@tuprolog/2p-full 0.31.2 → 0.31.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/2p-core.js +1 -1
- package/2p-repl.js +33 -19
- package/2p-repl.js.map +1 -1
- package/2p-solve.js +0 -1
- package/2p-solve.js.map +1 -1
- package/kotlin-kotlin-stdlib-js-ir.js +6 -6
- package/kotlin-kotlin-stdlib-js-ir.js.map +1 -1
- package/package.json +1 -1
package/2p-core.js
CHANGED
package/2p-repl.js
CHANGED
|
@@ -51,6 +51,7 @@
|
|
|
51
51
|
var arrayConcat = kotlin_kotlin.$_$.a;
|
|
52
52
|
var OOPLib_getInstance = kotlin_it_unibo_tuprolog_oop_lib.$_$.a;
|
|
53
53
|
var Companion_getInstance_5 = kotlin_it_unibo_tuprolog_solve.$_$.p2;
|
|
54
|
+
var TrackVariables_getInstance = kotlin_it_unibo_tuprolog_solve.$_$.c2;
|
|
54
55
|
var KProperty1 = kotlin_kotlin.$_$.d8;
|
|
55
56
|
var getPropertyCallableRef = kotlin_kotlin.$_$.r6;
|
|
56
57
|
var NotImplementedError = kotlin_kotlin.$_$.nb;
|
|
@@ -110,7 +111,7 @@
|
|
|
110
111
|
function printHaltSolution($this, sol, operatorSet) {
|
|
111
112
|
var ex = sol.c1w();
|
|
112
113
|
if (ex instanceof HaltException) {
|
|
113
|
-
$this.i3y('goodbye.', false, false, null, 14, null);
|
|
114
|
+
$this.i3y('# goodbye.', false, false, null, 14, null);
|
|
114
115
|
throw new ProgramResult(ex.exitStatus);
|
|
115
116
|
} else {
|
|
116
117
|
var tmp = format(sol, Companion_getInstance().withOperators(operatorSet));
|
|
@@ -299,21 +300,30 @@
|
|
|
299
300
|
return theory;
|
|
300
301
|
}
|
|
301
302
|
function readEvalPrintLoop($this, solver) {
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
303
|
+
try {
|
|
304
|
+
var query = $this.m4a();
|
|
305
|
+
while (!(query == null)) {
|
|
306
|
+
try {
|
|
307
|
+
var goal = parseStructWithOperators(Companion_getInstance_1(), query, solver.h1v());
|
|
308
|
+
var solutions = solver.solveWithTimeout(goal, $this.l4b()).j();
|
|
309
|
+
$this.n4a(solutions, solver.h1v());
|
|
310
|
+
} catch ($p) {
|
|
311
|
+
if ($p instanceof ParseException) {
|
|
312
|
+
$this.l4a($p);
|
|
313
|
+
} else {
|
|
314
|
+
throw $p;
|
|
315
|
+
}
|
|
313
316
|
}
|
|
317
|
+
$this.i3y('', false, false, null, 14, null);
|
|
318
|
+
query = $this.m4a();
|
|
319
|
+
}
|
|
320
|
+
} catch ($p) {
|
|
321
|
+
if ($p instanceof NullInputException) {
|
|
322
|
+
$this.i3y('# goodbye.', false, false, null, 14, null);
|
|
323
|
+
throw new ProgramResult(0);
|
|
324
|
+
} else {
|
|
325
|
+
throw $p;
|
|
314
326
|
}
|
|
315
|
-
$this.i3y('', false, false, null, 14, null);
|
|
316
|
-
query = $this.m4a();
|
|
317
327
|
}
|
|
318
328
|
}
|
|
319
329
|
function TuPrologCmd$getSolver$lambda$lambda($formatter) {
|
|
@@ -334,6 +344,9 @@
|
|
|
334
344
|
return Unit_getInstance();
|
|
335
345
|
};
|
|
336
346
|
}
|
|
347
|
+
function TuPrologCmd$getSolver$lambda_0($this$flag) {
|
|
348
|
+
return $this$flag.u29_1;
|
|
349
|
+
}
|
|
337
350
|
function TuPrologCmd(additionalLibraries) {
|
|
338
351
|
Companion_getInstance_6();
|
|
339
352
|
AbstractTuPrologCommand_init_$Init$('Start a Prolog Read-Eval-Print loop', null, 'java -jar 2p-repl.jar', true, false, null, null, true, false, false, 882, null, this);
|
|
@@ -363,7 +376,7 @@
|
|
|
363
376
|
};
|
|
364
377
|
TuPrologCmd.prototype.m4b = function () {
|
|
365
378
|
Info_getInstance();
|
|
366
|
-
var tmp = '# 2P-Kt version ' + '0.31.
|
|
379
|
+
var tmp = '# 2P-Kt version ' + '0.31.4';
|
|
367
380
|
this.i3y(tmp, false, false, null, 14, null);
|
|
368
381
|
var theory = loadTheory(this);
|
|
369
382
|
var tmp_0 = Companion_getInstance_3();
|
|
@@ -377,8 +390,9 @@
|
|
|
377
390
|
var libraries = tmp_1;
|
|
378
391
|
var tmp$ret$2;
|
|
379
392
|
// Inline function 'kotlin.also' call
|
|
380
|
-
var tmp_2 = Companion_getInstance_5().t1x();
|
|
381
|
-
var
|
|
393
|
+
var tmp_2 = Companion_getInstance_5().t1x().newBuilder().setRuntime(libraries).setStaticKb(theory);
|
|
394
|
+
var tmp_3 = TrackVariables_getInstance();
|
|
395
|
+
var tmp0_also = tmp_2.setNotableFlagByValue(tmp_3, TuPrologCmd$getSolver$lambda_0).setWarnings(outputChannel).build();
|
|
382
396
|
// Inline function 'kotlin.contracts.contract' call
|
|
383
397
|
// Inline function 'it.unibo.tuprolog.ui.repl.TuPrologCmd.getSolver.<anonymous>' call
|
|
384
398
|
var tmp$ret$0;
|
|
@@ -392,8 +406,8 @@
|
|
|
392
406
|
// Inline function 'kotlin.collections.component2' call
|
|
393
407
|
tmp$ret$1 = tmp1_loop_parameter.b1();
|
|
394
408
|
var library = tmp$ret$1;
|
|
395
|
-
var
|
|
396
|
-
this.i3y(
|
|
409
|
+
var tmp_4 = '# Successfully loaded library `' + library.o2e() + '`';
|
|
410
|
+
this.i3y(tmp_4, false, false, null, 14, null);
|
|
397
411
|
}
|
|
398
412
|
this.i3y('', false, false, null, 14, null);
|
|
399
413
|
tmp$ret$2 = tmp0_also;
|
package/2p-repl.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../../../../repl/src/commonMain/kotlin/it/unibo/tuprolog/ui/repl/AbstractTuPrologCommand.kt","commonMainSources/libraries/stdlib/src/kotlin/text/Strings.kt","jsMainSources/libraries/stdlib/js/src/kotlin/dynamic.kt","jsMainSources/libraries/stdlib/js/src/kotlin/text/string.kt","../../../../../../../repl/src/commonMain/kotlin/it/unibo/tuprolog/ui/repl/NullInputException.kt","../../../../../../../repl/src/commonMain/kotlin/it/unibo/tuprolog/ui/repl/TuPrologCmd.kt","commonMainSources/libraries/stdlib/src/kotlin/util/Standard.kt","commonMainSources/libraries/stdlib/src/kotlin/collections/Maps.kt","../../../../../../../repl/src/commonMain/kotlin/it/unibo/tuprolog/ui/repl/TuPrologSolveQuery.kt","../../../../../../../repl/src/jsMain/kotlin/it/unibo/tuprolog/ui/repl/Repl.kt"],"sourcesContent":[null,null,null,null,null,null,null,null,null,null],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"sources":["../../../../../../../repl/src/commonMain/kotlin/it/unibo/tuprolog/ui/repl/AbstractTuPrologCommand.kt","commonMainSources/libraries/stdlib/src/kotlin/text/Strings.kt","jsMainSources/libraries/stdlib/js/src/kotlin/dynamic.kt","jsMainSources/libraries/stdlib/js/src/kotlin/text/string.kt","../../../../../../../repl/src/commonMain/kotlin/it/unibo/tuprolog/ui/repl/NullInputException.kt","../../../../../../../repl/src/commonMain/kotlin/it/unibo/tuprolog/ui/repl/TuPrologCmd.kt","commonMainSources/libraries/stdlib/src/kotlin/util/Standard.kt","commonMainSources/libraries/stdlib/src/kotlin/collections/Maps.kt","../../../../../../../repl/src/commonMain/kotlin/it/unibo/tuprolog/ui/repl/TuPrologSolveQuery.kt","../../../../../../../repl/src/jsMain/kotlin/it/unibo/tuprolog/ui/repl/Repl.kt"],"sourcesContent":[null,null,null,null,null,null,null,null,null,null],"names":[],"mappings":"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"}
|
package/2p-solve.js
CHANGED
|
@@ -16706,7 +16706,6 @@
|
|
|
16706
16706
|
SolveOptionsImpl.prototype.addOptions = addOptions;
|
|
16707
16707
|
SolveOptionsImpl.prototype.setOption = setOption;
|
|
16708
16708
|
SolveOptionsImpl.prototype.addOption = addOption;
|
|
16709
|
-
SolverBuilderImpl$toFactory$1.prototype.y1y = solverWithDefaultBuiltins$default;
|
|
16710
16709
|
AbstractPluggable.prototype.containsSignature = containsSignature;
|
|
16711
16710
|
AbstractPluggable.prototype.containsOperator = containsOperator;
|
|
16712
16711
|
AbstractPluggable.prototype.hasPrimitive = hasPrimitive;
|