Commits

Carl Friedrich Bolz committed 97cf684 Merge

merge compress-terms2

Comments (0)

Files changed (5)

prolog/interpreter/parsing.py

File contents unchanged.

prolog/interpreter/shape.py

         return self.signature().numargs
 
     @objectmodel.specialize.arg(3)
-    @jit.unroll_safe
-    def basic_unify(self, other, heap, occurs_check=False):
+    @jit.look_inside_iff(lambda self, other, heap, occurs_check:
+        jit.isvirtual(self) or jit.isvirtual(other) or
+        jit.isconstant(self) or jit.isconstant(other))
+    def basic_unify(self, other, heap, occurs_check):
         if (isinstance(other, ShapedCallableBase) and
                 self.get_shape() is other.get_shape()):
             for i in range(self.size_storage()):

prolog/interpreter/signature.py

File contents unchanged.

prolog/interpreter/term.py

File contents unchanged.

prolog/interpreter/test/test_resource_consumption.py

     e.run_query(query, e.modulewrapper.user_module, CheckContinuation(e))
 
 def test_exception():
+    py.test.skip("broken for now")
     e = get_engine("""
         f(0).
         f(X) :- X>0, X0 is X - 1, throw(continue(X0)).