Bug fixes for QualifiedMethodExpr work -- we now compile all Clojure source

Author: dmiller

Clojure/Clojure/CljCompiler/Ast/InstanceMethodExpr.cs

@@ -52,7 +52,7 @@ public InstanceMethodExpr(
                 throw new ArgumentException(String.Format("Attempt to call instance method {0} on nil", methodName));
 
             if (_qualifyingType != null)
-                _method = Reflector.GetMatchingMethod(spanMap, _qualifyingType, _args, _methodName, _typeArgs);
+                _method = Reflector.GetMatchingMethod(spanMap, _qualifyingType, _args, _methodName, _typeArgs, false);
             else
             {
                 _method = null;

Clojure/Clojure/CljCompiler/Ast/InvokeExpr.cs

@@ -213,16 +213,18 @@ public static Expr Parse(ParserContext pcon, ISeq form)
             if (fexpr is StaticFieldExpr)
                 return fexpr;
 
-            IPersistentVector args = PersistentVector.EMPTY;
-            for ( ISeq s = RT.seq(form.next()); s != null; s = s.next())
-                args = args.cons(Compiler.Analyze(pcon,s.first()));
 
             if (fexpr is QualifiedMethodExpr qmfexpr)
                 return ToHostExpr(pcon,
                     qmfexpr,
                     Compiler.TagOf(form),
                     tailPosition,
-                    args);
+                    form.next());
+
+
+            IPersistentVector args = PersistentVector.EMPTY;
+            for (ISeq s = RT.seq(form.next()); s != null; s = s.next())
+                args = args.cons(Compiler.Analyze(pcon, s.first()));
 
             //if (args.count() > Compiler.MAX_POSITIONAL_ARITY)
             //    throw new ArgumentException(String.Format("No more than {0} args supported", Compiler.MAX_POSITIONAL_ARITY));
@@ -235,7 +237,7 @@ public static Expr Parse(ParserContext pcon, ISeq form)
                 tailPosition);
         }
 
-        static Expr ToHostExpr(ParserContext pcon, QualifiedMethodExpr qmfexpr, Symbol tag, bool tailPosition, IPersistentVector args)
+        static Expr ToHostExpr(ParserContext pcon, QualifiedMethodExpr qmfexpr, Symbol tag, bool tailPosition, ISeq args)
         {
             if (qmfexpr.HintedSig != null )
             {
@@ -246,7 +248,7 @@ static Expr ToHostExpr(ParserContext pcon, QualifiedMethodExpr qmfexpr, Symbol t
                         return new NewExpr(
                             qmfexpr.MethodType, 
                             (ConstructorInfo)method, 
-                            HostExpr.ParseArgs(pcon, RT.seq(args)), 
+                            HostExpr.ParseArgs(pcon, args), 
                             (IPersistentMap)Compiler.SourceSpanVar.deref());
 
                     case QualifiedMethodExpr.EMethodKind.INSTANCE:
@@ -271,7 +273,7 @@ static Expr ToHostExpr(ParserContext pcon, QualifiedMethodExpr qmfexpr, Symbol t
                              Compiler.munge(qmfexpr.MethodName), 
                              (MethodInfo)method, 
                              null,
-                             HostExpr.ParseArgs(pcon, RT.seq(args)),
+                             HostExpr.ParseArgs(pcon,args),
                              tailPosition);
                 }
             }
@@ -282,7 +284,7 @@ static Expr ToHostExpr(ParserContext pcon, QualifiedMethodExpr qmfexpr, Symbol t
                     case QualifiedMethodExpr.EMethodKind.CTOR:
                         return new NewExpr(
                             qmfexpr.MethodType, 
-                            HostExpr.ParseArgs(pcon, RT.seq(args)), 
+                            HostExpr.ParseArgs(pcon, args), 
                             (IPersistentMap)Compiler.SourceSpanVar.deref());
 
                     case QualifiedMethodExpr.EMethodKind.INSTANCE:
@@ -305,7 +307,7 @@ static Expr ToHostExpr(ParserContext pcon, QualifiedMethodExpr qmfexpr, Symbol t
                             qmfexpr.MethodType,
                             Compiler.munge(qmfexpr.MethodName),
                             null,
-                            HostExpr.ParseArgs(pcon, RT.seq(args)),
+                            HostExpr.ParseArgs(pcon, args),
                             tailPosition);
                 }
             }

Clojure/Clojure/CljCompiler/Ast/MethodExpr.cs

@@ -276,7 +276,7 @@ private void EmitComplexCall(ObjExpr objx, CljILGen ilg)
                         break;
 
                     case HostArg.ParameterType.Standard:
-                        if (argType.IsPrimitive && ha.ArgExpr is MaybePrimitiveExpr mpe)
+                        if (argType.IsPrimitive && ha.ArgExpr is MaybePrimitiveExpr mpe && mpe.CanEmitPrimitive)
                         {
                             mpe.EmitUnboxed(RHC.Expression, objx, ilg);
                         }

Clojure/Clojure/CljCompiler/Ast/StaticMethodExpr.cs

@@ -39,7 +39,7 @@ public StaticMethodExpr(string source, IPersistentMap spanMap, Symbol tag, Type
             : base(source,spanMap,tag,methodName,typeArgs, args, tailPosition)
         {
             _type = type;
-            _method  = Reflector.GetMatchingMethod(spanMap, _type, _args, _methodName, typeArgs);
+            _method  = Reflector.GetMatchingMethod(spanMap, _type, _args, _methodName, typeArgs,true);
             if ( _method != null && warnOnBoxedKeyword.Equals(RT.UncheckedMathVar.deref()) && IsBoxedMath(_method))
             {
                 RT.errPrintWriter().WriteLine("Boxed math warning, {0}:{1}:{2} - call {3}.",

Clojure/Clojure/Runtime/Reflector.cs

@@ -146,11 +146,11 @@ public static object GetInstanceFieldOrProperty(object target, string fieldName)
         /// <param name="methodName"></param>
         /// <param name="typeArgs"></param>
         /// <returns></returns>
-        public static MethodInfo GetMatchingMethod(IPersistentMap spanMap, Type targetType, IList<HostArg> args, string methodName, IList<Type> typeArgs)
+        public static MethodInfo GetMatchingMethod(IPersistentMap spanMap, Type targetType, IList<HostArg> args, string methodName, IList<Type> typeArgs, bool getStatics)
         {
-            IList<MethodBase> methods = GetMethods(targetType, methodName, typeArgs, args.Count, true);
+            IList<MethodBase> methods = GetMethods(targetType, methodName, typeArgs, args.Count, getStatics);
 
-            MethodBase method = GetMatchingMethodAux(targetType, args, methods, methodName, true);
+            MethodBase method = GetMatchingMethodAux(targetType, args, methods, methodName, getStatics);
             MaybeReflectionWarn(spanMap, targetType, true, methods.Count > 0,  method, methodName, args);
             return (MethodInfo)method;
         }