cmsc430 · dvanhorn · Nov 15, 2021 · Nov 10, 2021 · Nov 10, 2021 · Nov 10, 2021
diff --git a/langs/a86/ast.rkt b/langs/a86/ast.rkt
@@ -131,7 +131,9 @@
 (instruct Je     (x)       check:target)
 (instruct Jne    (x)       check:target)
 (instruct Jl     (x)       check:target)
+(instruct Jle    (x)       check:target)
 (instruct Jg     (x)       check:target)
+(instruct Jge    (x)       check:target)
 (instruct And    (dst src) check:src-dest)
 (instruct Or     (dst src) check:src-dest)
 (instruct Xor    (dst src) check:src-dest)
@@ -191,7 +193,9 @@
       (Je? x)
       (Jne? x)
       (Jl? x)
+      (Jle? x)
       (Jg? x)
+      (Jge? x)
       (And? x)
       (Or? x)
       (Xor? x)
@@ -271,8 +275,12 @@
      (cons s (label-uses asm))]
     [(cons (Jg (? label-symbol? s)) asm)
      (cons s (label-uses asm))]
+    [(cons (Jge (? label-symbol? s)) asm)
+     (cons s (label-uses asm))]
     [(cons (Jl (? label-symbol? s)) asm)
      (cons s (label-uses asm))]
+    [(cons (Jle (? label-symbol? s)) asm)
+     (cons s (label-uses asm))]
     [(cons (Call (? label-symbol? s)) asm)
      (cons s (label-uses asm))]
     [(cons (Lea _ (? label-symbol? s)) asm)

diff --git a/langs/a86/printer.rkt b/langs/a86/printer.rkt
@@ -54,7 +54,7 @@
       [(Offset (? reg? r) i)
        (string-append "[" (reg->string r) " + " (number->string i) "]")]
       [(Offset (? label? l) i)
-       (string-append "[" (symbol->string l) " + " (number->string i) "]")]
+       (string-append "[" (label-symbol->string l) " + " (number->string i) "]")]
       [(Const l)
        (symbol->string l)]
       [(? exp?) (exp->string a)]))
@@ -127,9 +127,15 @@
       [(Jl l)
        (string-append tab "jl "
                       (jump-target->string l))]
+      [(Jle l)
+       (string-append tab "jle "
+                      (jump-target->string l))]
       [(Jg l)
        (string-append tab "jg "
                       (jump-target->string l))]
+      [(Jge l)
+       (string-append tab "jge "
+                      (jump-target->string l))]
       [(Call l)
        (string-append tab "call "
                       (jump-target->string l))]

diff --git a/langs/evildoer/interp-file.rkt b/langs/evildoer/interp-file.rkt
@@ -9,5 +9,7 @@
   (let ((p (open-input-file fn)))
     (begin
       (read-line p) ; ignore #lang racket line
-      (println (interp (parse (read p))))
+      (let ((r (interp (parse (read p)))))
+        (unless (void? r)
+          (println r)))
       (close-input-port p))))
diff --git a/langs/fraud/interp-file.rkt b/langs/fraud/interp-file.rkt
@@ -9,5 +9,7 @@
   (let ((p (open-input-file fn)))
     (begin
       (read-line p) ; ignore #lang racket line
-      (println (interp (parse (read p))))
+      (let ((r (interp (parse (read p)))))
+        (unless (void? r)
+          (println r)))
       (close-input-port p))))
diff --git a/langs/hoax/ast.rkt b/langs/hoax/ast.rkt
@@ -25,7 +25,7 @@
 ;;           | 'vector? | vector-length
 ;;           | 'string? | string-length
 ;; type Op2  = '+ | '- | '< | '=
-;;           | 'cons
+;;           | 'cons | 'eq?
 ;;           | 'make-vector | 'vector-ref
 ;;           | 'make-string | 'string-ref
 ;; type Op3  = 'vector-set!

diff --git a/langs/hoax/compile-ops.rkt b/langs/hoax/compile-ops.rkt
@@ -216,9 +216,9 @@
 
             (Sar rax char-shift)
 
-            (Add r9 1) ; adds 1
-            (Sar r9 1) ; when
-            (Sal r9 1) ; len is odd
+            (Add r8 1) ; adds 1
+            (Sar r8 1) ; when
+            (Sal r8 1) ; len is odd
 
             (Label loop)
             (Mov (Offset rbx 0) eax)

diff --git a/langs/hoax/interp-file.rkt b/langs/hoax/interp-file.rkt
@@ -9,5 +9,7 @@
   (let ((p (open-input-file fn)))
     (begin
       (read-line p) ; ignore #lang racket line
-      (println (interp (parse (read p))))
+      (let ((r (interp (parse (read p)))))
+        (unless (void? r)
+          (println r)))
       (close-input-port p))))
