mesa: reformat comments, rewrap lines, etc for a little better readability
authorBrian Paul <brian.paul@tungstengraphics.com>
Fri, 7 Nov 2008 21:28:00 +0000 (14:28 -0700)
committerBrian Paul <brianp@vmware.com>
Tue, 6 Jan 2009 15:32:44 +0000 (08:32 -0700)
(cherry picked from commit b632e5aa7f948ed5bbf7104682ec3ee463af4c0a)

src/mesa/shader/slang/library/slang_shader.syn
src/mesa/shader/slang/library/slang_shader_syn.h

index ef4b410669c4001f0e5ac38bc5075f07b457a874..883bfe42816bcb102ad4700860c97e079bf69883 100644 (file)
  * usage:
  *   syn2c slang_shader.syn > slang_shader_syn.h
  *
- * when modifying or extending this file, several things must be taken into consideration:
- * - when adding new operators that were marked as reserved in the initial specification,
- *   one must only uncomment particular lines of code that refer to operators being added;
- * - when adding new shader target, one must reserve new value for shader_type register and
- *   use it in .if constructs for symbols that are exclusive for that shader;
- * - some symbols mimic output of other symbols - the best example is the "for" construct:
- *   expression "for (foo(); ; bar())" is seen as "for (foo(); true; bar())" by the output
- *   processor - hence, special care must be taken when rearranging output of essential symbols;
- * - order of single-quoted tokens does matter in alternatives - so do not parse "<" operator
- *   before "<<" and "<<" before "<<=";
- * - all double-quoted tokens are internally preprocessed to eliminate problems with parsing
- *   strings that are prefixes of other strings, like "sampler1D" and "sampler1DShadow";
+ * when modifying or extending this file, several things must be taken into
+ * consideration:
+ *
+ * - when adding new operators that were marked as reserved in the
+ *   initial specification, one must only uncomment particular lines of
+ *   code that refer to operators being added;
+ *
+ * - when adding new shader targets, one must reserve a new value for
+ *   shader_type register and use it in .if constructs for symbols that
+ *   are exclusive for that shader;
+ *
+ * - some symbols mimic output of other symbols - the best example is
+ *   the "for" construct: expression "for (foo(); ; bar())" is seen as
+ *   "for (foo(); true; bar())" by the output processor - hence, special
+ *   care must be taken when rearranging output of essential symbols;
+ *
+ * - order of single-quoted tokens does matter in alternatives - so do not
+ *   parse "<" operator before "<<" and "<<" before "<<=";
+ *
+ * - all double-quoted tokens are internally preprocessed to eliminate
+ *   problems with parsing strings that are prefixes of other strings,
+ *   like "sampler1D" and "sampler1DShadow";
  */
 
 .syntax translation_unit;
 .errtext INVALID_PRECISION_TYPE                     "2007: Invalid precision type '$err_token$'."
 
 
-/* tells whether the shader that is being parsed is a built-in shader or not */
-/*   0 - normal behaviour */
-/*   1 - accepts constructor and operator definitions and __asm statements */
-/* the implementation will set it to 1 when compiling internal built-in shaders */
+/*
+ * tells whether the shader that is being parsed is a built-in shader or not
+ *  0 - normal behaviour
+ *  1 - accepts constructor and operator definitions and __asm statements
+ * the implementation will set it to 1 when compiling internal built-in shaders
+ */
 .regbyte parsing_builtin                            0
 
-/* holds the type of the shader being parsed; possible values are listed below */
-/*   FRAGMENT_SHADER            1 */
-/*   VERTEX_SHADER              2 */
-/* shader type is set by the caller before parsing */
+/*
+ * holds the type of the shader being parsed; possible values are
+ * listed below.
+ *   FRAGMENT_SHADER            1
+ *   VERTEX_SHADER              2
+ * shader type is set by the caller before parsing
+ */
 .regbyte shader_type                                0
 
 /*
   <variable_identifier>               ::= <identifier>
-*/
* <variable_identifier> ::= <identifier>
+ */
 variable_identifier
     identifier .emit OP_PUSH_IDENTIFIER;
 
 /*
   <primary_expression>                ::= <variable_identifier>
                                         | <intconstant>
                                         | <floatconstant>
                                         | <boolconstant>
                                         | "(" <expression> ")"
-*/
*  <primary_expression> ::= <variable_identifier>
*                         | <intconstant>
*                         | <floatconstant>
*                         | <boolconstant>
*                         | "(" <expression> ")"
+ */
 primary_expression
     floatconstant .or boolconstant .or intconstant .or variable_identifier .or primary_expression_1;
 primary_expression_1
     lparen .and expression .and rparen;
 
 /*
   <postfix_expression>                ::= <primary_expression>
                                         | <postfix_expression> "[" <integer_expression> "]"
                                         | <function_call>
                                         | <postfix_expression> "." <field_selection>
                                         | <postfix_expression> "++"
                                         | <postfix_expression> "--"
-*/
* <postfix_expression> ::= <primary_expression>
*                        | <postfix_expression> "[" <integer_expression> "]"
*                        | <function_call>
*                        | <postfix_expression> "." <field_selection>
*                        | <postfix_expression> "++"
*                        | <postfix_expression> "--"
+ */
 postfix_expression
     postfix_expression_1 .and .loop postfix_expression_2;
 postfix_expression_1
@@ -307,21 +322,21 @@ postfix_expression_4
     dot .and field_selection .emit OP_FIELD;
 
 /*
   <integer_expression>                ::= <expression>
-*/
* <integer_expression> ::= <expression>
+ */
 integer_expression
     expression;
 
 /*
   <function_call>                     ::= <function_call_generic>
-*/
* <function_call> ::= <function_call_generic>
+ */
 function_call
     function_call_generic .emit OP_CALL .and .true .emit OP_END;
 
 /*
   <function_call_generic>             ::= <function_call_header_with_parameters> ")"
                                         | <function_call_header_no_parameters> ")"
-*/
* <function_call_generic> ::= <function_call_header_with_parameters> ")"
*                           | <function_call_header_no_parameters> ")"
+ */
 function_call_generic
     function_call_generic_1 .or function_call_generic_2;
 function_call_generic_1
