diff options
| -rw-r--r-- | ChangeLog | 19 | ||||
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | eval.c | 4 | ||||
| -rw-r--r-- | lisplib.c | 3 | ||||
| -rw-r--r-- | parser.c | 9 | ||||
| -rw-r--r-- | parser.h | 2 | ||||
| -rw-r--r-- | txr.1 | 14 | ||||
| -rw-r--r-- | txr.c | 4 |
8 files changed, 45 insertions, 13 deletions
@@ -1,3 +1,22 @@ +2015-05-07 Kaz Kylheku <kaz@kylheku.com> + + * Makefile (LISP_TO_C_STRING): Strip comments, but not comment lines, + so line numbers don't change. + + * eval.c (eval_init): Fix registrations of lisp-parse and read. + + * lisplib.c (place_instantiate): Give name to parsed string stream + using new lisp_parse argument. + + * parser.c (lisp_parse): Takes new argument to override name. + + * parser.h (lisp_parse): Declaration updated. + + * txr.c (txr_main): Call lisp_parse with four args, defaulting + the new one. + + * txr.1: Documented new argument. + 2015-05-06 Kaz Kylheku <kaz@kylheku.com> New macro-based framework for assignment places. @@ -111,8 +111,7 @@ endef define LISP_TO_C_STRING $(call ABBREV,L2C) $(V)echo "const wchli_t *${@:.h=}_code = wli(" > $@ -$(V)sed -n -e '/^(/,$$p' $< | \ - sed -e 's/["\\]/\\&/g' -e 's/$$/\\n/' -e 's/.*/"&"/' >> $@ +$(V)sed -e 's/;.*//' -e 's/["\\]/\\&/g' -e 's/$$/\\n/' -e 's/.*/"&"/' $< >> $@ $(V)echo ");" >> $@ endef @@ -4131,8 +4131,8 @@ void eval_init(void) func_n4o(hash_update_1, 3)); reg_fun(intern(lit("eval"), user_package), func_n2o(eval_intrinsic, 1)); - reg_fun(intern(lit("lisp-parse"), user_package), func_n3o(lisp_parse, 0)); - reg_fun(intern(lit("read"), user_package), func_n3o(lisp_parse, 0)); + reg_fun(intern(lit("lisp-parse"), user_package), func_n4o(lisp_parse, 0)); + reg_fun(intern(lit("read"), user_package), func_n4o(lisp_parse, 0)); reg_fun(intern(lit("expand"), system_package), func_n2o(expand, 1)); reg_fun(intern(lit("macro-form-p"), user_package), func_n2o(macro_form_p, 1)); reg_fun(intern(lit("macroexpand-1"), user_package), @@ -66,7 +66,8 @@ static void set_place_dlt_entries(val dlt, val fun) static val place_instantiate(val dlt) { set_place_dlt_entries(dlt, nil); - return eval_intrinsic(lisp_parse(static_str(place_code), std_error, nil), nil); + return eval_intrinsic(lisp_parse(static_str(place_code), std_error, + colon_k, lit("place.tl")), nil); } void lisplib_init(void) @@ -118,7 +118,7 @@ val regex_parse(val string, val error_stream) return parser.errors ? nil : parser.syntax_tree; } -val lisp_parse(val source_in, val error_stream, val error_return_val) +val lisp_parse(val source_in, val error_stream, val error_return_val, val name_in) { uses_or2; val source = default_bool_arg(source_in); @@ -126,9 +126,10 @@ val lisp_parse(val source_in, val error_stream, val error_return_val) make_string_byte_input_stream(source), or2(source, std_input)); val secret_token_stream = make_string_byte_input_stream(lit("@\x01" "E")); - val name = if3(stringp(source), - lit("string"), - stream_get_prop(input_stream, name_k)); + val name = or2(default_bool_arg(name_in), + if3(stringp(source), + lit("string"), + stream_get_prop(input_stream, name_k))); val stream = make_catenated_stream(list(secret_token_stream, input_stream, nao)); val saved_dyn = dyn_env; parser_t parser; @@ -66,6 +66,6 @@ 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 lisp_parse(val source, val error_stream, val error_return_val, val name); val parser(val stream, val lineno); void parse_init(void); @@ -23464,7 +23464,7 @@ Examples of strings which are not absolute paths. .coNP Function @ read .synb -.mets (read >> [ source >> [ error-stream <> [ error-return-value ]]]) +.mets (read >> [ source >> [ error-stream >> [ error-return-value <> [ name ]]]]) .syne .desc The @@ -23488,6 +23488,18 @@ The optional argument can be used to specify a stream to which parse errors diagnostics are sent. If absent, the diagnostics are suppressed. +The optional +.meta name +argument can be used to specify the file name which is used for reporting +errors. If this argument is missing, the name is taken from the name +property of the +.meta source +argument if it is a stream, or else the word +.code string +is used as the name if +.meta source +is a string. + If there are no parse errors, the function returns the parsed data structure. If there are parse errors, and the .meta error-return-value @@ -530,7 +530,7 @@ int txr_main(int argc, char **argv) spec_file = arg; break; case 'e': - eval_intrinsic(lisp_parse(arg, std_error, colon_k), + eval_intrinsic(lisp_parse(arg, std_error, colon_k, colon_k), make_env(bindings, nil, nil)); evaled = t; break; @@ -543,7 +543,7 @@ int txr_main(int argc, char **argv) if3(c_chr(opt) == 'P', pprinl, tprint)); - pf(eval_intrinsic(lisp_parse(arg, std_error, colon_k), + pf(eval_intrinsic(lisp_parse(arg, std_error, colon_k, colon_k), make_env(bindings, nil, nil)), std_output); evaled = t; } |