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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galacean/engine-shaderlab",
-  "version": "1.4.0-alpha.3",
+  "version": "1.4.0-beta.1",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"
@@ -26,11 +26,11 @@
     "verbose/package.json"
   ],
   "devDependencies": {
-    "@galacean/engine": "1.4.0-alpha.3",
-    "@galacean/engine-design": "1.4.0-alpha.3"
+    "@galacean/engine-design": "1.4.0-beta.1",
+    "@galacean/engine": "1.4.0-beta.1"
   },
   "peerDependencies": {
-    "@galacean/engine": "1.4.0-alpha.3"
+    "@galacean/engine": "1.4.0-beta.1"
   },
   "scripts": {
     "b:types": "tsc"

package/types/common/types.d.ts

@@ -66,6 +66,7 @@ export declare enum ETokenType {
     COLON = 1033,
     /** = */
     EQUAL = 1034,
+    /** ; */
     SEMICOLON = 1035,
     /** ! */
     BANG = 1036,

package/types/lexer/Utils.d.ts

@@ -3,5 +3,5 @@ export default class LexerUtils {
     static isLetter(charCode: number): boolean;
     static isAlpha(charCode: number): boolean;
     static isPpCharactors(charCode: number): boolean;
-    static isSpace(charCode: number): charCode is 9 | 10 | 32;
+    static isSpace(charCode: number): charCode is 9 | 10 | 13 | 32;
 }

package/types/parser/AST.d.ts

@@ -22,6 +22,9 @@ export declare abstract class TreeNode implements IPoolElement {
     init(): void;
     dispose(): void;
     codeGen(visitor: CodeGenVisitor): string;
+    /**
+     * Do semantic analyze right after the ast node is generated.
+     */
     semanticAnalyze(sa: SematicAnalyzer): void;
 }
 export declare namespace ASTNode {
@@ -107,6 +110,7 @@ export declare namespace ASTNode {
         get type(): GalaceanDataType;
         get lexeme(): string;
         get arraySize(): number;
+        get arraySpecifier(): ArraySpecifier;
         get isCustom(): boolean;
     }
     export class ArraySpecifier extends TreeNode {
@@ -304,9 +308,14 @@ export declare namespace ASTNode {
         get arraySpecifier(): ArraySpecifier | undefined;
     }
     export class VariableDeclaration extends TreeNode {
+        type: FullySpecifiedType;
         semanticAnalyze(sa: SematicAnalyzer): void;
         codeGen(visitor: CodeGenVisitor): string;
     }
+    export class VariableDeclarationList extends TreeNode {
+        type: FullySpecifiedType;
+        semanticAnalyze(sa: SematicAnalyzer): void;
+    }
     export class VariableIdentifier extends TreeNode {
         symbolInfo: VarSymbol | BuiltinVariable | null;
         get lexeme(): string;

package/types/parser/GrammarSymbol.d.ts

@@ -5,101 +5,103 @@ export declare enum NoneTerminal {
     gs_shader_program = 2001,
     global_declaration = 2002,
     variable_declaration = 2003,
-    array_specifier_list = 2004,
-    array_specifier = 2005,
-    ext_builtin_type_specifier_nonarray = 2006,
-    precision_specifier = 2007,
-    variable_identifier = 2008,
-    variable_identifier_node = 2009,
-    primary_expression = 2010,
-    postfix_expression = 2011,
-    integer_expression = 2012,
-    function_call = 2013,
-    function_call_generic = 2014,
-    function_call_header_no_parameters = 2015,
-    function_call_header_with_parameters = 2016,
-    function_call_parameter_list = 2017,
-    function_call_header = 2018,
-    function_identifier = 2019,
-    constructor_identifier = 2020,
-    unary_expression = 2021,
-    unary_operator = 2022,
-    multiplicative_expression = 2023,
-    additive_expression = 2024,
-    shift_expression = 2025,
-    relational_expression = 2026,
-    equality_expression = 2027,
-    and_expression = 2028,
-    inclusive_or_expression = 2029,
-    exclusive_or_expression = 2030,
-    logical_and_expression = 2031,
-    logical_xor_expression = 2032,
-    logical_or_expression = 2033,
-    conditional_expression = 2034,
-    assignment_expression = 2035,
-    assignment_operator = 2036,
-    expression = 2037,
-    integer_constant_expression = 2038,
-    integer_constant_expression_operator = 2039,
-    declaration = 2040,
-    function_prototype = 2041,
-    function_declarator = 2042,
-    function_header_with_parameters = 2043,
-    function_header = 2044,
-    function_parameter_list = 2045,
-    parameter_declarator = 2046,
-    parameter_declaration = 2047,
-    parameter_qualifier = 2048,
-    parameter_type_specifier = 2049,
-    init_declarator_list = 2050,
-    single_declaration = 2051,
-    fully_specified_type = 2052,
-    type_qualifier = 2053,
-    single_type_qualifier = 2054,
-    storage_qualifier = 2055,
-    precision_qualifier = 2056,
-    interpolation_qualifier = 2057,
-    invariant_qualifier = 2058,
-    type_specifier = 2059,
-    type_specifier_nonarray = 2060,
-    type_specifier_no_prec = 2061,
-    basic_type = 2062,
-    struct_specifier = 2063,
-    struct_declaration_list = 2064,
-    struct_declaration = 2065,
-    layout_qualifier = 2066,
-    struct_declarator_list = 2067,
-    struct_declarator = 2068,
-    identifier_list = 2069,
-    decl_identifier = 2070,
-    initializer = 2071,
-    initializer_list = 2072,
-    declaration_statement = 2073,
-    simple_statement = 2074,
-    compound_statement_no_scope = 2075,
-    statement_with_scope = 2076,
-    compound_statement = 2077,
-    statement = 2078,
-    statement_list = 2079,
-    iteration_statement_no_new_scope = 2080,
-    expression_statement = 2081,
-    selection_statement = 2082,
-    selection_rest_statement = 2083,
-    condition = 2084,
-    conditionopt = 2085,
-    iteration_statement = 2086,
-    for_init_statement = 2087,
-    for_rest_statement = 2088,
-    jump_statement = 2089,
-    external_declaration = 2090,
-    function_definition = 2091,
-    field_selection = 2092,
-    bool_constant = 2093,
-    function_identifier_node = 2094,
-    typename_identifier_node = 2095,
-    scope_brace = 2096,
-    scope_end_brace = 2097,
-    _ignore = 2098
+    variable_declaration_list = 2004,
+    variable_declaration_statement = 2005,
+    array_specifier_list = 2006,
+    array_specifier = 2007,
+    ext_builtin_type_specifier_nonarray = 2008,
+    precision_specifier = 2009,
+    variable_identifier = 2010,
+    variable_identifier_node = 2011,
+    primary_expression = 2012,
+    postfix_expression = 2013,
+    integer_expression = 2014,
+    function_call = 2015,
+    function_call_generic = 2016,
+    function_call_header_no_parameters = 2017,
+    function_call_header_with_parameters = 2018,
+    function_call_parameter_list = 2019,
+    function_call_header = 2020,
+    function_identifier = 2021,
+    constructor_identifier = 2022,
+    unary_expression = 2023,
+    unary_operator = 2024,
+    multiplicative_expression = 2025,
+    additive_expression = 2026,
+    shift_expression = 2027,
+    relational_expression = 2028,
+    equality_expression = 2029,
+    and_expression = 2030,
+    inclusive_or_expression = 2031,
+    exclusive_or_expression = 2032,
+    logical_and_expression = 2033,
+    logical_xor_expression = 2034,
+    logical_or_expression = 2035,
+    conditional_expression = 2036,
+    assignment_expression = 2037,
+    assignment_operator = 2038,
+    expression = 2039,
+    integer_constant_expression = 2040,
+    integer_constant_expression_operator = 2041,
+    declaration = 2042,
+    function_prototype = 2043,
+    function_declarator = 2044,
+    function_header_with_parameters = 2045,
+    function_header = 2046,
+    function_parameter_list = 2047,
+    parameter_declarator = 2048,
+    parameter_declaration = 2049,
+    parameter_qualifier = 2050,
+    parameter_type_specifier = 2051,
+    init_declarator_list = 2052,
+    single_declaration = 2053,
+    fully_specified_type = 2054,
+    type_qualifier = 2055,
+    single_type_qualifier = 2056,
+    storage_qualifier = 2057,
+    precision_qualifier = 2058,
+    interpolation_qualifier = 2059,
+    invariant_qualifier = 2060,
+    type_specifier = 2061,
+    type_specifier_nonarray = 2062,
+    type_specifier_no_prec = 2063,
+    basic_type = 2064,
+    struct_specifier = 2065,
+    struct_declaration_list = 2066,
+    struct_declaration = 2067,
+    layout_qualifier = 2068,
+    struct_declarator_list = 2069,
+    struct_declarator = 2070,
+    identifier_list = 2071,
+    decl_identifier = 2072,
+    initializer = 2073,
+    initializer_list = 2074,
+    declaration_statement = 2075,
+    simple_statement = 2076,
+    compound_statement_no_scope = 2077,
+    statement_with_scope = 2078,
+    compound_statement = 2079,
+    statement = 2080,
+    statement_list = 2081,
+    iteration_statement_no_new_scope = 2082,
+    expression_statement = 2083,
+    selection_statement = 2084,
+    selection_rest_statement = 2085,
+    condition = 2086,
+    conditionopt = 2087,
+    iteration_statement = 2088,
+    for_init_statement = 2089,
+    for_rest_statement = 2090,
+    jump_statement = 2091,
+    external_declaration = 2092,
+    function_definition = 2093,
+    field_selection = 2094,
+    bool_constant = 2095,
+    function_identifier_node = 2096,
+    typename_identifier_node = 2097,
+    scope_brace = 2098,
+    scope_end_brace = 2099,
+    _ignore = 2100
 }
 export type GrammarSymbol = Terminal | NoneTerminal;
 export type Derivation = GrammarSymbol[];

package/types/parser/builtin/functions.d.ts

@@ -19,17 +19,16 @@ export declare enum EGenType {
 export type NonGenericGalaceanType = Exclude<GalaceanDataType, string>;
 type BuiltinType = NonGenericGalaceanType | EGenType;
 export declare class BuiltinFunction {
-    private _returnType;
     ident: string;
     readonly args: BuiltinType[];
     readonly scope: EShaderStage;
+    private _returnType;
+    private _realReturnType;
+    get realReturnType(): NonGenericGalaceanType;
     private constructor();
     static getReturnType(fn: BuiltinFunction, genType?: NonGenericGalaceanType): NonGenericGalaceanType;
     static _create(ident: string, returnType: BuiltinType, ...args: BuiltinType[]): void;
     static _createWithScop(ident: string, returnType: BuiltinType, scope: EShaderStage, ...args: BuiltinType[]): void;
-    static getFn(ident: string, ...args: BuiltinType[]): {
-        fun: BuiltinFunction;
-        genType: Exclude<GalaceanDataType, string>;
-    } | undefined;
+    static getFn(ident: string, parameterTypes: NonGenericGalaceanType[]): BuiltinFunction | undefined;
 }
 export {};