Fix unhandled exception in interactive loop.

test/osh-usage.sh all-passing caught this.
oilshell · Aug 30, 2018 · 356ad17b9ec9c6add74bc035897b8565554165d9 · 356ad17
1 parent b7d44e5
commit 356ad17b9ec9c6add74bc035897b8565554165d9
Unified Split

Showing with 4 additions and 4 deletions.

+3 −0 core/lexer.py

+1 −4 osh/cmd_parse.py
diff --git a/core/lexer.py b/core/lexer.py
@@ -147,6 +147,9 @@ def __init__(self, line_lexer, line_reader):
    self.line_id = -1  # Invalid one
    self.translation_stack = []

+  def ResetInputObjects(self):
+    self.line_lexer.Reset('', -1, 0)
+
  def MaybeUnreadOne(self):
    return self.line_lexer.MaybeUnreadOne()

diff --git a/osh/cmd_parse.py b/osh/cmd_parse.py
@@ -153,10 +153,7 @@ def ResetInputObjects(self):
    """
    # All the stuff we read from
    self.w_parser.Reset()
-    #self.lexer.Reset()
-    # TODO: This should be a method on Lexer.  But I'm not sure if we want to
-    # reuse objects at all.
-    self.lexer.line_lexer.Reset('', -1)
+    self.lexer.ResetInputObjects()
    self.line_reader.Reset()

  def Error(self):