Changeset 11529

Timestamp:

01/03/09 13:17:22 (15 years ago)

Author:

Mark Evenson

Message:

Revert inadvertent r11528.

Location:

trunk/abcl

Files:

• build.properties.in (modified) (1 diff)
• nbproject/build-impl.xml (modified) (5 diffs)
• nbproject/genfiles.properties (modified) (1 diff)
• nbproject/project.properties (modified) (2 diffs)
• nbproject/project.xml (modified) (1 diff)
• netbeans-build.xml (modified) (1 diff)
• src/org/armedbear/lisp/Autoload.java (modified) (2 diffs)
• src/org/armedbear/lisp/Closure.java (modified) (1 diff)
• src/org/armedbear/lisp/StandardClass.java (modified) (2 diffs)
• src/org/armedbear/lisp/Symbol.java (modified) (1 diff)
• src/org/armedbear/lisp/Version.java (modified) (1 diff)
• src/org/armedbear/lisp/autoloads.lisp (modified) (1 diff)
• src/org/armedbear/lisp/java.lisp (modified) (2 diffs)
• src/org/armedbear/lisp/print-object.lisp (modified) (2 diffs)

trunk/abcl/build.properties.in

@@ -1 +1 @@
 # build.properties
 # $Id: build.properties,v 1.23 2007-03-03 19:19:11 piso Exp $
-
-#additional.jars=${user.home}/work/lsw/lib/bsh-2.0b4.jar:${user.home}/work/lsw/lib/jscheme.jar
-#java.options=-Xmx2g
-
-#abcl.src.version=r14888+possibly-scripting
-
-
-#abcl.build.module=scripting

trunk/abcl/nbproject/build-impl.xml

@@ -65 +65 @@
         </condition>
         <condition property="have.tests">
-            <or>
-                <available file="${test.src.dir}"/>
-            </or>
+            <or/>
         </condition>
         <condition property="have.sources">
@@ -126 +124 @@
     <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
         <fail unless="src.dir">Must set src.dir</fail>
-        <fail unless="test.src.dir">Must set test.src.dir</fail>
         <fail unless="build.dir">Must set build.dir</fail>
         <fail unless="dist.dir">Must set dist.dir</fail>
@@ -200 +197 @@
             <sequential>
                 <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true">
-                    <batchtest todir="${build.test.results.dir}">
-                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
-                            <filename name="@{testincludes}"/>
-                        </fileset>
-                    </batchtest>
+                    <batchtest todir="${build.test.results.dir}"/>
                     <classpath>
                         <path path="${run.test.classpath}"/>
@@ -509 +502 @@
     </target>
     <target if="do.depend.true" name="-compile-test-depend">
-        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
+        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir=""/>
     </target>
     <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
-        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
-        <copy todir="${build.test.classes.dir}">
-            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-        </copy>
+        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir=""/>
+        <copy todir="${build.test.classes.dir}"/>
     </target>
     <target name="-post-compile-test">
@@ -529 +520 @@
         <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
         <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
-        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>
-        <copy todir="${build.test.classes.dir}">
-            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-        </copy>
+        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" sourcepath="" srcdir=""/>
+        <copy todir="${build.test.classes.dir}"/>
     </target>
     <target name="-post-compile-test-single">

trunk/abcl/nbproject/genfiles.properties

@@ -4 +4 @@
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=742204ce
-nbproject/build-impl.xml.script.CRC32=b94c76f8
+nbproject/build-impl.xml.data.CRC32=71623fcd
+nbproject/build-impl.xml.script.CRC32=7d8238bd
 nbproject/build-impl.xml.stylesheet.CRC32=e55b27f5
 nbproject/profiler-build-impl.xml.data.CRC32=71623fcd

trunk/abcl/nbproject/project.properties

@@ -18 +18 @@
 dist.jar=${dist.dir}/abcl.jar
 dist.javadoc.dir=${dist.dir}/javadoc
-excludes=org/armedbear/lisp/scripting/*.java
+excludes=
 file.reference.abcl-src=src
 includes=org/armedbear/lisp/**/*.java,org/armedbear/lisp/**/*.lisp
 jar.compress=true
-javac.classpath=
 # Space-separated list of extra javac options
 javac.compilerargs=
@@ -67 +66 @@
 src.doc.dir=doc
 src.themes.dir=themes
-test.src.dir=test/src

trunk/abcl/nbproject/project.xml

