Issue 3752. Support for @override annotations (as structured doc comments)

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

 // 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.
 
 package com.google.dart.compiler.parser;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.io.CharStreams;
 import com.google.dart.compiler.DartCompilationError;
@@ skipping 75 matching lines @@
 import com.google.dart.compiler.ast.DartTypeParameter;
 import com.google.dart.compiler.ast.DartUnaryExpression;
 import com.google.dart.compiler.ast.DartUnit;
 import com.google.dart.compiler.ast.DartUnqualifiedInvocation;
 import com.google.dart.compiler.ast.DartVariable;
 import com.google.dart.compiler.ast.DartVariableStatement;
 import com.google.dart.compiler.ast.DartWhileStatement;
 import com.google.dart.compiler.ast.LibraryNode;
 import com.google.dart.compiler.ast.LibraryUnit;
 import com.google.dart.compiler.ast.Modifiers;
+import com.google.dart.compiler.metrics.CompilerMetrics;
 import com.google.dart.compiler.parser.DartScanner.Location;
 import com.google.dart.compiler.parser.DartScanner.Position;
 import com.google.dart.compiler.util.Lists;
 
 import java.io.IOException;
 import java.io.Reader;
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
 /**
  * The Dart parser. Parses a single compilation unit and produces a {@link DartUnit}.
  * The grammar rules are taken from Dart.g revision 557.
  */
 public class DartParser extends CompletionHooksParserBase {
 
+  private final Source source;
+  private final String sourceCode;
   private final boolean isDietParse;
   private final Set<String> prefixes;
   private final boolean corelibParse;
   private final Set<Integer> errorHistory = new HashSet<Integer>();
   private boolean isParsingInterface;
   private boolean isTopLevelAbstract;
   private DartScanner.Position topLevelAbstractModifierPosition;
   private boolean isParsingClass;
 
   /**
@@ skipping 69 matching lines @@
       "throw",
       "true",
       "try",
       "var",
       "void",
       "while"};
   public static final Set<String> RESERVED_WORDS_SET = ImmutableSet.copyOf(RESERVED_WORDS);
 
   public DartParser(Source source,
                     String sourceCode,
-                    DartCompilerListener listener) {
-    this(new DartScannerParserContext(source, sourceCode, listener));
+                    boolean isDietParse,
+                    Set<String> prefixes,
+                    DartCompilerListener listener,
+                    CompilerMetrics compilerMetrics) {
+    super(new DartParserCommentsHelper.CommentParserContext(source, sourceCode, listener, compilerMetrics));
+    this.source = source;
+    this.sourceCode = sourceCode;
+    this.isDietParse = isDietParse;
+    this.prefixes = prefixes;
+    this.corelibParse = source != null && SystemLibraryManager.isDartUri(source.getUri());
   }
 
-  public DartParser(ParserContext ctx) {
-    this(ctx, false);
+//  public DartParser(ParserContext ctx) {

[Brian Wilkerson, 2012/06/25 14:24:38]

Do we need this commented out code, or can we delete it?

[scheglov, 2012/06/26 19:46:34]

Done.

+//    this(ctx, false);
+//  }
+//
+//  public DartParser(ParserContext ctx, Set<String> prefixes, boolean isDietParse) {
+//    this(ctx, isDietParse, prefixes);
+//  }
+//
+//  public DartParser(ParserContext ctx, boolean isDietParse) {
+//    this(ctx, isDietParse, Collections.<String>emptySet());
+//  }
+//
+//  public DartParser(ParserContext ctx, boolean isDietParse, Set<String> prefixes) {
+//    super(ctx);
+//    this.isDietParse = isDietParse;
+//    this.prefixes = prefixes;
+//    {
+//      Source source = ctx.getSource();
+//      this.corelibParse = source != null && SystemLibraryManager.isDartUri(source.getUri());
+//    }
+//  }
+//
+//  private DartParser(Source source, DartCompilerListener listener) throws IOException {
+//    this(source, source.getSourceReader(), listener);
+//  }
+//
+//  private DartParser(Source source,
+//                    Reader sourceReader,
+//                    DartCompilerListener listener) throws IOException {
+//    this(new DartScannerParserContext(source, read(sourceReader), listener));
+//  }
+//
+//  public static DartParser getSourceParser(Source source, DartCompilerListener listener)
+//      throws IOException {
+//    return new DartParser(source, listener);
+//  }
+
+  public static String read(Source source) throws IOException {
+    return read(source.getSourceReader());
   }
-
-  public DartParser(ParserContext ctx, Set<String> prefixes, boolean isDietParse) {
-    this(ctx, isDietParse, prefixes);
-  }
-
-  public DartParser(ParserContext ctx, boolean isDietParse) {
-    this(ctx, isDietParse, Collections.<String>emptySet());
-  }
-
-  public DartParser(ParserContext ctx, boolean isDietParse, Set<String> prefixes) {
-    super(ctx);
-    this.isDietParse = isDietParse;
-    this.prefixes = prefixes;
-    {
-      Source source = ctx.getSource();
-      this.corelibParse = source != null && SystemLibraryManager.isDartUri(source.getUri());
-    }
-  }
-
-  private DartParser(Source source, DartCompilerListener listener) throws IOException {
-    this(source, source.getSourceReader(), listener);
-  }
-
-  private DartParser(Source source,
-                    Reader sourceReader,
-                    DartCompilerListener listener) throws IOException {
-    this(new DartScannerParserContext(source, read(sourceReader), listener));
-  }
-
-  public static DartParser getSourceParser(Source source, DartCompilerListener listener)
-      throws IOException {
-    return new DartParser(source, listener);
-  }
-
-  private static String read(Reader reader) throws IOException {
+  
+  public static String read(Reader reader) throws IOException {
     try {
       return CharStreams.toString(reader);
     } finally {
       reader.close();
     }
   }
 
   /**
    * A flag indicating whether function expressions are allowed.  See
    * {@link #setAllowFunctionExpression(boolean)}.
@@ skipping 39 matching lines @@
    *     | functionTypeAlias
    *     | methodOrConstructorDeclaration functionStatementBody
    *     | type? getOrSet identifier formalParameterList functionStatementBody
    *     | CONST type? staticConstDeclarationList ';'
    *     | variableDeclaration ';'
    *     ;
    * </pre>
    */
   @Terminals(tokens={Token.EOS, Token.CLASS, Token.LIBRARY, Token.IMPORT, Token.SOURCE,
       Token.RESOURCE, Token.NATIVE})
-  public DartUnit parseUnit(DartSource source) {
+  public DartUnit parseUnit() {
+    DartSource dartSource = (DartSource) source;
     try {
       beginCompilationUnit();
-      ctx.unitAboutToCompile(source, isDietParse);
-      DartUnit unit = new DartUnit(source, isDietParse);
+      ctx.unitAboutToCompile(dartSource, isDietParse);
+      DartUnit unit = new DartUnit(dartSource, isDietParse);
 
       // parse any directives at the beginning of the source
       parseDirectives(unit);
 
       while (!EOS()) {
         DartNode node = null;
         beginTopLevelElement();
         isParsingClass = isParsingInterface = false;
         // Check for ABSTRACT_KEYWORD.
         isTopLevelAbstract = false;
@@ skipping 26 matching lines @@
           // Only "class" can be top-level abstract element.
           if (isTopLevelAbstract && !isParsingClass) {
             Position abstractPositionEnd = topLevelAbstractModifierPosition.getAdvancedColumns(ABSTRACT_KEYWORD.length());
             Location location = new Location(topLevelAbstractModifierPosition, abstractPositionEnd);
             reportError(new DartCompilationError(source, location,
                 ParserErrorCode.ABSTRACT_TOP_LEVEL_ELEMENT));
           }
         }
       }
       expect(Token.EOS);
+      // add comments
+      {
+        List<int[]> commentLocs = ((DartParserCommentsHelper.CommentParserContext) ctx).getCommentLocs();
+        DartParserCommentsHelper.addComments(unit, source, sourceCode, commentLocs);
+      }
+      // done
       return done(unit);
     } catch (StringInterpolationParseError exception) {
       throw new InternalCompilerException("Failed to parse " + source.getUri(), exception);
     }
   }
 
   private boolean looksLikeDirective() {
     switch(peek(0)) {
       case LIBRARY:
       case IMPORT:
@@ skipping 4084 matching lines @@
   }
 
   private void reportError(DartNode node, ErrorCode errorCode, Object... arguments) {
     reportError(new DartCompilationError(node, errorCode, arguments));
   }
 
   private boolean currentlyParsingToplevel() {
     return   !(isParsingInterface || isTopLevelAbstract || isParsingClass);
   }
 }