Mercurial > hg > xemacs-beta

comparison src/regex.c @ 1347:8d350b095c21

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2003-03-09 12:59:36 by ben] oops, C++ bites again widget.texi: Fix Turnbull typos. config.inc.samp: Note that relative directories are a no-no in BUILD_DIR and SOURCE_DIR. Use paths relative to $(MAKEROOT) instead. file-coding.c: Fix up internal magic-cookie code to also check for `;;;###coding system', already handled by the (redundant) code in files.el. regex.c: Fix problem with ordering of initializations and statements -- OK in C++, not in C. search.c: Indentation.
author ben
date Sun, 09 Mar 2003 12:59:45 +0000
parents 01c57eb70ae9
children 19738a2a5138
comparison
equal deleted inserted replaced
1346:01c57eb70ae9 1347:8d350b095c21
6129 6129
6130 */ 6130 */
6131 re_char *dtmp = POS_AFTER_GAP_UNSAFE (d); 6131 re_char *dtmp = POS_AFTER_GAP_UNSAFE (d);
6132 Ichar emch = itext_ichar_fmt (dtmp, fmt, lispobj); 6132 Ichar emch = itext_ichar_fmt (dtmp, fmt, lispobj);
6133 int tempres; 6133 int tempres;
6134 #ifdef emacs
6135 Charxpos charpos = offset_to_charxpos (lispobj, PTR_TO_OFFSET (d));
6136 #endif
6134 BEGIN_REGEX_MALLOC_OK (); 6137 BEGIN_REGEX_MALLOC_OK ();
6135 #ifdef emacs 6138 #ifdef emacs
6136 Charxpos charpos = offset_to_charxpos (lispobj, PTR_TO_OFFSET (d));
6137 UPDATE_SYNTAX_CACHE (scache, charpos); 6139 UPDATE_SYNTAX_CACHE (scache, charpos);
6138 #endif 6140 #endif
6139 tempres = (SYNTAX_FROM_CACHE (scache, emch) != Sword); 6141 tempres = (SYNTAX_FROM_CACHE (scache, emch) != Sword);
6140 END_REGEX_MALLOC_OK (); 6142 END_REGEX_MALLOC_OK ();
6141 RE_MATCH_RELOCATE_MOVEABLE_DATA_POINTERS (); 6143 RE_MATCH_RELOCATE_MOVEABLE_DATA_POINTERS ();
6172 The or condition is incorrect (reversed). 6174 The or condition is incorrect (reversed).
6173 */ 6175 */
6174 re_char *dtmp; 6176 re_char *dtmp;
6175 Ichar emch; 6177 Ichar emch;
6176 int tempres; 6178 int tempres;
6177 BEGIN_REGEX_MALLOC_OK ();
6178 #ifdef emacs 6179 #ifdef emacs
6179 Charxpos charpos = offset_to_charxpos (lispobj, PTR_TO_OFFSET (d)); 6180 Charxpos charpos = offset_to_charxpos (lispobj, PTR_TO_OFFSET (d));
6181 BEGIN_REGEX_MALLOC_OK ();
6180 UPDATE_SYNTAX_CACHE (scache, charpos); 6182 UPDATE_SYNTAX_CACHE (scache, charpos);
6181 #endif
6182 END_REGEX_MALLOC_OK (); 6183 END_REGEX_MALLOC_OK ();
6183 RE_MATCH_RELOCATE_MOVEABLE_DATA_POINTERS (); 6184 RE_MATCH_RELOCATE_MOVEABLE_DATA_POINTERS ();
6185 #endif
6184 dtmp = POS_BEFORE_GAP_UNSAFE (d); 6186 dtmp = POS_BEFORE_GAP_UNSAFE (d);
6185 DEC_IBYTEPTR_FMT (dtmp, fmt); 6187 DEC_IBYTEPTR_FMT (dtmp, fmt);
6186 emch = itext_ichar_fmt (dtmp, fmt, lispobj); 6188 emch = itext_ichar_fmt (dtmp, fmt, lispobj);
6187 BEGIN_REGEX_MALLOC_OK (); 6189 BEGIN_REGEX_MALLOC_OK ();
6188 tempres = (SYNTAX_FROM_CACHE (scache, emch) != Sword); 6190 tempres = (SYNTAX_FROM_CACHE (scache, emch) != Sword);