# HG changeset patch # User Adam Chlipala # Date 1223821808 14400 # Node ID 2205d5cb416a9260e6fd80ea332cfb9bec2b1215 # Parent d5148178a7be6a68a304162d4037eb2727627ddb Get type definitions font-locking again diff -r d5148178a7be -r 2205d5cb416a src/elisp/urweb-mode.el --- a/src/elisp/urweb-mode.el Sun Oct 12 10:22:50 2008 -0400 +++ b/src/elisp/urweb-mode.el Sun Oct 12 10:30:08 2008 -0400 @@ -164,10 +164,10 @@ `(;;(urweb-font-comments-and-strings) (,(concat "\\<\\(fun\\|and\\)\\s-+\\(\\sw+\\)\\s-+[^ \t\n=]") (1 font-lock-keyword-face) - (6 font-lock-function-name-face)) + (5 font-lock-function-name-face)) (,(concat "\\<\\(\\(data\\)?type\\|con\\)\\s-+\\(\\sw+\\)") (1 font-lock-keyword-face) - (7 font-lock-type-def-face)) + (3 font-lock-type-def-face)) ("\\<\\(val\\)\\s-+\\(\\sw+\\>\\s-*\\)?\\(\\sw+\\)\\s-*[=:]" (1 font-lock-keyword-face) (3 font-lock-variable-name-face)) diff -r d5148178a7be -r 2205d5cb416a tests/crud.urs --- a/tests/crud.urs Sun Oct 12 10:22:50 2008 -0400 +++ b/tests/crud.urs Sun Oct 12 10:30:08 2008 -0400 @@ -1,21 +1,21 @@ -con colMeta = fn t_formT :: (Type * Type) => { - Nam : string, - Show : t_formT.1 -> xbody, - Widget : nm :: Name -> xml form [] [nm = t_formT.2], - WidgetPopulated : nm :: Name -> t_formT.1 -> xml form [] [nm = t_formT.2], - Parse : t_formT.2 -> t_formT.1, - Inject : sql_injectable t_formT.1 -} +con colMeta = fn t_formT :: (Type * Type) => + {Nam : string, + Show : t_formT.1 -> xbody, + Widget : nm :: Name -> xml form [] [nm = t_formT.2], + WidgetPopulated : nm :: Name -> t_formT.1 + -> xml form [] [nm = t_formT.2], + Parse : t_formT.2 -> t_formT.1, + Inject : sql_injectable t_formT.1} con colsMeta = fn cols :: {(Type * Type)} => $(mapT2T colMeta cols) 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 -end) : sig - val main : unit -> transaction page + val cols : colsMeta cols + end) : sig + val main : unit -> transaction page end