From ed9f80690bde53e56c6ef5cb046fb20713f3f780 Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Wed, 2 May 2018 20:42:26 +0100
Subject: Simplify expectIdentifierToken by using expectToken

---
 test/libsolidity/syntaxTests/parsing/constant_is_keyword.sol            | 2 +-
 test/libsolidity/syntaxTests/parsing/external_variable.sol              | 2 +-
 .../syntaxTests/parsing/location_specifiers_for_state_variables.sol     | 2 +-
 .../syntaxTests/parsing/missing_parameter_name_in_named_args.sol        | 2 +-
 .../syntaxTests/parsing/missing_variable_name_in_declaration.sol        | 2 +-
 test/libsolidity/syntaxTests/parsing/payable_accessor.sol               | 2 +-
 test/libsolidity/syntaxTests/parsing/var_array.sol                      | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'test/libsolidity/syntaxTests')

diff --git a/test/libsolidity/syntaxTests/parsing/constant_is_keyword.sol b/test/libsolidity/syntaxTests/parsing/constant_is_keyword.sol
index 40e237d2..59fe8518 100644
--- a/test/libsolidity/syntaxTests/parsing/constant_is_keyword.sol
+++ b/test/libsolidity/syntaxTests/parsing/constant_is_keyword.sol
@@ -2,4 +2,4 @@ contract Foo {
 	uint constant = 4;
 }
 // ----
-// ParserError: (30-30): Expected identifier, got 'Assign'
+// ParserError: (30-30): Expected token Identifier got 'Assign'
diff --git a/test/libsolidity/syntaxTests/parsing/external_variable.sol b/test/libsolidity/syntaxTests/parsing/external_variable.sol
index 5188875f..1d2e65e6 100644
--- a/test/libsolidity/syntaxTests/parsing/external_variable.sol
+++ b/test/libsolidity/syntaxTests/parsing/external_variable.sol
@@ -2,4 +2,4 @@ contract c {
 	uint external x;
 }
 // ----
-// ParserError: (19-19): Expected identifier, got 'External'
+// ParserError: (19-19): Expected token Identifier got 'External'
diff --git a/test/libsolidity/syntaxTests/parsing/location_specifiers_for_state_variables.sol b/test/libsolidity/syntaxTests/parsing/location_specifiers_for_state_variables.sol
index 1b525506..0fc85177 100644
--- a/test/libsolidity/syntaxTests/parsing/location_specifiers_for_state_variables.sol
+++ b/test/libsolidity/syntaxTests/parsing/location_specifiers_for_state_variables.sol
@@ -2,4 +2,4 @@ contract Foo {
 	uint[] memory x;
 }
 // ----
-// ParserError: (23-23): Expected identifier, got 'Memory'
+// ParserError: (23-23): Expected token Identifier got 'Memory'
diff --git a/test/libsolidity/syntaxTests/parsing/missing_parameter_name_in_named_args.sol b/test/libsolidity/syntaxTests/parsing/missing_parameter_name_in_named_args.sol
index 0606e2c7..3604f3b2 100644
--- a/test/libsolidity/syntaxTests/parsing/missing_parameter_name_in_named_args.sol
+++ b/test/libsolidity/syntaxTests/parsing/missing_parameter_name_in_named_args.sol
@@ -3,4 +3,4 @@ contract test {
 	function b() returns (uint r) { r = a({: 1, : 2, : 3}); }
 }
 // ----
-// ParserError: (143-143): Expected identifier, got 'Colon'
+// ParserError: (143-143): Expected token Identifier got 'Colon'
diff --git a/test/libsolidity/syntaxTests/parsing/missing_variable_name_in_declaration.sol b/test/libsolidity/syntaxTests/parsing/missing_variable_name_in_declaration.sol
index fd3067e3..bb1d015b 100644
--- a/test/libsolidity/syntaxTests/parsing/missing_variable_name_in_declaration.sol
+++ b/test/libsolidity/syntaxTests/parsing/missing_variable_name_in_declaration.sol
@@ -2,4 +2,4 @@ contract test {
     uint256 ;
 }
 // ----
-// ParserError: (28-28): Expected identifier, got 'Semicolon'
+// ParserError: (28-28): Expected token Identifier got 'Semicolon'
diff --git a/test/libsolidity/syntaxTests/parsing/payable_accessor.sol b/test/libsolidity/syntaxTests/parsing/payable_accessor.sol
index a73108ad..44b04afd 100644
--- a/test/libsolidity/syntaxTests/parsing/payable_accessor.sol
+++ b/test/libsolidity/syntaxTests/parsing/payable_accessor.sol
@@ -2,4 +2,4 @@ contract test {
 	uint payable x;
 }
 // ----
-// ParserError: (22-22): Expected identifier, got 'Payable'
+// ParserError: (22-22): Expected token Identifier got 'Payable'
diff --git a/test/libsolidity/syntaxTests/parsing/var_array.sol b/test/libsolidity/syntaxTests/parsing/var_array.sol
index 60f6dc28..86fc4fcb 100644
--- a/test/libsolidity/syntaxTests/parsing/var_array.sol
+++ b/test/libsolidity/syntaxTests/parsing/var_array.sol
@@ -2,4 +2,4 @@ contract Foo {
 	function f() { var[] a; }
 }
 // ----
-// ParserError: (34-34): Expected identifier, got 'LBrack'
+// ParserError: (34-34): Expected token Identifier got 'LBrack'
-- 
cgit