fix #435: reflecting generic constructors from F# quotation

dotnet-websharper · Jun 24, 2015 · 06b8354 · 06b8354
1 parent 2cdac41
commit 06b8354
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/src/compiler/WebSharper.Compiler/ReflectionLayer.fs b/src/compiler/WebSharper.Compiler/ReflectionLayer.fs
@@ -450,6 +450,11 @@ module QuotationUtils =
             for t in ts ->
                 CR.Type.FromType(t)
         ]
+//
+//    let generalize (m: MethodInfo) =
+//        if m.IsGenericMethod && not m.IsGenericMethodDefinition then
+//            m.GetGenericMethodDefinition()
+//        else m
 
     let getProperTypeGenerics (t: System.Type) =
         if t.IsGenericType || t.IsGenericTypeDefinition then
@@ -458,7 +463,7 @@ module QuotationUtils =
         else []
 
     let getProperMethodGenerics (m: MethodBase) =
-        if m.IsGenericMethod|| m.IsGenericMethodDefinition then
+        if m.IsGenericMethod || m.IsGenericMethodDefinition then
             m.GetGenericArguments()
             |> convertTypes
         else []
@@ -493,9 +498,7 @@ module QuotationUtils =
         else p
 
     let ConvertConstructor (c: ConstructorInfo) : Q.Concrete<CR.Constructor> =
-        let tD = CR.TypeDefinition.FromType c.DeclaringType
-        makeSignature (c.GetParameters())
-        |> CR.Constructor.Create tD
+        CR.Constructor.Parse c
         |> makeConcrete c.DeclaringType []
 
     let ConvertMethod (m: MethodInfo) : Q.Concrete<CR.Method> =

diff --git a/src/compiler/WebSharper.Core/Reflection.fs b/src/compiler/WebSharper.Core/Reflection.fs
@@ -513,6 +513,12 @@ type Constructor =
 
     static member Create dT s = Constructor (dT, s)
 
+    static member Parse(m: System.Reflection.ConstructorInfo) =
+        let m = m.Module.ResolveMethod m.MetadataToken :?> System.Reflection.ConstructorInfo
+        let s = [for p in m.GetParameters() -> Type.FromType p.ParameterType]
+        let d = TypeDefinition.FromType m.DeclaringType
+        Constructor.Create d s
+
     override this.ToString() =
         System.String.Format(".ctor(..) [{0}]", this.DeclaringType)
 

diff --git a/src/compiler/WebSharper.Core/Reflection.fsi b/src/compiler/WebSharper.Core/Reflection.fsi
@@ -196,6 +196,9 @@ type Constructor =
     /// Updates the declaring type.
     member WithDeclaringType : TypeDefinition -> Constructor
 
+    /// Parses the constructor.
+    static member Parse : System.Reflection.ConstructorInfo -> Constructor
+
     /// Constructs a new Constructor with an explicit signature.
     static member Create : TypeDefinition -> Signature -> Constructor