X-Git-Url: http://git.lukelau.me/?p=scheme.git;a=blobdiff_plain;f=ast.scm;h=2beb94507572eafd20b586d2ce9ef3867ec63d3e;hp=c81bc2b38ef4a9bbd70590f83d49dddd2b87948b;hb=9d93b066cfd6505849dff12146159bedeadf96b9;hpb=21a9f0aaa56d6dd767cefb30c606f4c62eecff48

diff --git a/ast.scm b/ast.scm
index c81bc2b..2beb945 100644
--- a/ast.scm
+++ b/ast.scm
@@ -7,6 +7,7 @@
       ('! #t)
       ('= #t)
       ('bool->int #t)
+      ('print #t)
       (else #f)))
   (cond
    ((list? x)
@@ -15,22 +16,60 @@
       ('let 'let)
       ('lambda 'lambda)
       ('closure 'closure) ; only available in codegen
+      ('static-string 'static-string) ; only available in codegen
       (else 'app)))
    ((builtin? x) 'builtin)
    ((symbol? x) 'var)
    ((integer? x) 'int-literal)
-   ((boolean? x) 'bool-literal)))
+   ((boolean? x) 'bool-literal)
+   ((string? x) 'string-literal)))
 
 (define (ast-traverse f x)
   (case (ast-type x)
     ('let `(let ,(map (lambda (x) (list (car x) (f (cadr x))))
 		      (let-bindings x))
-	     ,@(map f (let-body e))))
+	     ,@(map f (let-body x))))
     ('app (map f x))
-    ('lambda `(lambda ,(lambda-args x) ,(f lambda-body)))
+    ('lambda `(lambda ,(lambda-args x) ,(f (lambda-body x))))
     ('if `(if ,@(map f (cdr x))))
     (else x)))
 
+(define (ast-collect f x)
+  (define (inner y) (ast-collect f y))
+  (case (ast-type x)
+    ['let (append (f x)
+		  (fold-map inner (let-bindings x))
+		  (fold-map inner (let-body x)))]
+    ['app (append (f x)
+		  (fold-map inner x))]
+    ['lambda (append (f x)
+		     (inner (lambda-body x)))]
+    ['if (append (f x)
+		 (fold-map inner (cdr x)))]
+    [else (f x)]))
+
+(define (ast-find p x)
+  (define (inner y) (ast-find p y))
+  (define (any p x) (fold-left
+		     (lambda (acc y) (if acc #t (p y)))
+		     #f
+		     x))
+  (define (either . fs)
+    (if (null? fs) #f
+	(if (car fs) (car fs)
+	    (apply either (cdr fs)))))
+		     
+  (case (ast-type x)
+    ['let (either (p x)
+		  (any inner (let-bindings x))
+		  (any inner (let-body x)))]
+    ['app (either (p x)
+		  (any inner x))]
+    ['lambda (either (p x)
+		     (inner (lambda-body x)))]
+    ['if (either (p x) (any inner (cdr x)))]
+    [else (p x)]))
+
 (define let-bindings cadr)
 (define let-body cddr)
 
@@ -42,3 +81,19 @@
 ; for use elsewhere
 (define lambda-args cadr)
 (define lambda-body caddr)
+
+; utils
+(define (fold-map f x) (fold-left append '() (map f x)))
+(define (repeat x n) (if (<= n 0) '()
+			 (cons x (repeat x (- n 1)))))
+
+
+(define-syntax push!
+  (syntax-rules ()
+    ((_ s x) (set! s (cons x s)))))
+
+(define-syntax pop!
+  (syntax-rules ()
+    ((_ s) (let ([x (car s)])
+	     (set! s (cdr s))
+	     x))))