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

compiler/javatests/com/google/dart/compiler/CompilerTestCase.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;
 
+import static com.google.dart.compiler.common.ErrorExpectation.assertErrors;
+
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
 import com.google.dart.compiler.CommandLineOptions.CompilerOptions;
 import com.google.dart.compiler.ast.ASTVisitor;
 import com.google.dart.compiler.ast.DartExpression;
 import com.google.dart.compiler.ast.DartFunctionTypeAlias;
 import com.google.dart.compiler.ast.DartNode;
 import com.google.dart.compiler.ast.DartUnit;
 import com.google.dart.compiler.ast.LibraryUnit;
 import com.google.dart.compiler.common.ErrorExpectation;
+import com.google.dart.compiler.common.SourceInfo;
 import com.google.dart.compiler.parser.DartParser;
 import com.google.dart.compiler.parser.DartParserRunner;
-import com.google.dart.compiler.parser.DartScannerParserContext;
-import com.google.dart.compiler.parser.ParserContext;
-
-import static com.google.dart.compiler.common.ErrorExpectation.assertErrors;
 
 import junit.framework.TestCase;
 
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.net.URI;
 import java.net.URL;
 import java.util.List;
 import java.util.Map;
@@ skipping 156 matching lines @@
    */
   protected AnalyzeLibraryResult analyzeLibrary(String name, String code)
       throws Exception {
     AnalyzeLibraryResult result = new AnalyzeLibraryResult();
     result.source = code;
     // Prepare library.
     MockLibrarySource lib = new MockLibrarySource();
     // Prepare unit.
     Map<URI, DartUnit> testUnits =  Maps.newHashMap();
     {
-      DartSourceTest src = new DartSourceTest(name, code, lib);
-      ParserContext context = makeParserContext(src, code, result);
-      DartUnit unit = makeParser(context).parseUnit(src);
+      DartSource src = new DartSourceTest(name, code, lib);
+      DartUnit unit = makeParser(src, code, result).parseUnit();
       // Remember unit.
       lib.addSource(src);
       testUnits.put(src.getUri(), unit);
     }
     DartArtifactProvider provider = new MockArtifactProvider();
     result.setLibraryUnitResult(DartCompiler.analyzeLibrary(
         lib,
         testUnits,
         compilerConfiguration,
         provider,
@@ skipping 37 matching lines @@
     return parseUnit(path, source);
   }
 
   /**
    * Parse a single compilation unit for the name and source.
    */
   protected DartUnit parseUnit(String srcName, String sourceCode, Object... errors) {
     // TODO(jgw): We'll need to fill in the library parameter when testing multiple units.
     DartSourceTest src = new DartSourceTest(srcName, sourceCode, null);
     DartCompilerListenerTest listener = new DartCompilerListenerTest(srcName, errors);
-    ParserContext context = makeParserContext(src, sourceCode, listener);
-    DartUnit unit = makeParser(context).parseUnit(src);
+    DartUnit unit = makeParser(src, sourceCode, listener).parseUnit();
     listener.checkAllErrorsReported();
     return unit;
   }
 
   /**
    * Parse a single compilation unit for the name and source. The parse expects some kind of error,
    * but isn't picky about the actual contents. This is useful for testing parser recovery where we
    * don't want to make the test too brittle.
    */
   protected DartUnit parseUnitUnspecifiedErrors(String srcName, String sourceCode) {
     DartSourceTest src = new DartSourceTest(srcName, sourceCode, null);
     final List<DartCompilationError> errorsEncountered = Lists.newArrayList();
     DartCompilerListener listener = new DartCompilerListener.Empty() {
       @Override
       public void onError(DartCompilationError event) {
         errorsEncountered.add(event);
       }
     };
-    ParserContext context = makeParserContext(src, sourceCode, listener);
-    DartUnit unit = makeParser(context).parseUnit(src);
+    DartUnit unit = makeParser(src, sourceCode, listener).parseUnit();
     assertTrue("Expected some compilation errors, got none.", errorsEncountered.size() > 0);
     return unit;
     }
 
     protected DartUnit parseUnitAsSystemLibrary(final String srcName, String sourceCode,
                                               Object... errors) {
     DartSourceTest src = new DartSourceTest(srcName, sourceCode, null) {
       @Override
       public URI getUri() {
         return URI.create("dart:core/" + srcName);
       }
     };
     DartCompilerListenerTest listener = new DartCompilerListenerTest(srcName, errors);
-    ParserContext context = makeParserContext(src, sourceCode, listener);
-    DartUnit unit = makeParser(context).parseUnit(src);
+    DartUnit unit = makeParser(src, sourceCode, listener).parseUnit();
     listener.checkAllErrorsReported();
     return unit;
   }
 
 
   /**
    * Parse a single compilation unit with given name and source, and check for a set of expected errors.
    *
    * @param errors a sequence of errors represented as triples of the form
    *        (String msg, int line, int column) or
    *        (ErrorCode code, int line, int column)
    */
   protected DartUnit parseSourceUnitErrors(String sourceCode,  Object... errors) {
     String srcName = "Test.dart";
     DartSourceTest src = new DartSourceTest(srcName, sourceCode, null);
     DartCompilerListenerTest listener = new DartCompilerListenerTest(srcName, errors);
-    ParserContext context = makeParserContext(src, sourceCode, listener);
-    DartUnit unit = makeParser(context).parseUnit(src);
+    DartUnit unit = makeParser(src, sourceCode, listener).parseUnit();
     listener.checkAllErrorsReported();
     return unit;
   }
 
   /**
    * Parse a single compilation unit for the given input file, and check for a
    * set of expected errors.
    *
    * @param errors a sequence of errors represented as triples of the form
    *        (String msg, int line, int column) or
    *        (ErrorCode code, int line, int column)
    */
   protected DartUnit parseUnitErrors(final String path, final Object... errors) {
     URL url = inputUrlFor(getClass(), path);
     String sourceCode = readUrl(url);
     // TODO(jgw): We'll need to fill in the library parameter when testing multiple units.
     DartSourceTest src = new DartSourceTest(path, sourceCode, null);
     DartCompilerListenerTest listener = new DartCompilerListenerTest(path, errors);
-    ParserContext context = makeParserContext(src, sourceCode, listener);
-    DartUnit unit = makeParser(context).parseUnit(src);
+    DartUnit unit = makeParser(src, sourceCode, listener).parseUnit();
     listener.checkAllErrorsReported();
     return unit;
   }
 
   /**
    * Override this method to provide an alternate {@link DartParser}.
    */
-  protected DartParser makeParser(ParserContext context) {
-    return new DartParser(context);
+  protected DartParser makeParser(Source src, String sourceCode,
+      DartCompilerListener listener) {
+    return new DartParser(src, sourceCode, false, Sets.<String>newHashSet(), listener, null);
   }
 
   /**
-   * Override this method to provide an alternate {@link ParserContext}.
-   */
-  protected ParserContext makeParserContext(Source src, String sourceCode,
-      DartCompilerListener listener) {
-    return new DartScannerParserContext(src, sourceCode, listener);
-  }
-
-  /**
    * @return the {@link DartParserRunner} with parsed source. It can be used to request
    *         {@link DartUnit} or compilation problems.
    */
   protected final DartParserRunner parseSource(String code) {
     return DartParserRunner.parse(getName(), code, Integer.MAX_VALUE, false);
   }
 
   /**
    * Parses given source and checks parsing problems.
    */
@@ skipping 38 matching lines @@
       @Override
       public Void visitFunctionTypeAlias(DartFunctionTypeAlias node) {
         if (node.getName().getName().equals(name)) {
           result[0] = node;
         }
         return null;
       }
     });
     return result[0];
   }
+
+  public static String getNodeSource(String code, DartNode node) {
+    SourceInfo sourceInfo = node.getSourceInfo();
+    return code.substring(sourceInfo.getOffset(), sourceInfo.getEnd());
+  }
 }