hyung-hwan/moo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

some #include restructuring

Browse Source
This commit is contained in:
hyunghwan.chung 2019-11-15 09:39:12 +00:00
parent b48ef95e44
commit 925f70fea6
14 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
moo/lib/Makefile.am
View File

@ -37,7 +37,6 @@ pkgincludedir = $(includedir)
pkginclude_HEADERS = \ pkginclude_HEADERS = \
moo.h \ moo.h \
moo-bct.h \
moo-cmn.h \ moo-cmn.h \
moo-opt.h \ moo-opt.h \
moo-rbt.h \ moo-rbt.h \
@ -54,8 +53,8 @@ pkglib_LTLIBRARIES = libmoo.la libmoox.la
# libmoo # libmoo
################################################## ##################################################
libmoo_la_SOURCES = \ libmoo_la_SOURCES = \
bct-lab.h \
moo.h \ moo.h \
moo-bct.h \
moo-cmn.h \ moo-cmn.h \
moo-rbt.h \ moo-rbt.h \
moo-utl.h \ moo-utl.h \

3
moo/lib/Makefile.in
View File

@ -450,7 +450,6 @@ LIBADD_LIB_COMMON =
@WIN32_TRUE@ $(am__append_1) $(am__append_2) @WIN32_TRUE@ $(am__append_1) $(am__append_2)
pkginclude_HEADERS = \ pkginclude_HEADERS = \
moo.h \ moo.h \
moo-bct.h \
moo-cmn.h \ moo-cmn.h \
moo-opt.h \ moo-opt.h \
moo-rbt.h \ moo-rbt.h \
@ -463,8 +462,8 @@ pkglib_LTLIBRARIES = libmoo.la libmoox.la
# libmoo # libmoo
################################################## ##################################################
libmoo_la_SOURCES = \ libmoo_la_SOURCES = \
bct-lab.h \
moo.h \ moo.h \
moo-bct.h \
moo-cmn.h \ moo-cmn.h \
moo-rbt.h \ moo-rbt.h \
moo-utl.h \ moo-utl.h \

0
moo/lib/moo-bct.h → moo/lib/bct-lab.h
View File

3
moo/lib/exec.c
View File

@ -5471,7 +5471,8 @@ static int __execute (moo_t* moo)
#if defined(HAVE_LABELS_AS_VALUES) #if defined(HAVE_LABELS_AS_VALUES)
static void* inst_table[256] = static void* inst_table[256] =
{ {
#include "moo-bct.h" /* import bytecode label addresses */
#include "bct-lab.h"
}; };
# define BEGIN_DISPATCH_LOOP() __begin_inst_dispatch: # define BEGIN_DISPATCH_LOOP() __begin_inst_dispatch:

10
moo/lib/moo-cmn.h
View File

@ -32,15 +32,15 @@
/*#define MOO_HAVE_CFG_H*/ /*#define MOO_HAVE_CFG_H*/
#if defined(MOO_HAVE_CFG_H) #if defined(MOO_HAVE_CFG_H)
# include "moo-cfg.h" # include <moo-cfg.h>
#elif defined(_WIN32) #elif defined(_WIN32)
# include "moo-msw.h" # include <moo-msw.h>
#elif defined(__OS2__) #elif defined(__OS2__)
# include "moo-os2.h" # include <moo-os2.h>
#elif defined(__DOS__) #elif defined(__DOS__)
# include "moo-dos.h" # include <moo-dos.h>
#elif defined(macintosh) #elif defined(macintosh)
# include "moo-mac.h" /* class mac os */ # include <moo-mac.h> /* class mac os */
#else #else
# error UNSUPPORTED SYSTEM # error UNSUPPORTED SYSTEM
#endif #endif

2
moo/lib/moo-opt.h
View File

