summaryrefslogtreecommitdiff
path: root/colm/parsetree.h
diff options
context:
space:
mode:
authorAdrian Thurston <thurston@complang.org>2013-02-25 21:10:33 -0500
committerAdrian Thurston <thurston@complang.org>2013-02-25 21:10:33 -0500
commitc89ae2a6f05cab798f7504e8b3a4c1abf88797e9 (patch)
tree542a470d1e3d587f1ea21f710ff6976b52ee279d /colm/parsetree.h
parent0898e21a8121a85e97523cedc77a71766785a349 (diff)
downloadcolm-c89ae2a6f05cab798f7504e8b3a4c1abf88797e9.tar.gz
removed tokenInstanceList from Namespace, not needed
Diffstat (limited to 'colm/parsetree.h')
-rw-r--r--colm/parsetree.h15
1 files changed, 3 insertions, 12 deletions
diff --git a/colm/parsetree.h b/colm/parsetree.h
index 01b8552f..4f4a81fd 100644
--- a/colm/parsetree.h
+++ b/colm/parsetree.h
@@ -175,7 +175,6 @@ struct TokenDefListReg;
struct TokenDefListNs;
struct TokenInstance;
struct TokenInstanceListReg;
-struct TokenInstanceListNs;
struct Range;
struct LangEl;
@@ -437,20 +436,14 @@ struct TokenDef
bool isZero;
};
-struct TokenInstancePtr1
-{
- TokenInstance *prev, *next;
-};
-
-struct TokenInstancePtr2
+struct TokenInstancePtr
{
TokenInstance *prev, *next;
};
struct TokenInstance
:
- public TokenInstancePtr1,
- public TokenInstancePtr2
+ public TokenInstancePtr
{
TokenInstance()
:
@@ -550,8 +543,7 @@ struct NtDef
struct NtDefList : DList<NtDef> {};
/* Declare a new type so that ptreetypes.h need not include dlist.h. */
-struct TokenInstanceListReg : DListMel<TokenInstance, TokenInstancePtr1> {};
-struct TokenInstanceListNs : DListMel<TokenInstance, TokenInstancePtr2> {};
+struct TokenInstanceListReg : DListMel<TokenInstance, TokenInstancePtr> {};
/* Declare a new type so that ptreetypes.h need not include dlist.h. */
struct TokenDefListReg : DListMel<TokenDef, TokenDefPtr1> {};
@@ -801,7 +793,6 @@ struct Namespace
LiteralDict literalDict;
/* List of tokens defs in the namespace. */
- TokenInstanceListNs tokenInstanceList;
TokenDefListNs tokenDefList;
/* List of nonterminal defs in the namespace. */