@@ -330,19 +345,18 @@ function_call_generic_2
     function_call_header_no_parameters .and rparen .error RPAREN_EXPECTED;
 
 /*
   <function_call_header_no_parameters>::= <function_call_header> "void"
                                         | <function_call_header>
-*/
* <function_call_header_no_parameters>::= <function_call_header> "void"
*                                        | <function_call_header>
+ */
 function_call_header_no_parameters
     function_call_header .and function_call_header_no_parameters_1;
 function_call_header_no_parameters_1
     "void" .or .true;
 
 /*
-    <function_call_header_with_parameters>::= <function_call_header> <assignment_expression>
-                                            | <function_call_header_with_parameters> ","
-                                              <assignment_expression>
-*/
+ * <function_call_header_with_parameters> ::= <function_call_header> <assignment_expression>
+ *                                          | <function_call_header_with_parameters> "," <assignment_expression>
+ */
 function_call_header_with_parameters
     function_call_header .and assignment_expression .and .true .emit OP_END .and
     .loop function_call_header_with_parameters_1;
@@ -350,31 +364,31 @@ function_call_header_with_parameters_1
     comma .and assignment_expression .and .true .emit OP_END;
 
 /*
   <function_call_header>              ::= <function_identifier> "("
-*/
* <function_call_header> ::= <function_identifier> "("
+ */
 function_call_header
     function_identifier .and lparen;
 
 /*
   <function_identifier>               ::= <constructor_identifier>
                                         | <identifier>
-
-note: <constructor_identifier> has been deleted
-*/
* <function_identifier> ::= <constructor_identifier>
*                         | <identifier>
+ *
+ * note: <constructor_identifier> has been deleted
+ */
 function_identifier
     identifier;
 
 /*
   <unary_expression>                  ::= <postfix_expression>
                                         | "++" <unary_expression>
                                         | "--" <unary_expression>
                                         | <unary_operator> <unary_expression>
-
   <unary_operator>                    ::= "+"
                                         | "-"
                                         | "!"
                                         | "~" // reserved
-*/
* <unary_expression> ::= <postfix_expression>
*                      | "++" <unary_expression>
*                      | "--" <unary_expression>
*                      | <unary_operator> <unary_expression>
+ *
* <unary_operator>   ::= "+"
*                      | "-"
*                      | "!"
*                      | "~" // reserved
+ */
 unary_expression
     postfix_expression .or unary_expression_1 .or unary_expression_2 .or unary_expression_3 .or
     unary_expression_4 .or unary_expression_5/* .or unary_expression_6*/;
@@ -392,11 +406,11 @@ unary_expression_5
     tilde .and unary_expression .and .true .emit OP_COMPLEMENT;*/
 
 /*
   <multiplicative_expression>         ::= <unary_expression>
                                         | <multiplicative_expression> "*" <unary_expression>
                                         | <multiplicative_expression> "/" <unary_expression>
                                         | <multiplicative_expression> "%" <unary_expression> // reserved
-*/
* <multiplicative_expression> ::= <unary_expression>
*                               | <multiplicative_expression> "*" <unary_expression>
*                               | <multiplicative_expression> "/" <unary_expression>
*                               | <multiplicative_expression> "%" <unary_expression> // reserved
+ */
 multiplicative_expression
     unary_expression .and .loop multiplicative_expression_1;
 multiplicative_expression_1
@@ -409,10 +423,10 @@ multiplicative_expression_3
     percent .and unary_expression .and .true .emit OP_MODULUS;*/
 
 /*
   <additive_expression>               ::= <multiplicative_expression>
                                         | <additive_expression> "+" <multiplicative_expression>
                                         | <additive_expression> "-" <multiplicative_expression>
-*/
* <additive_expression> ::= <multiplicative_expression>
*                         | <additive_expression> "+" <multiplicative_expression>
*                         | <additive_expression> "-" <multiplicative_expression>
+ */
 additive_expression
     multiplicative_expression .and .loop additive_expression_1;
 additive_expression_1
@@ -423,10 +437,10 @@ additive_expression_3
     minus .and multiplicative_expression .and .true .emit OP_SUBTRACT;
 
 /*
   <shift_expression>                  ::= <additive_expression>
                                         | <shift_expression> "<<" <additive_expression> // reserved
                                         | <shift_expression> ">>" <additive_expression> // reserved
-*/
* <shift_expression> ::= <additive_expression>
*                      | <shift_expression> "<<" <additive_expression> // reserved
*                      | <shift_expression> ">>" <additive_expression> // reserved
+ */
 shift_expression
     additive_expression/* .and .loop shift_expression_1*/;
 /*shift_expression_1
@@ -437,12 +451,12 @@ shift_expression
     greatergreater .and additive_expression .and .true .emit OP_RSHIFT;*/
 
 /*
   <relational_expression>             ::= <shift_expression>
                                         | <relational_expression> "<" <shift_expression>
                                         | <relational_expression> ">" <shift_expression>
                                         | <relational_expression> "<=" <shift_expression>
                                         | <relational_expression> ">=" <shift_expression>
-*/
* <relational_expression> ::= <shift_expression>
*                           | <relational_expression> "<" <shift_expression>
*                           | <relational_expression> ">" <shift_expression>
*                           | <relational_expression> "<=" <shift_expression>
*                           | <relational_expression> ">=" <shift_expression>
+ */
 relational_expression
     shift_expression .and .loop relational_expression_1;
 relational_expression_1
@@ -458,10 +472,10 @@ relational_expression_5
     greater .and shift_expression .and .true .emit OP_GREATER;
 
 /*
   <equality_expression>               ::= <relational_expression>
                                         | <equality_expression> "==" <relational_expression>
                                         | <equality_expression> "!=" <relational_expression>
-*/
* <equality_expression> ::= <relational_expression>
*                         | <equality_expression> "==" <relational_expression>
*                         | <equality_expression> "!=" <relational_expression>
+ */
 equality_expression
     relational_expression .and .loop equality_expression_1;
 equality_expression_1
