fix bug with parsing nested sexprs. rename types to avoid clash with standard module.

swolchok · swolchok · commit e0ef6396daaa · 2010-01-05T02:37:38.000-05:00
diff --git a/larktypes.py b/larktypes.py
diff --git a/sexpr.py b/sexpr.py
@@ -162,7 +162,7 @@ def feed(self, tokens):
           else:
             build = self.build_stack.pop()
             if self.build_stack:
-              nconc1(self.build_stack[-1], build)
+              self.build_stack[-1] = nconc1(self.build_stack[-1], build)
             else:
               self.feed_next(build)
     return self
diff --git a/test_sexpr.py b/test_sexpr.py
@@ -34,5 +34,9 @@ def testlist(self):
     self.assertEqual(sexpr.str2sexpr('(a b c)')[0],
                      list(Symbol('a'), Symbol('b'), Symbol('c')))
 
+  def testfncall(self):
+    self.assertEqual(sexpr.str2sexpr('((fn (a) a) 1)')[0],
+                     list(list(Symbol('fn'), list(Symbol('a')), Symbol('a')), 1))
+
 if __name__ == '__main__':
   unittest.main()
