@tuprolog/arg2p-core 0.7.3 → 0.8.2

package/2p-parser-core.js

@@ -45,73 +45,286 @@
   var BailErrorStrategy = $module$antlr4_src_antlr4_error_s9pni7.BailErrorStrategy;
   var PrologParserVisitor = $module$_tuprolog_parser_utils_xy31vy.PrologParserVisitor;
   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.$_$.k9;
-  var replace = kotlin_kotlin.$_$.k8;
+  var captureStack = kotlin_kotlin.$_$.z4;
+  var protoOf = kotlin_kotlin.$_$.a6;
+  var classMeta = kotlin_kotlin.$_$.e5;
+  var setMetadataFor = kotlin_kotlin.$_$.b6;
+  var TuPrologException = kotlin_it_unibo_tuprolog_core.$_$.b1;
+  var TuPrologException_init_$Init$ = kotlin_it_unibo_tuprolog_core.$_$.e;
+  var ensureNotNull = kotlin_kotlin.$_$.y9;
+  var replace = kotlin_kotlin.$_$.w8;
   var _Char___init__impl__6a9atx = kotlin_kotlin.$_$.f1;
-  var Char = kotlin_kotlin.$_$.w8;
+  var Char = kotlin_kotlin.$_$.j9;
   var toString = kotlin_kotlin.$_$.j1;
-  var Struct = kotlin_it_unibo_tuprolog_core.$_$.l1;
-  var isInterface = kotlin_kotlin.$_$.i5;
-  var Numeric = kotlin_it_unibo_tuprolog_core.$_$.i1;
-  var Atom = kotlin_it_unibo_tuprolog_core.$_$.a1;
-  var Clause = kotlin_it_unibo_tuprolog_core.$_$.b1;
+  var Struct = kotlin_it_unibo_tuprolog_core.$_$.r1;
+  var isInterface = kotlin_kotlin.$_$.q5;
+  var Numeric = kotlin_it_unibo_tuprolog_core.$_$.n1;
+  var Atom = kotlin_it_unibo_tuprolog_core.$_$.e1;
+  var Companion_getInstance = kotlin_it_unibo_tuprolog_core.$_$.i;
+  var Companion_instance = kotlin_it_unibo_tuprolog_core.$_$.t;
+  var OperatorSet_init_$Create$ = kotlin_it_unibo_tuprolog_core.$_$.f;
+  var objectMeta = kotlin_kotlin.$_$.z5;
   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 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_0 = kotlin_kotlin.$_$.x5;
-  var coerceAtLeast = kotlin_kotlin.$_$.i6;
+  var Constant = kotlin_it_unibo_tuprolog_core.$_$.g1;
+  var Var = kotlin_it_unibo_tuprolog_core.$_$.s2;
+  var Integer = kotlin_it_unibo_tuprolog_core.$_$.l1;
+  var Real = kotlin_it_unibo_tuprolog_core.$_$.o1;
+  var Clause = kotlin_it_unibo_tuprolog_core.$_$.f1;
+  var Rule = kotlin_it_unibo_tuprolog_core.$_$.p1;
+  var Fact = kotlin_it_unibo_tuprolog_core.$_$.j1;
+  var Directive = kotlin_it_unibo_tuprolog_core.$_$.i1;
+  var interfaceMeta = kotlin_kotlin.$_$.n5;
+  var Companion_instance_0 = kotlin_it_unibo_tuprolog_core.$_$.m;
+  var Unit_instance = kotlin_kotlin.$_$.s1;
+  var THROW_CCE = kotlin_kotlin.$_$.v9;
+  var contains = kotlin_kotlin.$_$.l2;
+  var Companion_getInstance_0 = kotlin_it_unibo_tuprolog_core.$_$.j;
+  var map = kotlin_kotlin.$_$.s7;
+  var Operator = kotlin_it_unibo_tuprolog_core.$_$.d1;
+  var List = kotlin_it_unibo_tuprolog_core.$_$.m1;
+  var toString_0 = kotlin_kotlin.$_$.f6;
+  var coerceAtLeast = kotlin_kotlin.$_$.q6;
   var isRecognitionException = kotlin_it_unibo_tuprolog_parser_js.$_$.b;
   var isParseCancellationException = kotlin_it_unibo_tuprolog_parser_js.$_$.a;
-  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 generateSequence = kotlin_kotlin.$_$.m7;
+  var takeWhile = kotlin_kotlin.$_$.c8;
+  var to = kotlin_kotlin.$_$.ha;
+  var Companion_getInstance_1 = kotlin_io_github_gciatto_kt_math.$_$.e;
+  var charSequenceGet = kotlin_kotlin.$_$.c5;
   var Char__toInt_impl_vasixd = kotlin_kotlin.$_$.i1;
-  var contains_0 = kotlin_kotlin.$_$.d8;
-  var plus = kotlin_kotlin.$_$.o9;
+  var contains_0 = kotlin_kotlin.$_$.o8;
+  var plus = kotlin_kotlin.$_$.ca;
   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 listOf = kotlin_kotlin.$_$.j3;
+  var asList = kotlin_kotlin.$_$.d2;
+  var plus_0 = kotlin_kotlin.$_$.c4;
+  var collectionSizeOrDefault = kotlin_kotlin.$_$.j2;
+  var toList = kotlin_kotlin.$_$.l4;
+  var flatMap = kotlin_kotlin.$_$.k7;
+  var asSequence = kotlin_kotlin.$_$.h2;
+  var toList_0 = kotlin_kotlin.$_$.g8;
+  var sequenceOf = kotlin_kotlin.$_$.y7;
+  var asSequence_0 = kotlin_kotlin.$_$.i2;
+  var plus_1 = kotlin_kotlin.$_$.w7;
   var IllegalArgumentException_init_$Create$ = kotlin_kotlin.$_$.s;
-  var Term = kotlin_it_unibo_tuprolog_core.$_$.j2;
-  var Companion_getInstance_1 = kotlin_it_unibo_tuprolog_core.$_$.l;
+  var Term = kotlin_it_unibo_tuprolog_core.$_$.q2;
   var Companion_getInstance_2 = kotlin_it_unibo_tuprolog_core.$_$.o;
-  var NumberFormatException = kotlin_kotlin.$_$.e9;
+  var Companion_getInstance_3 = kotlin_it_unibo_tuprolog_core.$_$.r;
+  var NumberFormatException = kotlin_kotlin.$_$.s9;
   //endregion
   //region block: pre-declaration
   setMetadataFor(ParseException, 'ParseException', classMeta, TuPrologException);
   setMetadataFor(InvalidTermTypeException, 'InvalidTermTypeException', classMeta, ParseException);
   setMetadataFor(Companion, 'Companion', objectMeta);
