Make the parser more coherent

We build things up in stacks in the parser, rather than relying on
TikzGraphAssembler so much.  This makes tikzparser.ym easier to follow
(IMHO).

1 files changed, 0 insertions, 13 deletions

diff --git a/tikzit/src/common/TikzGraphAssembler.h b/tikzit/src/common/TikzGraphAssembler.h
index a0c8a0d..3fc4e9e 100644
--- a/tikzit/src/common/TikzGraphAssembler.h
+++ b/tikzit/src/common/TikzGraphAssembler.h
@@ -26,16 +26,11 @@
 
 @interface TikzGraphAssembler : NSObject {
 	Graph *graph;
-	Node *currentNode;
-	Edge *currentEdge;
 	NSMutableDictionary *nodeMap;
 	NSError *lastError;
 }
 
 @property (readonly) Graph *graph;
-@property (readonly) GraphElementData *data;
-@property (readonly) Node *currentNode;
-@property (readonly) Edge *currentEdge;
 @property (readonly) NSError *lastError;
 
 - (BOOL)parseTikz:(NSString*)tikz;
@@ -43,14 +38,6 @@
 
 - (BOOL)testTikz:(NSString*)tikz;
 
-- (void)prepareNode;
-- (void)finishNode;
-
-- (void)prepareEdge;
-- (void)setEdgeSource:(NSString*)edge anchor:(NSString*)anch;
-- (void)setEdgeTarget:(NSString*)edge anchor:(NSString*)anch;
-- (void)finishEdge;
-
 - (void)invalidate;
 - (void)invalidateWithError:(NSError*)error;