From e7ef82d23f3910726648e60245e71891378e4799 Mon Sep 17 00:00:00 2001
From: Simon Brooke <simon@journeyman.cc>
Date: Tue, 5 Feb 2019 11:02:04 +0000
Subject: [PATCH] #8: keywords as functions on associations working

---
 src/ops/intern.c  |  6 ++++
 src/ops/lispops.c | 71 ++++++++++++++++++++++++++---------------------
 2 files changed, 45 insertions(+), 32 deletions(-)

diff --git a/src/ops/intern.c b/src/ops/intern.c
index 87d116e..8ce5d71 100644
--- a/src/ops/intern.c
+++ b/src/ops/intern.c
@@ -91,6 +91,12 @@ struct cons_pointer c_assoc( struct cons_pointer key,
                              struct cons_pointer store ) {
     struct cons_pointer result = NIL;
 
+    debug_print( L"c_assoc; key is `", DEBUG_BIND);
+    debug_print_object( key, DEBUG_BIND);
+    debug_print( L"`; store is \n", DEBUG_BIND);
+    debug_dump_object( store, DEBUG_BIND);
+    debug_println(DEBUG_BIND);
+
     for ( struct cons_pointer next = store;
           consp( next ); next = pointer2cell( next ).payload.cons.cdr ) {
         struct cons_space_object entry =
diff --git a/src/ops/lispops.c b/src/ops/lispops.c
index 5471c3f..14724a1 100644
--- a/src/ops/lispops.c
+++ b/src/ops/lispops.c
@@ -269,8 +269,8 @@ eval_lambda( struct cons_space_object cell, struct stack_frame *frame,
  * @return the result of evaluating the function with its arguments.
  */
 struct cons_pointer
-c_apply( struct stack_frame *frame, struct cons_pointer frame_pointer,
-         struct cons_pointer env ) {
+    c_apply( struct stack_frame *frame, struct cons_pointer frame_pointer,
+            struct cons_pointer env ) {
     debug_print( L"Entering c_apply\n", DEBUG_EVAL );
     struct cons_pointer result = NIL;
 
@@ -285,38 +285,47 @@ c_apply( struct stack_frame *frame, struct cons_pointer frame_pointer,
 
         switch ( fn_cell.tag.value ) {
             case EXCEPTIONTV:
-                /* just pass exceptions straight back */
-                result = fn_pointer;
-                break;
+            /* just pass exceptions straight back */
+            result = fn_pointer;
+            break;
             case FUNCTIONTV:
-                {
-                    struct cons_pointer exep = NIL;
-                    struct cons_pointer next_pointer =
-                        make_stack_frame( frame_pointer, args, env );
-                    inc_ref( next_pointer );
-                    if ( exceptionp( next_pointer ) ) {
-                        result = next_pointer;
-                    } else {
-                        struct stack_frame *next =
-                            get_stack_frame( next_pointer );
+            {
+                struct cons_pointer exep = NIL;
+                struct cons_pointer next_pointer =
+                    make_stack_frame( frame_pointer, args, env );
+                inc_ref( next_pointer );
+                if ( exceptionp( next_pointer ) ) {
+                    result = next_pointer;
+                } else {
+                    struct stack_frame *next =
+                        get_stack_frame( next_pointer );
 
-                        result =
-                            ( *fn_cell.payload.function.executable ) ( next,
-                                                                       next_pointer,
-                                                                       env );
-                        dec_ref( next_pointer );
-                    }
+                    result =
+                        ( *fn_cell.payload.function.executable ) ( next,
+                                                                  next_pointer,
+                                                                  env );
+                    dec_ref( next_pointer );
                 }
-                break;
+            }
+            break;
+
+            case KEYTV:
+            result = c_assoc( fn_pointer,
+                             eval_form(frame,
+                                       frame_pointer,
+                                       c_car( c_cdr( frame->arg[0])),
+                                       env));
+            break;
+
             case LAMBDATV:
-                {
-                    struct cons_pointer exep = NIL;
-                    struct cons_pointer next_pointer =
-                        make_stack_frame( frame_pointer, args, env );
-                    inc_ref( next_pointer );
-                    if ( exceptionp( next_pointer ) ) {
-                        result = next_pointer;
-                    } else {
+            {
+                struct cons_pointer exep = NIL;
+                struct cons_pointer next_pointer =
+                    make_stack_frame( frame_pointer, args, env );
+                inc_ref( next_pointer );
+                if ( exceptionp( next_pointer ) ) {
+                    result = next_pointer;
+                } else {
                         struct stack_frame *next =
                             get_stack_frame( next_pointer );
                         result =
@@ -416,9 +425,7 @@ lisp_eval( struct stack_frame *frame, struct cons_pointer frame_pointer,
 
     switch ( cell.tag.value ) {
         case CONSTV:
-            {
                 result = c_apply( frame, frame_pointer, env );
-            }
             break;
 
         case SYMBOLTV: