Changeset 4148 for trunk/src/coding.c

Timestamp:

08/18/06 08:35:31 (2 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• trunk/src/coding.c (modified) (19 diffs)

trunk/src/coding.c

@@ -220 +220 @@
-
-/* Like ONE_MORE_BYTE, but 8-bit bytes of data at SRC are in multibyte
-
-
-
+
+
+
+
-  do {                                                          \
-    if (src >= src_end)                                         \
-      {                                                         \
-        coding->result = CODING_FINISH_INSUFFICIENT_SRC;        \
-goto label_end_of_loop;
+return ret;    
-      }                                                         \
-    c1 = *src++;                                                \
@@ -633 +634 @@
-  while (1)
-    {
-);
-
+,
+
-      if (composing)
-        {
@@ -641 +642 @@
-          else if (c == 0xA0)
-            {
-
+, 0
-              c &= 0x7F;
-            }
@@ -670 +671 @@
-        }
-    }
- label_end_of_loop:
-  return CODING_CATEGORY_MASK_EMACS_MULE;
-}
-
@@ -1426 +1425 @@
-
-  reg[0] = CHARSET_ASCII, reg[1] = reg[2] = reg[3] = -1;
- && src < src_end
-
-
+
+
+, mask & mask_found
-    retry:
-      switch (c)
@@ -1436 +1435 @@
-            break;
-          single_shifting = 0;
-
+, mask & mask_found
-          if (c >= '(' && c <= '/')
-            {
-              /* Designation sequence for a charset of dimension 1.  */
-
+, mask & mask_found
-              if (c1 < ' ' || c1 >= 0x80
-                  || (charset = iso_charset_table[0][c >= ','][c1]) < 0)
@@ -1450 +1449 @@
-            {
-              /* Designation sequence for a charset of dimension 2.  */
-
+, mask & mask_found
-              if (c >= '@' && c <= 'B')
-                /* Designation for JISX0208.1978, GB2312, or JISX0208.  */
@@ -1456 +1455 @@
-              else if (c >= '(' && c <= '/')
-                {
-
+
+
-                  if (c1 < ' ' || c1 >= 0x80
-                      || (charset = iso_charset_table[1][c >= ','][c1]) < 0)
@@ -1631 +1631 @@
-                  while (src < src_end)
-                    {
-
+
+
-                      if (c < 0xA0)
-                        break;
@@ -1649 +1650 @@
-        }
-    }
- label_end_of_loop:
-  return (mask & mask_found);
-}
@@ -2920 +2920 @@
-  while (1)
-    {
-
+, CODING_CATEGORY_MASK_SJIS
-      if (c < 0x80)
-        continue;
@@ -2927 +2927 @@
-      if (c <= 0x9F || c >= 0xE0)
-        {
-
+, 0
-          if (c < 0x40 || c == 0x7F || c > 0xFC)
-            return 0;
-        }
-    }
- label_end_of_loop:
-  return CODING_CATEGORY_MASK_SJIS;
-}
-
@@ -2952 +2950 @@
-  while (1)
-    {
-
+, CODING_CATEGORY_MASK_BIG5
-      if (c < 0x80)
-        continue;
-      if (c < 0xA1 || c > 0xFE)
-        return 0;
-
+, 0
-      if (c < 0x40 || (c > 0x7F && c < 0xA1) || c > 0xFE)
-        return 0;
-    }
- label_end_of_loop:
-  return CODING_CATEGORY_MASK_BIG5;
-}
-
@@ -2990 +2986 @@
-  while (1)
-    {
-
+, CODING_CATEGORY_MASK_UTF_8
-      if (UTF_8_1_OCTET_P (c))
-        continue;
@@ -3008 +3004 @@
-      do
-        {
-
+, 0
-          if (!UTF_8_EXTRA_OCTET_P (c))
-            return 0;
@@ -3015 +3011 @@
-      while (seq_maybe_bytes > 0);
-    }
-
- label_end_of_loop:
-  return CODING_CATEGORY_MASK_UTF_8;
-}
-
@@ -3046 +3039 @@
-  struct coding_system *coding = &dummy_coding;
-
-
-
+, 0
+, 0
-
-  if ((c1 == 0xFF) && (c2 == 0xFE))
@@ -3053 +3046 @@
-  else if ((c1 == 0xFE) && (c2 == 0xFF))
-    return CODING_CATEGORY_MASK_UTF_16_BE;
-
- label_end_of_loop:
-  return 0;
-}
@@ -3323 +3314 @@
-  while (1)
-    {
-
+, CODING_CATEGORY_MASK_CCL
-      if (! valid[c])
-        return 0;
-    }
- label_end_of_loop:
-  return CODING_CATEGORY_MASK_CCL;
-}
-