@galacean/engine-shaderlab 1.4.0-alpha.3 → 1.4.0-beta.1

package/dist/module.js

@@ -540,7 +540,7 @@ var ETokenType = /*#__PURE__*/ function(ETokenType) {
     /** , */ ETokenType[ETokenType["COMMA"] = 1032] = "COMMA";
     ETokenType[ETokenType["COLON"] = 1033] = "COLON";
     /** = */ ETokenType[ETokenType["EQUAL"] = 1034] = "EQUAL";
-    ETokenType[ETokenType["SEMICOLON"] = 1035] = "SEMICOLON";
+    /** ; */ ETokenType[ETokenType["SEMICOLON"] = 1035] = "SEMICOLON";
     /** ! */ ETokenType[ETokenType["BANG"] = 1036] = "BANG";
     /** \- */ ETokenType[ETokenType["DASH"] = 1037] = "DASH";
     /** ~ */ ETokenType[ETokenType["TILDE"] = 1038] = "TILDE";
@@ -637,7 +637,8 @@ var LexerUtils = /*#__PURE__*/ function() {
     };
     LexerUtils.isSpace = function isSpace(charCode) {
         return charCode === 9 || // Tab
-        charCode === 10 || // Line break
+        charCode === 10 || // Line break - /n
+        charCode === 13 || // Carriage return -/r
         charCode === 32 // Space
         ;
     };
@@ -710,7 +711,11 @@ var BaseScanner = /*#__PURE__*/ function() {
             var start = this.getCurPosition();
             this.advance(2);
             // single line comments
-            while(this.getCurChar() !== "\n")this._advance();
+            var curChar = this.getCurChar();
+            while(curChar !== "\n" && curChar !== "\r" && !this.isEnd()){
+                this._advance();
+                curChar = this.getCurChar();
+            }
             this.skipCommentsAndSpace();
             return ShaderLab.createRange(start, this.getCurPosition());
         } else if (this.peek(2) === "/*") {
@@ -820,7 +825,8 @@ var BaseScanner = /*#__PURE__*/ function() {
 BaseScanner._spaceCharsWithBreak = [
     " ",
     "\t",
-    "\n"
+    "\n",
+    "\r"
 ];
 BaseScanner._spaceChars = [
     " ",
@@ -1412,101 +1418,103 @@ var NoneTerminal = /*#__PURE__*/ function(NoneTerminal) {
     // glsl
     NoneTerminal[NoneTerminal["global_declaration"] = 2002] = "global_declaration";
     NoneTerminal[NoneTerminal["variable_declaration"] = 2003] = "variable_declaration";
-    NoneTerminal[NoneTerminal["array_specifier_list"] = 2004] = "array_specifier_list";
-    NoneTerminal[NoneTerminal["array_specifier"] = 2005] = "array_specifier";
-    NoneTerminal[NoneTerminal["ext_builtin_type_specifier_nonarray"] = 2006] = "ext_builtin_type_specifier_nonarray";
-    NoneTerminal[NoneTerminal["precision_specifier"] = 2007] = "precision_specifier";
-    NoneTerminal[NoneTerminal["variable_identifier"] = 2008] = "variable_identifier";
-    NoneTerminal[NoneTerminal["variable_identifier_node"] = 2009] = "variable_identifier_node";
-    NoneTerminal[NoneTerminal["primary_expression"] = 2010] = "primary_expression";
-    NoneTerminal[NoneTerminal["postfix_expression"] = 2011] = "postfix_expression";
-    NoneTerminal[NoneTerminal["integer_expression"] = 2012] = "integer_expression";
-    NoneTerminal[NoneTerminal["function_call"] = 2013] = "function_call";
-    NoneTerminal[NoneTerminal["function_call_generic"] = 2014] = "function_call_generic";
-    NoneTerminal[NoneTerminal["function_call_header_no_parameters"] = 2015] = "function_call_header_no_parameters";
-    NoneTerminal[NoneTerminal["function_call_header_with_parameters"] = 2016] = "function_call_header_with_parameters";
-    NoneTerminal[NoneTerminal["function_call_parameter_list"] = 2017] = "function_call_parameter_list";
-    NoneTerminal[NoneTerminal["function_call_header"] = 2018] = "function_call_header";
-    NoneTerminal[NoneTerminal["function_identifier"] = 2019] = "function_identifier";
-    NoneTerminal[NoneTerminal["constructor_identifier"] = 2020] = "constructor_identifier";
-    NoneTerminal[NoneTerminal["unary_expression"] = 2021] = "unary_expression";
-    NoneTerminal[NoneTerminal["unary_operator"] = 2022] = "unary_operator";
-    NoneTerminal[NoneTerminal["multiplicative_expression"] = 2023] = "multiplicative_expression";
-    NoneTerminal[NoneTerminal["additive_expression"] = 2024] = "additive_expression";
-    NoneTerminal[NoneTerminal["shift_expression"] = 2025] = "shift_expression";
-    NoneTerminal[NoneTerminal["relational_expression"] = 2026] = "relational_expression";
-    NoneTerminal[NoneTerminal["equality_expression"] = 2027] = "equality_expression";
-    NoneTerminal[NoneTerminal["and_expression"] = 2028] = "and_expression";
-    NoneTerminal[NoneTerminal["inclusive_or_expression"] = 2029] = "inclusive_or_expression";
-    NoneTerminal[NoneTerminal["exclusive_or_expression"] = 2030] = "exclusive_or_expression";
-    NoneTerminal[NoneTerminal["logical_and_expression"] = 2031] = "logical_and_expression";
-    NoneTerminal[NoneTerminal["logical_xor_expression"] = 2032] = "logical_xor_expression";
-    NoneTerminal[NoneTerminal["logical_or_expression"] = 2033] = "logical_or_expression";
-    NoneTerminal[NoneTerminal["conditional_expression"] = 2034] = "conditional_expression";
-    NoneTerminal[NoneTerminal["assignment_expression"] = 2035] = "assignment_expression";
-    NoneTerminal[NoneTerminal["assignment_operator"] = 2036] = "assignment_operator";
-    NoneTerminal[NoneTerminal["expression"] = 2037] = "expression";
-    NoneTerminal[NoneTerminal["integer_constant_expression"] = 2038] = "integer_constant_expression";
-    NoneTerminal[NoneTerminal["integer_constant_expression_operator"] = 2039] = "integer_constant_expression_operator";
-    NoneTerminal[NoneTerminal["declaration"] = 2040] = "declaration";
-    NoneTerminal[NoneTerminal["function_prototype"] = 2041] = "function_prototype";
-    NoneTerminal[NoneTerminal["function_declarator"] = 2042] = "function_declarator";
-    NoneTerminal[NoneTerminal["function_header_with_parameters"] = 2043] = "function_header_with_parameters";
-    NoneTerminal[NoneTerminal["function_header"] = 2044] = "function_header";
-    NoneTerminal[NoneTerminal["function_parameter_list"] = 2045] = "function_parameter_list";
-    NoneTerminal[NoneTerminal["parameter_declarator"] = 2046] = "parameter_declarator";
-    NoneTerminal[NoneTerminal["parameter_declaration"] = 2047] = "parameter_declaration";
-    NoneTerminal[NoneTerminal["parameter_qualifier"] = 2048] = "parameter_qualifier";
-    NoneTerminal[NoneTerminal["parameter_type_specifier"] = 2049] = "parameter_type_specifier";
-    NoneTerminal[NoneTerminal["init_declarator_list"] = 2050] = "init_declarator_list";
-    NoneTerminal[NoneTerminal["single_declaration"] = 2051] = "single_declaration";
-    NoneTerminal[NoneTerminal["fully_specified_type"] = 2052] = "fully_specified_type";
-    NoneTerminal[NoneTerminal["type_qualifier"] = 2053] = "type_qualifier";
-    NoneTerminal[NoneTerminal["single_type_qualifier"] = 2054] = "single_type_qualifier";
-    NoneTerminal[NoneTerminal["storage_qualifier"] = 2055] = "storage_qualifier";
-    NoneTerminal[NoneTerminal["precision_qualifier"] = 2056] = "precision_qualifier";
-    NoneTerminal[NoneTerminal["interpolation_qualifier"] = 2057] = "interpolation_qualifier";
-    NoneTerminal[NoneTerminal["invariant_qualifier"] = 2058] = "invariant_qualifier";
-    NoneTerminal[NoneTerminal["type_specifier"] = 2059] = "type_specifier";
-    NoneTerminal[NoneTerminal["type_specifier_nonarray"] = 2060] = "type_specifier_nonarray";
-    NoneTerminal[NoneTerminal["type_specifier_no_prec"] = 2061] = "type_specifier_no_prec";
-    NoneTerminal[NoneTerminal["basic_type"] = 2062] = "basic_type";
-    NoneTerminal[NoneTerminal["struct_specifier"] = 2063] = "struct_specifier";
-    NoneTerminal[NoneTerminal["struct_declaration_list"] = 2064] = "struct_declaration_list";
-    NoneTerminal[NoneTerminal["struct_declaration"] = 2065] = "struct_declaration";
-    NoneTerminal[NoneTerminal["layout_qualifier"] = 2066] = "layout_qualifier";
-    NoneTerminal[NoneTerminal["struct_declarator_list"] = 2067] = "struct_declarator_list";
-    NoneTerminal[NoneTerminal["struct_declarator"] = 2068] = "struct_declarator";
-    NoneTerminal[NoneTerminal["identifier_list"] = 2069] = "identifier_list";
-    NoneTerminal[NoneTerminal["decl_identifier"] = 2070] = "decl_identifier";
-    NoneTerminal[NoneTerminal["initializer"] = 2071] = "initializer";
-    NoneTerminal[NoneTerminal["initializer_list"] = 2072] = "initializer_list";
-    NoneTerminal[NoneTerminal["declaration_statement"] = 2073] = "declaration_statement";
-    NoneTerminal[NoneTerminal["simple_statement"] = 2074] = "simple_statement";
-    NoneTerminal[NoneTerminal["compound_statement_no_scope"] = 2075] = "compound_statement_no_scope";
-    NoneTerminal[NoneTerminal["statement_with_scope"] = 2076] = "statement_with_scope";
-    NoneTerminal[NoneTerminal["compound_statement"] = 2077] = "compound_statement";
-    NoneTerminal[NoneTerminal["statement"] = 2078] = "statement";
-    NoneTerminal[NoneTerminal["statement_list"] = 2079] = "statement_list";
-    NoneTerminal[NoneTerminal["iteration_statement_no_new_scope"] = 2080] = "iteration_statement_no_new_scope";
-    NoneTerminal[NoneTerminal["expression_statement"] = 2081] = "expression_statement";
-    NoneTerminal[NoneTerminal["selection_statement"] = 2082] = "selection_statement";
-    NoneTerminal[NoneTerminal["selection_rest_statement"] = 2083] = "selection_rest_statement";
-    NoneTerminal[NoneTerminal["condition"] = 2084] = "condition";
-    NoneTerminal[NoneTerminal["conditionopt"] = 2085] = "conditionopt";
-    NoneTerminal[NoneTerminal["iteration_statement"] = 2086] = "iteration_statement";
-    NoneTerminal[NoneTerminal["for_init_statement"] = 2087] = "for_init_statement";
-    NoneTerminal[NoneTerminal["for_rest_statement"] = 2088] = "for_rest_statement";
-    NoneTerminal[NoneTerminal["jump_statement"] = 2089] = "jump_statement";
-    NoneTerminal[NoneTerminal["external_declaration"] = 2090] = "external_declaration";
-    NoneTerminal[NoneTerminal["function_definition"] = 2091] = "function_definition";
-    NoneTerminal[NoneTerminal["field_selection"] = 2092] = "field_selection";
-    NoneTerminal[NoneTerminal["bool_constant"] = 2093] = "bool_constant";
-    NoneTerminal[NoneTerminal["function_identifier_node"] = 2094] = "function_identifier_node";
-    NoneTerminal[NoneTerminal["typename_identifier_node"] = 2095] = "typename_identifier_node";
-    NoneTerminal[NoneTerminal["scope_brace"] = 2096] = "scope_brace";
-    NoneTerminal[NoneTerminal["scope_end_brace"] = 2097] = "scope_end_brace";
-    NoneTerminal[NoneTerminal["_ignore"] = 2098] = "_ignore";
+    NoneTerminal[NoneTerminal["variable_declaration_list"] = 2004] = "variable_declaration_list";
+    NoneTerminal[NoneTerminal["variable_declaration_statement"] = 2005] = "variable_declaration_statement";
+    NoneTerminal[NoneTerminal["array_specifier_list"] = 2006] = "array_specifier_list";
+    NoneTerminal[NoneTerminal["array_specifier"] = 2007] = "array_specifier";
+    NoneTerminal[NoneTerminal["ext_builtin_type_specifier_nonarray"] = 2008] = "ext_builtin_type_specifier_nonarray";
+    NoneTerminal[NoneTerminal["precision_specifier"] = 2009] = "precision_specifier";
+    NoneTerminal[NoneTerminal["variable_identifier"] = 2010] = "variable_identifier";
+    NoneTerminal[NoneTerminal["variable_identifier_node"] = 2011] = "variable_identifier_node";
+    NoneTerminal[NoneTerminal["primary_expression"] = 2012] = "primary_expression";
+    NoneTerminal[NoneTerminal["postfix_expression"] = 2013] = "postfix_expression";
+    NoneTerminal[NoneTerminal["integer_expression"] = 2014] = "integer_expression";
+    NoneTerminal[NoneTerminal["function_call"] = 2015] = "function_call";
+    NoneTerminal[NoneTerminal["function_call_generic"] = 2016] = "function_call_generic";
+    NoneTerminal[NoneTerminal["function_call_header_no_parameters"] = 2017] = "function_call_header_no_parameters";
+    NoneTerminal[NoneTerminal["function_call_header_with_parameters"] = 2018] = "function_call_header_with_parameters";
+    NoneTerminal[NoneTerminal["function_call_parameter_list"] = 2019] = "function_call_parameter_list";
+    NoneTerminal[NoneTerminal["function_call_header"] = 2020] = "function_call_header";
+    NoneTerminal[NoneTerminal["function_identifier"] = 2021] = "function_identifier";
+    NoneTerminal[NoneTerminal["constructor_identifier"] = 2022] = "constructor_identifier";
+    NoneTerminal[NoneTerminal["unary_expression"] = 2023] = "unary_expression";
+    NoneTerminal[NoneTerminal["unary_operator"] = 2024] = "unary_operator";
+    NoneTerminal[NoneTerminal["multiplicative_expression"] = 2025] = "multiplicative_expression";
+    NoneTerminal[NoneTerminal["additive_expression"] = 2026] = "additive_expression";
+    NoneTerminal[NoneTerminal["shift_expression"] = 2027] = "shift_expression";
+    NoneTerminal[NoneTerminal["relational_expression"] = 2028] = "relational_expression";
+    NoneTerminal[NoneTerminal["equality_expression"] = 2029] = "equality_expression";
+    NoneTerminal[NoneTerminal["and_expression"] = 2030] = "and_expression";
+    NoneTerminal[NoneTerminal["inclusive_or_expression"] = 2031] = "inclusive_or_expression";
+    NoneTerminal[NoneTerminal["exclusive_or_expression"] = 2032] = "exclusive_or_expression";
+    NoneTerminal[NoneTerminal["logical_and_expression"] = 2033] = "logical_and_expression";
+    NoneTerminal[NoneTerminal["logical_xor_expression"] = 2034] = "logical_xor_expression";
+    NoneTerminal[NoneTerminal["logical_or_expression"] = 2035] = "logical_or_expression";
+    NoneTerminal[NoneTerminal["conditional_expression"] = 2036] = "conditional_expression";
+    NoneTerminal[NoneTerminal["assignment_expression"] = 2037] = "assignment_expression";
+    NoneTerminal[NoneTerminal["assignment_operator"] = 2038] = "assignment_operator";
+    NoneTerminal[NoneTerminal["expression"] = 2039] = "expression";
+    NoneTerminal[NoneTerminal["integer_constant_expression"] = 2040] = "integer_constant_expression";
+    NoneTerminal[NoneTerminal["integer_constant_expression_operator"] = 2041] = "integer_constant_expression_operator";
+    NoneTerminal[NoneTerminal["declaration"] = 2042] = "declaration";
+    NoneTerminal[NoneTerminal["function_prototype"] = 2043] = "function_prototype";
+    NoneTerminal[NoneTerminal["function_declarator"] = 2044] = "function_declarator";
+    NoneTerminal[NoneTerminal["function_header_with_parameters"] = 2045] = "function_header_with_parameters";
+    NoneTerminal[NoneTerminal["function_header"] = 2046] = "function_header";
+    NoneTerminal[NoneTerminal["function_parameter_list"] = 2047] = "function_parameter_list";
+    NoneTerminal[NoneTerminal["parameter_declarator"] = 2048] = "parameter_declarator";
+    NoneTerminal[NoneTerminal["parameter_declaration"] = 2049] = "parameter_declaration";
+    NoneTerminal[NoneTerminal["parameter_qualifier"] = 2050] = "parameter_qualifier";
+    NoneTerminal[NoneTerminal["parameter_type_specifier"] = 2051] = "parameter_type_specifier";
+    NoneTerminal[NoneTerminal["init_declarator_list"] = 2052] = "init_declarator_list";
+    NoneTerminal[NoneTerminal["single_declaration"] = 2053] = "single_declaration";
+    NoneTerminal[NoneTerminal["fully_specified_type"] = 2054] = "fully_specified_type";
+    NoneTerminal[NoneTerminal["type_qualifier"] = 2055] = "type_qualifier";
+    NoneTerminal[NoneTerminal["single_type_qualifier"] = 2056] = "single_type_qualifier";
+    NoneTerminal[NoneTerminal["storage_qualifier"] = 2057] = "storage_qualifier";
+    NoneTerminal[NoneTerminal["precision_qualifier"] = 2058] = "precision_qualifier";
+    NoneTerminal[NoneTerminal["interpolation_qualifier"] = 2059] = "interpolation_qualifier";
+    NoneTerminal[NoneTerminal["invariant_qualifier"] = 2060] = "invariant_qualifier";
+    NoneTerminal[NoneTerminal["type_specifier"] = 2061] = "type_specifier";
+    NoneTerminal[NoneTerminal["type_specifier_nonarray"] = 2062] = "type_specifier_nonarray";
+    NoneTerminal[NoneTerminal["type_specifier_no_prec"] = 2063] = "type_specifier_no_prec";
+    NoneTerminal[NoneTerminal["basic_type"] = 2064] = "basic_type";
+    NoneTerminal[NoneTerminal["struct_specifier"] = 2065] = "struct_specifier";
+    NoneTerminal[NoneTerminal["struct_declaration_list"] = 2066] = "struct_declaration_list";
+    NoneTerminal[NoneTerminal["struct_declaration"] = 2067] = "struct_declaration";
+    NoneTerminal[NoneTerminal["layout_qualifier"] = 2068] = "layout_qualifier";
+    NoneTerminal[NoneTerminal["struct_declarator_list"] = 2069] = "struct_declarator_list";
+    NoneTerminal[NoneTerminal["struct_declarator"] = 2070] = "struct_declarator";
+    NoneTerminal[NoneTerminal["identifier_list"] = 2071] = "identifier_list";
+    NoneTerminal[NoneTerminal["decl_identifier"] = 2072] = "decl_identifier";
+    NoneTerminal[NoneTerminal["initializer"] = 2073] = "initializer";
+    NoneTerminal[NoneTerminal["initializer_list"] = 2074] = "initializer_list";
+    NoneTerminal[NoneTerminal["declaration_statement"] = 2075] = "declaration_statement";
+    NoneTerminal[NoneTerminal["simple_statement"] = 2076] = "simple_statement";
+    NoneTerminal[NoneTerminal["compound_statement_no_scope"] = 2077] = "compound_statement_no_scope";
+    NoneTerminal[NoneTerminal["statement_with_scope"] = 2078] = "statement_with_scope";
+    NoneTerminal[NoneTerminal["compound_statement"] = 2079] = "compound_statement";
+    NoneTerminal[NoneTerminal["statement"] = 2080] = "statement";
+    NoneTerminal[NoneTerminal["statement_list"] = 2081] = "statement_list";
+    NoneTerminal[NoneTerminal["iteration_statement_no_new_scope"] = 2082] = "iteration_statement_no_new_scope";
+    NoneTerminal[NoneTerminal["expression_statement"] = 2083] = "expression_statement";
+    NoneTerminal[NoneTerminal["selection_statement"] = 2084] = "selection_statement";
+    NoneTerminal[NoneTerminal["selection_rest_statement"] = 2085] = "selection_rest_statement";
+    NoneTerminal[NoneTerminal["condition"] = 2086] = "condition";
+    NoneTerminal[NoneTerminal["conditionopt"] = 2087] = "conditionopt";
+    NoneTerminal[NoneTerminal["iteration_statement"] = 2088] = "iteration_statement";
+    NoneTerminal[NoneTerminal["for_init_statement"] = 2089] = "for_init_statement";
+    NoneTerminal[NoneTerminal["for_rest_statement"] = 2090] = "for_rest_statement";
+    NoneTerminal[NoneTerminal["jump_statement"] = 2091] = "jump_statement";
+    NoneTerminal[NoneTerminal["external_declaration"] = 2092] = "external_declaration";
+    NoneTerminal[NoneTerminal["function_definition"] = 2093] = "function_definition";
+    NoneTerminal[NoneTerminal["field_selection"] = 2094] = "field_selection";
+    NoneTerminal[NoneTerminal["bool_constant"] = 2095] = "bool_constant";
+    NoneTerminal[NoneTerminal["function_identifier_node"] = 2096] = "function_identifier_node";
+    NoneTerminal[NoneTerminal["typename_identifier_node"] = 2097] = "typename_identifier_node";
+    NoneTerminal[NoneTerminal["scope_brace"] = 2098] = "scope_brace";
+    NoneTerminal[NoneTerminal["scope_end_brace"] = 2099] = "scope_end_brace";
+    NoneTerminal[NoneTerminal["_ignore"] = 2100] = "_ignore";
     return NoneTerminal;
 }({});
 
@@ -1581,7 +1589,9 @@ var TreeNode = /*#__PURE__*/ function() {
     _proto.codeGen = function codeGen(visitor) {
         return visitor.defaultCodeGen(this.children);
     };
-    _proto.semanticAnalyze = function semanticAnalyze(sa) {};
+    /**
+   * Do semantic analyze right after the ast node is generated.
+   */ _proto.semanticAnalyze = function semanticAnalyze(sa) {};
     _create_class(TreeNode, [
         {
             key: "children",
@@ -1712,19 +1722,23 @@ var TreeNode = /*#__PURE__*/ function() {
             this.arraySpecifier = undefined;
         };
         _proto.semanticAnalyze = function semanticAnalyze(sa) {
-            var fullyType = this.children[0];
-            var id = this.children[1];
-            this.typeSpecifier = fullyType.typeSpecifier;
+            var children = this.children;
+            var childrenLen = children.length;
+            var fullyType = children[0];
+            var typeSpecifier = fullyType.typeSpecifier;
+            this.typeSpecifier = typeSpecifier;
+            this.arraySpecifier = typeSpecifier.arraySpecifier;
+            var id = children[1];
             var sm;
-            if (this.children.length === 2 || this.children.length === 4) {
-                var symbolType = new SymbolType(fullyType.type, fullyType.typeSpecifier.lexeme);
-                var initializer = this.children[3];
+            if (childrenLen === 2 || childrenLen === 4) {
+                var symbolType = new SymbolType(fullyType.type, typeSpecifier.lexeme, this.arraySpecifier);
+                var initializer = children[3];
                 sm = new VarSymbol(id.lexeme, symbolType, false, initializer);
             } else {
-                var arraySpecifier = this.children[2];
+                var arraySpecifier = children[2];
                 this.arraySpecifier = arraySpecifier;
-                var symbolType1 = new SymbolType(fullyType.type, fullyType.typeSpecifier.lexeme, arraySpecifier);
-                var initializer1 = this.children[4];
+                var symbolType1 = new SymbolType(fullyType.type, typeSpecifier.lexeme, this.arraySpecifier);
+                var initializer1 = children[4];
                 sm = new VarSymbol(id.lexeme, symbolType1, false, initializer1);
             }
             sa.symbolTableStack.insert(sm);
@@ -1841,6 +1855,12 @@ var TreeNode = /*#__PURE__*/ function() {
                     return (_this_children = this.children) == null ? void 0 : (_this_children_ = _this_children[1]) == null ? void 0 : _this_children_.size;
                 }
             },
+            {
+                key: "arraySpecifier",
+                get: function get() {
+                    return this.children[1];
+                }
+            },
             {
                 key: "isCustom",
                 get: function get() {
@@ -2853,14 +2873,15 @@ var TreeNode = /*#__PURE__*/ function() {
         }
         var _proto = VariableDeclaration.prototype;
         _proto.semanticAnalyze = function semanticAnalyze(sa) {
-            var type = this.children[0];
-            var ident = this.children[1];
-            var sm;
-            sm = new VarSymbol(ident.lexeme, new SymbolType(type.type, type.typeSpecifier.lexeme), true, this);
+            var children = this.children;
+            var type = children[0];
+            var ident = children[1];
+            this.type = type;
+            var sm = new VarSymbol(ident.lexeme, new SymbolType(type.type, type.typeSpecifier.lexeme), true, this);
             sa.symbolTableStack.insert(sm);
         };
         _proto.codeGen = function codeGen(visitor) {
-            return visitor.visitGlobalVariableDeclaration(this);
+            return visitor.visitGlobalVariableDeclaration(this) + ";";
         };
         return VariableDeclaration;
     }(TreeNode);
@@ -2868,6 +2889,45 @@ var TreeNode = /*#__PURE__*/ function() {
     VariableDeclaration = __decorate([
         ASTNodeDecorator(NoneTerminal.variable_declaration)
     ], VariableDeclaration);
+    var VariableDeclarationList = /*#__PURE__*/ function(TreeNode) {
+        _inherits(VariableDeclarationList, TreeNode);
+        function VariableDeclarationList() {
+            return TreeNode.apply(this, arguments) || this;
+        }
+        var _proto = VariableDeclarationList.prototype;
+        _proto.semanticAnalyze = function semanticAnalyze(sa) {
+            var children = this.children;
+            var length = children.length;
+            var variableDeclaration = children[0];
+            var type = variableDeclaration.type;
+            this.type = type;
+            if (length === 1) {
+                return;
+            }
+            var ident = children[2];
+            var newVariable = VariableDeclaration.pool.get();
+            if (length === 3) {
+                // variable_declaration_list ',' id
+                newVariable.set(ident.location, [
+                    type,
+                    ident
+                ]);
+            } else {
+                // variable_declaration_list ',' id array_specifier
+                newVariable.set(ident.location, [
+                    type,
+                    ident,
+                    children[3]
+                ]);
+            }
+            newVariable.semanticAnalyze(sa);
+        };
+        return VariableDeclarationList;
+    }(TreeNode);
+    ASTNode.VariableDeclarationList = VariableDeclarationList;
+    VariableDeclarationList = __decorate([
+        ASTNodeDecorator(NoneTerminal.variable_declaration_list)
+    ], VariableDeclarationList);
     var VariableIdentifier = /*#__PURE__*/ function(TreeNode) {
         _inherits(VariableIdentifier, TreeNode);
         function VariableIdentifier() {
@@ -2989,7 +3049,7 @@ var productionAndRules = [].concat(GrammarUtils.createProductionWithOptions(None
         NoneTerminal.precision_specifier
     ],
     [
-        NoneTerminal.variable_declaration
+        NoneTerminal.variable_declaration_statement
     ],
     [
         NoneTerminal.struct_specifier
@@ -2999,22 +3059,35 @@ var productionAndRules = [].concat(GrammarUtils.createProductionWithOptions(None
     ]
 ]), GrammarUtils.createProductionWithOptions(NoneTerminal.variable_declaration, [
     [
-        EKeyword.GS_RenderQueueType,
-        ETokenType.ID,
-        ETokenType.SEMICOLON
+        NoneTerminal.fully_specified_type,
+        ETokenType.ID
     ],
     [
         NoneTerminal.fully_specified_type,
         ETokenType.ID,
-        ETokenType.SEMICOLON
+        NoneTerminal.array_specifier
+    ]
+], ASTNode.VariableDeclaration.pool), GrammarUtils.createProductionWithOptions(NoneTerminal.variable_declaration_list, [
+    [
+        NoneTerminal.variable_declaration
     ],
     [
-        NoneTerminal.fully_specified_type,
+        NoneTerminal.variable_declaration_list,
+        ETokenType.COMMA,
+        ETokenType.ID
+    ],
+    [
+        NoneTerminal.variable_declaration_list,
+        ETokenType.COMMA,
         ETokenType.ID,
-        NoneTerminal.array_specifier,
+        NoneTerminal.array_specifier
+    ]
+], ASTNode.VariableDeclarationList.pool), GrammarUtils.createProductionWithOptions(NoneTerminal.variable_declaration_statement, [
+    [
+        NoneTerminal.variable_declaration_list,
         ETokenType.SEMICOLON
     ]
-], ASTNode.VariableDeclaration.pool), GrammarUtils.createProductionWithOptions(NoneTerminal.ext_builtin_type_specifier_nonarray, [
+]), GrammarUtils.createProductionWithOptions(NoneTerminal.ext_builtin_type_specifier_nonarray, [
     [
         EKeyword.VOID
     ],
@@ -5180,7 +5253,7 @@ var PpScanner = /*#__PURE__*/ function(BaseScanner) {
                 return !!this._definedMacros.get(macro.lexeme);
             } else {
                 var macro1 = this._definedMacros.get(id.lexeme);
-                if (!macro1) {
+                if (!macro1 || !macro1.body) {
                     return false;
                 }
                 if (macro1.isFunction) {
@@ -6725,7 +6798,7 @@ ShaderLab._shaderPositionPool = ShaderLabUtils.createObjectPool(ShaderPosition);
 ShaderLab._shaderRangePool = ShaderLabUtils.createObjectPool(ShaderRange);
 
 //@ts-ignore
-var version = "1.4.0-alpha.3";
+var version = "1.4.0-beta.1";
 var mode = "Release";
 console.log("Galacean ShaderLab version: " + version + ". mode: " + mode);