From 2aa4afed415b02add73c2dd5a3e9ccab90066d04 Mon Sep 17 00:00:00 2001
From: Alex Merry <dev@randomguy3.me.uk>
Date: Sat, 23 Mar 2013 00:45:23 +0000
Subject: 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).
---
 tikzit/src/common/tikzlexer.lm | 44 ++++++++++++++++++------------------------
 1 file changed, 19 insertions(+), 25 deletions(-)

(limited to 'tikzit/src/common/tikzlexer.lm')

diff --git a/tikzit/src/common/tikzlexer.lm b/tikzit/src/common/tikzlexer.lm
index 3fd7b53..ad99445 100644
--- a/tikzit/src/common/tikzlexer.lm
+++ b/tikzit/src/common/tikzlexer.lm
@@ -7,31 +7,25 @@
 FLOAT \-?[0-9]*(\.[0-9]+)?
 
 %{
-//
-//  tikzparser.l
-//  TikZiT
-//  
-//  Copyright 2010 Chris Heunen. All rights reserved.
-//  Copyright 2012 Aleks Kissinger
-//  Copyright 2012 KJ
-//  Copyright 2013 Alex Merry
-//  
-//  
-//  This file is part of TikZiT.
-//  
-//  TikZiT is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//  
-//  TikZiT is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//  
-//  You should have received a copy of the GNU General Public License
-//  along with TikZiT.  If not, see <http://www.gnu.org/licenses/>.
-//  
+/*
+ * Copyright 2010       Chris Heunen
+ * Copyright 2010-2013  Aleks Kissinger
+ * Copyright 2013       K. Johan Paulsson
+ * Copyright 2013       Alex Merry <dev@randomguy3.me.uk>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 #import <Foundation/Foundation.h>
 #ifdef __APPLE__
-- 
cgit v1.2.3