Changeset 16591 for util

Timestamp:

06/01/07 09:16:39 (18 months ago)

Author:

renormalist

Message:

- cperl-mode: token/regex (indenting+highlighting)

Files:

• util/cperl-mode.el (modified) (10 diffs)

util/cperl-mode.el

@@ -1470 +1470 @@
 ;;;
 ;;;  Highlighting new keywords/builtins:
-;;;    class, role, grammar, rule, 
+;;;    class, role, grammar, rule, token, regex, 
 ;;;    has, state, does,
 ;;;    say,
@@ -2098 +2098 @@
    (save-excursion
      (beginning-of-buffer)
-     (search-forward-regexp "^[\t ]*\\(use v6\\|\\(class\\|role\\|grammar\\|rule\\)[\t ]+.*;\\)" 320 t))))
+     (search-forward-regexp "^[\t ]*\\(use v6\\|\\(class\\|role\\|grammar\\|rule\\|token\\|regex\\)[\t ]+.*;\\)" 320 t))))
 
 (if cperl-can-font-lock
@@ -6971 +6971 @@
                     (forward-sexp -1)
                     ;; else {}     but not    else::func {}
-                    (or (and (looking-at "\\(else\\|class\\|role\\|grammar\\|rule\\|continue\\|grep\\|map\\|gather\\|async\\|atomically\\|given\\|when\\|default\\|loop\\|for\\|BEGIN\\|END\\|CHECK\\|INIT\\|START\\|FIRST\\|ENTER\\|LEAVE\\|KEEP\\|UNDO\\|NEXT\\|LAST\\|PRE\\|POST\\|CATCH\\|CONTROL\\|\\(\\(multi\\|proto\\)[ \t]*\\)?\\(coro\\|sub\\|method\\|submethod\\)?\\)\\>")
+                    (or (and (looking-at "\\(else\\|class\\|role\\|grammar\\|rule\\|token\\|regex\\|continue\\|grep\\|map\\|gather\\|async\\|atomically\\|given\\|when\\|default\\|loop\\|for\\|BEGIN\\|END\\|CHECK\\|INIT\\|START\\|FIRST\\|ENTER\\|LEAVE\\|KEEP\\|UNDO\\|NEXT\\|LAST\\|PRE\\|POST\\|CATCH\\|CONTROL\\|\\(\\(multi\\|proto\\)[ \t]*\\)?\\(coro\\|sub\\|method\\|submethod\\)?\\)\\>")
                              (not (looking-at "\\(\\sw\\|_\\)+::")))
                         ;; sub f {}
@@ -6988 +6988 @@
                 ;; perl6: todo: correct in P5? Then use-v6'ify!
                 (beginning-of-line)
-                (looking-at "\\s *}?\\s *\\(\\(els\\(e\\s +\\|\\)\\)?if\\|un\\(less\\|til\\)\\|class\\|role\\|grammar\\|rule\\|gather\\|async\\|atomically\\|given\\|wh\\(ile\\|en\\)\\|loop\\|for\\|\\(\\(multi\\|proto\\)[ \t]*\\)?\\(coro\\|sub\\|method\\|submethod\\)?\\)\\>"))))
+                (looking-at "\\s *}?\\s *\\(\\(els\\(e\\s +\\|\\)\\)?if\\|un\\(less\\|til\\)\\|class\\|role\\|grammar\\|rule\\|token\\|regex\\|gather\\|async\\|atomically\\|given\\|wh\\(ile\\|en\\)\\|loop\\|for\\|\\(\\(multi\\|proto\\)[ \t]*\\)?\\(coro\\|sub\\|method\\|submethod\\)?\\)\\>"))))
       (error nil))))
 
@@ -7895 +7895 @@
               ;; "grep" "has" "if" "keys" "kv" "last" "local" "loop" "map" "my" "next"
               ;; "no" "our" "pairs" "package" "pop" "pos" "pick" "print" "printf" "push"
-              ;; "q" "qq" "qw" "qx" "redo" "rx" "reduce" "return" "role" "rule" "say" "scalar" "shift"
-              ;; "sort" "splice" "split" "study" "state" "sum" "take" "type" "sub" "tie" "tr"
+              ;; "q" "qq" "qw" "qx" "redo" "rx" "reduce" "regex" "return" "role" "rule" "say" "scalar" "shift"
+              ;; "sort" "splice" "split" "study" "state" "sum" "take" "taken" "type" "token" "sub" "tie" "tr"
               ;; "undef" "uniq" "unless" "unshift" "untie" "until" "uniq" "use"
               ;; "while" "y" "zip"
