Merge branch 'release'

Conflicts:
	src/context.js

src/context.js

@@ -1671,14 +1671,15 @@ exports.RecordDecl = ChainedContext.extend({
         var type = this.__type;
         var baseType = type.baseType();
         var gen = this.codeGenerator();
-        gen.write((baseType ? this.qualifyScope(baseType.scope()) + baseType.name() + ".extend"
-                            : this.rtl().extendId())
-                  + "(");
+        var qualifiedBase = baseType ? this.qualifyScope(baseType.scope()) + baseType.name() : undefined; 
+        gen.write((baseType ? qualifiedBase + ".extend" 
+						    : this.rtl().extendId())
+			   + "(");
         gen.openScope();
         gen.write("init: function " + this.__type.cons() + "()");
         gen.openScope();
         if (baseType)
-            gen.write(baseType.name() + ".prototype.init.call(this);\n");
+            gen.write(qualifiedBase + ".prototype.init.call(this);\n");
         var ownFields = type.ownFields();
         for(var f in ownFields)
             gen.write("this." + f + " = " + ownFields[f].initializer(this) + ";\n");

test/expected/modules.js

@@ -103,7 +103,7 @@ return {
 var m2 = function (m1){
 var T = m1.T.extend({
 	init: function T(){
-		T.prototype.init.call(this);
+		m1.T.prototype.init.call(this);
 		this.i2 = 0;
 	}
 });
@@ -134,7 +134,7 @@ ref(RTL$.makeRef(m1.pr2(), "i"));
 var m3 = function (m1, m2){
 var T = m2.T.extend({
 	init: function T(){
-		T.prototype.init.call(this);
+		m2.T.prototype.init.call(this);
 	}
 });
 var r = new m2.T();

test/input/run/modules.ob

@@ -0,0 +1,12 @@
+MODULE m1;
+TYPE T1* = RECORD END;
+END m1.
+
+MODULE m2;
+IMPORT m1;
+TYPE T2* = RECORD(m1.T1) END;
+
+VAR v: T2;
+
+BEGIN
+END m2.