diff options
| author | Adrian Thurston <thurston@complang.org> | 2015-06-14 16:28:29 -0400 |
|---|---|---|
| committer | Adrian Thurston <thurston@complang.org> | 2015-06-14 16:28:29 -0400 |
| commit | 79710f96389cefc498cf806cefb5e05f6fed38ea (patch) | |
| tree | 6fce42d8f219db18914c20aedbfb03283e417234 /src/parser.cc | |
| parent | 324f1fc08d2876f8084f226a54bb06e0e817a791 (diff) | |
| download | colm-79710f96389cefc498cf806cefb5e05f6fed38ea.tar.gz | |
cleanup in the list and map types
Diffstat (limited to 'src/parser.cc')
| -rw-r--r-- | src/parser.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/parser.cc b/src/parser.cc index dc4d4576..37ba9893 100644 --- a/src/parser.cc +++ b/src/parser.cc @@ -480,14 +480,13 @@ LangStmt *BaseParser::globalDef( ObjectField *objField, LangExpr *expr, { LangStmt *stmt = 0; - StructDef *context = 0; + StructDef *structDef = 0; ObjectDef *object = 0; if ( curStruct() == 0 ) object = pd->globalObjectDef; else { - context = curStruct(); - objField->context = context; - object = context->objectDef; + structDef = curStruct(); + object = structDef->objectDef; } if ( object->rootScope->checkRedecl( objField->name ) != 0 ) @@ -497,7 +496,7 @@ LangStmt *BaseParser::globalDef( ObjectField *objField, LangExpr *expr, if ( expr != 0 ) { LangVarRef *varRef = LangVarRef::cons( objField->loc, - context, curScope, objField->name ); + structDef, curScope, objField->name ); stmt = LangStmt::cons( objField->loc, assignType, varRef, expr ); @@ -988,7 +987,6 @@ void BaseParser::structVarDef( const InputLoc &loc, ObjectField *objField ) error(loc) << "internal error: no context stack items found" << endp; StructDef *structDef = curStruct(); - objField->context = structDef; object = structDef->objectDef; if ( object->rootScope->checkRedecl( objField->name ) != 0 ) |