Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix preprocessor parenthesis expression parse #2236

Merged
merged 9 commits into from
Jul 17, 2024
Merged

Fix preprocessor parenthesis expression parse #2236

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
94e30f5
fix: conditional compilation
Sway007 Jul 16, 2024
e3c7aa5
fix: expand token
Sway007 Jul 16, 2024
36b77e0
fix: expand token
Sway007 Jul 16, 2024
b2e07fc
feat: code opt
Sway007 Jul 16, 2024
93df92e
fix: ci
Sway007 Jul 16, 2024
8e0cc28
feat: cache error shader
Sway007 Jul 17, 2024
7652250
Merge branch 'dev/1.3' of https://github.com/galacean/engine into fea…
Sway007 Jul 17, 2024
c92e674
fix: preprocessor parse expression
Sway007 Jul 17, 2024
3fefbe9
Merge branch 'dev/1.3' of https://github.com/galacean/engine into fea…
Sway007 Jul 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/shader-lab/src/preprocessor/PpParser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ export default class PpParser {
if (scanner.getCurChar() === "(") {
scanner.advance();
scanner.skipSpace(false);
const ret = this._parseConstant(scanner);
const ret = this._parseConstantExpression(scanner);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change from _parseConstant to _parseConstantExpression is appropriate for enhanced expression parsing.

The modification to use _parseConstantExpression instead of _parseConstant when parsing expressions within parenthesis is a logical enhancement. This change likely allows for more complex expressions to be correctly parsed, aligning with the intended improvements in the PR.

However, it is crucial to ensure that this change is thoroughly tested, especially since it affects the core functionality of the shader preprocessor.

Would you like me to help generate unit tests or update the documentation to reflect this change?

scanner.scanToChar(")");
scanner.advance();
return ret;
Expand Down
Loading