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

added a missing file in Makefile.am

Browse Source
This commit is contained in:
hyung-hwan 2011-05-20 09:15:15 +00:00
parent 687f4d21b8
commit 4a1e5d6106
3 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
qse/include/qse/cmn/Makefile.am
View File

@ -10,6 +10,7 @@ pkginclude_HEADERS = \
htb.h \ htb.h \
lda.h \ lda.h \
main.h \ main.h \
map.h \
mem.h \ mem.h \
misc.h \ misc.h \
oht.h \ oht.h \

8
qse/include/qse/cmn/Makefile.in
View File

@ -51,8 +51,8 @@ CONFIG_CLEAN_VPATH_FILES =
SOURCES = SOURCES =
DIST_SOURCES = DIST_SOURCES =
am__pkginclude_HEADERS_DIST = alg.h chr.h dll.h fio.h fma.h gdl.h \ am__pkginclude_HEADERS_DIST = alg.h chr.h dll.h fio.h fma.h gdl.h \
htb.h lda.h main.h mem.h misc.h oht.h opt.h pio.h rbt.h rex.h \ htb.h lda.h main.h map.h mem.h misc.h oht.h opt.h pio.h rbt.h \
sio.h sll.h stdio.h str.h time.h tio.h xma.h Mmgr.hpp \ rex.h sio.h sll.h stdio.h str.h time.h tio.h xma.h Mmgr.hpp \
StdMmgr.hpp Mmged.hpp StdMmgr.hpp Mmged.hpp
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \ am__vpath_adj = case $$p in \
@ -219,8 +219,8 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
pkginclude_HEADERS = alg.h chr.h dll.h fio.h fma.h gdl.h htb.h lda.h \ pkginclude_HEADERS = alg.h chr.h dll.h fio.h fma.h gdl.h htb.h lda.h \
main.h mem.h misc.h oht.h opt.h pio.h rbt.h rex.h sio.h sll.h \ main.h map.h mem.h misc.h oht.h opt.h pio.h rbt.h rex.h sio.h \
stdio.h str.h time.h tio.h xma.h $(am__append_1) sll.h stdio.h str.h time.h tio.h xma.h $(am__append_1)
all: all-am all: all-am
.SUFFIXES: .SUFFIXES:

36
qse/lib/stx/object.c
View File

