changeset 370:4f75cc2e1373

Fix problem with sig/struct indenting
author Adam Chlipala <adamc@hcoop.net>
date Thu, 16 Oct 2008 14:52:50 -0400
parents 226c977faa9c
children 782ef3ad8c28
files src/elisp/urweb-mode.el src/elisp/urweb-move.el tests/crud.ur tests/crud.urs
diffstat 4 files changed, 117 insertions(+), 120 deletions(-) [+]
line wrap: on
line diff
--- 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 "</xml")))
-        (setq sym "</xml>"))
     (if (member sym '(";" "d=")) (setq sym nil))
     (if sym (urweb-get-sym-indent sym)
       ;; FIXME: this can take a *long* time !!
--- 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))
 
 
--- 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 <xml><body>
-      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 <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>
+
+    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>
+
+    fun delete (id : int) =
+        () <- 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>
     </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>
+    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>
 
-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}
+          <h1>{cdata M.title}</h1>
 
-        <submit action={save id}/>
-      </form></body></xml>
+          <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>
 
-fun delete (id : int) =
-    () <- dml (DELETE FROM tab WHERE Id = {id});
-    return <xml><body>
-      The deed is done.
-    </body></xml>
+          <br/>
 
-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>
-</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>
+          <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
--- 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)