From 51fd5b1af6b2af7706c0c8604129d99e504a2d36 Mon Sep 17 00:00:00 2001 From: Adam Chlipala Date: Thu, 7 Aug 2008 13:09:26 -0400 Subject: Checkboxes --- src/c/lacweb.c | 23 ++++++++++++++--------- src/cjr_print.sml | 8 +++++++- src/lacweb.grm | 8 +++++++- src/lacweb.lex | 3 +++ src/monoize.sml | 2 ++ 5 files changed, 33 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/c/lacweb.c b/src/c/lacweb.c index 123a5a8f..12985b4f 100644 --- a/src/c/lacweb.c +++ b/src/c/lacweb.c @@ -18,7 +18,6 @@ struct lw_context { jmp_buf jmp_buf; - failure_kind failure_kind; char error_message[ERROR_BUF_LEN]; }; @@ -35,7 +34,6 @@ lw_context lw_init(size_t page_len, size_t heap_len) { ctx->inputs = calloc(lw_inputs_len, sizeof(char *)); - ctx->failure_kind = SUCCESS; ctx->error_message[0] = 0; return ctx; @@ -52,15 +50,12 @@ void lw_reset_keep_request(lw_context ctx) { ctx->page_front = ctx->page; ctx->heap_front = ctx->heap; - ctx->failure_kind = SUCCESS; ctx->error_message[0] = 0; } void lw_reset_keep_error_message(lw_context ctx) { ctx->page_front = ctx->page; ctx->heap_front = ctx->heap; - - ctx->failure_kind = SUCCESS; } void lw_reset(lw_context ctx) { @@ -71,20 +66,21 @@ void lw_reset(lw_context ctx) { void lw_handle(lw_context, char *); failure_kind lw_begin(lw_context ctx, char *path) { - if (!setjmp(ctx->jmp_buf)) + int r = setjmp(ctx->jmp_buf); + + if (r == 0) lw_handle(ctx, path); - return ctx->failure_kind; + return r; } void lw_error(lw_context ctx, failure_kind fk, const char *fmt, ...) { va_list ap; va_start(ap, fmt); - ctx->failure_kind = fk; vsnprintf(ctx->error_message, ERROR_BUF_LEN, fmt, ap); - longjmp(ctx->jmp_buf, 1); + longjmp(ctx->jmp_buf, fk); } char *lw_error_message(lw_context ctx) { @@ -116,6 +112,15 @@ char *lw_get_input(lw_context ctx, int n) { return ctx->inputs[n]; } +char *lw_get_optional_input(lw_context ctx, int n) { + if (n < 0) + lw_error(ctx, FATAL, "Negative input index %d", n); + if (n >= lw_inputs_len) + lw_error(ctx, FATAL, "Out-of-bounds input index %d", n); + printf("[%d] = %s\n", n, ctx->inputs[n]); + return (ctx->inputs[n] == NULL ? "" : ctx->inputs[n]); +} + static void lw_check_heap(lw_context ctx, size_t extra) { if (ctx->heap_back - ctx->heap_front < extra) { size_t desired = ctx->heap_back - ctx->heap_front + extra, next; diff --git a/src/cjr_print.sml b/src/cjr_print.sml index 749f56ab..2189a436 100644 --- a/src/cjr_print.sml +++ b/src/cjr_print.sml @@ -893,8 +893,14 @@ fun p_file env (ds, ps) = val n = case SM.find (fnums, x) of NONE => raise Fail "CjrPrint: Can't find in fnums" | SOME n => n + + val f = case t of + (TFfi ("Basis", "bool"), _) => "optional_" + | _ => "" in - box [string "request = lw_get_input(ctx, ", + box [string "request = lw_get_", + string f, + string "input(ctx, ", string (Int.toString n), string ");", newline, diff --git a/src/lacweb.grm b/src/lacweb.grm index cc68d380..3c3b87d5 100644 --- a/src/lacweb.grm +++ b/src/lacweb.grm @@ -51,7 +51,7 @@ fun uppercaseFirst "" = "" | FN | PLUSPLUS | MINUSMINUS | DOLLAR | TWIDDLE | STRUCTURE | SIGNATURE | STRUCT | SIG | END | FUNCTOR | WHERE | EXTERN | INCLUDE | OPEN | CONSTRAINT | CONSTRAINTS | EXPORT - | CASE + | CASE | IF | THEN | ELSE | XML_BEGIN of string | XML_END | NOTAGS of string @@ -318,6 +318,12 @@ eexp : eapps (eapps) | LPAREN eexp RPAREN DCOLON cexp (EAnnot (eexp, cexp), s (LPARENleft, cexpright)) | eexp MINUSMINUS cexp (ECut (eexp, cexp), s (eexpleft, cexpright)) | CASE eexp OF barOpt branch branchs (ECase (eexp, branch :: branchs), s (CASEleft, branchsright)) + | IF eexp THEN eexp ELSE eexp (let + val loc = s (IFleft, eexp3right) + in + (ECase (eexp1, [((PCon (["Basis"], "True", NONE), loc), eexp2), + ((PCon (["Basis"], "False", NONE), loc), eexp3)]), loc) + end) eterm : LPAREN eexp RPAREN (#1 eexp, s (LPARENleft, RPARENright)) diff --git a/src/lacweb.lex b/src/lacweb.lex index b62edcc6..45c9410c 100644 --- a/src/lacweb.lex +++ b/src/lacweb.lex @@ -261,6 +261,9 @@ notags = [^<{\n]+; "fn" => (Tokens.FN (pos yypos, pos yypos + size yytext)); "fold" => (Tokens.FOLD (pos yypos, pos yypos + size yytext)); "case" => (Tokens.CASE (pos yypos, pos yypos + size yytext)); + "if" => (Tokens.IF (pos yypos, pos yypos + size yytext)); + "then" => (Tokens.THEN (pos yypos, pos yypos + size yytext)); + "else" => (Tokens.ELSE (pos yypos, pos yypos + size yytext)); "structure" => (Tokens.STRUCTURE (pos yypos, pos yypos + size yytext)); "signature" => (Tokens.SIGNATURE (pos yypos, pos yypos + size yytext)); diff --git a/src/monoize.sml b/src/monoize.sml index f6e5be6e..4b45ff44 100644 --- a/src/monoize.sml +++ b/src/monoize.sml @@ -519,6 +519,8 @@ fun monoExp (env, st, fm) (all as (e, loc)) = | _ => (Print.prefaces "Targs" (map (fn t => ("T", CorePrint.p_con env t)) targs); raise Fail "No name passed to ltextarea tag")) + | "checkbox" => input "checkbox" + | "radio" => (case targs of [_, (L.CName name, _)] => -- cgit v1.2.3