Merge branch 'main' of github.com:cmsc430/www

dvanhorn · dvanhorn · commit 4d65c99e5d80 · 2023-06-15T14:48:29.000-04:00
diff --git a/.github/workflows/langs.yml b/.github/workflows/langs.yml
@@ -6,9 +6,9 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-18.04, ubuntu-20.04]
+        os: [ubuntu-20.04, ubuntu-22.04]
         racket-variant: ['BC', 'CS']
-        racket-version: ['7.8', '8.0', '8.6']
+        racket-version: ['7.8', '8.0', '8.6', '8.8']
     name: Test on Racket ${{ matrix.racket-variant }} ${{ matrix.racket-version }} on ${{ matrix.os }}	
     steps:
     - name: Checkout
@@ -20,7 +20,7 @@ jobs:
         sudo apt-get install libunistring2
         sudo apt-get install libunistring-dev
     - name: Install Racket
-      uses: Bogdanp/setup-racket@v1.5
+      uses: Bogdanp/setup-racket@v1.10
       with:
         architecture: 'x64'
         distribution: 'full'
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -15,12 +15,12 @@ jobs:
         sudo apt-get install fonts-stix
         sudo apt-get install libunistring-dev
     - name: Install Racket
-      uses: Bogdanp/setup-racket@v1.5
+      uses: Bogdanp/setup-racket@v1.10
       with:
         architecture: 'x64'
         distribution: 'full'
         variant: 'CS'
-        version: '8.3'
+        version: '8.6'
     - name: Build and test
       run: |
         export LINK_DIR=/usr/lib/x86_64-linux-gnu
diff --git a/langs/abscond/Makefile b/langs/abscond/Makefile
@@ -12,7 +12,12 @@ objs = \
 	main.o \
 	print.o
 
-default: runtime.o
+default: submit.zip
+
+submit.zip:
+	zip submit.zip -r * \
+		-x \*.[os] -x \*~ -x \*zip \
+		-x \*Zone.Identifier -x **compiled**
 
 runtime.o: $(objs)
 	ld -r $(objs) -o runtime.o
diff --git a/langs/blackmail/Makefile b/langs/blackmail/Makefile
@@ -12,7 +12,12 @@ objs = \
 	main.o \
 	print.o
 
-default: runtime.o
+default: submit.zip
+
+submit.zip:
+	zip submit.zip -r * \
+		-x \*.[os] -x \*~ -x \*zip \
+		-x \*Zone.Identifier -x **compiled**
 
 runtime.o: $(objs)
 	ld -r $(objs) -o runtime.o
diff --git a/langs/con/Makefile b/langs/con/Makefile
@@ -12,7 +12,12 @@ objs = \
 	main.o \
 	print.o
 
-default: runtime.o
+default: submit.zip
+
+submit.zip:
+	zip submit.zip -r * \
+		-x \*.[os] -x \*~ -x \*zip \
+		-x \*Zone.Identifier -x **compiled**
 
 runtime.o: $(objs)
 	ld -r $(objs) -o runtime.o
diff --git a/langs/dupe/Makefile b/langs/dupe/Makefile
@@ -13,7 +13,12 @@ objs = \
 	print.o \
 	values.o
 
-default: runtime.o
+default: submit.zip
+
+submit.zip:
+	zip submit.zip -r * \
+		-x \*.[os] -x \*~ -x \*zip \
+		-x \*Zone.Identifier -x **compiled**
 
 runtime.o: $(objs)
 	ld -r $(objs) -o runtime.o
diff --git a/langs/evildoer/Makefile b/langs/evildoer/Makefile
@@ -14,7 +14,12 @@ objs = \
 	values.o \
 	io.o
 
-default: runtime.o
+default: submit.zip
+
+submit.zip:
+	zip submit.zip -r * \
+		-x \*.[os] -x \*~ -x \*zip \
+		-x \*Zone.Identifier -x **compiled**
 
 runtime.o: $(objs)
 	ld -r $(objs) -o runtime.o
diff --git a/langs/evildoer/build-runtime.rkt b/langs/evildoer/build-runtime.rkt
@@ -4,9 +4,9 @@
 (require racket/runtime-path)
 (define-runtime-path here ".")
 
