diff options
author | Johan Paulsson <gonz@badcode.net> | 2015-03-12 12:55:07 -0700 |
---|---|---|
committer | Johan Paulsson <gonz@badcode.net> | 2015-03-12 12:55:07 -0700 |
commit | e29f8204df052ddd634e04053ac9144cee64df08 (patch) | |
tree | 7ff9b309b135e99c61fc5ccd1cf69797bd9fb94a /tikzit/src/common | |
parent | ffa99ec96899716ce1084177810303d336f51ff6 (diff) |
Reverted flex/bison files together with TikzGraphAssembler to be compiled with no ARC
Diffstat (limited to 'tikzit/src/common')
-rw-r--r-- | tikzit/src/common/tikzlexer.lm | 1 | ||||
-rw-r--r-- | tikzit/src/common/tikzparser.ym | 14 |
2 files changed, 10 insertions, 5 deletions
diff --git a/tikzit/src/common/tikzlexer.lm b/tikzit/src/common/tikzlexer.lm index 96690d2..1e92f73 100644 --- a/tikzit/src/common/tikzlexer.lm +++ b/tikzit/src/common/tikzlexer.lm @@ -37,6 +37,7 @@ %option header-file="common/tikzlexer.h" %option extra-type="TikzGraphAssembler *" + %s props %s xcoord %s ycoord diff --git a/tikzit/src/common/tikzparser.ym b/tikzit/src/common/tikzparser.ym index a6dc1ee..344e969 100644 --- a/tikzit/src/common/tikzparser.ym +++ b/tikzit/src/common/tikzparser.ym @@ -41,11 +41,11 @@ /* possible data types for semantic values */ %union { - NSPoint pt; - NSString *nsstr; - GraphElementProperty *prop; - GraphElementData *data; - Node *node; + NSString *nsstr; + GraphElementProperty *prop; + GraphElementData *data; + Node *node; + NSPoint pt; struct noderef noderef; } @@ -166,7 +166,9 @@ node: "\\node" optproperties nodename "at" COORD DELIMITEDSTRING ";" [node setLabel:$6]; [assembler addNodeToMap:node]; [[assembler graph] addNode:node]; +#if ! __has_feature(objc_arc) [node release]; +#endif }; optanchor: { $$ = nil; } | "." REFSTRING { $$ = $2; }; @@ -204,7 +206,9 @@ edge: "\\draw" optproperties noderef "to" optedgenode optnoderef ";" } [edge setAttributesFromData]; [[assembler graph] addEdge:edge]; +#if ! __has_feature(objc_arc) [edge release]; +#endif }; ignoreprop: val | val "=" val; |