Changeset 11529


Ignore:
Timestamp:
01/03/09 13:17:22 (12 years ago)
Author:
Mark Evenson
Message:

Revert inadvertent r11528.

Location:
trunk/abcl
Files:
14 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/build.properties.in

    r11528 r11529  
    11# build.properties
    22# $Id: build.properties,v 1.23 2007-03-03 19:19:11 piso Exp $
    3 
    4 #additional.jars=${user.home}/work/lsw/lib/bsh-2.0b4.jar:${user.home}/work/lsw/lib/jscheme.jar
    5 #java.options=-Xmx2g
    6 
    7 #abcl.src.version=r14888+possibly-scripting
    8 
    9 
    10 #abcl.build.module=scripting
  • trunk/abcl/nbproject/build-impl.xml

    r11528 r11529  
    6565        </condition>
    6666        <condition property="have.tests">
    67             <or>
    68                 <available file="${test.src.dir}"/>
    69             </or>
     67            <or/>
    7068        </condition>
    7169        <condition property="have.sources">
     
    126124    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
    127125        <fail unless="src.dir">Must set src.dir</fail>
    128         <fail unless="test.src.dir">Must set test.src.dir</fail>
    129126        <fail unless="build.dir">Must set build.dir</fail>
    130127        <fail unless="dist.dir">Must set dist.dir</fail>
     
    200197            <sequential>
    201198                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true">
    202                     <batchtest todir="${build.test.results.dir}">
    203                         <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
    204                             <filename name="@{testincludes}"/>
    205                         </fileset>
    206                     </batchtest>
     199                    <batchtest todir="${build.test.results.dir}"/>
    207200                    <classpath>
    208201                        <path path="${run.test.classpath}"/>
     
    509502    </target>
    510503    <target if="do.depend.true" name="-compile-test-depend">
    511         <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
     504        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir=""/>
    512505    </target>
    513506    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
    514         <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
    515         <copy todir="${build.test.classes.dir}">
    516             <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
    517         </copy>
     507        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir=""/>
     508        <copy todir="${build.test.classes.dir}"/>
    518509    </target>
    519510    <target name="-post-compile-test">
     
    529520        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
    530521        <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
    531         <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}"/>
    532         <copy todir="${build.test.classes.dir}">
    533             <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
    534         </copy>
     522        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" sourcepath="" srcdir=""/>
     523        <copy todir="${build.test.classes.dir}"/>
    535524    </target>
    536525    <target name="-post-compile-test-single">
  • trunk/abcl/nbproject/genfiles.properties

    r11528 r11529  
    44# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
    55# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
    6 nbproject/build-impl.xml.data.CRC32=742204ce
    7 nbproject/build-impl.xml.script.CRC32=b94c76f8
     6nbproject/build-impl.xml.data.CRC32=71623fcd
     7nbproject/build-impl.xml.script.CRC32=7d8238bd
    88nbproject/build-impl.xml.stylesheet.CRC32=e55b27f5
    99nbproject/profiler-build-impl.xml.data.CRC32=71623fcd
  • trunk/abcl/nbproject/project.properties

    r11528 r11529  
    1818dist.jar=${dist.dir}/abcl.jar
    1919dist.javadoc.dir=${dist.dir}/javadoc
    20 excludes=org/armedbear/lisp/scripting/*.java
     20excludes=
    2121file.reference.abcl-src=src
    2222includes=org/armedbear/lisp/**/*.java,org/armedbear/lisp/**/*.lisp
    2323jar.compress=true
    24 javac.classpath=
    2524# Space-separated list of extra javac options
    2625javac.compilerargs=
     
    6766src.doc.dir=doc
    6867src.themes.dir=themes
    69 test.src.dir=test/src
  • trunk/abcl/nbproject/project.xml

    r11528 r11529  
    99                <root id="src.dir"/>
    1010            </source-roots>
    11             <test-roots>
    12                 <root id="test.src.dir" name="test/src"/>
    13             </test-roots>
     11            <test-roots/>
    1412        </data>
    1513    </configuration>
  • trunk/abcl/netbeans-build.xml

    r11528 r11529  
    66     probably fail otherwise.  -->
    77  <import file="nbproject/build-impl.xml"/>
    8   <import file="nbproject/profiler-build-impl.xml" optional="true"/>
    98
    109  <target name="-post-compile">
  • trunk/abcl/src/org/armedbear/lisp/Autoload.java

    r11528 r11529  
    453453        autoload("probe-file", "probe_file");
    454454        autoload("rational", "FloatFunctions");
    455   autoload("read-char-no-hang", "read_char_no_hang");
    456   autoload("read-delimited-list", "read_delimited_list");
    457455        autoload("rem", "rem");
    458456        autoload("remhash", "HashTableFunctions");
     
    516514        autoload(PACKAGE_EXT, "thread-unlock", "ThreadLock", true);
    517515        autoload(PACKAGE_JAVA, "%jnew-proxy", "JProxy");
    518   autoload(PACKAGE_JAVA, "%find-java-class", "JavaClass");
    519   autoload(PACKAGE_JAVA, "%jmake-invocation-handler", "JProxy");
    520   autoload(PACKAGE_JAVA, "%jmake-proxy", "JProxy");
    521516        autoload(PACKAGE_JAVA, "%jnew-runtime-class", "RuntimeClass");
    522517        autoload(PACKAGE_JAVA, "%jredefine-method", "RuntimeClass");
  • trunk/abcl/src/org/armedbear/lisp/Closure.java

    r11528 r11529  
    596596        SpecialBinding lastSpecialBinding = thread.lastSpecialBinding;
    597597        Environment ext = new Environment(environment);
    598   for (Symbol special: specials)
    599     ext.declareSpecial(special);
    600598        bindRequiredParameters(ext, thread, first, second, third, fourth,
    601599                               fifth, sixth, seventh);
  • trunk/abcl/src/org/armedbear/lisp/StandardClass.java

    r11528 r11529  
    124124    addStandardClass(Symbol.BUILT_IN_CLASS, list1(CLASS));
    125125
    126   public static final StandardClass JAVA_CLASS =
    127     addStandardClass(Symbol.JAVA_CLASS, list1(CLASS));
    128 
    129126  public static final StandardClass FORWARD_REFERENCED_CLASS =
    130127    addStandardClass(Symbol.FORWARD_REFERENCED_CLASS, list1(CLASS));
     
    283280                               list1(PACKAGE_CL.intern("ARITHMETIC-ERROR-OPERANDS")))));
    284281    BUILT_IN_CLASS.setCPL(BUILT_IN_CLASS, CLASS, STANDARD_OBJECT,
    285                           BuiltInClass.CLASS_T);
    286     JAVA_CLASS.setCPL(JAVA_CLASS, CLASS, STANDARD_OBJECT,
    287282                          BuiltInClass.CLASS_T);
    288283    CELL_ERROR.setCPL(CELL_ERROR, ERROR, SERIOUS_CONDITION, CONDITION,
  • trunk/abcl/src/org/armedbear/lisp/Symbol.java

    r11528 r11529  
    29012901  public static final Symbol JAVA_OBJECT =
    29022902    PACKAGE_JAVA.addExternalSymbol("JAVA-OBJECT");
    2903   public static final Symbol JAVA_CLASS =
    2904     PACKAGE_JAVA.addExternalSymbol("JAVA-CLASS");
    29052903  public static final Symbol JCALL =
    29062904    PACKAGE_JAVA.addExternalSymbol("JCALL");
  • trunk/abcl/src/org/armedbear/lisp/Version.java

    r11528 r11529  
    4242  public static String getVersion()
    4343  {
    44     return "0.12.25";
     44    return "0.13.0-dev";
    4545  }
    4646}
  • trunk/abcl/src/org/armedbear/lisp/autoloads.lisp

    r11528 r11529  
    202202(export 'jobject-class "JAVA")
    203203(autoload 'jobject-class "java")
    204 (export 'jproperty-value "JAVA")
    205 (autoload 'jproperty-value "java")
    206204(export 'jclass-superclass "JAVA")
    207205(autoload 'jclass-superclass "java")
  • trunk/abcl/src/org/armedbear/lisp/java.lisp

    r11528 r11529  
    7676    (apply #'%jnew-proxy interface method-names-and-defs)))
    7777
    78 (defun jmake-invocation-handler (function)
    79   (%jmake-invocation-handler function))
    80  
    81 (when (autoloadp 'jmake-proxy)
    82   (fmakunbound 'jmake-proxy))
    83  
    84 (defgeneric jmake-proxy (interface implementation &optional lisp-this)
    85    (:documentation "Returns a proxy Java object implementing the
    86    provided interface using methods implemented in Lisp - typically
    87    closures, but implementations are free to provide other
    88    mechanisms. You can pass an optional 'lisp-this' object that will
    89    be passed to the implementing methods as their first argument. If
    90    you don't provide this object, NIL will be used. The second
    91    argument of the Lisp methods is the name of the Java method being
    92    implemented. This has the implication that overloaded methods are
    93    merged, so you have to manually discriminate them if you want
    94    to. The remaining arguments are java-objects wrapping the method's
    95    parameters."))
    96 
    97 (defmethod jmake-proxy (interface invocation-handler &optional lisp-this)
    98   "Basic implementation that directly uses an invocation handler."
    99   (%jmake-proxy (jclass interface) invocation-handler lisp-this))
    100 
    101 (defmethod jmake-proxy (interface (implementation function) &optional lisp-this)
    102    "Implements a Java interface forwarding method calls to a Lisp function."
    103    (%jmake-proxy (jclass interface) (jmake-invocation-handler implementation) lisp-this))
    104 
    105  (defmethod jmake-proxy (interface (implementation package) &optional lisp-this)
    106    "Implements a Java interface mapping Java method names to symbols
    107 in a given package. javaMethodName is mapped to a JAVA-METHOD-NAME
    108 symbol. An error is signaled if no such symbol exists in the package,
    109 or if the symbol exists but does not name a function."
    110 
    111    (flet ((java->lisp (name)
    112       (with-output-to-string (str)
    113         (let ((last-lower-p nil))
    114     (map nil (lambda (char)
    115          (let ((upper-p (char= (char-upcase char) char)))
    116            (when (and last-lower-p upper-p)
    117              (princ "-" str))
    118            (setf last-lower-p (not upper-p))
    119            (princ (char-upcase char) str)))
    120          name)))))
    121      (%jmake-proxy (jclass interface)
    122        (jmake-invocation-handler
    123         (lambda (obj method &rest args)
    124           (let ((sym (find-symbol
    125           (java->lisp method)
    126           implementation)))
    127       (unless sym
    128         (error "Symbol ~A, implementation of method ~A, not found in ~A"
    129          (java->lisp method)
    130          method
    131          implementation))
    132       (if (fboundp sym)
    133           (apply (symbol-function sym) obj method args)
    134           (error "Function ~A, implementation of method ~A, not found in ~A"
    135            sym method implementation)))))
    136        lisp-this)))
    137 
    138 (defmethod jmake-proxy (interface (implementation hash-table) &optional lisp-this)
    139    "Implements a Java interface using closures in an hash-table keyed
    140 by Java method name."
    141    (%jmake-proxy (jclass interface)
    142     (jmake-invocation-handler
    143      (lambda (obj method &rest args)
    144        (let ((fn (gethash method implementation)))
    145          (if fn
    146        (apply fn obj args)
    147        (error "Implementation for method ~A not found in ~A"
    148         method implementation)))))
    149     lisp-this))
    150  
    15178(defun jobject-class (obj)
    15279  "Returns the Java class that OBJ belongs to"
     
    307234
    308235(provide "JAVA-EXTENSIONS")
    309  (defun jproperty-value (obj prop)
    310    (%jget-property-value obj prop))
    311  
    312  (defun (setf jproperty-value) (value obj prop)
    313    (%jset-property-value obj prop value))
    314 
  • trunk/abcl/src/org/armedbear/lisp/print-object.lisp

    r11528 r11529  
    5050    (format stream "~S" (class-name (class-of object))))
    5151  object)
    52 
    53 (defmethod print-object ((class java:java-class) stream)
    54    (write-string (%write-to-string class) stream))
    5552
    5653(defmethod print-object ((class class) stream)
     
    124121  (if *print-escape*
    125122      (print-unreadable-object (e stream :type t :identity t)
    126   (format stream "~A"
    127     (java:jcall (java:jmethod "java.lang.Object" "toString")
    128           (java:java-exception-cause e))))
    129       (format stream "Java exception '~A'."
    130         (java:jcall (java:jmethod "java.lang.Object" "toString")
    131         (java:java-exception-cause e)))))
    132 
    133 (defmethod print-object ((e java:java-exception) stream)
    134   (if *print-escape*
    135       (print-unreadable-object (e stream :type t :identity t)
    136123        (format stream "~A"
    137124                (java:jcall (java:jmethod "java.lang.Object" "toString")
Note: See TracChangeset for help on using the changeset viewer.