From 8fc9bb237a4c7eecf49c91894d657395552b8621 Mon Sep 17 00:00:00 2001
From: David <allemang.d@gmail.com>
Date: Sun, 28 Oct 2018 02:44:39 -0400
Subject: [PATCH] package refactor

---
 main.py                 |  14 +++++
 thue/__init__.py        |   0
 thue/parser.py          | 100 ++++++++++++++++++++++++++++++++++++
 sub.py => thue/prods.py | 111 ++--------------------------------------
 4 files changed, 117 insertions(+), 108 deletions(-)
 create mode 100644 main.py
 create mode 100644 thue/__init__.py
 create mode 100644 thue/parser.py
 rename sub.py => thue/prods.py (56%)

diff --git a/main.py b/main.py
new file mode 100644
index 0000000..1c4ca07
--- /dev/null
+++ b/main.py
@@ -0,0 +1,14 @@
+import thue.parser
+
+
+def main():
+    with open('testing.ret') as f:
+        src = f.read()
+
+    pgm = thue.parser.compile(src)
+    res = pgm.run()
+    print(res)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/thue/__init__.py b/thue/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/thue/parser.py b/thue/parser.py
new file mode 100644
index 0000000..2f2b8d6
--- /dev/null
+++ b/thue/parser.py
@@ -0,0 +1,100 @@
+import re
+
+import lark
+from lark import Lark
+
+import thue.prods
+
+grammar = r'''
+program: suite
+
+suite: prod*
+
+?prod: _named_prod | _direct_prod
+
+_named_prod     : alias
+_direct_prod    : _compound_prod | _rule_prod | _literal_prod | _io_prod
+_io_prod  : output | input
+_compound_prod  : cont | sing
+_rule_prod      : full | part
+_literal_prod   : lit | ref
+
+alias : name "=" prod               // production alias
+output: "~" prod                    // output production
+input: ":::"                        // input production
+
+cont  : "{" suite "}"               // continual production
+sing  : "[" suite "]"               // singular production
+
+full  : _direct_prod "=>" prod      // full application
+part  : ctx "::=" prod              // partial application
+ref   : name                        // production reference
+
+lit   : STRING                      // literal production
+name  : CNAME                       // named production
+
+ctx   : REGEX
+
+CNAME : /[a-z_][a-z0-9_]*/i
+STRING: /(r)?(['"])(.*?)(?<!\\)\2/
+REGEX : /(r)?([\/])(.*?)(?<!\\)\2(i)?/
+
+%import common.WS
+%ignore WS
+'''
+
+STRING_PAT = re.compile(r'''(r)?(['"])(.*?)(?<!\\)\2''')
+REGEX_PAT = re.compile(r'''(r)?([/])(.*?)(?<!\\)\2(i)?''')
+ALL_PAT = re.compile(r'''^.*$''')
+
+
+class ProductionTransformer(lark.Transformer):
+    def suite(self, prods):
+        return thue.prods.Suite(prods)
+
+    def lit(self, prods):
+        fmt, = prods
+        match = STRING_PAT.match(fmt)
+        return thue.prods.Literal(match[3])
+
+    def ctx(self, prods):
+        reg, = prods
+        match = REGEX_PAT.match(reg)
+        return re.compile(match[3])
+
+    def input(self, prods):
+        return thue.prods.Input()
+
+    def output(self, prods):
+        prod, = prods
+        return thue.prods.Output(prod)
+
+    def full(self, prods):
+        lhs, rhs = prods
+        return thue.prods.Full(lhs, rhs)
+
+    def part(self, prods):
+        pat, rhs = prods
+        return thue.prods.Partial(pat, rhs)
+
+    def cont(self, prods):
+        suite, = prods
+        return thue.prods.Continual(suite)
+
+    def sing(self, prods):
+        suite, = prods
+        return thue.prods.Singular(suite)
+
+    def program(self, prods):
+        suite, = prods
+        return thue.prods.Program(suite)
+
+
+THUE_TRANSFORMER = ProductionTransformer()
+THUE_LARK = Lark(grammar, start='program')
+
+
+def compile(src):
+    tree = THUE_LARK.parse(src)
+    pgm = THUE_TRANSFORMER.transform(tree)
+    return pgm
diff --git a/sub.py b/thue/prods.py
similarity index 56%
rename from sub.py
rename to thue/prods.py
index b3d64fa..98ea052 100644
--- a/sub.py
+++ b/thue/prods.py
@@ -1,44 +1,6 @@
 import re
 
