This commit was manufactured by cvs2svn to create branch 'utf-2000'.

diff --git a/src/casetab.h b/src/casetab.h
new file mode 100644 (file)
index 0000000..fad321c
--- /dev/null
+++ b/src/casetab.h
@@ -0,0 +1,66 @@
+/* XEmacs routines to deal with case tables.
+   Copyright (C) 2000 Yoshiki Hayashi.
+This file is part of XEmacs.
+
+XEmacs is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option) any
+later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs; see the file COPYING.  If not, write to
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
+
+/* Synched up with: Not in FSF. */
+
+#ifndef INCLUDED_casetab_h_
+#define INCLUDED_casetab_h_
+
+struct Lisp_Case_Table
+{
+  struct lcrecord_header header;
+  Lisp_Object downcase_table;
+  Lisp_Object upcase_table;
+  Lisp_Object case_canon_table;
+  Lisp_Object case_eqv_table;
+};
+typedef struct Lisp_Case_Table Lisp_Case_Table;
+  
+DECLARE_LRECORD (case_table, Lisp_Case_Table);
+#define XCASE_TABLE(x) XRECORD (x, case_table, Lisp_Case_Table)
+#define XSETCASE_TABLE(x, p) XSETRECORD (x, p, case_table)
+#define CASE_TABLEP(x) RECORDP (x, case_table)
+#define CHECK_CASE_TABLE(x) CHECK_RECORD (x, case_table)
+#define CONCHECK_CASE_TABLE(x) CONCHECK_RECORD (x, case_table)
+
+#define CASE_TABLE_DOWNCASE(ct) ((ct)->downcase_table)
+#define CASE_TABLE_UPCASE(ct) ((ct)->upcase_table)
+#define CASE_TABLE_CANON(ct) ((ct)->case_canon_table)
+#define CASE_TABLE_EQV(ct) ((ct)->case_eqv_table)
+#define XCASE_TABLE_DOWNCASE(ct) (XCASE_TABLE (ct)->downcase_table)
+#define XCASE_TABLE_UPCASE(ct) (XCASE_TABLE (ct)->upcase_table)
+#define XCASE_TABLE_CANON(ct) (XCASE_TABLE (ct)->case_canon_table)
+#define XCASE_TABLE_EQV(ct) (XCASE_TABLE (ct)->case_eqv_table)
+
+#define SET_CASE_TABLE_DOWNCASE(ct, p) ((ct)->downcase_table = p)
+#define SET_CASE_TABLE_UPCASE(ct, p) ((ct)->upcase_table = p)
+#define SET_CASE_TABLE_CANON(ct, p) ((ct)->case_canon_table = p)
+#define SET_CASE_TABLE_EQV(ct, p) ((ct)->case_eqv_table = p)
+#define XSET_CASE_TABLE_DOWNCASE(ct, p)        \
+  SET_CASE_TABLE_DOWNCASE (XCASE_TABLE (ct), p)
+#define XSET_CASE_TABLE_UPCASE(ct, p)  \
+  SET_CASE_TABLE_UPCASE (XCASE_TABLE (ct), p)
+#define XSET_CASE_TABLE_CANON(ct, p)   \
+  SET_CASE_TABLE_CANON (XCASE_TABLE (ct),  p)
+#define XSET_CASE_TABLE_EQV(ct, p)     \
+  SET_CASE_TABLE_EQV (XCASE_TABLE (ct),  p)
+
+extern Lisp_Object Vstandard_case_table;
+
+#endif /* INCLUDED_casetab_h_ */

diff --git a/tests/automated/case-tests.el b/tests/automated/case-tests.el
new file mode 100644 (file)
index 0000000..2a294d5
Binary files /dev/null and b/tests/automated/case-tests.el differ

