Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(852)

Side by Side Diff: tools/idl_parser/test_parser/interface_web.idl

Issue 2704653002: idl_parser: Fix test expectations. (Closed)
Patch Set: Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « tools/idl_parser/test_parser/dictionary_web.idl ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 /* Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 Use of this source code is governed by a BSD-style license that can be 2 Use of this source code is governed by a BSD-style license that can be
3 found in the LICENSE file. */ 3 found in the LICENSE file. */
4 4
5 /* Test Interface productions 5 /* Test Interface productions
6 6
7 Run with --test to generate an AST and verify that all comments accurately 7 Run with --test to generate an AST and verify that all comments accurately
8 reflect the state of the Nodes. 8 reflect the state of the Nodes.
9 9
10 BUILD Type(Name) 10 BUILD Type(Name)
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 void foo(DOMString arg, ); 64 void foo(DOMString arg, );
65 }; 65 };
66 66
67 /* TREE 67 /* TREE
68 *Error(Unexpected keyword "double" after keyword "readonly".) 68 *Error(Unexpected keyword "double" after keyword "readonly".)
69 */ 69 */
70 interface MyIFaceMissingAttribute { 70 interface MyIFaceMissingAttribute {
71 readonly double foo; 71 readonly double foo;
72 }; 72 };
73 73
74 /* TREE 74 /* ERROR Unexpected "<" after ";". */
75 *Interface(MyIFaceContainsUnresolvedConflictDiff)
76 * Operation(foo)
77 * Arguments()
78 * Type()
79 * PrimitiveType(DOMString)
80 * Error(Unexpected "<" after ";".)
81 */
82 interface MyIFaceContainsUnresolvedConflictDiff { 75 interface MyIFaceContainsUnresolvedConflictDiff {
83 DOMString foo(); 76 DOMString foo();
84 <<<<<< ours 77 <<<<<< ours
85 DOMString bar(); 78 DOMString bar();
86 iterable<long>; 79 iterable<long>;
87 ====== 80 ======
88 >>>>>> theirs 81 >>>>>> theirs
89 }; 82 };
90 83
91 /* TREE 84 /* TREE
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after
388 * Type() 381 * Type()
389 * UnionType() 382 * UnionType()
390 * Type() 383 * Type()
391 * PrimitiveType(DOMString) 384 * PrimitiveType(DOMString)
392 * Type() 385 * Type()
393 * PrimitiveType(long) 386 * PrimitiveType(long)
394 */ 387 */
395 interface MyIfaceUnion { 388 interface MyIfaceUnion {
396 attribute (DOMString or long) foo; 389 attribute (DOMString or long) foo;
397 }; 390 };
OLDNEW
« no previous file with comments | « tools/idl_parser/test_parser/dictionary_web.idl ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698