Updated to rev. 672 (= rel. 20080213).

diff --git a/patches/args-and-require.diff b/patches/args-and-require.diff
index d4de70e..ca1c4fd 100644 (file)
--- a/patches/args-and-require.diff
+++ b/patches/args-and-require.diff
@@ -1,6 +1,6 @@
 Index: src/jvm/clojure/lang/Compiler.java
 ===================================================================
---- src/jvm/clojure/lang/Compiler.java (revision 664)
+--- src/jvm/clojure/lang/Compiler.java (revision 672)
 +++ src/jvm/clojure/lang/Compiler.java (working copy)
 @@ -28,9 +28,12 @@
  //*/
@@ -46,7 +46,7 @@ Index: src/jvm/clojure/lang/Compiler.java
  static public Var LOCAL_ENV = Var.create(null);
 Index: src/jvm/clojure/lang/Repl.java
 ===================================================================
---- src/jvm/clojure/lang/Repl.java     (revision 664)
+--- src/jvm/clojure/lang/Repl.java     (revision 672)
 +++ src/jvm/clojure/lang/Repl.java     (working copy)
 @@ -14,6 +14,7 @@
  
@@ -105,9 +105,9 @@ Index: src/jvm/clojure/lang/Repl.java
                w.write("Clojure\n");
 Index: src/jvm/clojure/lang/RT.java
 ===================================================================
---- src/jvm/clojure/lang/RT.java       (revision 664)
+--- src/jvm/clojure/lang/RT.java       (revision 672)
 +++ src/jvm/clojure/lang/RT.java       (working copy)
-@@ -116,6 +116,7 @@
+@@ -117,6 +117,7 @@
  //                                                    Module.findOrCreateModule("clojure/user"));
  
  final static Symbol LOAD_FILE = Symbol.create("load-file");
@@ -115,7 +115,7 @@ Index: src/jvm/clojure/lang/RT.java
  final static Symbol IN_NAMESPACE = Symbol.create("in-ns");
  final static Symbol EXPORTS = Symbol.create("*exports*");
  final static Var EXPORTS_VAR = Var.intern(CLOJURE_NS, EXPORTS, PersistentHashMap.EMPTY);
-@@ -185,6 +186,13 @@
+@@ -186,6 +187,13 @@
                                   return Compiler.loadFile((String) arg1);
                           }
                   });
