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

improved the #include handling to remember the file loaded and use it when loading an includee file

Browse Source
This commit is contained in:
hyunghwan.chung 2017-02-02 12:45:15 +00:00
parent 5c755d68f5
commit ea6d48eb0e
1 changed files with 35 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
moo/lib/main.c
View File

@ -97,7 +97,9 @@ struct bb_t
char buf[1024]; char buf[1024];
moo_oow_t pos; moo_oow_t pos;
moo_oow_t len; moo_oow_t len;
FILE* fp; FILE* fp;
moo_bch_t* fn;
}; };
typedef struct xtn_t xtn_t; typedef struct xtn_t xtn_t;
@ -156,56 +158,63 @@ static MOO_INLINE moo_ooi_t open_input (moo_t* moo, moo_ioarg_t* arg)
{ {
xtn_t* xtn = moo_getxtn(moo); xtn_t* xtn = moo_getxtn(moo);
bb_t* bb; bb_t* bb;
FILE* fp;
/* TOOD: support predefined include directory as well */
if (arg->includer) if (arg->includer)
{ {
/* includee */ /* includee */
moo_oow_t ucslen, bcslen, parlen;
const moo_bch_t* fn, * fb;
moo_bch_t bcs[1024]; /* TODO: right buffer size */ if (moo_convootobcstr (moo, arg->name, &ucslen, MOO_NULL, &bcslen) <= -1) return -1;
moo_oow_t bcslen = MOO_COUNTOF(bcs);
moo_oow_t ucslen;
if (moo_convootobcstr (moo, arg->name, &ucslen, bcs, &bcslen) <= -1) return -1; fn = ((bb_t*)arg->includer->handle)->fn;
/* TODO: make bcs relative to the includer */ fb = get_base_name (fn);
#if defined(__DOS__) || defined(_WIN32) || defined(__OS2__) parlen = fb - fn;
fp = fopen (bcs, "rb");
#else bb = moo_callocmem (moo, MOO_SIZEOF(*bb) + (MOO_SIZEOF(moo_bch_t) * (parlen + bcslen + 1)));
fp = fopen (bcs, "r"); if (!bb) return -1;
#endif
bb->fn = (moo_bch_t*)(bb + 1);
moo_copybchars (bb->fn, fn, parlen);
moo_convootobcstr (moo, arg->name, &ucslen, &bb->fn[parlen], &bcslen);
} }
else else
{ {
/* main stream */ /* main stream */
#if defined(__DOS__) || defined(_WIN32) || defined(__OS2__) moo_oow_t pathlen;
fp = fopen (xtn->source_path, "rb");
#else pathlen = moo_countbcstr (xtn->source_path);
fp = fopen (xtn->source_path, "r");
#endif bb = moo_callocmem (moo, MOO_SIZEOF(*bb) + (MOO_SIZEOF(moo_bch_t) * (pathlen + 1)));
if (!bb) return -1;
bb->fn = (moo_bch_t*)(bb + 1);
moo_copybcstr (bb->fn, pathlen + 1, xtn->source_path);
} }
if (!fp) #if defined(__DOS__) || defined(_WIN32) || defined(__OS2__)
bb->fp = fopen (bb->fn, "rb");
#else
bb->fp = fopen (bb->fn, "r");
#endif
if (!bb->fp)
{ {
fclose (bb->fp);
moo_freemem (moo, bb);
moo_seterrnum (moo, MOO_EIOERR); moo_seterrnum (moo, MOO_EIOERR);
return -1; return -1;
} }
bb = moo_callocmem (moo, MOO_SIZEOF(*bb));
if (!bb)
{
fclose (fp);
return -1;
}
bb->fp = fp;
arg->handle = bb; arg->handle = bb;
return 0; return 0;
} }
static MOO_INLINE moo_ooi_t close_input (moo_t* moo, moo_ioarg_t* arg) static MOO_INLINE moo_ooi_t close_input (moo_t* moo, moo_ioarg_t* arg)
{ {
xtn_t* xtn = moo_getxtn(moo); /*xtn_t* xtn = moo_getxtn(moo);*/
bb_t* bb; bb_t* bb;
bb = (bb_t*)arg->handle; bb = (bb_t*)arg->handle;