emacs: src/coding.c comparison

comparison src/coding.c @ 22874:b133f07a76db

(Qvalid_codes): New variable. (coding_category_name): Include "coding-category-ccl". (detect_coding_ccl): New function. (setup_coding_system): Setup coding->spec.ccl.valid_codes from the coding system priority `valid-codes' for CCL based coding systesm. (detect_coding_mask): Check also a CCL based coding system. (Fupdate_coding_systems_internal): Renamed from Fupdate_iso_coding_systems. (syms_of_coding): Change property char-table-extra-slot of translation-table to 1. Initialize and static pro Qvalid_codes.

author	Kenichi Handa <handa@m17n.org>
date	Sun, 02 Aug 1998 01:06:57 +0000
parents	70f58e77fda7
children	928b337d953b

comparison

equal deleted inserted replaced

-:79b98ccffdfc
+:b133f07a76db
 1. Preamble
 2. Emacs' internal format (emacs-mule) handlers
 3. ISO2022 handlers
 4. Shift-JIS and BIG5 handlers
-5. End-of-line handlers
+5. CCL handlers
-6. C library functions
+6. End-of-line handlers
-7. Emacs Lisp library functions
+7. C library functions
-8. Post-amble
+8. Emacs Lisp library functions
+9. Post-amble
 */
 /*** GENERAL NOTE on CODING SYSTEM ***
 Lisp_Object Qbuffer_file_coding_system;
 Lisp_Object Qpost_read_conversion, Qpre_write_conversion;
 Lisp_Object Qno_conversion, Qundecided;
 Lisp_Object Qcoding_system_history;
 Lisp_Object Qsafe_charsets;
+Lisp_Object Qvalid_codes;
 extern Lisp_Object Qinsert_file_contents, Qwrite_region;
 Lisp_Object Qcall_process, Qcall_process_region, Qprocess_argument;
 Lisp_Object Qstart_process, Qopen_network_stream;
 Lisp_Object Qtarget_idx;
 "coding-category-iso-8-2",
 "coding-category-iso-7-else",
 "coding-category-iso-8-else",
 "coding-category-big5",
 "coding-category-raw-text",
-"coding-category-binary"
+"coding-category-binary",
+"coding-category-ccl"
 };
 /* Table of pointers to coding systems corresponding to each coding
 categories.  */
 struct coding_system *coding_system_table[CODING_CATEGORY_IDX_MAX];
 coding->produced = coding->produced_char = dst - destination;
 return result;
 }
-/*** 5. End-of-line handlers ***/
+/*** 5. CCL handlers ***/
+/* See the above "GENERAL NOTES on `detect_coding_XXX ()' functions".
+Check if a text is encoded in a coding system of which
+encoder/decoder are written in CCL program.  If it is, return
+CODING_CATEGORY_MASK_CCL, else return 0.  */
+int
+detect_coding_ccl (src, src_end)
+unsigned char *src, *src_end;
+{
+unsigned char *valid;
+/* No coding system is assigned to coding-category-ccl.  */
+if (!coding_system_table[CODING_CATEGORY_IDX_CCL])
+return 0;
+valid = coding_system_table[CODING_CATEGORY_IDX_CCL]->spec.ccl.valid_codes;
+while (src < src_end)
+{
+if (! valid[*src]) return 0;
+src++;
+}
+return CODING_CATEGORY_MASK_CCL;
+}
+/*** 6. End-of-line handlers ***/
 /* See the above "GENERAL NOTES on `decode_coding_XXX ()' functions".
 This function is called only when `coding->eol_type' is
 CODING_EOL_CRLF or CODING_EOL_CR.  */
 coding->produced = coding->produced_char = dst - destination;
 return result;
 }
