From b3a371ca0a7661aa0147bdb7928242dfae5f7aa3 Mon Sep 17 00:00:00 2001 From: Adam Beck Date: Mon, 30 Apr 2018 21:08:41 -0400 Subject: [PATCH] Reformat all code --- expression-ops.scm | 9 ++++++--- interpreter.scm | 4 ++-- state-manipulation.scm | 12 ++++++------ state-structs.scm | 8 +++----- tester.scm | 10 +++++++--- 5 files changed, 24 insertions(+), 19 deletions(-) diff --git a/expression-ops.scm b/expression-ops.scm index e3a29ab..a8561f7 100644 --- a/expression-ops.scm +++ b/expression-ops.scm @@ -5,6 +5,7 @@ #lang racket (provide (all-defined-out)) +; Checks if an expression is a a valid expression (define G-expr? (lambda (arglist) (cond @@ -15,6 +16,7 @@ (define get-op-from-expr car) +; Checks to see if a math expression is encountered (define math-expr? (lambda (op) (cond @@ -25,6 +27,7 @@ ((eq? op '%) #t) (else #f)))) +; Checks to see if a boolean expression is encountered (define boolean-expr? (lambda (op) (cond @@ -33,6 +36,7 @@ ((eq? op '!) #t) (else #f)))) +; Checks to see if a comparing expression is encountered (define compare-expr? (lambda (op) (cond @@ -44,8 +48,6 @@ ((eq? op '>=) #t) (else #f)))) - - ; Determines whether a boolean in java boolean notation was encountered (define java-boolean? (lambda (value) @@ -54,7 +56,7 @@ ((eq? value 'false) #t) (else #f)))) - +; Converted a java boolean name to a scheme boolean name (e.g. true in java is #t in scheme) (define java-bool-to-scheme-bool (lambda (value) (cond @@ -103,6 +105,7 @@ (or arg1 arg2))) (else (error "unsupported boolean expression"))))) +; Determines what type of operator we have (define compare-operator-to-function-multi (lambda (op) (cond diff --git a/interpreter.scm b/interpreter.scm index d558166..229383e 100644 --- a/interpreter.scm +++ b/interpreter.scm @@ -17,10 +17,12 @@ (with-handlers ([exn:fail? error->handler]) (show-parse-tree-output (evaluate-parse-tree->retval_state (get-main-code classname staticstate) staticstate)))))) +; Used as a debugging helper for testing our code. (define debug-call (lambda (filename classname) (let* ([staticstate (G-parsed-file-to-state->state (parser filename) initstate)]) `(evaluate-parse-tree->retval_state ,(get-main-code classname staticstate) ,staticstate)))) + ; display the value from the parse tree output (define show-parse-tree-output (lambda (parse-tree-output) @@ -41,8 +43,6 @@ ; gets the code portion of a function closure (arglist + code) (define get-code-from-function-closure cadr) - - (define append-main (lambda (program) (append program '((return (funcall main)))))) diff --git a/state-manipulation.scm b/state-manipulation.scm index da9d056..40a0dd4 100644 --- a/state-manipulation.scm +++ b/state-manipulation.scm @@ -11,7 +11,7 @@ (require racket/trace) - +; State-empty? checks if an empty state is encountered, or if the state contains no more elements (empty) (define state-empty? (lambda (state) (cond @@ -40,16 +40,16 @@ +; Evaluates a list of statements (define evaluate-statement-list->state (lambda (program state cfuncsinstance) (cond ((null? program) state) ((not (list? program)) (error "Invalid program syntax")) ((pair? (program-head program)) - (evaluate-statement-list->state - (program-tail program) - (evaluate-statement->state (program-head program) state cfuncsinstance) - cfuncsinstance)) + (evaluate-statement-list->state (program-tail program) + (evaluate-statement->state (program-head program) state cfuncsinstance) + cfuncsinstance)) (else (error "Invalid statement list syntax"))))) ; Returns state updated after evaluating pair @@ -102,12 +102,12 @@ ;------------------------------------------------------------------------------------------------------------------ ; Function definition section - (define G-define-function->state (lambda (arglist state cfuncsinstance) (declare-function (get-function-name arglist) (get-function-formal-args arglist) (get-function-body arglist) state))) +; evaluates a declare function (define declare-function (lambda (function-name function-args function-body state) (cond diff --git a/state-structs.scm b/state-structs.scm index 7b42183..2519a02 100644 --- a/state-structs.scm +++ b/state-structs.scm @@ -29,11 +29,9 @@ (define cfuncs-wipe-all-but-catch (lambda (cfuncsinstance) - (cfuncs-update-break - (cfuncs-update-continue - (cfuncs-update-return cfuncsinstance identity) - identity) - identity))) + (cfuncs-update-break (cfuncs-update-continue (cfuncs-update-return cfuncsinstance identity) + identity) + identity))) (define identity-catch (lambda (a b) diff --git a/tester.scm b/tester.scm index eb78e78..c7d6e71 100644 --- a/tester.scm +++ b/tester.scm @@ -11,9 +11,12 @@ (if (eq? (interpret filename (findmain (parser filename))) expected-output) (string-append "Passed " filename) (string-append "Failed " filename - ", ! Expected output: " (if (number? expected-output) (number->string expected-output) (symbol->string expected-output)) - ", Interpreter output: " (if (number? (interpret filename (findmain (parser filename)))) (number->string (interpret filename (findmain (parser filename)))) (symbol->string - (interpret filename (findmain (parser filename))))))))) + ", ! Expected output: " (if (number? expected-output) + (number->string expected-output) + (symbol->string expected-output)) + ", Interpreter output: " (if (number? (interpret filename (findmain (parser filename)))) + (number->string (interpret filename (findmain (parser filename)))) + (symbol->string (interpret filename (findmain (parser filename))))))))) (define member* (lambda (x lis) @@ -21,6 +24,7 @@ ((null? lis) #f) ((not (list? lis)) (equal? x lis)) (else (or (member* x (car lis)) (member* x (cdr lis))))))) + (define findmain (lambda (parse-tree) (cond