-(system (string-append "make -C "
+(system (string-append "make -C '"
                        (path->string (normalize-path here))
-		       " runtime.o"))
+		       "' runtime.o"))
 
 (define runtime-path
   (normalize-path (build-path here "runtime.o")))
diff --git a/langs/evildoer/test/all.rkt b/langs/evildoer/test/all.rkt
@@ -53,7 +53,12 @@
   (check-equal? (run '(char? #t)) #f)
   (check-equal? (run '(char? 8)) #f)
   (check-equal? (run '(char->integer #\a)) (char->integer #\a))
-  (check-equal? (run '(integer->char 955)) #\λ))
+  (check-equal? (run '(integer->char 955)) #\λ)
+
+  ;; Evildoer examples
+  (check-equal? (run '(void)) (void))
+  (check-equal? (run '(begin 1 2)) 2)
+  (check-equal? (run '(eof-object? (void))) #f))
 
 (test-runner (λ (e) (interp (parse e))))
 (test-runner (λ (e) (bits->value (asm-interp (compile (parse e))))))
diff --git a/langs/extort/Makefile b/langs/extort/Makefile
@@ -14,7 +14,12 @@ objs = \
 	values.o \
 	io.o
 
-default: runtime.o
+default: submit.zip
+
+submit.zip:
+	zip submit.zip -r * \
+		-x \*.[os] -x \*~ -x \*zip \
+		-x \*Zone.Identifier -x **compiled**
 
 runtime.o: $(objs)
 	ld -r $(objs) -o runtime.o
diff --git a/langs/extort/build-runtime.rkt b/langs/extort/build-runtime.rkt
@@ -4,9 +4,9 @@
 (require racket/runtime-path)
 (define-runtime-path here ".")
 
-(system (string-append "make -C "
+(system (string-append "make -C '"
                        (path->string (normalize-path here))
-		       " runtime.o"))
+		       "' runtime.o"))
 
 (define runtime-path
   (normalize-path (build-path here "runtime.o")))
diff --git a/langs/extort/parse.rkt b/langs/extort/parse.rkt
@@ -18,7 +18,7 @@
 
 ;; Any -> Boolean
 (define (op0? x)
-  (memq x '(read-byte peek-byte)))
+  (memq x '(read-byte peek-byte void)))
 
 ;; Any -> Boolean
 (define (op1? x)
diff --git a/langs/extort/test/all.rkt b/langs/extort/test/all.rkt
@@ -56,6 +56,12 @@
   (check-equal? (run '(char? 8)) #f)
   (check-equal? (run '(char->integer #\a)) (char->integer #\a))
   (check-equal? (run '(integer->char 955)) #\λ)
+
+  ;; Evildoer examples
+  (check-equal? (run '(void)) (void))
+  (check-equal? (run '(begin 1 2)) 2)
+  (check-equal? (run '(eof-object? (void))) #f)
+
   ;; Extort examples
   (check-equal? (run '(add1 #f)) 'err)
   (check-equal? (run '(sub1 #f)) 'err)
diff --git a/langs/fraud/Makefile b/langs/fraud/Makefile
@@ -14,7 +14,12 @@ objs = \
 	values.o \
 	io.o
 
-default: runtime.o
+default: submit.zip
+
+submit.zip:
+	zip submit.zip -r * \
+		-x \*.[os] -x \*~ -x \*zip \
+		-x \*Zone.Identifier -x **compiled**
 
 runtime.o: $(objs)
 	ld -r $(objs) -o runtime.o
diff --git a/langs/fraud/build-runtime.rkt b/langs/fraud/build-runtime.rkt
@@ -4,9 +4,9 @@
 (require racket/runtime-path)
 (define-runtime-path here ".")
 
-(system (string-append "make -C "
+(system (string-append "make -C '"
                        (path->string (normalize-path here))
-		       " runtime.o"))
+		       "' runtime.o"))
 
 (define runtime-path
   (normalize-path (build-path here "runtime.o")))
diff --git a/langs/fraud/parse.rkt b/langs/fraud/parse.rkt
@@ -23,7 +23,7 @@
 
 ;; Any -> Boolean
 (define (op0? x)
-  (memq x '(read-byte peek-byte)))
+  (memq x '(read-byte peek-byte void)))
 (define (op1? x)
   (memq x '(add1 sub1 zero? char? integer->char char->integer
                  write-byte eof-object?)))
diff --git a/langs/fraud/test/test-runner.rkt b/langs/fraud/test/test-runner.rkt
@@ -44,6 +44,12 @@
   (check-equal? (run '(char? 8)) #f)
   (check-equal? (run '(char->integer #\a)) (char->integer #\a))
   (check-equal? (run '(integer->char 955)) #\λ)
+
+  ;; Evildoer examples
+  (check-equal? (run '(void)) (void))
+  (check-equal? (run '(begin 1 2)) 2)
+  (check-equal? (run '(eof-object? (void))) #f)
+
   ;; Extort examples
   (check-equal? (run '(add1 #f)) 'err)
   (check-equal? (run '(sub1 #f)) 'err)
diff --git a/langs/hoax/Makefile b/langs/hoax/Makefile
@@ -14,7 +14,12 @@ objs = \
 	values.o \
 	io.o
 
-default: runtime.o
+default: submit.zip
+
+submit.zip:
+	zip submit.zip -r * \
+		-x \*.[os] -x \*~ -x \*zip \
+		-x \*Zone.Identifier -x **compiled**
 
 runtime.o: $(objs)
 	ld -r $(objs) -o runtime.o
diff --git a/langs/hoax/build-runtime.rkt b/langs/hoax/build-runtime.rkt
@@ -4,9 +4,9 @@
 (require racket/runtime-path)
 (define-runtime-path here ".")
 
-(system (string-append "make -C "
+(system (string-append "make -C '"
                        (path->string (normalize-path here))
-		       " runtime.o"))
+		       "' runtime.o"))
 
 (define runtime-path
   (normalize-path (build-path here "runtime.o")))
diff --git a/langs/hoax/test/test-runner.rkt b/langs/hoax/test/test-runner.rkt
@@ -44,6 +44,12 @@
   (check-equal? (run '(char? 8)) #f)
   (check-equal? (run '(char->integer #\a)) (char->integer #\a))
   (check-equal? (run '(integer->char 955)) #\λ)
+
+  ;; Evildoer examples
+  (check-equal? (run '(void)) (void))
+  (check-equal? (run '(begin 1 2)) 2)
+  (check-equal? (run '(eof-object? (void))) #f)
+
   ;; Extort examples
   (check-equal? (run '(add1 #f)) 'err)
   (check-equal? (run '(sub1 #f)) 'err)
diff --git a/langs/hustle/Makefile b/langs/hustle/Makefile
@@ -14,7 +14,12 @@ objs = \
 	values.o \
 	io.o
 
-default: runtime.o
+default: submit.zip
+
+submit.zip:
+	zip submit.zip -r * \
+		-x \*.[os] -x \*~ -x \*zip \
+		-x \*Zone.Identifier -x **compiled**
 
 runtime.o: $(objs)
 	ld -r $(objs) -o runtime.o
diff --git a/langs/hustle/build-runtime.rkt b/langs/hustle/build-runtime.rkt
@@ -4,9 +4,9 @@
 (require racket/runtime-path)
 (define-runtime-path here ".")
 
-(system (string-append "make -C "
+(system (string-append "make -C '"
                        (path->string (normalize-path here))
-		       " runtime.o"))
+		       "' runtime.o"))
 
 (define runtime-path
   (normalize-path (build-path here "runtime.o")))
diff --git a/langs/hustle/test/all.rkt b/langs/hustle/test/all.rkt
@@ -48,6 +48,7 @@
   (check-equal? (run '(if  0 3 4)) 3)
   (check-equal? (run '(zero? 4)) #f)
   (check-equal? (run '(zero? 0)) #t)
+
   ;; Dodger examples
   (check-equal? (run #\a) #\a)
   (check-equal? (run #\b) #\b)
@@ -56,6 +57,12 @@
   (check-equal? (run '(char? 8)) #f)
   (check-equal? (run '(char->integer #\a)) (char->integer #\a))
   (check-equal? (run '(integer->char 955)) #\λ)
+
+  ;; Evildoer examples
+  (check-equal? (run '(void)) (void))
+  (check-equal? (run '(begin 1 2)) 2)
+  (check-equal? (run '(eof-object? (void))) #f)
+
   ;; Extort examples
   (check-equal? (run '(add1 #f)) 'err)
   (check-equal? (run '(sub1 #f)) 'err)
@@ -66,6 +73,7 @@
   (check-equal? (run '(write-byte #f)) 'err)
   (check-equal? (run '(write-byte -1)) 'err)
   (check-equal? (run '(write-byte 256)) 'err)
+
   ;; Fraud examples
   (check-equal? (run '(let ((x 7)) x)) 7)
   (check-equal? (run '(let ((x 7)) 2)) 2)
diff --git a/langs/iniquity/Makefile b/langs/iniquity/Makefile
@@ -14,7 +14,12 @@ objs = \
 	values.o \
 	io.o
 
-default: runtime.o
+default: submit.zip
+
+submit.zip:
+	zip submit.zip -r * \
+		-x \*.[os] -x \*~ -x \*zip \
+		-x \*Zone.Identifier -x **compiled**
 
 runtime.o: $(objs)
 	ld -r $(objs) -o runtime.o
diff --git a/langs/iniquity/build-runtime.rkt b/langs/iniquity/build-runtime.rkt
@@ -4,9 +4,9 @@
 (require racket/runtime-path)
 (define-runtime-path here ".")
 
-(system (string-append "make -C "
+(system (string-append "make -C '"
                        (path->string (normalize-path here))
-		       " runtime.o"))
+		       "' runtime.o"))
 
 (define runtime-path
   (normalize-path (build-path here "runtime.o")))
diff --git a/langs/jig/Makefile b/langs/jig/Makefile
@@ -14,7 +14,12 @@ objs = \
 	values.o \
 	io.o
 
-default: runtime.o
+default: submit.zip
+
+submit.zip:
+	zip submit.zip -r * \
+		-x \*.[os] -x \*~ -x \*zip \
+		-x \*Zone.Identifier -x **compiled**
 
 runtime.o: $(objs)
 	ld -r $(objs) -o runtime.o
diff --git a/langs/jig/build-runtime.rkt b/langs/jig/build-runtime.rkt
@@ -4,9 +4,9 @@
 (require racket/runtime-path)
 (define-runtime-path here ".")
 
-(system (string-append "make -C "
+(system (string-append "make -C '"
                        (path->string (normalize-path here))
-		       " runtime.o"))
+		       "' runtime.o"))
 
 (define runtime-path
   (normalize-path (build-path here "runtime.o")))
diff --git a/langs/knock/Makefile b/langs/knock/Makefile
@@ -14,7 +14,12 @@ objs = \
 	values.o \
 	io.o
 
-default: runtime.o
+default: submit.zip
+
+submit.zip:
+	zip submit.zip -r * \
+		-x \*.[os] -x \*~ -x \*zip \
+		-x \*Zone.Identifier -x **compiled**
 
 runtime.o: $(objs)
 	ld -r $(objs) -o runtime.o
diff --git a/langs/knock/build-runtime.rkt b/langs/knock/build-runtime.rkt
diff --git a/langs/loot/Makefile b/langs/loot/Makefile
diff --git a/langs/loot/build-runtime.rkt b/langs/loot/build-runtime.rkt
diff --git a/langs/mountebank/Makefile b/langs/mountebank/Makefile
diff --git a/langs/mountebank/build-runtime.rkt b/langs/mountebank/build-runtime.rkt
diff --git a/langs/mug/Makefile b/langs/mug/Makefile
diff --git a/langs/mug/build-runtime.rkt b/langs/mug/build-runtime.rkt
diff --git a/langs/neerdowell/Makefile b/langs/neerdowell/Makefile
diff --git a/langs/neerdowell/build-runtime.rkt b/langs/neerdowell/build-runtime.rkt
diff --git a/langs/outlaw/build-runtime.rkt b/langs/outlaw/build-runtime.rkt