@@ -129,7 +129,7 @@ Index: src/jvm/clojure/lang/RT.java
        Var.intern(CLOJURE_NS, IDENTICAL,
                   new AFn(){
                           public Object invoke(Object arg1, Object arg2)
-@@ -209,6 +217,7 @@
+@@ -210,6 +218,7 @@
  //            chars[i] = new Character((char) i);
  //    }
  
@@ -139,7 +139,7 @@ Index: src/jvm/clojure/lang/RT.java
        try
 Index: src/jvm/clojure/lang/Script.java
 ===================================================================
---- src/jvm/clojure/lang/Script.java   (revision 664)
+--- src/jvm/clojure/lang/Script.java   (revision 672)
 +++ src/jvm/clojure/lang/Script.java   (working copy)
 @@ -14,6 +14,7 @@
  

diff --git a/patches/args.diff b/patches/args.diff
index 7996f6b..6c0c5bb 100644 (file)
--- a/patches/args.diff
+++ b/patches/args.diff
@@ -1,6 +1,6 @@
 Index: src/jvm/clojure/lang/Repl.java
 ===================================================================
---- src/jvm/clojure/lang/Repl.java     (revision 664)
+--- src/jvm/clojure/lang/Repl.java     (revision 672)
 +++ src/jvm/clojure/lang/Repl.java     (working copy)
 @@ -14,6 +14,7 @@
  
@@ -57,9 +57,9 @@ Index: src/jvm/clojure/lang/Repl.java
                w.write("Clojure\n");
 Index: src/jvm/clojure/lang/RT.java
 ===================================================================
---- src/jvm/clojure/lang/RT.java       (revision 664)
+--- src/jvm/clojure/lang/RT.java       (revision 672)
 +++ src/jvm/clojure/lang/RT.java       (working copy)
-@@ -209,6 +209,7 @@
+@@ -210,6 +210,7 @@
  //            chars[i] = new Character((char) i);
  //    }
  
@@ -69,7 +69,7 @@ Index: src/jvm/clojure/lang/RT.java
        try
 Index: src/jvm/clojure/lang/Script.java
 ===================================================================
---- src/jvm/clojure/lang/Script.java   (revision 664)
+--- src/jvm/clojure/lang/Script.java   (revision 672)
 +++ src/jvm/clojure/lang/Script.java   (working copy)
 @@ -14,6 +14,7 @@
  

diff --git a/patches/num.diff b/patches/num.diff
index b700dcc..c0841e7 100644 (file)
--- a/patches/num.diff
+++ b/patches/num.diff
@@ -1,6 +1,6 @@
 Index: src/jvm/clojure/lang/LispReader.java
 ===================================================================
---- src/jvm/clojure/lang/LispReader.java       (revision 664)
+--- src/jvm/clojure/lang/LispReader.java       (revision 672)
 +++ src/jvm/clojure/lang/LispReader.java       (working copy)
 @@ -37,8 +37,8 @@
  static IFn[] dispatchMacros = new IFn[256];\r
@@ -13,7 +13,7 @@ Index: src/jvm/clojure/lang/LispReader.java
  static Pattern floatPat = Pattern.compile("[-+]?[0-9]+(\\.[0-9]+)?([eE][-+]?[0-9]+)?");\r
  static final Symbol SLASH = Symbol.create("/");\r
  //static Pattern accessorPat = Pattern.compile("\\.[a-zA-Z_]\\w*");\r
-@@ -227,8 +227,13 @@
+@@ -229,8 +229,13 @@
  \r
  private static Object matchNumber(String s){\r
        Matcher m = intPat.matcher(s);\r
@@ -29,7 +29,7 @@ Index: src/jvm/clojure/lang/LispReader.java
        m = floatPat.matcher(s);\r
        if(m.matches())\r
                return Num.from(Double.parseDouble(s));\r
-@@ -234,8 +239,17 @@
+@@ -236,8 +241,17 @@
                return Num.from(Double.parseDouble(s));\r
        m = ratioPat.matcher(s);\r
        if(m.matches())\r

diff --git a/patches/require.diff b/patches/require.diff
index 30d14a4..5b645eb 100644 (file)
--- a/patches/require.diff
+++ b/patches/require.diff
@@ -1,6 +1,6 @@
 Index: src/jvm/clojure/lang/Compiler.java
 ===================================================================
---- src/jvm/clojure/lang/Compiler.java (revision 664)
+--- src/jvm/clojure/lang/Compiler.java (revision 672)
 +++ src/jvm/clojure/lang/Compiler.java (working copy)
 @@ -28,9 +28,12 @@
  //*/
@@ -46,9 +46,9 @@ Index: src/jvm/clojure/lang/Compiler.java
  static public Var LOCAL_ENV = Var.create(null);
 Index: src/jvm/clojure/lang/RT.java
 ===================================================================
---- src/jvm/clojure/lang/RT.java       (revision 664)
+--- src/jvm/clojure/lang/RT.java       (revision 672)
 +++ src/jvm/clojure/lang/RT.java       (working copy)
-@@ -116,6 +116,7 @@
+@@ -117,6 +117,7 @@
  //                                                    Module.findOrCreateModule("clojure/user"));
  
  final static Symbol LOAD_FILE = Symbol.create("load-file");
@@ -56,7 +56,7 @@ Index: src/jvm/clojure/lang/RT.java
  final static Symbol IN_NAMESPACE = Symbol.create("in-ns");
  final static Symbol EXPORTS = Symbol.create("*exports*");
  final static Var EXPORTS_VAR = Var.intern(CLOJURE_NS, EXPORTS, PersistentHashMap.EMPTY);
-@@ -185,6 +186,13 @@
+@@ -186,6 +187,13 @@
                                   return Compiler.loadFile((String) arg1);
                           }
                   });

diff --git a/vim/clojure.vim b/vim/clojure.vim
index 8733000..34290f0 100644 (file)
--- a/vim/clojure.vim
+++ b/vim/clojure.vim
@@ -23,7 +23,7 @@ syn match clojureNumber "\<-\?[0-9]\+\>"
 syn match clojureRational "\<-\?[0-9]\+/[0-9]\+\>"
 syn match clojureFloat "\<-\?[0-9]\+\.[0-9]\+\([eE][-+]\=[0-9]\+\)\=\>"
 
