finished scheme Part III

PhilipAnderson2060 · Mar 14, 2021 · 2ecaefa · 2ecaefa
1 parent 400dfca
commit 2ecaefa
Show file tree

Hide file tree

Showing 55 changed files with 26 additions and 10 deletions.
diff --git a/scheme/.ok_history b/scheme/.ok_history
diff --git a/scheme/.ok_storage b/scheme/.ok_storage
diff --git a/scheme/__pycache__/scheme.cpython-38.pyc b/scheme/__pycache__/scheme.cpython-38.pyc
diff --git a/scheme/editor/__pycache__/__main__.cpython-38.pyc b/scheme/editor/__pycache__/__main__.cpython-38.pyc
diff --git a/scheme/editor/__pycache__/arithmetic.cpython-38.pyc b/scheme/editor/__pycache__/arithmetic.cpython-38.pyc
diff --git a/scheme/editor/__pycache__/console.cpython-38.pyc b/scheme/editor/__pycache__/console.cpython-38.pyc
diff --git a/scheme/editor/__pycache__/css_colors.cpython-38.pyc b/scheme/editor/__pycache__/css_colors.cpython-38.pyc
diff --git a/scheme/editor/__pycache__/datamodel.cpython-38.pyc b/scheme/editor/__pycache__/datamodel.cpython-38.pyc
diff --git a/scheme/editor/__pycache__/documentation.cpython-38.pyc b/scheme/editor/__pycache__/documentation.cpython-38.pyc
diff --git a/scheme/editor/__pycache__/environment.cpython-38.pyc b/scheme/editor/__pycache__/environment.cpython-38.pyc
diff --git a/scheme/editor/__pycache__/evaluate_apply.cpython-38.pyc b/scheme/editor/__pycache__/evaluate_apply.cpython-38.pyc
diff --git a/scheme/editor/__pycache__/execution.cpython-38.pyc b/scheme/editor/__pycache__/execution.cpython-38.pyc
diff --git a/scheme/editor/__pycache__/execution_parser.cpython-38.pyc b/scheme/editor/__pycache__/execution_parser.cpython-38.pyc
diff --git a/scheme/editor/__pycache__/file_manager.cpython-38.pyc b/scheme/editor/__pycache__/file_manager.cpython-38.pyc
diff --git a/scheme/editor/__pycache__/format_parser.cpython-38.pyc b/scheme/editor/__pycache__/format_parser.cpython-38.pyc
diff --git a/scheme/editor/__pycache__/formatter.cpython-38.pyc b/scheme/editor/__pycache__/formatter.cpython-38.pyc
diff --git a/scheme/editor/__pycache__/graphics.cpython-38.pyc b/scheme/editor/__pycache__/graphics.cpython-38.pyc
diff --git a/scheme/editor/__pycache__/helper.cpython-38.pyc b/scheme/editor/__pycache__/helper.cpython-38.pyc
diff --git a/scheme/editor/__pycache__/lexer.cpython-38.pyc b/scheme/editor/__pycache__/lexer.cpython-38.pyc
diff --git a/scheme/editor/__pycache__/lists.cpython-38.pyc b/scheme/editor/__pycache__/lists.cpython-38.pyc
diff --git a/scheme/editor/__pycache__/local_server.cpython-38.pyc b/scheme/editor/__pycache__/local_server.cpython-38.pyc
diff --git a/scheme/editor/__pycache__/log.cpython-38.pyc b/scheme/editor/__pycache__/log.cpython-38.pyc
diff --git a/scheme/editor/__pycache__/log_utils.cpython-38.pyc b/scheme/editor/__pycache__/log_utils.cpython-38.pyc
diff --git a/scheme/editor/__pycache__/ok_interface.cpython-38.pyc b/scheme/editor/__pycache__/ok_interface.cpython-38.pyc
diff --git a/scheme/editor/__pycache__/persistence.cpython-38.pyc b/scheme/editor/__pycache__/persistence.cpython-38.pyc
diff --git a/scheme/editor/__pycache__/primitives.cpython-38.pyc b/scheme/editor/__pycache__/primitives.cpython-38.pyc
diff --git a/scheme/editor/__pycache__/runtime_limiter.cpython-38.pyc b/scheme/editor/__pycache__/runtime_limiter.cpython-38.pyc
diff --git a/scheme/editor/__pycache__/scheme_exceptions.cpython-38.pyc b/scheme/editor/__pycache__/scheme_exceptions.cpython-38.pyc
diff --git a/scheme/editor/__pycache__/special_forms.cpython-38.pyc b/scheme/editor/__pycache__/special_forms.cpython-38.pyc
diff --git a/scheme/editor/__pycache__/type_checking.cpython-38.pyc b/scheme/editor/__pycache__/type_checking.cpython-38.pyc
diff --git a/scheme/editor/__pycache__/visualizing.cpython-38.pyc b/scheme/editor/__pycache__/visualizing.cpython-38.pyc
diff --git a/scheme/editor/libraries/__pycache__/mistune.cpython-38.pyc b/scheme/editor/libraries/__pycache__/mistune.cpython-38.pyc
diff --git a/scheme/questions.scm b/scheme/questions.scm
@@ -13,7 +13,10 @@
 ;; Returns a list of two-element lists
 (define (enumerate s)
   ; BEGIN PROBLEM 15
-  'replace-this-line
+  (begin (define (helper index s)
+                 (cond ((null? s) s)
+                       (else (cons (cons index (cons (car s) nil)) (helper (+ 1 index) (cdr s))))))
+         (helper 0 s))
   )
   ; END PROBLEM 15
 
@@ -23,7 +26,10 @@
 ;; the merged lists.
 (define (merge comp list1 list2)
   ; BEGIN PROBLEM 16
-  'replace-this-line
+  (cond ((null? list1) list2)
+        ((null? list2) list1)
+        ((comp (car list1) (car list2)) (cons (car list1) (merge comp (cdr list1) list2)))
+        (else (cons (car list2) (merge comp list1 (cdr list2)))))
   )
   ; END PROBLEM 16
 
@@ -37,9 +43,20 @@
 
 (define (nondecreaselist s)
     ; BEGIN PROBLEM 17
-    'replace-this-line
+    (cond (
+          ((null? (cdr s)) (cons s nil))
+          ((> (car s) (car (cdr s))) (cons (cons (car s) nil) (nondecreaselist (cdr s))))
+          (else (cons (cons (car s) (car (nondecreaselist (cdr s)))) (cdr (nondecreaselist (cdr s))))))
     )
+)
     ; END PROBLEM 17
+
+
+(define (zip s)
+        (cond ((null? s) '(() ()))
+              (else (cons (cons (car (car s)) (car (zip (cdr s)))) (cons (cons (car (cdr (car s))) (car (cdr (zip (cdr s))))) nil))))
+)
+
 
 ;; Problem EC
 ;; Returns a function that checks if an expression is the special form FORM
@@ -55,12 +72,12 @@
 (define (let-to-lambda expr)
   (cond ((atom? expr)
          ; BEGIN PROBLEM EC
-         'replace-this-line
+         expr
          ; END PROBLEM EC
          )
         ((quoted? expr)
          ; BEGIN PROBLEM EC
-         'replace-this-line
+         expr
          ; END PROBLEM EC
          )
         ((or (lambda? expr)
@@ -69,19 +86,18 @@
                (params (cadr expr))
                (body   (cddr expr)))
            ; BEGIN PROBLEM EC
-           'replace-this-line
+           (cons form (cons params (let-to-lambda body)))
            ; END PROBLEM EC
            ))
         ((let? expr)
          (let ((values (cadr expr))
                (body   (cddr expr)))
            ; BEGIN PROBLEM EC
-           'replace-this-line
+           (cons (cons 'lambda (cons (car (zip values)) (cons (let-to-lambda (car body)) nil))) (car (cdr (zip values))))
            ; END PROBLEM EC
            ))
         (else
          ; BEGIN PROBLEM EC
-         'replace-this-line
+         (map let-to-lambda expr)
          ; END PROBLEM EC
-         )))
-
+         )))
diff --git a/scheme/tests/__pycache__/01.cpython-38.pyc b/scheme/tests/__pycache__/01.cpython-38.pyc
diff --git a/scheme/tests/__pycache__/02.cpython-38.pyc b/scheme/tests/__pycache__/02.cpython-38.pyc
diff --git a/scheme/tests/__pycache__/03.cpython-38.pyc b/scheme/tests/__pycache__/03.cpython-38.pyc
diff --git a/scheme/tests/__pycache__/04.cpython-38.pyc b/scheme/tests/__pycache__/04.cpython-38.pyc
diff --git a/scheme/tests/__pycache__/05.cpython-38.pyc b/scheme/tests/__pycache__/05.cpython-38.pyc
diff --git a/scheme/tests/__pycache__/06.cpython-38.pyc b/scheme/tests/__pycache__/06.cpython-38.pyc
diff --git a/scheme/tests/__pycache__/07.cpython-38.pyc b/scheme/tests/__pycache__/07.cpython-38.pyc
diff --git a/scheme/tests/__pycache__/08.cpython-38.pyc b/scheme/tests/__pycache__/08.cpython-38.pyc
diff --git a/scheme/tests/__pycache__/09.cpython-38.pyc b/scheme/tests/__pycache__/09.cpython-38.pyc
diff --git a/scheme/tests/__pycache__/10.cpython-38.pyc b/scheme/tests/__pycache__/10.cpython-38.pyc
diff --git a/scheme/tests/__pycache__/11.cpython-38.pyc b/scheme/tests/__pycache__/11.cpython-38.pyc
diff --git a/scheme/tests/__pycache__/12.cpython-38.pyc b/scheme/tests/__pycache__/12.cpython-38.pyc
diff --git a/scheme/tests/__pycache__/13.cpython-38.pyc b/scheme/tests/__pycache__/13.cpython-38.pyc
diff --git a/scheme/tests/__pycache__/14.cpython-38.pyc b/scheme/tests/__pycache__/14.cpython-38.pyc
diff --git a/scheme/tests/__pycache__/15.cpython-38.pyc b/scheme/tests/__pycache__/15.cpython-38.pyc
diff --git a/scheme/tests/__pycache__/16.cpython-38.pyc b/scheme/tests/__pycache__/16.cpython-38.pyc
diff --git a/scheme/tests/__pycache__/17.cpython-38.pyc b/scheme/tests/__pycache__/17.cpython-38.pyc
diff --git a/scheme/tests/__pycache__/18.cpython-38.pyc b/scheme/tests/__pycache__/18.cpython-38.pyc
diff --git a/scheme/tests/__pycache__/19.cpython-38.pyc b/scheme/tests/__pycache__/19.cpython-38.pyc
diff --git a/scheme/tests/__pycache__/20.cpython-38.pyc b/scheme/tests/__pycache__/20.cpython-38.pyc
diff --git a/scheme/tests/__pycache__/EC.cpython-38.pyc b/scheme/tests/__pycache__/EC.cpython-38.pyc
diff --git a/scheme/tests/__pycache__/eval_apply.cpython-38.pyc b/scheme/tests/__pycache__/eval_apply.cpython-38.pyc