@tuprolog/2p-full 1.0.3 → 1.1.0

package/2p-unify.js

@@ -1,73 +1,78 @@
-(function (root, factory) {
+(function (factory) {
   if (typeof define === 'function' && define.amd)
     define(['exports', './kotlin-kotlin-stdlib.js', './2p-core.js', './2p-utils.js'], factory);
   else if (typeof exports === 'object')
     factory(module.exports, require('./kotlin-kotlin-stdlib.js'), require('./2p-core.js'), require('./2p-utils.js'));
   else {
-    if (typeof this['kotlin-kotlin-stdlib'] === 'undefined') {
+    if (typeof globalThis['kotlin-kotlin-stdlib'] === 'undefined') {
       throw new Error("Error loading module '2p-unify'. Its dependency 'kotlin-kotlin-stdlib' was not found. Please, check whether 'kotlin-kotlin-stdlib' is loaded prior to '2p-unify'.");
     }
-    if (typeof this['2p-core'] === 'undefined') {
+    if (typeof globalThis['2p-core'] === 'undefined') {
       throw new Error("Error loading module '2p-unify'. Its dependency '2p-core' was not found. Please, check whether '2p-core' is loaded prior to '2p-unify'.");
     }
-    if (typeof this['2p-utils'] === 'undefined') {
+    if (typeof globalThis['2p-utils'] === 'undefined') {
       throw new Error("Error loading module '2p-unify'. Its dependency '2p-utils' was not found. Please, check whether '2p-utils' is loaded prior to '2p-unify'.");
     }
-    root['2p-unify'] = factory(typeof this['2p-unify'] === 'undefined' ? {} : this['2p-unify'], this['kotlin-kotlin-stdlib'], this['2p-core'], this['2p-utils']);
+    globalThis['2p-unify'] = factory(typeof globalThis['2p-unify'] === 'undefined' ? {} : globalThis['2p-unify'], globalThis['kotlin-kotlin-stdlib'], globalThis['2p-core'], globalThis['2p-utils']);
   }
-}(this, function (_, kotlin_kotlin, kotlin_it_unibo_tuprolog_core, kotlin_it_unibo_tuprolog_utils) {
+}(function (_, kotlin_kotlin, kotlin_it_unibo_tuprolog_core, kotlin_it_unibo_tuprolog_utils) {
   'use strict';
   //region block: imports
   var imul = Math.imul;
-  var asSequence = kotlin_kotlin.$_$.m2;
-  var plus = kotlin_kotlin.$_$.u8;
-  var map = kotlin_kotlin.$_$.q8;
-  var Unit_instance = kotlin_kotlin.$_$.y1;
-  var Companion_getInstance = kotlin_it_unibo_tuprolog_core.$_$.e1;
-  var ArrayList_init_$Create$ = kotlin_kotlin.$_$.g;
-  var toCollection = kotlin_kotlin.$_$.b9;
-  var Pair = kotlin_kotlin.$_$.tb;
-  var VOID = kotlin_kotlin.$_$.d;
-  var lazy = kotlin_kotlin.$_$.ac;
-  var protoOf = kotlin_kotlin.$_$.u6;
-  var asSequence_0 = kotlin_kotlin.$_$.n2;
-  var classMeta = kotlin_kotlin.$_$.v5;
-  var setMetadataFor = kotlin_kotlin.$_$.v6;
-  var KProperty1 = kotlin_kotlin.$_$.q7;
-  var getPropertyCallableRef = kotlin_kotlin.$_$.c6;
+  var KProperty1 = kotlin_kotlin.$_$.c7;
+  var getPropertyCallableRef = kotlin_kotlin.$_$.q5;
+  var asSequence = kotlin_kotlin.$_$.v1;
+  var plus = kotlin_kotlin.$_$.g8;
+  var map = kotlin_kotlin.$_$.c8;
+  var Unit_instance = kotlin_kotlin.$_$.k1;
+  var Companion_getInstance = kotlin_it_unibo_tuprolog_core.$_$.v;
+  var ArrayList_init_$Create$ = kotlin_kotlin.$_$.d;
+  var toCollection = kotlin_kotlin.$_$.o8;
+  var Pair = kotlin_kotlin.$_$.ca;
+  var VOID = kotlin_kotlin.$_$.b;
+  var lazy = kotlin_kotlin.$_$.ja;
+  var protoOf = kotlin_kotlin.$_$.k6;
+  var asSequence_0 = kotlin_kotlin.$_$.w1;
+  var THROW_CCE = kotlin_kotlin.$_$.ea;
+  var initMetadataForClass = kotlin_kotlin.$_$.t5;
   var Companion_instance = kotlin_it_unibo_tuprolog_utils.$_$.a;
-  var Triple = kotlin_kotlin.$_$.xb;
+  var Triple = kotlin_kotlin.$_$.ga;
   var Some = kotlin_it_unibo_tuprolog_utils.$_$.k;
-  var zip = kotlin_kotlin.$_$.i9;
-  var flatMap = kotlin_kotlin.$_$.h8;
-  var sequenceOf = kotlin_kotlin.$_$.w8;
-  var THROW_CCE = kotlin_kotlin.$_$.vb;
-  var to = kotlin_kotlin.$_$.hc;
-  var objectMeta = kotlin_kotlin.$_$.t6;
-  var getKClass = kotlin_kotlin.$_$.c;
-  var ClassCastException_init_$Create$ = kotlin_kotlin.$_$.t;
-  var Companion_getInstance_0 = kotlin_it_unibo_tuprolog_core.$_$.d1;
-  var castTo = kotlin_it_unibo_tuprolog_utils.$_$.f;
-  var defineProp = kotlin_kotlin.$_$.x5;
-  var Castable = kotlin_it_unibo_tuprolog_utils.$_$.g;
-  var collectionSizeOrDefault = kotlin_kotlin.$_$.q2;
-  var ArrayList_init_$Create$_0 = kotlin_kotlin.$_$.f;
-  var IllegalArgumentException_init_$Create$ = kotlin_kotlin.$_$.v;
-  var interfaceMeta = kotlin_kotlin.$_$.f6;
+  var zip = kotlin_kotlin.$_$.v8;
+  var flatMap = kotlin_kotlin.$_$.t7;
+  var sequenceOf = kotlin_kotlin.$_$.j8;
+  var to = kotlin_kotlin.$_$.pa;
+  var sequenceOf_0 = kotlin_kotlin.$_$.i8;
+  var initMetadataForCompanion = kotlin_kotlin.$_$.u5;
+  var toString = kotlin_kotlin.$_$.n6;
+  var getKClass = kotlin_kotlin.$_$.b7;
+  var ClassCastException_init_$Create$ = kotlin_kotlin.$_$.o;
+  var Companion_getInstance_0 = kotlin_it_unibo_tuprolog_core.$_$.u;
+  var castTo = kotlin_it_unibo_tuprolog_utils.$_$.e;
+  var defineProp = kotlin_kotlin.$_$.l5;
+  var Castable = kotlin_it_unibo_tuprolog_utils.$_$.f;
+  var collectionSizeOrDefault = kotlin_kotlin.$_$.z1;
+  var ArrayList_init_$Create$_0 = kotlin_kotlin.$_$.c;
+  var IllegalArgumentException_init_$Create$ = kotlin_kotlin.$_$.q;
+  var initMetadataForInterface = kotlin_kotlin.$_$.w5;
   //endregion
   //region block: pre-declaration
+  function mguWithOccurCheck(term1, term2, occurCheckEnabled, $super) {
+    occurCheckEnabled = occurCheckEnabled === VOID ? true : occurCheckEnabled;
+    return $super === VOID ? this.g1h(term1, term2, occurCheckEnabled) : $super.g1h.call(this, term1, term2, occurCheckEnabled);
+  }
   function mgu(term1, term2) {
-    return this.y1j(term1, term2, true);
+    return this.g1h(term1, term2, true);
   }
   function matchWithOccurCheck(term1, term2, occurCheckEnabled) {
-    return !(this.y1j(term1, term2, occurCheckEnabled) === Companion_getInstance().failed());
+    return !(this.g1h(term1, term2, occurCheckEnabled) === Companion_getInstance().failed());
   }
   function match(term1, term2) {
     return this.matchWithOccurCheck(term1, term2, true);
   }
   function unifyWithOccurCheck(term1, term2, occurCheckEnabled) {
-    var substitution = this.y1j(term1, term2, occurCheckEnabled);
-    return substitution.x12() ? null : term1.getSubstituted(substitution, []);
+    var substitution = this.g1h(term1, term2, occurCheckEnabled);
+    return substitution.g10() ? null : term1.getSubstituted(substitution, []);
   }
   function unify(term1, term2) {
     return this.unifyWithOccurCheck(term1, term2, true);
@@ -75,37 +80,38 @@
   function merge(substitution1, substitution2) {
     return this.mergeWithOccurCheck(substitution1, substitution2, true);
   }
-  setMetadataFor(Unificator, 'Unificator', interfaceMeta);
-  setMetadataFor(AbstractUnificator, 'AbstractUnificator', classMeta, VOID, [Unificator]);
-  setMetadataFor(CachedUnificator, 'CachedUnificator', classMeta, VOID, [Unificator]);
-  setMetadataFor(Equation, 'Equation', classMeta, VOID, [Castable]);
-  setMetadataFor(Identity, 'Identity', classMeta, Equation);
-  setMetadataFor(Assignment, 'Assignment', classMeta, Equation);
-  setMetadataFor(Comparison, 'Comparison', classMeta, Equation);
-  setMetadataFor(Contradiction, 'Contradiction', classMeta, Equation);
-  setMetadataFor(Companion, 'Companion', objectMeta);
-  setMetadataFor(Unificator$Companion$naive$1, VOID, classMeta, AbstractUnificator);
-  setMetadataFor(Unificator$Companion$strict$1, VOID, classMeta, AbstractUnificator);
-  setMetadataFor(Companion_0, 'Companion', objectMeta);
+  initMetadataForInterface(Unificator, 'Unificator');
+  initMetadataForClass(AbstractUnificator, 'AbstractUnificator', VOID, VOID, [Unificator]);
+  initMetadataForClass(CachedUnificator, 'CachedUnificator', VOID, VOID, [Unificator]);
+  initMetadataForClass(Equation, 'Equation', VOID, VOID, [Castable]);
+  initMetadataForClass(Identity, 'Identity', VOID, Equation);
+  initMetadataForClass(Assignment, 'Assignment', VOID, Equation);
+  initMetadataForClass(Comparison, 'Comparison', VOID, Equation);
+  initMetadataForClass(Contradiction, 'Contradiction', VOID, Equation);
+  initMetadataForCompanion(Companion);
+  initMetadataForClass(Unificator$Companion$naive$1, VOID, VOID, AbstractUnificator);
+  initMetadataForClass(Unificator$Companion$strict$1, VOID, VOID, AbstractUnificator);
+  initMetadataForCompanion(Companion_0);
   //endregion
   function _get_contextEquations__x0dd77($this) {
+    var tmp0 = $this.p1g_1;
+    var tmp = KProperty1;
     // Inline function 'kotlin.getValue' call
-    var this_0 = $this.h1j_1;
-    contextEquations$factory();
-    return this_0.r2();
+    getPropertyCallableRef('contextEquations', 1, tmp, AbstractUnificator$_get_contextEquations_$ref_7ajcte(), null);
+    return tmp0.e2();
   }
   function occurrenceCheck($this, variable, term) {
     var tmp;
-    if (term.mx()) {
-      tmp = $this.i1j(variable, term);
-    } else if (term.ww()) {
+    if (term.vu()) {
+      tmp = $this.q1g(variable, term);
+    } else if (term.fu()) {
+      var tmp0 = term.bu();
       var tmp$ret$1;
       $l$block: {
         // Inline function 'kotlin.sequences.any' call
-        var tmp0_iterator = term.sw().r();
-        while (tmp0_iterator.s()) {
-          var element = tmp0_iterator.u();
-          // Inline function 'it.unibo.tuprolog.unify.AbstractUnificator.occurrenceCheck.<anonymous>' call
+        var _iterator__ex2g4s = tmp0.p();
+        while (_iterator__ex2g4s.s()) {
+          var element = _iterator__ex2g4s.t();
           if (occurrenceCheck($this, variable, element)) {
             tmp$ret$1 = true;
             break $l$block;
@@ -121,7 +127,7 @@
   }
   function equationsFor($this, term1, term2) {
     var tmp = Companion_instance_0;
-    return tmp.j1j(term1, term2, AbstractUnificator$checkTermsEquality$ref($this));
+    return tmp.r1g(term1, term2, AbstractUnificator$checkTermsEquality$ref($this));
   }
   function equationsFor_0($this, substitution1, substitution2) {
     var tmp = Companion_instance_0;
@@ -139,7 +145,7 @@
       }
        while (inductionVariable < exceptIndex);
     var inductionVariable_0 = exceptIndex + 1 | 0;
-    var last = equations.l();
+    var last = equations.u();
     if (inductionVariable_0 < last)
       do {
         var i_0 = inductionVariable_0;
@@ -153,32 +159,32 @@
     var changed = true;
     while (changed) {
       changed = false;
-      var eqIterator = equations.z1();
+      var eqIterator = equations.b4();
       while (eqIterator.s()) {
-        var eq = eqIterator.u();
-        if (eq.o1j()) {
+        var eq = eqIterator.t();
+        if (eq.w1g()) {
           return Companion_getInstance().failed();
-        } else if (eq.p1j()) {
-          eqIterator.t();
+        } else if (eq.x1g()) {
+          eqIterator.b3();
           changed = true;
-        } else if (eq.w1j()) {
-          var assignment = eq.r1j();
-          if (occurCheckEnabled ? occurrenceCheck($this, assignment.u1j_1, eq.n1j()) : false) {
+        } else if (eq.e1h()) {
+          var assignment = eq.z1g();
+          if (occurCheckEnabled && occurrenceCheck($this, assignment.c1h_1, eq.v1g())) {
             return Companion_getInstance().failed();
           } else {
-            changed = changed ? true : applySubstitutionToEquations($this, assignment.toSubstitution(), equations, eqIterator.n1());
+            changed = changed || applySubstitutionToEquations($this, assignment.toSubstitution(), equations, eqIterator.p3());
           }
-        } else if (eq.q1j()) {
-          eqIterator.t();
-          var tmp0_iterator = equationsFor($this, eq.m1j(), eq.n1j()).r();
-          insertion: while (tmp0_iterator.s()) {
-            var it = tmp0_iterator.u();
-            if (it.p1j())
+        } else if (eq.y1g()) {
+          eqIterator.b3();
+          var _iterator__ex2g4s = equationsFor($this, eq.u1g(), eq.v1g()).p();
+          insertion: while (_iterator__ex2g4s.s()) {
+            var it = _iterator__ex2g4s.t();
+            if (it.x1g())
               continue insertion;
-            else if (it.o1j())
+            else if (it.w1g())
               return Companion_getInstance().failed();
             else {
-              eqIterator.q1(it);
+              eqIterator.s3(it);
             }
           }
           changed = true;
@@ -188,12 +194,11 @@
     // Inline function 'kotlin.collections.filter' call
     // Inline function 'kotlin.collections.filterTo' call
     var destination = ArrayList_init_$Create$();
-    var tmp0_iterator_0 = equations.r();
-    while (tmp0_iterator_0.s()) {
-      var element = tmp0_iterator_0.u();
-      // Inline function 'it.unibo.tuprolog.unify.AbstractUnificator.mgu.<anonymous>' call
-      if (element.w1j()) {
-        destination.o(element);
+    var _iterator__ex2g4s_0 = equations.p();
+    while (_iterator__ex2g4s_0.s()) {
+      var element = _iterator__ex2g4s_0.t();
+      if (element.e1h()) {
+        destination.n(element);
       }
     }
     return toSubstitution(destination);
@@ -204,62 +209,70 @@
     return toCollection(items, tmp$ret$0);
   }
   function applySubstitutionToEquations$handleIndex($equations, $substitution, this$0, changed, i) {
-    if ($equations.c1(i).o1j() ? true : $equations.c1(i).p1j())
+    if ($equations.z(i).w1g() || $equations.z(i).x1g())
       return Unit_instance;
-    var currentEq = $equations.c1(i);
-    var tmp0_container = currentEq.apply($substitution).toPair();
-    var newLhs = tmp0_container.me();
-    var newRhs = tmp0_container.ne();
-    if (!currentEq.m1j().equals(newLhs) ? true : !currentEq.n1j().equals(newRhs)) {
+    var currentEq = $equations.z(i);
+    var _destruct__k2r9zo = currentEq.apply($substitution).toPair();
+    var newLhs = _destruct__k2r9zo.rc();
+    var newRhs = _destruct__k2r9zo.sc();
+    if (!currentEq.u1g().equals(newLhs) || !currentEq.v1g().equals(newRhs)) {
       var tmp = Companion_instance_0;
-      $equations.m(i, tmp.x1j(newLhs, newRhs, AbstractUnificator$checkTermsEquality$ref_0(this$0)));
+      $equations.y3(i, tmp.f1h(newLhs, newRhs, AbstractUnificator$checkTermsEquality$ref_0(this$0)));
       changed._v = true;
     }
   }
   function AbstractUnificator$contextEquations$delegate$lambda(this$0) {
     return function () {
-      return toEquations(this$0.uc());
+      return toEquations(this$0.h8());
     };
   }
-  function AbstractUnificator$checkTermsEquality$ref($boundThis) {
-    var l = function (p0, p1) {
-      return $boundThis.i1j(p0, p1);
+  function AbstractUnificator$_get_contextEquations_$ref_7ajcte() {
+    return function (p0) {
+      return _get_contextEquations__x0dd77(p0);
+    };
+  }
+  function AbstractUnificator$checkTermsEquality$ref(p0) {
+    var l = function (_this__u8e3s4, p0_0) {
+      return p0.q1g(_this__u8e3s4, p0_0);
     };
     l.callableName = 'checkTermsEquality';
     return l;
   }
   function AbstractUnificator$equationsFor$lambda(it) {
     // Inline function 'kotlin.collections.toPair' call
-    return new Pair(it.q2(), it.r2());
+    return new Pair(it.d2(), it.e2());
   }
-  function AbstractUnificator$checkTermsEquality$ref_0($boundThis) {
-    var l = function (p0, p1) {
-      return $boundThis.i1j(p0, p1);
+  function AbstractUnificator$checkTermsEquality$ref_0(p0) {
+    var l = function (_this__u8e3s4, p0_0) {
+      return p0.q1g(_this__u8e3s4, p0_0);
     };
     l.callableName = 'checkTermsEquality';
     return l;
   }
   function AbstractUnificator(context) {
     context = context === VOID ? Companion_getInstance().empty() : context;
-    this.g1j_1 = context;
+    this.o1g_1 = context;
     var tmp = this;
-    tmp.h1j_1 = lazy(AbstractUnificator$contextEquations$delegate$lambda(this));
+    tmp.p1g_1 = lazy(AbstractUnificator$contextEquations$delegate$lambda(this));
   }
-  protoOf(AbstractUnificator).uc = function () {
-    return this.g1j_1;
+  protoOf(AbstractUnificator).h8 = function () {
+    return this.o1g_1;
   };
-  protoOf(AbstractUnificator).y1j = function (term1, term2, occurCheckEnabled) {
-    if (this.uc().x12())
+  protoOf(AbstractUnificator).g1h = function (term1, term2, occurCheckEnabled) {
+    if (this.h8().g10())
       return Companion_getInstance().failed();
     var equations = newDeque(this, plus(asSequence_0(_get_contextEquations__x0dd77(this)), equationsFor(this, term1, term2)));
     return mgu_0(this, equations, occurCheckEnabled);
   };
-  protoOf(AbstractUnificator).z1j = function (substitution1, substitution2, occurCheckEnabled) {
-    if ((this.uc().x12() ? true : substitution1.x12()) ? true : substitution2.x12())
+  protoOf(AbstractUnificator).mguWithOccurCheck = function (term1, term2, occurCheckEnabled, $super) {
+    return this.mguWithOccurCheck(term1, term2, occurCheckEnabled, ($super == null ? true : $super instanceof AbstractUnificator) ? $super : THROW_CCE());
+  };
+  protoOf(AbstractUnificator).h1h = function (substitution1, substitution2, occurCheckEnabled) {
+    if (this.h8().g10() || substitution1.g10() || substitution2.g10())
       return Companion_getInstance().failed();
     if (!occurCheckEnabled) {
-      var quickMerge = this.uc().plus(substitution1).plus(substitution2);
-      if (quickMerge.w12()) {
+      var quickMerge = this.h8().plus(substitution1).plus(substitution2);
+      if (quickMerge.f10()) {
         return quickMerge;
       }
     }
@@ -267,45 +280,43 @@
     return mgu_0(this, equations, occurCheckEnabled);
   };
   protoOf(AbstractUnificator).mergeWithOccurCheck = function (substitution1, substitution2, occurCheckEnabled) {
-    return this.z1j(substitution1, substitution2, occurCheckEnabled);
+    return this.h1h(substitution1, substitution2, occurCheckEnabled);
   };
-  function contextEquations$factory() {
-    return getPropertyCallableRef('contextEquations', 1, KProperty1, function (receiver) {
-      return _get_contextEquations__x0dd77(receiver);
-    }, null);
-  }
   function CachedUnificator(decorated, cacheCapacity) {
-    this.a1k_1 = decorated;
-    this.b1k_1 = Companion_instance.rq(cacheCapacity);
+    this.i1h_1 = decorated;
+    this.j1h_1 = Companion_instance.wo(cacheCapacity);
   }
-  protoOf(CachedUnificator).y1j = function (term1, term2, occurCheckEnabled) {
+  protoOf(CachedUnificator).g1h = function (term1, term2, occurCheckEnabled) {
     var mguRequest = new Triple(term1, term2, occurCheckEnabled);
-    var cached = this.b1k_1.x2(mguRequest);
+    var cached = this.j1h_1.h2(mguRequest);
     var tmp;
     if (cached instanceof Some) {
-      tmp = cached.uq_1;
+      tmp = cached.zo_1;
     } else {
-      var mguResult = this.a1k_1.y1j(term1, term2, occurCheckEnabled);
-      this.b1k_1.sq(mguRequest, mguResult);
+      var mguResult = this.i1h_1.g1h(term1, term2, occurCheckEnabled);
+      this.j1h_1.xo(mguRequest, mguResult);
       tmp = mguResult;
     }
     return tmp;
   };
-  protoOf(CachedUnificator).z1j = function (substitution1, substitution2, occurCheckEnabled) {
+  protoOf(CachedUnificator).mguWithOccurCheck = function (term1, term2, occurCheckEnabled, $super) {
+    return this.mguWithOccurCheck(term1, term2, occurCheckEnabled, ($super == null ? true : $super instanceof CachedUnificator) ? $super : THROW_CCE());
+  };
+  protoOf(CachedUnificator).h1h = function (substitution1, substitution2, occurCheckEnabled) {
     var mguRequest = new Triple(substitution1, substitution2, occurCheckEnabled);
-    var cached = this.b1k_1.x2(mguRequest);
+    var cached = this.j1h_1.h2(mguRequest);
     var tmp;
     if (cached instanceof Some) {
-      tmp = cached.uq_1;
+      tmp = cached.zo_1;
     } else {
-      var mguResult = this.a1k_1.mergeWithOccurCheck(substitution1, substitution2, occurCheckEnabled);
-      this.b1k_1.sq(mguRequest, mguResult);
+      var mguResult = this.i1h_1.mergeWithOccurCheck(substitution1, substitution2, occurCheckEnabled);
+      this.j1h_1.xo(mguRequest, mguResult);
       tmp = mguResult;
     }
     return tmp;
   };
   protoOf(CachedUnificator).mergeWithOccurCheck = function (substitution1, substitution2, occurCheckEnabled) {
-    return this.z1j(substitution1, substitution2, occurCheckEnabled);
+    return this.h1h(substitution1, substitution2, occurCheckEnabled);
   };
   function allOfLists($this, lhs, rhs, equalityChecker) {
     var tmp = zip(lhs.unfold(), rhs.unfold());
@@ -338,7 +349,7 @@
   }
   function Equation$Companion$from$lambda($equalityChecker) {
     return function (it) {
-      return Companion_instance_0.c1k(it, $equalityChecker);
+      return Companion_instance_0.k1h(it, $equalityChecker);
     };
   }
   function Term$equals$ref_2() {
@@ -363,17 +374,17 @@
     return l;
   }
   function Equation$Companion$allOfLists$lambda($equalityChecker) {
-    return function (_name_for_destructuring_parameter_0__wldtmu) {
-      var l = _name_for_destructuring_parameter_0__wldtmu.me();
-      var r = _name_for_destructuring_parameter_0__wldtmu.ne();
-      return (l.dx() ? r.dx() : false) ? sequenceOf([Companion_instance_0.x1j(l.castToCons().wy(), r.castToCons().wy(), $equalityChecker)]) : (l.cx() ? r.cx() : false) ? sequenceOf([Companion_instance_0.x1j(l.castToList(), r.castToList(), $equalityChecker)]) : Companion_instance_0.j1j(l, r, $equalityChecker);
+    return function (_destruct__k2r9zo) {
+      var l = _destruct__k2r9zo.rc();
+      var r = _destruct__k2r9zo.sc();
+      return l.mu() && r.mu() ? sequenceOf(Companion_instance_0.f1h(l.castToCons().fw(), r.castToCons().fw(), $equalityChecker)) : l.lu() && r.lu() ? sequenceOf(Companion_instance_0.f1h(l.castToList(), r.castToList(), $equalityChecker)) : Companion_instance_0.r1g(l, r, $equalityChecker);
     };
   }
   function Equation$Companion$allOfTuples$lambda($equalityChecker) {
-    return function (_name_for_destructuring_parameter_0__wldtmu) {
-      var l = _name_for_destructuring_parameter_0__wldtmu.me();
-      var r = _name_for_destructuring_parameter_0__wldtmu.ne();
-      return (l.bx() ? r.bx() : false) ? sequenceOf([Companion_instance_0.x1j(l.castToTuple().ky(), r.castToTuple().ky(), $equalityChecker)]) : Companion_instance_0.j1j(l, r, $equalityChecker);
+    return function (_destruct__k2r9zo) {
+      var l = _destruct__k2r9zo.rc();
+      var r = _destruct__k2r9zo.sc();
+      return l.ku() && r.ku() ? sequenceOf(Companion_instance_0.f1h(l.castToTuple().tv(), r.castToTuple().tv(), $equalityChecker)) : Companion_instance_0.r1g(l, r, $equalityChecker);
     };
   }
   function Term$equals$ref_5() {
@@ -385,29 +396,29 @@
   }
   function Equation$Companion$allOf$lambda($equalityChecker) {
     return function (it) {
-      return Companion_instance_0.c1k(it, $equalityChecker);
+      return Companion_instance_0.k1h(it, $equalityChecker);
     };
   }
   function Identity(lhs, rhs) {
     Equation.call(this, lhs, rhs);
-    this.f1k_1 = lhs;
-    this.g1k_1 = rhs;
+    this.n1h_1 = lhs;
+    this.o1h_1 = rhs;
   }
-  protoOf(Identity).m1j = function () {
-    return this.f1k_1;
+  protoOf(Identity).u1g = function () {
+    return this.n1h_1;
   };
-  protoOf(Identity).n1j = function () {
-    return this.g1k_1;
+  protoOf(Identity).v1g = function () {
+    return this.o1h_1;
   };
-  protoOf(Identity).p1j = function () {
+  protoOf(Identity).x1g = function () {
     return true;
   };
   protoOf(Identity).toString = function () {
-    return 'Identity(lhs=' + this.f1k_1 + ', rhs=' + this.g1k_1 + ')';
+    return 'Identity(lhs=' + this.n1h_1.toString() + ', rhs=' + this.o1h_1.toString() + ')';
   };
   protoOf(Identity).hashCode = function () {
-    var result = this.f1k_1.hashCode();
-    result = imul(result, 31) + this.g1k_1.hashCode() | 0;
+    var result = this.n1h_1.hashCode();
+    result = imul(result, 31) + this.o1h_1.hashCode() | 0;
     return result;
   };
   protoOf(Identity).equals = function (other) {
@@ -415,45 +426,44 @@
       return true;
     if (!(other instanceof Identity))
       return false;
-    var tmp0_other_with_cast = other instanceof Identity ? other : THROW_CCE();
-    if (!this.f1k_1.equals(tmp0_other_with_cast.f1k_1))
+    if (!this.n1h_1.equals(other.n1h_1))
       return false;
-    if (!this.g1k_1.equals(tmp0_other_with_cast.g1k_1))
+    if (!this.o1h_1.equals(other.o1h_1))
       return false;
     return true;
   };
   function Assignment(lhs, rhs) {
     Equation.call(this, lhs, rhs);
-    this.u1j_1 = lhs;
-    this.v1j_1 = rhs;
+    this.c1h_1 = lhs;
+    this.d1h_1 = rhs;
   }
-  protoOf(Assignment).m1j = function () {
-    return this.u1j_1;
+  protoOf(Assignment).u1g = function () {
+    return this.c1h_1;
   };
-  protoOf(Assignment).n1j = function () {
-    return this.v1j_1;
+  protoOf(Assignment).v1g = function () {
+    return this.d1h_1;
   };
   protoOf(Assignment).toSubstitution = function () {
-    return Companion_getInstance().unifier(this.u1j_1, this.v1j_1);
+    return Companion_getInstance().unifier(this.c1h_1, this.d1h_1);
   };
-  protoOf(Assignment).j1k = function () {
-    return to(this.u1j_1, this.v1j_1);
+  protoOf(Assignment).r1h = function () {
+    return to(this.c1h_1, this.d1h_1);
   };
   protoOf(Assignment).toPair = function () {
-    return this.j1k();
+    return this.r1h();
   };
-  protoOf(Assignment).w1j = function () {
+  protoOf(Assignment).e1h = function () {
     return true;
   };
-  protoOf(Assignment).h1k = function () {
+  protoOf(Assignment).p1h = function () {
     return this;
   };
   protoOf(Assignment).toString = function () {
-    return 'Assignment(lhs=' + this.u1j_1 + ', rhs=' + this.v1j_1 + ')';
+    return 'Assignment(lhs=' + this.c1h_1.toString() + ', rhs=' + this.d1h_1.toString() + ')';
   };
   protoOf(Assignment).hashCode = function () {
-    var result = this.u1j_1.hashCode();
-    result = imul(result, 31) + this.v1j_1.hashCode() | 0;
+    var result = this.c1h_1.hashCode();
+    result = imul(result, 31) + this.d1h_1.hashCode() | 0;
     return result;
   };
   protoOf(Assignment).equals = function (other) {
@@ -461,33 +471,32 @@
       return true;
     if (!(other instanceof Assignment))
       return false;
-    var tmp0_other_with_cast = other instanceof Assignment ? other : THROW_CCE();
-    if (!this.u1j_1.equals(tmp0_other_with_cast.u1j_1))
+    if (!this.c1h_1.equals(other.c1h_1))
       return false;
-    if (!this.v1j_1.equals(tmp0_other_with_cast.v1j_1))
+    if (!this.d1h_1.equals(other.d1h_1))
       return false;
     return true;
   };
   function Comparison(lhs, rhs) {
     Equation.call(this, lhs, rhs);
-    this.m1k_1 = lhs;
-    this.n1k_1 = rhs;
+    this.u1h_1 = lhs;
+    this.v1h_1 = rhs;
   }
-  protoOf(Comparison).m1j = function () {
-    return this.m1k_1;
+  protoOf(Comparison).u1g = function () {
+    return this.u1h_1;
   };
-  protoOf(Comparison).n1j = function () {
-    return this.n1k_1;
+  protoOf(Comparison).v1g = function () {
+    return this.v1h_1;
   };
-  protoOf(Comparison).q1j = function () {
+  protoOf(Comparison).y1g = function () {
     return true;
   };
   protoOf(Comparison).toString = function () {
-    return 'Comparison(lhs=' + this.m1k_1 + ', rhs=' + this.n1k_1 + ')';
+    return 'Comparison(lhs=' + this.u1h_1.toString() + ', rhs=' + this.v1h_1.toString() + ')';
   };
   protoOf(Comparison).hashCode = function () {
-    var result = this.m1k_1.hashCode();
-    result = imul(result, 31) + this.n1k_1.hashCode() | 0;
+    var result = this.u1h_1.hashCode();
+    result = imul(result, 31) + this.v1h_1.hashCode() | 0;
     return result;
   };
   protoOf(Comparison).equals = function (other) {
@@ -495,33 +504,32 @@
       return true;
     if (!(other instanceof Comparison))
       return false;
-    var tmp0_other_with_cast = other instanceof Comparison ? other : THROW_CCE();
-    if (!this.m1k_1.equals(tmp0_other_with_cast.m1k_1))
+    if (!this.u1h_1.equals(other.u1h_1))
       return false;
-    if (!this.n1k_1.equals(tmp0_other_with_cast.n1k_1))
+    if (!this.v1h_1.equals(other.v1h_1))
       return false;
     return true;
   };
   function Contradiction(lhs, rhs) {
     Equation.call(this, lhs, rhs);
-    this.q1k_1 = lhs;
-    this.r1k_1 = rhs;
+    this.y1h_1 = lhs;
+    this.z1h_1 = rhs;
   }
-  protoOf(Contradiction).m1j = function () {
-    return this.q1k_1;
+  protoOf(Contradiction).u1g = function () {
+    return this.y1h_1;
   };
-  protoOf(Contradiction).n1j = function () {
-    return this.r1k_1;
+  protoOf(Contradiction).v1g = function () {
+    return this.z1h_1;
   };
-  protoOf(Contradiction).o1j = function () {
+  protoOf(Contradiction).w1g = function () {
     return true;
   };
   protoOf(Contradiction).toString = function () {
-    return 'Contradiction(lhs=' + this.q1k_1 + ', rhs=' + this.r1k_1 + ')';
+    return 'Contradiction(lhs=' + this.y1h_1.toString() + ', rhs=' + this.z1h_1.toString() + ')';
   };
   protoOf(Contradiction).hashCode = function () {
-    var result = this.q1k_1.hashCode();
-    result = imul(result, 31) + this.r1k_1.hashCode() | 0;
+    var result = this.y1h_1.hashCode();
+    result = imul(result, 31) + this.z1h_1.hashCode() | 0;
     return result;
   };
   protoOf(Contradiction).equals = function (other) {
@@ -529,18 +537,17 @@
       return true;
     if (!(other instanceof Contradiction))
       return false;
-    var tmp0_other_with_cast = other instanceof Contradiction ? other : THROW_CCE();
-    if (!this.q1k_1.equals(tmp0_other_with_cast.q1k_1))
+    if (!this.y1h_1.equals(other.y1h_1))
       return false;
-    if (!this.r1k_1.equals(tmp0_other_with_cast.r1k_1))
+    if (!this.z1h_1.equals(other.z1h_1))
       return false;
     return true;
   };
   function Companion() {
   }
-  protoOf(Companion).x1j = function (lhs, rhs, equalityChecker) {
+  protoOf(Companion).f1h = function (lhs, rhs, equalityChecker) {
     var tmp;
-    if (lhs.mx() ? rhs.mx() : false) {
+    if (lhs.vu() && rhs.vu()) {
       var tmp_0;
       if (equalityChecker(lhs, rhs)) {
         tmp_0 = new Identity(lhs, rhs);
@@ -548,11 +555,11 @@
         tmp_0 = new Assignment(lhs.castToVar(), rhs);
       }
       tmp = tmp_0;
-    } else if (lhs.mx()) {
+    } else if (lhs.vu()) {
       tmp = new Assignment(lhs.castToVar(), rhs);
-    } else if (rhs.mx()) {
+    } else if (rhs.vu()) {
       tmp = new Assignment(rhs.castToVar(), lhs);
-    } else if (lhs.px() ? rhs.px() : false) {
+    } else if (lhs.yu() && rhs.yu()) {
       var tmp_1;
       if (equalityChecker(lhs, rhs)) {
         tmp_1 = new Identity(lhs, rhs);
@@ -560,13 +567,13 @@
         tmp_1 = new Contradiction(lhs, rhs);
       }
       tmp = tmp_1;
-    } else if (lhs.px() ? true : rhs.px()) {
+    } else if (lhs.yu() || rhs.yu()) {
       tmp = new Contradiction(lhs, rhs);
-    } else if (lhs.ww() ? rhs.ww() : false) {
+    } else if (lhs.fu() && rhs.fu()) {
       var lhsStruct = lhs.castToStruct();
       var rhsStruct = rhs.castToStruct();
       var tmp_2;
-      if (!(lhsStruct.kw() === rhsStruct.kw()) ? true : !(lhsStruct.qw() === rhsStruct.qw())) {
+      if (!(lhsStruct.tt() === rhsStruct.tt()) || !(lhsStruct.zt() === rhsStruct.zt())) {
         tmp_2 = new Contradiction(lhsStruct, rhsStruct);
       } else {
         tmp_2 = new Comparison(lhsStruct, rhsStruct);
@@ -585,10 +592,10 @@
       tmp = equalityChecker;
     }
     equalityChecker = tmp;
-    return $super === VOID ? this.x1j(lhs, rhs, equalityChecker) : $super.x1j.call(this, lhs, rhs, equalityChecker);
+    return $super === VOID ? this.f1h(lhs, rhs, equalityChecker) : $super.f1h.call(this, lhs, rhs, equalityChecker);
   };
-  protoOf(Companion).s1k = function (pair, equalityChecker) {
-    return this.x1j(pair.ye_1, pair.ze_1, equalityChecker);
+  protoOf(Companion).a1i = function (pair, equalityChecker) {
+    return this.f1h(pair.xc_1, pair.yc_1, equalityChecker);
   };
   protoOf(Companion).ofPair = function (pair, equalityChecker, $super) {
     var tmp;
@@ -598,9 +605,9 @@
       tmp = equalityChecker;
     }
     equalityChecker = tmp;
-    return $super === VOID ? this.s1k(pair, equalityChecker) : $super.s1k.call(this, pair, equalityChecker);
+    return $super === VOID ? this.a1i(pair, equalityChecker) : $super.a1i.call(this, pair, equalityChecker);
   };
-  protoOf(Companion).t1k = function (pairs, equalityChecker) {
+  protoOf(Companion).b1i = function (pairs, equalityChecker) {
     return flatMap(pairs, Equation$Companion$from$lambda(equalityChecker));
   };
   protoOf(Companion).fromSequence = function (pairs, equalityChecker, $super) {
@@ -611,10 +618,10 @@
       tmp = equalityChecker;
     }
     equalityChecker = tmp;
-    return $super === VOID ? this.t1k(pairs, equalityChecker) : $super.t1k.call(this, pairs, equalityChecker);
+    return $super === VOID ? this.b1i(pairs, equalityChecker) : $super.b1i.call(this, pairs, equalityChecker);
   };
-  protoOf(Companion).u1k = function (pairs, equalityChecker) {
-    return this.t1k(asSequence_0(pairs), equalityChecker);
+  protoOf(Companion).c1i = function (pairs, equalityChecker) {
+    return this.b1i(asSequence_0(pairs), equalityChecker);
   };
   protoOf(Companion).fromIterable = function (pairs, equalityChecker, $super) {
     var tmp;
@@ -624,10 +631,10 @@
       tmp = equalityChecker;
     }
     equalityChecker = tmp;
-    return $super === VOID ? this.u1k(pairs, equalityChecker) : $super.u1k.call(this, pairs, equalityChecker);
+    return $super === VOID ? this.c1i(pairs, equalityChecker) : $super.c1i.call(this, pairs, equalityChecker);
   };
-  protoOf(Companion).v1k = function (pairs, equalityChecker) {
-    return this.t1k(sequenceOf(pairs.slice()), equalityChecker);
+  protoOf(Companion).d1i = function (pairs, equalityChecker) {
+    return this.b1i(sequenceOf_0(pairs.slice()), equalityChecker);
   };
   protoOf(Companion).from = function (pairs, equalityChecker, $super) {
     var tmp;
@@ -637,10 +644,10 @@
       tmp = equalityChecker;
     }
     equalityChecker = tmp;
-    return $super === VOID ? this.v1k(pairs, equalityChecker) : $super.v1k.call(this, pairs, equalityChecker);
+    return $super === VOID ? this.d1i(pairs, equalityChecker) : $super.d1i.call(this, pairs, equalityChecker);
   };
-  protoOf(Companion).c1k = function (pair, equalityChecker) {
-    return this.j1j(pair.ye_1, pair.ze_1, equalityChecker);
+  protoOf(Companion).k1h = function (pair, equalityChecker) {
+    return this.r1g(pair.xc_1, pair.yc_1, equalityChecker);
   };
   protoOf(Companion).allOfPair = function (pair, equalityChecker, $super) {
     var tmp;
@@ -650,29 +657,29 @@
       tmp = equalityChecker;
     }
     equalityChecker = tmp;
-    return $super === VOID ? this.c1k(pair, equalityChecker) : $super.c1k.call(this, pair, equalityChecker);
+    return $super === VOID ? this.k1h(pair, equalityChecker) : $super.k1h.call(this, pair, equalityChecker);
   };
-  protoOf(Companion).j1j = function (lhs, rhs, equalityChecker) {
+  protoOf(Companion).r1g = function (lhs, rhs, equalityChecker) {
     var tmp;
-    if (lhs.lw() ? rhs.lw() : false) {
-      tmp = sequenceOf([this.x1j(lhs, rhs, equalityChecker)]);
-    } else if (lhs.cx() ? rhs.cx() : false) {
+    if (lhs.ut() && rhs.ut()) {
+      tmp = sequenceOf(this.f1h(lhs, rhs, equalityChecker));
+    } else if (lhs.lu() && rhs.lu()) {
       tmp = allOfLists(this, lhs.castToList(), rhs.castToList(), equalityChecker);
-    } else if (lhs.bx() ? rhs.bx() : false) {
+    } else if (lhs.ku() && rhs.ku()) {
       tmp = allOfTuples(this, lhs.castToTuple(), rhs.castToTuple(), equalityChecker);
-    } else if (lhs.ww() ? rhs.ww() : false) {
+    } else if (lhs.fu() && rhs.fu()) {
       var lhsStruct = lhs.castToStruct();
       var rhsStruct = rhs.castToStruct();
       var tmp_0;
-      if (lhsStruct.kw() === rhsStruct.kw() ? lhsStruct.qw() === rhsStruct.qw() : false) {
-        var tmp_1 = zip(lhsStruct.jx(), rhsStruct.jx());
+      if (lhsStruct.tt() === rhsStruct.tt() && lhsStruct.zt() === rhsStruct.zt()) {
+        var tmp_1 = zip(lhsStruct.su(), rhsStruct.su());
         tmp_0 = flatMap(tmp_1, Equation$Companion$allOf$lambda(equalityChecker));
       } else {
-        tmp_0 = sequenceOf([this.x1j(lhs, rhs, equalityChecker)]);
+        tmp_0 = sequenceOf(this.f1h(lhs, rhs, equalityChecker));
       }
       tmp = tmp_0;
     } else {
-      tmp = sequenceOf([this.x1j(lhs, rhs, equalityChecker)]);
+      tmp = sequenceOf(this.f1h(lhs, rhs, equalityChecker));
     }
     return tmp;
   };
@@ -684,7 +691,7 @@
       tmp = equalityChecker;
     }
     equalityChecker = tmp;
-    return $super === VOID ? this.j1j(lhs, rhs, equalityChecker) : $super.j1j.call(this, lhs, rhs, equalityChecker);
+    return $super === VOID ? this.r1g(lhs, rhs, equalityChecker) : $super.r1g.call(this, lhs, rhs, equalityChecker);
   };
   var Companion_instance_0;
   function Companion_getInstance_1() {
@@ -698,54 +705,54 @@
     return l;
   }
   function Equation(lhs, rhs) {
-    this.k1j_1 = lhs;
-    this.l1j_1 = rhs;
+    this.s1g_1 = lhs;
+    this.t1g_1 = rhs;
   }
-  protoOf(Equation).m1j = function () {
-    return this.k1j_1;
+  protoOf(Equation).u1g = function () {
+    return this.s1g_1;
   };
-  protoOf(Equation).n1j = function () {
-    return this.l1j_1;
+  protoOf(Equation).v1g = function () {
+    return this.t1g_1;
   };
-  protoOf(Equation).p1j = function () {
+  protoOf(Equation).x1g = function () {
     return false;
   };
-  protoOf(Equation).w1j = function () {
+  protoOf(Equation).e1h = function () {
     return false;
   };
-  protoOf(Equation).h1k = function () {
+  protoOf(Equation).p1h = function () {
     return null;
   };
-  protoOf(Equation).r1j = function () {
-    var tmp0_elvis_lhs = this.h1k();
+  protoOf(Equation).z1g = function () {
+    var tmp0_elvis_lhs = this.p1h();
     var tmp;
     if (tmp0_elvis_lhs == null) {
-      throw ClassCastException_init_$Create$('Cannot cast ' + this + ' to ' + getKClass(Assignment).s6());
+      throw ClassCastException_init_$Create$('Cannot cast ' + toString(this) + ' to ' + getKClass(Assignment).b9());
     } else {
       tmp = tmp0_elvis_lhs;
     }
     return tmp;
   };
-  protoOf(Equation).q1j = function () {
+  protoOf(Equation).y1g = function () {
     return false;
   };
-  protoOf(Equation).o1j = function () {
+  protoOf(Equation).w1g = function () {
     return false;
   };
-  protoOf(Equation).p1i = function () {
-    return Companion_getInstance_0().of('=', [this.m1j(), this.n1j()]);
+  protoOf(Equation).x1f = function () {
+    return Companion_getInstance_0().of('=', [this.u1g(), this.v1g()]);
   };
   protoOf(Equation).toTerm = function () {
-    return this.p1i();
+    return this.x1f();
   };
   protoOf(Equation).toPair = function () {
-    return new Pair(this.m1j(), this.n1j());
+    return new Pair(this.u1g(), this.v1g());
   };
   protoOf(Equation).swap = function () {
-    return Companion_instance_0.of(this.n1j(), this.m1j());
+    return Companion_instance_0.of(this.v1g(), this.u1g());
   };
-  protoOf(Equation).i1k = function (substitution, equalityChecker) {
-    return Companion_instance_0.x1j(this.m1j().getSubstituted(substitution, []), this.n1j().getSubstituted(substitution, []), equalityChecker);
+  protoOf(Equation).q1h = function (substitution, equalityChecker) {
+    return Companion_instance_0.f1h(this.u1g().getSubstituted(substitution, []), this.v1g().getSubstituted(substitution, []), equalityChecker);
   };
   protoOf(Equation).apply = function (substitution, equalityChecker, $super) {
     var tmp;
@@ -755,23 +762,22 @@
       tmp = equalityChecker;
     }
     equalityChecker = tmp;
-    return $super === VOID ? this.i1k(substitution, equalityChecker) : $super.i1k.call(this, substitution, equalityChecker);
+    return $super === VOID ? this.q1h(substitution, equalityChecker) : $super.q1h.call(this, substitution, equalityChecker);
   };
   function toEquations(_this__u8e3s4) {
     // Inline function 'kotlin.collections.map' call
-    var this_0 = _this__u8e3s4.p2();
+    var this_0 = _this__u8e3s4.f1();
     // Inline function 'kotlin.collections.mapTo' call
     var destination = ArrayList_init_$Create$_0(collectionSizeOrDefault(this_0, 10));
-    var tmp0_iterator = this_0.r();
-    while (tmp0_iterator.s()) {
-      var item = tmp0_iterator.u();
-      // Inline function 'it.unibo.tuprolog.unify.toEquations.<anonymous>' call
+    var _iterator__ex2g4s = this_0.p();
+    while (_iterator__ex2g4s.s()) {
+      var item = _iterator__ex2g4s.t();
       // Inline function 'kotlin.collections.component1' call
-      var variable = item.q2();
+      var variable = item.d2();
       // Inline function 'kotlin.collections.component2' call
-      var term = item.r2();
+      var term = item.e2();
       var tmp$ret$2 = new Assignment(variable, term);
-      destination.o(tmp$ret$2);
+      destination.n(tmp$ret$2);
     }
     return destination;
   }
@@ -782,14 +788,14 @@
   }
   function toAssignmentPair(_this__u8e3s4) {
     var tmp;
-    if (_this__u8e3s4.w1j()) {
-      tmp = _this__u8e3s4.r1j().j1k();
-    } else if (_this__u8e3s4.m1j().mx()) {
-      tmp = to(_this__u8e3s4.m1j().castToVar(), _this__u8e3s4.n1j());
-    } else if (_this__u8e3s4.n1j().mx()) {
-      tmp = to(_this__u8e3s4.n1j().castToVar(), _this__u8e3s4.m1j());
+    if (_this__u8e3s4.e1h()) {
+      tmp = _this__u8e3s4.z1g().r1h();
+    } else if (_this__u8e3s4.u1g().vu()) {
+      tmp = to(_this__u8e3s4.u1g().castToVar(), _this__u8e3s4.v1g());
+    } else if (_this__u8e3s4.v1g().vu()) {
+      tmp = to(_this__u8e3s4.v1g().castToVar(), _this__u8e3s4.u1g());
     } else {
-      throw IllegalArgumentException_init_$Create$('Equation contains no variables: ' + _this__u8e3s4);
+      throw IllegalArgumentException_init_$Create$('Equation contains no variables: ' + toString(_this__u8e3s4));
     }
     return tmp;
   }
@@ -799,49 +805,61 @@
   function Unificator$Companion$default$delegate$lambda() {
     return Companion_getInstance_2().strict();
   }
+  function Unificator$Companion$_get_default_$ref_8i2tx3() {
+    return function (p0) {
+      return p0.g1i();
+    };
+  }
   function Unificator$Companion$naive$1($context) {
     AbstractUnificator.call(this, $context);
   }
-  protoOf(Unificator$Companion$naive$1).i1j = function (first, second) {
+  protoOf(Unificator$Companion$naive$1).q1g = function (first, second) {
     var tmp;
-    if (first.rx() ? second.rx() : false) {
-      tmp = first.castToInteger().r2().yk(second.castToInteger().r2()) === 0;
-    } else if (first.qx() ? second.qx() : false) {
-      tmp = first.castToNumeric().g11().pk(second.castToNumeric().g11()) === 0;
+    if (first.av() && second.av()) {
+      tmp = first.castToInteger().e2().dj(second.castToInteger().e2()) === 0;
+    } else if (first.zu() && second.zu()) {
+      tmp = first.castToNumeric().py().ui(second.castToNumeric().py()) === 0;
     } else {
       tmp = first.equals(second);
     }
     return tmp;
   };
+  protoOf(Unificator$Companion$naive$1).mguWithOccurCheck = function (term1, term2, occurCheckEnabled, $super) {
+    return this.mguWithOccurCheck(term1, term2, occurCheckEnabled, ($super == null ? true : $super instanceof Unificator$Companion$naive$1) ? $super : THROW_CCE());
+  };
   function Unificator$Companion$strict$1($context) {
     AbstractUnificator.call(this, $context);
   }
-  protoOf(Unificator$Companion$strict$1).i1j = function (first, second) {
+  protoOf(Unificator$Companion$strict$1).q1g = function (first, second) {
     return first.equals(second);
   };
+  protoOf(Unificator$Companion$strict$1).mguWithOccurCheck = function (term1, term2, occurCheckEnabled, $super) {
+    return this.mguWithOccurCheck(term1, term2, occurCheckEnabled, ($super == null ? true : $super instanceof Unificator$Companion$strict$1) ? $super : THROW_CCE());
+  };
   function Companion_0() {
     Companion_instance_1 = this;
     var tmp = this;
-    tmp.a1l_1 = lazy(Unificator$Companion$default$delegate$lambda);
-    this.b1l_1 = 32;
+    tmp.e1i_1 = lazy(Unificator$Companion$default$delegate$lambda);
+    this.f1i_1 = 32;
   }
-  protoOf(Companion_0).c1l = function () {
+  protoOf(Companion_0).g1i = function () {
+    var tmp0 = this.e1i_1;
+    var tmp = KProperty1;
     // Inline function 'kotlin.getValue' call
-    var this_0 = this.a1l_1;
-    default$factory();
-    return this_0.r2();
+    getPropertyCallableRef('default', 1, tmp, Unificator$Companion$_get_default_$ref_8i2tx3(), null);
+    return tmp0.e2();
   };
   protoOf(Companion_0).mguWith = function (_this__u8e3s4, other) {
-    return this.c1l().mgu(_this__u8e3s4, other);
+    return this.g1i().mgu(_this__u8e3s4, other);
   };
   protoOf(Companion_0).matches = function (_this__u8e3s4, other) {
-    return this.c1l().match(_this__u8e3s4, other);
+    return this.g1i().match(_this__u8e3s4, other);
   };
   protoOf(Companion_0).unifyWith = function (_this__u8e3s4, other) {
-    return this.c1l().unify(_this__u8e3s4, other);
+    return this.g1i().unify(_this__u8e3s4, other);
   };
   protoOf(Companion_0).mergeWith = function (_this__u8e3s4, other) {
-    return this.c1l().merge(_this__u8e3s4, other);
+    return this.g1i().merge(_this__u8e3s4, other);
   };
   protoOf(Companion_0).naiveWithContext = function (context) {
     return new Unificator$Companion$naive$1(context);
@@ -855,10 +873,10 @@
   protoOf(Companion_0).strict = function () {
     return this.strictWithContext(Companion_getInstance().empty());
   };
-  protoOf(Companion_0).d1l = function (other, capacity) {
+  protoOf(Companion_0).l1i = function (other, capacity) {
     var tmp;
     if (other instanceof CachedUnificator) {
-      tmp = new CachedUnificator(other.a1k_1, capacity);
+      tmp = new CachedUnificator(other.i1h_1, capacity);
     } else {
       tmp = new CachedUnificator(other, capacity);
     }
@@ -866,7 +884,7 @@
   };
   protoOf(Companion_0).cached = function (other, capacity, $super) {
     capacity = capacity === VOID ? 32 : capacity;
-    return $super === VOID ? this.d1l(other, capacity) : $super.d1l.call(this, other, capacity);
+    return $super === VOID ? this.l1i(other, capacity) : $super.l1i.call(this, other, capacity);
   };
   var Companion_instance_1;
   function Companion_getInstance_2() {
@@ -876,32 +894,29 @@
   }
   function Unificator() {
   }
-  function default$factory() {
-    return getPropertyCallableRef('default', 1, KProperty1, function (receiver) {
-      return receiver.c1l();
-    }, null);
-  }
   //region block: post-declaration
+  protoOf(AbstractUnificator).mguWithOccurCheck = mguWithOccurCheck;
   protoOf(AbstractUnificator).mgu = mgu;
   protoOf(AbstractUnificator).matchWithOccurCheck = matchWithOccurCheck;
   protoOf(AbstractUnificator).match = match;
   protoOf(AbstractUnificator).unifyWithOccurCheck = unifyWithOccurCheck;
   protoOf(AbstractUnificator).unify = unify;
   protoOf(AbstractUnificator).merge = merge;
+  protoOf(CachedUnificator).mguWithOccurCheck = mguWithOccurCheck;
   protoOf(CachedUnificator).mgu = mgu;
   protoOf(CachedUnificator).matchWithOccurCheck = matchWithOccurCheck;
   protoOf(CachedUnificator).match = match;
   protoOf(CachedUnificator).unifyWithOccurCheck = unifyWithOccurCheck;
   protoOf(CachedUnificator).unify = unify;
   protoOf(CachedUnificator).merge = merge;
-  protoOf(Equation).br = castTo;
+  protoOf(Equation).gp = castTo;
   defineProp(protoOf(Equation), 'lhs', function () {
-    return this.m1j();
+    return this.u1g();
   });
   defineProp(protoOf(Equation), 'rhs', function () {
-    return this.n1j();
+    return this.v1g();
   });
-  defineProp(protoOf(Companion_0), 'default', protoOf(Companion_0).c1l);
+  defineProp(protoOf(Companion_0), 'default', protoOf(Companion_0).g1i);
   //endregion
   //region block: init
   Companion_instance_0 = new Companion();