@tuprolog/2p-full 0.32.5 → 1.0.0

package/2p-core.js

@@ -150,14 +150,14 @@
   var itemWiseEquals = kotlin_it_unibo_tuprolog_utils.$_$.b1;
   var toMap_0 = kotlin_kotlin.$_$.y4;
   var synchronizedOnSelf = kotlin_it_unibo_tuprolog_utils.$_$.k1;
-  var setOf = kotlin_kotlin.$_$.o4;
-  var emptySet = kotlin_kotlin.$_$.b3;
   var mapOf_0 = kotlin_kotlin.$_$.v3;
   var IntCompanionObject_instance = kotlin_kotlin.$_$.s1;
+  var emptySet = kotlin_kotlin.$_$.b3;
   var asSequence_2 = kotlin_kotlin.$_$.m2;
   var filter = kotlin_kotlin.$_$.e8;
   var firstOrNull_0 = kotlin_kotlin.$_$.f8;
   var Pair = kotlin_kotlin.$_$.tb;
+  var setOf = kotlin_kotlin.$_$.o4;
   var setOf_0 = kotlin_kotlin.$_$.n4;
   var defineProp = kotlin_kotlin.$_$.x5;
   var synchronizedOn = kotlin_it_unibo_tuprolog_utils.$_$.l1;
@@ -1349,15 +1349,15 @@
   function get__() {
     return this.anonymous();
   }
-  function listFrom(terms, last, $super) {
+  function logicListFromFrom(terms, last, $super) {
     last = last === VOID ? null : last;
     return $super === VOID ? this.g12(terms, last) : $super.g12.call(this, terms, last);
   }
-  function listFromIterable(terms, last, $super) {
+  function logicListFromIterable(terms, last, $super) {
     last = last === VOID ? null : last;
     return $super === VOID ? this.h12(terms, last) : $super.h12.call(this, terms, last);
   }
-  function listFromSequence(terms, last, $super) {
+  function logicListFromSequence(terms, last, $super) {
     last = last === VOID ? null : last;
     return $super === VOID ? this.i12(terms, last) : $super.i12.call(this, terms, last);
   }
@@ -1645,7 +1645,7 @@
   }
   function Info() {
     Info_instance = this;
-    this.xu_1 = '0.32.5';
+    this.xu_1 = '1.0.0';
     var tmp = this;
     tmp.yu_1 = lazy(Info$PLATFORM$delegate$lambda);
     var tmp_0 = this;
@@ -4472,7 +4472,7 @@
     return this.tw();
   };
   protoOf(AbstractCons).uw = function (scope) {
-    return setTags(scope.listFromSequence(this.ay()), this.vt()).castToCons();
+    return setTags(scope.logicListFromSequence(this.ay()), this.vt()).castToCons();
   };
   protoOf(AbstractCons).freshCopyFromScope = function (scope) {
     return this.uw(scope);
@@ -5155,7 +5155,7 @@
       tmp = this;
     } else {
       var tmp_0 = this.jx();
-      tmp = setTags(scope.setOfSequence(map(tmp_0, BlockImpl$freshCopy$lambda(scope))), this.vt());
+      tmp = setTags(scope.blockOfSequence(map(tmp_0, BlockImpl$freshCopy$lambda(scope))), this.vt());
     }
     return tmp;
   };
@@ -5545,7 +5545,7 @@
         var tmp$ret$0 = item.freshCopyFromScope(scope);
         destination.o(tmp$ret$0);
       }
-      tmp = setTags(scope.listOfIterable(destination), this.vt()).castToCons();
+      tmp = setTags(scope.logicListOfIterable(destination), this.vt()).castToCons();
     } else {
       // Inline function 'kotlin.collections.map' call
       var this_1 = this.zx();
@@ -5558,7 +5558,7 @@
         var tmp$ret$3 = item_0.freshCopyFromScope(scope);
         destination_0.o(tmp$ret$3);
       }
-      tmp = setTags(scope.listFromIterable(destination_0), this.vt()).castToCons();
+      tmp = setTags(scope.logicListFromIterable(destination_0), this.vt()).castToCons();
     }
     return tmp;
   };
@@ -7083,22 +7083,28 @@
   protoOf(ScopeImpl).varOf = function (name) {
     return this.v1d(name);
   };
