ignore rettags other than long and double

zumbalogy · Aug 5, 2015 · 2344de2 · 2344de2
1 parent b38c23e
commit 2344de2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/clojure.iml b/clojure.iml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager" />
+  <component name="FacetManager">
+    <facet type="Clojure" name="Clojure">
+      <configuration />
+    </facet>
+  </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
@@ -21,5 +25,4 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.clojure:data.generators:0.1.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.clojure:test.check:0.5.9" level="project" />
   </component>
-</module>
-
+</module>
diff --git a/src/jvm/clojure/lang/Compiler.java b/src/jvm/clojure/lang/Compiler.java
@@ -5295,6 +5295,12 @@ static FnMethod parse(ObjExpr objx, ISeq form, Object rettag) {
 				rettag = Symbol.intern(null, (String) rettag);
             if(!(rettag instanceof Symbol))
                 rettag = null;
+            if(rettag != null)
+                {
+                String retstr = ((Symbol)rettag).getName();
+                if(!retstr.equals("long") || !retstr.equals("double"))
+                   rettag = null;
+                }
 			method.retClass = tagClass(tagOf(parms)!=null?tagOf(parms):rettag);
 			if(method.retClass.isPrimitive()){
                 if(!(method.retClass == double.class || method.retClass == long.class))