summaryrefslogtreecommitdiff
path: root/src/parser.h
diff options
context:
space:
mode:
authorAdrian Thurston <thurston@complang.org>2014-12-14 14:27:11 -0500
committerAdrian Thurston <thurston@complang.org>2014-12-14 14:27:11 -0500
commitb4c15bb4bd7e4f84d449987987f38c7c17d68697 (patch)
tree934fafe29fa489cec3537f47dea66e2561f8106e /src/parser.h
parentb31d25f21e6105ed52fc7859016acf6c29abca33 (diff)
downloadcolm-b4c15bb4bd7e4f84d449987987f38c7c17d68697.tar.gz
some name shortening
Diffstat (limited to 'src/parser.h')
-rw-r--r--src/parser.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/parser.h b/src/parser.h
index 80ee5494..bd93b84d 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -26,7 +26,7 @@ struct BaseParser
NamespaceVect namespaceStack;
ContextStack contextStack;
ObjectDef *curLocalFrame;
- ObjNameScope *curScope;
+ NameScope *curScope;
bool enterRl;
@@ -77,7 +77,8 @@ struct BaseParser
LexFactorAug *factorAug );
LexJoin *lexOptJoin( LexJoin *join, LexJoin *context );
LangExpr *send( const InputLoc &loc, LangVarRef *varRef, ConsItemList *list, bool eof );
- LangExpr *sendTree( const InputLoc &loc, LangVarRef *varRef, ConsItemList *list, bool eof );
+ LangExpr *sendTree( const InputLoc &loc, LangVarRef *varRef,
+ ConsItemList *list, bool eof );
LangExpr *parseCmd( const InputLoc &loc, bool tree, bool stop, ObjectField *objField,
TypeRef *typeRef, FieldInitVect *fieldInitVect, ConsItemList *list );
PatternItemList *consPatternEl( LangVarRef *varRef, PatternItemList *list );
@@ -88,7 +89,7 @@ struct BaseParser
PatternItemList *patListConcat( PatternItemList *list1, PatternItemList *list2 );
ConsItemList *consListConcat( ConsItemList *list1, ConsItemList *list2 );
LangStmt *forScope( const InputLoc &loc, const String &data,
- ObjNameScope *scope, TypeRef *typeRef, IterCall *iterCall, StmtList *stmtList );
+ NameScope *scope, TypeRef *typeRef, IterCall *iterCall, StmtList *stmtList );
void preEof( const InputLoc &loc, StmtList *stmtList, ObjectDef *localFrame );
ProdEl *prodElName( const InputLoc &loc, const String &data,