Merge branch 'indentationRefactor' into 'master'

AdamKBeck · AdamKBeck · commit 44b76cbc105c · 2018-04-30T21:30:23.000-04:00
Fix empty c..r

See merge request btj12/Interpreter!87
diff --git a/state-manipulation.scm b/state-manipulation.scm
@@ -191,13 +191,15 @@
       ((atom? dotexpr) '.temp)
       ((list? (dotted-class-instance (arglist-dot dotexpr)))
        (cond
-         ((eq? (car (dotted-class-instance (arglist-dot dotexpr))) 'new) '.temp)
+         ((eq? (get-dotted-head (dotted-class-instance (arglist-dot dotexpr))) 'new) '.temp)
          (else (find-highest-var (dotted-class-instance (arglist-dot dotexpr))))))
       ((eq? 'this (dotted-class-instance (arglist-dot dotexpr))) '.temp)
       ((eq? 'super (dotted-class-instance (arglist-dot dotexpr))) '.temp)
       ((eq? 'funcall (arglist-head dotexpr)) '.temp)
       (else (dotted-class-instance (arglist-dot dotexpr))))))
 
+(define get-dotted-head car)
+
 ; Gets the case class a state is in
 (define get-base-class
   (lambda (state cfuncsinstance)
@@ -218,12 +220,14 @@
       ((null? currentclass) default-currentclass)
       ((declared-in-scope? (get-variable-section-state (get-top-scope state)) '.class)
        (cond
-         ((and (eq? (car (get-value-section-state (get-top-scope state))) currentclass)
+         ((and (eq? (get-value-section-top-head (get-value-section-state (get-top-scope state))) currentclass)
                (G-initialized? '.class (get-tail-scope state)))
           (get-value-from-pair (G-value-lookup->value_state '.class (get-tail-scope state) empty-cfuncs)))
          (else (get-super-class currentclass (get-tail-scope state)))))
       (else (get-super-class currentclass (get-tail-scope state))))))
 
+(define get-value-section-top-head car)
+
 
 (define default-currentclass '())
 
@@ -523,11 +527,13 @@
 ; value is a list: e.g. (new A). Prereq: the name of the instance has not been declared in the current stack frame
 (define get-instance-initialization-value
   (lambda (value state)
-    (let* ([cn (cadr value)])
+    (let* ([cn (get-instance-init-value-head value)])
       (cond
         (else (list (list 'classname cn)
                     (G-eval-class-closure->state cn state)))))))
 
+(define get-instance-init-value-head cadr)
+
 
 ; Pushes the declaration statement to the state
 (define declare-var->state
@@ -1137,12 +1143,14 @@
       ((null? desiredclass) (pop-scope-to-function-default fn state))
       ((declared-in-scope? (get-variable-section-state (get-top-scope state)) '.class)
        (cond
-         ((eq? (car (get-value-section-state (get-top-scope state))) desiredclass)
+         ((eq? (get-value-popped-head (get-value-section-state (get-top-scope state))) desiredclass)
           (pop-scope-to-function-default fn state))
          (else (G-pop-scope-to-function->state fn desiredclass (get-tail-scope state)))))
       ((declared-in-scope? (get-variable-section-state (get-top-scope state)) fn) state)
       (else (G-pop-scope-to-function->state fn desiredclass (get-tail-scope state))))))
 
+(define get-value-popped-head car)
+
 ; Pops a scope to a givenfunction
 (define pop-scope-to-function-default
   (lambda (fn state)
