From ca6e93f091bc6f2e9dc26e842fc87d614089cf9d Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sat, 10 Feb 2018 14:10:02 +0300 Subject: G: use names in structs --- tests/data/parser/err/0000_struct_field_missing_comma.txt | 7 ++++--- tests/data/parser/err/0001_item_recovery_in_file.txt | 7 ++++--- tests/data/parser/err/0003_C++_semicolon.txt | 7 ++++--- tests/data/parser/err/0006_named_field_recovery.txt | 7 ++++--- tests/data/parser/err/0007_stray_curly_in_file.txt | 5 +++-- tests/data/parser/err/0009_broken_struct_type_parameter.txt | 10 ++++++---- 6 files changed, 25 insertions(+), 18 deletions(-) (limited to 'tests/data/parser/err') diff --git a/tests/data/parser/err/0000_struct_field_missing_comma.txt b/tests/data/parser/err/0000_struct_field_missing_comma.txt index d94b4fd9e..2c761694c 100644 --- a/tests/data/parser/err/0000_struct_field_missing_comma.txt +++ b/tests/data/parser/err/0000_struct_field_missing_comma.txt @@ -1,9 +1,10 @@ FILE@[0; 34) STRUCT_ITEM@[0; 34) STRUCT_KW@[0; 6) - WHITESPACE@[6; 7) - IDENT@[7; 8) "S" - WHITESPACE@[8; 9) + NAME@[6; 9) + WHITESPACE@[6; 7) + IDENT@[7; 8) "S" + WHITESPACE@[8; 9) L_CURLY@[9; 10) NAMED_FIELD@[10; 26) WHITESPACE@[10; 15) diff --git a/tests/data/parser/err/0001_item_recovery_in_file.txt b/tests/data/parser/err/0001_item_recovery_in_file.txt index c33113c6d..e41ddc009 100644 --- a/tests/data/parser/err/0001_item_recovery_in_file.txt +++ b/tests/data/parser/err/0001_item_recovery_in_file.txt @@ -9,8 +9,9 @@ FILE@[0; 21) WHITESPACE@[8; 10) STRUCT_ITEM@[10; 21) STRUCT_KW@[10; 16) - WHITESPACE@[16; 17) - IDENT@[17; 18) "S" - WHITESPACE@[18; 19) + NAME@[16; 19) + WHITESPACE@[16; 17) + IDENT@[17; 18) "S" + WHITESPACE@[18; 19) L_CURLY@[19; 20) R_CURLY@[20; 21) diff --git a/tests/data/parser/err/0003_C++_semicolon.txt b/tests/data/parser/err/0003_C++_semicolon.txt index d77c06378..e567b0775 100644 --- a/tests/data/parser/err/0003_C++_semicolon.txt +++ b/tests/data/parser/err/0003_C++_semicolon.txt @@ -1,9 +1,10 @@ FILE@[0; 40) STRUCT_ITEM@[0; 39) STRUCT_KW@[0; 6) - WHITESPACE@[6; 7) - IDENT@[7; 8) "S" - WHITESPACE@[8; 9) + NAME@[6; 9) + WHITESPACE@[6; 7) + IDENT@[7; 8) "S" + WHITESPACE@[8; 9) L_CURLY@[9; 10) NAMED_FIELD@[10; 21) WHITESPACE@[10; 15) diff --git a/tests/data/parser/err/0006_named_field_recovery.txt b/tests/data/parser/err/0006_named_field_recovery.txt index 0437bf2e7..7886beeb8 100644 --- a/tests/data/parser/err/0006_named_field_recovery.txt +++ b/tests/data/parser/err/0006_named_field_recovery.txt @@ -1,9 +1,10 @@ FILE@[0; 74) STRUCT_ITEM@[0; 74) STRUCT_KW@[0; 6) - WHITESPACE@[6; 7) - IDENT@[7; 8) "S" - WHITESPACE@[8; 9) + NAME@[6; 9) + WHITESPACE@[6; 7) + IDENT@[7; 8) "S" + WHITESPACE@[8; 9) L_CURLY@[9; 10) NAMED_FIELD@[10; 21) WHITESPACE@[10; 15) diff --git a/tests/data/parser/err/0007_stray_curly_in_file.txt b/tests/data/parser/err/0007_stray_curly_in_file.txt index 6460d06d8..f20807bfe 100644 --- a/tests/data/parser/err/0007_stray_curly_in_file.txt +++ b/tests/data/parser/err/0007_stray_curly_in_file.txt @@ -5,8 +5,9 @@ FILE@[0; 31) WHITESPACE@[1; 3) STRUCT_ITEM@[3; 14) STRUCT_KW@[3; 9) - WHITESPACE@[9; 10) - IDENT@[10; 11) "S" + NAME@[9; 11) + WHITESPACE@[9; 10) + IDENT@[10; 11) "S" SEMI@[11; 12) WHITESPACE@[12; 14) ERROR@[14; 17) diff --git a/tests/data/parser/err/0009_broken_struct_type_parameter.txt b/tests/data/parser/err/0009_broken_struct_type_parameter.txt index f329735b6..9434a764a 100644 --- a/tests/data/parser/err/0009_broken_struct_type_parameter.txt +++ b/tests/data/parser/err/0009_broken_struct_type_parameter.txt @@ -1,8 +1,9 @@ FILE@[0; 43) STRUCT_ITEM@[0; 12) STRUCT_KW@[0; 6) - WHITESPACE@[6; 7) - IDENT@[7; 8) "S" + NAME@[6; 8) + WHITESPACE@[6; 7) + IDENT@[7; 8) "S" TYPE_PARAM_LIST@[8; 12) L_ANGLE@[8; 9) ERROR@[9; 12) @@ -36,7 +37,8 @@ FILE@[0; 43) WHITESPACE@[31; 33) STRUCT_ITEM@[33; 43) STRUCT_KW@[33; 39) - WHITESPACE@[39; 40) - IDENT@[40; 41) "T" + NAME@[39; 41) + WHITESPACE@[39; 40) + IDENT@[40; 41) "T" SEMI@[41; 42) WHITESPACE@[42; 43) -- cgit v1.2.3