Changeset 20885

Timestamp:

10/07/08 12:51:33 (6 weeks ago)

Author:

hiratara

Message:

マージは最低限の処理だけやるように修正。
元のFragmentを壊さないようにコピー化

Files:

• lang/python/dfareg/branches/codezine200809/dfareg/nfabuilder.py (modified) (7 diffs)

lang/python/dfareg/branches/codezine200809/dfareg/nfabuilder.py

@@ -2 +2 @@
 # -*- coding: utf-8 -*-
 import nfa
+import copy
 
 class NFAFragment(object):
@@ -31 +32 @@
     def __init__(self, context):
         self.context = context
-        self.accepts = set()
         self.map     = dict()
+        self.accepts = None  # should be set later
         self.start   = None  # should be set later
 
@@ -48 +49 @@
 
         new_frag = self.context.new_fragment()
-        new_frag.accepts = self.accepts.union(frag.accepts)
+
         new_frag.map     = dict()
         for k, v in self.map.iteritems():
-            new_frag.map[k] = v
+            new_frag.map[k] = copy.copy(v)
         for k, v in frag.map.iteritems():
-            new_frag.map[k] = v
+            new_frag.map[k] = copy.copy(v)
 
+        return new_frag
+
+    def new_skelton(self):
+        # コピーして返す
+        new_frag = self.context.new_fragment()
+        new_frag.map = copy.deepcopy(self.map)
         return new_frag
 
@@ -93 +100 @@
         frag.connect(a, "", frag1.start)
         frag.connect(a, "", frag2.start)
+
         frag.start = a
+        frag.accepts = frag1.accepts | frag2.accepts
 
         return frag
@@ -110 +119 @@
         for state in frag1.accepts:
             frag.connect(state, "", frag2.start)
-            frag.accepts.remove(state)
 
-        frag.start = frag1.start
+        frag.start   = frag1.start
+        frag.accepts = frag2.accepts
 
         return frag
@@ -121 +130 @@
 
     def assemble(self, context):
-        frag = self.operand.assemble(context)
-        for state in frag.accepts:
-            frag.connect(state, "", frag.start)
+        frag_orig = self.operand.assemble(context)
+        frag = frag_orig.new_skelton()
+
+        for state in frag_orig.accepts:
+            frag.connect(state, "", frag_orig.start)
 
         a = frag.new_state()
-        frag.accepts.add(a)
-        frag.connect(a, "", frag.start)
+        frag.connect(a, "", frag_orig.start)
 
         frag.start = a
+        frag.accepts = frag_orig.accepts | set([a])
 
         return frag
@@ -142 +153 @@
         b = frag.new_state()
         frag.connect(a, self.char, b)
-        frag.accepts.add(b)
+
         frag.start = a
+        frag.accepts = set([b])
+
         return frag