Merge pull request #99 from cmsc430/next

Next

Author: dvanhorn

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)

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))]

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))))

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))))

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!

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)

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))))

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)]

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

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))))