summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/top.ur16
-rw-r--r--src/elisp/urweb-mode.el21
-rw-r--r--tests/crud.ur192
3 files changed, 125 insertions, 104 deletions
diff --git a/lib/top.ur b/lib/top.ur
index 1b1d1ec5..4b9f54ef 100644
--- a/lib/top.ur
+++ b/lib/top.ur
@@ -34,10 +34,10 @@ fun foldTR (tf :: Type -> Type) (tr :: {Type} -> Type)
(fn _ => i)
fun foldT2R (tf :: (Type * Type) -> Type) (tr :: {(Type * Type)} -> Type)
- (f : nm :: Name -> t :: (Type * Type) -> rest :: {(Type * Type)}
- -> fn [[nm] ~ rest] =>
- tf t -> tr rest -> tr ([nm = t] ++ rest))
- (i : tr []) =
+ (f : nm :: Name -> t :: (Type * Type) -> rest :: {(Type * Type)}
+ -> fn [[nm] ~ rest] =>
+ tf t -> tr rest -> tr ([nm = t] ++ rest))
+ (i : tr []) =
fold [fn r :: {(Type * Type)} => $(mapT2T tf r) -> tr r]
(fn (nm :: Name) (t :: (Type * Type)) (rest :: {(Type * Type)})
(acc : _ -> tr rest) [[nm] ~ rest] r =>
@@ -45,10 +45,10 @@ fun foldT2R (tf :: (Type * Type) -> Type) (tr :: {(Type * Type)} -> Type)
(fn _ => i)
fun foldTR2 (tf1 :: Type -> Type) (tf2 :: Type -> Type) (tr :: {Type} -> Type)
- (f : nm :: Name -> t :: Type -> rest :: {Type}
- -> fn [[nm] ~ rest] =>
- tf1 t -> tf2 t -> tr rest -> tr ([nm = t] ++ rest))
- (i : tr []) =
+ (f : nm :: Name -> t :: Type -> rest :: {Type}
+ -> fn [[nm] ~ rest] =>
+ tf1 t -> tf2 t -> tr rest -> tr ([nm = t] ++ rest))
+ (i : tr []) =
fold [fn r :: {Type} => $(mapTT tf1 r) -> $(mapTT tf2 r) -> tr r]
(fn (nm :: Name) (t :: Type) (rest :: {Type})
(acc : _ -> _ -> tr rest) [[nm] ~ rest] r1 r2 =>
diff --git a/src/elisp/urweb-mode.el b/src/elisp/urweb-mode.el
index c8186182..308bd1af 100644
--- a/src/elisp/urweb-mode.el
+++ b/src/elisp/urweb-mode.el
@@ -478,6 +478,25 @@ If anyone has a good algorithm for this..."
(setq done t))))
(and (not done) (> depth 0)))))
+(defun skip-matching-braces ()
+ "Skip backwards past matching brace pairs, to calculate XML indentation after quoted Ur code"
+ (beginning-of-line)
+ (let ((start-pos (point))
+ (depth 0))
+ (end-of-line)
+ (while (re-search-backward "[{}]" start-pos t)
+ (cond
+ ((looking-at "}")
+ (incf depth))
+ ((looking-at "{")
+ (decf depth))))
+ (while (and (> depth 0) (re-search-backward "[{}]" nil t)
+ (cond
+ ((looking-at "}")
+ (incf depth))
+ ((looking-at "{")
+ (decf depth)))))))
+
(defun urweb-tag-matching-indent ()
"Seek back to a matching opener tag and get its line's indent"
(save-excursion
@@ -520,7 +539,7 @@ If anyone has a good algorithm for this..."
(and (urweb-in-xml)
(let ((prev-indent (save-excursion
(previous-line 1)
- (end-of-line 1)
+ (skip-matching-braces)
(re-search-backward "^[^\n]" nil t)
(current-indentation))))
(cond
diff --git a/tests/crud.ur b/tests/crud.ur
index 02405f78..64a7b2c5 100644
--- a/tests/crud.ur
+++ b/tests/crud.ur
@@ -46,111 +46,113 @@ val tab = M.tab
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 <xml><body>
- Inserted with ID {txt _ id}.
- </body></xml>
+ 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 <xml><body>
+ Inserted with ID {txt _ id}.
+ </body></xml>
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 <xml><body>
- Saved!
- </body></xml>
+ () <- 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 <xml><body>
+ Saved!
+ </body></xml>
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 <xml><body>Not found!</body></xml>
- | Some fs => return <xml><body><form>
- {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)) =>
- <xml>
- <li> {cdata col.Nam}: {col.WidgetPopulated [nm] v}</li>
- {useMore acc}
- </xml>)
- <xml/>
- [M.cols] fs.Tab M.cols}
-
- <submit action={save id}/>
- </form></body></xml>
+ 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 <xml><body>Not found!</body></xml>
+ | Some fs => return <xml><body><form>
+ {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)) =>
+ <xml>
+ <li> {cdata col.Nam}: {col.WidgetPopulated [nm] v}</li>
+ {useMore acc}
+ </xml>)
+ <xml/>
+ [M.cols] fs.Tab M.cols}
+
+ <submit action={save id}/>
+ </form></body></xml>
fun delete (id : int) =
- () <- dml (DELETE FROM tab WHERE Id = {id});
- return <xml><body>
- The deed is done.
- </body></xml>
+ () <- dml (DELETE FROM tab WHERE Id = {id});
+ return <xml><body>
+ The deed is done.
+ </body></xml>
fun confirm (id : int) = return <xml><body>
- <p>Are you sure you want to delete ID #{txt _ id}?</p>
-
- <p><a link={delete id}>I was born sure!</a></p>
+ <p>Are you sure you want to delete ID #{txt _ id}?</p>
+
+ <p><a link={delete id}>I was born sure!</a></p>
</body></xml>
fun main () =
- rows <- queryX (SELECT * FROM tab AS T)
- (fn (fs : {T : $([Id = int] ++ mapT2T fstTT M.cols)}) => <xml>
- <tr>
- <td>{txt _ fs.T.Id}</td>
- {foldT2RX2 [fstTT] [colMeta] [tr]
- (fn (nm :: Name) (t :: (Type * Type)) (rest :: {(Type * Type)})
- [[nm] ~ rest] v col => <xml>
- <td>{col.Show v}</td>
- </xml>)
- [M.cols] (fs.T -- #Id) M.cols}
- <td><a link={update fs.T.Id}>[Update]</a> <a link={confirm fs.T.Id}>[Delete]</a></td>
- </tr>
- </xml>);
- return <xml><head>
- <title>{cdata M.title}</title>
-
- </head><body>
-
- <h1>{cdata M.title}</h1>
-
- <table border={1}>
- <tr>
- <th>ID</th>
- {foldT2RX [colMeta] [tr]
- (fn (nm :: Name) (t :: (Type * Type)) (rest :: {(Type * Type)})
- [[nm] ~ rest] col => <xml>
- <th>{cdata col.Nam}</th>
- </xml>)
- [M.cols] M.cols}
- </tr>
- {rows}
- </table>
-
- <br/>
-
- <form>
- {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)) => <xml>
- <li> {cdata col.Nam}: {col.Widget [nm]}</li>
- {useMore acc}
- </xml>)
- <xml/>
- [M.cols] M.cols}
-
- <submit action={create}/>
- </form>
- </body></xml>
+ rows <- queryX (SELECT * FROM tab AS T)
+ (fn (fs : {T : $([Id = int] ++ mapT2T fstTT M.cols)}) => <xml>
+ <tr>
+ <td>{txt _ fs.T.Id}</td>
+ {foldT2RX2 [fstTT] [colMeta] [tr]
+ (fn (nm :: Name) (t :: (Type * Type)) (rest :: {(Type * Type)})
+ [[nm] ~ rest] v col => <xml>
+ <td>{col.Show v}</td>
+ </xml>)
+ [M.cols] (fs.T -- #Id) M.cols}
+ <td><a link={update fs.T.Id}>[Update]</a> <a link={confirm fs.T.Id}>[Delete]</a></td>
+ </tr>
+ </xml>);
+ return <xml><head>
+ <title>{cdata M.title}</title>
+
+ </head><body>
+
+ <h1>{cdata M.title}</h1>
+
+ <table border={1}>
+ <tr>
+ <th>ID</th>
+ {foldT2RX [colMeta] [tr]
+ (fn (nm :: Name) (t :: (Type * Type)) (rest :: {(Type * Type)})
+ [[nm] ~ rest] col => <xml>
+ <th>{cdata col.Nam}</th>
+ </xml>)
+ [M.cols] M.cols}
+ </tr>
+ {rows}
+ </table>
+
+ <br/>
+
+ <form>
+ {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)) => <xml>
+ <li> {cdata col.Nam}: {col.Widget [nm]}</li>
+ {useMore acc}
+ </xml>)
+ <xml/>
+ [M.cols] M.cols}
+
+ <submit action={create}/>
+ </form>
+ </body></xml>
end
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-23 09:34:06 +0000