slang: Do not parse whitespace.

The preprocessor tokeniser deals with those.

1 files changed, 36 insertions, 94 deletions

diff --git a/src/mesa/shader/slang/library/slang_shader_syn.h b/src/mesa/shader/slang/library/slang_shader_syn.h
index 98e6453a00..e94238e012 100644
--- a/src/mesa/shader/slang/library/slang_shader_syn.h
+++ b/src/mesa/shader/slang/library/slang_shader_syn.h
@@ -321,11 +321,7 @@
 "function_header_with_parameters_1\n"
 " comma .and parameter_declaration;\n"
 "function_header\n"
-" function_header_nospace .or function_header_space;\n"
-"function_header_space\n"
-" fully_specified_type_space .and space .and function_decl_identifier .and lparen;\n"
-"function_header_nospace\n"
-" fully_specified_type_nospace .and function_decl_identifier .and lparen;\n"
+" fully_specified_type .and function_decl_identifier .and lparen;\n"
 "function_decl_identifier\n"
 " .if (parsing_builtin != 0) __operator .emit FUNCTION_OPERATOR .or\n"
 " .if (parsing_builtin != 0) \"__constructor\" .emit FUNCTION_CONSTRUCTOR .or\n"
@@ -362,11 +358,7 @@
 " \n"
 " caretcaret .emit OPERATOR_LOGICALXOR ;\n"
 "parameter_declarator\n"
-" parameter_declarator_nospace .or parameter_declarator_space;\n"
-"parameter_declarator_nospace\n"
-" type_specifier_nospace .and identifier .and parameter_declarator_1;\n"
-"parameter_declarator_space\n"
-" type_specifier_space .and space .and identifier .and parameter_declarator_1;\n"
+" type_specifier .and identifier .and parameter_declarator_1;\n"
 "parameter_declarator_1\n"
 " parameter_declarator_2 .emit PARAMETER_ARRAY_PRESENT .or\n"
 " .true .emit PARAMETER_ARRAY_NOT_PRESENT;\n"
@@ -377,29 +369,23 @@
 "parameter_declaration_1\n"
 " parameter_declaration_2 .or parameter_declaration_3;\n"
 "parameter_declaration_2\n"
-" type_qualifier .and space .and parameter_qualifier .and parameter_declaration_4;\n"
+" type_qualifier .and parameter_qualifier .and parameter_declaration_4;\n"
 "parameter_declaration_3\n"
 " parameter_qualifier .emit TYPE_QUALIFIER_NONE .and parameter_declaration_4;\n"
 "parameter_declaration_4\n"
 " parameter_declaration_optprec .and parameter_declaration_rest;\n"
 "parameter_declaration_optprec\n"
-" parameter_declaration_prec .or .true .emit PRECISION_DEFAULT;\n"
-"parameter_declaration_prec\n"
-" precision .and space;\n"
+" precision .or .true .emit PRECISION_DEFAULT;\n"
 "parameter_declaration_rest\n"
 " parameter_declarator .or parameter_type_specifier;\n"
 "parameter_qualifier\n"
 " parameter_qualifier_1 .or .true .emit PARAM_QUALIFIER_IN;\n"
 "parameter_qualifier_1\n"
-" parameter_qualifier_2 .and space;\n"
-"parameter_qualifier_2\n"
 " \"in\" .emit PARAM_QUALIFIER_IN .or\n"
 " \"out\" .emit PARAM_QUALIFIER_OUT .or\n"
 " \"inout\" .emit PARAM_QUALIFIER_INOUT;\n"
 "parameter_type_specifier\n"
-" parameter_type_specifier_1 .and .true .emit '\\0' .and parameter_type_specifier_2;\n"
-"parameter_type_specifier_1\n"
-" type_specifier_nospace .or type_specifier_space;\n"
+" type_specifier .and .true .emit '\\0' .and parameter_type_specifier_2;\n"
 "parameter_type_specifier_2\n"
 " parameter_type_specifier_3 .emit PARAMETER_ARRAY_PRESENT .or\n"
 " .true .emit PARAMETER_ARRAY_NOT_PRESENT;\n"
@@ -419,18 +405,10 @@
 "init_declarator_list_5\n"
 " constant_expression .emit VARIABLE_ARRAY_EXPLICIT .or .true .emit VARIABLE_ARRAY_UNKNOWN;\n"
 "single_declaration\n"
