emacs: src/fns.c comparison

comparison src/fns.c @ 20813:b040da7cfab8

(concat): If making a string, a nonempty bool-vector is error. (string_make_multibyte): In all-ASCII case, return orig STRING. (Fstring_as_unibyte): New function. (Fstring_as_multibyte): New function. (syms_of_fns): defsubr them.

author	Richard M. Stallman <rms@gnu.org>
date	Mon, 02 Feb 1998 01:03:10 +0000
parents	219fdecc30d3
children	8f6d92b4f48a

comparison

equal deleted inserted replaced

-:d21a1c41800f
+:b040da7cfab8
 		this_len_byte = XFASTINT (Fchar_bytes (ch));
 		result_len_byte += this_len_byte;
 		if (this_len_byte > 1)
 		  some_multibyte = 1;
 	      }
+	  else if (BOOL_VECTOR_P (this) && XBOOL_VECTOR (this)->size > 0)
+	    wrong_type_argument (Qintegerp, Faref (this, make_number (0)));
 	  else if (CONSP (this))
 	    for (; CONSP (this); this = XCONS (this)->cdr)
 	      {
 		ch = XCONS (this)->car;
 		if (! INTEGERP (ch))
 if (STRING_MULTIBYTE (string))
 return string;
 nbytes = count_size_as_multibyte (XSTRING (string)->data,
 				    XSTRING (string)->size);
+/* If all the chars are ASCII, they won't need any more bytes
+once converted.  In that case, we can return STRING itself.  */
+if (nbytes == XSTRING (string)->size_byte)
+return string;
 buf = (unsigned char *) alloca (nbytes);
 copy_text (XSTRING (string)->data, buf, XSTRING (string)->size_byte,
 	     0, 1);
 return make_multibyte_string (buf, XSTRING (string)->size, nbytes);
 "Return the unibyte equivalent of STRING.")
 (string)
 Lisp_Object string;
 {
 return string_make_unibyte (string);
+}
+DEFUN ("string-as-unibyte", Fstring_as_unibyte, Sstring_as_unibyte,
+1, 1, 0,
+"Return a unibyte string with the same individual bytes as STRING.\n\
+If STRING is unibyte, the result is STRING itself.")
+(string)
+Lisp_Object string;
+{
+if (STRING_MULTIBYTE (string))
+{
+string = Fcopy_sequence (string);
+XSTRING (string)->size = XSTRING (string)->size_byte;
+}
+return string;
+}
+DEFUN ("string-as-multibyte", Fstring_as_multibyte, Sstring_as_multibyte,
+1, 1, 0,
+"Return a multibyte string with the same individual bytes as STRING.\n\
+If STRING is multibyte, the result is STRING itself.")
+(string)
+Lisp_Object string;
+{
+if (! STRING_MULTIBYTE (string))
+{
+int newlen = chars_in_text (XSTRING (string)->data,
+				  XSTRING (string)->size_byte);
+/* If all the chars are ASCII, STRING is already suitable.  */
+if (newlen != XSTRING (string)->size_byte)
+	{
+	  string = Fcopy_sequence (string);
+	  XSTRING (string)->size = newlen;
+	}
+}
+return string;
 }
 DEFUN ("copy-alist", Fcopy_alist, Scopy_alist, 1, 1, 0,
 "Return a copy of ALIST.\n\
 This is an alist which represents the same mapping from objects to objects,\n\
 }
 DEFUN ("char-table-range", Fchar_table_range, Schar_table_range,
 2, 2, 0,
 "Return the value in CHAR-TABLE for a range of characters RANGE.\n\
-RANGE should be t (for all characters), nil (for the default value)\n\
+RANGE should be nil (for the default value)\n\
 a vector which identifies a character set or a row of a character set,\n\
-or a character code.")
+a character set name, or a character code.")
 (char_table, range)
 Lisp_Object char_table, range;
 {
 int i;
 if (EQ (range, Qnil))
 return XCHAR_TABLE (char_table)->defalt;
 else if (INTEGERP (range))
 return Faref (char_table, range);
+else if (SYMBOLP (range))
+{
+Lisp_Object charset_info;
+charset_info = Fget (range, Qcharset);
+CHECK_VECTOR (charset_info, 0);
+return Faref (char_table, XVECTOR (charset_info)->contents[0] + 128);
+}
 else if (VECTORP (range))
 {
 if (XVECTOR (range)->size == 1)
-	return Faref (char_table, XVECTOR (range)->contents[0]);
+	return Faref (char_table, XVECTOR (range)->contents[0] + 128);
 else
 	{
 	  int size = XVECTOR (range)->size;
 	  Lisp_Object *val = XVECTOR (range)->contents;
 	  Lisp_Object ch = Fmake_char_internal (size <= 0 ? Qnil : val[0],
 DEFUN ("set-char-table-range", Fset_char_table_range, Sset_char_table_range,
 3, 3, 0,
 "Set the value in CHAR-TABLE for a range of characters RANGE to VALUE.\n\
 RANGE should be t (for all characters), nil (for the default value)\n\
 a vector which identifies a character set or a row of a character set,\n\
-or a character code.")
+a coding system, or a character code.")
 (char_table, range, value)
 Lisp_Object char_table, range, value;
 {
 int i;
 if (EQ (range, Qt))
 for (i = 0; i < CHAR_TABLE_ORDINARY_SLOTS; i++)
 XCHAR_TABLE (char_table)->contents[i] = value;
 else if (EQ (range, Qnil))
 XCHAR_TABLE (char_table)->defalt = value;
+else if (SYMBOLP (range))
+{
+Lisp_Object charset_info;
+charset_info = Fget (range, Qcharset);
+CHECK_VECTOR (charset_info, 0);
+return Faset (char_table, XVECTOR (charset_info)->contents[0] + 128,
+		    value);
+}
 else if (INTEGERP (range))
 Faset (char_table, range, value);
 else if (VECTORP (range))
 {
 if (XVECTOR (range)->size == 1)
-	return Faset (char_table, XVECTOR (range)->contents[0], value);
+	return Faset (char_table, XVECTOR (range)->contents[0] + 128, value);
 else
 	{
 	  int size = XVECTOR (range)->size;
 	  Lisp_Object *val = XVECTOR (range)->contents;
 	  Lisp_Object ch = Fmake_char_internal (size <= 0 ? Qnil : val[0],
 defsubr (&Sconcat);
 defsubr (&Svconcat);
 defsubr (&Scopy_sequence);
 defsubr (&Sstring_make_multibyte);
 defsubr (&Sstring_make_unibyte);
+defsubr (&Sstring_as_multibyte);
+defsubr (&Sstring_as_unibyte);
 defsubr (&Scopy_alist);
 defsubr (&Ssubstring);
 defsubr (&Snthcdr);
 defsubr (&Snth);
 defsubr (&Selt);

Mercurial > emacs

comparison src/fns.c @ 20813:b040da7cfab8