diff options
| author | Brian <brian@yutani.localnet.net> | 2007-01-19 10:02:58 -0700 |
|---|---|---|
| committer | Brian <brian@yutani.localnet.net> | 2007-01-19 10:02:58 -0700 |
| commit | 8374ccb66ff13074a3f5938da1e22a48921c5328 (patch) | |
| tree | ab2bb4ab57249faf362e7c5cde57e8f4431291c0 | |
| parent | 16183e6430d782ff3576e352e24310dfe53fa8ab (diff) | |
change while-loop to create new scope for loop body, per spec
| -rw-r--r-- | src/mesa/shader/slang/library/slang_shader.syn | 4 | ||||
| -rw-r--r-- | src/mesa/shader/slang/library/slang_shader_syn.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/shader/slang/library/slang_shader.syn b/src/mesa/shader/slang/library/slang_shader.syn index ee0254f1b8..bfa6793f06 100644 --- a/src/mesa/shader/slang/library/slang_shader.syn +++ b/src/mesa/shader/slang/library/slang_shader.syn @@ -1096,7 +1096,7 @@ condition_3 expression .and .true .emit OP_END; /* - <iteration_statement> ::= "while" "(" <condition> ")" <statement_no_new_scope> + <iteration_statement> ::= "while" "(" <condition> ")" <statement> | "do" <statement> "while" "(" <expression> ")" ";" | "for" "(" <for_init_statement> <for_rest_statement> ")" <statement_no_new_scope> @@ -1105,7 +1105,7 @@ iteration_statement iteration_statement_1 .or iteration_statement_2 .or iteration_statement_3; iteration_statement_1 "while" .emit OP_WHILE .and lparen .error LPAREN_EXPECTED .and condition .and - rparen .error RPAREN_EXPECTED .and statement_no_new_scope; + rparen .error RPAREN_EXPECTED .and statement; iteration_statement_2 "do" .emit OP_DO .and statement_space .and "while" .and lparen .error LPAREN_EXPECTED .and expression .and rparen .error RPAREN_EXPECTED .emit OP_END .and semicolon; diff --git a/src/mesa/shader/slang/library/slang_shader_syn.h b/src/mesa/shader/slang/library/slang_shader_syn.h index abfb6cd42a..58cf1b1390 100644 --- a/src/mesa/shader/slang/library/slang_shader_syn.h +++ b/src/mesa/shader/slang/library/slang_shader_syn.h @@ -533,7 +533,7 @@ " iteration_statement_1 .or iteration_statement_2 .or iteration_statement_3;\n" "iteration_statement_1\n" " \"while\" .emit OP_WHILE .and lparen .error LPAREN_EXPECTED .and condition .and\n" -" rparen .error RPAREN_EXPECTED .and statement_no_new_scope;\n" +" rparen .error RPAREN_EXPECTED .and statement;\n" "iteration_statement_2\n" " \"do\" .emit OP_DO .and statement_space .and \"while\" .and lparen .error LPAREN_EXPECTED .and\n" " expression .and rparen .error RPAREN_EXPECTED .emit OP_END .and semicolon;\n" |