~ chicken-core (chicken-5) 39c2e525bfdf0784b94192e354c8198490655e3b
commit 39c2e525bfdf0784b94192e354c8198490655e3b
Merge: c23fdb83 6725c9e2
Author: felix <felix@call-with-current-continuation.org>
AuthorDate: Wed Mar 2 09:20:44 2011 -0500
Commit: felix <felix@call-with-current-continuation.org>
CommitDate: Wed Mar 2 09:20:44 2011 -0500
resolved conflicts
diff --cc batch-driver.scm
index 15c8809e,3fd44871..28b2afdc
--- a/batch-driver.scm
+++ b/batch-driver.scm
@@@ -500,38 -500,9 +500,41 @@@
(print-node "initial node tree" '|T| node0)
(initialize-analysis-database)
++<<<<<<< HEAD
+ (when (or do-scrutinize do-specialize)
+ ;;;XXX hardcoded database file name
+ (unless (memq 'ignore-repository options)
+ (load-type-database "types.db"))
+ (for-each (cut load-type-database <> #f) (collect-options 'types))
+ (begin-time)
+ (set! first-analysis #f)
+ (set! db (analyze 'scrutiny node0))
+ (print-db "analysis" '|0| db 0)
+ (end-time "pre-analysis")
+ (begin-time)
+ (debugging 'p "performing scrutiny")
+ (scrutinize node0 db do-scrutinize do-specialize)
+ (end-time "scrutiny")
+ (when do-specialize
+ (print-node "specialization" '|P| node0))
+ (set! first-analysis #t) )
+
+ (when do-lambda-lifting
+ (begin-time)
+ (unless do-scrutinize ; no need to do analysis if already done
+ (set! first-analysis #f) ; (and not specialized)
+ (set! db (analyze 'lift node0))
+ (print-db "analysis" '|0| db 0)
+ (end-time "pre-analysis (lambda-lift)"))
+ (begin-time)
+ (perform-lambda-lifting! node0 db)
+ (end-time "lambda lifting")
+ (print-node "lambda lifted" '|L| node0)
+ (set! first-analysis #t) )
+
- (let ((req (concatenate (vector->list file-requirements))))
+ ;; collect requirements and load inline and types files
+ (let* ((req (concatenate (vector->list file-requirements)))
+ (mreq (concatenate (map cdr req))))
(when (debugging 'M "; requirements:")
(pp req))
(when enable-inline-files
Trap