@@ -7904 +7904 @@
               "l\\(ast\\|o\\(cal\\|op\\)\\)\\|m\\(a\\(p\\|x\\)\\|in\\|y\\)\\|n\\(ext\\|o\\)\\|our\\|"
               "p\\(a\\(ckage\\|irs\\)\\|ick\\|rint\\(\\|f\\)\\|ush\\|o\\(p\\|s\\)\\)\\|"
-              "q\\(\\|q\\|w\\|x\\|r\\)\\|rx\\|re\\(turn\\|d\\(o\\|uce\\)\\)\\|r\\(o\\|u\\)le\\|s\\(ay\\|pli\\(ce\\|t\\)\\|"
-              "calar\\|t\\(udy\\|ate\\)\\|u\\(b\\|m\\)\\|hift\\|ort\\)\\|t\\(r\\|ie\\|ype\\|aken?\\)\\|"
+              "q\\(\\|q\\|w\\|x\\|r\\)\\|rx\\|re\\(gex\\|turn\\|d\\(o\\|uce\\)\\)\\|r\\(o\\|u\\)le\\|s\\(ay\\|pli\\(ce\\|t\\)\\|"
+              "calar\\|t\\(udy\\|ate\\)\\|u\\(b\\|m\\)\\|hift\\|ort\\)\\|t\\(r\\|ie\\|ype\\|oken\\|aken?\\)\\|"
               "u\\(se\\|n\\(iq\\|shift\\|ti\\(l\\|e\\)\\|def\\|less\\)\\)\\|"
               "while\\|y\\|zip\\|__\\(END\\|DATA\\)__" ;__DATA__ added manually
@@ -7943 +7943 @@
                              'font-lock-function-name-face
                            'font-lock-variable-name-face))))
-            '("\\<\\(package\\|class\\|role\\|grammar\\|rule\\|require\\|use\\|import\\|no\\|bootstrap\\)[ \t]+\\([a-zA-z_][a-zA-z_0-9:]*\\)[ \t;]" ; require A if B;
+            '("\\<\\(package\\|class\\|role\\|grammar\\|rule\\|token\\|regex\\|require\\|use\\|import\\|no\\|bootstrap\\)[ \t]+\\([a-zA-z_][a-zA-z_0-9:]*\\)[ \t;]" ; require A if B;
               2 font-lock-function-name-face)
             '("^[ \t]*format[ \t]+\\([a-zA-z_][a-zA-z_0-9:]*\\)[ \t]*=[ \t]*$"
@@ -8778 +8778 @@
                 "/\\<sub[ \\t]+\\(\\([a-zA-Z0-9:_]*::\\)?\\([a-zA-Z0-9_]+\\)\\)[ \\t]*\\(([^()]*)[ \t]*\\)?\\([ \t]*:[^#{;]*\\)?\\([{#]\\|$\\)/\\3/"
                 "-r"
-                "/\\<\\(package\\|class\\|role\\|grammar\\|rule\\)[ \\t]+\\(\\([a-zA-Z0-9:_]*::\\)?\\([a-zA-Z0-9_]+\\)\\)[ \\t]*\\([#;]\\|$\\)/\\2/"; perl6
+                "/\\<\\(package\\|class\\|role\\|grammar\\|rule\\|token\\|regex\\)[ \\t]+\\(\\([a-zA-Z0-9:_]*::\\)?\\([a-zA-Z0-9_]+\\)\\)[ \\t]*\\([#;]\\|$\\)/\\2/"; perl6
                 "-r"
-                "/\\<\\(package\\|class\\|role\\|grammar\\|rule\\)[ \\t]*;/\\1;/"))
+                "/\\<\\(package\\|class\\|role\\|grammar\\|rule\\|token\\|regex\\)[ \\t]*;/\\1;/"))
         res)
     (if add (setq args (cons "-a" args)))
@@ -8991 +8991 @@
                 (insert (elt elt 3)
                         127
-                        (if (string-match "^\\(package\\|class\\|role\\|grammar\\|rule\\) " (car elt)) ; perl6
+                        (if (string-match "^\\(package\\|class\\|role\\|grammar\\|rule\\|token\\|regex\\) " (car elt)) ; perl6
                             (substring (car elt) 8)
                           (car elt) )
@@ -9128 +9128 @@
   (concat
    "^\\("
-      "\\(package\\|class\\|role\\|grammar\\|rule\\)\\>"
+      "\\(package\\|class\\|role\\|grammar\\|rule\\|token\\|regex\\)\\>"
      "\\|"
       "sub\\>[^\n]+::"