Two small patches

[Matthieu Vachon <matthieu.o.vachon@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 318 bytes --]

Hi Per,

Here attached two patches:

# Patch fix-non-java-invoke.patch
Fix a small code syntax problem when not using feature
java.lang.invoke in ApplyExp.java.

# Patch fix-ant-build.patch
Fix ant compilation of lib-scm-classes. Some classes were missing from
the list resulting in compilation errors.

Regards,
Matt

[-- Attachment #2: fix-non-java-invoke.patch --]
[-- Type: application/octet-stream, Size: 587 bytes --]

Index: gnu/expr/ApplyExp.java
===================================================================
--- gnu/expr/ApplyExp.java	(revision 7945)
+++ gnu/expr/ApplyExp.java	 (working copy)
@@ -783,7 +783,7 @@ public class ApplyExp extends Expression
     // private static final Class[] compilerMethodType =
     //     new Class[] { gnu.expr.ApplyExp.class,
     //                   gnu.expr.Compilation.class,
-    //                   gnu.expr.Target.class, };
+    //                   gnu.expr.Target.class,
     //                   gnu.mapping.Procedure.class };
     /* #endif */
 }

[-- Attachment #3: fix-ant-build.patch --]
[-- Type: application/octet-stream, Size: 1067 bytes --]

Index: build.xml
===================================================================
--- build.xml	(revision 7945)
+++ build.xml	 (working copy)
@@ -522,6 +522,8 @@
         <file name="reflection.scm"/>
         <file name="syntax.scm"/>
         <file name="lists.scm"/>
+        <file name="ExceptionClasses.scm"/>
+        <file name="exceptions.scm"/>
         <file name="thread.scm"/>
         <file name="characters.scm"/>
         <file name="keywords.scm"/>
@@ -537,6 +539,7 @@
         <file name="bytevectors.scm"/>
         <file name="arrays.scm"/>
         <file name="system.scm"/>
+        <file name="kawa/expressions.scm"/>
         <file name="kawa/hashtable.scm"/>
         <file name="kawa/regex.scm"/>
         <file name="rnrs/hashtables.scm"/>
@@ -546,6 +549,7 @@
         <file name="rnrs/sorting.scm"/>
         <file name="rnrs/programs.scm"/>
         <file name="trace.scm"/>
+        <file name="compile_misc.scm"/>
       </filelist>
       <fileset dir="${src.dir}/kawa/lib">
         <include name="windows.scm" if="${with-swing}"/>