added a restart to remove conflicting clauses
Tue May 8 11:51:07 PDT 2012 Russ Tyndall <russ@acceleration.net>
* added a restart to remove conflicting clauses
diff -rN -u old-iterate/iterate.lisp new-iterate/iterate.lisp
--- old-iterate/iterate.lisp 2014-07-29 18:01:25.000000000 -0700
+++ new-iterate/iterate.lisp 2014-07-29 18:01:25.000000000 -0700
@@ -1319,9 +1319,13 @@
(kw2 (clause-info-keywords ci2)))
(if (= insert-n 2)
(rotatef kw1 kw2))
- (error "Iterate: Inserting clause ~a would create ~
+ (restart-case
+ (error "Iterate: Inserting clause ~a would create ~
an ambiguity with clause ~a"
- kw1 kw2))))
+ kw1 kw2)
+ (delete-conflict ()
+ :report "Delete the original clause"
+ (remove-clause kw2))))))
(defun ambiguous-clauses? (ci1 ci2)