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

Author: dvanhorn

langs/fraud/compile.rkt

@@ -4,11 +4,10 @@
 
 ;; Registers used
 (define rax 'rax) ; return
-(define rbx 'rbx) ; heap
 (define rsp 'rsp) ; stack
 (define rdi 'rdi) ; arg
 
-;; type CEnv = [Listof Variable]
+;; type CEnv = (Listof ID)
 
 ;; Expr -> Asm
 (define (compile e)

langs/fraud/interp-lexical.rkt

@@ -8,7 +8,7 @@
 (define (interp e)
   (interp-env (translate e) '()))
 
-;; Expr VEnv -> Answer
+;; IExpr VEnv -> Answer
 (define (interp-env e r)
   (match e
     [(Int i) i]

langs/fraud/interp.rkt

@@ -11,7 +11,7 @@
 ;; | Eof
 ;; | Void
 
-;; type REnv = (Listof (List Id Value))
+;; type Env = (Listof (List Id Value))
 
 ;; Expr -> Answer
 (define (interp e)
@@ -23,9 +23,9 @@
     [(Int i) i]
     [(Bool b) b]
     [(Char c) c]
-    [(Eof) eof]       
+    [(Eof) eof]
     [(Var x) (lookup r x)]
-    [(Prim0 p) (interp-prim0 p)]     
+    [(Prim0 p) (interp-prim0 p)]
     [(Prim1 p e)
      (match (interp-env e r)
        ['err 'err]
@@ -61,6 +61,6 @@
          (lookup r x))]))
 
 ;; Env Id Value -> Env
-(define (ext r v val)
-  (cons (list v val) r))
+(define (ext r x v)
+  (cons (list x v) r))
 

langs/hustle/interp-heap.rkt

@@ -1,7 +1,6 @@
 #lang racket
 (provide interp interp-env-heap)
-(require "heap.rkt"
-         "env.rkt"
+(require "env.rkt"
          "unload.rkt"
          "interp-prims-heap.rkt"
          "ast.rkt")

langs/hustle/interp-prims-heap.rkt

@@ -1,5 +1,5 @@
 #lang racket
-(provide interp-prim1 interp-prim2 interp-prim3)
+(provide interp-prim1 interp-prim2)
 (require "heap.rkt")
 
 ;; Op1 Value* Heap -> Answer*
@@ -18,9 +18,6 @@
     [(list 'car   (list 'cons i))         (cons h (heap-ref h i))]
     [(list 'cdr   (list 'cons i))         (cons h (heap-ref h (add1 i)))]
     [(list 'empty? v)                     (cons h (empty? v))]
-    [(list 'string? (list 'str s))        (cons h #t)]
-    [(list 'string? v)                    (cons h #f)]
-    [(list 'string-length (list 'str a))  (cons h (heap-ref h a))]
     [_                                    'err]))
 
 ;; Op2 Value* Value* Heap -> Answer*
@@ -35,24 +32,8 @@
        [(list (list t1 a1)  (list t2 a2)) (cons h (and (eq? t1 t2) (= a1 a2)))]
        [_                                 (cons h (eqv? v1 v2))])]
     [(list 'cons v1 v2)                        (alloc-cons v1 v2 h)]
-    [(list 'make-string (? integer? i) (? char? c))
-     (if (<= 0 i)
-         (alloc-str (make-string i c) h)
-         'err)]
-    [(list 'string-ref (list 'str a) (? integer? i))
-     (cons h (heap-ref h (+ a i 1)))]
     [_ 'err]))
 
-;; Op2 Value* Value* Heap -> Answer*
-(define (interp-prim3 p v1 v2 v3 h)
-  (match (list p v1 v2 v3)
-    [(list 'string-set! (list 'str a) (? integer? i) (? char? c))
-     (if (<= 0 v2 (sub1 (heap-ref h a)))
-         (cons (heap-set h (+ a i 1) c)
-               (void))
-         'err)]
-    [_  'err]))
-
 ;; Any -> Boolean
 (define (codepoint? v)
   (and (integer? v)

www/assignments.scrbl

@@ -6,7 +6,7 @@
 @include-section{assignments/1.scrbl}
 @include-section{assignments/2.scrbl}
 @include-section{assignments/3.scrbl}
-@;include-section{assignments/4.scrbl}
+@include-section{assignments/4.scrbl}
 @;include-section{assignments/5.scrbl}
 @;include-section{assignments/6.scrbl}
 @;;include-section{assignments/7.scrbl}

www/assignments/4.scrbl

@@ -7,19 +7,19 @@
 
 @(require "../notes/ev.rkt")
 
-@bold{Due: Thursday, Mar 31st at 11:59PM EST}
+@bold{Due: Tuesday, Oct 18, 11:59PM EST}
 
 The goal of this assignment is to extend a compiler with binding
 forms and primitives that can take any number of arguments.
 
-You are given a zip file on ELMS with a starter compiler similar to
-the @seclink["Fraud"]{Fraud} language we studied in class.  You are
-tasked with:
+You are given a @tt{fraud-plus.zip} file on ELMS with a starter
+compiler similar to the @seclink["Fraud"]{Fraud} language we studied
+in class.  You are tasked with:
 
 @itemlist[
 
 @item{incorporating the language features you added in
-@seclink["Assignment 3"]{Assignment 3},}
+@seclink["Assignment 3"]{Assignment 3}, scaled up to Fraud,}
 
 @item{extending the addition primitive to handle an arbitrary number of arguments,}
 
@@ -182,12 +182,13 @@ write additional test cases.
 
 @section[#:tag-prefix "a4-" #:style 'unnumbered]{Submitting}
 
-You should submit on Gradescope. You should submit a zip file that has
-exactly the same structure that the stub contains. We will only use
-the @tt{compile.rkt}, @tt{interp.rkt}, and @tt{interp-prim.rkt} files
-for grading, so make sure all your work is contained there! Note the
-lack of @tt{ast.rkt}, @tt{parse.rkt}, etc. - part of assignment 3 was
-learning to design your own structures, part of assignment 4 is
-learning to work within the constraints of an existing design!
-
+Submit a zip file containing your work to Gradescope.  Use @tt{make
+submit.zip} from within the @tt{dupe-plus} directory to create a zip
+file with the proper structure.
 
+We will only use the @tt{compile.rkt}, @tt{interp.rkt}, and
+@tt{interp-prim.rkt} files for grading, so make sure all your work is
+contained there! Note the lack of @tt{ast.rkt}, @tt{parse.rkt}, etc. -
+part of assignment 3 was learning to design your own structures, part
+of assignment 4 is learning to work within the constraints of an
+existing design!