Fold EvalStringToAstsMixin into Frontend (#463)

* Fold EvalStringToAstsMixin into Frontend

* Whoops

* Clean it up a little

* Fix length calculation

* Better length calculation

claripy/frontend.py

@@ -52,7 +52,15 @@ def eval_to_ast(self, e, n, extra_constraints=(), exact=None):
 
         :return:                        list of concrete ASTs
         """
-        return [ast.bv.BVV(v, e.size()) for v in self.eval(e, n, extra_constraints=extra_constraints, exact=exact)]
+        values = self.eval(e, n, extra_constraints=extra_constraints, exact=exact)
+
+        if isinstance(e, ast.BV):
+            return [ast.bv.BVV(v, e.size()) for v in values]
+        if isinstance(e, ast.String):
+            return [ast.strings.StringV(v, length=e.string_length) for v in values]
+
+        # TODO: Implement support for other types
+        raise NotImplementedError
 
     def finalize(self):
         raise NotImplementedError("finalize() is not implemented")

claripy/frontend_mixins/__init__.py

@@ -11,4 +11,3 @@
 from .simplify_skipper_mixin import SimplifySkipperMixin
 from .composited_cache_mixin import CompositedCacheMixin
 from .sat_cache_mixin import SatCacheMixin
-from .eval_string_to_ast_mixin import EvalStringsToASTsMixin

claripy/solvers.py

@@ -109,7 +109,6 @@ class SolverStrings(
     frontend_mixins.ConstraintFilterMixin,
     frontend_mixins.ConstraintDeduplicatorMixin,
     frontend_mixins.EagerResolutionMixin,
-    frontend_mixins.EvalStringsToASTsMixin,
     frontends.FullFrontend,
 ):
     """SolverStrings is a frontend that uses Z3 to solve string constraints."""