Type annotations on environment variable reads

[hcoop/domtool2.git] / elisp / domtool-mode.el

diff --git a/elisp/domtool-mode.el b/elisp/domtool-mode.el
index d1a4a98..a35a895 100644 (file)
--- a/elisp/domtool-mode.el
+++ b/elisp/domtool-mode.el
@@ -37,16 +37,43 @@
        ))
     table))
 
+(defun domtool-syms-re (&rest syms)
+  (concat "\\<" (regexp-opt syms t) "\\>"))
+
+(defconst domtool-types-regexp
+  (domtool-syms-re "proxy_target" "proxy_port" "mod_rewrite_cond_flag" "mod_rewrite_flag" "rewrite_arg" "redirect_code" "autoindex_option" "autoindex_width" "homedir_path" "dnsRecord" "apache_option" "authType" "location" "ssl" "ssl_cert_path" "suexec_flag" "web_node" "aliasTarget" "aliasSource" "email" "emailUser" "mail_node" "dnsKind" "master" "dns_node" "soa" "serial" "your_path" "your_group" "your_user" "group" "user" "node" "your_domain_host" "your_domain" "domain" "host" "ip" "no_newlines" "no_spaces" "bool" "string" "int")
+  "A regexp that matches Domtool types from the standard library.")
+
+(defconst domtool-contexts-regexp
+  (domtool-syms-re "Location" "Vhost" "Domain")
+  "A regexp that matches Domtool contexts from the standard library.")
+
+(defconst domtool-actions-regexp
+  (domtool-syms-re "errorDocument" "scriptAlias" "alias" "proxyPassReverse" "proxyPass" "rewriteLogLevel" "localProxyRewrite" "rewriteBase" "rewriteCond" "rewriteRule" "setEnv" "davFilesystem" "readmeName" "headerName" "unset_indexOptions" "set_indexOptions" "indexOptions" "addDescription" "mailmanWebHost" "dnsDefault" "dnsAlias" "dnsMail" "dnsIP" "nameserver" "dom" "web" "webAt" "relayMail" "handleMail" "dns" "addDefaultCharset" "action" "forceTypeOff" "forceType" "directoryIndex" "unset_options" "set_options" "options" "satisfyAny" "satisfyAll" "denyFrom" "denyFromAll" "allowFrom" "allowFromAll" "orderDenyAllow" "orderAllowDeny" "requireGroup" "requireUser" "requireValidUser" "authUserFile" "authName" "authType" "serverAliasDefault" "serverAlias" "serverAliasHost" "directory" "location" "vhost" "defaultAlias" "aliasDrop" "aliasMulti" "emailAlias" "aliasPrim" "domain")
+  "A regexp that matches Domtool actions from the standard library.")
+
+(defconst domtool-vals-regexp
+  (domtool-syms-re "ornext" "cond_nocase" "env" "skip" "redirectWith" "mimeType" "passthrough" "noescape" "qsappend" "nocase" "nosubreq" "chain" "last" "gone" "forbidden" "redirect" "redir307" "redir305" "redir304" "redir303" "redir302" "redir301" "redir300" "seeother" "permanent" "temp" "xhtml" "versionSort" "trackModified" "suppressSize" "suppressRules" "suppressLastModified" "suppressIcon" "suppressHtmlPreamble" "suppressDescription" "suppressColumnSorting" "scanHtmlTitles" "nameWidth" "ignoreClient" "ignoreCase" "iconWidth" "iconHeight" "iconsAreLinks" "htmlTable" "foldersFirst" "fancyIndexing" "descriptionWidth" "characters" "autofit" "home" "web_node" "default_node" "dnsDefaultA" "dnsNS" "dnsMX" "dnsCNAME" "dnsA" "indexes" "includesNOEXEC" "execCGI" "kerberos" "digest" "basic" "use_cert" "no_ssl" "web_node_to_node" "dropTarget" "addressesTarget" "addressTarget" "catchAllSource" "defaultSource" "userSource" "mail_node_to_node" "noDns" "useDns" "internalMaster" "externalMaster" "dns_node_to_node" "defaultSoa" "soa" "serialConst" "serialAuto" "ip_of_node" "true" "false")
+  "A regexp that matches Domtool vals from the standard library.")
+
+(defconst domtool-env-vars-regexp
+  (domtool-syms-re "Aliases" "DNS" "DocumentRoot" "Group" "MailNodes" "Mailbox" "SSL" "ServerAdmin" "SuExec" "TTL" "User" "WebNodes")
+  "A regexp that matches Domtool env-vars from the standard library.")
+
 (defvar domtool-font-lock-keywords
   `(,(concat
       "\\_<"
       (regexp-opt '("let" "in" "begin" "end" "with" "where" "extern" "type"
-                    "val" "context" "Root"
-                    ;; Actions
-                    "vhost" "location" "directory" "domain" "dom"
-                    "webAt" "web")
+                    "val" "context" "Root")
                   t)
       "\\_>")
+
+    (,domtool-actions-regexp . font-lock-builtin-face)
+    (,domtool-vals-regexp . font-lock-variable-name-face)
+    (,domtool-contexts-regexp . font-lock-constant-face)
+    (,domtool-env-vars-regexp . font-lock-constant-face)
+    (,domtool-types-regexp . font-lock-type-face)
+
     ("type[ \t]+\\(\\(\\sw\\|\\s_\\)+\\)" 1 font-lock-type-face)
     ("val[ \t]+\\(\\(\\sw\\|\\s_\\)+\\)" 1 font-lock-variable-name-face)))
 
@@ -83,12 +110,26 @@
      (savep (save-excursion (indent-line-to indent)))
      (t (indent-line-to indent)))))
 
+(defun until-closed (level)
+  (if
+      (re-search-backward "\\_<\\(with\\|where\\|begin\\|end\\)\\_>"
+                         nil t)
+      (cond
+       ((string= (match-string 0) "end")
+       (until-closed (+ level 1)))
+       ((= level 0)
+       (current-indentation))
+       (t
+       (until-closed (- level 1))))
+
+    nil))
+
 (defun domtool-calculate-indent ()
   (save-excursion
     (back-to-indentation)
     (multiple-value-bind (previous-keyword base-indent)
         (save-excursion
-          (if (re-search-backward "\\_<\\(with\\|where\\|end\\)\\_>"
+          (if (re-search-backward "\\_<\\(with\\|where\\|begin\\|end\\)\\_>"
                                   nil t)
               (values (match-string 0) (current-indentation))
             (values nil 0)))
@@ -98,11 +139,8 @@
           'noindent)
          ((nth 4 state)
           (domtool-calculate-comment-indent state))
-         ((and (looking-at "\\_<end\\_>")
-               (string= previous-keyword "end"))
-          (- base-indent domtool-indent))
          ((looking-at "\\_<\\(with\\|end\\)\\_>")
-          base-indent)
+          (until-closed 0))
          ((not previous-keyword)
           base-indent)
          ((string= previous-keyword "end")