@tuprolog/arg2p-core 0.14.2 → 0.16.2

package/2p-unify.js

@@ -19,60 +19,66 @@
   'use strict';
   //region block: imports
   var imul = Math.imul;
-  var KProperty1 = kotlin_kotlin.$_$.s6;
-  var getPropertyCallableRef = kotlin_kotlin.$_$.k5;
-  var asSequence = kotlin_kotlin.$_$.u1;
-  var plus = kotlin_kotlin.$_$.u7;
-  var map = kotlin_kotlin.$_$.q7;
-  var Unit_instance = kotlin_kotlin.$_$.j1;
-  var Companion_getInstance = kotlin_it_unibo_tuprolog_core.$_$.r;
-  var ArrayList_init_$Create$ = kotlin_kotlin.$_$.d;
-  var toCollection = kotlin_kotlin.$_$.b8;
-  var Pair = kotlin_kotlin.$_$.r9;
+  var protoOf = kotlin_kotlin.$_$.g6;
+  var getBooleanHashCode = kotlin_kotlin.$_$.p5;
+  var initMetadataForClass = kotlin_kotlin.$_$.t5;
+  var toString = kotlin_kotlin.$_$.j6;
+  var hashCode = kotlin_kotlin.$_$.s5;
+  var equals = kotlin_kotlin.$_$.n5;
+  var KProperty1 = kotlin_kotlin.$_$.x6;
+  var getPropertyCallableRef = kotlin_kotlin.$_$.q5;
+  var asSequence = kotlin_kotlin.$_$.y1;
+  var plus = kotlin_kotlin.$_$.z7;
+  var map = kotlin_kotlin.$_$.v7;
+  var Unit_instance = kotlin_kotlin.$_$.m;
+  var Companion_getInstance = kotlin_it_unibo_tuprolog_core.$_$.o;
+  var ArrayList_init_$Create$ = kotlin_kotlin.$_$.o;
+  var toCollection = kotlin_kotlin.$_$.g8;
+  var constructCallableReference = kotlin_kotlin.$_$.l5;
+  var Pair = kotlin_kotlin.$_$.x9;
+  var lazy = kotlin_kotlin.$_$.fa;
+  var asSequence_0 = kotlin_kotlin.$_$.z1;
+  var THROW_CCE = kotlin_kotlin.$_$.z9;
   var VOID = kotlin_kotlin.$_$.b;
-  var lazy = kotlin_kotlin.$_$.y9;
-  var protoOf = kotlin_kotlin.$_$.a6;
-  var asSequence_0 = kotlin_kotlin.$_$.v1;
-  var THROW_CCE = kotlin_kotlin.$_$.t9;
-  var initMetadataForClass = kotlin_kotlin.$_$.n5;
   var Companion_instance = kotlin_it_unibo_tuprolog_utils.$_$.a;
-  var Triple = kotlin_kotlin.$_$.v9;
+  var Triple = kotlin_kotlin.$_$.ba;
   var Some = kotlin_it_unibo_tuprolog_utils.$_$.k;
-  var zip = kotlin_kotlin.$_$.i8;
-  var flatMap = kotlin_kotlin.$_$.i7;
-  var sequenceOf = kotlin_kotlin.$_$.w7;
-  var to = kotlin_kotlin.$_$.da;
-  var sequenceOf_0 = kotlin_kotlin.$_$.v7;
-  var initMetadataForCompanion = kotlin_kotlin.$_$.o5;
-  var toString = kotlin_kotlin.$_$.d6;
-  var getKClass = kotlin_kotlin.$_$.r6;
-  var ClassCastException_init_$Create$ = kotlin_kotlin.$_$.o;
-  var Companion_getInstance_0 = kotlin_it_unibo_tuprolog_core.$_$.q;
+  var zip = kotlin_kotlin.$_$.n8;
+  var flatMap = kotlin_kotlin.$_$.n7;
+  var sequenceOf = kotlin_kotlin.$_$.b8;
+  var defineProp = kotlin_kotlin.$_$.m5;
+  var sequenceOf_0 = kotlin_kotlin.$_$.a8;
+  var initMetadataForCompanion = kotlin_kotlin.$_$.u5;
+  var getKClass = kotlin_kotlin.$_$.w6;
+  var ClassCastException_init_$Create$ = kotlin_kotlin.$_$.z;
+  var IllegalArgumentException_init_$Create$ = kotlin_kotlin.$_$.b1;
+  var to = kotlin_kotlin.$_$.ka;
+  var Companion_getInstance_0 = kotlin_it_unibo_tuprolog_core.$_$.n;
   var castTo = kotlin_it_unibo_tuprolog_utils.$_$.e;
-  var defineProp = kotlin_kotlin.$_$.g5;
   var Castable = kotlin_it_unibo_tuprolog_utils.$_$.f;
-  var collectionSizeOrDefault = kotlin_kotlin.$_$.x1;
-  var ArrayList_init_$Create$_0 = kotlin_kotlin.$_$.c;
-  var IllegalArgumentException_init_$Create$ = kotlin_kotlin.$_$.q;
-  var initMetadataForInterface = kotlin_kotlin.$_$.p5;
+  var collectionSizeOrDefault = kotlin_kotlin.$_$.b2;
+  var ArrayList_init_$Create$_0 = kotlin_kotlin.$_$.n;
+  var initMetadataForInterface = kotlin_kotlin.$_$.v5;
   //endregion
   //region block: pre-declaration
