mirror of https://github.com/GNOME/gimp.git
app/regexrepl.c removed here ...
2001-07-12 Sven Neumann <sven@gimp.org> * app/regexrepl.c * app/regexrepl.h: removed here ... * plug-ins/script-fu/regexrepl.c * plug-ins/script-fu/regexrepl.h: ... and here ... * regexrepl/Makefile.am * regexrepl/regex.c * regexrepl/regex.h: ... and added here again. * Makefile.am * configure.in * app/Makefile.am * app/pdb/plug_in_cmds.c * app/pdb/procedural_db_cmds.c * plug-ins/script-fu/Makefile.am * plug-ins/script-fu/interp_regex.c * tools/pdbgen/app.pl * tools/pdbgen/pdb/plug_in.pdb * tools/pdbgen/pdb/procedural_db.pdb: changed accordingly.
This commit is contained in:
parent
7aff6c8fbe
commit
cf980596e1
23
ChangeLog
23
ChangeLog
|
@ -1,3 +1,26 @@
|
||||||
|
2001-07-12 Sven Neumann <sven@gimp.org>
|
||||||
|
|
||||||
|
* app/regexrepl.c
|
||||||
|
* app/regexrepl.h: removed here ...
|
||||||
|
|
||||||
|
* plug-ins/script-fu/regexrepl.c
|
||||||
|
* plug-ins/script-fu/regexrepl.h: ... and here ...
|
||||||
|
|
||||||
|
* regexrepl/Makefile.am
|
||||||
|
* regexrepl/regex.c
|
||||||
|
* regexrepl/regex.h: ... and added here again.
|
||||||
|
|
||||||
|
* Makefile.am
|
||||||
|
* configure.in
|
||||||
|
* app/Makefile.am
|
||||||
|
* app/pdb/plug_in_cmds.c
|
||||||
|
* app/pdb/procedural_db_cmds.c
|
||||||
|
* plug-ins/script-fu/Makefile.am
|
||||||
|
* plug-ins/script-fu/interp_regex.c
|
||||||
|
* tools/pdbgen/app.pl
|
||||||
|
* tools/pdbgen/pdb/plug_in.pdb
|
||||||
|
* tools/pdbgen/pdb/procedural_db.pdb: changed accordingly.
|
||||||
|
|
||||||
2001-07-12 Michael Natterer <mitch@gimp.org>
|
2001-07-12 Michael Natterer <mitch@gimp.org>
|
||||||
|
|
||||||
* app/Makefile.am
|
* app/Makefile.am
|
||||||
|
|
43
Makefile.am
43
Makefile.am
|
@ -1,27 +1,28 @@
|
||||||
## Process this file with automake to produce Makefile.in
|
## Process this file with automake to produce Makefile.in
|
||||||
|
|
||||||
SUBDIRS = \
|
SUBDIRS = \
|
||||||
tools \
|
tools \
|
||||||
intl \
|
intl \
|
||||||
libgimpbase \
|
regexrepl \
|
||||||
libgimpcolor \
|
libgimpbase \
|
||||||
libgimpmath \
|
libgimpcolor \
|
||||||
libgimpwidgets \
|
libgimpmath \
|
||||||
libgimp \
|
libgimpwidgets \
|
||||||
app \
|
libgimp \
|
||||||
$(GIMP_PLUGINS) \
|
app \
|
||||||
$(GIMP_MODULES) \
|
$(GIMP_PLUGINS) \
|
||||||
po \
|
$(GIMP_MODULES) \
|
||||||
po-libgimp \
|
po \
|
||||||
po-plug-ins \
|
po-libgimp \
|
||||||
$(GIMP_PERL_PO) \
|
po-plug-ins \
|
||||||
po-script-fu \
|
$(GIMP_PERL_PO) \
|
||||||
cursors \
|
po-script-fu \
|
||||||
pixmaps \
|
cursors \
|
||||||
data \
|
pixmaps \
|
||||||
tips \
|
data \
|
||||||
docs \
|
tips \
|
||||||
devel-docs \
|
docs \
|
||||||
|
devel-docs \
|
||||||
build
|
build
|
||||||
|
|
||||||
bin_SCRIPTS = gimptool-1.4 @GIMPINSTALL@
|
bin_SCRIPTS = gimptool-1.4 @GIMPINSTALL@
|
||||||
|
|
|
@ -4,14 +4,6 @@ SUBDIRS = paint-funcs base core pdb xcf tools widgets gui
|
||||||
|
|
||||||
scriptdata =
|
scriptdata =
|
||||||
|
|
||||||
if HAVE_GLIBC_REGEX
|
|
||||||
regex_sources =
|
|
||||||
else
|
|
||||||
regex_sources = \
|
|
||||||
regexrepl.c \
|
|
||||||
regexrepl.h
|
|
||||||
endif
|
|
||||||
|
|
||||||
bin_PROGRAMS = gimp
|
bin_PROGRAMS = gimp
|
||||||
|
|
||||||
gimp_SOURCES = @STRIP_BEGIN@ \
|
gimp_SOURCES = @STRIP_BEGIN@ \
|
||||||
|
@ -127,7 +119,6 @@ gimp_SOURCES = @STRIP_BEGIN@ \
|
||||||
gimphelp.h \
|
gimphelp.h \
|
||||||
libgimp_glue.c \
|
libgimp_glue.c \
|
||||||
libgimp_glue.h \
|
libgimp_glue.h \
|
||||||
$(regex_sources) \
|
|
||||||
@STRIP_END@
|
@STRIP_END@
|
||||||
|
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
|
@ -138,16 +129,19 @@ EXTRA_DIST = \
|
||||||
gimp.sym \
|
gimp.sym \
|
||||||
wilber.ico \
|
wilber.ico \
|
||||||
arch/i386/mmx/detect_mmx.S \
|
arch/i386/mmx/detect_mmx.S \
|
||||||
arch/i386/mmx/paint_funcs_mmx.S \
|
arch/i386/mmx/paint_funcs_mmx.S
|
||||||
regexrepl.c \
|
|
||||||
regexrepl.h
|
if HAVE_GLIBC_REGEX
|
||||||
|
REGEXREPL =
|
||||||
|
else
|
||||||
|
REGEXREPL = $(top_builddir)/regexrepl/libregex.a
|
||||||
|
endif
|
||||||
|
|
||||||
gimp_LDFLAGS = -export-dynamic -export-symbols $(srcdir)/gimp.sym
|
gimp_LDFLAGS = -export-dynamic -export-symbols $(srcdir)/gimp.sym
|
||||||
|
|
||||||
AM_CPPFLAGS = @STRIP_BEGIN@ \
|
AM_CPPFLAGS = @STRIP_BEGIN@ \
|
||||||
-DLIBDIR=\""$(gimpplugindir)"\" \
|
-DLIBDIR=\""$(gimpplugindir)"\" \
|
||||||
-DLOCALEDIR=\""$(localedir)"\" \
|
-DLOCALEDIR=\""$(localedir)"\" \
|
||||||
-DREGEX_MALLOC \
|
|
||||||
-DG_LOG_DOMAIN=\"Gimp\" \
|
-DG_LOG_DOMAIN=\"Gimp\" \
|
||||||
@GIMP_THREAD_FLAGS@ \
|
@GIMP_THREAD_FLAGS@ \
|
||||||
@GIMP_MP_FLAGS@ \
|
@GIMP_MP_FLAGS@ \
|
||||||
|
@ -177,6 +171,7 @@ gimp_LDADD = @STRIP_BEGIN@ \
|
||||||
$(GIMP_THREAD_LIBS) \
|
$(GIMP_THREAD_LIBS) \
|
||||||
$(GIMP_MP_LIBS) \
|
$(GIMP_MP_LIBS) \
|
||||||
$(INTLLIBS) \
|
$(INTLLIBS) \
|
||||||
|
$(REGEXREPL) \
|
||||||
@STRIP_END@
|
@STRIP_END@
|
||||||
|
|
||||||
.PHONY: files
|
.PHONY: files
|
||||||
|
|
|
@ -36,7 +36,7 @@
|
||||||
#ifdef HAVE_GLIBC_REGEX
|
#ifdef HAVE_GLIBC_REGEX
|
||||||
#include <regex.h>
|
#include <regex.h>
|
||||||
#else
|
#else
|
||||||
#include "regexrepl.h"
|
#include "regexrepl/regex.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -36,7 +36,7 @@
|
||||||
#ifdef HAVE_GLIBC_REGEX
|
#ifdef HAVE_GLIBC_REGEX
|
||||||
#include <regex.h>
|
#include <regex.h>
|
||||||
#else
|
#else
|
||||||
#include "regexrepl.h"
|
#include "regexrepl/regex.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -900,6 +900,7 @@ plug-ins/perl/po/Makefile.in
|
||||||
po-plug-ins/Makefile.in
|
po-plug-ins/Makefile.in
|
||||||
po-script-fu/Makefile.in
|
po-script-fu/Makefile.in
|
||||||
intl/Makefile
|
intl/Makefile
|
||||||
|
regexrepl/Makefile
|
||||||
tools/Makefile
|
tools/Makefile
|
||||||
tools/authorsgen/Makefile
|
tools/authorsgen/Makefile
|
||||||
tools/pdbgen/Makefile
|
tools/pdbgen/Makefile
|
||||||
|
|
|
@ -1,11 +1,5 @@
|
||||||
## Process this file with automake to produce Makefile.in
|
## Process this file with automake to produce Makefile.in
|
||||||
|
|
||||||
if HAVE_GLIBC_REGEX
|
|
||||||
regex_sources =
|
|
||||||
else
|
|
||||||
regex_sources = regexrepl.c regexrepl.h
|
|
||||||
endif
|
|
||||||
|
|
||||||
SUBDIRS = scripts
|
SUBDIRS = scripts
|
||||||
|
|
||||||
libexecdir = $(gimpplugindir)/plug-ins
|
libexecdir = $(gimpplugindir)/plug-ins
|
||||||
|
@ -30,18 +24,9 @@ script_fu_SOURCES = @STRIP_BEGIN@ \
|
||||||
script-fu-enums.h \
|
script-fu-enums.h \
|
||||||
siod.h \
|
siod.h \
|
||||||
siodp.h \
|
siodp.h \
|
||||||
$(regex_sources) \
|
|
||||||
@STRIP_END@
|
@STRIP_END@
|
||||||
|
|
||||||
EXTRA_DIST = @STRIP_BEGIN@ \
|
AM_CPPFLAGS = -DLOCALEDIR=\""$(localedir)"\"
|
||||||
regexrepl.c \
|
|
||||||
regexrepl.h \
|
|
||||||
@STRIP_END@
|
|
||||||
|
|
||||||
AM_CPPFLAGS = @STRIP_BEGIN@ \
|
|
||||||
-DREGEX_MALLOC \
|
|
||||||
-DLOCALEDIR=\""$(localedir)"\" \
|
|
||||||
@STRIP_END@
|
|
||||||
|
|
||||||
INCLUDES = @STRIP_BEGIN@ \
|
INCLUDES = @STRIP_BEGIN@ \
|
||||||
-I$(top_srcdir) \
|
-I$(top_srcdir) \
|
||||||
|
@ -50,6 +35,12 @@ INCLUDES = @STRIP_BEGIN@ \
|
||||||
-I$(includedir) \
|
-I$(includedir) \
|
||||||
@STRIP_END@
|
@STRIP_END@
|
||||||
|
|
||||||
|
if HAVE_GLIBC_REGEX
|
||||||
|
REGEXREPL =
|
||||||
|
else
|
||||||
|
REGEXREPL = $(top_builddir)/regexrepl/libregex.a
|
||||||
|
endif
|
||||||
|
|
||||||
LDADD = @STRIP_BEGIN@ \
|
LDADD = @STRIP_BEGIN@ \
|
||||||
$(top_builddir)/plug-ins/dbbrowser/dbbrowser_utils.o \
|
$(top_builddir)/plug-ins/dbbrowser/dbbrowser_utils.o \
|
||||||
$(top_builddir)/libgimp/libgimpui-$(LT_RELEASE).la \
|
$(top_builddir)/libgimp/libgimpui-$(LT_RELEASE).la \
|
||||||
|
@ -59,6 +50,7 @@ LDADD = @STRIP_BEGIN@ \
|
||||||
$(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \
|
$(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \
|
||||||
$(GTK_LIBS) \
|
$(GTK_LIBS) \
|
||||||
$(INTLLIBS) \
|
$(INTLLIBS) \
|
||||||
|
$(REGEXREPL) \
|
||||||
@STRIP_END@
|
@STRIP_END@
|
||||||
|
|
||||||
.PHONY: files
|
.PHONY: files
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#ifndef HAVE_GLIBC_REGEX
|
#ifndef HAVE_GLIBC_REGEX
|
||||||
#include "regexrepl.h"
|
#include "regexrepl/regex.h"
|
||||||
#else
|
#else
|
||||||
#include <regex.h>
|
#include <regex.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1,536 +0,0 @@
|
||||||
/* Definitions for data structures and routines for the regular
|
|
||||||
expression library, version 0.12.
|
|
||||||
Copyright (C) 1985,89,90,91,92,93,95,96,97, 98 Free Software Foundation, Inc.
|
|
||||||
|
|
||||||
the C library, however. The master source lives in /gd/gnu/lib.
|
|
||||||
|
|
||||||
NOTE: The canonical source of this file is maintained with the
|
|
||||||
GNU C Library. Bugs can be reported to bug-glibc@prep.ai.mit.edu.
|
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify it
|
|
||||||
under the terms of the GNU General Public License as published by the
|
|
||||||
Free Software Foundation; either version 2, or (at your option) any
|
|
||||||
later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with this program; if not, write to the Free Software Foundation,
|
|
||||||
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
|
|
||||||
|
|
||||||
#ifndef _REGEX_H
|
|
||||||
#define _REGEX_H 1
|
|
||||||
|
|
||||||
/* Allow the use in C++ code. */
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* POSIX says that <sys/types.h> must be included (by the caller) before
|
|
||||||
<regex.h>. */
|
|
||||||
|
|
||||||
#if !defined (_POSIX_C_SOURCE) && !defined (_POSIX_SOURCE) && defined (VMS)
|
|
||||||
/* VMS doesn't have `size_t' in <sys/types.h>, even though POSIX says it
|
|
||||||
should be there. */
|
|
||||||
#include <stddef.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* The following two types have to be signed and unsigned integer type
|
|
||||||
wide enough to hold a value of a pointer. For most ANSI compilers
|
|
||||||
ptrdiff_t and size_t should be likely OK. Still size of these two
|
|
||||||
types is 2 for Microsoft C. Ugh... */
|
|
||||||
typedef long int s_reg_t;
|
|
||||||
typedef unsigned long int active_reg_t;
|
|
||||||
|
|
||||||
/* The following bits are used to determine the regexp syntax we
|
|
||||||
recognize. The set/not-set meanings are chosen so that Emacs syntax
|
|
||||||
remains the value 0. The bits are given in alphabetical order, and
|
|
||||||
the definitions shifted by one from the previous bit; thus, when we
|
|
||||||
add or remove a bit, only one other definition need change. */
|
|
||||||
typedef unsigned long int reg_syntax_t;
|
|
||||||
|
|
||||||
/* If this bit is not set, then \ inside a bracket expression is literal.
|
|
||||||
If set, then such a \ quotes the following character. */
|
|
||||||
#define RE_BACKSLASH_ESCAPE_IN_LISTS ((unsigned long int) 1)
|
|
||||||
|
|
||||||
/* If this bit is not set, then + and ? are operators, and \+ and \? are
|
|
||||||
literals.
|
|
||||||
If set, then \+ and \? are operators and + and ? are literals. */
|
|
||||||
#define RE_BK_PLUS_QM (RE_BACKSLASH_ESCAPE_IN_LISTS << 1)
|
|
||||||
|
|
||||||
/* If this bit is set, then character classes are supported. They are:
|
|
||||||
[:alpha:], [:upper:], [:lower:], [:digit:], [:alnum:], [:xdigit:],
|
|
||||||
[:space:], [:print:], [:punct:], [:graph:], and [:cntrl:].
|
|
||||||
If not set, then character classes are not supported. */
|
|
||||||
#define RE_CHAR_CLASSES (RE_BK_PLUS_QM << 1)
|
|
||||||
|
|
||||||
/* If this bit is set, then ^ and $ are always anchors (outside bracket
|
|
||||||
expressions, of course).
|
|
||||||
If this bit is not set, then it depends:
|
|
||||||
^ is an anchor if it is at the beginning of a regular
|
|
||||||
expression or after an open-group or an alternation operator;
|
|
||||||
$ is an anchor if it is at the end of a regular expression, or
|
|
||||||
before a close-group or an alternation operator.
|
|
||||||
|
|
||||||
This bit could be (re)combined with RE_CONTEXT_INDEP_OPS, because
|
|
||||||
POSIX draft 11.2 says that * etc. in leading positions is undefined.
|
|
||||||
We already implemented a previous draft which made those constructs
|
|
||||||
invalid, though, so we haven't changed the code back. */
|
|
||||||
#define RE_CONTEXT_INDEP_ANCHORS (RE_CHAR_CLASSES << 1)
|
|
||||||
|
|
||||||
/* If this bit is set, then special characters are always special
|
|
||||||
regardless of where they are in the pattern.
|
|
||||||
If this bit is not set, then special characters are special only in
|
|
||||||
some contexts; otherwise they are ordinary. Specifically,
|
|
||||||
* + ? and intervals are only special when not after the beginning,
|
|
||||||
open-group, or alternation operator. */
|
|
||||||
#define RE_CONTEXT_INDEP_OPS (RE_CONTEXT_INDEP_ANCHORS << 1)
|
|
||||||
|
|
||||||
/* If this bit is set, then *, +, ?, and { cannot be first in an re or
|
|
||||||
immediately after an alternation or begin-group operator. */
|
|
||||||
#define RE_CONTEXT_INVALID_OPS (RE_CONTEXT_INDEP_OPS << 1)
|
|
||||||
|
|
||||||
/* If this bit is set, then . matches newline.
|
|
||||||
If not set, then it doesn't. */
|
|
||||||
#define RE_DOT_NEWLINE (RE_CONTEXT_INVALID_OPS << 1)
|
|
||||||
|
|
||||||
/* If this bit is set, then . doesn't match NUL.
|
|
||||||
If not set, then it does. */
|
|
||||||
#define RE_DOT_NOT_NULL (RE_DOT_NEWLINE << 1)
|
|
||||||
|
|
||||||
/* If this bit is set, nonmatching lists [^...] do not match newline.
|
|
||||||
If not set, they do. */
|
|
||||||
#define RE_HAT_LISTS_NOT_NEWLINE (RE_DOT_NOT_NULL << 1)
|
|
||||||
|
|
||||||
/* If this bit is set, either \{...\} or {...} defines an
|
|
||||||
interval, depending on RE_NO_BK_BRACES.
|
|
||||||
If not set, \{, \}, {, and } are literals. */
|
|
||||||
#define RE_INTERVALS (RE_HAT_LISTS_NOT_NEWLINE << 1)
|
|
||||||
|
|
||||||
/* If this bit is set, +, ? and | aren't recognized as operators.
|
|
||||||
If not set, they are. */
|
|
||||||
#define RE_LIMITED_OPS (RE_INTERVALS << 1)
|
|
||||||
|
|
||||||
/* If this bit is set, newline is an alternation operator.
|
|
||||||
If not set, newline is literal. */
|
|
||||||
#define RE_NEWLINE_ALT (RE_LIMITED_OPS << 1)
|
|
||||||
|
|
||||||
/* If this bit is set, then `{...}' defines an interval, and \{ and \}
|
|
||||||
are literals.
|
|
||||||
If not set, then `\{...\}' defines an interval. */
|
|
||||||
#define RE_NO_BK_BRACES (RE_NEWLINE_ALT << 1)
|
|
||||||
|
|
||||||
/* If this bit is set, (...) defines a group, and \( and \) are literals.
|
|
||||||
If not set, \(...\) defines a group, and ( and ) are literals. */
|
|
||||||
#define RE_NO_BK_PARENS (RE_NO_BK_BRACES << 1)
|
|
||||||
|
|
||||||
/* If this bit is set, then \<digit> matches <digit>.
|
|
||||||
If not set, then \<digit> is a back-reference. */
|
|
||||||
#define RE_NO_BK_REFS (RE_NO_BK_PARENS << 1)
|
|
||||||
|
|
||||||
/* If this bit is set, then | is an alternation operator, and \| is literal.
|
|
||||||
If not set, then \| is an alternation operator, and | is literal. */
|
|
||||||
#define RE_NO_BK_VBAR (RE_NO_BK_REFS << 1)
|
|
||||||
|
|
||||||
/* If this bit is set, then an ending range point collating higher
|
|
||||||
than the starting range point, as in [z-a], is invalid.
|
|
||||||
If not set, then when ending range point collates higher than the
|
|
||||||
starting range point, the range is ignored. */
|
|
||||||
#define RE_NO_EMPTY_RANGES (RE_NO_BK_VBAR << 1)
|
|
||||||
|
|
||||||
/* If this bit is set, then an unmatched ) is ordinary.
|
|
||||||
If not set, then an unmatched ) is invalid. */
|
|
||||||
#define RE_UNMATCHED_RIGHT_PAREN_ORD (RE_NO_EMPTY_RANGES << 1)
|
|
||||||
|
|
||||||
/* If this bit is set, succeed as soon as we match the whole pattern,
|
|
||||||
without further backtracking. */
|
|
||||||
#define RE_NO_POSIX_BACKTRACKING (RE_UNMATCHED_RIGHT_PAREN_ORD << 1)
|
|
||||||
|
|
||||||
/* If this bit is set, do not process the GNU regex operators.
|
|
||||||
If not set, then the GNU regex operators are recognized. */
|
|
||||||
#define RE_NO_GNU_OPS (RE_NO_POSIX_BACKTRACKING << 1)
|
|
||||||
|
|
||||||
/* If this bit is set, turn on internal regex debugging.
|
|
||||||
If not set, and debugging was on, turn it off.
|
|
||||||
This only works if regex.c is compiled -DDEBUG.
|
|
||||||
We define this bit always, so that all that's needed to turn on
|
|
||||||
debugging is to recompile regex.c; the calling code can always have
|
|
||||||
this bit set, and it won't affect anything in the normal case. */
|
|
||||||
#define RE_DEBUG (RE_NO_GNU_OPS << 1)
|
|
||||||
|
|
||||||
/* This global variable defines the particular regexp syntax to use (for
|
|
||||||
some interfaces). When a regexp is compiled, the syntax used is
|
|
||||||
stored in the pattern buffer, so changing this does not affect
|
|
||||||
already-compiled regexps. */
|
|
||||||
extern reg_syntax_t re_syntax_options;
|
|
||||||
|
|
||||||
/* Define combinations of the above bits for the standard possibilities.
|
|
||||||
(The [[[ comments delimit what gets put into the Texinfo file, so
|
|
||||||
don't delete them!) */
|
|
||||||
/* [[[begin syntaxes]]] */
|
|
||||||
#define RE_SYNTAX_EMACS 0
|
|
||||||
|
|
||||||
#define RE_SYNTAX_AWK \
|
|
||||||
(RE_BACKSLASH_ESCAPE_IN_LISTS | RE_DOT_NOT_NULL \
|
|
||||||
| RE_NO_BK_PARENS | RE_NO_BK_REFS \
|
|
||||||
| RE_NO_BK_VBAR | RE_NO_EMPTY_RANGES \
|
|
||||||
| RE_DOT_NEWLINE | RE_CONTEXT_INDEP_ANCHORS \
|
|
||||||
| RE_UNMATCHED_RIGHT_PAREN_ORD | RE_NO_GNU_OPS)
|
|
||||||
|
|
||||||
#define RE_SYNTAX_GNU_AWK \
|
|
||||||
((RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS | RE_DEBUG) \
|
|
||||||
& ~(RE_DOT_NOT_NULL | RE_INTERVALS | RE_CONTEXT_INDEP_OPS))
|
|
||||||
|
|
||||||
#define RE_SYNTAX_POSIX_AWK \
|
|
||||||
(RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS \
|
|
||||||
| RE_INTERVALS | RE_NO_GNU_OPS)
|
|
||||||
|
|
||||||
#define RE_SYNTAX_GREP \
|
|
||||||
(RE_BK_PLUS_QM | RE_CHAR_CLASSES \
|
|
||||||
| RE_HAT_LISTS_NOT_NEWLINE | RE_INTERVALS \
|
|
||||||
| RE_NEWLINE_ALT)
|
|
||||||
|
|
||||||
#define RE_SYNTAX_EGREP \
|
|
||||||
(RE_CHAR_CLASSES | RE_CONTEXT_INDEP_ANCHORS \
|
|
||||||
| RE_CONTEXT_INDEP_OPS | RE_HAT_LISTS_NOT_NEWLINE \
|
|
||||||
| RE_NEWLINE_ALT | RE_NO_BK_PARENS \
|
|
||||||
| RE_NO_BK_VBAR)
|
|
||||||
|
|
||||||
#define RE_SYNTAX_POSIX_EGREP \
|
|
||||||
(RE_SYNTAX_EGREP | RE_INTERVALS | RE_NO_BK_BRACES)
|
|
||||||
|
|
||||||
/* P1003.2/D11.2, section 4.20.7.1, lines 5078ff. */
|
|
||||||
#define RE_SYNTAX_ED RE_SYNTAX_POSIX_BASIC
|
|
||||||
|
|
||||||
#define RE_SYNTAX_SED RE_SYNTAX_POSIX_BASIC
|
|
||||||
|
|
||||||
/* Syntax bits common to both basic and extended POSIX regex syntax. */
|
|
||||||
#define _RE_SYNTAX_POSIX_COMMON \
|
|
||||||
(RE_CHAR_CLASSES | RE_DOT_NEWLINE | RE_DOT_NOT_NULL \
|
|
||||||
| RE_INTERVALS | RE_NO_EMPTY_RANGES)
|
|
||||||
|
|
||||||
#define RE_SYNTAX_POSIX_BASIC \
|
|
||||||
(_RE_SYNTAX_POSIX_COMMON | RE_BK_PLUS_QM)
|
|
||||||
|
|
||||||
/* Differs from ..._POSIX_BASIC only in that RE_BK_PLUS_QM becomes
|
|
||||||
RE_LIMITED_OPS, i.e., \? \+ \| are not recognized. Actually, this
|
|
||||||
isn't minimal, since other operators, such as \`, aren't disabled. */
|
|
||||||
#define RE_SYNTAX_POSIX_MINIMAL_BASIC \
|
|
||||||
(_RE_SYNTAX_POSIX_COMMON | RE_LIMITED_OPS)
|
|
||||||
|
|
||||||
#define RE_SYNTAX_POSIX_EXTENDED \
|
|
||||||
(_RE_SYNTAX_POSIX_COMMON | RE_CONTEXT_INDEP_ANCHORS \
|
|
||||||
| RE_CONTEXT_INDEP_OPS | RE_NO_BK_BRACES \
|
|
||||||
| RE_NO_BK_PARENS | RE_NO_BK_VBAR \
|
|
||||||
| RE_UNMATCHED_RIGHT_PAREN_ORD)
|
|
||||||
|
|
||||||
/* Differs from ..._POSIX_EXTENDED in that RE_CONTEXT_INVALID_OPS
|
|
||||||
replaces RE_CONTEXT_INDEP_OPS and RE_NO_BK_REFS is added. */
|
|
||||||
#define RE_SYNTAX_POSIX_MINIMAL_EXTENDED \
|
|
||||||
(_RE_SYNTAX_POSIX_COMMON | RE_CONTEXT_INDEP_ANCHORS \
|
|
||||||
| RE_CONTEXT_INVALID_OPS | RE_NO_BK_BRACES \
|
|
||||||
| RE_NO_BK_PARENS | RE_NO_BK_REFS \
|
|
||||||
| RE_NO_BK_VBAR | RE_UNMATCHED_RIGHT_PAREN_ORD)
|
|
||||||
/* [[[end syntaxes]]] */
|
|
||||||
|
|
||||||
/* Maximum number of duplicates an interval can allow. Some systems
|
|
||||||
(erroneously) define this in other header files, but we want our
|
|
||||||
value, so remove any previous define. */
|
|
||||||
#ifdef RE_DUP_MAX
|
|
||||||
#undef RE_DUP_MAX
|
|
||||||
#endif
|
|
||||||
/* If sizeof(int) == 2, then ((1 << 15) - 1) overflows. */
|
|
||||||
#define RE_DUP_MAX (0x7fff)
|
|
||||||
|
|
||||||
|
|
||||||
/* POSIX `cflags' bits (i.e., information for `regcomp'). */
|
|
||||||
|
|
||||||
/* If this bit is set, then use extended regular expression syntax.
|
|
||||||
If not set, then use basic regular expression syntax. */
|
|
||||||
#define REG_EXTENDED 1
|
|
||||||
|
|
||||||
/* If this bit is set, then ignore case when matching.
|
|
||||||
If not set, then case is significant. */
|
|
||||||
#define REG_ICASE (REG_EXTENDED << 1)
|
|
||||||
|
|
||||||
/* If this bit is set, then anchors do not match at newline
|
|
||||||
characters in the string.
|
|
||||||
If not set, then anchors do match at newlines. */
|
|
||||||
#define REG_NEWLINE (REG_ICASE << 1)
|
|
||||||
|
|
||||||
/* If this bit is set, then report only success or fail in regexec.
|
|
||||||
If not set, then returns differ between not matching and errors. */
|
|
||||||
#define REG_NOSUB (REG_NEWLINE << 1)
|
|
||||||
|
|
||||||
|
|
||||||
/* POSIX `eflags' bits (i.e., information for regexec). */
|
|
||||||
|
|
||||||
/* If this bit is set, then the beginning-of-line operator doesn't match
|
|
||||||
the beginning of the string (presumably because it's not the
|
|
||||||
beginning of a line).
|
|
||||||
If not set, then the beginning-of-line operator does match the
|
|
||||||
beginning of the string. */
|
|
||||||
#define REG_NOTBOL 1
|
|
||||||
|
|
||||||
/* Like REG_NOTBOL, except for the end-of-line. */
|
|
||||||
#define REG_NOTEOL (1 << 1)
|
|
||||||
|
|
||||||
|
|
||||||
/* If any error codes are removed, changed, or added, update the
|
|
||||||
`re_error_msg' table in regex.c. */
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
REG_NOERROR = 0, /* Success. */
|
|
||||||
REG_NOMATCH, /* Didn't find a match (for regexec). */
|
|
||||||
|
|
||||||
/* POSIX regcomp return error codes. (In the order listed in the
|
|
||||||
standard.) */
|
|
||||||
REG_BADPAT, /* Invalid pattern. */
|
|
||||||
REG_ECOLLATE, /* Not implemented. */
|
|
||||||
REG_ECTYPE, /* Invalid character class name. */
|
|
||||||
REG_EESCAPE, /* Trailing backslash. */
|
|
||||||
REG_ESUBREG, /* Invalid back reference. */
|
|
||||||
REG_EBRACK, /* Unmatched left bracket. */
|
|
||||||
REG_EPAREN, /* Parenthesis imbalance. */
|
|
||||||
REG_EBRACE, /* Unmatched \{. */
|
|
||||||
REG_BADBR, /* Invalid contents of \{\}. */
|
|
||||||
REG_ERANGE, /* Invalid range end. */
|
|
||||||
REG_ESPACE, /* Ran out of memory. */
|
|
||||||
REG_BADRPT, /* No preceding re for repetition op. */
|
|
||||||
|
|
||||||
/* Error codes we've added. */
|
|
||||||
REG_EEND, /* Premature end. */
|
|
||||||
REG_ESIZE, /* Compiled pattern bigger than 2^16 bytes. */
|
|
||||||
REG_ERPAREN /* Unmatched ) or \); not returned from regcomp. */
|
|
||||||
} reg_errcode_t;
|
|
||||||
|
|
||||||
/* This data structure represents a compiled pattern. Before calling
|
|
||||||
the pattern compiler, the fields `buffer', `allocated', `fastmap',
|
|
||||||
`translate', and `no_sub' can be set. After the pattern has been
|
|
||||||
compiled, the `re_nsub' field is available. All other fields are
|
|
||||||
private to the regex routines. */
|
|
||||||
|
|
||||||
#ifndef RE_TRANSLATE_TYPE
|
|
||||||
#define RE_TRANSLATE_TYPE char *
|
|
||||||
#endif
|
|
||||||
|
|
||||||
struct re_pattern_buffer
|
|
||||||
{
|
|
||||||
/* [[[begin pattern_buffer]]] */
|
|
||||||
/* Space that holds the compiled pattern. It is declared as
|
|
||||||
`unsigned char *' because its elements are
|
|
||||||
sometimes used as array indexes. */
|
|
||||||
unsigned char *buffer;
|
|
||||||
|
|
||||||
/* Number of bytes to which `buffer' points. */
|
|
||||||
unsigned long int allocated;
|
|
||||||
|
|
||||||
/* Number of bytes actually used in `buffer'. */
|
|
||||||
unsigned long int used;
|
|
||||||
|
|
||||||
/* Syntax setting with which the pattern was compiled. */
|
|
||||||
reg_syntax_t syntax;
|
|
||||||
|
|
||||||
/* Pointer to a fastmap, if any, otherwise zero. re_search uses
|
|
||||||
the fastmap, if there is one, to skip over impossible
|
|
||||||
starting points for matches. */
|
|
||||||
char *fastmap;
|
|
||||||
|
|
||||||
/* Either a translate table to apply to all characters before
|
|
||||||
comparing them, or zero for no translation. The translation
|
|
||||||
is applied to a pattern when it is compiled and to a string
|
|
||||||
when it is matched. */
|
|
||||||
RE_TRANSLATE_TYPE translate;
|
|
||||||
|
|
||||||
/* Number of subexpressions found by the compiler. */
|
|
||||||
size_t re_nsub;
|
|
||||||
|
|
||||||
/* Zero if this pattern cannot match the empty string, one else.
|
|
||||||
Well, in truth it's used only in `re_search_2', to see
|
|
||||||
whether or not we should use the fastmap, so we don't set
|
|
||||||
this absolutely perfectly; see `re_compile_fastmap' (the
|
|
||||||
`duplicate' case). */
|
|
||||||
unsigned can_be_null : 1;
|
|
||||||
|
|
||||||
/* If REGS_UNALLOCATED, allocate space in the `regs' structure
|
|
||||||
for `max (RE_NREGS, re_nsub + 1)' groups.
|
|
||||||
If REGS_REALLOCATE, reallocate space if necessary.
|
|
||||||
If REGS_FIXED, use what's there. */
|
|
||||||
#define REGS_UNALLOCATED 0
|
|
||||||
#define REGS_REALLOCATE 1
|
|
||||||
#define REGS_FIXED 2
|
|
||||||
unsigned regs_allocated : 2;
|
|
||||||
|
|
||||||
/* Set to zero when `regex_compile' compiles a pattern; set to one
|
|
||||||
by `re_compile_fastmap' if it updates the fastmap. */
|
|
||||||
unsigned fastmap_accurate : 1;
|
|
||||||
|
|
||||||
/* If set, `re_match_2' does not return information about
|
|
||||||
subexpressions. */
|
|
||||||
unsigned no_sub : 1;
|
|
||||||
|
|
||||||
/* If set, a beginning-of-line anchor doesn't match at the
|
|
||||||
beginning of the string. */
|
|
||||||
unsigned not_bol : 1;
|
|
||||||
|
|
||||||
/* Similarly for an end-of-line anchor. */
|
|
||||||
unsigned not_eol : 1;
|
|
||||||
|
|
||||||
/* If true, an anchor at a newline matches. */
|
|
||||||
unsigned newline_anchor : 1;
|
|
||||||
|
|
||||||
/* [[[end pattern_buffer]]] */
|
|
||||||
};
|
|
||||||
|
|
||||||
typedef struct re_pattern_buffer regex_t;
|
|
||||||
|
|
||||||
/* Type for byte offsets within the string. POSIX mandates this. */
|
|
||||||
typedef int regoff_t;
|
|
||||||
|
|
||||||
|
|
||||||
/* This is the structure we store register match data in. See
|
|
||||||
regex.texinfo for a full description of what registers match. */
|
|
||||||
struct re_registers
|
|
||||||
{
|
|
||||||
unsigned num_regs;
|
|
||||||
regoff_t *start;
|
|
||||||
regoff_t *end;
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
/* If `regs_allocated' is REGS_UNALLOCATED in the pattern buffer,
|
|
||||||
`re_match_2' returns information about at least this many registers
|
|
||||||
the first time a `regs' structure is passed. */
|
|
||||||
#ifndef RE_NREGS
|
|
||||||
#define RE_NREGS 30
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
/* POSIX specification for registers. Aside from the different names than
|
|
||||||
`re_registers', POSIX uses an array of structures, instead of a
|
|
||||||
structure of arrays. */
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
regoff_t rm_so; /* Byte offset from string's start to substring's start. */
|
|
||||||
regoff_t rm_eo; /* Byte offset from string's start to substring's end. */
|
|
||||||
} regmatch_t;
|
|
||||||
|
|
||||||
/* Declarations for routines. */
|
|
||||||
|
|
||||||
/* To avoid duplicating every routine declaration -- once with a
|
|
||||||
prototype (if we are ANSI), and once without (if we aren't) -- we
|
|
||||||
use the following macro to declare argument types. This
|
|
||||||
unfortunately clutters up the declarations a bit, but I think it's
|
|
||||||
worth it. */
|
|
||||||
|
|
||||||
#if __STDC__
|
|
||||||
|
|
||||||
#define _RE_ARGS(args) args
|
|
||||||
|
|
||||||
#else /* not __STDC__ */
|
|
||||||
|
|
||||||
#define _RE_ARGS(args) ()
|
|
||||||
|
|
||||||
#endif /* not __STDC__ */
|
|
||||||
|
|
||||||
/* Sets the current default syntax to SYNTAX, and return the old syntax.
|
|
||||||
You can also simply assign to the `re_syntax_options' variable. */
|
|
||||||
extern reg_syntax_t re_set_syntax _RE_ARGS ((reg_syntax_t syntax));
|
|
||||||
|
|
||||||
/* Compile the regular expression PATTERN, with length LENGTH
|
|
||||||
and syntax given by the global `re_syntax_options', into the buffer
|
|
||||||
BUFFER. Return NULL if successful, and an error string if not. */
|
|
||||||
extern const char *re_compile_pattern
|
|
||||||
_RE_ARGS ((const char *pattern, size_t length,
|
|
||||||
struct re_pattern_buffer *buffer));
|
|
||||||
|
|
||||||
|
|
||||||
/* Compile a fastmap for the compiled pattern in BUFFER; used to
|
|
||||||
accelerate searches. Return 0 if successful and -2 if was an
|
|
||||||
internal error. */
|
|
||||||
extern int re_compile_fastmap _RE_ARGS ((struct re_pattern_buffer *buffer));
|
|
||||||
|
|
||||||
|
|
||||||
/* Search in the string STRING (with length LENGTH) for the pattern
|
|
||||||
compiled into BUFFER. Start searching at position START, for RANGE
|
|
||||||
characters. Return the starting position of the match, -1 for no
|
|
||||||
match, or -2 for an internal error. Also return register
|
|
||||||
information in REGS (if REGS and BUFFER->no_sub are nonzero). */
|
|
||||||
extern int re_search
|
|
||||||
_RE_ARGS ((struct re_pattern_buffer *buffer, const char *string,
|
|
||||||
int length, int start, int range, struct re_registers *regs));
|
|
||||||
|
|
||||||
|
|
||||||
/* Like `re_search', but search in the concatenation of STRING1 and
|
|
||||||
STRING2. Also, stop searching at index START + STOP. */
|
|
||||||
extern int re_search_2
|
|
||||||
_RE_ARGS ((struct re_pattern_buffer *buffer, const char *string1,
|
|
||||||
int length1, const char *string2, int length2,
|
|
||||||
int start, int range, struct re_registers *regs, int stop));
|
|
||||||
|
|
||||||
|
|
||||||
/* Like `re_search', but return how many characters in STRING the regexp
|
|
||||||
in BUFFER matched, starting at position START. */
|
|
||||||
extern int re_match
|
|
||||||
_RE_ARGS ((struct re_pattern_buffer *buffer, const char *string,
|
|
||||||
int length, int start, struct re_registers *regs));
|
|
||||||
|
|
||||||
|
|
||||||
/* Relates to `re_match' as `re_search_2' relates to `re_search'. */
|
|
||||||
extern int re_match_2
|
|
||||||
_RE_ARGS ((struct re_pattern_buffer *buffer, const char *string1,
|
|
||||||
int length1, const char *string2, int length2,
|
|
||||||
int start, struct re_registers *regs, int stop));
|
|
||||||
|
|
||||||
|
|
||||||
/* Set REGS to hold NUM_REGS registers, storing them in STARTS and
|
|
||||||
ENDS. Subsequent matches using BUFFER and REGS will use this memory
|
|
||||||
for recording register information. STARTS and ENDS must be
|
|
||||||
allocated with malloc, and must each be at least `NUM_REGS * sizeof
|
|
||||||
(regoff_t)' bytes long.
|
|
||||||
|
|
||||||
If NUM_REGS == 0, then subsequent matches should allocate their own
|
|
||||||
register data.
|
|
||||||
|
|
||||||
Unless this function is called, the first search or match using
|
|
||||||
PATTERN_BUFFER will allocate its own register data, without
|
|
||||||
freeing the old data. */
|
|
||||||
extern void re_set_registers
|
|
||||||
_RE_ARGS ((struct re_pattern_buffer *buffer, struct re_registers *regs,
|
|
||||||
unsigned num_regs, regoff_t *starts, regoff_t *ends));
|
|
||||||
|
|
||||||
#ifdef _REGEX_RE_COMP
|
|
||||||
#ifndef _CRAY
|
|
||||||
/* 4.2 bsd compatibility. */
|
|
||||||
extern char *re_comp _RE_ARGS ((const char *));
|
|
||||||
extern int re_exec _RE_ARGS ((const char *));
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* POSIX compatibility. */
|
|
||||||
extern int regcomp _RE_ARGS ((regex_t *preg, const char *pattern, int cflags));
|
|
||||||
extern int regexec
|
|
||||||
_RE_ARGS ((const regex_t *preg, const char *string, size_t nmatch,
|
|
||||||
regmatch_t pmatch[], int eflags));
|
|
||||||
extern size_t regerror
|
|
||||||
_RE_ARGS ((int errcode, const regex_t *preg, char *errbuf,
|
|
||||||
size_t errbuf_size));
|
|
||||||
extern void regfree _RE_ARGS ((regex_t *preg));
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif /* C++ */
|
|
||||||
|
|
||||||
#endif /* regex.h */
|
|
||||||
|
|
||||||
/*
|
|
||||||
Local variables:
|
|
||||||
make-backup-files: t
|
|
||||||
version-control: t
|
|
||||||
trim-versions-without-asking: nil
|
|
||||||
End:
|
|
||||||
*/
|
|
|
@ -6,7 +6,7 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#ifndef HAVE_GLIBC_REGEX
|
#ifndef HAVE_GLIBC_REGEX
|
||||||
#include "regexrepl.h"
|
#include "regexrepl/regex.h"
|
||||||
#else
|
#else
|
||||||
#include <regex.h>
|
#include <regex.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
Makefile.in
|
||||||
|
Makefile
|
||||||
|
.deps
|
|
@ -0,0 +1,18 @@
|
||||||
|
noinst_LIBRARIES = libregex.a
|
||||||
|
|
||||||
|
if HAVE_GLIBC_REGEX
|
||||||
|
libregex_a_SOURCES =
|
||||||
|
else
|
||||||
|
libregex_a_SOURCES = regex.c regex.h
|
||||||
|
endif
|
||||||
|
|
||||||
|
INCLUDES = \
|
||||||
|
-I$(top_srcdir) \
|
||||||
|
-I$(includedir)
|
||||||
|
|
||||||
|
AM_CPPFLAGS = \
|
||||||
|
-DREGEX_MALLOC
|
||||||
|
|
||||||
|
EXTRA_DIST = \
|
||||||
|
regex.c \
|
||||||
|
regex.h
|
|
@ -160,7 +160,7 @@ init_syntax_once ()
|
||||||
#endif /* not emacs */
|
#endif /* not emacs */
|
||||||
|
|
||||||
/* Get the interface, including the syntax bits. */
|
/* Get the interface, including the syntax bits. */
|
||||||
#include "regexrepl.h"
|
#include "regexrepl/regex.h"
|
||||||
|
|
||||||
/* isalpha etc. are used for the character classes. */
|
/* isalpha etc. are used for the character classes. */
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
|
@ -734,7 +734,7 @@ GPL
|
||||||
|
|
||||||
$headers .= "\n" if /libgimp/ && !$lib++ && $headers;
|
$headers .= "\n" if /libgimp/ && !$lib++ && $headers;
|
||||||
|
|
||||||
if ($_ eq '"regexrepl.h"') {
|
if ($_ eq '"regexrepl/regex.h"') {
|
||||||
$headers .= "\n";
|
$headers .= "\n";
|
||||||
$headers .= "#ifdef HAVE_GLIBC_REGEX\n";
|
$headers .= "#ifdef HAVE_GLIBC_REGEX\n";
|
||||||
$headers .= "#include <regex.h>\n";
|
$headers .= "#include <regex.h>\n";
|
||||||
|
@ -743,7 +743,7 @@ GPL
|
||||||
|
|
||||||
$headers .= "#include $_\n";
|
$headers .= "#include $_\n";
|
||||||
|
|
||||||
if ($_ eq '"regexrepl.h"') {
|
if ($_ eq '"regexrepl/regex.h"') {
|
||||||
$headers .= "#endif\n\n";
|
$headers .= "#endif\n\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -333,7 +333,8 @@ CODE
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@headers = qw("plug_in.h" "regexrepl.h" "appenv.h" <string.h> <stdlib.h>);
|
@headers = qw("plug_in.h" "regexrepl/regex.h" "appenv.h"
|
||||||
|
<string.h> <stdlib.h>);
|
||||||
|
|
||||||
$extra{app}->{code} = <<'CODE';
|
$extra{app}->{code} = <<'CODE';
|
||||||
static int
|
static int
|
||||||
|
|
|
@ -181,7 +181,7 @@ HELP
|
||||||
);
|
);
|
||||||
|
|
||||||
%invoke = (
|
%invoke = (
|
||||||
headers => [ qw(<stdlib.h> "regexrepl.h") ],
|
headers => [ qw(<stdlib.h> "regexrepl/regex.h") ],
|
||||||
vars => [ 'PDBQuery pdb_query' ],
|
vars => [ 'PDBQuery pdb_query' ],
|
||||||
code => <<CODE
|
code => <<CODE
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue