Merge r21-4-11-chise-0_20-=ucs.

[chise/xemacs-chise.git.1] / tests / automated / syntax-tests.el

diff --git a/tests/automated/syntax-tests.el b/tests/automated/syntax-tests.el
index e848e11..1ebb9f1 100644 (file)
--- a/tests/automated/syntax-tests.el
+++ b/tests/automated/syntax-tests.el
@@ -100,3 +100,58 @@
   (test-backward-word "WO " 3)
   (test-backward-word "W !" 3)
   (test-backward-word "WO !" 4))
+
+;; Works like test-forward-word, except for the following:
+;; after <string> is inserted, the syntax-table <apply-syntax>
+;; is applied to position <apply-pos>.
+;; <apply-pos> can be in the form (start . end), or can be a
+;; character position.
+(defun test-syntax-table (string apply-pos apply-syntax stop)
+  ;; We don't necessarily have syntax-table properties ...
+  (when (boundp 'lookup-syntax-properties) ; backwards compatible kludge
+    ;; ... and they may not be enabled by default if we do.
+    (setq lookup-syntax-properties t)
+    (goto-char (point-max))
+    (unless (consp apply-pos)
+      (setq apply-pos `(,apply-pos . ,(+ 1 apply-pos))))
+    (let ((point (point)))
+      (insert string)
+      (put-text-property (+ point (car apply-pos)) (+ point (cdr apply-pos))
+                        'syntax-table apply-syntax)
+      (goto-char point)
+      (forward-word 1)
+      (Assert (eq (point) (+ point stop))))))
+
+;; test syntax-table extents
+(with-temp-buffer
+  ;; Apply punctuation to word
+  (test-syntax-table "WO" 1 `(,(syntax-string-to-code ".")) 1)
+  ;; Apply word to punctuation
+  (test-syntax-table "W." 1 `(,(syntax-string-to-code "w")) 2))
+
+;; Test forward-comment at buffer boundaries
+;; #### The second Assert fails (once interpreted, once compiled) on 21.4.9
+;; with sjt's version of Andy's syntax-text-property-killer patch.
+(with-temp-buffer
+  (if (not (fboundp 'c-mode))
+      ;; #### This whole thing should go inside a macro Skip-Test
+      (let* ((reason "c-mode unavailable")
+            (count (gethash reason skipped-test-reasons)))
+       ;;(message "%S: %S" reason count)
+       (puthash reason (if (null count) 1 (1+ count))
+                skipped-test-reasons)
+       (Print-Skip "comment and parse-partial-sexp tests" reason))
+    (c-mode)
+    
+    (insert "// comment\n")
+    (forward-comment -2)
+    (Assert (eq (point) (point-min)))
+
+    (let ((point (point)))
+      (insert "/* comment */")
+      (goto-char point)
+      (forward-comment 2)
+      (Assert (eq (point) (point-max)))
+
+      ;; this last used to crash
+      (parse-partial-sexp point (point-max)))))