M: not-in-a-method-error summary
drop "call-next-method can only be called in a method definition" ;
+M: version-control-merge-conflict summary
+ drop "Version control merge conflict in source code" ;
+
GENERIC: expected>string ( obj -- str )
M: f expected>string drop "end of input" ;
"call(" [ \ call-effect parse-call( ] define-core-syntax
"execute(" [ \ execute-effect parse-call( ] define-core-syntax
+
+ "<<<<<<<" [ version-control-merge-conflict ] define-core-syntax
+ "=======" [ version-control-merge-conflict ] define-core-syntax
+ ">>>>>>>" [ version-control-merge-conflict ] define-core-syntax
+
+ "<<<<<<" [ version-control-merge-conflict ] define-core-syntax
+ "======" [ version-control-merge-conflict ] define-core-syntax
+ ">>>>>>" [ version-control-merge-conflict ] define-core-syntax
] with-compilation-unit