Changeset 17553 for util

Timestamp:

08/31/07 20:45:57 (15 months ago)

Author:

renormalist

Message:

cperl-mode:

• take in again the differentiation between Hash and Block (not perfect yet but better than without it)
• more Type keywords

Files:

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

util/cperl-mode.el

@@ -6687 +6687 @@
                                                                                 (1- e) 'to-end))
                                                                   (and (memq qtag (append "pPN" nil))
-                                                                           (re-search-forward "\\={[^{}]+}\\|."
+                                                                           (re-search-forward "\\={[^{}]+}\\|." ;; ss5: hier interessant f�und aehnliche Spezialvariablen?
                                                                                                                   (1- e) 'to-end))
                                                                   (eq (char-syntax qtag) ?w))
@@ -6914 +6914 @@
   ;; Positions is before ?\{.  Checks whether it starts a block.
   ;; No save-excursion!  This is more a distinguisher of a block/hash ref...
-; ss5: 2007-08-27 seems not to work
-;  (or
-;   (and ; perl6: it's never a hash if whitespace before brace
-;    (cond (cperl-use-v6))
-;    (memq (preceding-char) (append " \t" nil)))
+  (or
+   (and ; perl6: it's never a hash if whitespace before brace (not yet perfect)
+    (cond (cperl-use-v6))
+    (memq (preceding-char) (append " \t" nil)))
    (progn
      (cperl-backward-to-noncomment (point-min))
@@ -6942 +6941 @@
              (progn ; perl6: "if/elsif/unless/while/until/given/when/for/loop" without parens; just look at beginning of line
                (beginning-of-line)
-               (looking-at "\\s *}?\\s *\\(\\(els\\(e\\s +\\|\\)\\)?if\\|un\\(less\\|til\\)\\|given\\|wh\\(ile\\|en\\)\\|for\\|loop\\)\\>")))))
-; corresponding to ss5: 2007-08-27 seems not to work
-;)
+               (looking-at "\\s *}?\\s *\\(\\(els\\(e\\s +\\|\\)\\)?if\\|un\\(less\\|til\\)\\|given\\|wh\\(ile\\|en\\)\\|for\\|loop\\)\\>"))))))
 )
 
@@ -7875 +7872 @@
               ;; the builtin types:
               ;; bit" "int" "str" "num" "ref" "bool" "Bit" "Int" "Str" "Num" "Ref"
+                  ;; Complex Exception Seq Range Set Junction Pair Mapping Signature Capture "
+          ;; Bag\\|Mapping\\|Blob\\|KeyHash\\|KeySet\\|KeyBag\\|Buf\\|Regex\\|Match\\|Any\\|"
               ;; Bool" "Array" "Hash" "IO" "Code" "Routine" "Sub" "Method" "Submethod"
               ;; Macro" "Rule" "Block" "Bare" "Parametric" "Package" "Module" "Class" "Role"
@@ -7881 +7880 @@
               "bit\\|int\\|str\\|num\\|ref\\|bool\\|Bit\\|Int\\|Str\\|Num\\|Ref\\|"
                   "Complex\\|Exception\\|Seq\\|Range\\|Set\\|Junction\\|Pair\\|Mapping\\|Signature\\|Capture\\|"
+          "Bag\\|Mapping\\|Blob\\|KeyHash\\|KeySet\\|KeyBag\\|Buf\\|Regex\\|Match\\|Any\\|"
               "Bool\\|Array\\|Hash\\|IO\\|Code\\|Routine\\|Sub\\|Method\\|Submethod\\|"
               "Macro\\|Rule\\|Block\\|Bare\\|Parametric\\|Package\\|Module\\|Class\\|Role\\|"