diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | parser.c | 89 | ||||
| -rw-r--r-- | parser.h | 5 | ||||
| -rw-r--r-- | parser.l | 2 |
5 files changed, 107 insertions, 3 deletions
@@ -1,5 +1,17 @@ 2015-02-25 Kaz Kylheku <kaz@kylheku.com> + * Makefile (OBJS): Add parser.o. + + * parser.h (parser_s): Declared. + (parse_init): Declaration removed. + (parser_l_init): Declared. + + * parser.l (parse_init): Function renamed to parser_l_init. + + * parser.c: New file. + +2015-02-25 Kaz Kylheku <kaz@kylheku.com> + New ignerr macro. * eval.c (me_ignerr): New static function. @@ -45,7 +45,7 @@ OBJS-y := # make sure OBJ-y is a value variable, not a macro variable EXTRA_OBJS-y := OBJS := txr.o lex.yy.o y.tab.o match.o lib.o regex.o gc.o unwind.o stream.o -OBJS += arith.o hash.o utf8.o filter.o eval.o rand.o combi.o sysif.o +OBJS += arith.o hash.o utf8.o filter.o eval.o parser.o rand.o combi.o sysif.o OBJS-$(debug_support) += debug.o OBJS-$(have_syslog) += syslog.o OBJS-$(have_glob) += glob.o diff --git a/parser.c b/parser.c new file mode 100644 index 00000000..47d14fcb --- /dev/null +++ b/parser.c @@ -0,0 +1,89 @@ +/* Copyright 2009-2014 + * Kaz Kylheku <kaz@kylheku.com> + * Vancouver, Canada + * All rights reserved. + * + * Redistribution of this software in source and binary forms, with or without + * modification, is permitted provided that the following two conditions are met. + * + * Use of this software in any manner constitutes agreement with the disclaimer + * which follows the two conditions. + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL THE + * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DAMAGES, HOWEVER CAUSED, + * AND UNDER ANY THEORY OF LIABILITY, ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include <stdio.h> +#include <assert.h> +#include <limits.h> +#include <dirent.h> +#include <stdlib.h> +#include <stdarg.h> +#include <setjmp.h> +#include <wchar.h> +#include <signal.h> +#include "config.h" +#include "lib.h" +#include "signal.h" +#include "unwind.h" +#include "gc.h" +#include "regex.h" +#include "utf8.h" +#include "match.h" +#include "hash.h" +#include "eval.h" +#include "stream.h" +#include "parser.h" + +val parser_s; + +static void parser_mark(val obj) +{ + parser_t *p = coerce(parser_t *, obj->co.handle); + gc_mark(p->stream); + gc_mark(p->name); + gc_mark(p->prepared_msg); + gc_mark(p->syntax_tree); +} + +static struct cobj_ops parser_ops = { + eq, + cobj_print_op, + cobj_destroy_free_op, + parser_mark, + cobj_hash_op, +}; + +val parser(val stream, val lineno) +{ + parser_t *p = coerce(parser_t *, chk_malloc(sizeof *p)); + val parser; + p->lineno = 0; + p->errors = 0; + p->stream = nil; + p->name = nil; + p->prepared_msg = nil; + p->syntax_tree = nil; + p->scanner = 0; + parser = cobj(coerce(mem_t *, p), parser_s, &parser_ops); + p->lineno = c_num(default_arg(lineno, one)); + p->stream = stream; + return parser; +} + +void parse_init(void) +{ + parser_s = intern(lit("parser"), user_package); + parser_l_init(); +} @@ -43,6 +43,7 @@ typedef void *yyscan_t; extern const wchar_t *spec_file; extern val form_to_ln_hash; +extern val parser_s; void yyerror(scanner_t *scanner, parser_t *, const char *s); void yyerr(scanner_t *scanner, const char *s); void yyerrorf(scanner_t *scanner, val s, ...); @@ -53,7 +54,7 @@ int yylex_init(yyscan_t *pscanner); int yylex_destroy(yyscan_t scanner); parser_t *yyget_extra(yyscan_t scanner); void yyset_extra(parser_t *, yyscan_t); -void parse_init(void); +void parser_l_init(void); void open_txr_file(val spec_file, val *name, val *stream); int parse(val stream, val name, parser_t *parser); val source_loc(val form); @@ -66,3 +67,5 @@ INLINE val rlcp(val to, val from) val rlcp_tree(val to, val from); val regex_parse(val string, val error_stream); val lisp_parse(val source, val error_stream, val error_return_val); +val parser(val stream, val lineno); +void parse_init(void); @@ -951,7 +951,7 @@ val source_loc_str(val form) lit("source location n/a")); } -void parse_init(void) +void parser_l_init(void) { prot1(&form_to_ln_hash); form_to_ln_hash = make_hash(t, nil, nil); |