Codebase list cafeobj / c1aad5a
Fixed the problem with reduction immediately after adding an axiom in opening module. tswd 8 years ago
2 changed file(s) with 8 addition(s) and 4 deletion(s). Raw diff Collapse all Expand all
248248 ;; (reset-rewrite-counters)-(begin-rewrite)-(end-rewrite)
249249 (defun reducer-no-stat (term context-module rewrite-mode)
250250 (with-in-module ((prepare-reduction-env term context-module rewrite-mode nil))
251 ;; be ready for rewriting
252 (!setup-reduction *current-module*)
251253 (catch 'rewrite-abort
252254 (if *rewrite-exec-mode*
253255 (rewrite-exec $$target-term *current-module* rewrite-mode)
148148 ;; print out prelude message
149149 (unless *chaos-quiet*
150150 (with-in-module (mod)
151 (format t "~%-- ~a in " (if (eq mode :exec)
151 (format t "~&-- ~a in " (if (eq mode :exec)
152152 "execute"
153153 (if (eq mode :exec+)
154154 "execute!"
162162 (term-print-with-sort term))
163163 (flush-all)))
164164 ;; do the rewriting
165 (let ((*chaos-quiet* t))
166 (compile-module mod))
165167 (setq result (reducer term mod mode))
166168 ;; print out the resultant term
167169 (with-in-module (mod)
263265 (target-term nil))
264266 (when (modexp-is-error mod)
265267 (with-output-chaos-error ('no-such-module)
266 (princ "incorrect module expression, not such module: ")
268 (princ "incorrect module expression, no such module: ")
267269 (print-chaos-object modexp)))
268270 ;;
269271 (context-push-and-move (get-context-module t) mod)
455457 (setf mod (eval-modexp modexp))
456458 (when (modexp-is-error mod)
457459 (with-output-chaos-error ('no-such-module)
458 (format t "incorrect module expression, unknown module?")
460 (format t "incorrect module expression, or unknown module: ")
459461 (print-modexp modexp)))
460462 (describe-module mod)))
461463
472474 (eval-modexp modexp)))
473475 (when (modexp-is-error mod)
474476 (with-output-chaos-error ('no-such-module)
475 (princ "incorrect module expression or uknown module")
477 (princ "incorrect module expression or uknown module ")
476478 (print-modexp modexp)))
477479 ;;
478480 (unless mod