modified per hab's comment

Author: introom

ometa/interp.py

@@ -71,8 +71,7 @@ def end(self):
     def setNext(self, rule):
         if isinstance(rule, basestring):
             rule = (rule, )
-        if not isinstance(rule, (list, tuple)):
-            raise TypeError("rule should be a string, list or a tuple.")
+        rule = tuple(rule)
         return self.apply(rule[0], None, rule[1:])
 
 

ometa/test/test_tube.py

@@ -34,6 +34,7 @@ def setUp(self):
         _grammar =  r"""
             delimiter = '\r\n'
             initial = <(~delimiter anything)*>:val delimiter -> receiver.receive(val)
+            witharg :arg1 :arg2 = <(~delimiter anything)*>:a delimiter -> receiver.receive(arg1+arg2+a)
         """
         self.grammar = self._parseGrammar(_grammar)
 
@@ -75,3 +76,16 @@ def test_bindings(self):
         bindings = {'SMALL_INT': 3}
         TrampolinedParser(self._parseGrammar(grammar), receiver, bindings).receive('0')
         self.assertEqual(receiver.received, [3])
+
+
+    def test_currentRuleWithArgs(self):
+        """
+        TrampolinedParser should be able to invoke curruent rule with args.
+        """
+        receiver = TrampolinedReceiver()
+        receiver.currentRule = "witharg", "nice ", "day"
+        trampolinedParser = TrampolinedParser(self.grammar, receiver, {})
+        buf = b' oh yes\r\n'
+        for c in iterbytes(buf):
+            trampolinedParser.receive(c)
+        self.assertEqual(receiver.received, ["nice day oh yes"])