+  function parseTerm(input) {
+    return this.parseTermWithOperators(input, this.b39());
+  }
+  function parseStructWithOperators(input, operators) {
+    // Inline function 'it.unibo.tuprolog.core.parsing.Companion.parseAs' call
+    // Inline function 'kotlin.let' call
+    // Inline function 'kotlin.contracts.contract' call
+    // Inline function 'it.unibo.tuprolog.core.parsing.Companion.parseAs.<anonymous>' call
+    var it = this.parseTermWithOperators(input, operators);
+    var tmp0_elvis_lhs = isInterface(it, Struct) ? it : null;
+    var tmp;
+    if (tmp0_elvis_lhs == null) {
+      throw new InvalidTermTypeException(input, it, getKClass(Struct));
+    } else {
+      tmp = tmp0_elvis_lhs;
+    }
+    return tmp;
+  }
+  function parseStruct(input) {
+    return this.parseStructWithOperators(input, this.b39());
+  }
+  function parseConstantWithOperators(input, operators) {
+    // Inline function 'it.unibo.tuprolog.core.parsing.Companion.parseAs' call
+    // Inline function 'kotlin.let' call
+    // Inline function 'kotlin.contracts.contract' call
+    // Inline function 'it.unibo.tuprolog.core.parsing.Companion.parseAs.<anonymous>' call
+    var it = this.parseTermWithOperators(input, operators);
+    var tmp0_elvis_lhs = isInterface(it, Constant) ? it : null;
+    var tmp;
+    if (tmp0_elvis_lhs == null) {
+      throw new InvalidTermTypeException(input, it, getKClass(Constant));
+    } else {
+      tmp = tmp0_elvis_lhs;
+    }
+    return tmp;
+  }
+  function parseConstant(input) {
+    return this.parseConstantWithOperators(input, this.b39());
+  }
+  function parseVarWithOperators(input, operators) {
+    // Inline function 'it.unibo.tuprolog.core.parsing.Companion.parseAs' call
+    // Inline function 'kotlin.let' call
+    // Inline function 'kotlin.contracts.contract' call
+    // Inline function 'it.unibo.tuprolog.core.parsing.Companion.parseAs.<anonymous>' call
+    var it = this.parseTermWithOperators(input, operators);
+    var tmp0_elvis_lhs = isInterface(it, Var) ? it : null;
+    var tmp;
+    if (tmp0_elvis_lhs == null) {
+      throw new InvalidTermTypeException(input, it, getKClass(Var));
+    } else {
+      tmp = tmp0_elvis_lhs;
+    }
+    return tmp;
+  }
+  function parseVar(input) {
+    return this.parseVarWithOperators(input, this.b39());
+  }
+  function parseAtomWithOperators(input, operators) {
+    // Inline function 'it.unibo.tuprolog.core.parsing.Companion.parseAs' call
+    // Inline function 'kotlin.let' call
+    // Inline function 'kotlin.contracts.contract' call
+    // Inline function 'it.unibo.tuprolog.core.parsing.Companion.parseAs.<anonymous>' call
+    var it = this.parseTermWithOperators(input, operators);
+    var tmp0_elvis_lhs = isInterface(it, Atom) ? it : null;
+    var tmp;
+    if (tmp0_elvis_lhs == null) {
+      throw new InvalidTermTypeException(input, it, getKClass(Atom));
+    } else {
+      tmp = tmp0_elvis_lhs;
+    }
+    return tmp;
+  }
+  function parseAtom(input) {
+    return this.parseAtomWithOperators(input, this.b39());
+  }
+  function parseNumericWithOperators(input, operators) {
+    // Inline function 'it.unibo.tuprolog.core.parsing.Companion.parseAs' call
+    // Inline function 'kotlin.let' call
+    // Inline function 'kotlin.contracts.contract' call
+    // Inline function 'it.unibo.tuprolog.core.parsing.Companion.parseAs.<anonymous>' call
+    var it = this.parseTermWithOperators(input, operators);
+    var tmp0_elvis_lhs = isInterface(it, Numeric) ? it : null;
+    var tmp;
+    if (tmp0_elvis_lhs == null) {
+      throw new InvalidTermTypeException(input, it, getKClass(Numeric));
+    } else {
+      tmp = tmp0_elvis_lhs;
+    }
+    return tmp;
+  }
+  function parseNumeric(input) {
+    return this.parseNumericWithOperators(input, this.b39());
+  }
+  function parseIntegerWithOperators(input, operators) {
+    // Inline function 'it.unibo.tuprolog.core.parsing.Companion.parseAs' call
+    // Inline function 'kotlin.let' call
+    // Inline function 'kotlin.contracts.contract' call
+    // Inline function 'it.unibo.tuprolog.core.parsing.Companion.parseAs.<anonymous>' call
+    var it = this.parseTermWithOperators(input, operators);
+    var tmp0_elvis_lhs = isInterface(it, Integer) ? it : null;
+    var tmp;
+    if (tmp0_elvis_lhs == null) {
+      throw new InvalidTermTypeException(input, it, getKClass(Integer));
+    } else {
+      tmp = tmp0_elvis_lhs;
+    }
+    return tmp;
+  }
+  function parseInteger(input) {
+    return this.parseIntegerWithOperators(input, this.b39());
+  }
+  function parseRealWithOperators(input, operators) {
+    // Inline function 'it.unibo.tuprolog.core.parsing.Companion.parseAs' call
+    // Inline function 'kotlin.let' call
+    // Inline function 'kotlin.contracts.contract' call
+    // Inline function 'it.unibo.tuprolog.core.parsing.Companion.parseAs.<anonymous>' call
+    var it = this.parseTermWithOperators(input, operators);
+    var tmp0_elvis_lhs = isInterface(it, Real) ? it : null;
+    var tmp;
+    if (tmp0_elvis_lhs == null) {
+      throw new InvalidTermTypeException(input, it, getKClass(Real));
+    } else {
+      tmp = tmp0_elvis_lhs;
+    }
+    return tmp;
+  }
+  function parseReal(input) {
+    return this.parseRealWithOperators(input, this.b39());
+  }
+  function parseClauseWithOperators(input, operators) {
+    // Inline function 'it.unibo.tuprolog.core.parsing.Companion.parseAs' call
+    // Inline function 'kotlin.let' call
+    // Inline function 'kotlin.contracts.contract' call
+    // Inline function 'it.unibo.tuprolog.core.parsing.Companion.parseAs.<anonymous>' call
+    var it = this.parseTermWithOperators(input, operators);
+    var tmp0_elvis_lhs = isInterface(it, Clause) ? it : null;
+    var tmp;
+    if (tmp0_elvis_lhs == null) {
+      throw new InvalidTermTypeException(input, it, getKClass(Clause));
+    } else {
+      tmp = tmp0_elvis_lhs;
+    }
+    return tmp;
+  }
+  function parseClause(input) {
+    return this.parseClauseWithOperators(input, this.b39());
+  }
+  function parseRuleWithOperators(input, operators) {
+    // Inline function 'it.unibo.tuprolog.core.parsing.Companion.parseAs' call
+    // Inline function 'kotlin.let' call
+    // Inline function 'kotlin.contracts.contract' call
+    // Inline function 'it.unibo.tuprolog.core.parsing.Companion.parseAs.<anonymous>' call
+    var it = this.parseTermWithOperators(input, operators);
+    var tmp0_elvis_lhs = isInterface(it, Rule) ? it : null;
+    var tmp;
+    if (tmp0_elvis_lhs == null) {
+      throw new InvalidTermTypeException(input, it, getKClass(Rule));
+    } else {
+      tmp = tmp0_elvis_lhs;
+    }
+    return tmp;
+  }
+  function parseRule(input) {
+    return this.parseRuleWithOperators(input, this.b39());
+  }
+  function parseFactWithOperators(input, operators) {
+    // Inline function 'it.unibo.tuprolog.core.parsing.Companion.parseAs' call
+    // Inline function 'kotlin.let' call
+    // Inline function 'kotlin.contracts.contract' call
+    // Inline function 'it.unibo.tuprolog.core.parsing.Companion.parseAs.<anonymous>' call
+    var it = this.parseTermWithOperators(input, operators);
+    var tmp0_elvis_lhs = isInterface(it, Fact) ? it : null;
+    var tmp;
+    if (tmp0_elvis_lhs == null) {
+      throw new InvalidTermTypeException(input, it, getKClass(Fact));
+    } else {
+      tmp = tmp0_elvis_lhs;
+    }
+    return tmp;
+  }
+  function parseFact(input) {
+    return this.parseFactWithOperators(input, this.b39());
+  }
+  function parseDirectiveWithOperators(input, operators) {
+    // Inline function 'it.unibo.tuprolog.core.parsing.Companion.parseAs' call
+    // Inline function 'kotlin.let' call
+    // Inline function 'kotlin.contracts.contract' call
+    // Inline function 'it.unibo.tuprolog.core.parsing.Companion.parseAs.<anonymous>' call
+    var it = this.parseTermWithOperators(input, operators);
+    var tmp0_elvis_lhs = isInterface(it, Directive) ? it : null;
+    var tmp;
+    if (tmp0_elvis_lhs == null) {
+      throw new InvalidTermTypeException(input, it, getKClass(Directive));
+    } else {
+      tmp = tmp0_elvis_lhs;
+    }
+    return tmp;
+  }
+  function parseDirective(input) {
+    return this.parseDirectiveWithOperators(input, this.b39());
+  }
+  setMetadataFor(TermParser, 'TermParser', interfaceMeta);
+  setMetadataFor(Companion_0, 'Companion', objectMeta);
   setMetadataFor(DynamicOpListener, 'DynamicOpListener', classMeta, PrologParserListener);
   setMetadataFor(PrologParserFactory$newErrorListener$1, VOID, classMeta);
   setMetadataFor(PrologParserFactory, 'PrologParserFactory', objectMeta);
   setMetadataFor(PrologVisitor, 'PrologVisitor', classMeta, PrologParserVisitor, VOID, PrologVisitor);
