From 925f70fea6f0d9d3a3055fcc2be96f462237ae93 Mon Sep 17 00:00:00 2001 From: "hyunghwan.chung" Date: Fri, 15 Nov 2019 09:39:12 +0000 Subject: [PATCH] some #include restructuring --- moo/lib/Makefile.am | 3 +-- moo/lib/Makefile.in | 3 +-- moo/lib/{moo-bct.h => bct-lab.h} | 0 moo/lib/exec.c | 3 ++- moo/lib/moo-cmn.h | 10 +++++----- moo/lib/moo-opt.h | 2 +- moo/lib/moo-prv.h | 4 ++-- moo/lib/moo-rbt.h | 6 ++---- moo/lib/moo-utl.h | 2 +- moo/lib/moo.h | 4 ++-- moo/lib/opt-impl.h | 4 ++-- moo/lib/opt.c | 4 ++-- moo/lib/poll-msw.h | 2 +- moo/lib/rbt.c | 4 ++-- 14 files changed, 24 insertions(+), 27 deletions(-) rename moo/lib/{moo-bct.h => bct-lab.h} (100%) diff --git a/moo/lib/Makefile.am b/moo/lib/Makefile.am index ba2a93e..a91af9c 100644 --- a/moo/lib/Makefile.am +++ b/moo/lib/Makefile.am @@ -37,7 +37,6 @@ pkgincludedir = $(includedir) pkginclude_HEADERS = \ moo.h \ - moo-bct.h \ moo-cmn.h \ moo-opt.h \ moo-rbt.h \ @@ -54,8 +53,8 @@ pkglib_LTLIBRARIES = libmoo.la libmoox.la # libmoo ################################################## libmoo_la_SOURCES = \ + bct-lab.h \ moo.h \ - moo-bct.h \ moo-cmn.h \ moo-rbt.h \ moo-utl.h \ diff --git a/moo/lib/Makefile.in b/moo/lib/Makefile.in index 2f438ea..a6a8942 100644 --- a/moo/lib/Makefile.in +++ b/moo/lib/Makefile.in @@ -450,7 +450,6 @@ LIBADD_LIB_COMMON = @WIN32_TRUE@ $(am__append_1) $(am__append_2) pkginclude_HEADERS = \ moo.h \ - moo-bct.h \ moo-cmn.h \ moo-opt.h \ moo-rbt.h \ @@ -463,8 +462,8 @@ pkglib_LTLIBRARIES = libmoo.la libmoox.la # libmoo ################################################## libmoo_la_SOURCES = \ + bct-lab.h \ moo.h \ - moo-bct.h \ moo-cmn.h \ moo-rbt.h \ moo-utl.h \ diff --git a/moo/lib/moo-bct.h b/moo/lib/bct-lab.h similarity index 100% rename from moo/lib/moo-bct.h rename to moo/lib/bct-lab.h diff --git a/moo/lib/exec.c b/moo/lib/exec.c index 82aeeca..c397381 100644 --- a/moo/lib/exec.c +++ b/moo/lib/exec.c @@ -5471,7 +5471,8 @@ static int __execute (moo_t* moo) #if defined(HAVE_LABELS_AS_VALUES) static void* inst_table[256] = { - #include "moo-bct.h" + /* import bytecode label addresses */ + #include "bct-lab.h" }; # define BEGIN_DISPATCH_LOOP() __begin_inst_dispatch: diff --git a/moo/lib/moo-cmn.h b/moo/lib/moo-cmn.h index e8d060a..6cafbe3 100644 --- a/moo/lib/moo-cmn.h +++ b/moo/lib/moo-cmn.h @@ -32,15 +32,15 @@ /*#define MOO_HAVE_CFG_H*/ #if defined(MOO_HAVE_CFG_H) -# include "moo-cfg.h" +# include #elif defined(_WIN32) -# include "moo-msw.h" +# include #elif defined(__OS2__) -# include "moo-os2.h" +# include #elif defined(__DOS__) -# include "moo-dos.h" +# include #elif defined(macintosh) -# include "moo-mac.h" /* class mac os */ +# include /* class mac os */ #else # error UNSUPPORTED SYSTEM #endif diff --git a/moo/lib/moo-opt.h b/moo/lib/moo-opt.h index e1c16de..c50a87d 100644 --- a/moo/lib/moo-opt.h +++ b/moo/lib/moo-opt.h @@ -27,7 +27,7 @@ #ifndef _MOO_OPT_H_ #define _MOO_OPT_H_ -#include "moo-cmn.h" +#include /** \file * This file defines functions and data structures to process diff --git a/moo/lib/moo-prv.h b/moo/lib/moo-prv.h index db2d4a8..c1fb35f 100644 --- a/moo/lib/moo-prv.h +++ b/moo/lib/moo-prv.h @@ -27,8 +27,8 @@ #ifndef _MOO_PRV_H_ #define _MOO_PRV_H_ -#include "moo.h" -#include "moo-utl.h" +#include +#include /* you can define this to either 1 or 2 */ #define MOO_BCODE_LONG_PARAM_SIZE 2 diff --git a/moo/lib/moo-rbt.h b/moo/lib/moo-rbt.h index 9675729..8d4dcc5 100644 --- a/moo/lib/moo-rbt.h +++ b/moo/lib/moo-rbt.h @@ -27,7 +27,7 @@ #ifndef _MOO_RBT_H_ #define _MOO_RBT_H_ -#include "moo-cmn.h" +#include /** \file * This file provides a red-black tree encapsulated in the #moo_rbt_t type that @@ -37,9 +37,7 @@ * This sample code adds a series of keys and values and print them * in descending key order. * \code - * #include - * #include - * #include + * #include * * static moo_rbt_walk_t walk (moo_rbt_t* rbt, moo_rbt_pair_t* pair, void* ctx) * { diff --git a/moo/lib/moo-utl.h b/moo/lib/moo-utl.h index 3d3ea44..1d409a9 100644 --- a/moo/lib/moo-utl.h +++ b/moo/lib/moo-utl.h @@ -27,7 +27,7 @@ #ifndef _MOO_UTL_H_ #define _MOO_UTL_H_ -#include "moo-cmn.h" +#include #include /* ========================================================================= diff --git a/moo/lib/moo.h b/moo/lib/moo.h index a5ff921..8a921ff 100644 --- a/moo/lib/moo.h +++ b/moo/lib/moo.h @@ -27,8 +27,8 @@ #ifndef _MOO_H_ #define _MOO_H_ -#include "moo-cmn.h" -#include "moo-rbt.h" +#include +#include #include /* TODO: move this macro out to the build files.... */ diff --git a/moo/lib/opt-impl.h b/moo/lib/opt-impl.h index c398227..b593b1b 100644 --- a/moo/lib/opt-impl.h +++ b/moo/lib/opt-impl.h @@ -28,8 +28,8 @@ /* this file is supposed to be included by opt.c multiple times */ -#include "moo-opt.h" -#include "moo-utl.h" +#include +#include /* * moo_getopt is based on BSD getopt. diff --git a/moo/lib/opt.c b/moo/lib/opt.c index 4f203f5..6748073 100644 --- a/moo/lib/opt.c +++ b/moo/lib/opt.c @@ -24,8 +24,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "moo-opt.h" -#include "moo-utl.h" +#include +#include #define BADCH '?' #define BADARG ':' diff --git a/moo/lib/poll-msw.h b/moo/lib/poll-msw.h index 86854f9..b8aac9c 100644 --- a/moo/lib/poll-msw.h +++ b/moo/lib/poll-msw.h @@ -1,7 +1,7 @@ #ifndef _POLL_MSW_H_ #define _POLL_MSW_H_ -#include "moo.h" +#include #if !defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0600) /* Event types that can be polled for. These bits may be set in `events' diff --git a/moo/lib/rbt.c b/moo/lib/rbt.c index 5d5feca..642a977 100644 --- a/moo/lib/rbt.c +++ b/moo/lib/rbt.c @@ -24,7 +24,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "moo-rbt.h" +#include #include "moo-prv.h" #define copier_t moo_rbt_copier_t @@ -990,7 +990,7 @@ int moo_rbt_dflcomp (const moo_rbt_t* rbt, const void* kptr1, moo_oow_t klen1, c nn = (klen1 == klen2)? 0: 1; } - n = MOO_MEMCMP (kptr1, kptr2, KTOB(rbt,min)); + n = MOO_MEMCMP(kptr1, kptr2, KTOB(rbt,min)); if (n == 0) n = nn; return n; }