-from lark import Lark, InlineTransformer, Transformer
-
-grammar = r'''
-program: suite
-
-suite: prod*
-
-?prod: _named_prod | _direct_prod
-
-_named_prod     : alias
-_direct_prod    : _compound_prod | _rule_prod | _literal_prod | _io_prod
-_io_prod  : output | input
-_compound_prod  : cont | sing
-_rule_prod      : full | part
-_literal_prod   : lit | ref
-
-alias : name "=" prod               // production alias
-output: "~" prod                    // output production
-input: ":::"                        // input production
-
-cont  : "{" suite "}"               // continual production
-sing  : "[" suite "]"               // singular production
-
-full  : _direct_prod "=>" prod      // full application
-part  : ctx "::=" prod              // partial application
-ref   : name                        // production reference
-
-lit   : STRING                      // literal production
-name  : CNAME                       // named production
-
-ctx   : REGEX
-
-CNAME : /[a-z_][a-z0-9_]*/i
-STRING: /(r)?(['"])(.*?)(?<!\\)\2/
-REGEX : /(r)?([\/])(.*?)(?<!\\)\2(i)?/
-
-%import common.WS
-%ignore WS
-'''
+import thue.parser
 
 
 class Context:
@@ -59,7 +21,7 @@ class Context:
         return diff
 
     def expand(self, fmt):
-        self.match = ALL_PAT.match(self.string)
+        self.match = thue.parser.ALL_PAT.match(self.string)
         self.string = self.match.expand(fmt)
 
     def __str__(self):
@@ -119,7 +81,7 @@ class Input:
     def apply(self, ctx):
         ctx_ = ctx.enter()
         ctx_.string = input()
-        ctx_.match = ALL_PAT.match(ctx_.string)
+        ctx_.match = thue.parser.ALL_PAT.match(ctx_.string)
         return ctx.exit(ctx_)
 
     def __str__(self):
@@ -196,70 +158,3 @@ class Program:
 
     def __str__(self):
         return f'Program[{self.suite}]'
-
-
-STRING_PAT = re.compile(r'''(r)?(['"])(.*?)(?<!\\)\2''')
-REGEX_PAT = re.compile(r'''(r)?([/])(.*?)(?<!\\)\2(i)?''')
-ALL_PAT = re.compile(r'''^.*$''')
-
-
-class ProductionTransformer(Transformer):
-    def suite(self, prods):
-        return Suite(prods)
-
-    def lit(self, prods):
-        fmt, = prods
-        match = STRING_PAT.match(fmt)
-        return Literal(match[3])
-
-    def ctx(self, prods):
-        reg, = prods
-        match = REGEX_PAT.match(reg)
-        return re.compile(match[3])
-
-    def input(self, prods):
-        return Input()
-
-    def output(self, prods):
-        prod, = prods
-        return Output(prod)
-
-    def full(self, prods):
-        lhs, rhs = prods
-        return Full(lhs, rhs)
-
-    def part(self, prods):
-        pat, rhs = prods
-        return Partial(pat, rhs)
-
-    def cont(self, prods):
-        suite, = prods
-        return Continual(suite)
-
-    def sing(self, prods):
-        suite, = prods
-        return Singular(suite)
-
-    def program(self, prods):
-        suite, = prods
-        return Program(suite)
-
-
-def main():
-    lrk = Lark(grammar, start='program')
-
-    with open('testing.ret') as f:
-        src = f.read()
-
-    tree = lrk.parse(src)
-    print(tree.pretty())
-
-    tform = ProductionTransformer()
-    pgm = tform.transform(tree)
-    print(pgm)
-    print()
-    print(pgm.run())
-
-
-if __name__ == '__main__':
-    main()