-/* Header for UCS-4 character representation.
- Copyright (C) 1999 Electrotechnical Laboratory, JAPAN.
- Licensed to the Free Software Foundation.
+/* Header for character representation.
+ Copyright (C) 1999,2000 MORIOKA Tomohiko
This file is part of XEmacs.
the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-/* Rewritten by MORIOKA Tomohiko <tomo@m17n.org>. */
-
#ifndef _XEMACS_CHARACTER_H
#define _XEMACS_CHARACTER_H
#define CHAR_OR_CHAR_INTP(x) (CHARP (x) || CHAR_INTP (x))
-#ifdef ERROR_CHECK_TYPECHECK
-
-INLINE Emchar XCHAR_OR_CHAR_INT (Lisp_Object obj);
-INLINE Emchar
+INLINE_HEADER Emchar XCHAR_OR_CHAR_INT (Lisp_Object obj);
+INLINE_HEADER Emchar
XCHAR_OR_CHAR_INT (Lisp_Object obj)
{
- assert (CHAR_OR_CHAR_INTP (obj));
return CHARP (obj) ? XCHAR (obj) : XINT (obj);
}
-#else
-
-#define XCHAR_OR_CHAR_INT(obj) (CHARP ((obj)) ? XCHAR ((obj)) : XINT ((obj)))
-
-#endif
-
#define CHECK_CHAR_COERCE_INT(x) do { \
if (CHARP (x)) \
; \
x = wrong_type_argument (Qcharacterp, x); \
} while (0)
+
+#define CHARC_CHARSET(cc) ((cc).charset)
+#define CHARC_CHARSET_ID(cc) XCHARSET_ID (CHARC_CHARSET (cc))
+#define CHARC_CODE_POINT(cc) ((cc).code_point)
+#define CHARC_COLUMNS(cc) CHARSET_COLUMNS (XCHARSET (CHARC_CHARSET (cc)))
+
+INLINE_HEADER Emchar CHARC_TO_CHAR (Charc cc);
+INLINE_HEADER Emchar
+CHARC_TO_CHAR (Charc cc)
+{
+ return DECODE_CHAR (cc.charset, cc.code_point);
+}
+
+INLINE_HEADER int CHARC_EQ (Charc cc1, Charc cc2);
+INLINE_HEADER int
+CHARC_EQ (Charc cc1, Charc cc2)
+{
+ return EQ (cc1.charset, cc2.charset) && (cc1.code_point == cc2.code_point);
+}
+
+INLINE_HEADER int CHARC_ASCII_EQ (Charc cc, int ch);
+INLINE_HEADER int
+CHARC_ASCII_EQ (Charc cc, int ch)
+{
+ return EQ (cc.charset, Vcharset_ascii) && (cc.code_point == ch);
+}
+
+INLINE_HEADER int CHARC_IS_SPACE (Charc cc);
+INLINE_HEADER int
+CHARC_IS_SPACE (Charc cc)
+{
+ return (EQ (cc.charset, Vcharset_ascii) ||
+ EQ (cc.charset, Vcharset_control_1) ||
+ EQ (cc.charset, Vcharset_latin_iso8859_1))
+ && isspace (cc.code_point);
+}
+
+INLINE_HEADER Charc ASCII_TO_CHARC (int ch);
+INLINE_HEADER Charc
+ASCII_TO_CHARC (int ch)
+{
+ Charc cc;
+
+ cc.charset = Vcharset_ascii;
+ cc.code_point = ch;
+ return cc;
+}
+
+
+typedef struct
+{
+ Dynarr_declare (Charc);
+} Charc_dynarr;
+
#endif /* _XEMACS_CHARACTER_H */