From b07c20085e2daccdd77b07a681308f487dbf20a7 Mon Sep 17 00:00:00 2001 From: Kathy Gray Date: Mon, 26 May 2008 22:38:05 +0000 Subject: [PATCH] Attempt at performance increase/ overhead per-module reduction svn: r9966 --- .../libs/java/lang/ArithmeticException.jinfo | 127 +++++++++ .../lang/ArrayIndexOutOfBoundsException.jinfo | 134 +++++++++ .../libs/java/lang/ArrayStoreException.jinfo | 127 +++++++++ .../libs/java/lang/ClassCastException.jinfo | 127 +++++++++ .../libs/java/lang/ClassNotFoundException.ss | 9 - .../java/lang/CloneNotSupportedException.ss | 9 - .../libs/java/lang/Double-native-methods.ss | 10 +- collects/profj/libs/java/lang/Double.java | 13 +- collects/profj/libs/java/lang/Exception.jinfo | 131 +++++++++ .../libs/java/lang/IllegalAccessException.ss | 9 - .../java/lang/IllegalArgumentException.ss | 9 - .../java/lang/IllegalMonitorStateException.ss | 9 - .../libs/java/lang/IllegalStateException.ss | 9 - .../java/lang/IllegalThreadStateException.ss | 9 - .../java/lang/IndexOutOfBoundsException.jinfo | 127 +++++++++ .../libs/java/lang/InstantiationException.ss | 9 - .../libs/java/lang/InterruptedException.ss | 9 - .../lang/NegativeArraySizeException.jinfo | 127 +++++++++ .../libs/java/lang/NoSuchFieldException.ss | 9 - .../libs/java/lang/NoSuchMethodException.ss | 9 - .../libs/java/lang/NullPointerException.jinfo | 127 +++++++++ .../libs/java/lang/NumberFormatException.ss | 9 - .../profj/libs/java/lang/Object-composite.ss | 261 +++++++++++++++++- .../libs/java/lang/RuntimeException.jinfo | 133 +++++++++ .../profj/libs/java/lang/SecurityException.ss | 9 - .../lang/StringIndexOutOfBoundsException.ss | 9 - .../lang/UnsupportedOperationException.ss | 9 - collects/profj/libs/java/lang/compile-lang.ss | 4 +- collects/profj/libs/java/lang/installer.ss | 27 +- .../libs/java/{runtime.scm => runtime.ss} | 0 collects/profj/pre-installer.ss | 11 +- collects/profj/to-scheme.ss | 6 +- collects/profj/tool.ss | 6 +- 33 files changed, 1472 insertions(+), 161 deletions(-) create mode 100644 collects/profj/libs/java/lang/ArithmeticException.jinfo create mode 100644 collects/profj/libs/java/lang/ArrayIndexOutOfBoundsException.jinfo create mode 100644 collects/profj/libs/java/lang/ArrayStoreException.jinfo create mode 100644 collects/profj/libs/java/lang/ClassCastException.jinfo delete mode 100644 collects/profj/libs/java/lang/ClassNotFoundException.ss delete mode 100644 collects/profj/libs/java/lang/CloneNotSupportedException.ss create mode 100644 collects/profj/libs/java/lang/Exception.jinfo delete mode 100644 collects/profj/libs/java/lang/IllegalAccessException.ss delete mode 100644 collects/profj/libs/java/lang/IllegalArgumentException.ss delete mode 100644 collects/profj/libs/java/lang/IllegalMonitorStateException.ss delete mode 100644 collects/profj/libs/java/lang/IllegalStateException.ss delete mode 100644 collects/profj/libs/java/lang/IllegalThreadStateException.ss create mode 100644 collects/profj/libs/java/lang/IndexOutOfBoundsException.jinfo delete mode 100644 collects/profj/libs/java/lang/InstantiationException.ss delete mode 100644 collects/profj/libs/java/lang/InterruptedException.ss create mode 100644 collects/profj/libs/java/lang/NegativeArraySizeException.jinfo delete mode 100644 collects/profj/libs/java/lang/NoSuchFieldException.ss delete mode 100644 collects/profj/libs/java/lang/NoSuchMethodException.ss create mode 100644 collects/profj/libs/java/lang/NullPointerException.jinfo delete mode 100644 collects/profj/libs/java/lang/NumberFormatException.ss create mode 100644 collects/profj/libs/java/lang/RuntimeException.jinfo delete mode 100644 collects/profj/libs/java/lang/SecurityException.ss delete mode 100644 collects/profj/libs/java/lang/StringIndexOutOfBoundsException.ss delete mode 100644 collects/profj/libs/java/lang/UnsupportedOperationException.ss rename collects/profj/libs/java/{runtime.scm => runtime.ss} (100%) diff --git a/collects/profj/libs/java/lang/ArithmeticException.jinfo b/collects/profj/libs/java/lang/ArithmeticException.jinfo new file mode 100644 index 0000000000..4955eff724 --- /dev/null +++ b/collects/profj/libs/java/lang/ArithmeticException.jinfo @@ -0,0 +1,127 @@ +(class ("ArithmeticException" "java" "lang") (public) + #t + (("serialVersionUID" + (final static private) + ("ArithmeticException" "java" "lang") + long)) + (("ArithmeticException" + (public) + ctor + (("String" "java" "lang")) + () + ("ArithmeticException" "java" "lang")) + ("ArithmeticException" + (public) + ctor + () + () + ("ArithmeticException" "java" "lang")) + ("fillInStackTrace" + (public) + ("Throwable" "java" "lang") + () + () + ("Throwable" "java" "lang")) + ("initCause" + (public) + ("Throwable" "java" "lang") + (("Throwable" "java" "lang")) + () + ("Throwable" "java" "lang")) + ("getCause" + (public) + ("Throwable" "java" "lang") + () + () + ("Throwable" "java" "lang")) + ("getLocalizedMessage" + (public) + ("String" "java" "lang") + () + () + ("Throwable" "java" "lang")) + ("getMessage" + (public) + ("String" "java" "lang") + () + () + ("Throwable" "java" "lang")) + ("getStackTrace" + (public) + (1 ("StackTraceElement" "java" "lang")) + () + () + ("Throwable" "java" "lang")) + ("printStackTrace" (public) void () () ("Throwable" "java" "lang")) + ("printStackTrace" + (public) + void + (("PrintStream" "java" "io")) + () + ("Throwable" "java" "lang")) + ("printStackTrace" + (public) + void + (("PrintWriter" "java" "io")) + () + ("Throwable" "java" "lang")) + ("setStackTrace" + (public) + void + ((1 ("StackTraceElement" "java" "lang"))) + () + ("Throwable" "java" "lang")) + ("clone" + (protected) + ("Object" "java" "lang") + () + (("CloneNotSupportedException" "java" "lang")) + ("Object" "java" "lang")) + ("equals" + (public) + boolean + (("Object" "java" "lang")) + () + ("Object" "java" "lang")) + ("finalize" (protected) void () () ("Object" "java" "lang")) + ("getClass" + (public final) + ("Class" "java" "lang") + () + () + ("Object" "java" "lang")) + ("hashCode" (public) int () () ("Object" "java" "lang")) + ("notify" (public final) void () () ("Object" "java" "lang")) + ("notifyAll" (public final) void () () ("Object" "java" "lang")) + ("toString" + (public) + ("String" "java" "lang") + () + () + ("Object" "java" "lang")) + ("wait" + (public final) + void + () + (("InterruptedException" "java" "lang")) + ("Object" "java" "lang")) + ("wait" + (public final) + void + (long) + (("InterruptedException" "java" "lang")) + ("Object" "java" "lang")) + ("wait" + (public final) + void + (long int) + (("InterruptedException" "java" "lang")) + ("Object" "java" "lang"))) + () + (("RuntimeException" "java" "lang") + ("Exception" "java" "lang") + ("Throwable" "java" "lang") + ("Object" "java" "lang")) + (("Serializable" "java" "io")) + "version4" + "3.99.0.25") diff --git a/collects/profj/libs/java/lang/ArrayIndexOutOfBoundsException.jinfo b/collects/profj/libs/java/lang/ArrayIndexOutOfBoundsException.jinfo new file mode 100644 index 0000000000..99e29aca9f --- /dev/null +++ b/collects/profj/libs/java/lang/ArrayIndexOutOfBoundsException.jinfo @@ -0,0 +1,134 @@ +(class ("ArrayIndexOutOfBoundsException" "java" "lang") (public) + #t + (("serialVersionUID" + (final static private) + ("ArrayIndexOutOfBoundsException" "java" "lang") + long)) + (("ArrayIndexOutOfBoundsException" + (public) + ctor + (int) + () + ("ArrayIndexOutOfBoundsException" "java" "lang")) + ("ArrayIndexOutOfBoundsException" + (public) + ctor + (("String" "java" "lang")) + () + ("ArrayIndexOutOfBoundsException" "java" "lang")) + ("ArrayIndexOutOfBoundsException" + (public) + ctor + () + () + ("ArrayIndexOutOfBoundsException" "java" "lang")) + ("fillInStackTrace" + (public) + ("Throwable" "java" "lang") + () + () + ("Throwable" "java" "lang")) + ("initCause" + (public) + ("Throwable" "java" "lang") + (("Throwable" "java" "lang")) + () + ("Throwable" "java" "lang")) + ("getCause" + (public) + ("Throwable" "java" "lang") + () + () + ("Throwable" "java" "lang")) + ("getLocalizedMessage" + (public) + ("String" "java" "lang") + () + () + ("Throwable" "java" "lang")) + ("getMessage" + (public) + ("String" "java" "lang") + () + () + ("Throwable" "java" "lang")) + ("getStackTrace" + (public) + (1 ("StackTraceElement" "java" "lang")) + () + () + ("Throwable" "java" "lang")) + ("printStackTrace" (public) void () () ("Throwable" "java" "lang")) + ("printStackTrace" + (public) + void + (("PrintStream" "java" "io")) + () + ("Throwable" "java" "lang")) + ("printStackTrace" + (public) + void + (("PrintWriter" "java" "io")) + () + ("Throwable" "java" "lang")) + ("setStackTrace" + (public) + void + ((1 ("StackTraceElement" "java" "lang"))) + () + ("Throwable" "java" "lang")) + ("clone" + (protected) + ("Object" "java" "lang") + () + (("CloneNotSupportedException" "java" "lang")) + ("Object" "java" "lang")) + ("equals" + (public) + boolean + (("Object" "java" "lang")) + () + ("Object" "java" "lang")) + ("finalize" (protected) void () () ("Object" "java" "lang")) + ("getClass" + (public final) + ("Class" "java" "lang") + () + () + ("Object" "java" "lang")) + ("hashCode" (public) int () () ("Object" "java" "lang")) + ("notify" (public final) void () () ("Object" "java" "lang")) + ("notifyAll" (public final) void () () ("Object" "java" "lang")) + ("toString" + (public) + ("String" "java" "lang") + () + () + ("Object" "java" "lang")) + ("wait" + (public final) + void + () + (("InterruptedException" "java" "lang")) + ("Object" "java" "lang")) + ("wait" + (public final) + void + (long) + (("InterruptedException" "java" "lang")) + ("Object" "java" "lang")) + ("wait" + (public final) + void + (long int) + (("InterruptedException" "java" "lang")) + ("Object" "java" "lang"))) + () + (("IndexOutOfBoundsException" "java" "lang") + ("RuntimeException" "java" "lang") + ("Exception" "java" "lang") + ("Throwable" "java" "lang") + ("Object" "java" "lang")) + (("Serializable" "java" "io")) + "version4" + "3.99.0.25") diff --git a/collects/profj/libs/java/lang/ArrayStoreException.jinfo b/collects/profj/libs/java/lang/ArrayStoreException.jinfo new file mode 100644 index 0000000000..7ec53f4e88 --- /dev/null +++ b/collects/profj/libs/java/lang/ArrayStoreException.jinfo @@ -0,0 +1,127 @@ +(class ("ArrayStoreException" "java" "lang") (public) + #t + (("serialVersionUID" + (final static private) + ("ArrayStoreException" "java" "lang") + long)) + (("ArrayStoreException" + (public) + ctor + (("String" "java" "lang")) + () + ("ArrayStoreException" "java" "lang")) + ("ArrayStoreException" + (public) + ctor + () + () + ("ArrayStoreException" "java" "lang")) + ("fillInStackTrace" + (public) + ("Throwable" "java" "lang") + () + () + ("Throwable" "java" "lang")) + ("initCause" + (public) + ("Throwable" "java" "lang") + (("Throwable" "java" "lang")) + () + ("Throwable" "java" "lang")) + ("getCause" + (public) + ("Throwable" "java" "lang") + () + () + ("Throwable" "java" "lang")) + ("getLocalizedMessage" + (public) + ("String" "java" "lang") + () + () + ("Throwable" "java" "lang")) + ("getMessage" + (public) + ("String" "java" "lang") + () + () + ("Throwable" "java" "lang")) + ("getStackTrace" + (public) + (1 ("StackTraceElement" "java" "lang")) + () + () + ("Throwable" "java" "lang")) + ("printStackTrace" (public) void () () ("Throwable" "java" "lang")) + ("printStackTrace" + (public) + void + (("PrintStream" "java" "io")) + () + ("Throwable" "java" "lang")) + ("printStackTrace" + (public) + void + (("PrintWriter" "java" "io")) + () + ("Throwable" "java" "lang")) + ("setStackTrace" + (public) + void + ((1 ("StackTraceElement" "java" "lang"))) + () + ("Throwable" "java" "lang")) + ("clone" + (protected) + ("Object" "java" "lang") + () + (("CloneNotSupportedException" "java" "lang")) + ("Object" "java" "lang")) + ("equals" + (public) + boolean + (("Object" "java" "lang")) + () + ("Object" "java" "lang")) + ("finalize" (protected) void () () ("Object" "java" "lang")) + ("getClass" + (public final) + ("Class" "java" "lang") + () + () + ("Object" "java" "lang")) + ("hashCode" (public) int () () ("Object" "java" "lang")) + ("notify" (public final) void () () ("Object" "java" "lang")) + ("notifyAll" (public final) void () () ("Object" "java" "lang")) + ("toString" + (public) + ("String" "java" "lang") + () + () + ("Object" "java" "lang")) + ("wait" + (public final) + void + () + (("InterruptedException" "java" "lang")) + ("Object" "java" "lang")) + ("wait" + (public final) + void + (long) + (("InterruptedException" "java" "lang")) + ("Object" "java" "lang")) + ("wait" + (public final) + void + (long int) + (("InterruptedException" "java" "lang")) + ("Object" "java" "lang"))) + () + (("RuntimeException" "java" "lang") + ("Exception" "java" "lang") + ("Throwable" "java" "lang") + ("Object" "java" "lang")) + (("Serializable" "java" "io")) + "version4" + "3.99.0.25") diff --git a/collects/profj/libs/java/lang/ClassCastException.jinfo b/collects/profj/libs/java/lang/ClassCastException.jinfo new file mode 100644 index 0000000000..7cbdce4a2e --- /dev/null +++ b/collects/profj/libs/java/lang/ClassCastException.jinfo @@ -0,0 +1,127 @@ +(class ("ClassCastException" "java" "lang") (public) + #t + (("serialVersionUID" + (final static private) + ("ClassCastException" "java" "lang") + long)) + (("ClassCastException" + (public) + ctor + (("String" "java" "lang")) + () + ("ClassCastException" "java" "lang")) + ("ClassCastException" + (public) + ctor + () + () + ("ClassCastException" "java" "lang")) + ("fillInStackTrace" + (public) + ("Throwable" "java" "lang") + () + () + ("Throwable" "java" "lang")) + ("initCause" + (public) + ("Throwable" "java" "lang") + (("Throwable" "java" "lang")) + () + ("Throwable" "java" "lang")) + ("getCause" + (public) + ("Throwable" "java" "lang") + () + () + ("Throwable" "java" "lang")) + ("getLocalizedMessage" + (public) + ("String" "java" "lang") + () + () + ("Throwable" "java" "lang")) + ("getMessage" + (public) + ("String" "java" "lang") + () + () + ("Throwable" "java" "lang")) + ("getStackTrace" + (public) + (1 ("StackTraceElement" "java" "lang")) + () + () + ("Throwable" "java" "lang")) + ("printStackTrace" (public) void () () ("Throwable" "java" "lang")) + ("printStackTrace" + (public) + void + (("PrintStream" "java" "io")) + () + ("Throwable" "java" "lang")) + ("printStackTrace" + (public) + void + (("PrintWriter" "java" "io")) + () + ("Throwable" "java" "lang")) + ("setStackTrace" + (public) + void + ((1 ("StackTraceElement" "java" "lang"))) + () + ("Throwable" "java" "lang")) + ("clone" + (protected) + ("Object" "java" "lang") + () + (("CloneNotSupportedException" "java" "lang")) + ("Object" "java" "lang")) + ("equals" + (public) + boolean + (("Object" "java" "lang")) + () + ("Object" "java" "lang")) + ("finalize" (protected) void () () ("Object" "java" "lang")) + ("getClass" + (public final) + ("Class" "java" "lang") + () + () + ("Object" "java" "lang")) + ("hashCode" (public) int () () ("Object" "java" "lang")) + ("notify" (public final) void () () ("Object" "java" "lang")) + ("notifyAll" (public final) void () () ("Object" "java" "lang")) + ("toString" + (public) + ("String" "java" "lang") + () + () + ("Object" "java" "lang")) + ("wait" + (public final) + void + () + (("InterruptedException" "java" "lang")) + ("Object" "java" "lang")) + ("wait" + (public final) + void + (long) + (("InterruptedException" "java" "lang")) + ("Object" "java" "lang")) + ("wait" + (public final) + void + (long int) + (("InterruptedException" "java" "lang")) + ("Object" "java" "lang"))) + () + (("RuntimeException" "java" "lang") + ("Exception" "java" "lang") + ("Throwable" "java" "lang") + ("Object" "java" "lang")) + (("Serializable" "java" "io")) + "version4" + "3.99.0.25") diff --git a/collects/profj/libs/java/lang/ClassNotFoundException.ss b/collects/profj/libs/java/lang/ClassNotFoundException.ss deleted file mode 100644 index 3fecc0bc24..0000000000 --- a/collects/profj/libs/java/lang/ClassNotFoundException.ss +++ /dev/null @@ -1,9 +0,0 @@ -(module ClassNotFoundException mzscheme - (require "Object-composite.ss") - (provide - ClassNotFoundException - guard-convert-ClassNotFoundException - convert-assert-ClassNotFoundException - wrap-convert-assert-ClassNotFoundException - dynamic-ClassNotFoundException/c - static-ClassNotFoundException/c)) diff --git a/collects/profj/libs/java/lang/CloneNotSupportedException.ss b/collects/profj/libs/java/lang/CloneNotSupportedException.ss deleted file mode 100644 index e0eaf37793..0000000000 --- a/collects/profj/libs/java/lang/CloneNotSupportedException.ss +++ /dev/null @@ -1,9 +0,0 @@ -(module CloneNotSupportedException mzscheme - (require "Object-composite.ss") - (provide - CloneNotSupportedException - guard-convert-CloneNotSupportedException - convert-assert-CloneNotSupportedException - wrap-convert-assert-CloneNotSupportedException - dynamic-CloneNotSupportedException/c - static-CloneNotSupportedException/c)) diff --git a/collects/profj/libs/java/lang/Double-native-methods.ss b/collects/profj/libs/java/lang/Double-native-methods.ss index e947a3aa0d..0049a0d0a5 100644 --- a/collects/profj/libs/java/lang/Double-native-methods.ss +++ b/collects/profj/libs/java/lang/Double-native-methods.ss @@ -3,12 +3,12 @@ (require mzlib/class) (require "Throwable.ss" "String.ss" - "NumberFormatException.ss" "NullPointerException.ss" "RuntimeException.ss") + #;"NumberFormatException.ss" "NullPointerException.ss" "RuntimeException.ss") (provide (all-defined)) - (define (Double-parseDouble-java.lang.String-native s) - (when (null? s) + (define (Double-parseDoubleHelper-java.lang.String-native s) + #;(when (null? s) (raise (create-java-exception NullPointerException "parseDouble expected to receive String, received null value" (lambda (obj msg) @@ -22,10 +22,10 @@ ((equal? scheme-string "-NaN") -nan.0) ((equal? scheme-string "-Infinity") -inf.0) ((equal? scheme-string "+Infinity") +inf.0) - (raise (create-java-exception NumberFormatException + (raise (create-java-exception RuntimeException (format "parseDouble given misformatted string ~a" scheme-string) (lambda (obj msg) - (send obj NumberFormatException-constructor-java.lang.String msg)) + (send obj RuntimeException-constructor-java.lang.String msg)) (current-continuation-marks))))))) (define (Double-doubleToLongBits-double-native num) diff --git a/collects/profj/libs/java/lang/Double.java b/collects/profj/libs/java/lang/Double.java index dcd1d4bafc..758598c1d6 100644 --- a/collects/profj/libs/java/lang/Double.java +++ b/collects/profj/libs/java/lang/Double.java @@ -247,7 +247,18 @@ public final class Double extends Number implements Comparable * @see #NEGATIVE_INFINITY * @since 1.2 */ - public static native double parseDouble(String str); + static native double parseDoubleHelper(String str); + + public static double parseDouble(String str) { + if (null == str) + throw new NullPointerException("parseDouble expected to receive String, received null value"); + try { + return parseDoubleHelper(str); + } + catch (RuntimeException e) { + throw new NumberFormatException(e.getMessage()); + } + } /** * Return true if the double has the same diff --git a/collects/profj/libs/java/lang/Exception.jinfo b/collects/profj/libs/java/lang/Exception.jinfo new file mode 100644 index 0000000000..2692c8b81d --- /dev/null +++ b/collects/profj/libs/java/lang/Exception.jinfo @@ -0,0 +1,131 @@ +(class ("Exception" "java" "lang") (public) + #t + (("serialVersionUID" + (final static private) + ("Exception" "java" "lang") + long)) + (("Exception" + (public) + ctor + (("Throwable" "java" "lang")) + () + ("Exception" "java" "lang")) + ("Exception" + (public) + ctor + (("String" "java" "lang") ("Throwable" "java" "lang")) + () + ("Exception" "java" "lang")) + ("Exception" + (public) + ctor + (("String" "java" "lang")) + () + ("Exception" "java" "lang")) + ("Exception" (public) ctor () () ("Exception" "java" "lang")) + ("fillInStackTrace" + (public) + ("Throwable" "java" "lang") + () + () + ("Throwable" "java" "lang")) + ("initCause" + (public) + ("Throwable" "java" "lang") + (("Throwable" "java" "lang")) + () + ("Throwable" "java" "lang")) + ("getCause" + (public) + ("Throwable" "java" "lang") + () + () + ("Throwable" "java" "lang")) + ("getLocalizedMessage" + (public) + ("String" "java" "lang") + () + () + ("Throwable" "java" "lang")) + ("getMessage" + (public) + ("String" "java" "lang") + () + () + ("Throwable" "java" "lang")) + ("getStackTrace" + (public) + (1 ("StackTraceElement" "java" "lang")) + () + () + ("Throwable" "java" "lang")) + ("printStackTrace" (public) void () () ("Throwable" "java" "lang")) + ("printStackTrace" + (public) + void + (("PrintStream" "java" "io")) + () + ("Throwable" "java" "lang")) + ("printStackTrace" + (public) + void + (("PrintWriter" "java" "io")) + () + ("Throwable" "java" "lang")) + ("setStackTrace" + (public) + void + ((1 ("StackTraceElement" "java" "lang"))) + () + ("Throwable" "java" "lang")) + ("clone" + (protected) + ("Object" "java" "lang") + () + (("CloneNotSupportedException" "java" "lang")) + ("Object" "java" "lang")) + ("equals" + (public) + boolean + (("Object" "java" "lang")) + () + ("Object" "java" "lang")) + ("finalize" (protected) void () () ("Object" "java" "lang")) + ("getClass" + (public final) + ("Class" "java" "lang") + () + () + ("Object" "java" "lang")) + ("hashCode" (public) int () () ("Object" "java" "lang")) + ("notify" (public final) void () () ("Object" "java" "lang")) + ("notifyAll" (public final) void () () ("Object" "java" "lang")) + ("toString" + (public) + ("String" "java" "lang") + () + () + ("Object" "java" "lang")) + ("wait" + (public final) + void + () + (("InterruptedException" "java" "lang")) + ("Object" "java" "lang")) + ("wait" + (public final) + void + (long) + (("InterruptedException" "java" "lang")) + ("Object" "java" "lang")) + ("wait" + (public final) + void + (long int) + (("InterruptedException" "java" "lang")) + ("Object" "java" "lang"))) + () + (("Throwable" "java" "lang") ("Object" "java" "lang")) + (("Serializable" "java" "io")) + "version4" + "3.99.0.25") diff --git a/collects/profj/libs/java/lang/IllegalAccessException.ss b/collects/profj/libs/java/lang/IllegalAccessException.ss deleted file mode 100644 index 1242aa8bb2..0000000000 --- a/collects/profj/libs/java/lang/IllegalAccessException.ss +++ /dev/null @@ -1,9 +0,0 @@ -(module IllegalAccessException mzscheme - (require "Object-composite.ss") - (provide - IllegalAccessException - guard-convert-IllegalAccessException - convert-assert-IllegalAccessException - wrap-convert-assert-IllegalAccessException - dynamic-IllegalAccessException/c - static-IllegalAccessException/c)) diff --git a/collects/profj/libs/java/lang/IllegalArgumentException.ss b/collects/profj/libs/java/lang/IllegalArgumentException.ss deleted file mode 100644 index 16f078c7d7..0000000000 --- a/collects/profj/libs/java/lang/IllegalArgumentException.ss +++ /dev/null @@ -1,9 +0,0 @@ -(module IllegalArgumentException mzscheme - (require "Object-composite.ss") - (provide - IllegalArgumentException - guard-convert-IllegalArgumentException - convert-assert-IllegalArgumentException - wrap-convert-assert-IllegalArgumentException - dynamic-IllegalArgumentException/c - static-IllegalArgumentException/c)) diff --git a/collects/profj/libs/java/lang/IllegalMonitorStateException.ss b/collects/profj/libs/java/lang/IllegalMonitorStateException.ss deleted file mode 100644 index c7832436d4..0000000000 --- a/collects/profj/libs/java/lang/IllegalMonitorStateException.ss +++ /dev/null @@ -1,9 +0,0 @@ -(module IllegalMonitorStateException mzscheme - (require "Object-composite.ss") - (provide - IllegalMonitorStateException - guard-convert-IllegalMonitorStateException - convert-assert-IllegalMonitorStateException - wrap-convert-assert-IllegalMonitorStateException - dynamic-IllegalMonitorStateException/c - static-IllegalMonitorStateException/c)) diff --git a/collects/profj/libs/java/lang/IllegalStateException.ss b/collects/profj/libs/java/lang/IllegalStateException.ss deleted file mode 100644 index ebd0c82763..0000000000 --- a/collects/profj/libs/java/lang/IllegalStateException.ss +++ /dev/null @@ -1,9 +0,0 @@ -(module IllegalStateException mzscheme - (require "Object-composite.ss") - (provide - IllegalStateException - guard-convert-IllegalStateException - convert-assert-IllegalStateException - wrap-convert-assert-IllegalStateException - dynamic-IllegalStateException/c - static-IllegalStateException/c)) diff --git a/collects/profj/libs/java/lang/IllegalThreadStateException.ss b/collects/profj/libs/java/lang/IllegalThreadStateException.ss deleted file mode 100644 index ff9f6757e3..0000000000 --- a/collects/profj/libs/java/lang/IllegalThreadStateException.ss +++ /dev/null @@ -1,9 +0,0 @@ -(module IllegalThreadStateException mzscheme - (require "Object-composite.ss") - (provide - IllegalThreadStateException - guard-convert-IllegalThreadStateException - convert-assert-IllegalThreadStateException - wrap-convert-assert-IllegalThreadStateException - dynamic-IllegalThreadStateException/c - static-IllegalThreadStateException/c)) diff --git a/collects/profj/libs/java/lang/IndexOutOfBoundsException.jinfo b/collects/profj/libs/java/lang/IndexOutOfBoundsException.jinfo new file mode 100644 index 0000000000..b2133a945a --- /dev/null +++ b/collects/profj/libs/java/lang/IndexOutOfBoundsException.jinfo @@ -0,0 +1,127 @@ +(class ("IndexOutOfBoundsException" "java" "lang") (public) + #t + (("serialVersionUID" + (final static private) + ("IndexOutOfBoundsException" "java" "lang") + long)) + (("IndexOutOfBoundsException" + (public) + ctor + (("String" "java" "lang")) + () + ("IndexOutOfBoundsException" "java" "lang")) + ("IndexOutOfBoundsException" + (public) + ctor + () + () + ("IndexOutOfBoundsException" "java" "lang")) + ("fillInStackTrace" + (public) + ("Throwable" "java" "lang") + () + () + ("Throwable" "java" "lang")) + ("initCause" + (public) + ("Throwable" "java" "lang") + (("Throwable" "java" "lang")) + () + ("Throwable" "java" "lang")) + ("getCause" + (public) + ("Throwable" "java" "lang") + () + () + ("Throwable" "java" "lang")) + ("getLocalizedMessage" + (public) + ("String" "java" "lang") + () + () + ("Throwable" "java" "lang")) + ("getMessage" + (public) + ("String" "java" "lang") + () + () + ("Throwable" "java" "lang")) + ("getStackTrace" + (public) + (1 ("StackTraceElement" "java" "lang")) + () + () + ("Throwable" "java" "lang")) + ("printStackTrace" (public) void () () ("Throwable" "java" "lang")) + ("printStackTrace" + (public) + void + (("PrintStream" "java" "io")) + () + ("Throwable" "java" "lang")) + ("printStackTrace" + (public) + void + (("PrintWriter" "java" "io")) + () + ("Throwable" "java" "lang")) + ("setStackTrace" + (public) + void + ((1 ("StackTraceElement" "java" "lang"))) + () + ("Throwable" "java" "lang")) + ("clone" + (protected) + ("Object" "java" "lang") + () + (("CloneNotSupportedException" "java" "lang")) + ("Object" "java" "lang")) + ("equals" + (public) + boolean + (("Object" "java" "lang")) + () + ("Object" "java" "lang")) + ("finalize" (protected) void () () ("Object" "java" "lang")) + ("getClass" + (public final) + ("Class" "java" "lang") + () + () + ("Object" "java" "lang")) + ("hashCode" (public) int () () ("Object" "java" "lang")) + ("notify" (public final) void () () ("Object" "java" "lang")) + ("notifyAll" (public final) void () () ("Object" "java" "lang")) + ("toString" + (public) + ("String" "java" "lang") + () + () + ("Object" "java" "lang")) + ("wait" + (public final) + void + () + (("InterruptedException" "java" "lang")) + ("Object" "java" "lang")) + ("wait" + (public final) + void + (long) + (("InterruptedException" "java" "lang")) + ("Object" "java" "lang")) + ("wait" + (public final) + void + (long int) + (("InterruptedException" "java" "lang")) + ("Object" "java" "lang"))) + () + (("RuntimeException" "java" "lang") + ("Exception" "java" "lang") + ("Throwable" "java" "lang") + ("Object" "java" "lang")) + (("Serializable" "java" "io")) + "version4" + "3.99.0.25") diff --git a/collects/profj/libs/java/lang/InstantiationException.ss b/collects/profj/libs/java/lang/InstantiationException.ss deleted file mode 100644 index 1a982ef4c2..0000000000 --- a/collects/profj/libs/java/lang/InstantiationException.ss +++ /dev/null @@ -1,9 +0,0 @@ -(module InstantiationException mzscheme - (require "Object-composite.ss") - (provide - InstantiationException - guard-convert-InstantiationException - convert-assert-InstantiationException - wrap-convert-assert-InstantiationException - dynamic-InstantiationException/c - static-InstantiationException/c)) diff --git a/collects/profj/libs/java/lang/InterruptedException.ss b/collects/profj/libs/java/lang/InterruptedException.ss deleted file mode 100644 index f6e9204196..0000000000 --- a/collects/profj/libs/java/lang/InterruptedException.ss +++ /dev/null @@ -1,9 +0,0 @@ -(module InterruptedException mzscheme - (require "Object-composite.ss") - (provide - InterruptedException - guard-convert-InterruptedException - convert-assert-InterruptedException - wrap-convert-assert-InterruptedException - dynamic-InterruptedException/c - static-InterruptedException/c)) diff --git a/collects/profj/libs/java/lang/NegativeArraySizeException.jinfo b/collects/profj/libs/java/lang/NegativeArraySizeException.jinfo new file mode 100644 index 0000000000..1f65fa9087 --- /dev/null +++ b/collects/profj/libs/java/lang/NegativeArraySizeException.jinfo @@ -0,0 +1,127 @@ +(class ("NegativeArraySizeException" "java" "lang") (public) + #t + (("serialVersionUID" + (final static private) + ("NegativeArraySizeException" "java" "lang") + long)) + (("NegativeArraySizeException" + (public) + ctor + (("String" "java" "lang")) + () + ("NegativeArraySizeException" "java" "lang")) + ("NegativeArraySizeException" + (public) + ctor + () + () + ("NegativeArraySizeException" "java" "lang")) + ("fillInStackTrace" + (public) + ("Throwable" "java" "lang") + () + () + ("Throwable" "java" "lang")) + ("initCause" + (public) + ("Throwable" "java" "lang") + (("Throwable" "java" "lang")) + () + ("Throwable" "java" "lang")) + ("getCause" + (public) + ("Throwable" "java" "lang") + () + () + ("Throwable" "java" "lang")) + ("getLocalizedMessage" + (public) + ("String" "java" "lang") + () + () + ("Throwable" "java" "lang")) + ("getMessage" + (public) + ("String" "java" "lang") + () + () + ("Throwable" "java" "lang")) + ("getStackTrace" + (public) + (1 ("StackTraceElement" "java" "lang")) + () + () + ("Throwable" "java" "lang")) + ("printStackTrace" (public) void () () ("Throwable" "java" "lang")) + ("printStackTrace" + (public) + void + (("PrintStream" "java" "io")) + () + ("Throwable" "java" "lang")) + ("printStackTrace" + (public) + void + (("PrintWriter" "java" "io")) + () + ("Throwable" "java" "lang")) + ("setStackTrace" + (public) + void + ((1 ("StackTraceElement" "java" "lang"))) + () + ("Throwable" "java" "lang")) + ("clone" + (protected) + ("Object" "java" "lang") + () + (("CloneNotSupportedException" "java" "lang")) + ("Object" "java" "lang")) + ("equals" + (public) + boolean + (("Object" "java" "lang")) + () + ("Object" "java" "lang")) + ("finalize" (protected) void () () ("Object" "java" "lang")) + ("getClass" + (public final) + ("Class" "java" "lang") + () + () + ("Object" "java" "lang")) + ("hashCode" (public) int () () ("Object" "java" "lang")) + ("notify" (public final) void () () ("Object" "java" "lang")) + ("notifyAll" (public final) void () () ("Object" "java" "lang")) + ("toString" + (public) + ("String" "java" "lang") + () + () + ("Object" "java" "lang")) + ("wait" + (public final) + void + () + (("InterruptedException" "java" "lang")) + ("Object" "java" "lang")) + ("wait" + (public final) + void + (long) + (("InterruptedException" "java" "lang")) + ("Object" "java" "lang")) + ("wait" + (public final) + void + (long int) + (("InterruptedException" "java" "lang")) + ("Object" "java" "lang"))) + () + (("RuntimeException" "java" "lang") + ("Exception" "java" "lang") + ("Throwable" "java" "lang") + ("Object" "java" "lang")) + (("Serializable" "java" "io")) + "version4" + "3.99.0.25") diff --git a/collects/profj/libs/java/lang/NoSuchFieldException.ss b/collects/profj/libs/java/lang/NoSuchFieldException.ss deleted file mode 100644 index f2eea6aa80..0000000000 --- a/collects/profj/libs/java/lang/NoSuchFieldException.ss +++ /dev/null @@ -1,9 +0,0 @@ -(module NoSuchFieldException mzscheme - (require "Object-composite.ss") - (provide - NoSuchFieldException - guard-convert-NoSuchFieldException - convert-assert-NoSuchFieldException - wrap-convert-assert-NoSuchFieldException - dynamic-NoSuchFieldException/c - static-NoSuchFieldException/c)) diff --git a/collects/profj/libs/java/lang/NoSuchMethodException.ss b/collects/profj/libs/java/lang/NoSuchMethodException.ss deleted file mode 100644 index 1900ffae63..0000000000 --- a/collects/profj/libs/java/lang/NoSuchMethodException.ss +++ /dev/null @@ -1,9 +0,0 @@ -(module NoSuchMethodException mzscheme - (require "Object-composite.ss") - (provide - NoSuchMethodException - guard-convert-NoSuchMethodException - convert-assert-NoSuchMethodException - wrap-convert-assert-NoSuchMethodException - dynamic-NoSuchMethodException/c - static-NoSuchMethodException/c)) diff --git a/collects/profj/libs/java/lang/NullPointerException.jinfo b/collects/profj/libs/java/lang/NullPointerException.jinfo new file mode 100644 index 0000000000..8959a0bc5d --- /dev/null +++ b/collects/profj/libs/java/lang/NullPointerException.jinfo @@ -0,0 +1,127 @@ +(class ("NullPointerException" "java" "lang") (public) + #t + (("serialVersionUID" + (final static private) + ("NullPointerException" "java" "lang") + long)) + (("NullPointerException" + (public) + ctor + (("String" "java" "lang")) + () + ("NullPointerException" "java" "lang")) + ("NullPointerException" + (public) + ctor + () + () + ("NullPointerException" "java" "lang")) + ("fillInStackTrace" + (public) + ("Throwable" "java" "lang") + () + () + ("Throwable" "java" "lang")) + ("initCause" + (public) + ("Throwable" "java" "lang") + (("Throwable" "java" "lang")) + () + ("Throwable" "java" "lang")) + ("getCause" + (public) + ("Throwable" "java" "lang") + () + () + ("Throwable" "java" "lang")) + ("getLocalizedMessage" + (public) + ("String" "java" "lang") + () + () + ("Throwable" "java" "lang")) + ("getMessage" + (public) + ("String" "java" "lang") + () + () + ("Throwable" "java" "lang")) + ("getStackTrace" + (public) + (1 ("StackTraceElement" "java" "lang")) + () + () + ("Throwable" "java" "lang")) + ("printStackTrace" (public) void () () ("Throwable" "java" "lang")) + ("printStackTrace" + (public) + void + (("PrintStream" "java" "io")) + () + ("Throwable" "java" "lang")) + ("printStackTrace" + (public) + void + (("PrintWriter" "java" "io")) + () + ("Throwable" "java" "lang")) + ("setStackTrace" + (public) + void + ((1 ("StackTraceElement" "java" "lang"))) + () + ("Throwable" "java" "lang")) + ("clone" + (protected) + ("Object" "java" "lang") + () + (("CloneNotSupportedException" "java" "lang")) + ("Object" "java" "lang")) + ("equals" + (public) + boolean + (("Object" "java" "lang")) + () + ("Object" "java" "lang")) + ("finalize" (protected) void () () ("Object" "java" "lang")) + ("getClass" + (public final) + ("Class" "java" "lang") + () + () + ("Object" "java" "lang")) + ("hashCode" (public) int () () ("Object" "java" "lang")) + ("notify" (public final) void () () ("Object" "java" "lang")) + ("notifyAll" (public final) void () () ("Object" "java" "lang")) + ("toString" + (public) + ("String" "java" "lang") + () + () + ("Object" "java" "lang")) + ("wait" + (public final) + void + () + (("InterruptedException" "java" "lang")) + ("Object" "java" "lang")) + ("wait" + (public final) + void + (long) + (("InterruptedException" "java" "lang")) + ("Object" "java" "lang")) + ("wait" + (public final) + void + (long int) + (("InterruptedException" "java" "lang")) + ("Object" "java" "lang"))) + () + (("RuntimeException" "java" "lang") + ("Exception" "java" "lang") + ("Throwable" "java" "lang") + ("Object" "java" "lang")) + (("Serializable" "java" "io")) + "version4" + "3.99.0.25") diff --git a/collects/profj/libs/java/lang/NumberFormatException.ss b/collects/profj/libs/java/lang/NumberFormatException.ss deleted file mode 100644 index 154ecb6b67..0000000000 --- a/collects/profj/libs/java/lang/NumberFormatException.ss +++ /dev/null @@ -1,9 +0,0 @@ -(module NumberFormatException mzscheme - (require "Object-composite.ss") - (provide - NumberFormatException - guard-convert-NumberFormatException - convert-assert-NumberFormatException - wrap-convert-assert-NumberFormatException - dynamic-NumberFormatException/c - static-NumberFormatException/c)) diff --git a/collects/profj/libs/java/lang/Object-composite.ss b/collects/profj/libs/java/lang/Object-composite.ss index 45941f6d5c..413995b2a1 100644 --- a/collects/profj/libs/java/lang/Object-composite.ss +++ b/collects/profj/libs/java/lang/Object-composite.ss @@ -5,10 +5,8 @@ errortrace profj/libs/java/lang/Comparable - profj/libs/java/io/Serializable - #;(lib "Comparable.ss" "profj" "libs" "java" "lang") - #;(lib "Serializable.ss" "profj" "libs" "java" "io")) - (require "compile-lang-syntax.ss") + profj/libs/java/io/Serializable) + #;(require "compile-lang-syntax.ss") (define make-hash-table make-hash) (define hash-table-put! hash-set!) @@ -1190,6 +1188,259 @@ (define (wrap-convert-assert-PrintString . args) (void)) (define (wrap-convert-assert-PrintWriter . args) (void)) - (compile-rest-of-lang (list "Object" "Throwable" "String" "Exception" "RuntimeException" "Comparable")) + #;(compile-rest-of-lang (list "Object" "Throwable" "String" "Exception" "RuntimeException" "Comparable")) + + (provide Exception guard-convert-Exception convert-assert-Exception wrap-convert-assert-Exception + dynamic-Exception/c static-Exception/c) + (define Exception + (class* Throwable () + (super-instantiate ()) + (define/public (Exception-constructor) (send this Throwable-constructor)) + (define/public (Exception-constructor-java.lang.String s) + (send this Throwable-constructor-java.lang.String s)) + (define/public (Exception-constructor-java.lang.string-java.lang.Throwable s cause) + (send this Throwable-constructor-java.lang.String-java.lang.Throwable s cause)) + (define/public (Exception-constructor-java.lang.Throwable cause) + (send this Throwable-constructor-java.lang.Throwable cause)) + (define/override (my-name) "Exception"))) + (define (wrap-convert-assert-Exception obj p n s c) + (make-object convert-assert-Exception obj p n s c)) + (define convert-assert-Exception + (class convert-assert-Throwable + (init w p n s c) + (super-instantiate (w p n s c)))) + (define guard-convert-Exception + (class guard-convert-Throwable + (init w p n s c) + (super-instantiate (w p n s c)))) + (define dynamic-Exception/c + (c:flat-named-contract "Exception" (lambda (c) (is-a? c convert-assert-Exception)))) + (define static-Exception/c + (c:flat-named-contract "Exception" (lambda (c) (is-a? c guard-convert-Exception)))) + + (provide RuntimeException guard-convert-RuntimeException convert-assert-RuntimeException wrap-convert-assert-RuntimeException + dynamic-RuntimeException/c static-RuntimeException/c) + (define RuntimeException + (class* Exception () + (super-instantiate ()) + (define/public (RuntimeException-constructor) (send this Exception-constructor)) + (define/public (RuntimeException-constructor-java.lang.String s) + (send this Exception-constructor-java.lang.String s)) + (define/public (RuntimeException-constructor-java.lang.string-java.lang.Throwable s cause) + (send this Exception-constructor-java.lang.String-java.lang.Throwable s cause)) + (define/public (RuntimeException-constructor-java.lang.Throwable cause) + (send this Exception-constructor-java.lang.Throwable cause)) + (define/override (my-name) "RuntimeException"))) + (define (wrap-convert-assert-RuntimeException obj p n s c) + (make-object convert-assert-RuntimeException obj p n s c)) + (define convert-assert-RuntimeException + (class convert-assert-Exception + (init w p n s c) + (super-instantiate (w p n s c)))) + (define guard-convert-RuntimeException + (class guard-convert-Exception + (init w p n s c) + (super-instantiate (w p n s c)))) + (define dynamic-RuntimeException/c + (c:flat-named-contract "RuntimeException" (lambda (c) (is-a? c convert-assert-RuntimeException)))) + (define static-RuntimeException/c + (c:flat-named-contract "RuntimeException" (lambda (c) (is-a? c guard-convert-RuntimeException)))) + + (provide IndexOutOfBoundsException guard-convert-IndexOutOfBoundsException convert-assert-IndexOutOfBoundsException wrap-convert-assert-IndexOutOfBoundsException + dynamic-IndexOutOfBoundsException/c static-IndexOutOfBoundsException/c) + (define IndexOutOfBoundsException + (class* RuntimeException () + (super-instantiate ()) + (define/public (IndexOutOfBoundsException-constructor) (send this RuntimeException-constructor)) + (define/public (IndexOutOfBoundsException-constructor-java.lang.String s) + (send this RuntimeException-constructor-java.lang.String s)) + (define/public (IndexOutOfBoundsException-constructor-java.lang.string-java.lang.Throwable s cause) + (send this RuntimeException-constructor-java.lang.String-java.lang.Throwable s cause)) + (define/public (IndexOutOfBoundsException-constructor-java.lang.Throwable cause) + (send this RuntimeException-constructor-java.lang.Throwable cause)) + (define/override (my-name) "IndexOutOfBoundsException"))) + (define (wrap-convert-assert-IndexOutOfBoundsException obj p n s c) + (make-object convert-assert-IndexOutOfBoundsException obj p n s c)) + (define convert-assert-IndexOutOfBoundsException + (class convert-assert-RuntimeException + (init w p n s c) + (super-instantiate (w p n s c)))) + (define guard-convert-IndexOutOfBoundsException + (class guard-convert-RuntimeException + (init w p n s c) + (super-instantiate (w p n s c)))) + (define dynamic-IndexOutOfBoundsException/c + (c:flat-named-contract "IndexOutOfBoundsException" (lambda (c) (is-a? c convert-assert-IndexOutOfBoundsException)))) + (define static-IndexOutOfBoundsException/c + (c:flat-named-contract "IndexOutOfBoundsException" (lambda (c) (is-a? c guard-convert-IndexOutOfBoundsException)))) + + (provide ArrayIndexOutOfBoundsException guard-convert-ArrayIndexOutOfBoundsException convert-assert-ArrayIndexOutOfBoundsException wrap-convert-assert-ArrayIndexOutOfBoundsException + dynamic-ArrayIndexOutOfBoundsException/c static-ArrayIndexOutOfBoundsException/c) + (define ArrayIndexOutOfBoundsException + (class* IndexOutOfBoundsException () + (super-instantiate ()) + (define/public (ArrayIndexOutOfBoundsException-constructor) (send this IndexOutOfBoundsException-constructor)) + (define/public (ArrayIndexOutOfBoundsException-constructor-java.lang.String s) + (send this IndexOutOfBoundsException-constructor-java.lang.String s)) + (define/public (ArrayIndexOutOfBoundsException-constructor-java.lang.string-java.lang.Throwable s cause) + (send this IndexOutOfBoundsException-constructor-java.lang.String-java.lang.Throwable s cause)) + (define/public (ArrayIndexOutOfBoundsException-constructor-java.lang.Throwable cause) + (send this IndexOutOfBoundsException-constructor-java.lang.Throwable cause)) + (define/override (my-name) "ArrayIndexOutOfBoundsException"))) + (define (wrap-convert-assert-ArrayIndexOutOfBoundsException obj p n s c) + (make-object convert-assert-ArrayIndexOutOfBoundsException obj p n s c)) + (define convert-assert-ArrayIndexOutOfBoundsException + (class convert-assert-IndexOutOfBoundsException + (init w p n s c) + (super-instantiate (w p n s c)))) + (define guard-convert-ArrayIndexOutOfBoundsException + (class guard-convert-IndexOutOfBoundsException + (init w p n s c) + (super-instantiate (w p n s c)))) + (define dynamic-ArrayIndexOutOfBoundsException/c + (c:flat-named-contract "ArrayIndexOutOfBoundsException" (lambda (c) (is-a? c convert-assert-ArrayIndexOutOfBoundsException)))) + (define static-ArrayIndexOutOfBoundsException/c + (c:flat-named-contract "ArrayIndexOutOfBoundsException" (lambda (c) (is-a? c guard-convert-ArrayIndexOutOfBoundsException)))) + + (provide ArrayStoreException guard-convert-ArrayStoreException convert-assert-ArrayStoreException wrap-convert-assert-ArrayStoreException + dynamic-ArrayStoreException/c static-ArrayStoreException/c) + (define ArrayStoreException + (class* RuntimeException () + (super-instantiate ()) + (define/public (ArrayStoreException-constructor) (send this RuntimeException-constructor)) + (define/public (ArrayStoreException-constructor-java.lang.String s) + (send this RuntimeException-constructor-java.lang.String s)) + (define/public (ArrayStoreException-constructor-java.lang.string-java.lang.Throwable s cause) + (send this RuntimeException-constructor-java.lang.String-java.lang.Throwable s cause)) + (define/public (ArrayStoreException-constructor-java.lang.Throwable cause) + (send this RuntimeException-constructor-java.lang.Throwable cause)) + (define/override (my-name) "ArrayStoreException"))) + (define (wrap-convert-assert-ArrayStoreException obj p n s c) + (make-object convert-assert-ArrayStoreException obj p n s c)) + (define convert-assert-ArrayStoreException + (class convert-assert-RuntimeException + (init w p n s c) + (super-instantiate (w p n s c)))) + (define guard-convert-ArrayStoreException + (class guard-convert-RuntimeException + (init w p n s c) + (super-instantiate (w p n s c)))) + (define dynamic-ArrayStoreException/c + (c:flat-named-contract "ArrayStoreException" (lambda (c) (is-a? c convert-assert-ArrayStoreException)))) + (define static-ArrayStoreException/c + (c:flat-named-contract "ArrayStoreException" (lambda (c) (is-a? c guard-convert-ArrayStoreException)))) + + (provide NegativeArraySizeException guard-convert-NegativeArraySizeException convert-assert-NegativeArraySizeException wrap-convert-assert-NegativeArraySizeException + dynamic-NegativeArraySizeException/c static-NegativeArraySizeException/c) + (define NegativeArraySizeException + (class* RuntimeException () + (super-instantiate ()) + (define/public (NegativeArraySizeException-constructor) (send this RuntimeException-constructor)) + (define/public (NegativeArraySizeException-constructor-java.lang.String s) + (send this RuntimeException-constructor-java.lang.String s)) + (define/public (NegativeArraySizeException-constructor-java.lang.string-java.lang.Throwable s cause) + (send this RuntimeException-constructor-java.lang.String-java.lang.Throwable s cause)) + (define/public (NegativeArraySizeException-constructor-java.lang.Throwable cause) + (send this RuntimeException-constructor-java.lang.Throwable cause)) + (define/override (my-name) "NegativeArraySizeException"))) + (define (wrap-convert-assert-NegativeArraySizeException obj p n s c) + (make-object convert-assert-NegativeArraySizeException obj p n s c)) + (define convert-assert-NegativeArraySizeException + (class convert-assert-RuntimeException + (init w p n s c) + (super-instantiate (w p n s c)))) + (define guard-convert-NegativeArraySizeException + (class guard-convert-RuntimeException + (init w p n s c) + (super-instantiate (w p n s c)))) + (define dynamic-NegativeArraySizeException/c + (c:flat-named-contract "NegativeArraySizeException" (lambda (c) (is-a? c convert-assert-NegativeArraySizeException)))) + (define static-NegativeArraySizeException/c + (c:flat-named-contract "NegativeArraySizeException" (lambda (c) (is-a? c guard-convert-NegativeArraySizeException)))) + + (provide ClassCastException guard-convert-ClassCastException convert-assert-ClassCastException wrap-convert-assert-ClassCastException + dynamic-ClassCastException/c static-ClassCastException/c) + (define ClassCastException + (class* RuntimeException () + (super-instantiate ()) + (define/public (ClassCastException-constructor) (send this RuntimeException-constructor)) + (define/public (ClassCastException-constructor-java.lang.String s) + (send this RuntimeException-constructor-java.lang.String s)) + (define/public (ClassCastException-constructor-java.lang.string-java.lang.Throwable s cause) + (send this RuntimeException-constructor-java.lang.String-java.lang.Throwable s cause)) + (define/public (ClassCastException-constructor-java.lang.Throwable cause) + (send this RuntimeException-constructor-java.lang.Throwable cause)) + (define/override (my-name) "ClassCastException"))) + (define (wrap-convert-assert-ClassCastException obj p n s c) + (make-object convert-assert-ClassCastException obj p n s c)) + (define convert-assert-ClassCastException + (class convert-assert-RuntimeException + (init w p n s c) + (super-instantiate (w p n s c)))) + (define guard-convert-ClassCastException + (class guard-convert-RuntimeException + (init w p n s c) + (super-instantiate (w p n s c)))) + (define dynamic-ClassCastException/c + (c:flat-named-contract "ClassCastException" (lambda (c) (is-a? c convert-assert-ClassCastException)))) + (define static-ClassCastException/c + (c:flat-named-contract "ClassCastException" (lambda (c) (is-a? c guard-convert-ClassCastException)))) + + (provide ArithmeticException guard-convert-ArithmeticException convert-assert-ArithmeticException wrap-convert-assert-ArithmeticException + dynamic-ArithmeticException/c static-ArithmeticException/c) + (define ArithmeticException + (class* RuntimeException () + (super-instantiate ()) + (define/public (ArithmeticException-constructor) (send this RuntimeException-constructor)) + (define/public (ArithmeticException-constructor-java.lang.String s) + (send this RuntimeException-constructor-java.lang.String s)) + (define/public (ArithmeticException-constructor-java.lang.string-java.lang.Throwable s cause) + (send this RuntimeException-constructor-java.lang.String-java.lang.Throwable s cause)) + (define/public (ArithmeticException-constructor-java.lang.Throwable cause) + (send this RuntimeException-constructor-java.lang.Throwable cause)) + (define/override (my-name) "ArithmeticException"))) + (define (wrap-convert-assert-ArithmeticException obj p n s c) + (make-object convert-assert-ArithmeticException obj p n s c)) + (define convert-assert-ArithmeticException + (class convert-assert-RuntimeException + (init w p n s c) + (super-instantiate (w p n s c)))) + (define guard-convert-ArithmeticException + (class guard-convert-RuntimeException + (init w p n s c) + (super-instantiate (w p n s c)))) + (define dynamic-ArithmeticException/c + (c:flat-named-contract "ArithmeticException" (lambda (c) (is-a? c convert-assert-ArithmeticException)))) + (define static-ArithmeticException/c + (c:flat-named-contract "ArithmeticException" (lambda (c) (is-a? c guard-convert-ArithmeticException)))) + + (provide NullPointerException guard-convert-NullPointerException convert-assert-NullPointerException wrap-convert-assert-NullPointerException + dynamic-NullPointerException/c static-NullPointerException/c) + (define NullPointerException + (class* RuntimeException () + (super-instantiate ()) + (define/public (NullPointerException-constructor) (send this RuntimeException-constructor)) + (define/public (NullPointerException-constructor-java.lang.String s) + (send this RuntimeException-constructor-java.lang.String s)) + (define/public (NullPointerException-constructor-java.lang.string-java.lang.Throwable s cause) + (send this RuntimeException-constructor-java.lang.String-java.lang.Throwable s cause)) + (define/public (NullPointerException-constructor-java.lang.Throwable cause) + (send this RuntimeException-constructor-java.lang.Throwable cause)) + (define/override (my-name) "NullPointerException"))) + (define (wrap-convert-assert-NullPointerException obj p n s c) + (make-object convert-assert-NullPointerException obj p n s c)) + (define convert-assert-NullPointerException + (class convert-assert-RuntimeException + (init w p n s c) + (super-instantiate (w p n s c)))) + (define guard-convert-NullPointerException + (class guard-convert-RuntimeException + (init w p n s c) + (super-instantiate (w p n s c)))) + (define dynamic-NullPointerException/c + (c:flat-named-contract "NullPointerException" (lambda (c) (is-a? c convert-assert-NullPointerException)))) + (define static-NullPointerException/c + (c:flat-named-contract "NullPointerException" (lambda (c) (is-a? c guard-convert-NullPointerException)))) + ) diff --git a/collects/profj/libs/java/lang/RuntimeException.jinfo b/collects/profj/libs/java/lang/RuntimeException.jinfo new file mode 100644 index 0000000000..9ea8f3c5c7 --- /dev/null +++ b/collects/profj/libs/java/lang/RuntimeException.jinfo @@ -0,0 +1,133 @@ +(class ("RuntimeException" "java" "lang") (public) + #t + (("serialVersionUID" + (final static private) + ("RuntimeException" "java" "lang") + long)) + (("RuntimeException" + (public) + ctor + (("Throwable" "java" "lang")) + () + ("RuntimeException" "java" "lang")) + ("RuntimeException" + (public) + ctor + (("String" "java" "lang") ("Throwable" "java" "lang")) + () + ("RuntimeException" "java" "lang")) + ("RuntimeException" + (public) + ctor + (("String" "java" "lang")) + () + ("RuntimeException" "java" "lang")) + ("RuntimeException" (public) ctor () () ("RuntimeException" "java" "lang")) + ("fillInStackTrace" + (public) + ("Throwable" "java" "lang") + () + () + ("Throwable" "java" "lang")) + ("initCause" + (public) + ("Throwable" "java" "lang") + (("Throwable" "java" "lang")) + () + ("Throwable" "java" "lang")) + ("getCause" + (public) + ("Throwable" "java" "lang") + () + () + ("Throwable" "java" "lang")) + ("getLocalizedMessage" + (public) + ("String" "java" "lang") + () + () + ("Throwable" "java" "lang")) + ("getMessage" + (public) + ("String" "java" "lang") + () + () + ("Throwable" "java" "lang")) + ("getStackTrace" + (public) + (1 ("StackTraceElement" "java" "lang")) + () + () + ("Throwable" "java" "lang")) + ("printStackTrace" (public) void () () ("Throwable" "java" "lang")) + ("printStackTrace" + (public) + void + (("PrintStream" "java" "io")) + () + ("Throwable" "java" "lang")) + ("printStackTrace" + (public) + void + (("PrintWriter" "java" "io")) + () + ("Throwable" "java" "lang")) + ("setStackTrace" + (public) + void + ((1 ("StackTraceElement" "java" "lang"))) + () + ("Throwable" "java" "lang")) + ("clone" + (protected) + ("Object" "java" "lang") + () + (("CloneNotSupportedException" "java" "lang")) + ("Object" "java" "lang")) + ("equals" + (public) + boolean + (("Object" "java" "lang")) + () + ("Object" "java" "lang")) + ("finalize" (protected) void () () ("Object" "java" "lang")) + ("getClass" + (public final) + ("Class" "java" "lang") + () + () + ("Object" "java" "lang")) + ("hashCode" (public) int () () ("Object" "java" "lang")) + ("notify" (public final) void () () ("Object" "java" "lang")) + ("notifyAll" (public final) void () () ("Object" "java" "lang")) + ("toString" + (public) + ("String" "java" "lang") + () + () + ("Object" "java" "lang")) + ("wait" + (public final) + void + () + (("InterruptedException" "java" "lang")) + ("Object" "java" "lang")) + ("wait" + (public final) + void + (long) + (("InterruptedException" "java" "lang")) + ("Object" "java" "lang")) + ("wait" + (public final) + void + (long int) + (("InterruptedException" "java" "lang")) + ("Object" "java" "lang"))) + () + (("Exception" "java" "lang") + ("Throwable" "java" "lang") + ("Object" "java" "lang")) + (("Serializable" "java" "io")) + "version4" + "3.99.0.25") diff --git a/collects/profj/libs/java/lang/SecurityException.ss b/collects/profj/libs/java/lang/SecurityException.ss deleted file mode 100644 index 55c7817958..0000000000 --- a/collects/profj/libs/java/lang/SecurityException.ss +++ /dev/null @@ -1,9 +0,0 @@ -(module SecurityException mzscheme - (require "Object-composite.ss") - (provide - SecurityException - guard-convert-SecurityException - convert-assert-SecurityException - wrap-convert-assert-SecurityException - dynamic-SecurityException/c - static-SecurityException/c)) diff --git a/collects/profj/libs/java/lang/StringIndexOutOfBoundsException.ss b/collects/profj/libs/java/lang/StringIndexOutOfBoundsException.ss deleted file mode 100644 index 49511c73b3..0000000000 --- a/collects/profj/libs/java/lang/StringIndexOutOfBoundsException.ss +++ /dev/null @@ -1,9 +0,0 @@ -(module StringIndexOutOfBoundsException mzscheme - (require "Object-composite.ss") - (provide - StringIndexOutOfBoundsException - guard-convert-StringIndexOutOfBoundsException - convert-assert-StringIndexOutOfBoundsException - wrap-convert-assert-StringIndexOutOfBoundsException - dynamic-StringIndexOutOfBoundsException/c - static-StringIndexOutOfBoundsException/c)) diff --git a/collects/profj/libs/java/lang/UnsupportedOperationException.ss b/collects/profj/libs/java/lang/UnsupportedOperationException.ss deleted file mode 100644 index 5080aad4dd..0000000000 --- a/collects/profj/libs/java/lang/UnsupportedOperationException.ss +++ /dev/null @@ -1,9 +0,0 @@ -(module UnsupportedOperationException mzscheme - (require "Object-composite.ss") - (provide - UnsupportedOperationException - guard-convert-UnsupportedOperationException - convert-assert-UnsupportedOperationException - wrap-convert-assert-UnsupportedOperationException - dynamic-UnsupportedOperationException/c - static-UnsupportedOperationException/c)) diff --git a/collects/profj/libs/java/lang/compile-lang.ss b/collects/profj/libs/java/lang/compile-lang.ss index f5ee9207f4..8bb6f902fb 100644 --- a/collects/profj/libs/java/lang/compile-lang.ss +++ b/collects/profj/libs/java/lang/compile-lang.ss @@ -1,6 +1,5 @@ -#cs (module compile-lang mzscheme - (require (lib "compile.ss" "profj") + (require profj/compile mzlib/list mzlib/file mzlib/pretty) @@ -99,6 +98,7 @@ #f)) names (map get-provides bodies)))) + (define foo #t) (define (compile-exceptions so) (set-syntax-location so) (let* ((files (filter (lambda (f) (regexp-match "Exception[.]java$" (path->string f))) diff --git a/collects/profj/libs/java/lang/installer.ss b/collects/profj/libs/java/lang/installer.ss index 0299e650cc..2f76c7f471 100644 --- a/collects/profj/libs/java/lang/installer.ss +++ b/collects/profj/libs/java/lang/installer.ss @@ -16,20 +16,33 @@ (build-path java.lang file) #f #f)))]) + ;Exceptions + (javac "ClassNotFoundException.java") + (javac "CloneNotSupportedException.java") + (javac "IllegalAccessException.java") + (javac "IllegalArgumentException.java") + (javac "IllegalMonitorStateException.java") + (javac "IllegalStateException.java") + (javac "IllegalThreadStateException.java") + (javac "InstantiationException.java") + (javac "InterruptedException.java") + (javac "NoSuchFieldException.java") + (javac "NoSuchMethodException.java") + (javac "NumberFormatException.java") + (javac "SecurityException.java") + (javac "StringIndexOutOfBoundsException.java") + (javac "UnsupportedOperationException.java") + + ;Misc (javac "Util.djava") - ;(printf "util~n") (javac "Math.java") - ;(printf "math~n") (javac "System.java") - ;(printf "sys~n") + + ;Wrappers (javac "Number.java") - ;(printf "num~n") (javac "Boolean.java") - ;(printf "boolean ~n") (javac "Character.djava") - ;(printf "character ~n") (javac "Integer.java") - ;(printf "integer~n") (javac "Short.java") (javac "Byte.java") (javac "Long.java") diff --git a/collects/profj/libs/java/runtime.scm b/collects/profj/libs/java/runtime.ss similarity index 100% rename from collects/profj/libs/java/runtime.scm rename to collects/profj/libs/java/runtime.ss diff --git a/collects/profj/pre-installer.ss b/collects/profj/pre-installer.ss index 5e923c53ae..a902873d30 100644 --- a/collects/profj/pre-installer.ss +++ b/collects/profj/pre-installer.ss @@ -1,4 +1,4 @@ -(module pre-installer mzscheme +(module pre-installer scheme/base ;copy-jinfos path (list string) -> void ;Copies the given jinfos into the compiled directory of the given library @@ -23,8 +23,13 @@ (file-or-directory-modify-seconds file-b))) (define (pre-installer plthome) - (copy-jinfos (collection-path "profj" "libs" "java" "lang") '("Object.jinfo" "String.jinfo" "Throwable.jinfo" - "Comparable.jinfo")) + (copy-jinfos (collection-path "profj" "libs" "java" "lang") + '("Object.jinfo" "String.jinfo" "Throwable.jinfo" "Comparable.jinfo" + "Exception.jinfo" "RuntimeException.jinfo" + "IndexOutOfBoundsException.jinfo" "ArrayStoreException.jinfo" "NullPointerException.jinfo" + "ArithmeticException.jinfo" "ClassCastException.jinfo" "NegativeArraySizeException.jinfo" + "ArrayIndexOutOfBoundsException.jinfo" + )) (copy-jinfos (collection-path "profj" "libs" "java" "io") '("Serializable.jinfo"))) (provide pre-installer) ) diff --git a/collects/profj/to-scheme.ss b/collects/profj/to-scheme.ss index f25663e9cc..5150e264ea 100644 --- a/collects/profj/to-scheme.ss +++ b/collects/profj/to-scheme.ss @@ -391,7 +391,8 @@ (values (if (> (length translated-defs) 1) (cons (make-syntax #f `(module ,(module-name) mzscheme (require mzlib/class - (prefix javaRuntime: (lib "runtime.scm" "profj" "libs" "java")) + (prefix javaRuntime: profj/libs/java/runtime) + #;(prefix javaRuntime: (lib "runtime.scm" "profj" "libs" "java")) (prefix c: mzlib/contract) ,@(remove-dup-syntax (translate-require reqs type-recs))) ,@(map car translated-defs)) @@ -403,7 +404,8 @@ "")) mzscheme (require mzlib/class - (prefix javaRuntime: (lib "runtime.scm" "profj" "libs" "java")) + (prefix javaRuntime: profj/libs/java/runtime) + #;(prefix javaRuntime: (lib "runtime.scm" "profj" "libs" "java")) (prefix c: mzlib/contract) ,@(remove-dup-syntax (translate-require (map (lambda (r) (list (def-file (car defs)) r)) diff --git a/collects/profj/tool.ss b/collects/profj/tool.ss index ece201bf2a..0fa8b5322f 100644 --- a/collects/profj/tool.ss +++ b/collects/profj/tool.ss @@ -882,7 +882,9 @@ [(coverage?) java-examples-coverage-graphics%] [(testcase-ext?) java-test-graphics%] [else java-examples-graphics%])) + #;(printf "About to run tests~n") (send test-engine-obj run) + #;(printf "Test methods run~n") (send test-engine-obj setup-display (drscheme:rep:current-rep) e) (send test-engine-obj summarize-results (current-output-port)) (let ([test-objs (send test-engine-obj test-objects)]) @@ -910,6 +912,8 @@ (syntax (require (quote name)))))) (loop mods extras #f)) (else + #;(printf "~a~n" (syntax->datum (car mods))) + (collect-garbage) (let-values (((name syn) (get-module-name (expand (car mods))))) (set! name-to-require name) (syntax-as-top #;(eval (annotate-top (compile syn))) @@ -931,7 +935,7 @@ (namespace-require string-path) (namespace-require class-path) (namespace-require mred-path) - (namespace-require '(prefix javaRuntime: (lib "runtime.scm" "profj" "libs" "java"))) + (namespace-require '(prefix javaRuntime: profj/libs/java/runtime)) (namespace-require '(prefix c: mzlib/contract)) ))))))