Fixed a Bug and modified printnfa function

lex/lexer.py

@@ -20,6 +20,7 @@ def advance(self):
         pos = self.pos
         pattern = self.pattern
         if pos > len(pattern) - 1:
+            self.current_token = Token.EOS
             return Token.EOS
 
         text = self.lexeme = pattern[pos]
@@ -73,5 +74,4 @@ def handle_hex(self):
         return 1
 
     def match(self, token):
-        return self.current_token == token
-
+        return self.current_token == token

nfa/construction.py

@@ -106,7 +106,6 @@ def is_conn(token):
         Token.CCL_END,
         Token.AT_BOL,
     ]
-    print(lexer.current_token, token not in nc)
     return token not in nc
 
 
@@ -172,7 +171,6 @@ def nfa_option_closure(pair_out):
 
     pair_out.start_node = start
     pair_out.end_node = end
-    print(lexer.current_token, '****')
+
     lexer.advance()
-    print(lexer.current_token, '****')
     return True

nfa/nfa.py

@@ -37,12 +37,21 @@ def __init__(self):
 
 def log_nfa(start_node):
     log('NFA: ******** ')
-    if start_node.next_1 is not None:
+    next_1 = start_node.next_1 is not None
+    next_2 = start_node.next_2 is not None
+    if next_1:
         log('from: ', start_node.status_num)
         log('to: ', start_node.next_1.status_num)
         log('in: ', start_node.edge)
-    else:
+
+    if next_2:
+        log('from: ', start_node.status_num)
+        log('to: ', start_node.next_2.status_num)
+        log('in: ', start_node.edge)
+
+    if not next_1 and not next_2:
         log('accept: ', start_node.status_num)    
+
     start_node.visited = True
     if hasattr(start_node, 'input_set'):
         log('input set: ', start_node.input_set)

test.py

@@ -6,6 +6,7 @@
 from nfa.nfa import (
     log_nfa,
 )
+from lex.lexer import Lexer
 
 
 nfa_pair = NfaPair()
@@ -22,4 +23,11 @@
 # debugNfa(nfa_pair.start_node)
 # factor(nfa_pair)
 factor_conn(nfa_pair)
-log_nfa(nfa_pair.start_node)
+log_nfa(nfa_pair.start_node)
+
+# lexer = Lexer('*asd[]')
+# print('len ', len('*asd[]'))
+# for i in range(10):
+#     lexer.advance()
+#     print(lexer.pos)
+#     print(lexer.current_token)