@@ -9 +9 @@
                 <root id="src.dir"/>
             </source-roots>
-            <test-roots>
-                <root id="test.src.dir" name="test/src"/>
-            </test-roots>
+            <test-roots/>
         </data>
     </configuration>

trunk/abcl/netbeans-build.xml

@@ -6 +6 @@
      probably fail otherwise.  -->
   <import file="nbproject/build-impl.xml"/>
-  <import file="nbproject/profiler-build-impl.xml" optional="true"/>
 
   <target name="-post-compile">

trunk/abcl/src/org/armedbear/lisp/Autoload.java

@@ -453 +453 @@
         autoload("probe-file", "probe_file");
         autoload("rational", "FloatFunctions");
-  autoload("read-char-no-hang", "read_char_no_hang");
-  autoload("read-delimited-list", "read_delimited_list");
         autoload("rem", "rem");
         autoload("remhash", "HashTableFunctions");
@@ -516 +514 @@
         autoload(PACKAGE_EXT, "thread-unlock", "ThreadLock", true);
         autoload(PACKAGE_JAVA, "%jnew-proxy", "JProxy");
-  autoload(PACKAGE_JAVA, "%find-java-class", "JavaClass");
-  autoload(PACKAGE_JAVA, "%jmake-invocation-handler", "JProxy");
-  autoload(PACKAGE_JAVA, "%jmake-proxy", "JProxy");
         autoload(PACKAGE_JAVA, "%jnew-runtime-class", "RuntimeClass");
         autoload(PACKAGE_JAVA, "%jredefine-method", "RuntimeClass");

trunk/abcl/src/org/armedbear/lisp/Closure.java

@@ -596 +596 @@
         SpecialBinding lastSpecialBinding = thread.lastSpecialBinding;
         Environment ext = new Environment(environment);
-  for (Symbol special: specials)
-    ext.declareSpecial(special);
         bindRequiredParameters(ext, thread, first, second, third, fourth,
                                fifth, sixth, seventh);

trunk/abcl/src/org/armedbear/lisp/StandardClass.java

@@ -124 +124 @@
     addStandardClass(Symbol.BUILT_IN_CLASS, list1(CLASS));
 
-  public static final StandardClass JAVA_CLASS =
-    addStandardClass(Symbol.JAVA_CLASS, list1(CLASS));
-
   public static final StandardClass FORWARD_REFERENCED_CLASS =
     addStandardClass(Symbol.FORWARD_REFERENCED_CLASS, list1(CLASS));
@@ -283 +280 @@
                                list1(PACKAGE_CL.intern("ARITHMETIC-ERROR-OPERANDS")))));
     BUILT_IN_CLASS.setCPL(BUILT_IN_CLASS, CLASS, STANDARD_OBJECT,
-                          BuiltInClass.CLASS_T);
-    JAVA_CLASS.setCPL(JAVA_CLASS, CLASS, STANDARD_OBJECT,
                           BuiltInClass.CLASS_T);
     CELL_ERROR.setCPL(CELL_ERROR, ERROR, SERIOUS_CONDITION, CONDITION,

trunk/abcl/src/org/armedbear/lisp/Symbol.java

@@ -2901 +2901 @@
   public static final Symbol JAVA_OBJECT =
     PACKAGE_JAVA.addExternalSymbol("JAVA-OBJECT");
-  public static final Symbol JAVA_CLASS =
-    PACKAGE_JAVA.addExternalSymbol("JAVA-CLASS");
   public static final Symbol JCALL =
     PACKAGE_JAVA.addExternalSymbol("JCALL");

trunk/abcl/src/org/armedbear/lisp/Version.java

@@ -42 +42 @@
   public static String getVersion()
   {
-    return "0.12.25";
+    return "0.13.0-dev";
   }
 }

trunk/abcl/src/org/armedbear/lisp/autoloads.lisp

