Fix bug 918

runtime/vm/parser.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/parser.h"
 
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/compiler.h"
 #include "vm/compiler_stats.h"
@@ skipping 3629 matching lines @@
       ParseClassDefinition(pending_classes);
     } else if ((CurrentToken() == Token::kTYPEDEF) &&
                (LookaheadToken(1) != Token::kLPAREN)) {
       ParseFunctionTypeAlias(pending_classes);
     } else if (CurrentToken() == Token::kINTERFACE) {
       ParseInterfaceDefinition(pending_classes);
     } else {
       set_current_class(toplevel_class);
       if (IsVariableDeclaration()) {
         ParseTopLevelVariable(&top_level);
-      } else if (IsTopLevelFunction()) {
+      } else if (IsFunctionDeclaration()) {
         ParseTopLevelFunction(&top_level);
       } else if (IsTopLevelAccessor()) {
         ParseTopLevelAccessor(&top_level);
       } else if (CurrentToken() == Token::kEOS) {
         break;
       } else {
         UnexpectedToken();
       }
     }
   }
@@ skipping 605 matching lines @@
           (CurrentToken() == Token::kASSIGN)) {
         is_var_decl = true;
       }
     }
   }
   SetPosition(saved_pos);
   return is_var_decl;
 }
 
 
+// Look ahead to detect whether the next tokens should be parsed as
+// a function declaration. Token position remains unchanged.
 bool Parser::IsFunctionDeclaration() {
-  // A function declaration is like a function literal but it must have
-  // a name.
-  return (CurrentToken() != Token::kLPAREN) && IsFunctionLiteral();
-}
-
-
-bool Parser::IsTopLevelFunction() {
-  // Top-level function declarations can omit the return type. Check for
-  // that case separately.
-  return (IsIdentifier() &&
-      (LookaheadToken(1) == Token::kLPAREN)) || IsFunctionDeclaration();
+  const intptr_t saved_pos = token_index_;
+  if (IsIdentifier() && (LookaheadToken(1) == Token::kLPAREN)) {
+    // Possibly a function without explicit return type.
+    ConsumeToken();  // Consume function identifier.
+  } else if (TryParseReturnType()) {
+    if (!IsIdentifier()) {
+      SetPosition(saved_pos);
+      return false;
+    }
+    ConsumeToken();  // Consume function identifier.
+  } else {
+    SetPosition(saved_pos);
+    return false;
+  }
+  // Check parameter list and the following token.
+  if (CurrentToken() == Token::kLPAREN) {
+    SkipToMatchingParenthesis();
+    if ((CurrentToken() == Token::kLBRACE) ||
+        (CurrentToken() == Token::kARROW) ||
+        (is_top_level_ && IsLiteral("native"))) {
+      SetPosition(saved_pos);
+      return true;
+    }
+  }
+  SetPosition(saved_pos);
+  return false;
 }
 
 
 bool Parser::IsTopLevelAccessor() {
   if ((CurrentToken() == Token::kGET) || (CurrentToken() == Token::kSET)) {
     return true;
   }
   const intptr_t saved_pos = token_index_;
   if (TryParseReturnType()) {
     if ((CurrentToken() == Token::kGET) || (CurrentToken() == Token::kSET)) {
@@ skipping 4056 matching lines @@
 void Parser::SkipQualIdent() {
   ASSERT(IsIdentifier());
   ConsumeToken();
   if (CurrentToken() == Token::kPERIOD) {
     ConsumeToken();  // Consume the kPERIOD token.
     ExpectIdentifier("identifier expected after '.'");
   }
 }
 
 }  // namespace dart