X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=nagios-mode.el;h=7c9f663c0fa5a5b8b1fe039b3a84b1386c0833bc;hb=b7394981592e89a8303b2d3cac7eae43f5fc61d2;hp=e1573345a61670b5fb8a9989d3abf622c367ecf4;hpb=eb979cc1755ca7cf5b42f0ec401777fd6a1c50ee;p=nagios-mode.git

diff --git a/nagios-mode.el b/nagios-mode.el
index e157334..7c9f663 100644
--- a/nagios-mode.el
+++ b/nagios-mode.el
@@ -155,27 +155,6 @@
 
 ;; Regular Expression Transformations
 
-(defun regexp-word(regexp)
-  "Takes a regular expression as an argument, and adds the word boundary condition to the beginning and end of it. Newlines are treated as word boundaries."
-
-  ;; This basically joins two expressions in an alternation.
-  ;; The first allows for a newline followed by our regexp (on
-  ;; a word boundary), and the second checks for any-non-word
-  ;; character followed by our regexp.
-  ;;
-  ;; I consider neither a hyphen nor an underscore to be a word
-  ;; boundary for the purpose of syntax highlighting, so I stick
-  ;; the no-hyphens-or-underscores class on each end of the
-  ;; expressions.
-
-  (concat "\\("
-	  (concat "\\(^\\<\\(" regexp "\\)\\>[^_-]\\)")
-	  "\\|"
-	  (concat "\\([^_-]\\<\\(" regexp "\\)\\>[^_-]\\)")
-	  "\\)")
-  )
-
-
 (defun regexp-alt-raw(element-list)
   "Takes a list of elements, and returns the string '\\(element1\\|element2...\\)'"
   
@@ -206,16 +185,18 @@
 
 (defconst nagios-directives
   (eval-when-compile
+    (concat "^[ \t\r\n]*"
+
     (regexp-opt
      '("active_checks_enabled" "address" "alias" "check_command"
        "check_freshness" "check_interval" "check_period" "checks_enabled"
-       "command_line" "command_name" "contact_groups" "contact_name"
-       "contactgroup_name" "contacts" "dependent_host_name"
-       "dependent_service_description" "email" "event_handler"
-       "event_handler_enabled" "execution_failure_criteria"
+       "command_line" "command_name" "contactgroups" "contact_groups"
+       "contactgroup_members" "contact_name" "contactgroup_name" "contacts"
+       "dependent_host_name" "dependent_service_description" "email"
+       "event_handler" "event_handler_enabled" "execution_failure_criteria"
        "failure_prediction_enabled" "first_notification"
-       "flap_detection_enabled" "freshness_threshold" "friday"
-       "high_flap_threshold" "host_name" "host_notification_commands"
+       "first_notification_delay" "flap_detection_enabled" "freshness_threshold"
+       "friday" "high_flap_threshold" "host_name" "host_notification_commands"
        "host_notification_options" "host_notification_period"
        "host_notifications_enabled" "hostgroup_name" "hostgroups"
        "is_volatile" "last_notification" "low_flap_threshold"
@@ -231,9 +212,12 @@
        "service_notification_commands" "service_notification_options"
        "service_notification_period" "service_notifications_enabled"
        "servicegroup_name" "stalking_options"
-       "sunday" "thursday" "timeperiod_name" "tuesday" "wednesday") t))
+       "sunday" "thursday" "timeperiod_name" "tuesday" "wednesday") t)
+
+    "[ \r\n\t]+")
+    )
   )
-    
+
 
 
 (defconst nagios-macros
@@ -255,38 +239,58 @@
 
 (defconst nagios-definitions
   (eval-when-compile
+
+    (concat "^[ \t\r\n]*"
+
     (regexp-alt-raw
      '("define +\\(host\\|service\\|timeperiod\\|contact\\|command\\)"
        "define +\\(host\\|contact\\|service\\)group"
        "define +\\(service\\|host\\)dependency"
-       "define +\\(service\\|host\\|hostgroup\\)escalation")))
+       "define +\\(service\\|host\\|hostgroup\\)escalation"))
+
+    ;; These can be "terminated" by either an opening curly
+    ;; brace, or a space.
+    "\\({\\| \\)")
+    )
   )
 
 
 
 (defconst nagios-special
   (eval-when-compile
+    (concat "^[ \t\r\n]*"
+
     (regexp-opt
-     '("name" "register" "use") t))
+     '("name" "register" "use") t)
+
+    "[ \r\n\t]+"))
   )
 
 
 
+(defconst nagios-string
+  (eval-when-compile
+    "\\(\".*?\"\\)"))
+
+
 ;; The One True Font Locking Variable
 
 (defvar nagios-font-lock-keywords
   (list
 
-   ;; This first bit of ugliness allows us to override any
-   ;; other font-locking with the comment font.
-   (cons nagios-comments '(0 font-lock-comment-delimiter-face t))
+   ;; Font lock the comments first.
+   (cons nagios-comments font-lock-comment-delimiter-face)
+
+   ;; Strings have the highest priority. For now, this is broken,
+   ;; but I guess I would rather have strings miscolored within
+   ;; comments than the other way around.
+   (cons nagios-string '(0 font-lock-string-face t))
+
+   (cons nagios-special font-lock-keyword-face)
+   (cons nagios-directives font-lock-variable-name-face)
+   (cons nagios-macros font-lock-constant-face)
+   (cons nagios-definitions '(1 font-lock-function-name-face)))
 
-   ;; The rest just map regular expressions to font faces.
-   (cons (regexp-word nagios-directives) font-lock-variable-name-face)
-   (cons (regexp-word nagios-macros) font-lock-constant-face)
-   (cons (regexp-word nagios-definitions) font-lock-function-name-face)
-   (cons (regexp-word nagios-special) font-lock-keyword-face))
-  
   "Rules for highlighting Nagios configuration files."
   )
 
@@ -312,7 +316,7 @@
   ;; Configure font locking. Set the defaults to something
   ;; sensible, defined earlier.
   (make-local-variable 'font-lock-defaults)
-  (setq font-lock-defaults '(nagios-font-lock-keywords nil t))
+  (setq font-lock-defaults '(nagios-font-lock-keywords t t))
 
   ;; Keyboard Mapping
   (use-local-map nagios-mode-map)