Update print of nfa

Super3001 · Sep 20, 2019 · e2ce827 · e2ce827
1 parent 63f3240
commit e2ce827
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 27 deletions.
diff --git a/__pycache__/utils.cpython-37.pyc b/__pycache__/utils.cpython-37.pyc
diff --git a/nfa/construction.py b/nfa/construction.py
@@ -5,7 +5,6 @@
 from nfa.nfa import EPSILON
 from nfa.nfa import CCL
 from nfa.nfa import EMPTY
-from utils import log_nfa
 
 
 s = scanner()
@@ -32,7 +31,6 @@ def nfa_single_char(pair_out):
     pair_out.end_node = pair_out.start_node.next_1 = Nfa()
     start.edge = lexer.lexeme
     lexer.advance()
-    log_nfa(pair_out)
     return True
 
 
@@ -47,7 +45,6 @@ def nfa_dot_char(pair_out):
     start.set_input_set()
 
     lexer.advance()
-    log_nfa(pair_out)
     return False
 
 
@@ -63,7 +60,6 @@ def nfa_set_char(pair_out):
     dodash(start.input_set)
 
     lexer.advance()
-    log_nfa(pair_out)
     return True
 
 
@@ -97,7 +93,6 @@ def nfa_star_closure(pair_out):
     pair_out.end_node = end
 
     lexer.advance()
-    log_nfa(pair_out)
     return True
 
 
@@ -116,5 +111,4 @@ def nfa_plus_closure(pair_out):
     pair_out.end_node = end
 
     lexer.advance()
-    log_nfa(pair_out)
     return True
diff --git a/nfa/nfa.py b/nfa/nfa.py
@@ -1,3 +1,5 @@
+from utils import log
+
 # 对应的节点有两个出去的ε边
 EPSILON = -1
 # 边对应的是字符集
@@ -33,15 +35,14 @@ def __init__(self):
         self.end_node = None
 
 
-def debugNfa(start_node):
-    print('debug *******************')
-    if start_node is None:
-        return None
-    print('status num: ', start_node.status_num, 'edge: ', start_node.edge)
-    if start_node.next_1 is not None:
-        print('next 1: ', start_node.next_1.status_num)
-    if start_node.next_2 is not None:
-        print('next 2: ', start_node.next_2.status_num) 
+def log_nfa(start_node):
+    if start_node is None or (start_node.next_1 is None and start_node.next_2 is None) or start_node.visited:
+        return
+    log('from: ', start_node.status_num, 'to: ',
+        start_node.next_1.status_num, 'in: ', start_node.edge)
+    start_node.visited = True
+    if hasattr(start_node, 'input_set'):
+        log('input set: ', start_node.input_set)
 
-    debugNfa(start_node.next_1)
-    debugNfa(start_node.next_2)
+    log_nfa(start_node.next_1)
+    log_nfa(start_node.next_2)
diff --git a/test.py b/test.py
@@ -3,8 +3,8 @@
     nfa_star_closure,
     nfa_plus_closure,
 )
-from nfa.nfa import debugNfa
 from nfa.nfa import NfaPair
+from nfa.nfa import log_nfa
 
 
 nfa_pair = NfaPair()
@@ -14,9 +14,11 @@
 # node1.next_1 = Nfa() # 3
 # node1.next_1 = Nfa() # 4
 # node2.next_2 = Nfa() # 5
-term(nfa_pair)
-nfa_star_closure(nfa_pair)
+# term(nfa_pair)
+# nfa_star_closure(nfa_pair)
 term(nfa_pair)
 nfa_plus_closure(nfa_pair)
 # debugNfa(nfa_pair.start_node)
+log_nfa(nfa_pair.start_node)
+# print(nfa_pair.start_node.next_1)
 
diff --git a/utils.py b/utils.py
@@ -6,10 +6,3 @@ def log(*args, **kwargs):
     value = time.localtime(int(time.time()))
     dt = time.strftime(format, value)
     print(dt, *args, **kwargs)
-
-
-def log_nfa(pair_out):
-    log('from: ', pair_out.start_node.status_num, 'to: ',
-        pair_out.end_node.status_num, 'in: ', pair_out.start_node.edge)
-    if hasattr(pair_out.start_node, 'input_set'):
-        log('input set: ', pair_out.start_node.input_set)