Rename tokenizer to bas_to_tok, detokenizer to tok_to_bas, improve Makefile

diff --git a/.gitignore b/.gitignore
index 4b0f3e7..a5a627b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,8 @@
 *.tok
 __pycache__
-/detokenizer.py
+/bas_to_tok.py
 /element.py
 /lex_yy.py
-/tokenizer.py
+/tok_to_bas.py
 /t_def.py
 /y_tab.py

diff --git a/Makefile b/Makefile
index 77611e4..34cc206 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,10 @@
-all: element.py lex_yy.py t_def.py y_tab.py tokenizer.py detokenizer.py
+%.py: %.l
+       pilex --python -o __temp__.py $<
+       (echo '#!/usr/bin/env python3'; echo; cat __temp__.py) >$@
+       rm __temp__.py
+       chmod a+x $@
+
+all: element.py lex_yy.py t_def.py y_tab.py bas_to_tok.py tok_to_bas.py
 
 element.py:
        pitree --install-element
@@ -12,17 +18,16 @@ t_def.py: applesoft_basic.t
 y_tab.py: applesoft_basic.y
        piyacc --element --python $<
 
-tokenizer.py: tokenizer.l
-       pilex --python -o __temp__.py $<
-       (echo '#!/usr/bin/env python3'; echo; cat __temp__.py) >$@
-       rm __temp__.py
-       chmod a+x $@
+bas_to_tok.py: bas_to_tok.l
 
-detokenizer.py: detokenizer.l
-       pilex --python -o __temp__.py $<
-       (echo '#!/usr/bin/env python3'; echo; cat __temp__.py) >$@
-       rm __temp__.py
-       chmod a+x $@
+tok_to_bas.py: tok_to_bas.l
 
 clean:
-       rm -f element.py lex_yy.py t_def.py y_tab.py __temp__.py tokenizer.py detokenizer.py
+       rm -f \
+element.py \
+lex_yy.py \
+t_def.py \
+y_tab.py \
+__temp__.py \
+bas_to_tok.py \
+tok_to_bas.py

diff --git a/tokenizer.l b/bas_to_tok.l
similarity index 100%
rename from tokenizer.l
rename to bas_to_tok.l

diff --git a/detokenizer.l b/tok_to_bas.l
similarity index 100%
rename from detokenizer.l
rename to tok_to_bas.l