mirror of
https://github.com/postgres/postgres.git
synced 2025-04-24 10:47:04 +03:00
1 Update Snowball sources
2 Makefile fixes
This commit is contained in:
Teodor Sigaev
parent
3b0453b24f
commit
f82b853b47
@ -49,7 +49,7 @@ snb_en_init(PG_FUNCTION_ARGS)
|
|||||||
PG_FREE_IF_COPY(in, 0);
|
PG_FREE_IF_COPY(in, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
d->z = english_create_env();
|
d->z = english_ISO_8859_1_create_env();
|
||||||
if (!d->z)
|
if (!d->z)
|
||||||
{
|
{
|
||||||
freestoplist(&(d->stoplist));
|
freestoplist(&(d->stoplist));
|
||||||
@ -57,7 +57,7 @@ snb_en_init(PG_FUNCTION_ARGS)
|
|||||||
(errcode(ERRCODE_OUT_OF_MEMORY),
|
(errcode(ERRCODE_OUT_OF_MEMORY),
|
||||||
errmsg("out of memory")));
|
errmsg("out of memory")));
|
||||||
}
|
}
|
||||||
d->stem = english_stem;
|
d->stem = english_ISO_8859_1_stem;
|
||||||
|
|
||||||
PG_RETURN_POINTER(d);
|
PG_RETURN_POINTER(d);
|
||||||
}
|
}
|
||||||
@ -83,7 +83,7 @@ snb_ru_init(PG_FUNCTION_ARGS)
|
|||||||
PG_FREE_IF_COPY(in, 0);
|
PG_FREE_IF_COPY(in, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
d->z = russian_create_env();
|
d->z = russian_KOI8_R_create_env();
|
||||||
if (!d->z)
|
if (!d->z)
|
||||||
{
|
{
|
||||||
freestoplist(&(d->stoplist));
|
freestoplist(&(d->stoplist));
|
||||||
@ -91,7 +91,7 @@ snb_ru_init(PG_FUNCTION_ARGS)
|
|||||||
(errcode(ERRCODE_OUT_OF_MEMORY),
|
(errcode(ERRCODE_OUT_OF_MEMORY),
|
||||||
errmsg("out of memory")));
|
errmsg("out of memory")));
|
||||||
}
|
}
|
||||||
d->stem = russian_stem;
|
d->stem = russian_KOI8_R_stem;
|
||||||
|
|
||||||
PG_RETURN_POINTER(d);
|
PG_RETURN_POINTER(d);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -50,7 +50,7 @@ Example 1:
|
|||||||
|
|
||||||
2. Create template files for Portuguese
|
2. Create template files for Portuguese
|
||||||
|
|
||||||
./config.sh -n pt -s -p portuguese -v -C'Snowball stemmer for Portuguese'
|
./config.sh -n pt -s -p portuguese_ISO_8859_1 -v -C'Snowball stemmer for Portuguese'
|
||||||
|
|
||||||
Note, that argument for -p option should be *the same* as name of stemming
|
Note, that argument for -p option should be *the same* as name of stemming
|
||||||
function in stem.c (without _stem)
|
function in stem.c (without _stem)
|
||||||
@ -81,9 +81,10 @@ Example 1:
|
|||||||
Here is what I have in pg_ts_dict table
|
Here is what I have in pg_ts_dict table
|
||||||
|
|
||||||
psql -d testdict -c "select * from pg_ts_dict where dict_name='pt';"
|
psql -d testdict -c "select * from pg_ts_dict where dict_name='pt';"
|
||||||
dict_name | dict_init | dict_initoption | dict_lexize | dict_comment
|
dict_name | dict_init | dict_initoption | dict_lexize | dict_comment
|
||||||
-----------+-----------+-----------------+-------------+---------------------------------
|
-----------+--------------------+-----------------+---------------------------------------+---------------------------------
|
||||||
pt | 7177806 | | 7159330 | Snowball stemmer for Portuguese
|
pt | dinit_pt(internal) | | snb_lexize(internal,internal,integer) | Snowball stemmer for Portuguese
|
||||||
|
|
||||||
(1 row)
|
(1 row)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -131,9 +131,16 @@ fi
|
|||||||
if [ ${#cfile} -ne 0 ] || [ ${#hfile} -ne 0 ] ; then
|
if [ ${#cfile} -ne 0 ] || [ ${#hfile} -ne 0 ] ; then
|
||||||
[ $verbose = "yes" ] && echo -n 'Copy source and header files... '
|
[ $verbose = "yes" ] && echo -n 'Copy source and header files... '
|
||||||
if [ ${#cfile} -ne 0 ] ; then
|
if [ ${#cfile} -ne 0 ] ; then
|
||||||
if ! cp $cfile ../../$dir ; then
|
if [ $stemmode = "yes" ] ; then
|
||||||
echo "Cant cp all or one of files: $cfile"
|
for cfn in $cfile
|
||||||
exit 1
|
do
|
||||||
|
sed s#../runtime/## < $cfn > ../../$dir/$cfn
|
||||||
|
done
|
||||||
|
else
|
||||||
|
if ! cp $cfile ../../$dir ; then
|
||||||
|
echo "Can't cp all or one of files: $cfile"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
if [ ${#hfile} -ne 0 ] ; then
|
if [ ${#hfile} -ne 0 ] ; then
|
||||||
|
|||||||
@ -1,20 +1,24 @@
|
|||||||
# $PostgreSQL: pgsql/contrib/tsearch2/ispell/Makefile,v 1.6 2004/06/23 11:06:11 teodor Exp $
|
# $PostgreSQL: pgsql/contrib/tsearch2/ispell/Makefile,v 1.7 2005/09/15 11:14:18 teodor Exp $
|
||||||
|
|
||||||
subdir = contrib/tsearch2/ispell
|
PG_CPPFLAGS = -I$(srcdir)/..
|
||||||
|
SUBOBJS = spell.o regis.o
|
||||||
|
EXTRA_CLEAN = SUBSYS.o $(SUBOBJS)
|
||||||
|
|
||||||
|
ifdef USE_PGXS
|
||||||
|
PGXS = $(shell pg_config --pgxs)
|
||||||
|
include $(PGXS)
|
||||||
|
else
|
||||||
|
subdir = contrib/tsearch2
|
||||||
top_builddir = ../../..
|
top_builddir = ../../..
|
||||||
include $(top_builddir)/src/Makefile.global
|
include $(top_builddir)/src/Makefile.global
|
||||||
|
include $(top_srcdir)/contrib/contrib-global.mk
|
||||||
|
endif
|
||||||
|
|
||||||
|
|
||||||
PG_CPPFLAGS = -I$(srcdir)/.. $(CPPFLAGS)
|
|
||||||
override CFLAGS += $(CFLAGS_SL)
|
override CFLAGS += $(CFLAGS_SL)
|
||||||
|
|
||||||
SUBOBJS = spell.o regis.o
|
|
||||||
|
|
||||||
all: SUBSYS.o
|
all: SUBSYS.o
|
||||||
|
|
||||||
SUBSYS.o: $(SUBOBJS)
|
SUBSYS.o: $(SUBOBJS)
|
||||||
$(LD) $(LDREL) $(LDOUT) $@ $^
|
$(LD) $(LDREL) $(LDOUT) $@ $^
|
||||||
|
|
||||||
EXTRA_CLEAN = SUBSYS.o $(SUBOBJS)
|
|
||||||
|
|
||||||
include $(top_srcdir)/contrib/contrib-global.mk
|
|
||||||
|
|||||||
@ -1,20 +1,25 @@
|
|||||||
# $PostgreSQL: pgsql/contrib/tsearch2/snowball/Makefile,v 1.5 2003/11/29 19:51:36 pgsql Exp $
|
# $PostgreSQL: pgsql/contrib/tsearch2/snowball/Makefile,v 1.6 2005/09/15 11:14:18 teodor Exp $
|
||||||
|
|
||||||
subdir = contrib/tsearch2/snowball
|
|
||||||
top_builddir = ../../..
|
|
||||||
include $(top_builddir)/src/Makefile.global
|
|
||||||
|
|
||||||
|
|
||||||
PG_CPPFLAGS = -I$(srcdir)/..
|
PG_CPPFLAGS = -I$(srcdir)/..
|
||||||
override CFLAGS += $(CFLAGS_SL)
|
|
||||||
|
|
||||||
SUBOBJS = english_stem.o api.o russian_stem.o utilities.o
|
SUBOBJS = english_stem.o api.o russian_stem.o utilities.o
|
||||||
|
EXTRA_CLEAN = SUBSYS.o $(SUBOBJS)
|
||||||
|
|
||||||
|
ifdef USE_PGXS
|
||||||
|
PGXS = $(shell pg_config --pgxs)
|
||||||
|
include $(PGXS)
|
||||||
|
else
|
||||||
|
subdir = contrib/tsearch2
|
||||||
|
top_builddir = ../../..
|
||||||
|
include $(top_builddir)/src/Makefile.global
|
||||||
|
include $(top_srcdir)/contrib/contrib-global.mk
|
||||||
|
endif
|
||||||
|
|
||||||
|
override CFLAGS += $(CFLAGS_SL)
|
||||||
|
|
||||||
all: SUBSYS.o
|
all: SUBSYS.o
|
||||||
|
|
||||||
SUBSYS.o: $(SUBOBJS)
|
SUBSYS.o: $(SUBOBJS)
|
||||||
$(LD) $(LDREL) $(LDOUT) $@ $^
|
$(LD) $(LDREL) $(LDOUT) $@ $^
|
||||||
|
|
||||||
EXTRA_CLEAN = SUBSYS.o $(SUBOBJS)
|
|
||||||
|
|
||||||
include $(top_srcdir)/contrib/contrib-global.mk
|
|
||||||
|
|||||||
@ -1,89 +1,69 @@
|
|||||||
#include <stdlib.h>
|
|
||||||
|
|
||||||
|
#include <stdlib.h> /* for calloc, free */
|
||||||
#include "header.h"
|
#include "header.h"
|
||||||
|
|
||||||
struct SN_env *
|
extern struct SN_env * SN_create_env(int S_size, int I_size, int B_size)
|
||||||
SN_create_env(int S_size, int I_size, int B_size)
|
|
||||||
{
|
{
|
||||||
struct SN_env *z = (struct SN_env *) calloc(1, sizeof(struct SN_env));
|
struct SN_env * z = (struct SN_env *) calloc(1, sizeof(struct SN_env));
|
||||||
struct SN_env *z2 = z;
|
if (z == NULL) return NULL;
|
||||||
|
z->p = create_s();
|
||||||
|
if (z->p == NULL) goto error;
|
||||||
|
if (S_size)
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
z->S = (symbol * *) calloc(S_size, sizeof(symbol *));
|
||||||
|
if (z->S == NULL) goto error;
|
||||||
|
|
||||||
if (!z)
|
for (i = 0; i < S_size; i++)
|
||||||
return z;
|
{
|
||||||
|
z->S[i] = create_s();
|
||||||
|
if (z->S[i] == NULL) goto error;
|
||||||
|
}
|
||||||
|
z->S_size = S_size;
|
||||||
|
}
|
||||||
|
|
||||||
z->p = create_s();
|
if (I_size)
|
||||||
if (!z->p)
|
{
|
||||||
z = NULL;
|
z->I = (int *) calloc(I_size, sizeof(int));
|
||||||
|
if (z->I == NULL) goto error;
|
||||||
|
z->I_size = I_size;
|
||||||
|
}
|
||||||
|
|
||||||
if (z && S_size)
|
if (B_size)
|
||||||
{
|
{
|
||||||
if ((z->S = (symbol * *) calloc(S_size, sizeof(symbol *))))
|
z->B = (symbol *) calloc(B_size, sizeof(symbol));
|
||||||
{
|
if (z->B == NULL) goto error;
|
||||||
int i;
|
z->B_size = B_size;
|
||||||
|
}
|
||||||
|
|
||||||
for (i = 0; i < S_size; i++)
|
return z;
|
||||||
{
|
error:
|
||||||
if (!(z->S[i] = create_s()))
|
SN_close_env(z);
|
||||||
{
|
return NULL;
|
||||||
z = NULL;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
z2->S_size = i;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
z = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (z && I_size)
|
|
||||||
{
|
|
||||||
z->I = (int *) calloc(I_size, sizeof(int));
|
|
||||||
if (z->I)
|
|
||||||
z->I_size = I_size;
|
|
||||||
else
|
|
||||||
z = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (z && B_size)
|
|
||||||
{
|
|
||||||
z->B = (symbol *) calloc(B_size, sizeof(symbol));
|
|
||||||
if (z->B)
|
|
||||||
z->B_size = B_size;
|
|
||||||
else
|
|
||||||
z = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!z)
|
|
||||||
SN_close_env(z2);
|
|
||||||
|
|
||||||
return z;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
extern void SN_close_env(struct SN_env * z)
|
||||||
SN_close_env(struct SN_env * z)
|
|
||||||
{
|
{
|
||||||
if (z->S && z->S_size)
|
if (z == NULL) return;
|
||||||
{
|
if (z->S_size)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
for (i = 0; i < z->S_size; i++)
|
||||||
for (i = 0; i < z->S_size; i++)
|
{
|
||||||
lose_s(z->S[i]);
|
lose_s(z->S[i]);
|
||||||
}
|
}
|
||||||
free(z->S);
|
free(z->S);
|
||||||
}
|
}
|
||||||
if (z->I_size)
|
if (z->I_size) free(z->I);
|
||||||
free(z->I);
|
if (z->B_size) free(z->B);
|
||||||
if (z->B_size)
|
if (z->p) lose_s(z->p);
|
||||||
free(z->B);
|
free(z);
|
||||||
if (z->p)
|
|
||||||
lose_s(z->p);
|
|
||||||
free(z);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
extern int SN_set_current(struct SN_env * z, int size, const symbol * s)
|
||||||
SN_set_current(struct SN_env * z, int size, const symbol * s)
|
|
||||||
{
|
{
|
||||||
replace_s(z, 0, z->l, size, s);
|
int err = replace_s(z, 0, z->l, size, s, NULL);
|
||||||
z->c = 0;
|
z->c = 0;
|
||||||
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -11,24 +11,17 @@ typedef unsigned char symbol;
|
|||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
struct SN_env
|
struct SN_env {
|
||||||
{
|
symbol * p;
|
||||||
symbol *p;
|
int c; int a; int l; int lb; int bra; int ket;
|
||||||
int c;
|
int S_size; int I_size; int B_size;
|
||||||
int a;
|
symbol * * S;
|
||||||
int l;
|
int * I;
|
||||||
int lb;
|
symbol * B;
|
||||||
int bra;
|
|
||||||
int ket;
|
|
||||||
int S_size;
|
|
||||||
int I_size;
|
|
||||||
int B_size;
|
|
||||||
symbol **S;
|
|
||||||
int *I;
|
|
||||||
symbol *B;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
extern struct SN_env *SN_create_env(int S_size, int I_size, int B_size);
|
extern struct SN_env * SN_create_env(int S_size, int I_size, int B_size);
|
||||||
extern void SN_close_env(struct SN_env * z);
|
extern void SN_close_env(struct SN_env * z);
|
||||||
|
|
||||||
extern void SN_set_current(struct SN_env * z, int size, const symbol * s);
|
extern int SN_set_current(struct SN_env * z, int size, const symbol * s);
|
||||||
|
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -1,7 +1,16 @@
|
|||||||
|
|
||||||
/* This file was generated automatically by the Snowball to ANSI C compiler */
|
/* This file was generated automatically by the Snowball to ANSI C compiler */
|
||||||
|
|
||||||
extern struct SN_env *english_create_env(void);
|
#ifdef __cplusplus
|
||||||
extern void english_close_env(struct SN_env * z);
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
extern struct SN_env * english_ISO_8859_1_create_env(void);
|
||||||
|
extern void english_ISO_8859_1_close_env(struct SN_env * z);
|
||||||
|
|
||||||
|
extern int english_ISO_8859_1_stem(struct SN_env * z);
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
extern int english_stem(struct SN_env * z);
|
|
||||||
|
|||||||
@ -1,51 +1,58 @@
|
|||||||
|
|
||||||
|
#include <limits.h>
|
||||||
|
|
||||||
#include "api.h"
|
#include "api.h"
|
||||||
|
|
||||||
|
#define MAXINT INT_MAX
|
||||||
|
#define MININT INT_MIN
|
||||||
|
|
||||||
#define HEAD 2*sizeof(int)
|
#define HEAD 2*sizeof(int)
|
||||||
|
|
||||||
#define SIZE(p) ((int *)(p))[-1]
|
#define SIZE(p) ((int *)(p))[-1]
|
||||||
#define SET_SIZE(p, n) ((int *)(p))[-1] = n
|
#define SET_SIZE(p, n) ((int *)(p))[-1] = n
|
||||||
#define CAPACITY(p) ((int *)(p))[-2]
|
#define CAPACITY(p) ((int *)(p))[-2]
|
||||||
|
|
||||||
struct among
|
struct among
|
||||||
{
|
{ int s_size; /* number of chars in string */
|
||||||
int s_size; /* number of chars in string */
|
symbol * s; /* search string */
|
||||||
symbol *s; /* search string */
|
int substring_i;/* index to longest matching substring */
|
||||||
int substring_i; /* index to longest matching substring */
|
int result; /* result of the lookup */
|
||||||
int result; /* result of the lookup */
|
int (* function)(struct SN_env *);
|
||||||
int (*function) (struct SN_env *);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
extern symbol *create_s(void);
|
extern symbol * create_s(void);
|
||||||
extern void lose_s(symbol * p);
|
extern void lose_s(symbol * p);
|
||||||
|
|
||||||
extern int in_grouping(struct SN_env * z, unsigned char *s, int min, int max);
|
extern int skip_utf8(const symbol * p, int c, int lb, int l, int n);
|
||||||
extern int in_grouping_b(struct SN_env * z, unsigned char *s, int min, int max);
|
|
||||||
extern int out_grouping(struct SN_env * z, unsigned char *s, int min, int max);
|
|
||||||
extern int out_grouping_b(struct SN_env * z, unsigned char *s, int min, int max);
|
|
||||||
|
|
||||||
extern int in_range(struct SN_env * z, int min, int max);
|
extern int in_grouping_U(struct SN_env * z, unsigned char * s, int min, int max);
|
||||||
extern int in_range_b(struct SN_env * z, int min, int max);
|
extern int in_grouping_b_U(struct SN_env * z, unsigned char * s, int min, int max);
|
||||||
extern int out_range(struct SN_env * z, int min, int max);
|
extern int out_grouping_U(struct SN_env * z, unsigned char * s, int min, int max);
|
||||||
extern int out_range_b(struct SN_env * z, int min, int max);
|
extern int out_grouping_b_U(struct SN_env * z, unsigned char * s, int min, int max);
|
||||||
|
|
||||||
extern int eq_s(struct SN_env * z, int s_size, symbol * s);
|
extern int in_grouping(struct SN_env * z, unsigned char * s, int min, int max);
|
||||||
extern int eq_s_b(struct SN_env * z, int s_size, symbol * s);
|
extern int in_grouping_b(struct SN_env * z, unsigned char * s, int min, int max);
|
||||||
extern int eq_v(struct SN_env * z, symbol * p);
|
extern int out_grouping(struct SN_env * z, unsigned char * s, int min, int max);
|
||||||
extern int eq_v_b(struct SN_env * z, symbol * p);
|
extern int out_grouping_b(struct SN_env * z, unsigned char * s, int min, int max);
|
||||||
|
|
||||||
extern int find_among(struct SN_env * z, struct among * v, int v_size);
|
extern int eq_s(struct SN_env * z, int s_size, symbol * s);
|
||||||
extern int find_among_b(struct SN_env * z, struct among * v, int v_size);
|
extern int eq_s_b(struct SN_env * z, int s_size, symbol * s);
|
||||||
|
extern int eq_v(struct SN_env * z, symbol * p);
|
||||||
|
extern int eq_v_b(struct SN_env * z, symbol * p);
|
||||||
|
|
||||||
extern symbol *increase_size(symbol * p, int n);
|
extern int find_among(struct SN_env * z, struct among * v, int v_size);
|
||||||
extern int replace_s(struct SN_env * z, int c_bra, int c_ket, int s_size, const symbol * s);
|
extern int find_among_b(struct SN_env * z, struct among * v, int v_size);
|
||||||
extern void slice_from_s(struct SN_env * z, int s_size, symbol * s);
|
|
||||||
extern void slice_from_v(struct SN_env * z, symbol * p);
|
|
||||||
extern void slice_del(struct SN_env * z);
|
|
||||||
|
|
||||||
extern void insert_s(struct SN_env * z, int bra, int ket, int s_size, symbol * s);
|
extern int replace_s(struct SN_env * z, int c_bra, int c_ket, int s_size, const symbol * s, int * adjustment);
|
||||||
extern void insert_v(struct SN_env * z, int bra, int ket, symbol * p);
|
extern int slice_from_s(struct SN_env * z, int s_size, symbol * s);
|
||||||
|
extern int slice_from_v(struct SN_env * z, symbol * p);
|
||||||
|
extern int slice_del(struct SN_env * z);
|
||||||
|
|
||||||
extern symbol *slice_to(struct SN_env * z, symbol * p);
|
extern int insert_s(struct SN_env * z, int bra, int ket, int s_size, symbol * s);
|
||||||
extern symbol *assign_to(struct SN_env * z, symbol * p);
|
extern int insert_v(struct SN_env * z, int bra, int ket, symbol * p);
|
||||||
|
|
||||||
|
extern symbol * slice_to(struct SN_env * z, symbol * p);
|
||||||
|
extern symbol * assign_to(struct SN_env * z, symbol * p);
|
||||||
|
|
||||||
extern void debug(struct SN_env * z, int number, int line_count);
|
extern void debug(struct SN_env * z, int number, int line_count);
|
||||||
|
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -1,7 +1,16 @@
|
|||||||
|
|
||||||
/* This file was generated automatically by the Snowball to ANSI C compiler */
|
/* This file was generated automatically by the Snowball to ANSI C compiler */
|
||||||
|
|
||||||
extern struct SN_env *russian_create_env(void);
|
#ifdef __cplusplus
|
||||||
extern void russian_close_env(struct SN_env * z);
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
extern struct SN_env * russian_KOI8_R_create_env(void);
|
||||||
|
extern void russian_KOI8_R_close_env(struct SN_env * z);
|
||||||
|
|
||||||
|
extern int russian_KOI8_R_stem(struct SN_env * z);
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
extern int russian_stem(struct SN_env * z);
|
|
||||||
|
|||||||
@ -9,510 +9,438 @@
|
|||||||
|
|
||||||
#define CREATE_SIZE 1
|
#define CREATE_SIZE 1
|
||||||
|
|
||||||
symbol *
|
extern symbol * create_s(void) {
|
||||||
create_s(void)
|
symbol * p;
|
||||||
{
|
void * mem = malloc(HEAD + (CREATE_SIZE + 1) * sizeof(symbol));
|
||||||
symbol *p = (symbol *) (HEAD + (char *) malloc(HEAD + (CREATE_SIZE + 1) * sizeof(symbol)));
|
if (mem == NULL) return NULL;
|
||||||
|
p = (symbol *) (HEAD + (char *) mem);
|
||||||
if (p == (symbol *) (HEAD))
|
CAPACITY(p) = CREATE_SIZE;
|
||||||
return NULL;
|
SET_SIZE(p, CREATE_SIZE);
|
||||||
CAPACITY(p) = CREATE_SIZE;
|
return p;
|
||||||
SET_SIZE(p, CREATE_SIZE);
|
|
||||||
return p;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
extern void lose_s(symbol * p) {
|
||||||
lose_s(symbol * p)
|
if (p == NULL) return;
|
||||||
{
|
free((char *) p - HEAD);
|
||||||
free((char *) p - HEAD);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
/*
|
||||||
in_grouping(struct SN_env * z, unsigned char *s, int min, int max)
|
new_p = X_skip_utf8(p, c, lb, l, n); skips n characters forwards from p + c
|
||||||
{
|
if n +ve, or n characters backwards from p +c - 1 if n -ve. new_p is the new
|
||||||
if (z->c >= z->l)
|
position, or 0 on failure.
|
||||||
return 0;
|
|
||||||
{
|
|
||||||
int ch = z->p[z->c];
|
|
||||||
|
|
||||||
if
|
-- used to implement hop and next in the utf8 case.
|
||||||
(ch > max || (ch -= min) < 0 ||
|
*/
|
||||||
(s[ch >> 3] & (0X1 << (ch & 0X7))) == 0)
|
|
||||||
return 0;
|
extern int skip_utf8(const symbol * p, int c, int lb, int l, int n) {
|
||||||
}
|
int b;
|
||||||
z->c++;
|
if (n >= 0) {
|
||||||
return 1;
|
for (; n > 0; n--) {
|
||||||
|
if (c >= l) return -1;
|
||||||
|
b = p[c++];
|
||||||
|
if (b >= 0xC0) { /* 1100 0000 */
|
||||||
|
while (c < l) {
|
||||||
|
b = p[c];
|
||||||
|
if (b >= 0xC0 || b < 0x80) break;
|
||||||
|
/* break unless b is 10------ */
|
||||||
|
c++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
for (; n < 0; n++) {
|
||||||
|
if (c <= lb) return -1;
|
||||||
|
b = p[--c];
|
||||||
|
if (b >= 0x80) { /* 1000 0000 */
|
||||||
|
while (c > lb) {
|
||||||
|
b = p[c];
|
||||||
|
if (b >= 0xC0) break; /* 1100 0000 */
|
||||||
|
c--;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return c;
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
/* Code for character groupings: utf8 cases */
|
||||||
in_grouping_b(struct SN_env * z, unsigned char *s, int min, int max)
|
|
||||||
{
|
|
||||||
if (z->c <= z->lb)
|
|
||||||
return 0;
|
|
||||||
{
|
|
||||||
int ch = z->p[z->c - 1];
|
|
||||||
|
|
||||||
if
|
static int get_utf8(const symbol * p, int c, int l, int * slot) {
|
||||||
(ch > max || (ch -= min) < 0 ||
|
int b0, b1;
|
||||||
(s[ch >> 3] & (0X1 << (ch & 0X7))) == 0)
|
if (c >= l) return 0;
|
||||||
return 0;
|
b0 = p[c++];
|
||||||
}
|
if (b0 < 0xC0 || c == l) { /* 1100 0000 */
|
||||||
z->c--;
|
* slot = b0; return 1;
|
||||||
return 1;
|
}
|
||||||
|
b1 = p[c++];
|
||||||
|
if (b0 < 0xE0 || c == l) { /* 1110 0000 */
|
||||||
|
* slot = (b0 & 0x1F) << 6 | (b1 & 0x3F); return 2;
|
||||||
|
}
|
||||||
|
* slot = (b0 & 0xF) << 12 | (b1 & 0x3F) << 6 | (*p & 0x3F); return 3;
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
static int get_b_utf8(const symbol * p, int c, int lb, int * slot) {
|
||||||
out_grouping(struct SN_env * z, unsigned char *s, int min, int max)
|
int b0, b1;
|
||||||
{
|
if (c <= lb) return 0;
|
||||||
if (z->c >= z->l)
|
b0 = p[--c];
|
||||||
return 0;
|
if (b0 < 0x80 || c == lb) { /* 1000 0000 */
|
||||||
{
|
* slot = b0; return 1;
|
||||||
int ch = z->p[z->c];
|
}
|
||||||
|
b1 = p[--c];
|
||||||
unless
|
if (b1 >= 0xC0 || c == lb) { /* 1100 0000 */
|
||||||
(ch > max || (ch -= min) < 0 ||
|
* slot = (b1 & 0x1F) << 6 | (b0 & 0x3F); return 2;
|
||||||
(s[ch >> 3] & (0X1 << (ch & 0X7))) == 0) return 0;
|
}
|
||||||
}
|
* slot = (*p & 0xF) << 12 | (b1 & 0x3F) << 6 | (b0 & 0x3F); return 3;
|
||||||
z->c++;
|
|
||||||
return 1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
extern int in_grouping_U(struct SN_env * z, unsigned char * s, int min, int max) {
|
||||||
out_grouping_b(struct SN_env * z, unsigned char *s, int min, int max)
|
int ch;
|
||||||
{
|
int w = get_utf8(z->p, z->c, z->l, & ch);
|
||||||
if (z->c <= z->lb)
|
unless (w) return 0;
|
||||||
return 0;
|
if (ch > max || (ch -= min) < 0 || (s[ch >> 3] & (0X1 << (ch & 0X7))) == 0) return 0;
|
||||||
{
|
z->c += w; return 1;
|
||||||
int ch = z->p[z->c - 1];
|
|
||||||
|
|
||||||
unless
|
|
||||||
(ch > max || (ch -= min) < 0 ||
|
|
||||||
(s[ch >> 3] & (0X1 << (ch & 0X7))) == 0) return 0;
|
|
||||||
}
|
|
||||||
z->c--;
|
|
||||||
return 1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
extern int in_grouping_b_U(struct SN_env * z, unsigned char * s, int min, int max) {
|
||||||
int
|
int ch;
|
||||||
in_range(struct SN_env * z, int min, int max)
|
int w = get_b_utf8(z->p, z->c, z->lb, & ch);
|
||||||
{
|
unless (w) return 0;
|
||||||
if (z->c >= z->l)
|
if (ch > max || (ch -= min) < 0 || (s[ch >> 3] & (0X1 << (ch & 0X7))) == 0) return 0;
|
||||||
return 0;
|
z->c -= w; return 1;
|
||||||
{
|
|
||||||
int ch = z->p[z->c];
|
|
||||||
|
|
||||||
if
|
|
||||||
(ch > max || ch < min)
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
z->c++;
|
|
||||||
return 1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
extern int out_grouping_U(struct SN_env * z, unsigned char * s, int min, int max) {
|
||||||
in_range_b(struct SN_env * z, int min, int max)
|
int ch;
|
||||||
{
|
int w = get_utf8(z->p, z->c, z->l, & ch);
|
||||||
if (z->c <= z->lb)
|
unless (w) return 0;
|
||||||
return 0;
|
unless (ch > max || (ch -= min) < 0 || (s[ch >> 3] & (0X1 << (ch & 0X7))) == 0) return 0;
|
||||||
{
|
z->c += w; return 1;
|
||||||
int ch = z->p[z->c - 1];
|
|
||||||
|
|
||||||
if
|
|
||||||
(ch > max || ch < min)
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
z->c--;
|
|
||||||
return 1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
extern int out_grouping_b_U(struct SN_env * z, unsigned char * s, int min, int max) {
|
||||||
out_range(struct SN_env * z, int min, int max)
|
int ch;
|
||||||
{
|
int w = get_b_utf8(z->p, z->c, z->lb, & ch);
|
||||||
if (z->c >= z->l)
|
unless (w) return 0;
|
||||||
return 0;
|
unless (ch > max || (ch -= min) < 0 || (s[ch >> 3] & (0X1 << (ch & 0X7))) == 0) return 0;
|
||||||
{
|
z->c -= w; return 1;
|
||||||
int ch = z->p[z->c];
|
|
||||||
|
|
||||||
unless
|
|
||||||
(ch > max || ch < min) return 0;
|
|
||||||
}
|
|
||||||
z->c++;
|
|
||||||
return 1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
/* Code for character groupings: non-utf8 cases */
|
||||||
out_range_b(struct SN_env * z, int min, int max)
|
|
||||||
{
|
|
||||||
if (z->c <= z->lb)
|
|
||||||
return 0;
|
|
||||||
{
|
|
||||||
int ch = z->p[z->c - 1];
|
|
||||||
|
|
||||||
unless
|
extern int in_grouping(struct SN_env * z, unsigned char * s, int min, int max) {
|
||||||
(ch > max || ch < min) return 0;
|
int ch;
|
||||||
}
|
if (z->c >= z->l) return 0;
|
||||||
z->c--;
|
ch = z->p[z->c];
|
||||||
return 1;
|
if (ch > max || (ch -= min) < 0 || (s[ch >> 3] & (0X1 << (ch & 0X7))) == 0) return 0;
|
||||||
|
z->c++; return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
extern int in_grouping_b(struct SN_env * z, unsigned char * s, int min, int max) {
|
||||||
eq_s(struct SN_env * z, int s_size, symbol * s)
|
int ch;
|
||||||
{
|
if (z->c <= z->lb) return 0;
|
||||||
if (z->l - z->c < s_size ||
|
ch = z->p[z->c - 1];
|
||||||
memcmp(z->p + z->c, s, s_size * sizeof(symbol)) != 0)
|
if (ch > max || (ch -= min) < 0 || (s[ch >> 3] & (0X1 << (ch & 0X7))) == 0) return 0;
|
||||||
return 0;
|
z->c--; return 1;
|
||||||
z->c += s_size;
|
|
||||||
return 1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
extern int out_grouping(struct SN_env * z, unsigned char * s, int min, int max) {
|
||||||
eq_s_b(struct SN_env * z, int s_size, symbol * s)
|
int ch;
|
||||||
{
|
if (z->c >= z->l) return 0;
|
||||||
if (z->c - z->lb < s_size ||
|
ch = z->p[z->c];
|
||||||
memcmp(z->p + z->c - s_size, s, s_size * sizeof(symbol)) != 0)
|
unless (ch > max || (ch -= min) < 0 || (s[ch >> 3] & (0X1 << (ch & 0X7))) == 0) return 0;
|
||||||
return 0;
|
z->c++; return 1;
|
||||||
z->c -= s_size;
|
|
||||||
return 1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
extern int out_grouping_b(struct SN_env * z, unsigned char * s, int min, int max) {
|
||||||
eq_v(struct SN_env * z, symbol * p)
|
int ch;
|
||||||
{
|
if (z->c <= z->lb) return 0;
|
||||||
return eq_s(z, SIZE(p), p);
|
ch = z->p[z->c - 1];
|
||||||
|
unless (ch > max || (ch -= min) < 0 || (s[ch >> 3] & (0X1 << (ch & 0X7))) == 0) return 0;
|
||||||
|
z->c--; return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
extern int eq_s(struct SN_env * z, int s_size, symbol * s) {
|
||||||
eq_v_b(struct SN_env * z, symbol * p)
|
if (z->l - z->c < s_size || memcmp(z->p + z->c, s, s_size * sizeof(symbol)) != 0) return 0;
|
||||||
{
|
z->c += s_size; return 1;
|
||||||
return eq_s_b(z, SIZE(p), p);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
extern int eq_s_b(struct SN_env * z, int s_size, symbol * s) {
|
||||||
find_among(struct SN_env * z, struct among * v, int v_size)
|
if (z->c - z->lb < s_size || memcmp(z->p + z->c - s_size, s, s_size * sizeof(symbol)) != 0) return 0;
|
||||||
{
|
z->c -= s_size; return 1;
|
||||||
int i = 0;
|
}
|
||||||
int j = v_size;
|
|
||||||
|
|
||||||
int c = z->c;
|
extern int eq_v(struct SN_env * z, symbol * p) {
|
||||||
int l = z->l;
|
return eq_s(z, SIZE(p), p);
|
||||||
symbol *q = z->p + c;
|
}
|
||||||
|
|
||||||
struct among *w;
|
extern int eq_v_b(struct SN_env * z, symbol * p) {
|
||||||
|
return eq_s_b(z, SIZE(p), p);
|
||||||
|
}
|
||||||
|
|
||||||
int common_i = 0;
|
extern int find_among(struct SN_env * z, struct among * v, int v_size) {
|
||||||
int common_j = 0;
|
|
||||||
|
|
||||||
int first_key_inspected = 0;
|
int i = 0;
|
||||||
|
int j = v_size;
|
||||||
|
|
||||||
while (1)
|
int c = z->c; int l = z->l;
|
||||||
{
|
symbol * q = z->p + c;
|
||||||
int k = i + ((j - i) >> 1);
|
|
||||||
int diff = 0;
|
|
||||||
int common = common_i < common_j ? common_i : common_j; /* smaller */
|
|
||||||
|
|
||||||
w = v + k;
|
struct among * w;
|
||||||
{
|
|
||||||
int i;
|
|
||||||
|
|
||||||
for (i = common; i < w->s_size; i++)
|
int common_i = 0;
|
||||||
{
|
int common_j = 0;
|
||||||
if (c + common == l)
|
|
||||||
{
|
|
||||||
diff = -1;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
diff = q[common] - w->s[i];
|
|
||||||
if (diff != 0)
|
|
||||||
break;
|
|
||||||
common++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (diff < 0)
|
|
||||||
{
|
|
||||||
j = k;
|
|
||||||
common_j = common;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
i = k;
|
|
||||||
common_i = common;
|
|
||||||
}
|
|
||||||
if (j - i <= 1)
|
|
||||||
{
|
|
||||||
if (i > 0)
|
|
||||||
break; /* v->s has been inspected */
|
|
||||||
if (j == i)
|
|
||||||
break; /* only one item in v */
|
|
||||||
|
|
||||||
/*
|
int first_key_inspected = 0;
|
||||||
* - but now we need to go round once more to get v->s
|
|
||||||
* inspected. This looks messy, but is actually the optimal
|
|
||||||
* approach.
|
|
||||||
*/
|
|
||||||
|
|
||||||
if (first_key_inspected)
|
while(1) {
|
||||||
break;
|
int k = i + ((j - i) >> 1);
|
||||||
first_key_inspected = 1;
|
int diff = 0;
|
||||||
}
|
int common = common_i < common_j ? common_i : common_j; /* smaller */
|
||||||
}
|
w = v + k;
|
||||||
while (1)
|
{
|
||||||
{
|
int i; for (i = common; i < w->s_size; i++) {
|
||||||
w = v + i;
|
if (c + common == l) { diff = -1; break; }
|
||||||
if (common_i >= w->s_size)
|
diff = q[common] - w->s[i];
|
||||||
{
|
if (diff != 0) break;
|
||||||
z->c = c + w->s_size;
|
common++;
|
||||||
if (w->function == 0)
|
}
|
||||||
return w->result;
|
}
|
||||||
{
|
if (diff < 0) { j = k; common_j = common; }
|
||||||
int res = w->function(z);
|
else { i = k; common_i = common; }
|
||||||
|
if (j - i <= 1) {
|
||||||
|
if (i > 0) break; /* v->s has been inspected */
|
||||||
|
if (j == i) break; /* only one item in v */
|
||||||
|
|
||||||
z->c = c + w->s_size;
|
/* - but now we need to go round once more to get
|
||||||
if (res)
|
v->s inspected. This looks messy, but is actually
|
||||||
return w->result;
|
the optimal approach. */
|
||||||
}
|
|
||||||
}
|
if (first_key_inspected) break;
|
||||||
i = w->substring_i;
|
first_key_inspected = 1;
|
||||||
if (i < 0)
|
}
|
||||||
return 0;
|
}
|
||||||
}
|
while(1) {
|
||||||
|
w = v + i;
|
||||||
|
if (common_i >= w->s_size) {
|
||||||
|
z->c = c + w->s_size;
|
||||||
|
if (w->function == 0) return w->result;
|
||||||
|
{
|
||||||
|
int res = w->function(z);
|
||||||
|
z->c = c + w->s_size;
|
||||||
|
if (res) return w->result;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
i = w->substring_i;
|
||||||
|
if (i < 0) return 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* find_among_b is for backwards processing. Same comments apply */
|
/* find_among_b is for backwards processing. Same comments apply */
|
||||||
|
|
||||||
int
|
extern int find_among_b(struct SN_env * z, struct among * v, int v_size) {
|
||||||
find_among_b(struct SN_env * z, struct among * v, int v_size)
|
|
||||||
{
|
|
||||||
int i = 0;
|
|
||||||
int j = v_size;
|
|
||||||
|
|
||||||
int c = z->c;
|
int i = 0;
|
||||||
int lb = z->lb;
|
int j = v_size;
|
||||||
symbol *q = z->p + c - 1;
|
|
||||||
|
|
||||||
struct among *w;
|
int c = z->c; int lb = z->lb;
|
||||||
|
symbol * q = z->p + c - 1;
|
||||||
|
|
||||||
int common_i = 0;
|
struct among * w;
|
||||||
int common_j = 0;
|
|
||||||
|
|
||||||
int first_key_inspected = 0;
|
int common_i = 0;
|
||||||
|
int common_j = 0;
|
||||||
|
|
||||||
while (1)
|
int first_key_inspected = 0;
|
||||||
{
|
|
||||||
int k = i + ((j - i) >> 1);
|
|
||||||
int diff = 0;
|
|
||||||
int common = common_i < common_j ? common_i : common_j;
|
|
||||||
|
|
||||||
w = v + k;
|
while(1) {
|
||||||
{
|
int k = i + ((j - i) >> 1);
|
||||||
int i;
|
int diff = 0;
|
||||||
|
int common = common_i < common_j ? common_i : common_j;
|
||||||
for (i = w->s_size - 1 - common; i >= 0; i--)
|
w = v + k;
|
||||||
{
|
{
|
||||||
if (c - common == lb)
|
int i; for (i = w->s_size - 1 - common; i >= 0; i--) {
|
||||||
{
|
if (c - common == lb) { diff = -1; break; }
|
||||||
diff = -1;
|
diff = q[- common] - w->s[i];
|
||||||
break;
|
if (diff != 0) break;
|
||||||
}
|
common++;
|
||||||
diff = q[-common] - w->s[i];
|
}
|
||||||
if (diff != 0)
|
}
|
||||||
break;
|
if (diff < 0) { j = k; common_j = common; }
|
||||||
common++;
|
else { i = k; common_i = common; }
|
||||||
}
|
if (j - i <= 1) {
|
||||||
}
|
if (i > 0) break;
|
||||||
if (diff < 0)
|
if (j == i) break;
|
||||||
{
|
if (first_key_inspected) break;
|
||||||
j = k;
|
first_key_inspected = 1;
|
||||||
common_j = common;
|
}
|
||||||
}
|
}
|
||||||
else
|
while(1) {
|
||||||
{
|
w = v + i;
|
||||||
i = k;
|
if (common_i >= w->s_size) {
|
||||||
common_i = common;
|
z->c = c - w->s_size;
|
||||||
}
|
if (w->function == 0) return w->result;
|
||||||
if (j - i <= 1)
|
{
|
||||||
{
|
int res = w->function(z);
|
||||||
if (i > 0)
|
z->c = c - w->s_size;
|
||||||
break;
|
if (res) return w->result;
|
||||||
if (j == i)
|
}
|
||||||
break;
|
}
|
||||||
if (first_key_inspected)
|
i = w->substring_i;
|
||||||
break;
|
if (i < 0) return 0;
|
||||||
first_key_inspected = 1;
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
while (1)
|
|
||||||
{
|
|
||||||
w = v + i;
|
|
||||||
if (common_i >= w->s_size)
|
|
||||||
{
|
|
||||||
z->c = c - w->s_size;
|
|
||||||
if (w->function == 0)
|
|
||||||
return w->result;
|
|
||||||
{
|
|
||||||
int res = w->function(z);
|
|
||||||
|
|
||||||
z->c = c - w->s_size;
|
|
||||||
if (res)
|
|
||||||
return w->result;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
i = w->substring_i;
|
|
||||||
if (i < 0)
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
symbol *
|
/* Increase the size of the buffer pointed to by p to at least n symbols.
|
||||||
increase_size(symbol * p, int n)
|
* If insufficient memory, returns NULL and frees the old buffer.
|
||||||
{
|
*/
|
||||||
int new_size = n + 20;
|
static symbol * increase_size(symbol * p, int n) {
|
||||||
symbol *q = (symbol *) (HEAD + (char *) malloc(HEAD + (new_size + 1) * sizeof(symbol)));
|
symbol * q;
|
||||||
|
int new_size = n + 20;
|
||||||
CAPACITY(q) = new_size;
|
void * mem = realloc((char *) p - HEAD,
|
||||||
memmove(q, p, CAPACITY(p) * sizeof(symbol));
|
HEAD + (new_size + 1) * sizeof(symbol));
|
||||||
lose_s(p);
|
if (mem == NULL) {
|
||||||
return q;
|
lose_s(p);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
q = (symbol *) (HEAD + (char *)mem);
|
||||||
|
CAPACITY(q) = new_size;
|
||||||
|
return q;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* to replace symbols between c_bra and c_ket in z->p by the
|
/* to replace symbols between c_bra and c_ket in z->p by the
|
||||||
s_size symbols at s
|
s_size symbols at s.
|
||||||
|
Returns 0 on success, -1 on error.
|
||||||
|
Also, frees z->p (and sets it to NULL) on error.
|
||||||
*/
|
*/
|
||||||
|
extern int replace_s(struct SN_env * z, int c_bra, int c_ket, int s_size, const symbol * s, int * adjptr)
|
||||||
int
|
|
||||||
replace_s(struct SN_env * z, int c_bra, int c_ket, int s_size, const symbol * s)
|
|
||||||
{
|
{
|
||||||
int adjustment = s_size - (c_ket - c_bra);
|
int adjustment;
|
||||||
int len = SIZE(z->p);
|
int len;
|
||||||
|
if (z->p == NULL) {
|
||||||
if (adjustment != 0)
|
z->p = create_s();
|
||||||
{
|
if (z->p == NULL) return -1;
|
||||||
if (adjustment + len > CAPACITY(z->p))
|
}
|
||||||
z->p = increase_size(z->p, adjustment + len);
|
adjustment = s_size - (c_ket - c_bra);
|
||||||
memmove(z->p + c_ket + adjustment, z->p + c_ket, (len - c_ket) * sizeof(symbol));
|
len = SIZE(z->p);
|
||||||
SET_SIZE(z->p, adjustment + len);
|
if (adjustment != 0) {
|
||||||
z->l += adjustment;
|
if (adjustment + len > CAPACITY(z->p)) {
|
||||||
if (z->c >= c_ket)
|
z->p = increase_size(z->p, adjustment + len);
|
||||||
z->c += adjustment;
|
if (z->p == NULL) return -1;
|
||||||
else if (z->c > c_bra)
|
}
|
||||||
z->c = c_bra;
|
memmove(z->p + c_ket + adjustment,
|
||||||
}
|
z->p + c_ket,
|
||||||
unless(s_size == 0) memmove(z->p + c_bra, s, s_size * sizeof(symbol));
|
(len - c_ket) * sizeof(symbol));
|
||||||
return adjustment;
|
SET_SIZE(z->p, adjustment + len);
|
||||||
|
z->l += adjustment;
|
||||||
|
if (z->c >= c_ket)
|
||||||
|
z->c += adjustment;
|
||||||
|
else
|
||||||
|
if (z->c > c_bra)
|
||||||
|
z->c = c_bra;
|
||||||
|
}
|
||||||
|
unless (s_size == 0) memmove(z->p + c_bra, s, s_size * sizeof(symbol));
|
||||||
|
if (adjptr != NULL)
|
||||||
|
*adjptr = adjustment;
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static int slice_check(struct SN_env * z) {
|
||||||
slice_check(struct SN_env * z)
|
|
||||||
{
|
if (z->bra < 0 ||
|
||||||
if (!(0 <= z->bra &&
|
z->bra > z->ket ||
|
||||||
z->bra <= z->ket &&
|
z->ket > z->l ||
|
||||||
z->ket <= z->l &&
|
z->p == NULL ||
|
||||||
z->l <= SIZE(z->p))) /* this line could be removed */
|
z->l > SIZE(z->p)) /* this line could be removed */
|
||||||
{
|
{
|
||||||
fprintf(stderr, "faulty slice operation:\n");
|
#if 0
|
||||||
debug(z, -1, 0);
|
fprintf(stderr, "faulty slice operation:\n");
|
||||||
exit(1);
|
debug(z, -1, 0);
|
||||||
}
|
#endif
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
extern int slice_from_s(struct SN_env * z, int s_size, symbol * s) {
|
||||||
slice_from_s(struct SN_env * z, int s_size, symbol * s)
|
if (slice_check(z)) return -1;
|
||||||
{
|
return replace_s(z, z->bra, z->ket, s_size, s, NULL);
|
||||||
slice_check(z);
|
|
||||||
replace_s(z, z->bra, z->ket, s_size, s);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
extern int slice_from_v(struct SN_env * z, symbol * p) {
|
||||||
slice_from_v(struct SN_env * z, symbol * p)
|
return slice_from_s(z, SIZE(p), p);
|
||||||
{
|
|
||||||
slice_from_s(z, SIZE(p), p);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
extern int slice_del(struct SN_env * z) {
|
||||||
slice_del(struct SN_env * z)
|
return slice_from_s(z, 0, 0);
|
||||||
{
|
|
||||||
slice_from_s(z, 0, NULL);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
extern int insert_s(struct SN_env * z, int bra, int ket, int s_size, symbol * s) {
|
||||||
insert_s(struct SN_env * z, int bra, int ket, int s_size, symbol * s)
|
int adjustment;
|
||||||
{
|
if (replace_s(z, bra, ket, s_size, s, &adjustment))
|
||||||
int adjustment = replace_s(z, bra, ket, s_size, s);
|
return -1;
|
||||||
|
if (bra <= z->bra) z->bra += adjustment;
|
||||||
if (bra <= z->bra)
|
if (bra <= z->ket) z->ket += adjustment;
|
||||||
z->bra += adjustment;
|
return 0;
|
||||||
if (bra <= z->ket)
|
|
||||||
z->ket += adjustment;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
extern int insert_v(struct SN_env * z, int bra, int ket, symbol * p) {
|
||||||
insert_v(struct SN_env * z, int bra, int ket, symbol * p)
|
int adjustment;
|
||||||
{
|
if (replace_s(z, bra, ket, SIZE(p), p, &adjustment))
|
||||||
int adjustment = replace_s(z, bra, ket, SIZE(p), p);
|
return -1;
|
||||||
|
if (bra <= z->bra) z->bra += adjustment;
|
||||||
if (bra <= z->bra)
|
if (bra <= z->ket) z->ket += adjustment;
|
||||||
z->bra += adjustment;
|
return 0;
|
||||||
if (bra <= z->ket)
|
|
||||||
z->ket += adjustment;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
symbol *
|
extern symbol * slice_to(struct SN_env * z, symbol * p) {
|
||||||
slice_to(struct SN_env * z, symbol * p)
|
if (slice_check(z)) {
|
||||||
{
|
lose_s(p);
|
||||||
slice_check(z);
|
return NULL;
|
||||||
{
|
}
|
||||||
int len = z->ket - z->bra;
|
{
|
||||||
|
int len = z->ket - z->bra;
|
||||||
if (CAPACITY(p) < len)
|
if (CAPACITY(p) < len) {
|
||||||
p = increase_size(p, len);
|
p = increase_size(p, len);
|
||||||
memmove(p, z->p + z->bra, len * sizeof(symbol));
|
if (p == NULL)
|
||||||
SET_SIZE(p, len);
|
return NULL;
|
||||||
}
|
}
|
||||||
return p;
|
memmove(p, z->p + z->bra, len * sizeof(symbol));
|
||||||
|
SET_SIZE(p, len);
|
||||||
|
}
|
||||||
|
return p;
|
||||||
}
|
}
|
||||||
|
|
||||||
symbol *
|
extern symbol * assign_to(struct SN_env * z, symbol * p) {
|
||||||
assign_to(struct SN_env * z, symbol * p)
|
int len = z->l;
|
||||||
{
|
if (CAPACITY(p) < len) {
|
||||||
int len = z->l;
|
p = increase_size(p, len);
|
||||||
|
if (p == NULL)
|
||||||
if (CAPACITY(p) < len)
|
return NULL;
|
||||||
p = increase_size(p, len);
|
}
|
||||||
memmove(p, z->p, len * sizeof(symbol));
|
memmove(p, z->p, len * sizeof(symbol));
|
||||||
SET_SIZE(p, len);
|
SET_SIZE(p, len);
|
||||||
return p;
|
return p;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
#if 0
|
||||||
debug(struct SN_env * z, int number, int line_count)
|
extern void debug(struct SN_env * z, int number, int line_count) {
|
||||||
{
|
int i;
|
||||||
int i;
|
int limit = SIZE(z->p);
|
||||||
int limit = SIZE(z->p);
|
/*if (number >= 0) printf("%3d (line %4d): '", number, line_count);*/
|
||||||
|
if (number >= 0) printf("%3d (line %4d): [%d]'", number, line_count,limit);
|
||||||
/* if (number >= 0) printf("%3d (line %4d): '", number, line_count); */
|
for (i = 0; i <= limit; i++) {
|
||||||
if (number >= 0)
|
if (z->lb == i) printf("{");
|
||||||
printf("%3d (line %4d): [%d]'", number, line_count, limit);
|
if (z->bra == i) printf("[");
|
||||||
for (i = 0; i <= limit; i++)
|
if (z->c == i) printf("|");
|
||||||
{
|
if (z->ket == i) printf("]");
|
||||||
if (z->lb == i)
|
if (z->l == i) printf("}");
|
||||||
printf("{");
|
if (i < limit)
|
||||||
if (z->bra == i)
|
{ int ch = z->p[i];
|
||||||
printf("[");
|
if (ch == 0) ch = '#';
|
||||||
if (z->c == i)
|
printf("%c", ch);
|
||||||
printf("|");
|
}
|
||||||
if (z->ket == i)
|
}
|
||||||
printf("]");
|
printf("'\n");
|
||||||
if (z->l == i)
|
|
||||||
printf("}");
|
|
||||||
if (i < limit)
|
|
||||||
{
|
|
||||||
int ch = z->p[i];
|
|
||||||
|
|
||||||
if (ch == 0)
|
|
||||||
ch = '#';
|
|
||||||
printf("%c", ch);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
printf("'\n");
|
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|||||||
@ -1,14 +1,21 @@
|
|||||||
# $PostgreSQL: pgsql/contrib/tsearch2/wordparser/Makefile,v 1.5 2003/11/29 19:51:36 pgsql Exp $
|
# $PostgreSQL: pgsql/contrib/tsearch2/wordparser/Makefile,v 1.6 2005/09/15 11:14:18 teodor Exp $
|
||||||
|
|
||||||
subdir = contrib/tsearch2/wordparser
|
|
||||||
top_builddir = ../../..
|
|
||||||
include $(top_builddir)/src/Makefile.global
|
|
||||||
|
|
||||||
|
|
||||||
PG_CPPFLAGS = -I$(srcdir)/..
|
PG_CPPFLAGS = -I$(srcdir)/..
|
||||||
override CFLAGS += $(CFLAGS_SL)
|
|
||||||
|
|
||||||
SUBOBJS = parser.o deflex.o
|
SUBOBJS = parser.o deflex.o
|
||||||
|
EXTRA_CLEAN = SUBSYS.o $(SUBOBJS) parser.c
|
||||||
|
|
||||||
|
ifdef USE_PGXS
|
||||||
|
PGXS = $(shell pg_config --pgxs)
|
||||||
|
include $(PGXS)
|
||||||
|
else
|
||||||
|
subdir = contrib/tsearch2
|
||||||
|
top_builddir = ../../..
|
||||||
|
include $(top_builddir)/src/Makefile.global
|
||||||
|
include $(top_srcdir)/contrib/contrib-global.mk
|
||||||
|
endif
|
||||||
|
|
||||||
|
override CFLAGS += $(CFLAGS_SL)
|
||||||
|
|
||||||
all: SUBSYS.o
|
all: SUBSYS.o
|
||||||
|
|
||||||
@ -22,6 +29,4 @@ endif
|
|||||||
SUBSYS.o: $(SUBOBJS)
|
SUBSYS.o: $(SUBOBJS)
|
||||||
$(LD) $(LDREL) $(LDOUT) $@ $^
|
$(LD) $(LDREL) $(LDOUT) $@ $^
|
||||||
|
|
||||||
EXTRA_CLEAN = SUBSYS.o $(SUBOBJS) parser.c
|
|
||||||
|
|
||||||
include $(top_srcdir)/contrib/contrib-global.mk
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user