diff --git a/langs/hoax/interp.rkt b/langs/hoax/interp.rkt
@@ -33,7 +33,7 @@
     [(Eof)    eof]
     [(Empty)  '()]
     [(Var x)  (lookup r x)]
-    [(Str s)  (string-copy s)]
+    [(Str s)  s]
     [(Prim0 'void) (void)]
     [(Prim0 'read-byte) (read-byte)]
     [(Prim0 'peek-byte) (peek-byte)]

diff --git a/langs/hoax/test/test-runner.rkt b/langs/hoax/test/test-runner.rkt
@@ -149,7 +149,10 @@
   (check-equal? (run '(string-ref "fred" 2)) #\e)
   (check-equal? (run '(string-ref "fred" 4)) 'err)
   (check-equal? (run '(string? "fred")) #t)
-  (check-equal? (run '(string? (cons 1 2))) #f))
+  (check-equal? (run '(string? (cons 1 2))) #f)
+  (check-equal? (run '(begin (make-string 3 #\f)
+                             (make-string 3 #\f)))
+                "fff"))
 
 (define (test-runner-io run)
   ;; Evildoer examples

diff --git a/langs/hustle/interp-file.rkt b/langs/hustle/interp-file.rkt
@@ -9,5 +9,7 @@
   (let ((p (open-input-file fn)))
     (begin
       (read-line p) ; ignore #lang racket line
-      (println (interp (parse (read p))))
+      (let ((r (interp (parse (read p)))))
+        (unless (void? r)
+          (println r)))
       (close-input-port p))))
diff --git a/langs/iniquity/compile-ops.rkt b/langs/iniquity/compile-ops.rkt
@@ -216,9 +216,9 @@
 
             (Sar rax char-shift)
 
-            (Add r9 1) ; adds 1
-            (Sar r9 1) ; when
-            (Sal r9 1) ; len is odd
+            (Add r8 1) ; adds 1
+            (Sar r8 1) ; when
+            (Sal r8 1) ; len is odd
 
             (Label loop)
             (Mov (Offset rbx 0) eax)

diff --git a/langs/iniquity/interp-file.rkt b/langs/iniquity/interp-file.rkt
@@ -9,5 +9,7 @@
   (let ((p (open-input-file fn)))
     (begin
       (read-line p) ; ignore #lang racket line
-      (println (interp (parse (read-all p))))
+      (let ((r (interp (parse (read-all p)))))
+        (unless (void? r)
+          (println r)))
       (close-input-port p))))
diff --git a/langs/iniquity/interp.rkt b/langs/iniquity/interp.rkt
@@ -36,7 +36,7 @@
     [(Eof)    eof]
     [(Empty)  '()]
     [(Var x)  (lookup r x)]
-    [(Str s)  (string-copy s)]
+    [(Str s)  s]
     [(Prim0 'void) (void)]
     [(Prim0 'read-byte) (read-byte)]
     [(Prim0 'peek-byte) (peek-byte)]

diff --git a/langs/iniquity/test/test-runner.rkt b/langs/iniquity/test/test-runner.rkt
@@ -143,6 +143,9 @@
   (check-equal? (run '(string-ref "fred" 4)) 'err)
   (check-equal? (run '(string? "fred")) #t)
   (check-equal? (run '(string? (cons 1 2))) #f)
+  (check-equal? (run '(begin (make-string 3 #\f)
+                             (make-string 3 #\f)))
+                "fff")
 
   ;; Iniquity tests
   (check-equal? (run

diff --git a/langs/jig/compile-ops.rkt b/langs/jig/compile-ops.rkt
@@ -216,9 +216,9 @@
 
             (Sar rax char-shift)
 
-            (Add r9 1) ; adds 1
-            (Sar r9 1) ; when
-            (Sal r9 1) ; len is odd
+            (Add r8 1) ; adds 1
+            (Sar r8 1) ; when
+            (Sal r8 1) ; len is odd
 
             (Label loop)
             (Mov (Offset rbx 0) eax)

diff --git a/langs/jig/interp-file.rkt b/langs/jig/interp-file.rkt
@@ -9,5 +9,7 @@
   (let ((p (open-input-file fn)))
     (begin
       (read-line p) ; ignore #lang racket line
-      (println (interp (parse (read-all p))))
+      (let ((r (interp (parse (read-all p)))))
+        (unless (void? r)
+          (println r)))
       (close-input-port p))))
diff --git a/langs/jig/interp.rkt b/langs/jig/interp.rkt
@@ -36,7 +36,7 @@
     [(Eof)    eof]
     [(Empty)  '()]
     [(Var x)  (lookup r x)]
-    [(Str s)  (string-copy s)]
+    [(Str s)  s]
     [(Prim0 'void) (void)]
     [(Prim0 'read-byte) (read-byte)]
     [(Prim0 'peek-byte) (peek-byte)]

diff --git a/langs/jig/test/test-runner.rkt b/langs/jig/test/test-runner.rkt
@@ -143,6 +143,9 @@
   (check-equal? (run '(string-ref "fred" 4)) 'err)
   (check-equal? (run '(string? "fred")) #t)
   (check-equal? (run '(string? (cons 1 2))) #f)
+  (check-equal? (run '(begin (make-string 3 #\f)
+                             (make-string 3 #\f)))
+                "fff")
 
   ;; Iniquity tests
   (check-equal? (run

diff --git a/langs/knock/compile-ops.rkt b/langs/knock/compile-ops.rkt
@@ -216,9 +216,9 @@
 
             (Sar rax char-shift)
 
-            (Add r9 1) ; adds 1
-            (Sar r9 1) ; when
-            (Sal r9 1) ; len is odd
+            (Add r8 1) ; adds 1
+            (Sar r8 1) ; when
+            (Sal r8 1) ; len is odd
 
             (Label loop)
             (Mov (Offset rbx 0) eax)

diff --git a/langs/knock/interp-file.rkt b/langs/knock/interp-file.rkt
@@ -0,0 +1,15 @@
+#lang racket
+(provide main)
+(require "parse.rkt" "interp.rkt" "read-all.rkt")
+
+;; String -> Void
+;; Parse and interpret contents of given filename,
+;; print result on stdout
+(define (main fn)
+  (let ((p (open-input-file fn)))
+    (begin
+      (read-line p) ; ignore #lang racket line
+      (let ((r (interp (parse (read-all p)))))
+        (unless (void? r)
+          (println r)))
+      (close-input-port p))))
diff --git a/langs/knock/test/test-runner.rkt b/langs/knock/test/test-runner.rkt
@@ -143,6 +143,9 @@
   (check-equal? (run '(string-ref "fred" 4)) 'err)
   (check-equal? (run '(string? "fred")) #t)
   (check-equal? (run '(string? (cons 1 2))) #f)
+  (check-equal? (run '(begin (make-string 3 #\f)
+                             (make-string 3 #\f)))
+                "fff")
 
   ;; Iniquity tests
   (check-equal? (run

diff --git a/langs/loot/ast.rkt b/langs/loot/ast.rkt
@@ -21,6 +21,7 @@
 ;;           | (Begin Expr Expr)
 ;;           | (Let Id Expr Expr)
 ;;           | (Var Id)
+;;           | (Match Expr (Listof Pat) (Listof Expr))
 ;;           | (App Expr (Listof Expr))
 ;;           | (Lam Id (Listof Id) Expr)
 ;; type Id   = Symbol
@@ -30,13 +31,24 @@
 ;;           | 'write-byte | 'eof-object?
 ;;           | 'box | 'car | 'cdr | 'unbox
 ;;           | 'empty? | 'cons? | 'box?
-;;           | 'vector? | vector-length
-;;           | 'string? | string-length
+;;           | 'vector? | 'vector-length
+;;           | 'string? | 'string-length
 ;; type Op2  = '+ | '- | '< | '=
 ;;           | 'cons
 ;;           | 'make-vector | 'vector-ref
 ;;           | 'make-string | 'string-ref
 ;; type Op3  = 'vector-set!
+;; type Pat  = (PVar Id)
+;;           | (PWild)
+;;           | (PLit Lit)
+;;           | (PBox Pat)
+;;           | (PCons Pat Pat)
+;;           | (PAnd Pat Pat)
+;; type Lit  = Boolean
+;;           | Character
+;;           | Integer
+;;           | '()
+
 (struct Eof   ()           #:prefab)
 (struct Empty ()           #:prefab)
 (struct Int   (i)          #:prefab)
@@ -53,3 +65,11 @@
 (struct Var   (x)          #:prefab)
 (struct App   (e es)       #:prefab)
 (struct Lam   (f xs e)     #:prefab)
+(struct Match (e ps es)    #:prefab)
+
+(struct PVar  (x)          #:prefab)
+(struct PWild ()           #:prefab)
+(struct PLit  (x)          #:prefab)
+(struct PBox  (p)          #:prefab)
+(struct PCons (p1 p2)      #:prefab)
+(struct PAnd  (p1 p2)      #:prefab)
diff --git a/langs/loot/compile-ops.rkt b/langs/loot/compile-ops.rkt
@@ -216,9 +216,9 @@
 
             (Sar rax char-shift)
 
-            (Add r9 1) ; adds 1
-            (Sar r9 1) ; when
-            (Sal r9 1) ; len is odd
+            (Add r8 1) ; adds 1
+            (Sar r8 1) ; when
+            (Sal r8 1) ; len is odd
 
             (Label loop)
             (Mov (Offset rbx 0) eax)