-/*** 6. C library functions ***/
+/*** 7. C library functions ***/
 /* In Emacs Lisp, coding system is represented by a Lisp symbol which
 has a property `coding-system'.  The value of this property is a
 vector of length 5 (called as coding-vector).  Among elements of
 this vector, the first (element[0]) and the fifth (element[4])
 	    setup_ccl_program (&(coding->spec.ccl.decoder), decoder);
 	    setup_ccl_program (&(coding->spec.ccl.encoder), encoder);
 	  }
 	else
 	  goto label_invalid_coding_system;
+	bzero (coding->spec.ccl.valid_codes, 256);
+	val = Fplist_get (plist, Qvalid_codes);
+	if (CONSP (val))
+	  {
+	    Lisp_Object this;
+	    for (this = XCONS (val)->car; CONSP (val); val = XCONS (val)->cdr)
+	      {
+		if (INTEGERP (this)
+		    && XINT (this) >= 0 && XINT (this) < 256)
+		  coding->spec.ccl.valid_codes[XINT (this)] = 1;
+		else if (CONSP (this)
+			 && INTEGERP (XCONS (this)->car)
+			 && INTEGERP (XCONS (this)->cdr))
+		  {
+		    int start = XINT (XCONS (this)->car);
+		    int end = XINT (XCONS (this)->cdr);
+		    if (start >= 0 && start <= end && end < 256)
+		      while (start < end)
+			coding->spec.ccl.valid_codes[start++] = 1;
+		  }
+	      }
+	  }
 }
 coding->common_flags |= CODING_REQUIRE_FLUSHING_MASK;
 break;
 case 5:
 o coding-category-big5
 	The category for a coding system which has the same code range
 	as BIG5.  Assigned the coding-system (Lisp symbol)
 	`cn-big5' by default.
+o coding-category-ccl
+	The category for a coding system of which encoder/decoder is
+	written in CCL programs.  The default value is nil, i.e., no
+	coding system is assigned.
 o coding-category-binary
 	The category for a coding system not categorized in any of the
 	above.  Assigned the coding-system (Lisp symbol)
 	try = (CODING_CATEGORY_MASK_ISO_8_ELSE
 		| CODING_CATEGORY_MASK_ISO_8BIT
 		| CODING_CATEGORY_MASK_SJIS
 		| CODING_CATEGORY_MASK_BIG5);
+/* Or, we may have to consider the possibility of CCL.  */
+if (coding_system_table[CODING_CATEGORY_IDX_CCL]
+	  && (coding_system_table[CODING_CATEGORY_IDX_CCL]
+	      ->spec.ccl.valid_codes)[c])
+	try |= CODING_CATEGORY_MASK_CCL;
 mask = 0;
 if (priorities)
 	{
 	  for (i = 0; i < CODING_CATEGORY_IDX_MAX; i++)
 	    {
 		mask = detect_coding_sjis (src, src_end);
 	      else if (priorities[i] & try & CODING_CATEGORY_MASK_BIG5)
 		mask = detect_coding_big5 (src, src_end);
 	      else if (priorities[i] & try & CODING_CATEGORY_MASK_EMACS_MULE)
 		mask = detect_coding_emacs_mule (src, src_end);
+	      else if (priorities[i] & CODING_CATEGORY_MASK_CCL)
+		mask = detect_coding_ccl (src, src_end);
 	      else if (priorities[i] & CODING_CATEGORY_MASK_RAW_TEXT)
 		mask = CODING_CATEGORY_MASK_RAW_TEXT;
 	      else if (priorities[i] & CODING_CATEGORY_MASK_BINARY)
 		mask = CODING_CATEGORY_MASK_BINARY;
 	      if (mask)
 if (try & CODING_CATEGORY_MASK_SJIS)
 	mask |= detect_coding_sjis (src, src_end);
 if (try & CODING_CATEGORY_MASK_BIG5)
 	mask |= detect_coding_big5 (src, src_end);
 if (try & CODING_CATEGORY_MASK_EMACS_MULE)
 	mask |= detect_coding_emacs_mule (src, src_end);
+if (try & CODING_CATEGORY_MASK_CCL)
+	mask |= detect_coding_ccl (src, src_end);
 }
 return (mask | CODING_CATEGORY_MASK_RAW_TEXT | CODING_CATEGORY_MASK_BINARY);
 label_return_highest_only:
 for (i = 0; i < CODING_CATEGORY_IDX_MAX; i++)
 return str;
 }
 #ifdef emacs
-/*** 7. Emacs Lisp library functions ***/
+/*** 8. Emacs Lisp library functions ***/
 DEFUN ("coding-system-p", Fcoding_system_p, Scoding_system_p, 1, 1, 0,
 "Return t if OBJECT is nil or a coding-system.\n\
 See the documentation of `make-coding-system' for information\n\
 about coding-system objects.")
 	}
 }
 return Qnil;
 }
