Bugfix

pyState/ListComp.py

@@ -9,13 +9,14 @@
 
 logger = logging.getLogger("pyState:ListComp")
 
-#import astunparse
+import astunparse
 
 def _findAllInputVariables(haystack):
     """
     Find all input variables (ast.Name objects). Return as a list
     """
     ret = []
+    print("type",type(haystack))
 
     if type(haystack) is ast.ListComp:
         for generator in haystack.generators:
@@ -35,8 +36,16 @@ def _findAllInputVariables(haystack):
         if haystack.kwargs is not None:
             for arg in haystack.kwargs:
                 ret += _findAllInputVariables(arg)
+        if type(haystack.func) is not ast.Name:
+            ret += _findAllInputVariables(haystack.func)
         return ret
 
+    if type(haystack) is ast.Attribute:
+        return [] + _findAllInputVariables(haystack.value)
+
+    if type(haystack) is ast.Subscript:
+        return [] + _findAllInputVariables(haystack.value)
+
     return []
 
 
@@ -105,7 +114,7 @@ def handle(state,element,ctx=None):
     for inputVar in allInputVars:
         fun.args.args.append(ast.arg(inputVar.id,0))
 
-    #print(astunparse.unparse(fun))
+    print(astunparse.unparse(fun))
 
     # Call our new function.
     state.Call(ast.parse("blergy({0})".format(','.join([x.id for x in allInputVars]))).body[0].value,func=fun,retObj=retObj)

pyState/functions/int.py

@@ -2,6 +2,7 @@
 from pyObjectManager.Real import Real
 from pyObjectManager.BitVec import BitVec
 from pyObjectManager.String import String
+from pyObjectManager.Char import Char
 import logging
 
 logger = logging.getLogger("pyState:functions:int")
@@ -14,7 +15,7 @@ def handle(state,call,obj,base=10):
     # Resolve the object
     obj = state.resolveObject(obj)
 
-    if type(obj) not in [Int, Real, BitVec, String]:
+    if type(obj) not in [Int, Real, BitVec, String, Char]:
         err = "handle: Don't know how to handle type {0}".format(type(obj))
         logger.error(err)
         raise Exception(err)