diff options
| -rw-r--r-- | ChangeLog | 46 | ||||
| -rw-r--r-- | eval.c | 20 | ||||
| -rw-r--r-- | eval.h | 3 | ||||
| -rw-r--r-- | hash.c | 21 | ||||
| -rw-r--r-- | lib.c | 286 | ||||
| -rw-r--r-- | stream.c | 148 | ||||
| -rw-r--r-- | stream.h | 17 | ||||
| -rw-r--r-- | tests/009/json.expected | 51 | ||||
| -rw-r--r-- | tests/010/seq.expected | 9 | ||||
| -rw-r--r-- | tests/011/macros-2.expected | 11 |
10 files changed, 429 insertions, 183 deletions
@@ -1,3 +1,49 @@ +2015-07-31 Kaz Kylheku <kaz@kylheku.com> + + Multi-line, indented printing of structure. + + * eval.c (op_error): New static function. + (macro_form_p, fboundp): Static to external. + (special_operator_p): New function. + (eval_init): Register macrolet and symacrolet to op_error. + These are recognized and processed by expand, but we want + them in the op table so they are reported by special_operator_p. + + * eval.h (fboundp, macro_form_p, special_operator_p): Declared. + + * hash.c (print_key_val): Break long lines on spaces + between pairs with stream_width_check. + (hash_print_op): Implement split and indented printing. + + * lib.c (obj_print_impl): New static function, resulting + from a merge of obj_print and obj_pprint. Fixes some + wrong-way recursion bugs: obj_pprint recursed into obj_print + in some places. Adds support for multi-line printing of + vectors and lists, with indentation using the new + interfaces in streams. + + * stream.c (strm_base_init): Update initializer. + (put_indent, indent_mode_put_string): New static functions. + (put_string): Use indent_mode_put_string in either of the + two indent modes. + (put_char): Implement indent mode. + (get_indent_mode, test_set_indent_mode, + set_indent_mode, get_indent, set_indent, + inc_indent, width_check): New functions. + + * stream.h (enum indent_mode): New. + (struct strm_base): indent_on member becomes indent_mode. + New members data_width and code_width. + (get_indent_mode, test_set_indent_mode, + set_indent_mode, get_indent, set_indent, + inc_indent, width_check): Declared. + + * tests/009/json.expected: Updated. + + * tests/010/seq.expected: Likewise. + + * tests/011/macros-2.expected: Likewise. + 2015-07-30 Kaz Kylheku <kaz@kylheku.com> * filter.c, utf8.c: Fix bad indentation introduced in whitespace @@ -1109,6 +1109,12 @@ static val eval_prog1(val forms, val env, val ctx_form) return retval; } +static val op_error(val form, val env) +{ + eval_error(form, lit("unexpanded ~s encountered"), car(form), nao); + abort(); +} + static val op_quote(val form, val env) { val d = cdr(form); @@ -2685,8 +2691,6 @@ static val me_tc(val form, val menv) cons(tree_case_s, cons(args, cases)), nao); } -static val macro_form_p(val form, val menv); - static val me_opip(val form, val menv) { val opsym = pop(&form); @@ -3189,7 +3193,7 @@ val expand(val form, val menv) return ret; } -static val macro_form_p(val form, val menv) +val macro_form_p(val form, val menv) { menv = default_bool_arg(menv); @@ -3421,12 +3425,17 @@ static val boundp(val sym) return if2(lookup_var(nil, sym) || lookup_symac(nil, sym), t); } -static val fboundp(val sym) +val fboundp(val sym) { return if2(lookup_fun(nil, sym) || lookup_mac(nil, sym) || gethash(op_table, sym), t); } +val special_operator_p(val sym) +{ + return if2(gethash(op_table, sym), t); +} + static val makunbound(val sym) { lisplib_try_load(sym), @@ -4012,6 +4021,9 @@ void eval_init(void) sys_load_s = intern(lit("load"), system_package); sys_lisp1_value_s = intern(lit("lisp1-value"), system_package); + with_saved_vars_s = intern(lit("with-saved-vars"), system_package); + reg_op(macrolet_s, op_error); + reg_op(symacrolet_s, op_error); reg_op(quote_s, op_quote); reg_op(qquote_s, op_qquote_error); reg_op(sys_qquote_s, op_qquote_error); @@ -36,6 +36,9 @@ val lookup_var(val env, val sym); loc lookup_var_l(val env, val sym); val lookup_fun(val env, val sym); val interp_fun(val env, val fun, val args); +val fboundp(val sym); +val special_operator_p(val sym); +val macro_form_p(val form, val menv); void reg_var(val sym, val val); void reg_fun(val sym, val fun); val apply(val fun, val arglist, val ctx_form); @@ -226,10 +226,12 @@ cnum cobj_hash_op(val obj) static val print_key_val(val out, val key, val value) { + width_check(out, chr(' ')); + if (value) - format(out, lit(" (~s ~s)"), key, value, nao); + format(out, lit("(~s ~s)"), key, value, nao); else - format(out, lit(" (~s)"), key, nao); + format(out, lit("(~s)"), key, nao); return nil; } @@ -349,15 +351,23 @@ static void hash_print_op(val hash, val out) { struct hash *h = coerce(struct hash *, hash->co.handle); int need_space = 0; + val save_mode = test_set_indent_mode(out, num_fast(indent_off), + num_fast(indent_data)); + val save_indent; + + put_string(lit("#H("), out); + + save_indent = inc_indent(out, zero); + + put_char(chr('('), out); - put_string(lit("#H(("), out); if (h->hash_fun == equal_hash) { obj_print(equal_based_k, out); need_space = 1; } if (h->flags != hash_weak_none) { if (need_space) - put_string(lit(" "), out); + put_char(chr(' '), out); switch (h->flags) { case hash_weak_both: obj_print(weak_keys_k, out); @@ -375,6 +385,9 @@ static void hash_print_op(val hash, val out) put_string(lit(")"), out); maphash(curry_123_23(func_n3(print_key_val), out), hash); put_string(lit(")"), out); + + set_indent_mode(out, save_mode); + set_indent(out, save_indent); } static void hash_mark(val hash) @@ -6905,49 +6905,54 @@ static void obj_init(void) prog_string = string(progname); } -val obj_print(val obj, val out) +static val obj_print_impl(val obj, val out, val pretty) { - out = default_arg(out, std_output); + val ret = obj; switch (type(obj)) { case NIL: - put_string(lit("nil"), out); - return obj; + put_string(if3(get_indent_mode(out) == num_fast(indent_code), + lit("()"), lit("nil")), out); + break; case CONS: case LCONS: { - val obj_in = obj; val sym = car(obj); + val save_mode = test_set_indent_mode(out, num_fast(indent_off), + num_fast(indent_data)); + val save_indent = nil; if (sym == quote_s && consp(cdr(obj)) && !(cdr(cdr(obj)))) { put_char(chr('\''), out); - obj_print(second(obj), out); + obj_print_impl(second(obj), out, pretty); } else if (sym == sys_qquote_s) { put_char(chr('^'), out); - obj_print(second(obj), out); + obj_print_impl(second(obj), out, pretty); } else if (sym == sys_unquote_s) { put_char(chr(','), out); - obj_print(second(obj), out); + obj_print_impl(second(obj), out, pretty); } else if (sym == sys_splice_s) { put_string(lit(",*"), out); - obj_print(second(obj), out); + obj_print_impl(second(obj), out, pretty); } else if (sym == vector_lit_s) { put_string(lit("#"), out); - obj_print(second(obj), out); + obj_print_impl(second(obj), out, pretty); } else if (sym == hash_lit_s) { put_string(lit("#H"), out); - obj_print(rest(obj), out); + obj_print_impl(rest(obj), out, pretty); } else if (sym == var_s && (symbolp(second(obj)) || integerp(second(obj))) && !cdr(cdr(obj))) { put_char(chr('@'), out); - obj_print(second(obj), out); + obj_print_impl(second(obj), out, pretty); } else if (sym == expr_s) { put_char(chr('@'), out); - obj_print(rest(obj), out); + obj_print_impl(rest(obj), out, pretty); } else { val iter; val closepar = chr(')'); + val indent = zero; + if (sym == dwim_s && consp(cdr(obj))) { put_char(chr('['), out); obj = cdr(obj); @@ -6957,37 +6962,58 @@ val obj_print(val obj, val out) } if (sym == lambda_s && consp(cdr(obj)) && symbolp(second(obj))) { - obj_print(sym, out); + indent = one; + save_indent = inc_indent(out, indent); + set_indent_mode(out, num_fast(indent_code)); + obj_print_impl(sym, out, pretty); if (second(obj)) { put_string(lit(" (. "), out); - obj_print(second(obj), out); + obj_print_impl(second(obj), out, pretty); put_char(chr(')'), out); } else { put_string(lit(" ()"), out); } - iter = (cdr(obj)); + iter = cdr(obj); + goto finish; + } else if (special_operator_p(sym) || macro_form_p(obj, nil)) { + indent = one; + set_indent_mode(out, num_fast(indent_code)); + } else if (fboundp(sym)) { + obj_print_impl(sym, out, pretty); + indent = one; + save_indent = inc_indent(out, indent); + set_indent_mode(out, num_fast(indent_code)); + iter = obj; goto finish; } + save_indent = inc_indent(out, indent); + for (iter = obj; consp(iter); iter = cdr(iter)) { - obj_print(car(iter), out); + obj_print_impl(car(iter), out, pretty); finish: if (nilp(cdr(iter))) { put_char(closepar, out); } else if (consp(cdr(iter))) { - put_char(chr(' '), out); + width_check(out, chr(' ')); } else { put_string(lit(" . "), out); - obj_print(cdr(iter), out); + obj_print_impl(cdr(iter), out, pretty); put_char(closepar, out); } } } - return obj_in; + + if (save_indent) + set_indent(out, save_indent); + set_indent_mode(out, save_mode); + break; } case LIT: case STR: - { + if (pretty) { + put_string(obj, out); + } else { const wchar_t *ptr; int semi_flag = 0; put_char(chr('"'), out); @@ -7018,9 +7044,11 @@ finish: } put_char(chr('"'), out); } - return obj; + break; case CHR: - { + if (pretty) { + put_char(obj, out); + } else { wchar_t ch = c_chr(obj); put_string(lit("#\\"), out); @@ -7047,189 +7075,115 @@ finish: put_char(chr(ch), out); } } - return obj; + break; case NUM: case BGNUM: case FLNUM: format(out, lit("~s"), obj, nao); - return obj; + break; case SYM: - if (obj->s.package != user_package) { - if (!obj->s.package) - put_char(chr('#'), out); - else if (obj->s.package != keyword_package) - put_string(obj->s.package->pk.name, out); - put_char(chr(':'), out); + if (!pretty) { + if (obj->s.package != user_package) { + if (!obj->s.package) + put_char(chr('#'), out); + else if (obj->s.package != keyword_package) + put_string(obj->s.package->pk.name, out); + put_char(chr(':'), out); + } } put_string(symbol_name(obj), out); - return obj; + break; case PKG: format(out, lit("#<package: ~s>"), obj->pk.name, nao); - return obj; + break; case FUN: format(out, lit("#<function: type ~a>"), num(obj->f.functype), nao); - return obj; + break; case VEC: { cnum i, length = c_num(obj->v.vec[vec_length]); + val save_mode = test_set_indent_mode(out, num_fast(indent_off), + num_fast(indent_data)); + val save_indent; + put_string(lit("#("), out); + + save_indent = inc_indent(out, zero); + for (i = 0; i < length; i++) { - obj_print(obj->v.vec[i], out); + val elem = obj->v.vec[i]; + obj_print_impl(elem, out, pretty); if (i < length - 1) - put_char(chr(' '), out); + width_check(out, chr(' ')); } + put_char(chr(')'), out); + + set_indent(out, save_indent); + set_indent_mode(out, save_mode); } - return obj; + break; case LSTR: if (obj->ls.list) format(out, lit("#<lazy-string: ~s (~s ...)>"), obj->ls.prefix, obj->ls.list, nao); else - obj_print(obj->ls.prefix, out); - return obj; + obj_print_impl(obj->ls.prefix, out, pretty); + break; case COBJ: obj->co.ops->print(obj, out); - return obj; + break; case ENV: format(out, lit("#<environment: ~p>"), obj, nao); - return obj; + break; + default: + format(out, lit("#<garbage: ~p>"), obj, nao); + break; } - format(out, lit("#<garbage: ~p>"), obj, nao); - return obj; + return ret; } -val obj_pprint(val obj, val out) +val obj_print(val obj, val stream) { - out = default_arg(out, std_output); + volatile val ret = nil; + val out = default_arg(stream, std_output); + val save_mode = get_indent_mode(out); + val save_indent = get_indent(out); - switch (type(obj)) { - case NIL: - put_string(lit("nil"), out); - return obj; - case CONS: - case LCONS: - { - val obj_in = obj; - val sym = car(obj); + uw_simple_catch_begin; - if (sym == quote_s && consp(cdr(obj)) && !(cdr(cdr(obj)))) { - put_char(chr('\''), out); - obj_print(second(obj), out); - } else if (sym == sys_qquote_s) { - put_char(chr('^'), out); - obj_print(second(obj), out); - } else if (sym == sys_unquote_s) { - put_char(chr(','), out); - obj_pprint(second(obj), out); - } else if (sym == sys_splice_s) { - put_string(lit(",*"), out); - obj_pprint(second(obj), out); - } else if (sym == vector_lit_s) { - put_string(lit("#"), out); - obj_print(second(obj), out); - } else if (sym == hash_lit_s) { - put_string(lit("#H"), out); - obj_print(rest(obj), out); - } else if (sym == var_s && (symbolp(second(obj)) || integerp(second(obj))) - && !cdr(cdr(obj))) - { - put_char(chr('@'), out); - obj_print(second(obj), out); - } else if (sym == expr_s) { - put_char(chr('@'), out); - obj_print(rest(obj), out); - } else { - val iter; - val closepar = chr(')'); - if (sym == dwim_s && consp(cdr(obj))) { - put_char(chr('['), out); - obj = cdr(obj); - closepar = chr(']'); - } else { - put_char(chr('('), out); - } + ret = obj_print_impl(obj, out, nil); - if (sym == lambda_s && consp(cdr(obj)) && symbolp(second(obj))) { - obj_print(sym, out); - if (second(obj)) { - put_string(lit(" (. "), out); - obj_pprint(second(obj), out); - put_char(chr(')'), out); - } else { - put_string(lit(" ()"), out); - } - iter = (cdr(obj)); - goto finish; - } + uw_unwind { + set_indent_mode(out, save_mode); + set_indent(out, save_indent); + } - for (iter = obj; consp(iter); iter = cdr(iter)) { - obj_pprint(car(iter), out); -finish: - if (nilp(cdr(iter))) { - put_char(closepar, out); - } else if (consp(cdr(iter))) { - put_char(chr(' '), out); - } else { - put_string(lit(" . "), out); - obj_pprint(cdr(iter), out); - put_char(closepar, out); - } - } - } - return obj_in; - } - case LIT: - case STR: - put_string(obj, out); - return obj; - case CHR: - put_char(obj, out); - return obj; - case NUM: - case BGNUM: - case FLNUM: - format(out, lit("~s"), obj, nao); - return obj; - case SYM: - put_string(symbol_name(obj), out); - return obj; - case PKG: - format(out, lit("#<package: ~s>"), obj->pk.name, nao); - return obj; - case FUN: - format(out, lit("#<function: type ~a>"), num(obj->f.functype), nao); - return obj; - case VEC: - { - cnum i, length = c_num(obj->v.vec[vec_length]); - put_string(lit("#("), out); - for (i = 0; i < length; i++) { - obj_pprint(obj->v.vec[i], out); - if (i < length - 1) - put_char(chr(' '), out); - } - put_char(chr(')'), out); - } - return obj; - case LSTR: - if (obj->ls.list) - format(out, lit("#<lazy-string: ~s (~s ...)>"), obj->ls.prefix, - obj->ls.list, nao); - else - obj_pprint(obj->ls.prefix, out); - return obj; - case COBJ: - obj->co.ops->print(obj, out); - return obj; - case ENV: - format(out, lit("#<environment: ~p>"), obj, nao); - return obj; + uw_catch_end; + + return ret; +} + +val obj_pprint(val obj, val stream) +{ + volatile val ret = nil; + val out = default_arg(stream, std_output); + val save_mode = get_indent_mode(out); + val save_indent = get_indent(out); + + uw_simple_catch_begin; + + ret = obj_print_impl(obj, out, t); + + uw_unwind { + set_indent_mode(out, save_mode); + set_indent(out, save_indent); } - format(out, lit("#<garbage: ~p>"), obj, nao); - return obj; + uw_catch_end; + + return ret; } val tostring(val obj) @@ -69,7 +69,7 @@ val format_s; void strm_base_init(struct strm_base *s) { - static struct strm_base init = { 0, 0, 0 }; + static struct strm_base init = { indent_off, 60, 10, 0, 0 }; *s = init; } @@ -2608,6 +2608,42 @@ val formatv(val stream, val string, val args) abort(); } +static val put_indent(val stream, struct strm_ops *ops, cnum chars) +{ + while (chars--) + if (!ops->put_char(stream, chr(' '))) + return nil; + return t; +} + +static val indent_mode_put_string(val stream, val string, + struct strm_ops *ops, struct strm_base *s) +{ + cnum col = s->column; + const wchar_t *str = c_str(string), *p = str; + val ret; + + for (; *p; p++) { + switch (*p) { + case '\n': + col = 0; + break; + case '\t': + col = (col + 1) | 7; + break; + default: + if (iswprint(*p)) + col++; + break; + } + } + + if ((ret = ops->put_string(stream, string)) != nil) + s->column = col; + + return ret; +} + val put_string(val string, val stream) { stream = default_arg(stream, std_output); @@ -2618,7 +2654,12 @@ val put_string(val string, val stream) { struct strm_ops *ops = coerce(struct strm_ops *, stream->co.ops); - return ops->put_string(stream, string); + struct strm_base *s = coerce(struct strm_base *, stream->co.handle); + + if (s->indent_mode == indent_off) + return ops->put_string(stream, string); + + return indent_mode_put_string(stream, string, ops, s); } } @@ -2632,7 +2673,34 @@ val put_char(val ch, val stream) { struct strm_ops *ops = coerce(struct strm_ops *, stream->co.ops); - return ops->put_char(stream, ch); + struct strm_base *s = coerce(struct strm_base *, stream->co.handle); + wint_t cch = c_chr(ch); + + if (s->indent_mode == indent_off) + return ops->put_char(stream, ch); + + switch (cch) { + case L'\n': + if (ops->put_char(stream, ch) && + put_indent(stream, ops, s->indent_chars)) { + s->column = s->indent_chars; + return t; + } + return nil; + case L'\t': + if (ops->put_char(stream, ch)) { + s->column = (s->column + 1) | 7; + return t; + } + return nil; + default: + if (ops->put_char(stream, ch)) { + if (iswprint(cch)) + s->column++; + return t; + } + return nil; + } } } @@ -2716,6 +2784,80 @@ val seek_stream(val stream, val offset, val whence) } } +val get_indent_mode(val stream) +{ + struct strm_base *s = coerce(struct strm_base *, stream->co.handle); + return num_fast(s->indent_mode); +} + +val test_set_indent_mode(val stream, val compare, val mode) +{ + struct strm_base *s = coerce(struct strm_base *, stream->co.handle); + val oldval = num_fast(s->indent_mode); + if (oldval == compare) + s->indent_mode = (enum indent_mode) c_num(mode); + return oldval; +} + +val set_indent_mode(val stream, val mode) +{ + struct strm_base *s = coerce(struct strm_base *, stream->co.handle); + val oldval = num_fast(s->indent_mode); + if ((s->indent_mode = (enum indent_mode) c_num(mode)) == indent_off) + s->column = 0; + return oldval; +} + +val get_indent(val stream) +{ + struct strm_base *s = coerce(struct strm_base *, stream->co.handle); + return num(s->indent_chars); +} + +val set_indent(val stream, val indent) +{ + struct strm_base *s = coerce(struct strm_base *, stream->co.handle); + val oldval = num(s->indent_chars); + s->indent_chars = c_num(indent); + return oldval; +} + +val inc_indent(val stream, val delta) +{ + struct strm_base *s = coerce(struct strm_base *, stream->co.handle); + val oldval = num(s->indent_chars); + val col = num(s->column); + s->indent_chars = c_num(plus(delta, col)); + return oldval; +} + +val width_check(val stream, val alt) +{ + struct strm_ops *ops = coerce(struct strm_ops *, stream->co.ops); + struct strm_base *s = coerce(struct strm_base *, stream->co.handle); + + + if ((s->indent_mode == indent_code && + s->column >= s->indent_chars + s->code_width) || + (s->indent_mode == indent_data && + s->column >= s->indent_chars + s->data_width)) + { + if (ops->put_char(stream, chr('\n')) && + put_indent(stream, ops, s->indent_chars)) { + s->column = s->indent_chars; + return t; + } + return nil; + } else if (alt) { + ops->put_char(stream, alt); + s->column++; + return t; + } + + return t; +} + + val get_string(val stream, val nchars, val close_after_p) { val strstream = make_string_output_stream(); @@ -30,8 +30,16 @@ enum strm_whence { strm_end = SEEK_SET }; +enum indent_mode { + indent_off, + indent_data, + indent_code +}; + struct strm_base { - unsigned int indent_on; + enum indent_mode indent_mode; + cnum data_width; + cnum code_width; cnum indent_chars; cnum column; }; @@ -127,6 +135,13 @@ val put_strings(val strings, val stream); val put_lines(val lines, val stream); val flush_stream(val stream); val seek_stream(val stream, val offset, val whence); +val get_indent_mode(val stream); +val test_set_indent_mode(val stream, val compare, val mode); +val set_indent_mode(val stream, val mode); +val get_indent(val stream); +val set_indent(val stream, val indent); +val inc_indent(val stream, val delta); +val width_check(val stream, val alt); val get_string(val stream, val nchars, val close_after_p); val statf(val path); val open_directory(val path); diff --git a/tests/009/json.expected b/tests/009/json.expected index f0d5fcd3..643ed5b7 100644 --- a/tests/009/json.expected +++ b/tests/009/json.expected @@ -1,8 +1,55 @@ -AST: #H((:equal-based) ("web-app" #H((:equal-based) ("servlet-mapping" #H((:equal-based) ("cofaxTools" "/tools/*") ("cofaxCDS" "/") ("cofaxAdmin" "/admin/*") ("cofaxEmail" "/cofaxutil/aemail/*") ("fileServlet" "/static/*"))) ("servlet" #(#H((:equal-based) ("servlet-class" "org.cofax.cds.CDSServlet") ("init-param" #H((:equal-based) ("defaultFileTemplate" "articleTemplate.htm") ("configGlossary:installationAt" "Philadelphia, PA") ("templateOverridePath" "") ("dataStoreLogLevel" "debug") ("searchEngineListTemplate" "forSearchEnginesList.htm") ("dataStoreClass" "org.cofax.SqlDataStore") ("configGlossary:poweredBy" "Cofax") ("jspFileTemplate" "articleTemplate.jsp") ("cacheTemplatesTrack" 100.0) ("cacheTemplatesStore" 50.0) ("templateProcessorClass" "org.cofax.WysiwygTemplate") ("dataStoreUser" "sa") ("redirectionClass" "org.cofax.SqlRedirection") ("dataStoreConnUsageLimit" 100.0) ("dataStoreMaxConns" 100.0) ("jspListTemplate" "listTemplate.jsp") ("useJSP" :false) ("configGlossary:poweredByIcon" "/images/cofax.gif") ("templateLoaderClass" "org.cofax.FilesTemplateLoader") ("cacheTemplatesRefresh" 15.0) ("cachePagesDirtyRead" 10.0) ("searchEngineRobotsDb" "WEB-INF/robots.db") ("cachePagesStore" 100.0) ("dataStoreTestQuery" "SET NOCOUNT ON;select test='test';") ("configGlossary:adminEmail" "ksm@pobox.com") ("configGlossary:staticPath" "/content/static") ("dataStoreInitConns" 10.0) ("cachePagesTrack" 200.0) ("dataStorePassword" "dataStoreTestQuery") ("defaultListTemplate" "listTemplate.htm") ("dataStoreLogFile" "/usr/local/tomcat/logs/datastore.log") ("maxUrlLength" 500.0) ("dataStoreDriver" "com.microsoft.jdbc.sqlserver.SQLServerDriver") ("dataStoreName" "cofax") ("cachePackageTagsRefresh" 60.0) ("templatePath" "templates") ("dataStoreUrl" "jdbc:microsoft:sqlserver://LOCALHOST:1433;DatabaseName=goon") ("useDataStore" :true) ("cachePackageTagsTrack" 200.0) ("searchEngineFileTemplate" "forSearchEngines.htm") ("cachePackageTagsStore" 200.0) ("cachePagesRefresh" 10.0))) ("servlet-name" "cofaxCDS")) #H((:equal-based) ("servlet-class" "org.cofax.cds.EmailServlet") ("init-param" #H((:equal-based) ("mailHost" "mail1") ("mailHostOverride" "mail2"))) ("servlet-name" "cofaxEmail")) #H((:equal-based) ("servlet-class" "org.cofax.cds.AdminServlet") ("servlet-name" "cofaxAdmin")) #H((:equal-based) ("servlet-class" "org.cofax.cds.FileServlet") ("servlet-name" "fileServlet")) #H((:equal-based) ("servlet-class" "org.cofax.cms.CofaxToolsServlet") ("init-param" #H((:equal-based) ("lookInContext" 1.0) ("removePageCache" "/content/admin/remove?cache=pages&id=") ("logMaxSize" "") ("dataLogMaxSize" "") ("removeTemplateCache" "/content/admin/remove?cache=templates&id=") ("dataLog" 1.0) ("logLocation" "/usr/local/tomcat/logs/CofaxTools.log") ("log" 1.0) ("adminGroupID" 4.0) ("templatePath" "toolstemplates/") ("betaServer" :true) ("dataLogLocation" "/usr/local/tomcat/logs/dataLog.log") ("fileTransferFolder" "/usr/local/tomcat/webapps/content/fileTransferFolder"))) ("servlet-name" "cofaxTools")))) ("taglib" #H((:equal-based) ("taglib-uri" "cofax.tld") ("taglib-location" "/WEB-INF/tlds/cofax.tld")))))) +AST: #H((:equal-based) ("web-app" #H((:equal-based) ("servlet-mapping" #H((:equal-based) ("cofaxTools" "/tools/*") ("cofaxCDS" "/") ("cofaxAdmin" "/admin/*") + ("cofaxEmail" "/cofaxutil/aemail/*") ("fileServlet" "/static/*"))) + ("servlet" #(#H((:equal-based) ("servlet-class" "org.cofax.cds.CDSServlet") ("init-param" #H((:equal-based) ("defaultFileTemplate" "articleTemplate.htm") + ("configGlossary:installationAt" "Philadelphia, PA") ("templateOverridePath" "") + ("dataStoreLogLevel" "debug") ("searchEngineListTemplate" "forSearchEnginesList.htm") + ("dataStoreClass" "org.cofax.SqlDataStore") ("configGlossary:poweredBy" "Cofax") + ("jspFileTemplate" "articleTemplate.jsp") ("cacheTemplatesTrack" 100.0) + ("cacheTemplatesStore" 50.0) ("templateProcessorClass" "org.cofax.WysiwygTemplate") + ("dataStoreUser" "sa") ("redirectionClass" "org.cofax.SqlRedirection") + ("dataStoreConnUsageLimit" 100.0) ("dataStoreMaxConns" 100.0) + ("jspListTemplate" "listTemplate.jsp") ("useJSP" :false) ("configGlossary:poweredByIcon" "/images/cofax.gif") + ("templateLoaderClass" "org.cofax.FilesTemplateLoader") ("cacheTemplatesRefresh" 15.0) + ("cachePagesDirtyRead" 10.0) ("searchEngineRobotsDb" "WEB-INF/robots.db") + ("cachePagesStore" 100.0) ("dataStoreTestQuery" "SET NOCOUNT ON;select test='test';") + ("configGlossary:adminEmail" "ksm@pobox.com") ("configGlossary:staticPath" "/content/static") + ("dataStoreInitConns" 10.0) ("cachePagesTrack" 200.0) ("dataStorePassword" "dataStoreTestQuery") + ("defaultListTemplate" "listTemplate.htm") ("dataStoreLogFile" "/usr/local/tomcat/logs/datastore.log") + ("maxUrlLength" 500.0) ("dataStoreDriver" "com.microsoft.jdbc.sqlserver.SQLServerDriver") + ("dataStoreName" "cofax") ("cachePackageTagsRefresh" 60.0) ("templatePath" "templates") + ("dataStoreUrl" "jdbc:microsoft:sqlserver://LOCALHOST:1433;DatabaseName=goon") + ("useDataStore" :true) ("cachePackageTagsTrack" 200.0) ("searchEngineFileTemplate" "forSearchEngines.htm") + ("cachePackageTagsStore" 200.0) ("cachePagesRefresh" 10.0))) + ("servlet-name" "cofaxCDS")) #H((:equal-based) ("servlet-class" "org.cofax.cds.EmailServlet") + ("init-param" #H((:equal-based) ("mailHost" "mail1") ("mailHostOverride" "mail2"))) + ("servlet-name" "cofaxEmail")) + #H((:equal-based) ("servlet-class" "org.cofax.cds.AdminServlet") + ("servlet-name" "cofaxAdmin")) #H((:equal-based) ("servlet-class" "org.cofax.cds.FileServlet") + ("servlet-name" "fileServlet")) + #H((:equal-based) ("servlet-class" "org.cofax.cms.CofaxToolsServlet") + ("init-param" #H((:equal-based) ("lookInContext" 1.0) ("removePageCache" "/content/admin/remove?cache=pages&id=") + ("logMaxSize" "") ("dataLogMaxSize" "") ("removeTemplateCache" "/content/admin/remove?cache=templates&id=") + ("dataLog" 1.0) ("logLocation" "/usr/local/tomcat/logs/CofaxTools.log") + ("log" 1.0) ("adminGroupID" 4.0) ("templatePath" "toolstemplates/") + ("betaServer" :true) ("dataLogLocation" "/usr/local/tomcat/logs/dataLog.log") + ("fileTransferFolder" "/usr/local/tomcat/webapps/content/fileTransferFolder"))) + ("servlet-name" "cofaxTools")))) ("taglib" #H((:equal-based) ("taglib-uri" "cofax.tld") ("taglib-location" "/WEB-INF/tlds/cofax.tld")))))) Unmatched junk: "" -AST: #("JSON Test Pattern pass1" #H((:equal-based) ("object with 1 member" #("array with 1 element"))) #H((:equal-based)) #() -42.0 :true :false :null #H((:equal-based) ("" 2.3456789012e76) ("digit" "0123456789") ("\\/\\\\\"쫾몾ꮘﳞ볚\b\f\n\r\t`1~!@#$%^&*()_+-=[]{}|;:',./<>?" "A key can be any string") ("null" :null) ("one" 1.0) ("E" 1.23456789e34) ("special" "`1~!@#$%^&*()_+-={':[,]}|;.</>?") ("e" 1.23456789e-13) ("comment" "// /* <!-- --") ("# -- --> */" " ") ("real" -9876.54321) ("backslash" "\\\\") ("array" #()) ("url" "http://www.JSON.org/") ("zero" 0.0) ("false" :false) ("space" " ") ("slash" "/ & \\/") ("address" "50 St. James Street") ("compact" #(1.0 2.0 3.0 4.0 5.0 6.0 7.0)) ("object" #H((:equal-based))) ("quote" "\"") ("jsontext" "{\"object with 1 member\":[\"array with 1 element\"]}") ("true" :true) ("integer" 1234567890.0) ("ALPHA" "ABCDEFGHIJKLMNOPQRSTUVWYZ") ("quotes" "" \" %22 0x22 034 "") ("hex" "ģ䕧覫췯ꯍ") ("0123456789" "digit") ("controls" "\b\f\n\r\t") ("alpha" "abcdefghijklmnopqrstuvwyz") (" s p a c e d " #(1.0 2.0 3.0 4.0 5.0 6.0 7.0))) 0.5 98.6 99.44 1066.0 10.0 1.0 0.1 1.0 2.0 2.0 "rosebud") +AST: #("JSON Test Pattern pass1" #H((:equal-based) ("object with 1 member" #("array with 1 element"))) + #H((:equal-based)) #() -42.0 :true :false :null #H((:equal-based) ("" 2.3456789012e76) ("digit" "0123456789") ("\\/\\\\\"쫾몾ꮘﳞ볚\b\f\n\r\t`1~!@#$%^&*()_+-=[]{}|;:',./<>?" "A key can be any string") + ("null" :null) ("one" 1.0) ("E" 1.23456789e34) ("special" "`1~!@#$%^&*()_+-={':[,]}|;.</>?") + ("e" 1.23456789e-13) ("comment" "// /* <!-- --") ("# -- --> */" " ") + ("real" -9876.54321) ("backslash" "\\\\") ("array" #()) ("url" "http://www.JSON.org/") + ("zero" 0.0) ("false" :false) ("space" " ") ("slash" "/ & \\/") + ("address" "50 St. James Street") ("compact" #(1.0 2.0 3.0 4.0 5.0 6.0 7.0)) + ("object" #H((:equal-based))) ("quote" "\"") ("jsontext" "{\"object with 1 member\":[\"array with 1 element\"]}") + ("true" :true) ("integer" 1234567890.0) ("ALPHA" "ABCDEFGHIJKLMNOPQRSTUVWYZ") + ("quotes" "" \" %22 0x22 034 "") ("hex" "ģ䕧覫췯ꯍ") ("0123456789" "digit") + ("controls" "\b\f\n\r\t") ("alpha" "abcdefghijklmnopqrstuvwyz") + (" s p a c e d " #(1.0 2.0 3.0 4.0 5.0 6.0 7.0))) + 0.5 98.6 99.44 1066.0 10.0 1.0 0.1 1.0 2.0 2.0 "rosebud") Unmatched junk: "" diff --git a/tests/010/seq.expected b/tests/010/seq.expected index 5d589d40..9c4d860d 100644 --- a/tests/010/seq.expected +++ b/tests/010/seq.expected @@ -6,6 +6,11 @@ nil #\d "ac" exception! #(8 7 6 5 4 3 2 1) -#((7 . #\h) (8 . #\g) (6 . #\f) (5 . #\e) (4 . #\d) (3 . #\c) (2 . #\b) (1 . #\a)) -(100 99 98 97 96 95 94 93 92 91 90 89 88 87 86 85 84 83 82 81 80 79 78 77 76 75 74 73 72 71 70 69 68 67 66 65 64 63 62 61 60 59 58 57 56 55 54 53 52 51 50 49 48 47 46 45 44 43 42 41 40 39 38 37 36 35 34 33 32 31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) +#((7 . #\h) (8 . #\g) (6 . #\f) (5 . #\e) (4 . #\d) (3 . #\c) (2 . #\b) + (1 . #\a)) +(100 99 98 97 96 95 94 93 92 91 90 89 88 87 86 85 84 83 82 81 + 80 79 78 77 76 75 74 73 72 71 70 69 68 67 66 65 64 63 62 61 60 + 59 58 57 56 55 54 53 52 51 50 49 48 47 46 45 44 43 42 41 40 39 + 38 37 36 35 34 33 32 31 30 29 28 27 26 25 24 23 22 21 20 19 18 + 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) #((8 . #\g) (6 . #\f)) #((7 . #\h) (5 . #\e) (4 . #\d) (3 . #\c) (2 . #\b) (1 . #\a)) diff --git a/tests/011/macros-2.expected b/tests/011/macros-2.expected index 5cb887f6..020185c2 100644 --- a/tests/011/macros-2.expected +++ b/tests/011/macros-2.expected @@ -9,7 +9,16 @@ 28 29 30 -(block #:brk-blk-0002 (for nil ((< i 100) nil) nil (block #:cnt-blk-0001 (if (< (sys:setq i (succ i)) 20) (return-from #:cnt-blk-0001)) (if (> i 30) (return-from #:brk-blk-0002)) (prinl i)))) +(block #:brk-blk-0002 + (for () ((< i 100) ()) + () (block #:cnt-blk-0001 + (if (< (sys:setq i (succ i)) + 20) (return-from + #:cnt-blk-0001)) + (if (> i 30) + (return-from + #:brk-blk-0002)) + (prinl i)))) (whilst break) (whilst break) (whilst break) |