@tuprolog/arg2p 0.13.2 → 0.14.2

package/2p-unify.js

@@ -19,61 +19,61 @@
   'use strict';
   //region block: imports
   var imul = Math.imul;
-  var KProperty1 = kotlin_kotlin.$_$.g7;
-  var getPropertyCallableRef = kotlin_kotlin.$_$.u5;
-  var asSequence = kotlin_kotlin.$_$.y1;
-  var plus = kotlin_kotlin.$_$.j8;
-  var map = kotlin_kotlin.$_$.f8;
-  var Unit_instance = kotlin_kotlin.$_$.k1;
+  var KProperty1 = kotlin_kotlin.$_$.h7;
+  var getPropertyCallableRef = kotlin_kotlin.$_$.x5;
+  var asSequence = kotlin_kotlin.$_$.z1;
+  var plus = kotlin_kotlin.$_$.k8;
+  var map = kotlin_kotlin.$_$.g8;
+  var Unit_instance = kotlin_kotlin.$_$.l1;
   var Companion_getInstance = kotlin_it_unibo_tuprolog_core.$_$.v;
   var ArrayList_init_$Create$ = kotlin_kotlin.$_$.d;
-  var toCollection = kotlin_kotlin.$_$.s8;
-  var Pair = kotlin_kotlin.$_$.na;
+  var toCollection = kotlin_kotlin.$_$.t8;
+  var Pair = kotlin_kotlin.$_$.oa;
   var VOID = kotlin_kotlin.$_$.b;
-  var lazy = kotlin_kotlin.$_$.va;
-  var protoOf = kotlin_kotlin.$_$.m6;
-  var asSequence_0 = kotlin_kotlin.$_$.z1;
-  var THROW_CCE = kotlin_kotlin.$_$.pa;
-  var initMetadataForClass = kotlin_kotlin.$_$.x5;
+  var lazy = kotlin_kotlin.$_$.wa;
+  var protoOf = kotlin_kotlin.$_$.n6;
+  var asSequence_0 = kotlin_kotlin.$_$.a2;
+  var THROW_CCE = kotlin_kotlin.$_$.qa;
+  var initMetadataForClass = kotlin_kotlin.$_$.a6;
   var Companion_instance = kotlin_it_unibo_tuprolog_utils.$_$.a;
-  var Triple = kotlin_kotlin.$_$.ra;
+  var Triple = kotlin_kotlin.$_$.sa;
   var Some = kotlin_it_unibo_tuprolog_utils.$_$.l;
-  var zip = kotlin_kotlin.$_$.z8;
-  var flatMap = kotlin_kotlin.$_$.w7;
-  var sequenceOf = kotlin_kotlin.$_$.m8;
+  var zip = kotlin_kotlin.$_$.a9;
+  var flatMap = kotlin_kotlin.$_$.x7;
+  var sequenceOf = kotlin_kotlin.$_$.n8;
   var to = kotlin_kotlin.$_$.cb;
-  var sequenceOf_0 = kotlin_kotlin.$_$.l8;
-  var initMetadataForCompanion = kotlin_kotlin.$_$.y5;
-  var toString = kotlin_kotlin.$_$.p6;
-  var getKClass = kotlin_kotlin.$_$.e7;
+  var sequenceOf_0 = kotlin_kotlin.$_$.m8;
+  var initMetadataForCompanion = kotlin_kotlin.$_$.b6;
+  var toString = kotlin_kotlin.$_$.q6;
+  var getKClass = kotlin_kotlin.$_$.f7;
   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.$_$.q5;
+  var defineProp = kotlin_kotlin.$_$.t5;
   var TermConvertible = kotlin_it_unibo_tuprolog_core.$_$.u1;
   var Castable = kotlin_it_unibo_tuprolog_utils.$_$.f;
-  var collectionSizeOrDefault = kotlin_kotlin.$_$.b2;
+  var collectionSizeOrDefault = kotlin_kotlin.$_$.c2;
   var ArrayList_init_$Create$_0 = kotlin_kotlin.$_$.c;
   var IllegalArgumentException_init_$Create$ = kotlin_kotlin.$_$.q;
