vitalif
/
openscad
mirror of https://github.com/vitalif/openscad
1
0
Fork 0
Code Issues Releases Wiki Activity

reorder parser predicat to better understanding

issue480
Vicnet 2013-09-13 14:42:45 +02:00
parent d9a66f2cb0
commit f6343949eb
1 changed files with 54 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
src/parser.y
View File

@ -134,28 +134,6 @@ input: /* empty */
| statement input | statement input
; ;
inner_input:
/* empty */
| statement inner_input
;
assignment:
TOK_ID '=' expr ';'
{
bool found = false;
foreach (Assignment& iter, scope_stack.top()->assignments) {
if (iter.first == $1) {
iter.second = $3;
found = true;
break;
}
}
if (!found) {
scope_stack.top()->assignments.push_back(Assignment($1, $3));
}
}
;
statement: statement:
';' ';'
| '{' inner_input '}' | '{' inner_input '}'
@ -177,7 +155,7 @@ statement:
{ {
scope_stack.pop(); scope_stack.pop();
} }
| TOK_FUNCTION TOK_ID '(' arguments_decl optional_commas ')' '=' expr ';' | TOK_FUNCTION TOK_ID '(' arguments_decl optional_commas ')' '=' expr
{ {
Function *func = new Function(); Function *func = new Function();
func->definition_arguments = *$4; func->definition_arguments = *$4;
@ -186,36 +164,28 @@ statement:
free($2); free($2);
delete $4; delete $4;
} }
';'
; ;
if_statement: inner_input:
TOK_IF '(' expr ')' /* empty */
{ | statement inner_input
$<ifelse>$ = new IfElseModuleInstantiation();
$<ifelse>$->arguments.push_back(Assignment("", $3));
$<ifelse>$->setPath(parser_source_path);
scope_stack.push(&$<ifelse>$->scope);
}
child_statement
{
scope_stack.pop();
$$ = $<ifelse>5;
}
; ;
ifelse_statement: assignment:
if_statement TOK_ID '=' expr ';'
{ {
$$ = $1; bool found = false;
} foreach (Assignment& iter, scope_stack.top()->assignments) {
| if_statement TOK_ELSE if (iter.first == $1) {
{ iter.second = $3;
scope_stack.push(&$1->else_scope); found = true;
} break;
child_statement }
{ }
scope_stack.pop(); if (!found) {
$$ = $1; scope_stack.top()->assignments.push_back(Assignment($1, $3));
}
} }
; ;
@ -256,6 +226,42 @@ module_instantiation:
} }
; ;
ifelse_statement:
if_statement
{
$$ = $1;
}
| if_statement TOK_ELSE
{
scope_stack.push(&$1->else_scope);
}
child_statement
{
scope_stack.pop();
$$ = $1;
}
;
if_statement:
TOK_IF '(' expr ')'
{
$<ifelse>$ = new IfElseModuleInstantiation();
$<ifelse>$->arguments.push_back(Assignment("", $3));
$<ifelse>$->setPath(parser_source_path);
scope_stack.push(&$<ifelse>$->scope);
}
child_statement
{
scope_stack.pop();
$$ = $<ifelse>5;
}
;
child_statements:
/* empty */
| child_statements child_statement
;
child_statement: child_statement:
';' ';'
| '{' child_statements '}' | '{' child_statements '}'
@ -271,11 +277,6 @@ child_statement:
assignment ; assignment ;
*/ */
child_statements:
/* empty */
| child_statements child_statement
;
single_module_instantiation: single_module_instantiation:
TOK_ID '(' arguments_call ')' TOK_ID '(' arguments_call ')'
{ {