@ -16,7 +16,7 @@ qse_word_t qse_stx_alloc_word_object (
qse_word_t idx, n; qse_word_t idx, n;
qse_stx_word_object_t* obj; qse_stx_word_object_t* obj;
qse_assert (stx->nil == QSE_STX_NIL); QSE_ASSERT (stx->nil == QSE_STX_NIL);
/* bytes to allocated = /* bytes to allocated =
* (number of instance variables + * (number of instance variables +
@ -60,7 +60,7 @@ qse_word_t qse_stx_alloc_byte_object (
qse_word_t idx; qse_word_t idx;
qse_stx_byte_object_t* obj; qse_stx_byte_object_t* obj;
qse_assert (stx->nil == QSE_STX_NIL); QSE_ASSERT (stx->nil == QSE_STX_NIL);
idx = qse_stx_memory_alloc ( idx = qse_stx_memory_alloc (
&stx->memory, n + qse_sizeof(qse_stx_object_t)); &stx->memory, n + qse_sizeof(qse_stx_object_t));
@ -96,7 +96,7 @@ qse_word_t qse_stx_alloc_char_objectx (
qse_word_t idx; qse_word_t idx;
qse_stx_char_object_t* obj; qse_stx_char_object_t* obj;
qse_assert (stx->nil == QSE_STX_NIL); QSE_ASSERT (stx->nil == QSE_STX_NIL);
idx = qse_stx_memory_alloc (&stx->memory, idx = qse_stx_memory_alloc (&stx->memory,
(n + 1) * qse_sizeof(qse_char_t) + qse_sizeof(qse_stx_object_t)); (n + 1) * qse_sizeof(qse_char_t) + qse_sizeof(qse_stx_object_t));
@ -125,7 +125,7 @@ qse_word_t qse_stx_allocn_char_object (qse_stx_t* stx, ...)
qse_va_list ap; qse_va_list ap;
qse_stx_char_object_t* obj; qse_stx_char_object_t* obj;
qse_assert (stx->nil == QSE_STX_NIL); QSE_ASSERT (stx->nil == QSE_STX_NIL);
qse_va_start (ap, stx); qse_va_start (ap, stx);
while ((p = qse_va_arg(ap, const qse_char_t*)) != QSE_NULL) { while ((p = qse_va_arg(ap, const qse_char_t*)) != QSE_NULL) {
@ -174,7 +174,7 @@ qse_word_t qse_stx_hash_object (qse_stx_t* stx, qse_word_t object)
QSE_STX_DATA(stx,object), QSE_STX_SIZE(stx,object)); QSE_STX_DATA(stx,object), QSE_STX_SIZE(stx,object));
} }
else { else {
qse_assert (QSE_STX_IS_WORD_OBJECT(stx,object)); QSE_ASSERT (QSE_STX_IS_WORD_OBJECT(stx,object));
hv = qse_stx_hash (QSE_STX_DATA(stx,object), hv = qse_stx_hash (QSE_STX_DATA(stx,object),
QSE_STX_SIZE(stx,object) * qse_sizeof(qse_word_t)); QSE_STX_SIZE(stx,object) * qse_sizeof(qse_word_t));
} }
@ -190,36 +190,40 @@ qse_word_t qse_stx_instantiate (
qse_word_t spec, nfields, new; qse_word_t spec, nfields, new;
int indexable; int indexable;
qse_assert (class != stx->class_smallinteger); QSE_ASSERT (class != stx->class_smallinteger);
class_obj = (qse_stx_class_t*)QSE_STX_OBJECT(stx, class); class_obj = (qse_stx_class_t*)QSE_STX_OBJECT(stx, class);
/* don't instantiate a metaclass whose instance must be /* don't instantiate a metaclass whose instance must be
created in a different way */ created in a different way */
/* TODO: maybe delete the following line */ /* TODO: maybe delete the following line */
qse_assert (class_obj->header.class != stx->class_metaclass); QSE_ASSERT (class_obj->header.class != stx->class_metaclass);
qse_assert (QSE_STX_IS_SMALLINT(class_obj->spec)); QSE_ASSERT (QSE_STX_IS_SMALLINT(class_obj->spec));
spec = QSE_STX_FROM_SMALLINT(class_obj->spec); spec = QSE_STX_FROM_SMALLINT(class_obj->spec);
nfields = (spec >> QSE_STX_SPEC_INDEXABLE_BITS); nfields = (spec >> QSE_STX_SPEC_INDEXABLE_BITS);
indexable = spec & QSE_STX_SPEC_INDEXABLE_MASK; indexable = spec & QSE_STX_SPEC_INDEXABLE_MASK;
if (indexable == QSE_STX_SPEC_BYTE_INDEXABLE) { if (indexable == QSE_STX_SPEC_BYTE_INDEXABLE)
qse_assert (nfields == 0 && data == QSE_NULL); {
QSE_ASSERT (nfields == 0 && data == QSE_NULL);
new = qse_stx_alloc_byte_object( new = qse_stx_alloc_byte_object(
stx, variable_data, variable_nfields); stx, variable_data, variable_nfields);
} }
else if (indexable == QSE_STX_SPEC_CHAR_INDEXABLE) { else if (indexable == QSE_STX_SPEC_CHAR_INDEXABLE)
qse_assert (nfields == 0 && data == QSE_NULL); {
QSE_ASSERT (nfields == 0 && data == QSE_NULL);
new = qse_stx_alloc_char_objectx( new = qse_stx_alloc_char_objectx(
stx, variable_data, variable_nfields); stx, variable_data, variable_nfields);
} }
else if (indexable == QSE_STX_SPEC_WORD_INDEXABLE) { else if (indexable == QSE_STX_SPEC_WORD_INDEXABLE)
{
new = qse_stx_alloc_word_object ( new = qse_stx_alloc_word_object (
stx, data, nfields, variable_data, variable_nfields); stx, data, nfields, variable_data, variable_nfields);
} }
else { else
qse_assert (indexable == QSE_STX_SPEC_NOT_INDEXABLE); {
qse_assert (variable_nfields == 0 && variable_data == QSE_NULL); QSE_ASSERT (indexable == QSE_STX_SPEC_NOT_INDEXABLE);
QSE_ASSERT (variable_nfields == 0 && variable_data == QSE_NULL);
new = qse_stx_alloc_word_object ( new = qse_stx_alloc_word_object (
stx, data, nfields, QSE_NULL, 0); stx, data, nfields, QSE_NULL, 0);
} }