Ticket #275: java-jvm-7a.patch

Source/Cobra.Core/Java/mkjarAll

@@ -8 +8 @@
 
 [ -d classes ] || mkdir classes
 [ -d classes/cobra/lang ] && rm -rf classes/cobra/lang/*
-EXCEPTIONS="AssertException.java InvariantException.java RequireException.java EnsureException.java NonNilCastException.java DynamicOperationException.java ExpectException.java CheckedExceptionWrapper.java"
-javac -d classes SourceSite.java CobraImp.java CobraCore.java Delegate.java DelegateO.java Pair.java ${EXCEPTIONS} CobraDirectString.java
+
+source javaRtlSources
+javac -Xlint:unchecked -d classes ${RTL_SRCS}
 [ $? == 0 ] || exit
 
 jar cvf ${CORE_RTL} -C classes .

Source/Cobra.Core/Java/mkjar

@@ -7 +7 @@
 
 [ -d classes ] || mkdir classes
 [ -d classes/cobra/lang ] && rm -rf classes/cobra/lang/*
-EXCEPTIONS="AssertException.java InvariantException.java RequireException.java EnsureException.java NonNilCastException.java DynamicOperationException.java ExpectException.java CheckedExceptionWrapper.java"
-javac -Xlint:unchecked -d classes SourceSite.java CobraImp.java CobraCore.java Delegate.java DelegateO.java BasePair.java Pair.java ${EXCEPTIONS} CobraDirectString.java
+
+source javaRtlSources
+javac -Xlint:unchecked -d classes ${RTL_SRCS}
 [ $? == 0 ] || exit
 
 jar cvf ${CORE_RTL} -C classes .

Source/Cobra.Core/Java/mkjarOnly

@@ -7 +7 @@
 
 [ -d classes ] || mkdir classes
 [ -d classes/cobra/lang ] && rm -rf classes/cobra/lang/*
-EXCEPTIONS="AssertException.java InvariantException.java RequireException.java EnsureException.java NonNilCastException.java DynamicOperationException.java ExpectException.java CheckedExceptionWrapper.java"
-javac -Xlint:unchecked -d classes SourceSite.java CobraImp.java CobraCore.java Delegate.java DelegateO.java Pair.java ${EXCEPTIONS} CobraDirectString.java
+
+source javaRtlSources
+javac -Xlint:unchecked -d classes ${RTL_SRCS}
 [ $? == 0 ] || exit
+
 jar cvf ${CORE_RTL} -C classes .
 [ $? == 0 ] || exit
 cp ${CORE_RTL} ../..

Source/Cobra.Core/Java/BasePair.java

@@ +1 @@
+/* 
+ *  BasePair.java
+ *
+ *  Abstract base class for simple pair class hierarchy to satisfy RT requirements for compiler
+ * used by Pair.java et al
+ */ 
+
+package cobra.core;
+import java.util.*;
+
+public abstract class BasePair  {
+
+    protected  int _compare(Comparable<Object> a, Comparable<Object> b) {
+          /*
+           * Gracefully handle comparisons that involve nil.
+           * A simple `a.compareTo(b)` does not work if `a` can be `nil`.
+           */ 
+    if (a == null)
+            if (b == null) 
+                return 0;
+        else 
+                return -1;
+    else if (b == null)
+        return 1;
+    else
+        return a.compareTo(b);
+    }
+
+    public int size() {
+            return 2;
+       }
+
+}

Source/Cobra.Core/Java/javaRTLSources

@@ +1 @@
+# List of java Source files for the jvm cobra Runtime Library
+# sourced into the mkjar* build  scripts
+# The RTL sources are currently all java src code, eventually when compiler 
+# is more mature will migrate some/most to cobra sources
+
+EXCEPTIONS="AssertException.java InvariantException.java 
+  RequireException.java EnsureException.java NonNilCastException.java 
+  DynamicOperationException.java ExpectException.java 
+  CheckedExceptionWrapper.java"
+
+RTL_SRCS="SourceSite.java CobraImp.java CobraCore.java 
+  Delegate.java DelegateO.java BasePair.java Pair.java 
+  ${EXCEPTIONS} CobraDirectString.java"