From 83c060f3efc2945c3388ffaaa419862f5cdd9d1c Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Tue, 28 Jun 2005 15:23:58 +0000 Subject: [PATCH] *** empty log message *** --- ase/stx/makefile.cl | 22 ++++++++++++++++++++++ ase/stx/parser.c | 16 +++++++++++----- 2 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 ase/stx/makefile.cl diff --git a/ase/stx/makefile.cl b/ase/stx/makefile.cl new file mode 100644 index 00000000..e4da2d0f --- /dev/null +++ b/ase/stx/makefile.cl @@ -0,0 +1,22 @@ +SRCS = \ + stx.c memory.c object.c symbol.c class.c \ + hash.c misc.c context.c token.c parser.c bootstrp.c +OBJS = $(SRCS:.c=.obj) +OUT = xpstx.lib + +CC = cl +CFLAGS = /nologo /MT /GX /W3 /GR- /D_WIN32_WINNT=0400 -I../.. + +all: $(OBJS) + link -lib @<< +/nologo /out:$(OUT) $(OBJS) +<< + + +clean: + del $(OBJS) $(OUT) *.obj + +.SUFFIXES: .c .obj +.c.obj: + $(CC) $(CFLAGS) /c $< + diff --git a/ase/stx/parser.c b/ase/stx/parser.c index 4d92630c..30b0d3d7 100644 --- a/ase/stx/parser.c +++ b/ase/stx/parser.c @@ -1,10 +1,16 @@ /* - * $Id: parser.c,v 1.41 2005-06-28 04:13:08 bacon Exp $ + * $Id: parser.c,v 1.42 2005-06-28 15:23:58 bacon Exp $ */ #include #include +#if defined(__BORLANDC__) || defined(_MSC_VER) + #define INLINE +#else + #define INLINE inline +#endif + static int __parse_method ( xp_stx_parser_t* parser, xp_word_t method_class, void* input); @@ -160,7 +166,7 @@ const xp_char_t* xp_stx_parser_error_string (xp_stx_parser_t* parser) return XP_TEXT("unknown error"); } -static inline xp_bool_t __is_pseudo_variable (const xp_stx_token_t* token) +static INLINE xp_bool_t __is_pseudo_variable (const xp_stx_token_t* token) { return token->type == XP_STX_TOKEN_IDENT && (xp_strcmp(token->name.buffer, XP_TEXT("self")) == 0 || @@ -170,7 +176,7 @@ static inline xp_bool_t __is_pseudo_variable (const xp_stx_token_t* token) xp_strcmp(token->name.buffer, XP_TEXT("false")) == 0); } -static inline xp_bool_t __is_vbar_token (const xp_stx_token_t* token) +static INLINE xp_bool_t __is_vbar_token (const xp_stx_token_t* token) { return token->type == XP_STX_TOKEN_BINARY && @@ -178,7 +184,7 @@ static inline xp_bool_t __is_vbar_token (const xp_stx_token_t* token) token->name.buffer[0] == XP_CHAR('|'); } -static inline xp_bool_t __is_binary_char (xp_cint_t c) +static INLINE xp_bool_t __is_binary_char (xp_cint_t c) { /* * binaryCharacter ::= @@ -198,7 +204,7 @@ static inline xp_bool_t __is_binary_char (xp_cint_t c) c == XP_CHAR('~') || c == XP_CHAR('-'); } -static inline xp_bool_t __is_closing_char (xp_cint_t c) +static INLINE xp_bool_t __is_closing_char (xp_cint_t c) { return c == XP_CHAR('.') || c == XP_CHAR(']') ||