-syn keyword clojureSyntax fn fn* if def let let* new recur loop do quote the-var identical? throw set! monitor-enter monitor-exit try catch finally
+syn keyword clojureSyntax fn fn* if def let let* new recur loop do quote the-var identical? throw set! monitor-enter monitor-exit try catch finally in-ns
 syn match clojureSyntax "(\s*\(\.\|\.\.\)[^\.]"hs=s+1
 
 syn region clojureDef matchgroup=clojureSyntax start="(\s*\(def \|defn \|defstruct \|defmacro \|defmulti \|defmethod \)\s*"hs=s+1 end="\ze[\[('":){]" contains=ALLBUT,clojureFunc
@@ -62,7 +62,7 @@ highlight link clojureBoolean Constant
 
 if exists("g:clj_highlight_builtins")
     "Highlight Clojure's predefined functions"
-    syn keyword clojureFunc list cons conj defn instance? vector hash-map sorted-map sorted-map-by defmacro when when-not meta with-meta nil? false? true? not first rest second ffirst rfirst frest rrest = not= str symbol keyword gensym cond seq spread apply list* delay fnseq lazy-cons concat and or reduce reverse + * / - < <= > >= == max min inc dec pos? neg? zero? quot rem bit-shift-left bit-shift-right bit-and bit-or bit-xor bit-not complement constantly identity count peek pop nth contains? get assoc dissoc find select keys vals key val rseq name namespace andfn orfn locking .. -> defmulti defmethod remove-method binding find-var agent agent-of ! agent-errors clear-agent-errors ref deref commute alter set ensure sync comp partial every? not-every? some not-any? map mapcat filter take take-while drop drop-while cycle split-at split-with repeat replicate iterate range merge merge-with zipmap line-seq comparator sort sort-by eval defimports doseq scan touch await await-for dotimes import into-array into array make-proxy implement pr newline prn print println read with-open doto memfn time int long float double short byte char boolean alength aget aset def-aset make-array to-array to-array-2d pmap macroexpand-1 macroexpand create-struct defstruct struct-map struct accessor subvec load resultset-seq to-set distinct filter-key find-ns create-ns remove-ns all-ns ns-name ns-map ns-unmap ns-publics ns-imports refer ns-refers ns-interns take-nth interleave var-get var-set with-local-vars ns-resolve resolve array-map nthrest string? symbol? map? seq? vector? when-first lazy-cat for bean comment prstr assert test
+    syn keyword clojureFunc list cons conj defn instance? vector hash-map sorted-map sorted-map-by defmacro when when-not meta with-meta nil? false? true? not first rest second ffirst rfirst frest rrest = not= str symbol keyword gensym cond seq spread apply list* delay fnseq lazy-cons concat and or reduce reverse + * / - < <= > >= == max min inc dec pos? neg? zero? quot rem bit-shift-left bit-shift-right bit-and bit-or bit-xor bit-not complement constantly identity count peek pop nth contains? get assoc dissoc find select keys vals key val rseq name namespace andfn orfn locking .. -> defmulti defmethod remove-method binding find-var agent agent-of ! agent-errors clear-agent-errors ref deref commute alter set ensure sync comp partial every? not-every? some not-any? map mapcat filter take take-while drop drop-while cycle split-at split-with repeat replicate iterate range merge merge-with zipmap line-seq comparator sort sort-by eval defimports doseq scan touch await await-for dotimes import into-array into array make-proxy implement pr newline prn print println read with-open doto memfn time int long float double short byte char boolean alength aget aset def-aset make-array to-array to-array-2d pmap macroexpand-1 macroexpand create-struct defstruct struct-map struct accessor subvec load resultset-seq to-set distinct filter-key find-ns create-ns remove-ns all-ns ns-name ns-map ns-unmap ns-publics ns-imports refer ns-refers ns-interns take-nth interleave var-get var-set with-local-vars ns-resolve resolve array-map nthrest string? symbol? map? seq? vector? when-first lazy-cat for bean comment with-out-str pr-str prn-str print-str println-str assert test re-groups re-seq re-matches re-find
     highlight link clojureFunc Special
 endif