crook

cmsc430 · Nov 25, 2024 · 30f8a88 · 30f8a88
1 parent 5cb072e
commit 30f8a88
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 6 deletions.
diff --git a/iniquity-plus/exec-io.rkt b/iniquity-plus/exec-io.rkt
@@ -0,0 +1,14 @@
+#lang racket
+(require a86/interp)
+(require "compile.rkt")
+(require "interp-io.rkt")
+(require "types.rkt")
+(require "build-runtime.rkt")
+(provide exec/io)
+;; Prog String -> (cons Answer String)
+(define (exec/io p in)
+  (parameterize ((current-objs (list (path->string runtime-path))))
+    (match (asm-interp/io (compile p) in)
+      [(cons 'err o) (cons 'err o)]
+      [(cons b o) (cons (bits->value b) o)])))
+
diff --git a/iniquity-plus/exec.rkt b/iniquity-plus/exec.rkt
@@ -0,0 +1,14 @@
+#lang racket
+(require a86/interp)
+(require "compile.rkt")
+(require "interp.rkt")
+(require "types.rkt")
+(require "build-runtime.rkt")
+(provide exec)
+;; Prog -> Answer
+(define (exec p)
+  (parameterize ((current-objs (list (path->string runtime-path))))
+    (match (asm-interp (compile p))
+      ['err 'err]
+      [b (bits->value b)])))
+
diff --git a/iniquity-plus/test/compile.rkt b/iniquity-plus/test/compile.rkt
@@ -1,8 +1,9 @@
 #lang racket
 (require "../compile.rkt")
 (require "../parse.rkt")
-(require "../run.rkt")
+(require "../exec.rkt")
+(require "../exec-io.rkt")
 (require "test-runner.rkt")
-(test (λ p (run (compile (apply parse p)))))
-(test/io (λ (in . p) (run/io (compile (apply parse p)) in)))
+(test (λ p (exec (apply parse p))))
+(test/io (λ (in . p) (exec/io (apply parse p) in)))
 
diff --git a/knock-plus/exec-io.rkt b/knock-plus/exec-io.rkt
@@ -0,0 +1,14 @@
+#lang racket
+(require a86/interp)
+(require "compile.rkt")
+(require "interp-io.rkt")
+(require "types.rkt")
+(require "build-runtime.rkt")
+(provide exec/io)
+;; Prog String -> (cons Answer String)
+(define (exec/io p in)
+  (parameterize ((current-objs (list (path->string runtime-path))))
+    (match (asm-interp/io (compile p) in)
+      [(cons 'err o) (cons 'err o)]
+      [(cons b o) (cons (bits->value b) o)])))
+
diff --git a/knock-plus/exec.rkt b/knock-plus/exec.rkt
@@ -0,0 +1,14 @@
+#lang racket
+(require a86/interp)
+(require "compile.rkt")
+(require "interp.rkt")
+(require "types.rkt")
+(require "build-runtime.rkt")
+(provide exec)
+;; Prog -> Answer
+(define (exec p)
+  (parameterize ((current-objs (list (path->string runtime-path))))
+    (match (asm-interp (compile p))
+      ['err 'err]
+      [b (bits->value b)])))
+
diff --git a/knock-plus/test/compile.rkt b/knock-plus/test/compile.rkt
@@ -1,8 +1,9 @@
 #lang racket
 (require "../compile.rkt")
 (require "../parse.rkt")
-(require "../run.rkt")
+(require "../exec.rkt")
+(require "../exec-io.rkt")
 (require "test-runner.rkt")
-(test (λ p (run (compile (apply parse p)))))
-(test/io (λ (in . p) (run/io (compile (apply parse p)) in)))
+(test (λ p (exec (apply parse p))))
+(test/io (λ (in . p) (exec/io (apply parse p) in)))