@@ -472,86 +486,84 @@ equality_expression_3
     bangequals .and relational_expression .and .true .emit OP_NOTEQUAL;
 
 /*
   <and_expression>                    ::= <equality_expression>
                                         | <and_expression> "&" <equality_expression> // reserved
-*/
* <and_expression> ::= <equality_expression>
*                    | <and_expression> "&" <equality_expression> // reserved
+ */
 and_expression
     equality_expression/* .and .loop and_expression_1*/;
 /*and_expression_1
     ampersand .and equality_expression .and .true .emit OP_BITAND;*/
 
 /*
   <exclusive_or_expression>           ::= <and_expression>
                                         | <exclusive_or_expression> "^" <and_expression> // reserved
-*/
* <exclusive_or_expression> ::= <and_expression>
*                             | <exclusive_or_expression> "^" <and_expression> // reserved
+ */
 exclusive_or_expression
     and_expression/* .and .loop exclusive_or_expression_1*/;
 /*exclusive_or_expression_1
     caret .and and_expression .and .true .emit OP_BITXOR;*/
 
 /*
   <inclusive_or_expression>           ::= <exclusive_or_expression>
                                         | <inclusive_or_expression> "|" <exclusive_or_expression> // reserved
-*/
* <inclusive_or_expression> ::= <exclusive_or_expression>
*                             | <inclusive_or_expression> "|" <exclusive_or_expression> // reserved
+ */
 inclusive_or_expression
     exclusive_or_expression/* .and .loop inclusive_or_expression_1*/;
 /*inclusive_or_expression_1
     bar .and exclusive_or_expression .and .true .emit OP_BITOR;*/
 
 /*
   <logical_and_expression>            ::= <inclusive_or_expression>
                                         | <logical_and_expression> "&&" <inclusive_or_expression>
-*/
* <logical_and_expression> ::= <inclusive_or_expression>
*                            | <logical_and_expression> "&&" <inclusive_or_expression>
+ */
 logical_and_expression
     inclusive_or_expression .and .loop logical_and_expression_1;
 logical_and_expression_1
     ampersandampersand .and inclusive_or_expression .and .true .emit OP_LOGICALAND;
 
 /*
   <logical_xor_expression>            ::= <logical_and_expression>
                                         | <logical_xor_expression> "^^" <logical_and_expression>
-*/
* <logical_xor_expression> ::= <logical_and_expression>
*                            | <logical_xor_expression> "^^" <logical_and_expression>
+ */
 logical_xor_expression
     logical_and_expression .and .loop logical_xor_expression_1;
 logical_xor_expression_1
     caretcaret .and logical_and_expression .and .true .emit OP_LOGICALXOR;
 
 /*
   <logical_or_expression>             ::= <logical_xor_expression>
                                         | <logical_or_expression> "||" <logical_xor_expression>
-*/
* <logical_or_expression> ::= <logical_xor_expression>
*                           | <logical_or_expression> "||" <logical_xor_expression>
+ */
 logical_or_expression
     logical_xor_expression .and .loop logical_or_expression_1;
 logical_or_expression_1
     barbar .and logical_xor_expression .and .true .emit OP_LOGICALOR;
 
 /*
-    <conditional_expression>            ::= <logical_or_expression>
-                                          | <logical_or_expression> "?" <expression> ":"
-                                            <conditional_expression>
-*/
+ * <conditional_expression> ::= <logical_or_expression>
+ *                            | <logical_or_expression> "?" <expression> ":" <conditional_expression>
+ */
 conditional_expression
     logical_or_expression .and .loop conditional_expression_1;
 conditional_expression_1
     question .and expression .and colon .and conditional_expression .and .true .emit OP_SELECT;
 
 /*
-    <assignment_expression>             ::= <conditional_expression>
-                                          | <unary_expression> <assignment_operator>
-                                            <assignment_expression>
-
-    <assignment_operator>               ::= "="
-                                          | "*="
-                                          | "/="
-                                          | "+="
-                                          | "-="
-                                          | "%=" // reserved
-                                          | "<<=" // reserved
-                                          | ">>=" // reserved
-                                          | "&=" // reserved
-                                          | "^=" // reserved
-                                          | "|=" // reserved
-*/
+ * <assignment_expression> ::= <conditional_expression>
+ *                           | <unary_expression> <assignment_operator> <assignment_expression>
+ *
+ * <assignment_operator> ::= "="
+ *                         | "*="
+ *                         | "/="
+ *                         | "+="
+ *                         | "-="
+ *                         | "%=" // reserved
+ *                         | "<<=" // reserved
+ *                         | ">>=" // reserved
+ *                         | "&=" // reserved
+ *                         | "^=" // reserved
+ *                         | "|=" // reserved
+ */
 assignment_expression
     assignment_expression_1 .or assignment_expression_2 .or assignment_expression_3 .or
     assignment_expression_4 .or assignment_expression_5/* .or assignment_expression_6 .or
@@ -582,24 +594,24 @@ assignment_expression_5
     unary_expression .and barequals .and assignment_expression .and .true .emit OP_ORASSIGN;*/
 
 /*
   <expression>                        ::= <assignment_expression>
                                         | <expression> "," <assignment_expression>
-*/
* <expression> ::= <assignment_expression>
*                | <expression> "," <assignment_expression>
+ */
 expression
     assignment_expression .and .loop expression_1;
 expression_1
     comma .and assignment_expression .and .true .emit OP_SEQUENCE;
 
 /*
   <constant_expression>               ::= <conditional_expression>
-*/
* <constant_expression> ::= <conditional_expression>
+ */
 constant_expression
     conditional_expression .and .true .emit OP_END;
 
 /*
   <declaration>                       ::= <function_prototype> ";"
                                         | <init_declarator_list> ";"
-*/
* <declaration> ::= <function_prototype> ";"
*                 | <init_declarator_list> ";"
+ */
 declaration
     declaration_1 .or declaration_2;
 declaration_1
@@ -608,9 +620,9 @@ declaration_2
     init_declarator_list .emit DECLARATION_INIT_DECLARATOR_LIST .and semicolon;
 
 /*
   <function_prototype>                ::= <function_header> "void" ")"
                                         | <function_declarator> ")"
-*/
* <function_prototype> ::= <function_header> "void" ")"
*                        | <function_declarator> ")"
+ */
 function_prototype
     function_prototype_1 .or function_prototype_2;
 function_prototype_1
