@tuprolog/2p-full 1.1.4 → 1.3.1

package/2p-unify.js

@@ -19,60 +19,61 @@
   'use strict';
   //region block: imports
   var imul = Math.imul;
-  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 KProperty1 = kotlin_kotlin.$_$.h7;
+  var getPropertyCallableRef = kotlin_kotlin.$_$.x5;
+  var asSequence = kotlin_kotlin.$_$.z1;
+  var plus = kotlin_kotlin.$_$.l8;
+  var map = kotlin_kotlin.$_$.h8;
+  var Unit_instance = kotlin_kotlin.$_$.m;
+  var Companion_getInstance = kotlin_it_unibo_tuprolog_core.$_$.p;
+  var ArrayList_init_$Create$ = kotlin_kotlin.$_$.o;
+  var toCollection = kotlin_kotlin.$_$.t8;
+  var constructCallableReference = kotlin_kotlin.$_$.r5;
+  var Pair = kotlin_kotlin.$_$.la;
   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 lazy = kotlin_kotlin.$_$.ta;
+  var protoOf = kotlin_kotlin.$_$.p6;
+  var asSequence_0 = kotlin_kotlin.$_$.a2;
+  var THROW_CCE = kotlin_kotlin.$_$.na;
+  var initMetadataForClass = kotlin_kotlin.$_$.a6;
   var Companion_instance = kotlin_it_unibo_tuprolog_utils.$_$.a;
-  var Triple = kotlin_kotlin.$_$.ga;
+  var Triple = kotlin_kotlin.$_$.pa;
   var Some = kotlin_it_unibo_tuprolog_utils.$_$.k;
-  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 zip = kotlin_kotlin.$_$.a9;
+  var flatMap = kotlin_kotlin.$_$.y7;
+  var sequenceOf = kotlin_kotlin.$_$.o8;
+  var to = kotlin_kotlin.$_$.ya;
+  var sequenceOf_0 = kotlin_kotlin.$_$.n8;
+  var initMetadataForCompanion = kotlin_kotlin.$_$.b6;
+  var toString = kotlin_kotlin.$_$.s6;
+  var getKClass = kotlin_kotlin.$_$.g7;
+  var ClassCastException_init_$Create$ = kotlin_kotlin.$_$.z;
+  var Companion_getInstance_0 = kotlin_it_unibo_tuprolog_core.$_$.o;
   var castTo = kotlin_it_unibo_tuprolog_utils.$_$.e;
-  var defineProp = kotlin_kotlin.$_$.l5;
+  var defineProp = kotlin_kotlin.$_$.s5;
   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;
+  var collectionSizeOrDefault = kotlin_kotlin.$_$.d2;
+  var ArrayList_init_$Create$_0 = kotlin_kotlin.$_$.n;
+  var IllegalArgumentException_init_$Create$ = kotlin_kotlin.$_$.b1;
+  var initMetadataForInterface = kotlin_kotlin.$_$.d6;
   //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);