-DEFUN ("update-iso-coding-systems", Fupdate_iso_coding_systems,
+DEFUN ("update-coding-systems-internal",  Fupdate_coding_systems_internal,
-Supdate_iso_coding_systems, 0, 0, 0,
+Supdate_coding_systems_internal, 0, 0, 0,
-"Update internal database for ISO2022 based coding systems.\n\
+"Update internal database for ISO2022 and CCL based coding systems.\n\
 When values of the following coding categories are changed, you must\n\
 call this function:\n\
 coding-category-iso-7, coding-category-iso-7-tight,\n\
 coding-category-iso-8-1, coding-category-iso-8-2,\n\
-coding-category-iso-7-else, coding-category-iso-8-else")
+coding-category-iso-7-else, coding-category-iso-8-else,\n\
+coding-category-ccl")
 ()
 {
 int i;
-for (i = CODING_CATEGORY_IDX_ISO_7; i <= CODING_CATEGORY_IDX_ISO_8_ELSE;
+for (i = CODING_CATEGORY_IDX_ISO_7; i <= CODING_CATEGORY_IDX_CCL; i++)
-i++)
+{
-{
+Lisp_Object val;
-if (! coding_system_table[i])
-	coding_system_table[i]
+val = XSYMBOL (XVECTOR (Vcoding_category_table)->contents[i])->value;
-	  = (struct coding_system *) xmalloc (sizeof (struct coding_system));
+if (!NILP (val))
-setup_coding_system
+	{
-	(XSYMBOL (XVECTOR (Vcoding_category_table)->contents[i])->value,
+	  if (! coding_system_table[i])
-	 coding_system_table[i]);
+	    coding_system_table[i] = ((struct coding_system *)
-}
+				      xmalloc (sizeof (struct coding_system)));
+	  setup_coding_system (val, coding_system_table[i]);
+	}
+else if (coding_system_table[i])
+	{
+	  xfree (coding_system_table[i]);
+	  coding_system_table[i] = NULL;
+	}
+}
 return Qnil;
 }
 DEFUN ("set-coding-priority-internal", Fset_coding_priority_internal,
 Sset_coding_priority_internal, 0, 0, 0,
 }
 #endif /* emacs */
-/*** 8. Post-amble ***/
+/*** 9. Post-amble ***/
 void
 init_coding ()
 {
 conversion_buffer = (char *) xmalloc (MINIMUM_CONVERSION_BUFFER_SIZE);
 }
 }
 Qtranslation_table = intern ("translation-table");
 staticpro (&Qtranslation_table);
-Fput (Qtranslation_table, Qchar_table_extra_slots, make_number (0));
+Fput (Qtranslation_table, Qchar_table_extra_slots, make_number (1));
 Qtranslation_table_id = intern ("translation-table-id");
 staticpro (&Qtranslation_table_id);
 Qtranslation_table_for_decode = intern ("translation-table-for-decode");
 Qtranslation_table_for_encode = intern ("translation-table-for-encode");
 staticpro (&Qtranslation_table_for_encode);
 Qsafe_charsets = intern ("safe-charsets");
 staticpro (&Qsafe_charsets);
+Qvalid_codes = intern ("valid-codes");
+staticpro (&Qvalid_codes);
 Qemacs_mule = intern ("emacs-mule");
 staticpro (&Qemacs_mule);
 Qraw_text = intern ("raw-text");
 defsubr (&Sset_safe_terminal_coding_system_internal);
 defsubr (&Sterminal_coding_system);
 defsubr (&Sset_keyboard_coding_system_internal);
 defsubr (&Skeyboard_coding_system);
 defsubr (&Sfind_operation_coding_system);
-defsubr (&Supdate_iso_coding_systems);
+defsubr (&Supdate_coding_systems_internal);
 defsubr (&Sset_coding_priority_internal);
 DEFVAR_LISP ("coding-system-list", &Vcoding_system_list,
 "List of coding systems.\n\
 \n\

Mercurial > emacs

comparison src/coding.c @ 22874:b133f07a76db