From 039e2ebdfa5670de7a35084fd480fe204afbdc8b Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Mon, 3 Mar 2014 01:44:37 -0800 Subject: * parser.l: Allowing ^ to be a quote character, and adjusting definition of identifiers to rule this out from being the first character of a symbol which has no prefix. Recognize the ^ character as a token in the NESTED state. * lib.c (obj_print, obj_pprint): Render sys:qquote as ^. * parser.y (choose_quote): Function removed. (n_expr): Recognize '^' as quasiquote. Removed all the "smart quote" hacks that try to make quote behave as quote or quasiquote, or try to cancel out unquotes and quotes. * tests/009/json.txr: Fixed to ^ quasiquote. * tests/010/reghash.txr: Likewise. * tests/011/macros-2.txr: Likewise. * tests/011/mandel.txr: Likewise. * tests/011/special-1.txr: Likewise. * txr.1: Updated docs. * genvim.txr: Revamped definitions for txr_ident and txl_ident so that unqualified identifiers cannot start with # or ^, but ones with @ or : in front can start with these characters. * txr.vim: Regenerated. --- tests/011/special-1.txr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/011/special-1.txr') diff --git a/tests/011/special-1.txr b/tests/011/special-1.txr index 72ab844a..f3e92a03 100644 --- a/tests/011/special-1.txr +++ b/tests/011/special-1.txr @@ -1,6 +1,6 @@ @(do (defmacro with-output-to-string ((var) . forms) - '(let ((,var (make-string-output-stream))) + ^(let ((,var (make-string-output-stream))) (progn ,*forms (get-string-from-stream ,var)))) (let ((x (with-output-to-string (*stdout*) -- cgit v1.2.3