X-Git-Url: https://git.distorted.org.uk/~mdw/sod/blobdiff_plain/05a2c613fbbc2caa19dd365989b2bf8859fc4e99..09efeb89e38f084c4a365cbbdce60d3674c17485:/src/frontend.lisp

diff --git a/src/frontend.lisp b/src/frontend.lisp
index d394eee..0336d1a 100644
--- a/src/frontend.lisp
+++ b/src/frontend.lisp
@@ -25,11 +25,17 @@
 
 (cl:defpackage #:sod-frontend
   (:use #:common-lisp #:optparse #:sod #:sod-parser)
-  (:shadowing-import-from #:optparse "INT"))
+  (:shadowing-import-from #:optparse #:int))
 
 (cl:in-package #:sod-frontend)
 
 ;;;--------------------------------------------------------------------------
+;;; Preparation for dumping.
+
+(clear-the-decks)
+(exercise)
+
+;;;--------------------------------------------------------------------------
 ;;; The main program.
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
@@ -110,9 +116,6 @@
 		 (or builtinsp args))
       (die-usage))
 
-    ;; Prepare the builtins.
-    (make-builtin-module)
-
     ;; Do the main parsing job.
     (multiple-value-bind (hunoz nerror nwarn)
 	(count-and-report-errors ()
@@ -169,12 +172,10 @@
 	      ;; If we're writing the builtin module then now seems like a
 	      ;; good time to do that.
 	      (when builtinsp
-		(clear-the-decks)
 		(hack-module *builtin-module*))
 
 	      ;; Parse and write out the remaining modules.
 	      (dolist (arg args)
-		(clear-the-decks)
 		(hack-module (read-module arg))))))
 
       ;; Report on how well everything worked.