@tuprolog/arg2p-core 0.7.2 → 0.7.3

package/2p-parser-core.js

@@ -1,8 +1,8 @@
 (function (root, factory) {
   if (typeof define === 'function' && define.amd)
-    define(['exports', '@tuprolog/parser-utils', 'antlr4', 'antlr4/src/antlr4/error', 'antlr4/src/antlr4/atn', './kotlin-kotlin-stdlib-js-ir.js', './2p-core.js', './2p-parser-js.js', './kt-math.js'], factory);
+    define(['exports', '@tuprolog/parser-utils', 'antlr4', 'antlr4/src/antlr4/error', 'antlr4/src/antlr4/atn', './kotlin-kotlin-stdlib.js', './2p-core.js', './2p-parser-js.js', './kt-math.js'], factory);
   else if (typeof exports === 'object')
-    factory(module.exports, require('@tuprolog/parser-utils'), require('antlr4'), require('antlr4/src/antlr4/error'), require('antlr4/src/antlr4/atn'), require('./kotlin-kotlin-stdlib-js-ir.js'), require('./2p-core.js'), require('./2p-parser-js.js'), require('./kt-math.js'));
+    factory(module.exports, require('@tuprolog/parser-utils'), require('antlr4'), require('antlr4/src/antlr4/error'), require('antlr4/src/antlr4/atn'), require('./kotlin-kotlin-stdlib.js'), require('./2p-core.js'), require('./2p-parser-js.js'), require('./kt-math.js'));
   else {
     if (typeof this['@tuprolog/parser-utils'] === 'undefined') {
       throw new Error("Error loading module '2p-parser-core'. Its dependency '@tuprolog/parser-utils' was not found. Please, check whether '@tuprolog/parser-utils' is loaded prior to '2p-parser-core'.");
@@ -16,8 +16,8 @@
     if (typeof this['antlr4/src/antlr4/atn'] === 'undefined') {
       throw new Error("Error loading module '2p-parser-core'. Its dependency 'antlr4/src/antlr4/atn' was not found. Please, check whether 'antlr4/src/antlr4/atn' is loaded prior to '2p-parser-core'.");
     }
-    if (typeof this['kotlin-kotlin-stdlib-js-ir'] === 'undefined') {
-      throw new Error("Error loading module '2p-parser-core'. Its dependency 'kotlin-kotlin-stdlib-js-ir' was not found. Please, check whether 'kotlin-kotlin-stdlib-js-ir' is loaded prior to '2p-parser-core'.");
+    if (typeof this['kotlin-kotlin-stdlib'] === 'undefined') {
+      throw new Error("Error loading module '2p-parser-core'. Its dependency 'kotlin-kotlin-stdlib' was not found. Please, check whether 'kotlin-kotlin-stdlib' is loaded prior to '2p-parser-core'.");
     }
     if (typeof this['2p-core'] === 'undefined') {
       throw new Error("Error loading module '2p-parser-core'. Its dependency '2p-core' was not found. Please, check whether '2p-core' is loaded prior to '2p-parser-core'.");
@@ -28,7 +28,7 @@
     if (typeof this['kt-math'] === 'undefined') {
       throw new Error("Error loading module '2p-parser-core'. Its dependency 'kt-math' was not found. Please, check whether 'kt-math' is loaded prior to '2p-parser-core'.");
     }
-    root['2p-parser-core'] = factory(typeof this['2p-parser-core'] === 'undefined' ? {} : this['2p-parser-core'], this['@tuprolog/parser-utils'], antlr4, this['antlr4/src/antlr4/error'], this['antlr4/src/antlr4/atn'], this['kotlin-kotlin-stdlib-js-ir'], this['2p-core'], this['2p-parser-js'], this['kt-math']);
+    root['2p-parser-core'] = factory(typeof this['2p-parser-core'] === 'undefined' ? {} : this['2p-parser-core'], this['@tuprolog/parser-utils'], antlr4, this['antlr4/src/antlr4/error'], this['antlr4/src/antlr4/atn'], this['kotlin-kotlin-stdlib'], this['2p-core'], this['2p-parser-js'], this['kt-math']);
   }
 }(this, function (_, $module$_tuprolog_parser_utils_xy31vy, $module$antlr4, $module$antlr4_src_antlr4_error_s9pni7, $module$antlr4_src_antlr4_atn_66gh9q, kotlin_kotlin, kotlin_it_unibo_tuprolog_core, kotlin_it_unibo_tuprolog_parser_js, kotlin_io_github_gciatto_kt_math) {
   'use strict';
@@ -44,64 +44,65 @@
   var CommonTokenStream = $module$antlr4.CommonTokenStream;
   var BailErrorStrategy = $module$antlr4_src_antlr4_error_s9pni7.BailErrorStrategy;
   var PrologParserVisitor = $module$_tuprolog_parser_utils_xy31vy.PrologParserVisitor;
-  var VOID = kotlin_kotlin.$_$.s9;
-  var captureStack = kotlin_kotlin.$_$.p4;
-  var protoOf = kotlin_kotlin.$_$.q5;
-  var classMeta = kotlin_kotlin.$_$.u4;
-  var setMetadataFor = kotlin_kotlin.$_$.r5;
+  var VOID = kotlin_kotlin.$_$.d;
+  var captureStack = kotlin_kotlin.$_$.r4;
+  var protoOf = kotlin_kotlin.$_$.s5;
+  var classMeta = kotlin_kotlin.$_$.w4;
+  var setMetadataFor = kotlin_kotlin.$_$.t5;
   var TuPrologException = kotlin_it_unibo_tuprolog_core.$_$.x;
   var TuPrologException_init_$Init$ = kotlin_it_unibo_tuprolog_core.$_$.b;
-  var ensureNotNull = kotlin_kotlin.$_$.i9;
-  var replace = kotlin_kotlin.$_$.i8;
-  var _Char___init__impl__6a9atx = kotlin_kotlin.$_$.c1;
-  var Char = kotlin_kotlin.$_$.u8;
-  var Clause = kotlin_it_unibo_tuprolog_core.$_$.b1;
-  var getKClass = kotlin_kotlin.$_$.c;
-  var Companion_getInstance = kotlin_it_unibo_tuprolog_core.$_$.j;
+  var ensureNotNull = kotlin_kotlin.$_$.k9;
+  var replace = kotlin_kotlin.$_$.k8;
+  var _Char___init__impl__6a9atx = kotlin_kotlin.$_$.f1;
+  var Char = kotlin_kotlin.$_$.w8;
+  var toString = kotlin_kotlin.$_$.j1;
   var Struct = kotlin_it_unibo_tuprolog_core.$_$.l1;
-  var isInterface = kotlin_kotlin.$_$.f5;
-  var Unit_getInstance = kotlin_kotlin.$_$.o1;
-  var objectMeta = kotlin_kotlin.$_$.p5;
-  var THROW_CCE = kotlin_kotlin.$_$.f9;
+  var isInterface = kotlin_kotlin.$_$.i5;
+  var Numeric = kotlin_it_unibo_tuprolog_core.$_$.i1;
   var Atom = kotlin_it_unibo_tuprolog_core.$_$.a1;
-  var contains = kotlin_kotlin.$_$.f2;
+  var Clause = kotlin_it_unibo_tuprolog_core.$_$.b1;
+  var getKClass = kotlin_kotlin.$_$.c;
+  var Companion_instance = kotlin_it_unibo_tuprolog_core.$_$.j;
+  var Unit_instance = kotlin_kotlin.$_$.r1;
+  var objectMeta = kotlin_kotlin.$_$.r5;
+  var THROW_CCE = kotlin_kotlin.$_$.h9;
+  var contains = kotlin_kotlin.$_$.i2;
   var Directive = kotlin_it_unibo_tuprolog_core.$_$.d1;
-  var Numeric = kotlin_it_unibo_tuprolog_core.$_$.i1;
-  var Companion_getInstance_0 = kotlin_it_unibo_tuprolog_core.$_$.g;
-  var map = kotlin_kotlin.$_$.h7;
+  var Companion_getInstance = kotlin_it_unibo_tuprolog_core.$_$.g;
+  var map = kotlin_kotlin.$_$.j7;
   var Operator = kotlin_it_unibo_tuprolog_core.$_$.z;
   var List = kotlin_it_unibo_tuprolog_core.$_$.h1;
-  var toString = kotlin_kotlin.$_$.v5;
-  var coerceAtLeast = kotlin_kotlin.$_$.g6;
+  var toString_0 = kotlin_kotlin.$_$.x5;
+  var coerceAtLeast = kotlin_kotlin.$_$.i6;
   var isRecognitionException = kotlin_it_unibo_tuprolog_parser_js.$_$.b;
   var isParseCancellationException = kotlin_it_unibo_tuprolog_parser_js.$_$.a;
-  var generateSequence = kotlin_kotlin.$_$.b7;
-  var takeWhile = kotlin_kotlin.$_$.p7;
-  var to = kotlin_kotlin.$_$.r9;
-  var Companion_getInstance_1 = kotlin_io_github_gciatto_kt_math.$_$.e;
-  var charSequenceGet = kotlin_kotlin.$_$.s4;
-  var Char__toInt_impl_vasixd = kotlin_kotlin.$_$.f1;
-  var contains_0 = kotlin_kotlin.$_$.b8;
-  var plus = kotlin_kotlin.$_$.m9;
-  var ArrayList_init_$Create$ = kotlin_kotlin.$_$.d;
-  var IllegalStateException_init_$Create$ = kotlin_kotlin.$_$.s;
-  var listOf = kotlin_kotlin.$_$.a3;
-  var asList = kotlin_kotlin.$_$.x1;
-  var plus_0 = kotlin_kotlin.$_$.s3;
-  var collectionSizeOrDefault = kotlin_kotlin.$_$.d2;
-  var toList = kotlin_kotlin.$_$.c4;
-  var flatMap = kotlin_kotlin.$_$.z6;
-  var asSequence = kotlin_kotlin.$_$.b2;
-  var toList_0 = kotlin_kotlin.$_$.t7;
-  var sequenceOf = kotlin_kotlin.$_$.m7;
-  var asSequence_0 = kotlin_kotlin.$_$.c2;
-  var plus_1 = kotlin_kotlin.$_$.l7;
-  var Companion_getInstance_2 = kotlin_it_unibo_tuprolog_core.$_$.q;
-  var IllegalArgumentException_init_$Create$ = kotlin_kotlin.$_$.q;
+  var generateSequence = kotlin_kotlin.$_$.d7;
+  var takeWhile = kotlin_kotlin.$_$.r7;
+  var to = kotlin_kotlin.$_$.s9;
+  var Companion_getInstance_0 = kotlin_io_github_gciatto_kt_math.$_$.e;
+  var charSequenceGet = kotlin_kotlin.$_$.u4;
+  var Char__toInt_impl_vasixd = kotlin_kotlin.$_$.i1;
+  var contains_0 = kotlin_kotlin.$_$.d8;
+  var plus = kotlin_kotlin.$_$.o9;
+  var ArrayList_init_$Create$ = kotlin_kotlin.$_$.e;
+  var IllegalStateException_init_$Create$ = kotlin_kotlin.$_$.v;
+  var listOf = kotlin_kotlin.$_$.d3;
+  var asList = kotlin_kotlin.$_$.a2;
+  var plus_0 = kotlin_kotlin.$_$.v3;
+  var collectionSizeOrDefault = kotlin_kotlin.$_$.g2;
+  var toList = kotlin_kotlin.$_$.e4;
+  var flatMap = kotlin_kotlin.$_$.b7;
+  var asSequence = kotlin_kotlin.$_$.e2;
+  var toList_0 = kotlin_kotlin.$_$.v7;
+  var sequenceOf = kotlin_kotlin.$_$.o7;
+  var asSequence_0 = kotlin_kotlin.$_$.f2;
+  var plus_1 = kotlin_kotlin.$_$.n7;
+  var Companion_instance_0 = kotlin_it_unibo_tuprolog_core.$_$.q;
+  var IllegalArgumentException_init_$Create$ = kotlin_kotlin.$_$.s;
   var Term = kotlin_it_unibo_tuprolog_core.$_$.j2;
-  var Companion_getInstance_3 = kotlin_it_unibo_tuprolog_core.$_$.l;
-  var Companion_getInstance_4 = kotlin_it_unibo_tuprolog_core.$_$.o;
-  var NumberFormatException = kotlin_kotlin.$_$.c9;
+  var Companion_getInstance_1 = kotlin_it_unibo_tuprolog_core.$_$.l;
+  var Companion_getInstance_2 = kotlin_it_unibo_tuprolog_core.$_$.o;
+  var NumberFormatException = kotlin_kotlin.$_$.e9;
   //endregion
   //region block: pre-declaration
   setMetadataFor(ParseException, 'ParseException', classMeta, TuPrologException);
@@ -110,7 +111,7 @@
   setMetadataFor(DynamicOpListener, 'DynamicOpListener', classMeta, PrologParserListener);
   setMetadataFor(PrologParserFactory$newErrorListener$1, VOID, classMeta);
   setMetadataFor(PrologParserFactory, 'PrologParserFactory', objectMeta);
-  setMetadataFor(PrologVisitor, 'PrologVisitor', classMeta, PrologParserVisitor);
+  setMetadataFor(PrologVisitor, 'PrologVisitor', classMeta, PrologParserVisitor, VOID, PrologVisitor);
   //endregion
   function InvalidTermTypeException(input, term, type, offendingSymbol, line, column, message, throwable) {
     var tmp;
@@ -123,12 +124,12 @@
     offendingSymbol = tmp;
     line = line === VOID ? 1 : line;
     column = column === VOID ? 1 : column;
-    message = message === VOID ? 'Expected ' + type.xc() + ', got: ' + offendingSymbol : message;
+    message = message === VOID ? 'Expected ' + type.n6() + ', got: ' + offendingSymbol : message;
     throwable = throwable === VOID ? null : throwable;
     ParseException.call(this, input, offendingSymbol, line, column, message, throwable);
     captureStack(this, InvalidTermTypeException);
-    this.l33_1 = term;
-    this.m33_1 = type;
+    this.f35_1 = term;
+    this.g35_1 = type;
   }
   function ParseException(input, offendingSymbol, line, column, message, throwable) {
     TuPrologException_init_$Init$(message, throwable, this);
@@ -139,50 +140,84 @@
     this.column = column;
     this.clauseIndex = -1;
   }
-  protoOf(ParseException).n33 = function (_set____db54di) {
+  protoOf(ParseException).h35 = function (_set____db54di) {
     this.input = _set____db54di;
   };
-  protoOf(ParseException).o33 = function () {
+  protoOf(ParseException).i35 = function () {
     return this.input;
   };
-  protoOf(ParseException).p33 = function (_set____db54di) {
+  protoOf(ParseException).j35 = function (_set____db54di) {
     this.offendingSymbol = _set____db54di;
   };
-  protoOf(ParseException).q33 = function () {
+  protoOf(ParseException).k35 = function () {
     return this.offendingSymbol;
   };
-  protoOf(ParseException).r33 = function (_set____db54di) {
+  protoOf(ParseException).l35 = function (_set____db54di) {
     this.line = _set____db54di;
   };
-  protoOf(ParseException).s33 = function () {
+  protoOf(ParseException).m35 = function () {
     return this.line;
   };
-  protoOf(ParseException).t33 = function (_set____db54di) {
+  protoOf(ParseException).n35 = function (_set____db54di) {
     this.column = _set____db54di;
   };
-  protoOf(ParseException).u33 = function () {
+  protoOf(ParseException).o35 = function () {
     return this.column;
   };
-  protoOf(ParseException).v33 = function (_set____db54di) {
+  protoOf(ParseException).p35 = function (_set____db54di) {
     this.clauseIndex = _set____db54di;
   };
-  protoOf(ParseException).w33 = function () {
+  protoOf(ParseException).q35 = function () {
     return this.clauseIndex;
   };
   protoOf(ParseException).toString = function () {
-    return "ParseException{message='" + replace(ensureNotNull(this.message), '\\n', '\\\\n') + new Char(_Char___init__impl__6a9atx(39)) + ', line=' + this.line + ', column=' + this.column + ", offendingSymbol='" + this.offendingSymbol + new Char(_Char___init__impl__6a9atx(39)) + new Char(_Char___init__impl__6a9atx(125));
+    return "ParseException{message='" + replace(ensureNotNull(this.message), '\\n', '\\\\n') + new Char(_Char___init__impl__6a9atx(39)) + ', line=' + this.line + ', column=' + this.column + ", offendingSymbol='" + this.offendingSymbol + new Char(_Char___init__impl__6a9atx(39)) + toString(_Char___init__impl__6a9atx(125));
   };
+  function get_isOpDirective(_this__u8e3s4) {
+    var tmp;
+    var tmp_0;
+    var tmp_1;
+    var tmp_2;
+    var tmp_3;
+    if (isInterface(_this__u8e3s4, Struct)) {
+      tmp_3 = _this__u8e3s4.eu() === 3;
+    } else {
+      tmp_3 = false;
+    }
+    if (tmp_3) {
+      tmp_2 = _this__u8e3s4.ku() === 'op';
+    } else {
+      tmp_2 = false;
+    }
+    if (tmp_2) {
+      tmp_1 = _this__u8e3s4.ov();
+    } else {
+      tmp_1 = false;
+    }
+    if (tmp_1) {
+      var tmp_4 = _this__u8e3s4.get(0);
+      tmp_0 = isInterface(tmp_4, Numeric);
+    } else {
+      tmp_0 = false;
+    }
+    if (tmp_0) {
+      var tmp_5 = _this__u8e3s4.get(1);
+      tmp = isInterface(tmp_5, Atom);
+    } else {
+      tmp = false;
+    }
+    return tmp;
+  }
   function termToClause(_this__u8e3s4, source, line, column) {
     source = source === VOID ? null : source;
     line = line === VOID ? 0 : line;
     column = column === VOID ? 0 : column;
-    var tmp0_subject = _this__u8e3s4;
     var tmp;
-    if (isInterface(tmp0_subject, Clause)) {
+    if (isInterface(_this__u8e3s4, Clause)) {
       tmp = _this__u8e3s4;
     } else {
-      if (isInterface(tmp0_subject, Struct)) {
-        tmp = Companion_getInstance().of(_this__u8e3s4);
+      if (isInterface(_this__u8e3s4, Struct)) {
+        tmp = Companion_instance.of(_this__u8e3s4);
       } else {
         throw new InvalidTermTypeException(source, _this__u8e3s4, getKClass(Clause), VOID, line, column);
       }
@@ -193,37 +228,33 @@
     return _this__u8e3s4.toString();
   }
   function DynamicOpListener$Companion$of$lambda($this$$receiver, it) {
-    return Unit_getInstance();
+    return Unit_instance;
   }
   function onOperatorDefined($this, operator) {
-    $this.x33_1.addOperator(operator.l1f_1, toAssociativity(operator.m1f_1), operator.n1f_1);
-    $this.y33_1($this.x33_1, operator);
+    $this.r35_1.addOperator(operator.g1g_1, toAssociativity(operator.h1g_1), operator.i1g_1);
+    $this.s35_1($this.r35_1, operator);
   }
   function Companion() {
-    Companion_instance = this;
   }
-  protoOf(Companion).z33 = function (parser) {
+  protoOf(Companion).t35 = function (parser) {
     return new DynamicOpListener(parser, DynamicOpListener$Companion$of$lambda);
   };
-  var Companion_instance;
-  function Companion_getInstance_5() {
-    if (Companion_instance == null)
-      new Companion();
-    return Companion_instance;
+  var Companion_instance_1;
+  function Companion_getInstance_3() {
+    return Companion_instance_1;
   }
   function DynamicOpListener$exitClause$lambda(it) {
     return isInterface(it, Atom) ? it : THROW_CCE();
   }
   function DynamicOpListener(parser, operatorDefinedCallback) {
-    Companion_getInstance_5();
     PrologParserListener.call(this);
-    this.x33_1 = parser;
-    this.y33_1 = operatorDefinedCallback;
+    this.r35_1 = parser;
+    this.s35_1 = operatorDefinedCallback;
   }
-  protoOf(DynamicOpListener).a34 = function (ctx) {
+  protoOf(DynamicOpListener).u35 = function (ctx) {
     var expr = ctx.expression();
     if (ctx.exception != null) {
-      return Unit_getInstance();
+      return Unit_instance;
     }
     var tmp;
     var tmp_0;
@@ -242,67 +273,28 @@
     if (tmp) {
       var tmp_1 = ctx.accept(new PrologVisitor());
       var directive = isInterface(tmp_1, Directive) ? tmp_1 : THROW_CCE();
-      var op = directive.mv();
-      var tmp_2;
-      var tmp_3;
-      var tmp_4;
-      var tmp_5;
-      var tmp_6;
-      if (isInterface(op, Struct)) {
-        tmp_6 = op.lt() === 3;
-      } else {
-        tmp_6 = false;
-      }
-      if (tmp_6) {
-        tmp_5 = op.rt() === 'op';
-      } else {
-        tmp_5 = false;
-      }
-      if (tmp_5) {
-        var tmp_7 = op.get(0);
-        tmp_4 = isInterface(tmp_7, Numeric);
-      } else {
-        tmp_4 = false;
-      }
-      if (tmp_4) {
-        var tmp_8 = op.get(1);
-        tmp_3 = isInterface(tmp_8, Atom);
-      } else {
-        tmp_3 = false;
-      }
-      if (tmp_3) {
-        tmp_2 = op.ku();
-      } else {
-        tmp_2 = false;
-      }
-      if (tmp_2) {
-        var tmp$ret$1;
+      var op = directive.rw();
+      if (get_isOpDirective(op)) {
         // Inline function 'kotlin.math.min' call
-        var tmp$ret$0;
         // Inline function 'kotlin.math.max' call
-        var tmp_9 = op.get(0);
-        var tmp0_max = (isInterface(tmp_9, Numeric) ? tmp_9 : THROW_CCE()).sw().toInt();
-        tmp$ret$0 = Math.max(0, tmp0_max);
-        var tmp1_min = tmp$ret$0;
-        tmp$ret$1 = Math.min(1200, tmp1_min);
-        var priority = tmp$ret$1;
-        var specifier = Companion_getInstance_0().fromTerm(op.get(1));
+        var tmp_2 = (isInterface(op, Struct) ? op : THROW_CCE()).get(0);
+        var b = (isInterface(tmp_2, Numeric) ? tmp_2 : THROW_CCE()).sy().toInt();
+        var b_0 = Math.max(0, b);
+        var priority = Math.min(1200, b_0);
+        var specifier = Companion_getInstance().fromTerm(op.get(1));
         var operator = op.get(2);
         if (isInterface(operator, Atom)) {
-          onOperatorDefined(this, new Operator(operator.p2(), specifier, priority));
+          onOperatorDefined(this, new Operator(operator.q2(), specifier, priority));
         } else {
           if (isInterface(operator, List)) {
             var tmp$ret$3;
             $l$block: {
               // Inline function 'kotlin.sequences.all' call
-              var tmp2_all = operator.hs();
-              var tmp0_iterator = tmp2_all.j();
-              while (tmp0_iterator.m()) {
-                var element = tmp0_iterator.n();
-                var tmp$ret$2;
+              var tmp0_iterator = operator.at().o();
+              while (tmp0_iterator.p()) {
+                var element = tmp0_iterator.r();
                 // Inline function 'it.unibo.tuprolog.core.parsing.DynamicOpListener.exitClause.<anonymous>' call
-                tmp$ret$2 = isInterface(element, Atom);
-                if (!tmp$ret$2) {
+                if (!isInterface(element, Atom)) {
                   tmp$ret$3 = false;
                   break $l$block;
                 }
@@ -310,11 +302,11 @@
               tmp$ret$3 = true;
             }
             if (tmp$ret$3) {
-              var tmp_10 = operator.hs();
-              var tmp2_iterator = map(tmp_10, DynamicOpListener$exitClause$lambda).j();
-              while (tmp2_iterator.m()) {
-                var it = tmp2_iterator.n();
-                onOperatorDefined(this, new Operator(it.p2(), specifier, priority));
+              var tmp_3 = operator.at();
+              var tmp2_iterator = map(tmp_3, DynamicOpListener$exitClause$lambda).o();
+              while (tmp2_iterator.p()) {
+                var it = tmp2_iterator.r();
+                onOperatorDefined(this, new Operator(it.q2(), specifier, priority));
               }
             }
           }
@@ -323,7 +315,7 @@
     }
   };
   protoOf(DynamicOpListener).exitClause = function (ctx) {
-    return this.a34(ctx);
+    return this.u35(ctx);
   };
   function parseException(token, message) {
     return new ParseException(null, token.text, token.line, token.column, message, null);
@@ -333,7 +325,7 @@
     if (obj instanceof Token) {
       tmp = obj.text;
     } else {
-      tmp = toString(obj);
+      tmp = toString_0(obj);
     }
     return tmp;
   }
@@ -343,7 +335,7 @@
   function parseClause($this, parserAndErrorStrategy, source) {
     var mark = -1;
     var index = -1;
-    var parser = parserAndErrorStrategy.f4_1;
+    var parser = parserAndErrorStrategy.md_1;
     var tmp;
     try {
       mark = parser.getTokenStream().mark();
@@ -351,23 +343,21 @@
       tmp = parser.optClause();
     } catch ($p) {
       var tmp_0;
-      {
-        var e = $p;
-        var tmp_1;
-        if (isParseCancellationException(e) ? parser._interp.predictionMode === PredictionMode.SLL : false) {
-          parser.getTokenStream().seek(index);
-          parser._interp.predictionMode = PredictionMode.LL;
-          parser._errHandler = parserAndErrorStrategy.g4_1;
-          parser.addErrorListener(newErrorListener($this, source));
-          tmp_1 = parseClause($this, parserAndErrorStrategy, source);
-        } else if (e.clause !== null ? isRecognitionException(e.cause) : false) {
-          var tmp_2 = e.cause;
-          throw tmp_2 instanceof RecognitionException ? tmp_2 : THROW_CCE();
-        } else {
-          throw e instanceof Error ? e : THROW_CCE();
-        }
-        tmp_0 = tmp_1;
+      var e = $p;
+      var tmp_1;
+      if (isParseCancellationException(e) ? parser._interp.predictionMode === PredictionMode.SLL : false) {
+        parser.getTokenStream().seek(index);
+        parser._interp.predictionMode = PredictionMode.LL;
+        parser._errHandler = parserAndErrorStrategy.nd_1;
+        parser.addErrorListener(newErrorListener($this, source));
+        tmp_1 = parseClause($this, parserAndErrorStrategy, source);
+      } else if (e.clause !== null ? isRecognitionException(e.cause) : false) {
+        var tmp_2 = e.cause;
+        throw tmp_2 instanceof RecognitionException ? tmp_2 : THROW_CCE();
+      } else {
+        throw e instanceof Error ? e : THROW_CCE();
       }
+      tmp_0 = tmp_1;
       tmp = tmp_0;
     }
     finally {
@@ -382,13 +372,13 @@
     return map(tmp_1, PrologParserFactory$parseClauses$lambda_2);
   }
   function PrologParserFactory$newErrorListener$1($whileParsing) {
-    this.b34_1 = $whileParsing;
+    this.v35_1 = $whileParsing;
   }
   protoOf(PrologParserFactory$newErrorListener$1).syntaxError = function (recognizer, offendingSymbol, line, column, msg, e) {
     if (recognizer instanceof PrologParser) {
       recognizer.removeParseListeners();
     }
-    throw new ParseException(this.b34_1, symbolToString(this, offendingSymbol), line, column + 1 | 0, msg, e);
+    throw new ParseException(this.v35_1, symbolToString(this, offendingSymbol), line, column + 1 | 0, msg, e);
   };
   function PrologParserFactory$parseClauses$lambda(it) {
     return it + 1 | 0;
@@ -397,7 +387,7 @@
     return function (it) {
       var tmp;
       try {
-        tmp = parseClause(PrologParserFactory_getInstance(), $parser, $source);
+        tmp = parseClause(PrologParserFactory_instance, $parser, $source);
       } catch ($p) {
         var tmp_0;
         if ($p instanceof ParseException) {
@@ -407,7 +397,6 @@
         } else {
           throw $p;
         }
-        tmp = tmp_0;
       }
       return tmp;
     };
@@ -419,13 +408,12 @@
     return it.clause();
   }
   function PrologParserFactory() {
-    PrologParserFactory_instance = this;
   }
-  protoOf(PrologParserFactory).c34 = function (source, withOperators) {
-    var parser = this.d34(source, withOperators);
+  protoOf(PrologParserFactory).w35 = function (source, withOperators) {
+    var parser = this.x35(source, withOperators);
     return parseClauses(this, parser, source);
   };
-  protoOf(PrologParserFactory).d34 = function (source, operators) {
+  protoOf(PrologParserFactory).x35 = function (source, operators) {
     var stream = new InputStream(source);
     var lexer = new PrologLexer(stream);
     lexer.removeErrorListeners();
@@ -435,23 +423,21 @@
     var originalErrorStrategy = parser._errHandler;
     parser._errHandler = new BailErrorStrategy();
     parser._interp.predictionMode = PredictionMode.SLL;
-    return to(this.e34(parser, operators), originalErrorStrategy);
+    return to(this.y35(parser, operators), originalErrorStrategy);
   };
-  protoOf(PrologParserFactory).e34 = function (prologParser, operators) {
+  protoOf(PrologParserFactory).y35 = function (prologParser, operators) {
     // Inline function 'kotlin.collections.forEach' call
-    var tmp0_iterator = operators.j();
-    while (tmp0_iterator.m()) {
-      var element = tmp0_iterator.n();
+    var tmp0_iterator = operators.o();
+    while (tmp0_iterator.p()) {
+      var element = tmp0_iterator.r();
       // Inline function 'it.unibo.tuprolog.core.parsing.PrologParserFactory.addOperators.<anonymous>' call
-      prologParser.addOperator(element.l1f_1, toAssociativity(element.m1f_1), element.n1f_1);
+      prologParser.addOperator(element.g1g_1, toAssociativity(element.h1g_1), element.i1g_1);
     }
-    prologParser.addParseListener(Companion_getInstance_5().z33(prologParser));
+    prologParser.addParseListener(Companion_instance_1.t35(prologParser));
     return prologParser;
   };
   var PrologParserFactory_instance;
   function PrologParserFactory_getInstance() {
-    if (PrologParserFactory_instance == null)
-      new PrologParserFactory();
     return PrologParserFactory_instance;
   }
   function parseInteger($this, ctx) {
@@ -460,65 +446,44 @@
     var clean;
     if (ctx.isBin) {
       base = 2;
-      var tmp$ret$1;
       // Inline function 'kotlin.text.substring' call
-      var tmp$ret$0;
       // Inline function 'kotlin.js.asDynamic' call
-      tmp$ret$0 = str;
-      tmp$ret$1 = tmp$ret$0.substring(2);
-      clean = tmp$ret$1;
+      clean = str.substring(2);
     } else if (ctx.isOct) {
       base = 8;
-      var tmp$ret$3;
       // Inline function 'kotlin.text.substring' call
-      var tmp$ret$2;
       // Inline function 'kotlin.js.asDynamic' call
-      tmp$ret$2 = str;
-      tmp$ret$3 = tmp$ret$2.substring(2);
-      clean = tmp$ret$3;
+      clean = str.substring(2);
     } else if (ctx.isHex) {
       base = 16;
-      var tmp$ret$5;
       // Inline function 'kotlin.text.substring' call
-      var tmp$ret$4;
       // Inline function 'kotlin.js.asDynamic' call
-      tmp$ret$4 = str;
-      tmp$ret$5 = tmp$ret$4.substring(2);
-      clean = tmp$ret$5;
+      clean = str.substring(2);
     } else if (ctx.isChar) {
-      var tmp$ret$7;
       // Inline function 'kotlin.text.substring' call
-      var tmp$ret$6;
       // Inline function 'kotlin.js.asDynamic' call
-      tmp$ret$6 = str;
-      tmp$ret$7 = tmp$ret$6.substring(2);
-      clean = tmp$ret$7;
+      clean = str.substring(2);
       if (!(clean.length === 1)) {
         throw parseException(ctx.value, 'Invalid character literal: ' + ctx.value.text);
       }
-      var tmp$ret$10;
       // Inline function 'kotlin.with' call
-      var tmp = Companion_getInstance_1();
-      var tmp$ret$8;
+      var tmp = Companion_getInstance_0();
       // Inline function 'kotlin.code' call
-      var tmp0__get_code__88qj9g = charSequenceGet(clean, 0);
-      tmp$ret$8 = Char__toInt_impl_vasixd(tmp0__get_code__88qj9g);
-      var tmp1_with = tmp.of(tmp$ret$8);
+      var this_0 = charSequenceGet(clean, 0);
+      var tmp$ret$8 = Char__toInt_impl_vasixd(this_0);
       // Inline function 'kotlin.contracts.contract' call
-      var tmp$ret$9;
       // Inline function 'it.unibo.tuprolog.core.parsing.PrologVisitor.parseInteger.<anonymous>' call
+      var $this$with = tmp.of(tmp$ret$8);
       var tmp_0;
       var tmp0_safe_receiver = ctx.sign;
       var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.text;
       var tmp2_elvis_lhs = tmp1_safe_receiver == null ? null : contains_0(tmp1_safe_receiver, '-');
       if (tmp2_elvis_lhs == null ? false : tmp2_elvis_lhs) {
-        tmp_0 = tmp1_with.unaryMinus();
+        tmp_0 = $this$with.unaryMinus();
       } else {
-        tmp_0 = tmp1_with;
+        tmp_0 = $this$with;
       }
-      tmp$ret$9 = tmp_0;
-      tmp$ret$10 = tmp$ret$9;
-      return tmp$ret$10;
+      return tmp_0;
     } else {
       base = 10;
       clean = str;
@@ -527,72 +492,59 @@
       var tmp0_safe_receiver_0 = ctx.sign;
       clean = plus(tmp0_safe_receiver_0 == null ? null : tmp0_safe_receiver_0.text, clean);
     }
-    return Companion_getInstance_1().parseWithRadix(clean, base);
+    return Companion_getInstance_0().parseWithRadix(clean, base);
   }
   function visitPostfixExpression($this, ctx) {
     var tmp0_safe_receiver = ctx.left;
     var tmp = ensureNotNull(tmp0_safe_receiver == null ? null : tmp0_safe_receiver.accept($this));
-    var tmp$ret$2;
     // Inline function 'kotlin.collections.map' call
-    var tmp1_map = ctx.operators;
-    var tmp$ret$1;
+    var this_0 = ctx.operators;
     // Inline function 'kotlin.collections.mapTo' call
-    var tmp0_mapTo = ArrayList_init_$Create$(tmp1_map.length);
-    var indexedObject = tmp1_map;
+    var destination = ArrayList_init_$Create$(this_0.length);
     var inductionVariable = 0;
-    var last = indexedObject.length;
+    var last = this_0.length;
     while (inductionVariable < last) {
-      var item = indexedObject[inductionVariable];
+      var item = this_0[inductionVariable];
       inductionVariable = inductionVariable + 1 | 0;
-      var tmp$ret$0;
       // Inline function 'it.unibo.tuprolog.core.parsing.PrologVisitor.visitPostfixExpression.<anonymous>' call
-      tmp$ret$0 = item.symbol.text;
-      tmp0_mapTo.g(tmp$ret$0);
+      var tmp$ret$0 = item.symbol.text;
+      destination.l(tmp$ret$0);
     }
-    tmp$ret$1 = tmp0_mapTo;
-    tmp$ret$2 = tmp$ret$1;
-    return postfix($this, tmp, tmp$ret$2);
+    return postfix($this, tmp, destination);
   }
   function postfix($this, term, ops) {
-    var operator = ops.j();
-    var result = $this.f34_1.structOf(operator.n(), [term]);
-    while (operator.m()) {
-      result = $this.f34_1.structOf(operator.n(), [result]);
+    var operator = ops.o();
+    var result = $this.z35_1.structOf(operator.r(), [term]);
+    while (operator.p()) {
+      result = $this.z35_1.structOf(operator.r(), [result]);
     }
     return result;
   }
   function visitPrefixExpression($this, ctx) {
     var tmp = ctx.right[0].accept($this);
-    var tmp$ret$2;
     // Inline function 'kotlin.collections.map' call
-    var tmp1_map = ctx.operators;
-    var tmp$ret$1;
+    var this_0 = ctx.operators;
     // Inline function 'kotlin.collections.mapTo' call
-    var tmp0_mapTo = ArrayList_init_$Create$(tmp1_map.length);
-    var indexedObject = tmp1_map;
+    var destination = ArrayList_init_$Create$(this_0.length);
     var inductionVariable = 0;
-    var last = indexedObject.length;
+    var last = this_0.length;
     while (inductionVariable < last) {
-      var item = indexedObject[inductionVariable];
+      var item = this_0[inductionVariable];
       inductionVariable = inductionVariable + 1 | 0;
-      var tmp$ret$0;
       // Inline function 'it.unibo.tuprolog.core.parsing.PrologVisitor.visitPrefixExpression.<anonymous>' call
-      tmp$ret$0 = item.symbol.text;
-      tmp0_mapTo.g(tmp$ret$0);
+      var tmp$ret$0 = item.symbol.text;
+      destination.l(tmp$ret$0);
     }
-    tmp$ret$1 = tmp0_mapTo;
-    tmp$ret$2 = tmp$ret$1;
-    return prefix($this, tmp, tmp$ret$2);
+    return prefix($this, tmp, destination);
   }
   function prefix($this, term, ops) {
-    var i = ops.p() - 1 | 0;
+    var i = ops.u() - 1 | 0;
     var tmp0 = i;
     i = tmp0 - 1 | 0;
-    var result = $this.f34_1.structOf(ops.o(tmp0), [term]);
+    var result = $this.z35_1.structOf(ops.a1(tmp0), [term]);
     while (i >= 0) {
-      result = $this.f34_1.structOf(ops.o(i), [result]);
-      var tmp1 = i;
-      i = tmp1 - 1 | 0;
+      result = $this.z35_1.structOf(ops.a1(i), [result]);
+      i = i - 1 | 0;
     }
     return result;
   }
@@ -606,131 +558,109 @@
     } else if (tmp0_subject === Associativity.XFX) {
       tmp = visitInfixNonAssociativeExpression($this, ctx);
     } else {
-      throw IllegalStateException_init_$Create$();
+      var message = 'Non-infix associativity ' + ctx.associativity + ' in infix expression';
+      throw IllegalStateException_init_$Create$(toString_0(message));
     }
     return tmp;
   }
   function visitInfixNonAssociativeExpression($this, ctx) {
-    var tmp$ret$2;
     // Inline function 'kotlin.collections.map' call
-    var tmp1_map = plus_0(listOf(ensureNotNull(ctx.left)), asList(ctx.right));
-    var tmp$ret$1;
+    var this_0 = plus_0(listOf(ensureNotNull(ctx.left)), asList(ctx.right));
     // Inline function 'kotlin.collections.mapTo' call
-    var tmp0_mapTo = ArrayList_init_$Create$(collectionSizeOrDefault(tmp1_map, 10));
-    var tmp0_iterator = tmp1_map.j();
-    while (tmp0_iterator.m()) {
-      var item = tmp0_iterator.n();
-      var tmp$ret$0;
+    var destination = ArrayList_init_$Create$(collectionSizeOrDefault(this_0, 10));
+    var tmp0_iterator = this_0.o();
+    while (tmp0_iterator.p()) {
+      var item = tmp0_iterator.r();
       // Inline function 'it.unibo.tuprolog.core.parsing.PrologVisitor.visitInfixNonAssociativeExpression.<anonymous>' call
-      tmp$ret$0 = item.accept($this);
-      tmp0_mapTo.g(tmp$ret$0);
+      var tmp$ret$0 = item.accept($this);
+      destination.l(tmp$ret$0);
     }
-    tmp$ret$1 = tmp0_mapTo;
-    tmp$ret$2 = tmp$ret$1;
-    var operands = tmp$ret$2;
-    var tmp$ret$5;
+    var operands = destination;
     // Inline function 'kotlin.collections.map' call
-    var tmp3_map = ctx.operators;
-    var tmp$ret$4;
+    var this_1 = ctx.operators;
     // Inline function 'kotlin.collections.mapTo' call
-    var tmp2_mapTo = ArrayList_init_$Create$(tmp3_map.length);
-    var indexedObject = tmp3_map;
+    var destination_0 = ArrayList_init_$Create$(this_1.length);
     var inductionVariable = 0;
-    var last = indexedObject.length;
+    var last = this_1.length;
     while (inductionVariable < last) {
-      var item_0 = indexedObject[inductionVariable];
+      var item_0 = this_1[inductionVariable];
       inductionVariable = inductionVariable + 1 | 0;
-      var tmp$ret$3;
       // Inline function 'it.unibo.tuprolog.core.parsing.PrologVisitor.visitInfixNonAssociativeExpression.<anonymous>' call
-      tmp$ret$3 = item_0.symbol.text;
-      tmp2_mapTo.g(tmp$ret$3);
+      var tmp$ret$3 = item_0.symbol.text;
+      destination_0.l(tmp$ret$3);
     }
-    tmp$ret$4 = tmp2_mapTo;
-    tmp$ret$5 = tmp$ret$4;
-    var operators = tmp$ret$5;
+    var operators = destination_0;
     return infixNonAssociative($this, operands, operators);
   }
   function infixNonAssociative($this, terms, ops) {
-    return $this.f34_1.structOf(ops.o(0), [terms.o(0), terms.o(1)]);
+    return $this.z35_1.structOf(ops.a1(0), [terms.a1(0), terms.a1(1)]);
   }
   function handleOuters($this, expression, outers) {
     var result = expression;
-    var tmp0_iterator = outers.j();
-    while (tmp0_iterator.m()) {
-      var o = tmp0_iterator.n();
+    var tmp0_iterator = outers.o();
+    while (tmp0_iterator.p()) {
+      var o = tmp0_iterator.r();
       var tmp = listOf(result);
-      var tmp$ret$2;
       // Inline function 'kotlin.collections.map' call
-      var tmp1_map = o.right;
-      var tmp$ret$1;
+      var this_0 = o.right;
       // Inline function 'kotlin.collections.mapTo' call
-      var tmp0_mapTo = ArrayList_init_$Create$(tmp1_map.length);
-      var indexedObject = tmp1_map;
+      var destination = ArrayList_init_$Create$(this_0.length);
       var inductionVariable = 0;
-      var last = indexedObject.length;
+      var last = this_0.length;
       while (inductionVariable < last) {
-        var item = indexedObject[inductionVariable];
+        var item = this_0[inductionVariable];
         inductionVariable = inductionVariable + 1 | 0;
-        var tmp$ret$0;
         // Inline function 'it.unibo.tuprolog.core.parsing.PrologVisitor.handleOuters.<anonymous>' call
-        tmp$ret$0 = item.accept($this);
-        tmp0_mapTo.g(tmp$ret$0);
+        var tmp$ret$0 = item.accept($this);
+        destination.l(tmp$ret$0);
       }
-      tmp$ret$1 = tmp0_mapTo;
-      tmp$ret$2 = tmp$ret$1;
-      var operands = plus_0(tmp, tmp$ret$2);
-      var tmp$ret$5;
+      var operands = plus_0(tmp, destination);
       // Inline function 'kotlin.collections.map' call
-      var tmp3_map = o.operators;
-      var tmp$ret$4;
+      var this_1 = o.operators;
       // Inline function 'kotlin.collections.mapTo' call
-      var tmp2_mapTo = ArrayList_init_$Create$(tmp3_map.length);
-      var indexedObject_0 = tmp3_map;
+      var destination_0 = ArrayList_init_$Create$(this_1.length);
       var inductionVariable_0 = 0;
-      var last_0 = indexedObject_0.length;
+      var last_0 = this_1.length;
       while (inductionVariable_0 < last_0) {
-        var item_0 = indexedObject_0[inductionVariable_0];
+        var item_0 = this_1[inductionVariable_0];
         inductionVariable_0 = inductionVariable_0 + 1 | 0;
-        var tmp$ret$3;
         // Inline function 'it.unibo.tuprolog.core.parsing.PrologVisitor.handleOuters.<anonymous>' call
-        tmp$ret$3 = item_0.symbol.text;
-        tmp2_mapTo.g(tmp$ret$3);
+        var tmp$ret$3 = item_0.symbol.text;
+        destination_0.l(tmp$ret$3);
       }
-      tmp$ret$4 = tmp2_mapTo;
-      tmp$ret$5 = tmp$ret$4;
-      var operators = tmp$ret$5;
-      var tmp1_subject = o.associativity;
+      var operators = destination_0;
+      var associativity = o.associativity;
       var tmp_0;
-      if (tmp1_subject === Associativity.XFY) {
+      if (associativity === Associativity.XFY) {
         tmp_0 = infixRight($this, operands, operators);
-      } else if (tmp1_subject === Associativity.XF ? true : tmp1_subject === Associativity.YF) {
+      } else if (associativity === Associativity.XF ? true : associativity === Associativity.YF) {
         tmp_0 = postfix($this, result, operators);
-      } else if (tmp1_subject === Associativity.XFX) {
+      } else if (associativity === Associativity.XFX) {
         tmp_0 = infixNonAssociative($this, operands, operators);
-      } else if (tmp1_subject === Associativity.YFX) {
+      } else if (associativity === Associativity.YFX) {
         tmp_0 = infixLeft($this, operands, operators);
-      } else if (tmp1_subject === Associativity.FX ? true : tmp1_subject === Associativity.FY) {
+      } else if (associativity === Associativity.FX ? true : associativity === Associativity.FY) {
         tmp_0 = prefix($this, result, operators);
       } else {
-        throw IllegalStateException_init_$Create$();
+        var message = 'Invalid associativity: ' + associativity;
+        throw IllegalStateException_init_$Create$(toString_0(message));
       }
       result = tmp_0;
     }
     return result;
   }
   function infixRight($this, terms, ops) {
-    var i = terms.p() - 1 | 0;
-    var j = ops.p() - 1 | 0;
+    var i = terms.u() - 1 | 0;
+    var j = ops.u() - 1 | 0;
     var tmp0 = j;
     j = tmp0 - 1 | 0;
-    var result = $this.f34_1.structOf(ops.o(tmp0), [terms.o(i - 1 | 0), terms.o(i)]);
+    var result = $this.z35_1.structOf(ops.a1(tmp0), [terms.a1(i - 1 | 0), terms.a1(i)]);
     i = i - 2 | 0;
     while (i >= 0) {
       var tmp1 = j;
       j = tmp1 - 1 | 0;
-      result = $this.f34_1.structOf(ops.o(tmp1), [terms.o(i), result]);
-      var tmp2 = i;
-      i = tmp2 - 1 | 0;
+      result = $this.z35_1.structOf(ops.a1(tmp1), [terms.a1(i), result]);
+      i = i - 1 | 0;
     }
     return result;
   }
@@ -739,62 +669,50 @@
     var j = 0;
     var tmp0 = j;
     j = tmp0 + 1 | 0;
-    var tmp = ops.o(tmp0);
+    var tmp = ops.a1(tmp0);
     var tmp1 = i;
     i = tmp1 + 1 | 0;
-    var tmp_0 = terms.o(tmp1);
+    var tmp_0 = terms.a1(tmp1);
     var tmp2 = i;
     i = tmp2 + 1 | 0;
-    var result = $this.f34_1.structOf(tmp, [tmp_0, terms.o(tmp2)]);
-    while (i < terms.p()) {
+    var result = $this.z35_1.structOf(tmp, [tmp_0, terms.a1(tmp2)]);
+    while (i < terms.u()) {
       var tmp3 = j;
       j = tmp3 + 1 | 0;
-      result = $this.f34_1.structOf(ops.o(tmp3), [result, terms.o(i)]);
-      var tmp4 = i;
-      i = tmp4 + 1 | 0;
+      result = $this.z35_1.structOf(ops.a1(tmp3), [result, terms.a1(i)]);
+      i = i + 1 | 0;
     }
     return result;
   }
   function listOfOperands($this, ctx) {
-    var tmp$ret$2;
     // Inline function 'kotlin.collections.map' call
-    var tmp1_map = plus_0(listOf(ctx.left), toList(ctx.right));
-    var tmp$ret$1;
+    var this_0 = plus_0(listOf(ctx.left), toList(ctx.right));
     // Inline function 'kotlin.collections.mapTo' call
-    var tmp0_mapTo = ArrayList_init_$Create$(collectionSizeOrDefault(tmp1_map, 10));
-    var tmp0_iterator = tmp1_map.j();
-    while (tmp0_iterator.m()) {
-      var item = tmp0_iterator.n();
-      var tmp$ret$0;
+    var destination = ArrayList_init_$Create$(collectionSizeOrDefault(this_0, 10));
+    var tmp0_iterator = this_0.o();
+    while (tmp0_iterator.p()) {
+      var item = tmp0_iterator.r();
       // Inline function 'it.unibo.tuprolog.core.parsing.PrologVisitor.listOfOperands.<anonymous>' call
-      tmp$ret$0 = ensureNotNull(item).accept($this);
-      tmp0_mapTo.g(tmp$ret$0);
+      var tmp$ret$0 = ensureNotNull(item).accept($this);
+      destination.l(tmp$ret$0);
     }
-    tmp$ret$1 = tmp0_mapTo;
-    tmp$ret$2 = tmp$ret$1;
-    return tmp$ret$2;
+    return destination;
   }
   function listOfOperators($this, ctx) {
-    var tmp$ret$2;
     // Inline function 'kotlin.collections.map' call
-    var tmp1_map = ctx.operators;
-    var tmp$ret$1;
+    var this_0 = ctx.operators;
     // Inline function 'kotlin.collections.mapTo' call
-    var tmp0_mapTo = ArrayList_init_$Create$(tmp1_map.length);
-    var indexedObject = tmp1_map;
+    var destination = ArrayList_init_$Create$(this_0.length);
     var inductionVariable = 0;
-    var last = indexedObject.length;
+    var last = this_0.length;
     while (inductionVariable < last) {
-      var item = indexedObject[inductionVariable];
+      var item = this_0[inductionVariable];
       inductionVariable = inductionVariable + 1 | 0;
-      var tmp$ret$0;
       // Inline function 'it.unibo.tuprolog.core.parsing.PrologVisitor.listOfOperators.<anonymous>' call
-      tmp$ret$0 = item.symbol.text;
-      tmp0_mapTo.g(tmp$ret$0);
+      var tmp$ret$0 = item.symbol.text;
+      destination.l(tmp$ret$0);
     }
-    tmp$ret$1 = tmp0_mapTo;
-    tmp$ret$2 = tmp$ret$1;
-    return tmp$ret$2;
+    return destination;
   }
   function visitInfixRightAssociativeExpression($this, ctx) {
     return infixRight($this, listOfOperands($this, ctx), listOfOperators($this, ctx));
@@ -803,10 +721,8 @@
     return infixLeft($this, listOfOperands($this, ctx), listOfOperators($this, ctx));
   }
   function flatten($this, outers) {
-    var tmp$ret$0;
     // Inline function 'kotlin.sequences.asSequence' call
-    tmp$ret$0 = outers;
-    var tmp = tmp$ret$0;
+    var tmp = outers;
     return flatMap(tmp, PrologVisitor$flatten$lambda($this));
   }
   function flatten_0($this, outers) {
@@ -814,7 +730,7 @@
   }
   function PrologVisitor$visitExpression$ref($boundThis) {
     var l = function (p0) {
-      return $boundThis.g34(p0);
+      return $boundThis.a36(p0);
     };
     l.callableName = 'visitExpression';
     return l;
@@ -825,32 +741,32 @@
     };
   }
   function PrologVisitor(scope) {
-    scope = scope === VOID ? Companion_getInstance_2().empty() : scope;
+    scope = scope === VOID ? Companion_instance_0.empty() : scope;
     PrologParserVisitor.call(this);
-    this.f34_1 = scope;
+    this.z35_1 = scope;
   }
-  protoOf(PrologVisitor).h34 = function (ctx) {
-    return this.i34(ctx.term());
+  protoOf(PrologVisitor).b36 = function (ctx) {
+    return this.c36(ctx.term());
   };
   protoOf(PrologVisitor).visitSingletonTerm = function (ctx) {
-    return this.h34(ctx);
+    return this.b36(ctx);
   };
-  protoOf(PrologVisitor).j34 = function (ctx) {
-    return this.g34(ctx.expression());
+  protoOf(PrologVisitor).d36 = function (ctx) {
+    return this.a36(ctx.expression());
   };
   protoOf(PrologVisitor).visitSingletonExpression = function (ctx) {
-    return this.j34(ctx);
+    return this.d36(ctx);
   };
-  protoOf(PrologVisitor).k34 = function (ctx) {
+  protoOf(PrologVisitor).e36 = function (ctx) {
     return termToClause(ctx.expression().accept(this), null, ensureNotNull(ctx.start).line, ensureNotNull(ctx.start).column);
   };
   protoOf(PrologVisitor).visitClause = function (ctx) {
-    return this.k34(ctx);
+    return this.e36(ctx);
   };
-  protoOf(PrologVisitor).g34 = function (ctx) {
+  protoOf(PrologVisitor).a36 = function (ctx) {
     var tmp;
     if (ctx.isTerm) {
-      tmp = this.i34(ensureNotNull(ctx.left));
+      tmp = this.c36(ensureNotNull(ctx.left));
     } else if (contains(Associativity.INFIX, ctx.associativity)) {
       tmp = visitInfixExpression(this, ctx);
     } else if (contains(Associativity.POSTFIX, ctx.associativity)) {
@@ -863,12 +779,12 @@
     return handleOuters(this, tmp, flatten_0(this, asList(ctx.outers)));
   };
   protoOf(PrologVisitor).visitExpression = function (ctx) {
-    return this.g34(ctx);
+    return this.a36(ctx);
   };
-  protoOf(PrologVisitor).i34 = function (ctx) {
+  protoOf(PrologVisitor).c36 = function (ctx) {
     var tmp;
     if (ctx.isExpr) {
-      tmp = this.g34(ctx.expression());
+      tmp = this.a36(ctx.expression());
     } else {
       var tmp_0 = ctx.children[0].accept(this);
       tmp = (!(tmp_0 == null) ? isInterface(tmp_0, Term) : false) ? tmp_0 : THROW_CCE();
@@ -876,23 +792,23 @@
     return tmp;
   };
   protoOf(PrologVisitor).visitTerm = function (ctx) {
-    return this.i34(ctx);
+    return this.c36(ctx);
   };
-  protoOf(PrologVisitor).l34 = function (ctx) {
+  protoOf(PrologVisitor).f36 = function (ctx) {
     var value = parseInteger(this, ctx);
-    return Companion_getInstance_3().ofBigInteger(value);
+    return Companion_getInstance_1().ofBigInteger(value);
   };
   protoOf(PrologVisitor).visitInteger = function (ctx) {
-    return this.l34(ctx);
+    return this.f36(ctx);
   };
-  protoOf(PrologVisitor).m34 = function (ctx) {
+  protoOf(PrologVisitor).g36 = function (ctx) {
     var tmp = ctx.children[0].accept(this);
     return (!(tmp == null) ? isInterface(tmp, Term) : false) ? tmp : THROW_CCE();
   };
   protoOf(PrologVisitor).visitNumber = function (ctx) {
-    return this.m34(ctx);
+    return this.g36(ctx);
   };
-  protoOf(PrologVisitor).n34 = function (ctx) {
+  protoOf(PrologVisitor).h36 = function (ctx) {
     var raw = ctx.value.text;
     if (!(ctx.sign == null)) {
       var tmp0_safe_receiver = ctx.sign;
@@ -900,7 +816,7 @@
     }
     var tmp;
     try {
-      tmp = Companion_getInstance_4().parse(raw);
+      tmp = Companion_getInstance_2().parse(raw);
     } catch ($p) {
       var tmp_0;
       if ($p instanceof NumberFormatException) {
@@ -909,105 +825,99 @@
       } else {
         throw $p;
       }
-      tmp = tmp_0;
     }
     return tmp;
   };
   protoOf(PrologVisitor).visitReal = function (ctx) {
-    return this.n34(ctx);
+    return this.h36(ctx);
   };
-  protoOf(PrologVisitor).o34 = function (ctx) {
+  protoOf(PrologVisitor).i36 = function (ctx) {
     var tmp;
     if (ctx.isAnonymous) {
-      tmp = this.f34_1.anonymous();
+      tmp = this.z35_1.anonymous();
     } else {
-      tmp = this.f34_1.varOf(ctx.value.text);
+      tmp = this.z35_1.varOf(ctx.value.text);
     }
     return tmp;
   };
   protoOf(PrologVisitor).visitVariable = function (ctx) {
-    return this.o34(ctx);
+    return this.i36(ctx);
   };
-  protoOf(PrologVisitor).p34 = function (ctx) {
+  protoOf(PrologVisitor).j36 = function (ctx) {
+    var tmp;
     if (ctx.isList) {
-      return this.f34_1.listOf([]);
+      tmp = this.z35_1.logicListOf([]);
     } else if (ctx.isBlock) {
-      return this.f34_1.setOf([]);
-    }
-    var tmp;
-    if (ctx.arity === 0) {
-      tmp = this.f34_1.atomOf(ctx.functor.text);
+      tmp = this.z35_1.blockOf([]);
+    } else if (ctx.arity === 0) {
+      tmp = this.z35_1.atomOf(ctx.functor.text);
     } else {
       var tmp_0 = ctx.functor.text;
       var tmp_1 = asSequence_0(ctx.args);
-      tmp = this.f34_1.structOfSequence(tmp_0, map(tmp_1, PrologVisitor$visitExpression$ref(this)));
+      tmp = this.z35_1.structOfSequence(tmp_0, map(tmp_1, PrologVisitor$visitExpression$ref(this)));
     }
     return tmp;
   };
   protoOf(PrologVisitor).visitStructure = function (ctx) {
-    return this.p34(ctx);
+    return this.j36(ctx);
   };
-  protoOf(PrologVisitor).q34 = function (ctx) {
-    var tmp$ret$1;
+  protoOf(PrologVisitor).k36 = function (ctx) {
     // Inline function 'kotlin.collections.map' call
-    var tmp1_map = ctx.items;
-    var tmp$ret$0;
+    var this_0 = ctx.items;
     // Inline function 'kotlin.collections.mapTo' call
-    var tmp0_mapTo = ArrayList_init_$Create$(tmp1_map.length);
-    var indexedObject = tmp1_map;
+    var destination = ArrayList_init_$Create$(this_0.length);
     var inductionVariable = 0;
-    var last = indexedObject.length;
+    var last = this_0.length;
     while (inductionVariable < last) {
-      var item = indexedObject[inductionVariable];
+      var item = this_0[inductionVariable];
       inductionVariable = inductionVariable + 1 | 0;
-      tmp0_mapTo.g(this.g34(item));
+      var tmp$ret$0 = this.a36(item);
+      destination.l(tmp$ret$0);
     }
-    tmp$ret$0 = tmp0_mapTo;
-    tmp$ret$1 = tmp$ret$0;
-    var terms = tmp$ret$1;
+    var terms = destination;
     var tmp;
     if (ctx.hasTail) {
       var tmp0_safe_receiver = ctx.tail;
-      tmp = this.f34_1.hy(terms, tmp0_safe_receiver == null ? null : tmp0_safe_receiver.accept(this));
+      tmp = this.z35_1.b10(terms, tmp0_safe_receiver == null ? null : tmp0_safe_receiver.accept(this));
     } else {
-      tmp = this.f34_1.listOfIterable(terms);
+      tmp = this.z35_1.logicListOfIterable(terms);
     }
     return tmp;
   };
   protoOf(PrologVisitor).visitList = function (ctx) {
-    return this.q34(ctx);
+    return this.k36(ctx);
   };
-  protoOf(PrologVisitor).r34 = function (ctx) {
+  protoOf(PrologVisitor).l36 = function (ctx) {
     var tmp;
     if (ctx.length === 1) {
-      tmp = this.f34_1.setOf([ctx.items[0].accept(this)]);
+      tmp = this.z35_1.blockOf([ctx.items[0].accept(this)]);
     } else {
-      var tmp$ret$1;
       // Inline function 'kotlin.collections.map' call
-      var tmp1_map = ctx.items;
-      var tmp$ret$0;
+      var this_0 = ctx.items;
       // Inline function 'kotlin.collections.mapTo' call
-      var tmp0_mapTo = ArrayList_init_$Create$(tmp1_map.length);
-      var indexedObject = tmp1_map;
+      var destination = ArrayList_init_$Create$(this_0.length);
       var inductionVariable = 0;
-      var last = indexedObject.length;
+      var last = this_0.length;
       while (inductionVariable < last) {
-        var item = indexedObject[inductionVariable];
+        var item = this_0[inductionVariable];
         inductionVariable = inductionVariable + 1 | 0;
-        tmp0_mapTo.g(this.g34(item));
+        var tmp$ret$0 = this.a36(item);
+        destination.l(tmp$ret$0);
       }
-      tmp$ret$0 = tmp0_mapTo;
-      tmp$ret$1 = tmp$ret$0;
-      tmp = this.f34_1.setOfIterable(tmp$ret$1);
+      tmp = this.z35_1.blockOfIterable(destination);
     }
     return tmp;
   };
   protoOf(PrologVisitor).visitBlock = function (ctx) {
-    return this.r34(ctx);
+    return this.l36(ctx);
   };
+  //region block: init
+  Companion_instance_1 = new Companion();
+  PrologParserFactory_instance = new PrologParserFactory();
+  //endregion
   //region block: exports
   _.$_$ = _.$_$ || {};
-  _.$_$.a = PrologParserFactory_getInstance;
+  _.$_$.a = PrologParserFactory_instance;
   _.$_$.b = PrologVisitor;
   _.$_$.c = termToClause;
   //endregion