Convert top level factory into method, issue 345

compiler/java/com/google/dart/compiler/parser/DartParser.java

 // Copyright (c) 2011, 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.
 
 package com.google.dart.compiler.parser;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.io.CharStreams;
 import com.google.dart.compiler.DartCompilationError;
 import com.google.dart.compiler.DartCompilerListener;
@@ skipping 27 matching lines @@
 import com.google.dart.compiler.ast.DartForStatement;
 import com.google.dart.compiler.ast.DartFunction;
 import com.google.dart.compiler.ast.DartFunctionExpression;
 import com.google.dart.compiler.ast.DartFunctionObjectInvocation;
 import com.google.dart.compiler.ast.DartFunctionTypeAlias;
 import com.google.dart.compiler.ast.DartIdentifier;
 import com.google.dart.compiler.ast.DartIfStatement;
 import com.google.dart.compiler.ast.DartImportDirective;
 import com.google.dart.compiler.ast.DartInitializer;
 import com.google.dart.compiler.ast.DartIntegerLiteral;
-import com.google.dart.compiler.ast.DartInvocation;
 import com.google.dart.compiler.ast.DartLabel;
 import com.google.dart.compiler.ast.DartLibraryDirective;
 import com.google.dart.compiler.ast.DartMapLiteral;
 import com.google.dart.compiler.ast.DartMapLiteralEntry;
 import com.google.dart.compiler.ast.DartMethodDefinition;
 import com.google.dart.compiler.ast.DartMethodInvocation;
 import com.google.dart.compiler.ast.DartNamedExpression;
 import com.google.dart.compiler.ast.DartNativeBlock;
 import com.google.dart.compiler.ast.DartNativeDirective;
 import com.google.dart.compiler.ast.DartNewExpression;
@@ skipping 709 matching lines @@
 
     if (match(Token.VAR) || match(Token.FINAL)) {
       if (modifiers.isAbstract()) {
         reportError(position(), ParserErrorCode.DISALLOWED_ABSTRACT_KEYWORD);
       } else if (modifiers.isFactory()) {
         reportError(position(), ParserErrorCode.DISALLOWED_FACTORY_KEYWORD);
       }
     }
 
     if (modifiers.isFactory()) {
-      return done(parseFactory(modifiers));
+      // Factory is not allowed on top level.
+      if (!allowStatic) {
+        reportError(position(), ParserErrorCode.DISALLOWED_FACTORY_KEYWORD);
+        modifiers = modifiers.removeFactory();
+      }
+      // Do parse factory.
+      DartMethodDefinition factoryNode = parseFactory(modifiers);
+      // If factory is not allowed, ensure that it is valid as method.
+      DartExpression actualName = factoryNode.getName();
+      if (!allowStatic && !(actualName instanceof DartIdentifier)) {
+        DartExpression replacementName = new DartIdentifier(actualName.toString());
+        factoryNode.setName(replacementName);
+      }
+      // Done.
+      return done(factoryNode);
     }
 
     final DartNode member;
 
     switch (peek(0)) {
       case VAR: {
         consume(Token.VAR);
         member = parseFieldDeclaration(modifiers, null);
         expectStatmentTerminator();
         break;
@@ skipping 2678 matching lines @@
     } else {
       ctx.error(dartError);
       errorHistory.add(dartError.hashCode());
     }
   }
 
   private void reportError(DartNode node, ErrorCode errorCode, Object... arguments) {
     reportError(new DartCompilationError(node, errorCode, arguments));
   }
 }