@@ -619,25 +631,25 @@ function_prototype_2
     function_declarator .and rparen .error RPAREN_EXPECTED .emit PARAMETER_NONE;
 
 /*
   <function_declarator>               ::= <function_header>
                                         | <function_header_with_parameters>
-*/
* <function_declarator> ::= <function_header>
*                         | <function_header_with_parameters>
+ */
 function_declarator
     function_header_with_parameters .or function_header;
 
 /*
   <function_header_with_parameters>   ::= <function_header> <parameter_declaration>
                                         | <function_header_with_parameters> ","
                                           <parameter_declaration>
-*/
* <function_header_with_parameters> ::= <function_header> <parameter_declaration>
*                                     | <function_header_with_parameters> ","
*                                       <parameter_declaration>
+ */
 function_header_with_parameters
     function_header .and parameter_declaration .and .loop function_header_with_parameters_1;
 function_header_with_parameters_1
     comma .and parameter_declaration;
 
 /*
   <function_header>                   ::= <fully_specified_type> <identifier> "("
-*/
* <function_header> ::= <fully_specified_type> <identifier> "("
+ */
 function_header
     function_header_nospace .or function_header_space;
 function_header_space
@@ -646,64 +658,64 @@ function_header_nospace
     fully_specified_type_nospace .and function_decl_identifier .and lparen;
 
 /*
   <function_decl_identifier>          ::= "__constructor"
                                         | <__operator>
                                         | <identifier>
-
-note: this is an extension to the standard language specification - normally slang disallows
     operator and constructor prototypes and definitions
-*/
* <function_decl_identifier> ::= "__constructor"
*                              | <__operator>
*                              | <identifier>
+ *
+ * note: this is an extension to the standard language specification.
* normally slang disallows operator and constructor prototypes and definitions
+ */
 function_decl_identifier
     .if (parsing_builtin != 0) __operator .emit FUNCTION_OPERATOR .or
     .if (parsing_builtin != 0) "__constructor" .emit FUNCTION_CONSTRUCTOR .or
     identifier .emit FUNCTION_ORDINARY;
 
 /*
   <__operator>                        ::= "__operator" <overriden_op>
-
-note: this is an extension to the standard language specification - normally slang disallows
     operator prototypes and definitions
-*/
* <__operator> ::= "__operator" <overriden_op>
+ *
+ * note: this is an extension to the standard language specification.
* normally slang disallows operator prototypes and definitions
+ */
 __operator
     "__operator" .and overriden_operator .error INVALID_OPERATOR_OVERRIDE;
 
 /*
   <overriden_op>                      ::= "="
                                         | "+="
                                         | "-="
                                         | "*="
                                         | "/="
                                         | "%=" // reserved
                                         | "<<=" // reserved
                                         | ">>=" // reserved
                                         | "&=" // reserved
                                         | "^=" // reserved
                                         | "|=" // reserved
                                         | "^^"
                                         | "|" // reserved
                                         | "^" // reserved
                                         | "&" // reserved
                                         | "=="
                                         | "!="
                                         | "<"
                                         | ">"
                                         | "<="
                                         | ">="
                                         | "<<" // reserved
                                         | ">>" // reserved
                                         | "*"
                                         | "/"
                                         | "%" // reserved
                                         | "++"
                                         | "--"
                                         | "+"
                                         | "-"
                                         | "~" // reserved
                                         | "!"
-
-note: this is an extension to the standard language specification - normally slang disallows
     operator prototypes and definitions
-*/
* <overriden_op> ::= "="
*                  | "+="
*                  | "-="
*                  | "*="
*                  | "/="
*                  | "%=" // reserved
*                  | "<<=" // reserved
*                  | ">>=" // reserved
*                  | "&=" // reserved
*                  | "^=" // reserved
*                  | "|=" // reserved
*                  | "^^"
*                  | "|" // reserved
*                  | "^" // reserved
*                  | "&" // reserved
*                  | "=="
*                  | "!="
*                  | "<"
*                  | ">"
*                  | "<="
*                  | ">="
*                  | "<<" // reserved
*                  | ">>" // reserved
*                  | "*"
*                  | "/"
*                  | "%" // reserved
*                  | "++"
*                  | "--"
*                  | "+"
*                  | "-"
*                  | "~" // reserved
*                  | "!"
+ *
+ * note: this is an extension to the standard language specification.
* normally slang disallows operator prototypes and definitions
+ */
 overriden_operator
     plusplus .emit OPERATOR_INCREMENT .or
     plusequals .emit OPERATOR_ADDASSIGN .or
@@ -736,10 +748,9 @@ overriden_operator
     caret .emit OPERATOR_BITXOR*/;
 
 /*
-    <parameter_declarator>              ::= <type_specifier> <identifier>
-                                          | <type_specifier> <identifier> "[" <constant_expression>
-                                            "]"
-*/
+ * <parameter_declarator> ::= <type_specifier> <identifier>
+ *                          | <type_specifier> <identifier> "[" <constant_expression> "]"
+ */
 parameter_declarator
     parameter_declarator_nospace .or parameter_declarator_space;
 parameter_declarator_nospace
