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

Unified Diff: tools/idl_parser/test_parser/interface_web.idl

Issue 981923002: IDL: Propagate parser errors occurred in InterfaceMembers (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/idl_parser/idl_parser.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/idl_parser/test_parser/interface_web.idl
diff --git a/tools/idl_parser/test_parser/interface_web.idl b/tools/idl_parser/test_parser/interface_web.idl
index 9e69e9f12430849046edeff478539c035073f028..b1f3278623f8e4e764f5070dc8f495ff73fc1da9 100644
--- a/tools/idl_parser/test_parser/interface_web.idl
+++ b/tools/idl_parser/test_parser/interface_web.idl
@@ -72,6 +72,23 @@ interface MyIFaceMissingAttribute {
};
/* TREE
+ *Interface(MyIFaceContainsUnresolvedConflictDiff)
+ * Operation(foo)
+ * Arguments()
+ * Type()
+ * PrimitiveType(DOMString)
+ * Error(Unexpected "<" after ";".)
+ */
+interface MyIFaceContainsUnresolvedConflictDiff {
+ DOMString foo();
+<<<<<< ours
bashi 2015/03/06 01:06:04 I use '<<<<<<' instead of '<<<<<<<' (removed one '
+ DOMString bar();
+ iterable<long>;
+======
+>>>>>> theirs
+};
+
+/* TREE
*Interface(MyIFaceBig)
* Const(setString)
* PrimitiveType(DOMString)
« no previous file with comments | « tools/idl_parser/idl_parser.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698