Merge pull request #121 from cmsc430/stdin

Stdin

Author: dvanhorn

langs/abscond/Makefile

@@ -2,8 +2,10 @@ UNAME := $(shell uname)
 
 ifeq ($(UNAME), Darwin)
   format=macho64
+  CC=arch -x86_64 gcc
 else
   format=elf64
+  CC=gcc
 endif
 
 objs = \
@@ -16,16 +18,16 @@ runtime.o: $(objs)
 	ld -r $(objs) -o runtime.o
 
 %.run: %.o runtime.o
-	arch -x86_64 gcc runtime.o $< -o $@
+	$(CC) runtime.o $< -o $@
 
 .c.o:
-	arch -x86_64 gcc -fPIC -c -g -o $@ $<
+	$(CC) -fPIC -c -g -o $@ $<
 
 .s.o:
 	nasm -g -f $(format) -o $@ $<
 
 %.s: %.rkt
-	racket -t compile-file.rkt -m $< > $@
+	cat $< | racket -t compile-stdin.rkt -m > $@
 
 clean:
 	rm *.o *.s *.run

langs/abscond/compile-file.rkt

@@ -0,0 +1,10 @@
+#lang racket
+(provide main)
+(require "parse.rkt" "compile.rkt" a86/printer)
+
+;; -> Void
+;; Compile contents of stdin,
+;; emit asm code on stdout
+(define (main)
+  (read-line) ; ignore #lang racket line
+  (asm-display (compile (parse (read)))))

langs/abscond/compile-stdin.rkt

@@ -0,0 +1,10 @@
+#lang racket
+(provide main)
+(require "parse.rkt" "interp.rkt")
+
+;; -> Void
+;; Parse and interpret contents of stdin,
+;; print result on stdout
+(define (main)
+  (read-line) ; ignore #lang racket line
+  (println (interp (parse (read)))))

langs/abscond/interp-file.rkt

@@ -1,10 +1,11 @@
 UNAME := $(shell uname)
-.PHONY: test
 
 ifeq ($(UNAME), Darwin)
   format=macho64
+  CC=arch -x86_64 gcc
 else
   format=elf64
+  CC=gcc
 endif
 
 objs = \
@@ -17,19 +18,19 @@ runtime.o: $(objs)
 	ld -r $(objs) -o runtime.o
 
 %.run: %.o runtime.o
-	gcc runtime.o $< -o $@
+	$(CC) runtime.o $< -o $@
 
 .c.o:
-	gcc -fPIC -c -g -o $@ $<
+	$(CC) -fPIC -c -g -o $@ $<
 
 .s.o:
 	nasm -g -f $(format) -o $@ $<
 
 %.s: %.rkt
-	racket -t compile-file.rkt -m $< > $@
+	cat $< | racket -t compile-stdin.rkt -m > $@
 
 clean:
 	rm *.o *.s *.run
 
-test: example.run
-	@test "$(shell ./example.run)" = "$(shell racket example.rkt)"
+%.test: %.run %.rkt
+	@test "$(shell ./$(<))" = "$(shell racket $(word 2,$^))"

langs/abscond/interp-stdin.rkt

@@ -0,0 +1,10 @@
+#lang racket
+(provide main)
+(require "parse.rkt" "compile.rkt" a86/printer)
+
+;; -> Void
+;; Compile contents of stdin,
+;; emit asm code on stdout
+(define (main)
+  (read-line) ; ignore #lang racket line
+  (asm-display (compile (parse (read)))))

langs/blackmail/Makefile

@@ -0,0 +1,10 @@
+#lang racket
+(provide main)
+(require "parse.rkt" "interp.rkt")
+
+;; -> Void
+;; Parse and interpret contents of stdin,
+;; print result on stdout
+(define (main)
+  (read-line) ; ignore #lang racket line
+  (println (interp (parse (read)))))