@@ -753,21 +764,21 @@ parameter_declarator_2
     lbracket .and constant_expression .and rbracket;
 
 /*
   <parameter_declaration>             ::= <type_qualifier> <parameter_qualifier>
                                           <precision> <parameter_declarator>
                                         | <type_qualifier> <parameter_qualifier>
                                           <precision> <parameter_type_specifier>
                                         | <type_qualifier> <parameter_qualifier>
                                           <parameter_declarator>
                                         | <type_qualifier> <parameter_qualifier>
                                           <parameter_type_specifier>
                                         | <parameter_qualifier> <precision>
                                           <parameter_declarator>
                                         | <parameter_qualifier> <precision>
                                           <parameter_type_specifier>
                                         | <parameter_qualifier> <parameter_declarator>
                                         | <parameter_qualifier> <parameter_type_specifier>
-*/
* <parameter_declaration> ::= <type_qualifier> <parameter_qualifier>
*                             <precision> <parameter_declarator>
*                           | <type_qualifier> <parameter_qualifier>
*                             <precision> <parameter_type_specifier>
*                           | <type_qualifier> <parameter_qualifier>
*                             <parameter_declarator>
*                           | <type_qualifier> <parameter_qualifier>
*                             <parameter_type_specifier>
*                           | <parameter_qualifier> <precision>
*                             <parameter_declarator>
*                           | <parameter_qualifier> <precision>
*                             <parameter_type_specifier>
*                           | <parameter_qualifier> <parameter_declarator>
*                           | <parameter_qualifier> <parameter_type_specifier>
+ */
 parameter_declaration
     parameter_declaration_1 .emit PARAMETER_NEXT;
 parameter_declaration_1
@@ -786,11 +797,11 @@ parameter_declaration_rest
     parameter_declarator .or parameter_type_specifier;
 
 /*
   <parameter_qualifier>               ::= "in"
                                         | "out"
                                         | "inout"
                                         | ""
-*/
* <parameter_qualifier> ::= "in"
*                         | "out"
*                         | "inout"
*                         | ""
+ */
 parameter_qualifier
     parameter_qualifier_1 .or .true .emit PARAM_QUALIFIER_IN;
 parameter_qualifier_1
@@ -801,9 +812,9 @@ parameter_qualifier_2
     "inout" .emit PARAM_QUALIFIER_INOUT;
 
 /*
   <parameter_type_specifier>          ::= <type_specifier>
                                         | <type_specifier> "[" <constant_expression> "]"
-*/
* <parameter_type_specifier> ::= <type_specifier>
*                              | <type_specifier> "[" <constant_expression> "]"
+ */
 parameter_type_specifier
     parameter_type_specifier_1 .and .true .emit '\0' .and parameter_type_specifier_2;
 parameter_type_specifier_1
@@ -815,14 +826,14 @@ parameter_type_specifier_3
     lbracket .and constant_expression .and rbracket;
 
 /*
   <init_declarator_list>              ::= <single_declaration>
                                         | <init_declarator_list> "," <identifier>
                                         | <init_declarator_list> "," <identifier> "[" "]"
                                         | <init_declarator_list> "," <identifier> "["
                                           <constant_expression> "]"
                                         | <init_declarator_list> "," <identifier> "="
                                           <initializer>
-*/
* <init_declarator_list> ::= <single_declaration>
*                          | <init_declarator_list> "," <identifier>
*                          | <init_declarator_list> "," <identifier> "[" "]"
*                          | <init_declarator_list> "," <identifier> "["
*                            <constant_expression> "]"
*                          | <init_declarator_list> "," <identifier> "="
*                            <initializer>
+ */
 init_declarator_list
     single_declaration .and .loop init_declarator_list_1 .emit DECLARATOR_NEXT .and
     .true .emit DECLARATOR_NONE;
@@ -838,12 +849,12 @@ init_declarator_list_5
     constant_expression .emit VARIABLE_ARRAY_EXPLICIT .or .true .emit VARIABLE_ARRAY_UNKNOWN;
 
 /*
   <single_declaration>                ::= <fully_specified_type>
                                         | <fully_specified_type> <identifier>
                                         | <fully_specified_type> <identifier> "[" "]"
                                         | <fully_specified_type> <identifier> "["
                                           <constant_expression> "]"
                                         | <fully_specified_type> <identifier> "=" <initializer>
* <single_declaration> ::= <fully_specified_type>
*                        | <fully_specified_type> <identifier>
*                        | <fully_specified_type> <identifier> "[" "]"
*                        | <fully_specified_type> <identifier> "["
*                          <constant_expression> "]"
*                        | <fully_specified_type> <identifier> "=" <initializer>
 */
 single_declaration
     single_declaration_nospace .or single_declaration_space;
@@ -869,11 +880,11 @@ single_declaration_6
     constant_expression .emit VARIABLE_ARRAY_EXPLICIT .or .true .emit VARIABLE_ARRAY_UNKNOWN;
 
 /*
   <fully_specified_type>              ::= <type_specifier>
                                         | <type_qualifier> <type_specifier>
                                         | <precision> <type_specifier>
                                         | <type_qualifier> <precision> <type_specifier>
-*/
* <fully_specified_type> ::= <type_specifier>
*                          | <type_qualifier> <type_specifier>
*                          | <precision> <type_specifier>
*                          | <type_qualifier> <precision> <type_specifier>
+ */
 fully_specified_type_space
     fully_specified_type_optqual .and fully_specified_type_optprec .and type_specifier_space;
 fully_specified_type_nospace
@@ -888,58 +899,58 @@ fully_specified_type_prec
     precision .and space;
 
 /*
   <type_qualifier>                    ::= "const"
                                         | "attribute" // Vertex only.
                                         | "varying"
                                         | "uniform"
                                                                                | "__fixed_output"
                                                                                | "__fixed_input"
-
-note: this is an extension to the standard language specification - normally slang disallows
     __fixed_output and __fixed_input type qualifiers
-*/
*  <type_qualifier> ::= "const"
*                     | "attribute" // Vertex only.
*                     | "varying"
*                     | "uniform"
*                     | "__fixed_output"
*                     | "__fixed_input"
+ *
+ * note: this is an extension to the standard language specification,
* normally slang disallows __fixed_output and __fixed_input type qualifiers
+ */
 type_qualifier
     "const" .emit TYPE_QUALIFIER_CONST .or
     .if (shader_type == 2) "attribute" .emit TYPE_QUALIFIER_ATTRIBUTE .or
     "varying" .emit TYPE_QUALIFIER_VARYING .or
     "uniform" .emit TYPE_QUALIFIER_UNIFORM .or
