emacs: src/coding.c comparison

comparison src/coding.c @ 89225:32058afc72e2

(detect_coding_charset): If only ASCII bytes are found, return 0. (detect_coding_system): Fix previous change. (Fdefine_coding_system_internal): Setup CODING_ATTR_ASCII_COMPAT (attrs) correctly.

author	Kenichi Handa <handa@m17n.org>
date	Wed, 16 Oct 2002 05:03:55 +0000
parents	e6779a6185ca
children	101ee928c088

comparison

equal deleted inserted replaced

-:d77928dacd87
+:32058afc72e2
 unsigned char *src = coding->source, *src_base = src;
 unsigned char *src_end = coding->source + coding->src_bytes;
 int multibytep = coding->src_multibyte;
 int consumed_chars = 0;
 Lisp_Object attrs, valids;
+int found = 0;
 coding = &coding_categories[coding_category_charset];
 attrs = CODING_ID_ATTRS (coding->id);
 valids = AREF (attrs, coding_attr_charset_valids);
 int c;
 ONE_MORE_BYTE (c);
 if (NILP (AREF (valids, c)))
 	break;
+if (c >= 0x80)
+	found = 1;
 }
 *mask &= ~CATEGORY_MASK_CHARSET;
 return 0;
 no_more_source:
-return 1;
+return (found || NILP (CODING_ATTR_ASCII_COMPAT (attrs)));
 }
 static void
 decode_coding_charset (coding)
 struct coding_system *coding;
 	{
 	  c = *src;
 	  if (c & 0x80
 	      || (c < 0x20 && (c == ISO_CODE_ESC
 			       || c == ISO_CODE_SI
-			       || c == ISO_CODE_SO
+			       || c == ISO_CODE_SO)))
-			       /* Most UTF-16 text contains '\0'. */
-			       || !c)))
 	    break;
 	}
 coding.head_ascii = src - coding.source;
 if (src < src_end)
 				make_number (255));
 for (tail = charset_list; CONSP (tail); tail = XCDR (tail))
 XSTRING (safe_charsets)->data[XFASTINT (XCAR (tail))] = 0;
 CODING_ATTR_SAFE_CHARSETS (attrs) = safe_charsets;
+CODING_ATTR_ASCII_COMPAT (attrs) = args[coding_arg_ascii_compatible_p];
 val = args[coding_arg_decode_translation_table];
 if (! NILP (val))
 CHECK_CHAR_TABLE (val);
 CODING_ATTR_DECODE_TBL (attrs) = val;
 	{
 	  struct charset *charset = CHARSET_FROM_ID (XFASTINT (XCAR (tail)));
 	  int dim = CHARSET_DIMENSION (charset);
 	  int idx = (dim - 1) * 4;
+	  if (CHARSET_ASCII_COMPATIBLE_P (charset))
+	    CODING_ATTR_ASCII_COMPAT (attrs) = Qt;
 	  for (i = charset->code_space[idx];
 	       i <= charset->code_space[idx + 1]; i++)
 	    {
 	      Lisp_Object tmp, tmp2;
 	      int dim2;
 }
 else if (EQ (coding_type, Qutf_16))
 {
 Lisp_Object bom, endian;
+CODING_ATTR_ASCII_COMPAT (attrs) = Qnil;
 if (nargs < coding_arg_utf16_max)
 	goto short_args;
 bom = args[coding_arg_utf16_bom];
 if (! NILP (bom) && ! EQ (bom, Qt))
 for (i = 0; i < 4; i++)
 	{
 	  val = Faref (initial, make_number (i));
 	  if (! NILP (val))
 	    {
-	      CHECK_CHARSET_GET_ID (val, id);
+	      struct charset *charset;
-	      ASET (initial, i, make_number (id));
+	      CHECK_CHARSET_GET_CHARSET (val, charset);
+	      ASET (initial, i, make_number (CHARSET_ID (charset)));
+	      if (i == 0 && CHARSET_ASCII_COMPATIBLE_P (charset))
+		CODING_ATTR_ASCII_COMPAT (attrs) = Qt;
 	    }
 	  else
 	    ASET (initial, i, make_number (-1));
 	}
 }
 else if (EQ (coding_type, Qemacs_mule))
 {
 if (EQ (args[coding_arg_charset_list], Qemacs_mule))
 	ASET (attrs, coding_attr_emacs_mule_full, Qt);
+CODING_ATTR_ASCII_COMPAT (attrs) = Qt;
 category = coding_category_emacs_mule;
 }
 else if (EQ (coding_type, Qshift_jis))
 {
 charset = CHARSET_FROM_ID (XINT (XCAR (charset_list)));
 if (CHARSET_DIMENSION (charset) != 1)
 	error ("Dimension of charset %s is not one",
 	       XSYMBOL (CHARSET_NAME (charset))->name->data);
+if (CHARSET_ASCII_COMPATIBLE_P (charset))
+	CODING_ATTR_ASCII_COMPAT (attrs) = Qt;
 charset_list = XCDR (charset_list);
 charset = CHARSET_FROM_ID (XINT (XCAR (charset_list)));
 if (CHARSET_DIMENSION (charset) != 1)
 	error ("Dimension of charset %s is not one",
 charset = CHARSET_FROM_ID (XINT (XCAR (charset_list)));
 if (CHARSET_DIMENSION (charset) != 1)
 	error ("Dimension of charset %s is not one",
 	       XSYMBOL (CHARSET_NAME (charset))->name->data);
+if (CHARSET_ASCII_COMPATIBLE_P (charset))
+	CODING_ATTR_ASCII_COMPAT (attrs) = Qt;
 charset_list = XCDR (charset_list);
 charset = CHARSET_FROM_ID (XINT (XCAR (charset_list)));
 if (CHARSET_DIMENSION (charset) != 2)
 	error ("Dimension of charset %s is not two",
 category = coding_category_big5;
 Vbig5_coding_system = name;
 }
 else if (EQ (coding_type, Qraw_text))
-category = coding_category_raw_text;
+{
+category = coding_category_raw_text;
+CODING_ATTR_ASCII_COMPAT (attrs) = Qt;
+}
 else if (EQ (coding_type, Qutf_8))
-category = coding_category_utf_8;
+{
+category = coding_category_utf_8;
+CODING_ATTR_ASCII_COMPAT (attrs) = Qt;
+}
 else if (EQ (coding_type, Qundecided))
 category = coding_category_undecided;
 else
 error ("Invalid coding system type: %s",
 	   XSYMBOL (coding_type)->name->data);

Mercurial > emacs

comparison src/coding.c @ 89225:32058afc72e2