diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | eval.c | 16 | ||||
| -rw-r--r-- | txr.1 | 15 |
3 files changed, 34 insertions, 4 deletions
@@ -1,5 +1,12 @@ 2014-02-22 Kaz Kylheku <kaz@kylheku.com> + * eval.c (prinl, pprinl): New functions. + (eval_init): Registered as intrinsics. + + * txr.1: Documented. + +2014-02-22 Kaz Kylheku <kaz@kylheku.com> + * lib.c (obj_init): changing the quote, qquote, unquote and splice symbols to be in the regular user package, rather than the system package. @@ -2819,6 +2819,20 @@ static val and_fun(val vals) return item; } +static val prinl(val obj, val stream) +{ + val ret = obj_print(obj, stream); + put_char(chr('\n'), stream); + return ret; +} + +static val pprinl(val obj, val stream) +{ + val ret = obj_pprint(obj, stream); + put_char(chr('\n'), stream); + return ret; +} + void eval_init(void) { protect(&top_vb, &top_fb, &top_mb, &special, @@ -3128,6 +3142,8 @@ void eval_init(void) reg_fun(intern(lit("pprint"), user_package), func_n2o(obj_pprint, 1)); reg_fun(intern(lit("tostring"), user_package), func_n1(tostring)); reg_fun(intern(lit("tostringp"), user_package), func_n1(tostringp)); + reg_fun(intern(lit("prinl"), user_package), func_n2o(prinl, 1)); + reg_fun(intern(lit("pprinl"), user_package), func_n2o(pprinl, 1)); reg_fun(intern(lit("make-string-input-stream"), user_package), func_n1(make_string_input_stream)); reg_fun(intern(lit("make-string-byte-input-stream"), user_package), func_n1(make_string_byte_input_stream)); reg_fun(intern(lit("make-string-output-stream"), user_package), func_n0(make_string_output_stream)); @@ -11150,13 +11150,15 @@ truncated off entirely, including the decimal point. .PP -.SS Functions print, pprint, tostring, tostringp +.SS Functions print, pprint, prinl, pprinl, tostring, tostringp .TP Syntax: (print <obj> [<stream>]) (pprint <obj> [<stream>]) + (prinl <obj> [<stream>]) + (pprinl <obj> [<stream>]) (tostring <obj>) (tostringp <obj>) @@ -11172,7 +11174,11 @@ a similar object of the same kind when it appears in TXR source code. The pprint function ("pretty print") does not strive for read-print consistency. For instance it prints a string object simply by dumping its characters, rather than by adding the surrounding quotes and rendering escape syntax for -special characters. +special characters. Both functions return <obj>. + +The prinl and pprinl functions are like print and pprint, except +that they issue a newline character after printing the object. +These functions also return <obj>. The tostring and tostringp functions are like print and pprint, but they do not accept a stream argument, instead printing to a freshly @@ -11183,10 +11189,11 @@ and calls to these functions: (format stream "~s" obj) <--> (print obj stream) (format t "~s" obj) <--> (print obj) + (format t "~s\en" obj) <--> (prinl obj) (format nil "~s" obj) <--> (tostring obj) -For pprint and tostringp, the equivalence is produced by using "~a" -in format rather than "~s". +For pprint, tostringp and pprinl, the equivalence is produced by using "~a" in +format rather than "~s". .SS Function streamp |