Changeset 24515

Timestamp:

11/20/08 23:57:43 (7 weeks ago)

Author:

hiratara

Message:

OOP的になってなかったので修正
(なんか巻き戻ったので、再コミット)

Location:

lang/python/dfareg/branches/PLY200811/dfareg

Files:

• __init__.py (modified) (2 diffs)
• lexer.py (modified) (1 diff)
• parser.py (modified) (3 diffs)

lang/python/dfareg/branches/PLY200811/dfareg/__init__.py

@@ -6 +6 @@
 """
 import nfa2dfa
-import parser
+from parser  import Parser
+from lexer   import Lexer
 
 class Regexp(object):
@@ -15 +16 @@
 
     def _compile(self, debug=False):
-        nfa = parser.parse(self.regexp)
+        # コンパイル
+        lexer_        = Lexer(self.regexp)
+        parser_       = Parser(lexer_)
+        nfa           = parser_.expression()
         # 部分集合構成法
         self.dfa      = nfa2dfa.nfa2dfa(nfa)

lang/python/dfareg/branches/PLY200811/dfareg/lexer.py

@@ -40 +40 @@
     raise t
 
-lex.lex()
+class Lexer(object):
+    def __init__(self, regexp):
+        self.lexer = lex.lex()
+        self.lexer.input(regexp)

lang/python/dfareg/branches/PLY200811/dfareg/parser.py

@@ -14 +14 @@
 
 def p_subexpr1(p):
-    'subexpr : seq OPE_UNION subexpr'
+    'subexpr : subexpr OPE_UNION seq'
     p[0] = Union(p[1], p[3])
 
@@ -30 +30 @@
 
 def p_subseq1(p):
-    'subseq : star subseq'
+    'subseq : subseq star'
     p[0] = Concat(p[1], p[2])
 
@@ -56 +56 @@
     raise Exception("syntax error")
 
-yacc.yacc()
-
-
-from nfabuilder import Context
-def parse(regexp):
-    # コンパイル
-    node = yacc.parse(regexp)
-    # 構文木から変更
-    context  = Context()
-    fragment = node.assemble(context)
-    return fragment.build()
+class Parser(object):
+    def __init__(self, lexer):
+        self.yacc  = yacc.yacc()
+        self.lexer = lexer
+    def expression(self):
+        # コンパイル
+        node = self.yacc.parse(lexer=self.lexer.lexer)
+        # 構文木から変更
+        context  = Context()
+        fragment = node.assemble(context)
+        return fragment.build()