diff options
| author | Marius Kintel <marius@kintel.net> | 2013-06-18 05:46:48 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-06-18 05:46:48 (GMT) |
| commit | 6d91540e4cc3f9fe0caaea63ac64518a5626d28b (patch) | |
| tree | ca7034453a1f55124e4b7378aaab22985aff6a21 /src/parser.y | |
| parent | 95947a877b8e88521a7f00348d56c89e9b7c2a79 (diff) | |
| parent | 6c7d386a3338039416ced323bf1aa75edbb43d19 (diff) | |
Merge branch 'master' into epec-kernel
Diffstat (limited to 'src/parser.y')
| -rw-r--r-- | src/parser.y | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/parser.y b/src/parser.y index 2b07f14..5b3d019 100644 --- a/src/parser.y +++ b/src/parser.y @@ -127,7 +127,7 @@ input: /* empty */ | -TOK_USE { rootmodule->usedlibs[$1] = NULL; } input | +TOK_USE { rootmodule->usedlibs.insert($1); } input | statement input ; inner_input: @@ -136,15 +136,17 @@ statement inner_input ; assignment: TOK_ID '=' expr ';' { + bool found = false; for (AssignmentList::iterator iter = scope_stack.top()->assignments.begin(); iter != scope_stack.top()->assignments.end(); iter++) { if (iter->first == $1) { - scope_stack.top()->assignments.erase(iter); + iter->second = $3; + found = true; break; } } - scope_stack.top()->assignments.push_back(Assignment($1, $3)); + if (!found) scope_stack.top()->assignments.push_back(Assignment($1, $3)); } ; statement: |