From 76057cb83de999eb62b7644a8d16282a3d4253bc Mon Sep 17 00:00:00 2001
From: Nick Downing <nick.downing@lifx.co>
Date: Mon, 27 Jan 2020 10:55:25 +1100
Subject: [PATCH] Update to use the installed pitree/pilex/piyacc including the
 new --install-element switch to pitree

---
 Makefile | 10 +++++-----
 ansi_c.l |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index ccbb7dd..ec53008 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,16 @@
 all: element.py lex_yy.py t_def.py y_tab.py
 
-element.py: ../pitree/ndcode/pitree/skel/element.py
-	cat $< >$@
+element.py:
+	pitree --install-element
 
 lex_yy.py: ansi_c.l
-	../pilex/pilex.py --element --python $<
+	pilex --element --python $<
 
 t_def.py: ansi_c.t
-	PYTHONPATH=../pitree ../pitree/ndcode/pitree/cli.py --python $<
+	pitree --python $<
 
 y_tab.py: ansi_c.y
-	../piyacc/piyacc.py --element --python $<
+	piyacc --element --python $<
 
 clean:
 	rm -f element.py lex_yy.py t_def.py y_tab.py
diff --git a/ansi_c.l b/ansi_c.l
index c394660..218d1e6 100644
--- a/ansi_c.l
+++ b/ansi_c.l
@@ -80,7 +80,7 @@ WS  [ \t\v\n\f]
 "_Thread_local"				return y_tab.THREAD_LOCAL
 "__func__"				return y_tab.FUNC_NAME
 
-FILE|GRAM_STYPE|YYLTYPE|assoc|bool|boundary|code_props|code_props_type|location|muscle_kind|named_ref|param_type|scanflags_t|size_t|symbol|symbol_class|symbol_list|uniqstr|variant|warnings|u?int(8|16|32|64)_t|BaseType_t {
+FILE|GRAM_STYPE|YYLTYPE|assoc|bool|boundary|code_props|code_props_type|location|muscle_kind|named_ref|param_type|scanflags_t|size_t|symbol|symbol_class|symbol_list|uniqstr|variant|warnings|u?int(8|16|32|64)_t|BaseType_t|TickType_t {
   # THIS IS A HACK FOR NOW
   return y_tab.TYPEDEF_NAME
 }
-- 
2.34.1