-" single_declaration_nospace .or single_declaration_space;\n"
-"single_declaration_space\n"
-" fully_specified_type_space .and single_declaration_space_1;\n"
-"single_declaration_nospace\n"
-" fully_specified_type_nospace .and single_declaration_nospace_1;\n"
-"single_declaration_space_1\n"
-" single_declaration_space_2 .emit VARIABLE_IDENTIFIER .or .true .emit VARIABLE_NONE;\n"
-"single_declaration_nospace_1\n"
-" single_declaration_nospace_2 .emit VARIABLE_IDENTIFIER .or .true .emit VARIABLE_NONE;\n"
-"single_declaration_space_2\n"
-" space .and identifier .and single_declaration_3;\n"
-"single_declaration_nospace_2\n"
+" fully_specified_type .and single_declaration_1;\n"
+"single_declaration_1\n"
+" single_declaration_2 .emit VARIABLE_IDENTIFIER .or .true .emit VARIABLE_NONE;\n"
+"single_declaration_2\n"
 " identifier .and single_declaration_3;\n"
 "single_declaration_3\n"
 " single_declaration_4 .or single_declaration_5 .or .true .emit VARIABLE_NONE;\n"
@@ -440,26 +418,16 @@
 " lbracket .and single_declaration_6 .and rbracket;\n"
 "single_declaration_6\n"
 " constant_expression .emit VARIABLE_ARRAY_EXPLICIT .or .true .emit VARIABLE_ARRAY_UNKNOWN;\n"
-"fully_specified_type_space\n"
-" fully_specified_type_optinvariant .and fully_specified_type_optcentroid .and fully_specified_type_optqual .and fully_specified_type_optprec .and type_specifier_space;\n"
-"fully_specified_type_nospace\n"
-" fully_specified_type_optinvariant .and fully_specified_type_optcentroid .and fully_specified_type_optqual .and fully_specified_type_optprec .and type_specifier_nospace;\n"
+"fully_specified_type\n"
+" fully_specified_type_optinvariant .and fully_specified_type_optcentroid .and fully_specified_type_optqual .and fully_specified_type_optprec .and type_specifier;\n"
 "fully_specified_type_optinvariant\n"
-" fully_specified_type_invariant .or .true .emit TYPE_VARIANT;\n"
-"fully_specified_type_invariant\n"
-" invariant_qualifier .and space;\n"
+" invariant_qualifier .or .true .emit TYPE_VARIANT;\n"
 "fully_specified_type_optcentroid\n"
-" fully_specified_type_centroid .or .true .emit TYPE_CENTER;\n"
-"fully_specified_type_centroid\n"
-" centroid_qualifier .and space;\n"
+" centroid_qualifier .or .true .emit TYPE_CENTER;\n"
 "fully_specified_type_optqual\n"
-" fully_specified_type_qual .or .true .emit TYPE_QUALIFIER_NONE;\n"
-"fully_specified_type_qual\n"
-" type_qualifier .and space;\n"
+" type_qualifier .or .true .emit TYPE_QUALIFIER_NONE;\n"
 "fully_specified_type_optprec\n"
-" fully_specified_type_prec .or .true .emit PRECISION_DEFAULT;\n"
-"fully_specified_type_prec\n"
-" precision .and space;\n"
+" precision .or .true .emit PRECISION_DEFAULT;\n"
 "invariant_qualifier\n"
 " \"invariant\" .emit TYPE_INVARIANT;\n"
 "centroid_qualifier\n"
@@ -471,7 +439,8 @@
 " \"uniform\" .emit TYPE_QUALIFIER_UNIFORM .or\n"
 " .if (parsing_builtin != 0) \"__fixed_output\" .emit TYPE_QUALIFIER_FIXEDOUTPUT .or\n"
 " .if (parsing_builtin != 0) \"__fixed_input\" .emit TYPE_QUALIFIER_FIXEDINPUT;\n"
-"type_specifier_nonarray_space\n"
+"type_specifier_nonarray\n"
+" struct_specifier .emit TYPE_SPECIFIER_STRUCT .or\n"
 " \"void\" .emit TYPE_SPECIFIER_VOID .or\n"
 " \"float\" .emit TYPE_SPECIFIER_FLOAT .or\n"
 " \"int\" .emit TYPE_SPECIFIER_INT .or\n"
@@ -503,33 +472,21 @@
 " \"sampler2DRect\" .emit TYPE_SPECIFIER_SAMPLER2DRECT .or\n"
 " \"sampler2DRectShadow\" .emit TYPE_SPECIFIER_SAMPLER2DRECTSHADOW .or\n"
 " type_name .emit TYPE_SPECIFIER_TYPENAME;\n"
