@tuprolog/2p-full 0.31.5-dev0c → 0.31.5-dev0n

package/2p-unify.js

@@ -1,53 +1,73 @@
-(function (_, kotlin_kotlin, kotlin_it_unibo_tuprolog_core, kotlin_it_unibo_tuprolog_utils) {
+(function (root, factory) {
+  if (typeof define === 'function' && define.amd)
+    define(['exports', './kotlin-kotlin-stdlib-js-ir.js', './2p-core.js', './2p-utils.js'], factory);
+  else if (typeof exports === 'object')
+    factory(module.exports, require('./kotlin-kotlin-stdlib-js-ir.js'), require('./2p-core.js'), require('./2p-utils.js'));
+  else {
+    if (typeof this['kotlin-kotlin-stdlib-js-ir'] === 'undefined') {
+      throw new Error("Error loading module '2p-unify'. Its dependency 'kotlin-kotlin-stdlib-js-ir' was not found. Please, check whether 'kotlin-kotlin-stdlib-js-ir' is loaded prior to '2p-unify'.");
+    }
+    if (typeof this['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') {
+      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-js-ir'], this['2p-core'], this['2p-utils']);
+  }
+}(this, function (_, kotlin_kotlin, kotlin_it_unibo_tuprolog_core, kotlin_it_unibo_tuprolog_utils) {
   'use strict';
   //region block: imports
   var imul = Math.imul;
-  var Unit_getInstance = kotlin_kotlin.$_$.r2;
-  var asSequence = kotlin_kotlin.$_$.f3;
-  var plus = kotlin_kotlin.$_$.g9;
-  var map = kotlin_kotlin.$_$.c9;
+  var Unit_getInstance = kotlin_kotlin.$_$.v1;
+  var asSequence = kotlin_kotlin.$_$.j2;
+  var plus = kotlin_kotlin.$_$.s8;
+  var map = kotlin_kotlin.$_$.o8;
   var Companion_getInstance = kotlin_it_unibo_tuprolog_core.$_$.e1;
-  var ArrayList_init_$Create$ = kotlin_kotlin.$_$.c1;
-  var toCollection = kotlin_kotlin.$_$.n9;
-  var Pair = kotlin_kotlin.$_$.qb;
-  var lazy = kotlin_kotlin.$_$.xb;
-  var asSequence_0 = kotlin_kotlin.$_$.g3;
-  var classMeta = kotlin_kotlin.$_$.m6;
-  var setMetadataFor = kotlin_kotlin.$_$.j7;
-  var KProperty1 = kotlin_kotlin.$_$.d8;
-  var getPropertyCallableRef = kotlin_kotlin.$_$.r6;
+  var ArrayList_init_$Create$ = kotlin_kotlin.$_$.f;
+  var toCollection = kotlin_kotlin.$_$.z8;
+  var Pair = kotlin_kotlin.$_$.rb;
+  var VOID = kotlin_kotlin.$_$.gc;
+  var lazy = kotlin_kotlin.$_$.yb;
+  var protoOf = kotlin_kotlin.$_$.s6;
+  var asSequence_0 = kotlin_kotlin.$_$.k2;
+  var classMeta = kotlin_kotlin.$_$.t5;
+  var setMetadataFor = kotlin_kotlin.$_$.t6;
+  var KProperty1 = kotlin_kotlin.$_$.o7;
+  var getPropertyCallableRef = kotlin_kotlin.$_$.z5;
   var Companion_getInstance_0 = kotlin_it_unibo_tuprolog_utils.$_$.a;
-  var Triple = kotlin_kotlin.$_$.ub;
+  var Triple = kotlin_kotlin.$_$.vb;
   var Some = kotlin_it_unibo_tuprolog_utils.$_$.k;
-  var zip = kotlin_kotlin.$_$.u9;
-  var flatMap = kotlin_kotlin.$_$.u8;
-  var sequenceOf = kotlin_kotlin.$_$.i9;
-  var THROW_CCE = kotlin_kotlin.$_$.sb;
+  var zip = kotlin_kotlin.$_$.g9;
+  var flatMap = kotlin_kotlin.$_$.f8;
+  var sequenceOf = kotlin_kotlin.$_$.u8;
+  var THROW_CCE = kotlin_kotlin.$_$.tb;
   var castTo = kotlin_it_unibo_tuprolog_utils.$_$.f;
-  var to = kotlin_kotlin.$_$.ec;
-  var objectMeta = kotlin_kotlin.$_$.i7;
+  var to = kotlin_kotlin.$_$.fc;
+  var objectMeta = kotlin_kotlin.$_$.r6;
   var getKClass = kotlin_kotlin.$_$.c;
-  var ClassCastException_init_$Create$ = kotlin_kotlin.$_$.o1;
+  var ClassCastException_init_$Create$ = kotlin_kotlin.$_$.r;
   var Companion_getInstance_1 = kotlin_it_unibo_tuprolog_core.$_$.d1;
+  var defineProp = kotlin_kotlin.$_$.v5;
   var Castable = kotlin_it_unibo_tuprolog_utils.$_$.g;
-  var collectionSizeOrDefault = kotlin_kotlin.$_$.j3;
-  var ArrayList_init_$Create$_0 = kotlin_kotlin.$_$.b1;
-  var IllegalArgumentException_init_$Create$ = kotlin_kotlin.$_$.p1;
-  var interfaceMeta = kotlin_kotlin.$_$.u6;
+  var collectionSizeOrDefault = kotlin_kotlin.$_$.n2;
+  var ArrayList_init_$Create$_0 = kotlin_kotlin.$_$.e;
+  var IllegalArgumentException_init_$Create$ = kotlin_kotlin.$_$.t;
+  var interfaceMeta = kotlin_kotlin.$_$.c6;
   //endregion
   //region block: pre-declaration
   function mgu(term1, term2) {
-    return this.c1k(term1, term2, true);
+    return this.d1j(term1, term2, true);
   }
   function matchWithOccurCheck(term1, term2, occurCheckEnabled) {
-    return !(this.c1k(term1, term2, occurCheckEnabled) === Companion_getInstance().failed());
+    return !(this.d1j(term1, term2, occurCheckEnabled) === Companion_getInstance().failed());
   }
   function match(term1, term2) {
     return this.matchWithOccurCheck(term1, term2, true);
   }
   function unifyWithOccurCheck(term1, term2, occurCheckEnabled) {
-    var substitution = this.c1k(term1, term2, occurCheckEnabled);
-    return substitution.r12() ? null : term1.getSubstituted(substitution, []);
+    var substitution = this.d1j(term1, term2, occurCheckEnabled);
+    return substitution.h11() ? null : term1.getSubstituted(substitution, []);
   }
   function unify(term1, term2) {
     return this.unifyWithOccurCheck(term1, term2, true);
@@ -55,38 +75,38 @@
   function merge(substitution1, substitution2) {
     return this.mergeWithOccurCheck(substitution1, substitution2, true);
   }
-  setMetadataFor(Unificator, 'Unificator', interfaceMeta, undefined, undefined, undefined, undefined, []);
-  setMetadataFor(AbstractUnificator, 'AbstractUnificator', classMeta, undefined, [Unificator], undefined, undefined, []);
-  setMetadataFor(CachedUnificator, 'CachedUnificator', classMeta, undefined, [Unificator], undefined, undefined, []);
-  setMetadataFor(Equation, 'Equation', classMeta, undefined, [Castable], undefined, undefined, []);
-  setMetadataFor(Identity, 'Identity', classMeta, Equation, undefined, undefined, undefined, []);
-  setMetadataFor(Assignment, 'Assignment', classMeta, Equation, undefined, undefined, undefined, []);
-  setMetadataFor(Comparison, 'Comparison', classMeta, Equation, undefined, undefined, undefined, []);
-  setMetadataFor(Contradiction, 'Contradiction', classMeta, Equation, undefined, undefined, undefined, []);
-  setMetadataFor(Companion, 'Companion', objectMeta, undefined, undefined, undefined, undefined, []);
-  setMetadataFor(Unificator$Companion$naive$1, undefined, classMeta, AbstractUnificator, undefined, undefined, undefined, []);
-  setMetadataFor(Unificator$Companion$strict$1, undefined, classMeta, AbstractUnificator, undefined, undefined, undefined, []);
-  setMetadataFor(Companion_0, 'Companion', objectMeta, undefined, undefined, undefined, undefined, []);
+  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);
   //endregion
   function _get_contextEquations__x0dd77($this) {
     var tmp$ret$0;
     // Inline function 'kotlin.getValue' call
     var tmp0_getValue = contextEquations$factory();
-    tmp$ret$0 = $this.j1j_1.b1();
+    tmp$ret$0 = $this.m1i_1.b1();
     return tmp$ret$0;
   }
   function occurrenceCheck($this, variable, term) {
     var tmp;
-    if (term.bx()) {
-      tmp = $this.k1j(variable, term);
-    } else if (term.lw()) {
+    if (term.mw()) {
+      tmp = $this.n1i(variable, term);
+    } else if (term.aw()) {
       var tmp$ret$1;
       $l$block: {
         // Inline function 'kotlin.sequences.any' call
-        var tmp0_any = term.hw();
+        var tmp0_any = term.yv();
         var tmp0_iterator = tmp0_any.j();
         while (tmp0_iterator.m()) {
-          var element = tmp0_iterator.p();
+          var element = tmp0_iterator.n();
           var tmp$ret$0;
           // Inline function 'it.unibo.tuprolog.unify.AbstractUnificator.occurrenceCheck.<anonymous>' call
           tmp$ret$0 = occurrenceCheck($this, variable, element);
@@ -105,13 +125,12 @@
   }
   function equationsFor($this, term1, term2) {
     var tmp = Companion_getInstance_2();
-    return tmp.l1j(term1, term2, AbstractUnificator$checkTermsEquality$ref($this));
+    return tmp.o1i(term1, term2, AbstractUnificator$checkTermsEquality$ref($this));
   }
   function equationsFor_0($this, substitution1, substitution2) {
     var tmp = Companion_getInstance_2();
     var tmp_0 = plus(asSequence(substitution1), asSequence(substitution2));
-    var tmp_1 = map(tmp_0, AbstractUnificator$equationsFor$lambda);
-    return tmp.m1j(tmp_1, null, 2, null);
+    return tmp.fromSequence(map(tmp_0, AbstractUnificator$equationsFor$lambda));
   }
   function applySubstitutionToEquations($this, substitution, equations, exceptIndex) {
     var changed = {_v: false};
@@ -124,7 +143,7 @@
       }
        while (inductionVariable < exceptIndex);
     var inductionVariable_0 = exceptIndex + 1 | 0;
-    var last = equations.o();
+    var last = equations.p();
     if (inductionVariable_0 < last)
       do {
         var i_0 = inductionVariable_0;
@@ -138,32 +157,32 @@
     var changed = true;
     while (changed) {
       changed = false;
-      var eqIterator = equations.bb();
+      var eqIterator = equations.gb();
       while (eqIterator.m()) {
-        var eq = eqIterator.p();
-        if (eq.r1j()) {
+        var eq = eqIterator.n();
+        if (eq.t1i()) {
           return Companion_getInstance().failed();
-        } else if (eq.s1j()) {
-          eqIterator.u4();
+        } else if (eq.u1i()) {
+          eqIterator.y4();
           changed = true;
-        } else if (eq.z1j()) {
-          var assignment = eq.u1j();
-          if (occurCheckEnabled ? occurrenceCheck($this, assignment.x1j_1, eq.q1j()) : false) {
+        } else if (eq.b1j()) {
+          var assignment = eq.w1i();
+          if (occurCheckEnabled ? occurrenceCheck($this, assignment.z1i_1, eq.s1i()) : false) {
             return Companion_getInstance().failed();
           } else {
-            changed = changed ? true : applySubstitutionToEquations($this, assignment.toSubstitution(), equations, eqIterator.sa());
+            changed = changed ? true : applySubstitutionToEquations($this, assignment.toSubstitution(), equations, eqIterator.xa());
           }
-        } else if (eq.t1j()) {
-          eqIterator.u4();
-          var tmp0_iterator = equationsFor($this, eq.p1j(), eq.q1j()).j();
+        } else if (eq.v1i()) {
+          eqIterator.y4();
+          var tmp0_iterator = equationsFor($this, eq.r1i(), eq.s1i()).j();
           insertion: while (tmp0_iterator.m()) {
-            var it = tmp0_iterator.p();
-            if (it.s1j())
+            var it = tmp0_iterator.n();
+            if (it.u1i())
               continue insertion;
-            else if (it.r1j())
+            else if (it.t1i())
               return Companion_getInstance().failed();
             else {
-              eqIterator.va(it);
+              eqIterator.ab(it);
             }
           }
           changed = true;
@@ -177,10 +196,10 @@
     var tmp0_filterTo = ArrayList_init_$Create$();
     var tmp0_iterator_0 = equations.j();
     while (tmp0_iterator_0.m()) {
-      var element = tmp0_iterator_0.p();
+      var element = tmp0_iterator_0.n();
       var tmp$ret$0;
       // Inline function 'it.unibo.tuprolog.unify.AbstractUnificator.mgu.<anonymous>' call
-      tmp$ret$0 = element.z1j();
+      tmp$ret$0 = element.b1j();
       if (tmp$ret$0) {
         tmp0_filterTo.g(element);
       }
@@ -196,26 +215,26 @@
     return toCollection(items, tmp$ret$0);
   }
   function applySubstitutionToEquations$handleIndex($equations, $substitution, this$0, changed, i) {
-    if ($equations.n(i).r1j() ? true : $equations.n(i).s1j())
+    if ($equations.o(i).t1i() ? true : $equations.o(i).u1i())
       return Unit_getInstance();
-    var currentEq = $equations.n(i);
-    var tmp0_container = currentEq.a1k($substitution, null, 2, null).toPair();
-    var newLhs = tmp0_container.n3();
-    var newRhs = tmp0_container.o3();
-    if (!currentEq.p1j().equals(newLhs) ? true : !currentEq.q1j().equals(newRhs)) {
+    var currentEq = $equations.o(i);
+    var tmp0_container = currentEq.apply($substitution).toPair();
+    var newLhs = tmp0_container.r3();
+    var newRhs = tmp0_container.s3();
+    if (!currentEq.r1i().equals(newLhs) ? true : !currentEq.s1i().equals(newRhs)) {
       var tmp = Companion_getInstance_2();
-      $equations.s4(i, tmp.b1k(newLhs, newRhs, AbstractUnificator$checkTermsEquality$ref_0(this$0)));
+      $equations.w4(i, tmp.c1j(newLhs, newRhs, AbstractUnificator$checkTermsEquality$ref_0(this$0)));
       changed._v = true;
     }
   }
   function AbstractUnificator$contextEquations$delegate$lambda(this$0) {
     return function () {
-      return toEquations(this$0.j5());
+      return toEquations(this$0.n5());
     };
   }
   function AbstractUnificator$checkTermsEquality$ref($boundThis) {
     var l = function (p0, p1) {
-      return $boundThis.k1j(p0, p1);
+      return $boundThis.n1i(p0, p1);
     };
     l.callableName = 'checkTermsEquality';
     return l;
@@ -228,39 +247,40 @@
   }
   function AbstractUnificator$checkTermsEquality$ref_0($boundThis) {
     var l = function (p0, p1) {
-      return $boundThis.k1j(p0, p1);
+      return $boundThis.n1i(p0, p1);
     };
     l.callableName = 'checkTermsEquality';
     return l;
   }
   function AbstractUnificator(context) {
-    this.i1j_1 = context;
+    context = context === VOID ? Companion_getInstance().empty() : context;
+    this.l1i_1 = context;
     var tmp = this;
-    tmp.j1j_1 = lazy(AbstractUnificator$contextEquations$delegate$lambda(this));
+    tmp.m1i_1 = lazy(AbstractUnificator$contextEquations$delegate$lambda(this));
   }
-  AbstractUnificator.prototype.j5 = function () {
-    return this.i1j_1;
+  protoOf(AbstractUnificator).n5 = function () {
+    return this.l1i_1;
   };
-  AbstractUnificator.prototype.c1k = function (term1, term2, occurCheckEnabled) {
-    if (this.j5().r12())
+  protoOf(AbstractUnificator).d1j = function (term1, term2, occurCheckEnabled) {
+    if (this.n5().h11())
       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);
   };
-  AbstractUnificator.prototype.d1k = function (substitution1, substitution2, occurCheckEnabled) {
-    if ((this.j5().r12() ? true : substitution1.r12()) ? true : substitution2.r12())
+  protoOf(AbstractUnificator).e1j = function (substitution1, substitution2, occurCheckEnabled) {
+    if ((this.n5().h11() ? true : substitution1.h11()) ? true : substitution2.h11())
       return Companion_getInstance().failed();
     if (!occurCheckEnabled) {
-      var quickMerge = this.j5().plus(substitution1).plus(substitution2);
-      if (quickMerge.q12()) {
+      var quickMerge = this.n5().plus(substitution1).plus(substitution2);
+      if (quickMerge.g11()) {
         return quickMerge;
       }
     }
     var equations = newDeque(this, plus(asSequence_0(_get_contextEquations__x0dd77(this)), equationsFor_0(this, substitution1, substitution2)));
     return mgu_0(this, equations, occurCheckEnabled);
   };
-  AbstractUnificator.prototype.mergeWithOccurCheck = function (substitution1, substitution2, occurCheckEnabled) {
-    return this.d1k(substitution1, substitution2, occurCheckEnabled);
+  protoOf(AbstractUnificator).mergeWithOccurCheck = function (substitution1, substitution2, occurCheckEnabled) {
+    return this.e1j(substitution1, substitution2, occurCheckEnabled);
   };
   function contextEquations$factory() {
     return getPropertyCallableRef('contextEquations', 1, KProperty1, function (receiver) {
@@ -268,37 +288,37 @@
     }, null);
   }
   function CachedUnificator(decorated, cacheCapacity) {
-    this.e1k_1 = decorated;
-    this.f1k_1 = Companion_getInstance_0().gq(cacheCapacity);
+    this.f1j_1 = decorated;
+    this.g1j_1 = Companion_getInstance_0().xp(cacheCapacity);
   }
-  CachedUnificator.prototype.c1k = function (term1, term2, occurCheckEnabled) {
+  protoOf(CachedUnificator).d1j = function (term1, term2, occurCheckEnabled) {
     var mguRequest = new Triple(term1, term2, occurCheckEnabled);
-    var cached = this.f1k_1.a3(mguRequest);
+    var cached = this.g1j_1.f3(mguRequest);
     var tmp;
     if (cached instanceof Some) {
-      tmp = cached.jq_1;
+      tmp = cached.aq_1;
     } else {
-      var mguResult = this.e1k_1.c1k(term1, term2, occurCheckEnabled);
-      this.f1k_1.hq(mguRequest, mguResult);
+      var mguResult = this.f1j_1.d1j(term1, term2, occurCheckEnabled);
+      this.g1j_1.yp(mguRequest, mguResult);
       tmp = mguResult;
     }
     return tmp;
   };
-  CachedUnificator.prototype.d1k = function (substitution1, substitution2, occurCheckEnabled) {
+  protoOf(CachedUnificator).e1j = function (substitution1, substitution2, occurCheckEnabled) {
     var mguRequest = new Triple(substitution1, substitution2, occurCheckEnabled);
-    var cached = this.f1k_1.a3(mguRequest);
+    var cached = this.g1j_1.f3(mguRequest);
     var tmp;
     if (cached instanceof Some) {
-      tmp = cached.jq_1;
+      tmp = cached.aq_1;
     } else {
-      var mguResult = this.e1k_1.mergeWithOccurCheck(substitution1, substitution2, occurCheckEnabled);
-      this.f1k_1.hq(mguRequest, mguResult);
+      var mguResult = this.f1j_1.mergeWithOccurCheck(substitution1, substitution2, occurCheckEnabled);
+      this.g1j_1.yp(mguRequest, mguResult);
       tmp = mguResult;
     }
     return tmp;
   };
-  CachedUnificator.prototype.mergeWithOccurCheck = function (substitution1, substitution2, occurCheckEnabled) {
-    return this.d1k(substitution1, substitution2, occurCheckEnabled);
+  protoOf(CachedUnificator).mergeWithOccurCheck = function (substitution1, substitution2, occurCheckEnabled) {
+    return this.e1j(substitution1, substitution2, occurCheckEnabled);
   };
   function allOfLists($this, lhs, rhs, equalityChecker) {
     var tmp = zip(lhs.unfold(), rhs.unfold());
@@ -331,7 +351,7 @@
   }
   function Equation$Companion$from$lambda($equalityChecker) {
     return function (it) {
-      return Companion_getInstance_2().g1k(it, $equalityChecker);
+      return Companion_getInstance_2().h1j(it, $equalityChecker);
     };
   }
   function Term$equals$ref_2() {
@@ -357,16 +377,16 @@
   }
   function Equation$Companion$allOfLists$lambda($equalityChecker) {
     return function (_name_for_destructuring_parameter_0__wldtmu) {
-      var l = _name_for_destructuring_parameter_0__wldtmu.n3();
-      var r = _name_for_destructuring_parameter_0__wldtmu.o3();
-      return (l.sw() ? r.sw() : false) ? sequenceOf([Companion_getInstance_2().b1k(l.castToCons().ly(), r.castToCons().ly(), $equalityChecker)]) : (l.rw() ? r.rw() : false) ? sequenceOf([Companion_getInstance_2().b1k(l.castToList(), r.castToList(), $equalityChecker)]) : Companion_getInstance_2().l1j(l, r, $equalityChecker);
+      var l = _name_for_destructuring_parameter_0__wldtmu.r3();
+      var r = _name_for_destructuring_parameter_0__wldtmu.s3();
+      return (l.fw() ? r.fw() : false) ? sequenceOf([Companion_getInstance_2().c1j(l.castToCons().sx(), r.castToCons().sx(), $equalityChecker)]) : (l.ew() ? r.ew() : false) ? sequenceOf([Companion_getInstance_2().c1j(l.castToList(), r.castToList(), $equalityChecker)]) : Companion_getInstance_2().o1i(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.n3();
-      var r = _name_for_destructuring_parameter_0__wldtmu.o3();
-      return (l.qw() ? r.qw() : false) ? sequenceOf([Companion_getInstance_2().b1k(l.castToTuple().zx(), r.castToTuple().zx(), $equalityChecker)]) : Companion_getInstance_2().l1j(l, r, $equalityChecker);
+      var l = _name_for_destructuring_parameter_0__wldtmu.r3();
+      var r = _name_for_destructuring_parameter_0__wldtmu.s3();
+      return (l.dw() ? r.dw() : false) ? sequenceOf([Companion_getInstance_2().c1j(l.castToTuple().gx(), r.castToTuple().gx(), $equalityChecker)]) : Companion_getInstance_2().o1i(l, r, $equalityChecker);
     };
   }
   function Term$equals$ref_5() {
@@ -378,172 +398,163 @@
   }
   function Equation$Companion$allOf$lambda($equalityChecker) {
     return function (it) {
-      return Companion_getInstance_2().g1k(it, $equalityChecker);
+      return Companion_getInstance_2().h1j(it, $equalityChecker);
     };
   }
   function Identity(lhs, rhs) {
     Equation.call(this, lhs, rhs);
-    this.j1k_1 = lhs;
-    this.k1k_1 = rhs;
+    this.k1j_1 = lhs;
+    this.l1j_1 = rhs;
   }
-  Identity.prototype.p1j = function () {
-    return this.j1k_1;
+  protoOf(Identity).r1i = function () {
+    return this.k1j_1;
   };
-  Identity.prototype.q1j = function () {
-    return this.k1k_1;
+  protoOf(Identity).s1i = function () {
+    return this.l1j_1;
   };
-  Identity.prototype.s1j = function () {
+  protoOf(Identity).u1i = function () {
     return true;
   };
-  Identity.prototype.toString = function () {
-    return 'Identity(lhs=' + this.j1k_1 + ', rhs=' + this.k1k_1 + ')';
+  protoOf(Identity).toString = function () {
+    return 'Identity(lhs=' + this.k1j_1 + ', rhs=' + this.l1j_1 + ')';
   };
-  Identity.prototype.hashCode = function () {
-    var result = this.j1k_1.hashCode();
-    result = imul(result, 31) + this.k1k_1.hashCode() | 0;
+  protoOf(Identity).hashCode = function () {
+    var result = this.k1j_1.hashCode();
+    result = imul(result, 31) + this.l1j_1.hashCode() | 0;
     return result;
   };
-  Identity.prototype.equals = function (other) {
+  protoOf(Identity).equals = function (other) {
     if (this === other)
       return true;
     if (!(other instanceof Identity))
       return false;
     var tmp0_other_with_cast = other instanceof Identity ? other : THROW_CCE();
-    if (!this.j1k_1.equals(tmp0_other_with_cast.j1k_1))
+    if (!this.k1j_1.equals(tmp0_other_with_cast.k1j_1))
       return false;
-    if (!this.k1k_1.equals(tmp0_other_with_cast.k1k_1))
+    if (!this.l1j_1.equals(tmp0_other_with_cast.l1j_1))
       return false;
     return true;
   };
   function Assignment(lhs, rhs) {
     Equation.call(this, lhs, rhs);
-    this.x1j_1 = lhs;
-    this.y1j_1 = rhs;
+    this.z1i_1 = lhs;
+    this.a1j_1 = rhs;
   }
-  Assignment.prototype.p1j = function () {
-    return this.x1j_1;
+  protoOf(Assignment).r1i = function () {
+    return this.z1i_1;
   };
-  Assignment.prototype.q1j = function () {
-    return this.y1j_1;
+  protoOf(Assignment).s1i = function () {
+    return this.a1j_1;
   };
-  Assignment.prototype.toSubstitution = function () {
-    return Companion_getInstance().unifier(this.x1j_1, this.y1j_1);
+  protoOf(Assignment).toSubstitution = function () {
+    return Companion_getInstance().unifier(this.z1i_1, this.a1j_1);
   };
-  Assignment.prototype.n1k = function () {
-    return to(this.x1j_1, this.y1j_1);
+  protoOf(Assignment).o1j = function () {
+    return to(this.z1i_1, this.a1j_1);
   };
-  Assignment.prototype.toPair = function () {
-    return this.n1k();
+  protoOf(Assignment).toPair = function () {
+    return this.o1j();
   };
-  Assignment.prototype.z1j = function () {
+  protoOf(Assignment).b1j = function () {
     return true;
   };
-  Assignment.prototype.l1k = function () {
+  protoOf(Assignment).m1j = function () {
     return this;
   };
-  Assignment.prototype.toString = function () {
-    return 'Assignment(lhs=' + this.x1j_1 + ', rhs=' + this.y1j_1 + ')';
+  protoOf(Assignment).toString = function () {
+    return 'Assignment(lhs=' + this.z1i_1 + ', rhs=' + this.a1j_1 + ')';
   };
-  Assignment.prototype.hashCode = function () {
-    var result = this.x1j_1.hashCode();
-    result = imul(result, 31) + this.y1j_1.hashCode() | 0;
+  protoOf(Assignment).hashCode = function () {
+    var result = this.z1i_1.hashCode();
+    result = imul(result, 31) + this.a1j_1.hashCode() | 0;
     return result;
   };
-  Assignment.prototype.equals = function (other) {
+  protoOf(Assignment).equals = function (other) {
     if (this === other)
       return true;
     if (!(other instanceof Assignment))
       return false;
     var tmp0_other_with_cast = other instanceof Assignment ? other : THROW_CCE();
-    if (!this.x1j_1.equals(tmp0_other_with_cast.x1j_1))
+    if (!this.z1i_1.equals(tmp0_other_with_cast.z1i_1))
       return false;
-    if (!this.y1j_1.equals(tmp0_other_with_cast.y1j_1))
+    if (!this.a1j_1.equals(tmp0_other_with_cast.a1j_1))
       return false;
     return true;
   };
   function Comparison(lhs, rhs) {
     Equation.call(this, lhs, rhs);
-    this.q1k_1 = lhs;
-    this.r1k_1 = rhs;
+    this.r1j_1 = lhs;
+    this.s1j_1 = rhs;
   }
-  Comparison.prototype.p1j = function () {
-    return this.q1k_1;
+  protoOf(Comparison).r1i = function () {
+    return this.r1j_1;
   };
-  Comparison.prototype.q1j = function () {
-    return this.r1k_1;
+  protoOf(Comparison).s1i = function () {
+    return this.s1j_1;
   };
-  Comparison.prototype.t1j = function () {
+  protoOf(Comparison).v1i = function () {
     return true;
   };
-  Comparison.prototype.toString = function () {
-    return 'Comparison(lhs=' + this.q1k_1 + ', rhs=' + this.r1k_1 + ')';
+  protoOf(Comparison).toString = function () {
+    return 'Comparison(lhs=' + this.r1j_1 + ', rhs=' + this.s1j_1 + ')';
   };
-  Comparison.prototype.hashCode = function () {
-    var result = this.q1k_1.hashCode();
-    result = imul(result, 31) + this.r1k_1.hashCode() | 0;
+  protoOf(Comparison).hashCode = function () {
+    var result = this.r1j_1.hashCode();
+    result = imul(result, 31) + this.s1j_1.hashCode() | 0;
     return result;
   };
-  Comparison.prototype.equals = function (other) {
+  protoOf(Comparison).equals = function (other) {
     if (this === other)
       return true;
     if (!(other instanceof Comparison))
       return false;
     var tmp0_other_with_cast = other instanceof Comparison ? other : THROW_CCE();
-    if (!this.q1k_1.equals(tmp0_other_with_cast.q1k_1))
+    if (!this.r1j_1.equals(tmp0_other_with_cast.r1j_1))
       return false;
-    if (!this.r1k_1.equals(tmp0_other_with_cast.r1k_1))
+    if (!this.s1j_1.equals(tmp0_other_with_cast.s1j_1))
       return false;
     return true;
   };
   function Contradiction(lhs, rhs) {
     Equation.call(this, lhs, rhs);
-    this.u1k_1 = lhs;
-    this.v1k_1 = rhs;
+    this.v1j_1 = lhs;
+    this.w1j_1 = rhs;
   }
-  Contradiction.prototype.p1j = function () {
-    return this.u1k_1;
+  protoOf(Contradiction).r1i = function () {
+    return this.v1j_1;
   };
-  Contradiction.prototype.q1j = function () {
-    return this.v1k_1;
+  protoOf(Contradiction).s1i = function () {
+    return this.w1j_1;
   };
-  Contradiction.prototype.r1j = function () {
+  protoOf(Contradiction).t1i = function () {
     return true;
   };
-  Contradiction.prototype.toString = function () {
-    return 'Contradiction(lhs=' + this.u1k_1 + ', rhs=' + this.v1k_1 + ')';
+  protoOf(Contradiction).toString = function () {
+    return 'Contradiction(lhs=' + this.v1j_1 + ', rhs=' + this.w1j_1 + ')';
   };
-  Contradiction.prototype.hashCode = function () {
-    var result = this.u1k_1.hashCode();
-    result = imul(result, 31) + this.v1k_1.hashCode() | 0;
+  protoOf(Contradiction).hashCode = function () {
+    var result = this.v1j_1.hashCode();
+    result = imul(result, 31) + this.w1j_1.hashCode() | 0;
     return result;
   };
-  Contradiction.prototype.equals = function (other) {
+  protoOf(Contradiction).equals = function (other) {
     if (this === other)
       return true;
     if (!(other instanceof Contradiction))
       return false;
     var tmp0_other_with_cast = other instanceof Contradiction ? other : THROW_CCE();
-    if (!this.u1k_1.equals(tmp0_other_with_cast.u1k_1))
+    if (!this.v1j_1.equals(tmp0_other_with_cast.v1j_1))
       return false;
-    if (!this.v1k_1.equals(tmp0_other_with_cast.v1k_1))
+    if (!this.w1j_1.equals(tmp0_other_with_cast.w1j_1))
       return false;
     return true;
   };
   function Companion() {
     Companion_instance = this;
   }
-  Companion.prototype.of = function (lhs, rhs, equalityChecker) {
+  protoOf(Companion).c1j = function (lhs, rhs, equalityChecker) {
     var tmp;
-    if (equalityChecker === void 1) {
-      tmp = Term$equals$ref();
-    } else {
-      tmp = equalityChecker;
-    }
-    return this.b1k(lhs, rhs, tmp);
-  };
-  Companion.prototype.b1k = function (lhs, rhs, equalityChecker) {
-    var tmp;
-    if (lhs.bx() ? rhs.bx() : false) {
+    if (lhs.mw() ? rhs.mw() : false) {
       var tmp_0;
       if (equalityChecker(lhs, rhs)) {
         tmp_0 = new Identity(lhs, rhs);
@@ -551,11 +562,11 @@
         tmp_0 = new Assignment(lhs.castToVar(), rhs);
       }
       tmp = tmp_0;
-    } else if (lhs.bx()) {
+    } else if (lhs.mw()) {
       tmp = new Assignment(lhs.castToVar(), rhs);
-    } else if (rhs.bx()) {
+    } else if (rhs.mw()) {
       tmp = new Assignment(rhs.castToVar(), lhs);
-    } else if (lhs.ex() ? rhs.ex() : false) {
+    } else if (lhs.ky() ? rhs.ky() : false) {
       var tmp_1;
       if (equalityChecker(lhs, rhs)) {
         tmp_1 = new Identity(lhs, rhs);
@@ -563,13 +574,13 @@
         tmp_1 = new Contradiction(lhs, rhs);
       }
       tmp = tmp_1;
-    } else if (lhs.ex() ? true : rhs.ex()) {
+    } else if (lhs.ky() ? true : rhs.ky()) {
       tmp = new Contradiction(lhs, rhs);
-    } else if (lhs.lw() ? rhs.lw() : false) {
+    } else if (lhs.aw() ? rhs.aw() : false) {
       var lhsStruct = lhs.castToStruct();
       var rhsStruct = rhs.castToStruct();
       var tmp_2;
-      if (!(lhsStruct.zv() === rhsStruct.zv()) ? true : !(lhsStruct.fw() === rhsStruct.fw())) {
+      if (!(lhsStruct.qv() === rhsStruct.qv()) ? true : !(lhsStruct.wv() === rhsStruct.wv())) {
         tmp_2 = new Contradiction(lhsStruct, rhsStruct);
       } else {
         tmp_2 = new Comparison(lhsStruct, rhsStruct);
@@ -580,111 +591,115 @@
     }
     return tmp;
   };
-  Companion.prototype.w1k = function (lhs, rhs, equalityChecker, $mask0, $handler) {
-    if (!(($mask0 & 4) === 0)) {
-      equalityChecker = Term$equals$ref();
-    }
-    return this.b1k(lhs, rhs, equalityChecker);
-  };
-  Companion.prototype.ofPair = function (pair, equalityChecker) {
+  protoOf(Companion).of = function (lhs, rhs, equalityChecker, $super) {
     var tmp;
-    if (equalityChecker === void 1) {
-      tmp = Term$equals$ref_0();
+    if (equalityChecker === VOID) {
+      tmp = Term$equals$ref();
     } else {
       tmp = equalityChecker;
     }
-    return this.x1k(pair, tmp);
+    equalityChecker = tmp;
+    return $super === VOID ? this.c1j(lhs, rhs, equalityChecker) : $super.c1j.call(this, lhs, rhs, equalityChecker);
   };
-  Companion.prototype.x1k = function (pair, equalityChecker) {
-    return this.b1k(pair.g4_1, pair.h4_1, equalityChecker);
+  protoOf(Companion).x1j = function (pair, equalityChecker) {
+    return this.c1j(pair.k4_1, pair.l4_1, equalityChecker);
   };
-  Companion.prototype.fromSequence = function (pairs, equalityChecker) {
+  protoOf(Companion).ofPair = function (pair, equalityChecker, $super) {
     var tmp;
-    if (equalityChecker === void 1) {
-      tmp = Term$equals$ref_1();
+    if (equalityChecker === VOID) {
+      tmp = Term$equals$ref_0();
     } else {
       tmp = equalityChecker;
     }
-    return this.y1k(pairs, tmp);
+    equalityChecker = tmp;
+    return $super === VOID ? this.x1j(pair, equalityChecker) : $super.x1j.call(this, pair, equalityChecker);
   };
-  Companion.prototype.y1k = function (pairs, equalityChecker) {
+  protoOf(Companion).y1j = function (pairs, equalityChecker) {
     return flatMap(pairs, Equation$Companion$from$lambda(equalityChecker));
   };
-  Companion.prototype.m1j = function (pairs, equalityChecker, $mask0, $handler) {
-    if (!(($mask0 & 2) === 0)) {
-      equalityChecker = Term$equals$ref_1();
-    }
-    return this.y1k(pairs, equalityChecker);
-  };
-  Companion.prototype.fromIterable = function (pairs, equalityChecker) {
+  protoOf(Companion).fromSequence = function (pairs, equalityChecker, $super) {
     var tmp;
-    if (equalityChecker === void 1) {
-      tmp = Term$equals$ref_2();
+    if (equalityChecker === VOID) {
+      tmp = Term$equals$ref_1();
     } else {
       tmp = equalityChecker;
     }
-    return this.z1k(pairs, tmp);
+    equalityChecker = tmp;
+    return $super === VOID ? this.y1j(pairs, equalityChecker) : $super.y1j.call(this, pairs, equalityChecker);
   };
-  Companion.prototype.z1k = function (pairs, equalityChecker) {
-    return this.y1k(asSequence_0(pairs), equalityChecker);
+  protoOf(Companion).z1j = function (pairs, equalityChecker) {
+    return this.y1j(asSequence_0(pairs), equalityChecker);
   };
-  Companion.prototype.from = function (pairs, equalityChecker) {
+  protoOf(Companion).fromIterable = function (pairs, equalityChecker, $super) {
     var tmp;
-    if (equalityChecker === void 1) {
-      tmp = Term$equals$ref_3();
+    if (equalityChecker === VOID) {
+      tmp = Term$equals$ref_2();
     } else {
       tmp = equalityChecker;
     }
-    return this.a1l(pairs, tmp);
+    equalityChecker = tmp;
+    return $super === VOID ? this.z1j(pairs, equalityChecker) : $super.z1j.call(this, pairs, equalityChecker);
   };
-  Companion.prototype.a1l = function (pairs, equalityChecker) {
-    return this.y1k(sequenceOf(pairs.slice()), equalityChecker);
+  protoOf(Companion).a1k = function (pairs, equalityChecker) {
+    return this.y1j(sequenceOf(pairs.slice()), equalityChecker);
   };
-  Companion.prototype.allOfPair = function (pair, equalityChecker) {
+  protoOf(Companion).from = function (pairs, equalityChecker, $super) {
     var tmp;
-    if (equalityChecker === void 1) {
-      tmp = Term$equals$ref_4();
+    if (equalityChecker === VOID) {
+      tmp = Term$equals$ref_3();
     } else {
       tmp = equalityChecker;
     }
-    return this.g1k(pair, tmp);
+    equalityChecker = tmp;
+    return $super === VOID ? this.a1k(pairs, equalityChecker) : $super.a1k.call(this, pairs, equalityChecker);
   };
-  Companion.prototype.g1k = function (pair, equalityChecker) {
-    return this.l1j(pair.g4_1, pair.h4_1, equalityChecker);
+  protoOf(Companion).h1j = function (pair, equalityChecker) {
+    return this.o1i(pair.k4_1, pair.l4_1, equalityChecker);
   };
-  Companion.prototype.allOf = function (lhs, rhs, equalityChecker) {
+  protoOf(Companion).allOfPair = function (pair, equalityChecker, $super) {
     var tmp;
-    if (equalityChecker === void 1) {
-      tmp = Term$equals$ref_5();
+    if (equalityChecker === VOID) {
+      tmp = Term$equals$ref_4();
     } else {
       tmp = equalityChecker;
     }
-    return this.l1j(lhs, rhs, tmp);
+    equalityChecker = tmp;
+    return $super === VOID ? this.h1j(pair, equalityChecker) : $super.h1j.call(this, pair, equalityChecker);
   };
-  Companion.prototype.l1j = function (lhs, rhs, equalityChecker) {
+  protoOf(Companion).o1i = function (lhs, rhs, equalityChecker) {
     var tmp;
-    if (lhs.aw() ? rhs.aw() : false) {
-      tmp = sequenceOf([this.b1k(lhs, rhs, equalityChecker)]);
-    } else if (lhs.rw() ? rhs.rw() : false) {
+    if (lhs.rv() ? rhs.rv() : false) {
+      tmp = sequenceOf([this.c1j(lhs, rhs, equalityChecker)]);
+    } else if (lhs.ew() ? rhs.ew() : false) {
       tmp = allOfLists(this, lhs.castToList(), rhs.castToList(), equalityChecker);
-    } else if (lhs.qw() ? rhs.qw() : false) {
+    } else if (lhs.dw() ? rhs.dw() : false) {
       tmp = allOfTuples(this, lhs.castToTuple(), rhs.castToTuple(), equalityChecker);
-    } else if (lhs.lw() ? rhs.lw() : false) {
+    } else if (lhs.aw() ? rhs.aw() : false) {
       var lhsStruct = lhs.castToStruct();
       var rhsStruct = rhs.castToStruct();
       var tmp_0;
-      if (lhsStruct.zv() === rhsStruct.zv() ? lhsStruct.fw() === rhsStruct.fw() : false) {
-        var tmp_1 = zip(lhsStruct.yw(), rhsStruct.yw());
+      if (lhsStruct.qv() === rhsStruct.qv() ? lhsStruct.wv() === rhsStruct.wv() : false) {
+        var tmp_1 = zip(lhsStruct.jw(), rhsStruct.jw());
         tmp_0 = flatMap(tmp_1, Equation$Companion$allOf$lambda(equalityChecker));
       } else {
-        tmp_0 = sequenceOf([this.b1k(lhs, rhs, equalityChecker)]);
+        tmp_0 = sequenceOf([this.c1j(lhs, rhs, equalityChecker)]);
       }
       tmp = tmp_0;
     } else {
-      tmp = sequenceOf([this.b1k(lhs, rhs, equalityChecker)]);
+      tmp = sequenceOf([this.c1j(lhs, rhs, equalityChecker)]);
     }
     return tmp;
   };
+  protoOf(Companion).allOf = function (lhs, rhs, equalityChecker, $super) {
+    var tmp;
+    if (equalityChecker === VOID) {
+      tmp = Term$equals$ref_5();
+    } else {
+      tmp = equalityChecker;
+    }
+    equalityChecker = tmp;
+    return $super === VOID ? this.o1i(lhs, rhs, equalityChecker) : $super.o1i.call(this, lhs, rhs, equalityChecker);
+  };
   var Companion_instance;
   function Companion_getInstance_2() {
     if (Companion_instance == null)
@@ -700,95 +715,81 @@
   }
   function Equation(lhs, rhs) {
     Companion_getInstance_2();
-    this.n1j_1 = lhs;
-    this.o1j_1 = rhs;
+    this.p1i_1 = lhs;
+    this.q1i_1 = rhs;
   }
-  Equation.prototype.p1j = function () {
-    return this.n1j_1;
+  protoOf(Equation).r1i = function () {
+    return this.p1i_1;
   };
-  Equation.prototype.q1j = function () {
-    return this.o1j_1;
+  protoOf(Equation).s1i = function () {
+    return this.q1i_1;
   };
-  Equation.prototype.s1j = function () {
+  protoOf(Equation).u1i = function () {
     return false;
   };
-  Equation.prototype.z1j = function () {
+  protoOf(Equation).b1j = function () {
     return false;
   };
-  Equation.prototype.l1k = function () {
+  protoOf(Equation).m1j = function () {
     return null;
   };
-  Equation.prototype.u1j = function () {
-    var tmp0_elvis_lhs = this.l1k();
+  protoOf(Equation).w1i = function () {
+    var tmp0_elvis_lhs = this.m1j();
     var tmp;
     if (tmp0_elvis_lhs == null) {
-      throw ClassCastException_init_$Create$('Cannot cast ' + this + ' to ' + getKClass(Assignment).kd());
+      throw ClassCastException_init_$Create$('Cannot cast ' + this + ' to ' + getKClass(Assignment).md());
     } else {
       tmp = tmp0_elvis_lhs;
     }
     return tmp;
   };
-  Equation.prototype.t1j = function () {
+  protoOf(Equation).v1i = function () {
     return false;
   };
-  Equation.prototype.r1j = function () {
+  protoOf(Equation).t1i = function () {
     return false;
   };
-  Equation.prototype.r1i = function () {
-    return Companion_getInstance_1().of('=', [this.p1j(), this.q1j()]);
+  protoOf(Equation).u1h = function () {
+    return Companion_getInstance_1().of('=', [this.r1i(), this.s1i()]);
   };
-  Equation.prototype.toTerm = function () {
-    return this.r1i();
+  protoOf(Equation).toTerm = function () {
+    return this.u1h();
   };
-  Equation.prototype.toPair = function () {
-    return new Pair(this.p1j(), this.q1j());
+  protoOf(Equation).toPair = function () {
+    return new Pair(this.r1i(), this.s1i());
   };
-  Equation.prototype.swap = function () {
-    var tmp = Companion_getInstance_2();
-    var tmp_0 = this.q1j();
-    var tmp_1 = this.p1j();
-    return tmp.w1k(tmp_0, tmp_1, null, 4, null);
+  protoOf(Equation).swap = function () {
+    return Companion_getInstance_2().of(this.s1i(), this.r1i());
+  };
+  protoOf(Equation).n1j = function (substitution, equalityChecker) {
+    return Companion_getInstance_2().c1j(this.r1i().getSubstituted(substitution, []), this.s1i().getSubstituted(substitution, []), equalityChecker);
   };
-  Equation.prototype.apply = function (substitution, equalityChecker) {
+  protoOf(Equation).apply = function (substitution, equalityChecker, $super) {
     var tmp;
-    if (equalityChecker === void 1) {
+    if (equalityChecker === VOID) {
       tmp = Term$equals$ref_6();
     } else {
       tmp = equalityChecker;
     }
-    return this.m1k(substitution, tmp);
-  };
-  Equation.prototype.m1k = function (substitution, equalityChecker) {
-    return Companion_getInstance_2().b1k(this.p1j().getSubstituted(substitution, []), this.q1j().getSubstituted(substitution, []), equalityChecker);
-  };
-  Equation.prototype.a1k = function (substitution, equalityChecker, $mask0, $handler) {
-    if (!(($mask0 & 2) === 0)) {
-      equalityChecker = Term$equals$ref_6();
-    }
-    return this.m1k(substitution, equalityChecker);
+    equalityChecker = tmp;
+    return $super === VOID ? this.n1j(substitution, equalityChecker) : $super.n1j.call(this, substitution, equalityChecker);
   };
-  Object.defineProperty(Equation.prototype, 'lhs', {
-    configurable: true,
-    get: function () {
-      return this.p1j();
-    }
+  defineProp(protoOf(Equation), 'lhs', function () {
+    return this.r1i();
   });
-  Object.defineProperty(Equation.prototype, 'rhs', {
-    configurable: true,
-    get: function () {
-      return this.q1j();
-    }
+  defineProp(protoOf(Equation), 'rhs', function () {
+    return this.s1i();
   });
   function toEquations(_this__u8e3s4) {
     var tmp$ret$4;
     // Inline function 'kotlin.collections.map' call
-    var tmp0_map = _this__u8e3s4.z();
+    var tmp1_map = _this__u8e3s4.z();
     var tmp$ret$3;
     // Inline function 'kotlin.collections.mapTo' call
-    var tmp0_mapTo = ArrayList_init_$Create$_0(collectionSizeOrDefault(tmp0_map, 10));
-    var tmp0_iterator = tmp0_map.j();
+    var tmp0_mapTo = ArrayList_init_$Create$_0(collectionSizeOrDefault(tmp1_map, 10));
+    var tmp0_iterator = tmp1_map.j();
     while (tmp0_iterator.m()) {
-      var item = tmp0_iterator.p();
+      var item = tmp0_iterator.n();
       var tmp$ret$2;
       // Inline function 'it.unibo.tuprolog.unify.toEquations.<anonymous>' call
       var tmp$ret$0;
@@ -813,12 +814,12 @@
   }
   function toAssignmentPair(_this__u8e3s4) {
     var tmp;
-    if (_this__u8e3s4.z1j()) {
-      tmp = _this__u8e3s4.u1j().n1k();
-    } else if (_this__u8e3s4.p1j().bx()) {
-      tmp = to(_this__u8e3s4.p1j().castToVar(), _this__u8e3s4.q1j());
-    } else if (_this__u8e3s4.q1j().bx()) {
-      tmp = to(_this__u8e3s4.q1j().castToVar(), _this__u8e3s4.p1j());
+    if (_this__u8e3s4.b1j()) {
+      tmp = _this__u8e3s4.w1i().o1j();
+    } else if (_this__u8e3s4.r1i().mw()) {
+      tmp = to(_this__u8e3s4.r1i().castToVar(), _this__u8e3s4.s1i());
+    } else if (_this__u8e3s4.s1i().mw()) {
+      tmp = to(_this__u8e3s4.s1i().castToVar(), _this__u8e3s4.r1i());
     } else {
       throw IllegalArgumentException_init_$Create$('Equation contains no variables: ' + _this__u8e3s4);
     }
@@ -833,12 +834,12 @@
   function Unificator$Companion$naive$1($context) {
     AbstractUnificator.call(this, $context);
   }
-  Unificator$Companion$naive$1.prototype.k1j = function (first, second) {
+  protoOf(Unificator$Companion$naive$1).n1i = function (first, second) {
     var tmp;
-    if (first.gx() ? second.gx() : false) {
-      tmp = first.castToInteger().b1().lk(second.castToInteger().b1()) === 0;
-    } else if (first.fx() ? second.fx() : false) {
-      tmp = first.castToNumeric().x10().ck(second.castToNumeric().x10()) === 0;
+    if (first.pw() ? second.pw() : false) {
+      tmp = first.castToInteger().b1().ek(second.castToInteger().b1()) === 0;
+    } else if (first.ow() ? second.ow() : false) {
+      tmp = first.castToNumeric().iz().vj(second.castToNumeric().iz()) === 0;
     } else {
       tmp = first.equals(second);
     }
@@ -847,62 +848,60 @@
   function Unificator$Companion$strict$1($context) {
     AbstractUnificator.call(this, $context);
   }
-  Unificator$Companion$strict$1.prototype.k1j = function (first, second) {
+  protoOf(Unificator$Companion$strict$1).n1i = function (first, second) {
     return first.equals(second);
   };
   function Companion_0() {
     Companion_instance_0 = this;
     var tmp = this;
-    tmp.f1l_1 = lazy(Unificator$Companion$default$delegate$lambda);
-    this.g1l_1 = 32;
+    tmp.f1k_1 = lazy(Unificator$Companion$default$delegate$lambda);
+    this.g1k_1 = 32;
   }
-  Companion_0.prototype.h1l = function () {
+  protoOf(Companion_0).h1k = function () {
     var tmp$ret$0;
     // Inline function 'kotlin.getValue' call
     var tmp0_getValue = default$factory();
-    tmp$ret$0 = this.f1l_1.b1();
+    tmp$ret$0 = this.f1k_1.b1();
     return tmp$ret$0;
   };
-  Companion_0.prototype.mguWith = function (_this__u8e3s4, other) {
-    return this.h1l().mgu(_this__u8e3s4, other);
+  protoOf(Companion_0).mguWith = function (_this__u8e3s4, other) {
+    return this.h1k().mgu(_this__u8e3s4, other);
   };
-  Companion_0.prototype.matches = function (_this__u8e3s4, other) {
-    return this.h1l().match(_this__u8e3s4, other);
+  protoOf(Companion_0).matches = function (_this__u8e3s4, other) {
+    return this.h1k().match(_this__u8e3s4, other);
   };
-  Companion_0.prototype.unifyWith = function (_this__u8e3s4, other) {
-    return this.h1l().unify(_this__u8e3s4, other);
+  protoOf(Companion_0).unifyWith = function (_this__u8e3s4, other) {
+    return this.h1k().unify(_this__u8e3s4, other);
   };
-  Companion_0.prototype.mergeWith = function (_this__u8e3s4, other) {
-    return this.h1l().merge(_this__u8e3s4, other);
+  protoOf(Companion_0).mergeWith = function (_this__u8e3s4, other) {
+    return this.h1k().merge(_this__u8e3s4, other);
   };
-  Companion_0.prototype.naiveWithContext = function (context) {
+  protoOf(Companion_0).naiveWithContext = function (context) {
     return new Unificator$Companion$naive$1(context);
   };
-  Companion_0.prototype.naive = function () {
+  protoOf(Companion_0).naive = function () {
     return this.naiveWithContext(Companion_getInstance().empty());
   };
-  Companion_0.prototype.strictWithContext = function (context) {
+  protoOf(Companion_0).strictWithContext = function (context) {
     return new Unificator$Companion$strict$1(context);
   };
-  Companion_0.prototype.strict = function () {
+  protoOf(Companion_0).strict = function () {
     return this.strictWithContext(Companion_getInstance().empty());
   };
-  Companion_0.prototype.cached = function (other, capacity) {
-    return this.i1l(other, capacity === void 1 ? 32 : capacity);
-  };
-  Companion_0.prototype.i1l = function (other, capacity) {
+  protoOf(Companion_0).i1k = function (other, capacity) {
     var tmp;
     if (other instanceof CachedUnificator) {
-      tmp = new CachedUnificator(other.e1k_1, capacity);
+      tmp = new CachedUnificator(other.f1j_1, capacity);
     } else {
       tmp = new CachedUnificator(other, capacity);
     }
     return tmp;
   };
-  Object.defineProperty(Companion_0.prototype, 'default', {
-    configurable: true,
-    get: Companion_0.prototype.h1l
-  });
+  protoOf(Companion_0).cached = function (other, capacity, $super) {
+    capacity = capacity === VOID ? 32 : capacity;
+    return $super === VOID ? this.i1k(other, capacity) : $super.i1k.call(this, other, capacity);
+  };
+  defineProp(protoOf(Companion_0), 'default', protoOf(Companion_0).h1k);
   var Companion_instance_0;
   function Companion_getInstance_3() {
     if (Companion_instance_0 == null)
@@ -913,45 +912,45 @@
   }
   function default$factory() {
     return getPropertyCallableRef('default', 1, KProperty1, function (receiver) {
-      return receiver.h1l();
+      return receiver.h1k();
     }, null);
   }
   //region block: post-declaration
-  AbstractUnificator.prototype.mgu = mgu;
-  AbstractUnificator.prototype.matchWithOccurCheck = matchWithOccurCheck;
-  AbstractUnificator.prototype.match = match;
-  AbstractUnificator.prototype.unifyWithOccurCheck = unifyWithOccurCheck;
-  AbstractUnificator.prototype.unify = unify;
-  AbstractUnificator.prototype.merge = merge;
-  CachedUnificator.prototype.mgu = mgu;
-  CachedUnificator.prototype.matchWithOccurCheck = matchWithOccurCheck;
-  CachedUnificator.prototype.match = match;
-  CachedUnificator.prototype.unifyWithOccurCheck = unifyWithOccurCheck;
-  CachedUnificator.prototype.unify = unify;
-  CachedUnificator.prototype.merge = merge;
-  Equation.prototype.qq = castTo;
-  Identity.prototype.qq = castTo;
-  Assignment.prototype.qq = castTo;
-  Comparison.prototype.qq = castTo;
-  Contradiction.prototype.qq = castTo;
-  Unificator$Companion$naive$1.prototype.mgu = mgu;
-  Unificator$Companion$naive$1.prototype.merge = merge;
-  Unificator$Companion$naive$1.prototype.matchWithOccurCheck = matchWithOccurCheck;
-  Unificator$Companion$naive$1.prototype.match = match;
-  Unificator$Companion$naive$1.prototype.unifyWithOccurCheck = unifyWithOccurCheck;
-  Unificator$Companion$naive$1.prototype.unify = unify;
-  Unificator$Companion$strict$1.prototype.mgu = mgu;
-  Unificator$Companion$strict$1.prototype.merge = merge;
-  Unificator$Companion$strict$1.prototype.matchWithOccurCheck = matchWithOccurCheck;
-  Unificator$Companion$strict$1.prototype.match = match;
-  Unificator$Companion$strict$1.prototype.unifyWithOccurCheck = unifyWithOccurCheck;
-  Unificator$Companion$strict$1.prototype.unify = unify;
+  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).mgu = mgu;
+  protoOf(CachedUnificator).matchWithOccurCheck = matchWithOccurCheck;
+  protoOf(CachedUnificator).match = match;
+  protoOf(CachedUnificator).unifyWithOccurCheck = unifyWithOccurCheck;
+  protoOf(CachedUnificator).unify = unify;
+  protoOf(CachedUnificator).merge = merge;
+  protoOf(Equation).hq = castTo;
+  protoOf(Identity).hq = castTo;
+  protoOf(Assignment).hq = castTo;
+  protoOf(Comparison).hq = castTo;
+  protoOf(Contradiction).hq = castTo;
+  protoOf(Unificator$Companion$naive$1).mgu = mgu;
+  protoOf(Unificator$Companion$naive$1).merge = merge;
+  protoOf(Unificator$Companion$naive$1).matchWithOccurCheck = matchWithOccurCheck;
+  protoOf(Unificator$Companion$naive$1).match = match;
+  protoOf(Unificator$Companion$naive$1).unifyWithOccurCheck = unifyWithOccurCheck;
+  protoOf(Unificator$Companion$naive$1).unify = unify;
+  protoOf(Unificator$Companion$strict$1).mgu = mgu;
+  protoOf(Unificator$Companion$strict$1).merge = merge;
+  protoOf(Unificator$Companion$strict$1).matchWithOccurCheck = matchWithOccurCheck;
+  protoOf(Unificator$Companion$strict$1).match = match;
+  protoOf(Unificator$Companion$strict$1).unifyWithOccurCheck = unifyWithOccurCheck;
+  protoOf(Unificator$Companion$strict$1).unify = unify;
   //endregion
   //region block: exports
   _.$_$ = _.$_$ || {};
   _.$_$.a = Companion_getInstance_3;
   //endregion
   return _;
-}(module.exports, require('./kotlin-kotlin-stdlib-js-ir.js'), require('./2p-core.js'), require('./2p-utils.js')));
+}));
 
 //# sourceMappingURL=2p-unify.js.map