From 2f0df71c50b5f997b6eb7e76133c07c0d9d50d6f Mon Sep 17 00:00:00 2001 From: Felix Brendel Date: Sun, 24 Feb 2019 09:17:04 +0100 Subject: [PATCH] overloaded append_to_array_list instead of adding type as part of name --- src/defines.cpp | 2 +- src/eval.cpp | 2 +- src/lisp_object.cpp | 2 +- src/memory.cpp | 2 +- src/parse.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/defines.cpp b/src/defines.cpp index cb922ad..725095e 100644 --- a/src/defines.cpp +++ b/src/defines.cpp @@ -57,7 +57,7 @@ constexpr bool is_debug_build = false; }; \ \ \ - proc append_to_##name##_array_list(name##_Array_List* arraylist, type element) -> void { \ + proc append_to_array_list(name##_Array_List* arraylist, type element) -> void { \ if (arraylist->next_index == arraylist->length) { \ arraylist->length *= 2; \ arraylist->data = \ diff --git a/src/eval.cpp b/src/eval.cpp index 8b5f00c..854ffc3 100644 --- a/src/eval.cpp +++ b/src/eval.cpp @@ -73,7 +73,7 @@ proc apply_arguments_to_function(Lisp_Object* arguments, Function* function) -> arguments->value.pair->rest->value.pair->first, new_env); - append_to_String_array_list(read_in_keywords, arguments->value.pair->first->value.keyword->identifier); + append_to_array_list(read_in_keywords, arguments->value.pair->first->value.keyword->identifier); // overstep both for next one arguments = arguments->value.pair->rest->value.pair->rest; diff --git a/src/lisp_object.cpp b/src/lisp_object.cpp index cc2d5bb..139453b 100644 --- a/src/lisp_object.cpp +++ b/src/lisp_object.cpp @@ -59,5 +59,5 @@ proc append_to_keyword_argument_list(Keyword_Arguments* args, } args->identifiers[args->next_index++] = identifier; - append_to_Lisp_Object_array_list(args->values, default_value); + append_to_array_list(args->values, default_value); } diff --git a/src/memory.cpp b/src/memory.cpp index 6b48beb..2d7d562 100644 --- a/src/memory.cpp +++ b/src/memory.cpp @@ -69,7 +69,7 @@ namespace Memory { } proc delete_string(String* str) { - append_to_Void_Ptr_array_list(free_spots_in_string_memory, (void*)str); + append_to_array_list(free_spots_in_string_memory, (void*)str); } proc duplicate_string(String* str) -> String* { diff --git a/src/parse.cpp b/src/parse.cpp index 85553e3..c13f74f 100644 --- a/src/parse.cpp +++ b/src/parse.cpp @@ -510,7 +510,7 @@ namespace Parser { try { parsed = parse_expression(text, &index_in_text); } - append_to_Lisp_Object_array_list(program, parsed); + append_to_array_list(program, parsed); } break; case ';': case ' ':