diff options
| author |  Adam Chlipala <adamc@hcoop.net> | 2008-10-14 17:18:59 -0400 |
|---|---|---|
| committer | Adam Chlipala <adamc@hcoop.net> | 2008-10-14 17:18:59 -0400 |
| commit | ed10a428abc7be47f8cce83db8dc64ac3cb6e84b (patch) | |
| tree | b7617266b4a9f49dec81d71cdb6c762172f706d6 /src | |
| parent | 8f64fda22cf9820a07c251acf755e14c836020a8 (diff) | |
Reusable column handlers for Crud
Diffstat (limited to 'src')
| -rw-r--r-- | src/elaborate.sml | 13 | ||||
| -rw-r--r-- | src/elisp/urweb-mode.el | 4 |
2 files changed, 13 insertions, 4 deletions
diff --git a/src/elaborate.sml b/src/elaborate.sml index b2d1f958..035b95f6 100644 --- a/src/elaborate.sml +++ b/src/elaborate.sml @@ -2167,8 +2167,15 @@ fun subSgn (env, denv) sgn1 (sgn2 as (_, loc2)) = | (L'.SgnConst sgis1, L'.SgnConst sgis2) => let + (*val () = prefaces "subSgn" [("sgn1", p_sgn env sgn1), + ("sgn2", p_sgn env sgn2), + ("sgis1", p_sgn env (L'.SgnConst sgis1, loc2)), + ("sgis2", p_sgn env (L'.SgnConst sgis2, loc2))]*) + fun folder (sgi2All as (sgi, loc), (env, denv)) = let + (*val () = prefaces "folder" [("sgis1", p_sgn env (L'.SgnConst sgis1, loc2))]*) + fun seek p = let fun seek (env, denv) ls = @@ -2358,7 +2365,9 @@ fun subSgn (env, denv) sgn1 (sgn2 as (_, loc2)) = case sgi1 of L'.SgiVal (x', n1, c1) => if x = x' then - (case unifyCons (env, denv) c1 c2 of + ((*prefaces "Pre" [("c1", p_con env c1), + ("c2", p_con env c2)];*) + case unifyCons (env, denv) c1 c2 of [] => SOME (env, denv) | _ => NONE) handle CUnify (c1, c2, err) => @@ -2846,7 +2855,7 @@ fun elabDecl (dAll as (d, loc), (env, denv, gs : constraint list)) = val c' = makeInstantiable c' in (*prefaces "DVal" [("x", Print.PD.string x), - ("c'", p_con env c')];*) + ("c'", p_con env c')];*) ([(L'.DVal (x, n, c', e'), loc)], (env', denv, enD gs1 @ gs2 @ enD gs3 @ enD gs4 @ gs)) end | L.DValRec vis => diff --git a/src/elisp/urweb-mode.el b/src/elisp/urweb-mode.el index 39cb41f8..27271f11 100644 --- a/src/elisp/urweb-mode.el +++ b/src/elisp/urweb-mode.el @@ -197,7 +197,7 @@ See doc for the variable `urweb-mode-info'." (defconst urweb-font-lock-keywords `(;;(urweb-font-comments-and-strings) - ("\\(<\\sw+\\)\\(\\s-\\|\\sw\\|=\\|\"[^\"]*\"\\|{[^}]*}\\)*/?\\(>\\)" + ("\\(<\\sw+\\)\\(\\s-\\|\\sw\\|=\\|\"[^\"]*\"\\|{[^}]*}\\)*\\(/?>\\)" (1 font-lock-tag-face) (3 font-lock-tag-face)) ("\\(</\\sw+>\\)" @@ -350,7 +350,7 @@ See doc for the variable `urweb-mode-info'." ;;;###autoload (add-to-list 'load-path (file-name-directory load-file-name)) ;;;###autoload -(add-to-list 'auto-mode-alist '("\\.s\\(ml\\|ig\\)\\'" . urweb-mode)) +(add-to-list 'auto-mode-alist '("\\.urs?\\'" . urweb-mode)) ;;;###autoload (define-derived-mode urweb-mode fundamental-mode "Ur/Web" |