Fix string conversion between java and prolog

Author: AlchemicRaker

gradle.properties

@@ -3,7 +3,7 @@ minecraft_version = 1.12.2
 forge_version = 14.23.5.2847
 
 mod_name = OpenProlog
-mod_version=0.3.2
+mod_version=0.3.3
 opencomputers_version=1.7.5.192
 
 org.gradle.jvmargs = -Xmx2048m

src/main/java/com/syntheticentropy/ocpro/OpenProlog.java

@@ -20,7 +20,7 @@ public class OpenProlog
     @SuppressWarnings("WeakerAccess")
     public static final String NAME = "OpenProlog";
     @SuppressWarnings("WeakerAccess")
-    public static final String VERSION = "0.3.2";
+    public static final String VERSION = "0.3.3";
 
     // resource path
     static final String RESOURCE_PATH = "/com/syntheticentropy/ocpro/";

src/main/java/com/syntheticentropy/ocpro/PrologArchitecture.java

@@ -29,7 +29,7 @@ public class PrologArchitecture implements Architecture {
     private FutureTask<Object> vmQueryResponseFutureTask;
     private int vmQuerySleepTicks;
 
-    private ExecutionResult forceExecutionResult;
+    public ExecutionResult forceExecutionResult;
 
     enum VMResponse {
         RunSynchronous,
@@ -55,6 +55,7 @@ public PrologArchitecture(Machine machine) {
     public boolean initialize() {
 
         //create the VM
+        if (vm != null && vm.jip != null) vm.jip.releaseAllResources();
         vm = new PrologVM(this);
 
         return true;
@@ -67,8 +68,11 @@ public void runSynchronized() {
 
     @Override
     public ExecutionResult runThreaded(boolean isSynchronizedReturn) {
-        if (forceExecutionResult != null)
-            return forceExecutionResult;
+        if (forceExecutionResult != null) {
+            ExecutionResult tmpResult = forceExecutionResult;
+            forceExecutionResult = null;
+            return tmpResult;
+        }
 
         //Called for: synchronized return, init, or signal
         vmQueryResponse = VMResponse.None;
@@ -169,6 +173,7 @@ public Object[] synchronizedCall(Supplier<Object[]> task) {
             return synchronizedFutureTask.get();
         } catch (InterruptedException | ExecutionException e) {
             e.printStackTrace();
+            crash(e.getMessage());
         }
         return null;
     }
@@ -199,7 +204,7 @@ public void crash(String e) {
         if (!synchronizedFutureTask.isDone()) {
             synchronizedFutureTask.cancel(true);
         }
-//        machine.crash(e);
+        machine.crash(e);
     }
 
     @Override
@@ -215,6 +220,8 @@ public boolean recomputeMemory(Iterable<ItemStack> iterable) {
 
     @Override
     public void close() {
+        if (vm != null && vm.jip != null) vm.jip.releaseAllResources();
+        if (vm != null) vm.jip = null;
         vm = null;
 
         synchronizedSupplier = null;

src/main/java/com/syntheticentropy/ocpro/PrologVM.java

@@ -33,13 +33,12 @@ public void run() {
             }
         } catch (Exception e) {
             state = State.Terminated;
-            exitException = e;
+//            exitException = e;
             owner.crash(e.getMessage());
         } finally {
-            if (jip != null) {
-                jip.releaseAllResources();
-                jip = null;
-            }
+//            if (jip != null) {
+//                jip.reset();
+//            }
         }
     }
 

src/main/java/com/syntheticentropy/ocpro/builtin/OcproBuiltIn.java

@@ -13,7 +13,7 @@ public PrologObject rawToPrologObject(Object raw) {
             return Atom.createAtom(((Boolean) raw) ? "true" : "false");
         }
         if (raw instanceof String) {
-            return new Functor(Atom.createAtom("string/1"), new PString((String) raw, true).getConsCell());
+            return stringToFunctor((String) raw, "string");
         }
         if (raw instanceof Integer) {
             return Expression.createNumber((Integer) raw);
@@ -22,7 +22,7 @@ public PrologObject rawToPrologObject(Object raw) {
             return Expression.createNumber((Double) raw);
         }
         if (raw instanceof byte[]) {
-            return new Functor(Atom.createAtom("bytes/1"), new PString(new String((byte[]) raw), true).getConsCell());
+            return stringToFunctor(new String((byte[]) raw), "bytes");
         }
         if (raw instanceof HandleValue) {
             return Expression.createNumber(((HandleValue) raw).handle());
@@ -34,6 +34,10 @@ public PrologObject rawToPrologObject(Object raw) {
         return Atom.createAtom(raw.toString());
     }
 
+    public Functor stringToFunctor(String str, String functorName) {
+        return new Functor(Atom.createAtom(functorName + "/1"), new ConsCell(new PString(PString.getList(str, true), true), null));
+    }
+
     public Object prologObjectToRaw(PrologObject prologObjectIndirect) {
         PrologObject prologObject = prologObjectIndirect instanceof Variable ?
                 ((Variable) prologObjectIndirect).getObject() : prologObjectIndirect;

src/main/java/com/ugos/jiprolog/engine/PString.java

@@ -166,7 +166,7 @@ public final boolean _unify(PrologObject obj, final Hashtable table) {
         }
     }
 
-    private static final ConsList getList(final String string, boolean chars) {
+    public static final ConsList getList(final String string, boolean chars) {
         ConsList retList = null;
 
         for (int i = string.length() - 1; i >= 0; i--) {

src/main/resources/com/syntheticentropy/ocpro/bios.pl

@@ -4,14 +4,16 @@
     component_invoke(Address, exists, [string("init.pl")], [InitDoesExist]),
     InitDoesExist.
 
-on_signal(Signal) :-
+
+write_signal(Signal) :-
     !, term_string(Signal, Text),
     xterm_write(Text).
 
+
 biosMain :-
     component_type(gpu, Gpu),
     component_type(screen, Screen),
-    component_invoke(Screen, turnOn, [], _),
+    component_invoke(Screen, turnOn, [string("this is how it should be")], _),
     component_invoke(Gpu, bind, [Screen], _),
     component_invoke(Gpu, maxResolution, [], [MaxWidth, MaxHeight]),
     component_invoke(Gpu, setResolution, [MaxWidth, MaxHeight], _),
@@ -33,5 +35,6 @@
         ; sleep(200), fail
         ),
         xterm_write("got signal"),
+        write_signal(Signal),
         on_signal(Signal),
         fail.