Fix bug in base96_single

Update requirements.txt
Update create_list to use a NumericLiteral

node/base96_single.py

@@ -2,6 +2,7 @@
 
 from nodes import Node
 
+
 class Base96Single(Node):
     char = "w"
     args = 0
@@ -14,6 +15,7 @@ def __init__(self, value):
     @Node.test_func([], [0], " ")
     @Node.test_func([], [1], "!")
     @Node.test_func([], [-32], "\x00")
+    @Node.test_func([], [4815162342], bytearray(b"\x91\xf8\x86\x98\x06"))
     def func(self):
         """Return ord(const_arg)-32"""
         return self.value
@@ -36,6 +38,7 @@ def accepts(cls, code, accept=False):
             value |= (new & 0x7F)
             value <<= 7
             new = code[0]
+            code = code[1:]
         value |= new
         value -= 32
         return code, cls(value)

node/create_list.py

@@ -10,7 +10,7 @@ class List(Node):
     default_arg = 2
     contents = []
 
-    def __init__(self, size: Node.Base10Single):
+    def __init__(self, size: Node.NumericLiteral):
         self.args = size
 
     def prepare(self, stack):

nodes.py

@@ -85,7 +85,8 @@ def __call__(self, args):
 
     def choose_function(self, args):
         funcs = {}
-        for cur_func in self.get_functions(self):
+        all_funcs = self.get_functions(self)
+        for cur_func in all_funcs:
             arg_types_dict = cur_func.__annotations__
             has_star_args = cur_func.__code__.co_flags & 4
             func_arg_names = cur_func.__code__.co_varnames[1:cur_func.__code__.co_argcount+has_star_args]
@@ -113,7 +114,7 @@ def choose_function(self, args):
         try:
             func = funcs[max(funcs.keys())]
         except ValueError:
-            sys.stderr.write("No valid func for node %r, args: %r. Trying with Map.\n"%(self.__class__.__name__, args))
+            sys.stderr.write("No valid func for node %r, args: %r (All: %r). Trying with Map.\n"%(self.__class__.__name__, args, all_funcs))
             return nodes["map"](self).choose_function(args)
         return func
 

requirements.txt

@@ -1,4 +1,4 @@
 flask
 python-dateutil
 pyephem
-flask-cache
+flask-caching

web.py

@@ -11,7 +11,7 @@
 from subprocess import Popen, PIPE, STDOUT, TimeoutExpired
 
 from flask import Flask, request, redirect, render_template, send_from_directory
-from flask_cache import Cache
+from flask_caching import Cache
 
 import explainer
 import lang_ast
@@ -221,14 +221,16 @@ def get_docs():
                     pass
                 for test in func.tests[::-1]:
                     try:
-                        #print(node, test, end=" ")
                         inp = literal_gen.stack_literal(test[0])
-                        #print(test)
                         if isinstance(test[-1], bytearray):
                             cmd = nodes.nodes[node].char + test[-1]
                         else:
                             cmd = nodes.nodes[node].char+bytearray(test[-1].encode("ascii"))
-                        lang_ast.test_code(inp+cmd, test[1])
+                        try:
+                            lang_ast.test_code(inp+cmd, test[1])
+                        except AssertionError:
+                            print(func)
+                            raise
                     except NotImplementedError:
                         func_doc["input"] = "Literal Undefined\n"
                         func_doc["output"] = str(test[1])+"\n"
@@ -240,8 +242,11 @@ def get_docs():
                                 cmd = "." + chr(cmd[0] & 0x7F) + cmd[1:].decode("ascii")
                             elif cmd[:1] == b"~":
                                 cmd = "~." + chr(cmd[1] & 0x7F)
-                        func_doc["input"] += (inp.decode("ascii")+cmd+"\n")
-                        func_doc["output"] += (str(test[1])+"\n")
+                        try:
+                            func_doc["input"] += (inp.decode("ascii")+cmd+"\n")
+                            func_doc["output"] += (str(test[1])+"\n")
+                        except TypeError:
+                            pass
                 func_doc["input"] = func_doc["input"][:-1]
                 func_doc["output"] = func_doc["output"][:-1]
                 func_doc["output"] = func_doc["output"].replace("<", "&lt;")