+  initMetadataForClass(Mgu, 'Mgu');
+  initMetadataForClass(Merge, 'Merge');
   function mguWithOccurCheck(term1, term2, occurCheckEnabled, $super) {
     occurCheckEnabled = occurCheckEnabled === VOID ? true : occurCheckEnabled;
-    return $super === VOID ? this.k1g(term1, term2, occurCheckEnabled) : $super.k1g.call(this, term1, term2, occurCheckEnabled);
+    return $super === VOID ? this.p1h(term1, term2, occurCheckEnabled) : $super.p1h.call(this, term1, term2, occurCheckEnabled);
   }
   function mgu(term1, term2) {
-    return this.k1g(term1, term2, true);
+    return this.p1h(term1, term2, true);
   }
   function matchWithOccurCheck(term1, term2, occurCheckEnabled) {
-    return !(this.k1g(term1, term2, occurCheckEnabled) === Companion_getInstance().failed());
+    return !(this.p1h(term1, term2, occurCheckEnabled) === Companion_getInstance().failed());
   }
   function match(term1, term2) {
     return this.matchWithOccurCheck(term1, term2, true);
   }
   function unifyWithOccurCheck(term1, term2, occurCheckEnabled) {
-    var substitution = this.k1g(term1, term2, occurCheckEnabled);
-    return substitution.hz() ? null : term1.getSubstituted(substitution, []);
+    var substitution = this.p1h(term1, term2, occurCheckEnabled);
+    return substitution.iz() ? null : term1.getSubstituted(substitution, []);
   }
   function unify(term1, term2) {
     return this.unifyWithOccurCheck(term1, term2, true);
@@ -86,6 +92,8 @@
   initMetadataForClass(Equation, 'Equation', VOID, VOID, [Castable]);
   initMetadataForClass(Identity, 'Identity', VOID, Equation);
   initMetadataForClass(Assignment, 'Assignment', VOID, Equation);
+  initMetadataForClass(LeftAssignment, 'LeftAssignment', VOID, Assignment);
+  initMetadataForClass(RightAssignment, 'RightAssignment', VOID, Assignment);
   initMetadataForClass(Comparison, 'Comparison', VOID, Equation);
   initMetadataForClass(Contradiction, 'Contradiction', VOID, Equation);
   initMetadataForCompanion(Companion);
@@ -93,33 +101,87 @@
   initMetadataForClass(Unificator$Companion$strict$1, VOID, VOID, AbstractUnificator);
   initMetadataForCompanion(Companion_0);
   //endregion
+  function Mgu(term1, term2, occurCheckEnabled) {
+    this.n1g_1 = term1;
+    this.o1g_1 = term2;
+    this.p1g_1 = occurCheckEnabled;
+  }
+  protoOf(Mgu).toString = function () {
+    return 'Mgu(term1=' + this.n1g_1.toString() + ', term2=' + this.o1g_1.toString() + ', occurCheckEnabled=' + this.p1g_1 + ')';
+  };
+  protoOf(Mgu).hashCode = function () {
+    var result = this.n1g_1.hashCode();
+    result = imul(result, 31) + this.o1g_1.hashCode() | 0;
+    result = imul(result, 31) + getBooleanHashCode(this.p1g_1) | 0;
+    return result;
+  };
+  protoOf(Mgu).equals = function (other) {
+    if (this === other)
+      return true;
+    if (!(other instanceof Mgu))
+      return false;
+    if (!this.n1g_1.equals(other.n1g_1))
+      return false;
+    if (!this.o1g_1.equals(other.o1g_1))
+      return false;
+    if (!(this.p1g_1 === other.p1g_1))
+      return false;
+    return true;
+  };
+  function Merge(substitution1, substitution2, occurCheckEnabled) {
+    this.q1g_1 = substitution1;
+    this.r1g_1 = substitution2;
+    this.s1g_1 = occurCheckEnabled;
+  }
+  protoOf(Merge).toString = function () {
+    return 'Merge(substitution1=' + toString(this.q1g_1) + ', substitution2=' + toString(this.r1g_1) + ', occurCheckEnabled=' + this.s1g_1 + ')';
+  };
+  protoOf(Merge).hashCode = function () {
+    var result = hashCode(this.q1g_1);
+    result = imul(result, 31) + hashCode(this.r1g_1) | 0;
+    result = imul(result, 31) + getBooleanHashCode(this.s1g_1) | 0;
+    return result;
+  };
+  protoOf(Merge).equals = function (other) {
+    if (this === other)
+      return true;
+    if (!(other instanceof Merge))
+      return false;
+    if (!equals(this.q1g_1, other.q1g_1))
+      return false;
+    if (!equals(this.r1g_1, other.r1g_1))
+      return false;
+    if (!(this.s1g_1 === other.s1g_1))
+      return false;
+    return true;
+  };
   function _get_contextEquations__x0dd77($this) {
-    var tmp0 = $this.t1f_1;
+    var tmp0 = $this.u1g_1;
     var tmp = KProperty1;
     // Inline function 'kotlin.getValue' call
-    getPropertyCallableRef('contextEquations', 1, tmp, AbstractUnificator$_get_contextEquations_$ref_7ajcte(), null);
-    return tmp0.c2();
+    /* dead property reference removed */
+    return tmp0.d2();
   }
   function occurrenceCheck($this, variable, term) {
     var tmp;
-    if (term.yt()) {
-      tmp = $this.u1f(variable, term);
-    } else if (term.it()) {
-      var tmp0 = term.et();
-      var tmp$ret$1;
+    if (term.zt()) {
+      tmp = $this.v1g(variable, term);
+    } else if (term.jt()) {
+      var tmp0 = term.ft();
+      var tmp$ret$0;
       $l$block: {
         // Inline function 'kotlin.sequences.any' call
-        var _iterator__ex2g4s = tmp0.o();
-        while (_iterator__ex2g4s.r()) {
-          var element = _iterator__ex2g4s.s();
+        var _iterator__ex2g4s = tmp0.m();
+        while (_iterator__ex2g4s.p()) {
+          var element = _iterator__ex2g4s.q();
           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 +189,7 @@
   }
   function equationsFor($this, term1, term2) {
     var tmp = Companion_instance_0;
-    return tmp.v1f(term1, term2, AbstractUnificator$checkTermsEquality$ref($this));
+    return tmp.w1g(term1, term2, AbstractUnificator$checkTermsEquality$ref($this));
   }
   function equationsFor_0($this, substitution1, substitution2) {
     var tmp = Companion_instance_0;
@@ -145,7 +207,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;
@@ -155,36 +217,37 @@
        while (inductionVariable_0 < last);
     return changed._v;
   }
-  function mgu_0($this, equations, occurCheckEnabled) {
+  function mgu_0($this, request, equations, occurCheckEnabled) {
     var changed = true;
     while (changed) {
       changed = false;
-      var eqIterator = equations.z3();
-      while (eqIterator.r()) {
-        var eq = eqIterator.s();
-        if (eq.a1g()) {
+      var eqIterator = equations.a4();
+      while (eqIterator.p()) {
+        var eq = $this.x1g(request, eqIterator.q());
+        if (eq.c1h()) {
           return Companion_getInstance().failed();
-        } else if (eq.b1g()) {
-          eqIterator.z2();
+        } else if (eq.d1h()) {
+          eqIterator.a3();
           changed = true;
-        } else if (eq.i1g()) {
-          var assignment = eq.d1g();
-          if (occurCheckEnabled && occurrenceCheck($this, assignment.g1g_1, eq.z1f())) {
+        } else if (eq.m1h()) {
+          var assignment = eq.castToAssignment();
+          if (occurCheckEnabled && occurrenceCheck($this, assignment.k1h(), assignment.l1h())) {
             return Companion_getInstance().failed();
           } else {
-            changed = changed || applySubstitutionToEquations($this, assignment.toSubstitution(), equations, eqIterator.n3());
+            changed = changed || applySubstitutionToEquations($this, assignment.j1h(), equations, eqIterator.o3());
           }
-        } else if (eq.c1g()) {
-          eqIterator.z2();
-          var _iterator__ex2g4s = equationsFor($this, eq.y1f(), eq.z1f()).o();
-          insertion: while (_iterator__ex2g4s.r()) {
-            var it = _iterator__ex2g4s.s();
-            if (it.b1g())
-              continue insertion;
-            else if (it.a1g())
+        } else if (eq.e1h()) {
+          eqIterator.a3();
+          var _iterator__ex2g4s = equationsFor($this, eq.a1h(), eq.b1h()).m();
+          $l$loop: while (_iterator__ex2g4s.p()) {
+            var it = _iterator__ex2g4s.q();
+            var subEq = it.c1h() || it.d1h() ? $this.x1g(request, it) : it;
+            if (subEq.d1h())
+              continue $l$loop;
+            else if (subEq.c1h())
               return Companion_getInstance().failed();
             else {
-              eqIterator.q3(it);
+              eqIterator.r3(subEq);
             }
           }
           changed = true;
@@ -194,14 +257,14 @@
     // Inline function 'kotlin.collections.filter' call
     // Inline function 'kotlin.collections.filterTo' call
     var destination = ArrayList_init_$Create$();
-    var _iterator__ex2g4s_0 = equations.o();
-    while (_iterator__ex2g4s_0.r()) {
-      var element = _iterator__ex2g4s_0.s();
-      if (element.i1g()) {
-        destination.l(element);
+    var _iterator__ex2g4s_0 = equations.m();
+    while (_iterator__ex2g4s_0.p()) {
+      var element = _iterator__ex2g4s_0.q();
+      if (element.m1h()) {
+        destination.j(element);
       }
     }
-    return toSubstitution(destination);
+    return $this.n1h(request, toSubstitution(destination));
   }
   function newDeque($this, items) {
     // Inline function 'kotlin.collections.arrayListOf' call
@@ -210,91 +273,87 @@
   }
   function AbstractUnificator$contextEquations$delegate$lambda(this$0) {
     return function () {
-      return toEquations(this$0.f8());
+      return toEquations(this$0.g8());
     };
   }
   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.u1f(_this__u8e3s4, p0_0);
-    };
-    l.callableName = 'checkTermsEquality';
-    return l;
+    return constructCallableReference(function (p0_0, p1) {
+      return p0.v1g(p0_0, p1);
+    }, 2, 0, 26, 'checkTermsEquality', [p0]);
   }
   function AbstractUnificator$equationsFor$lambda(it) {
     // Inline function 'kotlin.collections.toPair' call
-    return new Pair(it.b2(), it.c2());
-  }
-  function AbstractUnificator$checkTermsEquality$ref_0(p0) {
-    var l = function (_this__u8e3s4, p0_0) {
-      return p0.u1f(_this__u8e3s4, p0_0);
-    };
-    l.callableName = 'checkTermsEquality';
-    return l;
+    return new Pair(it.c2(), it.d2());
   }
   function applySubstitutionToEquations$handleIndex($equations, $substitution, this$0, changed, i) {
-    if ($equations.v(i).a1g() || $equations.v(i).b1g())
+    if ($equations.t(i).c1h() || $equations.t(i).d1h())
       return Unit_instance;
-    var currentEq = $equations.v(i);
+    var currentEq = $equations.t(i);
     var _destruct__k2r9zo = currentEq.apply($substitution).toPair();
-    var newLhs = _destruct__k2r9zo.vb();
-    var newRhs = _destruct__k2r9zo.wb();
-    if (!currentEq.y1f().equals(newLhs) || !currentEq.z1f().equals(newRhs)) {
+    var newLhs = _destruct__k2r9zo.ub();
+    var newRhs = _destruct__k2r9zo.vb();
+    if (!currentEq.a1h().equals(newLhs) || !currentEq.b1h().equals(newRhs)) {
       var tmp = Companion_instance_0;
-      $equations.w3(i, tmp.j1g(newLhs, newRhs, AbstractUnificator$checkTermsEquality$ref_0(this$0)));
+      $equations.x3(i, tmp.o1h(newLhs, newRhs, AbstractUnificator$checkTermsEquality$ref(this$0)));
       changed._v = true;
     }
   }
   function AbstractUnificator(context) {
-    context = context === VOID ? Companion_getInstance().empty() : context;
-    this.s1f_1 = context;
+    this.t1g_1 = context;
     var tmp = this;
-    tmp.t1f_1 = lazy(AbstractUnificator$contextEquations$delegate$lambda(this));
+    tmp.u1g_1 = lazy(AbstractUnificator$contextEquations$delegate$lambda(this));
   }
-  protoOf(AbstractUnificator).f8 = function () {
-    return this.s1f_1;
+  protoOf(AbstractUnificator).g8 = function () {
+    return this.t1g_1;
+  };
+  protoOf(AbstractUnificator).n1h = function (request, result) {
+    return result;
+  };
+  protoOf(AbstractUnificator).x1g = function (request, equation) {
+    return equation;
   };
-  protoOf(AbstractUnificator).k1g = function (term1, term2, occurCheckEnabled) {
-    if (this.f8().hz())
+  protoOf(AbstractUnificator).p1h = function (term1, term2, occurCheckEnabled) {
+    if (this.g8().iz())
       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);
+    return mgu_0(this, new Mgu(term1, term2, occurCheckEnabled), equations, occurCheckEnabled);
   };
   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).l1g = function (substitution1, substitution2, occurCheckEnabled) {
-    if (this.f8().hz() || substitution1.hz() || substitution2.hz())
+  protoOf(AbstractUnificator).q1h = function (substitution1, substitution2, occurCheckEnabled) {
+    if (this.g8().iz() || substitution1.iz() || substitution2.iz())
       return Companion_getInstance().failed();
     if (!occurCheckEnabled) {
-      var quickMerge = this.f8().plus(substitution1).plus(substitution2);
-      if (quickMerge.gz()) {
+      var quickMerge = this.g8().plus(substitution1).plus(substitution2);
+      if (quickMerge.hz()) {
         return quickMerge;
       }
     }
     var equations = newDeque(this, plus(asSequence_0(_get_contextEquations__x0dd77(this)), equationsFor_0(this, substitution1, substitution2)));
-    return mgu_0(this, equations, occurCheckEnabled);
+    return mgu_0(this, new Merge(substitution1, substitution2, occurCheckEnabled), equations, occurCheckEnabled);
   };
   protoOf(AbstractUnificator).mergeWithOccurCheck = function (substitution1, substitution2, occurCheckEnabled) {
-    return this.l1g(substitution1, substitution2, occurCheckEnabled);
+    return this.q1h(substitution1, substitution2, occurCheckEnabled);
   };
   function CachedUnificator(decorated, cacheCapacity) {
-    this.m1g_1 = decorated;
-    this.n1g_1 = Companion_instance.zn(cacheCapacity);
+    this.r1h_1 = decorated;
+    this.s1h_1 = Companion_instance.ao(cacheCapacity);
   }
-  protoOf(CachedUnificator).k1g = function (term1, term2, occurCheckEnabled) {
+  protoOf(CachedUnificator).p1h = function (term1, term2, occurCheckEnabled) {
     var mguRequest = new Triple(term1, term2, occurCheckEnabled);
-    var cached = this.n1g_1.f2(mguRequest);
+    var cached = this.s1h_1.g2(mguRequest);
     var tmp;
     if (cached instanceof Some) {
-      tmp = cached.co_1;
+      tmp = cached.do_1;
     } else {
-      var mguResult = this.m1g_1.k1g(term1, term2, occurCheckEnabled);
-      this.n1g_1.ao(mguRequest, mguResult);
+      var mguResult = this.r1h_1.p1h(term1, term2, occurCheckEnabled);
+      this.s1h_1.bo(mguRequest, mguResult);
       tmp = mguResult;
     }
     return tmp;
@@ -302,123 +361,105 @@
   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).l1g = function (substitution1, substitution2, occurCheckEnabled) {
+  protoOf(CachedUnificator).q1h = function (substitution1, substitution2, occurCheckEnabled) {
     var mguRequest = new Triple(substitution1, substitution2, occurCheckEnabled);
-    var cached = this.n1g_1.f2(mguRequest);
+    var cached = this.s1h_1.g2(mguRequest);
     var tmp;
     if (cached instanceof Some) {
-      tmp = cached.co_1;
+      tmp = cached.do_1;
     } else {
-      var mguResult = this.m1g_1.mergeWithOccurCheck(substitution1, substitution2, occurCheckEnabled);
-      this.n1g_1.ao(mguRequest, mguResult);
+      var mguResult = this.r1h_1.mergeWithOccurCheck(substitution1, substitution2, occurCheckEnabled);
+      this.s1h_1.bo(mguRequest, mguResult);
       tmp = mguResult;
     }
     return tmp;
   };
   protoOf(CachedUnificator).mergeWithOccurCheck = function (substitution1, substitution2, occurCheckEnabled) {
-    return this.l1g(substitution1, substitution2, occurCheckEnabled);
+    return this.q1h(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 constructCallableReference(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 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.o1g(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.t1h(it, $equalityChecker);
     };
-    l.callableName = 'equals';
-    return l;
   }
   function Equation$Companion$allOfLists$lambda($equalityChecker) {
     return function (_destruct__k2r9zo) {
-      var l = _destruct__k2r9zo.vb();
-      var r = _destruct__k2r9zo.wb();
-      return l.pt() && r.pt() ? sequenceOf(Companion_instance_0.j1g(l.castToCons().iv(), r.castToCons().iv(), $equalityChecker)) : l.ot() && r.ot() ? sequenceOf(Companion_instance_0.j1g(l.castToList(), r.castToList(), $equalityChecker)) : Companion_instance_0.v1f(l, r, $equalityChecker);
+      var l = _destruct__k2r9zo.ub();
+      var r = _destruct__k2r9zo.vb();
+      return l.qt() && r.qt() ? sequenceOf(Companion_instance_0.o1h(l.castToCons().jv(), r.castToCons().jv(), $equalityChecker)) : l.pt() && r.pt() ? sequenceOf(Companion_instance_0.o1h(l.castToList(), r.castToList(), $equalityChecker)) : Companion_instance_0.w1g(l, r, $equalityChecker);
     };
   }
   function Equation$Companion$allOfTuples$lambda($equalityChecker) {
     return function (_destruct__k2r9zo) {
-      var l = _destruct__k2r9zo.vb();
-      var r = _destruct__k2r9zo.wb();
-      return l.nt() && r.nt() ? sequenceOf(Companion_instance_0.j1g(l.castToTuple().wu(), r.castToTuple().wu(), $equalityChecker)) : Companion_instance_0.v1f(l, r, $equalityChecker);
+      var l = _destruct__k2r9zo.ub();
+      var r = _destruct__k2r9zo.vb();
+      return l.ot() && r.ot() ? sequenceOf(Companion_instance_0.o1h(l.castToTuple().xu(), r.castToTuple().xu(), $equalityChecker)) : Companion_instance_0.w1g(l, r, $equalityChecker);
     };
   }
-  function Term$equals$ref_5() {
-    var l = function (p0, p1) {
-      return p0.equals(p1);
-    };
-    l.callableName = 'equals';
-    return l;
-  }
   function Equation$Companion$allOf$lambda($equalityChecker) {
     return function (it) {
-      return Companion_instance_0.o1g(it, $equalityChecker);
+      return Companion_instance_0.t1h(it, $equalityChecker);
     };
   }
   function Identity(lhs, rhs) {
     Equation.call(this, lhs, rhs);
-    this.r1g_1 = lhs;
-    this.s1g_1 = rhs;
+    this.w1h_1 = lhs;
+    this.x1h_1 = rhs;
   }
-  protoOf(Identity).y1f = function () {
-    return this.r1g_1;
+  protoOf(Identity).a1h = function () {
+    return this.w1h_1;
   };
-  protoOf(Identity).z1f = function () {
-    return this.s1g_1;
+  protoOf(Identity).b1h = function () {
+    return this.x1h_1;
   };
-  protoOf(Identity).b1g = function () {
+  protoOf(Identity).d1h = function () {
     return true;
   };
+  protoOf(Identity).y1h = function () {
+    return this;
+  };
+  protoOf(Identity).asIdentity = function () {
+    return this.y1h();
+  };
+  protoOf(Identity).z1h = function (lhs, rhs) {
+    return this.a1i(lhs, rhs);
+  };
+  protoOf(Identity).a1i = function (lhs, rhs) {
+    return new Identity(lhs, rhs);
+  };
   protoOf(Identity).toString = function () {
-    return 'Identity(lhs=' + this.r1g_1.toString() + ', rhs=' + this.s1g_1.toString() + ')';
+    return 'Identity(lhs=' + this.w1h_1.toString() + ', rhs=' + this.x1h_1.toString() + ')';
   };
   protoOf(Identity).hashCode = function () {
-    var result = this.r1g_1.hashCode();
-    result = imul(result, 31) + this.s1g_1.hashCode() | 0;
+    var result = this.w1h_1.hashCode();
+    result = imul(result, 31) + this.x1h_1.hashCode() | 0;
     return result;
   };
   protoOf(Identity).equals = function (other) {
@@ -426,77 +467,194 @@
       return true;
     if (!(other instanceof Identity))
       return false;
-    if (!this.r1g_1.equals(other.r1g_1))
+    if (!this.w1h_1.equals(other.w1h_1))
       return false;
-    if (!this.s1g_1.equals(other.s1g_1))
+    if (!this.x1h_1.equals(other.x1h_1))
       return false;
     return true;
   };
   function Assignment(lhs, rhs) {
     Equation.call(this, lhs, rhs);
-    this.g1g_1 = lhs;
-    this.h1g_1 = rhs;
+    this.h1h_1 = lhs;
+    this.i1h_1 = rhs;
   }
-  protoOf(Assignment).y1f = function () {
-    return this.g1g_1;
+  protoOf(Assignment).a1h = function () {
+    return this.h1h_1;
+  };
+  protoOf(Assignment).b1h = function () {
+    return this.i1h_1;
+  };
+  protoOf(Assignment).m1h = function () {
+    return true;
+  };
+  protoOf(Assignment).e1i = function () {
+    return this;
+  };
+  protoOf(Assignment).asAssignment = function () {
+    return this.e1i();
   };
-  protoOf(Assignment).z1f = function () {
-    return this.h1g_1;
+  protoOf(Assignment).f1i = function () {
+    return new Pair(this.k1h(), this.l1h());
+  };
+  protoOf(Assignment).toAssignmentPair = function () {
+    return this.f1i();
+  };
+  protoOf(Assignment).j1h = function () {
+    return Companion_getInstance().unifier(this.k1h(), this.l1h());
   };
   protoOf(Assignment).toSubstitution = function () {
-    return Companion_getInstance().unifier(this.g1g_1, this.h1g_1);
+    return this.j1h();
+  };
+  function LeftAssignment(lhs, rhs) {
+    Assignment.call(this, lhs, rhs);
+    this.k1i_1 = lhs;
+    this.l1i_1 = rhs;
+    this.m1i_1 = this.k1i_1;
+    this.n1i_1 = this.l1i_1;
+  }
+  protoOf(LeftAssignment).a1h = function () {
+    return this.k1i_1;
+  };
+  protoOf(LeftAssignment).b1h = function () {
+    return this.l1i_1;
+  };
+  protoOf(LeftAssignment).k1h = function () {
+    return this.m1i_1;
+  };
+  protoOf(LeftAssignment).l1h = function () {
+    return this.n1i_1;
   };
-  protoOf(Assignment).v1g = function () {
-    return to(this.g1g_1, this.h1g_1);
+  protoOf(LeftAssignment).b1i = function () {
+    return true;
+  };
+  protoOf(LeftAssignment).o1i = function () {
+    return this;
+  };
+  protoOf(LeftAssignment).asLeftAssignment = function () {
+    return this.o1i();
+  };
+  protoOf(LeftAssignment).z1h = function (lhs, rhs) {
+    return this.p1i(lhs.castToVar(), rhs);
+  };
+  protoOf(LeftAssignment).q1i = function () {
+    return new Pair(this.k1i_1, this.l1i_1);
+  };
+  protoOf(LeftAssignment).toPair = function () {
+    return this.q1i();
   };
-  protoOf(Assignment).toPair = function () {
-    return this.v1g();
+  protoOf(LeftAssignment).p1i = function (lhs, rhs) {
+    return new LeftAssignment(lhs, rhs);
   };
-  protoOf(Assignment).i1g = function () {
+  protoOf(LeftAssignment).toString = function () {
+    return 'LeftAssignment(lhs=' + this.k1i_1.toString() + ', rhs=' + this.l1i_1.toString() + ')';
+  };
+  protoOf(LeftAssignment).hashCode = function () {
+    var result = this.k1i_1.hashCode();
+    result = imul(result, 31) + this.l1i_1.hashCode() | 0;
+    return result;
+  };
+  protoOf(LeftAssignment).equals = function (other) {
+    if (this === other)
+      return true;
+    if (!(other instanceof LeftAssignment))
+      return false;
+    if (!this.k1i_1.equals(other.k1i_1))
+      return false;
+    if (!this.l1i_1.equals(other.l1i_1))
+      return false;
     return true;
   };
-  protoOf(Assignment).t1g = function () {
+  function RightAssignment(lhs, rhs) {
+    Assignment.call(this, lhs, rhs);
+    this.v1i_1 = lhs;
+    this.w1i_1 = rhs;
+    this.x1i_1 = this.w1i_1;
+    this.y1i_1 = this.v1i_1;
+  }
+  protoOf(RightAssignment).a1h = function () {
+    return this.v1i_1;
+  };
+  protoOf(RightAssignment).b1h = function () {
+    return this.w1i_1;
+  };
+  protoOf(RightAssignment).k1h = function () {
+    return this.x1i_1;
+  };
+  protoOf(RightAssignment).l1h = function () {
+    return this.y1i_1;
+  };
+  protoOf(RightAssignment).c1i = function () {
+    return true;
+  };
+  protoOf(RightAssignment).z1i = function () {
     return this;
   };
-  protoOf(Assignment).toString = function () {
-    return 'Assignment(lhs=' + this.g1g_1.toString() + ', rhs=' + this.h1g_1.toString() + ')';
+  protoOf(RightAssignment).asRightAssignment = function () {
+    return this.z1i();
+  };
+  protoOf(RightAssignment).z1h = function (lhs, rhs) {
+    return this.a1j(lhs, rhs.castToVar());
+  };
+  protoOf(RightAssignment).q1i = function () {
+    return new Pair(this.v1i_1, this.w1i_1);
+  };
+  protoOf(RightAssignment).toPair = function () {
+    return this.q1i();
+  };
+  protoOf(RightAssignment).a1j = function (lhs, rhs) {
+    return new RightAssignment(lhs, rhs);
+  };
+  protoOf(RightAssignment).toString = function () {
+    return 'RightAssignment(lhs=' + this.v1i_1.toString() + ', rhs=' + this.w1i_1.toString() + ')';
   };
-  protoOf(Assignment).hashCode = function () {
-    var result = this.g1g_1.hashCode();
-    result = imul(result, 31) + this.h1g_1.hashCode() | 0;
+  protoOf(RightAssignment).hashCode = function () {
+    var result = this.v1i_1.hashCode();
+    result = imul(result, 31) + this.w1i_1.hashCode() | 0;
     return result;
   };
-  protoOf(Assignment).equals = function (other) {
+  protoOf(RightAssignment).equals = function (other) {
     if (this === other)
       return true;
-    if (!(other instanceof Assignment))
+    if (!(other instanceof RightAssignment))
       return false;
-    if (!this.g1g_1.equals(other.g1g_1))
+    if (!this.v1i_1.equals(other.v1i_1))
       return false;
-    if (!this.h1g_1.equals(other.h1g_1))
+    if (!this.w1i_1.equals(other.w1i_1))
       return false;
     return true;
   };
   function Comparison(lhs, rhs) {
     Equation.call(this, lhs, rhs);
-    this.y1g_1 = lhs;
-    this.z1g_1 = rhs;
+    this.d1j_1 = lhs;
+    this.e1j_1 = rhs;
   }
-  protoOf(Comparison).y1f = function () {
-    return this.y1g_1;
+  protoOf(Comparison).a1h = function () {
+    return this.d1j_1;
   };
-  protoOf(Comparison).z1f = function () {
-    return this.z1g_1;
+  protoOf(Comparison).b1h = function () {
+    return this.e1j_1;
   };
-  protoOf(Comparison).c1g = function () {
+  protoOf(Comparison).e1h = function () {
     return true;
   };
+  protoOf(Comparison).f1j = function () {
+    return this;
+  };
+  protoOf(Comparison).asComparison = function () {
+    return this.f1j();
+  };
+  protoOf(Comparison).z1h = function (lhs, rhs) {
+    return this.a1i(lhs, rhs);
+  };
+  protoOf(Comparison).a1i = function (lhs, rhs) {
+    return new Comparison(lhs, rhs);
+  };
   protoOf(Comparison).toString = function () {
-    return 'Comparison(lhs=' + this.y1g_1.toString() + ', rhs=' + this.z1g_1.toString() + ')';
+    return 'Comparison(lhs=' + this.d1j_1.toString() + ', rhs=' + this.e1j_1.toString() + ')';
   };
   protoOf(Comparison).hashCode = function () {
-    var result = this.y1g_1.hashCode();
-    result = imul(result, 31) + this.z1g_1.hashCode() | 0;
+    var result = this.d1j_1.hashCode();
+    result = imul(result, 31) + this.e1j_1.hashCode() | 0;
     return result;
   };
   protoOf(Comparison).equals = function (other) {
@@ -504,32 +662,50 @@
       return true;
     if (!(other instanceof Comparison))
       return false;
-    if (!this.y1g_1.equals(other.y1g_1))
+    if (!this.d1j_1.equals(other.d1j_1))
       return false;
-    if (!this.z1g_1.equals(other.z1g_1))
+    if (!this.e1j_1.equals(other.e1j_1))
       return false;
     return true;
   };
   function Contradiction(lhs, rhs) {
     Equation.call(this, lhs, rhs);
-    this.c1h_1 = lhs;
-    this.d1h_1 = rhs;
+    this.i1j_1 = lhs;
+    this.j1j_1 = rhs;
   }
-  protoOf(Contradiction).y1f = function () {
-    return this.c1h_1;
+  protoOf(Contradiction).a1h = function () {
+    return this.i1j_1;
   };
-  protoOf(Contradiction).z1f = function () {
-    return this.d1h_1;
+  protoOf(Contradiction).b1h = function () {
+    return this.j1j_1;
   };
-  protoOf(Contradiction).a1g = function () {
+  protoOf(Contradiction).c1h = function () {
     return true;
   };
+  protoOf(Contradiction).k1j = function () {
+    return this;
+  };
+  protoOf(Contradiction).asContradiction = function () {
+    return this.k1j();
+  };
+  protoOf(Contradiction).z1h = function (lhs, rhs) {
+    return this.a1i(lhs, rhs);
+  };
+  protoOf(Contradiction).j1h = function () {
+    return Companion_getInstance().failed();
+  };
+  protoOf(Contradiction).toSubstitution = function () {
+    return this.j1h();
+  };
+  protoOf(Contradiction).a1i = function (lhs, rhs) {
+    return new Contradiction(lhs, rhs);
+  };
   protoOf(Contradiction).toString = function () {
-    return 'Contradiction(lhs=' + this.c1h_1.toString() + ', rhs=' + this.d1h_1.toString() + ')';
+    return 'Contradiction(lhs=' + this.i1j_1.toString() + ', rhs=' + this.j1j_1.toString() + ')';
   };
   protoOf(Contradiction).hashCode = function () {
-    var result = this.c1h_1.hashCode();
-    result = imul(result, 31) + this.d1h_1.hashCode() | 0;
+    var result = this.i1j_1.hashCode();
+    result = imul(result, 31) + this.j1j_1.hashCode() | 0;
     return result;
   };
   protoOf(Contradiction).equals = function (other) {
@@ -537,29 +713,29 @@
       return true;
     if (!(other instanceof Contradiction))
       return false;
-    if (!this.c1h_1.equals(other.c1h_1))
+    if (!this.i1j_1.equals(other.i1j_1))
       return false;
-    if (!this.d1h_1.equals(other.d1h_1))
+    if (!this.j1j_1.equals(other.j1j_1))
       return false;
     return true;
   };
   function Companion() {
   }
-  protoOf(Companion).j1g = function (lhs, rhs, equalityChecker) {
+  protoOf(Companion).o1h = function (lhs, rhs, equalityChecker) {
     var tmp;
-    if (lhs.yt() && rhs.yt()) {
+    if (lhs.zt() && rhs.zt()) {
       var tmp_0;
       if (equalityChecker(lhs, rhs)) {
         tmp_0 = new Identity(lhs, rhs);
       } else {
-        tmp_0 = new Assignment(lhs.castToVar(), rhs);
+        tmp_0 = new LeftAssignment(lhs.castToVar(), rhs);
       }
       tmp = tmp_0;
-    } else if (lhs.yt()) {
-      tmp = new Assignment(lhs.castToVar(), rhs);
-    } else if (rhs.yt()) {
-      tmp = new Assignment(rhs.castToVar(), lhs);
-    } else if (lhs.bu() && rhs.bu()) {
+    } else if (lhs.zt()) {
+      tmp = new LeftAssignment(lhs.castToVar(), rhs);
+    } else if (rhs.zt()) {
+      tmp = new RightAssignment(lhs, rhs.castToVar());
+    } else if (lhs.cu() && rhs.cu()) {
       var tmp_1;
       if (equalityChecker(lhs, rhs)) {
         tmp_1 = new Identity(lhs, rhs);
@@ -567,13 +743,13 @@
         tmp_1 = new Contradiction(lhs, rhs);
       }
       tmp = tmp_1;
-    } else if (lhs.bu() || rhs.bu()) {
+    } else if (lhs.cu() || rhs.cu()) {
       tmp = new Contradiction(lhs, rhs);
-    } else if (lhs.it() && rhs.it()) {
+    } else if (lhs.jt() && rhs.jt()) {
       var lhsStruct = lhs.castToStruct();
       var rhsStruct = rhs.castToStruct();
       var tmp_2;
-      if (!(lhsStruct.ws() === rhsStruct.ws()) || !(lhsStruct.ct() === rhsStruct.ct())) {
+      if (!(lhsStruct.xs() === rhsStruct.xs()) || !(lhsStruct.dt() === rhsStruct.dt())) {
         tmp_2 = new Contradiction(lhsStruct, rhsStruct);
       } else {
         tmp_2 = new Comparison(lhsStruct, rhsStruct);
@@ -592,192 +768,286 @@
       tmp = equalityChecker;
     }
     equalityChecker = tmp;
-    return $super === VOID ? this.j1g(lhs, rhs, equalityChecker) : $super.j1g.call(this, lhs, rhs, equalityChecker);
+    return $super === VOID ? this.o1h(lhs, rhs, equalityChecker) : $super.o1h.call(this, lhs, rhs, equalityChecker);
   };
-  protoOf(Companion).e1h = function (pair, equalityChecker) {
-    return this.j1g(pair.first, pair.second, equalityChecker);
+  protoOf(Companion).l1j = function (pair, equalityChecker) {
+    return this.o1h(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.e1h(pair, equalityChecker) : $super.e1h.call(this, pair, equalityChecker);
+    return $super === VOID ? this.l1j(pair, equalityChecker) : $super.l1j.call(this, pair, equalityChecker);
   };
-  protoOf(Companion).f1h = function (pairs, equalityChecker) {
+  protoOf(Companion).m1j = 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.f1h(pairs, equalityChecker) : $super.f1h.call(this, pairs, equalityChecker);
+    return $super === VOID ? this.m1j(pairs, equalityChecker) : $super.m1j.call(this, pairs, equalityChecker);
   };
-  protoOf(Companion).g1h = function (pairs, equalityChecker) {
-    return this.f1h(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;
     if (equalityChecker === VOID) {
-      tmp = Term$equals$ref_2();
+      tmp = Term$equals$ref();
     } else {
       tmp = equalityChecker;
     }
     equalityChecker = tmp;
-    return $super === VOID ? this.g1h(pairs, equalityChecker) : $super.g1h.call(this, pairs, equalityChecker);
+    return $super === VOID ? this.n1j(pairs, equalityChecker) : $super.n1j.call(this, pairs, equalityChecker);
   };
-  protoOf(Companion).h1h = function (pairs, equalityChecker) {
-    return this.f1h(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;
     if (equalityChecker === VOID) {
-      tmp = Term$equals$ref_3();
+      tmp = Term$equals$ref();
     } else {
       tmp = equalityChecker;
     }
     equalityChecker = tmp;
-    return $super === VOID ? this.h1h(pairs, equalityChecker) : $super.h1h.call(this, pairs, equalityChecker);
+    return $super === VOID ? this.o1j(pairs, equalityChecker) : $super.o1j.call(this, pairs, equalityChecker);
   };
-  protoOf(Companion).o1g = function (pair, equalityChecker) {
-    return this.v1f(pair.first, pair.second, equalityChecker);
+  protoOf(Companion).t1h = function (pair, equalityChecker) {
+    return this.w1g(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.o1g(pair, equalityChecker) : $super.o1g.call(this, pair, equalityChecker);
+    return $super === VOID ? this.t1h(pair, equalityChecker) : $super.t1h.call(this, pair, equalityChecker);
   };
-  protoOf(Companion).v1f = function (lhs, rhs, equalityChecker) {
+  protoOf(Companion).w1g = function (lhs, rhs, equalityChecker) {
     var tmp;
-    if (lhs.xs() && rhs.xs()) {
-      tmp = sequenceOf(this.j1g(lhs, rhs, equalityChecker));
-    } else if (lhs.ot() && rhs.ot()) {
+    if (lhs.ys() && rhs.ys()) {
+      tmp = sequenceOf(this.o1h(lhs, rhs, equalityChecker));
+    } else if (lhs.pt() && rhs.pt()) {
       tmp = allOfLists(this, lhs.castToList(), rhs.castToList(), equalityChecker);
-    } else if (lhs.nt() && rhs.nt()) {
+    } else if (lhs.ot() && rhs.ot()) {
       tmp = allOfTuples(this, lhs.castToTuple(), rhs.castToTuple(), equalityChecker);
-    } else if (lhs.it() && rhs.it()) {
+    } else if (lhs.jt() && rhs.jt()) {
       var lhsStruct = lhs.castToStruct();
       var rhsStruct = rhs.castToStruct();
       var tmp_0;
-      if (lhsStruct.ws() === rhsStruct.ws() && lhsStruct.ct() === rhsStruct.ct()) {
-        var tmp_1 = zip(lhsStruct.vt(), rhsStruct.vt());
+      if (lhsStruct.xs() === rhsStruct.xs() && lhsStruct.dt() === rhsStruct.dt()) {
+        var tmp_1 = zip(lhsStruct.wt(), rhsStruct.wt());
         tmp_0 = flatMap(tmp_1, Equation$Companion$allOf$lambda(equalityChecker));
       } else {
-        tmp_0 = sequenceOf(this.j1g(lhs, rhs, equalityChecker));
+        tmp_0 = sequenceOf(this.o1h(lhs, rhs, equalityChecker));
       }
       tmp = tmp_0;
     } else {
-      tmp = sequenceOf(this.j1g(lhs, rhs, equalityChecker));
+      tmp = sequenceOf(this.o1h(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.v1f(lhs, rhs, equalityChecker) : $super.v1f.call(this, lhs, rhs, equalityChecker);
+    return $super === VOID ? this.w1g(lhs, rhs, equalityChecker) : $super.w1g.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.w1f_1 = lhs;
-    this.x1f_1 = rhs;
+    this.y1g_1 = lhs;
+    this.z1g_1 = rhs;
   }
-  protoOf(Equation).y1f = function () {
-    return this.w1f_1;
+  protoOf(Equation).a1h = function () {
+    return this.y1g_1;
   };
-  protoOf(Equation).z1f = function () {
-    return this.x1f_1;
+  protoOf(Equation).b1h = function () {
+    return this.z1g_1;
   };
-  protoOf(Equation).b1g = function () {
+  protoOf(Equation).d1h = function () {
     return false;
   };
-  protoOf(Equation).i1g = function () {
+  protoOf(Equation).asIdentity = function () {
+    return null;
+  };
+  protoOf(Equation).castToIdentity = function () {
+    var tmp0_elvis_lhs = this.asIdentity();
+    var tmp;
+    if (tmp0_elvis_lhs == null) {
+      throw ClassCastException_init_$Create$('Cannot cast ' + toString(this) + ' to ' + getKClass(Identity).a9());
+    } else {
+      tmp = tmp0_elvis_lhs;
+    }
+    return tmp;
+  };
+  protoOf(Equation).m1h = function () {
     return false;
   };
-  protoOf(Equation).t1g = function () {
+  protoOf(Equation).asAssignment = function () {
     return null;
   };
-  protoOf(Equation).d1g = function () {
-    var tmp0_elvis_lhs = this.t1g();
+  protoOf(Equation).castToAssignment = function () {
+    var tmp0_elvis_lhs = this.asAssignment();
     var tmp;
     if (tmp0_elvis_lhs == null) {
-      throw ClassCastException_init_$Create$('Cannot cast ' + toString(this) + ' to ' + getKClass(Assignment).z8());
+      throw ClassCastException_init_$Create$('Cannot cast ' + toString(this) + ' to ' + getKClass(Assignment).a9());
     } else {
       tmp = tmp0_elvis_lhs;
     }
     return tmp;
   };
-  protoOf(Equation).c1g = function () {
+  protoOf(Equation).b1i = function () {
     return false;
   };
-  protoOf(Equation).a1g = function () {
+  protoOf(Equation).asLeftAssignment = function () {
+    return null;
+  };
+  protoOf(Equation).castToLeftAssignment = function () {
+    var tmp0_elvis_lhs = this.asLeftAssignment();
+    var tmp;
+    if (tmp0_elvis_lhs == null) {
+      throw ClassCastException_init_$Create$('Cannot cast ' + toString(this) + ' to ' + getKClass(LeftAssignment).a9());
+    } else {
+      tmp = tmp0_elvis_lhs;
+    }
+    return tmp;
+  };
+  protoOf(Equation).c1i = function () {
     return false;
   };
-  protoOf(Equation).b1f = function () {
-    return Companion_getInstance_0().of('=', [this.y1f(), this.z1f()]);
+  protoOf(Equation).asRightAssignment = function () {
+    return null;
+  };
+  protoOf(Equation).castToRightAssignment = function () {
+    var tmp0_elvis_lhs = this.asRightAssignment();
+    var tmp;
+    if (tmp0_elvis_lhs == null) {
+      throw ClassCastException_init_$Create$('Cannot cast ' + toString(this) + ' to ' + getKClass(RightAssignment).a9());
+    } else {
+      tmp = tmp0_elvis_lhs;
+    }
+    return tmp;
+  };
+  protoOf(Equation).e1h = function () {
+    return false;
+  };
+  protoOf(Equation).asComparison = function () {
+    return null;
+  };
+  protoOf(Equation).castToComparison = function () {
+    var tmp0_elvis_lhs = this.asComparison();
+    var tmp;
+    if (tmp0_elvis_lhs == null) {
+      throw ClassCastException_init_$Create$('Cannot cast ' + toString(this) + ' to ' + getKClass(Comparison).a9());
+    } else {
+      tmp = tmp0_elvis_lhs;
+    }
+    return tmp;
+  };
+  protoOf(Equation).c1h = function () {
+    return false;
+  };
+  protoOf(Equation).asContradiction = function () {
+    return null;
+  };
+  protoOf(Equation).castToContradiction = function () {
+    var tmp0_elvis_lhs = this.asContradiction();
+    var tmp;
+    if (tmp0_elvis_lhs == null) {
+      throw ClassCastException_init_$Create$('Cannot cast ' + toString(this) + ' to ' + getKClass(Contradiction).a9());
+    } else {
+      tmp = tmp0_elvis_lhs;
+    }
+    return tmp;
+  };
+  protoOf(Equation).clone = function (lhs, rhs, $super) {
+    lhs = lhs === VOID ? this.a1h() : lhs;
+    rhs = rhs === VOID ? this.b1h() : rhs;
+    return $super === VOID ? this.z1h(lhs, rhs) : $super.z1h.call(this, lhs, rhs);
+  };
+  protoOf(Equation).toContradiction = function () {
+    return new Contradiction(this.a1h(), this.b1h());
+  };
+  protoOf(Equation).toAssignmentPair = function () {
+    var tmp;
+    if (this.a1h().zt()) {
+      tmp = to(this.a1h().castToVar(), this.b1h());
+    } else if (this.b1h().zt()) {
+      tmp = to(this.b1h().castToVar(), this.a1h());
+    } else {
+      throw IllegalArgumentException_init_$Create$('Equation contains no variables: ' + toString(this));
+    }
+    return tmp;
+  };
+  protoOf(Equation).toSubstitution = function () {
+    var tmp;
+    if (this.a1h().zt()) {
+      tmp = Companion_getInstance().unifier(this.a1h().castToVar(), this.b1h());
+    } else if (this.b1h().zt()) {
+      tmp = Companion_getInstance().unifier(this.b1h().castToVar(), this.a1h());
+    } else {
+      throw IllegalArgumentException_init_$Create$('Equation contains no variables: ' + toString(this));
+    }
+    return tmp;
+  };
+  protoOf(Equation).w1f = function () {
+    return Companion_getInstance_0().of('=', [this.a1h(), this.b1h()]);
   };
   protoOf(Equation).toTerm = function () {
-    return this.b1f();
+    return this.w1f();
   };
   protoOf(Equation).toPair = function () {
-    return new Pair(this.y1f(), this.z1f());
+    return new Pair(this.a1h(), this.b1h());
   };
   protoOf(Equation).swap = function () {
-    return Companion_instance_0.of(this.z1f(), this.y1f());
+    return Companion_instance_0.of(this.b1h(), this.a1h());
   };
-  protoOf(Equation).u1g = function (substitution, equalityChecker) {
-    return Companion_instance_0.j1g(this.y1f().getSubstituted(substitution, []), this.z1f().getSubstituted(substitution, []), equalityChecker);
+  protoOf(Equation).d1i = function (substitution, equalityChecker) {
+    return Companion_instance_0.o1h(this.a1h().getSubstituted(substitution, []), this.b1h().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.u1g(substitution, equalityChecker) : $super.u1g.call(this, substitution, equalityChecker);
+    return $super === VOID ? this.d1i(substitution, equalityChecker) : $super.d1i.call(this, substitution, equalityChecker);
   };
   function toEquations(_this__u8e3s4) {
     // Inline function 'kotlin.collections.map' call
-    var this_0 = _this__u8e3s4.d1();
+    var this_0 = _this__u8e3s4.b1();
     // Inline function 'kotlin.collections.mapTo' call
     var destination = ArrayList_init_$Create$_0(collectionSizeOrDefault(this_0, 10));
-    var _iterator__ex2g4s = this_0.o();
-    while (_iterator__ex2g4s.r()) {
-      var item = _iterator__ex2g4s.s();
+    var _iterator__ex2g4s = this_0.m();
+    while (_iterator__ex2g4s.p()) {
+      var item = _iterator__ex2g4s.q();
       // Inline function 'kotlin.collections.component1' call
-      var variable = item.b2();
+      var variable = item.c2();
       // Inline function 'kotlin.collections.component2' call
-      var term = item.c2();
-      var tmp$ret$2 = new Assignment(variable, term);
-      destination.l(tmp$ret$2);
+      var term = item.d2();
+      var tmp$ret$2 = new LeftAssignment(variable, term);
+      destination.j(tmp$ret$2);
     }
     return destination;
   }
@@ -786,39 +1056,26 @@
     var tmp_0 = asSequence_0(_this__u8e3s4);
     return tmp.ofSequence(map(tmp_0, toSubstitution$lambda));
   }
-  function toAssignmentPair(_this__u8e3s4) {
-    var tmp;
-    if (_this__u8e3s4.i1g()) {
-      tmp = _this__u8e3s4.d1g().v1g();
-    } else if (_this__u8e3s4.y1f().yt()) {
-      tmp = to(_this__u8e3s4.y1f().castToVar(), _this__u8e3s4.z1f());
-    } else if (_this__u8e3s4.z1f().yt()) {
-      tmp = to(_this__u8e3s4.z1f().castToVar(), _this__u8e3s4.y1f());
-    } else {
-      throw IllegalArgumentException_init_$Create$('Equation contains no variables: ' + toString(_this__u8e3s4));
-    }
-    return tmp;
-  }
   function toSubstitution$lambda(it) {
-    return toAssignmentPair(it);
+    return it.toAssignmentPair();
   }
   function Unificator$Companion$default$delegate$lambda() {
     return Companion_getInstance_2().strict();
   }
   function Unificator$Companion$_get_default_$ref_8i2tx3() {
-    return function (p0) {
-      return p0.k1h();
-    };
+    return constructCallableReference(function (p0) {
+      return p0.r1j();
+    }, 1, 0, 28);
   }
   function Unificator$Companion$naive$1($context) {
     AbstractUnificator.call(this, $context);
   }
-  protoOf(Unificator$Companion$naive$1).u1f = function (first, second) {
+  protoOf(Unificator$Companion$naive$1).v1g = function (first, second) {
     var tmp;
-    if (first.du() && second.du()) {
-      tmp = first.castToInteger().c2().gi(second.castToInteger().c2()) === 0;
-    } else if (first.cu() && second.cu()) {
-      tmp = first.castToNumeric().sx().xh(second.castToNumeric().sx()) === 0;
+    if (first.eu() && second.eu()) {
+      tmp = first.castToInteger().d2().hi(second.castToInteger().d2()) === 0;
+    } else if (first.du() && second.du()) {
+      tmp = first.castToNumeric().tx().yh(second.castToNumeric().tx()) === 0;
     } else {
       tmp = first.equals(second);
     }
@@ -830,7 +1087,7 @@
   function Unificator$Companion$strict$1($context) {
     AbstractUnificator.call(this, $context);
   }
-  protoOf(Unificator$Companion$strict$1).u1f = function (first, second) {
+  protoOf(Unificator$Companion$strict$1).v1g = function (first, second) {
     return first.equals(second);
   };
   protoOf(Unificator$Companion$strict$1).mguWithOccurCheck = function (term1, term2, occurCheckEnabled, $super) {
@@ -839,27 +1096,27 @@
   function Companion_0() {
     Companion_instance_1 = this;
     var tmp = this;
-    tmp.i1h_1 = lazy(Unificator$Companion$default$delegate$lambda);
-    this.j1h_1 = 32;
+    tmp.p1j_1 = lazy(Unificator$Companion$default$delegate$lambda);
+    this.q1j_1 = 32;
   }
-  protoOf(Companion_0).k1h = function () {
-    var tmp0 = this.i1h_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.c2();
+    /* dead property reference removed */
+    return tmp0.d2();
   };
   protoOf(Companion_0).mguWith = function (_this__u8e3s4, other) {
-    return this.k1h().mgu(_this__u8e3s4, other);
+    return this.r1j().mgu(_this__u8e3s4, other);
   };
   protoOf(Companion_0).matches = function (_this__u8e3s4, other) {
-    return this.k1h().match(_this__u8e3s4, other);
+    return this.r1j().match(_this__u8e3s4, other);
   };
   protoOf(Companion_0).unifyWith = function (_this__u8e3s4, other) {
-    return this.k1h().unify(_this__u8e3s4, other);
+    return this.r1j().unify(_this__u8e3s4, other);
   };
   protoOf(Companion_0).mergeWith = function (_this__u8e3s4, other) {
-    return this.k1h().merge(_this__u8e3s4, other);
+    return this.r1j().merge(_this__u8e3s4, other);
   };
   protoOf(Companion_0).naiveWithContext = function (context) {
     return new Unificator$Companion$naive$1(context);
@@ -873,10 +1130,10 @@
   protoOf(Companion_0).strict = function () {
     return this.strictWithContext(Companion_getInstance().empty());
   };
-  protoOf(Companion_0).p1h = function (other, capacity) {
+  protoOf(Companion_0).w1j = function (other, capacity) {
     var tmp;
     if (other instanceof CachedUnificator) {
-      tmp = new CachedUnificator(other.m1g_1, capacity);
+      tmp = new CachedUnificator(other.r1h_1, capacity);
     } else {
       tmp = new CachedUnificator(other, capacity);
     }
@@ -884,7 +1141,7 @@
   };
   protoOf(Companion_0).cached = function (other, capacity, $super) {
     capacity = capacity === VOID ? 32 : capacity;
-    return $super === VOID ? this.p1h(other, capacity) : $super.p1h.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() {
@@ -909,14 +1166,38 @@
   protoOf(CachedUnificator).unifyWithOccurCheck = unifyWithOccurCheck;
   protoOf(CachedUnificator).unify = unify;
   protoOf(CachedUnificator).merge = merge;
-  protoOf(Equation).jo = castTo;
+  protoOf(Equation).ko = castTo;
   defineProp(protoOf(Equation), 'lhs', function () {
-    return this.y1f();
+    return this.a1h();
   });
   defineProp(protoOf(Equation), 'rhs', function () {
-    return this.z1f();
+    return this.b1h();
+  });
+  defineProp(protoOf(Equation), 'isIdentity', function () {
+    return this.d1h();
+  });
+  defineProp(protoOf(Equation), 'isAssignment', function () {
+    return this.m1h();
+  });
+  defineProp(protoOf(Equation), 'isLeftAssignment', function () {
+    return this.b1i();
+  });
+  defineProp(protoOf(Equation), 'isRightAssignment', function () {
+    return this.c1i();
+  });
+  defineProp(protoOf(Equation), 'isComparison', function () {
+    return this.e1h();
+  });
+  defineProp(protoOf(Equation), 'isContradiction', function () {
+    return this.c1h();
+  });
+  defineProp(protoOf(Assignment), 'variable', function () {
+    return this.k1h();
+  });
+  defineProp(protoOf(Assignment), 'term', function () {
+    return this.l1h();
   });
-  defineProp(protoOf(Companion_0), 'default', protoOf(Companion_0).k1h);
+  defineProp(protoOf(Companion_0), 'default', protoOf(Companion_0).r1j);
   //endregion
   //region block: init
   Companion_instance_0 = new Companion();