-       .if (parsing_builtin != 0) "__fixed_output" .emit TYPE_QUALIFIER_FIXEDOUTPUT .or
-       .if (parsing_builtin != 0) "__fixed_input" .emit TYPE_QUALIFIER_FIXEDINPUT;
-
-/*
   <type_specifier>                    ::= "void"
                                         | "float"
                                         | "int"
                                         | "bool"
                                         | "vec2"
                                         | "vec3"
                                         | "vec4"
                                         | "bvec2"
                                         | "bvec3"
                                         | "bvec4"
                                         | "ivec2"
                                         | "ivec3"
                                         | "ivec4"
                                         | "mat2"
                                         | "mat3"
                                         | "mat4"
                                         | "mat2x3"
                                         | "mat3x2"
                                         | "mat2x4"
                                         | "mat4x2"
                                         | "mat3x4"
                                         | "mat4x3"
                                         | "sampler1D"
                                         | "sampler2D"
                                         | "sampler3D"
                                         | "samplerCube"
                                         | "sampler1DShadow"
                                         | "sampler2DShadow"
                                        | "sampler2DRect"
                                        | "sampler2DRectShadow"
                                         | <struct_specifier>
                                         | <type_name>
-*/
+    .if (parsing_builtin != 0) "__fixed_output" .emit TYPE_QUALIFIER_FIXEDOUTPUT .or
+    .if (parsing_builtin != 0) "__fixed_input" .emit TYPE_QUALIFIER_FIXEDINPUT;
+
+/*
* <type_specifier> ::= "void"
*                    | "float"
*                    | "int"
*                    | "bool"
*                    | "vec2"
*                    | "vec3"
*                    | "vec4"
*                    | "bvec2"
*                    | "bvec3"
*                    | "bvec4"
*                    | "ivec2"
*                    | "ivec3"
*                    | "ivec4"
*                    | "mat2"
*                    | "mat3"
*                    | "mat4"
*                    | "mat2x3"
*                    | "mat3x2"
*                    | "mat2x4"
*                    | "mat4x2"
*                    | "mat3x4"
*                    | "mat4x3"
*                    | "sampler1D"
*                    | "sampler2D"
*                    | "sampler3D"
*                    | "samplerCube"
*                    | "sampler1DShadow"
*                    | "sampler2DShadow"
*                    | "sampler2DRect"
*                    | "sampler2DRectShadow"
*                    | <struct_specifier>
*                    | <type_name>
+ */
 type_specifier_space
     "void" .emit TYPE_SPECIFIER_VOID .or
     "float" .emit TYPE_SPECIFIER_FLOAT .or
@@ -976,9 +987,9 @@ type_specifier_nospace
     struct_specifier .emit TYPE_SPECIFIER_STRUCT;
 
 /*
   <struct_specifier>                  ::= "struct" <identifier> "{" <struct_declaration_list> "}"
                                         | "struct" "{" <struct_declaration_list> "}"
-*/
* <struct_specifier> ::= "struct" <identifier> "{" <struct_declaration_list> "}"
*                       | "struct" "{" <struct_declaration_list> "}"
+ */
 struct_specifier
     "struct" .and struct_specifier_1 .and optional_space .and lbrace .error LBRACE_EXPECTED .and
     struct_declaration_list .and rbrace .emit FIELD_NONE;
@@ -988,15 +999,15 @@ struct_specifier_2
     space .and identifier;
 
 /*
   <struct_declaration_list>           ::= <struct_declaration>
                                         | <struct_declaration_list> <struct_declaration>
-*/
* <struct_declaration_list> ::= <struct_declaration>
*                              | <struct_declaration_list> <struct_declaration>
+ */
 struct_declaration_list
     struct_declaration .and .loop struct_declaration .emit FIELD_NEXT;
 
 /*
   <struct_declaration>                ::= <type_specifier> <struct_declarator_list> ";"
-*/
* <struct_declaration> ::= <type_specifier> <struct_declarator_list> ";"
+ */
 struct_declaration
     struct_declaration_nospace .or struct_declaration_space;
 struct_declaration_space
@@ -1005,18 +1016,18 @@ struct_declaration_nospace
     type_specifier_nospace .and struct_declarator_list .and semicolon .emit FIELD_NONE;
 
 /*
   <struct_declarator_list>            ::= <struct_declarator>
                                         | <struct_declarator_list> "," <struct_declarator>
-*/
* <struct_declarator_list> ::= <struct_declarator>
*                             | <struct_declarator_list> "," <struct_declarator>
+ */
 struct_declarator_list
     struct_declarator .and .loop struct_declarator_list_1 .emit FIELD_NEXT;
 struct_declarator_list_1
     comma .and struct_declarator;
 
 /*
   <struct_declarator>                 ::= <identifier>
                                         | <identifier> "[" <constant_expression> "]"
-*/
* <struct_declarator> ::= <identifier>
*                       | <identifier> "[" <constant_expression> "]"
+ */
 struct_declarator
     identifier .and struct_declarator_1;
 struct_declarator_1
@@ -1025,21 +1036,21 @@ struct_declarator_2
     lbracket .and constant_expression .and rbracket;
 
 /*
   <initializer>                       ::= <assignment_expression>
-*/
* <initializer> ::= <assignment_expression>
+ */
 initializer
     assignment_expression .and .true .emit OP_END;
 
 /*
   <declaration_statement>             ::= <declaration>
-*/
* <declaration_statement> ::= <declaration>
+ */
 declaration_statement
     declaration;
 
 /*
   <statement>                         ::= <compound_statement>
                                         | <simple_statement>
-*/
* <statement> ::= <compound_statement>
*               | <simple_statement>
+ */
 statement
     compound_statement .or simple_statement;
 statement_space
@@ -1048,16 +1059,16 @@ statement_space_1
     space .and simple_statement;
 
 /*
   <simple_statement>                  ::= <__asm_statement>
                                         | <selection_statement>
                                         | <iteration_statement>
                                         | <jump_statement>
                                         | <expression_statement>
                                         | <declaration_statement>
-
-note: this is an extension to the standard language specification - normally slang disallows
     use of __asm statements
-*/
* <simple_statement> ::= <__asm_statement>
*                      | <selection_statement>
*                      | <iteration_statement>
*                      | <jump_statement>
*                      | <expression_statement>
*                      | <declaration_statement>
+ *
+ * note: this is an extension to the standard language specification.
* normally slang disallows use of __asm statements
+ */
 simple_statement
     .if (parsing_builtin != 0) __asm_statement .emit OP_ASM .or
     selection_statement .or