-  protoOf(ScopeImpl).w1d = function (lambda) {
+  protoOf(ScopeImpl).w1d = function (name) {
+    return this.v1d(toString_0(name));
+  };
+  protoOf(ScopeImpl).varOfChar = function (name) {
+    return this.w1d(name);
+  };
+  protoOf(ScopeImpl).x1d = function (lambda) {
     // Inline function 'kotlin.also' call
     // Inline function 'kotlin.contracts.contract' call
     lambda(this);
     return this;
   };
   protoOf(ScopeImpl).where = function (lambda) {
-    return this.w1d(lambda);
+    return this.x1d(lambda);
   };
-  protoOf(ScopeImpl).x1d = function (lambda) {
+  protoOf(ScopeImpl).y1d = function (lambda) {
     // Inline function 'kotlin.with' call
     // Inline function 'kotlin.contracts.contract' call
     return lambda(this);
   };
   protoOf(ScopeImpl).with = function (lambda) {
-    return this.x1d(lambda);
+    return this.y1d(lambda);
   };
   protoOf(ScopeImpl).equals = function (other) {
     if (this === other)
@@ -7117,86 +7123,50 @@
   protoOf(ScopeImpl).toString = function () {
     return toString(this.sw());
   };
-  protoOf(ScopeImpl).y1d = function (value) {
+  protoOf(ScopeImpl).z1d = function (value) {
     return Companion_getInstance_24().of(value);
   };
   protoOf(ScopeImpl).truthOf = function (value) {
-    return this.y1d(value);
-  };
-  protoOf(ScopeImpl).z1d = function (terms) {
-    return Companion_instance_1.ofIterable(terms);
-  };
-  protoOf(ScopeImpl).setOfIterable = function (terms) {
-    return this.z1d(terms);
+    return this.z1d(value);
   };
   protoOf(ScopeImpl).a1e = function (terms) {
-    return Companion_instance_1.ofSequence(terms);
+    return Companion_instance_1.ofIterable(terms);
   };
-  protoOf(ScopeImpl).setOfSequence = function (terms) {
+  protoOf(ScopeImpl).blockOfIterable = function (terms) {
     return this.a1e(terms);
   };
-  protoOf(ScopeImpl).b1e = function (items) {
-    return setOf(items.slice());
+  protoOf(ScopeImpl).b1e = function (terms) {
+    return Companion_instance_1.ofSequence(terms);
   };
-  protoOf(ScopeImpl).ktSetOf = function (items) {
-    return this.b1e(items);
+  protoOf(ScopeImpl).blockOfSequence = function (terms) {
+    return this.b1e(terms);
   };
-  protoOf(ScopeImpl).c1e = function () {
-    return emptySet();
+  protoOf(ScopeImpl).c1e = function (terms) {
+    return Companion_instance_1.of(terms.slice());
   };
-  protoOf(ScopeImpl).ktEmptySet = function () {
-    return this.c1e();
+  protoOf(ScopeImpl).blockOf = function (terms) {
+    return this.c1e(terms);
   };
   protoOf(ScopeImpl).d1e = function (terms) {
-    return Companion_instance_1.of(terms.slice());
+    return Companion_instance_11.ofIterable(terms);
   };
-  protoOf(ScopeImpl).setOf = function (terms) {
+  protoOf(ScopeImpl).logicListOfIterable = function (terms) {
     return this.d1e(terms);
   };
   protoOf(ScopeImpl).e1e = function (terms) {
-    return Companion_instance_11.ofIterable(terms);
-  };
-  protoOf(ScopeImpl).listOfIterable = function (terms) {
-    return this.e1e(terms);
-  };
-  protoOf(ScopeImpl).f1e = function (terms) {
     return Companion_instance_11.ofSequence(terms);
   };
-  protoOf(ScopeImpl).listOfSequence = function (terms) {
-    return this.f1e(terms);
-  };
-  protoOf(ScopeImpl).g1e = function (items) {
-    return listOf(items.slice());
-  };
-  protoOf(ScopeImpl).ktListOf = function (items) {
-    return this.g1e(items);
-  };
-  protoOf(ScopeImpl).h1e = function () {
-    return emptyList();
-  };
-  protoOf(ScopeImpl).ktEmptyList = function () {
-    return this.h1e();
-  };
-  protoOf(ScopeImpl).i1e = function (_this__u8e3s4, item, items) {
-    return this.j1e(_this__u8e3s4, this.g1e(arrayConcat([[item], items])));
-  };
-  protoOf(ScopeImpl).append = function (_this__u8e3s4, item, items) {
-    return this.i1e(_this__u8e3s4, (item == null ? true : !(item == null)) ? item : THROW_CCE(), items);
-  };
-  protoOf(ScopeImpl).j1e = function (_this__u8e3s4, other) {
-    return plus(_this__u8e3s4, other);
-  };
-  protoOf(ScopeImpl).concat = function (_this__u8e3s4, other) {
-    return this.j1e(_this__u8e3s4, other);
+  protoOf(ScopeImpl).logicListOfSequence = function (terms) {
+    return this.e1e(terms);
   };
   protoOf(ScopeImpl).e12 = function () {
     return Companion_getInstance_9().invoke();
   };
-  protoOf(ScopeImpl).k1e = function (terms) {
+  protoOf(ScopeImpl).f1e = function (terms) {
     return Companion_instance_11.of(terms.slice());
   };
-  protoOf(ScopeImpl).listOf = function (terms) {
-    return this.k1e(terms);
+  protoOf(ScopeImpl).logicListOf = function (terms) {
+    return this.f1e(terms);
   };
   protoOf(ScopeImpl).g12 = function (terms, last) {
     return Companion_instance_11.from(terms.slice(), last);
@@ -7207,247 +7177,253 @@
   protoOf(ScopeImpl).h12 = function (terms, last) {
     return Companion_instance_11.fromIterable(terms, last);
   };
-  protoOf(ScopeImpl).l1e = function (terms) {
+  protoOf(ScopeImpl).g1e = function (terms) {
     return Companion_instance_23.ofList(toList_0(terms));
   };
   protoOf(ScopeImpl).tupleOfIterable = function (terms) {
-    return this.l1e(terms);
+    return this.g1e(terms);
   };
-  protoOf(ScopeImpl).m1e = function (terms) {
+  protoOf(ScopeImpl).h1e = function (terms) {
     return Companion_instance_23.ofList(toList_1(terms));
   };
   protoOf(ScopeImpl).tupleOfSequence = function (terms) {
-    return this.m1e(terms);
+    return this.h1e(terms);
   };
-  protoOf(ScopeImpl).n1e = function (terms) {
+  protoOf(ScopeImpl).i1e = function (terms) {
     return Companion_instance_23.ofList(toList(terms));
   };
   protoOf(ScopeImpl).tupleOf = function (terms) {
-    return this.n1e(terms);
+    return this.i1e(terms);
   };
-  protoOf(ScopeImpl).o1e = function (value) {
+  protoOf(ScopeImpl).j1e = function (value) {
     return Companion_getInstance_2().of(value);
   };
   protoOf(ScopeImpl).atomOf = function (value) {
-    return this.o1e(value);
+    return this.j1e(value);
+  };
+  protoOf(ScopeImpl).k1e = function (value) {
+    return Companion_getInstance_2().of(toString_0(value));
+  };
+  protoOf(ScopeImpl).atomOfChar = function (value) {
+    return this.k1e(value);
   };
-  protoOf(ScopeImpl).p1e = function (functor, args) {
+  protoOf(ScopeImpl).l1e = function (functor, args) {
     return Companion_getInstance_19().of(functor, args.slice());
   };
   protoOf(ScopeImpl).structOf = function (functor, args) {
-    return this.p1e(functor, args);
+    return this.l1e(functor, args);
   };
-  protoOf(ScopeImpl).q1e = function (functor, args) {
+  protoOf(ScopeImpl).m1e = function (functor, args) {
     return Companion_getInstance_19().ofSequence(functor, args);
   };
   protoOf(ScopeImpl).structOfSequence = function (functor, args) {
-    return this.q1e(functor, args);
+    return this.m1e(functor, args);
   };
-  protoOf(ScopeImpl).r1e = function (functor, args) {
+  protoOf(ScopeImpl).n1e = function (functor, args) {
     return Companion_getInstance_19().ofIterable(functor, args);
   };
   protoOf(ScopeImpl).structOfIterable = function (functor, args) {
-    return this.r1e(functor, args);
+    return this.n1e(functor, args);
   };
-  protoOf(ScopeImpl).s1e = function (functor, args) {
+  protoOf(ScopeImpl).o1e = function (functor, args) {
     return Companion_getInstance_19().ofList(functor, args);
   };
   protoOf(ScopeImpl).structOfList = function (functor, args) {
-    return this.s1e(functor, args);
+    return this.o1e(functor, args);
   };
-  protoOf(ScopeImpl).t1e = function (head) {
+  protoOf(ScopeImpl).p1e = function (head) {
     return Companion_instance_8.of(head);
   };
   protoOf(ScopeImpl).factOf = function (head) {
-    return this.t1e(head);
+    return this.p1e(head);
   };
-  protoOf(ScopeImpl).u1e = function (head, body1, body) {
+  protoOf(ScopeImpl).q1e = function (head, body1, body) {
     return Companion_instance_15.of(head, arrayConcat([[body1], body]));
   };
   protoOf(ScopeImpl).ruleOf = function (head, body1, body) {
-    return this.u1e(head, body1, body);
+    return this.q1e(head, body1, body);
   };
-  protoOf(ScopeImpl).v1e = function (body1, body) {
+  protoOf(ScopeImpl).r1e = function (body1, body) {
     return Companion_instance_4.of(body1, body.slice());
   };
   protoOf(ScopeImpl).directiveOf = function (body1, body) {
-    return this.v1e(body1, body);
+    return this.r1e(body1, body);
   };
-  protoOf(ScopeImpl).w1e = function (head, body) {
+  protoOf(ScopeImpl).s1e = function (head, body) {
     return Companion_getInstance_4().yy(head, body.slice());
   };
   protoOf(ScopeImpl).clauseOf = function (head, body) {
-    return this.w1e(head, body);
+    return this.s1e(head, body);
   };
-  protoOf(ScopeImpl).x1e = function (head, tail) {
+  protoOf(ScopeImpl).t1e = function (head, tail) {
     return Companion_instance_3.of(head, tail);
   };
   protoOf(ScopeImpl).consOf = function (head, tail) {
-    return this.x1e(head, tail);
+    return this.t1e(head, tail);
   };
-  protoOf(ScopeImpl).y1e = function (name, arity) {
+  protoOf(ScopeImpl).u1e = function (name, arity) {
     return Companion_instance_9.of(name, arity);
   };
   protoOf(ScopeImpl).indicatorOf = function (name, arity) {
-    return this.y1e(name, arity);
+    return this.u1e(name, arity);
   };
-  protoOf(ScopeImpl).z1e = function (name, arity) {
+  protoOf(ScopeImpl).v1e = function (name, arity) {
     return Companion_instance_9.ofString(name, arity);
   };
   protoOf(ScopeImpl).indicatorOfStringInt = function (name, arity) {
-    return this.z1e(name, arity);
+    return this.v1e(name, arity);
   };
-  protoOf(ScopeImpl).a1f = function () {
+  protoOf(ScopeImpl).w1e = function () {
     return Companion_getInstance_26().anonymous();
   };
   protoOf(ScopeImpl).anonymous = function () {
-    return this.a1f();
+    return this.w1e();
   };
-  protoOf(ScopeImpl).b1f = function () {
-    return this.a1f();
+  protoOf(ScopeImpl).x1e = function () {
+    return this.w1e();
   };
   protoOf(ScopeImpl).whatever = function () {
-    return this.b1f();
+    return this.x1e();
   };
-  protoOf(ScopeImpl).c1f = function (value) {
+  protoOf(ScopeImpl).y1e = function (value) {
     return Companion_getInstance_15().ofBigDecimal(value);
   };
   protoOf(ScopeImpl).numOfBigDecimal = function (value) {
-    return this.c1f(value);
+    return this.y1e(value);
   };
-  protoOf(ScopeImpl).d1f = function (value) {
+  protoOf(ScopeImpl).z1e = function (value) {
     return Companion_getInstance_15().ofDouble(value);
   };
   protoOf(ScopeImpl).numOfDouble = function (value) {
-    return this.d1f(value);
+    return this.z1e(value);
   };
-  protoOf(ScopeImpl).e1f = function (value) {
+  protoOf(ScopeImpl).a1f = function (value) {
     return Companion_getInstance_15().ofFloat(value);
   };
   protoOf(ScopeImpl).numOfFloat = function (value) {
-    return this.e1f(value);
+    return this.a1f(value);
   };
-  protoOf(ScopeImpl).f1f = function (value) {
+  protoOf(ScopeImpl).b1f = function (value) {
     return Companion_getInstance_15().ofBigInteger(value);
   };
   protoOf(ScopeImpl).numOfBigInteger = function (value) {
-    return this.f1f(value);
+    return this.b1f(value);
   };
-  protoOf(ScopeImpl).g1f = function (value) {
+  protoOf(ScopeImpl).c1f = function (value) {
     return Companion_getInstance_15().ofInteger(value);
   };
   protoOf(ScopeImpl).numOfInt = function (value) {
-    return this.g1f(value);
+    return this.c1f(value);
   };
-  protoOf(ScopeImpl).h1f = function (value) {
+  protoOf(ScopeImpl).d1f = function (value) {
     return Companion_getInstance_15().ofLong(value);
   };
   protoOf(ScopeImpl).numOfLong = function (value) {
-    return this.h1f(value);
+    return this.d1f(value);
   };
-  protoOf(ScopeImpl).i1f = function (value) {
+  protoOf(ScopeImpl).e1f = function (value) {
     return Companion_getInstance_15().ofShort(value);
   };
   protoOf(ScopeImpl).numOfShort = function (value) {
-    return this.i1f(value);
+    return this.e1f(value);
   };
-  protoOf(ScopeImpl).j1f = function (value) {
+  protoOf(ScopeImpl).f1f = function (value) {
     return Companion_getInstance_15().ofByte(value);
   };
   protoOf(ScopeImpl).numOfByte = function (value) {
-    return this.j1f(value);
+    return this.f1f(value);
   };
-  protoOf(ScopeImpl).k1f = function (value) {
+  protoOf(ScopeImpl).g1f = function (value) {
     return Companion_getInstance_15().parse(value);
   };
   protoOf(ScopeImpl).parseNum = function (value) {
-    return this.k1f(value);
+    return this.g1f(value);
   };
-  protoOf(ScopeImpl).l1f = function (value) {
+  protoOf(ScopeImpl).h1f = function (value) {
     return Companion_getInstance_15().of(value);
   };
   protoOf(ScopeImpl).numOf = function (value) {
-    return this.l1f(value);
+    return this.h1f(value);
   };
-  protoOf(ScopeImpl).m1f = function (value) {
+  protoOf(ScopeImpl).i1f = function (value) {
     return Companion_getInstance_12().ofBigInteger(value);
   };
   protoOf(ScopeImpl).intOfBigInteger = function (value) {
-    return this.m1f(value);
+    return this.i1f(value);
   };
-  protoOf(ScopeImpl).n1f = function (value) {
+  protoOf(ScopeImpl).j1f = function (value) {
     return Companion_getInstance_12().ofInt(value);
   };
   protoOf(ScopeImpl).intOf = function (value) {
-    return this.n1f(value);
+    return this.j1f(value);
   };
-  protoOf(ScopeImpl).o1f = function (value) {
+  protoOf(ScopeImpl).k1f = function (value) {
     return Companion_getInstance_12().ofLong(value);
   };
   protoOf(ScopeImpl).intOfLong = function (value) {
-    return this.o1f(value);
+    return this.k1f(value);
   };
-  protoOf(ScopeImpl).p1f = function (value) {
+  protoOf(ScopeImpl).l1f = function (value) {
     return Companion_getInstance_12().ofShort(value);
   };
   protoOf(ScopeImpl).intOfShort = function (value) {
-    return this.p1f(value);
+    return this.l1f(value);
   };
-  protoOf(ScopeImpl).q1f = function (value) {
+  protoOf(ScopeImpl).m1f = function (value) {
     return Companion_getInstance_12().ofByte(value);
   };
   protoOf(ScopeImpl).intOfByte = function (value) {
-    return this.q1f(value);
+    return this.m1f(value);
   };
-  protoOf(ScopeImpl).r1f = function (value) {
+  protoOf(ScopeImpl).n1f = function (value) {
     return Companion_getInstance_12().parse(value);
   };
   protoOf(ScopeImpl).parseInt = function (value) {
-    return this.r1f(value);
+    return this.n1f(value);
   };
-  protoOf(ScopeImpl).s1f = function (value, radix) {
+  protoOf(ScopeImpl).o1f = function (value, radix) {
     return Companion_getInstance_12().parseRadix(value, radix);
   };
   protoOf(ScopeImpl).parseIntRadix = function (value, radix) {
-    return this.s1f(value, radix);
+    return this.o1f(value, radix);
   };
-  protoOf(ScopeImpl).t1f = function (value) {
+  protoOf(ScopeImpl).p1f = function (value) {
     return Companion_getInstance_16().ofBigDecimal(value);
   };
   protoOf(ScopeImpl).realOfBigDecimal = function (value) {
-    return this.t1f(value);
+    return this.p1f(value);
   };
-  protoOf(ScopeImpl).u1f = function (value) {
+  protoOf(ScopeImpl).q1f = function (value) {
     return Companion_getInstance_16().ofDouble(value);
   };
   protoOf(ScopeImpl).realOf = function (value) {
-    return this.u1f(value);
+    return this.q1f(value);
   };
-  protoOf(ScopeImpl).v1f = function (value) {
+  protoOf(ScopeImpl).r1f = function (value) {
     return Companion_getInstance_16().ofFloat(value);
   };
   protoOf(ScopeImpl).realOfFloat = function (value) {
-    return this.v1f(value);
+    return this.r1f(value);
   };
-  protoOf(ScopeImpl).w1f = function (value) {
+  protoOf(ScopeImpl).s1f = function (value) {
     return Companion_getInstance_16().parse(value);
   };
   protoOf(ScopeImpl).parseReal = function (value) {
-    return this.w1f(value);
+    return this.s1f(value);
   };
-  protoOf(ScopeImpl).x1f = function (assignments) {
+  protoOf(ScopeImpl).t1f = function (assignments) {
     return Companion_getInstance_20().unifierIterable(assignments);
   };
   protoOf(ScopeImpl).unifierOfIterable = function (assignments) {
-    return this.x1f(assignments);
+    return this.t1f(assignments);
   };
-  protoOf(ScopeImpl).y1f = function (assignments) {
-    return this.x1f(asIterable_0(assignments));
+  protoOf(ScopeImpl).u1f = function (assignments) {
+    return this.t1f(asIterable_0(assignments));
   };
   protoOf(ScopeImpl).unifierOfSequence = function (assignments) {
-    return this.y1f(assignments);
+    return this.u1f(assignments);
   };
-  protoOf(ScopeImpl).z1f = function (assignments) {
+  protoOf(ScopeImpl).v1f = function (assignments) {
     // Inline function 'kotlin.collections.map' call
     // Inline function 'kotlin.collections.mapTo' call
     var destination = ArrayList_init_$Create$(assignments.length);
@@ -7462,24 +7438,24 @@
       var tmp$ret$0 = to(this.v1d(v), t);
       destination.o(tmp$ret$0);
     }
-    return this.x1f(destination);
+    return this.t1f(destination);
   };
   protoOf(ScopeImpl).unifierOf = function (assignments) {
-    return this.z1f(assignments);
+    return this.v1f(assignments);
   };
-  protoOf(ScopeImpl).a1g = function (assignments) {
+  protoOf(ScopeImpl).w1f = function (assignments) {
     return Companion_getInstance_20().ofIterable(assignments);
   };
   protoOf(ScopeImpl).substitutionOfIterable = function (assignments) {
-    return this.a1g(assignments);
+    return this.w1f(assignments);
   };
-  protoOf(ScopeImpl).b1g = function (assignments) {
-    return this.a1g(asIterable_0(assignments));
+  protoOf(ScopeImpl).x1f = function (assignments) {
+    return this.w1f(asIterable_0(assignments));
   };
   protoOf(ScopeImpl).substitutionOfSequence = function (assignments) {
-    return this.b1g(assignments);
+    return this.x1f(assignments);
   };
-  protoOf(ScopeImpl).c1g = function (assignments) {
+  protoOf(ScopeImpl).y1f = function (assignments) {
     // Inline function 'kotlin.collections.map' call
     // Inline function 'kotlin.collections.mapTo' call
     var destination = ArrayList_init_$Create$(assignments.length);
@@ -7494,10 +7470,10 @@
       var tmp$ret$0 = to(this.v1d(v), t);
       destination.o(tmp$ret$0);
     }
-    return this.a1g(destination);
+    return this.w1f(destination);
   };
   protoOf(ScopeImpl).substitutionOf = function (assignments) {
-    return this.c1g(assignments);
+    return this.y1f(assignments);
   };
   function SimpleTermFormatter(quoted, numberVars, ignoreOps) {
     quoted = quoted === VOID ? true : quoted;
@@ -7516,25 +7492,25 @@
   function StructImpl(functor, args, tags) {
     tags = tags === VOID ? emptyMap() : tags;
     AbstractStruct.call(this, functor, args, tags);
-    this.h1g_1 = functor;
-    this.i1g_1 = args;
+    this.d1g_1 = functor;
+    this.e1g_1 = args;
     var tmp = this;
-    tmp.j1g_1 = lazy(StructImpl$isGround$delegate$lambda(this));
+    tmp.f1g_1 = lazy(StructImpl$isGround$delegate$lambda(this));
   }
   protoOf(StructImpl).qw = function () {
-    return this.h1g_1;
+    return this.d1g_1;
   };
   protoOf(StructImpl).rw = function () {
-    return this.i1g_1;
+    return this.e1g_1;
   };
   protoOf(StructImpl).ux = function () {
     // Inline function 'kotlin.getValue' call
-    var this_0 = this.j1g_1;
+    var this_0 = this.f1g_1;
     isGround$factory();
     return this_0.r2();
   };
   protoOf(StructImpl).a16 = function (tags) {
-    return new StructImpl(this.h1g_1, this.i1g_1, tags);
+    return new StructImpl(this.d1g_1, this.e1g_1, tags);
   };
   protoOf(StructImpl).br = function () {
     return this.kx();
@@ -7566,15 +7542,15 @@
     return this.p14((!(value == null) ? isInterface(value, Term) : false) ? value : THROW_CCE());
   };
   function OperatorDecorations(prefix, suffix) {
-    this.n1g_1 = prefix;
-    this.o1g_1 = suffix;
+    this.j1g_1 = prefix;
+    this.k1g_1 = suffix;
   }
   protoOf(OperatorDecorations).toString = function () {
-    return 'OperatorDecorations(prefix=' + this.n1g_1 + ', suffix=' + this.o1g_1 + ')';
+    return 'OperatorDecorations(prefix=' + this.j1g_1 + ', suffix=' + this.k1g_1 + ')';
   };
   protoOf(OperatorDecorations).hashCode = function () {
-    var result = getStringHashCode(this.n1g_1);
-    result = imul(result, 31) + getStringHashCode(this.o1g_1) | 0;
+    var result = getStringHashCode(this.j1g_1);
+    result = imul(result, 31) + getStringHashCode(this.k1g_1) | 0;
     return result;
   };
   protoOf(OperatorDecorations).equals = function (other) {
@@ -7583,26 +7559,26 @@
     if (!(other instanceof OperatorDecorations))
       return false;
     var tmp0_other_with_cast = other instanceof OperatorDecorations ? other : THROW_CCE();
-    if (!(this.n1g_1 === tmp0_other_with_cast.n1g_1))
+    if (!(this.j1g_1 === tmp0_other_with_cast.j1g_1))
       return false;
-    if (!(this.o1g_1 === tmp0_other_with_cast.o1g_1))
+    if (!(this.k1g_1 === tmp0_other_with_cast.k1g_1))
       return false;
     return true;
   };
   function _get_decorations__mnzyq(_this__u8e3s4, $this) {
-    var tmp0_elvis_lhs = $this.q1g_1.x2(_this__u8e3s4);
-    return tmp0_elvis_lhs == null ? $this.p1g_1 : tmp0_elvis_lhs;
+    var tmp0_elvis_lhs = $this.m1g_1.x2(_this__u8e3s4);
+    return tmp0_elvis_lhs == null ? $this.l1g_1 : tmp0_elvis_lhs;
   }
   function _get_prefix__wiwq7t(_this__u8e3s4, $this) {
-    return _get_decorations__mnzyq(_this__u8e3s4, $this).n1g_1;
+    return _get_decorations__mnzyq(_this__u8e3s4, $this).j1g_1;
   }
   function _get_suffix__6yo6oq(_this__u8e3s4, $this) {
-    return _get_decorations__mnzyq(_this__u8e3s4, $this).o1g_1;
+    return _get_decorations__mnzyq(_this__u8e3s4, $this).k1g_1;
   }
   function Companion_29() {
     Companion_instance_29 = this;
-    this.p1g_1 = new OperatorDecorations(' ', ' ');
-    this.q1g_1 = mapOf_0([to(',', new OperatorDecorations('', ' ')), to(';', new OperatorDecorations('', ' ')), to('\\+', new OperatorDecorations('', ' '))]);
+    this.l1g_1 = new OperatorDecorations(' ', ' ');
+    this.m1g_1 = mapOf_0([to(',', new OperatorDecorations('', ' ')), to(';', new OperatorDecorations('', ' ')), to('\\+', new OperatorDecorations('', ' '))]);
   }
   var Companion_instance_29;
   function Companion_getInstance_31() {
@@ -7625,7 +7601,7 @@
   }
   function addingParenthesesIfForced($this, struct, stringGenerator) {
     var string = stringGenerator(struct);
-    if ($this.x1g_1.n(struct.qw())) {
+    if ($this.t1g_1.n(struct.qw())) {
       return wrapWithinParentheses(string, $this);
     }
     return string;
@@ -7650,14 +7626,14 @@
     return protoOf(AbstractTermFormatter).ry.call($this, struct);
   }
   function childFormatter($this, priority, forceParentheses) {
-    return new TermFormatterWithPrettyExpressions(priority, $this.v1g_1, $this.w1g_1, forceParentheses, $this.a17_1, $this.b17_1, $this.c17_1);
+    return new TermFormatterWithPrettyExpressions(priority, $this.r1g_1, $this.s1g_1, forceParentheses, $this.a17_1, $this.b17_1, $this.c17_1);
   }
   function childFormatter$default($this, priority, forceParentheses, $super) {
     forceParentheses = forceParentheses === VOID ? emptySet() : forceParentheses;
     return childFormatter($this, priority, forceParentheses);
   }
   function isOperator(_this__u8e3s4, $this) {
-    return $this.w1g_1.u2(_this__u8e3s4);
+    return $this.s1g_1.u2(_this__u8e3s4);
   }
   function getSpecifierAndIndex(_this__u8e3s4, $this, functor, priorityPredicate, specifierPredicate) {
     var tmp0_safe_receiver = _this__u8e3s4.x2(functor);
@@ -7695,7 +7671,7 @@
     var tmp;
     if (_this__u8e3s4.kw() === 1) {
       var tmp_0 = _this__u8e3s4.qw();
-      tmp = getSpecifierAndIndexWithNonGreaterPriority($this.w1g_1, $this, tmp_0, $this.u1g_1, TermFormatterWithPrettyExpressions$isPrefix$lambda);
+      tmp = getSpecifierAndIndexWithNonGreaterPriority($this.s1g_1, $this, tmp_0, $this.q1g_1, TermFormatterWithPrettyExpressions$isPrefix$lambda);
     } else {
       tmp = null;
     }
@@ -7705,7 +7681,7 @@
     var tmp;
     if (_this__u8e3s4.kw() === 1) {
       var tmp_0 = _this__u8e3s4.qw();
-      tmp = getSpecifierAndIndexWithNonGreaterPriority($this.w1g_1, $this, tmp_0, $this.u1g_1, TermFormatterWithPrettyExpressions$isPostfix$lambda);
+      tmp = getSpecifierAndIndexWithNonGreaterPriority($this.s1g_1, $this, tmp_0, $this.q1g_1, TermFormatterWithPrettyExpressions$isPostfix$lambda);
     } else {
       tmp = null;
     }
@@ -7715,7 +7691,7 @@
     var tmp;
     if (_this__u8e3s4.kw() === 2) {
       var tmp_0 = _this__u8e3s4.qw();
-      tmp = getSpecifierAndIndexWithNonGreaterPriority($this.w1g_1, $this, tmp_0, $this.u1g_1, TermFormatterWithPrettyExpressions$isInfix$lambda);
+      tmp = getSpecifierAndIndexWithNonGreaterPriority($this.s1g_1, $this, tmp_0, $this.q1g_1, TermFormatterWithPrettyExpressions$isInfix$lambda);
     } else {
       tmp = null;
     }
@@ -7726,11 +7702,11 @@
     switch (_this__u8e3s4.kw()) {
       case 1:
         var tmp_0 = _this__u8e3s4.qw();
-        tmp = getSpecifierAndIndexWithGreaterPriority($this.w1g_1, $this, tmp_0, $this.u1g_1, TermFormatterWithPrettyExpressions$isLowerPriority$lambda);
+        tmp = getSpecifierAndIndexWithGreaterPriority($this.s1g_1, $this, tmp_0, $this.q1g_1, TermFormatterWithPrettyExpressions$isLowerPriority$lambda);
         break;
       case 2:
         var tmp_1 = _this__u8e3s4.qw();
-        tmp = getSpecifierAndIndexWithGreaterPriority($this.w1g_1, $this, tmp_1, $this.u1g_1, TermFormatterWithPrettyExpressions$isLowerPriority$lambda_0);
+        tmp = getSpecifierAndIndexWithGreaterPriority($this.s1g_1, $this, tmp_1, $this.q1g_1, TermFormatterWithPrettyExpressions$isLowerPriority$lambda_0);
         break;
       default:
         tmp = null;
@@ -7765,7 +7741,7 @@
   }
   function TermFormatterWithPrettyExpressions$getSpecifierAndIndex$lambda_0(this$0) {
     return function (it) {
-      return !this$0.x1g_1.n(it.q2().g9_1);
+      return !this$0.t1g_1.n(it.q2().g9_1);
     };
   }
   function TermFormatterWithPrettyExpressions$getSpecifierAndIndex$lambda_1(it) {
@@ -7783,19 +7759,19 @@
     };
   }
   function TermFormatterWithPrettyExpressions$isPrefix$lambda($this$getSpecifierAndIndexWithNonGreaterPriority) {
-    return $this$getSpecifierAndIndexWithNonGreaterPriority.a1h();
+    return $this$getSpecifierAndIndexWithNonGreaterPriority.w1g();
   }
   function TermFormatterWithPrettyExpressions$isPostfix$lambda($this$getSpecifierAndIndexWithNonGreaterPriority) {
-    return $this$getSpecifierAndIndexWithNonGreaterPriority.b1h();
+    return $this$getSpecifierAndIndexWithNonGreaterPriority.x1g();
   }
   function TermFormatterWithPrettyExpressions$isInfix$lambda($this$getSpecifierAndIndexWithNonGreaterPriority) {
-    return $this$getSpecifierAndIndexWithNonGreaterPriority.c1h();
+    return $this$getSpecifierAndIndexWithNonGreaterPriority.y1g();
   }
   function TermFormatterWithPrettyExpressions$isLowerPriority$lambda($this$getSpecifierAndIndexWithGreaterPriority) {
-    return $this$getSpecifierAndIndexWithGreaterPriority.a1h() ? true : $this$getSpecifierAndIndexWithGreaterPriority.b1h();
+    return $this$getSpecifierAndIndexWithGreaterPriority.w1g() ? true : $this$getSpecifierAndIndexWithGreaterPriority.x1g();
   }
   function TermFormatterWithPrettyExpressions$isLowerPriority$lambda_0($this$getSpecifierAndIndexWithGreaterPriority) {
-    return $this$getSpecifierAndIndexWithGreaterPriority.c1h();
+    return $this$getSpecifierAndIndexWithGreaterPriority.y1g();
   }
   function TermFormatterWithPrettyExpressions(priority, delegate, operators, forceParentheses, quoted, numberVars, ignoreOps) {
     Companion_getInstance_31();
@@ -7803,43 +7779,43 @@
     numberVars = numberVars === VOID ? false : numberVars;
     ignoreOps = ignoreOps === VOID ? false : ignoreOps;
     AbstractTermFormatter.call(this, quoted, numberVars, ignoreOps);
-    this.u1g_1 = priority;
-    this.v1g_1 = delegate;
-    this.w1g_1 = operators;
-    this.x1g_1 = forceParentheses;
+    this.q1g_1 = priority;
+    this.r1g_1 = delegate;
+    this.s1g_1 = operators;
+    this.t1g_1 = forceParentheses;
   }
   protoOf(TermFormatterWithPrettyExpressions).zy = function (term) {
-    return term.accept(this.v1g_1);
+    return term.accept(this.r1g_1);
   };
   protoOf(TermFormatterWithPrettyExpressions).visitVar = function (term) {
     return this.zy(term);
   };
   protoOf(TermFormatterWithPrettyExpressions).f17 = function (term) {
-    return term.accept(this.v1g_1);
+    return term.accept(this.r1g_1);
   };
   protoOf(TermFormatterWithPrettyExpressions).visitAtom = function (term) {
     return this.f17(term);
   };
-  protoOf(TermFormatterWithPrettyExpressions).d1h = function (term) {
-    return term.accept(this.v1g_1);
+  protoOf(TermFormatterWithPrettyExpressions).z1g = function (term) {
+    return term.accept(this.r1g_1);
   };
   protoOf(TermFormatterWithPrettyExpressions).visitInteger = function (term) {
-    return this.d1h(term);
+    return this.z1g(term);
   };
-  protoOf(TermFormatterWithPrettyExpressions).e1h = function (term) {
-    return term.accept(this.v1g_1);
+  protoOf(TermFormatterWithPrettyExpressions).a1h = function (term) {
+    return term.accept(this.r1g_1);
   };
   protoOf(TermFormatterWithPrettyExpressions).visitReal = function (term) {
-    return this.e1h(term);
+    return this.a1h(term);
   };
   protoOf(TermFormatterWithPrettyExpressions).py = function (term) {
-    return term.accept(this.v1g_1);
+    return term.accept(this.r1g_1);
   };
   protoOf(TermFormatterWithPrettyExpressions).visitEmptyBlock = function (term) {
     return this.py(term);
   };
   protoOf(TermFormatterWithPrettyExpressions).t11 = function (term) {
-    return term.accept(this.v1g_1);
+    return term.accept(this.r1g_1);
   };
   protoOf(TermFormatterWithPrettyExpressions).visitEmptyList = function (term) {
     return this.t11(term);
@@ -7861,7 +7837,7 @@
     var op = ',';
     var tmp = term.ay();
     var string = joinToString(map(tmp, TermFormatterWithPrettyExpressions$visitTuple$lambda(this)), _get_prefix__wiwq7t(op, Companion_getInstance_31()) + op + _get_suffix__6yo6oq(op, Companion_getInstance_31()));
-    if (this.x1g_1.n(op)) {
+    if (this.t1g_1.n(op)) {
       return wrapWithinParentheses(string, this);
     }
     return string;
@@ -7971,16 +7947,16 @@
   function TruthImpl(value, isTrue, tags) {
     tags = tags === VOID ? emptyMap() : tags;
     AtomImpl.call(this, value, tags);
-    this.o1h_1 = isTrue;
+    this.k1h_1 = isTrue;
   }
   protoOf(TruthImpl).ow = function () {
-    return this.o1h_1;
+    return this.k1h_1;
   };
   protoOf(TruthImpl).toString = function () {
     return this.r2();
   };
   protoOf(TruthImpl).a16 = function (tags) {
-    return new TruthImpl(this.r2(), this.o1h_1, tags);
+    return new TruthImpl(this.r2(), this.k1h_1, tags);
   };
   protoOf(TruthImpl).tw = function () {
     return this;
@@ -8019,18 +7995,18 @@
     return this.tx();
   };
   function _no_name_provided__qut3iv_3(this$0) {
-    this.p1h_1 = this$0;
+    this.l1h_1 = this$0;
   }
   protoOf(_no_name_provided__qut3iv_3).r = function () {
     // Inline function 'it.unibo.tuprolog.core.impl.TupleImpl.<get-unfoldedSequence>.<anonymous>' call
-    return new TupleIterator(this.p1h_1);
+    return new TupleIterator(this.l1h_1);
   };
   function _no_name_provided__qut3iv_4(this$0) {
-    this.q1h_1 = this$0;
+    this.m1h_1 = this$0;
   }
   protoOf(_no_name_provided__qut3iv_4).r = function () {
     // Inline function 'it.unibo.tuprolog.core.impl.TupleImpl.unfold.<anonymous>' call
-    return new TupleUnfolder(this.q1h_1);
+    return new TupleUnfolder(this.m1h_1);
   };
   function TupleImpl$freshCopy$lambda($scope) {
     return function (it) {
@@ -8041,22 +8017,22 @@
     tags = tags === VOID ? emptyMap() : tags;
     Terms_getInstance();
     RecursiveImpl.call(this, ',', listOf([left, right]), tags);
-    this.w1h_1 = left;
-    this.x1h_1 = right;
-    this.y1h_1 = this.d16();
-    this.z1h_1 = ',';
+    this.s1h_1 = left;
+    this.t1h_1 = right;
+    this.u1h_1 = this.d16();
+    this.v1h_1 = ',';
   }
   protoOf(TupleImpl).ky = function () {
-    return this.w1h_1;
+    return this.s1h_1;
   };
   protoOf(TupleImpl).jy = function () {
-    return this.x1h_1;
+    return this.t1h_1;
   };
   protoOf(TupleImpl).ux = function () {
-    return this.y1h_1;
+    return this.u1h_1;
   };
   protoOf(TupleImpl).d16 = function () {
-    return this.w1h_1.ux() ? this.x1h_1.ux() : false;
+    return this.s1h_1.ux() ? this.t1h_1.ux() : false;
   };
   protoOf(TupleImpl).ay = function () {
     // Inline function 'kotlin.collections.Iterable' call
@@ -8075,13 +8051,13 @@
     return this.t15();
   };
   protoOf(TupleImpl).qw = function () {
-    return this.z1h_1;
+    return this.v1h_1;
   };
   protoOf(TupleImpl).toString = function () {
     return joinToString(this.ay(), ', ', '(', ')');
   };
   protoOf(TupleImpl).a16 = function (tags) {
-    return new TupleImpl(this.w1h_1, this.x1h_1, tags);
+    return new TupleImpl(this.s1h_1, this.t1h_1, tags);
   };
   protoOf(TupleImpl).tw = function () {
     return protoOf(RecursiveImpl).tw.call(this).castToTuple();
@@ -8091,7 +8067,7 @@
   };
   protoOf(TupleImpl).uw = function (scope) {
     var tmp;
-    if (this.y1h_1) {
+    if (this.u1h_1) {
       tmp = this;
     } else {
       var tmp_0 = this.jx();
@@ -8130,33 +8106,33 @@
     return this.yx();
   };
   function TupleUnfolder$tupleUnfolderVisitor$1(this$0) {
-    this.a1i_1 = this$0;
+    this.w1h_1 = this$0;
   }
   protoOf(TupleUnfolder$tupleUnfolderVisitor$1).fy = function (term) {
-    this.a1i_1.b1i_1 = term.jy();
+    this.w1h_1.x1h_1 = term.jy();
     return term;
   };
   protoOf(TupleUnfolder$tupleUnfolderVisitor$1).visitTuple = function (term) {
     return this.fy(term);
   };
   protoOf(TupleUnfolder$tupleUnfolderVisitor$1).ly = function (term) {
-    this.a1i_1.b1i_1 = null;
+    this.w1h_1.x1h_1 = null;
     return term;
   };
   protoOf(TupleUnfolder$tupleUnfolderVisitor$1).defaultValue = function (term) {
     return this.ly(term);
   };
   function TupleUnfolder(tuple) {
-    this.b1i_1 = tuple;
+    this.x1h_1 = tuple;
     var tmp = this;
-    tmp.c1i_1 = new TupleUnfolder$tupleUnfolderVisitor$1(this);
+    tmp.y1h_1 = new TupleUnfolder$tupleUnfolderVisitor$1(this);
   }
   protoOf(TupleUnfolder).s = function () {
-    return !(this.b1i_1 == null);
+    return !(this.x1h_1 == null);
   };
   protoOf(TupleUnfolder).u = function () {
-    var tmp0_safe_receiver = this.b1i_1;
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.accept(this.c1i_1);
+    var tmp0_safe_receiver = this.x1h_1;
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.accept(this.y1h_1);
     var tmp;
     if (tmp1_elvis_lhs == null) {
       throw NoSuchElementException_init_$Create$();
@@ -8166,11 +8142,11 @@
     return tmp;
   };
   function instanceId($this, name) {
-    return synchronizedOn($this.d1i_1, VarImpl$Companion$instanceId$lambda(name));
+    return synchronizedOn($this.z1h_1, VarImpl$Companion$instanceId$lambda(name));
   }
   function VarImpl$Companion$instanceId$lambda($name) {
     return function () {
-      var tmp0_safe_receiver = Companion_getInstance_32().d1i_1.x2($name);
+      var tmp0_safe_receiver = Companion_getInstance_32().z1h_1.x2($name);
       var tmp;
       if (tmp0_safe_receiver == null) {
         tmp = null;
@@ -8183,7 +8159,7 @@
       }
       var tmp1_elvis_lhs = tmp;
       var count = tmp1_elvis_lhs == null ? new Long(0, 0) : tmp1_elvis_lhs;
-      var this_0 = Companion_getInstance_32().d1i_1;
+      var this_0 = Companion_getInstance_32().z1h_1;
       var key = $name;
       this_0.n2(key, count);
       return count;
@@ -8193,7 +8169,7 @@
     Companion_instance_30 = this;
     var tmp = this;
     // Inline function 'kotlin.collections.mutableMapOf' call
-    tmp.d1i_1 = LinkedHashMap_init_$Create$();
+    tmp.z1h_1 = LinkedHashMap_init_$Create$();
   }
   var Companion_instance_30;
   function Companion_getInstance_32() {
@@ -8206,18 +8182,18 @@
     if (useVarCompleteName) {
       tmp = $this.l14() === other.l14();
     } else {
-      tmp = $this.f1i_1 === other.bb();
+      tmp = $this.b1i_1 === other.bb();
     }
     return tmp;
   }
   function VarImpl$completeName$delegate$lambda(this$0) {
     return function () {
-      return this$0.f1i_1 + '_' + this$0.g1i_1.toString();
+      return this$0.b1i_1 + '_' + this$0.c1i_1.toString();
     };
   }
   function VarImpl$isNameWellFormed$delegate$lambda(this$0) {
     return function () {
-      return Terms_getInstance().nv_1.o8(this$0.f1i_1);
+      return Terms_getInstance().nv_1.o8(this$0.b1i_1);
     };
   }
   function VarImpl$hashCodeCache$delegate$lambda(this$0) {
@@ -8230,31 +8206,31 @@
     identifier = identifier === VOID ? instanceId(Companion_getInstance_32(), name) : identifier;
     tags = tags === VOID ? emptyMap() : tags;
     TermImpl.call(this, tags);
-    this.f1i_1 = name;
-    this.g1i_1 = identifier;
+    this.b1i_1 = name;
+    this.c1i_1 = identifier;
     var tmp = this;
-    tmp.h1i_1 = lazy(VarImpl$completeName$delegate$lambda(this));
-    this.i1i_1 = get_isAnonymous.call(this);
+    tmp.d1i_1 = lazy(VarImpl$completeName$delegate$lambda(this));
+    this.e1i_1 = get_isAnonymous.call(this);
     var tmp_0 = this;
-    tmp_0.j1i_1 = lazy(VarImpl$isNameWellFormed$delegate$lambda(this));
+    tmp_0.f1i_1 = lazy(VarImpl$isNameWellFormed$delegate$lambda(this));
     var tmp_1 = this;
-    tmp_1.k1i_1 = lazy(VarImpl$hashCodeCache$delegate$lambda(this));
+    tmp_1.g1i_1 = lazy(VarImpl$hashCodeCache$delegate$lambda(this));
   }
   protoOf(VarImpl).bb = function () {
-    return this.f1i_1;
+    return this.b1i_1;
   };
   protoOf(VarImpl).l14 = function () {
     // Inline function 'kotlin.getValue' call
-    var this_0 = this.h1i_1;
+    var this_0 = this.d1i_1;
     completeName$factory();
     return this_0.r2();
   };
   protoOf(VarImpl).b15 = function () {
-    return this.i1i_1;
+    return this.e1i_1;
   };
   protoOf(VarImpl).d15 = function () {
     // Inline function 'kotlin.getValue' call
-    var this_0 = this.j1i_1;
+    var this_0 = this.f1i_1;
     isNameWellFormed$factory();
     return this_0.r2();
   };
@@ -8265,16 +8241,16 @@
     return this.l16(other);
   };
   protoOf(VarImpl).a16 = function (tags) {
-    return new VarImpl(this.f1i_1, this.g1i_1, tags);
+    return new VarImpl(this.b1i_1, this.c1i_1, tags);
   };
   protoOf(VarImpl).tw = function () {
-    return new VarImpl(this.f1i_1, VOID, this.vt());
+    return new VarImpl(this.b1i_1, VOID, this.vt());
   };
   protoOf(VarImpl).freshCopy = function () {
     return this.tw();
   };
   protoOf(VarImpl).uw = function (scope) {
-    return setTags(this.i1i_1 ? scope.anonymous() : scope.varOf(this.f1i_1), this.vt());
+    return setTags(this.e1i_1 ? scope.anonymous() : scope.varOf(this.b1i_1), this.vt());
   };
   protoOf(VarImpl).freshCopyFromScope = function (scope) {
     return this.uw(scope);
@@ -8283,7 +8259,7 @@
     return this.d15() ? this.l14() : Companion_getInstance_26().escapeName(this.l14());
   };
   protoOf(VarImpl).c15 = function () {
-    return this.g1i_1.toString();
+    return this.c1i_1.toString();
   };
   protoOf(VarImpl).equals = function (other) {
     if (this === other)
@@ -8324,7 +8300,7 @@
   };
   protoOf(VarImpl).n16 = function () {
     // Inline function 'kotlin.getValue' call
-    var this_0 = this.k1i_1;
+    var this_0 = this.g1i_1;
     hashCodeCache$factory_2();
     return this_0.r2();
   };
@@ -8368,219 +8344,210 @@
     }, null);
   }
   function VariablesProviderImpl(scope) {
-    this.l1i_1 = scope;
+    this.h1i_1 = scope;
   }
   protoOf(VariablesProviderImpl).f12 = function () {
-    return this.l1i_1.f12();
+    return this.h1i_1.f12();
   };
   protoOf(VariablesProviderImpl).e12 = function () {
-    return this.l1i_1.e12();
+    return this.h1i_1.e12();
   };
   protoOf(VariablesProviderImpl).anonymous = function () {
-    return this.l1i_1.anonymous();
+    return this.h1i_1.anonymous();
+  };
+  protoOf(VariablesProviderImpl).atomOfChar = function (value) {
+    return this.h1i_1.atomOfChar(value);
   };
   protoOf(VariablesProviderImpl).atomOf = function (value) {
-    return this.l1i_1.atomOf(value);
+    return this.h1i_1.atomOf(value);
   };
-  protoOf(VariablesProviderImpl).setOf = function (terms) {
-    return this.l1i_1.setOf(terms);
+  protoOf(VariablesProviderImpl).blockOf = function (terms) {
+    return this.h1i_1.blockOf(terms);
   };
-  protoOf(VariablesProviderImpl).setOfIterable = function (terms) {
-    return this.l1i_1.setOfIterable(terms);
+  protoOf(VariablesProviderImpl).blockOfIterable = function (terms) {
+    return this.h1i_1.blockOfIterable(terms);
   };
-  protoOf(VariablesProviderImpl).setOfSequence = function (terms) {
-    return this.l1i_1.setOfSequence(terms);
+  protoOf(VariablesProviderImpl).blockOfSequence = function (terms) {
+    return this.h1i_1.blockOfSequence(terms);
   };
   protoOf(VariablesProviderImpl).clauseOf = function (head, body) {
-    return this.l1i_1.clauseOf(head, body);
+    return this.h1i_1.clauseOf(head, body);
   };
   protoOf(VariablesProviderImpl).consOf = function (head, tail) {
-    return this.l1i_1.consOf(head, tail);
+    return this.h1i_1.consOf(head, tail);
   };
   protoOf(VariablesProviderImpl).containsVar = function (variable) {
-    return this.l1i_1.containsVar(variable);
+    return this.h1i_1.containsVar(variable);
   };
   protoOf(VariablesProviderImpl).contains = function (variable) {
-    return this.l1i_1.contains(variable);
+    return this.h1i_1.contains(variable);
   };
   protoOf(VariablesProviderImpl).directiveOf = function (body1, body) {
-    return this.l1i_1.directiveOf(body1, body);
+    return this.h1i_1.directiveOf(body1, body);
   };
   protoOf(VariablesProviderImpl).factOf = function (head) {
-    return this.l1i_1.factOf(head);
+    return this.h1i_1.factOf(head);
   };
   protoOf(VariablesProviderImpl).get = function (variable) {
-    return this.l1i_1.get(variable);
+    return this.h1i_1.get(variable);
   };
   protoOf(VariablesProviderImpl).indicatorOf = function (name, arity) {
-    return this.l1i_1.indicatorOf(name, arity);
+    return this.h1i_1.indicatorOf(name, arity);
   };
   protoOf(VariablesProviderImpl).indicatorOfStringInt = function (name, arity) {
-    return this.l1i_1.indicatorOfStringInt(name, arity);
+    return this.h1i_1.indicatorOfStringInt(name, arity);
   };
   protoOf(VariablesProviderImpl).intOfByte = function (value) {
-    return this.l1i_1.intOfByte(value);
+    return this.h1i_1.intOfByte(value);
   };
   protoOf(VariablesProviderImpl).intOf = function (value) {
-    return this.l1i_1.intOf(value);
+    return this.h1i_1.intOf(value);
   };
   protoOf(VariablesProviderImpl).intOfLong = function (value) {
-    return this.l1i_1.intOfLong(value);
+    return this.h1i_1.intOfLong(value);
   };
   protoOf(VariablesProviderImpl).intOfShort = function (value) {
-    return this.l1i_1.intOfShort(value);
+    return this.h1i_1.intOfShort(value);
   };
   protoOf(VariablesProviderImpl).parseInt = function (value) {
-    return this.l1i_1.parseInt(value);
+    return this.h1i_1.parseInt(value);
   };
   protoOf(VariablesProviderImpl).parseIntRadix = function (value, radix) {
-    return this.l1i_1.parseIntRadix(value, radix);
+    return this.h1i_1.parseIntRadix(value, radix);
   };
   protoOf(VariablesProviderImpl).intOfBigInteger = function (value) {
-    return this.l1i_1.intOfBigInteger(value);
-  };
-  protoOf(VariablesProviderImpl).ktEmptyList = function () {
-    return this.l1i_1.ktEmptyList();
-  };
-  protoOf(VariablesProviderImpl).ktEmptySet = function () {
-    return this.l1i_1.ktEmptySet();
-  };
-  protoOf(VariablesProviderImpl).ktListOf = function (items) {
-    return this.l1i_1.ktListOf(items);
-  };
-  protoOf(VariablesProviderImpl).ktSetOf = function (items) {
-    return this.l1i_1.ktSetOf(items);
+    return this.h1i_1.intOfBigInteger(value);
   };
   protoOf(VariablesProviderImpl).g12 = function (terms, last) {
-    return this.l1i_1.g12(terms, last);
+    return this.h1i_1.g12(terms, last);
   };
   protoOf(VariablesProviderImpl).h12 = function (terms, last) {
-    return this.l1i_1.h12(terms, last);
+    return this.h1i_1.h12(terms, last);
   };
   protoOf(VariablesProviderImpl).i12 = function (terms, last) {
-    return this.l1i_1.i12(terms, last);
+    return this.h1i_1.i12(terms, last);
   };
-  protoOf(VariablesProviderImpl).listOf = function (terms) {
-    return this.l1i_1.listOf(terms);
+  protoOf(VariablesProviderImpl).logicListOf = function (terms) {
+    return this.h1i_1.logicListOf(terms);
   };
-  protoOf(VariablesProviderImpl).listOfIterable = function (terms) {
-    return this.l1i_1.listOfIterable(terms);
+  protoOf(VariablesProviderImpl).logicListOfIterable = function (terms) {
+    return this.h1i_1.logicListOfIterable(terms);
   };
-  protoOf(VariablesProviderImpl).listOfSequence = function (terms) {
-    return this.l1i_1.listOfSequence(terms);
+  protoOf(VariablesProviderImpl).logicListOfSequence = function (terms) {
+    return this.h1i_1.logicListOfSequence(terms);
   };
   protoOf(VariablesProviderImpl).numOfByte = function (value) {
-    return this.l1i_1.numOfByte(value);
+    return this.h1i_1.numOfByte(value);
   };
   protoOf(VariablesProviderImpl).numOfDouble = function (value) {
-    return this.l1i_1.numOfDouble(value);
+    return this.h1i_1.numOfDouble(value);
   };
   protoOf(VariablesProviderImpl).numOfFloat = function (value) {
-    return this.l1i_1.numOfFloat(value);
+    return this.h1i_1.numOfFloat(value);
   };
   protoOf(VariablesProviderImpl).numOfInt = function (value) {
-    return this.l1i_1.numOfInt(value);
+    return this.h1i_1.numOfInt(value);
   };
   protoOf(VariablesProviderImpl).numOfLong = function (value) {
-    return this.l1i_1.numOfLong(value);
+    return this.h1i_1.numOfLong(value);
   };
   protoOf(VariablesProviderImpl).numOf = function (value) {
-    return this.l1i_1.numOf(value);
+    return this.h1i_1.numOf(value);
   };
   protoOf(VariablesProviderImpl).numOfShort = function (value) {
-    return this.l1i_1.numOfShort(value);
+    return this.h1i_1.numOfShort(value);
   };
   protoOf(VariablesProviderImpl).parseNum = function (value) {
-    return this.l1i_1.parseNum(value);
+    return this.h1i_1.parseNum(value);
   };
   protoOf(VariablesProviderImpl).numOfBigDecimal = function (value) {
-    return this.l1i_1.numOfBigDecimal(value);
+    return this.h1i_1.numOfBigDecimal(value);
   };
   protoOf(VariablesProviderImpl).numOfBigInteger = function (value) {
-    return this.l1i_1.numOfBigInteger(value);
+    return this.h1i_1.numOfBigInteger(value);
   };
   protoOf(VariablesProviderImpl).realOf = function (value) {
-    return this.l1i_1.realOf(value);
+    return this.h1i_1.realOf(value);
   };
   protoOf(VariablesProviderImpl).realOfFloat = function (value) {
-    return this.l1i_1.realOfFloat(value);
+    return this.h1i_1.realOfFloat(value);
   };
   protoOf(VariablesProviderImpl).parseReal = function (value) {
-    return this.l1i_1.parseReal(value);
+    return this.h1i_1.parseReal(value);
   };
   protoOf(VariablesProviderImpl).realOfBigDecimal = function (value) {
-    return this.l1i_1.realOfBigDecimal(value);
+    return this.h1i_1.realOfBigDecimal(value);
   };
   protoOf(VariablesProviderImpl).ruleOf = function (head, body1, body) {
-    return this.l1i_1.ruleOf(head, body1, body);
+    return this.h1i_1.ruleOf(head, body1, body);
   };
   protoOf(VariablesProviderImpl).structOf = function (functor, args) {
-    return this.l1i_1.structOf(functor, args);
+    return this.h1i_1.structOf(functor, args);
   };
   protoOf(VariablesProviderImpl).structOfIterable = function (functor, args) {
-    return this.l1i_1.structOfIterable(functor, args);
+    return this.h1i_1.structOfIterable(functor, args);
   };
   protoOf(VariablesProviderImpl).structOfList = function (functor, args) {
-    return this.l1i_1.structOfList(functor, args);
+    return this.h1i_1.structOfList(functor, args);
   };
   protoOf(VariablesProviderImpl).structOfSequence = function (functor, args) {
-    return this.l1i_1.structOfSequence(functor, args);
+    return this.h1i_1.structOfSequence(functor, args);
   };
   protoOf(VariablesProviderImpl).substitutionOf = function (assignments) {
-    return this.l1i_1.substitutionOf(assignments);
+    return this.h1i_1.substitutionOf(assignments);
   };
   protoOf(VariablesProviderImpl).substitutionOfIterable = function (assignments) {
-    return this.l1i_1.substitutionOfIterable(assignments);
+    return this.h1i_1.substitutionOfIterable(assignments);
   };
   protoOf(VariablesProviderImpl).substitutionOfSequence = function (assignments) {
-    return this.l1i_1.substitutionOfSequence(assignments);
+    return this.h1i_1.substitutionOfSequence(assignments);
   };
   protoOf(VariablesProviderImpl).truthOf = function (value) {
-    return this.l1i_1.truthOf(value);
+    return this.h1i_1.truthOf(value);
   };
   protoOf(VariablesProviderImpl).tupleOf = function (terms) {
-    return this.l1i_1.tupleOf(terms);
+    return this.h1i_1.tupleOf(terms);
   };
   protoOf(VariablesProviderImpl).tupleOfIterable = function (terms) {
-    return this.l1i_1.tupleOfIterable(terms);
+    return this.h1i_1.tupleOfIterable(terms);
   };
   protoOf(VariablesProviderImpl).tupleOfSequence = function (terms) {
-    return this.l1i_1.tupleOfSequence(terms);
+    return this.h1i_1.tupleOfSequence(terms);
   };
   protoOf(VariablesProviderImpl).unifierOf = function (assignments) {
-    return this.l1i_1.unifierOf(assignments);
+    return this.h1i_1.unifierOf(assignments);
   };
   protoOf(VariablesProviderImpl).unifierOfIterable = function (assignments) {
-    return this.l1i_1.unifierOfIterable(assignments);
+    return this.h1i_1.unifierOfIterable(assignments);
   };
   protoOf(VariablesProviderImpl).unifierOfSequence = function (assignments) {
-    return this.l1i_1.unifierOfSequence(assignments);
+    return this.h1i_1.unifierOfSequence(assignments);
+  };
+  protoOf(VariablesProviderImpl).varOfChar = function (name) {
+    return this.h1i_1.varOfChar(name);
   };
   protoOf(VariablesProviderImpl).varOf = function (name) {
-    return this.l1i_1.varOf(name);
+    return this.h1i_1.varOf(name);
   };
   protoOf(VariablesProviderImpl).whatever = function () {
-    return this.l1i_1.whatever();
+    return this.h1i_1.whatever();
   };
   protoOf(VariablesProviderImpl).where = function (lambda) {
-    return this.l1i_1.where(lambda);
+    return this.h1i_1.where(lambda);
   };
   protoOf(VariablesProviderImpl).with = function (lambda) {
-    return this.l1i_1.with(lambda);
+    return this.h1i_1.with(lambda);
   };
-  protoOf(VariablesProviderImpl).append = function (_this__u8e3s4, item, items) {
-    return this.l1i_1.append(_this__u8e3s4, item, items);
-  };
-  protoOf(VariablesProviderImpl).concat = function (_this__u8e3s4, other) {
-    return this.l1i_1.concat(_this__u8e3s4, other);
-  };
-  protoOf(VariablesProviderImpl).m1i = function (thisRef, property) {
+  protoOf(VariablesProviderImpl).i1i = function (thisRef, property) {
     return this.varOf(property.callableName);
   };
+  protoOf(VariablesProviderImpl).getValue = function (thisRef, property) {
+    return this.i1i(thisRef, property);
+  };
   function Companion_31() {
     Companion_instance_31 = this;
-    this.n1i_1 = 'op';
-    this.o1i_1 = Companion_getInstance_19().of('op', [Companion_getInstance_26().of('P'), Companion_getInstance_26().of('A'), Companion_getInstance_26().of('F')]);
+    this.j1i_1 = 'op';
+    this.k1i_1 = Companion_getInstance_19().of('op', [Companion_getInstance_26().of('P'), Companion_getInstance_26().of('A'), Companion_getInstance_26().of('F')]);
   }
   protoOf(Companion_31).fromTerms = function (priority, specifier, functor) {
     return this.fromTerm(Companion_getInstance_19().of('op', [priority, specifier, functor]));
@@ -8623,33 +8590,33 @@
   }
   function Operator(functor, specifier, priority) {
     Companion_getInstance_33();
-    this.p1i_1 = functor;
-    this.q1i_1 = specifier;
-    this.r1i_1 = priority;
+    this.l1i_1 = functor;
+    this.m1i_1 = specifier;
+    this.n1i_1 = priority;
   }
-  protoOf(Operator).s1i = function (other) {
+  protoOf(Operator).o1i = function (other) {
     var tmp;
-    if (this.r1i_1 > other.r1i_1) {
+    if (this.n1i_1 > other.n1i_1) {
       tmp = 1;
-    } else if (this.r1i_1 < other.r1i_1) {
+    } else if (this.n1i_1 < other.n1i_1) {
       tmp = -1;
     } else {
       // Inline function 'kotlin.let' call
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'it.unibo.tuprolog.core.operators.Operator.compareTo.<anonymous>' call
-      var specifierCompareTo = this.q1i_1.i9(other.q1i_1);
-      tmp = specifierCompareTo === 0 ? compareTo(this.p1i_1, other.p1i_1) : specifierCompareTo;
+      var specifierCompareTo = this.m1i_1.i9(other.m1i_1);
+      tmp = specifierCompareTo === 0 ? compareTo(this.l1i_1, other.l1i_1) : specifierCompareTo;
     }
     return tmp;
   };
   protoOf(Operator).d = function (other) {
-    return this.s1i(other instanceof Operator ? other : THROW_CCE());
+    return this.o1i(other instanceof Operator ? other : THROW_CCE());
   };
-  protoOf(Operator).t1i = function () {
-    return Companion_getInstance_19().of('op', [intToTerm(this.r1i_1), this.q1i_1.t1i(), stringToAtom(this.p1i_1)]);
+  protoOf(Operator).p1i = function () {
+    return Companion_getInstance_19().of('op', [intToTerm(this.n1i_1), this.m1i_1.p1i(), stringToAtom(this.l1i_1)]);
   };
   protoOf(Operator).toTerm = function () {
-    return this.t1i();
+    return this.p1i();
   };
   protoOf(Operator).equals = function (other) {
     if (this === other)
@@ -8658,19 +8625,19 @@
       return false;
     if (!(other instanceof Operator))
       THROW_CCE();
-    if (!(this.p1i_1 === other.p1i_1))
+    if (!(this.l1i_1 === other.l1i_1))
       return false;
-    if (!this.q1i_1.equals(other.q1i_1))
+    if (!this.m1i_1.equals(other.m1i_1))
       return false;
     return true;
   };
   protoOf(Operator).hashCode = function () {
-    var result = getStringHashCode(this.p1i_1);
-    result = imul(31, result) + this.q1i_1.hashCode() | 0;
+    var result = getStringHashCode(this.l1i_1);
+    result = imul(31, result) + this.m1i_1.hashCode() | 0;
     return result;
   };
   protoOf(Operator).toString = function () {
-    return 'Operator(' + this.r1i_1 + ', ' + this.q1i_1 + ", '" + this.p1i_1 + "')";
+    return 'Operator(' + this.n1i_1 + ', ' + this.m1i_1 + ", '" + this.l1i_1 + "')";
   };
   function OperatorSet$Companion$ARITHMETIC$lambda(it) {
     return new Operator(it, Specifier_FY_getInstance(), 200);
@@ -8722,7 +8689,7 @@
   }
   function _get_operators__lk0kke($this) {
     // Inline function 'kotlin.getValue' call
-    var this_0 = $this.v1i_1;
+    var this_0 = $this.r1i_1;
     operators$factory();
     return this_0.r2();
   }
@@ -8783,28 +8750,28 @@
     this.STANDARD = new OperatorSet(plus_2(plus_2(plus_2(plus_2(asSequence_0(this.ARITHMETIC), asSequence_0(this.ARITHMETIC_COMPARISON)), asSequence_0(this.TERM_COMPARISON)), asSequence_0(this.CONTROL_FLOW)), asSequence_0(this.CLAUSES)));
     this.DEFAULT = this.STANDARD;
   }
-  protoOf(Companion_32).w1i = function () {
+  protoOf(Companion_32).s1i = function () {
     return this.EMPTY;
   };
-  protoOf(Companion_32).x1i = function () {
+  protoOf(Companion_32).t1i = function () {
     return this.ARITHMETIC;
   };
-  protoOf(Companion_32).y1i = function () {
+  protoOf(Companion_32).u1i = function () {
     return this.ARITHMETIC_COMPARISON;
   };
-  protoOf(Companion_32).z1i = function () {
+  protoOf(Companion_32).v1i = function () {
     return this.TERM_COMPARISON;
   };
-  protoOf(Companion_32).a1j = function () {
+  protoOf(Companion_32).w1i = function () {
     return this.CONTROL_FLOW;
   };
-  protoOf(Companion_32).b1j = function () {
+  protoOf(Companion_32).x1i = function () {
     return this.CLAUSES;
   };
-  protoOf(Companion_32).c1j = function () {
+  protoOf(Companion_32).y1i = function () {
     return this.STANDARD;
   };
-  protoOf(Companion_32).d1j = function () {
+  protoOf(Companion_32).z1i = function () {
     return this.DEFAULT;
   };
   var Companion_instance_32;
@@ -8820,32 +8787,32 @@
   }
   function OperatorSet(operators) {
     Companion_getInstance_34();
-    this.u1i_1 = toHashSet(operators);
+    this.q1i_1 = toHashSet(operators);
     var tmp = this;
-    tmp.v1i_1 = lazy(OperatorSet$operators$delegate$lambda(operators));
+    tmp.r1i_1 = lazy(OperatorSet$operators$delegate$lambda(operators));
   }
   protoOf(OperatorSet).l = function () {
-    return this.u1i_1.l();
+    return this.q1i_1.l();
   };
-  protoOf(OperatorSet).e1j = function (element) {
-    return this.u1i_1.n(element);
+  protoOf(OperatorSet).a1j = function (element) {
+    return this.q1i_1.n(element);
   };
   protoOf(OperatorSet).n = function (element) {
     if (!(element instanceof Operator))
       return false;
-    return this.e1j(element instanceof Operator ? element : THROW_CCE());
+    return this.a1j(element instanceof Operator ? element : THROW_CCE());
   };
-  protoOf(OperatorSet).f1j = function (elements) {
-    return this.u1i_1.x(elements);
+  protoOf(OperatorSet).b1j = function (elements) {
+    return this.q1i_1.x(elements);
   };
   protoOf(OperatorSet).x = function (elements) {
-    return this.f1j(elements);
+    return this.b1j(elements);
   };
   protoOf(OperatorSet).y = function () {
-    return this.u1i_1.y();
+    return this.q1i_1.y();
   };
   protoOf(OperatorSet).r = function () {
-    return this.u1i_1.r();
+    return this.q1i_1.r();
   };
   protoOf(OperatorSet).plus = function (operator) {
     // Inline function 'kotlin.collections.toTypedArray' call
@@ -8894,17 +8861,17 @@
       var op = tmp0_iterator.u();
       // Inline function 'kotlin.collections.contains' call
       // Inline function 'kotlin.collections.containsKey' call
-      var key = op.p1i_1;
+      var key = op.l1i_1;
       if ((isInterface(temp, Map) ? temp : THROW_CCE()).u2(key)) {
-        var opsWithFunctor = ensureNotNull(temp.x2(op.p1i_1));
+        var opsWithFunctor = ensureNotNull(temp.x2(op.l1i_1));
         // Inline function 'kotlin.collections.set' call
-        var key_0 = op.q1i_1;
-        var value = op.r1i_1;
+        var key_0 = op.m1i_1;
+        var value = op.n1i_1;
         opsWithFunctor.n2(key_0, value);
       } else {
         // Inline function 'kotlin.collections.set' call
-        var key_1 = op.p1i_1;
-        var value_0 = mutableMapOf([to(op.q1i_1, op.r1i_1)]);
+        var key_1 = op.l1i_1;
+        var value_0 = mutableMapOf([to(op.m1i_1, op.n1i_1)]);
         temp.n2(key_1, value_0);
       }
     }
@@ -8926,10 +8893,10 @@
   }
   function Companion_33() {
     Companion_instance_33 = this;
-    this.g1j_1 = setOf([Specifier_FX_getInstance(), Specifier_FY_getInstance()]);
-    this.h1j_1 = setOf([Specifier_YF_getInstance(), Specifier_XF_getInstance()]);
-    this.i1j_1 = setOf([Specifier_XFX_getInstance(), Specifier_YFX_getInstance(), Specifier_XFY_getInstance()]);
-    this.j1j_1 = plus_3(this.h1j_1, this.i1j_1);
+    this.c1j_1 = setOf([Specifier_FX_getInstance(), Specifier_FY_getInstance()]);
+    this.d1j_1 = setOf([Specifier_YF_getInstance(), Specifier_XF_getInstance()]);
+    this.e1j_1 = setOf([Specifier_XFX_getInstance(), Specifier_YFX_getInstance(), Specifier_XFY_getInstance()]);
+    this.f1j_1 = plus_3(this.d1j_1, this.e1j_1);
   }
   protoOf(Companion_33).fromAtom = function (atom) {
     try {
@@ -9001,20 +8968,20 @@
   function Specifier(name, ordinal) {
     Enum.call(this, name, ordinal);
   }
-  protoOf(Specifier).a1h = function () {
-    return Companion_getInstance_35().g1j_1.n(this);
+  protoOf(Specifier).w1g = function () {
+    return Companion_getInstance_35().c1j_1.n(this);
   };
-  protoOf(Specifier).c1h = function () {
-    return Companion_getInstance_35().i1j_1.n(this);
+  protoOf(Specifier).y1g = function () {
+    return Companion_getInstance_35().e1j_1.n(this);
   };
-  protoOf(Specifier).b1h = function () {
-    return Companion_getInstance_35().h1j_1.n(this);
+  protoOf(Specifier).x1g = function () {
+    return Companion_getInstance_35().d1j_1.n(this);
   };
-  protoOf(Specifier).t1i = function () {
+  protoOf(Specifier).p1i = function () {
     return _get_atomRepresentation__p7qnyl(this);
   };
   protoOf(Specifier).toTerm = function () {
-    return this.t1i();
+    return this.p1i();
   };
   function Specifier_XF_getInstance() {
     Specifier_initEntries();
@@ -9463,8 +9430,8 @@
   protoOf(ListUnfolder$listUnfolderVisitor$1).visitDirective = visitDirective;
   protoOf(RealImpl).sx = get_isReal_0;
   protoOf(RealImpl).c12 = asReal_0;
-  protoOf(ScopeImpl).listFromSequence = listFromSequence;
-  protoOf(ScopeImpl).listFromIterable = listFromIterable;
+  protoOf(ScopeImpl).logicListFromSequence = logicListFromSequence;
+  protoOf(ScopeImpl).logicListFromIterable = logicListFromIterable;
   protoOf(ScopeImpl).f12 = get__;
   protoOf(TruthImpl).pw = get_isFail_2;
   protoOf(TruthImpl).nx = get_isTruth_0;
@@ -9499,12 +9466,12 @@
   protoOf(VarImpl).mx = get_isVar_0;
   protoOf(VarImpl).e15 = asVar_0;
   protoOf(VarImpl).sw = get_variables_2;
-  protoOf(VariablesProviderImpl).listFrom = listFrom;
-  protoOf(VariablesProviderImpl).listFromIterable = listFromIterable;
-  protoOf(VariablesProviderImpl).listFromSequence = listFromSequence;
-  defineProp(protoOf(Specifier), 'isPrefix', protoOf(Specifier).a1h);
-  defineProp(protoOf(Specifier), 'isInfix', protoOf(Specifier).c1h);
-  defineProp(protoOf(Specifier), 'isPostfix', protoOf(Specifier).b1h);
+  protoOf(VariablesProviderImpl).logicListFromFrom = logicListFromFrom;
+  protoOf(VariablesProviderImpl).logicListFromIterable = logicListFromIterable;
+  protoOf(VariablesProviderImpl).logicListFromSequence = logicListFromSequence;
+  defineProp(protoOf(Specifier), 'isPrefix', protoOf(Specifier).w1g);
+  defineProp(protoOf(Specifier), 'isInfix', protoOf(Specifier).y1g);
+  defineProp(protoOf(Specifier), 'isPostfix', protoOf(Specifier).x1g);
   //endregion
   //region block: init
   Companion_instance = new Companion();