+  setMetadataFor(TermParserImpl, 'TermParserImpl', classMeta, VOID, [TermParser]);
   //endregion
   function InvalidTermTypeException(input, term, type, offendingSymbol, line, column, message, throwable) {
     var tmp;
@@ -124,12 +337,12 @@
     offendingSymbol = tmp;
     line = line === VOID ? 1 : line;
     column = column === VOID ? 1 : column;
-    message = message === VOID ? 'Expected ' + type.n6() + ', got: ' + offendingSymbol : message;
+    message = message === VOID ? 'Expected ' + type.o6() + ', got: ' + offendingSymbol : message;
     throwable = throwable === VOID ? null : throwable;
     ParseException.call(this, input, offendingSymbol, line, column, message, throwable);
     captureStack(this, InvalidTermTypeException);
-    this.f35_1 = term;
-    this.g35_1 = type;
+    this.k38_1 = term;
+    this.l38_1 = type;
   }
   function ParseException(input, offendingSymbol, line, column, message, throwable) {
     TuPrologException_init_$Init$(message, throwable, this);
@@ -140,34 +353,34 @@
     this.column = column;
     this.clauseIndex = -1;
   }
-  protoOf(ParseException).h35 = function (_set____db54di) {
+  protoOf(ParseException).m38 = function (_set____db54di) {
     this.input = _set____db54di;
   };
-  protoOf(ParseException).i35 = function () {
+  protoOf(ParseException).n38 = function () {
     return this.input;
   };
-  protoOf(ParseException).j35 = function (_set____db54di) {
+  protoOf(ParseException).o38 = function (_set____db54di) {
     this.offendingSymbol = _set____db54di;
   };
-  protoOf(ParseException).k35 = function () {
+  protoOf(ParseException).p38 = function () {
     return this.offendingSymbol;
   };
-  protoOf(ParseException).l35 = function (_set____db54di) {
+  protoOf(ParseException).q38 = function (_set____db54di) {
     this.line = _set____db54di;
   };
-  protoOf(ParseException).m35 = function () {
+  protoOf(ParseException).r38 = function () {
     return this.line;
   };
-  protoOf(ParseException).n35 = function (_set____db54di) {
+  protoOf(ParseException).s38 = function (_set____db54di) {
     this.column = _set____db54di;
   };
-  protoOf(ParseException).o35 = function () {
+  protoOf(ParseException).t38 = function () {
     return this.column;
   };
-  protoOf(ParseException).p35 = function (_set____db54di) {
+  protoOf(ParseException).u38 = function (_set____db54di) {
     this.clauseIndex = _set____db54di;
   };
-  protoOf(ParseException).q35 = function () {
+  protoOf(ParseException).v38 = function () {
     return this.clauseIndex;
   };
   protoOf(ParseException).toString = function () {
@@ -180,17 +393,17 @@
     var tmp_2;
     var tmp_3;
     if (isInterface(_this__u8e3s4, Struct)) {
-      tmp_3 = _this__u8e3s4.eu() === 3;
+      tmp_3 = _this__u8e3s4.tu() === 3;
     } else {
       tmp_3 = false;
     }
     if (tmp_3) {
-      tmp_2 = _this__u8e3s4.ku() === 'op';
+      tmp_2 = _this__u8e3s4.zu() === 'op';
     } else {
       tmp_2 = false;
     }
     if (tmp_2) {
-      tmp_1 = _this__u8e3s4.ov();
+      tmp_1 = _this__u8e3s4.dw();
     } else {
       tmp_1 = false;
     }
@@ -208,6 +421,49 @@
     }
     return tmp;
   }
+  function Companion() {
+  }
+  protoOf(Companion).w38 = function (scope) {
+    return this.x38(Companion_getInstance().EMPTY, scope);
+  };
+  protoOf(Companion).withNoOperator = function (scope, $super) {
+    scope = scope === VOID ? Companion_instance.empty() : scope;
+    return $super === VOID ? this.w38(scope) : $super.w38.call(this, scope);
+  };
+  protoOf(Companion).y38 = function (scope) {
+    return this.x38(Companion_getInstance().STANDARD, scope);
+  };
+  protoOf(Companion).withStandardOperators = function (scope, $super) {
+    scope = scope === VOID ? Companion_instance.empty() : scope;
+    return $super === VOID ? this.y38(scope) : $super.y38.call(this, scope);
+  };
+  protoOf(Companion).z38 = function (scope) {
+    return this.x38(Companion_getInstance().DEFAULT, scope);
+  };
+  protoOf(Companion).withDefaultOperators = function (scope, $super) {
+    scope = scope === VOID ? Companion_instance.empty() : scope;
+    return $super === VOID ? this.z38(scope) : $super.z38.call(this, scope);
+  };
+  protoOf(Companion).x38 = function (operators, scope) {
+    return termParserWithOperators(operators, scope);
+  };
+  protoOf(Companion).withOperatorSet = function (operators, scope, $super) {
+    scope = scope === VOID ? Companion_instance.empty() : scope;
+    return $super === VOID ? this.x38(operators, scope) : $super.x38.call(this, operators, scope);
+  };
+  protoOf(Companion).a39 = function (operators, scope) {
+    return this.x38(OperatorSet_init_$Create$(operators.slice()), scope);
+  };
+  protoOf(Companion).withOperators = function (operators, scope, $super) {
+    scope = scope === VOID ? Companion_instance.empty() : scope;
+    return $super === VOID ? this.a39(operators, scope) : $super.a39.call(this, operators, scope);
+  };
+  var Companion_instance_1;
+  function Companion_getInstance_4() {
+    return Companion_instance_1;
+  }
+  function TermParser() {
+  }
   function termToClause(_this__u8e3s4, source, line, column) {
     source = source === VOID ? null : source;
     line = line === VOID ? 0 : line;
@@ -217,13 +473,22 @@
       tmp = _this__u8e3s4;
     } else {
       if (isInterface(_this__u8e3s4, Struct)) {
-        tmp = Companion_instance.of(_this__u8e3s4);
+        tmp = Companion_instance_0.of(_this__u8e3s4);
       } else {
         throw new InvalidTermTypeException(source, _this__u8e3s4, getKClass(Clause), VOID, line, column);
       }
     }
     return tmp;
   }
+  function parseStructWithOperators_0(_this__u8e3s4, input, operators) {
+    return get_defaultParser().parseStructWithOperators(input, operators);
+  }
+  function parseStruct_0(_this__u8e3s4, input) {
+    return get_defaultParser().parseStruct(input);
+  }
+  function get_defaultParser() {
+    return Companion_instance_1.withDefaultOperators();
+  }
   function toAssociativity(_this__u8e3s4) {
     return _this__u8e3s4.toString();
   }
@@ -231,27 +496,27 @@
     return Unit_instance;
   }
   function onOperatorDefined($this, operator) {
-    $this.r35_1.addOperator(operator.g1g_1, toAssociativity(operator.h1g_1), operator.i1g_1);
-    $this.s35_1($this.r35_1, operator);
+    $this.c39_1.addOperator(operator.a1h_1, toAssociativity(operator.b1h_1), operator.c1h_1);
+    $this.d39_1($this.c39_1, operator);
   }
-  function Companion() {
+  function Companion_0() {
   }
-  protoOf(Companion).t35 = function (parser) {
+  protoOf(Companion_0).e39 = function (parser) {
     return new DynamicOpListener(parser, DynamicOpListener$Companion$of$lambda);
   };
-  var Companion_instance_1;
-  function Companion_getInstance_3() {
-    return Companion_instance_1;
+  var Companion_instance_2;
+  function Companion_getInstance_5() {
+    return Companion_instance_2;
   }
   function DynamicOpListener$exitClause$lambda(it) {
     return isInterface(it, Atom) ? it : THROW_CCE();
   }
   function DynamicOpListener(parser, operatorDefinedCallback) {
     PrologParserListener.call(this);
-    this.r35_1 = parser;
-    this.s35_1 = operatorDefinedCallback;
+    this.c39_1 = parser;
+    this.d39_1 = operatorDefinedCallback;
   }
-  protoOf(DynamicOpListener).u35 = function (ctx) {
+  protoOf(DynamicOpListener).f39 = function (ctx) {
     var expr = ctx.expression();
     if (ctx.exception != null) {
       return Unit_instance;
@@ -273,26 +538,26 @@
     if (tmp) {
       var tmp_1 = ctx.accept(new PrologVisitor());
       var directive = isInterface(tmp_1, Directive) ? tmp_1 : THROW_CCE();
-      var op = directive.rw();
+      var op = directive.gx();
       if (get_isOpDirective(op)) {
         // Inline function 'kotlin.math.min' call
         // Inline function 'kotlin.math.max' call
         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 = (isInterface(tmp_2, Numeric) ? tmp_2 : THROW_CCE()).hz().toInt();
         var b_0 = Math.max(0, b);
         var priority = Math.min(1200, b_0);
-        var specifier = Companion_getInstance().fromTerm(op.get(1));
+        var specifier = Companion_getInstance_0().fromTerm(op.get(1));
         var operator = op.get(2);
         if (isInterface(operator, Atom)) {
-          onOperatorDefined(this, new Operator(operator.q2(), specifier, priority));
+          onOperatorDefined(this, new Operator(operator.r2(), specifier, priority));
         } else {
           if (isInterface(operator, List)) {
             var tmp$ret$3;
             $l$block: {
               // Inline function 'kotlin.sequences.all' call
-              var tmp0_iterator = operator.at().o();
-              while (tmp0_iterator.p()) {
-                var element = tmp0_iterator.r();
+              var tmp0_iterator = operator.pt().r();
+              while (tmp0_iterator.s()) {
+                var element = tmp0_iterator.u();
                 // Inline function 'it.unibo.tuprolog.core.parsing.DynamicOpListener.exitClause.<anonymous>' call
                 if (!isInterface(element, Atom)) {
                   tmp$ret$3 = false;
@@ -302,11 +567,11 @@
               tmp$ret$3 = true;
             }
             if (tmp$ret$3) {
-              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));
+              var tmp_3 = operator.pt();
+              var tmp2_iterator = map(tmp_3, DynamicOpListener$exitClause$lambda).r();
+              while (tmp2_iterator.s()) {
+                var it = tmp2_iterator.u();
+                onOperatorDefined(this, new Operator(it.r2(), specifier, priority));
               }
             }
           }
@@ -315,7 +580,7 @@
     }
   };
   protoOf(DynamicOpListener).exitClause = function (ctx) {
-    return this.u35(ctx);
+    return this.f39(ctx);
   };
   function parseException(token, message) {
     return new ParseException(null, token.text, token.line, token.column, message, null);
@@ -332,10 +597,43 @@
   function newErrorListener($this, whileParsing) {
     return new PrologParserFactory$newErrorListener$1(whileParsing);
   }
-  function parseClause($this, parserAndErrorStrategy, source) {
+  function parseExpression($this, parserAndErrorStrategy, source) {
+    var mark = -1;
+    var index = -1;
+    var parser = parserAndErrorStrategy.qd_1;
+    var tmp;
+    try {
+      mark = parser.getTokenStream().mark();
+      index = coerceAtLeast(parser.getTokenStream().index, 0);
+      tmp = parser.singletonExpression();
+    } 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.rd_1;
+        parser.addErrorListener(newErrorListener($this, source));
+        tmp_1 = parseExpression($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 {
+      parser.getTokenStream().release(mark);
+    }
+    return tmp;
+  }
+  function parseClause_0($this, parserAndErrorStrategy, source) {
     var mark = -1;
     var index = -1;
-    var parser = parserAndErrorStrategy.md_1;
+    var parser = parserAndErrorStrategy.qd_1;
     var tmp;
     try {
       mark = parser.getTokenStream().mark();
@@ -348,9 +646,9 @@
       if (isParseCancellationException(e) ? parser._interp.predictionMode === PredictionMode.SLL : false) {
         parser.getTokenStream().seek(index);
         parser._interp.predictionMode = PredictionMode.LL;
-        parser._errHandler = parserAndErrorStrategy.nd_1;
+        parser._errHandler = parserAndErrorStrategy.rd_1;
         parser.addErrorListener(newErrorListener($this, source));
-        tmp_1 = parseClause($this, parserAndErrorStrategy, source);
+        tmp_1 = parseClause_0($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();
@@ -372,13 +670,13 @@
     return map(tmp_1, PrologParserFactory$parseClauses$lambda_2);
   }
   function PrologParserFactory$newErrorListener$1($whileParsing) {
-    this.v35_1 = $whileParsing;
+    this.g39_1 = $whileParsing;
   }
   protoOf(PrologParserFactory$newErrorListener$1).syntaxError = function (recognizer, offendingSymbol, line, column, msg, e) {
     if (recognizer instanceof PrologParser) {
       recognizer.removeParseListeners();
     }
-    throw new ParseException(this.v35_1, symbolToString(this, offendingSymbol), line, column + 1 | 0, msg, e);
+    throw new ParseException(this.g39_1, symbolToString(this, offendingSymbol), line, column + 1 | 0, msg, e);
   };
   function PrologParserFactory$parseClauses$lambda(it) {
     return it + 1 | 0;
@@ -387,7 +685,7 @@
     return function (it) {
       var tmp;
       try {
-        tmp = parseClause(PrologParserFactory_instance, $parser, $source);
+        tmp = parseClause_0(PrologParserFactory_instance, $parser, $source);
       } catch ($p) {
         var tmp_0;
         if ($p instanceof ParseException) {
@@ -409,11 +707,15 @@
   }
   function PrologParserFactory() {
   }
-  protoOf(PrologParserFactory).w35 = function (source, withOperators) {
-    var parser = this.x35(source, withOperators);
+  protoOf(PrologParserFactory).h39 = function (string, withOperators) {
+    var parser = this.i39(string, withOperators);
+    return parseExpression(this, parser, string);
+  };
+  protoOf(PrologParserFactory).j39 = function (source, withOperators) {
+    var parser = this.i39(source, withOperators);
     return parseClauses(this, parser, source);
   };
-  protoOf(PrologParserFactory).x35 = function (source, operators) {
+  protoOf(PrologParserFactory).i39 = function (source, operators) {
     var stream = new InputStream(source);
     var lexer = new PrologLexer(stream);
     lexer.removeErrorListeners();
@@ -423,24 +725,24 @@
     var originalErrorStrategy = parser._errHandler;
     parser._errHandler = new BailErrorStrategy();
     parser._interp.predictionMode = PredictionMode.SLL;
-    return to(this.y35(parser, operators), originalErrorStrategy);
+    return to(this.k39(parser, operators), originalErrorStrategy);
   };
-  protoOf(PrologParserFactory).y35 = function (prologParser, operators) {
+  protoOf(PrologParserFactory).k39 = function (prologParser, operators) {
     // Inline function 'kotlin.collections.forEach' call
-    var tmp0_iterator = operators.o();
-    while (tmp0_iterator.p()) {
-      var element = tmp0_iterator.r();
+    var tmp0_iterator = operators.r();
+    while (tmp0_iterator.s()) {
+      var element = tmp0_iterator.u();
       // Inline function 'it.unibo.tuprolog.core.parsing.PrologParserFactory.addOperators.<anonymous>' call
-      prologParser.addOperator(element.g1g_1, toAssociativity(element.h1g_1), element.i1g_1);
+      prologParser.addOperator(element.a1h_1, toAssociativity(element.b1h_1), element.c1h_1);
     }
-    prologParser.addParseListener(Companion_instance_1.t35(prologParser));
+    prologParser.addParseListener(Companion_instance_2.e39(prologParser));
     return prologParser;
   };
   var PrologParserFactory_instance;
   function PrologParserFactory_getInstance() {
     return PrologParserFactory_instance;
   }
-  function parseInteger($this, ctx) {
+  function parseInteger_0($this, ctx) {
     var str = ctx.value.text;
     var base;
     var clean;
@@ -467,7 +769,7 @@
         throw parseException(ctx.value, 'Invalid character literal: ' + ctx.value.text);
       }
       // Inline function 'kotlin.with' call
-      var tmp = Companion_getInstance_0();
+      var tmp = Companion_getInstance_1();
       // Inline function 'kotlin.code' call
       var this_0 = charSequenceGet(clean, 0);
       var tmp$ret$8 = Char__toInt_impl_vasixd(this_0);
@@ -492,7 +794,7 @@
       var tmp0_safe_receiver_0 = ctx.sign;
       clean = plus(tmp0_safe_receiver_0 == null ? null : tmp0_safe_receiver_0.text, clean);
     }
-    return Companion_getInstance_0().parseWithRadix(clean, base);
+    return Companion_getInstance_1().parseWithRadix(clean, base);
   }
   function visitPostfixExpression($this, ctx) {
     var tmp0_safe_receiver = ctx.left;
@@ -508,15 +810,15 @@
       inductionVariable = inductionVariable + 1 | 0;
       // Inline function 'it.unibo.tuprolog.core.parsing.PrologVisitor.visitPostfixExpression.<anonymous>' call
       var tmp$ret$0 = item.symbol.text;
-      destination.l(tmp$ret$0);
+      destination.o(tmp$ret$0);
     }
     return postfix($this, tmp, destination);
   }
   function postfix($this, term, ops) {
-    var operator = ops.o();
-    var result = $this.z35_1.structOf(operator.r(), [term]);
-    while (operator.p()) {
-      result = $this.z35_1.structOf(operator.r(), [result]);
+    var operator = ops.r();
+    var result = $this.l39_1.structOf(operator.u(), [term]);
+    while (operator.s()) {
+      result = $this.l39_1.structOf(operator.u(), [result]);
     }
     return result;
   }
@@ -533,17 +835,17 @@
       inductionVariable = inductionVariable + 1 | 0;
       // Inline function 'it.unibo.tuprolog.core.parsing.PrologVisitor.visitPrefixExpression.<anonymous>' call
       var tmp$ret$0 = item.symbol.text;
-      destination.l(tmp$ret$0);
+      destination.o(tmp$ret$0);
     }
     return prefix($this, tmp, destination);
   }
   function prefix($this, term, ops) {
-    var i = ops.u() - 1 | 0;
+    var i = ops.l() - 1 | 0;
     var tmp0 = i;
     i = tmp0 - 1 | 0;
-    var result = $this.z35_1.structOf(ops.a1(tmp0), [term]);
+    var result = $this.l39_1.structOf(ops.d1(tmp0), [term]);
     while (i >= 0) {
-      result = $this.z35_1.structOf(ops.a1(i), [result]);
+      result = $this.l39_1.structOf(ops.d1(i), [result]);
       i = i - 1 | 0;
     }
     return result;
@@ -568,12 +870,12 @@
     var this_0 = plus_0(listOf(ensureNotNull(ctx.left)), asList(ctx.right));
     // Inline function 'kotlin.collections.mapTo' call
     var destination = ArrayList_init_$Create$(collectionSizeOrDefault(this_0, 10));
-    var tmp0_iterator = this_0.o();
-    while (tmp0_iterator.p()) {
-      var item = tmp0_iterator.r();
+    var tmp0_iterator = this_0.r();
+    while (tmp0_iterator.s()) {
+      var item = tmp0_iterator.u();
       // Inline function 'it.unibo.tuprolog.core.parsing.PrologVisitor.visitInfixNonAssociativeExpression.<anonymous>' call
       var tmp$ret$0 = item.accept($this);
-      destination.l(tmp$ret$0);
+      destination.o(tmp$ret$0);
     }
     var operands = destination;
     // Inline function 'kotlin.collections.map' call
@@ -587,19 +889,19 @@
       inductionVariable = inductionVariable + 1 | 0;
       // Inline function 'it.unibo.tuprolog.core.parsing.PrologVisitor.visitInfixNonAssociativeExpression.<anonymous>' call
       var tmp$ret$3 = item_0.symbol.text;
-      destination_0.l(tmp$ret$3);
+      destination_0.o(tmp$ret$3);
     }
     var operators = destination_0;
     return infixNonAssociative($this, operands, operators);
   }
   function infixNonAssociative($this, terms, ops) {
-    return $this.z35_1.structOf(ops.a1(0), [terms.a1(0), terms.a1(1)]);
+    return $this.l39_1.structOf(ops.d1(0), [terms.d1(0), terms.d1(1)]);
   }
   function handleOuters($this, expression, outers) {
     var result = expression;
-    var tmp0_iterator = outers.o();
-    while (tmp0_iterator.p()) {
-      var o = tmp0_iterator.r();
+    var tmp0_iterator = outers.r();
+    while (tmp0_iterator.s()) {
+      var o = tmp0_iterator.u();
       var tmp = listOf(result);
       // Inline function 'kotlin.collections.map' call
       var this_0 = o.right;
@@ -612,7 +914,7 @@
         inductionVariable = inductionVariable + 1 | 0;
         // Inline function 'it.unibo.tuprolog.core.parsing.PrologVisitor.handleOuters.<anonymous>' call
         var tmp$ret$0 = item.accept($this);
-        destination.l(tmp$ret$0);
+        destination.o(tmp$ret$0);
       }
       var operands = plus_0(tmp, destination);
       // Inline function 'kotlin.collections.map' call
@@ -626,7 +928,7 @@
         inductionVariable_0 = inductionVariable_0 + 1 | 0;
         // Inline function 'it.unibo.tuprolog.core.parsing.PrologVisitor.handleOuters.<anonymous>' call
         var tmp$ret$3 = item_0.symbol.text;
-        destination_0.l(tmp$ret$3);
+        destination_0.o(tmp$ret$3);
       }
       var operators = destination_0;
       var associativity = o.associativity;
@@ -650,16 +952,16 @@
     return result;
   }
   function infixRight($this, terms, ops) {
-    var i = terms.u() - 1 | 0;
-    var j = ops.u() - 1 | 0;
+    var i = terms.l() - 1 | 0;
+    var j = ops.l() - 1 | 0;
     var tmp0 = j;
     j = tmp0 - 1 | 0;
-    var result = $this.z35_1.structOf(ops.a1(tmp0), [terms.a1(i - 1 | 0), terms.a1(i)]);
+    var result = $this.l39_1.structOf(ops.d1(tmp0), [terms.d1(i - 1 | 0), terms.d1(i)]);
     i = i - 2 | 0;
     while (i >= 0) {
       var tmp1 = j;
       j = tmp1 - 1 | 0;
-      result = $this.z35_1.structOf(ops.a1(tmp1), [terms.a1(i), result]);
+      result = $this.l39_1.structOf(ops.d1(tmp1), [terms.d1(i), result]);
       i = i - 1 | 0;
     }
     return result;
@@ -669,17 +971,17 @@
     var j = 0;
     var tmp0 = j;
     j = tmp0 + 1 | 0;
-    var tmp = ops.a1(tmp0);
+    var tmp = ops.d1(tmp0);
     var tmp1 = i;
     i = tmp1 + 1 | 0;
-    var tmp_0 = terms.a1(tmp1);
+    var tmp_0 = terms.d1(tmp1);
     var tmp2 = i;
     i = tmp2 + 1 | 0;
-    var result = $this.z35_1.structOf(tmp, [tmp_0, terms.a1(tmp2)]);
-    while (i < terms.u()) {
+    var result = $this.l39_1.structOf(tmp, [tmp_0, terms.d1(tmp2)]);
+    while (i < terms.l()) {
       var tmp3 = j;
       j = tmp3 + 1 | 0;
-      result = $this.z35_1.structOf(ops.a1(tmp3), [result, terms.a1(i)]);
+      result = $this.l39_1.structOf(ops.d1(tmp3), [result, terms.d1(i)]);
       i = i + 1 | 0;
     }
     return result;
@@ -689,12 +991,12 @@
     var this_0 = plus_0(listOf(ctx.left), toList(ctx.right));
     // Inline function 'kotlin.collections.mapTo' call
     var destination = ArrayList_init_$Create$(collectionSizeOrDefault(this_0, 10));
-    var tmp0_iterator = this_0.o();
-    while (tmp0_iterator.p()) {
-      var item = tmp0_iterator.r();
+    var tmp0_iterator = this_0.r();
+    while (tmp0_iterator.s()) {
+      var item = tmp0_iterator.u();
       // Inline function 'it.unibo.tuprolog.core.parsing.PrologVisitor.listOfOperands.<anonymous>' call
       var tmp$ret$0 = ensureNotNull(item).accept($this);
-      destination.l(tmp$ret$0);
+      destination.o(tmp$ret$0);
     }
     return destination;
   }
@@ -710,7 +1012,7 @@
       inductionVariable = inductionVariable + 1 | 0;
       // Inline function 'it.unibo.tuprolog.core.parsing.PrologVisitor.listOfOperators.<anonymous>' call
       var tmp$ret$0 = item.symbol.text;
-      destination.l(tmp$ret$0);
+      destination.o(tmp$ret$0);
     }
     return destination;
   }
@@ -730,7 +1032,7 @@
   }
   function PrologVisitor$visitExpression$ref($boundThis) {
     var l = function (p0) {
-      return $boundThis.a36(p0);
+      return $boundThis.m39(p0);
     };
     l.callableName = 'visitExpression';
     return l;
@@ -741,32 +1043,32 @@
     };
   }
   function PrologVisitor(scope) {
-    scope = scope === VOID ? Companion_instance_0.empty() : scope;
+    scope = scope === VOID ? Companion_instance.empty() : scope;
     PrologParserVisitor.call(this);
-    this.z35_1 = scope;
+    this.l39_1 = scope;
   }
-  protoOf(PrologVisitor).b36 = function (ctx) {
-    return this.c36(ctx.term());
+  protoOf(PrologVisitor).n39 = function (ctx) {
+    return this.o39(ctx.term());
   };
   protoOf(PrologVisitor).visitSingletonTerm = function (ctx) {
-    return this.b36(ctx);
+    return this.n39(ctx);
   };
-  protoOf(PrologVisitor).d36 = function (ctx) {
-    return this.a36(ctx.expression());
+  protoOf(PrologVisitor).p39 = function (ctx) {
+    return this.m39(ctx.expression());
   };
   protoOf(PrologVisitor).visitSingletonExpression = function (ctx) {
-    return this.d36(ctx);
+    return this.p39(ctx);
   };
-  protoOf(PrologVisitor).e36 = function (ctx) {
+  protoOf(PrologVisitor).q39 = function (ctx) {
     return termToClause(ctx.expression().accept(this), null, ensureNotNull(ctx.start).line, ensureNotNull(ctx.start).column);
   };
   protoOf(PrologVisitor).visitClause = function (ctx) {
-    return this.e36(ctx);
+    return this.q39(ctx);
   };
-  protoOf(PrologVisitor).a36 = function (ctx) {
+  protoOf(PrologVisitor).m39 = function (ctx) {
     var tmp;
     if (ctx.isTerm) {
-      tmp = this.c36(ensureNotNull(ctx.left));
+      tmp = this.o39(ensureNotNull(ctx.left));
     } else if (contains(Associativity.INFIX, ctx.associativity)) {
       tmp = visitInfixExpression(this, ctx);
     } else if (contains(Associativity.POSTFIX, ctx.associativity)) {
@@ -779,12 +1081,12 @@
     return handleOuters(this, tmp, flatten_0(this, asList(ctx.outers)));
   };
   protoOf(PrologVisitor).visitExpression = function (ctx) {
-    return this.a36(ctx);
+    return this.m39(ctx);
   };
-  protoOf(PrologVisitor).c36 = function (ctx) {
+  protoOf(PrologVisitor).o39 = function (ctx) {
     var tmp;
     if (ctx.isExpr) {
-      tmp = this.a36(ctx.expression());
+      tmp = this.m39(ctx.expression());
     } else {
       var tmp_0 = ctx.children[0].accept(this);
       tmp = (!(tmp_0 == null) ? isInterface(tmp_0, Term) : false) ? tmp_0 : THROW_CCE();
@@ -792,23 +1094,23 @@
     return tmp;
   };
   protoOf(PrologVisitor).visitTerm = function (ctx) {
-    return this.c36(ctx);
+    return this.o39(ctx);
   };
-  protoOf(PrologVisitor).f36 = function (ctx) {
-    var value = parseInteger(this, ctx);
-    return Companion_getInstance_1().ofBigInteger(value);
+  protoOf(PrologVisitor).r39 = function (ctx) {
+    var value = parseInteger_0(this, ctx);
+    return Companion_getInstance_2().ofBigInteger(value);
   };
   protoOf(PrologVisitor).visitInteger = function (ctx) {
-    return this.f36(ctx);
+    return this.r39(ctx);
   };
-  protoOf(PrologVisitor).g36 = function (ctx) {
+  protoOf(PrologVisitor).s39 = 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.g36(ctx);
+    return this.s39(ctx);
   };
-  protoOf(PrologVisitor).h36 = function (ctx) {
+  protoOf(PrologVisitor).t39 = function (ctx) {
     var raw = ctx.value.text;
     if (!(ctx.sign == null)) {
       var tmp0_safe_receiver = ctx.sign;
@@ -816,7 +1118,7 @@
     }
     var tmp;
     try {
-      tmp = Companion_getInstance_2().parse(raw);
+      tmp = Companion_getInstance_3().parse(raw);
     } catch ($p) {
       var tmp_0;
       if ($p instanceof NumberFormatException) {
@@ -829,39 +1131,39 @@
     return tmp;
   };
   protoOf(PrologVisitor).visitReal = function (ctx) {
-    return this.h36(ctx);
+    return this.t39(ctx);
   };
-  protoOf(PrologVisitor).i36 = function (ctx) {
+  protoOf(PrologVisitor).u39 = function (ctx) {
     var tmp;
     if (ctx.isAnonymous) {
-      tmp = this.z35_1.anonymous();
+      tmp = this.l39_1.anonymous();
     } else {
-      tmp = this.z35_1.varOf(ctx.value.text);
+      tmp = this.l39_1.varOf(ctx.value.text);
     }
     return tmp;
   };
   protoOf(PrologVisitor).visitVariable = function (ctx) {
-    return this.i36(ctx);
+    return this.u39(ctx);
   };
-  protoOf(PrologVisitor).j36 = function (ctx) {
+  protoOf(PrologVisitor).v39 = function (ctx) {
     var tmp;
     if (ctx.isList) {
-      tmp = this.z35_1.logicListOf([]);
+      tmp = this.l39_1.logicListOf([]);
     } else if (ctx.isBlock) {
-      tmp = this.z35_1.blockOf([]);
+      tmp = this.l39_1.blockOf([]);
     } else if (ctx.arity === 0) {
-      tmp = this.z35_1.atomOf(ctx.functor.text);
+      tmp = this.l39_1.atomOf(ctx.functor.text);
     } else {
       var tmp_0 = ctx.functor.text;
       var tmp_1 = asSequence_0(ctx.args);
-      tmp = this.z35_1.structOfSequence(tmp_0, map(tmp_1, PrologVisitor$visitExpression$ref(this)));
+      tmp = this.l39_1.structOfSequence(tmp_0, map(tmp_1, PrologVisitor$visitExpression$ref(this)));
     }
     return tmp;
   };
   protoOf(PrologVisitor).visitStructure = function (ctx) {
-    return this.j36(ctx);
+    return this.v39(ctx);
   };
-  protoOf(PrologVisitor).k36 = function (ctx) {
+  protoOf(PrologVisitor).w39 = function (ctx) {
     // Inline function 'kotlin.collections.map' call
     var this_0 = ctx.items;
     // Inline function 'kotlin.collections.mapTo' call
@@ -871,26 +1173,26 @@
     while (inductionVariable < last) {
       var item = this_0[inductionVariable];
       inductionVariable = inductionVariable + 1 | 0;
-      var tmp$ret$0 = this.a36(item);
-      destination.l(tmp$ret$0);
+      var tmp$ret$0 = this.m39(item);
+      destination.o(tmp$ret$0);
     }
     var terms = destination;
     var tmp;
     if (ctx.hasTail) {
       var tmp0_safe_receiver = ctx.tail;
-      tmp = this.z35_1.b10(terms, tmp0_safe_receiver == null ? null : tmp0_safe_receiver.accept(this));
+      tmp = this.l39_1.q10(terms, tmp0_safe_receiver == null ? null : tmp0_safe_receiver.accept(this));
     } else {
-      tmp = this.z35_1.logicListOfIterable(terms);
+      tmp = this.l39_1.logicListOfIterable(terms);
     }
     return tmp;
   };
   protoOf(PrologVisitor).visitList = function (ctx) {
-    return this.k36(ctx);
+    return this.w39(ctx);
   };
-  protoOf(PrologVisitor).l36 = function (ctx) {
+  protoOf(PrologVisitor).x39 = function (ctx) {
     var tmp;
     if (ctx.length === 1) {
-      tmp = this.z35_1.blockOf([ctx.items[0].accept(this)]);
+      tmp = this.l39_1.blockOf([ctx.items[0].accept(this)]);
     } else {
       // Inline function 'kotlin.collections.map' call
       var this_0 = ctx.items;
@@ -901,25 +1203,70 @@
       while (inductionVariable < last) {
         var item = this_0[inductionVariable];
         inductionVariable = inductionVariable + 1 | 0;
-        var tmp$ret$0 = this.a36(item);
-        destination.l(tmp$ret$0);
+        var tmp$ret$0 = this.m39(item);
+        destination.o(tmp$ret$0);
       }
-      tmp = this.z35_1.blockOfIterable(destination);
+      tmp = this.l39_1.blockOfIterable(destination);
     }
     return tmp;
   };
   protoOf(PrologVisitor).visitBlock = function (ctx) {
-    return this.l36(ctx);
+    return this.x39(ctx);
+  };
+  function termParserWithOperators(operators, scope) {
+    scope = scope === VOID ? Companion_instance.empty() : scope;
+    return new TermParserImpl(scope, operators);
+  }
+  function TermParserImpl(scope, defaultOperatorSet) {
+    this.y39_1 = scope;
+    this.z39_1 = defaultOperatorSet;
+  }
+  protoOf(TermParserImpl).b39 = function () {
+    return this.z39_1;
   };
+  protoOf(TermParserImpl).a3a = function (input, operators) {
+    return PrologParserFactory_instance.h39(input, operators).accept(new PrologVisitor(this.y39_1));
+  };
+  protoOf(TermParserImpl).parseTermWithOperators = function (input, operators) {
+    return this.a3a(input, operators);
+  };
+  //region block: post-declaration
+  protoOf(TermParserImpl).parseTerm = parseTerm;
+  protoOf(TermParserImpl).parseStructWithOperators = parseStructWithOperators;
+  protoOf(TermParserImpl).parseStruct = parseStruct;
+  protoOf(TermParserImpl).parseConstantWithOperators = parseConstantWithOperators;
+  protoOf(TermParserImpl).parseConstant = parseConstant;
+  protoOf(TermParserImpl).parseVarWithOperators = parseVarWithOperators;
+  protoOf(TermParserImpl).parseVar = parseVar;
+  protoOf(TermParserImpl).parseAtomWithOperators = parseAtomWithOperators;
+  protoOf(TermParserImpl).parseAtom = parseAtom;
+  protoOf(TermParserImpl).parseNumericWithOperators = parseNumericWithOperators;
+  protoOf(TermParserImpl).parseNumeric = parseNumeric;
+  protoOf(TermParserImpl).parseIntegerWithOperators = parseIntegerWithOperators;
+  protoOf(TermParserImpl).parseInteger = parseInteger;
+  protoOf(TermParserImpl).parseRealWithOperators = parseRealWithOperators;
+  protoOf(TermParserImpl).parseReal = parseReal;
+  protoOf(TermParserImpl).parseClauseWithOperators = parseClauseWithOperators;
+  protoOf(TermParserImpl).parseClause = parseClause;
+  protoOf(TermParserImpl).parseRuleWithOperators = parseRuleWithOperators;
+  protoOf(TermParserImpl).parseRule = parseRule;
+  protoOf(TermParserImpl).parseFactWithOperators = parseFactWithOperators;
+  protoOf(TermParserImpl).parseFact = parseFact;
+  protoOf(TermParserImpl).parseDirectiveWithOperators = parseDirectiveWithOperators;
+  protoOf(TermParserImpl).parseDirective = parseDirective;
+  //endregion
   //region block: init
   Companion_instance_1 = new Companion();
+  Companion_instance_2 = new Companion_0();
   PrologParserFactory_instance = new PrologParserFactory();
   //endregion
   //region block: exports
   _.$_$ = _.$_$ || {};
   _.$_$.a = PrologParserFactory_instance;
   _.$_$.b = PrologVisitor;
-  _.$_$.c = termToClause;
+  _.$_$.c = parseStruct_0;
+  _.$_$.d = parseStructWithOperators_0;
+  _.$_$.e = termToClause;
   //endregion
   return _;
 }));