Fixed type issues in compression

Author: Theomat

synth/semantic/evaluator.py

@@ -1,5 +1,5 @@
 from abc import ABC, abstractmethod
-from typing import Any, Dict, List, Set, Callable
+from typing import Any, Dict, List, Set, Callable, Tuple
 
 from synth.syntax.program import Constant, Function, Primitive, Program, Variable
 
@@ -35,10 +35,10 @@ def __init__(self, semantics: Dict[Primitive, Any], use_cache: bool = True) -> N
         # Statistics
         self._total_requests = 0
         self._cache_hits = 0
-        self._dsl_constants: Dict[Any, Primitive] = {}
+        self._dsl_constants: Dict[Tuple[Type, Any], Primitive] = {}
         for p, val in semantics.items():
             if len(p.type.arguments()) == 0:
-                self._dsl_constants[__tuplify__(val)] = p
+                self._dsl_constants[(p.type, __tuplify__(val))] = p
 
     def compress(self, program: Program, allow_constants: bool = True) -> Program:
         """
@@ -61,8 +61,9 @@ def compress(self, program: Program, allow_constants: bool = True) -> Program:
                 if isinstance(value, Callable):  # type: ignore
                     return Function(program.function, args)
                 tval = __tuplify__(value)
-                if tval in self._dsl_constants:
-                    return self._dsl_constants[tval]
+                rtype = program.type
+                if (rtype, tval) in self._dsl_constants:
+                    return self._dsl_constants[(rtype, tval)]
                 if allow_constants:
                     return Constant(program.type.returns(), value, True)
                 else:

tests/semantic/test_evaluator.py

@@ -28,15 +28,12 @@
 dsl = DSL(syntax)
 cfg = CFG.depth_constraint(dsl, FunctionType(INT, INT), max_depth)
 
-other_syntax = {
-    "+1": FunctionType(INT, INT),
-    "0": INT,
-    "2": INT,
-}
+other_syntax = {"+1": FunctionType(INT, INT), "0": INT, "2": INT, "True": STRING}
 
 other_semantics = {
     "+1": lambda x: x + 1,
     "0": 0,
+    "True": True,
     "2": 2,
 }
 other_dsl = DSL(other_syntax)