A few minor fixes to make the recent imported changes work.

boo-lang · Jan 21, 2017 · 00f0b08 · 00f0b08
1 parent 21a1370
commit 00f0b08
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Boo.Lang.Compiler/Steps/EmitAssembly.cs b/src/Boo.Lang.Compiler/Steps/EmitAssembly.cs
@@ -235,10 +235,10 @@ void DefineTypes()
 				DefineType(type);
 
 			foreach (var type in types)
-			{
 				DefineGenericParameters(type);
-				DefineTypeMembers(type);
-			}
+
+            foreach (var type in types)
+                DefineTypeMembers(type);
 
 			foreach (var module in CompileUnit.Modules)
 				OnModule(module);

diff --git a/src/Boo.Lang.Compiler/TypeSystem/Services/BooCodeBuilder.cs b/src/Boo.Lang.Compiler/TypeSystem/Services/BooCodeBuilder.cs
@@ -671,7 +671,7 @@ public Constructor CreateStaticConstructor(TypeDefinition type)
         public MethodInvocationExpression CreateGenericConstructorInvocation(IType classType,
 	        IEnumerable<GenericParameterDeclaration> genericArgs)
 	    {
-	        var args = genericArgs.Select(gpd => new SimpleTypeReference(gpd.Name){Entity = gpd.Entity});
+	        var args = genericArgs.Select(gpd => new SimpleTypeReference(gpd.Name){Entity = gpd.Entity}).Cast<TypeReference>();
             return CreateGenericConstructorInvocation(classType, args);
 	    }