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

Author: dvanhorn

hoax-plus/compile-ops.rkt

@@ -234,8 +234,8 @@
           (Mov r9 (Mem r8 (- type-vect)))
           (Cmp r10 r9)
           (Jge 'err)
-          (Sar r10 1) ; convert to byte offset          
-          (Mov (Mem r8 r10 (- 8 type-vect)) rax)          
+          (Sar r10 1) ; convert to byte offset
+          (Mov (Mem r8 r10 (- 8 type-vect)) rax)
           (Mov rax (value->bits (void))))]))
 
 (define (type-pred mask type)

iniquity-plus/compile-ops.rkt

@@ -222,8 +222,8 @@
           (Mov r9 (Mem r8 (- type-vect)))
           (Cmp r10 r9)
           (Jge 'err)
-          (Sar r10 1) ; convert to byte offset          
-          (Mov (Mem r8 r10 (- 8 type-vect)) rax)          
+          (Sar r10 1) ; convert to byte offset
+          (Mov (Mem r8 r10 (- 8 type-vect)) rax)
           (Mov rax (value->bits (void))))]))
 
 (define (type-pred mask type)

iniquity-plus/parse.rkt

@@ -174,7 +174,7 @@
                 (list ys (cons g gs) (App g es))])])])]
       [(list-rest (? symbol? g) sr)
        (match (parse-es/acc sr fs xs ys gs)
-         [(list ys s es)
+         [(list ys gs es)
           (list ys (if (memq g fs) gs (cons g gs)) (App g es))])]
       [_
        (error "parse error" s)]))

knock-plus/ast.rkt

@@ -51,6 +51,9 @@
 ;;           | (Box Pat)
 ;;           | (Cons Pat Pat)
 ;;           | (Conj Pat Pat)
+;;           | (List [Listof Pat])
+;;           | (Vect [Listof Pat])
+;;           | (Pred Id)
 
 (struct Eof () #:prefab)
 (struct Lit (d) #:prefab)

knock-plus/parse.rkt

@@ -156,7 +156,7 @@
                 (list ys (cons g gs) (App g es))])])])]
       [(list-rest (? symbol? g) sr)
        (match (parse-es/acc sr fs xs ys gs)
-         [(list ys s es)
+         [(list ys gs es)
           (list ys (if (memq g fs) gs (cons g gs)) (App g es))])]
       [_
        (error "parse error" s)]))