@ -27,7 +27,7 @@
#ifndef _MOO_OPT_H_ #ifndef _MOO_OPT_H_
#define _MOO_OPT_H_ #define _MOO_OPT_H_
#include "moo-cmn.h" #include <moo-cmn.h>
/** \file /** \file
* This file defines functions and data structures to process * This file defines functions and data structures to process

4
moo/lib/moo-prv.h
View File

@ -27,8 +27,8 @@
#ifndef _MOO_PRV_H_ #ifndef _MOO_PRV_H_
#define _MOO_PRV_H_ #define _MOO_PRV_H_
#include "moo.h" #include <moo.h>
#include "moo-utl.h" #include <moo-utl.h>
/* you can define this to either 1 or 2 */ /* you can define this to either 1 or 2 */
#define MOO_BCODE_LONG_PARAM_SIZE 2 #define MOO_BCODE_LONG_PARAM_SIZE 2

6
moo/lib/moo-rbt.h
View File

@ -27,7 +27,7 @@
#ifndef _MOO_RBT_H_ #ifndef _MOO_RBT_H_
#define _MOO_RBT_H_ #define _MOO_RBT_H_
#include "moo-cmn.h" #include <moo-cmn.h>
/** \file /** \file
* This file provides a red-black tree encapsulated in the #moo_rbt_t type that * 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 * This sample code adds a series of keys and values and print them
* in descending key order. * in descending key order.
* \code * \code
* #include <moo/cmn/rbt.h> * #include <moo-rbt.h>
* #include <moo/cmn/mem.h>
* #include <moo/cmn/sio.h>
* *
* static moo_rbt_walk_t walk (moo_rbt_t* rbt, moo_rbt_pair_t* pair, void* ctx) * static moo_rbt_walk_t walk (moo_rbt_t* rbt, moo_rbt_pair_t* pair, void* ctx)
* { * {

2
moo/lib/moo-utl.h
View File

@ -27,7 +27,7 @@
#ifndef _MOO_UTL_H_ #ifndef _MOO_UTL_H_
#define _MOO_UTL_H_ #define _MOO_UTL_H_
#include "moo-cmn.h" #include <moo-cmn.h>
#include <stdarg.h> #include <stdarg.h>
/* ========================================================================= /* =========================================================================

4
moo/lib/moo.h
View File

@ -27,8 +27,8 @@
#ifndef _MOO_H_ #ifndef _MOO_H_
#define _MOO_H_ #define _MOO_H_
#include "moo-cmn.h" #include <moo-cmn.h>
#include "moo-rbt.h" #include <moo-rbt.h>
#include <stdarg.h> #include <stdarg.h>
/* TODO: move this macro out to the build files.... */ /* TODO: move this macro out to the build files.... */

4
moo/lib/opt-impl.h
View File

@ -28,8 +28,8 @@
/* this file is supposed to be included by opt.c multiple times */ /* this file is supposed to be included by opt.c multiple times */
#include "moo-opt.h" #include <moo-opt.h>
#include "moo-utl.h" #include <moo-utl.h>
/* /*
* moo_getopt is based on BSD getopt. * moo_getopt is based on BSD getopt.

4
moo/lib/opt.c
View File

@ -24,8 +24,8 @@
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "moo-opt.h" #include <moo-opt.h>
#include "moo-utl.h" #include <moo-utl.h>
#define BADCH '?' #define BADCH '?'
#define BADARG ':' #define BADARG ':'

2
moo/lib/poll-msw.h
View File

@ -1,7 +1,7 @@
#ifndef _POLL_MSW_H_ #ifndef _POLL_MSW_H_
#define _POLL_MSW_H_ #define _POLL_MSW_H_
#include "moo.h" #include <moo.h>
#if !defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0600) #if !defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0600)
/* Event types that can be polled for. These bits may be set in `events' /* Event types that can be polled for. These bits may be set in `events'

4
moo/lib/rbt.c
View File

@ -24,7 +24,7 @@
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "moo-rbt.h" #include <moo-rbt.h>
#include "moo-prv.h" #include "moo-prv.h"
#define copier_t moo_rbt_copier_t #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; 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; if (n == 0) n = nn;
return n; return n;
} }