Mercurial > urweb
changeset 135:b1cfe49ce692
Proper escaping of cdata
| author | Adam Chlipala <adamc@hcoop.net> |
|---|---|
| date | Thu, 17 Jul 2008 13:33:56 -0400 |
| parents | 18299126a343 |
| children | 133fa2d51bb4 |
| files | include/lacweb.h src/c/lacweb.c src/compiler.sml src/mono_opt.sml src/monoize.sml tests/cdataF.lac |
| diffstat | 6 files changed, 64 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/include/lacweb.h Thu Jul 17 13:12:16 2008 -0400 +++ b/include/lacweb.h Thu Jul 17 13:33:56 2008 -0400 @@ -13,6 +13,9 @@ void lw_write(lw_context, const char*); +char *lw_Basis_htmlifyString(lw_Basis_string); +void lw_Basis_htmlifyString_w(lw_context, lw_Basis_string); + char *lw_Basis_attrifyInt(lw_Basis_int); char *lw_Basis_attrifyFloat(lw_Basis_float); char *lw_Basis_attrifyString(lw_Basis_string);
--- a/src/c/lacweb.c Thu Jul 17 13:12:16 2008 -0400 +++ b/src/c/lacweb.c Thu Jul 17 13:33:56 2008 -0400 @@ -72,6 +72,7 @@ lw_write_unsafe(ctx, s); } + char *lw_Basis_attrifyInt(lw_Basis_int n) { return "0"; } @@ -207,3 +208,33 @@ lw_Basis_string lw_unurlifyString(char **s) { return ""; } + + +char *lw_Basis_htmlifyString(lw_Basis_string s) { + return ""; +} + +void lw_Basis_htmlifyString_w(lw_context ctx, lw_Basis_string s) { + lw_check(ctx, strlen(s) * 5); + + for (; *s; s++) { + char c = *s; + + switch (c) { + case '<': + lw_write_unsafe(ctx, "<"); + break; + case '&': + lw_write_unsafe(ctx, "&"); + break; + default: + if (isprint(c)) + lw_writec_unsafe(ctx, c); + else { + lw_write_unsafe(ctx, "&#"); + lw_Basis_attrifyInt_w_unsafe(ctx, c); + lw_writec_unsafe(ctx, ';'); + } + } + } +}
--- a/src/compiler.sml Thu Jul 17 13:12:16 2008 -0400 +++ b/src/compiler.sml Thu Jul 17 13:33:56 2008 -0400 @@ -51,7 +51,8 @@ val () = TextIO.closeOut outf val () = (ErrorMsg.resetErrors (); - ErrorMsg.resetPositioning filename) + ErrorMsg.resetPositioning filename; + Lex.UserDeclarations.initialize ()) val file = TextIO.openIn fname fun get _ = TextIO.input file fun parseerror (s, p1, p2) = ErrorMsg.errorAt' (p1, p2) s @@ -79,7 +80,8 @@ fun parseLac filename = let val () = (ErrorMsg.resetErrors (); - ErrorMsg.resetPositioning filename) + ErrorMsg.resetPositioning filename; + Lex.UserDeclarations.initialize ()) val file = TextIO.openIn filename fun get _ = TextIO.input file fun parseerror (s, p1, p2) = ErrorMsg.errorAt' (p1, p2) s
--- a/src/mono_opt.sml Thu Jul 17 13:12:16 2008 -0400 +++ b/src/mono_opt.sml Thu Jul 17 13:33:56 2008 -0400 @@ -46,6 +46,7 @@ Real.toString n val attrifyString = String.translate (fn #"\"" => """ + | #"&" => "&" | ch => if Char.isPrint ch then str ch else @@ -54,6 +55,15 @@ val urlifyInt = attrifyInt val urlifyFloat = attrifyFloat +val htmlifyString = String.translate (fn ch => case ch of + #"<" => "<" + | #"&" => "&" + | _ => + if Char.isPrint ch orelse Char.isSpace ch then + str ch + else + "&#" ^ Int.toString (ord ch) ^ ";") + fun hexIt ch = let val s = Int.fmt StringCvt.HEX (ord ch) @@ -122,6 +132,13 @@ ESeq ((optExp (EWrite e1, loc), loc), (optExp (EWrite e2, loc), loc)) + | EFfiApp ("Basis", "htmlifyString", [(EPrim (Prim.String s), _)]) => + EPrim (Prim.String (htmlifyString s)) + | EWrite (EFfiApp ("Basis", "htmlifyString", [(EPrim (Prim.String s), _)]), loc) => + EWrite (EPrim (Prim.String (htmlifyString s)), loc) + | EWrite (EFfiApp ("Basis", "htmlifyString", [e]), _) => + EFfiApp ("Basis", "htmlifyString_w", [e]) + | EFfiApp ("Basis", "attrifyInt", [(EPrim (Prim.Int n), _)]) => EPrim (Prim.String (attrifyInt n)) | EWrite (EFfiApp ("Basis", "attrifyInt", [(EPrim (Prim.Int n), _)]), loc) =>
--- a/src/monoize.sml Thu Jul 17 13:12:16 2008 -0400 +++ b/src/monoize.sml Thu Jul 17 13:33:56 2008 -0400 @@ -139,7 +139,7 @@ | L.EFfiApp (m, x, es) => (L'.EFfiApp (m, x, map (monoExp env) es), loc) | L.EApp ((L.ECApp ((L.EFfi ("Basis", "cdata"), _), - _), _), se) => monoExp env se + _), _), se) => (L'.EFfiApp ("Basis", "htmlifyString", [monoExp env se]), loc) | L.EApp ( (L.EApp ( (L.ECApp (