implement function statements, assert

[email protected]

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

Author: John Messerly

lib/runtime/dart_runtime.js

@@ -142,4 +142,10 @@ var dart;
   }
   dart.mixin = mixin;
 
+  function assert(condition) {
+    // TODO(jmesserly): throw assertion error.
+    if (!condition) throw 'assertion failed';
+  }
+  dart.assert = assert;
+
 })(dart || (dart = {}));

lib/src/codegen/js_codegen.dart

@@ -92,6 +92,7 @@ var $_libraryName;
 
   bool isPublic(String name) => !name.startsWith('_');
 
+
   /// Conversions that we don't handle end up here.
   @override
   void visitConversion(Conversion node) {
@@ -453,11 +454,8 @@ var $_libraryName;
       out.write('function ');
     }
 
-    out.write('$name(');
-    var function = node.functionExpression;
-    _visitNode(function.parameters);
-    out.write(') ');
-    function.body.accept(this);
+    out.write('$name');
+    node.functionExpression.accept(this);
 
     if (!node.isGetter && !node.isSetter) {
       out.write('\n');
@@ -468,16 +466,34 @@ var $_libraryName;
 
   @override
   void visitFunctionExpression(FunctionExpression node) {
-    if (node.parent is ExpressionStatement) {
-      out.write('/* Unimplemented function expr as statement: $node */');
+    if (node.parent is FunctionDeclaration) {
+      out.write('(');
+      _visitNode(node.parameters);
+      out.write(') ');
+      node.body.accept(this);
+    } else {
+      out.write("(");
+      _visitNode(node.parameters);
+      out.write(") => ");
+      var body = node.body;
+      if (body is ExpressionFunctionBody) body = body.expression;
+      body.accept(this);
+    }
+  }
+
+  @override
+  void visitFunctionDeclarationStatement(FunctionDeclarationStatement node) {
+    var func = node.functionDeclaration;
+    if (func.isGetter || func.isSetter) {
+      out.write('/* Unimplemented function get/set statement: $node */');
       return;
     }
-    out.write("(");
-    _visitNode(node.parameters);
-    out.write(") => ");
-    var body = node.body;
-    if (body is ExpressionFunctionBody) body = body.expression;
-    body.accept(this);
+
+    var name = func.name.name;
+    out.write("// Function $name: ${func.element.type}\n");
+    out.write('function $name');
+    func.functionExpression.accept(this);
+    out.write('\n');
   }
 
   /// Writes a simple identifier. This can handle implicit `this` as well as
@@ -553,7 +569,7 @@ var $_libraryName;
   @override
   void visitMethodInvocation(MethodInvocation node) {
     if (rules.isDynamicCall(node.methodName)) {
-      _unimplemented(node);
+      out.write('/* Unimplemented dynamic method call: $node */');
       return;
     }
 
@@ -621,6 +637,12 @@ var $_libraryName;
     out.write(';\n');
   }
 
+  @override
+  void visitAssertStatement(AssertStatement node) {
+    // TODO(jmesserly): only emit in checked mode.
+    _visitNode(node.condition, prefix: 'dart.assert(', suffix: ');\n');
+  }
+
   @override
   void visitReturnStatement(ReturnStatement node) {
     out.write('return');
@@ -817,7 +839,7 @@ var $_libraryName;
     // it should be assigned to a temp. Note that even simple identifier isn't
     // safe in the face of getters.
     if (node.target is! SimpleIdentifier) {
-      _unimplemented(node);
+      out.write('/* Unimplemented cascade on non-simple identifier: $node */');
       return;
     }
 
@@ -1037,9 +1059,7 @@ var $_libraryName;
   void visitDirective(Directive node) {}
 
   @override
-  void visitNode(AstNode node) => _unimplemented(node);
-
-  void _unimplemented(AstNode node) {
+  void visitNode(AstNode node) {
     out.write('/* Unimplemented ${node.runtimeType}: $node */');
   }
 

test/codegen/expect/BenchmarkBase/BenchmarkBase.js

@@ -45,7 +45,7 @@ var BenchmarkBase;
       watch.start();
       let elapsed = 0;
       while (elapsed < timeMinimum) {
-        /* Unimplemented MethodInvocation: f() */;
+        /* Unimplemented dynamic method call: f() */;
         elapsed = watch.elapsedMilliseconds;
         iter++;
       }

test/codegen/expect/_internal/_internal.js

@@ -172,7 +172,7 @@ var _internal;
       let growable = opt$.growable === undefined ? true : opt$.growable;
       let result = null;
       if (growable) {
-        result = /* Unimplemented CascadeExpression: new List<E>()..length = length */;
+        result = /* Unimplemented cascade on non-simple identifier: new List<E>()..length = length */;
       }
        else {
         result = new dart_core.List(this.length);
@@ -256,7 +256,7 @@ var _internal;
       if (this._endOrLength !== null && this._endOrLength < end) end = this._endOrLength;
       let length = end - start;
       if (length < 0) length = 0;
-      let result = growable ? (/* Unimplemented CascadeExpression: new List<E>()..length = length */) : new dart_core.List(length);
+      let result = growable ? (/* Unimplemented cascade on non-simple identifier: new List<E>()..length = length */) : new dart_core.List(length);
       for (let i = 0; i < length; i++) {
         result[i] = this._iterable.elementAt(start + i);
         if (this._iterable.length < end) throw new dart_core.ConcurrentModificationError(this);
@@ -445,7 +445,8 @@ var _internal;
       this._iterator = _iterator;
       this._remaining = _remaining;
       super();
-      /* Unimplemented AssertStatement: assert (_remaining is int && _remaining >= 0); */}
+      dart.assert(/* Unimplemented IsExpression: _remaining is int */ && this._remaining >= 0);
+    }
     moveNext() {
       this._remaining--;
       if (this._remaining >= 0) {
@@ -538,7 +539,8 @@ var _internal;
       this._iterator = _iterator;
       this._skipCount = _skipCount;
       super();
-      /* Unimplemented AssertStatement: assert (_skipCount is int && _skipCount >= 0); */}
+      dart.assert(/* Unimplemented IsExpression: _skipCount is int */ && this._skipCount >= 0);
+    }
     moveNext() {
       for (let i = 0; i < this._skipCount; i++) this._iterator.moveNext();
       this._skipCount = 0;
@@ -1221,7 +1223,8 @@ var _internal;
       }
     }
     static _dualPivotQuicksort(a, left, right, /* Unimplemented FunctionTypedFormalParameter: int compare(a, b) */) {
-      /* Unimplemented AssertStatement: assert (right - left > _INSERTION_SORT_THRESHOLD); */let sixth = ((right - left + 1) / 6).truncate();
+      dart.assert(right - left > _INSERTION_SORT_THRESHOLD);
+      let sixth = ((right - left + 1) / 6).truncate();
       let index1 = left + sixth;
       let index5 = right - sixth;
       let index3 = ((left + right) / 2).truncate();