* 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.

1 files changed, 5 insertions, 19 deletions

diff --git a/parser.y b/parser.y
index 67409d4b..5b2775ad 100644
--- a/parser.y
+++ b/parser.y
@@ -55,7 +55,6 @@ static val define_transform(val define_form);
 static val lit_char_helper(val litchars);
 static val optimize_text(val text_form);
 static val unquotes_occur(val quoted_form, int level);
-static val choose_quote(val quoted_form);
 static val expand_meta(val form, val menv);
 static wchar_t char_from_name(const wchar_t *name);
 
@@ -107,7 +106,7 @@ static val parsed_spec;
 %right OUTPUT REPEAT REP FIRST LAST EMPTY DEFINE
 %right SPACE TEXT NUMBER
 %nonassoc '[' ']' '(' ')'
-%left '-' ',' '\'' SPLICE '@'
+%left '-' ',' '\'' '^' SPLICE '@'
 %left '|' '/'
 %left '&' 
 %right '~' '*' '?' '+' '%'
@@ -753,18 +752,10 @@ n_expr : SYMTOK                 { $$ = sym_helper($1, t); }
        | chrlit                 { $$ = $1; }
        | strlit                 { $$ = $1; }
        | quasilit               { $$ = $1; }
-       | ',' n_expr             { val expr = $2;
-                                  if (consp(expr) && car(expr) == sys_qquote_s)
-                                    expr = cons(quote_s, rest(expr));
-                                  $$ = rlcp(list(sys_unquote_s, expr, nao),
-				            $2); }
-       | '\'' n_expr            { $$ = rlcp(list(choose_quote($2),
-                                                 $2, nao), $2); }
-       | SPLICE n_expr          { val expr = $2;
-                                  if (consp(expr) && car(expr) == sys_qquote_s)
-                                    expr = cons(quote_s, rest(expr));
-                                  $$ = rlcp(list(sys_splice_s, expr, nao),
-				            $2); }
+       | '\'' n_expr            { $$ = rlcp(list(quote_s, $2, nao), $2); }
+       | '^' n_expr             { $$ = rlcp(list(sys_qquote_s, $2, nao), $2); }
+       | ',' n_expr             { $$ = rlcp(list(sys_unquote_s, $2, nao), $2); }
+       | SPLICE n_expr          { $$ = rlcp(list(sys_splice_s, $2, nao), $2); }
        ;
 
 regex : '/' regexpr '/'         { $$ = cons(regex_s, $2); end_of_regex();
@@ -1123,11 +1114,6 @@ static val unquotes_occur(val quoted_form, int level)
   }
 }
 
-static val choose_quote(val quoted_form)
-{
-  return unquotes_occur(quoted_form, 0) ? sys_qquote_s : quote_s;
-}
-
 static val expand_meta(val form, val menv)
 {
   val sym;