+    return $super === VOID ? this.f1h(term1, term2, occurCheckEnabled) : $super.f1h.call(this, term1, term2, occurCheckEnabled);
   }
   function mgu(term1, term2) {
-    return this.g1h(term1, term2, true);
+    return this.f1h(term1, term2, true);
   }
   function matchWithOccurCheck(term1, term2, occurCheckEnabled) {
-    return !(this.g1h(term1, term2, occurCheckEnabled) === Companion_getInstance().failed());
+    return !(this.f1h(term1, term2, occurCheckEnabled) === Companion_getInstance().failed());
   }
   function match(term1, term2) {
     return this.matchWithOccurCheck(term1, term2, true);
   }
   function unifyWithOccurCheck(term1, term2, occurCheckEnabled) {
-    var substitution = this.g1h(term1, term2, occurCheckEnabled);
-    return substitution.g10() ? null : term1.getSubstituted(substitution, []);
+    var substitution = this.f1h(term1, term2, occurCheckEnabled);
+    return substitution.e10() ? null : term1.getSubstituted(substitution, []);
   }
   function unify(term1, term2) {
     return this.unifyWithOccurCheck(term1, term2, true);
@@ -94,7 +95,7 @@
   initMetadataForCompanion(Companion_0);
   //endregion
   function _get_contextEquations__x0dd77($this) {
-    var tmp0 = $this.p1g_1;
+    var tmp0 = $this.o1g_1;
     var tmp = KProperty1;
     // Inline function 'kotlin.getValue' call
     getPropertyCallableRef('contextEquations', 1, tmp, AbstractUnificator$_get_contextEquations_$ref_7ajcte(), null);
@@ -102,24 +103,24 @@
   }
   function occurrenceCheck($this, variable, term) {
     var tmp;
-    if (term.vu()) {
-      tmp = $this.q1g(variable, term);
-    } else if (term.fu()) {
-      var tmp0 = term.bu();
-      var tmp$ret$1;
+    if (term.tu()) {
+      tmp = $this.p1g(variable, term);
+    } else if (term.du()) {
+      var tmp0 = term.zt();
+      var tmp$ret$0;
       $l$block: {
         // Inline function 'kotlin.sequences.any' call
-        var _iterator__ex2g4s = tmp0.p();
-        while (_iterator__ex2g4s.s()) {
-          var element = _iterator__ex2g4s.t();
+        var _iterator__ex2g4s = tmp0.n();
+        while (_iterator__ex2g4s.q()) {
+          var element = _iterator__ex2g4s.r();
           if (occurrenceCheck($this, variable, element)) {
-            tmp$ret$1 = true;
+            tmp$ret$0 = true;
             break $l$block;
           }
         }
-        tmp$ret$1 = false;
+        tmp$ret$0 = false;
       }
-      tmp = tmp$ret$1;
+      tmp = tmp$ret$0;
     } else {
       tmp = false;
     }
@@ -127,7 +128,7 @@
   }
   function equationsFor($this, term1, term2) {
     var tmp = Companion_instance_0;
-    return tmp.r1g(term1, term2, AbstractUnificator$checkTermsEquality$ref($this));
+    return tmp.q1g(term1, term2, AbstractUnificator$checkTermsEquality$ref($this));
   }
   function equationsFor_0($this, substitution1, substitution2) {
     var tmp = Companion_instance_0;
@@ -145,7 +146,7 @@
       }
        while (inductionVariable < exceptIndex);
     var inductionVariable_0 = exceptIndex + 1 | 0;
-    var last = equations.u();
+    var last = equations.s();
     if (inductionVariable_0 < last)
       do {
         var i_0 = inductionVariable_0;
@@ -160,28 +161,28 @@
     while (changed) {
       changed = false;
       var eqIterator = equations.b4();
-      while (eqIterator.s()) {
-        var eq = eqIterator.t();
-        if (eq.w1g()) {
+      while (eqIterator.q()) {
+        var eq = eqIterator.r();
+        if (eq.v1g()) {
           return Companion_getInstance().failed();
-        } else if (eq.x1g()) {
+        } else if (eq.w1g()) {
           eqIterator.b3();
           changed = true;
-        } else if (eq.e1h()) {
-          var assignment = eq.z1g();
-          if (occurCheckEnabled && occurrenceCheck($this, assignment.c1h_1, eq.v1g())) {
+        } else if (eq.d1h()) {
+          var assignment = eq.y1g();
+          if (occurCheckEnabled && occurrenceCheck($this, assignment.b1h_1, eq.u1g())) {
             return Companion_getInstance().failed();
           } else {
             changed = changed || applySubstitutionToEquations($this, assignment.toSubstitution(), equations, eqIterator.p3());
           }
-        } else if (eq.y1g()) {
+        } else if (eq.x1g()) {
           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())
+          var _iterator__ex2g4s = equationsFor($this, eq.t1g(), eq.u1g()).n();
+          insertion: while (_iterator__ex2g4s.q()) {
+            var it = _iterator__ex2g4s.r();
+            if (it.w1g())
               continue insertion;
-            else if (it.w1g())
+            else if (it.v1g())
               return Companion_getInstance().failed();
             else {
               eqIterator.s3(it);
@@ -194,11 +195,11 @@
     // Inline function 'kotlin.collections.filter' call
     // Inline function 'kotlin.collections.filterTo' call
     var destination = ArrayList_init_$Create$();
-    var _iterator__ex2g4s_0 = equations.p();
-    while (_iterator__ex2g4s_0.s()) {
-      var element = _iterator__ex2g4s_0.t();
-      if (element.e1h()) {
-        destination.n(element);
+    var _iterator__ex2g4s_0 = equations.n();
+    while (_iterator__ex2g4s_0.q()) {
+      var element = _iterator__ex2g4s_0.r();
+      if (element.d1h()) {
+        destination.l(element);
       }
     }
     return toSubstitution(destination);
@@ -208,58 +209,49 @@
     var tmp$ret$0 = ArrayList_init_$Create$();
     return toCollection(items, tmp$ret$0);
   }
-  function applySubstitutionToEquations$handleIndex($equations, $substitution, this$0, changed, i) {
-    if ($equations.z(i).w1g() || $equations.z(i).x1g())
-      return Unit_instance;
-    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.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.h8());
     };
   }
   function AbstractUnificator$_get_contextEquations_$ref_7ajcte() {
-    return function (p0) {
+    return constructCallableReference(function (p0) {
       return _get_contextEquations__x0dd77(p0);
-    };
+    }, 1, 0, 25);
   }
   function AbstractUnificator$checkTermsEquality$ref(p0) {
-    var l = function (_this__u8e3s4, p0_0) {
-      return p0.q1g(_this__u8e3s4, p0_0);
-    };
-    l.callableName = 'checkTermsEquality';
-    return l;
+    return constructCallableReference(function (p0_0, p1) {
+      return p0.p1g(p0_0, p1);
+    }, 2, 0, 26, 'checkTermsEquality', [p0]);
   }
   function AbstractUnificator$equationsFor$lambda(it) {
     // Inline function 'kotlin.collections.toPair' call
     return new Pair(it.d2(), it.e2());
   }
-  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 applySubstitutionToEquations$handleIndex($equations, $substitution, this$0, changed, i) {
+    if ($equations.x(i).v1g() || $equations.x(i).w1g())
+      return Unit_instance;
+    var currentEq = $equations.x(i);
+    var _destruct__k2r9zo = currentEq.apply($substitution).toPair();
+    var newLhs = _destruct__k2r9zo.oc();
+    var newRhs = _destruct__k2r9zo.pc();
+    if (!currentEq.t1g().equals(newLhs) || !currentEq.u1g().equals(newRhs)) {
+      var tmp = Companion_instance_0;
+      $equations.y3(i, tmp.e1h(newLhs, newRhs, AbstractUnificator$checkTermsEquality$ref(this$0)));
+      changed._v = true;
+    }
   }
   function AbstractUnificator(context) {
     context = context === VOID ? Companion_getInstance().empty() : context;
-    this.o1g_1 = context;
+    this.n1g_1 = context;
     var tmp = this;
-    tmp.p1g_1 = lazy(AbstractUnificator$contextEquations$delegate$lambda(this));
+    tmp.o1g_1 = lazy(AbstractUnificator$contextEquations$delegate$lambda(this));
   }
   protoOf(AbstractUnificator).h8 = function () {
-    return this.o1g_1;
+    return this.n1g_1;
   };
-  protoOf(AbstractUnificator).g1h = function (term1, term2, occurCheckEnabled) {
-    if (this.h8().g10())
+  protoOf(AbstractUnificator).f1h = function (term1, term2, occurCheckEnabled) {
+    if (this.h8().e10())
       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);
@@ -267,12 +259,12 @@
   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())
+  protoOf(AbstractUnificator).g1h = function (substitution1, substitution2, occurCheckEnabled) {
+    if (this.h8().e10() || substitution1.e10() || substitution2.e10())
       return Companion_getInstance().failed();
     if (!occurCheckEnabled) {
       var quickMerge = this.h8().plus(substitution1).plus(substitution2);
-      if (quickMerge.f10()) {
+      if (quickMerge.d10()) {
         return quickMerge;
       }
     }
@@ -280,21 +272,21 @@
     return mgu_0(this, equations, occurCheckEnabled);
   };
   protoOf(AbstractUnificator).mergeWithOccurCheck = function (substitution1, substitution2, occurCheckEnabled) {
-    return this.h1h(substitution1, substitution2, occurCheckEnabled);
+    return this.g1h(substitution1, substitution2, occurCheckEnabled);
   };
   function CachedUnificator(decorated, cacheCapacity) {
-    this.i1h_1 = decorated;
-    this.j1h_1 = Companion_instance.wo(cacheCapacity);
+    this.h1h_1 = decorated;
+    this.i1h_1 = Companion_instance.uo(cacheCapacity);
   }
-  protoOf(CachedUnificator).g1h = function (term1, term2, occurCheckEnabled) {
+  protoOf(CachedUnificator).f1h = function (term1, term2, occurCheckEnabled) {
     var mguRequest = new Triple(term1, term2, occurCheckEnabled);
-    var cached = this.j1h_1.h2(mguRequest);
+    var cached = this.i1h_1.h2(mguRequest);
     var tmp;
     if (cached instanceof Some) {
-      tmp = cached.zo_1;
+      tmp = cached.xo_1;
     } else {
-      var mguResult = this.i1h_1.g1h(term1, term2, occurCheckEnabled);
-      this.j1h_1.xo(mguRequest, mguResult);
+      var mguResult = this.h1h_1.f1h(term1, term2, occurCheckEnabled);
+      this.i1h_1.vo(mguRequest, mguResult);
       tmp = mguResult;
     }
     return tmp;
@@ -302,123 +294,93 @@
   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) {
+  protoOf(CachedUnificator).g1h = function (substitution1, substitution2, occurCheckEnabled) {
     var mguRequest = new Triple(substitution1, substitution2, occurCheckEnabled);
-    var cached = this.j1h_1.h2(mguRequest);
+    var cached = this.i1h_1.h2(mguRequest);
     var tmp;
     if (cached instanceof Some) {
-      tmp = cached.zo_1;
+      tmp = cached.xo_1;
     } else {
-      var mguResult = this.i1h_1.mergeWithOccurCheck(substitution1, substitution2, occurCheckEnabled);
-      this.j1h_1.xo(mguRequest, mguResult);
+      var mguResult = this.h1h_1.mergeWithOccurCheck(substitution1, substitution2, occurCheckEnabled);
+      this.i1h_1.vo(mguRequest, mguResult);
       tmp = mguResult;
     }
     return tmp;
   };
   protoOf(CachedUnificator).mergeWithOccurCheck = function (substitution1, substitution2, occurCheckEnabled) {
-    return this.h1h(substitution1, substitution2, occurCheckEnabled);
+    return this.g1h(substitution1, substitution2, occurCheckEnabled);
   };
   function allOfLists($this, lhs, rhs, equalityChecker) {
-    var tmp = zip(lhs.unfold(), rhs.unfold());
-    return flatMap(tmp, Equation$Companion$allOfLists$lambda(equalityChecker));
+    var tmp;
+    if (equalityChecker === VOID) {
+      tmp = Term$equals$ref();
+    } else {
+      tmp = equalityChecker;
+    }
+    equalityChecker = tmp;
+    var tmp_0 = zip(lhs.unfold(), rhs.unfold());
+    return flatMap(tmp_0, Equation$Companion$allOfLists$lambda(equalityChecker));
   }
   function allOfTuples($this, lhs, rhs, equalityChecker) {
-    var tmp = zip(lhs.unfold(), rhs.unfold());
-    return flatMap(tmp, Equation$Companion$allOfTuples$lambda(equalityChecker));
+    var tmp;
+    if (equalityChecker === VOID) {
+      tmp = Term$equals$ref();
+    } else {
+      tmp = equalityChecker;
+    }
+    equalityChecker = tmp;
+    var tmp_0 = zip(lhs.unfold(), rhs.unfold());
+    return flatMap(tmp_0, Equation$Companion$allOfTuples$lambda(equalityChecker));
   }
   function Term$equals$ref() {
-    var l = function (p0, p1) {
-      return p0.equals(p1);
-    };
-    l.callableName = 'equals';
-    return l;
-  }
-  function Term$equals$ref_0() {
-    var l = function (p0, p1) {
-      return p0.equals(p1);
-    };
-    l.callableName = 'equals';
-    return l;
-  }
-  function Term$equals$ref_1() {
-    var l = function (p0, p1) {
+    return constructCallableReference(function (p0, p1) {
       return p0.equals(p1);
-    };
-    l.callableName = 'equals';
-    return l;
+    }, 2, 0, 27, 'equals');
   }
   function Equation$Companion$from$lambda($equalityChecker) {
     return function (it) {
-      return Companion_instance_0.k1h(it, $equalityChecker);
-    };
-  }
-  function Term$equals$ref_2() {
-    var l = function (p0, p1) {
-      return p0.equals(p1);
-    };
-    l.callableName = 'equals';
-    return l;
-  }
-  function Term$equals$ref_3() {
-    var l = function (p0, p1) {
-      return p0.equals(p1);
-    };
-    l.callableName = 'equals';
-    return l;
-  }
-  function Term$equals$ref_4() {
-    var l = function (p0, p1) {
-      return p0.equals(p1);
+      return Companion_instance_0.j1h(it, $equalityChecker);
     };
-    l.callableName = 'equals';
-    return l;
   }
   function Equation$Companion$allOfLists$lambda($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);
+      var l = _destruct__k2r9zo.oc();
+      var r = _destruct__k2r9zo.pc();
+      return l.ku() && r.ku() ? sequenceOf(Companion_instance_0.e1h(l.castToCons().dw(), r.castToCons().dw(), $equalityChecker)) : l.ju() && r.ju() ? sequenceOf(Companion_instance_0.e1h(l.castToList(), r.castToList(), $equalityChecker)) : Companion_instance_0.q1g(l, r, $equalityChecker);
     };
   }
   function Equation$Companion$allOfTuples$lambda($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() {
-    var l = function (p0, p1) {
-      return p0.equals(p1);
+      var l = _destruct__k2r9zo.oc();
+      var r = _destruct__k2r9zo.pc();
+      return l.iu() && r.iu() ? sequenceOf(Companion_instance_0.e1h(l.castToTuple().rv(), r.castToTuple().rv(), $equalityChecker)) : Companion_instance_0.q1g(l, r, $equalityChecker);
     };
-    l.callableName = 'equals';
-    return l;
   }
   function Equation$Companion$allOf$lambda($equalityChecker) {
     return function (it) {
-      return Companion_instance_0.k1h(it, $equalityChecker);
+      return Companion_instance_0.j1h(it, $equalityChecker);
     };
   }
   function Identity(lhs, rhs) {
     Equation.call(this, lhs, rhs);
-    this.n1h_1 = lhs;
-    this.o1h_1 = rhs;
+    this.m1h_1 = lhs;
+    this.n1h_1 = rhs;
   }
+  protoOf(Identity).t1g = function () {
+    return this.m1h_1;
+  };
   protoOf(Identity).u1g = function () {
     return this.n1h_1;
   };
-  protoOf(Identity).v1g = function () {
-    return this.o1h_1;
-  };
-  protoOf(Identity).x1g = function () {
+  protoOf(Identity).w1g = function () {
     return true;
   };
   protoOf(Identity).toString = function () {
-    return 'Identity(lhs=' + this.n1h_1.toString() + ', rhs=' + this.o1h_1.toString() + ')';
+    return 'Identity(lhs=' + this.m1h_1.toString() + ', rhs=' + this.n1h_1.toString() + ')';
   };
   protoOf(Identity).hashCode = function () {
-    var result = this.n1h_1.hashCode();
-    result = imul(result, 31) + this.o1h_1.hashCode() | 0;
+    var result = this.m1h_1.hashCode();
+    result = imul(result, 31) + this.n1h_1.hashCode() | 0;
     return result;
   };
   protoOf(Identity).equals = function (other) {
@@ -426,44 +388,44 @@
       return true;
     if (!(other instanceof Identity))
       return false;
-    if (!this.n1h_1.equals(other.n1h_1))
+    if (!this.m1h_1.equals(other.m1h_1))
       return false;
-    if (!this.o1h_1.equals(other.o1h_1))
+    if (!this.n1h_1.equals(other.n1h_1))
       return false;
     return true;
   };
   function Assignment(lhs, rhs) {
     Equation.call(this, lhs, rhs);
-    this.c1h_1 = lhs;
-    this.d1h_1 = rhs;
+    this.b1h_1 = lhs;
+    this.c1h_1 = rhs;
   }
+  protoOf(Assignment).t1g = function () {
+    return this.b1h_1;
+  };
   protoOf(Assignment).u1g = function () {
     return this.c1h_1;
   };
-  protoOf(Assignment).v1g = function () {
-    return this.d1h_1;
-  };
   protoOf(Assignment).toSubstitution = function () {
-    return Companion_getInstance().unifier(this.c1h_1, this.d1h_1);
+    return Companion_getInstance().unifier(this.b1h_1, this.c1h_1);
   };
-  protoOf(Assignment).r1h = function () {
-    return to(this.c1h_1, this.d1h_1);
+  protoOf(Assignment).q1h = function () {
+    return to(this.b1h_1, this.c1h_1);
   };
   protoOf(Assignment).toPair = function () {
-    return this.r1h();
+    return this.q1h();
   };
-  protoOf(Assignment).e1h = function () {
+  protoOf(Assignment).d1h = function () {
     return true;
   };
-  protoOf(Assignment).p1h = function () {
+  protoOf(Assignment).o1h = function () {
     return this;
   };
   protoOf(Assignment).toString = function () {
-    return 'Assignment(lhs=' + this.c1h_1.toString() + ', rhs=' + this.d1h_1.toString() + ')';
+    return 'Assignment(lhs=' + this.b1h_1.toString() + ', rhs=' + this.c1h_1.toString() + ')';
   };
   protoOf(Assignment).hashCode = function () {
-    var result = this.c1h_1.hashCode();
-    result = imul(result, 31) + this.d1h_1.hashCode() | 0;
+    var result = this.b1h_1.hashCode();
+    result = imul(result, 31) + this.c1h_1.hashCode() | 0;
     return result;
   };
   protoOf(Assignment).equals = function (other) {
@@ -471,32 +433,32 @@
       return true;
     if (!(other instanceof Assignment))
       return false;
-    if (!this.c1h_1.equals(other.c1h_1))
+    if (!this.b1h_1.equals(other.b1h_1))
       return false;
-    if (!this.d1h_1.equals(other.d1h_1))
+    if (!this.c1h_1.equals(other.c1h_1))
       return false;
     return true;
   };
   function Comparison(lhs, rhs) {
     Equation.call(this, lhs, rhs);
-    this.u1h_1 = lhs;
-    this.v1h_1 = rhs;
+    this.t1h_1 = lhs;
+    this.u1h_1 = rhs;
   }
+  protoOf(Comparison).t1g = function () {
+    return this.t1h_1;
+  };
   protoOf(Comparison).u1g = function () {
     return this.u1h_1;
   };
-  protoOf(Comparison).v1g = function () {
-    return this.v1h_1;
-  };
-  protoOf(Comparison).y1g = function () {
+  protoOf(Comparison).x1g = function () {
     return true;
   };
   protoOf(Comparison).toString = function () {
-    return 'Comparison(lhs=' + this.u1h_1.toString() + ', rhs=' + this.v1h_1.toString() + ')';
+    return 'Comparison(lhs=' + this.t1h_1.toString() + ', rhs=' + this.u1h_1.toString() + ')';
   };
   protoOf(Comparison).hashCode = function () {
-    var result = this.u1h_1.hashCode();
-    result = imul(result, 31) + this.v1h_1.hashCode() | 0;
+    var result = this.t1h_1.hashCode();
+    result = imul(result, 31) + this.u1h_1.hashCode() | 0;
     return result;
   };
   protoOf(Comparison).equals = function (other) {
@@ -504,32 +466,32 @@
       return true;
     if (!(other instanceof Comparison))
       return false;
-    if (!this.u1h_1.equals(other.u1h_1))
+    if (!this.t1h_1.equals(other.t1h_1))
       return false;
-    if (!this.v1h_1.equals(other.v1h_1))
+    if (!this.u1h_1.equals(other.u1h_1))
       return false;
     return true;
   };
   function Contradiction(lhs, rhs) {
     Equation.call(this, lhs, rhs);
-    this.y1h_1 = lhs;
-    this.z1h_1 = rhs;
+    this.x1h_1 = lhs;
+    this.y1h_1 = rhs;
   }
+  protoOf(Contradiction).t1g = function () {
+    return this.x1h_1;
+  };
   protoOf(Contradiction).u1g = function () {
     return this.y1h_1;
   };
   protoOf(Contradiction).v1g = function () {
-    return this.z1h_1;
-  };
-  protoOf(Contradiction).w1g = function () {
     return true;
   };
   protoOf(Contradiction).toString = function () {
-    return 'Contradiction(lhs=' + this.y1h_1.toString() + ', rhs=' + this.z1h_1.toString() + ')';
+    return 'Contradiction(lhs=' + this.x1h_1.toString() + ', rhs=' + this.y1h_1.toString() + ')';
   };
   protoOf(Contradiction).hashCode = function () {
-    var result = this.y1h_1.hashCode();
-    result = imul(result, 31) + this.z1h_1.hashCode() | 0;
+    var result = this.x1h_1.hashCode();
+    result = imul(result, 31) + this.y1h_1.hashCode() | 0;
     return result;
   };
   protoOf(Contradiction).equals = function (other) {
@@ -537,17 +499,17 @@
       return true;
     if (!(other instanceof Contradiction))
       return false;
-    if (!this.y1h_1.equals(other.y1h_1))
+    if (!this.x1h_1.equals(other.x1h_1))
       return false;
-    if (!this.z1h_1.equals(other.z1h_1))
+    if (!this.y1h_1.equals(other.y1h_1))
       return false;
     return true;
   };
   function Companion() {
   }
-  protoOf(Companion).f1h = function (lhs, rhs, equalityChecker) {
+  protoOf(Companion).e1h = function (lhs, rhs, equalityChecker) {
     var tmp;
-    if (lhs.vu() && rhs.vu()) {
+    if (lhs.tu() && rhs.tu()) {
       var tmp_0;
       if (equalityChecker(lhs, rhs)) {
         tmp_0 = new Identity(lhs, rhs);
@@ -555,11 +517,11 @@
         tmp_0 = new Assignment(lhs.castToVar(), rhs);
       }
       tmp = tmp_0;
-    } else if (lhs.vu()) {
+    } else if (lhs.tu()) {
       tmp = new Assignment(lhs.castToVar(), rhs);
-    } else if (rhs.vu()) {
+    } else if (rhs.tu()) {
       tmp = new Assignment(rhs.castToVar(), lhs);
-    } else if (lhs.yu() && rhs.yu()) {
+    } else if (lhs.wu() && rhs.wu()) {
       var tmp_1;
       if (equalityChecker(lhs, rhs)) {
         tmp_1 = new Identity(lhs, rhs);
@@ -567,13 +529,13 @@
         tmp_1 = new Contradiction(lhs, rhs);
       }
       tmp = tmp_1;
-    } else if (lhs.yu() || rhs.yu()) {
+    } else if (lhs.wu() || rhs.wu()) {
       tmp = new Contradiction(lhs, rhs);
-    } else if (lhs.fu() && rhs.fu()) {
+    } else if (lhs.du() && rhs.du()) {
       var lhsStruct = lhs.castToStruct();
       var rhsStruct = rhs.castToStruct();
       var tmp_2;
-      if (!(lhsStruct.tt() === rhsStruct.tt()) || !(lhsStruct.zt() === rhsStruct.zt())) {
+      if (!(lhsStruct.rt() === rhsStruct.rt()) || !(lhsStruct.xt() === rhsStruct.xt())) {
         tmp_2 = new Contradiction(lhsStruct, rhsStruct);
       } else {
         tmp_2 = new Comparison(lhsStruct, rhsStruct);
@@ -592,139 +554,132 @@
       tmp = equalityChecker;
     }
     equalityChecker = tmp;
-    return $super === VOID ? this.f1h(lhs, rhs, equalityChecker) : $super.f1h.call(this, lhs, rhs, equalityChecker);
+    return $super === VOID ? this.e1h(lhs, rhs, equalityChecker) : $super.e1h.call(this, lhs, rhs, equalityChecker);
   };
-  protoOf(Companion).a1i = function (pair, equalityChecker) {
-    return this.f1h(pair.xc_1, pair.yc_1, equalityChecker);
+  protoOf(Companion).z1h = function (pair, equalityChecker) {
+    return this.e1h(pair.first, pair.second, equalityChecker);
   };
   protoOf(Companion).ofPair = function (pair, equalityChecker, $super) {
     var tmp;
     if (equalityChecker === VOID) {
-      tmp = Term$equals$ref_0();
+      tmp = Term$equals$ref();
     } else {
       tmp = equalityChecker;
     }
     equalityChecker = tmp;
-    return $super === VOID ? this.a1i(pair, equalityChecker) : $super.a1i.call(this, pair, equalityChecker);
+    return $super === VOID ? this.z1h(pair, equalityChecker) : $super.z1h.call(this, pair, equalityChecker);
   };
-  protoOf(Companion).b1i = function (pairs, equalityChecker) {
+  protoOf(Companion).a1i = function (pairs, equalityChecker) {
     return flatMap(pairs, Equation$Companion$from$lambda(equalityChecker));
   };
   protoOf(Companion).fromSequence = function (pairs, equalityChecker, $super) {
     var tmp;
     if (equalityChecker === VOID) {
-      tmp = Term$equals$ref_1();
+      tmp = Term$equals$ref();
     } else {
       tmp = equalityChecker;
     }
     equalityChecker = tmp;
-    return $super === VOID ? this.b1i(pairs, equalityChecker) : $super.b1i.call(this, pairs, equalityChecker);
+    return $super === VOID ? this.a1i(pairs, equalityChecker) : $super.a1i.call(this, pairs, equalityChecker);
   };
-  protoOf(Companion).c1i = function (pairs, equalityChecker) {
-    return this.b1i(asSequence_0(pairs), equalityChecker);
+  protoOf(Companion).b1i = function (pairs, equalityChecker) {
+    return this.a1i(asSequence_0(pairs), equalityChecker);
   };
   protoOf(Companion).fromIterable = function (pairs, equalityChecker, $super) {
     var tmp;
     if (equalityChecker === VOID) {
-      tmp = Term$equals$ref_2();
+      tmp = Term$equals$ref();
     } else {
       tmp = equalityChecker;
     }
     equalityChecker = tmp;
-    return $super === VOID ? this.c1i(pairs, equalityChecker) : $super.c1i.call(this, pairs, equalityChecker);
+    return $super === VOID ? this.b1i(pairs, equalityChecker) : $super.b1i.call(this, pairs, equalityChecker);
   };
-  protoOf(Companion).d1i = function (pairs, equalityChecker) {
-    return this.b1i(sequenceOf_0(pairs.slice()), equalityChecker);
+  protoOf(Companion).c1i = function (pairs, equalityChecker) {
+    return this.a1i(sequenceOf_0(pairs.slice()), equalityChecker);
   };
   protoOf(Companion).from = function (pairs, equalityChecker, $super) {
     var tmp;
     if (equalityChecker === VOID) {
-      tmp = Term$equals$ref_3();
+      tmp = Term$equals$ref();
     } else {
       tmp = equalityChecker;
     }
     equalityChecker = tmp;
-    return $super === VOID ? this.d1i(pairs, equalityChecker) : $super.d1i.call(this, pairs, equalityChecker);
+    return $super === VOID ? this.c1i(pairs, equalityChecker) : $super.c1i.call(this, pairs, equalityChecker);
   };
-  protoOf(Companion).k1h = function (pair, equalityChecker) {
-    return this.r1g(pair.xc_1, pair.yc_1, equalityChecker);
+  protoOf(Companion).j1h = function (pair, equalityChecker) {
+    return this.q1g(pair.first, pair.second, equalityChecker);
   };
   protoOf(Companion).allOfPair = function (pair, equalityChecker, $super) {
     var tmp;
     if (equalityChecker === VOID) {
-      tmp = Term$equals$ref_4();
+      tmp = Term$equals$ref();
     } else {
       tmp = equalityChecker;
     }
     equalityChecker = tmp;
-    return $super === VOID ? this.k1h(pair, equalityChecker) : $super.k1h.call(this, pair, equalityChecker);
+    return $super === VOID ? this.j1h(pair, equalityChecker) : $super.j1h.call(this, pair, equalityChecker);
   };
-  protoOf(Companion).r1g = function (lhs, rhs, equalityChecker) {
+  protoOf(Companion).q1g = function (lhs, rhs, equalityChecker) {
     var tmp;
-    if (lhs.ut() && rhs.ut()) {
-      tmp = sequenceOf(this.f1h(lhs, rhs, equalityChecker));
-    } else if (lhs.lu() && rhs.lu()) {
+    if (lhs.st() && rhs.st()) {
+      tmp = sequenceOf(this.e1h(lhs, rhs, equalityChecker));
+    } else if (lhs.ju() && rhs.ju()) {
       tmp = allOfLists(this, lhs.castToList(), rhs.castToList(), equalityChecker);
-    } else if (lhs.ku() && rhs.ku()) {
+    } else if (lhs.iu() && rhs.iu()) {
       tmp = allOfTuples(this, lhs.castToTuple(), rhs.castToTuple(), equalityChecker);
-    } else if (lhs.fu() && rhs.fu()) {
+    } else if (lhs.du() && rhs.du()) {
       var lhsStruct = lhs.castToStruct();
       var rhsStruct = rhs.castToStruct();
       var tmp_0;
-      if (lhsStruct.tt() === rhsStruct.tt() && lhsStruct.zt() === rhsStruct.zt()) {
-        var tmp_1 = zip(lhsStruct.su(), rhsStruct.su());
+      if (lhsStruct.rt() === rhsStruct.rt() && lhsStruct.xt() === rhsStruct.xt()) {
+        var tmp_1 = zip(lhsStruct.qu(), rhsStruct.qu());
         tmp_0 = flatMap(tmp_1, Equation$Companion$allOf$lambda(equalityChecker));
       } else {
-        tmp_0 = sequenceOf(this.f1h(lhs, rhs, equalityChecker));
+        tmp_0 = sequenceOf(this.e1h(lhs, rhs, equalityChecker));
       }
       tmp = tmp_0;
     } else {
-      tmp = sequenceOf(this.f1h(lhs, rhs, equalityChecker));
+      tmp = sequenceOf(this.e1h(lhs, rhs, equalityChecker));
     }
     return tmp;
   };
   protoOf(Companion).allOf = function (lhs, rhs, equalityChecker, $super) {
     var tmp;
     if (equalityChecker === VOID) {
-      tmp = Term$equals$ref_5();
+      tmp = Term$equals$ref();
     } else {
       tmp = equalityChecker;
     }
     equalityChecker = tmp;
-    return $super === VOID ? this.r1g(lhs, rhs, equalityChecker) : $super.r1g.call(this, lhs, rhs, equalityChecker);
+    return $super === VOID ? this.q1g(lhs, rhs, equalityChecker) : $super.q1g.call(this, lhs, rhs, equalityChecker);
   };
   var Companion_instance_0;
   function Companion_getInstance_1() {
     return Companion_instance_0;
   }
-  function Term$equals$ref_6() {
-    var l = function (p0, p1) {
-      return p0.equals(p1);
-    };
-    l.callableName = 'equals';
-    return l;
-  }
   function Equation(lhs, rhs) {
-    this.s1g_1 = lhs;
-    this.t1g_1 = rhs;
+    this.r1g_1 = lhs;
+    this.s1g_1 = rhs;
   }
+  protoOf(Equation).t1g = function () {
+    return this.r1g_1;
+  };
   protoOf(Equation).u1g = function () {
     return this.s1g_1;
   };
-  protoOf(Equation).v1g = function () {
-    return this.t1g_1;
-  };
-  protoOf(Equation).x1g = function () {
+  protoOf(Equation).w1g = function () {
     return false;
   };
-  protoOf(Equation).e1h = function () {
+  protoOf(Equation).d1h = function () {
     return false;
   };
-  protoOf(Equation).p1h = function () {
+  protoOf(Equation).o1h = function () {
     return null;
   };
-  protoOf(Equation).z1g = function () {
-    var tmp0_elvis_lhs = this.p1h();
+  protoOf(Equation).y1g = function () {
+    var tmp0_elvis_lhs = this.o1h();
     var tmp;
     if (tmp0_elvis_lhs == null) {
       throw ClassCastException_init_$Create$('Cannot cast ' + toString(this) + ' to ' + getKClass(Assignment).b9());
@@ -733,51 +688,51 @@
     }
     return tmp;
   };
-  protoOf(Equation).y1g = function () {
+  protoOf(Equation).x1g = function () {
     return false;
   };
-  protoOf(Equation).w1g = function () {
+  protoOf(Equation).v1g = function () {
     return false;
   };
-  protoOf(Equation).x1f = function () {
-    return Companion_getInstance_0().of('=', [this.u1g(), this.v1g()]);
+  protoOf(Equation).w1f = function () {
+    return Companion_getInstance_0().of('=', [this.t1g(), this.u1g()]);
   };
   protoOf(Equation).toTerm = function () {
-    return this.x1f();
+    return this.w1f();
   };
   protoOf(Equation).toPair = function () {
-    return new Pair(this.u1g(), this.v1g());
+    return new Pair(this.t1g(), this.u1g());
   };
   protoOf(Equation).swap = function () {
-    return Companion_instance_0.of(this.v1g(), this.u1g());
+    return Companion_instance_0.of(this.u1g(), this.t1g());
   };
-  protoOf(Equation).q1h = function (substitution, equalityChecker) {
-    return Companion_instance_0.f1h(this.u1g().getSubstituted(substitution, []), this.v1g().getSubstituted(substitution, []), equalityChecker);
+  protoOf(Equation).p1h = function (substitution, equalityChecker) {
+    return Companion_instance_0.e1h(this.t1g().getSubstituted(substitution, []), this.u1g().getSubstituted(substitution, []), equalityChecker);
   };
   protoOf(Equation).apply = function (substitution, equalityChecker, $super) {
     var tmp;
     if (equalityChecker === VOID) {
-      tmp = Term$equals$ref_6();
+      tmp = Term$equals$ref();
     } else {
       tmp = equalityChecker;
     }
     equalityChecker = tmp;
-    return $super === VOID ? this.q1h(substitution, equalityChecker) : $super.q1h.call(this, substitution, equalityChecker);
+    return $super === VOID ? this.p1h(substitution, equalityChecker) : $super.p1h.call(this, substitution, equalityChecker);
   };
   function toEquations(_this__u8e3s4) {
     // Inline function 'kotlin.collections.map' call
-    var this_0 = _this__u8e3s4.f1();
+    var this_0 = _this__u8e3s4.d1();
     // Inline function 'kotlin.collections.mapTo' call
     var destination = ArrayList_init_$Create$_0(collectionSizeOrDefault(this_0, 10));
-    var _iterator__ex2g4s = this_0.p();
-    while (_iterator__ex2g4s.s()) {
-      var item = _iterator__ex2g4s.t();
+    var _iterator__ex2g4s = this_0.n();
+    while (_iterator__ex2g4s.q()) {
+      var item = _iterator__ex2g4s.r();
       // Inline function 'kotlin.collections.component1' call
       var variable = item.d2();
       // Inline function 'kotlin.collections.component2' call
       var term = item.e2();
       var tmp$ret$2 = new Assignment(variable, term);
-      destination.n(tmp$ret$2);
+      destination.l(tmp$ret$2);
     }
     return destination;
   }
@@ -788,12 +743,12 @@
   }
   function toAssignmentPair(_this__u8e3s4) {
     var tmp;
-    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());
+    if (_this__u8e3s4.d1h()) {
+      tmp = _this__u8e3s4.y1g().q1h();
+    } else if (_this__u8e3s4.t1g().tu()) {
+      tmp = to(_this__u8e3s4.t1g().castToVar(), _this__u8e3s4.u1g());
+    } else if (_this__u8e3s4.u1g().tu()) {
+      tmp = to(_this__u8e3s4.u1g().castToVar(), _this__u8e3s4.t1g());
     } else {
       throw IllegalArgumentException_init_$Create$('Equation contains no variables: ' + toString(_this__u8e3s4));
     }
@@ -806,19 +761,19 @@
     return Companion_getInstance_2().strict();
   }
   function Unificator$Companion$_get_default_$ref_8i2tx3() {
-    return function (p0) {
-      return p0.g1i();
-    };
+    return constructCallableReference(function (p0) {
+      return p0.f1i();
+    }, 1, 0, 28);
   }
   function Unificator$Companion$naive$1($context) {
     AbstractUnificator.call(this, $context);
   }
-  protoOf(Unificator$Companion$naive$1).q1g = function (first, second) {
+  protoOf(Unificator$Companion$naive$1).p1g = function (first, second) {
     var tmp;
-    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;
+    if (first.yu() && second.yu()) {
+      tmp = first.castToInteger().e2().bj(second.castToInteger().e2()) === 0;
+    } else if (first.xu() && second.xu()) {
+      tmp = first.castToNumeric().ny().si(second.castToNumeric().ny()) === 0;
     } else {
       tmp = first.equals(second);
     }
@@ -830,7 +785,7 @@
   function Unificator$Companion$strict$1($context) {
     AbstractUnificator.call(this, $context);
   }
-  protoOf(Unificator$Companion$strict$1).q1g = function (first, second) {
+  protoOf(Unificator$Companion$strict$1).p1g = function (first, second) {
     return first.equals(second);
   };
   protoOf(Unificator$Companion$strict$1).mguWithOccurCheck = function (term1, term2, occurCheckEnabled, $super) {
@@ -839,27 +794,27 @@
   function Companion_0() {
     Companion_instance_1 = this;
     var tmp = this;
-    tmp.e1i_1 = lazy(Unificator$Companion$default$delegate$lambda);
-    this.f1i_1 = 32;
+    tmp.d1i_1 = lazy(Unificator$Companion$default$delegate$lambda);
+    this.e1i_1 = 32;
   }
-  protoOf(Companion_0).g1i = function () {
-    var tmp0 = this.e1i_1;
+  protoOf(Companion_0).f1i = function () {
+    var tmp0 = this.d1i_1;
     var tmp = KProperty1;
     // Inline function 'kotlin.getValue' call
     getPropertyCallableRef('default', 1, tmp, Unificator$Companion$_get_default_$ref_8i2tx3(), null);
     return tmp0.e2();
   };
   protoOf(Companion_0).mguWith = function (_this__u8e3s4, other) {
-    return this.g1i().mgu(_this__u8e3s4, other);
+    return this.f1i().mgu(_this__u8e3s4, other);
   };
   protoOf(Companion_0).matches = function (_this__u8e3s4, other) {
-    return this.g1i().match(_this__u8e3s4, other);
+    return this.f1i().match(_this__u8e3s4, other);
   };
   protoOf(Companion_0).unifyWith = function (_this__u8e3s4, other) {
-    return this.g1i().unify(_this__u8e3s4, other);
+    return this.f1i().unify(_this__u8e3s4, other);
   };
   protoOf(Companion_0).mergeWith = function (_this__u8e3s4, other) {
-    return this.g1i().merge(_this__u8e3s4, other);
+    return this.f1i().merge(_this__u8e3s4, other);
   };
   protoOf(Companion_0).naiveWithContext = function (context) {
     return new Unificator$Companion$naive$1(context);
@@ -873,10 +828,10 @@
   protoOf(Companion_0).strict = function () {
     return this.strictWithContext(Companion_getInstance().empty());
   };
-  protoOf(Companion_0).l1i = function (other, capacity) {
+  protoOf(Companion_0).k1i = function (other, capacity) {
     var tmp;
     if (other instanceof CachedUnificator) {
-      tmp = new CachedUnificator(other.i1h_1, capacity);
+      tmp = new CachedUnificator(other.h1h_1, capacity);
     } else {
       tmp = new CachedUnificator(other, capacity);
     }
@@ -884,7 +839,7 @@
   };
   protoOf(Companion_0).cached = function (other, capacity, $super) {
     capacity = capacity === VOID ? 32 : capacity;
-    return $super === VOID ? this.l1i(other, capacity) : $super.l1i.call(this, other, capacity);
+    return $super === VOID ? this.k1i(other, capacity) : $super.k1i.call(this, other, capacity);
   };
   var Companion_instance_1;
   function Companion_getInstance_2() {
@@ -909,14 +864,14 @@
   protoOf(CachedUnificator).unifyWithOccurCheck = unifyWithOccurCheck;
   protoOf(CachedUnificator).unify = unify;
   protoOf(CachedUnificator).merge = merge;
-  protoOf(Equation).gp = castTo;
+  protoOf(Equation).ep = castTo;
   defineProp(protoOf(Equation), 'lhs', function () {
-    return this.u1g();
+    return this.t1g();
   });
   defineProp(protoOf(Equation), 'rhs', function () {
-    return this.v1g();
+    return this.u1g();
   });
-  defineProp(protoOf(Companion_0), 'default', protoOf(Companion_0).g1i);
+  defineProp(protoOf(Companion_0), 'default', protoOf(Companion_0).f1i);
   //endregion
   //region block: init
   Companion_instance_0 = new Companion();