Commit c994aea962ef0bc8caec2d619ce65a9fc47295f6 - cafeobj

Fix: User declared error operators are properly :using imported. tswd 7 years ago

1 changed file(s) with 10 addition(s) and 8 deletion(s). Raw diff Collapse all Expand all

+10

-8

chaos/decafe/mimport.lisp less more

541	541	(let ((op-symbol (operator-symbol (opinfo-operator opinfo))))
542	542	(dolist (meth (opinfo-methods opinfo))
543	543	(when (eq submodule (method-module meth))
544		(when (or ;; (method-is-user-defined-error-method meth)
545		(and (not (method-is-error-method meth))
546		(not (method-is-user-defined-error-method meth))
547		(not (memq meth
548		(module-methods-for-regularity
549		submodule)))))
	544	(when (or (method-is-user-defined-error-method meth)
	545	(and (not (method-is-error-method meth))
	546	(not (method-is-user-defined-error-method meth))
	547	(not (memq meth
	548	(module-methods-for-regularity
	549	submodule)))))
550	550	(let* ((new-arity (mapcar #'(lambda (x)
551	551	(using-find-sort-err x))
552	552	(method-arity meth)))

628	628	;; but we must delay the axiom importation
629	629	;; because there can happen reorganizing operators in different ways
630	630	(dolist (e (reverse (module-equations submodule)))
631		(delay-axiom-importation module e submodule))
	631	(unless (axiom-kind e)
	632	(delay-axiom-importation module e submodule)))
632	633
633	634	(dolist (r (reverse (module-rules submodule)))
634		(delay-axiom-importation module r submodule))
	635	(unless (axiom-kind r)
	636	(delay-axiom-importation module r submodule)))
635	637	;;
636	638	;; all done, hopefully
637	639	;;