Merge branch 'clojure/master' into android

Author: alexander-yakushev

build.xml

@@ -11,7 +11,8 @@
   <property name="jtestsrc" location="${test}/java"/>
   <property name="cljsrc" location="${src}/clj"/>
   <property name="cljscript" location="${src}/script"/>
-  <property name="test-script" location="${cljscript}/run_tests.clj"/>
+  <property name="test-script" location="${cljscript}/run_test.clj"/>
+  <property name="test-generative-script" location="${cljscript}/run_test_generative.clj"/>
   <property name="compile-script" location="${cljscript}/bootstrap_compile.clj"/>
   <property name="target" location="target"/>
   <property name="build" location="${target}/classes"/>
@@ -98,7 +99,7 @@
     </java>
   </target>
 
-  <target name="test"
+  <target name="test-example"
           description="Run clojure tests without recompiling clojure."
           depends="compile-tests"
           unless="maven.test.skip">
@@ -114,6 +115,26 @@
     </java>
   </target>
 
+  <target name="test-generative"
+          description="Run test generative tests without recompiling clojure."
+          depends="compile-tests"
+          unless="maven.test.skip">
+    <java classname="clojure.main" failonerror="true" fork="true">
+      <classpath>
+        <pathelement path="${maven.test.classpath}"/>
+        <path location="${test-classes}"/>
+        <path location="${test}"/>
+        <path location="${build}"/>
+	<path location="${cljsrc}"/>
+      </classpath>
+      <arg value="${test-generative-script}"/>
+    </java>
+  </target>
+
+  <target name="test"
+          description="Run all the tests"
+          depends="test-example,test-generative"/>
+
   <target name="build"
           description="Build Clojure (compilation only, no tests)."
           depends="compile-java, compile-clojure"/>

changes.md

