Merge pull request #58 from ShaderFrog/token-evaluation

Evaluating expanded macros in conditional expressions

Author: AndrewRayCode

.gitignore

@@ -3,6 +3,23 @@ dist
 .vscode
 .DS_Store
 tmp
+tsconfig.tsbuildinfo
+
+# Compiled parsers
 src/parser/parser.js
 src/preprocessor/preprocessor-parser.js
-tsconfig.tsbuildinfo
+
+# Peggy / typescript built files
+ast/
+error.d.ts
+error.js
+index.d.ts
+index.js
+parser/
+preprocessor/
+
+# Typescript builds these?
+vite.config.d.ts
+vite.config.js
+vitest.global-setup.d.ts
+vitest.global-setup.js

build.sh

@@ -4,13 +4,15 @@ set -e
 # Clean the output dir
 rm -rf dist/
 mkdir -p dist
-
+mkdir -p dist/parser
+mkdir -p dist/preprocessor
 # Compile the typescript project
 npx tsc
 
 npx peggy --cache --format es -o dist/parser/parser.js src/parser/glsl-grammar.pegjs
+
 # Manualy copy in the type definitions
 cp src/parser/parser.d.ts dist/parser/
 
-npx peggy --cache --format es -o dist/preprocessor/preprocessor-parser.js src/preprocessor/preprocessor-grammar.pegjs
+npx peggy --cache --format es --allowed-start-rules program,constant_expression -o dist/preprocessor/preprocessor-parser.js src/preprocessor/preprocessor-grammar.pegjs
 cp src/preprocessor/preprocessor-parser.d.ts dist/preprocessor/preprocessor-parser.d.ts