Changeset 39042 in project for release

Timestamp:

09/18/20 15:10:06 (5 months ago)

Author:

Kon Lovett

Message:

import csi when csi, -O4 -d0

Location:

release/5/expand-full/trunk

Files:

• expand-full.egg (modified) (2 diffs)
• expand-full.scm (modified) (3 diffs)

release/5/expand-full/trunk/expand-full.egg

@@ -3 +3 @@
 
 ((synopsis "Full macro expansion")
- (version "2.1.0")
+ (version "2.1.1")
  (category misc)
  (author "[[kon lovett]]")
@@ -12 +12 @@
   (extension expand-full
     (types-file)
-    (csc-options "-O3" "-d1" "-strict-types" "-no-procedure-checks") ) ) )
+    (csc-options "-O4" "-d0" "-strict-types" "-no-procedure-checks") ) ) )

release/5/expand-full/trunk/expand-full.scm

@@ -25 +25 @@
 (import (chicken syntax))
 (import (only (chicken platform) feature?))
-#; ;NOTE since could be used in a compiled context cannot require a "non-existing" module
-(import (only (chicken csi) toplevel-command))
 (import (only (chicken pretty-print) pretty-print))
 (import (only (srfi 1) proper-list?))
@@ -41 +39 @@
 (define (across func form)
   (cond
-    ((vector? form) (vector-map (lambda (_ x) (func x)) form))
-    ((pair? form)   (safe-list-map func form))
-    (else           form)) )
+    ((vector? form)
+      (vector-map (lambda (_ x) (func x)) form))
+    ((pair? form)
+      (print "across " form)
+      (if (or (eq? 'quote (car form)) (eq? '##core#quote (car form)))
+        form
+        (safe-list-map func form)))
+    (else
+      form)) )
 
 (define (down stpr form expanded)
@@ -77 +81 @@
 
 (when (feature? 'csi)
-  (chicken.csi#toplevel-command 'x*
+  ;; Load csi library at runtime here in Chicken 5 only after we confirm
+  ;; csi is running. Otherwise chicken.csi load fails.
+  (import (only (chicken csi) toplevel-command))
+  (toplevel-command 'x*
     ;FIXME need apropos like csi argument handler
     (lambda () (ppexpand* (read)))