emacs: src/coding.c comparison

comparison src/coding.c @ 46370:40db0673e6f0

Most uses of XSTRING combined with STRING_BYTES or indirection changed to SCHARS, SBYTES, STRING_INTERVALS, SREF, SDATA; explicit size_byte references left unchanged for now.

author	Ken Raeburn <raeburn@raeburn.org>
date	Mon, 15 Jul 2002 00:00:41 +0000
parents	1fb8f75062c6
children	c6bb99a483e0

comparison

equal deleted inserted replaced

-:dd1d3b1d0053
+:40db0673e6f0
 		    CODING_ADD_COMPOSITION_COMPONENT (coding, XINT (ch));
 		  }
 	      else if (VECTORP (val) || STRINGP (val))
 		{
 		  int len = (VECTORP (val)
-			     ? XVECTOR (val)->size : XSTRING (val)->size);
+			     ? XVECTOR (val)->size : SCHARS (val));
 		  int i;
 		  for (i = 0; i < len; i++)
 		    {
 		      ch = (STRINGP (val)
 			    ? Faref (val, make_number (i))
 multibyteness of the working buffer to that of STR.  */
 Ferase_buffer ();
 buf->enable_multibyte_characters = multibyte ? Qt : Qnil;
 insert_from_string (str, 0, 0,
-		      XSTRING (str)->size, STRING_BYTES (XSTRING (str)), 0);
+		      SCHARS (str), SBYTES (str), 0);
 UNGCPRO;
 inhibit_pre_post_conversion = 1;
 if (encodep)
 call2 (coding->pre_write_conversion, make_number (BEG), make_number (Z));
 else
 int shrinked_bytes = 0;
 Lisp_Object newstr;
 int consumed, consumed_char, produced, produced_char;
 from = 0;
-to_byte = STRING_BYTES (XSTRING (str));
+to_byte = SBYTES (str);
 saved_coding_symbol = coding->symbol;
 coding->src_multibyte = STRING_MULTIBYTE (str);
 coding->dst_multibyte = 1;
 if (CODING_REQUIRE_DETECTION (coding))
 {
 /* See the comments in code_convert_region.  */
 if (coding->type == coding_type_undecided)
 	{
-	  detect_coding (coding, XSTRING (str)->data, to_byte);
+	  detect_coding (coding, SDATA (str), to_byte);
 	  if (coding->type == coding_type_undecided)
 	    {
 	      coding->type = coding_type_emacs_mule;
 	      coding->category_idx = CODING_CATEGORY_IDX_EMACS_MULE;
 	      /* As emacs-mule decoder will handle composition, we
 	}
 if (coding->eol_type == CODING_EOL_UNDECIDED
 	  && coding->type != coding_type_ccl)
 	{
 	  saved_coding_symbol = coding->symbol;
-	  detect_eol (coding, XSTRING (str)->data, to_byte);
+	  detect_eol (coding, SDATA (str), to_byte);
 	  if (coding->eol_type == CODING_EOL_UNDECIDED)
 	    coding->eol_type = CODING_EOL_LF;
 	  /* We had better recover the original eol format if we
 	     encounter an inconsistent eol format while decoding.  */
 	  coding->mode |= CODING_MODE_INHIBIT_INCONSISTENT_EOL;
 if (STRING_MULTIBYTE (str))
 {
 /* Decoding routines expect the source text to be unibyte.  */
 str = Fstring_as_unibyte (str);
-to_byte = STRING_BYTES (XSTRING (str));
+to_byte = SBYTES (str);
 nocopy = 1;
 coding->src_multibyte = 0;
 }
 /* Try to skip the heading and tailing ASCIIs.  */
 if (require_decoding && coding->type != coding_type_ccl)
 {
-SHRINK_CONVERSION_REGION (&from, &to_byte, coding, XSTRING (str)->data,
+SHRINK_CONVERSION_REGION (&from, &to_byte, coding, SDATA (str),
 				0);
 if (from == to_byte)
 	require_decoding = 0;
-shrinked_bytes = from + (STRING_BYTES (XSTRING (str)) - to_byte);
+shrinked_bytes = from + (SBYTES (str) - to_byte);
 }
 if (!require_decoding)
 {
-coding->consumed = STRING_BYTES (XSTRING (str));
+coding->consumed = SBYTES (str);
-coding->consumed_char = XSTRING (str)->size;
+coding->consumed_char = SCHARS (str);
 if (coding->dst_multibyte)
 	{
 	  str = Fstring_as_multibyte (str);
 	  nocopy = 1;
 	}
-coding->produced = STRING_BYTES (XSTRING (str));
+coding->produced = SBYTES (str);
-coding->produced_char = XSTRING (str)->size;
+coding->produced_char = SCHARS (str);
 return (nocopy ? str : Fcopy_sequence (str));
 }
 if (coding->composing != COMPOSITION_DISABLED)
 coding_allocate_composition_data (coding, from);
 allocate_conversion_buffer (buf, len);
 consumed = consumed_char = produced = produced_char = 0;
 while (1)
 {
-result = decode_coding (coding, XSTRING (str)->data + from + consumed,
+result = decode_coding (coding, SDATA (str) + from + consumed,
 			      buf.data + produced, to_byte - from - consumed,
 			      buf.size - produced);
 consumed += coding->consumed;
 consumed_char += coding->consumed_char;
 produced += coding->produced;
 newstr = make_uninit_multibyte_string (produced_char + shrinked_bytes,
 					   produced + shrinked_bytes);
 else
 newstr = make_uninit_string (produced + shrinked_bytes);
 if (from > 0)
-bcopy (XSTRING (str)->data, XSTRING (newstr)->data, from);
+bcopy (SDATA (str), SDATA (newstr), from);
-bcopy (buf.data, XSTRING (newstr)->data + from, produced);
+bcopy (buf.data, SDATA (newstr) + from, produced);
 if (shrinked_bytes > from)
-bcopy (XSTRING (str)->data + to_byte,
+bcopy (SDATA (str) + to_byte,
-	   XSTRING (newstr)->data + from + produced,
+	   SDATA (newstr) + from + produced,
 	   shrinked_bytes - from);
 free_conversion_buffer (&buf);
 if (coding->cmp_data && coding->cmp_data->used)
 coding_restore_composition (coding, newstr);
 if (SYMBOLP (coding->pre_write_conversion)
 && !NILP (Ffboundp (coding->pre_write_conversion)))
 str = run_pre_post_conversion_on_str (str, coding, 1);
 from = 0;
-to = XSTRING (str)->size;
+to = SCHARS (str);
-to_byte = STRING_BYTES (XSTRING (str));
+to_byte = SBYTES (str);
 /* Encoding routines determine the multibyteness of the source text
 by coding->src_multibyte.  */
 coding->src_multibyte = STRING_MULTIBYTE (str);
 coding->dst_multibyte = 0;
 if (! CODING_REQUIRE_ENCODING (coding))
 {
-coding->consumed = STRING_BYTES (XSTRING (str));
+coding->consumed = SBYTES (str);
-coding->consumed_char = XSTRING (str)->size;
+coding->consumed_char = SCHARS (str);
 if (STRING_MULTIBYTE (str))
 	{
 	  str = Fstring_as_unibyte (str);
 	  nocopy = 1;
 	}
-coding->produced = STRING_BYTES (XSTRING (str));
+coding->produced = SBYTES (str);
-coding->produced_char = XSTRING (str)->size;
+coding->produced_char = SCHARS (str);
 return (nocopy ? str : Fcopy_sequence (str));
 }
 if (coding->composing != COMPOSITION_DISABLED)
 coding_save_composition (coding, from, to, str);
 /* Try to skip the heading and tailing ASCIIs.  */
 if (coding->type != coding_type_ccl)
 {
-SHRINK_CONVERSION_REGION (&from, &to_byte, coding, XSTRING (str)->data,
+SHRINK_CONVERSION_REGION (&from, &to_byte, coding, SDATA (str),
 				1);
 if (from == to_byte)
 	return (nocopy ? str : Fcopy_sequence (str));
-shrinked_bytes = from + (STRING_BYTES (XSTRING (str)) - to_byte);
+shrinked_bytes = from + (SBYTES (str) - to_byte);
 }
 len = encoding_buffer_size (coding, to_byte - from);
 allocate_conversion_buffer (buf, len);
 consumed = consumed_char = produced = produced_char = 0;
 while (1)
 {
-result = encode_coding (coding, XSTRING (str)->data + from + consumed,
+result = encode_coding (coding, SDATA (str) + from + consumed,
 			      buf.data + produced, to_byte - from - consumed,
 			      buf.size - produced);
 consumed += coding->consumed;
 consumed_char += coding->consumed_char;
 produced += coding->produced;
 coding->produced = produced;
 coding->produced_char = produced_char;
 newstr = make_uninit_string (produced + shrinked_bytes);
 if (from > 0)
-bcopy (XSTRING (str)->data, XSTRING (newstr)->data, from);
+bcopy (SDATA (str), SDATA (newstr), from);
-bcopy (buf.data, XSTRING (newstr)->data + from, produced);
+bcopy (buf.data, SDATA (newstr) + from, produced);
 if (shrinked_bytes > from)
-bcopy (XSTRING (str)->data + to_byte,
+bcopy (SDATA (str) + to_byte,
-	   XSTRING (newstr)->data + from + produced,
+	   SDATA (newstr) + from + produced,
 	   shrinked_bytes - from);
 free_conversion_buffer (&buf);
 coding_free_composition_data (coding);
 do
 {
 val = Fcompleting_read (prompt, Vcoding_system_alist, Qnil,
 			      Qt, Qnil, Qcoding_system_history, Qnil, Qnil);
 }
-while (XSTRING (val)->size == 0);
+while (SCHARS (val) == 0);
 return (Fintern (val, Qnil));
 }
 DEFUN ("read-coding-system", Fread_coding_system, Sread_coding_system, 1, 2, 0,
 doc: /* Read a coding system from the minibuffer, prompting with string PROMPT.
 if (SYMBOLP (default_coding_system))
 default_coding_system = SYMBOL_NAME (default_coding_system);
 val = Fcompleting_read (prompt, Vcoding_system_alist, Qnil,
 			  Qt, Qnil, Qcoding_system_history,
 			  default_coding_system, Qnil);
-return (XSTRING (val)->size == 0 ? Qnil : Fintern (val, Qnil));
+return (SCHARS (val) == 0 ? Qnil : Fintern (val, Qnil));
 }
 DEFUN ("check-coding-system", Fcheck_coding_system, Scheck_coding_system,
 1, 1, 0,
 doc: /* Check validity of CODING-SYSTEM.
 (string, highest)
 Lisp_Object string, highest;
 {
 CHECK_STRING (string);
-return detect_coding_system (XSTRING (string)->data,
+return detect_coding_system (SDATA (string),
 			       /* "+ 1" is to include the anchor byte
 				  `\0'.  With this, code detectors can
 				  handle the tailing bytes more
 				  accurately.  */
-			       STRING_BYTES (XSTRING (string)) + 1,
+			       SBYTES (string) + 1,
 			       !NILP (highest),
 			       STRING_MULTIBYTE (string));
 }
 /* Return an intersection of lists L1 and L2.  */
 if (STRINGP (start))
 {
 if (!STRING_MULTIBYTE (start))
 	return Qt;
-p1 = XSTRING (start)->data, p1end = p1 + STRING_BYTES (XSTRING (start));
+p1 = SDATA (start), p1end = p1 + SBYTES (start);
 p2 = p2end = p1end;
-if (XSTRING (start)->size != STRING_BYTES (XSTRING (start)))
+if (SCHARS (start) != SBYTES (start))
 	non_ascii_p = 1;
 }
 else
 {
 int from, to, stop;
 if (NILP (coding_system))
 return make_number (to - from);
 if (setup_coding_system (Fcheck_coding_system (coding_system), &coding) < 0)
-error ("Invalid coding system: %s", XSTRING (SYMBOL_NAME (coding_system))->data);
+error ("Invalid coding system: %s", SDATA (SYMBOL_NAME (coding_system)));
 coding.mode |= CODING_MODE_LAST_BLOCK;
 coding.src_multibyte = coding.dst_multibyte
 = !NILP (current_buffer->enable_multibyte_characters);
 code_convert_region (from, CHAR_TO_BYTE (from), to, CHAR_TO_BYTE (to),
 if (NILP (coding_system))
 return (NILP (nocopy) ? Fcopy_sequence (string) : string);
 if (setup_coding_system (Fcheck_coding_system (coding_system), &coding) < 0)
-error ("Invalid coding system: %s", XSTRING (SYMBOL_NAME (coding_system))->data);
+error ("Invalid coding system: %s", SDATA (SYMBOL_NAME (coding_system)));
 coding.mode |= CODING_MODE_LAST_BLOCK;
 string = (encodep
 	    ? encode_coding_string (string, &coding, !NILP (nocopy))
 	    : decode_coding_string (string, &coding, !NILP (nocopy)));
 if (NILP (coding_system))
 return string;
 if (setup_coding_system (Fcheck_coding_system (coding_system), &coding) < 0)
-error ("Invalid coding system: %s", XSTRING (SYMBOL_NAME (coding_system))->data);
+error ("Invalid coding system: %s", SDATA (SYMBOL_NAME (coding_system)));
 coding.composing = COMPOSITION_DISABLED;
 coding.mode |= CODING_MODE_LAST_BLOCK;
 return (encodep
 	  ? encode_coding_string (string, &coding, 1)
 if (!SYMBOLP (operation)
 || !INTEGERP (target_idx = Fget (operation, Qtarget_idx)))
 error ("Invalid first argument");
 if (nargs < 1 + XINT (target_idx))
 error ("Too few arguments for operation: %s",
-	   XSTRING (SYMBOL_NAME (operation))->data);
+	   SDATA (SYMBOL_NAME (operation)));
 target = args[XINT (target_idx) + 1];
 if (!(STRINGP (target)
 	|| (EQ (operation, Qopen_network_stream) && INTEGERP (target))))
 error ("Invalid argument %d", XINT (target_idx) + 1);
 if (! NILP (Vlocale_coding_system))
 {
 Lisp_Object dec = code_convert_string_norecord (build_string (str),
 						      Vlocale_coding_system,
 						      0);
-str = (char *) XSTRING (dec)->data;
+str = (char *) SDATA (dec);
 }
 return str;
 }

Mercurial > emacs

comparison src/coding.c @ 46370:40db0673e6f0