* limpy is halfway usable now...

Author: mmolle

builtinenv.c

@@ -35,7 +35,13 @@ struct { char *name; limo_builtin f; } builtin_array[] = {
   { "SLEEP", builtin_sleep },
   { "STRING-CONCAT", builtin_string_concat },
   { "MAKE-SYM", builtin_make_sym },
-  { "GET_ANNOTATION", builtin_get_annotation }
+  { "GET-ANNOTATION", builtin_get_annotation },
+  { "MAKE-DICT", builtin_make_dict },
+  { "DICT-GET", builtin_dict_get },
+  { "DICT-SET", builtin_dict_set },
+  { "DICT-UNSET", builtin_dict_unset },
+  { "DICT-TO-LIST", builtin_dict_to_list },
+  { "DICT-HAS-KEY", builtin_dict_has_key },
 };
 
 limo_data *make_globalenv(int argc, char **argv)

dict.c

@@ -113,15 +113,19 @@ limo_data **dict_get_place(limo_data *dict, limo_data *key)
   limo_error("dict_get_place(): this should not happen!");
 }
 
-limo_data *dict_remove(limo_data *dict, limo_data *key)
+void dict_remove(limo_data *dict, limo_data *key)
 {
-  limo_data **place = dict_get_place(dict, key);
-  (*place) = NULL;
-  dict->data.d_dict->used--;
+  limo_data **place;
 
-  // dict_resize MUST be done, or else items, which should have been stored in the same bucket as *key
-  // are unfindable after removal of this. SERIOUSLY hard to find bug!
-  dict_resize(dict);
+  place = dict_get_place(dict, key);
+  if (place !=NULL) {
+    (*place) = NULL;
+    dict->data.d_dict->used--;
+
+    // dict_resize MUST be done, or else items, which should have been stored in the same bucket as *key
+    // are unfindable after removal of this. SERIOUSLY hard to find bug!
+    dict_resize(dict);
+  }
 }
 
 limo_data *dict_to_list(limo_data *dict)
@@ -135,3 +139,103 @@ limo_data *dict_to_list(limo_data *dict)
 
   return res;
 }
+
+////////// BUILTINS ////////////
+
+BUILTIN(builtin_make_dict)
+{
+  return make_dict();  
+}
+
+BUILTIN(builtin_dict_get)
+{
+  limo_data *dict;
+  limo_data *key;
+  limo_data **res;
+
+  if (list_length(arglist) != 3)
+    limo_error("(dict-get DICT KEY)");
+
+  dict = eval(FIRST_ARG, env);
+  if (dict->type != limo_TYPE_DICT)
+    limo_error("(dict-get DICT KEY)");
+
+  key = eval(SECOND_ARG, env);
+  res = dict_get_place(dict, key);
+  if (res == NULL)
+    throw(make_cons(make_string("Could not find key"), key));
+  return *res;
+}
+
+BUILTIN(builtin_dict_set)
+{
+  limo_data *dict;
+  limo_data *key;
+  limo_data *value;
+
+  if (list_length(arglist) != 4)
+    limo_error("(dict-set DICT KEY VALUE)");
+
+  dict = eval(FIRST_ARG, env);
+  if (dict->type != limo_TYPE_DICT)
+    limo_error("(dict-set DICT KEY VALUE)");
+
+  key = eval(SECOND_ARG, env);
+  value = eval(THIRD_ARG, env);
+
+  dict_put(dict, key, value);
+  return make_nil();
+}
+
+
+BUILTIN(builtin_dict_unset)
+{
+  limo_data *dict;
+  limo_data *key;
+
+  if (list_length(arglist) != 3)
+    limo_error("(dict-unset DICT KEY)");
+
+  dict = eval(FIRST_ARG, env);
+  if (dict->type != limo_TYPE_DICT)
+    limo_error("(dict-unset DICT KEY)");
+
+  key = eval(SECOND_ARG, env);
+  dict_remove(dict, key);
+  return make_nil();
+}
+
+BUILTIN(builtin_dict_has_key)
+{
+  limo_data *dict;
+  limo_data *key;
+  limo_data **res;
+
+  if (list_length(arglist) != 3)
+    limo_error("(dict-has-key DICT KEY)");
+
+  dict = eval(FIRST_ARG, env);
+  if (dict->type != limo_TYPE_DICT)
+    limo_error("(dict-has-key DICT KEY)");
+
+  key = eval(SECOND_ARG, env);
+  res = dict_get_place(dict, key);
+  if (res == NULL)
+    return make_nil();
+  else
+    return sym_true;
+}
+
+BUILTIN(builtin_dict_to_list)
+{
+  limo_data *dict;
+
+  if (list_length(arglist) != 2)
+    limo_error("(dict-unset DICT KEY)");
+
+  dict = eval(FIRST_ARG, env);
+  if (dict->type != limo_TYPE_DICT)
+    limo_error("(dict-unset DICT KEY)");  
+
+  return dict_to_list(dict);
+}

limo.c

@@ -76,6 +76,7 @@ int main(int argc, char **argv)
     if (sigsetjmp(*ljbuf, 1)) {
       printf("\nUNHANDLED EXCEPTION CAUGHT\n");
       if (exception) {
+	rs = limo_rs_make_readline();
 	print_stacktrace(var_lookup(globalenv, sym_stacktrace));
 	stacktrace = make_nil();
 	writer(exception);

limo.h

@@ -146,7 +146,7 @@ limo_dict *make_dict_size(int minused);
 void dict_resize(limo_data *dict);
 void dict_put(limo_data *dict, limo_data *key, limo_data *value);
 limo_data **dict_get_place(limo_data *dict, limo_data *key);
-limo_data *dict_remove(limo_data *dict, limo_data *key);
+void dict_remove(limo_data *dict, limo_data *key);
 limo_data *dict_to_list(limo_data *dict);
 
 limo_data *var_lookup(limo_data *env, limo_data *name);
@@ -195,6 +195,12 @@ BUILTIN(builtin_sleep);
 BUILTIN(builtin_string_concat);
 BUILTIN(builtin_make_sym);
 BUILTIN(builtin_get_annotation);
+BUILTIN(builtin_make_dict);
+BUILTIN(builtin_dict_get);
+BUILTIN(builtin_dict_set);
+BUILTIN(builtin_dict_unset);
+BUILTIN(builtin_dict_to_list);
+BUILTIN(builtin_dict_has_key);
 
 limo_data *real_eval(limo_data *form, limo_data *env);
 limo_data *eval(limo_data *form, limo_data *env);