diff options
| author | Adrian Thurston <thurston@complang.org> | 2013-02-16 10:13:42 -0500 |
|---|---|---|
| committer | Adrian Thurston <thurston@complang.org> | 2013-02-16 11:44:44 -0500 |
| commit | 5f233cfcb9737c1580fd3dc7721f526d5636fab3 (patch) | |
| tree | 6d98fac6d38439b8e0e30d0d25b83c3ee048568d | |
| parent | 3a3a1898e39ee58a14845f31974eea93a25e8df5 (diff) | |
| download | colm-5f233cfcb9737c1580fd3dc7721f526d5636fab3.tar.gz | |
took name out of the RegionInfo struct (runtime)
Lexical regions are no longer named constructs in the language.
| -rw-r--r-- | colm/pdabuild.cc | 2 | ||||
| -rw-r--r-- | colm/pdacodegen.cc | 5 | ||||
| -rw-r--r-- | colm/pdarun.c | 7 | ||||
| -rw-r--r-- | colm/pdarun.h | 1 |
4 files changed, 1 insertions, 14 deletions
diff --git a/colm/pdabuild.cc b/colm/pdabuild.cc index 6eb929f7..23038025 100644 --- a/colm/pdabuild.cc +++ b/colm/pdabuild.cc @@ -1361,11 +1361,9 @@ void Compiler::makeRuntimeData() runtimeData->regionInfo = new RegionInfo[runtimeData->numRegions]; memset( runtimeData->regionInfo, 0, sizeof(RegionInfo) * runtimeData->numRegions ); - runtimeData->regionInfo[0].name = "___EMPTY"; runtimeData->regionInfo[0].defaultToken = -1; for ( RegionList::Iter reg = regionList; reg.lte(); reg++ ) { long regId = reg->id+1; - runtimeData->regionInfo[regId].name = reg->name; runtimeData->regionInfo[regId].defaultToken = reg->defaultTokenDef == 0 ? -1 : reg->defaultTokenDef->tdLangEl->id; runtimeData->regionInfo[regId].eofFrameId = -1; diff --git a/colm/pdacodegen.cc b/colm/pdacodegen.cc index c6bf212f..45857701 100644 --- a/colm/pdacodegen.cc +++ b/colm/pdacodegen.cc @@ -351,10 +351,7 @@ void PdaCodeGen::writeRuntimeData( RuntimeData *runtimeData, PdaTables *pdaTable */ out << "RegionInfo " << regionInfo() << "[] = {\n"; for ( int i = 0; i < runtimeData->numRegions; i++ ) { - out << "\t{ \""; - /* Name. */ - escapeLiteralString( out, runtimeData->regionInfo[i].name ); - out << "\", " << runtimeData->regionInfo[i].defaultToken << + out << "\t{ " << runtimeData->regionInfo[i].defaultToken << ", " << runtimeData->regionInfo[i].eofFrameId << ", " << runtimeData->regionInfo[i].isIgnoreOnly << ", " << runtimeData->regionInfo[i].isCiOnly << diff --git a/colm/pdarun.c b/colm/pdarun.c index 5dc1439f..a76ef3e7 100644 --- a/colm/pdarun.c +++ b/colm/pdarun.c @@ -968,15 +968,10 @@ static void newToken( Program *prg, PdaRun *pdaRun, FsmRun *fsmRun ) fsmRun->region = pdaRunGetNextRegion( pdaRun, 0 ); fsmRun->preRegion = pdaRunGetNextPreRegion( pdaRun ); if ( fsmRun->preRegion > 0 ) { - debug( REALM_PARSE, "pre region for next token: %s\n", - prg->rtd->regionInfo[fsmRun->preRegion].name ); fsmRun->cs = fsmRun->tables->entryByRegion[fsmRun->preRegion]; fsmRun->ncs = fsmRun->tables->entryByRegion[fsmRun->region]; } else { - debug( REALM_PARSE, "scanning using token region: %s\n", - prg->rtd->regionInfo[fsmRun->region].name ); - fsmRun->cs = fsmRun->tables->entryByRegion[fsmRun->region]; } @@ -1143,8 +1138,6 @@ case PcrStart: if ( fsmRun->preRegion >= 0 ) { fsmRun->preRegion = -1; fsmRun->cs = fsmRun->ncs; - debug( REALM_PARSE, "moving from pre region to main region: %s\n", - prg->rtd->regionInfo[fsmRun->region].name ); continue; } } diff --git a/colm/pdarun.h b/colm/pdarun.h index 5b81853b..8d919b33 100644 --- a/colm/pdarun.h +++ b/colm/pdarun.h @@ -217,7 +217,6 @@ typedef struct _FrameInfo typedef struct _RegionInfo { - const char *name; long defaultToken; long eofFrameId; int isIgnoreOnly; |