@tuprolog/2p-full 3.0.7 → 4.0.0

package/2p-repl.js

@@ -1,27 +1,30 @@
 (function (factory) {
   if (typeof define === 'function' && define.amd)
-    define(['exports', './kotlin-kotlin-stdlib.js', './2p-solve.js', './2p-core.js', './clikt-clikt.js', './clikt-clikt-mordant.js', './mordant-mordant.js', './2p-theory.js', './2p-parser-core.js', './2p-io-lib.js', './2p-oop-lib.js'], factory);
+    define(['exports', './2p-solve.js', './kotlin-kotlin-stdlib.js', './clikt-clikt.js', './2p-core.js', './clikt-clikt-mordant.js', './mordant-mordant.js', './2p-utils.js', './2p-theory.js', './2p-parser-core.js', './2p-io-lib.js', './2p-oop-lib.js'], factory);
   else if (typeof exports === 'object')
-    factory(module.exports, require('./kotlin-kotlin-stdlib.js'), require('./2p-solve.js'), require('./2p-core.js'), require('./clikt-clikt.js'), require('./clikt-clikt-mordant.js'), require('./mordant-mordant.js'), require('./2p-theory.js'), require('./2p-parser-core.js'), require('./2p-io-lib.js'), require('./2p-oop-lib.js'));
+    factory(module.exports, require('./2p-solve.js'), require('./kotlin-kotlin-stdlib.js'), require('./clikt-clikt.js'), require('./2p-core.js'), require('./clikt-clikt-mordant.js'), require('./mordant-mordant.js'), require('./2p-utils.js'), require('./2p-theory.js'), require('./2p-parser-core.js'), require('./2p-io-lib.js'), require('./2p-oop-lib.js'));
   else {
-    if (typeof globalThis['kotlin-kotlin-stdlib'] === 'undefined') {
-      throw new Error("Error loading module '2p-repl'. Its dependency 'kotlin-kotlin-stdlib' was not found. Please, check whether 'kotlin-kotlin-stdlib' is loaded prior to '2p-repl'.");
-    }
     if (typeof globalThis['2p-solve'] === 'undefined') {
       throw new Error("Error loading module '2p-repl'. Its dependency '2p-solve' was not found. Please, check whether '2p-solve' is loaded prior to '2p-repl'.");
     }
-    if (typeof globalThis['2p-core'] === 'undefined') {
-      throw new Error("Error loading module '2p-repl'. Its dependency '2p-core' was not found. Please, check whether '2p-core' is loaded prior to '2p-repl'.");
+    if (typeof globalThis['kotlin-kotlin-stdlib'] === 'undefined') {
+      throw new Error("Error loading module '2p-repl'. Its dependency 'kotlin-kotlin-stdlib' was not found. Please, check whether 'kotlin-kotlin-stdlib' is loaded prior to '2p-repl'.");
     }
     if (typeof globalThis['clikt-clikt'] === 'undefined') {
       throw new Error("Error loading module '2p-repl'. Its dependency 'clikt-clikt' was not found. Please, check whether 'clikt-clikt' is loaded prior to '2p-repl'.");
     }
+    if (typeof globalThis['2p-core'] === 'undefined') {
+      throw new Error("Error loading module '2p-repl'. Its dependency '2p-core' was not found. Please, check whether '2p-core' is loaded prior to '2p-repl'.");
+    }
     if (typeof globalThis['clikt-clikt-mordant'] === 'undefined') {
       throw new Error("Error loading module '2p-repl'. Its dependency 'clikt-clikt-mordant' was not found. Please, check whether 'clikt-clikt-mordant' is loaded prior to '2p-repl'.");
     }
     if (typeof globalThis['mordant-mordant'] === 'undefined') {
       throw new Error("Error loading module '2p-repl'. Its dependency 'mordant-mordant' was not found. Please, check whether 'mordant-mordant' is loaded prior to '2p-repl'.");
     }
+    if (typeof globalThis['2p-utils'] === 'undefined') {
+      throw new Error("Error loading module '2p-repl'. Its dependency '2p-utils' was not found. Please, check whether '2p-utils' is loaded prior to '2p-repl'.");
+    }
     if (typeof globalThis['2p-theory'] === 'undefined') {
       throw new Error("Error loading module '2p-repl'. Its dependency '2p-theory' was not found. Please, check whether '2p-theory' is loaded prior to '2p-repl'.");
     }
@@ -34,76 +37,88 @@
     if (typeof globalThis['2p-oop-lib'] === 'undefined') {
       throw new Error("Error loading module '2p-repl'. Its dependency '2p-oop-lib' was not found. Please, check whether '2p-oop-lib' is loaded prior to '2p-repl'.");
     }
-    globalThis['2p-repl'] = factory(typeof globalThis['2p-repl'] === 'undefined' ? {} : globalThis['2p-repl'], globalThis['kotlin-kotlin-stdlib'], globalThis['2p-solve'], globalThis['2p-core'], globalThis['clikt-clikt'], globalThis['clikt-clikt-mordant'], globalThis['mordant-mordant'], globalThis['2p-theory'], globalThis['2p-parser-core'], globalThis['2p-io-lib'], globalThis['2p-oop-lib']);
+    globalThis['2p-repl'] = factory(typeof globalThis['2p-repl'] === 'undefined' ? {} : globalThis['2p-repl'], globalThis['2p-solve'], globalThis['kotlin-kotlin-stdlib'], globalThis['clikt-clikt'], globalThis['2p-core'], globalThis['clikt-clikt-mordant'], globalThis['mordant-mordant'], globalThis['2p-utils'], globalThis['2p-theory'], globalThis['2p-parser-core'], globalThis['2p-io-lib'], globalThis['2p-oop-lib']);
   }
-}(function (_, kotlin_kotlin, kotlin_it_unibo_tuprolog_solve, kotlin_it_unibo_tuprolog_core, kotlin_clikt_clikt, kotlin_clikt_clikt_mordant, kotlin_mordant_mordant, kotlin_it_unibo_tuprolog_theory, kotlin_it_unibo_tuprolog_parser_core, kotlin_it_unibo_tuprolog_io_lib, kotlin_it_unibo_tuprolog_oop_lib) {
+}(function (_, kotlin_it_unibo_tuprolog_solve, kotlin_kotlin, kotlin_clikt_clikt, kotlin_it_unibo_tuprolog_core, kotlin_clikt_clikt_mordant, kotlin_mordant_mordant, kotlin_it_unibo_tuprolog_utils, kotlin_it_unibo_tuprolog_theory, kotlin_it_unibo_tuprolog_parser_core, kotlin_it_unibo_tuprolog_io_lib, kotlin_it_unibo_tuprolog_oop_lib) {
   'use strict';
   //region block: imports
-  var noWhenBranchMatchedException = kotlin_kotlin.$_$.se;
-  var Unit_instance = kotlin_kotlin.$_$.r;
-  var Halt = kotlin_it_unibo_tuprolog_solve.$_$.m4;
-  var isInterface = kotlin_kotlin.$_$.m8;
-  var No = kotlin_it_unibo_tuprolog_solve.$_$.n4;
-  var Yes = kotlin_it_unibo_tuprolog_solve.$_$.o4;
-  var Companion_instance = kotlin_it_unibo_tuprolog_solve.$_$.t1;
-  var format = kotlin_it_unibo_tuprolog_core.$_$.b3;
+  var Halt = kotlin_it_unibo_tuprolog_solve.$_$.i5;
+  var isInterface = kotlin_kotlin.$_$.t9;
   var ProgramResult = kotlin_clikt_clikt.$_$.c;
-  var HaltException = kotlin_it_unibo_tuprolog_solve.$_$.r2;
-  var StringBuilder = kotlin_kotlin.$_$.qb;
-  var THROW_CCE = kotlin_kotlin.$_$.he;
-  var isCharSequence = kotlin_kotlin.$_$.k8;
-  var trim = kotlin_kotlin.$_$.rd;
-  var toString = kotlin_kotlin.$_$.x8;
-  var _Char___init__impl__6a9atx = kotlin_kotlin.$_$.c;
-  var endsWith = kotlin_kotlin.$_$.bc;
+  var HaltException = kotlin_it_unibo_tuprolog_solve.$_$.e3;
+  var minus = kotlin_kotlin.$_$.s5;
+  var Companion_instance = kotlin_it_unibo_tuprolog_solve.$_$.d2;
+  var format = kotlin_it_unibo_tuprolog_core.$_$.d3;
+  var charCodeAt = kotlin_kotlin.$_$.v8;
+  var isLetter = kotlin_kotlin.$_$.kd;
+  var substring = kotlin_kotlin.$_$.ie;
+  var get_time = kotlin_it_unibo_tuprolog_solve.$_$.m4;
+  var Duration = kotlin_kotlin.$_$.ze;
+  var formatTime = kotlin_it_unibo_tuprolog_solve.$_$.l4;
   var get_terminal = kotlin_clikt_clikt_mordant.$_$.b;
+  var TextStyles_bold_getInstance = kotlin_mordant_mordant.$_$.f;
+  var drop = kotlin_kotlin.$_$.bd;
+  var StringBuilder = kotlin_kotlin.$_$.rc;
+  var THROW_CCE = kotlin_kotlin.$_$.sf;
+  var isCharSequence = kotlin_kotlin.$_$.r9;
+  var trim = kotlin_kotlin.$_$.ye;
+  var toString = kotlin_kotlin.$_$.ea;
+  var _Char___init__impl__6a9atx = kotlin_kotlin.$_$.q;
+  var endsWith = kotlin_kotlin.$_$.cd;
   var VOID = kotlin_kotlin.$_$.b;
   var prompt = kotlin_mordant_mordant.$_$.c;
+  var Unit_instance = kotlin_kotlin.$_$.m1;
   var CliktCommand = kotlin_clikt_clikt_mordant.$_$.a;
-  var emptyMap = kotlin_kotlin.$_$.m3;
-  var protoOf = kotlin_kotlin.$_$.u8;
-  var charSequenceLength = kotlin_kotlin.$_$.q7;
-  var charCodeAt = kotlin_kotlin.$_$.o7;
-  var toString_0 = kotlin_kotlin.$_$.h;
-  var titlecase = kotlin_kotlin.$_$.gd;
-  var isLowerCase = kotlin_kotlin.$_$.hc;
-  var substring = kotlin_kotlin.$_$.dd;
-  var initMetadataForClass = kotlin_kotlin.$_$.d8;
-  var TuPrologException_init_$Init$ = kotlin_it_unibo_tuprolog_core.$_$.i1;
-  var objectCreate = kotlin_kotlin.$_$.t8;
-  var captureStack = kotlin_kotlin.$_$.l7;
-  var TuPrologException = kotlin_it_unibo_tuprolog_core.$_$.l1;
-  var initMetadataForCompanion = kotlin_kotlin.$_$.e8;
-  var KProperty1 = kotlin_kotlin.$_$.v9;
-  var getPropertyCallableRef = kotlin_kotlin.$_$.a8;
+  var emptyMap = kotlin_kotlin.$_$.m4;
+  var protoOf = kotlin_kotlin.$_$.ba;
+  var System_instance = kotlin_kotlin.$_$.h1;
+  var formatLocalTimestamp = kotlin_it_unibo_tuprolog_utils.$_$.d;
+  var trimEnd = kotlin_kotlin.$_$.te;
+  var removeSuffix = kotlin_kotlin.$_$.vd;
+  var charSequenceLength = kotlin_kotlin.$_$.x8;
+  var toString_0 = kotlin_kotlin.$_$.v;
+  var titlecase = kotlin_kotlin.$_$.ke;
+  var isLowerCase = kotlin_kotlin.$_$.ld;
+  var substring_0 = kotlin_kotlin.$_$.he;
+  var initMetadataForClass = kotlin_kotlin.$_$.k9;
+  var TuPrologException_init_$Init$ = kotlin_it_unibo_tuprolog_core.$_$.j1;
+  var objectCreate = kotlin_kotlin.$_$.aa;
+  var captureStack = kotlin_kotlin.$_$.s8;
+  var TuPrologException = kotlin_it_unibo_tuprolog_core.$_$.m1;
+  var initMetadataForCompanion = kotlin_kotlin.$_$.l9;
+  var KProperty1 = kotlin_kotlin.$_$.eb;
+  var getPropertyCallableRef = kotlin_kotlin.$_$.h9;
   var Companion_instance_0 = kotlin_it_unibo_tuprolog_theory.$_$.b;
-  var trimMargin = kotlin_kotlin.$_$.pd;
+  var trimMargin = kotlin_kotlin.$_$.ve;
   var ParseException = kotlin_it_unibo_tuprolog_parser_core.$_$.a;
-  var Companion_getInstance = kotlin_it_unibo_tuprolog_core.$_$.x;
+  var Companion_getInstance = kotlin_it_unibo_tuprolog_core.$_$.y;
   var parseStructWithOperators = kotlin_it_unibo_tuprolog_parser_core.$_$.d;
-  var GroundQueriesHaveBooleanSolution_getInstance = kotlin_it_unibo_tuprolog_solve.$_$.h1;
-  var equals = kotlin_kotlin.$_$.v7;
-  var constructCallableReference = kotlin_kotlin.$_$.t7;
-  var Companion_instance_1 = kotlin_it_unibo_tuprolog_core.$_$.z;
-  var joinToString = kotlin_kotlin.$_$.v3;
+  var timed = kotlin_it_unibo_tuprolog_solve.$_$.n4;
+  var GroundQueriesHaveBooleanSolution_getInstance = kotlin_it_unibo_tuprolog_solve.$_$.o1;
+  var equals = kotlin_kotlin.$_$.c9;
+  var constructCallableReference = kotlin_kotlin.$_$.a9;
+  var Companion_instance_1 = kotlin_it_unibo_tuprolog_core.$_$.a1;
+  var joinToString = kotlin_kotlin.$_$.x4;
   var option = kotlin_clikt_clikt.$_$.m;
   var multiple = kotlin_clikt_clikt.$_$.l;
   var int = kotlin_clikt_clikt.$_$.n;
   var default_0 = kotlin_clikt_clikt.$_$.j;
   var flag = kotlin_clikt_clikt.$_$.k;
-  var fromInt = kotlin_kotlin.$_$.y6;
-  var Companion_instance_2 = kotlin_it_unibo_tuprolog_solve.$_$.u;
-  var Companion_instance_3 = kotlin_it_unibo_tuprolog_solve.$_$.m1;
+  var Companion_getInstance_0 = kotlin_kotlin.$_$.i1;
+  var fromInt = kotlin_kotlin.$_$.f8;
+  var DurationUnit_MILLISECONDS_getInstance = kotlin_kotlin.$_$.b1;
+  var toDuration = kotlin_kotlin.$_$.af;
+  var Companion_instance_2 = kotlin_it_unibo_tuprolog_solve.$_$.b1;
+  var Companion_instance_3 = kotlin_it_unibo_tuprolog_solve.$_$.v1;
   var IOLib_getInstance = kotlin_it_unibo_tuprolog_io_lib.$_$.a;
   var arrayConcat = kotlin_kotlin.$_$.a;
   var OOPLib_getInstance = kotlin_it_unibo_tuprolog_oop_lib.$_$.a;
-  var Companion_getInstance_0 = kotlin_it_unibo_tuprolog_solve.$_$.v1;
-  var TrackVariables_getInstance = kotlin_it_unibo_tuprolog_solve.$_$.j1;
+  var Companion_getInstance_1 = kotlin_it_unibo_tuprolog_solve.$_$.f2;
   var parseStruct = kotlin_it_unibo_tuprolog_parser_core.$_$.c;
-  var isBlank = kotlin_kotlin.$_$.fc;
+  var isBlank = kotlin_kotlin.$_$.id;
   var argument = kotlin_clikt_clikt.$_$.h;
   var validate = kotlin_clikt_clikt.$_$.i;
-  var NotImplementedError = kotlin_kotlin.$_$.ce;
+  var NotImplementedError = kotlin_kotlin.$_$.nf;
   var subcommands = kotlin_clikt_clikt.$_$.f;
   var main = kotlin_clikt_clikt.$_$.d;
   //endregion
@@ -114,34 +129,51 @@
   initMetadataForClass(TuPrologCmd, 'TuPrologCmd', VOID, AbstractTuPrologCommand);
   initMetadataForClass(TuPrologSolveQuery, 'TuPrologSolveQuery', TuPrologSolveQuery, AbstractTuPrologCommand);
   //endregion
-  function printSolution($this, sol, operatorSet, groundQueriesHaveBooleanSolution) {
-    if (isInterface(sol, Yes)) {
-      printYesSolution($this, sol, operatorSet, groundQueriesHaveBooleanSolution);
-    } else {
-      if (isInterface(sol, No)) {
-        printNoSolution($this, sol, operatorSet);
-      } else {
-        if (isInterface(sol, Halt)) {
-          printHaltSolution($this, sol, operatorSet);
-        } else {
-          noWhenBranchMatchedException();
+  function printSolution($this, sol, number, operatorSet, groundQueriesHaveBooleanSolution) {
+    var tmp0_safe_receiver = isInterface(sol, Halt) ? sol : null;
+    var exception = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.m25();
+    if (exception instanceof HaltException) {
+      $this.z3x('# goodbye.');
+      throw new ProgramResult(exception.exitStatus);
+    }
+    var plain = format(sol.resetTags(minus(sol.gz(), 'it.unibo.tuprolog.solve.timing.time')), Companion_instance.x25(operatorSet, groundQueriesHaveBooleanSolution));
+    var tmp$ret$0;
+    $l$block: {
+      // Inline function 'kotlin.text.takeWhile' call
+      var inductionVariable = 0;
+      var last = plain.length;
+      if (inductionVariable < last)
+        do {
+          var index = inductionVariable;
+          inductionVariable = inductionVariable + 1 | 0;
+          var it = charCodeAt(plain, index);
+          if (!isLetter(it)) {
+            tmp$ret$0 = substring(plain, 0, index);
+            break $l$block;
+          }
         }
-      }
+         while (inductionVariable < last);
+      tmp$ret$0 = plain;
     }
-  }
-  function printYesSolution($this, sol, operatorSet, groundQueriesHaveBooleanSolution) {
-    $this.q3u(format(sol, Companion_instance.x1z(operatorSet, groundQueriesHaveBooleanSolution)));
-  }
-  function printHaltSolution($this, sol, operatorSet) {
-    var ex = sol.m1z();
-    if (ex instanceof HaltException) {
-      $this.q3u('# goodbye.');
-      throw new ProgramResult(ex.exitStatus);
+    var keyword = tmp$ret$0;
+    var tmp1_safe_receiver = get_time(sol);
+    var tmp;
+    var tmp_0 = tmp1_safe_receiver;
+    if ((tmp_0 == null ? null : new Duration(tmp_0)) == null) {
+      tmp = null;
     } else {
-      $this.q3u(format(sol, Companion_instance.withOperators(operatorSet)));
+      var tmp_1 = tmp1_safe_receiver;
+      // Inline function 'kotlin.let' call
+      var it_0 = (tmp_1 == null ? null : new Duration(tmp_1)).ld_1;
+      tmp = '[' + formatTime(it_0) + '] ';
     }
+    // Inline function 'kotlin.text.orEmpty' call
+    var tmp0_elvis_lhs = tmp;
+    var prefix = '' + number + '. ' + (tmp0_elvis_lhs == null ? '' : tmp0_elvis_lhs);
+    get_terminal($this).f5u(prefix + TextStyles_bold_getInstance().p5e(keyword) + drop(plain, keyword.length));
   }
-  function printEndOfSolutions($this) {
+  function printEndOfSolutions($this, solutions) {
+    $this.z3x('% resolution time: ' + formatTime(solutions.r3e().active));
   }
   function readQueryMultiline($this, query) {
     var longQuery = new StringBuilder(query);
@@ -161,13 +193,10 @@
         tmp = tmp0_elvis_lhs;
       }
       lastRead = tmp;
-      longQuery.u7(lastRead);
+      longQuery.s7(lastRead);
     }
     return longQuery.toString();
   }
-  function printNoSolution($this, sol, operatorSet) {
-    $this.q3u(format(sol, Companion_instance.withOperators(operatorSet)));
-  }
   function AbstractTuPrologCommand(help, epilog, name, invokeWithoutSubcommand, printHelpOnEmptyArgs, helpTags, autoCompleteEnvvar, allowMultipleSubcommands, treatUnknownOptionsAsArgs, hiddenFromHelp) {
     help = help === VOID ? '' : help;
     epilog = epilog === VOID ? '' : epilog;
@@ -180,44 +209,51 @@
     treatUnknownOptionsAsArgs = treatUnknownOptionsAsArgs === VOID ? false : treatUnknownOptionsAsArgs;
     hiddenFromHelp = hiddenFromHelp === VOID ? false : hiddenFromHelp;
     CliktCommand.call(this, name);
-    this.l5t_1 = help;
-    this.m5t_1 = epilog;
-    this.n5t_1 = invokeWithoutSubcommand;
-    this.o5t_1 = printHelpOnEmptyArgs;
-    this.p5t_1 = helpTags;
-    this.q5t_1 = autoCompleteEnvvar;
-    this.r5t_1 = allowMultipleSubcommands;
-    this.s5t_1 = treatUnknownOptionsAsArgs;
-    this.t5t_1 = hiddenFromHelp;
-  }
-  protoOf(AbstractTuPrologCommand).p3t = function () {
-    return this.n5t_1;
+    this.u5w_1 = help;
+    this.v5w_1 = epilog;
+    this.w5w_1 = invokeWithoutSubcommand;
+    this.x5w_1 = printHelpOnEmptyArgs;
+    this.y5w_1 = helpTags;
+    this.z5w_1 = autoCompleteEnvvar;
+    this.a5x_1 = allowMultipleSubcommands;
+    this.b5x_1 = treatUnknownOptionsAsArgs;
+    this.c5x_1 = hiddenFromHelp;
+  }
+  protoOf(AbstractTuPrologCommand).y3w = function () {
+    return this.w5w_1;
   };
-  protoOf(AbstractTuPrologCommand).q3t = function () {
-    return this.o5t_1;
+  protoOf(AbstractTuPrologCommand).z3w = function () {
+    return this.x5w_1;
   };
-  protoOf(AbstractTuPrologCommand).r3t = function () {
-    return this.p5t_1;
+  protoOf(AbstractTuPrologCommand).a3x = function () {
+    return this.y5w_1;
   };
-  protoOf(AbstractTuPrologCommand).s3t = function () {
-    return this.q5t_1;
+  protoOf(AbstractTuPrologCommand).b3x = function () {
+    return this.z5w_1;
   };
-  protoOf(AbstractTuPrologCommand).t3t = function () {
-    return this.r5t_1;
+  protoOf(AbstractTuPrologCommand).c3x = function () {
+    return this.a5x_1;
   };
-  protoOf(AbstractTuPrologCommand).u3t = function () {
-    return this.s5t_1;
+  protoOf(AbstractTuPrologCommand).d3x = function () {
+    return this.b5x_1;
   };
-  protoOf(AbstractTuPrologCommand).v3t = function () {
-    return this.t5t_1;
+  protoOf(AbstractTuPrologCommand).e3x = function () {
+    return this.c5x_1;
   };
-  protoOf(AbstractTuPrologCommand).i3t = function (context) {
-    return this.l5t_1;
+  protoOf(AbstractTuPrologCommand).r3w = function (context) {
+    return this.u5w_1;
   };
-  protoOf(AbstractTuPrologCommand).o3t = function (context) {
-    return this.m5t_1;
+  protoOf(AbstractTuPrologCommand).x3w = function (context) {
+    return this.v5w_1;
   };
-  protoOf(AbstractTuPrologCommand).u5t = function (e) {
+  protoOf(AbstractTuPrologCommand).d5x = function (query) {
+    var tmp = get_terminal(this);
+    var tmp_0 = '[' + formatLocalTimestamp(System_instance.yk().fl()) + '] ' + TextStyles_bold_getInstance().p5e('?-');
+    // Inline function 'kotlin.text.trimEnd' call
+    var tmp$ret$0 = toString(trimEnd(isCharSequence(query) ? query : THROW_CCE()));
+    tmp.f5u(tmp_0 + (' ' + removeSuffix(tmp$ret$0, '.') + '.'));
+  };
+  protoOf(AbstractTuPrologCommand).e5x = function (e) {
     var tmp0_safe_receiver = e.message;
     var tmp;
     if (tmp0_safe_receiver == null) {
@@ -229,16 +265,16 @@
       if (charSequenceLength(tmp0_safe_receiver) > 0) {
         var it = charCodeAt(tmp0_safe_receiver, 0);
         var tmp$ret$2 = isLowerCase(it) ? titlecase(it) : toString_0(it);
-        tmp_0 = toString(tmp$ret$2) + substring(tmp0_safe_receiver, 1);
+        tmp_0 = toString(tmp$ret$2) + substring_0(tmp0_safe_receiver, 1);
       } else {
         tmp_0 = tmp0_safe_receiver;
       }
       tmp = tmp_0;
     }
-    this.q3u('# ' + tmp, VOID, true);
+    this.z3x('# ' + tmp, VOID, true);
   };
-  protoOf(AbstractTuPrologCommand).v5t = function () {
-    var query = prompt(get_terminal(this), '?-', VOID, VOID, VOID, VOID, VOID, ' ');
+  protoOf(AbstractTuPrologCommand).f5x = function () {
+    var query = prompt(get_terminal(this), '[' + formatLocalTimestamp(System_instance.yk().fl()) + '] ' + TextStyles_bold_getInstance().p5e('?-'), VOID, VOID, VOID, VOID, VOID, ' ');
     var tmp;
     if (query == null) {
       throw NullInputException_init_$Create$('The standard input has been close unexpectedly');
@@ -253,10 +289,11 @@
     }
     return tmp;
   };
-  protoOf(AbstractTuPrologCommand).w5t = function (solutions, operatorSet, groundQueriesHaveBooleanSolution) {
-    var first = true;
+  protoOf(AbstractTuPrologCommand).g5x = function (timedSolutions, operatorSet, groundQueriesHaveBooleanSolution) {
+    var solutions = timedSolutions.n();
+    var number = 0;
     $l$loop: while (solutions.q()) {
-      if (!first) {
+      if (number > 0) {
         var tmp0_safe_receiver = prompt(get_terminal(this), '', VOID, VOID, VOID, false);
         var tmp;
         if (tmp0_safe_receiver == null) {
@@ -268,20 +305,21 @@
         var cmd = tmp;
         if (!(cmd === ';'))
           break $l$loop;
-      } else {
-        first = false;
       }
-      printSolution(this, solutions.r(), operatorSet, groundQueriesHaveBooleanSolution);
+      var tmp_0 = solutions.r();
+      number = number + 1 | 0;
+      printSolution(this, tmp_0, number, operatorSet, groundQueriesHaveBooleanSolution);
     }
-    printEndOfSolutions(this);
+    printEndOfSolutions(this, timedSolutions);
   };
-  protoOf(AbstractTuPrologCommand).x5t = function (solutions, maxSolutions, operatorSet, groundQueriesHaveBooleanSolution) {
+  protoOf(AbstractTuPrologCommand).h5x = function (timedSolutions, maxSolutions, operatorSet, groundQueriesHaveBooleanSolution) {
+    var solutions = timedSolutions.n();
     var i = 0;
     while (i < maxSolutions && solutions.q()) {
       i = i + 1 | 0;
-      printSolution(this, solutions.r(), operatorSet, groundQueriesHaveBooleanSolution);
+      printSolution(this, solutions.r(), i, operatorSet, groundQueriesHaveBooleanSolution);
     }
-    printEndOfSolutions(this);
+    printEndOfSolutions(this, timedSolutions);
   };
   function NullInputException_init_$Init$(message, cause, $this) {
     TuPrologException_init_$Init$(message, cause, $this);
@@ -301,23 +339,23 @@
     captureStack(this, NullInputException);
   }
   function Companion() {
-    this.y5t_1 = 1000;
+    this.i5x_1 = 1000;
   }
   var Companion_instance_4;
-  function Companion_getInstance_1() {
+  function Companion_getInstance_2() {
     return Companion_instance_4;
   }
   function _get_files__hkfg7a($this) {
     var tmp = KProperty1;
-    return $this.y5u_1.b45($this, getPropertyCallableRef('files', 1, tmp, TuPrologCmd$_get_files_$ref_c1qk0p(), null));
+    return $this.i5y_1.k48($this, getPropertyCallableRef('files', 1, tmp, TuPrologCmd$_get_files_$ref_c1qk0p(), null));
   }
   function _get_timeout__tg4wg($this) {
     var tmp = KProperty1;
-    return $this.z5u_1.b45($this, getPropertyCallableRef('timeout', 1, tmp, TuPrologCmd$_get_timeout_$ref_q0nd1f(), null));
+    return $this.j5y_1.k48($this, getPropertyCallableRef('timeout', 1, tmp, TuPrologCmd$_get_timeout_$ref_q0nd1f(), null));
   }
   function _get_oop__e6e8e9($this) {
     var tmp = KProperty1;
-    return $this.a5v_1.b45($this, getPropertyCallableRef('oop', 1, tmp, TuPrologCmd$_get_oop_$ref_nvbbou(), null));
+    return $this.k5y_1.k48($this, getPropertyCallableRef('oop', 1, tmp, TuPrologCmd$_get_oop_$ref_nvbbou(), null));
   }
   function loadTheory($this) {
     var theory = Companion_instance_0.emptyWithDefaultUnificator();
@@ -327,44 +365,44 @@
       if (isReadableFile(file)) {
         try {
           var t = loadTheoryFromFile(file);
-          $this.q3u('# Successfully loaded ' + t.s().toString() + ' clauses from ' + file);
+          $this.z3x('# Successfully loaded ' + t.s().toString() + ' clauses from ' + file);
           theory = theory.plusTheory(t);
         } catch ($p) {
           if ($p instanceof ParseException) {
             var e = $p;
-            $this.q3u(trimMargin('\n                        |# Error while parsing theory file: ' + file + '\n                        |#     Message: ' + e.message + '\n                        |#     Line   : ' + e.line + '\n                        |#     Column : ' + e.column + '\n                        |#     Clause : ' + e.clauseIndex + '\n                        '), VOID, true);
+            $this.z3x(trimMargin('\n                        |# Error while parsing theory file: ' + file + '\n                        |#     Message: ' + e.message + '\n                        |#     Line   : ' + e.line + '\n                        |#     Column : ' + e.column + '\n                        |#     Clause : ' + e.clauseIndex + '\n                        '), VOID, true);
           } else {
             throw $p;
           }
         }
       }
     }
-    $this.q3u('');
+    $this.z3x('');
     return theory;
   }
   function readEvalPrintLoop($this, solver) {
     try {
-      var query = $this.v5t();
+      var query = $this.f5x();
       while (!(query == null)) {
         try {
-          var goal = parseStructWithOperators(Companion_getInstance(), query, solver.c1y());
-          var solutions = solver.solveWithTimeout(goal, $this.b5v()).n();
-          $this.w5t(solutions, solver.c1y(), equals(solver.u1x().get(GroundQueriesHaveBooleanSolution_getInstance()), GroundQueriesHaveBooleanSolution_getInstance().s2c_1));
+          var goal = parseStructWithOperators(Companion_getInstance(), query, solver.u23());
+          var solutions = timed(solver.solveWithTimeout(goal, $this.l5y()));
+          $this.g5x(solutions, solver.u23(), equals(solver.m23().get(GroundQueriesHaveBooleanSolution_getInstance()), GroundQueriesHaveBooleanSolution_getInstance().m2j_1));
         } catch ($p) {
           if ($p instanceof ParseException) {
             var e = $p;
-            $this.u5t(e);
+            $this.e5x(e);
           } else {
             throw $p;
           }
         }
-        $this.q3u('');
-        query = $this.v5t();
+        $this.z3x('');
+        query = $this.f5x();
       }
     } catch ($p_0) {
       if ($p_0 instanceof NullInputException) {
         var _unused_var__etf5q3 = $p_0;
-        $this.q3u('\n# goodbye.');
+        $this.z3x('\n# goodbye.');
         throw new ProgramResult(0);
       } else {
         throw $p_0;
@@ -374,17 +412,17 @@
   function TuPrologCmd$_get_files_$ref_c1qk0p() {
     return constructCallableReference(function (p0) {
       return _get_files__hkfg7a(p0);
-    }, 1, 0, 161);
+    }, 1, 0, 112);
   }
   function TuPrologCmd$_get_timeout_$ref_q0nd1f() {
     return constructCallableReference(function (p0) {
       return _get_timeout__tg4wg(p0);
-    }, 1, 0, 162);
+    }, 1, 0, 113);
   }
   function TuPrologCmd$_get_oop_$ref_nvbbou() {
     return constructCallableReference(function (p0) {
       return _get_oop__e6e8e9(p0);
-    }, 1, 0, 163);
+    }, 1, 0, 114);
   }
   function TuPrologCmd$getSolver$lambda$lambda($formatter) {
     return function (it) {
@@ -393,95 +431,94 @@
   }
   function TuPrologCmd$getSolver$lambda(this$0) {
     return function (w) {
-      this$0.q3u('# ' + w.message, VOID, true);
+      this$0.z3x('# ' + w.message, VOID, true);
       var sep = '\n    at ';
-      var formatter = Companion_instance_1.prettyExpressionsPrettyVariables(w.v8().c1y());
-      var tmp = w.q1x();
+      var formatter = Companion_instance_1.prettyExpressionsPrettyVariables(w.x8().u23());
+      var tmp = w.h23();
       var stacktrace = joinToString(tmp, sep, VOID, VOID, VOID, VOID, TuPrologCmd$getSolver$lambda$lambda(formatter));
-      this$0.q3u('#    at ' + stacktrace, VOID, true);
+      this$0.z3x('#    at ' + stacktrace, VOID, true);
       return Unit_instance;
     };
   }
-  function TuPrologCmd$getSolver$lambda_0($this$flag) {
-    return $this$flag.n2d_1;
-  }
   function TuPrologCmd(additionalLibraries) {
     AbstractTuPrologCommand.call(this, 'Start a Prolog Read-Eval-Print loop', VOID, 'java -jar 2p-repl.jar', true, VOID, VOID, VOID, true);
-    this.x5u_1 = additionalLibraries;
+    this.h5y_1 = additionalLibraries;
     var tmp = this;
     var tmp_0 = multiple(option(this, ['-T', '--theory'], 'Path of theory file to be loaded'));
     var tmp_1 = KProperty1;
-    tmp.y5u_1 = tmp_0.o45(this, getPropertyCallableRef('files', 1, tmp_1, TuPrologCmd$_get_files_$ref_c1qk0p(), null));
+    tmp.i5y_1 = tmp_0.x48(this, getPropertyCallableRef('files', 1, tmp_1, TuPrologCmd$_get_files_$ref_c1qk0p(), null));
     var tmp_2 = this;
     var tmp_3 = default_0(int(option(this, ['-t', '--timeout'], 'Maximum amount of time for computing a solution (default: 1000 ms)')), 1000);
     var tmp_4 = KProperty1;
-    tmp_2.z5u_1 = tmp_3.o45(this, getPropertyCallableRef('timeout', 1, tmp_4, TuPrologCmd$_get_timeout_$ref_q0nd1f(), null));
+    tmp_2.j5y_1 = tmp_3.x48(this, getPropertyCallableRef('timeout', 1, tmp_4, TuPrologCmd$_get_timeout_$ref_q0nd1f(), null));
     var tmp_5 = this;
     var tmp_6 = flag(option(this, ['--oop'], 'Loads the OOP library'), [], false);
     var tmp_7 = KProperty1;
-    tmp_5.a5v_1 = tmp_6.o45(this, getPropertyCallableRef('oop', 1, tmp_7, TuPrologCmd$_get_oop_$ref_nvbbou(), null));
+    tmp_5.k5y_1 = tmp_6.x48(this, getPropertyCallableRef('oop', 1, tmp_7, TuPrologCmd$_get_oop_$ref_nvbbou(), null));
   }
-  protoOf(TuPrologCmd).c3w = function () {
-    if (this.x2f().k3v() == null) {
-      readEvalPrintLoop(this, this.c5v());
+  protoOf(TuPrologCmd).l3z = function () {
+    if (this.i2n().t3y() == null) {
+      readEvalPrintLoop(this, this.m5y());
     }
   };
-  protoOf(TuPrologCmd).b5v = function () {
-    return fromInt(_get_timeout__tg4wg(this));
+  protoOf(TuPrologCmd).l5y = function () {
+    Companion_getInstance_0();
+    // Inline function 'kotlin.time.Companion.milliseconds' call
+    var this_0 = fromInt(_get_timeout__tg4wg(this));
+    return toDuration(this_0, DurationUnit_MILLISECONDS_getInstance());
   };
-  protoOf(TuPrologCmd).c5v = function () {
-    this.q3u('# 2P-Kt version 3.0.7');
+  protoOf(TuPrologCmd).m5y = function () {
+    this.z3x('# 2P-Kt version 4.0.0');
     var theory = loadTheory(this);
     var tmp = Companion_instance_2;
     var outputChannel = tmp.of(TuPrologCmd$getSolver$lambda(this));
     var tmp_0;
     if (_get_oop__e6e8e9(this)) {
-      tmp_0 = Companion_instance_3.of(arrayConcat([[IOLib_getInstance(), OOPLib_getInstance()], this.x5u_1]));
+      tmp_0 = Companion_instance_3.of(arrayConcat([[IOLib_getInstance(), OOPLib_getInstance()], this.h5y_1]));
     } else {
-      tmp_0 = Companion_instance_3.of(arrayConcat([[IOLib_getInstance()], this.x5u_1]));
+      tmp_0 = Companion_instance_3.of(arrayConcat([[IOLib_getInstance()], this.h5y_1]));
     }
     var libraries = tmp_0;
-    var tmp_1 = Companion_getInstance_0().y20().newBuilder().setRuntime(libraries).setStaticKb(theory);
-    var tmp_2 = TrackVariables_getInstance();
     // Inline function 'kotlin.also' call
-    var this_0 = tmp_1.setNotableFlagByValue(tmp_2, TuPrologCmd$getSolver$lambda_0).setWarnings(outputChannel).build();
+    var this_0 = Companion_getInstance_1().e27().newBuilder().setRuntime(libraries).setStaticKb(theory).setWarnings(outputChannel).build();
     // Inline function 'kotlin.collections.iterator' call
-    var _iterator__ex2g4s = this_0.t1x().d1().n();
+    var _iterator__ex2g4s = this_0.l23().d1().n();
     while (_iterator__ex2g4s.q()) {
       // Inline function 'kotlin.collections.component2' call
       var library = _iterator__ex2g4s.r().f1();
-      this.q3u('# Successfully loaded library `' + library.e2j() + '`');
+      this.z3x('# Successfully loaded library `' + library.c2r() + '`');
     }
-    this.q3u('');
+    this.z3x('');
     return this_0;
   };
   function _get_query__c6g9vb($this) {
     var tmp = KProperty1;
-    return $this.b5w_1.b45($this, getPropertyCallableRef('query', 1, tmp, TuPrologSolveQuery$_get_query_$ref_bkd3qt(), null));
+    return $this.l5z_1.k48($this, getPropertyCallableRef('query', 1, tmp, TuPrologSolveQuery$_get_query_$ref_bkd3qt(), null));
   }
   function _get_maxSolutions__ysux2t($this) {
     var tmp = KProperty1;
-    return $this.c5w_1.b45($this, getPropertyCallableRef('maxSolutions', 1, tmp, TuPrologSolveQuery$_get_maxSolutions_$ref_o23pc7(), null));
+    return $this.m5z_1.k48($this, getPropertyCallableRef('maxSolutions', 1, tmp, TuPrologSolveQuery$_get_maxSolutions_$ref_o23pc7(), null));
   }
   function _get_parentCommand__z09ff4($this) {
-    var tmp0_safe_receiver = $this.x2f().b3s_1;
-    var tmp = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.c3s_1;
+    var tmp0_safe_receiver = $this.i2n().k3v_1;
+    var tmp = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.l3v_1;
     return tmp instanceof TuPrologCmd ? tmp : THROW_CCE();
   }
   function evalAndPrint($this, solver) {
     try {
-      var duration = _get_parentCommand__z09ff4($this).b5v();
-      var solutions = solver.solveWithTimeout(parseStruct(Companion_getInstance(), _get_query__c6g9vb($this)), duration).n();
-      var groundQueriesHaveBooleanSolution = equals(solver.u1x().get(GroundQueriesHaveBooleanSolution_getInstance()), GroundQueriesHaveBooleanSolution_getInstance().s2c_1);
+      $this.d5x(_get_query__c6g9vb($this));
+      var duration = _get_parentCommand__z09ff4($this).l5y();
+      var solutions = timed(solver.solveWithTimeout(parseStruct(Companion_getInstance(), _get_query__c6g9vb($this)), duration));
+      var groundQueriesHaveBooleanSolution = equals(solver.m23().get(GroundQueriesHaveBooleanSolution_getInstance()), GroundQueriesHaveBooleanSolution_getInstance().m2j_1);
       if (_get_maxSolutions__ysux2t($this) === 0) {
-        $this.w5t(solutions, solver.c1y(), groundQueriesHaveBooleanSolution);
+        $this.g5x(solutions, solver.u23(), groundQueriesHaveBooleanSolution);
       } else {
-        $this.x5t(solutions, _get_maxSolutions__ysux2t($this), solver.c1y(), groundQueriesHaveBooleanSolution);
+        $this.h5x(solutions, _get_maxSolutions__ysux2t($this), solver.u23(), groundQueriesHaveBooleanSolution);
       }
     } catch ($p) {
       if ($p instanceof ParseException) {
         var e = $p;
-        $this.u5t(e);
+        $this.e5x(e);
       } else {
         throw $p;
       }
@@ -493,7 +530,7 @@
       // Inline function 'com.github.ajalt.clikt.parameters.arguments.ArgumentTransformContext.require' call
       if (!!isBlank(it)) {
         var tmp$ret$3 = $message;
-        $this$validate.k44(tmp$ret$3);
+        $this$validate.t47(tmp$ret$3);
       }
       return Unit_instance;
     };
@@ -501,12 +538,12 @@
   function TuPrologSolveQuery$_get_query_$ref_bkd3qt() {
     return constructCallableReference(function (p0) {
       return _get_query__c6g9vb(p0);
-    }, 1, 0, 164);
+    }, 1, 0, 115);
   }
   function TuPrologSolveQuery$_get_maxSolutions_$ref_o23pc7() {
     return constructCallableReference(function (p0) {
       return _get_maxSolutions__ysux2t(p0);
-    }, 1, 0, 165);
+    }, 1, 0, 116);
   }
   function TuPrologSolveQuery() {
     AbstractTuPrologCommand.call(this, 'Compute a particular query and then terminate', VOID, 'solve');
@@ -517,14 +554,14 @@
     // Inline function 'com.github.ajalt.clikt.parameters.arguments.check' call
     var tmp_0 = validate(tmp0, TuPrologSolveQuery$query$delegate$lambda(message));
     var tmp_1 = KProperty1;
-    tmp.b5w_1 = tmp_0.d45(this, getPropertyCallableRef('query', 1, tmp_1, TuPrologSolveQuery$_get_query_$ref_bkd3qt(), null));
+    tmp.l5z_1 = tmp_0.m48(this, getPropertyCallableRef('query', 1, tmp_1, TuPrologSolveQuery$_get_query_$ref_bkd3qt(), null));
     var tmp_2 = this;
     var tmp_3 = default_0(int(option(this, ['-n', '--numberOfSolutions'], 'Number of solution to calculate')), 0);
     var tmp_4 = KProperty1;
-    tmp_2.c5w_1 = tmp_3.o45(this, getPropertyCallableRef('maxSolutions', 1, tmp_4, TuPrologSolveQuery$_get_maxSolutions_$ref_o23pc7(), null));
+    tmp_2.m5z_1 = tmp_3.x48(this, getPropertyCallableRef('maxSolutions', 1, tmp_4, TuPrologSolveQuery$_get_maxSolutions_$ref_o23pc7(), null));
   }
-  protoOf(TuPrologSolveQuery).c3w = function () {
-    var solver = _get_parentCommand__z09ff4(this).c5v();
+  protoOf(TuPrologSolveQuery).l3z = function () {
+    var solver = _get_parentCommand__z09ff4(this).m5y();
     evalAndPrint(this, solver);
   };
   function isReadableFile(path) {