xemacs-beta: src/search.c comparison

comparison src/search.c @ 793:e38acbeb1cae

[xemacs-hg @ 2002-03-29 04:46:17 by ben] lots o' fixes etc/ChangeLog: New file. Separated out all entries for etc/ into their own ChangeLog. Includes entries for the following files: etc/BABYL, etc/BETA, etc/CHARSETS, etc/DISTRIB, etc/Emacs.ad, etc/FTP, etc/GNUS-NEWS, etc/GOATS, etc/HELLO, etc/INSTALL, etc/MACHINES, etc/MAILINGLISTS, etc/MSDOS, etc/MYTHOLOGY, etc/NEWS, etc/OXYMORONS, etc/PACKAGES, etc/README, etc/TUTORIAL, etc/TUTORIAL.de, etc/TUTORIAL.ja, etc/TUTORIAL.ko, etc/TUTORIAL.se, etc/aliases.ksh, etc/altrasoft-logo.xpm, etc/check_cygwin_setup.sh, etc/custom/example-themes/europe-theme.el, etc/custom/example-themes/ex-custom-file, etc/custom/example-themes/example-theme.el, etc/e/eterm.ti, etc/edt-user.doc, etc/enriched.doc, etc/etags.1, etc/gnuserv.1, etc/gnuserv.README, etc/package-index.LATEST.gpg, etc/package-index.LATEST.pgp, etc/photos/jan.png, etc/recycle.xpm, etc/refcard.tex, etc/sample.Xdefaults, etc/sample.emacs, etc/sgml/CATALOG, etc/sgml/HTML32.dtd, etc/skk/SKK.tut.E, etc/smilies/Face_ase.xbm, etc/smilies/Face_ase2.xbm, etc/smilies/Face_ase3.xbm, etc/smilies/Face_smile.xbm, etc/smilies/Face_weep.xbm, etc/sounds, etc/toolbar, etc/toolbar/workshop-cap-up.xpm, etc/xemacs-ja.1, etc/xemacs.1, etc/yow.lines, etc\BETA, etc\NEWS, etc\README, etc\TUTORIAL, etc\TUTORIAL.de, etc\check_cygwin_setup.sh, etc\sample.init.el, etc\unicode\README, etc\unicode\mule-ucs\*, etc\unicode\other\* unicode/unicode-consortium/8859-16.TXT: New file. mule/english.el: Define this charset now, since a bug was fixed that formerly prevented it. mule/ethio-util.el: Fix compile errors involving Unicode `characters', which should be integers. Makefile.in.in: Always include gui.c, to fix compile error when TTY-only. EmacsFrame.c, abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, bytecode.h, callint.c, callproc.c, casetab.c, casetab.h, charset.h, chartab.c, chartab.h, cmds.c, console-msw.c, console-msw.h, console-tty.c, console-x.c, console-x.h, console.c, console.h, data.c, database.c, device-gtk.c, device-msw.c, device-x.c, device.c, device.h, dialog-msw.c, doc.c, doprnt.c, dumper.c, dynarr.c, editfns.c, eldap.c, eldap.h, elhash.c, elhash.h, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, event-unixoid.c, events.c, events.h, extents.c, extents.h, faces.c, faces.h, file-coding.c, file-coding.h, fileio.c, filelock.c, fns.c, frame-gtk.c, frame-msw.c, frame-tty.c, frame-x.c, frame.c, frame.h, free-hook.c, general-slots.h, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, gpmevent.c, gtk-xemacs.c, gui-msw.c, gui-x.c, gui-x.h, gui.c, gui.h, gutter.c, gutter.h, indent.c, input-method-xlib.c, insdel.c, keymap.c, keymap.h, lisp-disunion.h, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, marker.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, mule-canna.c, mule-ccl.c, mule-charset.c, mule-wnnfns.c, native-gtk-toolbar.c, objects-msw.c, objects-tty.c, objects-x.c, objects.c, objects.h, opaque.c, opaque.h, postgresql.c, postgresql.h, print.c, process-unix.c, process.c, process.h, rangetab.c, rangetab.h, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, scrollbar.h, search.c, select-gtk.c, select-x.c, sound.c, specifier.c, specifier.h, strftime.c, symbols.c, symeval.h, syntax.h, text.c, text.h, toolbar-common.c, toolbar-msw.c, toolbar.c, toolbar.h, tooltalk.c, tooltalk.h, ui-gtk.c, ui-gtk.h, undo.c, vm-limit.c, window.c, window.h: Eliminate XSETFOO. Replace all usages with wrap_foo(). Make symbol->name a Lisp_Object, not Lisp_String *. Eliminate nearly all uses of Lisp_String * in favor of Lisp_Object, and correct macros so most of them favor Lisp_Object. Create new error-behavior ERROR_ME_DEBUG_WARN -- output warnings, but at level `debug' (usually ignored). Use it when instantiating specifiers, so problems can be debugged. Move log-warning-minimum-level into C so that we can optimize ERROR_ME_DEBUG_WARN. Fix warning levels consistent with new definitions. Add default_ and parent fields to char table; not yet implemented. New fun Dynarr_verify(); use for further error checking on Dynarrs. Rearrange code at top of lisp.h in conjunction with dynarr changes. Fix eifree(). Use Eistrings in various places (format_event_object(), where_is_to_char(), and callers thereof) to avoid fixed-size strings buffers. New fun write_eistring(). Reindent and fix GPM code to follow standards. Set default MS Windows font to Lucida Console (same size as Courier New but less interline spacing, so more lines fit). Increase default frame size on Windows to 50 lines. (If that's too big for the workspace, the frame will be shrunk as necessary.) Fix problem with text files with no newlines (). (Change `convert-eol' coding system to use `nil' for autodetect, consistent with make-coding-system.) Correct compile warnings in vm-limit.c. Fix handling of reverse-direction charsets to avoid errors when opening (e.g.) mule-ucs/lisp/reldata/uiso8859-6.el. Recode some object printing methods to use write_fmt_string() instead of a fixed buffer and sprintf. Turn on display of png comments as warnings (level `info'), now that they're unobtrusive. Revamped the sound documentation. Fixed bug in redisplay w.r.t. hscroll/truncation/continuation glyphs causing jumping up and down of the lines, since they're bigger than the line size. (It was seen most obviously when there's a horizontal scroll bar, e.g. do C-h a glyph or something like that.) The problem was that the glyph-contrib-p setting on glyphs was ignored even if it was set properly, which it wasn't until now.

author	ben
date	Fri, 29 Mar 2002 04:49:13 +0000
parents	943eaba38521
children	a634e3b7acc8

comparison

equal deleted inserted replaced

-:4e83fdb13eb9
+:e38acbeb1cae
 /* String search routines for XEmacs.
 Copyright (C) 1985, 1986, 1987, 1992-1995 Free Software Foundation, Inc.
 Copyright (C) 1995 Sun Microsystems, Inc.
-Copyright (C) 2001 Ben Wing.
+Copyright (C) 2001, 2002 Ben Wing.
 This file is part of XEmacs.
 XEmacs is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
 for (i = 0; i < num_regs; i++)
 {
 if (search_regs.start[i] > 0)
 	{
 	  search_regs.start[i] =
-	    XSTRING_INDEX_BYTE_TO_CHAR (string, search_regs.start[i]);
+	    string_index_byte_to_char (string, search_regs.start[i]);
 	}
 if (search_regs.end[i] > 0)
 	{
 	  search_regs.end[i] =
-	    XSTRING_INDEX_BYTE_TO_CHAR (string, search_regs.end[i]);
+	    string_index_byte_to_char (string, search_regs.end[i]);
 	}
 }
 }
 	{
 	  search_regs.start[i] += BI_BUF_BEGV (buf);
 	  search_regs.end[i] += BI_BUF_BEGV (buf);
 	}
 }
-XSETBUFFER (last_thing_searched, buf);
+last_thing_searched = wrap_buffer (buf);
 fixup_search_regs_for_buffer (buf);
 return unbind_to_1 (count, val);
 }
 DEFUN ("looking-at", Flooking_at, 1, 2, 0, /*
 			  (!NILP (buf->case_fold_search)
 			   ? XCASE_TABLE_DOWNCASE (buf->case_table) : Qnil),
 			  0, ERROR_ME);
 QUIT;
 {
-Bytecount bis = XSTRING_INDEX_CHAR_TO_BYTE (string, s);
+Bytecount bis = string_index_char_to_byte (string, s);
 regex_match_object = string;
 regex_emacs_buffer = buf;
 val = re_search (bufp, (char *) XSTRING_DATA (string),
 		     XSTRING_LENGTH (string), bis,
 		     XSTRING_LENGTH (string) - bis,
 if (val < 0) return unbind_to (count);
 last_thing_searched = Qt;
 fixup_search_regs_for_string (string);
 return
 unbind_to_1 (count,
-	       make_int (XSTRING_INDEX_BYTE_TO_CHAR (string, val)));
+	       make_int (string_index_byte_to_char (string, val)));
 }
 DEFUN ("string-match", Fstring_match, 2, 4, 0, /*
 Return index of start of first match for REGEXP in STRING, or nil.
 If third arg START is non-nil, start search at that index in STRING.
 {
 return scan_buffer (buf, '\n', from, 0, count, 0, 1);
 }
 Bytebpos
-bi_find_next_emchar_in_string (Lisp_String* str, Emchar target, Bytebpos st,
+bi_find_next_emchar_in_string (Lisp_Object str, Emchar target, Bytebpos st,
 			       EMACS_INT count)
 {
 /* This function has been Mule-ized. */
-Bytebpos lim = string_length (str) -1;
+Bytebpos lim = XSTRING_LENGTH (str) -1;
-Intbyte* s = string_data (str);
+Intbyte *s = XSTRING_DATA (str);
 assert (count >= 0);
 #ifdef MULE
 /* Due to the Mule representation of characters in a buffer,
 way is faster. */
 if (target >= 0200)
 {
 while (st < lim && count > 0)
 	{
-	  if (string_char (str, st) == target)
+	  if (XSTRING_CHAR (str, st) == target)
 	    count--;
 	  INC_CHARBYTEBPOS (s, st);
 	}
 }
 else
 		if (search_regs.start[i] >= 0)
 		  {
 		    search_regs.start[i] += j;
 		    search_regs.end[i] += j;
 		  }
-	      XSETBUFFER (last_thing_searched, buf);
+	      last_thing_searched = wrap_buffer (buf);
 	      /* Set pos to the new position. */
 	      pos = search_regs.start[0];
 	      fixup_search_regs_for_buffer (buf);
 	      /* And charbpos too. */
 	      charbpos = search_regs.start[0];
 		if (search_regs.start[i] >= 0)
 		  {
 		    search_regs.start[i] += j;
 		    search_regs.end[i] += j;
 		  }
-	      XSETBUFFER (last_thing_searched, buf);
+	      last_thing_searched = wrap_buffer (buf);
 	      /* Set pos to the new position. */
 	      pos = search_regs.end[0];
 	      fixup_search_regs_for_buffer (buf);
 	      /* And charbpos too. */
 	      charbpos = search_regs.end[0];
 search_regs.num_regs = 1;
 }
 search_regs.start[0] = beg;
 search_regs.end[0] = beg + len;
-XSETBUFFER (last_thing_searched, buf);
+last_thing_searched = wrap_buffer (buf);
 }
 /* Given a string of words separated by word delimiters,
 compute a regexp that matches those exact words
 CHECK_STRING (string);
 len = XSTRING_CHAR_LENGTH (string);
 for (i = 0; i < len; i++)
-if (!WORD_SYNTAX_P (syntax_table, string_char (XSTRING (string), i)))
+if (!WORD_SYNTAX_P (syntax_table, XSTRING_CHAR (string, i)))
 {
 	punct_count++;
 	if (i > 0 && WORD_SYNTAX_P (syntax_table,
-				    string_char (XSTRING (string), i - 1)))
+				    XSTRING_CHAR (string, i - 1)))
 word_count++;
 }
-if (WORD_SYNTAX_P (syntax_table, string_char (XSTRING (string), len - 1)))
+if (WORD_SYNTAX_P (syntax_table, XSTRING_CHAR (string, len - 1)))
 word_count++;
 if (!word_count) return build_string ("");
 {
 /* The following value is an upper bound on the amount of storage we
 *o++ = '\\';
 *o++ = 'b';
 for (i = 0; i < len; i++)
 {
-	Emchar ch = string_char (XSTRING (string), i);
+	Emchar ch = XSTRING_CHAR (string, i);
 	if (WORD_SYNTAX_P (syntax_table, ch))
 	  o += set_charptr_emchar (o, ch);
 	else if (i > 0
 		 && WORD_SYNTAX_P (syntax_table,
-				   string_char (XSTRING (string), i - 1))
+				   XSTRING_CHAR (string, i - 1))
 		 && --word_count)
 	  {
 	    *o++ = '\\';
 	    *o++ = 'W';
 	    *o++ = '\\';
 	 of the typical half-assed "let the implementation be
 	 visible" form it's in, we could extend it to include
 	 the last string matched and the buffer used for that
 	 matching.  But of course we can't change it as it is. */
 buf = decode_buffer (strbuffer, 0);
-XSETBUFFER (buffer, buf);
+buffer = wrap_buffer (buf);
 }
 else
 {
 if (!NILP (strbuffer))
 	{
 for (pos = search_regs.start[sub]; pos < last; pos++)
 	{
 	  if (NILP (string))
 	    c = BUF_FETCH_CHAR (buf, pos);
 	  else
-	    c = string_char (XSTRING (string), pos);
+	    c = XSTRING_CHAR (string, pos);
 	  if (LOWERCASEP (buf, c))
 	    {
 	      /* Cannot be all caps if any original char is lower case */
 	      /* If SUBSTART is set, we need to also insert the
 		 text from SUBSTART to SUBEND in the original string. */
 	      Charcount substart = -1;
 	      Charcount subend   = -1;
-	      c = string_char (XSTRING (replacement), strpos);
+	      c = XSTRING_CHAR (replacement, strpos);
 	      if (c == '\\' && strpos < stlen - 1)
 		{
-		  c = string_char (XSTRING (replacement), ++strpos);
+		  c = XSTRING_CHAR (replacement, ++strpos);
 		  if (c == '&')
 		    {
 		      literal_end = strpos - 1;
 		      substart = search_regs.start[0];
 		      subend = search_regs.end[0];
 	  Charcount stlen = XSTRING_CHAR_LENGTH (replacement);
 	  Charcount strpos;
 	  for (strpos = 0; strpos < stlen; strpos++)
 	    {
-	      Emchar curchar = string_char (XSTRING (replacement), strpos);
+	      Emchar curchar = XSTRING_CHAR (replacement, strpos);
 	      Emchar newchar = -1;
 	      if (i < Dynarr_length (ul_pos_dynarr) &&
 		  strpos == Dynarr_at (ul_pos_dynarr, i))
 		{
 		  int new_action = Dynarr_at (ul_action_dynarr, i);
 		    newchar = DOWNCASE (buf, curchar);
 		  else
 		    newchar = curchar;
 		}
 	      if (newchar != curchar)
-		set_string_char (XSTRING (replacement), strpos, newchar);
+		set_string_char (replacement, strpos, newchar);
 	    }
 	}
 /* frees the Dynarrs if necessary. */
 unbind_to (speccount);
 	     exactly complementing BUF_SET_PT() above.
 	     During the loop, it keeps track of the amount inserted.
 	   */
 	  Charcount offset = BUF_PT (buf) - search_regs.start[sub];
-	  c = string_char (XSTRING (replacement), strpos);
+	  c = XSTRING_CHAR (replacement, strpos);
 	  if (c == '\\' && strpos < stlen - 1)
 	    {
 	      /* XXX FIXME: replacing just a substring non-literally
 		 using backslash refs to the match looks dangerous.  But
 		 <15366.18513.698042.156573@ns.caldera.de> from Torsten Duwe
 		 <duwe@caldera.de> claims Finsert_buffer_substring already
 		 handles this correctly.
 	      */
-	      c = string_char (XSTRING (replacement), ++strpos);
+	      c = XSTRING_CHAR (replacement, ++strpos);
 	      if (c == '&')
 		Finsert_buffer_substring
 (buffer,
 make_int (search_regs.start[0] + offset),
 make_int (search_regs.end[0] + offset));
 	  if (MARKERP (marker))
 	    {
 	      if (XMARKER (marker)->buffer == 0)
 		marker = Qzero;
 	      else
-		XSETBUFFER (last_thing_searched, XMARKER (marker)->buffer);
+		last_thing_searched = wrap_buffer (XMARKER (marker)->buffer);
 	    }
 	  CHECK_INT_COERCE_MARKER (marker);
 	  search_regs.start[i] = XINT (marker);
 	  list = Fcdr (list);

Mercurial > hg > xemacs-beta

comparison src/search.c @ 793:e38acbeb1cae