@tuprolog/2p-full 0.32.4 → 1.0.0

package/2p-solve-classic.js

@@ -208,11 +208,11 @@
   }
   function clone(context, $super) {
     context = context === VOID ? this.uc() : context;
-    return $super === VOID ? this.g37(context) : $super.g37.call(this, context);
+    return $super === VOID ? this.x37(context) : $super.x37.call(this, context);
   }
   setMetadataFor(State, 'State', interfaceMeta);
   function get_hasOpenAlternatives() {
-    return this.g2i().y1v() ? this.uc().f34() : false;
+    return this.x2i().g1w() ? this.uc().w34() : false;
   }
   function get_isEndState_0() {
     return true;
@@ -221,7 +221,7 @@
     return this;
   }
   function asEndState_1() {
-    return this.d37();
+    return this.u37();
   }
   setMetadataFor(EndState, 'EndState', interfaceMeta, VOID, [State]);
   setMetadataFor(AbstractState, 'AbstractState', classMeta, VOID, [State]);
@@ -254,7 +254,7 @@
   setMetadataFor(Companion_1, 'Companion', objectMeta);
   //endregion
   function AbstractClassicSolver_init_$Init$(unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings, trustKb, $this) {
-    unificator = unificator === VOID ? Companion_getInstance().g1l() : unificator;
+    unificator = unificator === VOID ? Companion_getInstance().c1l() : unificator;
     libraries = libraries === VOID ? Companion_instance.empty() : libraries;
     flags = flags === VOID ? Companion_getInstance_0().empty() : flags;
     staticKb = staticKb === VOID ? Companion_instance_0.empty(unificator) : staticKb;
@@ -264,7 +264,7 @@
     stdErr = stdErr === VOID ? Companion_instance_3.stdErr() : stdErr;
     warnings = warnings === VOID ? Companion_instance_3.warning() : warnings;
     trustKb = trustKb === VOID ? false : trustKb;
-    AbstractClassicSolver.call($this, unificator, libraries, flags, staticKb, dynamicKb, Companion_instance_4.i1y(stdIn), Companion_instance_5.l1y(stdOut, stdErr, warnings), trustKb);
+    AbstractClassicSolver.call($this, unificator, libraries, flags, staticKb, dynamicKb, Companion_instance_4.q1y(stdIn), Companion_instance_5.t1y(stdOut, stdErr, warnings), trustKb);
     return $this;
   }
   function updateCurrentContextAfterStateTransition($this, source, destination, index) {
@@ -272,12 +272,12 @@
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'kotlin.require' call
     // Inline function 'kotlin.contracts.contract' call
-    if (!destination.uc().b33_1.equals(index)) {
+    if (!destination.uc().s33_1.equals(index)) {
       // Inline function 'kotlin.require.<anonymous>' call
       var message = 'Failed requirement.';
       throw IllegalArgumentException_init_$Create$(toString(message));
     }
-    $this.i33(destination.uc());
+    $this.z33(destination.uc());
   }
   function AbstractClassicSolver$updateCurrentContextAfterStateTransition$ref($boundThis) {
     var l = function (p0, p1, p2) {
@@ -288,7 +288,7 @@
     return l;
   }
   function AbstractClassicSolver(unificator, libraries, flags, initialStaticKb, initialDynamicKb, inputChannels, outputChannels, trustKb) {
-    unificator = unificator === VOID ? Companion_getInstance().g1l() : unificator;
+    unificator = unificator === VOID ? Companion_getInstance().c1l() : unificator;
     libraries = libraries === VOID ? Companion_instance.empty() : libraries;
     flags = flags === VOID ? Companion_getInstance_0().empty() : flags;
     initialStaticKb = initialStaticKb === VOID ? Companion_instance_0.empty(unificator) : initialStaticKb;
@@ -298,97 +298,97 @@
     trustKb = trustKb === VOID ? false : trustKb;
     AbstractSolver.call(this, unificator, libraries, flags, initialStaticKb, initialDynamicKb, inputChannels, outputChannels, trustKb);
   }
-  protoOf(AbstractClassicSolver).i33 = function (_set____db54di) {
-    this.h33_1 = _set____db54di;
+  protoOf(AbstractClassicSolver).z33 = function (_set____db54di) {
+    this.y33_1 = _set____db54di;
   };
-  protoOf(AbstractClassicSolver).c2b = function (_set____db54di) {
-    return this.i33(_set____db54di instanceof ClassicExecutionContext ? _set____db54di : THROW_CCE());
+  protoOf(AbstractClassicSolver).k2b = function (_set____db54di) {
+    return this.z33(_set____db54di instanceof ClassicExecutionContext ? _set____db54di : THROW_CCE());
   };
-  protoOf(AbstractClassicSolver).a2b = function () {
-    var tmp = this.h33_1;
+  protoOf(AbstractClassicSolver).i2b = function () {
+    var tmp = this.y33_1;
     if (!(tmp == null))
       return tmp;
     else {
       throwUninitializedPropertyAccessException('currentContext');
     }
   };
-  protoOf(AbstractClassicSolver).b2b = function (unificator, libraries, flags, staticKb, dynamicKb, operators, inputChannels, outputChannels, trustKb) {
+  protoOf(AbstractClassicSolver).j2b = function (unificator, libraries, flags, staticKb, dynamicKb, operators, inputChannels, outputChannels, trustKb) {
     return new ClassicExecutionContext(VOID, unificator, libraries, flags, trustKb ? staticKb.toImmutableTheory() : Companion_instance_0.empty(unificator), trustKb ? dynamicKb.toMutableTheory() : Companion_instance_1.empty(unificator), toOperatorSet(getAllOperators(libraries, [])), inputChannels, outputChannels, VOID, VOID, VOID, VOID, VOID, VOID, new Long(0, 0));
   };
-  protoOf(AbstractClassicSolver).i2b = function (goal, options) {
-    var tmp0_unificator = this.j1l();
-    var tmp1_libraries = this.u1u();
-    var tmp2_flags = this.v1u();
-    var tmp3_staticKb = this.w1u().toImmutableTheory();
-    var tmp4_dynamicKb = this.x1u().toMutableTheory();
-    var tmp5_operators = this.d1v();
-    var tmp6_inputChannels = this.y1u();
-    var tmp7_outputChannels = this.z1u();
-    var tmp8_customData = this.a2b().q32_1;
+  protoOf(AbstractClassicSolver).q2b = function (goal, options) {
+    var tmp0_unificator = this.f1l();
+    var tmp1_libraries = this.c1v();
+    var tmp2_flags = this.d1v();
+    var tmp3_staticKb = this.e1v().toImmutableTheory();
+    var tmp4_dynamicKb = this.f1v().toMutableTheory();
+    var tmp5_operators = this.l1v();
+    var tmp6_inputChannels = this.g1v();
+    var tmp7_outputChannels = this.h1v();
+    var tmp8_customData = this.i2b().h33_1;
     var tmp9_startTime = currentTimeInstant();
-    var tmp10_maxDuration = options.c1x();
-    this.i33(new ClassicExecutionContext(VOID, tmp0_unificator, tmp1_libraries, tmp2_flags, tmp3_staticKb, tmp4_dynamicKb, tmp5_operators, tmp6_inputChannels, tmp7_outputChannels, tmp8_customData, VOID, goal, VOID, VOID, VOID, tmp9_startTime, tmp10_maxDuration));
-    var tmp = new StateInit(this.a2b());
-    return asSequence(this.j33(tmp, AbstractClassicSolver$updateCurrentContextAfterStateTransition$ref(this)));
+    var tmp10_maxDuration = options.k1x();
+    this.z33(new ClassicExecutionContext(VOID, tmp0_unificator, tmp1_libraries, tmp2_flags, tmp3_staticKb, tmp4_dynamicKb, tmp5_operators, tmp6_inputChannels, tmp7_outputChannels, tmp8_customData, VOID, goal, VOID, VOID, VOID, tmp9_startTime, tmp10_maxDuration));
+    var tmp = new StateInit(this.i2b());
+    return asSequence(this.a34(tmp, AbstractClassicSolver$updateCurrentContextAfterStateTransition$ref(this)));
   };
   function Primitives(alternatives, executionContext, parent, depth) {
     ChoicePointContext.call(this, alternatives, executionContext, parent, depth);
-    this.o33_1 = alternatives;
-    this.p33_1 = executionContext;
-    this.q33_1 = parent;
-    this.r33_1 = depth;
+    this.f34_1 = alternatives;
+    this.g34_1 = executionContext;
+    this.h34_1 = parent;
+    this.i34_1 = depth;
   }
-  protoOf(Primitives).s33 = function () {
-    return this.o33_1;
+  protoOf(Primitives).j34 = function () {
+    return this.f34_1;
   };
-  protoOf(Primitives).t33 = function () {
-    return this.p33_1;
+  protoOf(Primitives).k34 = function () {
+    return this.g34_1;
   };
-  protoOf(Primitives).u33 = function () {
-    return this.q33_1;
+  protoOf(Primitives).l34 = function () {
+    return this.h34_1;
   };
-  protoOf(Primitives).v33 = function () {
-    return this.r33_1;
+  protoOf(Primitives).m34 = function () {
+    return this.i34_1;
   };
   protoOf(Primitives).toString = function () {
     return protoOf(ChoicePointContext).toString.call(this);
   };
-  protoOf(Primitives).w33 = function () {
+  protoOf(Primitives).n34 = function () {
     return 'Primitives';
   };
-  protoOf(Primitives).x33 = function (context) {
-    var tmp0_$this = ensureNotNull(this.p33_1);
-    var tmp1_primitives = this.o33_1;
+  protoOf(Primitives).o34 = function (context) {
+    var tmp0_$this = ensureNotNull(this.g34_1);
+    var tmp1_primitives = this.f34_1;
     // Inline function 'kotlin.Long.plus' call
-    var tmp2_step = context.b33_1.ob(toLong(1));
-    var tmp3_startTime = context.w32_1;
-    var tmp4_flags = context.k32_1;
-    var tmp5_dynamicKb = context.m32_1;
-    var tmp6_staticKb = context.l32_1;
-    var tmp7_operators = context.n32_1;
-    var tmp8_inputChannels = context.o32_1;
-    var tmp9_outputChannels = context.p32_1;
-    var tmp10_libraries = context.j32_1;
-    var tmp11_customData = context.q32_1.discardEphemeral();
-    var tempContext = tmp0_$this.y33(VOID, VOID, tmp10_libraries, tmp4_flags, tmp6_staticKb, tmp5_dynamicKb, tmp7_operators, tmp8_inputChannels, tmp9_outputChannels, tmp11_customData, VOID, VOID, VOID, VOID, tmp1_primitives, tmp3_startTime, VOID, VOID, VOID, VOID, tmp2_step);
-    var nextChoicePointContext = this.z33(this.o33_1.er(), tempContext);
-    return tempContext.y33(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, nextChoicePointContext);
-  };
-  protoOf(Primitives).a34 = function (alternatives, executionContext, parent, depth) {
+    var tmp2_step = context.s33_1.ob(toLong(1));
+    var tmp3_startTime = context.n33_1;
+    var tmp4_flags = context.b33_1;
+    var tmp5_dynamicKb = context.d33_1;
+    var tmp6_staticKb = context.c33_1;
+    var tmp7_operators = context.e33_1;
+    var tmp8_inputChannels = context.f33_1;
+    var tmp9_outputChannels = context.g33_1;
+    var tmp10_libraries = context.a33_1;
+    var tmp11_customData = context.h33_1.discardEphemeral();
+    var tempContext = tmp0_$this.p34(VOID, VOID, tmp10_libraries, tmp4_flags, tmp6_staticKb, tmp5_dynamicKb, tmp7_operators, tmp8_inputChannels, tmp9_outputChannels, tmp11_customData, VOID, VOID, VOID, VOID, tmp1_primitives, tmp3_startTime, VOID, VOID, VOID, VOID, tmp2_step);
+    var nextChoicePointContext = this.q34(this.f34_1.er(), tempContext);
+    return tempContext.p34(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, nextChoicePointContext);
+  };
+  protoOf(Primitives).r34 = function (alternatives, executionContext, parent, depth) {
     return new Primitives(alternatives, executionContext, parent, depth);
   };
-  protoOf(Primitives).z33 = function (alternatives, executionContext, parent, depth, $super) {
-    alternatives = alternatives === VOID ? this.o33_1 : alternatives;
-    executionContext = executionContext === VOID ? this.p33_1 : executionContext;
-    parent = parent === VOID ? this.q33_1 : parent;
-    depth = depth === VOID ? this.r33_1 : depth;
-    return $super === VOID ? this.a34(alternatives, executionContext, parent, depth) : $super.a34.call(this, alternatives, executionContext, parent, depth);
+  protoOf(Primitives).q34 = function (alternatives, executionContext, parent, depth, $super) {
+    alternatives = alternatives === VOID ? this.f34_1 : alternatives;
+    executionContext = executionContext === VOID ? this.g34_1 : executionContext;
+    parent = parent === VOID ? this.h34_1 : parent;
+    depth = depth === VOID ? this.i34_1 : depth;
+    return $super === VOID ? this.r34(alternatives, executionContext, parent, depth) : $super.r34.call(this, alternatives, executionContext, parent, depth);
   };
   protoOf(Primitives).hashCode = function () {
-    var result = hashCode(this.o33_1);
-    result = imul(result, 31) + (this.p33_1 == null ? 0 : this.p33_1.hashCode()) | 0;
-    result = imul(result, 31) + (this.q33_1 == null ? 0 : hashCode(this.q33_1)) | 0;
-    result = imul(result, 31) + this.r33_1 | 0;
+    var result = hashCode(this.f34_1);
+    result = imul(result, 31) + (this.g34_1 == null ? 0 : this.g34_1.hashCode()) | 0;
+    result = imul(result, 31) + (this.h34_1 == null ? 0 : hashCode(this.h34_1)) | 0;
+    result = imul(result, 31) + this.i34_1 | 0;
     return result;
   };
   protoOf(Primitives).equals = function (other) {
@@ -397,74 +397,74 @@
     if (!(other instanceof Primitives))
       return false;
     var tmp0_other_with_cast = other instanceof Primitives ? other : THROW_CCE();
-    if (!equals(this.o33_1, tmp0_other_with_cast.o33_1))
+    if (!equals(this.f34_1, tmp0_other_with_cast.f34_1))
       return false;
-    if (!equals(this.p33_1, tmp0_other_with_cast.p33_1))
+    if (!equals(this.g34_1, tmp0_other_with_cast.g34_1))
       return false;
-    if (!equals(this.q33_1, tmp0_other_with_cast.q33_1))
+    if (!equals(this.h34_1, tmp0_other_with_cast.h34_1))
       return false;
-    if (!(this.r33_1 === tmp0_other_with_cast.r33_1))
+    if (!(this.i34_1 === tmp0_other_with_cast.i34_1))
       return false;
     return true;
   };
   function Rules(alternatives, executionContext, parent, depth) {
     ChoicePointContext.call(this, alternatives, executionContext, parent, depth);
-    this.n34_1 = alternatives;
-    this.o34_1 = executionContext;
-    this.p34_1 = parent;
-    this.q34_1 = depth;
+    this.e35_1 = alternatives;
+    this.f35_1 = executionContext;
+    this.g35_1 = parent;
+    this.h35_1 = depth;
   }
-  protoOf(Rules).s33 = function () {
-    return this.n34_1;
+  protoOf(Rules).j34 = function () {
+    return this.e35_1;
   };
-  protoOf(Rules).t33 = function () {
-    return this.o34_1;
+  protoOf(Rules).k34 = function () {
+    return this.f35_1;
   };
-  protoOf(Rules).u33 = function () {
-    return this.p34_1;
+  protoOf(Rules).l34 = function () {
+    return this.g35_1;
   };
-  protoOf(Rules).v33 = function () {
-    return this.q34_1;
+  protoOf(Rules).m34 = function () {
+    return this.h35_1;
   };
   protoOf(Rules).toString = function () {
     return protoOf(ChoicePointContext).toString.call(this);
   };
-  protoOf(Rules).w33 = function () {
+  protoOf(Rules).n34 = function () {
     return 'Rules';
   };
-  protoOf(Rules).x33 = function (context) {
-    var tmp0_$this = ensureNotNull(this.o34_1);
-    var tmp1_rules = this.n34_1;
+  protoOf(Rules).o34 = function (context) {
+    var tmp0_$this = ensureNotNull(this.f35_1);
+    var tmp1_rules = this.e35_1;
     // Inline function 'kotlin.Long.plus' call
-    var tmp2_step = context.b33_1.ob(toLong(1));
-    var tmp3_startTime = context.w32_1;
-    var tmp4_flags = context.k32_1;
-    var tmp5_dynamicKb = context.m32_1;
-    var tmp6_staticKb = context.l32_1;
-    var tmp7_operators = context.n32_1;
-    var tmp8_inputChannels = context.o32_1;
-    var tmp9_outputChannels = context.p32_1;
-    var tmp10_libraries = context.j32_1;
-    var tmp11_customData = context.q32_1.discardEphemeral();
-    var tempContext = tmp0_$this.y33(VOID, VOID, tmp10_libraries, tmp4_flags, tmp6_staticKb, tmp5_dynamicKb, tmp7_operators, tmp8_inputChannels, tmp9_outputChannels, tmp11_customData, VOID, VOID, VOID, tmp1_rules, VOID, tmp3_startTime, VOID, VOID, VOID, VOID, tmp2_step);
-    var nextChoicePointContext = this.r34(this.n34_1.er(), tempContext);
-    return tempContext.y33(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, nextChoicePointContext);
-  };
-  protoOf(Rules).s34 = function (alternatives, executionContext, parent, depth) {
+    var tmp2_step = context.s33_1.ob(toLong(1));
+    var tmp3_startTime = context.n33_1;
+    var tmp4_flags = context.b33_1;
+    var tmp5_dynamicKb = context.d33_1;
+    var tmp6_staticKb = context.c33_1;
+    var tmp7_operators = context.e33_1;
+    var tmp8_inputChannels = context.f33_1;
+    var tmp9_outputChannels = context.g33_1;
+    var tmp10_libraries = context.a33_1;
+    var tmp11_customData = context.h33_1.discardEphemeral();
+    var tempContext = tmp0_$this.p34(VOID, VOID, tmp10_libraries, tmp4_flags, tmp6_staticKb, tmp5_dynamicKb, tmp7_operators, tmp8_inputChannels, tmp9_outputChannels, tmp11_customData, VOID, VOID, VOID, tmp1_rules, VOID, tmp3_startTime, VOID, VOID, VOID, VOID, tmp2_step);
+    var nextChoicePointContext = this.i35(this.e35_1.er(), tempContext);
+    return tempContext.p34(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, nextChoicePointContext);
+  };
+  protoOf(Rules).j35 = function (alternatives, executionContext, parent, depth) {
     return new Rules(alternatives, executionContext, parent, depth);
   };
-  protoOf(Rules).r34 = function (alternatives, executionContext, parent, depth, $super) {
-    alternatives = alternatives === VOID ? this.n34_1 : alternatives;
-    executionContext = executionContext === VOID ? this.o34_1 : executionContext;
-    parent = parent === VOID ? this.p34_1 : parent;
-    depth = depth === VOID ? this.q34_1 : depth;
-    return $super === VOID ? this.s34(alternatives, executionContext, parent, depth) : $super.s34.call(this, alternatives, executionContext, parent, depth);
+  protoOf(Rules).i35 = function (alternatives, executionContext, parent, depth, $super) {
+    alternatives = alternatives === VOID ? this.e35_1 : alternatives;
+    executionContext = executionContext === VOID ? this.f35_1 : executionContext;
+    parent = parent === VOID ? this.g35_1 : parent;
+    depth = depth === VOID ? this.h35_1 : depth;
+    return $super === VOID ? this.j35(alternatives, executionContext, parent, depth) : $super.j35.call(this, alternatives, executionContext, parent, depth);
   };
   protoOf(Rules).hashCode = function () {
-    var result = hashCode(this.n34_1);
-    result = imul(result, 31) + (this.o34_1 == null ? 0 : this.o34_1.hashCode()) | 0;
-    result = imul(result, 31) + (this.p34_1 == null ? 0 : hashCode(this.p34_1)) | 0;
-    result = imul(result, 31) + this.q34_1 | 0;
+    var result = hashCode(this.e35_1);
+    result = imul(result, 31) + (this.f35_1 == null ? 0 : this.f35_1.hashCode()) | 0;
+    result = imul(result, 31) + (this.g35_1 == null ? 0 : hashCode(this.g35_1)) | 0;
+    result = imul(result, 31) + this.h35_1 | 0;
     return result;
   };
   protoOf(Rules).equals = function (other) {
@@ -473,28 +473,28 @@
     if (!(other instanceof Rules))
       return false;
     var tmp0_other_with_cast = other instanceof Rules ? other : THROW_CCE();
-    if (!equals(this.n34_1, tmp0_other_with_cast.n34_1))
+    if (!equals(this.e35_1, tmp0_other_with_cast.e35_1))
       return false;
-    if (!equals(this.o34_1, tmp0_other_with_cast.o34_1))
+    if (!equals(this.f35_1, tmp0_other_with_cast.f35_1))
       return false;
-    if (!equals(this.p34_1, tmp0_other_with_cast.p34_1))
+    if (!equals(this.g35_1, tmp0_other_with_cast.g35_1))
       return false;
-    if (!(this.q34_1 === tmp0_other_with_cast.q34_1))
+    if (!(this.h35_1 === tmp0_other_with_cast.h35_1))
       return false;
     return true;
   };
   function ChoicePointContext$_get_pathToRoot_$slambda_q0myjn(this$0, resultContinuation) {
-    this.b35_1 = this$0;
+    this.s35_1 = this$0;
     CoroutineImpl.call(this, resultContinuation);
   }
-  protoOf(ChoicePointContext$_get_pathToRoot_$slambda_q0myjn).e35 = function ($this$sequence, $completion) {
-    var tmp = this.f35($this$sequence, $completion);
+  protoOf(ChoicePointContext$_get_pathToRoot_$slambda_q0myjn).v35 = function ($this$sequence, $completion) {
+    var tmp = this.w35($this$sequence, $completion);
     tmp.pc_1 = Unit_instance;
     tmp.qc_1 = null;
     return tmp.yc();
   };
   protoOf(ChoicePointContext$_get_pathToRoot_$slambda_q0myjn).ld = function (p1, $completion) {
-    return this.e35(p1 instanceof SequenceScope ? p1 : THROW_CCE(), $completion);
+    return this.v35(p1 instanceof SequenceScope ? p1 : THROW_CCE(), $completion);
   };
   protoOf(ChoicePointContext$_get_pathToRoot_$slambda_q0myjn).yc = function () {
     var suspendResult = this.pc_1;
@@ -504,24 +504,24 @@
         switch (tmp) {
           case 0:
             this.oc_1 = 4;
-            this.d35_1 = this.b35_1;
+            this.u35_1 = this.s35_1;
             this.nc_1 = 1;
             continue $sm;
           case 1:
-            if (!!(this.d35_1 == null)) {
+            if (!!(this.u35_1 == null)) {
               this.nc_1 = 3;
               continue $sm;
             }
 
             this.nc_1 = 2;
-            suspendResult = this.c35_1.ef(ensureNotNull(this.d35_1), this);
+            suspendResult = this.t35_1.ef(ensureNotNull(this.u35_1), this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
 
             continue $sm;
           case 2:
-            this.d35_1 = this.d35_1.u33();
+            this.u35_1 = this.u35_1.l34();
             this.nc_1 = 1;
             continue $sm;
           case 3:
@@ -540,47 +540,47 @@
       }
      while (true);
   };
-  protoOf(ChoicePointContext$_get_pathToRoot_$slambda_q0myjn).f35 = function ($this$sequence, completion) {
-    var i = new ChoicePointContext$_get_pathToRoot_$slambda_q0myjn(this.b35_1, completion);
-    i.c35_1 = $this$sequence;
+  protoOf(ChoicePointContext$_get_pathToRoot_$slambda_q0myjn).w35 = function ($this$sequence, completion) {
+    var i = new ChoicePointContext$_get_pathToRoot_$slambda_q0myjn(this.s35_1, completion);
+    i.t35_1 = $this$sequence;
     return i;
   };
   function ChoicePointContext$_get_pathToRoot_$slambda_q0myjn_0(this$0, resultContinuation) {
     var i = new ChoicePointContext$_get_pathToRoot_$slambda_q0myjn(this$0, resultContinuation);
     var l = function ($this$sequence, $completion) {
-      return i.e35($this$sequence, $completion);
+      return i.v35($this$sequence, $completion);
     };
     l.$arity = 1;
     return l;
   }
   function ChoicePointContext(alternatives, executionContext, parent, depth) {
     depth = depth === VOID ? 0 : depth;
-    this.b34_1 = alternatives;
-    this.c34_1 = executionContext;
-    this.d34_1 = parent;
-    this.e34_1 = depth;
+    this.s34_1 = alternatives;
+    this.t34_1 = executionContext;
+    this.u34_1 = parent;
+    this.v34_1 = depth;
   }
-  protoOf(ChoicePointContext).s33 = function () {
-    return this.b34_1;
+  protoOf(ChoicePointContext).j34 = function () {
+    return this.s34_1;
   };
-  protoOf(ChoicePointContext).t33 = function () {
-    return this.c34_1;
+  protoOf(ChoicePointContext).k34 = function () {
+    return this.t34_1;
   };
-  protoOf(ChoicePointContext).u33 = function () {
-    return this.d34_1;
+  protoOf(ChoicePointContext).l34 = function () {
+    return this.u34_1;
   };
-  protoOf(ChoicePointContext).v33 = function () {
-    return this.e34_1;
+  protoOf(ChoicePointContext).m34 = function () {
+    return this.v34_1;
   };
-  protoOf(ChoicePointContext).f34 = function () {
+  protoOf(ChoicePointContext).w34 = function () {
     var tmp$ret$1;
     $l$block: {
       // Inline function 'kotlin.sequences.any' call
-      var tmp0_iterator = this.g34().r();
+      var tmp0_iterator = this.x34().r();
       while (tmp0_iterator.s()) {
         var element = tmp0_iterator.u();
         // Inline function 'it.unibo.tuprolog.solve.classic.ChoicePointContext.<get-hasOpenAlternatives>.<anonymous>' call
-        if (element.s33().gr()) {
+        if (element.j34().gr()) {
           tmp$ret$1 = true;
           break $l$block;
         }
@@ -589,63 +589,63 @@
     }
     return tmp$ret$1;
   };
-  protoOf(ChoicePointContext).g34 = function () {
+  protoOf(ChoicePointContext).x34 = function () {
     return sequence(ChoicePointContext$_get_pathToRoot_$slambda_q0myjn_0(this, null));
   };
-  protoOf(ChoicePointContext).h34 = function () {
-    var tmp0_safe_receiver = this.t33();
-    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.a33_1;
+  protoOf(ChoicePointContext).y34 = function () {
+    var tmp0_safe_receiver = this.k34();
+    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.r33_1;
   };
-  protoOf(ChoicePointContext).i34 = function () {
-    var tmp0_safe_receiver = this.t33();
-    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.h32_1;
+  protoOf(ChoicePointContext).z34 = function () {
+    var tmp0_safe_receiver = this.k34();
+    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.y32_1;
   };
   protoOf(ChoicePointContext).toString = function () {
-    var tmp = this.w33() + '(' + ('alternatives=' + this.s33() + ', ');
+    var tmp = this.n34() + '(' + ('alternatives=' + this.j34() + ', ');
     var tmp_0;
-    if (this.t33() === null) {
-      tmp_0 = 'executionContext=' + this.t33() + ', ';
+    if (this.k34() === null) {
+      tmp_0 = 'executionContext=' + this.k34() + ', ';
     } else {
-      'executionContextDepth=' + this.h34() + ', ';
-      tmp_0 = 'executionContextProcedure=' + this.i34() + ', ';
+      'executionContextDepth=' + this.y34() + ', ';
+      tmp_0 = 'executionContextProcedure=' + this.z34() + ', ';
     }
-    return tmp + tmp_0 + ('depth=' + this.v33()) + ')';
+    return tmp + tmp_0 + ('depth=' + this.m34()) + ')';
   };
   function appendRules(_this__u8e3s4, alternatives, executionContext) {
     executionContext = executionContext === VOID ? null : executionContext;
     return new Rules(alternatives, executionContext, _this__u8e3s4, nextDepth(_this__u8e3s4));
   }
   function nextDepth(_this__u8e3s4) {
-    return _this__u8e3s4 == null ? 0 : _this__u8e3s4.v33() + 1 | 0;
+    return _this__u8e3s4 == null ? 0 : _this__u8e3s4.m34() + 1 | 0;
   }
   function appendPrimitives(_this__u8e3s4, alternatives, executionContext) {
     executionContext = executionContext === VOID ? null : executionContext;
     return new Primitives(alternatives, executionContext, _this__u8e3s4, nextDepth(_this__u8e3s4));
   }
   function _get_locallyInterestingVariables__39cqti($this) {
-    var tmp = asSequence_0($this.c33_1);
-    var tmp0_safe_receiver = $this.t32_1.fr();
+    var tmp = asSequence_0($this.t33_1);
+    var tmp0_safe_receiver = $this.k33_1.fr();
     var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.sw();
     return plus(tmp, tmp1_elvis_lhs == null ? emptySequence() : tmp1_elvis_lhs);
   }
   function _get_interestingVariables__k6uw5o($this) {
     // Inline function 'kotlin.getValue' call
-    var this_0 = $this.f33_1;
+    var this_0 = $this.w33_1;
     interestingVariables$factory();
     return this_0.r2();
   }
   function ClassicExecutionContext$pathToRoot$slambda(this$0, resultContinuation) {
-    this.o35_1 = this$0;
+    this.f36_1 = this$0;
     CoroutineImpl.call(this, resultContinuation);
   }
-  protoOf(ClassicExecutionContext$pathToRoot$slambda).r35 = function ($this$sequence, $completion) {
-    var tmp = this.s35($this$sequence, $completion);
+  protoOf(ClassicExecutionContext$pathToRoot$slambda).i36 = function ($this$sequence, $completion) {
+    var tmp = this.j36($this$sequence, $completion);
     tmp.pc_1 = Unit_instance;
     tmp.qc_1 = null;
     return tmp.yc();
   };
   protoOf(ClassicExecutionContext$pathToRoot$slambda).ld = function (p1, $completion) {
-    return this.r35(p1 instanceof SequenceScope ? p1 : THROW_CCE(), $completion);
+    return this.i36(p1 instanceof SequenceScope ? p1 : THROW_CCE(), $completion);
   };
   protoOf(ClassicExecutionContext$pathToRoot$slambda).yc = function () {
     var suspendResult = this.pc_1;
@@ -655,24 +655,24 @@
         switch (tmp) {
           case 0:
             this.oc_1 = 4;
-            this.q35_1 = this.o35_1;
+            this.h36_1 = this.f36_1;
             this.nc_1 = 1;
             continue $sm;
           case 1:
-            if (!!(this.q35_1 == null)) {
+            if (!!(this.h36_1 == null)) {
               this.nc_1 = 3;
               continue $sm;
             }
 
             this.nc_1 = 2;
-            suspendResult = this.p35_1.ef(this.q35_1, this);
+            suspendResult = this.g36_1.ef(this.h36_1, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
 
             continue $sm;
           case 2:
-            this.q35_1 = this.q35_1.z32_1;
+            this.h36_1 = this.h36_1.q33_1;
             this.nc_1 = 1;
             continue $sm;
           case 3:
@@ -691,15 +691,15 @@
       }
      while (true);
   };
-  protoOf(ClassicExecutionContext$pathToRoot$slambda).s35 = function ($this$sequence, completion) {
-    var i = new ClassicExecutionContext$pathToRoot$slambda(this.o35_1, completion);
-    i.p35_1 = $this$sequence;
+  protoOf(ClassicExecutionContext$pathToRoot$slambda).j36 = function ($this$sequence, completion) {
+    var i = new ClassicExecutionContext$pathToRoot$slambda(this.f36_1, completion);
+    i.g36_1 = $this$sequence;
     return i;
   };
   function ClassicExecutionContext$pathToRoot$slambda_0(this$0, resultContinuation) {
     var i = new ClassicExecutionContext$pathToRoot$slambda(this$0, resultContinuation);
     var l = function ($this$sequence, $completion) {
-      return i.r35($this$sequence, $completion);
+      return i.i36($this$sequence, $completion);
     };
     l.$arity = 1;
     return l;
@@ -707,11 +707,11 @@
   function ClassicExecutionContext$currentGoal$delegate$lambda(this$0) {
     return function () {
       var tmp;
-      if (this$0.t32_1.hr()) {
+      if (this$0.k33_1.hr()) {
         tmp = null;
       } else {
-        var tmp0_safe_receiver = this$0.t32_1.fr();
-        tmp = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.applySubstitution(this$0.r32_1);
+        var tmp0_safe_receiver = this$0.k33_1.fr();
+        tmp = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.applySubstitution(this$0.i33_1);
       }
       return tmp;
     };
@@ -721,28 +721,28 @@
   }
   function ClassicExecutionContext$interestingVariables$delegate$lambda(this$0) {
     return function () {
-      var tmp = plus(_get_locallyInterestingVariables__39cqti(this$0), this$0.s32_1.sw());
-      return cached(distinct(plus(tmp, flatMap(this$0.d33_1, ClassicExecutionContext$interestingVariables$delegate$lambda$lambda))));
+      var tmp = plus(_get_locallyInterestingVariables__39cqti(this$0), this$0.j33_1.sw());
+      return cached(distinct(plus(tmp, flatMap(this$0.u33_1, ClassicExecutionContext$interestingVariables$delegate$lambda$lambda))));
     };
   }
   function ClassicExecutionContext$logicStackTrace$delegate$lambda$lambda(it) {
-    return it.t35();
+    return it.k36();
   }
   function ClassicExecutionContext$logicStackTrace$delegate$lambda$lambda_0(this$0) {
     return function (it) {
-      var tmp0_elvis_lhs = it.h32_1;
-      return tmp0_elvis_lhs == null ? Companion_getInstance_1().of('?-', [this$0.s32_1]) : tmp0_elvis_lhs;
+      var tmp0_elvis_lhs = it.y32_1;
+      return tmp0_elvis_lhs == null ? Companion_getInstance_1().of('?-', [this$0.j33_1]) : tmp0_elvis_lhs;
     };
   }
   function ClassicExecutionContext$logicStackTrace$delegate$lambda(this$0) {
     return function () {
-      var tmp = filter(this$0.d33_1, ClassicExecutionContext$logicStackTrace$delegate$lambda$lambda);
+      var tmp = filter(this$0.u33_1, ClassicExecutionContext$logicStackTrace$delegate$lambda$lambda);
       return toList(map(tmp, ClassicExecutionContext$logicStackTrace$delegate$lambda$lambda_0(this$0)));
     };
   }
   function ClassicExecutionContext(procedure, unificator, libraries, flags, staticKb, dynamicKb, operators, inputChannels, outputChannels, customData, substitution, query, goals, rules, primitives, startTime, maxDuration, choicePoints, parent, depth, step, relevantVariables) {
     procedure = procedure === VOID ? null : procedure;
-    unificator = unificator === VOID ? Companion_getInstance().g1l() : unificator;
+    unificator = unificator === VOID ? Companion_getInstance().c1l() : unificator;
     libraries = libraries === VOID ? Companion_instance.empty() : libraries;
     flags = flags === VOID ? Companion_getInstance_0().empty() : flags;
     staticKb = staticKb === VOID ? Companion_instance_0.empty(unificator) : staticKb;
@@ -769,33 +769,33 @@
     depth = depth === VOID ? 0 : depth;
     step = step === VOID ? new Long(0, 0) : step;
     relevantVariables = relevantVariables === VOID ? emptySet() : relevantVariables;
-    this.h32_1 = procedure;
-    this.i32_1 = unificator;
-    this.j32_1 = libraries;
-    this.k32_1 = flags;
-    this.l32_1 = staticKb;
-    this.m32_1 = dynamicKb;
-    this.n32_1 = operators;
-    this.o32_1 = inputChannels;
-    this.p32_1 = outputChannels;
-    this.q32_1 = customData;
-    this.r32_1 = substitution;
-    this.s32_1 = query;
-    this.t32_1 = goals;
-    this.u32_1 = rules;
-    this.v32_1 = primitives;
-    this.w32_1 = startTime;
-    this.x32_1 = maxDuration;
-    this.y32_1 = choicePoints;
-    this.z32_1 = parent;
-    this.a33_1 = depth;
-    this.b33_1 = step;
-    this.c33_1 = relevantVariables;
+    this.y32_1 = procedure;
+    this.z32_1 = unificator;
+    this.a33_1 = libraries;
+    this.b33_1 = flags;
+    this.c33_1 = staticKb;
+    this.d33_1 = dynamicKb;
+    this.e33_1 = operators;
+    this.f33_1 = inputChannels;
+    this.g33_1 = outputChannels;
+    this.h33_1 = customData;
+    this.i33_1 = substitution;
+    this.j33_1 = query;
+    this.k33_1 = goals;
+    this.l33_1 = rules;
+    this.m33_1 = primitives;
+    this.n33_1 = startTime;
+    this.o33_1 = maxDuration;
+    this.p33_1 = choicePoints;
+    this.q33_1 = parent;
+    this.r33_1 = depth;
+    this.s33_1 = step;
+    this.t33_1 = relevantVariables;
     // Inline function 'kotlin.require' call
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'kotlin.require' call
     // Inline function 'kotlin.contracts.contract' call
-    if (!((this.a33_1 === 0 ? this.z32_1 == null : false) ? true : this.a33_1 > 0 ? !(this.z32_1 == null) : false)) {
+    if (!((this.r33_1 === 0 ? this.q33_1 == null : false) ? true : this.r33_1 > 0 ? !(this.q33_1 == null) : false)) {
       // Inline function 'kotlin.require.<anonymous>' call
       var message = 'Failed requirement.';
       throw IllegalArgumentException_init_$Create$(toString(message));
@@ -804,7 +804,7 @@
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'kotlin.require' call
     // Inline function 'kotlin.contracts.contract' call
-    if (!(this.w32_1.q6(new Long(0, 0)) >= 0)) {
+    if (!(this.n33_1.q6(new Long(0, 0)) >= 0)) {
       // Inline function 'kotlin.require.<anonymous>' call
       var message_0 = 'Failed requirement.';
       throw IllegalArgumentException_init_$Create$(toString(message_0));
@@ -813,169 +813,169 @@
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'kotlin.require' call
     // Inline function 'kotlin.contracts.contract' call
-    if (!(this.x32_1.q6(new Long(0, 0)) >= 0)) {
+    if (!(this.o33_1.q6(new Long(0, 0)) >= 0)) {
       // Inline function 'kotlin.require.<anonymous>' call
       var message_1 = 'Failed requirement.';
       throw IllegalArgumentException_init_$Create$(toString(message_1));
     }
     var tmp_0 = this;
-    tmp_0.d33_1 = sequence(ClassicExecutionContext$pathToRoot$slambda_0(this, null));
+    tmp_0.u33_1 = sequence(ClassicExecutionContext$pathToRoot$slambda_0(this, null));
     var tmp_1 = this;
-    tmp_1.e33_1 = lazy(ClassicExecutionContext$currentGoal$delegate$lambda(this));
+    tmp_1.v33_1 = lazy(ClassicExecutionContext$currentGoal$delegate$lambda(this));
     var tmp_2 = this;
-    tmp_2.f33_1 = lazy(ClassicExecutionContext$interestingVariables$delegate$lambda(this));
+    tmp_2.w33_1 = lazy(ClassicExecutionContext$interestingVariables$delegate$lambda(this));
     var tmp_3 = this;
-    tmp_3.g33_1 = lazy(ClassicExecutionContext$logicStackTrace$delegate$lambda(this));
+    tmp_3.x33_1 = lazy(ClassicExecutionContext$logicStackTrace$delegate$lambda(this));
   }
-  protoOf(ClassicExecutionContext).p1u = function () {
-    return this.h32_1;
+  protoOf(ClassicExecutionContext).x1u = function () {
+    return this.y32_1;
   };
-  protoOf(ClassicExecutionContext).j1l = function () {
-    return this.i32_1;
+  protoOf(ClassicExecutionContext).f1l = function () {
+    return this.z32_1;
   };
-  protoOf(ClassicExecutionContext).u1u = function () {
-    return this.j32_1;
+  protoOf(ClassicExecutionContext).c1v = function () {
+    return this.a33_1;
   };
-  protoOf(ClassicExecutionContext).v1u = function () {
-    return this.k32_1;
+  protoOf(ClassicExecutionContext).d1v = function () {
+    return this.b33_1;
   };
-  protoOf(ClassicExecutionContext).w1u = function () {
-    return this.l32_1;
+  protoOf(ClassicExecutionContext).e1v = function () {
+    return this.c33_1;
   };
-  protoOf(ClassicExecutionContext).x1u = function () {
-    return this.m32_1;
+  protoOf(ClassicExecutionContext).f1v = function () {
+    return this.d33_1;
   };
-  protoOf(ClassicExecutionContext).d1v = function () {
-    return this.n32_1;
+  protoOf(ClassicExecutionContext).l1v = function () {
+    return this.e33_1;
   };
-  protoOf(ClassicExecutionContext).y1u = function () {
-    return this.o32_1;
+  protoOf(ClassicExecutionContext).g1v = function () {
+    return this.f33_1;
   };
-  protoOf(ClassicExecutionContext).z1u = function () {
-    return this.p32_1;
+  protoOf(ClassicExecutionContext).h1v = function () {
+    return this.g33_1;
   };
-  protoOf(ClassicExecutionContext).s1u = function () {
-    return this.q32_1;
+  protoOf(ClassicExecutionContext).a1v = function () {
+    return this.h33_1;
   };
-  protoOf(ClassicExecutionContext).q1u = function () {
-    return this.r32_1;
+  protoOf(ClassicExecutionContext).y1u = function () {
+    return this.i33_1;
   };
-  protoOf(ClassicExecutionContext).k1u = function () {
-    return this.w32_1;
+  protoOf(ClassicExecutionContext).s1u = function () {
+    return this.n33_1;
   };
-  protoOf(ClassicExecutionContext).m1u = function () {
-    return this.x32_1;
+  protoOf(ClassicExecutionContext).u1u = function () {
+    return this.o33_1;
   };
-  protoOf(ClassicExecutionContext).u35 = function () {
-    return this.a33_1 === 0;
+  protoOf(ClassicExecutionContext).l36 = function () {
+    return this.r33_1 === 0;
   };
-  protoOf(ClassicExecutionContext).f34 = function () {
-    var tmp0_safe_receiver = this.y32_1;
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.f34();
+  protoOf(ClassicExecutionContext).w34 = function () {
+    var tmp0_safe_receiver = this.p33_1;
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.w34();
     return tmp1_elvis_lhs == null ? false : tmp1_elvis_lhs;
   };
-  protoOf(ClassicExecutionContext).t35 = function () {
-    return this.z32_1 == null ? true : (this.a33_1 - this.z32_1.a33_1 | 0) >= 1;
+  protoOf(ClassicExecutionContext).k36 = function () {
+    return this.q33_1 == null ? true : (this.r33_1 - this.q33_1.r33_1 | 0) >= 1;
   };
-  protoOf(ClassicExecutionContext).v35 = function () {
+  protoOf(ClassicExecutionContext).m36 = function () {
     // Inline function 'kotlin.getValue' call
-    var this_0 = this.e33_1;
+    var this_0 = this.v33_1;
     currentGoal$factory();
     return this_0.r2();
   };
-  protoOf(ClassicExecutionContext).w35 = function (variable) {
+  protoOf(ClassicExecutionContext).n36 = function (variable) {
     return contains(_get_interestingVariables__k6uw5o(this), variable);
   };
-  protoOf(ClassicExecutionContext).r1u = function () {
+  protoOf(ClassicExecutionContext).z1u = function () {
     // Inline function 'kotlin.getValue' call
-    var this_0 = this.g33_1;
+    var this_0 = this.x33_1;
     logicStackTrace$factory();
     return this_0.r2();
   };
-  protoOf(ClassicExecutionContext).t1u = function (unificator, libraries, flags, staticKb, dynamicKb, inputChannels, outputChannels) {
+  protoOf(ClassicExecutionContext).b1v = function (unificator, libraries, flags, staticKb, dynamicKb, inputChannels, outputChannels) {
     return ClassicSolver_init_$Create$(unificator, libraries, flags, staticKb, dynamicKb, inputChannels, outputChannels, true);
   };
-  protoOf(ClassicExecutionContext).a1v = function (unificator, libraries, flags, staticKb, dynamicKb, inputChannels, outputChannels) {
+  protoOf(ClassicExecutionContext).i1v = function (unificator, libraries, flags, staticKb, dynamicKb, inputChannels, outputChannels) {
     return MutableClassicSolver_init_$Create$(unificator, libraries, flags, staticKb, dynamicKb, inputChannels, outputChannels, true);
   };
-  protoOf(ClassicExecutionContext).c1v = function (unificator, libraries, flags, staticKb, dynamicKb, operators, inputChannels, outputChannels, customData) {
-    return this.y33(VOID, unificator, libraries, flags, staticKb, dynamicKb.toMutableTheory(), operators, inputChannels, outputChannels, customData);
+  protoOf(ClassicExecutionContext).k1v = function (unificator, libraries, flags, staticKb, dynamicKb, operators, inputChannels, outputChannels, customData) {
+    return this.p34(VOID, unificator, libraries, flags, staticKb, dynamicKb.toMutableTheory(), operators, inputChannels, outputChannels, customData);
   };
-  protoOf(ClassicExecutionContext).x35 = function (sideEffect) {
+  protoOf(ClassicExecutionContext).o36 = function (sideEffect) {
     var tmp = apply.call(this, sideEffect);
     return tmp instanceof ClassicExecutionContext ? tmp : THROW_CCE();
   };
   protoOf(ClassicExecutionContext).apply = function (sideEffect) {
-    return this.x35(sideEffect);
+    return this.o36(sideEffect);
   };
-  protoOf(ClassicExecutionContext).y35 = function (sideEffects) {
+  protoOf(ClassicExecutionContext).p36 = function (sideEffects) {
     var tmp = applyIterable.call(this, sideEffects);
     return tmp instanceof ClassicExecutionContext ? tmp : THROW_CCE();
   };
   protoOf(ClassicExecutionContext).applyIterable = function (sideEffects) {
-    return this.y35(sideEffects);
+    return this.p36(sideEffects);
   };
-  protoOf(ClassicExecutionContext).z35 = function (sideEffects) {
+  protoOf(ClassicExecutionContext).q36 = function (sideEffects) {
     var tmp = applySequence.call(this, sideEffects);
     return tmp instanceof ClassicExecutionContext ? tmp : THROW_CCE();
   };
   protoOf(ClassicExecutionContext).applySequence = function (sideEffects) {
-    return this.z35(sideEffects);
+    return this.q36(sideEffects);
   };
   protoOf(ClassicExecutionContext).toString = function () {
-    return 'ClassicExecutionContext(' + ('step=' + this.b33_1.toString() + ', ') + ('depth=' + this.a33_1 + ', ') + ('substitution=' + this.r32_1 + ', ') + ('logicStackTrace=' + this.r1u() + ', ') + ('goals=' + this.t32_1 + ', ') + ('rules=' + this.u32_1 + ', ') + ('primitives=' + this.v32_1 + ', ') + ('startTime=' + this.w32_1.toString() + ', ') + ('endTime=' + this.l1u().toString() + ', ') + ('maxDuration=' + this.x32_1.toString() + ', ') + ('unificator=' + this.i32_1 + ', ') + ('choicePoints=' + this.y32_1) + ')';
+    return 'ClassicExecutionContext(' + ('step=' + this.s33_1.toString() + ', ') + ('depth=' + this.r33_1 + ', ') + ('substitution=' + this.i33_1 + ', ') + ('logicStackTrace=' + this.z1u() + ', ') + ('goals=' + this.k33_1 + ', ') + ('rules=' + this.l33_1 + ', ') + ('primitives=' + this.m33_1 + ', ') + ('startTime=' + this.n33_1.toString() + ', ') + ('endTime=' + this.t1u().toString() + ', ') + ('maxDuration=' + this.o33_1.toString() + ', ') + ('unificator=' + this.z32_1 + ', ') + ('choicePoints=' + this.p33_1) + ')';
   };
-  protoOf(ClassicExecutionContext).a36 = function (procedure, unificator, libraries, flags, staticKb, dynamicKb, operators, inputChannels, outputChannels, customData, substitution, query, goals, rules, primitives, startTime, maxDuration, choicePoints, parent, depth, step, relevantVariables) {
+  protoOf(ClassicExecutionContext).r36 = function (procedure, unificator, libraries, flags, staticKb, dynamicKb, operators, inputChannels, outputChannels, customData, substitution, query, goals, rules, primitives, startTime, maxDuration, choicePoints, parent, depth, step, relevantVariables) {
     return new ClassicExecutionContext(procedure, unificator, libraries, flags, staticKb, dynamicKb, operators, inputChannels, outputChannels, customData, substitution, query, goals, rules, primitives, startTime, maxDuration, choicePoints, parent, depth, step, relevantVariables);
   };
-  protoOf(ClassicExecutionContext).y33 = function (procedure, unificator, libraries, flags, staticKb, dynamicKb, operators, inputChannels, outputChannels, customData, substitution, query, goals, rules, primitives, startTime, maxDuration, choicePoints, parent, depth, step, relevantVariables, $super) {
-    procedure = procedure === VOID ? this.h32_1 : procedure;
-    unificator = unificator === VOID ? this.i32_1 : unificator;
-    libraries = libraries === VOID ? this.j32_1 : libraries;
-    flags = flags === VOID ? this.k32_1 : flags;
-    staticKb = staticKb === VOID ? this.l32_1 : staticKb;
-    dynamicKb = dynamicKb === VOID ? this.m32_1 : dynamicKb;
-    operators = operators === VOID ? this.n32_1 : operators;
-    inputChannels = inputChannels === VOID ? this.o32_1 : inputChannels;
-    outputChannels = outputChannels === VOID ? this.p32_1 : outputChannels;
-    customData = customData === VOID ? this.q32_1 : customData;
-    substitution = substitution === VOID ? this.r32_1 : substitution;
-    query = query === VOID ? this.s32_1 : query;
-    goals = goals === VOID ? this.t32_1 : goals;
-    rules = rules === VOID ? this.u32_1 : rules;
-    primitives = primitives === VOID ? this.v32_1 : primitives;
-    startTime = startTime === VOID ? this.w32_1 : startTime;
-    maxDuration = maxDuration === VOID ? this.x32_1 : maxDuration;
-    choicePoints = choicePoints === VOID ? this.y32_1 : choicePoints;
-    parent = parent === VOID ? this.z32_1 : parent;
-    depth = depth === VOID ? this.a33_1 : depth;
-    step = step === VOID ? this.b33_1 : step;
-    relevantVariables = relevantVariables === VOID ? this.c33_1 : relevantVariables;
-    return $super === VOID ? this.a36(procedure, unificator, libraries, flags, staticKb, dynamicKb, operators, inputChannels, outputChannels, customData, substitution, query, goals, rules, primitives, startTime, maxDuration, choicePoints, parent, depth, step, relevantVariables) : $super.a36.call(this, procedure, unificator, libraries, flags, staticKb, dynamicKb, operators, inputChannels, outputChannels, customData, substitution, query, goals, rules, primitives, startTime, maxDuration, choicePoints, parent, depth, step, relevantVariables);
+  protoOf(ClassicExecutionContext).p34 = function (procedure, unificator, libraries, flags, staticKb, dynamicKb, operators, inputChannels, outputChannels, customData, substitution, query, goals, rules, primitives, startTime, maxDuration, choicePoints, parent, depth, step, relevantVariables, $super) {
+    procedure = procedure === VOID ? this.y32_1 : procedure;
+    unificator = unificator === VOID ? this.z32_1 : unificator;
+    libraries = libraries === VOID ? this.a33_1 : libraries;
+    flags = flags === VOID ? this.b33_1 : flags;
+    staticKb = staticKb === VOID ? this.c33_1 : staticKb;
+    dynamicKb = dynamicKb === VOID ? this.d33_1 : dynamicKb;
+    operators = operators === VOID ? this.e33_1 : operators;
+    inputChannels = inputChannels === VOID ? this.f33_1 : inputChannels;
+    outputChannels = outputChannels === VOID ? this.g33_1 : outputChannels;
+    customData = customData === VOID ? this.h33_1 : customData;
+    substitution = substitution === VOID ? this.i33_1 : substitution;
+    query = query === VOID ? this.j33_1 : query;
+    goals = goals === VOID ? this.k33_1 : goals;
+    rules = rules === VOID ? this.l33_1 : rules;
+    primitives = primitives === VOID ? this.m33_1 : primitives;
+    startTime = startTime === VOID ? this.n33_1 : startTime;
+    maxDuration = maxDuration === VOID ? this.o33_1 : maxDuration;
+    choicePoints = choicePoints === VOID ? this.p33_1 : choicePoints;
+    parent = parent === VOID ? this.q33_1 : parent;
+    depth = depth === VOID ? this.r33_1 : depth;
+    step = step === VOID ? this.s33_1 : step;
+    relevantVariables = relevantVariables === VOID ? this.t33_1 : relevantVariables;
+    return $super === VOID ? this.r36(procedure, unificator, libraries, flags, staticKb, dynamicKb, operators, inputChannels, outputChannels, customData, substitution, query, goals, rules, primitives, startTime, maxDuration, choicePoints, parent, depth, step, relevantVariables) : $super.r36.call(this, procedure, unificator, libraries, flags, staticKb, dynamicKb, operators, inputChannels, outputChannels, customData, substitution, query, goals, rules, primitives, startTime, maxDuration, choicePoints, parent, depth, step, relevantVariables);
   };
   protoOf(ClassicExecutionContext).hashCode = function () {
-    var result = this.h32_1 == null ? 0 : this.h32_1.hashCode();
-    result = imul(result, 31) + hashCode(this.i32_1) | 0;
-    result = imul(result, 31) + hashCode(this.j32_1) | 0;
-    result = imul(result, 31) + this.k32_1.hashCode() | 0;
-    result = imul(result, 31) + hashCode(this.l32_1) | 0;
-    result = imul(result, 31) + hashCode(this.m32_1) | 0;
-    result = imul(result, 31) + this.n32_1.hashCode() | 0;
-    result = imul(result, 31) + hashCode(this.o32_1) | 0;
-    result = imul(result, 31) + hashCode(this.p32_1) | 0;
-    result = imul(result, 31) + this.q32_1.hashCode() | 0;
-    result = imul(result, 31) + hashCode(this.r32_1) | 0;
-    result = imul(result, 31) + this.s32_1.hashCode() | 0;
-    result = imul(result, 31) + hashCode(this.t32_1) | 0;
-    result = imul(result, 31) + hashCode(this.u32_1) | 0;
-    result = imul(result, 31) + hashCode(this.v32_1) | 0;
-    result = imul(result, 31) + this.w32_1.hashCode() | 0;
-    result = imul(result, 31) + this.x32_1.hashCode() | 0;
-    result = imul(result, 31) + (this.y32_1 == null ? 0 : hashCode(this.y32_1)) | 0;
-    result = imul(result, 31) + (this.z32_1 == null ? 0 : this.z32_1.hashCode()) | 0;
-    result = imul(result, 31) + this.a33_1 | 0;
+    var result = this.y32_1 == null ? 0 : this.y32_1.hashCode();
+    result = imul(result, 31) + hashCode(this.z32_1) | 0;
+    result = imul(result, 31) + hashCode(this.a33_1) | 0;
     result = imul(result, 31) + this.b33_1.hashCode() | 0;
     result = imul(result, 31) + hashCode(this.c33_1) | 0;
+    result = imul(result, 31) + hashCode(this.d33_1) | 0;
+    result = imul(result, 31) + this.e33_1.hashCode() | 0;
+    result = imul(result, 31) + hashCode(this.f33_1) | 0;
+    result = imul(result, 31) + hashCode(this.g33_1) | 0;
+    result = imul(result, 31) + this.h33_1.hashCode() | 0;
+    result = imul(result, 31) + hashCode(this.i33_1) | 0;
+    result = imul(result, 31) + this.j33_1.hashCode() | 0;
+    result = imul(result, 31) + hashCode(this.k33_1) | 0;
+    result = imul(result, 31) + hashCode(this.l33_1) | 0;
+    result = imul(result, 31) + hashCode(this.m33_1) | 0;
+    result = imul(result, 31) + this.n33_1.hashCode() | 0;
+    result = imul(result, 31) + this.o33_1.hashCode() | 0;
+    result = imul(result, 31) + (this.p33_1 == null ? 0 : hashCode(this.p33_1)) | 0;
+    result = imul(result, 31) + (this.q33_1 == null ? 0 : this.q33_1.hashCode()) | 0;
+    result = imul(result, 31) + this.r33_1 | 0;
+    result = imul(result, 31) + this.s33_1.hashCode() | 0;
+    result = imul(result, 31) + hashCode(this.t33_1) | 0;
     return result;
   };
   protoOf(ClassicExecutionContext).equals = function (other) {
@@ -984,55 +984,55 @@
     if (!(other instanceof ClassicExecutionContext))
       return false;
     var tmp0_other_with_cast = other instanceof ClassicExecutionContext ? other : THROW_CCE();
-    if (!equals(this.h32_1, tmp0_other_with_cast.h32_1))
+    if (!equals(this.y32_1, tmp0_other_with_cast.y32_1))
       return false;
-    if (!equals(this.i32_1, tmp0_other_with_cast.i32_1))
+    if (!equals(this.z32_1, tmp0_other_with_cast.z32_1))
       return false;
-    if (!equals(this.j32_1, tmp0_other_with_cast.j32_1))
+    if (!equals(this.a33_1, tmp0_other_with_cast.a33_1))
       return false;
-    if (!this.k32_1.equals(tmp0_other_with_cast.k32_1))
+    if (!this.b33_1.equals(tmp0_other_with_cast.b33_1))
       return false;
-    if (!equals(this.l32_1, tmp0_other_with_cast.l32_1))
+    if (!equals(this.c33_1, tmp0_other_with_cast.c33_1))
       return false;
-    if (!equals(this.m32_1, tmp0_other_with_cast.m32_1))
+    if (!equals(this.d33_1, tmp0_other_with_cast.d33_1))
       return false;
-    if (!this.n32_1.equals(tmp0_other_with_cast.n32_1))
+    if (!this.e33_1.equals(tmp0_other_with_cast.e33_1))
       return false;
-    if (!equals(this.o32_1, tmp0_other_with_cast.o32_1))
+    if (!equals(this.f33_1, tmp0_other_with_cast.f33_1))
       return false;
-    if (!equals(this.p32_1, tmp0_other_with_cast.p32_1))
+    if (!equals(this.g33_1, tmp0_other_with_cast.g33_1))
       return false;
-    if (!this.q32_1.equals(tmp0_other_with_cast.q32_1))
+    if (!this.h33_1.equals(tmp0_other_with_cast.h33_1))
       return false;
-    if (!equals(this.r32_1, tmp0_other_with_cast.r32_1))
+    if (!equals(this.i33_1, tmp0_other_with_cast.i33_1))
       return false;
-    if (!this.s32_1.equals(tmp0_other_with_cast.s32_1))
+    if (!this.j33_1.equals(tmp0_other_with_cast.j33_1))
       return false;
-    if (!equals(this.t32_1, tmp0_other_with_cast.t32_1))
+    if (!equals(this.k33_1, tmp0_other_with_cast.k33_1))
       return false;
-    if (!equals(this.u32_1, tmp0_other_with_cast.u32_1))
+    if (!equals(this.l33_1, tmp0_other_with_cast.l33_1))
       return false;
-    if (!equals(this.v32_1, tmp0_other_with_cast.v32_1))
+    if (!equals(this.m33_1, tmp0_other_with_cast.m33_1))
       return false;
-    if (!this.w32_1.equals(tmp0_other_with_cast.w32_1))
+    if (!this.n33_1.equals(tmp0_other_with_cast.n33_1))
       return false;
-    if (!this.x32_1.equals(tmp0_other_with_cast.x32_1))
+    if (!this.o33_1.equals(tmp0_other_with_cast.o33_1))
       return false;
-    if (!equals(this.y32_1, tmp0_other_with_cast.y32_1))
+    if (!equals(this.p33_1, tmp0_other_with_cast.p33_1))
       return false;
-    if (!equals(this.z32_1, tmp0_other_with_cast.z32_1))
+    if (!equals(this.q33_1, tmp0_other_with_cast.q33_1))
       return false;
-    if (!(this.a33_1 === tmp0_other_with_cast.a33_1))
+    if (!(this.r33_1 === tmp0_other_with_cast.r33_1))
       return false;
-    if (!this.b33_1.equals(tmp0_other_with_cast.b33_1))
+    if (!this.s33_1.equals(tmp0_other_with_cast.s33_1))
       return false;
-    if (!equals(this.c33_1, tmp0_other_with_cast.c33_1))
+    if (!equals(this.t33_1, tmp0_other_with_cast.t33_1))
       return false;
     return true;
   };
   function currentGoal$factory() {
     return getPropertyCallableRef('currentGoal', 1, KProperty1, function (receiver) {
-      return receiver.v35();
+      return receiver.m36();
     }, null);
   }
   function interestingVariables$factory() {
@@ -1042,11 +1042,11 @@
   }
   function logicStackTrace$factory() {
     return getPropertyCallableRef('logicStackTrace', 1, KProperty1, function (receiver) {
-      return receiver.r1u();
+      return receiver.z1u();
     }, null);
   }
   function ClassicSolver_init_$Init$(unificator, libraries, flags, initialStaticKb, initialDynamicKb, inputChannels, outputChannels, trustKb, $this) {
-    unificator = unificator === VOID ? Companion_getInstance().g1l() : unificator;
+    unificator = unificator === VOID ? Companion_getInstance().c1l() : unificator;
     libraries = libraries === VOID ? Companion_instance.empty() : libraries;
     flags = flags === VOID ? Companion_getInstance_0().empty() : flags;
     initialStaticKb = initialStaticKb === VOID ? Companion_instance_0.empty(unificator) : initialStaticKb;
@@ -1062,7 +1062,7 @@
     return ClassicSolver_init_$Init$(unificator, libraries, flags, initialStaticKb, initialDynamicKb, inputChannels, outputChannels, trustKb, objectCreate(protoOf(ClassicSolver)));
   }
   function ClassicSolver_init_$Init$_0(unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings, trustKb, $this) {
-    unificator = unificator === VOID ? Companion_getInstance().g1l() : unificator;
+    unificator = unificator === VOID ? Companion_getInstance().c1l() : unificator;
     libraries = libraries === VOID ? Companion_instance.empty() : libraries;
     flags = flags === VOID ? Companion_getInstance_0().empty() : flags;
     staticKb = staticKb === VOID ? Companion_instance_0.empty(unificator) : staticKb;
@@ -1079,35 +1079,35 @@
   function ClassicSolver_init_$Create$_0(unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings, trustKb) {
     return ClassicSolver_init_$Init$_0(unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings, trustKb, objectCreate(protoOf(ClassicSolver)));
   }
-  protoOf(ClassicSolver).j33 = function (initialState, onStateTransition) {
-    return Companion_instance_15.c36(initialState, onStateTransition);
+  protoOf(ClassicSolver).a34 = function (initialState, onStateTransition) {
+    return Companion_instance_15.t36(initialState, onStateTransition);
   };
-  protoOf(ClassicSolver).l1v = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings) {
+  protoOf(ClassicSolver).t1v = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings) {
     return ClassicSolver_init_$Create$_0(unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings);
   };
-  protoOf(ClassicSolver).y1s = function () {
+  protoOf(ClassicSolver).u1s = function () {
     return this.copy();
   };
   protoOf(ClassicSolver).clone = function () {
-    return this.y1s();
+    return this.u1s();
   };
   function ClassicSolver() {
   }
   function ClassicSolverFactory() {
   }
-  protoOf(ClassicSolverFactory).v1x = function () {
+  protoOf(ClassicSolverFactory).d1y = function () {
     return DefaultBuiltins_getInstance();
   };
-  protoOf(ClassicSolverFactory).g1y = function (unificator, libraries, flags, staticKb, dynamicKb, inputs, outputs) {
+  protoOf(ClassicSolverFactory).o1y = function (unificator, libraries, flags, staticKb, dynamicKb, inputs, outputs) {
     return ClassicSolver_init_$Create$(unificator, libraries, flags, staticKb, dynamicKb, inputs, outputs);
   };
-  protoOf(ClassicSolverFactory).m1y = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings) {
+  protoOf(ClassicSolverFactory).u1y = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings) {
     return ClassicSolver_init_$Create$_0(unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings);
   };
-  protoOf(ClassicSolverFactory).o1y = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings) {
+  protoOf(ClassicSolverFactory).w1y = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings) {
     return MutableClassicSolver_init_$Create$_0(unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings);
   };
-  protoOf(ClassicSolverFactory).q1y = function (unificator, libraries, flags, staticKb, dynamicKb, inputs, outputs) {
+  protoOf(ClassicSolverFactory).y1y = function (unificator, libraries, flags, staticKb, dynamicKb, inputs, outputs) {
     return MutableClassicSolver_init_$Create$(unificator, libraries, flags, staticKb, dynamicKb, inputs, outputs);
   };
   var ClassicSolverFactory_instance;
@@ -1115,7 +1115,7 @@
     return ClassicSolverFactory_instance;
   }
   function MutableClassicSolver_init_$Init$(unificator, libraries, flags, staticKb, dynamicKb, inputChannels, outputChannels, trustKb, $this) {
-    unificator = unificator === VOID ? Companion_getInstance().g1l() : unificator;
+    unificator = unificator === VOID ? Companion_getInstance().c1l() : unificator;
     libraries = libraries === VOID ? Companion_instance.empty() : libraries;
     flags = flags === VOID ? Companion_getInstance_0().empty() : flags;
     staticKb = staticKb === VOID ? Companion_instance_0.empty(unificator) : staticKb;
@@ -1131,7 +1131,7 @@
     return MutableClassicSolver_init_$Init$(unificator, libraries, flags, staticKb, dynamicKb, inputChannels, outputChannels, trustKb, objectCreate(protoOf(MutableClassicSolver)));
   }
   function MutableClassicSolver_init_$Init$_0(unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings, trustKb, $this) {
-    unificator = unificator === VOID ? Companion_getInstance().g1l() : unificator;
+    unificator = unificator === VOID ? Companion_getInstance().c1l() : unificator;
     libraries = libraries === VOID ? Companion_instance.empty() : libraries;
     flags = flags === VOID ? Companion_getInstance_0().empty() : flags;
     staticKb = staticKb === VOID ? Companion_instance_0.empty(unificator) : staticKb;
@@ -1150,262 +1150,262 @@
   }
   function MutableClassicSolver$loadLibrary$lambda($library) {
     return function ($this$updateContext) {
-      var newRuntime = $this$updateContext.j32_1.plusLibrary($library);
-      return $this$updateContext.y33(VOID, VOID, newRuntime, VOID, VOID, VOID, $this$updateContext.n32_1.plusOperatorSet(toOperatorSet(getAllOperators(newRuntime, []))));
+      var newRuntime = $this$updateContext.a33_1.plusLibrary($library);
+      return $this$updateContext.p34(VOID, VOID, newRuntime, VOID, VOID, VOID, $this$updateContext.e33_1.plusOperatorSet(toOperatorSet(getAllOperators(newRuntime, []))));
     };
   }
   function MutableClassicSolver$unloadLibrary$lambda($library) {
     return function ($this$updateContext) {
-      var newRuntime = $this$updateContext.j32_1.plusLibrary($library);
-      return $this$updateContext.y33(VOID, VOID, newRuntime, VOID, VOID, VOID, toOperatorSet(getAllOperators(newRuntime, [$this$updateContext.l32_1, $this$updateContext.m32_1])));
+      var newRuntime = $this$updateContext.a33_1.plusLibrary($library);
+      return $this$updateContext.p34(VOID, VOID, newRuntime, VOID, VOID, VOID, toOperatorSet(getAllOperators(newRuntime, [$this$updateContext.c33_1, $this$updateContext.d33_1])));
     };
   }
   function MutableClassicSolver$setRuntime$lambda($libraries) {
     return function ($this$updateContext) {
-      return $this$updateContext.y33(VOID, VOID, $libraries, VOID, VOID, VOID, toOperatorSet(getAllOperators($libraries, [$this$updateContext.l32_1, $this$updateContext.m32_1])));
+      return $this$updateContext.p34(VOID, VOID, $libraries, VOID, VOID, VOID, toOperatorSet(getAllOperators($libraries, [$this$updateContext.c33_1, $this$updateContext.d33_1])));
     };
   }
   function MutableClassicSolver$resetStaticKb$lambda($this$updateContext) {
-    return $this$updateContext.y33(VOID, VOID, VOID, VOID, Companion_instance_0.empty($this$updateContext.i32_1), VOID, toOperatorSet(getAllOperators($this$updateContext.j32_1, [$this$updateContext.m32_1])));
+    return $this$updateContext.p34(VOID, VOID, VOID, VOID, Companion_instance_0.empty($this$updateContext.z32_1), VOID, toOperatorSet(getAllOperators($this$updateContext.a33_1, [$this$updateContext.d33_1])));
   }
   function MutableClassicSolver$resetDynamicKb$lambda($this$updateContext) {
-    return $this$updateContext.y33(VOID, VOID, VOID, VOID, VOID, Companion_instance_1.empty($this$updateContext.i32_1), toOperatorSet(getAllOperators($this$updateContext.j32_1, [$this$updateContext.l32_1])));
+    return $this$updateContext.p34(VOID, VOID, VOID, VOID, VOID, Companion_instance_1.empty($this$updateContext.z32_1), toOperatorSet(getAllOperators($this$updateContext.a33_1, [$this$updateContext.c33_1])));
   }
   function MutableClassicSolver$assertA$lambda($clause) {
     return function ($this$updateContext) {
-      return $this$updateContext.y33(VOID, VOID, VOID, VOID, VOID, $this$updateContext.m32_1.o1s($clause), $this$updateContext.n32_1.plusOperatorSet(toOperatorSet(getAllOperators_0(listOf($clause)))));
+      return $this$updateContext.p34(VOID, VOID, VOID, VOID, VOID, $this$updateContext.d33_1.k1s($clause), $this$updateContext.e33_1.plusOperatorSet(toOperatorSet(getAllOperators_0(listOf($clause)))));
     };
   }
   function MutableClassicSolver$assertA$lambda_0($fact) {
     return function ($this$updateContext) {
-      return $this$updateContext.y33(VOID, VOID, VOID, VOID, VOID, $this$updateContext.m32_1.b1t($fact));
+      return $this$updateContext.p34(VOID, VOID, VOID, VOID, VOID, $this$updateContext.d33_1.j1t($fact));
     };
   }
   function MutableClassicSolver$assertZ$lambda($clause) {
     return function ($this$updateContext) {
-      return $this$updateContext.y33(VOID, VOID, VOID, VOID, VOID, $this$updateContext.m32_1.s1s($clause), $this$updateContext.n32_1.plusOperatorSet(toOperatorSet(getAllOperators_0(listOf($clause)))));
+      return $this$updateContext.p34(VOID, VOID, VOID, VOID, VOID, $this$updateContext.d33_1.o1s($clause), $this$updateContext.e33_1.plusOperatorSet(toOperatorSet(getAllOperators_0(listOf($clause)))));
     };
   }
   function MutableClassicSolver$assertZ$lambda_0($fact) {
     return function ($this$updateContext) {
-      return $this$updateContext.y33(VOID, VOID, VOID, VOID, VOID, $this$updateContext.m32_1.c1t($fact));
+      return $this$updateContext.p34(VOID, VOID, VOID, VOID, VOID, $this$updateContext.d33_1.k1t($fact));
     };
   }
   function MutableClassicSolver$retract$lambda($result, $clause) {
     return function ($this$updateContext) {
-      return $this$updateContext.y33(VOID, VOID, VOID, VOID, VOID, $result.g1s().toMutableTheory(), $this$updateContext.n32_1.minusOperatorSet(toOperatorSet(getAllOperators_0(listOf($clause)))));
+      return $this$updateContext.p34(VOID, VOID, VOID, VOID, VOID, $result.c1s().toMutableTheory(), $this$updateContext.e33_1.minusOperatorSet(toOperatorSet(getAllOperators_0(listOf($clause)))));
     };
   }
   function MutableClassicSolver$retract$lambda_0($result) {
     return function ($this$updateContext) {
-      return $this$updateContext.y33(VOID, VOID, VOID, VOID, VOID, $result.g1s().toMutableTheory());
+      return $this$updateContext.p34(VOID, VOID, VOID, VOID, VOID, $result.c1s().toMutableTheory());
     };
   }
   function MutableClassicSolver$retractAll$lambda($result) {
     return function ($this$updateContext) {
-      return $this$updateContext.y33(VOID, VOID, VOID, VOID, VOID, $result.g1s().toMutableTheory(), $this$updateContext.n32_1.minusOperatorSet(toOperatorSet(getAllOperators_0($result.g1s()))));
+      return $this$updateContext.p34(VOID, VOID, VOID, VOID, VOID, $result.c1s().toMutableTheory(), $this$updateContext.e33_1.minusOperatorSet(toOperatorSet(getAllOperators_0($result.c1s()))));
     };
   }
   function MutableClassicSolver$retractAll$lambda_0($result) {
     return function ($this$updateContext) {
-      return $this$updateContext.y33(VOID, VOID, VOID, VOID, VOID, $result.g1s().toMutableTheory());
+      return $this$updateContext.p34(VOID, VOID, VOID, VOID, VOID, $result.c1s().toMutableTheory());
     };
   }
   function MutableClassicSolver$setFlag$lambda($name, $value) {
     return function ($this$updateContext) {
-      return $this$updateContext.y33(VOID, VOID, VOID, $this$updateContext.k32_1.set($name, $value));
+      return $this$updateContext.p34(VOID, VOID, VOID, $this$updateContext.b33_1.set($name, $value));
     };
   }
   function MutableClassicSolver$setFlag$lambda_0($flag) {
     return function ($this$updateContext) {
-      return $this$updateContext.y33(VOID, VOID, VOID, $this$updateContext.k32_1.plusPair($flag));
+      return $this$updateContext.p34(VOID, VOID, VOID, $this$updateContext.b33_1.plusPair($flag));
     };
   }
   function MutableClassicSolver$setFlag$lambda_1($flag) {
     return function ($this$updateContext) {
-      return $this$updateContext.y33(VOID, VOID, VOID, $this$updateContext.k32_1.plusNotable($flag));
+      return $this$updateContext.p34(VOID, VOID, VOID, $this$updateContext.b33_1.plusNotable($flag));
     };
   }
   function MutableClassicSolver$setStandardInput$lambda($stdIn) {
     return function ($this$updateContext) {
-      return $this$updateContext.y33(VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this$updateContext.o32_1.plus(to('stdin', $stdIn)));
+      return $this$updateContext.p34(VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this$updateContext.f33_1.plus(to('stdin', $stdIn)));
     };
   }
   function MutableClassicSolver$setStandardError$lambda($stdErr) {
     return function ($this$updateContext) {
-      return $this$updateContext.y33(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this$updateContext.p32_1.plus(to('stderr', $stdErr)));
+      return $this$updateContext.p34(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this$updateContext.g33_1.plus(to('stderr', $stdErr)));
     };
   }
   function MutableClassicSolver$setStandardOutput$lambda($stdOut) {
     return function ($this$updateContext) {
-      return $this$updateContext.y33(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this$updateContext.p32_1.plus(to('stdout', $stdOut)));
+      return $this$updateContext.p34(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this$updateContext.g33_1.plus(to('stdout', $stdOut)));
     };
   }
   function MutableClassicSolver$setWarnings$lambda($warnings) {
     return function ($this$updateContext) {
-      return $this$updateContext.y33(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, Companion_instance_5.g1z($this$updateContext.p32_1, $warnings));
+      return $this$updateContext.p34(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, Companion_instance_5.o1z($this$updateContext.g33_1, $warnings));
     };
   }
-  protoOf(MutableClassicSolver).e36 = function (library) {
-    this.z2a(MutableClassicSolver$loadLibrary$lambda(library));
+  protoOf(MutableClassicSolver).v36 = function (library) {
+    this.h2b(MutableClassicSolver$loadLibrary$lambda(library));
   };
   protoOf(MutableClassicSolver).loadLibrary = function (library) {
-    return this.e36(library);
+    return this.v36(library);
   };
-  protoOf(MutableClassicSolver).f36 = function (library) {
-    this.z2a(MutableClassicSolver$unloadLibrary$lambda(library));
+  protoOf(MutableClassicSolver).w36 = function (library) {
+    this.h2b(MutableClassicSolver$unloadLibrary$lambda(library));
   };
   protoOf(MutableClassicSolver).unloadLibrary = function (library) {
-    return this.f36(library);
+    return this.w36(library);
   };
-  protoOf(MutableClassicSolver).g36 = function (libraries) {
-    this.z2a(MutableClassicSolver$setRuntime$lambda(libraries));
+  protoOf(MutableClassicSolver).x36 = function (libraries) {
+    this.h2b(MutableClassicSolver$setRuntime$lambda(libraries));
   };
   protoOf(MutableClassicSolver).setLibraries = function (libraries) {
-    return this.g36(libraries);
+    return this.x36(libraries);
   };
-  protoOf(MutableClassicSolver).h36 = function (theory) {
-    this.d2b(theory, VOID, false);
+  protoOf(MutableClassicSolver).y36 = function (theory) {
+    this.l2b(theory, VOID, false);
   };
   protoOf(MutableClassicSolver).loadStaticKb = function (theory) {
-    return this.h36(theory);
+    return this.y36(theory);
   };
-  protoOf(MutableClassicSolver).i36 = function (theory) {
-    this.d2b(theory);
+  protoOf(MutableClassicSolver).z36 = function (theory) {
+    this.l2b(theory);
   };
   protoOf(MutableClassicSolver).appendStaticKb = function (theory) {
-    return this.i36(theory);
+    return this.z36(theory);
   };
-  protoOf(MutableClassicSolver).j36 = function () {
-    this.z2a(MutableClassicSolver$resetStaticKb$lambda);
+  protoOf(MutableClassicSolver).a37 = function () {
+    this.h2b(MutableClassicSolver$resetStaticKb$lambda);
   };
   protoOf(MutableClassicSolver).resetStaticKb = function () {
-    return this.j36();
+    return this.a37();
   };
-  protoOf(MutableClassicSolver).k36 = function (theory) {
-    this.d2b(VOID, theory, VOID, false);
+  protoOf(MutableClassicSolver).b37 = function (theory) {
+    this.l2b(VOID, theory, VOID, false);
   };
   protoOf(MutableClassicSolver).loadDynamicKb = function (theory) {
-    return this.k36(theory);
+    return this.b37(theory);
   };
-  protoOf(MutableClassicSolver).l36 = function (theory) {
-    this.d2b(VOID, theory);
+  protoOf(MutableClassicSolver).c37 = function (theory) {
+    this.l2b(VOID, theory);
   };
   protoOf(MutableClassicSolver).appendDynamicKb = function (theory) {
-    return this.l36(theory);
+    return this.c37(theory);
   };
-  protoOf(MutableClassicSolver).m36 = function () {
-    this.z2a(MutableClassicSolver$resetDynamicKb$lambda);
+  protoOf(MutableClassicSolver).d37 = function () {
+    this.h2b(MutableClassicSolver$resetDynamicKb$lambda);
   };
   protoOf(MutableClassicSolver).resetDynamicKb = function () {
-    return this.m36();
+    return this.d37();
   };
-  protoOf(MutableClassicSolver).v1m = function (clause) {
-    this.z2a(MutableClassicSolver$assertA$lambda(clause));
+  protoOf(MutableClassicSolver).r1m = function (clause) {
+    this.h2b(MutableClassicSolver$assertA$lambda(clause));
   };
   protoOf(MutableClassicSolver).assertA = function (clause) {
-    return this.v1m(clause);
+    return this.r1m(clause);
   };
-  protoOf(MutableClassicSolver).n36 = function (fact) {
-    this.z2a(MutableClassicSolver$assertA$lambda_0(fact));
+  protoOf(MutableClassicSolver).e37 = function (fact) {
+    this.h2b(MutableClassicSolver$assertA$lambda_0(fact));
   };
   protoOf(MutableClassicSolver).assertAFact = function (fact) {
-    return this.n36(fact);
+    return this.e37(fact);
   };
-  protoOf(MutableClassicSolver).w1l = function (clause) {
-    this.z2a(MutableClassicSolver$assertZ$lambda(clause));
+  protoOf(MutableClassicSolver).s1l = function (clause) {
+    this.h2b(MutableClassicSolver$assertZ$lambda(clause));
   };
   protoOf(MutableClassicSolver).assertZ = function (clause) {
-    return this.w1l(clause);
+    return this.s1l(clause);
   };
-  protoOf(MutableClassicSolver).o36 = function (fact) {
-    this.z2a(MutableClassicSolver$assertZ$lambda_0(fact));
+  protoOf(MutableClassicSolver).f37 = function (fact) {
+    this.h2b(MutableClassicSolver$assertZ$lambda_0(fact));
   };
   protoOf(MutableClassicSolver).assertZFact = function (fact) {
-    return this.o36(fact);
+    return this.f37(fact);
   };
-  protoOf(MutableClassicSolver).d1t = function (clause) {
-    var result = this.x1u().retract(clause);
-    this.z2a(MutableClassicSolver$retract$lambda(result, clause));
+  protoOf(MutableClassicSolver).l1t = function (clause) {
+    var result = this.f1v().retract(clause);
+    this.h2b(MutableClassicSolver$retract$lambda(result, clause));
     return result;
   };
   protoOf(MutableClassicSolver).retract = function (clause) {
-    return this.d1t(clause);
+    return this.l1t(clause);
   };
-  protoOf(MutableClassicSolver).e1t = function (fact) {
-    var result = this.x1u().retractByHead(fact);
-    this.z2a(MutableClassicSolver$retract$lambda_0(result));
+  protoOf(MutableClassicSolver).m1t = function (fact) {
+    var result = this.f1v().retractByHead(fact);
+    this.h2b(MutableClassicSolver$retract$lambda_0(result));
     return result;
   };
   protoOf(MutableClassicSolver).retractByHead = function (fact) {
-    return this.e1t(fact);
+    return this.m1t(fact);
   };
-  protoOf(MutableClassicSolver).b1m = function (clause) {
-    var result = this.x1u().retractAll(clause);
-    this.z2a(MutableClassicSolver$retractAll$lambda(result));
+  protoOf(MutableClassicSolver).x1l = function (clause) {
+    var result = this.f1v().retractAll(clause);
+    this.h2b(MutableClassicSolver$retractAll$lambda(result));
     return result;
   };
   protoOf(MutableClassicSolver).retractAll = function (clause) {
-    return this.b1m(clause);
+    return this.x1l(clause);
   };
-  protoOf(MutableClassicSolver).p36 = function (fact) {
-    var result = this.x1u().retractAllByHead(fact);
-    this.z2a(MutableClassicSolver$retractAll$lambda_0(result));
+  protoOf(MutableClassicSolver).g37 = function (fact) {
+    var result = this.f1v().retractAllByHead(fact);
+    this.h2b(MutableClassicSolver$retractAll$lambda_0(result));
     return result;
   };
   protoOf(MutableClassicSolver).retractAllBeHead = function (fact) {
-    return this.p36(fact);
+    return this.g37(fact);
   };
-  protoOf(MutableClassicSolver).q36 = function (name, value) {
-    this.z2a(MutableClassicSolver$setFlag$lambda(name, value));
+  protoOf(MutableClassicSolver).h37 = function (name, value) {
+    this.h2b(MutableClassicSolver$setFlag$lambda(name, value));
   };
   protoOf(MutableClassicSolver).setFlag = function (name, value) {
-    return this.q36(name, value);
+    return this.h37(name, value);
   };
-  protoOf(MutableClassicSolver).r36 = function (flag) {
-    this.z2a(MutableClassicSolver$setFlag$lambda_0(flag));
+  protoOf(MutableClassicSolver).i37 = function (flag) {
+    this.h2b(MutableClassicSolver$setFlag$lambda_0(flag));
   };
   protoOf(MutableClassicSolver).setFlagPair = function (flag) {
-    return this.r36(flag);
+    return this.i37(flag);
   };
-  protoOf(MutableClassicSolver).s36 = function (flag) {
-    this.z2a(MutableClassicSolver$setFlag$lambda_1(flag));
+  protoOf(MutableClassicSolver).j37 = function (flag) {
+    this.h2b(MutableClassicSolver$setFlag$lambda_1(flag));
   };
   protoOf(MutableClassicSolver).setFlagNotable = function (flag) {
-    return this.s36(flag);
+    return this.j37(flag);
   };
-  protoOf(MutableClassicSolver).t36 = function (stdIn) {
-    this.z2a(MutableClassicSolver$setStandardInput$lambda(stdIn));
+  protoOf(MutableClassicSolver).k37 = function (stdIn) {
+    this.h2b(MutableClassicSolver$setStandardInput$lambda(stdIn));
   };
   protoOf(MutableClassicSolver).setStandardInput = function (stdIn) {
-    return this.t36(stdIn);
+    return this.k37(stdIn);
   };
-  protoOf(MutableClassicSolver).u36 = function (stdErr) {
-    this.z2a(MutableClassicSolver$setStandardError$lambda(stdErr));
+  protoOf(MutableClassicSolver).l37 = function (stdErr) {
+    this.h2b(MutableClassicSolver$setStandardError$lambda(stdErr));
   };
   protoOf(MutableClassicSolver).setStandardError = function (stdErr) {
-    return this.u36(stdErr);
+    return this.l37(stdErr);
   };
-  protoOf(MutableClassicSolver).v36 = function (stdOut) {
-    this.z2a(MutableClassicSolver$setStandardOutput$lambda(stdOut));
+  protoOf(MutableClassicSolver).m37 = function (stdOut) {
+    this.h2b(MutableClassicSolver$setStandardOutput$lambda(stdOut));
   };
   protoOf(MutableClassicSolver).setStandardOutput = function (stdOut) {
-    return this.v36(stdOut);
+    return this.m37(stdOut);
   };
-  protoOf(MutableClassicSolver).w36 = function (warnings) {
-    this.z2a(MutableClassicSolver$setWarnings$lambda(warnings));
+  protoOf(MutableClassicSolver).n37 = function (warnings) {
+    this.h2b(MutableClassicSolver$setWarnings$lambda(warnings));
   };
   protoOf(MutableClassicSolver).setWarnings = function (warnings) {
-    return this.w36(warnings);
+    return this.n37(warnings);
   };
-  protoOf(MutableClassicSolver).l1v = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings) {
+  protoOf(MutableClassicSolver).t1v = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings) {
     return MutableClassicSolver_init_$Create$_0(unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings);
   };
-  protoOf(MutableClassicSolver).y1s = function () {
+  protoOf(MutableClassicSolver).u1s = function () {
     return this.copy();
   };
   protoOf(MutableClassicSolver).clone = function () {
-    return this.y1s();
+    return this.u1s();
   };
   function MutableClassicSolver() {
   }
@@ -1414,7 +1414,7 @@
   }
   function Companion() {
   }
-  protoOf(Companion).c36 = function (initialState, onStateTransition) {
+  protoOf(Companion).t36 = function (initialState, onStateTransition) {
     return new SimpleSolutionIterator(initialState, onStateTransition);
   };
   protoOf(Companion).of = function (initialState, onStateTransition, $super) {
@@ -1425,7 +1425,7 @@
       tmp = onStateTransition;
     }
     onStateTransition = tmp;
-    return $super === VOID ? this.c36(initialState, onStateTransition) : $super.c36.call(this, initialState, onStateTransition);
+    return $super === VOID ? this.t36(initialState, onStateTransition) : $super.t36.call(this, initialState, onStateTransition);
   };
   var Companion_instance_15;
   function Companion_getInstance_6() {
@@ -1433,73 +1433,73 @@
   }
   function AbstractEndState(solution, context) {
     AbstractState.call(this, context);
-    this.z36_1 = solution;
-    this.a37_1 = context;
+    this.q37_1 = solution;
+    this.r37_1 = context;
   }
-  protoOf(AbstractEndState).g2i = function () {
-    return this.z36_1;
+  protoOf(AbstractEndState).x2i = function () {
+    return this.q37_1;
   };
   protoOf(AbstractEndState).uc = function () {
-    return this.a37_1;
+    return this.r37_1;
   };
-  protoOf(AbstractEndState).b37 = function () {
+  protoOf(AbstractEndState).s37 = function () {
     throw NoSuchElementException_init_$Create$();
   };
   protoOf(AbstractEndState).asEndState = function () {
-    return this.d37();
+    return this.u37();
   };
   function AbstractState$executionTime$delegate$lambda(this$0) {
     return function () {
-      return this$0.j37();
+      return this$0.a38();
     };
   }
   function AbstractState(context) {
-    this.e37_1 = context;
+    this.v37_1 = context;
     var tmp = this;
-    tmp.f37_1 = lazy(AbstractState$executionTime$delegate$lambda(this));
+    tmp.w37_1 = lazy(AbstractState$executionTime$delegate$lambda(this));
   }
   protoOf(AbstractState).uc = function () {
-    return this.e37_1;
+    return this.v37_1;
   };
-  protoOf(AbstractState).h37 = function () {
+  protoOf(AbstractState).y37 = function () {
     // Inline function 'kotlin.getValue' call
-    var this_0 = this.f37_1;
+    var this_0 = this.w37_1;
     executionTime$factory();
     return this_0.r2();
   };
-  protoOf(AbstractState).i37 = function () {
-    return this.h37().pb(this.uc().w32_1).q6(this.uc().x32_1) > 0;
+  protoOf(AbstractState).z37 = function () {
+    return this.y37().pb(this.uc().n33_1).q6(this.uc().o33_1) > 0;
   };
   protoOf(AbstractState).u = function () {
     var tmp;
-    if (this.i37()) {
-      var tmp0_exceededDuration = this.uc().x32_1;
+    if (this.z37()) {
+      var tmp0_exceededDuration = this.uc().o33_1;
       var tmp1_context = this.uc();
-      tmp = new StateHalt(TimeOutException_init_$Create$(VOID, VOID, tmp1_context, tmp0_exceededDuration), this.uc().y33(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.k37()));
+      tmp = new StateHalt(TimeOutException_init_$Create$(VOID, VOID, tmp1_context, tmp0_exceededDuration), this.uc().p34(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.b38()));
     } else {
-      tmp = this.b37();
+      tmp = this.s37();
     }
     return tmp;
   };
   protoOf(AbstractState).next = function () {
     return this.u();
   };
-  protoOf(AbstractState).j37 = function () {
+  protoOf(AbstractState).a38 = function () {
     return currentTimeInstant();
   };
-  protoOf(AbstractState).k37 = function () {
+  protoOf(AbstractState).b38 = function () {
     // Inline function 'kotlin.Long.plus' call
-    return this.uc().b33_1.ob(toLong(1));
+    return this.uc().s33_1.ob(toLong(1));
   };
-  protoOf(AbstractState).l37 = function (_this__u8e3s4) {
+  protoOf(AbstractState).c38 = function (_this__u8e3s4) {
     var tmp$ret$2;
     $l$block: {
       // Inline function 'kotlin.sequences.first' call
-      var tmp0_iterator = _this__u8e3s4.d33_1.r();
+      var tmp0_iterator = _this__u8e3s4.u33_1.r();
       while (tmp0_iterator.s()) {
         var element = tmp0_iterator.u();
         // Inline function 'it.unibo.tuprolog.solve.classic.fsm.AbstractState.skipThrow.<anonymous>' call
-        var tmp0_safe_receiver = element.h32_1;
+        var tmp0_safe_receiver = element.y32_1;
         var tmp = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.qw();
         // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
         if (!(tmp === Throw_getInstance().signature.name)) {
@@ -1513,7 +1513,7 @@
   };
   function executionTime$factory() {
     return getPropertyCallableRef('executionTime', 1, KProperty1, function (receiver) {
-      return receiver.h37();
+      return receiver.y37();
     }, null);
   }
   function EndState() {
@@ -1522,28 +1522,28 @@
   }
   function StateBacktracking(context) {
     AbstractState.call(this, context);
-    this.o37_1 = context;
+    this.f38_1 = context;
   }
   protoOf(StateBacktracking).uc = function () {
-    return this.o37_1;
+    return this.f38_1;
   };
-  protoOf(StateBacktracking).b37 = function () {
-    var choicePoints = this.o37_1.y32_1;
+  protoOf(StateBacktracking).s37 = function () {
+    var choicePoints = this.f38_1.p33_1;
     var tmp;
     // Inline function 'kotlin.let' call
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'it.unibo.tuprolog.solve.classic.fsm.StateBacktracking.computeNext.<anonymous>' call
-    if (choicePoints === null ? true : !choicePoints.f34()) {
-      tmp = new StateEnd(Companion_instance_8.no(this.o37_1.s32_1), this.o37_1.y33(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.k37()));
+    if (choicePoints === null ? true : !choicePoints.w34()) {
+      tmp = new StateEnd(Companion_instance_8.no(this.f38_1.j33_1), this.f38_1.p34(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.b38()));
     } else {
       var tmp$ret$3;
       $l$block: {
         // Inline function 'kotlin.sequences.first' call
-        var tmp0_iterator = ensureNotNull(choicePoints).g34().r();
+        var tmp0_iterator = ensureNotNull(choicePoints).x34().r();
         while (tmp0_iterator.s()) {
           var element = tmp0_iterator.u();
           // Inline function 'it.unibo.tuprolog.solve.classic.fsm.StateBacktracking.computeNext.<anonymous>' call
-          if (element.s33().gr()) {
+          if (element.j34().gr()) {
             tmp$ret$3 = element;
             break $l$block;
           }
@@ -1551,9 +1551,9 @@
         throw NoSuchElementException_init_$Create$_0('Sequence contains no element matching the predicate.');
       }
       var choicePointContext = tmp$ret$3;
-      var nextContext = choicePointContext.x33(this.o37_1);
+      var nextContext = choicePointContext.o34(this.f38_1);
       var tmp_0;
-      if (nextContext.v32_1.gr()) {
+      if (nextContext.m33_1.gr()) {
         tmp_0 = new StatePrimitiveExecution(nextContext);
       } else {
         tmp_0 = new StateRuleExecution(nextContext);
@@ -1562,17 +1562,17 @@
     }
     return tmp;
   };
-  protoOf(StateBacktracking).g37 = function (context) {
-    return this.p37(context);
+  protoOf(StateBacktracking).x37 = function (context) {
+    return this.g38(context);
   };
-  protoOf(StateBacktracking).p37 = function (context) {
+  protoOf(StateBacktracking).g38 = function (context) {
     return new StateBacktracking(context);
   };
   protoOf(StateBacktracking).toString = function () {
-    return 'StateBacktracking(context=' + this.o37_1 + ')';
+    return 'StateBacktracking(context=' + this.f38_1 + ')';
   };
   protoOf(StateBacktracking).hashCode = function () {
-    return this.o37_1.hashCode();
+    return this.f38_1.hashCode();
   };
   protoOf(StateBacktracking).equals = function (other) {
     if (this === other)
@@ -1580,48 +1580,48 @@
     if (!(other instanceof StateBacktracking))
       return false;
     var tmp0_other_with_cast = other instanceof StateBacktracking ? other : THROW_CCE();
-    if (!this.o37_1.equals(tmp0_other_with_cast.o37_1))
+    if (!this.f38_1.equals(tmp0_other_with_cast.f38_1))
       return false;
     return true;
   };
   function StateEnd(solution, context) {
     AbstractEndState.call(this, solution, context);
-    this.u37_1 = solution;
-    this.v37_1 = context;
+    this.l38_1 = solution;
+    this.m38_1 = context;
   }
-  protoOf(StateEnd).g2i = function () {
-    return this.u37_1;
+  protoOf(StateEnd).x2i = function () {
+    return this.l38_1;
   };
   protoOf(StateEnd).uc = function () {
-    return this.v37_1;
+    return this.m38_1;
   };
-  protoOf(StateEnd).i37 = function () {
+  protoOf(StateEnd).z37 = function () {
     return false;
   };
-  protoOf(StateEnd).b37 = function () {
+  protoOf(StateEnd).s37 = function () {
     var tmp;
-    if (this.v37_1.f34()) {
-      var tmp0_$this = this.v37_1;
-      var tmp1_step = this.k37();
-      var tmp2_startTime = this.j37();
-      tmp = new StateBacktracking(tmp0_$this.y33(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, tmp2_startTime, VOID, VOID, VOID, VOID, tmp1_step));
+    if (this.m38_1.w34()) {
+      var tmp0_$this = this.m38_1;
+      var tmp1_step = this.b38();
+      var tmp2_startTime = this.a38();
+      tmp = new StateBacktracking(tmp0_$this.p34(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, tmp2_startTime, VOID, VOID, VOID, VOID, tmp1_step));
     } else {
-      tmp = protoOf(AbstractEndState).b37.call(this);
+      tmp = protoOf(AbstractEndState).s37.call(this);
     }
     return tmp;
   };
-  protoOf(StateEnd).g37 = function (context) {
-    return this.w37(this.u37_1, context);
+  protoOf(StateEnd).x37 = function (context) {
+    return this.n38(this.l38_1, context);
   };
-  protoOf(StateEnd).w37 = function (solution, context) {
+  protoOf(StateEnd).n38 = function (solution, context) {
     return new StateEnd(solution, context);
   };
   protoOf(StateEnd).toString = function () {
-    return 'StateEnd(solution=' + this.u37_1 + ', context=' + this.v37_1 + ')';
+    return 'StateEnd(solution=' + this.l38_1 + ', context=' + this.m38_1 + ')';
   };
   protoOf(StateEnd).hashCode = function () {
-    var result = hashCode(this.u37_1);
-    result = imul(result, 31) + this.v37_1.hashCode() | 0;
+    var result = hashCode(this.l38_1);
+    result = imul(result, 31) + this.m38_1.hashCode() | 0;
     return result;
   };
   protoOf(StateEnd).equals = function (other) {
@@ -1630,14 +1630,14 @@
     if (!(other instanceof StateEnd))
       return false;
     var tmp0_other_with_cast = other instanceof StateEnd ? other : THROW_CCE();
-    if (!equals(this.u37_1, tmp0_other_with_cast.u37_1))
+    if (!equals(this.l38_1, tmp0_other_with_cast.l38_1))
       return false;
-    if (!this.v37_1.equals(tmp0_other_with_cast.v37_1))
+    if (!this.m38_1.equals(tmp0_other_with_cast.m38_1))
       return false;
     return true;
   };
   protoOf(StateEnd).asEndState = function () {
-    return this.d37();
+    return this.u37();
   };
   function isCatch(_this__u8e3s4, $this) {
     var tmp;
@@ -1653,9 +1653,9 @@
   function getExceptionContent(_this__u8e3s4, $this) {
     var tmp;
     if (_this__u8e3s4 instanceof MessageError) {
-      tmp = _this__u8e3s4.s26();
+      tmp = _this__u8e3s4.a27();
     } else {
-      tmp = _this__u8e3s4.u24();
+      tmp = _this__u8e3s4.c25();
     }
     return tmp;
   }
@@ -1669,17 +1669,17 @@
     return tmp;
   }
   function _get_finalState__3aigq8($this) {
-    return new StateHalt(toPublicException($this.z37_1, $this), $this.a38_1.y33(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.k37()));
+    return new StateHalt(toPublicException($this.q38_1, $this), $this.r38_1.p34(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.b38()));
   }
   function _get_handleExceptionInParentContext__yj3v4e($this) {
-    return new StateException($this.z37_1, ensureNotNull($this.a38_1.z32_1).y33(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.k37()));
+    return new StateException($this.q38_1, ensureNotNull($this.r38_1.q33_1).p34(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.b38()));
   }
   function handleStruct($this, unificator, catchGoal, error) {
     var tmp;
     if (isCatch(catchGoal, $this)) {
       var catcher = unificator.mgu(catchGoal.get(1), getExceptionContent(error, $this));
       tmp = handleCatch($this, catchGoal, catcher);
-    } else if ($this.a38_1.u35()) {
+    } else if ($this.r38_1.l36()) {
       tmp = _get_finalState__3aigq8($this);
     } else {
       tmp = _get_handleExceptionInParentContext__yj3v4e($this);
@@ -1689,17 +1689,17 @@
   function handleCatch($this, catchGoal, catcher) {
     var tmp;
     if (catcher.w12()) {
-      var tmp_0 = $this.a38_1.r32_1.plus(catcher);
+      var tmp_0 = $this.r38_1.i33_1.plus(catcher);
       var newSubstitution = tmp_0.filterEntry(StateException$handleCatch$lambda($this));
       var subGoals = catchGoal.get(2).getSubstituted(newSubstitution, []);
-      var newGoals = plus_0(toGoals(subGoals), $this.a38_1.t32_1.er());
-      var tmp0_$this = $this.a38_1;
+      var newGoals = plus_0(toGoals(subGoals), $this.r38_1.k33_1.er());
+      var tmp0_$this = $this.r38_1;
       var tmp1_rules = Companion_instance_7.empty();
       var tmp2_primitives = Companion_instance_7.empty();
       var tmp3_substitution = newSubstitution.castToUnifier();
-      var tmp4_step = $this.k37();
-      tmp = new StateGoalSelection(tmp0_$this.y33(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, tmp3_substitution, VOID, newGoals, tmp1_rules, tmp2_primitives, VOID, VOID, VOID, VOID, VOID, tmp4_step));
-    } else if ($this.a38_1.u35()) {
+      var tmp4_step = $this.b38();
+      tmp = new StateGoalSelection(tmp0_$this.p34(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, tmp3_substitution, VOID, newGoals, tmp1_rules, tmp2_primitives, VOID, VOID, VOID, VOID, VOID, tmp4_step));
+    } else if ($this.r38_1.l36()) {
       tmp = _get_finalState__3aigq8($this);
     } else {
       tmp = _get_handleExceptionInParentContext__yj3v4e($this);
@@ -1710,39 +1710,39 @@
     return function (_name_for_destructuring_parameter_0__wldtmu) {
       // Inline function 'kotlin.collections.component1' call
       var it = _name_for_destructuring_parameter_0__wldtmu.q2();
-      return this$0.a38_1.w35(it);
+      return this$0.r38_1.n36(it);
     };
   }
   function StateException(exception, context) {
     AbstractState.call(this, context);
-    this.z37_1 = exception;
-    this.a38_1 = context;
+    this.q38_1 = exception;
+    this.r38_1 = context;
   }
   protoOf(StateException).uc = function () {
-    return this.a38_1;
+    return this.r38_1;
   };
-  protoOf(StateException).b37 = function () {
+  protoOf(StateException).s37 = function () {
     var tmp;
-    if (this.z37_1 instanceof LogicError) {
-      var catchGoal = ensureNotNull(this.a38_1.v35());
-      tmp = catchGoal.ww() ? handleStruct(this, this.a38_1.i32_1, catchGoal.castToStruct(), this.z37_1) : this.a38_1.u35() ? _get_finalState__3aigq8(this) : _get_handleExceptionInParentContext__yj3v4e(this);
+    if (this.q38_1 instanceof LogicError) {
+      var catchGoal = ensureNotNull(this.r38_1.m36());
+      tmp = catchGoal.ww() ? handleStruct(this, this.r38_1.z32_1, catchGoal.castToStruct(), this.q38_1) : this.r38_1.l36() ? _get_finalState__3aigq8(this) : _get_handleExceptionInParentContext__yj3v4e(this);
     } else {
       tmp = _get_finalState__3aigq8(this);
     }
     return tmp;
   };
-  protoOf(StateException).g37 = function (context) {
-    return this.b38(this.z37_1, context);
+  protoOf(StateException).x37 = function (context) {
+    return this.s38(this.q38_1, context);
   };
-  protoOf(StateException).b38 = function (exception, context) {
+  protoOf(StateException).s38 = function (exception, context) {
     return new StateException(exception, context);
   };
   protoOf(StateException).toString = function () {
-    return 'StateException(exception=' + this.z37_1 + ', context=' + this.a38_1 + ')';
+    return 'StateException(exception=' + this.q38_1 + ', context=' + this.r38_1 + ')';
   };
   protoOf(StateException).hashCode = function () {
-    var result = hashCode(this.z37_1);
-    result = imul(result, 31) + this.a38_1.hashCode() | 0;
+    var result = hashCode(this.q38_1);
+    result = imul(result, 31) + this.r38_1.hashCode() | 0;
     return result;
   };
   protoOf(StateException).equals = function (other) {
@@ -1751,9 +1751,9 @@
     if (!(other instanceof StateException))
       return false;
     var tmp0_other_with_cast = other instanceof StateException ? other : THROW_CCE();
-    if (!equals(this.z37_1, tmp0_other_with_cast.z37_1))
+    if (!equals(this.q38_1, tmp0_other_with_cast.q38_1))
       return false;
-    if (!this.a38_1.equals(tmp0_other_with_cast.a38_1))
+    if (!this.r38_1.equals(tmp0_other_with_cast.r38_1))
       return false;
     return true;
   };
@@ -1761,63 +1761,63 @@
     return function (_name_for_destructuring_parameter_0__wldtmu) {
       // Inline function 'kotlin.collections.component1' call
       var it = _name_for_destructuring_parameter_0__wldtmu.q2();
-      return this$0.e38_1.w35(it);
+      return this$0.v38_1.n36(it);
     };
   }
   function StateGoalSelection(context) {
     AbstractState.call(this, context);
-    this.e38_1 = context;
+    this.v38_1 = context;
   }
   protoOf(StateGoalSelection).uc = function () {
-    return this.e38_1;
+    return this.v38_1;
   };
-  protoOf(StateGoalSelection).b37 = function () {
+  protoOf(StateGoalSelection).s37 = function () {
     var tmp;
-    if (this.e38_1.t32_1.hr()) {
+    if (this.v38_1.k33_1.hr()) {
       var tmp_0;
-      if (this.e38_1.u35()) {
-        tmp_0 = new StateEnd(Companion_instance_8.g1w(this.e38_1.s32_1, this.e38_1.r32_1), this.e38_1.y33(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.k37()));
+      if (this.v38_1.l36()) {
+        tmp_0 = new StateEnd(Companion_instance_8.o1w(this.v38_1.j33_1, this.v38_1.i33_1), this.v38_1.p34(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.b38()));
       } else {
         // Inline function 'kotlin.let' call
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'it.unibo.tuprolog.solve.classic.fsm.StateGoalSelection.computeNext.<anonymous>' call
-        var it = ensureNotNull(this.e38_1.z32_1);
-        var tmp0_choicePoints = this.e38_1.y32_1;
-        var tmp1_flags = this.e38_1.k32_1;
-        var tmp2_dynamicKb = this.e38_1.m32_1;
-        var tmp3_staticKb = this.e38_1.l32_1;
-        var tmp4_substitution = this.e38_1.r32_1.q12(StateGoalSelection$computeNext$lambda(this));
-        var tmp5_goals = it.t32_1.er();
-        var tmp6_procedure = it.h32_1;
-        var tmp7_step = this.k37();
-        var tmp8_startTime = this.e38_1.w32_1;
-        var tmp9_operators = this.e38_1.n32_1;
-        var tmp10_inputChannels = this.e38_1.o32_1;
-        var tmp11_outputChannels = this.e38_1.p32_1;
-        var tmp12_libraries = this.e38_1.j32_1;
-        var tmp13_customData = this.e38_1.q32_1;
-        var tmp$ret$1 = it.y33(tmp6_procedure, VOID, tmp12_libraries, tmp1_flags, tmp3_staticKb, tmp2_dynamicKb, tmp9_operators, tmp10_inputChannels, tmp11_outputChannels, tmp13_customData, tmp4_substitution, VOID, tmp5_goals, VOID, VOID, tmp8_startTime, VOID, tmp0_choicePoints, VOID, VOID, tmp7_step);
+        var it = ensureNotNull(this.v38_1.q33_1);
+        var tmp0_choicePoints = this.v38_1.p33_1;
+        var tmp1_flags = this.v38_1.b33_1;
+        var tmp2_dynamicKb = this.v38_1.d33_1;
+        var tmp3_staticKb = this.v38_1.c33_1;
+        var tmp4_substitution = this.v38_1.i33_1.q12(StateGoalSelection$computeNext$lambda(this));
+        var tmp5_goals = it.k33_1.er();
+        var tmp6_procedure = it.y32_1;
+        var tmp7_step = this.b38();
+        var tmp8_startTime = this.v38_1.n33_1;
+        var tmp9_operators = this.v38_1.e33_1;
+        var tmp10_inputChannels = this.v38_1.f33_1;
+        var tmp11_outputChannels = this.v38_1.g33_1;
+        var tmp12_libraries = this.v38_1.a33_1;
+        var tmp13_customData = this.v38_1.h33_1;
+        var tmp$ret$1 = it.p34(tmp6_procedure, VOID, tmp12_libraries, tmp1_flags, tmp3_staticKb, tmp2_dynamicKb, tmp9_operators, tmp10_inputChannels, tmp11_outputChannels, tmp13_customData, tmp4_substitution, VOID, tmp5_goals, VOID, VOID, tmp8_startTime, VOID, tmp0_choicePoints, VOID, VOID, tmp7_step);
         tmp_0 = new StateGoalSelection(tmp$ret$1);
       }
       tmp = tmp_0;
-    } else if (equals(this.e38_1.k32_1.get(TrackVariables_getInstance()), TrackVariables_getInstance().z28_1)) {
-      tmp = new StatePrimitiveSelection(this.e38_1.y33(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.k37(), plus_1(this.e38_1.c33_1, toSet(ensureNotNull(this.e38_1.t32_1.fr()).sw()))));
+    } else if (equals(this.v38_1.b33_1.get(TrackVariables_getInstance()), TrackVariables_getInstance().h29_1)) {
+      tmp = new StatePrimitiveSelection(this.v38_1.p34(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.b38(), plus_1(this.v38_1.t33_1, toSet(ensureNotNull(this.v38_1.k33_1.fr()).sw()))));
     } else {
-      tmp = new StatePrimitiveSelection(this.e38_1.y33(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.k37()));
+      tmp = new StatePrimitiveSelection(this.v38_1.p34(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.b38()));
     }
     return tmp;
   };
-  protoOf(StateGoalSelection).g37 = function (context) {
-    return this.p37(context);
+  protoOf(StateGoalSelection).x37 = function (context) {
+    return this.g38(context);
   };
-  protoOf(StateGoalSelection).p37 = function (context) {
+  protoOf(StateGoalSelection).g38 = function (context) {
     return new StateGoalSelection(context);
   };
   protoOf(StateGoalSelection).toString = function () {
-    return 'StateGoalSelection(context=' + this.e38_1 + ')';
+    return 'StateGoalSelection(context=' + this.v38_1 + ')';
   };
   protoOf(StateGoalSelection).hashCode = function () {
-    return this.e38_1.hashCode();
+    return this.v38_1.hashCode();
   };
   protoOf(StateGoalSelection).equals = function (other) {
     if (this === other)
@@ -1825,30 +1825,30 @@
     if (!(other instanceof StateGoalSelection))
       return false;
     var tmp0_other_with_cast = other instanceof StateGoalSelection ? other : THROW_CCE();
-    if (!this.e38_1.equals(tmp0_other_with_cast.e38_1))
+    if (!this.v38_1.equals(tmp0_other_with_cast.v38_1))
       return false;
     return true;
   };
   function StateHalt(exception, context) {
-    AbstractEndState.call(this, Companion_instance_8.halt(context.s32_1, exception), context);
-    this.j38_1 = exception;
-    this.k38_1 = context;
+    AbstractEndState.call(this, Companion_instance_8.halt(context.j33_1, exception), context);
+    this.a39_1 = exception;
+    this.b39_1 = context;
   }
   protoOf(StateHalt).uc = function () {
-    return this.k38_1;
+    return this.b39_1;
   };
-  protoOf(StateHalt).g37 = function (context) {
-    return this.b38(this.j38_1, context);
+  protoOf(StateHalt).x37 = function (context) {
+    return this.s38(this.a39_1, context);
   };
-  protoOf(StateHalt).b38 = function (exception, context) {
+  protoOf(StateHalt).s38 = function (exception, context) {
     return new StateHalt(exception, context);
   };
   protoOf(StateHalt).toString = function () {
-    return 'StateHalt(exception=' + this.j38_1 + ', context=' + this.k38_1 + ')';
+    return 'StateHalt(exception=' + this.a39_1 + ', context=' + this.b39_1 + ')';
   };
   protoOf(StateHalt).hashCode = function () {
-    var result = hashCode(this.j38_1);
-    result = imul(result, 31) + this.k38_1.hashCode() | 0;
+    var result = hashCode(this.a39_1);
+    result = imul(result, 31) + this.b39_1.hashCode() | 0;
     return result;
   };
   protoOf(StateHalt).equals = function (other) {
@@ -1857,43 +1857,43 @@
     if (!(other instanceof StateHalt))
       return false;
     var tmp0_other_with_cast = other instanceof StateHalt ? other : THROW_CCE();
-    if (!equals(this.j38_1, tmp0_other_with_cast.j38_1))
+    if (!equals(this.a39_1, tmp0_other_with_cast.a39_1))
       return false;
-    if (!this.k38_1.equals(tmp0_other_with_cast.k38_1))
+    if (!this.b39_1.equals(tmp0_other_with_cast.b39_1))
       return false;
     return true;
   };
   protoOf(StateHalt).asEndState = function () {
-    return this.d37();
+    return this.u37();
   };
   function StateInit(context) {
     AbstractState.call(this, context);
-    this.n38_1 = context;
+    this.e39_1 = context;
   }
   protoOf(StateInit).uc = function () {
-    return this.n38_1;
+    return this.e39_1;
   };
-  protoOf(StateInit).b37 = function () {
-    var tmp0_$this = this.n38_1;
-    var tmp1_goals = toGoals(this.n38_1.s32_1);
+  protoOf(StateInit).s37 = function () {
+    var tmp0_$this = this.e39_1;
+    var tmp1_goals = toGoals(this.e39_1.j33_1);
     var tmp2_rules = Companion_instance_7.empty();
     var tmp3_primitives = Companion_instance_7.empty();
     var tmp4_substitution = Companion_getInstance_2().empty();
-    var tmp5_customData = this.n38_1.q32_1.preservePersistent();
+    var tmp5_customData = this.e39_1.h33_1.preservePersistent();
     var tmp6_relevantVariables = emptySet();
-    return new StateGoalSelection(appendRulesAndChoicePoints(tmp0_$this.y33(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, tmp5_customData, tmp4_substitution, VOID, tmp1_goals, tmp2_rules, tmp3_primitives, VOID, VOID, null, null, 0, new Long(1, 0), tmp6_relevantVariables), Companion_instance_7.empty()));
+    return new StateGoalSelection(appendRulesAndChoicePoints(tmp0_$this.p34(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, tmp5_customData, tmp4_substitution, VOID, tmp1_goals, tmp2_rules, tmp3_primitives, VOID, VOID, null, null, 0, new Long(1, 0), tmp6_relevantVariables), Companion_instance_7.empty()));
   };
-  protoOf(StateInit).g37 = function (context) {
-    return this.p37(context);
+  protoOf(StateInit).x37 = function (context) {
+    return this.g38(context);
   };
-  protoOf(StateInit).p37 = function (context) {
+  protoOf(StateInit).g38 = function (context) {
     return new StateInit(context);
   };
   protoOf(StateInit).toString = function () {
-    return 'StateInit(context=' + this.n38_1 + ')';
+    return 'StateInit(context=' + this.e39_1 + ')';
   };
   protoOf(StateInit).hashCode = function () {
-    return this.n38_1.hashCode();
+    return this.e39_1.hashCode();
   };
   protoOf(StateInit).equals = function (other) {
     if (this === other)
@@ -1901,12 +1901,12 @@
     if (!(other instanceof StateInit))
       return false;
     var tmp0_other_with_cast = other instanceof StateInit ? other : THROW_CCE();
-    if (!this.n38_1.equals(tmp0_other_with_cast.n38_1))
+    if (!this.e39_1.equals(tmp0_other_with_cast.e39_1))
       return false;
     return true;
   };
   function copyFromCurrentPrimitive(_this__u8e3s4, $this, goals, procedureFromAncestor, substitution) {
-    var tmp0_safe_receiver = _this__u8e3s4.v32_1.fr();
+    var tmp0_safe_receiver = _this__u8e3s4.m33_1.fr();
     var tmp;
     if (tmp0_safe_receiver == null) {
       tmp = null;
@@ -1914,18 +1914,18 @@
       // Inline function 'kotlin.let' call
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'it.unibo.tuprolog.solve.classic.fsm.StatePrimitiveExecution.copyFromCurrentPrimitive.<anonymous>' call
-      tmp = _this__u8e3s4.y35(tmp0_safe_receiver.sideEffects);
+      tmp = _this__u8e3s4.p36(tmp0_safe_receiver.sideEffects);
     }
     var tmp1_elvis_lhs = tmp;
     var ctx = tmp1_elvis_lhs == null ? _this__u8e3s4 : tmp1_elvis_lhs;
-    var tmp4_goals = goals == null ? _this__u8e3s4.t32_1 : goals;
-    var tmp_0 = drop(_this__u8e3s4.d33_1, procedureFromAncestor);
+    var tmp4_goals = goals == null ? _this__u8e3s4.k33_1 : goals;
+    var tmp_0 = drop(_this__u8e3s4.u33_1, procedureFromAncestor);
     var tmp5_procedure = first(map(tmp_0, StatePrimitiveExecution$copyFromCurrentPrimitive$lambda));
     var tmp6_primitives = Companion_instance_7.empty();
-    var tmp_1 = substitution == null ? _this__u8e3s4.r32_1 : substitution;
+    var tmp_1 = substitution == null ? _this__u8e3s4.i33_1 : substitution;
     var tmp7_substitution = isInterface(tmp_1, Unifier) ? tmp_1 : THROW_CCE();
-    var tmp8_step = $this.k37();
-    return ctx.y33(tmp5_procedure, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, tmp7_substitution, VOID, tmp4_goals, VOID, tmp6_primitives, VOID, VOID, VOID, VOID, VOID, tmp8_step);
+    var tmp8_step = $this.b38();
+    return ctx.p34(tmp5_procedure, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, tmp7_substitution, VOID, tmp4_goals, VOID, tmp6_primitives, VOID, VOID, VOID, VOID, VOID, tmp8_step);
   }
   function copyFromCurrentPrimitive$default(_this__u8e3s4, $this, goals, procedureFromAncestor, substitution, $super) {
     goals = goals === VOID ? null : goals;
@@ -1934,21 +1934,21 @@
     return copyFromCurrentPrimitive(_this__u8e3s4, $this, goals, procedureFromAncestor, substitution);
   }
   function StatePrimitiveExecution$copyFromCurrentPrimitive$lambda(it) {
-    return it.h32_1;
+    return it.y32_1;
   }
   function StatePrimitiveExecution$computeNext$lambda(this$0) {
     return function (it) {
-      return new StateGoalSelection(copyFromCurrentPrimitive(this$0.q38_1, this$0, this$0.q38_1.t32_1.er(), 1, this$0.q38_1.i32_1.mergeWithOccurCheck(this$0.q38_1.r32_1, it.q1u(), false)));
+      return new StateGoalSelection(copyFromCurrentPrimitive(this$0.h39_1, this$0, this$0.h39_1.k33_1.er(), 1, this$0.h39_1.z32_1.mergeWithOccurCheck(this$0.h39_1.i33_1, it.y1u(), false)));
     };
   }
   function StatePrimitiveExecution$computeNext$lambda_0(this$0) {
     return function (it) {
-      return new StateBacktracking(copyFromCurrentPrimitive$default(ensureNotNull(this$0.q38_1.z32_1), this$0));
+      return new StateBacktracking(copyFromCurrentPrimitive$default(ensureNotNull(this$0.h39_1.q33_1), this$0));
     };
   }
   function StatePrimitiveExecution$computeNext$lambda_1(this$0) {
     return function (it) {
-      return new StateException(it.x1v().updateLastContext(this$0.l37(this$0.q38_1)), copyFromCurrentPrimitive$default(this$0.q38_1, this$0));
+      return new StateException(it.f1w().updateLastContext(this$0.c38(this$0.h39_1)), copyFromCurrentPrimitive$default(this$0.h39_1, this$0));
     };
   }
   function StatePrimitiveExecution$computeNext$lambda_2(it) {
@@ -1956,15 +1956,15 @@
   }
   function StatePrimitiveExecution(context) {
     AbstractState.call(this, context);
-    this.q38_1 = context;
+    this.h39_1 = context;
   }
   protoOf(StatePrimitiveExecution).uc = function () {
-    return this.q38_1;
+    return this.h39_1;
   };
-  protoOf(StatePrimitiveExecution).b37 = function () {
+  protoOf(StatePrimitiveExecution).s37 = function () {
     var tmp;
     try {
-      var tmp0_safe_receiver = this.q38_1.v32_1.fr();
+      var tmp0_safe_receiver = this.h39_1.m33_1.fr();
       var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.solution;
       var tmp_0;
       if (tmp1_safe_receiver == null) {
@@ -1973,15 +1973,15 @@
         var tmp_1 = StatePrimitiveExecution$computeNext$lambda(this);
         var tmp_2 = StatePrimitiveExecution$computeNext$lambda_0(this);
         var tmp_3 = StatePrimitiveExecution$computeNext$lambda_1(this);
-        tmp_0 = tmp1_safe_receiver.b1w(tmp_1, tmp_2, tmp_3, StatePrimitiveExecution$computeNext$lambda_2);
+        tmp_0 = tmp1_safe_receiver.j1w(tmp_1, tmp_2, tmp_3, StatePrimitiveExecution$computeNext$lambda_2);
       }
       var tmp2_elvis_lhs = tmp_0;
-      tmp = tmp2_elvis_lhs == null ? new StateBacktracking(copyFromCurrentPrimitive$default(this.q38_1, this)) : tmp2_elvis_lhs;
+      tmp = tmp2_elvis_lhs == null ? new StateBacktracking(copyFromCurrentPrimitive$default(this.h39_1, this)) : tmp2_elvis_lhs;
     } catch ($p) {
       var tmp_4;
       if ($p instanceof ResolutionException) {
         var exception = $p;
-        tmp_4 = new StateException(exception.updateLastContext(this.l37(this.q38_1)), this.q38_1.y33(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.k37()));
+        tmp_4 = new StateException(exception.updateLastContext(this.c38(this.h39_1)), this.h39_1.p34(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.b38()));
       } else {
         throw $p;
       }
@@ -1989,17 +1989,17 @@
     }
     return tmp;
   };
-  protoOf(StatePrimitiveExecution).g37 = function (context) {
-    return this.p37(context);
+  protoOf(StatePrimitiveExecution).x37 = function (context) {
+    return this.g38(context);
   };
-  protoOf(StatePrimitiveExecution).p37 = function (context) {
+  protoOf(StatePrimitiveExecution).g38 = function (context) {
     return new StatePrimitiveExecution(context);
   };
   protoOf(StatePrimitiveExecution).toString = function () {
-    return 'StatePrimitiveExecution(context=' + this.q38_1 + ')';
+    return 'StatePrimitiveExecution(context=' + this.h39_1 + ')';
   };
   protoOf(StatePrimitiveExecution).hashCode = function () {
-    return this.q38_1.hashCode();
+    return this.h39_1.hashCode();
   };
   protoOf(StatePrimitiveExecution).equals = function (other) {
     if (this === other)
@@ -2007,39 +2007,39 @@
     if (!(other instanceof StatePrimitiveExecution))
       return false;
     var tmp0_other_with_cast = other instanceof StatePrimitiveExecution ? other : THROW_CCE();
-    if (!this.q38_1.equals(tmp0_other_with_cast.q38_1))
+    if (!this.h39_1.equals(tmp0_other_with_cast.h39_1))
       return false;
     return true;
   };
   function exceptionalState($this, exception) {
-    return new StateException(exception, $this.t38_1.y33(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.k37()));
+    return new StateException(exception, $this.k39_1.p34(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.b38()));
   }
   function StatePrimitiveSelection(context) {
     AbstractState.call(this, context);
-    this.t38_1 = context;
+    this.k39_1 = context;
   }
   protoOf(StatePrimitiveSelection).uc = function () {
-    return this.t38_1;
+    return this.k39_1;
   };
-  protoOf(StatePrimitiveSelection).b37 = function () {
+  protoOf(StatePrimitiveSelection).s37 = function () {
     // Inline function 'kotlin.with' call
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'it.unibo.tuprolog.solve.classic.fsm.StatePrimitiveSelection.computeNext.<anonymous>' call
-    var $this$with = this.t38_1;
-    var goal = ensureNotNull($this$with.v35());
+    var $this$with = this.k39_1;
+    var goal = ensureNotNull($this$with.m36());
     var tmp;
     if (goal.mx()) {
-      tmp = exceptionalState(this, Companion_instance_11.forGoal(this.t38_1, extractSignature(ensureNotNull(this.t38_1.h32_1)), goal.castToVar()));
+      tmp = exceptionalState(this, Companion_instance_11.forGoal(this.k39_1, extractSignature(ensureNotNull(this.k39_1.y32_1)), goal.castToVar()));
     } else if (goal.ww()) {
       var goalStruct = goal.castToStruct();
       var signature = extractSignature(goalStruct);
       var tmp_0;
-      if ($this$with.j32_1.hasPrimitive(signature)) {
+      if ($this$with.a33_1.hasPrimitive(signature)) {
         var childContext = createChild($this$with);
         var tmp_1;
         try {
-          var request = toRequest(childContext, goalStruct, signature, this.h37());
-          var tmp0_elvis_lhs = $this$with.j32_1.r2d().x2(signature);
+          var request = toRequest(childContext, goalStruct, signature, this.y37());
+          var tmp0_elvis_lhs = $this$with.a33_1.i2e().x2(signature);
           var tmp_2;
           if (tmp0_elvis_lhs == null) {
             var message = 'Inconsistent behaviour of Library.contains and Library.get';
@@ -2054,7 +2054,7 @@
           var tmp_3;
           if ($p instanceof ResolutionException) {
             var exception = $p;
-            tmp_3 = exceptionalState(this, exception.updateLastContext(this.l37(childContext)));
+            tmp_3 = exceptionalState(this, exception.updateLastContext(this.c38(childContext)));
           } else {
             throw $p;
           }
@@ -2062,28 +2062,28 @@
         }
         tmp_0 = tmp_1;
       } else {
-        tmp_0 = new StateRuleSelection(this.t38_1.y33(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.k37()));
+        tmp_0 = new StateRuleSelection(this.k39_1.p34(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.b38()));
       }
       tmp = tmp_0;
     } else {
       var tmp_4 = Companion_instance_10;
-      var tmp1_safe_receiver = this.t38_1.h32_1;
+      var tmp1_safe_receiver = this.k39_1.y32_1;
       var tmp2_elvis_lhs = tmp1_safe_receiver == null ? null : extractSignature(tmp1_safe_receiver);
-      tmp = exceptionalState(this, tmp_4.forGoal(this.t38_1, tmp2_elvis_lhs == null ? new Signature('?-', 1) : tmp2_elvis_lhs, Expected_CALLABLE_getInstance(), goal));
+      tmp = exceptionalState(this, tmp_4.forGoal(this.k39_1, tmp2_elvis_lhs == null ? new Signature('?-', 1) : tmp2_elvis_lhs, Expected_CALLABLE_getInstance(), goal));
     }
     return tmp;
   };
-  protoOf(StatePrimitiveSelection).g37 = function (context) {
-    return this.p37(context);
+  protoOf(StatePrimitiveSelection).x37 = function (context) {
+    return this.g38(context);
   };
-  protoOf(StatePrimitiveSelection).p37 = function (context) {
+  protoOf(StatePrimitiveSelection).g38 = function (context) {
     return new StatePrimitiveSelection(context);
   };
   protoOf(StatePrimitiveSelection).toString = function () {
-    return 'StatePrimitiveSelection(context=' + this.t38_1 + ')';
+    return 'StatePrimitiveSelection(context=' + this.k39_1 + ')';
   };
   protoOf(StatePrimitiveSelection).hashCode = function () {
-    return this.t38_1.hashCode();
+    return this.k39_1.hashCode();
   };
   protoOf(StatePrimitiveSelection).equals = function (other) {
     if (this === other)
@@ -2091,51 +2091,51 @@
     if (!(other instanceof StatePrimitiveSelection))
       return false;
     var tmp0_other_with_cast = other instanceof StatePrimitiveSelection ? other : THROW_CCE();
-    if (!this.t38_1.equals(tmp0_other_with_cast.t38_1))
+    if (!this.k39_1.equals(tmp0_other_with_cast.k39_1))
       return false;
     return true;
   };
   function _get_failureState__yid9tw($this) {
-    return new StateBacktracking($this.w38_1.y33(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, Companion_instance_7.empty(), VOID, VOID, VOID, VOID, VOID, VOID, $this.k37()));
+    return new StateBacktracking($this.n39_1.p34(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, Companion_instance_7.empty(), VOID, VOID, VOID, VOID, VOID, VOID, $this.b38()));
   }
   function StateRuleExecution(context) {
     AbstractState.call(this, context);
-    this.w38_1 = context;
+    this.n39_1 = context;
   }
   protoOf(StateRuleExecution).uc = function () {
-    return this.w38_1;
+    return this.n39_1;
   };
-  protoOf(StateRuleExecution).b37 = function () {
+  protoOf(StateRuleExecution).s37 = function () {
     // Inline function 'kotlin.with' call
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'it.unibo.tuprolog.solve.classic.fsm.StateRuleExecution.computeNext.<anonymous>' call
-    var $this$with = this.w38_1;
-    var substitution = $this$with.i32_1.mgu(ensureNotNull($this$with.v35()), ensureNotNull($this$with.u32_1.fr()).wy());
+    var $this$with = this.n39_1;
+    var substitution = $this$with.z32_1.mgu(ensureNotNull($this$with.m36()), ensureNotNull($this$with.l33_1.fr()).wy());
     var tmp;
     if (substitution.w12()) {
-      var newSubstitution = this.w38_1.r32_1.plus(substitution).castToUnifier();
-      var subGoals = prepareForExecutionWithUnifier(ensureNotNull(this.w38_1.u32_1.fr()), newSubstitution).xy().getSubstituted(newSubstitution, []);
-      var tmp0_$this = this.w38_1;
+      var newSubstitution = this.n39_1.i33_1.plus(substitution).castToUnifier();
+      var subGoals = prepareForExecutionWithUnifier(ensureNotNull(this.n39_1.l33_1.fr()), newSubstitution).xy().getSubstituted(newSubstitution, []);
+      var tmp0_$this = this.n39_1;
       var tmp1_goals = toGoals(subGoals);
       var tmp2_rules = Companion_instance_7.empty();
-      var tmp3_step = this.k37();
-      tmp = new StateGoalSelection(tmp0_$this.y33(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, newSubstitution, VOID, tmp1_goals, tmp2_rules, VOID, VOID, VOID, VOID, VOID, VOID, tmp3_step));
+      var tmp3_step = this.b38();
+      tmp = new StateGoalSelection(tmp0_$this.p34(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, newSubstitution, VOID, tmp1_goals, tmp2_rules, VOID, VOID, VOID, VOID, VOID, VOID, tmp3_step));
     } else {
       tmp = _get_failureState__yid9tw(this);
     }
     return tmp;
   };
-  protoOf(StateRuleExecution).g37 = function (context) {
-    return this.p37(context);
+  protoOf(StateRuleExecution).x37 = function (context) {
+    return this.g38(context);
   };
-  protoOf(StateRuleExecution).p37 = function (context) {
+  protoOf(StateRuleExecution).g38 = function (context) {
     return new StateRuleExecution(context);
   };
   protoOf(StateRuleExecution).toString = function () {
-    return 'StateRuleExecution(context=' + this.w38_1 + ')';
+    return 'StateRuleExecution(context=' + this.n39_1 + ')';
   };
   protoOf(StateRuleExecution).hashCode = function () {
-    return this.w38_1.hashCode();
+    return this.n39_1.hashCode();
   };
   protoOf(StateRuleExecution).equals = function (other) {
     if (this === other)
@@ -2143,23 +2143,23 @@
     if (!(other instanceof StateRuleExecution))
       return false;
     var tmp0_other_with_cast = other instanceof StateRuleExecution ? other : THROW_CCE();
-    if (!this.w38_1.equals(tmp0_other_with_cast.w38_1))
+    if (!this.n39_1.equals(tmp0_other_with_cast.n39_1))
       return false;
     return true;
   };
   function None() {
     None_instance = this;
     CutLimit.call(this);
-    this.x38_1 = -1;
-    this.y38_1 = null;
+    this.o39_1 = -1;
+    this.p39_1 = null;
   }
-  protoOf(None).z38 = function () {
-    return this.x38_1;
+  protoOf(None).q39 = function () {
+    return this.o39_1;
   };
-  protoOf(None).p1u = function () {
-    return this.y38_1;
+  protoOf(None).x1u = function () {
+    return this.p39_1;
   };
-  protoOf(None).a39 = function () {
+  protoOf(None).r39 = function () {
     return true;
   };
   var None_instance;
@@ -2170,24 +2170,24 @@
   }
   function Actual(depthToCut, procedure) {
     CutLimit.call(this);
-    this.b39_1 = depthToCut;
-    this.c39_1 = procedure;
+    this.s39_1 = depthToCut;
+    this.t39_1 = procedure;
   }
-  protoOf(Actual).z38 = function () {
-    return this.b39_1;
+  protoOf(Actual).q39 = function () {
+    return this.s39_1;
   };
-  protoOf(Actual).p1u = function () {
-    return this.c39_1;
+  protoOf(Actual).x1u = function () {
+    return this.t39_1;
   };
   function CutLimit() {
   }
-  protoOf(CutLimit).a39 = function () {
+  protoOf(CutLimit).r39 = function () {
     return false;
   };
   function Companion_0() {
     Companion_instance_16 = this;
-    this.d39_1 = Catch_getInstance().signature;
-    this.e39_1 = setOf([new Signature(',', 2), new Signature(';', 2), new Signature('->', 2)]);
+    this.u39_1 = Catch_getInstance().signature;
+    this.v39_1 = setOf([new Signature(',', 2), new Signature(';', 2), new Signature('->', 2)]);
   }
   var Companion_instance_16;
   function Companion_getInstance_7() {
@@ -2196,15 +2196,15 @@
     return Companion_instance_16;
   }
   function _get_failureState__yid9tw_0($this) {
-    return new StateBacktracking($this.h39_1.y33(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.k37()));
+    return new StateBacktracking($this.y39_1.p34(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.b38()));
   }
   function exceptionalState_0($this, exception) {
-    return new StateException(exception, $this.h39_1.y33(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.k37()));
+    return new StateException(exception, $this.y39_1.p34(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.b38()));
   }
   function missingProcedure($this, ruleSources, missing) {
-    var unknown = $this.h39_1.k32_1.get(Unknown_getInstance());
+    var unknown = $this.y39_1.b33_1.get(Unknown_getInstance());
     var tmp;
-    if (equals(unknown, Unknown_getInstance().f29_1)) {
+    if (equals(unknown, Unknown_getInstance().n29_1)) {
       tmp = _get_failureState__yid9tw_0($this);
     } else {
       var tmp_0;
@@ -2224,14 +2224,14 @@
       }
       if (tmp$ret$1) {
         var tmp_1;
-        if (equals(unknown, Unknown_getInstance().d29_1)) {
-          tmp_1 = exceptionalState_0($this, Companion_instance_12.forProcedure($this.h39_1, missing));
-        } else if (equals(unknown, Unknown_getInstance().e29_1)) {
+        if (equals(unknown, Unknown_getInstance().l29_1)) {
+          tmp_1 = exceptionalState_0($this, Companion_instance_12.forProcedure($this.y39_1, missing));
+        } else if (equals(unknown, Unknown_getInstance().m29_1)) {
           // Inline function 'kotlin.also' call
           var this_0 = _get_failureState__yid9tw_0($this);
           // Inline function 'kotlin.contracts.contract' call
           // Inline function 'it.unibo.tuprolog.solve.classic.fsm.StateRuleSelection.missingProcedure.<anonymous>' call
-          $this.h39_1.h1v().write(MissingPredicate_init_$Create$($this.h39_1, missing));
+          $this.y39_1.p1v().write(MissingPredicate_init_$Create$($this.y39_1, missing));
           tmp_1 = this_0;
         } else {
           tmp_1 = _get_failureState__yid9tw_0($this);
@@ -2245,7 +2245,7 @@
     return tmp;
   }
   function _get_ignoreState__t4wl8y($this) {
-    return new StateGoalSelection($this.h39_1.y33(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.h39_1.t32_1.er(), VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.k37()));
+    return new StateGoalSelection($this.y39_1.p34(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.y39_1.k33_1.er(), VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.b38()));
   }
   function isCut(_this__u8e3s4, $this) {
     return _this__u8e3s4.lw() ? _this__u8e3s4.castToAtom().r2() === '!' : false;
@@ -2253,17 +2253,17 @@
   function computeCutLimit(_this__u8e3s4, $this, magicCut) {
     var tmp;
     if (magicCut) {
-      tmp = firstOrNull(_this__u8e3s4.d33_1);
+      tmp = firstOrNull(_this__u8e3s4.u33_1);
     } else {
       var tmp$ret$1;
       $l$block: {
         // Inline function 'kotlin.sequences.firstOrNull' call
-        var tmp0_iterator = _this__u8e3s4.d33_1.r();
+        var tmp0_iterator = _this__u8e3s4.u33_1.r();
         while (tmp0_iterator.s()) {
           var element = tmp0_iterator.u();
           // Inline function 'it.unibo.tuprolog.solve.classic.fsm.StateRuleSelection.computeCutLimit.<anonymous>' call
-          var tmp_0 = Companion_getInstance_7().e39_1;
-          var tmp0_safe_receiver = element.h32_1;
+          var tmp_0 = Companion_getInstance_7().v39_1;
+          var tmp0_safe_receiver = element.y32_1;
           if (!contains_0(tmp_0, tmp0_safe_receiver == null ? null : extractSignature(tmp0_safe_receiver))) {
             tmp$ret$1 = element;
             break $l$block;
@@ -2278,21 +2278,21 @@
     if (cutLimit == null) {
       tmp_1 = None_getInstance();
     } else {
-      tmp_1 = new Actual(cutLimit.a33_1, cutLimit.h32_1);
+      tmp_1 = new Actual(cutLimit.r33_1, cutLimit.y32_1);
     }
     return tmp_1;
   }
   function cutCanBeSkipped($this, cutLimit, executionContext) {
-    return (cutLimit.a39() ? true : cutLimit.z38() > executionContext.a33_1) ? true : cutLimit.z38() === executionContext.a33_1 ? !equals(cutLimit.p1u(), executionContext.h32_1) : false;
+    return (cutLimit.r39() ? true : cutLimit.q39() > executionContext.r33_1) ? true : cutLimit.q39() === executionContext.r33_1 ? !equals(cutLimit.x1u(), executionContext.y32_1) : false;
   }
   function performCut(_this__u8e3s4, $this, cutLimit) {
     var tmp;
     if (_this__u8e3s4 === null) {
       tmp = null;
-    } else if (cutCanBeSkipped($this, cutLimit, ensureNotNull(_this__u8e3s4.t33()))) {
+    } else if (cutCanBeSkipped($this, cutLimit, ensureNotNull(_this__u8e3s4.k34()))) {
       tmp = _this__u8e3s4;
     } else {
-      var tmp_0 = _this__u8e3s4.g34();
+      var tmp_0 = _this__u8e3s4.x34();
       var cutCandidates = filter(tmp_0, StateRuleSelection$performCut$lambda(cutLimit));
       var tmp_1;
       if (any(cutCandidates)) {
@@ -2303,7 +2303,7 @@
           while (tmp0_iterator.s()) {
             var element = tmp0_iterator.u();
             // Inline function 'it.unibo.tuprolog.solve.classic.fsm.StateRuleSelection.performCut.<anonymous>' call
-            if (ensureNotNull(element.t33()).a33_1 <= cutLimit.z38()) {
+            if (ensureNotNull(element.k34()).r33_1 <= cutLimit.q39()) {
               tmp$ret$1 = element;
               break $l$block;
             }
@@ -2311,7 +2311,7 @@
           tmp$ret$1 = null;
         }
         var tmp0_safe_receiver = tmp$ret$1;
-        tmp_1 = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.u33();
+        tmp_1 = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.l34();
       } else {
         tmp_1 = _this__u8e3s4;
       }
@@ -2321,11 +2321,11 @@
   }
   function _get_isTailRecursive__h5eso7(_this__u8e3s4, $this) {
     var tmp;
-    if (_this__u8e3s4.t32_1.er().hr() ? equals(_this__u8e3s4.k32_1.get(LastCallOptimization_getInstance()), LastCallOptimization_getInstance().s28_1) : false) {
+    if (_this__u8e3s4.k33_1.er().hr() ? equals(_this__u8e3s4.b33_1.get(LastCallOptimization_getInstance()), LastCallOptimization_getInstance().a29_1) : false) {
       // Inline function 'kotlin.let' call
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'it.unibo.tuprolog.solve.classic.fsm.StateRuleSelection.<get-isTailRecursive>.<anonymous>' call
-      var tmp0_safe_receiver = ensureNotNull(_this__u8e3s4.v35()).asStruct();
+      var tmp0_safe_receiver = ensureNotNull(_this__u8e3s4.m36()).asStruct();
       var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : extractSignature(tmp0_safe_receiver);
       var tmp_0;
       if (tmp1_safe_receiver == null) {
@@ -2335,9 +2335,9 @@
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'it.unibo.tuprolog.solve.classic.fsm.StateRuleSelection.<get-isTailRecursive>.<anonymous>.<anonymous>' call
         var tmp_1;
-        var tmp0_safe_receiver_0 = _this__u8e3s4.h32_1;
+        var tmp0_safe_receiver_0 = _this__u8e3s4.y32_1;
         if (tmp1_safe_receiver.equals(tmp0_safe_receiver_0 == null ? null : extractSignature(tmp0_safe_receiver_0))) {
-          tmp_1 = !tmp1_safe_receiver.equals(Companion_getInstance_7().d39_1);
+          tmp_1 = !tmp1_safe_receiver.equals(Companion_getInstance_7().u39_1);
         } else {
           tmp_1 = false;
         }
@@ -2357,7 +2357,7 @@
     // Inline function 'it.unibo.tuprolog.solve.classic.fsm.StateRuleSelection.selectClauses.<anonymous>' call
     var it = ensureRules(map(tmp, StateRuleSelection$selectClauses$lambda));
     var tmp_0;
-    if (_this__u8e3s4.z1s()) {
+    if (_this__u8e3s4.v1s()) {
       tmp_0 = buffered(it);
     } else {
       tmp_0 = it;
@@ -2366,7 +2366,7 @@
   }
   function StateRuleSelection$performCut$lambda($cutLimit) {
     return function (it) {
-      return equals(ensureNotNull(it.t33()).h32_1, $cutLimit.p1u());
+      return equals(ensureNotNull(it.k34()).y32_1, $cutLimit.x1u());
     };
   }
   function StateRuleSelection$computeNext$lambda(this$0, $currentGoalStruct) {
@@ -2380,23 +2380,23 @@
   function StateRuleSelection(context) {
     Companion_getInstance_7();
     AbstractState.call(this, context);
-    this.h39_1 = context;
+    this.y39_1 = context;
   }
   protoOf(StateRuleSelection).uc = function () {
-    return this.h39_1;
+    return this.y39_1;
   };
-  protoOf(StateRuleSelection).b37 = function () {
-    var currentGoal = ensureNotNull(this.h39_1.v35());
+  protoOf(StateRuleSelection).s37 = function () {
+    var currentGoal = ensureNotNull(this.y39_1.m36());
     var tmp;
     if (currentGoal.mx()) {
-      tmp = exceptionalState_0(this, Companion_instance_11.forGoal(this.h39_1, extractSignature(ensureNotNull(this.h39_1.h32_1)), currentGoal.castToVar()));
+      tmp = exceptionalState_0(this, Companion_instance_11.forGoal(this.y39_1, extractSignature(ensureNotNull(this.y39_1.y32_1)), currentGoal.castToVar()));
     } else if (currentGoal.ww()) {
       // Inline function 'kotlin.with' call
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'it.unibo.tuprolog.solve.classic.fsm.StateRuleSelection.computeNext.<anonymous>' call
-      var $this$with = this.h39_1;
+      var $this$with = this.y39_1;
       var currentGoalStruct = currentGoal.castToStruct();
-      var ruleSources = sequenceOf([$this$with.j32_1.asTheory($this$with.i32_1), $this$with.l32_1, $this$with.m32_1]);
+      var ruleSources = sequenceOf([$this$with.a33_1.asTheory($this$with.z32_1), $this$with.c33_1, $this$with.d33_1]);
       var tmp_0;
       if (currentGoalStruct.nx()) {
         var tmp_1;
@@ -2413,7 +2413,7 @@
           // Inline function 'kotlin.contracts.contract' call
           // Inline function 'it.unibo.tuprolog.solve.classic.fsm.StateRuleSelection.computeNext.<anonymous>.<anonymous>' call
           var it = _get_ignoreState__t4wl8y(this);
-          tmp_0 = it.p37(it.e38_1.y33(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, performCut(it.e38_1.y32_1, this, cutLimit)));
+          tmp_0 = it.g38(it.v38_1.p34(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, performCut(it.v38_1.p33_1, this, cutLimit)));
         } else {
           var tmp$ret$3;
           $l$block: {
@@ -2432,10 +2432,10 @@
           if (tmp$ret$3) {
             var rules = cursor(flatMap(ruleSources, StateRuleSelection$computeNext$lambda(this, currentGoalStruct)));
             var tmp_2;
-            if (_get_isTailRecursive__h5eso7(this.h39_1, this)) {
-              tmp_2 = new StateRuleExecution(replaceWithChildAppendingRulesAndChoicePoints(this.h39_1, rules));
+            if (_get_isTailRecursive__h5eso7(this.y39_1, this)) {
+              tmp_2 = new StateRuleExecution(replaceWithChildAppendingRulesAndChoicePoints(this.y39_1, rules));
             } else {
-              tmp_2 = new StateRuleExecution(createChildAppendingRulesAndChoicePoints(this.h39_1, rules));
+              tmp_2 = new StateRuleExecution(createChildAppendingRulesAndChoicePoints(this.y39_1, rules));
             }
             tmp_0 = tmp_2;
           } else {
@@ -2445,21 +2445,21 @@
       }
       tmp = tmp_0;
     } else {
-      tmp = exceptionalState_0(this, Companion_instance_10.forGoal(this.h39_1, extractSignature(ensureNotNull(this.h39_1.h32_1)), Expected_CALLABLE_getInstance(), currentGoal));
+      tmp = exceptionalState_0(this, Companion_instance_10.forGoal(this.y39_1, extractSignature(ensureNotNull(this.y39_1.y32_1)), Expected_CALLABLE_getInstance(), currentGoal));
     }
     return tmp;
   };
-  protoOf(StateRuleSelection).g37 = function (context) {
-    return this.p37(context);
+  protoOf(StateRuleSelection).x37 = function (context) {
+    return this.g38(context);
   };
-  protoOf(StateRuleSelection).p37 = function (context) {
+  protoOf(StateRuleSelection).g38 = function (context) {
     return new StateRuleSelection(context);
   };
   protoOf(StateRuleSelection).toString = function () {
-    return 'StateRuleSelection(context=' + this.h39_1 + ')';
+    return 'StateRuleSelection(context=' + this.y39_1 + ')';
   };
   protoOf(StateRuleSelection).hashCode = function () {
-    return this.h39_1.hashCode();
+    return this.y39_1.hashCode();
   };
   protoOf(StateRuleSelection).equals = function (other) {
     if (this === other)
@@ -2467,19 +2467,19 @@
     if (!(other instanceof StateRuleSelection))
       return false;
     var tmp0_other_with_cast = other instanceof StateRuleSelection ? other : THROW_CCE();
-    if (!this.h39_1.equals(tmp0_other_with_cast.h39_1))
+    if (!this.y39_1.equals(tmp0_other_with_cast.y39_1))
       return false;
     return true;
   };
   function appendRulesAndChoicePoints(_this__u8e3s4, rules) {
     var tmp;
     if (rules.gr()) {
-      tmp = appendRules(_this__u8e3s4.y32_1, rules.er(), _this__u8e3s4);
+      tmp = appendRules(_this__u8e3s4.p33_1, rules.er(), _this__u8e3s4);
     } else {
-      tmp = appendRules(_this__u8e3s4.y32_1, Companion_instance_7.empty(), _this__u8e3s4);
+      tmp = appendRules(_this__u8e3s4.p33_1, Companion_instance_7.empty(), _this__u8e3s4);
     }
     var newChoicePointContext = tmp;
-    return _this__u8e3s4.y33(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, rules, VOID, VOID, VOID, newChoicePointContext);
+    return _this__u8e3s4.p34(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, rules, VOID, VOID, VOID, newChoicePointContext);
   }
   function toGoals(_this__u8e3s4) {
     var tmp = unfoldGoals(_this__u8e3s4);
@@ -2497,14 +2497,14 @@
   }
   function createChild(_this__u8e3s4, inferProcedureFromGoals) {
     inferProcedureFromGoals = inferProcedureFromGoals === VOID ? true : inferProcedureFromGoals;
-    var currentGoal = ensureNotNull(_this__u8e3s4.v35()).castToStruct();
+    var currentGoal = ensureNotNull(_this__u8e3s4.m36()).castToStruct();
     var tmp0_goals = toGoals(currentGoal);
-    var tmp1_procedure = inferProcedureFromGoals ? currentGoal : _this__u8e3s4.h32_1;
-    var tmp2_depth = _this__u8e3s4.a33_1 + 1 | 0;
+    var tmp1_procedure = inferProcedureFromGoals ? currentGoal : _this__u8e3s4.y32_1;
+    var tmp2_depth = _this__u8e3s4.r33_1 + 1 | 0;
     // Inline function 'kotlin.Long.plus' call
-    var tmp3_step = _this__u8e3s4.b33_1.ob(toLong(1));
+    var tmp3_step = _this__u8e3s4.s33_1.ob(toLong(1));
     var tmp4_relevantVariables = emptySet();
-    return _this__u8e3s4.y33(tmp1_procedure, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, tmp0_goals, VOID, VOID, VOID, VOID, VOID, _this__u8e3s4, tmp2_depth, tmp3_step, tmp4_relevantVariables);
+    return _this__u8e3s4.p34(tmp1_procedure, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, tmp0_goals, VOID, VOID, VOID, VOID, VOID, _this__u8e3s4, tmp2_depth, tmp3_step, tmp4_relevantVariables);
   }
   function toRequest(_this__u8e3s4, goal, signature, startTime) {
     return new Request(signature, goal.rw(), _this__u8e3s4, startTime);
@@ -2512,12 +2512,12 @@
   function appendPrimitivesAndChoicePoints(_this__u8e3s4, primitiveExecutions) {
     var tmp;
     if (primitiveExecutions.gr()) {
-      tmp = appendPrimitives(_this__u8e3s4.y32_1, primitiveExecutions.er(), _this__u8e3s4);
+      tmp = appendPrimitives(_this__u8e3s4.p33_1, primitiveExecutions.er(), _this__u8e3s4);
     } else {
-      tmp = appendPrimitives(_this__u8e3s4.y32_1, Companion_instance_7.empty(), _this__u8e3s4);
+      tmp = appendPrimitives(_this__u8e3s4.p33_1, Companion_instance_7.empty(), _this__u8e3s4);
     }
     var newChoicePointContext = tmp;
-    return _this__u8e3s4.y33(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, primitiveExecutions, VOID, VOID, newChoicePointContext);
+    return _this__u8e3s4.p34(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, primitiveExecutions, VOID, VOID, newChoicePointContext);
   }
   function replaceWithChildAppendingRulesAndChoicePoints(_this__u8e3s4, rules, inferProcedureFromGoals) {
     inferProcedureFromGoals = inferProcedureFromGoals === VOID ? true : inferProcedureFromGoals;
@@ -2534,13 +2534,13 @@
   }
   function replaceWithChild(_this__u8e3s4, inferProcedureFromGoals) {
     inferProcedureFromGoals = inferProcedureFromGoals === VOID ? true : inferProcedureFromGoals;
-    var currentGoal = ensureNotNull(_this__u8e3s4.v35()).castToStruct();
+    var currentGoal = ensureNotNull(_this__u8e3s4.m36()).castToStruct();
     var tmp0_goals = toGoals(currentGoal);
-    var tmp1_procedure = inferProcedureFromGoals ? currentGoal : _this__u8e3s4.h32_1;
-    var tmp2_depth = _this__u8e3s4.a33_1 + 1 | 0;
+    var tmp1_procedure = inferProcedureFromGoals ? currentGoal : _this__u8e3s4.y32_1;
+    var tmp2_depth = _this__u8e3s4.r33_1 + 1 | 0;
     // Inline function 'kotlin.Long.plus' call
-    var tmp3_step = _this__u8e3s4.b33_1.ob(toLong(1));
-    return _this__u8e3s4.y33(tmp1_procedure, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, tmp0_goals, VOID, VOID, VOID, VOID, VOID, VOID, tmp2_depth, tmp3_step);
+    var tmp3_step = _this__u8e3s4.s33_1.ob(toLong(1));
+    return _this__u8e3s4.p34(tmp1_procedure, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, tmp0_goals, VOID, VOID, VOID, VOID, VOID, VOID, tmp2_depth, tmp3_step);
   }
   function toGoals$lambda(it) {
     return it.mx() ? Companion_getInstance_1().of('call', [it]) : it;
@@ -2561,49 +2561,49 @@
     return it.castToRule();
   }
   function AbstractSolutionIterator(state) {
-    this.i39_1 = state;
-    this.j39_1 = new Long(0, 0);
+    this.z39_1 = state;
+    this.a3a_1 = new Long(0, 0);
   }
   protoOf(AbstractSolutionIterator).s = function () {
     // Inline function 'kotlin.let' call
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'it.unibo.tuprolog.solve.classic.impl.AbstractSolutionIterator.hasNext.<anonymous>' call
-    var it = this.i39_1;
-    return !it.c37() ? true : it.castToEndState().f34();
+    var it = this.z39_1;
+    return !it.t37() ? true : it.castToEndState().w34();
   };
   protoOf(AbstractSolutionIterator).u = function () {
     do {
-      var previousState = this.i39_1;
+      var previousState = this.z39_1;
       var tmp = this;
-      var tmp_0 = this.i39_1;
-      this.j39_1 = this.j39_1.tb();
-      tmp.i39_1 = this.k39(tmp_0, this.j39_1);
-      this.onStateTransition(previousState, this.i39_1, this.j39_1);
+      var tmp_0 = this.z39_1;
+      this.a3a_1 = this.a3a_1.tb();
+      tmp.z39_1 = this.b3a(tmp_0, this.a3a_1);
+      this.onStateTransition(previousState, this.z39_1, this.a3a_1);
     }
-     while (!this.i39_1.c37());
-    return this.i39_1.castToEndState().g2i().cleanUp();
+     while (!this.z39_1.t37());
+    return this.z39_1.castToEndState().x2i().cleanUp();
   };
   function SimpleSolutionIterator(state, onStateTransitionCallback) {
     AbstractSolutionIterator.call(this, state);
-    this.n39_1 = onStateTransitionCallback;
+    this.e3a_1 = onStateTransitionCallback;
   }
-  protoOf(SimpleSolutionIterator).k39 = function (state, step) {
+  protoOf(SimpleSolutionIterator).b3a = function (state, step) {
     return state.next();
   };
-  protoOf(SimpleSolutionIterator).o39 = function (source, destination, index) {
-    return this.n39_1(source, destination, index);
+  protoOf(SimpleSolutionIterator).f3a = function (source, destination, index) {
+    return this.e3a_1(source, destination, index);
   };
   protoOf(SimpleSolutionIterator).onStateTransition = function (source, destination, index) {
-    return this.o39(source, destination, index);
+    return this.f3a(source, destination, index);
   };
   function DefaultBuiltins() {
     DefaultBuiltins_instance = this;
     ExtensionLibrary.call(this, CommonBuiltins_getInstance());
   }
-  protoOf(DefaultBuiltins).f2e = function () {
+  protoOf(DefaultBuiltins).w2e = function () {
     return listOf(Throw_getInstance());
   };
-  protoOf(DefaultBuiltins).e2e = function () {
+  protoOf(DefaultBuiltins).v2e = function () {
     return listOf_0([Catch_getInstance(), Call_getInstance(), Comma_getInstance(), Cut_getInstance(), Fail_getInstance(), Success_getInstance()]);
   };
   var DefaultBuiltins_instance;
@@ -2632,7 +2632,7 @@
       var tmp_3 = error.get(0);
       tmp = tmp_2.of(VOID, VOID, context, isInterface(tmp_3, Struct) ? tmp_3 : THROW_CCE(), error.kw() > 1 ? error.get(1) : null);
     } else {
-      tmp = Companion_instance_13.n26(error, context);
+      tmp = Companion_instance_13.v26(error, context);
     }
     return tmp;
   }
@@ -2640,11 +2640,11 @@
     Throw_instance = this;
     UnaryPredicate.call(this, 'throw');
   }
-  protoOf(Throw).p2q = function (_this__u8e3s4, first) {
-    return sequenceOf([Companion_getInstance_5().f2f(_this__u8e3s4).replyException(handleError(this, _this__u8e3s4.context, _this__u8e3s4.arguments.c1(0)), VOID, [])]);
+  protoOf(Throw).g2r = function (_this__u8e3s4, first) {
+    return sequenceOf([Companion_getInstance_5().w2f(_this__u8e3s4).replyException(handleError(this, _this__u8e3s4.context, _this__u8e3s4.arguments.c1(0)), VOID, [])]);
   };
-  protoOf(Throw).b2j = function (_this__u8e3s4, first) {
-    return this.p2q(_this__u8e3s4, first);
+  protoOf(Throw).s2j = function (_this__u8e3s4, first) {
+    return this.g2r(_this__u8e3s4, first);
   };
   var Throw_instance;
   function Throw_getInstance() {
@@ -2656,10 +2656,10 @@
     Call_instance = this;
     RuleWrapper_init_$Init$('call', 1, VOID, this);
   }
-  protoOf(Call).f2j = function (_this__u8e3s4) {
-    return _this__u8e3s4.ktListOf([_this__u8e3s4.varOf('G')]);
+  protoOf(Call).w2j = function (_this__u8e3s4) {
+    return listOf(_this__u8e3s4.varOf('G'));
   };
-  protoOf(Call).g2j = function (_this__u8e3s4) {
+  protoOf(Call).x2j = function (_this__u8e3s4) {
     // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
     var tmp$ret$0 = EnsureExecutable_getInstance().signature.name;
     return _this__u8e3s4.tupleOf([_this__u8e3s4.structOf(tmp$ret$0, [_this__u8e3s4.varOf('G')]), _this__u8e3s4.varOf('G')]);
@@ -2674,10 +2674,10 @@
     Catch_instance = this;
     RuleWrapper_init_$Init$('catch', 3, VOID, this);
   }
-  protoOf(Catch).f2j = function (_this__u8e3s4) {
-    return _this__u8e3s4.ktListOf([_this__u8e3s4.varOf('G'), _this__u8e3s4.varOf('E'), _this__u8e3s4.varOf('C')]);
+  protoOf(Catch).w2j = function (_this__u8e3s4) {
+    return listOf_0([_this__u8e3s4.varOf('G'), _this__u8e3s4.varOf('E'), _this__u8e3s4.varOf('C')]);
   };
-  protoOf(Catch).g2j = function (_this__u8e3s4) {
+  protoOf(Catch).x2j = function (_this__u8e3s4) {
     return _this__u8e3s4.varOf('G');
   };
   var Catch_instance;
@@ -2690,10 +2690,10 @@
     Comma_instance = this;
     RuleWrapper_init_$Init$(',', 2, VOID, this);
   }
-  protoOf(Comma).f2j = function (_this__u8e3s4) {
-    return _this__u8e3s4.ktListOf([_this__u8e3s4.varOf('A'), _this__u8e3s4.varOf('B')]);
+  protoOf(Comma).w2j = function (_this__u8e3s4) {
+    return listOf_0([_this__u8e3s4.varOf('A'), _this__u8e3s4.varOf('B')]);
   };
-  protoOf(Comma).g2j = function (_this__u8e3s4) {
+  protoOf(Comma).x2j = function (_this__u8e3s4) {
     return _this__u8e3s4.tupleOf([_this__u8e3s4.varOf('A'), _this__u8e3s4.varOf('B')]);
   };
   var Comma_instance;
@@ -2716,7 +2716,7 @@
     Fail_instance = this;
     NegationAsFailure.call(this);
   }
-  protoOf(Fail).g2j = function (_this__u8e3s4) {
+  protoOf(Fail).x2j = function (_this__u8e3s4) {
     // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
     var tmp$ret$0 = EnsureExecutable_getInstance().signature.name;
     var tmp = _this__u8e3s4.structOf(tmp$ret$0, [_this__u8e3s4.varOf('X')]);
@@ -2734,7 +2734,7 @@
     Success_instance = this;
     NegationAsFailure.call(this);
   }
-  protoOf(Success).g2j = function (_this__u8e3s4) {
+  protoOf(Success).x2j = function (_this__u8e3s4) {
     return _this__u8e3s4.truthOf(true);
   };
   var Success_instance;
@@ -2744,8 +2744,8 @@
     return Success_instance;
   }
   function Companion_1() {
-    this.o3a_1 = '\\+';
-    this.p3a_1 = 1;
+    this.f3b_1 = '\\+';
+    this.g3b_1 = 1;
   }
   var Companion_instance_17;
   function Companion_getInstance_8() {
@@ -2754,37 +2754,37 @@
   function NegationAsFailure() {
     RuleWrapper_init_$Init$('\\+', 1, VOID, this);
   }
-  protoOf(NegationAsFailure).f2j = function (_this__u8e3s4) {
-    return _this__u8e3s4.ktListOf([_this__u8e3s4.varOf('X')]);
+  protoOf(NegationAsFailure).w2j = function (_this__u8e3s4) {
+    return listOf(_this__u8e3s4.varOf('X'));
   };
   //region block: post-declaration
   protoOf(ClassicExecutionContext).createSolver = createSolver;
   protoOf(ClassicExecutionContext).createMutableSolver = createMutableSolver;
   protoOf(ClassicExecutionContext).update = update;
-  protoOf(ClassicExecutionContext).e1v = get_standardInput;
-  protoOf(ClassicExecutionContext).f1v = get_standardOutput;
-  protoOf(ClassicExecutionContext).g1v = get_standardError;
-  protoOf(ClassicExecutionContext).h1v = get_warnings;
-  protoOf(ClassicExecutionContext).l1u = get_endTime;
-  protoOf(ClassicExecutionContext).n1u = get_remainingTime;
-  protoOf(ClassicExecutionContext).o1u = get_elapsedTime;
+  protoOf(ClassicExecutionContext).m1v = get_standardInput;
+  protoOf(ClassicExecutionContext).n1v = get_standardOutput;
+  protoOf(ClassicExecutionContext).o1v = get_standardError;
+  protoOf(ClassicExecutionContext).p1v = get_warnings;
+  protoOf(ClassicExecutionContext).t1u = get_endTime;
+  protoOf(ClassicExecutionContext).v1u = get_remainingTime;
+  protoOf(ClassicExecutionContext).w1u = get_elapsedTime;
   protoOf(ClassicSolverFactory).rawSolverOf = rawSolverOf;
   protoOf(ClassicSolverFactory).solverOf = solverOf;
   protoOf(ClassicSolverFactory).mutableSolverOf = mutableSolverOf;
   protoOf(ClassicSolverFactory).rawMutableSolverOf = rawMutableSolverOf;
   protoOf(ClassicSolverFactory).newBuilder = newBuilder;
-  protoOf(ClassicSolverFactory).u1x = get_defaultRuntime;
-  protoOf(ClassicSolverFactory).w1x = get_defaultUnificator;
-  protoOf(ClassicSolverFactory).x1x = get_defaultFlags;
-  protoOf(ClassicSolverFactory).a1y = get_defaultStaticKb;
-  protoOf(ClassicSolverFactory).b1y = get_defaultDynamicKb;
-  protoOf(ClassicSolverFactory).c1y = get_defaultInputChannel;
-  protoOf(ClassicSolverFactory).d1y = get_defaultOutputChannel;
-  protoOf(ClassicSolverFactory).e1y = get_defaultErrorChannel;
-  protoOf(ClassicSolverFactory).f1y = get_defaultWarningsChannel;
-  protoOf(ClassicSolverFactory).n1y = solverWithDefaultBuiltins;
+  protoOf(ClassicSolverFactory).c1y = get_defaultRuntime;
+  protoOf(ClassicSolverFactory).e1y = get_defaultUnificator;
+  protoOf(ClassicSolverFactory).f1y = get_defaultFlags;
+  protoOf(ClassicSolverFactory).i1y = get_defaultStaticKb;
+  protoOf(ClassicSolverFactory).j1y = get_defaultDynamicKb;
+  protoOf(ClassicSolverFactory).k1y = get_defaultInputChannel;
+  protoOf(ClassicSolverFactory).l1y = get_defaultOutputChannel;
+  protoOf(ClassicSolverFactory).m1y = get_defaultErrorChannel;
+  protoOf(ClassicSolverFactory).n1y = get_defaultWarningsChannel;
+  protoOf(ClassicSolverFactory).v1y = solverWithDefaultBuiltins;
   protoOf(ClassicSolverFactory).solverWithDefaultBuiltinsAnd = solverWithDefaultBuiltinsAnd;
-  protoOf(ClassicSolverFactory).p1y = mutableSolverWithDefaultBuiltins;
+  protoOf(ClassicSolverFactory).x1y = mutableSolverWithDefaultBuiltins;
   protoOf(ClassicSolverFactory).mutableSolverWithDefaultBuiltinsAnd = mutableSolverWithDefaultBuiltinsAnd;
   protoOf(MutableClassicSolver).loadStaticClauses = loadStaticClauses;
   protoOf(MutableClassicSolver).loadStaticClausesIterable = loadStaticClausesIterable;
@@ -2792,13 +2792,13 @@
   protoOf(MutableClassicSolver).loadDynamicClauses = loadDynamicClauses;
   protoOf(MutableClassicSolver).loadDynamicClausesIterable = loadDynamicClausesIterable;
   protoOf(MutableClassicSolver).loadDynamicClausesSequence = loadDynamicClausesSequence;
-  protoOf(AbstractState).c37 = get_isEndState;
+  protoOf(AbstractState).t37 = get_isEndState;
   protoOf(AbstractState).asEndState = asEndState;
   protoOf(AbstractState).castToEndState = castToEndState;
   protoOf(AbstractState).clone = clone;
-  protoOf(AbstractEndState).f34 = get_hasOpenAlternatives;
-  protoOf(AbstractEndState).c37 = get_isEndState_0;
-  protoOf(AbstractEndState).d37 = asEndState_0;
+  protoOf(AbstractEndState).w34 = get_hasOpenAlternatives;
+  protoOf(AbstractEndState).t37 = get_isEndState_0;
+  protoOf(AbstractEndState).u37 = asEndState_0;
   //endregion
   //region block: init
   ClassicSolverFactory_instance = new ClassicSolverFactory();