summaryrefslogtreecommitdiff
path: root/colm/lmparse.kh
diff options
context:
space:
mode:
authorAdrian Thurston <thurston@complang.org>2013-02-23 22:51:38 -0500
committerAdrian Thurston <thurston@complang.org>2013-02-23 22:51:38 -0500
commitaeef465c0e89d5b689d349370329baef4c67b7eb (patch)
treec868f173f39aecfee4b5804f8970fd363f0ed2a4 /colm/lmparse.kh
parente6acde465c0cdaed67cbf463522faa093485d50b (diff)
downloadcolm-aeef465c0e89d5b689d349370329baef4c67b7eb.tar.gz
renamed TokenDef to TokenInstance
Will add back token def as the thing the user declares. Instances go into regions and a def can cause more than one instance to be created.
Diffstat (limited to 'colm/lmparse.kh')
-rw-r--r--colm/lmparse.kh4
1 files changed, 2 insertions, 2 deletions
diff --git a/colm/lmparse.kh b/colm/lmparse.kh
index b0722b13..824cfe43 100644
--- a/colm/lmparse.kh
+++ b/colm/lmparse.kh
@@ -112,7 +112,7 @@ struct ColmParser
/* Report an error encountered by the parser. */
ostream &parse_error( int tokId, Token &token );
- void tokenDef( const InputLoc &loc, String name, LexJoin *join,
+ void tokenInstance( const InputLoc &loc, String name, LexJoin *join,
CodeBlock *transBlock, bool ignore, bool noPreIgnore, bool noPostIgnore );
void literalDef( const InputLoc &loc, const String &data,
@@ -168,7 +168,7 @@ struct ColmParser
LangExpr *require( const InputLoc &loc, LangVarRef *varRef, PatternItemList *list );
void contextVarDef( const InputLoc &loc, ObjectField *objField );
void contextHead( const InputLoc &loc, const String &data );
- void tokenDefName( const String &name );
+ void tokenInstanceName( const String &name );
StmtList *appendStatement( StmtList *stmtList, LangStmt *stmt );
ParameterList *appendParam( ParameterList *paramList, ObjectField *objField );
ObjectField *addParam( const InputLoc &loc, TypeRef *typeRef, const String &name );