summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* getopts: uniformize opthelp newlines and headers.Paul A. Patience2022-02-082-7/+7
| | | | | | | | | | | | | | | | The documented options and type legend both end in a blank line, unlike the undocumented options and option conventions. * stdlib/getopts.tl (opthelp): Print a blank line after the undocumented options. (opthelp-conventions): Print a blank line after the conventions. Also, change the header from "Option Conventions" to "Option conventions" to follow the style of the undocumented options and type legend. * txr.1: Remove superfluous (as of now) put-line calls in the --extra-help example of getopts. While here, correct o.extrahelp to o.extra-help.
* doc: fix a few more typos.Paul A. Patience2022-02-071-10/+11
| | | | * txr.1: Fix typos.
* lib: fix return value of separate for nil seq.Paul A. Patience2022-02-071-1/+1
| | | | | * lib.c (separate): Return (list nil nil) instead of just nil when the sequence parameter is nil, as is documented.
* txr: -D bugfixes.Kaz Kylheku2022-02-061-12/+25
| | | | | | | * txr.c (txr_main): Don't use split_str to break -Dvar=val syntax, because that splits on all occurrences of the = character. Secondly, diagnose -Da,b,c shape: list commas occur with no = sign.
* doc: fix various typos and stylistic issues.Paul A. Patience2022-02-062-79/+87
| | | | | | * txr.1: Fix typos and stylistic issues. * stdlib/doc-syms.tl: Updated.
* Use null_string throughout code base.Kaz Kylheku2022-02-056-11/+12
| | | | | | | | | | | | | | | | * eval.c (load): Use null_string instead of lit(""). * lib.c (obj_init): Likewise. * match.c (LOG_MATCH, LOG_MISMATCH, do_txeval): Likewise. * parser.c (regex_parse, lisp_parse_impl, find_matching_syms): Likewise. * stream.c (do_parse_mode): Likewise. * txr.c (sysroot_init): Likewise. (txr_main): Replace string(L"") with null_string.
* doc: no such thing as -Da,b,cKaz Kylheku2022-02-051-2/+4
| | | | | * txr.1: Fix the example -Da,b,c to -Dvar=a,b,c. Reported by Paul A. Patience.
* txr: bind -D-valueless variables to empty string.Paul A. Patience2022-02-051-1/+1
| | | | | * txr.c (txr_main): Bind variables specified with -D but without values to the empty string, as documented in the manual.
* vim: improvement multi-line strings.Kaz Kylheku2022-02-041-5/+5
| | | | | | | | | | | | | | | | | | Vim's handling of multi-line Lisp strings is glitchy. We are contributing to it by tryign to match the backslash-newline as an escape sequence. As a result of this change, Vim is less confused. Indentation is still incorrect after some multi-line strings, but I'm not seeing the discrepancy between the behavior of the visual parentheses matching, and the % parentheses jump. I'm able to navigate around in the stdlib/getopts.tl code. * genvim.txr (chesc): Remove the backslash-newline from the list of character escapes. (txr_string, txr_quasilit, txr_regex, tx_regex): Use skip= to recognize the backslash-newline sequence as part of the literal.
* getopt: opthelp: bind *stdout* to remove stream repetition.Kaz Kylheku2022-02-041-15/+15
| | | | | | | * stdlib/getopts.tl (opthelp, opthelp-conventions, opthelp-types): Use *stdout* as the optional stream argument, defaulting to *stdout*. Now we no longer have to explicitly pass the stream to put-line.
* matcher: bug: quasiliteral allowing prefix matches.Kaz Kylheku2022-02-042-4/+8
| | | | | | | | * stdlib/match.tl (expand-quasi-match): When matching `text` or `@var`, which are matching in the final position of the specimen, it is not good enough that match-str returns true; we must check that the entire string was matched. Reported by Paul A. Patience.
* getopts: break up help into three functions.Kaz Kylheku2022-02-034-92/+143
| | | | | | | | | | | | | | | | * lisplib.c (getopts_set_entries): Autoload for opthelp-conventions and opthelp-types. * stdlib/getopts.tl (opthelp): Remove incnotes parameter. Entirely trim out the code for notes about conventions and use of types. (opthel-conventions, opthelp-types): New functions. (option-base opthelp-conventions, option-base opthelp-types): New methods. * txr.1: Documented. * stdlib/doc-syms.tl: Updated.
* getopts: make detailed help notes optional.Joe Bloggs2022-02-032-74/+79
| | | | | | | | | | * stdlib/getopts.tl (opthelp): New incnotes parameter. If specified as false, disables the detailed Notes and Type legend. (sys:option-base opthelp): Same new parameter on this method, passed down to opthelp. * txr.1: Documented.
* doc: fix in amb macro.Kaz Kylheku2022-02-031-2/+3
| | | | | | | | | | | | | | * txr.1: when the amb macro detects that the continuation has succeeded, it should return that successful value from the amb-scope, rather than returning the local successful argument a from the amb function. Although it works both ways, it is inefficient when it returns from the function. The reason is that each call to amb executes the successful future twice: once via (call cont a) and then again by returning the a value. This then causes an exponential cascade in calls: each successive amb call sthe successful future twice, so for instance if the solution has a sequence of 8 amb calls, the successful case is reached 256 times.
* quip: joke about dark mode.Kaz Kylheku2022-02-031-0/+1
| | | | * quips.tl (%quips%): New one.
* doc: window-mappend typo.Kaz Kylheku2022-02-021-1/+1
| | | | | * txr.1: The window-mapdo function is analogous to mapdo, not window-mappend. Reported by vapnik spaknik.
* getopts: fix display of overlong-option help text.Paul A. Patience2022-02-021-1/+3
| | | | | | | | * stdlib/getopts.tl (opthelp): If the long/short part of an option description is 34 characters long or more, print the help text starting on the next line, lest it be glued to the long/short part (i.e., without an intervening space) and extend too far to the right.
* getopts: fix ignored stream parameter in opthelp.Paul A. Patience2022-02-021-14/+13
| | | | | * stdlib/getopts.tl (opthelp): Actually use the function's stream parameter in the put-line calls.
* cadr: re-running gencadr.txr.Kaz Kylheku2022-01-303-36/+39
| | | | | | | * cadr.c, cadr.h, stdlib/cadr.tl: Regenerated. All that changes is the formatting of the copyright block, since now it is scraped from files that reformatted it to 80 columns half a year ago.
* conv: extra blank line removed.Kaz Kylheku2022-01-301-1/+0
| | | | | * stdlib/conv.tl: Extra blank line after copyright header removed.
* stdlib: missing blank line after copyright header.Kaz Kylheku2022-01-3036-0/+36
| | | | | | | | | | | | | | | Commit 93edcde038209335122964432bd35dee0c2ecb04, made in August 2021, accidentally removed the blank line after the copyright header in most stdlib files. stdlib{asm.tl, awk.tl, build.tl, compiler.tl, copy-file.tl, debugger.tl, doloop.tl, each-prod.tl, error.tl, except.tl, ffi.tl, getopts.tl, getput.tl, hash.tl, ifa.tl, match.tl, op.tl, package.tl, param.tl, path-test.tl, pic.tl, place.tl, pmac.tl, quips.tl, save-exe.tl, socket.tl, stream-wrap.tl, tagbody.tl, termios.tl, trace.tl, txr-case.tl, type.tl, vm-param.tl, with-resources.tl, with-stream.tl, yield.tl}: Ensure there is a blank line after the copyright header.
* mpi: compile out more unused functions.Kaz Kylheku2022-01-281-0/+6
| | | | | * mpi.c (mp_mul_2, mp_2expt, mp_addmod, mp_submod, mp_mulmod, mp_sqrmod): Excluded from compilation.
* random-sample: replace algorithm R.Kaz Kylheku2022-01-291-4/+13
| | | | | | | | | * rand.c (random_sample): The brnach of the code for lists is converted from the naive algorithm R which requires a random integer for each element of the sequence to a list adaptation of the smarter algorithm L used for vector. We don't have random access through the list being sampled, but we can step to new positions without generating random numbers.
* New function: random-sample.Kaz Kylheku2022-01-293-4/+97
| | | | | | | | | | | | | | | | Implements reservoir sampling. * rand.c (radom_float_impl): New static function, made out of random_float. Returns double, giving us access to the unboxed result (random_float): Now a wrapper around random_float_impl: boxes the result of random_float. (elrd, flrd, random_sample): New static functions. (rand_init): Register random-sample intrinsic. * txr.1: Documented. * stdlib/doc-syms.tl: Updated.
* listener: line_w must be volatile now.Kaz Kylheku2022-01-281-1/+1
| | | | | | | | | * parser.c (repl): The line_w variable must be volatile because it's modified after we save the context for catching exceptions. Without this, I'm seeing that expressions that throw an exception are not being entered into the linenoise history, because the exception catch restores the null initial value of line_w.
* listener: handle Ctrl-C interrupts from linenoise.Kaz Kylheku2022-01-281-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an issue that affects plain mode, because in full editing mode, linenoise reads Ctrl-C as a character. In plain mode, Ctrl-C-generated SIGINT behaves curiously. The ^C characters appear, and the current line of input is discarded. This is because the linenoise() call is not enclosed in the catch region. The registered signa handler goes off, and repl_intr is called. Thta function throws the intr exception. Since that exception isn't derived from error, and there is no handler for it, nothing happens. The signal handler just returns. In this fix, we move the linenoise call into the catch region of the REPL loop, so the interrupt is handled. The entire multi-line input is aborted, an ** intr message is printed, and the REPL waits for another line. Issues reportd by Paul A. Patience. * parser.c (repl): Move the uw_catch_begin above the linenoise call. This means that the surrounding code can no longer use continue to continue the loop, or break to terminate. Instead of "continue" we go to a new "contin" label placed at the bottom of the catch processing, just before the end of the loop. The EOF case now sets the done fag and also branches to that label. Some free(line_w) calls no longer have to be done because the unwinding block takes care of it. In the exception catching block, we no actually check for the intr_s exception.
* linenoise: issue newline on EOF in plain mode.Kaz Kylheku2022-01-281-0/+2
| | | | | | | * linenoise/linenoise.c (linenoise): In plain mode, like in full editing mode, when EOF is detected, print a newline so that when TXR exit to an interactive shell, the shell's prompt starts on a new line.
* linenoise: Ctrl-V Ctrl-J now inserts CR not LF.Kaz Kylheku2022-01-281-0/+4
| | | | | | | | | | | | | | If newlines are inserted into the input, they don't behave well. The is_balanced_line callback doesn't recognize them as line terminators for the purposes of delimiting ; comments. Also, they make a mess in the ~/.txr_history file. Plus, users of shells like Bash are used to Ctrl-V Ctrl-J inserting a line break; some users have that in their muscle memory. So let's just do that as a special case: Ctrl-V Ctrl-J behaves like Ctrl-V Ctrl-M. * linenoise/linenoise.c (history_search, edit): Remap a verbatim Ctrl-J to a carriage return.
* repl: bug handling comments in plain mode.Kaz Kylheku2022-01-281-6/+4
| | | | | | | | | | | | | | | | | | | The is_balanced_line function assumes that comments are terminated by a carriage return, whic his the multi-line convention used by the interactive repl. The plain-mode listener, though, only replaces newlines by carriage returns when returning the complete multi-line input. When invoking the is_balanced_line callback, the newlines are still there, and so comments are not handled properly. Reported by Paul. A. Patience. * linenoise/linenoise.c (linenoise): In plain mode, replace the trailing newline with a carriage return after every physical line input, before that line is passed to the lino->enter_callback (i.e. is_balanced_line). The code to replace newlines with carriage returns at the end is consequently no longer required.
* New function: copy-cptr.Kaz Kylheku2022-01-286-1/+35
| | | | | | | | | | | | | | | * eval.c (eval_init): copy-cptr intrinsic registered. * lib.c (copy_cptr): New function. (copy): Use copy_cptr for CPTR objects. * lib.h (copy_cptr): Declared. * tests/017/ffi-misc.tl: New test cases. * txr.1: Documented. * stdlib/doc-syms.tl: Updated.
* filter: actually throw from filter-string-tree.Paul A. Patience2022-01-271-2/+4
| | | | | | | | | * filter.c (filter_string_tree): The function tries to call uw_throwf when an invalid filter is provided, but an overzealous return statement renders the effort futile. Remove the return statement, change the exception type from error_s to type_error_s, and conform the message to the usual type-error style.
* quips: new entry.Kaz Kylheku2022-01-251-0/+1
| | | | % stdlib/quips.tl (%quips%): New one.
* Remove numerous unused global functions.Kaz Kylheku2022-01-239-140/+23
| | | | | | | | | | | | | | | | | | | | | | | * eval.[ch] (lookup_global_var_l): Remove. * itypes.[ch] (c_schar): Likewise. * lib.[ch] (null_list, rcyc_list, gequal, func_n6v, func_n7v, func_n8v, do_pa_123_23, pa_123_23, orf, aconsql_new_c): Likewise. (obj_init): Remove references to null_list. * mpi/mpi-config.h (MP_FOR_TXR): New preprocessor symbol, defined as 1. * mpi/mpi.c (mp_get_prec, mp_set_prec, mp_init_array, mp_clear_array, mp_set_word, mp_exptmod_d, mp_cmp_d, mp_cmp_mag, mp_cmp_int, mp_lcm, mp_xgcd, mp_invmod, mp_char2value): Exclude using #if !MPI_FOR_TXR, rather than remove. We don't bother excluding the declarations in the header. * utf8.[ch] (w_freopen): Remove.
* signal: make stack_refcount static.Kaz Kylheku2022-01-231-1/+1
| | | | | * signal.c (stack_refcount): This variable is referenced only from two static functions here; it should be static.
* lib: new functions nand, nor, nandf and norf.Paul A. Patience2022-01-225-32/+171
| | | | | | | | | | | | | | * eval.c (me_nand, me_nor, nor_fun, nand_fun): New functions. (eval_init): Register new intrinsics. * lib.c (nandv, norv): New functions. * lib.h (nandv, norv): Declared. * txr.1: Documented, along with trivial fixes to the descriptions of and, or, andf, orf and notf. * stdlib/doc-syms.tl: Updated.
* compiler: optimize some typep expressions.Kaz Kylheku2022-01-211-0/+12
| | | | | | | | * stdlib/compiler.tl (compiler compile): Handle typep symbol via comp-typep method. (compiler comp-typep): New method. This recognizes some absolute truths: every object is of type t, and no object is of type nil.
* typecase: merge with etypecase, handle t differnetly.Kaz Kylheku2022-01-213-20/+40
| | | | | | | | | | | | | | | | | * stdlib/type.tl (sys:typecase-expander): New function, formed from body of typecase. Bad clause syntax now handled with compile-error rather than (throwf 'eval-error). The t symbol is handled specially: it turns into a t conditon in the resulting cond rather than a typep test. The compiler will nicely eliminate dead code after that. Now etypecase is handled here also: if we are expanding etypecase, we just emit the extra clause. (typecase, etypecase): Reduced to sys:typecase-expander calls. * tests/012/typecase.tl: New file. * tests/012/compile.tl: Add type.tl to list of compile-tested files.
* type: new macro etypecase.Paul A. Patience2022-01-214-1/+51
| | | | | | | | | | * lisplib.c (type_set_entries): Add etypecase to autoload list. * stdlib/type.tl (etypecase): New macro. * txr.1: Documented. * stdlib/doc-syms.tl: Updated.
* compiler: few more cases of ifq/ifql removal.Kaz Kylheku2022-01-181-1/+10
| | | | | | | | | | * optimize.tl (basic-blocks peephole-block): Check for the reversed arguments case of (ifq (d x) (t 0)), and also match ifq. Add a case for two different d registers being compared by ifq or ifql which are not both implicated as load-time regs; that also converts to an unconditional jmp to the else label. Add a case for a register being compared with itself with ifq or ifql, which disappears.
* doc: mention each-match and while-match in overview.Kaz Kylheku2022-01-181-0/+6
| | | | | * txr.1: In the Pattern-Matching macros overview section, mention while-match and each-match.
* quasiquote: make new @,expr work in dot position.Kaz Kylheku2022-01-182-7/+26
| | | | | | | | | | | | | | | Bugfix: the newly introduced @.expr fails in the dotted position because ^(a . @,expr) turns into (list 'a 'let ...). * eval.c (is_meta_unquote): New static function. (expand_qquote_rec): Replace existing shape test with is_meta_unquote. We must also use this test in one more place: whenever the cdr of a list has the meta unquote shape, we must treat the result similarly to a dotted atom, by converting to append format. * tests/010/qquote.tl: Test cases to cover this.
* quasiquote: support @,expr hack.Kaz Kylheku2022-01-183-0/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For better or worse, TXR Lisp has a dichotomy of representation that @<atom> produces sys:var syntax, whereas @<compound> produces sys:expr. This can cause an issue in backquoting. Suppose you want to use backquote to generate sytax like (a @b) where the b comes from a variable. The problem is that (let ((x 'b)) ^(a @,x)) doesn't do what you might expect: it produces (sys:expr b) rather than (sys:var b). This patch adds a hack into the quasiquote expander which causes it to generate code to do what you expect. Old behavior: 1> (expand '^(a @,x)) (list 'a (list 'sys:expr x)) New behavior: 1> (expand '^(a @,x)) (list 'a (let ((#:g0012 x)) (if (atom #:g0012) (list 'sys:var #:g0012) (list 'sys:expr #:g0012)))) In other words, x will be evaluted, and the based on the type of the object which emerges, either sys:var or sys:expr syntax is generated. * eval.c (expand_qquote_rec): Implement the above hack. We are careful to only do this when this exact shape occurs in the syntax: (sys:expr (sys:unquote item)). * tests/010/qquote.tl: New file. * txr.1: Documented.
* doc: introduce meta-atom terminology.Kaz Kylheku2022-01-181-23/+31
| | | | | | * txr.1: the @expr syntax is not just for numbers, symbols and compound expressions. Most atom syntax can follow @, and produces sys:var.
* New function: match-fboundp.Kaz Kylheku2022-01-176-1/+29
| | | | | | | | | | | | | | | | | | User vapnik spaknik was asking in the mailing list whether there is an existence test for TXR pattern functions. Now there is. * eval.c (eval_init): Register match-fboundp intrinsic. * match.c (match_fbound): New function. * match.h (match_fbound): Declared. * tests/011/txr-case.txr: New test cases. * txr.1: Documented. * stdlib/doc-syms.tl: Updated.
* keyparams: fix broken.Kaz Kylheku2022-01-172-34/+59
| | | | | | | | | | | | | | | | | | | Issues reported by user vapnik spaknik. The evaluation of init forms is incorrect. Init forms like '(x) evaluate to '(x) rather than (x), Also, init forms are evaluated even when the argument is present, so the entire current approach is wrong. * stdlib/keyparams.tl (extract-keys, extract-keys-p, build-key-list-expr): Functions removed. (stuff-key-params): New function. (:key): Rework using simplified approach, with just the stuff-key-params helper. All variables from the keyword parameter list are bound with let. Generated code searches the keyword parameters for values and assigns the variables as needed, evaluating default init forms in the not-found cases. * tests/011/keyparams.tl: New file.
* quips: a turn toward the slightly macabre.Kaz Kylheku2022-01-171-0/+1
| | | | * stdlib/quips.tl (%quips%): New entry.
* testing: cover compiled, non-inlined lambda.Kaz Kylheku2022-01-141-13/+28
| | | | | | | | | | | | | | | | | | | The lambda.tl test, when compiled, is only testing the compiler's implementation of the inlined lambda: code generated from a lambda expression to which arguments are statically applied. We augment this to also compile real lambda functions which are called. Everything passes. * tests/012/lambda.tl (call-lambda): New function. (ltest): New macro, specifically geared for testing lambda expressions. When *compile-test* is true, this generates code which performs two tests: applying the arguments directly to the lambda, and evaluating the lambda to a function which is passed to call-lambda, which will then apply the arguments. We cannot use apply, because the compiler sees through that and will inline the lambda anyway. (mltest): Multi-expression version of ltest. This is a drop-in replacement for mtest in the rest of the file.
* compiler: two optimizations, motivated by optional params.Kaz Kylheku2022-01-141-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The motivating situation is this: (lambda (: (opt :)) opt) When the default value of an optional parameter is : then the net effect is that there is no optional substituion. The optional argument is signaled by the : symbol, and that same symbol then replaces the value. This is not optimized well: data: 0: : 1: t syms: code: 0: 8C000009 close t2 0 3 9 1 0 nil t2 1: 00000002 2: 00000001 3: 00000003 4: 00000002 5: 3C000008 ifq t2 d0 8 6: 00020400 7: 2C020400 movsr t2 d0 8: 10000002 end t2 9: 10000002 end t2 instruction count: 5 entry point: 4 The instruction sequence 5: 3C000008 ifq t2 d0 8 6: 00020400 7: 2C020400 movsr t2 d0 8: serves no purpose; it's like: (if (eq x y) (set x y)) With this commit it looks like: data: 0: : 1: t syms: code: 0: 8C000006 close t2 0 3 6 1 0 nil t2 1: 00000002 2: 00000001 3: 00000003 4: 00000002 5: 10000002 end t2 6: 10000002 end t2 instruction count: 3 entry point: 4 * stdlib/optimize.tl (basic-blocks peephole-block): Here, we add an optimization for the useless assignment pattern. If an "ifq tx dy label" instruction falls through to a "mov tx dy", then we remove that move instruction from the next block. But only if that next block has nothing else jumping to it! If there are other jumps there, they could be relying on that "mov tx dy", so it cannot be removed. (basic-blocks elim-next-jump): The above optimization may leave us with a useless ifq instruction, which jumps to the same destination whether the comparison is true or not. In elim-next-jmp, we took care only of jmp instructions which uselessly jump to the next block in instruction order. We fix this to also eliminate if and ifq instructions whose destination label is the next block; they are equivalent to an unconditional jump.
* cptr-int: allow full unsigned range.Kaz Kylheku2022-01-132-2/+18
| | | | | | | | | | | | | | The cptr-int function requries an address to be expressed as a signed integer, which is incovenient. E.g. -2147483648 to 2147483647 in a 32 bit address space. Let's fix it to accept an extended range. * lib.c (cptr_int): Convert the argument value to a ucnum if it is positive according to plusp, otherwise to cnum. Then either one to the mem_t * pointer. Thus we can accept either signed or unsigned values. * txr.1: Document the extended range of cptr-int.
* carray-replace: two overrun bugs.Kaz Kylheku2022-01-132-2/+18
| | | | | | | | | | | | | * ffi.c (carray_replace): In the case when we replace a larger range by a smaller one, when the upper part of the aray shifts down, we are not correctly clearing to zeros the vacated part of the array. The variable whole is a displacement from the base of the array, not from ptr. Secondly, the copying loop must go rom fr to below sn, not below vn; sn is derived from vn but truncated not to go past the array. * tests/017/carray.tl: New file. Several cases here fail before this fix.
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-17 16:04:15 +0000