@@ -202 +202 @@
 (export 'jobject-class "JAVA")
 (autoload 'jobject-class "java")
-(export 'jproperty-value "JAVA")
-(autoload 'jproperty-value "java")
 (export 'jclass-superclass "JAVA")
 (autoload 'jclass-superclass "java")

trunk/abcl/src/org/armedbear/lisp/java.lisp

@@ -76 +76 @@
     (apply #'%jnew-proxy interface method-names-and-defs)))
 
-(defun jmake-invocation-handler (function)
-  (%jmake-invocation-handler function))
- 
-(when (autoloadp 'jmake-proxy)
-  (fmakunbound 'jmake-proxy))
- 
-(defgeneric jmake-proxy (interface implementation &optional lisp-this)
-   (:documentation "Returns a proxy Java object implementing the
-   provided interface using methods implemented in Lisp - typically
-   closures, but implementations are free to provide other
-   mechanisms. You can pass an optional 'lisp-this' object that will
-   be passed to the implementing methods as their first argument. If
-   you don't provide this object, NIL will be used. The second
-   argument of the Lisp methods is the name of the Java method being
-   implemented. This has the implication that overloaded methods are
-   merged, so you have to manually discriminate them if you want
-   to. The remaining arguments are java-objects wrapping the method's
-   parameters."))
-
-(defmethod jmake-proxy (interface invocation-handler &optional lisp-this)
-  "Basic implementation that directly uses an invocation handler."
-  (%jmake-proxy (jclass interface) invocation-handler lisp-this))
-
-(defmethod jmake-proxy (interface (implementation function) &optional lisp-this)
-   "Implements a Java interface forwarding method calls to a Lisp function."
-   (%jmake-proxy (jclass interface) (jmake-invocation-handler implementation) lisp-this))
-
- (defmethod jmake-proxy (interface (implementation package) &optional lisp-this)
-   "Implements a Java interface mapping Java method names to symbols
-in a given package. javaMethodName is mapped to a JAVA-METHOD-NAME
-symbol. An error is signaled if no such symbol exists in the package,
-or if the symbol exists but does not name a function."
-
-   (flet ((java->lisp (name)
-      (with-output-to-string (str)
-        (let ((last-lower-p nil))
-    (map nil (lambda (char)
-         (let ((upper-p (char= (char-upcase char) char)))
-           (when (and last-lower-p upper-p)
-             (princ "-" str))
-           (setf last-lower-p (not upper-p))
-           (princ (char-upcase char) str)))
-         name)))))
-     (%jmake-proxy (jclass interface)
-       (jmake-invocation-handler 
-        (lambda (obj method &rest args)
-          (let ((sym (find-symbol
-          (java->lisp method)
-          implementation)))
-      (unless sym
-        (error "Symbol ~A, implementation of method ~A, not found in ~A"
-         (java->lisp method)
-         method
-         implementation))
-      (if (fboundp sym)
-          (apply (symbol-function sym) obj method args)
-          (error "Function ~A, implementation of method ~A, not found in ~A"
-           sym method implementation)))))
-       lisp-this)))
-
-(defmethod jmake-proxy (interface (implementation hash-table) &optional lisp-this)
-   "Implements a Java interface using closures in an hash-table keyed
-by Java method name."
-   (%jmake-proxy (jclass interface)
-    (jmake-invocation-handler 
-     (lambda (obj method &rest args)
-       (let ((fn (gethash method implementation)))
-         (if fn
-       (apply fn obj args)
-       (error "Implementation for method ~A not found in ~A"
-        method implementation)))))
-    lisp-this))
- 
 (defun jobject-class (obj)
   "Returns the Java class that OBJ belongs to"
@@ -307 +234 @@
 
 (provide "JAVA-EXTENSIONS")
- (defun jproperty-value (obj prop)
-   (%jget-property-value obj prop))
- 
- (defun (setf jproperty-value) (value obj prop)
-   (%jset-property-value obj prop value))
-

trunk/abcl/src/org/armedbear/lisp/print-object.lisp

@@ -50 +50 @@
     (format stream "~S" (class-name (class-of object))))
   object)
-
-(defmethod print-object ((class java:java-class) stream)
-   (write-string (%write-to-string class) stream))
 
 (defmethod print-object ((class class) stream)
@@ -124 +121 @@
   (if *print-escape*
       (print-unreadable-object (e stream :type t :identity t)
-  (format stream "~A"
-    (java:jcall (java:jmethod "java.lang.Object" "toString")
-          (java:java-exception-cause e))))
-      (format stream "Java exception '~A'."
-        (java:jcall (java:jmethod "java.lang.Object" "toString")
-        (java:java-exception-cause e)))))
-
-(defmethod print-object ((e java:java-exception) stream)
-  (if *print-escape*
-      (print-unreadable-object (e stream :type t :identity t)
         (format stream "~A"
                 (java:jcall (java:jmethod "java.lang.Object" "toString")