From d77a08fefb2f790b53809716449100898ccc5622 Mon Sep 17 00:00:00 2001 From: itchyny Date: Fri, 4 Aug 2023 08:13:48 +0900 Subject: [PATCH] Rename jv_type_private to jv_private, move jvp_number_is_nan there --- Makefile.am | 2 +- src/builtin.c | 2 +- src/jv.h | 1 - src/jv_aux.c | 2 +- src/jv_print.c | 2 +- src/jv_private.h | 7 +++++++ src/jv_type_private.h | 6 ------ 7 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 src/jv_private.h delete mode 100644 src/jv_type_private.h diff --git a/Makefile.am b/Makefile.am index b2b666ecee..7905e20677 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,7 +7,7 @@ LIBJQ_INCS = src/builtin.h src/bytecode.h src/compile.h \ src/linker.h src/locfile.h src/opcode_list.h src/parser.y \ src/util.h src/decNumber/decContext.h src/decNumber/decNumber.h \ src/decNumber/decNumberLocal.h src/jv_dtoa_tsd.h src/jv_thread.h \ - src/jv_type_private.h + src/jv_private.h LIBJQ_SRC = src/builtin.c src/bytecode.c src/compile.c src/execute.c \ src/jq_test.c src/jv.c src/jv_alloc.c src/jv_aux.c \ diff --git a/src/builtin.c b/src/builtin.c index 793b597666..dcaa6c3c31 100644 --- a/src/builtin.c +++ b/src/builtin.c @@ -43,7 +43,7 @@ void *alloca (size_t); #include "locfile.h" #include "jv_unicode.h" #include "jv_alloc.h" - +#include "jv_private.h" static jv type_error(jv bad, const char* msg) { char errbuf[15]; diff --git a/src/jv.h b/src/jv.h index 0f0dac7226..eb313f8a97 100644 --- a/src/jv.h +++ b/src/jv.h @@ -70,7 +70,6 @@ jv jv_number(double); jv jv_number_with_literal(const char*); double jv_number_value(jv); int jv_is_integer(jv); -int jvp_number_is_nan(jv); int jv_number_has_literal(jv n); const char* jv_number_get_literal(jv); diff --git a/src/jv_aux.c b/src/jv_aux.c index 6a5efa9432..133fb54ccb 100644 --- a/src/jv_aux.c +++ b/src/jv_aux.c @@ -2,7 +2,7 @@ #include #include #include "jv_alloc.h" -#include "jv_type_private.h" +#include "jv_private.h" // making this static verbose function here // until we introduce a less confusing naming scheme diff --git a/src/jv_print.c b/src/jv_print.c index d1db88aa89..10ea588628 100644 --- a/src/jv_print.c +++ b/src/jv_print.c @@ -14,7 +14,7 @@ #include "jv_dtoa_tsd.h" #include "jv_unicode.h" #include "jv_alloc.h" -#include "jv_type_private.h" +#include "jv_private.h" #ifndef MAX_PRINT_DEPTH #define MAX_PRINT_DEPTH (256) diff --git a/src/jv_private.h b/src/jv_private.h new file mode 100644 index 0000000000..066520fd87 --- /dev/null +++ b/src/jv_private.h @@ -0,0 +1,7 @@ +#ifndef JV_PRIVATE +#define JV_PRIVATE + +int jvp_number_cmp(jv, jv); +int jvp_number_is_nan(jv); + +#endif //JV_PRIVATE diff --git a/src/jv_type_private.h b/src/jv_type_private.h deleted file mode 100644 index a25254dc10..0000000000 --- a/src/jv_type_private.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef JV_TYPE_PRIVATE -#define JV_TYPE_PRIVATE - -int jvp_number_cmp(jv, jv); - -#endif //JV_TYPE_PRIVATE