-  var initMetadataForInterface = kotlin_kotlin.$_$.z5;
+  var initMetadataForInterface = kotlin_kotlin.$_$.c6;
   //endregion
   //region block: pre-declaration
   function mguWithOccurCheck(term1, term2, occurCheckEnabled, $super) {
     occurCheckEnabled = occurCheckEnabled === VOID ? true : occurCheckEnabled;
-    return $super === VOID ? this.u1h(term1, term2, occurCheckEnabled) : $super.u1h.call(this, term1, term2, occurCheckEnabled);
+    return $super === VOID ? this.r1i(term1, term2, occurCheckEnabled) : $super.r1i.call(this, term1, term2, occurCheckEnabled);
   }
   function mgu(term1, term2) {
-    return this.u1h(term1, term2, true);
+    return this.r1i(term1, term2, true);
   }
   function matchWithOccurCheck(term1, term2, occurCheckEnabled) {
-    return !(this.u1h(term1, term2, occurCheckEnabled) === Companion_getInstance().failed());
+    return !(this.r1i(term1, term2, occurCheckEnabled) === Companion_getInstance().failed());
   }
   function match(term1, term2) {
     return this.matchWithOccurCheck(term1, term2, true);
   }
   function unifyWithOccurCheck(term1, term2, occurCheckEnabled) {
-    var substitution = this.u1h(term1, term2, occurCheckEnabled);
-    return substitution.m10() ? null : term1.getSubstituted(substitution, []);
+    var substitution = this.r1i(term1, term2, occurCheckEnabled);
+    return substitution.k11() ? null : term1.getSubstituted(substitution, []);
   }
   function unify(term1, term2) {
     return this.unifyWithOccurCheck(term1, term2, true);
@@ -95,7 +95,7 @@
   initMetadataForCompanion(Companion_0);
   //endregion
   function _get_contextEquations__x0dd77($this) {
-    var tmp0 = $this.d1h_1;
+    var tmp0 = $this.a1i_1;
     var tmp = KProperty1;
     // Inline function 'kotlin.getValue' call
     getPropertyCallableRef('contextEquations', 1, tmp, AbstractUnificator$_get_contextEquations_$ref_7ajcte(), null);
@@ -103,10 +103,10 @@
   }
   function occurrenceCheck($this, variable, term) {
     var tmp;
-    if (term.dv()) {
-      tmp = $this.e1h(variable, term);
-    } else if (term.nu()) {
-      var tmp0 = term.ju();
+    if (term.bw()) {
+      tmp = $this.b1i(variable, term);
+    } else if (term.lv()) {
+      var tmp0 = term.hv();
       var tmp$ret$1;
       $l$block: {
         // Inline function 'kotlin.sequences.any' call
@@ -128,7 +128,7 @@
   }
   function equationsFor($this, term1, term2) {
     var tmp = Companion_instance_0;
-    return tmp.f1h(term1, term2, AbstractUnificator$checkTermsEquality$ref($this));
+    return tmp.c1i(term1, term2, AbstractUnificator$checkTermsEquality$ref($this));
   }
   function equationsFor_0($this, substitution1, substitution2) {
     var tmp = Companion_instance_0;
@@ -163,26 +163,26 @@
       var eqIterator = equations.b4();
       while (eqIterator.s()) {
         var eq = eqIterator.t();
-        if (eq.k1h()) {
+        if (eq.h1i()) {
           return Companion_getInstance().failed();
-        } else if (eq.l1h()) {
+        } else if (eq.i1i()) {
           eqIterator.c3();
           changed = true;
-        } else if (eq.s1h()) {
-          var assignment = eq.n1h();
-          if (occurCheckEnabled && occurrenceCheck($this, assignment.q1h_1, eq.j1h())) {
+        } else if (eq.p1i()) {
+          var assignment = eq.k1i();
+          if (occurCheckEnabled && occurrenceCheck($this, assignment.n1i_1, eq.g1i())) {
             return Companion_getInstance().failed();
           } else {
             changed = changed || applySubstitutionToEquations($this, assignment.toSubstitution(), equations, eqIterator.r3());
           }
-        } else if (eq.m1h()) {
+        } else if (eq.j1i()) {
           eqIterator.c3();
-          var _iterator__ex2g4s = equationsFor($this, eq.i1h(), eq.j1h()).p();
+          var _iterator__ex2g4s = equationsFor($this, eq.f1i(), eq.g1i()).p();
           insertion: while (_iterator__ex2g4s.s()) {
             var it = _iterator__ex2g4s.t();
-            if (it.l1h())
+            if (it.i1i())
               continue insertion;
-            else if (it.k1h())
+            else if (it.h1i())
               return Companion_getInstance().failed();
             else {
               eqIterator.u3(it);
@@ -198,7 +198,7 @@
     var _iterator__ex2g4s_0 = equations.p();
     while (_iterator__ex2g4s_0.s()) {
       var element = _iterator__ex2g4s_0.t();
-      if (element.s1h()) {
+      if (element.p1i()) {
         destination.m(element);
       }
     }
@@ -209,19 +209,6 @@
     var tmp$ret$0 = ArrayList_init_$Create$();
     return toCollection(items, tmp$ret$0);
   }
-  function applySubstitutionToEquations$handleIndex($equations, $substitution, this$0, changed, i) {
-    if ($equations.w(i).k1h() || $equations.w(i).l1h())
-      return Unit_instance;
-    var currentEq = $equations.w(i);
-    var _destruct__k2r9zo = currentEq.apply($substitution).toPair();
-    var newLhs = _destruct__k2r9zo.zb();
-    var newRhs = _destruct__k2r9zo.ac();
-    if (!currentEq.i1h().equals(newLhs) || !currentEq.j1h().equals(newRhs)) {
-      var tmp = Companion_instance_0;
-      $equations.z2(i, tmp.t1h(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());
@@ -234,7 +221,7 @@
   }
   function AbstractUnificator$checkTermsEquality$ref(p0) {
     var l = function (_this__u8e3s4, p0_0) {
-      return p0.e1h(_this__u8e3s4, p0_0);
+      return p0.b1i(_this__u8e3s4, p0_0);
     };
     l.callableName = 'checkTermsEquality';
     return l;
@@ -245,22 +232,35 @@
   }
   function AbstractUnificator$checkTermsEquality$ref_0(p0) {
     var l = function (_this__u8e3s4, p0_0) {
-      return p0.e1h(_this__u8e3s4, p0_0);
+      return p0.b1i(_this__u8e3s4, p0_0);
     };
     l.callableName = 'checkTermsEquality';
     return l;
   }
+  function applySubstitutionToEquations$handleIndex($equations, $substitution, this$0, changed, i) {
+    if ($equations.w(i).h1i() || $equations.w(i).i1i())
+      return Unit_instance;
+    var currentEq = $equations.w(i);
+    var _destruct__k2r9zo = currentEq.apply($substitution).toPair();
+    var newLhs = _destruct__k2r9zo.zc();
+    var newRhs = _destruct__k2r9zo.ad();
+    if (!currentEq.f1i().equals(newLhs) || !currentEq.g1i().equals(newRhs)) {
+      var tmp = Companion_instance_0;
+      $equations.z2(i, tmp.q1i(newLhs, newRhs, AbstractUnificator$checkTermsEquality$ref_0(this$0)));
+      changed._v = true;
+    }
+  }
   function AbstractUnificator(context) {
     context = context === VOID ? Companion_getInstance().empty() : context;
-    this.c1h_1 = context;
+    this.z1h_1 = context;
     var tmp = this;
-    tmp.d1h_1 = lazy(AbstractUnificator$contextEquations$delegate$lambda(this));
+    tmp.a1i_1 = lazy(AbstractUnificator$contextEquations$delegate$lambda(this));
   }
   protoOf(AbstractUnificator).h8 = function () {
-    return this.c1h_1;
+    return this.z1h_1;
   };
-  protoOf(AbstractUnificator).u1h = function (term1, term2, occurCheckEnabled) {
-    if (this.h8().m10())
+  protoOf(AbstractUnificator).r1i = function (term1, term2, occurCheckEnabled) {
+    if (this.h8().k11())
       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);
@@ -268,12 +268,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).v1h = function (substitution1, substitution2, occurCheckEnabled) {
-    if (this.h8().m10() || substitution1.m10() || substitution2.m10())
+  protoOf(AbstractUnificator).s1i = function (substitution1, substitution2, occurCheckEnabled) {
+    if (this.h8().k11() || substitution1.k11() || substitution2.k11())
       return Companion_getInstance().failed();
     if (!occurCheckEnabled) {
       var quickMerge = this.h8().plus(substitution1).plus(substitution2);
-      if (quickMerge.l10()) {
+      if (quickMerge.j11()) {
         return quickMerge;
       }
     }
@@ -281,21 +281,21 @@
     return mgu_0(this, equations, occurCheckEnabled);
   };
   protoOf(AbstractUnificator).mergeWithOccurCheck = function (substitution1, substitution2, occurCheckEnabled) {
-    return this.v1h(substitution1, substitution2, occurCheckEnabled);
+    return this.s1i(substitution1, substitution2, occurCheckEnabled);
   };
   function CachedUnificator(decorated, cacheCapacity) {
-    this.w1h_1 = decorated;
-    this.x1h_1 = Companion_instance.wo(cacheCapacity);
+    this.t1i_1 = decorated;
+    this.u1i_1 = Companion_instance.up(cacheCapacity);
   }
-  protoOf(CachedUnificator).u1h = function (term1, term2, occurCheckEnabled) {
+  protoOf(CachedUnificator).r1i = function (term1, term2, occurCheckEnabled) {
     var mguRequest = new Triple(term1, term2, occurCheckEnabled);
-    var cached = this.x1h_1.h2(mguRequest);
+    var cached = this.u1i_1.h2(mguRequest);
     var tmp;
     if (cached instanceof Some) {
-      tmp = cached.zo_1;
+      tmp = cached.xp_1;
     } else {
-      var mguResult = this.w1h_1.u1h(term1, term2, occurCheckEnabled);
-      this.x1h_1.xo(mguRequest, mguResult);
+      var mguResult = this.t1i_1.r1i(term1, term2, occurCheckEnabled);
+      this.u1i_1.vp(mguRequest, mguResult);
       tmp = mguResult;
     }
     return tmp;
@@ -303,21 +303,21 @@
   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).v1h = function (substitution1, substitution2, occurCheckEnabled) {
+  protoOf(CachedUnificator).s1i = function (substitution1, substitution2, occurCheckEnabled) {
     var mguRequest = new Triple(substitution1, substitution2, occurCheckEnabled);
-    var cached = this.x1h_1.h2(mguRequest);
+    var cached = this.u1i_1.h2(mguRequest);
     var tmp;
     if (cached instanceof Some) {
-      tmp = cached.zo_1;
+      tmp = cached.xp_1;
     } else {
-      var mguResult = this.w1h_1.mergeWithOccurCheck(substitution1, substitution2, occurCheckEnabled);
-      this.x1h_1.xo(mguRequest, mguResult);
+      var mguResult = this.t1i_1.mergeWithOccurCheck(substitution1, substitution2, occurCheckEnabled);
+      this.u1i_1.vp(mguRequest, mguResult);
       tmp = mguResult;
     }
     return tmp;
   };
   protoOf(CachedUnificator).mergeWithOccurCheck = function (substitution1, substitution2, occurCheckEnabled) {
-    return this.v1h(substitution1, substitution2, occurCheckEnabled);
+    return this.s1i(substitution1, substitution2, occurCheckEnabled);
   };
   function allOfLists($this, lhs, rhs, equalityChecker) {
     var tmp = zip(lhs.unfold(), rhs.unfold());
@@ -350,7 +350,7 @@
   }
   function Equation$Companion$from$lambda($equalityChecker) {
     return function (it) {
-      return Companion_instance_0.y1h(it, $equalityChecker);
+      return Companion_instance_0.v1i(it, $equalityChecker);
     };
   }
   function Term$equals$ref_2() {
@@ -376,16 +376,16 @@
   }
   function Equation$Companion$allOfLists$lambda($equalityChecker) {
     return function (_destruct__k2r9zo) {
-      var l = _destruct__k2r9zo.zb();
-      var r = _destruct__k2r9zo.ac();
-      return l.uu() && r.uu() ? sequenceOf(Companion_instance_0.t1h(l.castToCons().nw(), r.castToCons().nw(), $equalityChecker)) : l.tu() && r.tu() ? sequenceOf(Companion_instance_0.t1h(l.castToList(), r.castToList(), $equalityChecker)) : Companion_instance_0.f1h(l, r, $equalityChecker);
+      var l = _destruct__k2r9zo.zc();
+      var r = _destruct__k2r9zo.ad();
+      return l.sv() && r.sv() ? sequenceOf(Companion_instance_0.q1i(l.castToCons().lx(), r.castToCons().lx(), $equalityChecker)) : l.rv() && r.rv() ? sequenceOf(Companion_instance_0.q1i(l.castToList(), r.castToList(), $equalityChecker)) : Companion_instance_0.c1i(l, r, $equalityChecker);
     };
   }
   function Equation$Companion$allOfTuples$lambda($equalityChecker) {
     return function (_destruct__k2r9zo) {
-      var l = _destruct__k2r9zo.zb();
-      var r = _destruct__k2r9zo.ac();
-      return l.su() && r.su() ? sequenceOf(Companion_instance_0.t1h(l.castToTuple().bw(), r.castToTuple().bw(), $equalityChecker)) : Companion_instance_0.f1h(l, r, $equalityChecker);
+      var l = _destruct__k2r9zo.zc();
+      var r = _destruct__k2r9zo.ad();
+      return l.qv() && r.qv() ? sequenceOf(Companion_instance_0.q1i(l.castToTuple().zw(), r.castToTuple().zw(), $equalityChecker)) : Companion_instance_0.c1i(l, r, $equalityChecker);
     };
   }
   function Term$equals$ref_5() {
@@ -397,29 +397,29 @@
   }
   function Equation$Companion$allOf$lambda($equalityChecker) {
     return function (it) {
-      return Companion_instance_0.y1h(it, $equalityChecker);
+      return Companion_instance_0.v1i(it, $equalityChecker);
     };
   }
   function Identity(lhs, rhs) {
     Equation.call(this, lhs, rhs);
-    this.b1i_1 = lhs;
-    this.c1i_1 = rhs;
+    this.y1i_1 = lhs;
+    this.z1i_1 = rhs;
   }
-  protoOf(Identity).i1h = function () {
-    return this.b1i_1;
+  protoOf(Identity).f1i = function () {
+    return this.y1i_1;
   };
-  protoOf(Identity).j1h = function () {
-    return this.c1i_1;
+  protoOf(Identity).g1i = function () {
+    return this.z1i_1;
   };
-  protoOf(Identity).l1h = function () {
+  protoOf(Identity).i1i = function () {
     return true;
   };
   protoOf(Identity).toString = function () {
-    return 'Identity(lhs=' + this.b1i_1.toString() + ', rhs=' + this.c1i_1.toString() + ')';
+    return 'Identity(lhs=' + this.y1i_1.toString() + ', rhs=' + this.z1i_1.toString() + ')';
   };
   protoOf(Identity).hashCode = function () {
-    var result = this.b1i_1.hashCode();
-    result = imul(result, 31) + this.c1i_1.hashCode() | 0;
+    var result = this.y1i_1.hashCode();
+    result = imul(result, 31) + this.z1i_1.hashCode() | 0;
     return result;
   };
   protoOf(Identity).equals = function (other) {
@@ -427,44 +427,44 @@
       return true;
     if (!(other instanceof Identity))
       return false;
-    if (!this.b1i_1.equals(other.b1i_1))
+    if (!this.y1i_1.equals(other.y1i_1))
       return false;
-    if (!this.c1i_1.equals(other.c1i_1))
+    if (!this.z1i_1.equals(other.z1i_1))
       return false;
     return true;
   };
   function Assignment(lhs, rhs) {
     Equation.call(this, lhs, rhs);
-    this.q1h_1 = lhs;
-    this.r1h_1 = rhs;
+    this.n1i_1 = lhs;
+    this.o1i_1 = rhs;
   }
-  protoOf(Assignment).i1h = function () {
-    return this.q1h_1;
+  protoOf(Assignment).f1i = function () {
+    return this.n1i_1;
   };
-  protoOf(Assignment).j1h = function () {
-    return this.r1h_1;
+  protoOf(Assignment).g1i = function () {
+    return this.o1i_1;
   };
   protoOf(Assignment).toSubstitution = function () {
-    return Companion_getInstance().unifier(this.q1h_1, this.r1h_1);
+    return Companion_getInstance().unifier(this.n1i_1, this.o1i_1);
   };
-  protoOf(Assignment).f1i = function () {
-    return to(this.q1h_1, this.r1h_1);
+  protoOf(Assignment).c1j = function () {
+    return to(this.n1i_1, this.o1i_1);
   };
   protoOf(Assignment).toPair = function () {
-    return this.f1i();
+    return this.c1j();
   };
-  protoOf(Assignment).s1h = function () {
+  protoOf(Assignment).p1i = function () {
     return true;
   };
-  protoOf(Assignment).d1i = function () {
+  protoOf(Assignment).a1j = function () {
     return this;
   };
   protoOf(Assignment).toString = function () {
-    return 'Assignment(lhs=' + this.q1h_1.toString() + ', rhs=' + this.r1h_1.toString() + ')';
+    return 'Assignment(lhs=' + this.n1i_1.toString() + ', rhs=' + this.o1i_1.toString() + ')';
   };
   protoOf(Assignment).hashCode = function () {
-    var result = this.q1h_1.hashCode();
-    result = imul(result, 31) + this.r1h_1.hashCode() | 0;
+    var result = this.n1i_1.hashCode();
+    result = imul(result, 31) + this.o1i_1.hashCode() | 0;
     return result;
   };
   protoOf(Assignment).equals = function (other) {
@@ -472,32 +472,32 @@
       return true;
     if (!(other instanceof Assignment))
       return false;
-    if (!this.q1h_1.equals(other.q1h_1))
+    if (!this.n1i_1.equals(other.n1i_1))
       return false;
-    if (!this.r1h_1.equals(other.r1h_1))
+    if (!this.o1i_1.equals(other.o1i_1))
       return false;
     return true;
   };
   function Comparison(lhs, rhs) {
     Equation.call(this, lhs, rhs);
-    this.i1i_1 = lhs;
-    this.j1i_1 = rhs;
+    this.f1j_1 = lhs;
+    this.g1j_1 = rhs;
   }
-  protoOf(Comparison).i1h = function () {
-    return this.i1i_1;
+  protoOf(Comparison).f1i = function () {
+    return this.f1j_1;
   };
-  protoOf(Comparison).j1h = function () {
-    return this.j1i_1;
+  protoOf(Comparison).g1i = function () {
+    return this.g1j_1;
   };
-  protoOf(Comparison).m1h = function () {
+  protoOf(Comparison).j1i = function () {
     return true;
   };
   protoOf(Comparison).toString = function () {
-    return 'Comparison(lhs=' + this.i1i_1.toString() + ', rhs=' + this.j1i_1.toString() + ')';
+    return 'Comparison(lhs=' + this.f1j_1.toString() + ', rhs=' + this.g1j_1.toString() + ')';
   };
   protoOf(Comparison).hashCode = function () {
-    var result = this.i1i_1.hashCode();
-    result = imul(result, 31) + this.j1i_1.hashCode() | 0;
+    var result = this.f1j_1.hashCode();
+    result = imul(result, 31) + this.g1j_1.hashCode() | 0;
     return result;
   };
   protoOf(Comparison).equals = function (other) {
@@ -505,32 +505,32 @@
       return true;
     if (!(other instanceof Comparison))
       return false;
-    if (!this.i1i_1.equals(other.i1i_1))
+    if (!this.f1j_1.equals(other.f1j_1))
       return false;
-    if (!this.j1i_1.equals(other.j1i_1))
+    if (!this.g1j_1.equals(other.g1j_1))
       return false;
     return true;
   };
   function Contradiction(lhs, rhs) {
     Equation.call(this, lhs, rhs);
-    this.m1i_1 = lhs;
-    this.n1i_1 = rhs;
+    this.j1j_1 = lhs;
+    this.k1j_1 = rhs;
   }
-  protoOf(Contradiction).i1h = function () {
-    return this.m1i_1;
+  protoOf(Contradiction).f1i = function () {
+    return this.j1j_1;
   };
-  protoOf(Contradiction).j1h = function () {
-    return this.n1i_1;
+  protoOf(Contradiction).g1i = function () {
+    return this.k1j_1;
   };
-  protoOf(Contradiction).k1h = function () {
+  protoOf(Contradiction).h1i = function () {
     return true;
   };
   protoOf(Contradiction).toString = function () {
-    return 'Contradiction(lhs=' + this.m1i_1.toString() + ', rhs=' + this.n1i_1.toString() + ')';
+    return 'Contradiction(lhs=' + this.j1j_1.toString() + ', rhs=' + this.k1j_1.toString() + ')';
   };
   protoOf(Contradiction).hashCode = function () {
-    var result = this.m1i_1.hashCode();
-    result = imul(result, 31) + this.n1i_1.hashCode() | 0;
+    var result = this.j1j_1.hashCode();
+    result = imul(result, 31) + this.k1j_1.hashCode() | 0;
     return result;
   };
   protoOf(Contradiction).equals = function (other) {
@@ -538,17 +538,17 @@
       return true;
     if (!(other instanceof Contradiction))
       return false;
-    if (!this.m1i_1.equals(other.m1i_1))
+    if (!this.j1j_1.equals(other.j1j_1))
       return false;
-    if (!this.n1i_1.equals(other.n1i_1))
+    if (!this.k1j_1.equals(other.k1j_1))
       return false;
     return true;
   };
   function Companion() {
   }
-  protoOf(Companion).t1h = function (lhs, rhs, equalityChecker) {
+  protoOf(Companion).q1i = function (lhs, rhs, equalityChecker) {
     var tmp;
-    if (lhs.dv() && rhs.dv()) {
+    if (lhs.bw() && rhs.bw()) {
       var tmp_0;
       if (equalityChecker(lhs, rhs)) {
         tmp_0 = new Identity(lhs, rhs);
@@ -556,11 +556,11 @@
         tmp_0 = new Assignment(lhs.castToVar(), rhs);
       }
       tmp = tmp_0;
-    } else if (lhs.dv()) {
+    } else if (lhs.bw()) {
       tmp = new Assignment(lhs.castToVar(), rhs);
-    } else if (rhs.dv()) {
+    } else if (rhs.bw()) {
       tmp = new Assignment(rhs.castToVar(), lhs);
-    } else if (lhs.gv() && rhs.gv()) {
+    } else if (lhs.ew() && rhs.ew()) {
       var tmp_1;
       if (equalityChecker(lhs, rhs)) {
         tmp_1 = new Identity(lhs, rhs);
@@ -568,13 +568,13 @@
         tmp_1 = new Contradiction(lhs, rhs);
       }
       tmp = tmp_1;
-    } else if (lhs.gv() || rhs.gv()) {
+    } else if (lhs.ew() || rhs.ew()) {
       tmp = new Contradiction(lhs, rhs);
-    } else if (lhs.nu() && rhs.nu()) {
+    } else if (lhs.lv() && rhs.lv()) {
       var lhsStruct = lhs.castToStruct();
       var rhsStruct = rhs.castToStruct();
       var tmp_2;
-      if (!(lhsStruct.bu() === rhsStruct.bu()) || !(lhsStruct.hu() === rhsStruct.hu())) {
+      if (!(lhsStruct.zu() === rhsStruct.zu()) || !(lhsStruct.fv() === rhsStruct.fv())) {
         tmp_2 = new Contradiction(lhsStruct, rhsStruct);
       } else {
         tmp_2 = new Comparison(lhsStruct, rhsStruct);
@@ -593,10 +593,10 @@
       tmp = equalityChecker;
     }
     equalityChecker = tmp;
-    return $super === VOID ? this.t1h(lhs, rhs, equalityChecker) : $super.t1h.call(this, lhs, rhs, equalityChecker);
+    return $super === VOID ? this.q1i(lhs, rhs, equalityChecker) : $super.q1i.call(this, lhs, rhs, equalityChecker);
   };
-  protoOf(Companion).o1i = function (pair, equalityChecker) {
-    return this.t1h(pair.fc_1, pair.gc_1, equalityChecker);
+  protoOf(Companion).l1j = function (pair, equalityChecker) {
+    return this.q1i(pair.first, pair.second, equalityChecker);
   };
   protoOf(Companion).ofPair = function (pair, equalityChecker, $super) {
     var tmp;
@@ -606,9 +606,9 @@
       tmp = equalityChecker;
     }
     equalityChecker = tmp;
-    return $super === VOID ? this.o1i(pair, equalityChecker) : $super.o1i.call(this, pair, equalityChecker);
+    return $super === VOID ? this.l1j(pair, equalityChecker) : $super.l1j.call(this, pair, equalityChecker);
   };
-  protoOf(Companion).p1i = function (pairs, equalityChecker) {
+  protoOf(Companion).m1j = function (pairs, equalityChecker) {
     return flatMap(pairs, Equation$Companion$from$lambda(equalityChecker));
   };
   protoOf(Companion).fromSequence = function (pairs, equalityChecker, $super) {
@@ -619,10 +619,10 @@
       tmp = equalityChecker;
     }
     equalityChecker = tmp;
-    return $super === VOID ? this.p1i(pairs, equalityChecker) : $super.p1i.call(this, pairs, equalityChecker);
+    return $super === VOID ? this.m1j(pairs, equalityChecker) : $super.m1j.call(this, pairs, equalityChecker);
   };
-  protoOf(Companion).q1i = function (pairs, equalityChecker) {
-    return this.p1i(asSequence_0(pairs), equalityChecker);
+  protoOf(Companion).n1j = function (pairs, equalityChecker) {
+    return this.m1j(asSequence_0(pairs), equalityChecker);
   };
   protoOf(Companion).fromIterable = function (pairs, equalityChecker, $super) {
     var tmp;
@@ -632,10 +632,10 @@
       tmp = equalityChecker;
     }
     equalityChecker = tmp;
-    return $super === VOID ? this.q1i(pairs, equalityChecker) : $super.q1i.call(this, pairs, equalityChecker);
+    return $super === VOID ? this.n1j(pairs, equalityChecker) : $super.n1j.call(this, pairs, equalityChecker);
   };
-  protoOf(Companion).r1i = function (pairs, equalityChecker) {
-    return this.p1i(sequenceOf_0(pairs.slice()), equalityChecker);
+  protoOf(Companion).o1j = function (pairs, equalityChecker) {
+    return this.m1j(sequenceOf_0(pairs.slice()), equalityChecker);
   };
   protoOf(Companion).from = function (pairs, equalityChecker, $super) {
     var tmp;
@@ -645,10 +645,10 @@
       tmp = equalityChecker;
     }
     equalityChecker = tmp;
-    return $super === VOID ? this.r1i(pairs, equalityChecker) : $super.r1i.call(this, pairs, equalityChecker);
+    return $super === VOID ? this.o1j(pairs, equalityChecker) : $super.o1j.call(this, pairs, equalityChecker);
   };
-  protoOf(Companion).y1h = function (pair, equalityChecker) {
-    return this.f1h(pair.fc_1, pair.gc_1, equalityChecker);
+  protoOf(Companion).v1i = function (pair, equalityChecker) {
+    return this.c1i(pair.first, pair.second, equalityChecker);
   };
   protoOf(Companion).allOfPair = function (pair, equalityChecker, $super) {
     var tmp;
@@ -658,29 +658,29 @@
       tmp = equalityChecker;
     }
     equalityChecker = tmp;
-    return $super === VOID ? this.y1h(pair, equalityChecker) : $super.y1h.call(this, pair, equalityChecker);
+    return $super === VOID ? this.v1i(pair, equalityChecker) : $super.v1i.call(this, pair, equalityChecker);
   };
-  protoOf(Companion).f1h = function (lhs, rhs, equalityChecker) {
+  protoOf(Companion).c1i = function (lhs, rhs, equalityChecker) {
     var tmp;
-    if (lhs.cu() && rhs.cu()) {
-      tmp = sequenceOf(this.t1h(lhs, rhs, equalityChecker));
-    } else if (lhs.tu() && rhs.tu()) {
+    if (lhs.av() && rhs.av()) {
+      tmp = sequenceOf(this.q1i(lhs, rhs, equalityChecker));
+    } else if (lhs.rv() && rhs.rv()) {
       tmp = allOfLists(this, lhs.castToList(), rhs.castToList(), equalityChecker);
-    } else if (lhs.su() && rhs.su()) {
+    } else if (lhs.qv() && rhs.qv()) {
       tmp = allOfTuples(this, lhs.castToTuple(), rhs.castToTuple(), equalityChecker);
-    } else if (lhs.nu() && rhs.nu()) {
+    } else if (lhs.lv() && rhs.lv()) {
       var lhsStruct = lhs.castToStruct();
       var rhsStruct = rhs.castToStruct();
       var tmp_0;
-      if (lhsStruct.bu() === rhsStruct.bu() && lhsStruct.hu() === rhsStruct.hu()) {
-        var tmp_1 = zip(lhsStruct.av(), rhsStruct.av());
+      if (lhsStruct.zu() === rhsStruct.zu() && lhsStruct.fv() === rhsStruct.fv()) {
+        var tmp_1 = zip(lhsStruct.yv(), rhsStruct.yv());
         tmp_0 = flatMap(tmp_1, Equation$Companion$allOf$lambda(equalityChecker));
       } else {
-        tmp_0 = sequenceOf(this.t1h(lhs, rhs, equalityChecker));
+        tmp_0 = sequenceOf(this.q1i(lhs, rhs, equalityChecker));
       }
       tmp = tmp_0;
     } else {
-      tmp = sequenceOf(this.t1h(lhs, rhs, equalityChecker));
+      tmp = sequenceOf(this.q1i(lhs, rhs, equalityChecker));
     }
     return tmp;
   };
@@ -692,7 +692,7 @@
       tmp = equalityChecker;
     }
     equalityChecker = tmp;
-    return $super === VOID ? this.f1h(lhs, rhs, equalityChecker) : $super.f1h.call(this, lhs, rhs, equalityChecker);
+    return $super === VOID ? this.c1i(lhs, rhs, equalityChecker) : $super.c1i.call(this, lhs, rhs, equalityChecker);
   };
   var Companion_instance_0;
   function Companion_getInstance_1() {
@@ -706,26 +706,26 @@
     return l;
   }
   function Equation(lhs, rhs) {
-    this.g1h_1 = lhs;
-    this.h1h_1 = rhs;
+    this.d1i_1 = lhs;
+    this.e1i_1 = rhs;
   }
-  protoOf(Equation).i1h = function () {
-    return this.g1h_1;
+  protoOf(Equation).f1i = function () {
+    return this.d1i_1;
   };
-  protoOf(Equation).j1h = function () {
-    return this.h1h_1;
+  protoOf(Equation).g1i = function () {
+    return this.e1i_1;
   };
-  protoOf(Equation).l1h = function () {
+  protoOf(Equation).i1i = function () {
     return false;
   };
-  protoOf(Equation).s1h = function () {
+  protoOf(Equation).p1i = function () {
     return false;
   };
-  protoOf(Equation).d1i = function () {
+  protoOf(Equation).a1j = function () {
     return null;
   };
-  protoOf(Equation).n1h = function () {
-    var tmp0_elvis_lhs = this.d1i();
+  protoOf(Equation).k1i = function () {
+    var tmp0_elvis_lhs = this.a1j();
     var tmp;
     if (tmp0_elvis_lhs == null) {
       throw ClassCastException_init_$Create$('Cannot cast ' + toString(this) + ' to ' + getKClass(Assignment).b9());
@@ -734,26 +734,26 @@
     }
     return tmp;
   };
-  protoOf(Equation).m1h = function () {
+  protoOf(Equation).j1i = function () {
     return false;
   };
-  protoOf(Equation).k1h = function () {
+  protoOf(Equation).h1i = function () {
     return false;
   };
-  protoOf(Equation).l1g = function () {
-    return Companion_getInstance_0().of('=', [this.i1h(), this.j1h()]);
+  protoOf(Equation).i1h = function () {
+    return Companion_getInstance_0().of('=', [this.f1i(), this.g1i()]);
   };
   protoOf(Equation).toTerm = function () {
-    return this.l1g();
+    return this.i1h();
   };
   protoOf(Equation).toPair = function () {
-    return new Pair(this.i1h(), this.j1h());
+    return new Pair(this.f1i(), this.g1i());
   };
   protoOf(Equation).swap = function () {
-    return Companion_instance_0.of(this.j1h(), this.i1h());
+    return Companion_instance_0.of(this.g1i(), this.f1i());
   };
-  protoOf(Equation).e1i = function (substitution, equalityChecker) {
-    return Companion_instance_0.t1h(this.i1h().getSubstituted(substitution, []), this.j1h().getSubstituted(substitution, []), equalityChecker);
+  protoOf(Equation).b1j = function (substitution, equalityChecker) {
+    return Companion_instance_0.q1i(this.f1i().getSubstituted(substitution, []), this.g1i().getSubstituted(substitution, []), equalityChecker);
   };
   protoOf(Equation).apply = function (substitution, equalityChecker, $super) {
     var tmp;
@@ -763,11 +763,11 @@
       tmp = equalityChecker;
     }
     equalityChecker = tmp;
-    return $super === VOID ? this.e1i(substitution, equalityChecker) : $super.e1i.call(this, substitution, equalityChecker);
+    return $super === VOID ? this.b1j(substitution, equalityChecker) : $super.b1j.call(this, substitution, equalityChecker);
   };
   function toEquations(_this__u8e3s4) {
     // Inline function 'kotlin.collections.map' call
-    var this_0 = _this__u8e3s4.e1();
+    var this_0 = _this__u8e3s4.f1();
     // Inline function 'kotlin.collections.mapTo' call
     var destination = ArrayList_init_$Create$_0(collectionSizeOrDefault(this_0, 10));
     var _iterator__ex2g4s = this_0.p();
@@ -789,12 +789,12 @@
   }
   function toAssignmentPair(_this__u8e3s4) {
     var tmp;
-    if (_this__u8e3s4.s1h()) {
-      tmp = _this__u8e3s4.n1h().f1i();
-    } else if (_this__u8e3s4.i1h().dv()) {
-      tmp = to(_this__u8e3s4.i1h().castToVar(), _this__u8e3s4.j1h());
-    } else if (_this__u8e3s4.j1h().dv()) {
-      tmp = to(_this__u8e3s4.j1h().castToVar(), _this__u8e3s4.i1h());
+    if (_this__u8e3s4.p1i()) {
+      tmp = _this__u8e3s4.k1i().c1j();
+    } else if (_this__u8e3s4.f1i().bw()) {
+      tmp = to(_this__u8e3s4.f1i().castToVar(), _this__u8e3s4.g1i());
+    } else if (_this__u8e3s4.g1i().bw()) {
+      tmp = to(_this__u8e3s4.g1i().castToVar(), _this__u8e3s4.f1i());
     } else {
       throw IllegalArgumentException_init_$Create$('Equation contains no variables: ' + toString(_this__u8e3s4));
     }
@@ -808,18 +808,18 @@
   }
   function Unificator$Companion$_get_default_$ref_8i2tx3() {
     return function (p0) {
-      return p0.u1i();
+      return p0.r1j();
     };
   }
   function Unificator$Companion$naive$1($context) {
     AbstractUnificator.call(this, $context);
   }
-  protoOf(Unificator$Companion$naive$1).e1h = function (first, second) {
+  protoOf(Unificator$Companion$naive$1).b1i = function (first, second) {
     var tmp;
-    if (first.iv() && second.iv()) {
-      tmp = first.castToInteger().e2().dj(second.castToInteger().e2()) === 0;
-    } else if (first.hv() && second.hv()) {
-      tmp = first.castToNumeric().xy().ui(second.castToNumeric().xy()) === 0;
+    if (first.gw() && second.gw()) {
+      tmp = first.castToInteger().e2().bk(second.castToInteger().e2()) === 0;
+    } else if (first.fw() && second.fw()) {
+      tmp = first.castToNumeric().vz().sj(second.castToNumeric().vz()) === 0;
     } else {
       tmp = first.equals(second);
     }
@@ -831,7 +831,7 @@
   function Unificator$Companion$strict$1($context) {
     AbstractUnificator.call(this, $context);
   }
-  protoOf(Unificator$Companion$strict$1).e1h = function (first, second) {
+  protoOf(Unificator$Companion$strict$1).b1i = function (first, second) {
     return first.equals(second);
   };
   protoOf(Unificator$Companion$strict$1).mguWithOccurCheck = function (term1, term2, occurCheckEnabled, $super) {
@@ -840,27 +840,27 @@
   function Companion_0() {
     Companion_instance_1 = this;
     var tmp = this;
-    tmp.s1i_1 = lazy(Unificator$Companion$default$delegate$lambda);
-    this.t1i_1 = 32;
+    tmp.p1j_1 = lazy(Unificator$Companion$default$delegate$lambda);
+    this.q1j_1 = 32;
   }
-  protoOf(Companion_0).u1i = function () {
-    var tmp0 = this.s1i_1;
+  protoOf(Companion_0).r1j = function () {
+    var tmp0 = this.p1j_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.u1i().mgu(_this__u8e3s4, other);
+    return this.r1j().mgu(_this__u8e3s4, other);
   };
   protoOf(Companion_0).matches = function (_this__u8e3s4, other) {
-    return this.u1i().match(_this__u8e3s4, other);
+    return this.r1j().match(_this__u8e3s4, other);
   };
   protoOf(Companion_0).unifyWith = function (_this__u8e3s4, other) {
-    return this.u1i().unify(_this__u8e3s4, other);
+    return this.r1j().unify(_this__u8e3s4, other);
   };
   protoOf(Companion_0).mergeWith = function (_this__u8e3s4, other) {
-    return this.u1i().merge(_this__u8e3s4, other);
+    return this.r1j().merge(_this__u8e3s4, other);
   };
   protoOf(Companion_0).naiveWithContext = function (context) {
     return new Unificator$Companion$naive$1(context);
@@ -874,10 +874,10 @@
   protoOf(Companion_0).strict = function () {
     return this.strictWithContext(Companion_getInstance().empty());
   };
-  protoOf(Companion_0).z1i = function (other, capacity) {
+  protoOf(Companion_0).w1j = function (other, capacity) {
     var tmp;
     if (other instanceof CachedUnificator) {
-      tmp = new CachedUnificator(other.w1h_1, capacity);
+      tmp = new CachedUnificator(other.t1i_1, capacity);
     } else {
       tmp = new CachedUnificator(other, capacity);
     }
@@ -885,7 +885,7 @@
   };
   protoOf(Companion_0).cached = function (other, capacity, $super) {
     capacity = capacity === VOID ? 32 : capacity;
-    return $super === VOID ? this.z1i(other, capacity) : $super.z1i.call(this, other, capacity);
+    return $super === VOID ? this.w1j(other, capacity) : $super.w1j.call(this, other, capacity);
   };
   var Companion_instance_1;
   function Companion_getInstance_2() {
@@ -910,14 +910,14 @@
   protoOf(CachedUnificator).unifyWithOccurCheck = unifyWithOccurCheck;
   protoOf(CachedUnificator).unify = unify;
   protoOf(CachedUnificator).merge = merge;
-  protoOf(Equation).gp = castTo;
+  protoOf(Equation).eq = castTo;
   defineProp(protoOf(Equation), 'lhs', function () {
-    return this.i1h();
+    return this.f1i();
   });
   defineProp(protoOf(Equation), 'rhs', function () {
-    return this.j1h();
+    return this.g1i();
   });
-  defineProp(protoOf(Companion_0), 'default', protoOf(Companion_0).u1i);
+  defineProp(protoOf(Companion_0), 'default', protoOf(Companion_0).r1j);
   //endregion
   //region block: init
   Companion_instance_0 = new Companion();