@@ -61,6 +61,8 @@ Some related issues addressed during development:
 * [CLJ-1497](http://dev.clojure.org/jira/browse/CLJ-1497)
 * [CLJ-1549](http://dev.clojure.org/jira/browse/CLJ-1549)
 * [CLJ-1537](http://dev.clojure.org/jira/browse/CLJ-1537)
+* [CLJ-1554](http://dev.clojure.org/jira/browse/CLJ-1554)
+
 
 ### 1.2 Keyword and Symbol Construction
 
@@ -148,6 +150,8 @@ Example use:
   clojure.core/set should use transients for better performance
 * [CLJ-1429](http://dev.clojure.org/jira/browse/CLJ-1429)
   Cache unknown multimethod value default dispatch
+* [CLJ-1529](http://dev.clojure.org/jira/browse/CLJ-1529)
+  Reduce compile times by avoiding unnecessary calls to Class.forName()
 
 ### 2.4 Other enhancements
 
@@ -163,6 +167,8 @@ Example use:
   Don't initialize classes when importing them
 * [CLJ-1330](http://dev.clojure.org/jira/browse/CLJ-1330)
   Class name clash between top-level functions and defn'ed ones
+* [CLJ-1349](http://dev.clojure.org/jira/browse/CLJ-1349)
+  Update to latest test.generative and add dependency on test.check
 
 ## 3 Bug Fixes
 
@@ -188,6 +194,10 @@ Example use:
   Make cached string value of Keyword and Symbol transient
 * [CLJ-1466](http://dev.clojure.org/jira/browse/CLJ-1466)
   clojure.core/bean should implement Iterable
+* [CLJ-1578](http://dev.clojure.org/jira/browse/CLJ-1578)
+  Make refer of Clojure core function not throw exception on reload
+* [CLJ-1501](http://dev.clojure.org/jira/browse/CLJ-1501)
+  LazySeq equals() should not use equiv() logic
 
 # Changes to Clojure in Version 1.6
 

pom.xml

@@ -47,7 +47,19 @@
     <dependency>
       <groupId>org.clojure</groupId>
       <artifactId>test.generative</artifactId>
-      <version>0.4.0</version>
+      <version>0.5.1</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.clojure</groupId>
+          <artifactId>clojure</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.clojure</groupId>
+      <artifactId>test.check</artifactId>
+      <version>0.5.9</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>

src/jvm/clojure/lang/Compiler.java

@@ -1003,6 +1003,8 @@ private static Class maybeClass(Object form, boolean stringOk) {
 					Object o = currentNS().getMapping(sym);
 					if(o instanceof Class)
 						c = (Class) o;
+					else if(LOCAL_ENV.deref() != null && ((java.util.Map)LOCAL_ENV.deref()).containsKey(form))
+						return null;
 					else
 						{
 						try{
@@ -1044,7 +1046,7 @@ else if(stringOk && form instanceof String)
 	 }
  */
 	static Class tagToClass(Object tag) {
-		Class c = maybeClass(tag, true);
+		Class c = null;
 		if(tag instanceof Symbol)
 			{
 			Symbol sym = (Symbol) tag;
@@ -1086,6 +1088,8 @@ else if(sym.name.equals("boolean"))
 					c = Boolean.TYPE;
 				}
 			}
+		if(c == null)
+		    c = maybeClass(tag, true);
 		if(c != null)
 			return c;
 		throw new IllegalArgumentException("Unable to resolve classname: " + tag);
@@ -3849,10 +3853,7 @@ static Expr parse(C context, ISeq form, String name) {
 
 		if(RT.second(form) instanceof Symbol) {
 			nm = (Symbol) RT.second(form);
-			if (name == null)
-				name = nm.name + "__" + RT.nextID();
-			else
-				name += "__" + nm.name + "__" + RT.nextID();
+			name = nm.name + "__" + RT.nextID();
 		} else {
 			if(name == null)
 				name = "fn__" + RT.nextID();

src/jvm/clojure/lang/LazySeq.java

@@ -97,7 +97,11 @@ public IPersistentCollection empty(){
 }
 
 public boolean equiv(Object o){
-	return equals(o);
+	ISeq s = seq();
+	if(s != null)
+		return s.equiv(o);
+	else
+		return (o instanceof Sequential || o instanceof List) && RT.seq(o) == null;
 }
 
 public int hashCode(){
@@ -114,7 +118,7 @@ public int hasheq(){
 public boolean equals(Object o){
 	ISeq s = seq();
 	if(s != null)
-		return s.equiv(o);
+		return s.equals(o);
 	else
 		return (o instanceof Sequential || o instanceof List) && RT.seq(o) == null;
 }

src/jvm/clojure/lang/Namespace.java

@@ -82,7 +82,7 @@ private void warnOrFailOnReplace(Symbol sym, Object o, Object v){
     if (o instanceof Var)
         {
         Namespace ns = ((Var)o).ns;
-        if (ns == this)
+        if (ns == this || (v instanceof Var && ((Var)v).ns  == RT.CLOJURE_NS))
             return;
         if (ns != RT.CLOJURE_NS)
             throw new IllegalStateException(sym + " already refers to: " + o + " in namespace: " + name);

src/script/run_test.clj

@@ -0,0 +1,8 @@
+(System/setProperty "java.awt.headless" "true")
+(require
+ '[clojure.test :as test]
+ '[clojure.tools.namespace :as ns])
+(def namespaces (ns/find-namespaces-in-dir (java.io.File. "test")))
+(doseq [ns namespaces] (require ns))
+(let [summary (apply test/run-tests namespaces)]
+  (System/exit (if (test/successful? summary) 0 -1)))

src/script/run_tests.clj renamed to src/script/run_test_generative.clj

@@ -1,4 +1,5 @@
-(System/setProperty "clojure.test.generative.msec" "60000")
 (System/setProperty "java.awt.headless" "true")
+(when-not (System/getProperty "clojure.test.generative.msec")
+  (System/setProperty "clojure.test.generative.msec" "60000"))
 (require '[clojure.test.generative.runner :as runner])
 (runner/-main "test")

test/clojure/test_clojure/sequences.clj

@@ -98,6 +98,8 @@
       (lazy-seq [])
       (lazy-seq [1 2]))
 
+  (is (not (.equals (lazy-seq [3]) (lazy-seq [3N]))))
+
   (are [x y] (= x y)
       (lazy-seq nil) ()
       (lazy-seq [nil]) '(nil)
@@ -109,6 +111,7 @@
       (lazy-seq "") ()
       (lazy-seq (into-array [])) ()
 
+      (lazy-seq [3]) [3N]
       (lazy-seq (list 1 2)) '(1 2)
       (lazy-seq [1 2]) '(1 2)
       (lazy-seq (sorted-set 1 2)) '(1 2)
@@ -120,6 +123,7 @@
 (deftest test-seq
   (is (not (seq? (seq []))))
   (is (seq? (seq [1 2])))
+  (is (not (.equals (seq [3]) (seq [3N]))))
 
   (are [x y] (= x y)
     (seq nil) nil
@@ -132,6 +136,7 @@
     (seq "") nil
     (seq (into-array [])) nil
 
+    (seq [3]) [3N]
     (seq (list 1 2)) '(1 2)
     (seq [1 2]) '(1 2)
     (seq (sorted-set 1 2)) '(1 2)