not a field access if there are param-tags

Author: fogus

src/jvm/clojure/lang/Compiler.java

@@ -4372,7 +4372,9 @@ static public Expr parse(C context, ISeq form) {
 			Class c = ((StaticFieldExpr) fexpr).c;
 			String name = ((StaticFieldExpr) fexpr).fieldName;
 
-			if (RT.count(args) == 0 && QualifiedMethodExpr.methodsWithName(c, name, QualifiedMethodExpr.MethodKind.STATIC).isEmpty())
+			if (RT.count(args) == 0
+//					&& ((form.first() instanceof Symbol) && (paramTagsOf((Symbol)form.first()) == null))
+					&& QualifiedMethodExpr.methodsWithName(c, name, QualifiedMethodExpr.MethodKind.STATIC).isEmpty())
 				return fexpr;
 			else {
 				Symbol sym = Symbol.intern(c.getName(), name);
@@ -7838,7 +7840,7 @@ private static Expr analyzeSymbol(Symbol sym) {
 			Class c = HostExpr.maybeClass(nsSym, false);
 			if(c != null)
 				{
-				if(Reflector.getField(c, sym.name, true) != null)
+				if((paramTagsOf(sym) == null) && (Reflector.getField(c, sym.name, true) != null))
 					return new StaticFieldExpr(lineDeref(), columnDeref(), c, sym.name, tag);
 				else
 					return new QualifiedMethodExpr(c, sym);

test/clojure/test_clojure/param_tags.clj

@@ -175,8 +175,9 @@
   (is (= "" (clojure.test.SwissArmy/doppelganger))) ;; favor 0-arity call over unwrap static field bug
   (is (= "int-int" (clojure.test.SwissArmy/.doppelganger (clojure.test.SwissArmy/new) (int 1) (int 2))))
   (is (= "int-int" (apply clojure.test.SwissArmy/.doppelganger (clojure.test.SwissArmy/new) (int 1) (int 2) [])))
-  ;; Can't distinguish field vs static method in value position
+  ;; Can't distinguish field vs static method in value position w/o param-tags
   ;; (is (= "int-int-long" (apply clojure.test.SwissArmy/doppelganger (int 1) (int 2) (long 42) [])))
+  (is (= "" (apply ^[] clojure.test.SwissArmy/doppelganger [])))
   (is (= "int-int-long" (clojure.test.SwissArmy/doppelganger (int 1) (int 2) (long 42)))))
 
 (defmacro arg-tags-called-in-macro