Compare commits

..

No commits in common. "df520e99cafd1545c557b07cbd3e79abbaec7915" and "4c67b0f18d41615503e43742b3cc13c2e222fde4" have entirely different histories.

4 changed files with 18 additions and 60 deletions

View File

@ -7,7 +7,7 @@
(define (explicate-control sexp)
(match sexp
[`(program ,info ,exp)
`(program ,info ((start . ,(explicate-control-tail exp))))]))
`(program ,info ,(explicate-control-tail exp))]))
; after a remove-complex-opera*, all expressions
; are compatible with C0

View File

@ -5,7 +5,7 @@
(require "explicate-control.scm")
(require "c2.scm")
(define programs
(define programs
(list
`(program () (+ 2 3))
`(program () (+ (- 2) 3))
@ -19,46 +19,41 @@
`(program () (+ (let ([x (+ (- 1) 2)]) (+ x 2)) (+ 4 5)))))
(define (pass program) (explicate-control (remove-complex-opera* program)))
(test-eq
(pass (list-ref programs 0))
`(program ()
((start .
(return (+ 2 3))))))
(return (+ 2 3))))
(test-eq
(pass (list-ref programs 1))
`(program ()
((start .
(seq (assign tmp.1 (- 2))
(return (+ tmp.1 3)))))))
(seq (assign tmp.1 (- 2))
(return (+ tmp.1 3)))))
(test-eq
(pass (list-ref programs 2))
`(program ()
((start .
(seq (assign x.1 20)
(seq (assign x.2 22)
(seq (assign y.1 (+ x.1 x.2))
(return y.1))))))))
(seq (assign x.1 20)
(seq (assign x.2 22)
(seq (assign y.1 (+ x.1 x.2))
(return y.1))))))
(test-eq
(pass (list-ref programs 3))
`(program ()
((start .
(seq (assign a.1 42)
(seq (assign b.1 a.1)
(return b.1)))))))
(seq (assign a.1 42)
(seq (assign b.1 a.1)
(return b.1)))))
(test-eq
(pass (list-ref programs 4))
`(program ()
((start .
(seq (assign tmp.1 (- 1))
(seq (assign x.1 (+ tmp.1 2))
(seq (assign tmp.2 (+ x.1 2))
(seq (assign tmp.3 (+ 4 5))
(return (+ tmp.2 tmp.3))))))))))
(seq (assign tmp.1 (- 1))
(seq (assign x.1 (+ tmp.1 2))
(seq (assign tmp.2 (+ x.1 2))
(seq (assign tmp.3 (+ 4 5))
(return (+ tmp.2 tmp.3))))))))

View File

@ -1,15 +0,0 @@
#lang racket
(require "uncover-locals.scm")
(require "test-util.scm")
(define programs
(list
`(program ()
((start . (seq (assign x.1 20) (seq (assign x.2 3) (return (+ x.1 x.2)))))))))
(test-eq
(cadr (uncover-locals (list-ref programs 0)))
`(locals . (x.1 x.2)))

View File

@ -1,22 +0,0 @@
#lang racket
(provide uncover-locals)
(define (uncover-locals p)
(match p
[`(program ,data ,c0-blocks)
`(program ,(append data (cons `locals (uncover-locals-blocks c0-blocks))) c0-blocks)]))
(define (uncover-locals-blocks c0-blocks)
(if (empty? c0-blocks)
`()
(append (uncover-locals-block (car c0-blocks)) (uncover-locals-blocks (cdr c0-blocks)))))
(define (uncover-locals-block c0-block)
(match c0-block
[`(,label . ,tail) (uncover-locals-tail tail)]))
(define (uncover-locals-tail c0-tail)
(match c0-tail
[`(return ,exp) `()]
[`(seq (assign ,var ,exp) ,next) (cons var (uncover-locals-tail next))]))