feat: code opt

galacean · Oct 12, 2024 · fb3974e · fb3974e
1 parent eb515be
commit fb3974e
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 23 deletions.
diff --git a/packages/shader-lab/src/GSError.ts b/packages/shader-lab/src/GSError.ts
@@ -57,9 +57,9 @@ export class GSError extends Error {
   }
 }
 
+// #endif
 export enum GSErrorName {
   PreprocessorError = "PreprocessorError",
   CompilationError = "CompilationError",
   ScannerError = "ScannerError"
 }
-// #endif
diff --git a/packages/shader-lab/src/ShaderLabUtils.ts b/packages/shader-lab/src/ShaderLabUtils.ts
@@ -1,7 +1,10 @@
 import { ClearableObjectPool, IPoolElement } from "@galacean/engine";
-import { GSError, GSErrorName } from "./GSError";
+import { GSErrorName } from "./GSError";
 import { ShaderRange } from "./common/ShaderRange";
 import { ShaderPosition } from "./common/ShaderPosition";
+// #if _VERBOSE
+import { GSError } from "./GSError";
+// #endif
 
 export class ShaderLabUtils {
   private static _shaderLabObjectPoolSet: ClearableObjectPool<IPoolElement>[] = [];
@@ -28,7 +31,7 @@ export class ShaderLabUtils {
     // #if _VERBOSE
     return new GSError(errorName, message, location, source, file);
     // #else
-    throw new Error(message);
+    throw new Error(`[${errorName}]: ${message}`);
     // #endif
   }
 }
diff --git a/packages/shader-lab/src/codeGen/CodeGenVisitor.ts b/packages/shader-lab/src/codeGen/CodeGenVisitor.ts
@@ -6,10 +6,11 @@ import { ESymbolType, FnSymbol, VarSymbol } from "../parser/symbolTable";
 import { ParserUtils } from "../ParserUtils";
 import { NodeChild } from "../parser/types";
 import { VisitorContext } from "./VisitorContext";
+import { ShaderLab } from "../ShaderLab";
+import { GSErrorName } from "../GSError";
 // #if _VERBOSE
-import { GSErrorName, GSError } from "../GSError";
+import { GSError } from "../GSError";
 // #endif
-import { ShaderLab } from "../ShaderLab";
 
 /**
  * @internal

diff --git a/packages/shader-lab/src/codeGen/VisitorContext.ts b/packages/shader-lab/src/codeGen/VisitorContext.ts
@@ -2,12 +2,13 @@ import { EShaderStage } from "../common/Enums";
 import { ASTNode } from "../parser/AST";
 import { ESymbolType, SymbolTable, SymbolInfo } from "../parser/symbolTable";
 import { IParamInfo } from "../parser/types";
-// #if _VERBOSE
-import { GSErrorName, GSError } from "../GSError";
-// #endif
+import { GSErrorName } from "../GSError";
 import { BaseToken } from "../common/BaseToken";
 import { ShaderLab } from "../ShaderLab";
 import { ShaderLabUtils } from "../ShaderLabUtils";
+// #if _VERBOSE
+import { GSError } from "../GSError";
+// #endif
 
 /** @internal */
 export class VisitorContext {

diff --git a/packages/shader-lab/src/common/BaseScanner.ts b/packages/shader-lab/src/common/BaseScanner.ts
@@ -1,8 +1,5 @@
-import { Logger } from "@galacean/engine";
 import { ETokenType, ShaderRange, ShaderPosition } from ".";
-// #if _VERBOSE
-import { GSError, GSErrorName } from "../GSError";
-// #endif
+import { GSErrorName } from "../GSError";
 import { ShaderLab } from "../ShaderLab";
 import { BaseToken } from "./BaseToken";
 import { ShaderLabUtils } from "../ShaderLabUtils";

diff --git a/packages/shader-lab/src/contentParser/ShaderContentParser.ts b/packages/shader-lab/src/contentParser/ShaderContentParser.ts
@@ -23,8 +23,9 @@ import {
   IShaderPassContent,
   IRenderStates
 } from "@galacean/engine-design";
+import { GSErrorName } from "../GSError";
 // #if _VERBOSE
-import { GSError, GSErrorName } from "../GSError";
+import { GSError } from "../GSError";
 import { ShaderLabUtils } from "../ShaderLabUtils";
 // #endif
 

diff --git a/packages/shader-lab/src/parser/SemanticAnalyzer.ts b/packages/shader-lab/src/parser/SemanticAnalyzer.ts
@@ -1,13 +1,14 @@
 import { ShaderRange } from "../common";
 import { TreeNode } from "./AST";
-// #if _VERBOSE
-import { GSError, GSErrorName } from "../GSError";
-// #endif
+import { GSErrorName } from "../GSError";
 import { ShaderData } from "./ShaderInfo";
 import { SymbolInfo, SymbolTable } from "../parser/symbolTable";
 import { NodeChild } from "./types";
 import { SymbolTableStack } from "../common/BaseSymbolTable";
 import { ShaderLab } from "../ShaderLab";
+// #if _VERBOSE
+import { GSError } from "../GSError";
+// #endif
 
 export type TranslationRule<T = any> = (sa: SematicAnalyzer, ...tokens: NodeChild[]) => T;
 

diff --git a/packages/shader-lab/src/parser/ShaderTargetParser.ts b/packages/shader-lab/src/parser/ShaderTargetParser.ts
@@ -10,9 +10,7 @@ import { addTranslationRule, createGrammar } from "../lalr/CFG";
 import { LALR1 } from "../lalr";
 import { ParserUtils } from "../ParserUtils";
 import { Logger } from "@galacean/engine";
-// #if _VERBOSE
-import { GSError, GSErrorName } from "../GSError";
-// #endif
+import { GSErrorName } from "../GSError";
 import { ShaderLab } from "../ShaderLab";
 import { ShaderLabUtils } from "../ShaderLabUtils";
 

diff --git a/packages/shader-lab/src/preprocessor/PpParser.ts b/packages/shader-lab/src/preprocessor/PpParser.ts
@@ -1,17 +1,17 @@
 import { ShaderPosition, ShaderRange } from "../common";
 import LexerUtils from "../lexer/Utils";
 import { MacroDefine } from "./MacroDefine";
-// #if _VERBOSE
-import PpSourceMap, { BlockInfo } from "./sourceMap";
-import { GSError, GSErrorName } from "../GSError";
-// #endif
 import { BaseToken } from "../common/BaseToken";
 import { EPpKeyword, EPpToken, PpConstant } from "./constants";
 import PpScanner from "./PpScanner";
 import { PpUtils } from "./Utils";
 import { ShaderLab } from "../ShaderLab";
 import { ShaderPass } from "@galacean/engine";
 import { ShaderLabUtils } from "../ShaderLabUtils";
+import { GSErrorName } from "../GSError";
+// #if _VERBOSE
+import PpSourceMap, { BlockInfo } from "./sourceMap";
+// #endif
 
 export interface ExpandSegment {
   // #if _VERBOSE