@@ -1 +1,2 @@ *.o +xpl bin/.gitignore @@ -3,6 +3,9 @@ #include <stdlib.h> #include <string.h> +static void xpl_lex_stream_free_current_symbol(xpl_lex_stream stream); +static xpl_lex_symbol xpl_lex_symbol_init(); + xpl_lex_stream xpl_lex_stream_init(FILE* file) { xpl_lex_stream stream = (xpl_lex_stream) malloc(sizeof(struct xpl_lex_stream)); stream->input = file; @@ -11,10 +14,7 @@ xpl_lex_stream xpl_lex_stream_init(FILE* file) { } xpl_lex_symbol xpl_lex_stream_next(xpl_lex_stream stream) { - if(stream->current_sym != NULL) { - free(stream->current_sym); - stream->current_sym = NULL; - } + xpl_lex_stream_free_current_symbol(stream); char ch = getc(stream->input); while(ch == '\r' || ch == '\n' || ch == ' ') ch = getc(stream->input); @@ -40,10 +40,13 @@ void xpl_lex_stream_free(xpl_lex_stream stream) { free(stream); } -xpl_lex_symbol xpl_lex_symbol_init() { - return (xpl_lex_symbol) malloc(sizeof(struct xpl_lex_symbol)); +static void xpl_lex_stream_free_current_symbol(xpl_lex_stream stream) { + if(stream->current_sym != NULL) { + free(stream->current_sym); + stream->current_sym = NULL; + } } -void xpl_lex_symbol_free(xpl_lex_symbol symbol) { - free(symbol); +static xpl_lex_symbol xpl_lex_symbol_init() { + return (xpl_lex_symbol) malloc(sizeof(struct xpl_lex_symbol)); } src/lexer.c @@ -20,6 +20,3 @@ typedef struct xpl_lex_symbol *xpl_lex_symbol; xpl_lex_stream xpl_lex_stream_init(FILE* file); xpl_lex_symbol xpl_lex_stream_next(xpl_lex_stream stream); void xpl_lex_stream_free(xpl_lex_stream stream); - -xpl_lex_symbol xpl_lex_symbol_init(); -void xpl_lex_symbol_free(xpl_lex_symbol symbol); src/lexer.h bin/xpl 2a001fa2ae07d240a736f04b5ebc1e6271794e3b sztywny sztywny@gmail.com http://github.com/sztywny/xpl/commit/0e876945fff9cf1fb2974c713478821463bd651c 0e876945fff9cf1fb2974c713478821463bd651c 2009-04-07T14:42:56-07:00 2009-04-07T14:42:56-07:00 Little cleanups. ef67ae1b75973a6e9ee9fab00fbfe208ad604109 sztywny sztywny@gmail.com