-"type_specifier_nonarray_nospace\n"
-" struct_specifier .emit TYPE_SPECIFIER_STRUCT;\n"
-"type_specifier_nonarray\n"
-" type_specifier_nonarray_nospace .or type_specifier_nonarray_space;\n"
-"type_specifier_space\n"
-" type_specifier_nonarray_space .and .true .emit TYPE_SPECIFIER_NONARRAY;\n"
-"type_specifier_nospace\n"
-" type_specifier_nospace_array .or type_specifier_nospace_1;\n"
-"type_specifier_nospace_1\n"
-" type_specifier_nonarray_nospace .and .true .emit TYPE_SPECIFIER_NONARRAY;\n"
-"type_specifier_nospace_array\n"
+"type_specifier\n"
+" type_specifier_array .or type_specifier_1;\n"
+"type_specifier_1\n"
+" type_specifier_nonarray .and .true .emit TYPE_SPECIFIER_NONARRAY;\n"
+"type_specifier_array\n"
 " type_specifier_nonarray .and lbracket .emit TYPE_SPECIFIER_ARRAY .and constant_expression .and rbracket;\n"
 "struct_specifier\n"
-" \"struct\" .and struct_specifier_1 .and optional_space .and lbrace .error LBRACE_EXPECTED .and\n"
+" \"struct\" .and struct_specifier_1 .and lbrace .error LBRACE_EXPECTED .and\n"
 " struct_declaration_list .and rbrace .emit FIELD_NONE;\n"
 "struct_specifier_1\n"
-" struct_specifier_2 .or .true .emit '\\0';\n"
-"struct_specifier_2\n"
-" space .and identifier;\n"
+" identifier .or .true .emit '\\0';\n"
 "struct_declaration_list\n"
 " struct_declaration .and .loop struct_declaration .emit FIELD_NEXT;\n"
 "struct_declaration\n"
-" struct_declaration_nospace .or struct_declaration_space;\n"
-"struct_declaration_space\n"
-" type_specifier_space .and space .and struct_declarator_list .and semicolon .emit FIELD_NONE;\n"
-"struct_declaration_nospace\n"
-" type_specifier_nospace .and struct_declarator_list .and semicolon .emit FIELD_NONE;\n"
+" type_specifier .and struct_declarator_list .and semicolon .emit FIELD_NONE;\n"
 "struct_declarator_list\n"
 " struct_declarator .and .loop struct_declarator_list_1 .emit FIELD_NEXT;\n"
 "struct_declarator_list_1\n"
@@ -546,10 +503,6 @@
 " declaration;\n"
 "statement\n"
 " compound_statement .or simple_statement;\n"
-"statement_space\n"
-" compound_statement .or statement_space_1;\n"
-"statement_space_1\n"
-" space .and simple_statement;\n"
 "simple_statement\n"
 " .if (parsing_builtin != 0) __asm_statement .emit OP_ASM .or\n"
 " selection_statement .or\n"
@@ -590,20 +543,14 @@
 "selection_rest_statement_1\n"
 " selection_rest_statement_2 .or .true .emit OP_EXPRESSION .emit OP_PUSH_VOID .emit OP_END;\n"
 "selection_rest_statement_2\n"
-" \"else\" .and optional_space .and statement;\n"
+" \"else\" .and statement;\n"
 "condition\n"
 " condition_1 .emit OP_DECLARE .emit DECLARATION_INIT_DECLARATOR_LIST .or\n"
-" condition_3 .emit OP_EXPRESSION;\n"
+" condition_2 .emit OP_EXPRESSION;\n"
 "condition_1\n"
-" condition_1_nospace .or condition_1_space;\n"
-"condition_1_nospace\n"
-" fully_specified_type_nospace .and condition_2;\n"
-"condition_1_space\n"
-" fully_specified_type_space .and space .and condition_2;\n"
+" fully_specified_type .and identifier .emit VARIABLE_IDENTIFIER .and\n"
+" equals .emit VARIABLE_INITIALIZER .and initializer .and .true .emit DECLARATOR_NONE;\n"
 "condition_2\n"
-" identifier .emit VARIABLE_IDENTIFIER .and equals .emit VARIABLE_INITIALIZER .and\n"
-" initializer .and .true .emit DECLARATOR_NONE;\n"
-"condition_3\n"
 " expression .and .true .emit OP_END;\n"
 "iteration_statement\n"
 " iteration_statement_1 .or iteration_statement_2 .or iteration_statement_3;\n"
