Changeset 9

Timestamp:

Aug 17, 2010, 11:02:59 AM (14 years ago)

Author:

ertl-ishikawa

Message:

WORNINGとERRORのEND対応がとれていないバグを修正．

Location:

tf-mode/trunk

Files:

• tf-mode.el (modified) (2 diffs)
• tf-mode.l (modified) (4 diffs)

tf-mode/trunk/tf-mode.el

@@ -119 +119 @@
 
 (defvar *tf-block-beg-re*
-  "[\$]\\(IF\\|FOREACH\\|JOINEACH\\|FUNCTION\\)[ ]")
+  "[\$]\\(\\(IF\\|FOREACH\\|JOINEACH\\|FUNCTION\\|ERROR\\|WORNING\\)[ ]\\|\\(ERROR\\|WORNING\\)[\$]\\)")
 (defvar *tf-block-mid-re*
   "\$ELSE[\$]")
@@ -240 +240 @@
 
 ;; 対応を探すための正規表現
-(defvar *tf-block-keyword* "[\$]\\(IF[ \t]\\|FOREACH[ \t]\\|JOINEACH[ \t]\\|FUNCTION[ \t]\\|END[\$]\\)")
+(defvar *tf-block-keyword* "[\$]\\(IF[ \t]\\|FOREACH[ \t]\\|JOINEACH[ \t]\\|FUNCTION[ \t]\\|END[\$]\\|ERROR[ \$]\\|WORNING[ \$]\\)")
 (defvar *tf-block-tag* 'tf-block)
 

tf-mode/trunk/tf-mode.l

@@ -75 +75 @@
   (setq *tf-mode-map* (make-sparse-keymap))
   (define-key *tf-mode-map* #\TAB 'tf-indent-line)
+  (define-key *tf-mode-map* '(#\C-c #\I) 'tf-indent-region)
   )
 
 (defvar *tf-mode-syntax-table* nil)
 (unless *tf-mode-syntax-table*
-  (setq *tf-mode-syntax-table* (make-syntax-table)))
-;;  (set-syntax-start-comment *tf-mode-syntax-table* #\$\t t)
-;;  (set-syntax-end-comment *tf-mode-syntax-table* #\LFD nil t))
+  (setq *tf-mode-syntax-table* (make-syntax-table))
+  (do ((x #x21 (1+ x)))((>= x #x7f))
+    (let ((c (code-char x)))
+      (unless (alphanumericp c)
+        (set-syntax-punctuation *tf-mode-syntax-table* c))))
+  (set-syntax-option *tf-mode-syntax-table*
+                     *syntax-option-c-preprocessor*)
+  (set-syntax-string *tf-mode-syntax-table* #\")
+  (set-syntax-string *tf-mode-syntax-table* #\')
+  (set-syntax-escape *tf-mode-syntax-table* #\\)
+  (set-syntax-symbol *tf-mode-syntax-table* #\_)
+  (set-syntax-symbol *tf-mode-syntax-table* #\#)
+  (set-syntax-match *tf-mode-syntax-table* #\( #\))
+  (set-syntax-match *tf-mode-syntax-table* #\{ #\})
+  (set-syntax-match *tf-mode-syntax-table* #\[ #\]))
 
 
@@ -117 +130 @@
 
 (defvar *tf-block-beg-re*
-  "[\$]\\(IF\\|FOREACH\\|JOINEACH\\|FUNCTION\\)[ ]")
+  "[\$]\\(\\(IF\\|FOREACH\\|JOINEACH\\|FUNCTION\\|ERROR\\|WORNING\\)[ ]\\|\\(ERROR\\|WORNING\\)[\$]\\)")
 (defvar *tf-block-mid-re*
   "\$ELSE[\$]")
@@ -213 +226 @@
   t)
 
+(defun tf-indent-region (from to)
+  (interactive "*r")
+  (if (> from to)
+      (rotatef from to))
+  (save-excursion
+    (save-restriction
+      (narrow-to-region (point-min) to)
+      (goto-char from)
+      (goto-eol)
+;;      (delete-trailing-spaces)
+      (while (forward-line 1)
+        (goto-eol)
+;;      (delete-trailing-spaces)
+        (unless (bolp)
+          (funcall mode-specific-indent-command)))))
+  t)
+
 ;; -------------------------------------------------------------------------
 ;;
@@ -246 +276 @@
 
 ;; ‘Ήž‚ð’T‚·‚½‚߂̐³‹K•\Œ»
-(defvar *tf-block-keyword* "[\$]\\(IF[ \t]\\|FOREACH[ \t]\\|JOINEACH[ \t]\\|FUNCTION[ \t]\\|END[\$]\\)")
+(defvar *tf-block-keyword* "[\$]\\(IF[ \t]\\|FOREACH[ \t]\\|JOINEACH[ \t]\\|FUNCTION[ \t]\\|END[\$]\\|ERROR[ \$]\\|WORNING[ \$]\\)")
 (defvar *tf-block-tag* 'tf-block)