Merge pull request #6 from cmsc430/crook

crook

Author: dvanhorn

dupe-plus/ast.rkt

@@ -1,11 +1,9 @@
 #lang racket
-(provide Lit Prim1 If)
+(provide Lit Prim1 If Cond)
 ;; type Expr = (Lit Datum)
 ;;           | (Prim1 Op1 Expr)
 ;;           | (If Expr Expr Expr)
-;;           | (Cond [Listof CondClause] Expr)
-
-;; type CondClause = (Clause Expr Expr)
+;;           | (Cond [Listof Expr] [Listof Expr] Expr)
 ;; type Datum = Integer
 ;;            | Boolean
 ;; type Op1 = 'add1 | 'sub1
@@ -14,4 +12,5 @@
 (struct Lit (d) #:prefab)
 (struct Prim1 (p e) #:prefab)
 (struct If (e1 e2 e3) #:prefab)
+(struct Cond (cs es el) #:prefab)
 

dupe-plus/compile-ops.rkt

@@ -16,5 +16,14 @@
      (seq (Cmp rax 0)
           (Mov rax (value->bits #f))
           (Mov r9  (value->bits #t))
-          (Cmove rax r9))]))
+          (Cmove rax r9))]
+    ['abs
+     ;; TODO
+     (seq)]
+    ['-
+     ;; TODO
+     (seq)]
+    ['not
+     ;; TODO
+     (seq)]))
 

dupe-plus/compile.rkt

@@ -22,7 +22,9 @@
     [(Lit d) (compile-value d)]
     [(Prim1 p e) (compile-prim1 p e)]
     [(If e1 e2 e3)
-     (compile-if e1 e2 e3)]))
+     (compile-if e1 e2 e3)]
+    [(Cond eqs eas el) ;; TODO
+     (seq)]))
 
 ;; Value -> Asm
 (define (compile-value v)

dupe-plus/interp-prim.rkt

@@ -8,7 +8,13 @@
     ['add1 (add1 v)]
     ['sub1 (sub1 v)]
     ['zero? (zero? v)]
-    ['not (not v)]
-    ['- (- v)]
-    ['abs (abs v)]))
+    ['not
+     ;; TODO
+     0]
+    ['-
+     ;; TODO
+     0]
+    ['abs
+     ;; TODO
+     0]))
 

dupe-plus/interp.rkt

@@ -15,5 +15,8 @@
     [(If e1 e2 e3)
      (if (interp e1)
          (interp e2)
-         (interp e3))]))
+         (interp e3))]
+    [(Cond eqs eas el)
+     ;; TODO
+     0]))
 

dupe-plus/parse.rkt

@@ -18,9 +18,21 @@
           [(list s1 s2 s3)
            (If (parse s1) (parse s2) (parse s3))]
           [_ (error "if: bad syntax" s)])]
+       ['cond
+        (parse-cond sr)]
        [_ (error "parse error" s)])]
     [_ (error "parse error" s)]))
 
+;; S-Expr -> Cond
+(define (parse-cond s)
+  (match s
+    [(list (list 'else s)) (Cond '() '() (parse s))]
+    [(cons (list s1 s2) sr)
+     (match (parse-cond sr)
+       [(Cond qs es e)
+        (Cond (cons (parse s1) qs) (cons (parse s2) es) e)])]
+    [_ (error "parse error")]))
+
 ;; Any -> Boolean
 (define (datum? x)
   (or (exact-integer? x)

iniquity-plus/ast.rkt

@@ -1,5 +1,6 @@
 #lang racket
-(provide Lit Prim0 Prim1 Prim2 Prim3 If Eof Begin
+(provide Lit Prim0 Prim1 Prim2 Prim3 If
+         Eof Begin
          Let Var Prog Defn App
          Apply FunPlain FunRest FunCase)
 

knock-plus/ast.rkt

@@ -1,5 +1,6 @@
 #lang racket
-(provide Lit Prim0 Prim1 Prim2 Prim3 PrimN If Eof Begin
+(provide Lit Prim0 Prim1 Prim2 Prim3 PrimN If
+         Eof Begin
          Let Var Prog Defn App
          Match Box Cons Conj
          List Pred Vect)