# HG changeset patch # User Adam Chlipala # Date 1224183170 14400 # Node ID 4f75cc2e1373e42950412ed4cea8dd2353121f94 # Parent 226c977faa9c9483013ce40d4d6eb2452d75f66f Fix problem with sig/struct indenting diff -r 226c977faa9c -r 4f75cc2e1373 src/elisp/urweb-mode.el --- a/src/elisp/urweb-mode.el Thu Oct 16 14:40:28 2008 -0400 +++ b/src/elisp/urweb-mode.el Thu Oct 16 14:52:50 2008 -0400 @@ -586,8 +586,6 @@ (let ((sym (unless (save-excursion (urweb-backward-arg)) (urweb-backward-spaces) (urweb-backward-sym)))) - (if (and (= sym ">") (save-excursion (backward-char 5) (looking-at "")) (if (member sym '(";" "d=")) (setq sym nil)) (if sym (urweb-get-sym-indent sym) ;; FIXME: this can take a *long* time !! diff -r 226c977faa9c -r 4f75cc2e1373 src/elisp/urweb-move.el --- a/src/elisp/urweb-move.el Thu Oct 16 14:40:28 2008 -0400 +++ b/src/elisp/urweb-move.el Thu Oct 16 14:52:50 2008 -0400 @@ -340,7 +340,7 @@ ;;(defun urweb-forward-thing () ;; (if (= ?w (char-syntax (char-after))) (forward-word 1) (forward-char 1))) -(defun urweb-backward-arg () (interactive) (urweb-backward-sexp 1000)) +(defun urweb-backward-arg () (urweb-backward-sexp 1000)) (defun urweb-forward-arg () (urweb-forward-sexp 1000)) diff -r 226c977faa9c -r 4f75cc2e1373 tests/crud.ur --- a/tests/crud.ur Thu Oct 16 14:40:28 2008 -0400 +++ b/tests/crud.ur Thu Oct 16 14:52:50 2008 -0400 @@ -31,133 +31,133 @@ Inject = _} functor Make(M : sig -con cols :: {(Type * Type)} -constraint [Id] ~ cols -val tab : sql_table ([Id = int] ++ mapT2T fstTT cols) + con cols :: {(Type * Type)} + constraint [Id] ~ cols + val tab : sql_table ([Id = int] ++ mapT2T fstTT cols) -val title : string + val title : string -val cols : colsMeta cols + val cols : colsMeta cols end) = struct -open constraints M -val tab = M.tab + open constraints M + val tab = M.tab -sequence seq + sequence seq -fun create (inputs : $(mapT2T sndTT M.cols)) = - id <- nextval seq; - () <- dml (insert tab - (foldT2R2 [sndTT] [colMeta] - [fn cols => $(mapT2T (fn t :: (Type * Type) => - sql_exp [] [] [] t.1) cols)] - (fn (nm :: Name) (t :: (Type * Type)) (rest :: {(Type * Type)}) - [[nm] ~ rest] => - fn input col acc => acc with nm = sql_inject col.Inject (col.Parse input)) - {} [M.cols] inputs M.cols - with #Id = (SQL {id}))); - return - Inserted with ID {txt _ id}. + fun create (inputs : $(mapT2T sndTT M.cols)) = + id <- nextval seq; + () <- dml (insert tab + (foldT2R2 [sndTT] [colMeta] + [fn cols => $(mapT2T (fn t :: (Type * Type) => + sql_exp [] [] [] t.1) cols)] + (fn (nm :: Name) (t :: (Type * Type)) (rest :: {(Type * Type)}) + [[nm] ~ rest] => + fn input col acc => acc with nm = sql_inject col.Inject (col.Parse input)) + {} [M.cols] inputs M.cols + with #Id = (SQL {id}))); + return + Inserted with ID {txt _ id}. + + + fun save (id : int) (inputs : $(mapT2T sndTT M.cols)) = + () <- dml (update [mapT2T fstTT M.cols] + (foldT2R2 [sndTT] [colMeta] + [fn cols => $(mapT2T (fn t :: (Type * Type) => + sql_exp [T = [Id = int] + ++ mapT2T fstTT M.cols] + [] [] t.1) cols)] + (fn (nm :: Name) (t :: (Type * Type)) (rest :: {(Type * Type)}) + [[nm] ~ rest] => + fn input col acc => acc with nm = + sql_inject col.Inject (col.Parse input)) + {} [M.cols] inputs M.cols) + tab (WHERE T.Id = {id})); + return + Saved! + + + fun update (id : int) = + fso <- oneOrNoRows (SELECT tab.{{mapT2T fstTT M.cols}} FROM tab WHERE tab.Id = {id}); + case fso : (Basis.option {Tab : $(mapT2T fstTT M.cols)}) of + None => return Not found! + | Some fs => return
+ {foldT2R2 [fstTT] [colMeta] [fn cols :: {(Type * Type)} => xml form [] (mapT2T sndTT cols)] + (fn (nm :: Name) (t :: (Type * Type)) (rest :: {(Type * Type)}) + [[nm] ~ rest] (v : t.1) (col : colMeta t) + (acc : xml form [] (mapT2T sndTT rest)) => + +
  • {cdata col.Nam}: {col.WidgetPopulated [nm] v}
    • + {useMore acc} +     ) + + [M.cols] fs.Tab M.cols} + + +
    + + fun delete (id : int) = + () <- dml (DELETE FROM tab WHERE Id = {id}); + return + The deed is done. + + + fun confirm (id : int) = return +

    Are you sure you want to delete ID #{txt _ id}?

    + +

    I was born sure!

     -fun save (id : int) (inputs : $(mapT2T sndTT M.cols)) = - () <- dml (update [mapT2T fstTT M.cols] - (foldT2R2 [sndTT] [colMeta] - [fn cols => $(mapT2T (fn t :: (Type * Type) => - sql_exp [T = [Id = int] - ++ mapT2T fstTT M.cols] - [] [] t.1) cols)] - (fn (nm :: Name) (t :: (Type * Type)) (rest :: {(Type * Type)}) - [[nm] ~ rest] => - fn input col acc => acc with nm = - sql_inject col.Inject (col.Parse input)) - {} [M.cols] inputs M.cols) - tab (WHERE T.Id = {id})); - return - Saved! - + fun main () = + rows <- queryX (SELECT * FROM tab AS T) + (fn (fs : {T : $([Id = int] ++ mapT2T fstTT M.cols)}) => + + {txt _ fs.T.Id} + {foldT2RX2 [fstTT] [colMeta] [tr] + (fn (nm :: Name) (t :: (Type * Type)) (rest :: {(Type * Type)}) + [[nm] ~ rest] v col => + {col.Show v} + ) + [M.cols] (fs.T -- #Id) M.cols} + + [Update] + [Delete] + + + ); + return + {cdata M.title} + -fun update (id : int) = - fso <- oneOrNoRows (SELECT tab.{{mapT2T fstTT M.cols}} FROM tab WHERE tab.Id = {id}); - case fso : (Basis.option {Tab : $(mapT2T fstTT M.cols)}) of - None => return Not found! - | Some fs => return
    - {foldT2R2 [fstTT] [colMeta] [fn cols :: {(Type * Type)} => xml form [] (mapT2T sndTT cols)] - (fn (nm :: Name) (t :: (Type * Type)) (rest :: {(Type * Type)}) - [[nm] ~ rest] (v : t.1) (col : colMeta t) - (acc : xml form [] (mapT2T sndTT rest)) => - -
  • {cdata col.Nam}: {col.WidgetPopulated [nm] v}
    • - {useMore acc} -     ) - - [M.cols] fs.Tab M.cols} +

    {cdata M.title}

    - -
    + + + + {foldT2RX [colMeta] [tr] + (fn (nm :: Name) (t :: (Type * Type)) (rest :: {(Type * Type)}) + [[nm] ~ rest] col => + + ) + [M.cols] M.cols} + + {rows} +
    ID{cdata col.Nam}
    -fun delete (id : int) = - () <- dml (DELETE FROM tab WHERE Id = {id}); - return - The deed is done. - +
    -fun confirm (id : int) = return -

    Are you sure you want to delete ID #{txt _ id}?

    - -

    I was born sure!

    -     - -fun main () = - rows <- queryX (SELECT * FROM tab AS T) - (fn (fs : {T : $([Id = int] ++ mapT2T fstTT M.cols)}) => - - {txt _ fs.T.Id} - {foldT2RX2 [fstTT] [colMeta] [tr] - (fn (nm :: Name) (t :: (Type * Type)) (rest :: {(Type * Type)}) - [[nm] ~ rest] v col => - {col.Show v} - ) - [M.cols] (fs.T -- #Id) M.cols} - - [Update] - [Delete] - - - ); - return - {cdata M.title} - - -

    {cdata M.title}

    - - - - - {foldT2RX [colMeta] [tr] - (fn (nm :: Name) (t :: (Type * Type)) (rest :: {(Type * Type)}) - [[nm] ~ rest] col => - - ) - [M.cols] M.cols} - - {rows} -
    ID{cdata col.Nam}
    - -
    - -
    - {foldT2R [colMeta] [fn cols :: {(Type * Type)} => xml form [] (mapT2T sndTT cols)] - (fn (nm :: Name) (t :: (Type * Type)) (rest :: {(Type * Type)}) - [[nm] ~ rest] (col : colMeta t) (acc : xml form [] (mapT2T sndTT rest)) => -
  • {cdata col.Nam}: {col.Widget [nm]}
    • - {useMore acc} -     ) - - [M.cols] M.cols} - - - -
    +
    + {foldT2R [colMeta] [fn cols :: {(Type * Type)} => xml form [] (mapT2T sndTT cols)] + (fn (nm :: Name) (t :: (Type * Type)) (rest :: {(Type * Type)}) + [[nm] ~ rest] (col : colMeta t) (acc : xml form [] (mapT2T sndTT rest)) => +
  • {cdata col.Nam}: {col.Widget [nm]}
    • + {useMore acc} +     ) + + [M.cols] M.cols} + + + +
    end diff -r 226c977faa9c -r 4f75cc2e1373 tests/crud.urs --- a/tests/crud.urs Thu Oct 16 14:40:28 2008 -0400 +++ b/tests/crud.urs Thu Oct 16 14:52:50 2008 -0400 @@ -8,7 +8,6 @@ Inject : sql_injectable t_formT.1} con colsMeta = fn cols :: {(Type * Type)} => $(mapT2T colMeta cols) -val default : t ::: Type -> show t -> read t -> sql_injectable t -> string -> colMeta (t, string) val int : string -> colMeta (int, string) val float : string -> colMeta (float, string) val string : string -> colMeta (string, string)