From 62799e02fdb073b0f00715f4039da59b72767de5 Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Sat, 28 May 2005 13:34:26 +0000 Subject: [PATCH] *** empty log message *** --- ase/lsp/array.c | 4 ++-- ase/lsp/array.h | 9 +++++---- ase/lsp/env.c | 4 ++-- ase/lsp/env.h | 8 ++++---- ase/lsp/eval.c | 16 ++++------------ ase/lsp/lisp.c | 4 ++-- ase/lsp/lisp.h | 14 +++++++------- ase/lsp/makefile.lcc | 18 ++++++++++++++++++ ase/lsp/memory.c | 6 +++--- ase/lsp/memory.h | 12 ++++++------ ase/lsp/object.h | 4 ++-- ase/lsp/primitive.c | 8 ++++---- ase/lsp/primitive.h | 10 +++++----- ase/lsp/print.c | 4 ++-- ase/lsp/token.c | 4 ++-- ase/lsp/token.h | 8 ++++---- ase/lsp/types.h | 6 +++--- ase/macros.h | 4 ++-- ase/makefile.in | 2 +- 19 files changed, 78 insertions(+), 67 deletions(-) create mode 100644 ase/lsp/makefile.lcc diff --git a/ase/lsp/array.c b/ase/lsp/array.c index c2960d59..eea70722 100644 --- a/ase/lsp/array.c +++ b/ase/lsp/array.c @@ -1,8 +1,8 @@ /* - * $Id: array.c,v 1.5 2005-05-22 13:41:14 bacon Exp $ + * $Id: array.c,v 1.6 2005-05-28 13:34:26 bacon Exp $ */ -#include +#include #include #include diff --git a/ase/lsp/array.h b/ase/lsp/array.h index 2b5e37ac..995cbfeb 100644 --- a/ase/lsp/array.h +++ b/ase/lsp/array.h @@ -1,13 +1,14 @@ /* - * $Id: array.h,v 1.3 2005-05-22 13:41:14 bacon Exp $ + * $Id: array.h,v 1.4 2005-05-28 13:34:26 bacon Exp $ */ -#ifndef _XP_LISP_ARRAY_H_ -#define _XP_LISP_ARRAY_H_ +#ifndef _XP_LSP_ARRAY_H_ +#define _XP_LSP_ARRAY_H_ #include -struct xp_lisp_array_t { +struct xp_lisp_array_t +{ void** buffer; xp_size_t size; xp_size_t capacity; diff --git a/ase/lsp/env.c b/ase/lsp/env.c index 427de9f4..5d3de790 100644 --- a/ase/lsp/env.c +++ b/ase/lsp/env.c @@ -1,8 +1,8 @@ /* - * $Id: env.c,v 1.5 2005-04-24 07:48:16 bacon Exp $ + * $Id: env.c,v 1.6 2005-05-28 13:34:26 bacon Exp $ */ -#include +#include #include #include diff --git a/ase/lsp/env.h b/ase/lsp/env.h index 94bf3552..a19782e5 100644 --- a/ase/lsp/env.h +++ b/ase/lsp/env.h @@ -1,11 +1,11 @@ /* - * $Id: env.h,v 1.2 2005-02-04 16:00:37 bacon Exp $ + * $Id: env.h,v 1.3 2005-05-28 13:34:26 bacon Exp $ */ -#ifndef _XP_LISP_ENV_H_ -#define _XP_LISP_ENV_H_ +#ifndef _XP_LSP_ENV_H_ +#define _XP_LSP_ENV_H_ -#include +#include struct xp_lisp_assoc_t { diff --git a/ase/lsp/eval.c b/ase/lsp/eval.c index 70fb8b39..dd9ada31 100644 --- a/ase/lsp/eval.c +++ b/ase/lsp/eval.c @@ -1,24 +1,16 @@ /* - * $Id: eval.c,v 1.6 2005-04-24 07:48:16 bacon Exp $ + * $Id: eval.c,v 1.7 2005-05-28 13:34:26 bacon Exp $ */ -#include -#include -#include +#include +#include +#include #include -#ifdef __cplusplus -extern "C" { -#endif - static xp_lisp_obj_t* make_func (xp_lisp_t* lsp, xp_lisp_obj_t* cdr, int is_macro); static xp_lisp_obj_t* eval_cons (xp_lisp_t* lsp, xp_lisp_obj_t* cons); static xp_lisp_obj_t* apply (xp_lisp_t* lsp, xp_lisp_obj_t* func, xp_lisp_obj_t* actual); -#ifdef __cplusplus -} -#endif - xp_lisp_obj_t* xp_lisp_eval (xp_lisp_t* lsp, xp_lisp_obj_t* obj) { lsp->error = XP_LISP_ERR_NONE; diff --git a/ase/lsp/lisp.c b/ase/lsp/lisp.c index 24c2e663..0a308132 100644 --- a/ase/lsp/lisp.c +++ b/ase/lsp/lisp.c @@ -1,8 +1,8 @@ /* - * $Id: lisp.c,v 1.8 2005-04-24 07:48:16 bacon Exp $ + * $Id: lisp.c,v 1.9 2005-05-28 13:34:26 bacon Exp $ */ -#include +#include #include #include diff --git a/ase/lsp/lisp.h b/ase/lsp/lisp.h index 30d49b8d..95a6f95e 100644 --- a/ase/lsp/lisp.h +++ b/ase/lsp/lisp.h @@ -1,14 +1,14 @@ /* - * $Id: lisp.h,v 1.4 2005-04-24 07:48:16 bacon Exp $ + * $Id: lisp.h,v 1.5 2005-05-28 13:34:26 bacon Exp $ */ -#ifndef _XP_LISP_LISP_H_ -#define _XP_LISP_LISP_H_ +#ifndef _XP_LSP_LISP_H_ +#define _XP_LSP_LISP_H_ -#include -#include -#include -#include +#include +#include +#include +#include #include // TODO: may have to remove dependency on stdio? diff --git a/ase/lsp/makefile.lcc b/ase/lsp/makefile.lcc new file mode 100644 index 00000000..2ec1f398 --- /dev/null +++ b/ase/lsp/makefile.lcc @@ -0,0 +1,18 @@ +SRCS = env.c token.c memory.c lisp.c primitive.c read.c eval.c print.c array.c +OBJS = env.obj token.obj memory.obj lisp.obj primitive.obj read.obj eval.obj print.obj array.obj +OUT = xpstx.lib + +CC = lcc +CFLAGS = -I../.. -A -ansic -libcdll +LDFLAGS = +LIBS = + +all: $(OBJS) + lcclib $(OUT) $(OBJS) + +clean: + del $(OBJS) $(OUT) *.obj + +.SUFFIXES: .c .obj +.c.obj: + $(CC) $(CFLAGS) -c $< diff --git a/ase/lsp/memory.c b/ase/lsp/memory.c index 673f9d3b..ab98d35b 100644 --- a/ase/lsp/memory.c +++ b/ase/lsp/memory.c @@ -1,9 +1,9 @@ /* - * $Id: memory.c,v 1.10 2005-04-24 07:48:16 bacon Exp $ + * $Id: memory.c,v 1.11 2005-05-28 13:34:26 bacon Exp $ */ -#include -#include +#include +#include #include #include #include diff --git a/ase/lsp/memory.h b/ase/lsp/memory.h index 54227b46..0ea36191 100644 --- a/ase/lsp/memory.h +++ b/ase/lsp/memory.h @@ -1,13 +1,13 @@ /* - * $Id: memory.h,v 1.4 2005-02-14 14:37:50 bacon Exp $ + * $Id: memory.h,v 1.5 2005-05-28 13:34:26 bacon Exp $ */ -#ifndef _XP_LISP_MEM_H_ -#define _XP_LISP_MEM_H_ +#ifndef _XP_LSP_MEM_H_ +#define _XP_LSP_MEM_H_ -#include -#include -#include +#include +#include +#include struct xp_lisp_mem_t { diff --git a/ase/lsp/object.h b/ase/lsp/object.h index 03e975df..9196b368 100644 --- a/ase/lsp/object.h +++ b/ase/lsp/object.h @@ -1,11 +1,11 @@ /* - * $Id: object.h,v 1.4 2005-02-14 14:37:50 bacon Exp $ + * $Id: object.h,v 1.5 2005-05-28 13:34:26 bacon Exp $ */ #ifndef _XP_LISP_OBJECT_H_ #define _XP_LISP_OBJECT_H_ -#include +#include // object types enum diff --git a/ase/lsp/primitive.c b/ase/lsp/primitive.c index 6116e9c0..33cafbc3 100644 --- a/ase/lsp/primitive.c +++ b/ase/lsp/primitive.c @@ -1,10 +1,10 @@ /* - * $Id: primitive.c,v 1.6 2005-04-24 07:48:16 bacon Exp $ + * $Id: primitive.c,v 1.7 2005-05-28 13:34:26 bacon Exp $ */ -#include -#include -#include +#include +#include +#include #include xp_lisp_obj_t* xp_lisp_prim_abort (xp_lisp_t* lsp, xp_lisp_obj_t* args) diff --git a/ase/lsp/primitive.h b/ase/lsp/primitive.h index 88830996..445c8909 100644 --- a/ase/lsp/primitive.h +++ b/ase/lsp/primitive.h @@ -1,12 +1,12 @@ /* - * $Id: primitive.h,v 1.2 2005-02-04 16:00:37 bacon Exp $ + * $Id: primitive.h,v 1.3 2005-05-28 13:34:26 bacon Exp $ */ -#ifndef _XP_LISP_PRIM_H_ -#define _XP_LISP_PRIM_H_ +#ifndef _XP_LSP_PRIM_H_ +#define _XP_LSP_PRIM_H_ -#include -#include +#include +#include typedef xp_lisp_obj_t* (*xp_lisp_pimpl_t) (xp_lisp_t*, xp_lisp_obj_t*); diff --git a/ase/lsp/print.c b/ase/lsp/print.c index 649c02e4..fa67211b 100644 --- a/ase/lsp/print.c +++ b/ase/lsp/print.c @@ -1,8 +1,8 @@ /* - * $Id: print.c,v 1.4 2005-02-14 14:37:50 bacon Exp $ + * $Id: print.c,v 1.5 2005-05-28 13:34:26 bacon Exp $ */ -#include +#include void xp_lisp_print_debug (xp_lisp_obj_t* obj) { diff --git a/ase/lsp/token.c b/ase/lsp/token.c index 710643bc..5cd8a20c 100644 --- a/ase/lsp/token.c +++ b/ase/lsp/token.c @@ -1,8 +1,8 @@ /* - * $Id: token.c,v 1.9 2005-05-22 13:41:14 bacon Exp $ + * $Id: token.c,v 1.10 2005-05-28 13:34:26 bacon Exp $ */ -#include +#include #include #include diff --git a/ase/lsp/token.h b/ase/lsp/token.h index 49908a2d..a609ef83 100644 --- a/ase/lsp/token.h +++ b/ase/lsp/token.h @@ -1,11 +1,11 @@ /* - * $Id: token.h,v 1.6 2005-05-22 13:41:14 bacon Exp $ + * $Id: token.h,v 1.7 2005-05-28 13:34:26 bacon Exp $ */ -#ifndef _XP_LISP_TOKEN_H_ -#define _XP_LISP_TOKEN_H_ +#ifndef _XP_LSP_TOKEN_H_ +#define _XP_LSP_TOKEN_H_ -#include +#include struct xp_lisp_token_t { diff --git a/ase/lsp/types.h b/ase/lsp/types.h index 63681052..4cbb10e8 100644 --- a/ase/lsp/types.h +++ b/ase/lsp/types.h @@ -1,9 +1,9 @@ /* - * $Id: types.h,v 1.5 2005-02-14 14:37:50 bacon Exp $ + * $Id: types.h,v 1.6 2005-05-28 13:34:26 bacon Exp $ */ -#ifndef _XP_LISP_TYPES_H_ -#define _XP_LISP_TYPES_H_ +#ifndef _XP_LSP_TYPES_H_ +#define _XP_LSP_TYPES_H_ #include #include diff --git a/ase/macros.h b/ase/macros.h index e5ae078e..f922ea0b 100644 --- a/ase/macros.h +++ b/ase/macros.h @@ -1,5 +1,5 @@ /* - * $Id: macros.h,v 1.24 2005-05-10 16:08:10 bacon Exp $ + * $Id: macros.h,v 1.25 2005-05-28 13:34:26 bacon Exp $ */ #ifndef _XP_MACROS_H_ @@ -13,7 +13,7 @@ #define XP_NULL ((void*)0) #endif -#define XP_EOF ((xp_cint_t)-1) +#define XP_CHAR_EOF ((xp_cint_t)-1) #define xp_sizeof(n) (sizeof(n)) #define xp_countof(n) (sizeof(n) / sizeof(n[0])) diff --git a/ase/makefile.in b/ase/makefile.in index db3ae886..43dfb7d0 100644 --- a/ase/makefile.in +++ b/ase/makefile.in @@ -1,4 +1,4 @@ -SUBDIRS=bas net utl awk lisp +SUBDIRS=bas net utl awk lsp all: @for i in $(SUBDIRS); \