@@ -611,7 +558,7 @@
 " \"while\" .emit OP_WHILE .and lparen .error LPAREN_EXPECTED .and condition .and\n"
 " rparen .error RPAREN_EXPECTED .and statement;\n"
 "iteration_statement_2\n"
-" \"do\" .emit OP_DO .and statement_space .and \"while\" .and lparen .error LPAREN_EXPECTED .and\n"
+" \"do\" .emit OP_DO .and statement .and \"while\" .and lparen .error LPAREN_EXPECTED .and\n"
 " expression .and rparen .error RPAREN_EXPECTED .emit OP_END .and semicolon;\n"
 "iteration_statement_3\n"
 " \"for\" .emit OP_FOR .and lparen .error LPAREN_EXPECTED .and for_init_statement .and\n"
@@ -635,13 +582,13 @@
 "jump_statement_2\n"
 " \"break\" .and semicolon .emit OP_BREAK;\n"
 "jump_statement_3\n"
-" \"return\" .emit OP_RETURN .and optional_space .and expression .and semicolon .emit OP_END;\n"
+" \"return\" .emit OP_RETURN .and expression .and semicolon .emit OP_END;\n"
 "jump_statement_4\n"
 " \"return\" .emit OP_RETURN .and semicolon .emit OP_PUSH_VOID .emit OP_END;\n"
 "jump_statement_5\n"
 " \"discard\" .and semicolon .emit OP_DISCARD;\n"
 "__asm_statement\n"
-" \"__asm\" .and space .and identifier .and space .and asm_arguments .and semicolon .emit OP_END;\n"
+" \"__asm\" .and identifier .and asm_arguments .and semicolon .emit OP_END;\n"
 "asm_arguments\n"
 " asm_argument .and .true .emit OP_END .and .loop asm_arguments_1;\n"
 "asm_arguments_1\n"
@@ -653,16 +600,15 @@
 "var_with_field\n"
 " variable_identifier .and dot .and field_selection .emit OP_FIELD;\n"
 "translation_unit\n"
-" optional_space .emit REVISION .and external_declaration .error INVALID_EXTERNAL_DECLARATION .and\n"
-" .loop external_declaration .and optional_space .and\n"
-" '\\0' .error INVALID_EXTERNAL_DECLARATION .emit EXTERNAL_NULL;\n"
+" .true .emit REVISION .and external_declaration .error INVALID_EXTERNAL_DECLARATION .and\n"
+" .loop external_declaration .and '\\0' .error INVALID_EXTERNAL_DECLARATION .emit EXTERNAL_NULL;\n"
 "external_declaration\n"
 " precision_stmt .emit DEFAULT_PRECISION .or\n"
 " function_definition .emit EXTERNAL_FUNCTION_DEFINITION .or\n"
 " invariant_stmt .emit INVARIANT_STMT .or\n"
 " declaration .emit EXTERNAL_DECLARATION;\n"
 "precision_stmt\n"
-" \"precision\" .and space .and precision .error INVALID_PRECISION .and space .and prectype .error INVALID_PRECISION_TYPE .and semicolon;\n"
+" \"precision\" .and precision .error INVALID_PRECISION .and prectype .error INVALID_PRECISION_TYPE .and semicolon;\n"
 "precision\n"
 " \"lowp\" .emit PRECISION_LOW .or\n"
 " \"mediump\" .emit PRECISION_MEDIUM .or\n"
@@ -679,7 +625,7 @@
 " \"sampler2DRect\" .emit TYPE_SPECIFIER_SAMPLER2DRECT .or\n"
 " \"sampler2DRectShadow\" .emit TYPE_SPECIFIER_SAMPLER2DRECTSHADOW;\n"
 "invariant_stmt\n"
-" \"invariant\" .and space .and identifier .and semicolon;\n"
+" \"invariant\" .and identifier .and semicolon;\n"
 "function_definition\n"
 " function_prototype .and compound_statement_no_new_scope;\n"
 "identifier\n"
@@ -701,10 +647,6 @@
 " integer .emit OP_PUSH_INT;\n"
 "boolconstant\n"
 " boolean .emit OP_PUSH_BOOL;\n"
-"optional_space\n"
-" .true;\n"
-"space\n"
-" .true;\n"
 "ampersandampersand\n"
 " \"@&&\";\n"
 "barbar\n"