Fix all small and medium-sized issues after review

2016-10-06 18:46:46 +02:00
parent 9617fc7d6b
commit c2b5c11781
32 changed files with 195 additions and 312 deletions
@@ -152,10 +152,7 @@ public class ScriptCodegen extends MemberCodegen<KtScript> {
                iv.invokespecial("java/lang/Object", "<init>", "()V", false);
            }
            else {
-                // TODO: check if it is correct way to find a primary constructor
-                Collection<ClassConstructorDescriptor> ctorDescriptors = superclass.getConstructors();
-                assert ctorDescriptors.size() == 1;
-                ConstructorDescriptor ctorDesc = ctorDescriptors.iterator().next();
+                ConstructorDescriptor ctorDesc = superclass.getUnsubstitutedPrimaryConstructor();
                assert ctorDesc != null;

                iv.load(0, classType);