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

compiler/javatests/com/google/dart/compiler/parser/CPParserTest.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 com.google.dart.compiler.CompilerTestCase;
 import com.google.dart.compiler.DartCompilerListener;
 import com.google.dart.compiler.Source;
 import com.google.dart.compiler.ast.DartComment;
 import com.google.dart.compiler.ast.DartUnit;
 import com.google.dart.compiler.common.SourceInfo;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * Tests for the parser, which simply assert that valid source units parse
  * correctly. All tests invoking {@code parseUnit} are designed such that
  * they will throw an exception if anything goes wrong in the parser.
  */
 public class CPParserTest extends CompilerTestCase {
 
   private static String[] EXPECTED001 = {"/*\n * Beginning comment\n */",
     "// line comment", "// another", "/**/", "//", "/*/*nested*/*/",
   };
   private static String[] EXPECTED002 = {"/*\n*\n //comment\nX Y"};
 
   private String source;
-  private CommentPreservingParser parser;
+
+  
+  @Override
+  protected DartParser makeParser(Source src, String sourceCode, DartCompilerListener listener) {
+    source = sourceCode;
+    return super.makeParser(src, sourceCode, listener);
+  }
 
   public void test001() {
     DartUnit unit = parseUnit("Comments.dart");
     compareComments(unit.getComments(), EXPECTED001);
   }
 
   public void test002() {
     DartUnit unit = parseUnitErrors("BadCommentNegativeTest.dart",
                                     "Unexpected token 'ILLEGAL' (expected end of file)", 1, 1);
     compareComments(unit.getComments(), EXPECTED002);
   }
 
-  @Override
-  protected DartParser makeParser(ParserContext context) {
-    parser = new CommentPreservingParser(context, false);
-    return parser;
-  }
-
-  @Override
-  protected ParserContext makeParserContext(Source src, String sourceCode,
-      DartCompilerListener listener) {
-    this.source = sourceCode;
-    return CommentPreservingParser.createContext(src, sourceCode, listener);
-  }
-
   private List<String> extractComments(List<DartComment> cms) {
     List<String> comments = new ArrayList<String>();
     for (DartComment cm : cms) {
       SourceInfo sourceInfo = cm.getSourceInfo();
-      comments.add(source.substring(sourceInfo.getOffset(), sourceInfo.getOffset()
-          + sourceInfo.getLength()));
+      comments.add(source.substring(sourceInfo.getOffset(), sourceInfo.getEnd()));
     }
     return comments;
   }
 
   private void compareComments(List<DartComment> cms, String[] expected) {
     List<String> comments = extractComments(cms);
     assertEquals(expected.length, comments.size());
     for (int i = 0; i < expected.length; i++) {
       assertEquals(expected[i], comments.get(i));
     }
   }
 
 }