Woohoo! Huge decrease in cells not cleaned up, with fixing one stupid bug.

src/ops/intern.c

@@ -292,7 +292,7 @@ internedp( struct cons_pointer key, struct cons_pointer store ) {
         //     if ( equal( key, entry.payload.cons.car ) ) {
         //         result = entry.payload.cons.car;
         //     }
-        if (!nilp( c_assoc( store, key))) {
+        if (!nilp( c_assoc( key, store))) {
             result = key;
         }
     } else {
@@ -340,18 +340,23 @@ struct cons_pointer c_assoc( struct cons_pointer key,
                         result = hashmap_get( entry_ptr, key );
                         break;
                     default:
-                        throw_exception( c_string_to_lisp_string
-                                         ( L"Store entry is of unknown type" ),
-                                         NIL );
+                        throw_exception( c_append(
+                            c_string_to_lisp_string( L"Store entry is of unknown type: " ),
+                            c_type( entry_ptr)), NIL);
                 }
             }
         }
     } else if ( hashmapp( store ) ) {
         result = hashmap_get( store, key );
     } else if ( !nilp( store ) ) {
+        debug_print( L"c_assoc; store is of unknown type `", DEBUG_BIND );
+        debug_print_object( c_type( store), DEBUG_BIND );
+        debug_print( L"`\n", DEBUG_BIND );
         result =
-            throw_exception( c_string_to_lisp_string
-                             ( L"Store is of unknown type" ), NIL );
+            throw_exception( 
+                c_append( 
+                    c_string_to_lisp_string( L"Store is of unknown type: " ),
+                    c_type( store)), NIL );
     }
 
     debug_print( L"c_assoc returning ", DEBUG_BIND );

src/ops/lispops.c

@@ -38,6 +38,13 @@
 #include "memory/stack.h"
 #include "memory/vectorspace.h"
 
+/**
+ * @brief the name of the symbol to which the prompt is bound;
+ * 
+ * Set in init to `*prompt*`
+ */
+struct cons_pointer prompt_name;
+
 /*
  * also to create in this section:
  * struct cons_pointer lisp_let( struct cons_pointer args, struct cons_pointer env,
@@ -46,7 +53,6 @@
  * and others I haven't thought of yet.
  */
 
-
 /**
  * Useful building block; evaluate this single form in the context of this
  * parent stack frame and this environment.
@@ -1263,7 +1269,7 @@ struct cons_pointer lisp_repl( struct stack_frame *frame,
 
     struct cons_pointer input = get_default_stream( true, env );
     struct cons_pointer output = get_default_stream( false, env );
-    struct cons_pointer prompt_name = c_string_to_lisp_symbol( L"*prompt*" );
+//    struct cons_pointer prompt_name = c_string_to_lisp_symbol( L"*prompt*" );
     struct cons_pointer old_oblist = oblist;
     struct cons_pointer new_env = env;
     
@@ -1558,43 +1564,35 @@ struct cons_pointer lisp_let( struct stack_frame *frame,
 
 }
 
-// /**
-//  * Function; print the internal representation of the object indicated by `frame->arg[0]` to the
-//  * (optional, defaults to the value of `*out*` in the environment) stream indicated by `frame->arg[1]`.
-//  *
-//  * * (inspect expression)
-//  * * (inspect expression <write-stream>)
-//  *
-//  * @param frame my stack frame.
-//  * @param frame_pointer a pointer to my stack_frame.
-//  * @param env the environment.
-//  * @return the value of the first argument - `expression`.
-//  */
-// struct cons_pointer lisp_inspect( struct stack_frame *frame,
-//                                   struct cons_pointer frame_pointer,
-//                                   struct cons_pointer env ) {
-//     debug_print( L"Entering print\n", DEBUG_IO );
-//     URL_FILE *output;
-//     struct cons_pointer out_stream = writep( frame->arg[1] ) ?
-//         frame->arg[1] : get_default_stream( false, env );
+// struct cons_pointer c_concat( struct cons_pointer a, struct cons_pointer b) {
+//     struct cons_pointer result = b;
 
-//     if ( writep( out_stream ) ) {
-//         debug_print( L"lisp_print: setting output stream\n", DEBUG_IO );
-//         debug_dump_object( out_stream, DEBUG_IO );
-//         output = pointer2cell( out_stream ).payload.stream.stream;
-//         inc_ref( out_stream );
+//     if ( nilp( b.tag.value)) {
+//         result = make_cons( a, b);
 //     } else {
-//         output = file_to_url_file( stdout );
+//         if ( ! nilp( a)) {
+//             if (a.tag.value == b.tag.value) {
+
+//                 struct cons_pointer tail = c_concat( c_cdr( a), b);
+
+//                 switch ( a.tag.value) {
+//                     case CONSTV:
+//                         result = make_cons( c_car( a), tail);
+//                         break;
+//                     case KEYTV:
+//                     case STRINGTV:
+//                     case SYMBOLTV:
+//                         result = make_string_like_thing()
+
+//                 }
+
+//             } else {
+//                 // throw an exception
+//             }
+//         }
 //     }
+    
 
-//     dump_object( output, frame->arg[0] );
-//     url_fputws( L"\n", output );
 
-//     if ( writep( out_stream ) ) {
-//         dec_ref( out_stream );
-//     } else {
-//         free( output );
-//     }
-
-//     return frame->arg[0];
-// }
+//     return result;
+// }

src/ops/lispops.h

@@ -22,6 +22,8 @@
 #ifndef __psse_lispops_h
 #define __psse_lispops_h
 
+extern struct cons_pointer prompt_name;
+
 /*
  * utilities
  */