@@ -1068,9 +1079,9 @@ simple_statement
     declaration_statement .emit OP_DECLARE;
 
 /*
   <compound_statement>                ::= "{" "}"
                                         | "{" <statement_list> "}"
-*/
* <compound_statement> ::= "{" "}"
*                        | "{" <statement_list> "}"
+ */
 compound_statement
     compound_statement_1 .emit OP_BLOCK_BEGIN_NEW_SCOPE .and .true .emit OP_END;
 compound_statement_1
@@ -1081,16 +1092,16 @@ compound_statement_3
     lbrace .and statement_list .and rbrace;
 
 /*
   <statement_no_new_scope>            ::= <compound_statement_no_new_scope>
                                         | <simple_statement>
-*/
* <statement_no_new_scope> ::= <compound_statement_no_new_scope>
*                            | <simple_statement>
+ */
 statement_no_new_scope
     compound_statement_no_new_scope .or simple_statement;
 
 /*
   <compound_statement_no_new_scope>   ::= "{" "}"
                                         | "{" <statement_list> "}"
-*/
* <compound_statement_no_new_scope> ::= "{" "}"
*                                     | "{" <statement_list> "}"
+ */
 compound_statement_no_new_scope
     compound_statement_no_new_scope_1 .emit OP_BLOCK_BEGIN_NO_NEW_SCOPE .and .true .emit OP_END;
 compound_statement_no_new_scope_1
@@ -1101,16 +1112,16 @@ compound_statement_no_new_scope_3
     lbrace .and statement_list .and rbrace;
 
 /*
   <statement_list>                    ::= <statement>
                                         | <statement_list> <statement>
-*/
* <statement_list> ::= <statement>
*                    | <statement_list> <statement>
+ */
 statement_list
     statement .and .loop statement;
 
 /*
   <expression_statement>              ::= ";"
                                         | <expression> ";"
-*/
* <expression_statement> ::= ";"
*                          | <expression> ";"
+ */
 expression_statement
     expression_statement_1 .or expression_statement_2;
 expression_statement_1
@@ -1119,16 +1130,16 @@ expression_statement_2
     expression .and semicolon .emit OP_END;
 
 /*
   <selection_statement>               ::= "if" "(" <expression> ")" <selection_rest_statement>
-*/
* <selection_statement> ::= "if" "(" <expression> ")" <selection_rest_statement>
+ */
 selection_statement
     "if" .emit OP_IF .and lparen .error LPAREN_EXPECTED .and expression .and
     rparen .error RPAREN_EXPECTED .emit OP_END .and selection_rest_statement;
 
 /*
   <selection_rest_statement>          ::= <statement> "else" <statement>
                                         | <statement>
-*/
* <selection_rest_statement> ::= <statement> "else" <statement>
*                              | <statement>
+ */
 selection_rest_statement
     statement .and selection_rest_statement_1;
 selection_rest_statement_1
@@ -1137,11 +1148,12 @@ selection_rest_statement_2
     "else" .and optional_space .and statement;
 
 /*
-    <condition>                         ::= <expression>
-                                          | <fully_specified_type> <identifier> "=" <initializer>
-
-note: if <condition_1> is executed, the emit format must match <declaration> emit format
-*/
+ * <condition> ::= <expression>
+ *               | <fully_specified_type> <identifier> "=" <initializer>
+ *
+ * note: if <condition_1> is executed, the emit format must
+ * match <declaration> emit format
+ */
 condition
     condition_1 .emit OP_DECLARE .emit DECLARATION_INIT_DECLARATOR_LIST .or
     condition_3 .emit OP_EXPRESSION;
@@ -1158,11 +1170,11 @@ condition_3
     expression .and .true .emit OP_END;
 
 /*
   <iteration_statement>               ::= "while" "(" <condition> ")" <statement>
                                         | "do" <statement> "while" "(" <expression> ")" ";"
                                         | "for" "(" <for_init_statement> <for_rest_statement> ")"
                                           <statement_no_new_scope>
-*/
* <iteration_statement> ::= "while" "(" <condition> ")" <statement>
*                         | "do" <statement> "while" "(" <expression> ")" ";"
*                         | "for" "(" <for_init_statement> <for_rest_statement> ")"
*                            <statement_no_new_scope>
+ */
 iteration_statement
     iteration_statement_1 .or iteration_statement_2 .or iteration_statement_3;
 iteration_statement_1
@@ -1176,27 +1188,28 @@ iteration_statement_3
     for_rest_statement .and rparen .error RPAREN_EXPECTED .and statement_no_new_scope;
 
 /*
   <for_init_statement>                ::= <expression_statement>
                                         | <declaration_statement>
-*/
* <for_init_statement> ::= <expression_statement>
*                        | <declaration_statement>
+ */
 for_init_statement
     expression_statement .emit OP_EXPRESSION .or declaration_statement .emit OP_DECLARE;
 
 /*
-    <conditionopt>                      ::= <condition>
-                                          | ""
-
-note: <conditionopt> is used only by "for" statement - if <condition> is ommitted, parser
-      simulates default behaviour, that is simulates "true" expression
-*/
+ * <conditionopt> ::= <condition>
+ *                  | ""
+ *
+ * note: <conditionopt> is used only by "for" statement.
+ * if <condition> is ommitted, parser simulates default behaviour,
+ * that is simulates "true" expression
+ */
 conditionopt
     condition .or
     .true .emit OP_EXPRESSION .emit OP_PUSH_BOOL .emit 2 .emit '1' .emit '\0' .emit OP_END;
 
 /*
   <for_rest_statement>                ::= <conditionopt> ";"
                                         | <conditionopt> ";" <expression>
-*/
* <for_rest_statement> ::= <conditionopt> ";"
*                        | <conditionopt> ";" <expression>
+ */
 for_rest_statement
     conditionopt .and semicolon .and for_rest_statement_1;
 for_rest_statement_1
@@ -1205,12 +1218,12 @@ for_rest_statement_2
     expression .and .true .emit OP_END;
 
 /*
   <jump_statement>                    ::= "continue" ";"
                                         | "break" ";"
                                         | "return" ";"
                                         | "return" <expression> ";"
                                         | "discard" ";" // Fragment shader only.
-*/
* <jump_statement> ::= "continue" ";"
*                    | "break" ";"
*                    | "return" ";"
*                    | "return" <expression> ";"
*                    | "discard" ";" // Fragment shader only.
+ */
 jump_statement
     jump_statement_1 .or jump_statement_2 .or jump_statement_3 .or jump_statement_4 .or
     .if (shader_type == 1) jump_statement_5;
@@ -1226,33 +1239,33 @@ jump_statement_5
     "discard" .and semicolon .emit OP_DISCARD;
 
 /*
   <__asm_statement>                   ::= "__asm" <identifier> <asm_arguments> ";"
-
-note: this is an extension to the standard language specification - normally slang disallows
     __asm statements
-*/
* <__asm_statement> ::= "__asm" <identifier> <asm_arguments> ";"
+ *
+ * note: this is an extension to the standard language specification.
* normally slang disallows __asm statements
+ */
 __asm_statement
     "__asm" .and space .and identifier .and space .and asm_arguments .and semicolon .emit OP_END;
 
 /*
   <asm_arguments>                     ::= <asm_argument>
                                         | <asm_arguments> "," <asm_argument>
-
-note: this is an extension to the standard language specification - normally slang disallows
     __asm statements
-*/
* <asm_arguments> ::= <asm_argument>
*                   | <asm_arguments> "," <asm_argument>
+ *
+ * note: this is an extension to the standard language specification.
* normally slang disallows __asm statements
+ */
 asm_arguments
     asm_argument .and .true .emit OP_END .and .loop asm_arguments_1;
 asm_arguments_1
     comma .and asm_argument .and .true .emit OP_END;
 
 /*
   <asm_argument>                      ::= <variable_identifier>
                                         | <floatconstant>
-
-note: this is an extension to the standard language specification - normally slang disallows
     __asm statements
-*/
* <asm_argument> ::= <variable_identifier>
*                  | <floatconstant>
+ *
+ * note: this is an extension to the standard language specification.
* normally slang disallows __asm statements
+ */
 asm_argument
     var_with_field .or
     variable_identifier .or
@@ -1263,8 +1276,8 @@ var_with_field
 
 
 /*
- *  <translation_unit>                  ::= <external_declaration>
- *                                        | <translation_unit> <external_declaration>
+ * <translation_unit> ::= <external_declaration>
+ *                      | <translation_unit> <external_declaration>
  */
 translation_unit
     optional_space .emit REVISION .and external_declaration .error INVALID_EXTERNAL_DECLARATION .and
@@ -1273,8 +1286,8 @@ translation_unit
 
 
 /*
- *  <external_declaration>              ::= <function_definition>
- *                                        | <declaration>
+ * <external_declaration> ::= <function_definition>
+ *                          | <declaration>
  */
 external_declaration
     precision_stmt .emit DEFAULT_PRECISION .or
@@ -1284,15 +1297,15 @@ external_declaration
 
 
 /*
- * <precision_stmt>    ::= "precision" <precision> <prectype>
+ * <precision_stmt> ::= "precision" <precision> <prectype>
  */
 precision_stmt
     "precision" .and space .and precision .error INVALID_PRECISION .and space .and prectype .error INVALID_PRECISION_TYPE .and semicolon;
 
 /*
- * <precision>           ::= "lowp"
- *                         | "mediump"
- *                         | "highp"
+ * <precision> ::= "lowp"
+ *               | "mediump"
+ *               | "highp"
  */
 precision
     "lowp" .emit PRECISION_LOW .or
@@ -1318,20 +1331,23 @@ prectype
 
 
 /*
- * <invariant_stmt>    ::= "invariant" identifier;
+ * <invariant_stmt> ::= "invariant" identifier;
  */
 invariant_stmt
     "invariant" .and space .and identifier .and semicolon;
 
 
-
 /*
   <function_definition>               :: <function_prototype> <compound_statement_no_new_scope>
-*/
* <function_definition> :: <function_prototype> <compound_statement_no_new_scope>
+ */
 function_definition
     function_prototype .and compound_statement_no_new_scope;
 
-/* helper rulez, not part of the official language syntax */
+
+
+/*
+ * helper rules, not part of the official language syntax
+ */
 
 digit_oct
     '0'-'7';
@@ -1469,7 +1485,7 @@ cpp_style_comment_block_3
 cpp_style_comment_char
     '\x0E'-'\xFF' .or '\x01'-'\x09' .or '\x0B'-'\x0C';
 
-/* lexical rulez */
+/* lexical rules */
 
 /*ampersand
     optional_space .and '&' .and optional_space;*/
@@ -1606,7 +1622,7 @@ starequals
 /*tilde
     optional_space .and '~' .and optional_space;*/
 
-/* string rulez - these are used internally by the parser when parsing quoted strings */
+/* string rules - these are used internally by the parser when parsing quoted strings */
 
 .string string_lexer;
 
@@ -1619,7 +1635,7 @@ lex_first_identifier_character
 lex_next_identifier_character
     'a'-'z' .or 'A'-'Z' .or '0'-'9' .or '_';
 
-/* error rulez - these are used by error messages */
+/* error rules - these are used by error messages */
 
 err_token
     '~' .or '`' .or '!' .or '@' .or '#' .or '$' .or '%' .or '^' .or '&' .or '*' .or '(' .or ')' .or
index 6457bb69bd44b9a9e462a9818ababae52b722b2b..abd8d8fb45635ec9a4af9f6b67a1a7725f070043 100644 (file)
 " .if (shader_type == 2) \"attribute\" .emit TYPE_QUALIFIER_ATTRIBUTE .or\n"
 " \"varying\" .emit TYPE_QUALIFIER_VARYING .or\n"
 " \"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"
+" .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_space\n"
 " \"void\" .emit TYPE_SPECIFIER_VOID .or\n"
 " \"float\" .emit TYPE_SPECIFIER_FLOAT .or\n"