fix mixin field init, implicit-this

also slight change to sunflower example

[email protected]

Review URL: https://chromereviews.googleplex.com/144247014

Author: John Messerly

lib/runtime/dart_runtime.js

@@ -89,26 +89,28 @@ var dart;
   dart.dbinary = dbinary;
 
   function as(obj, type) {
-    if (obj == null || is(obj, type)) return obj;
-    throw new dart_core.CastError();
+    // TODO(vsm): Implement.
+    // if (obj == null || is(obj, type)) return obj;
+    // throw new core.CastError();
+    return obj;
   }
   dart.as = as;
 
   function is(obj, type) {
     // TODO(vsm): Implement.
-    throw new dart_core.UnimplementedError();
+    throw new core.UnimplementedError();
   }
   dart.is = is;
 
   function isGroundType(type) {
     // TODO(vsm): Implement.
-    throw new dart_core.UnimplementedError();
+    throw new core.UnimplementedError();
   }
   dart.isGroundType = isGroundType;
 
   function arity(f) {
     // TODO(vsm): Implement.
-    throw new dart_core.UnimplementedError();
+    throw new core.UnimplementedError();
   }
   dart.arity = arity;
 
@@ -189,17 +191,21 @@ var dart;
    * superclass (prototype).
    */
   function mixin(base/*, ...mixins*/) {
-    // Inherit statics from Base to simulate ES6 class inheritance
-    // Conceptually this is: `class Mixin extends base {}`
+    // Build the mixin constructor. This runs the superclass as well as each
+    // of the mixins' constructors.
+    var mixins = Array.prototype.slice.call(arguments, 1);
     function Mixin() {
       base.apply(this, arguments);
+      // Run mixin constructors. They cannot have arguments.
+      for (var i = 0; i< mixins.length; i++) mixins[i].call(this);
     }
+    // Inherit statics from Base to simulate ES6 class inheritance
+    // Conceptually this is: `class Mixin extends base {}`
     Mixin.__proto__ = base;
     Mixin.prototype = Object.create(base.prototype);
     // Copy each mixin, with later ones overwriting earlier entries.
-    for (var i = 1; i < arguments.length; i++) {
-      var from = arguments[i];
-      copyProperties(Mixin.prototype, from.prototype);
+    for (var i = 0; i< mixins.length; i++) {
+      copyProperties(Mixin.prototype, mixins[i].prototype);
     }
     return Mixin;
   }
@@ -258,7 +264,7 @@ var dart;
   dart.defineNamedConstructor = defineNamedConstructor;
 
   function stackTrace(exception) {
-    throw new dart_core.UnimplementedError();
+    throw new core.UnimplementedError();
   }
   dart.stackTrace = stackTrace;
 

lib/src/codegen/js_codegen.dart

@@ -645,8 +645,7 @@ $name.prototype[Symbol.iterator] = function() {
     if (e.enclosingElement is CompilationUnitElement &&
         (e.library != libraryInfo.library || _needsModuleGetter(e))) {
       out.write('${_jsLibraryName(e.library)}.');
-    } else if (currentClass != null &&
-        e.enclosingElement == currentClass.element) {
+    } else if (currentClass != null) {
       if (e is PropertyAccessorElement && !e.variable.isStatic ||
           e is ClassMemberElement && !e.isStatic && e is! ConstructorElement) {
         out.write('this.');

test/codegen/expect/DeltaBlue/DeltaBlue.js

@@ -80,23 +80,23 @@ var DeltaBlue;
       this.myOutput = myOutput;
       this.satisfied = false;
       super(strength);
-      addConstraint();
+      this.addConstraint();
     }
     addToGraph() {
       this.myOutput.addConstraint(this);
       this.satisfied = false;
     }
     chooseMethod(mark) {
-      this.satisfied = (this.myOutput.mark !== mark) && Strength.stronger(strength, this.myOutput.walkStrength);
+      this.satisfied = (this.myOutput.mark !== mark) && Strength.stronger(this.strength, this.myOutput.walkStrength);
     }
     isSatisfied() { return this.satisfied; }
     markInputs(mark) {
     }
     output() { return this.myOutput; }
     recalculate() {
-      this.myOutput.walkStrength = strength;
-      this.myOutput.stay = !isInput();
-      if (this.myOutput.stay) execute();
+      this.myOutput.walkStrength = this.strength;
+      this.myOutput.stay = !this.isInput();
+      if (this.myOutput.stay) this.execute();
     }
     markUnsatisfied() {
       this.satisfied = false;
@@ -134,19 +134,19 @@ var DeltaBlue;
       this.v2 = v2;
       this.direction = NONE;
       super(strength);
-      addConstraint();
+      this.addConstraint();
     }
     chooseMethod(mark) {
       if (this.v1.mark === mark) {
-        this.direction = (this.v2.mark !== mark && Strength.stronger(strength, this.v2.walkStrength)) ? FORWARD : NONE;
+        this.direction = (this.v2.mark !== mark && Strength.stronger(this.strength, this.v2.walkStrength)) ? FORWARD : NONE;
       }
       if (this.v2.mark === mark) {
-        this.direction = (this.v1.mark !== mark && Strength.stronger(strength, this.v1.walkStrength)) ? BACKWARD : NONE;
+        this.direction = (this.v1.mark !== mark && Strength.stronger(this.strength, this.v1.walkStrength)) ? BACKWARD : NONE;
       }
       if (Strength.weaker(this.v1.walkStrength, this.v2.walkStrength)) {
-        this.direction = Strength.stronger(strength, this.v1.walkStrength) ? BACKWARD : NONE;
+        this.direction = Strength.stronger(this.strength, this.v1.walkStrength) ? BACKWARD : NONE;
       } else {
-        this.direction = Strength.stronger(strength, this.v2.walkStrength) ? FORWARD : BACKWARD;
+        this.direction = Strength.stronger(this.strength, this.v2.walkStrength) ? FORWARD : BACKWARD;
       }
     }
     addToGraph() {
@@ -162,9 +162,9 @@ var DeltaBlue;
     output() { return this.direction === FORWARD ? this.v2 : this.v1; }
     recalculate() {
       let ihn = this.input(), out = this.output();
-      out.walkStrength = Strength.weakest(strength, ihn.walkStrength);
+      out.walkStrength = Strength.weakest(this.strength, ihn.walkStrength);
       out.stay = ihn.stay;
-      if (out.stay) execute();
+      if (out.stay) this.execute();
     }
     markUnsatisfied() {
       this.direction = NONE;
@@ -201,15 +201,15 @@ var DeltaBlue;
       this.scale.mark = this.offset.mark = mark;
     }
     execute() {
-      if (direction === FORWARD) {
-        v2.value = v1.value * this.scale.value + this.offset.value;
+      if (this.direction === FORWARD) {
+        this.v2.value = this.v1.value * this.scale.value + this.offset.value;
       } else {
-        v1.value = ((v2.value - this.offset.value) / this.scale.value).truncate();
+        this.v1.value = ((this.v2.value - this.offset.value) / this.scale.value).truncate();
       }
     }
     recalculate() {
-      let ihn = input(), out = output();
-      out.walkStrength = Strength.weakest(strength, ihn.walkStrength);
+      let ihn = this.input(), out = this.output();
+      out.walkStrength = Strength.weakest(this.strength, ihn.walkStrength);
       out.stay = ihn.stay && this.scale.stay && this.offset.stay;
       if (out.stay) this.execute();
     }
@@ -220,7 +220,7 @@ var DeltaBlue;
       super(v1, v2, strength);
     }
     execute() {
-      output().value = input().value;
+      this.output().value = this.input().value;
     }
   }
 

test/codegen/expect/_internal/_internal.js

@@ -434,8 +434,8 @@ var _internal;
       super._(iterable, takeCount);
     }
     get length() {
-      let iterableLength = _iterable.length;
-      if (iterableLength > _takeCount) return _takeCount;
+      let iterableLength = this._iterable.length;
+      if (iterableLength > this._takeCount) return this._takeCount;
       return iterableLength;
     }
   }
@@ -527,7 +527,7 @@ var _internal;
       super._(iterable, skipCount);
     }
     get length() {
-      let length = _iterable.length - _skipCount;
+      let length = this._iterable.length - this._skipCount;
       if (length >= 0) return length;
       return 0;
     }