diff --git a/tests/automated/regexp-tests.el b/tests/automated/regexp-tests.el
new file mode 100644 (file)
index 0000000..2df3156
--- /dev/null
+++ b/tests/automated/regexp-tests.el
@@ -0,0 +1,206 @@
+;;; -*- coding: iso-8859-1 -*-
+
+;; Copyright (C) 2000 Free Software Foundation, Inc.
+
+;; Author: Yoshiki Hayashi  <yoshiki@xemacs.org>
+;; Maintainer: Yoshiki Hayashi  <yoshiki@xemacs.org>
+;; Created: 2000
+;; Keywords: tests
+
+;; This file is part of XEmacs.
+
+;; XEmacs is free software; you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with XEmacs; see the file COPYING.  If not, write to the Free
+;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+;; 02111-1307, USA.
+
+;;; Synched up with: Not in FSF.
+
+;;; Commentary:
+
+;; Test regular expression.
+
+(Check-Error-Message error "Trailing backslash"
+                    (string-match "\\" "a"))
+(Check-Error-Message error "Invalid preceding regular expression"
+                    (string-match "a++" "a"))
+(Check-Error-Message error "Invalid preceding regular expression"
+                    (string-match "a**" "a"))
+(Check-Error-Message error "Invalid preceding regular expression"
+                    (string-match "a???" "a"))
+(Check-Error-Message error "Unmatched \\[ or \\[^"
+                    (string-match "[" "a"))
+(Check-Error-Message error "Unmatched \\[ or \\[^"
+                    (string-match "[abc" "a"))
+(Check-Error-Message error "Unmatched ) or \\\\)"
+                    (string-match "\\)" "a"))
+(Check-Error-Message error "Invalid regular expression"
+                    (string-match "\\(?.\\)" "a"))
+(Check-Error-Message error "Unmatched \\\\{"
+                    (string-match "a\\{" "a"))
+(Check-Error-Message error "Invalid content of \\\\{\\\\}"
+                    (string-match "a\\{a\\}" "a"))
+
+;; exactn
+
+;; string-match
+(with-temp-buffer
+  ;; case-insensitive
+  (Assert (string-match "ä" "ä"))
+  (Assert (string-match "ä" "Ä"))
+  (Assert (string-match "Ä" "Ä"))
+  (Assert (string-match "Ä" "ä"))
+  ;; case-sensitive
+  (setq case-fold-search nil)
+  (Assert (string-match "ä" "ä"))
+  (Assert (not (string-match "ä" "Ä")))
+  (Assert (string-match "Ä" "Ä"))
+  (Assert (not (string-match "Ä" "ä"))))
+
+;; looking-at
+(with-temp-buffer
+  (insert "äÄ")
+  ;; case-insensitive
+  (goto-char (point-min))
+  (Assert (looking-at "ä"))
+  (Assert (looking-at "Ä"))
+  (forward-char)
+  (Assert (looking-at "ä"))
+  (Assert (looking-at "Ä"))
+  ;; case-sensitive
+  (setq case-fold-search nil)
+  (goto-char (point-min))
+  (Assert (looking-at "ä"))
+  (Assert (not (looking-at "Ä")))
+  (forward-char)
+  (Assert (not (looking-at "ä")))
+  (Assert (looking-at "Ä")))
+
+;; re-search-forward and re-search-backward
+(with-temp-buffer
+  (insert "äÄ")
+  ;; case insensitive
+  ;; forward
+  (goto-char (point-min))
+  ;; Avoid trivial regexp.
+  (Assert (eq 2 (re-search-forward "ä\\|a" nil t)))
+  (goto-char (point-min))
+  (Assert (eq 2 (re-search-forward "Ä\\|a" nil t)))
+  (goto-char (1+ (point-min)))
+  (Assert (eq 3 (re-search-forward "ä\\|a" nil t)))
+  (goto-char (1+ (point-min)))
+  (Assert (eq 3 (re-search-forward "Ä\\|a" nil t)))
+  ;; backward
+  (goto-char (point-max))
+  (Assert (eq 2 (re-search-backward "ä\\|a" nil t)))
+  (goto-char (point-max))
+  (Assert (eq 2 (re-search-backward "Ä\\|a" nil t)))
+  (goto-char (1- (point-max)))
+  (Assert (eq 1 (re-search-backward "ä\\|a" nil t)))
+  (goto-char (1- (point-max)))
+  (Assert (eq 1 (re-search-backward "Ä\\|a" nil t)))
+  ;; case sensitive
+  (setq case-fold-search nil)
+  ;; forward
+  (goto-char (point-min))
+  (Assert (eq 2 (re-search-forward "ä\\|a" nil t)))
+  (goto-char (point-min))
+  (Assert (eq 3 (re-search-forward "Ä\\|a" nil t)))
+  (goto-char (1+ (point-min)))
+  (Assert (not (re-search-forward "ä\\|a" nil t)))
+  (goto-char (1+ (point-min)))
+  (Assert (eq 3 (re-search-forward "Ä\\|a" nil t)))
+  ;; backward
+  (goto-char (point-max))
+  (Assert (eq 1 (re-search-backward "ä\\|a" nil t)))
+  (goto-char (point-max))
+  (Assert (eq 2 (re-search-backward "Ä\\|a" nil t)))
+  (goto-char (1- (point-max)))
+  (Assert (eq 1 (re-search-backward "ä\\|a" nil t)))
+  (goto-char (1- (point-max)))
+  (Assert (not (re-search-backward "Ä\\|a" nil t))))
+
+;; duplicate
+(with-temp-buffer
+  ;; case insensitive
+  (Assert (string-match "^\\(ä\\)\\1$" "ää"))
+  (Assert (string-match "^\\(ä\\)\\1$" "äÄ"))
+  (Assert (string-match "^\\(ä\\)\\1$" "ÄÄ"))
+  (Assert (string-match "^\\(ä\\)\\1$" "Ää"))
+  (Assert (string-match "^\\(Ä\\)\\1$" "ää"))
+  (Assert (string-match "^\\(Ä\\)\\1$" "äÄ"))
+  (Assert (string-match "^\\(Ä\\)\\1$" "ÄÄ"))
+  (Assert (string-match "^\\(Ä\\)\\1$" "Ää"))
+  ;; case sensitive
+  (setq case-fold-search nil)
+  (Assert (string-match "^\\(ä\\)\\1$" "ää"))
+  (Assert (not (string-match "^\\(ä\\)\\1$" "äÄ")))
+  (Assert (not (string-match "^\\(ä\\)\\1$" "ÄÄ")))
+  (Assert (not (string-match "^\\(ä\\)\\1$" "Ää")))
+  (Assert (not (string-match "^\\(Ä\\)\\1$" "ää")))
+  (Assert (not (string-match "^\\(Ä\\)\\1$" "äÄ")))
+  (Assert (string-match "^\\(Ä\\)\\1$" "ÄÄ"))
+  (Assert (not (string-match "^\\(Ä\\)\\1$" "Ää"))))
+
+;; charset, charset_not
+;; Not called because it takes too much time.
+(defun test-regexp-charset-paranoid ()
+  (let ((i 0)
+       (max (expt 2 (if (featurep 'mule) 19 8)))
+       (range "[a-z]")
+       (range-not "[^a-z]")
+       char string)
+    (while (< i max)
+      (when (setq char (int-to-char i))
+       (setq string (char-to-string char))
+       (if (or (and (<= 65 i)
+                    (<= i 90))
+               (and (<= 97 i)
+                    (<= i 122)))
+           (progn
+             (Assert (string-match range string))
+             (Assert (not (string-match range-not string))))
+         (Assert (not (string-match range string)))
+         (Assert (string-match range-not string))))
+      (setq i (1+ i)))))
+
+;; (test-regexp-charset-paranoid)
+
+;; charset_mule, charset_mule_not
+;; Not called because it takes too much time.
+(defun test-regex-charset-mule-paranoid ()
+  (if (featurep 'mule)
+      (let ((i 0)
+           (max (expt 2 19))
+           (range (format "[%c-%c]"
+                          (make-char 'japanese-jisx0208 36 34)
+                          (make-char 'japanese-jisx0208 36 42)))
+           (range-not (format "[^%c-%c]"
+                              (make-char 'japanese-jisx0208 36 34)
+                              (make-char 'japanese-jisx0208 36 42)))
+           (min-int (char-to-int (make-char 'japanese-jisx0208 36 34)))
+           (max-int (char-to-int (make-char 'japanese-jisx0208 36 42)))
+           char string)
+       (while (< i max)
+         (when (setq char (int-to-char i))
+           (setq string (char-to-string char))
+           (if (and (<= min-int i)
+                    (<= i max-int))
+               (progn
+                 (Assert (string-match range string))
+                 (Assert (not (string-match range-not string))))
+             (Assert (not (string-match range string)))
+             (Assert (string-match range-not string))))
+         (setq i (1+ i))))))
+
+;; (test-regex-charset-mule-paranoid)