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

compiler/javatests/com/google/dart/compiler/parser/ParserEventsTest.java

 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file

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

nit: copyright year

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

Done.

 // 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 static com.google.dart.compiler.parser.ParserEventsTest.Mark.ArrayLiteral;
 import static com.google.dart.compiler.parser.ParserEventsTest.Mark.BinaryExpression;
 import static com.google.dart.compiler.parser.ParserEventsTest.Mark.Block;
 import static com.google.dart.compiler.parser.ParserEventsTest.Mark.BreakStatement;
 import static com.google.dart.compiler.parser.ParserEventsTest.Mark.CatchClause;
@@ skipping 48 matching lines @@
 import static com.google.dart.compiler.parser.ParserEventsTest.Mark.TypeAnnotation;
 import static com.google.dart.compiler.parser.ParserEventsTest.Mark.TypeArguments;
 import static com.google.dart.compiler.parser.ParserEventsTest.Mark.TypeExpression;
 import static com.google.dart.compiler.parser.ParserEventsTest.Mark.TypeFunctionOrVarable;
 import static com.google.dart.compiler.parser.ParserEventsTest.Mark.TypeParameter;
 import static com.google.dart.compiler.parser.ParserEventsTest.Mark.UnaryExpression;
 import static com.google.dart.compiler.parser.ParserEventsTest.Mark.VarDeclaration;
 import static com.google.dart.compiler.parser.ParserEventsTest.Mark.VariableDeclaration;
 import static com.google.dart.compiler.parser.ParserEventsTest.Mark.WhileStatement;
 
+import com.google.common.collect.Sets;
+import com.google.dart.compiler.DartCompilerListener;
+import com.google.dart.compiler.Source;
+import com.google.dart.compiler.metrics.CompilerMetrics;
+
 import java.util.HashSet;
 import java.util.LinkedHashSet;
+import java.util.Set;
 
 public class ParserEventsTest extends AbstractParserTest {
 
   /**
    * A collection of marks representing interesting parser states. Copied from
    * com.google.dart.tools.core.internal.completion.
    * <p>
    * TODO(messick) Find a way to share the implementation of Mark.
    */
   static enum Mark {
@@ skipping 98 matching lines @@
       super.rollback();
       Mark lastMark = null;
       for (Mark mark: marks) {
         lastMark = mark;
       }
       if (lastMark != null) {
         marks.remove(lastMark);
       }
     }
 
-    public ParserEventRecorder(ParserContext ctx) {
-      super(ctx);
+    public ParserEventRecorder(Source source,
+        String sourceCode,
+        boolean isDietParse,
+        Set<String> prefixes,
+        DartCompilerListener listener,
+        CompilerMetrics compilerMetrics) {
+      super(source, sourceCode, isDietParse, prefixes, listener, compilerMetrics);
       marks = new LinkedHashSet<Mark>();
     }
 
     @SuppressWarnings({"unchecked", "rawtypes"})
     public HashSet<Mark> copyMarks() {
       return (HashSet) marks.clone();
     }
 
     @Override
     protected void beginArrayLiteral() {
@@ skipping 543 matching lines @@
   }
 
   @Override
   public void testTopLevel() {
     parseUnit("TopLevel.dart");
     compareMarks(ArrayLiteral, CompilationUnit, PostfixExpression, NativeBody, Literal, Identifier,
         ClassMember, Block, MethodName, TopLevelElement, TypeAnnotation, Expression,
         QualifiedIdentifier, ConditionalExpression, BinaryExpression, VariableDeclaration,
         FormalParameterList);
   }
-
+  
   @Override
-  protected DartParser makeParser(ParserContext context) {
-    recorder = new ParserEventRecorder(context);
+  protected DartParser makeParser(Source src, String sourceCode, DartCompilerListener listener) {
+    recorder = new ParserEventRecorder(src, sourceCode, false, Sets.<String>newHashSet(), listener, null);
     return recorder;
   }
 
   private void compareMarks(Mark... expectedMarks) {
     HashSet<Mark> recordedMarks = recorder.copyMarks();
     for (Mark m : expectedMarks) {
       assertNotNull("Missing mark: " + m.name(), recordedMarks.remove(m));
     }
     for (Mark m : recordedMarks) {
       fail("Unexpected mark: " + m.name());
     }
   }
 }