mirror of
https://github.com/postgres/postgres.git
synced 2025-07-28 23:42:10 +03:00
Re-run pgindent, fixing a problem where comment lines after a blank
comment line where output as too long, and update typedefs for /lib directory. Also fix case where identifiers were used as variable names in the backend, but as typedefs in ecpg (favor the backend for indenting). Backpatch to 8.1.X.
This commit is contained in:
Bruce Momjian
@ -60,9 +60,9 @@
|
||||
|
||||
typedef struct remoteConn
|
||||
{
|
||||
PGconn *conn; /* Hold the remote connection */
|
||||
PGconn *conn; /* Hold the remote connection */
|
||||
int openCursorCount; /* The number of open cursors */
|
||||
bool newXactForCursor; /* Opened a transaction for a cursor */
|
||||
bool newXactForCursor; /* Opened a transaction for a cursor */
|
||||
} remoteConn;
|
||||
|
||||
/*
|
||||
@ -84,8 +84,8 @@ static Oid get_relid_from_relname(text *relname_text);
|
||||
static char *generate_relation_name(Oid relid);
|
||||
|
||||
/* Global */
|
||||
static remoteConn *pconn = NULL;
|
||||
static HTAB *remoteConnHash = NULL;
|
||||
static remoteConn *pconn = NULL;
|
||||
static HTAB *remoteConnHash = NULL;
|
||||
|
||||
/*
|
||||
* Following is list that holds multiple remote connections.
|
||||
@ -346,7 +346,7 @@ dblink_open(PG_FUNCTION_ARGS)
|
||||
else
|
||||
conn = rconn->conn;
|
||||
|
||||
/* If we are not in a transaction, start one */
|
||||
/* If we are not in a transaction, start one */
|
||||
if (PQtransactionStatus(conn) == PQTRANS_IDLE)
|
||||
{
|
||||
res = PQexec(conn, "BEGIN");
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* $PostgreSQL: pgsql/contrib/pgbench/pgbench.c,v 1.45 2005/10/29 19:38:07 tgl Exp $
|
||||
* $PostgreSQL: pgsql/contrib/pgbench/pgbench.c,v 1.45.2.1 2005/11/22 18:23:01 momjian Exp $
|
||||
*
|
||||
* pgbench: a simple benchmark program for PostgreSQL
|
||||
* written by Tatsuo Ishii
|
||||
@ -1110,7 +1110,8 @@ main(int argc, char **argv)
|
||||
fprintf(stderr, "Use limit/ulimt to increase the limit before using pgbench.\n");
|
||||
exit(1);
|
||||
}
|
||||
#endif /* #if !(defined(__CYGWIN__) || defined(__MINGW32__)) */
|
||||
#endif /* #if !(defined(__CYGWIN__) ||
|
||||
* defined(__MINGW32__)) */
|
||||
break;
|
||||
case 'C':
|
||||
is_connect = 1;
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $PostgreSQL: pgsql/contrib/pgcrypto/pgp-decrypt.c,v 1.6 2005/10/15 02:49:06 momjian Exp $
|
||||
* $PostgreSQL: pgsql/contrib/pgcrypto/pgp-decrypt.c,v 1.6.2.1 2005/11/22 18:23:01 momjian Exp $
|
||||
*/
|
||||
|
||||
#include "postgres.h"
|
||||
@ -269,14 +269,14 @@ prefix_init(void **priv_p, void *arg, PullFilter * src)
|
||||
* The original purpose of the 2-byte check was to show user a
|
||||
* friendly "wrong key" message. This made following possible:
|
||||
*
|
||||
* "An Attack on CFB Mode Encryption As Used By OpenPGP" by Serge Mister
|
||||
* and Robert Zuccherato
|
||||
* "An Attack on CFB Mode Encryption As Used By OpenPGP" by Serge
|
||||
* Mister and Robert Zuccherato
|
||||
*
|
||||
* To avoid being 'oracle', we delay reporting, which basically means we
|
||||
* prefer to run into corrupt packet header.
|
||||
* To avoid being 'oracle', we delay reporting, which basically means
|
||||
* we prefer to run into corrupt packet header.
|
||||
*
|
||||
* We _could_ throw PXE_PGP_CORRUPT_DATA here, but there is possibility
|
||||
* of attack via timing, so we don't.
|
||||
* We _could_ throw PXE_PGP_CORRUPT_DATA here, but there is
|
||||
* possibility of attack via timing, so we don't.
|
||||
*/
|
||||
ctx->corrupt_prefix = 1;
|
||||
}
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $PostgreSQL: pgsql/contrib/pgcrypto/pgp-pgsql.c,v 1.6 2005/10/15 02:49:06 momjian Exp $
|
||||
* $PostgreSQL: pgsql/contrib/pgcrypto/pgp-pgsql.c,v 1.6.2.1 2005/11/22 18:23:01 momjian Exp $
|
||||
*/
|
||||
|
||||
#include "postgres.h"
|
||||
@ -125,8 +125,8 @@ add_entropy(text *data1, text *data2, text *data3)
|
||||
/*
|
||||
* Try to make the feeding unpredictable.
|
||||
*
|
||||
* Prefer data over keys, as it's rather likely that key is same in several
|
||||
* calls.
|
||||
* Prefer data over keys, as it's rather likely that key is same in
|
||||
* several calls.
|
||||
*/
|
||||
|
||||
/* chance: 7/8 */
|
||||
|
||||
@ -547,8 +547,8 @@ crosstab(PG_FUNCTION_ARGS)
|
||||
* Get the next category item value, which is alway
|
||||
* attribute number three.
|
||||
*
|
||||
* Be careful to sssign the value to the array index based on
|
||||
* which category we are presently processing.
|
||||
* Be careful to sssign the value to the array index based
|
||||
* on which category we are presently processing.
|
||||
*/
|
||||
values[1 + i] = SPI_getvalue(spi_tuple, spi_tupdesc, 3);
|
||||
|
||||
@ -870,8 +870,8 @@ get_crosstab_tuplestore(char *sql,
|
||||
/*
|
||||
* The provided SQL query must always return at least three columns:
|
||||
*
|
||||
* 1. rowname the label for each row - column 1 in the final result 2.
|
||||
* category the label for each value-column in the final result 3.
|
||||
* 1. rowname the label for each row - column 1 in the final result
|
||||
* 2. category the label for each value-column in the final result 3.
|
||||
* value the values used to populate the value-columns
|
||||
*
|
||||
* If there are more than three columns, the last two are taken as
|
||||
|
||||
@ -169,7 +169,7 @@ gettoken_query(QPRS_STATE * state, int4 *val, int4 *lenval, char **strval, int2
|
||||
state->state = WAITOPERATOR;
|
||||
return VAL;
|
||||
}
|
||||
else if ( state->state == WAITFIRSTOPERAND )
|
||||
else if (state->state == WAITFIRSTOPERAND)
|
||||
return END;
|
||||
else
|
||||
ereport(ERROR,
|
||||
@ -620,12 +620,13 @@ static QUERYTYPE *
|
||||
/* parse query & make polish notation (postfix, but in reverse order) */
|
||||
makepol(&state, pushval);
|
||||
pfree(state.valstate.word);
|
||||
if (!state.num) {
|
||||
if (!state.num)
|
||||
{
|
||||
elog(NOTICE, "Query doesn't contain lexem(s)");
|
||||
query = (QUERYTYPE*)palloc( HDRSIZEQT );
|
||||
query = (QUERYTYPE *) palloc(HDRSIZEQT);
|
||||
query->len = HDRSIZEQT;
|
||||
query->size = 0;
|
||||
return query;
|
||||
return query;
|
||||
}
|
||||
|
||||
/* make finish struct */
|
||||
@ -912,8 +913,8 @@ to_tsquery(PG_FUNCTION_ARGS)
|
||||
PG_FREE_IF_COPY(in, 1);
|
||||
|
||||
query = queryin(str, pushval_morph, PG_GETARG_INT32(0));
|
||||
|
||||
if ( query->size == 0 )
|
||||
|
||||
if (query->size == 0)
|
||||
PG_RETURN_POINTER(query);
|
||||
|
||||
res = clean_fakeval_v2(GETQUERY(query), &len);
|
||||
|
||||
@ -266,8 +266,10 @@ calc_rank_or(float *w, tsvector * t, QUERYTYPE * q)
|
||||
|
||||
for (i = 0; i < size; i++)
|
||||
{
|
||||
float resj,wjm;
|
||||
int4 jm;
|
||||
float resj,
|
||||
wjm;
|
||||
int4 jm;
|
||||
|
||||
entry = find_wordentry(t, q, item[i]);
|
||||
if (!entry)
|
||||
continue;
|
||||
@ -283,28 +285,29 @@ calc_rank_or(float *w, tsvector * t, QUERYTYPE * q)
|
||||
post = POSNULL + 1;
|
||||
}
|
||||
|
||||
resj = 0.0;
|
||||
wjm = -1.0;
|
||||
jm = 0;
|
||||
for (j = 0; j < dimt; j++)
|
||||
{
|
||||
resj = resj + wpos(post[j])/((j+1)*(j+1));
|
||||
if ( wpos(post[j]) > wjm ) {
|
||||
wjm = wpos(post[j]);
|
||||
jm = j;
|
||||
}
|
||||
}
|
||||
/*
|
||||
limit (sum(i/i^2),i->inf) = pi^2/6
|
||||
resj = sum(wi/i^2),i=1,noccurence,
|
||||
wi - should be sorted desc,
|
||||
don't sort for now, just choose maximum weight. This should be corrected
|
||||
resj = 0.0;
|
||||
wjm = -1.0;
|
||||
jm = 0;
|
||||
for (j = 0; j < dimt; j++)
|
||||
{
|
||||
resj = resj + wpos(post[j]) / ((j + 1) * (j + 1));
|
||||
if (wpos(post[j]) > wjm)
|
||||
{
|
||||
wjm = wpos(post[j]);
|
||||
jm = j;
|
||||
}
|
||||
}
|
||||
/*
|
||||
limit (sum(i/i^2),i->inf) = pi^2/6
|
||||
resj = sum(wi/i^2),i=1,noccurence,
|
||||
wi - should be sorted desc,
|
||||
don't sort for now, just choose maximum weight. This should be corrected
|
||||
Oleg Bartunov
|
||||
*/
|
||||
res = res + ( wjm + resj - wjm/((jm+1)*(jm+1)))/1.64493406685;
|
||||
res = res + (wjm + resj - wjm / ((jm + 1) * (jm + 1))) / 1.64493406685;
|
||||
}
|
||||
if ( size > 0 )
|
||||
res = res /size;
|
||||
if (size > 0)
|
||||
res = res / size;
|
||||
pfree(item);
|
||||
return res;
|
||||
}
|
||||
|
||||
@ -23,7 +23,7 @@ struct SN_env
|
||||
int S_size;
|
||||
int I_size;
|
||||
int B_size;
|
||||
symbol **S;
|
||||
symbol **S;
|
||||
int *I;
|
||||
symbol *B;
|
||||
};
|
||||
|
||||
@ -28,8 +28,8 @@ static symbol s_0_1[5] = {'g', 'e', 'n', 'e', 'r'};
|
||||
|
||||
static struct among a_0[2] =
|
||||
{
|
||||
/* 0 */ {6, s_0_0, -1, -1, 0},
|
||||
/* 1 */ {5, s_0_1, -1, -1, 0}
|
||||
/* 0 */ {6, s_0_0, -1, -1, 0},
|
||||
/* 1 */ {5, s_0_1, -1, -1, 0}
|
||||
};
|
||||
|
||||
static symbol s_1_0[1] = {'\''};
|
||||
@ -38,9 +38,9 @@ static symbol s_1_2[2] = {'\'', 's'};
|
||||
|
||||
static struct among a_1[3] =
|
||||
{
|
||||
/* 0 */ {1, s_1_0, -1, 1, 0},
|
||||
/* 1 */ {3, s_1_1, 0, 1, 0},
|
||||
/* 2 */ {2, s_1_2, -1, 1, 0}
|
||||
/* 0 */ {1, s_1_0, -1, 1, 0},
|
||||
/* 1 */ {3, s_1_1, 0, 1, 0},
|
||||
/* 2 */ {2, s_1_2, -1, 1, 0}
|
||||
};
|
||||
|
||||
static symbol s_2_0[3] = {'i', 'e', 'd'};
|
||||
@ -52,12 +52,12 @@ static symbol s_2_5[2] = {'u', 's'};
|
||||
|
||||
static struct among a_2[6] =
|
||||
{
|
||||
/* 0 */ {3, s_2_0, -1, 2, 0},
|
||||
/* 1 */ {1, s_2_1, -1, 3, 0},
|
||||
/* 2 */ {3, s_2_2, 1, 2, 0},
|
||||
/* 3 */ {4, s_2_3, 1, 1, 0},
|
||||
/* 4 */ {2, s_2_4, 1, -1, 0},
|
||||
/* 5 */ {2, s_2_5, 1, -1, 0}
|
||||
/* 0 */ {3, s_2_0, -1, 2, 0},
|
||||
/* 1 */ {1, s_2_1, -1, 3, 0},
|
||||
/* 2 */ {3, s_2_2, 1, 2, 0},
|
||||
/* 3 */ {4, s_2_3, 1, 1, 0},
|
||||
/* 4 */ {2, s_2_4, 1, -1, 0},
|
||||
/* 5 */ {2, s_2_5, 1, -1, 0}
|
||||
};
|
||||
|
||||
static symbol s_3_1[2] = {'b', 'b'};
|
||||
@ -75,16 +75,16 @@ static symbol s_3_12[2] = {'i', 'z'};
|
||||
|
||||
static struct among a_3[13] =
|
||||
{
|
||||
/* 0 */ {0, 0, -1, 3, 0},
|
||||
/* 1 */ {2, s_3_1, 0, 2, 0},
|
||||
/* 2 */ {2, s_3_2, 0, 2, 0},
|
||||
/* 3 */ {2, s_3_3, 0, 2, 0},
|
||||
/* 4 */ {2, s_3_4, 0, 2, 0},
|
||||
/* 5 */ {2, s_3_5, 0, 1, 0},
|
||||
/* 6 */ {2, s_3_6, 0, 2, 0},
|
||||
/* 7 */ {2, s_3_7, 0, 2, 0},
|
||||
/* 8 */ {2, s_3_8, 0, 2, 0},
|
||||
/* 9 */ {2, s_3_9, 0, 2, 0},
|
||||
/* 0 */ {0, 0, -1, 3, 0},
|
||||
/* 1 */ {2, s_3_1, 0, 2, 0},
|
||||
/* 2 */ {2, s_3_2, 0, 2, 0},
|
||||
/* 3 */ {2, s_3_3, 0, 2, 0},
|
||||
/* 4 */ {2, s_3_4, 0, 2, 0},
|
||||
/* 5 */ {2, s_3_5, 0, 1, 0},
|
||||
/* 6 */ {2, s_3_6, 0, 2, 0},
|
||||
/* 7 */ {2, s_3_7, 0, 2, 0},
|
||||
/* 8 */ {2, s_3_8, 0, 2, 0},
|
||||
/* 9 */ {2, s_3_9, 0, 2, 0},
|
||||
/* 10 */ {2, s_3_10, 0, 1, 0},
|
||||
/* 11 */ {2, s_3_11, 0, 2, 0},
|
||||
/* 12 */ {2, s_3_12, 0, 1, 0}
|
||||
@ -99,12 +99,12 @@ static symbol s_4_5[5] = {'i', 'n', 'g', 'l', 'y'};
|
||||
|
||||
static struct among a_4[6] =
|
||||
{
|
||||
/* 0 */ {2, s_4_0, -1, 2, 0},
|
||||
/* 1 */ {3, s_4_1, 0, 1, 0},
|
||||
/* 2 */ {3, s_4_2, -1, 2, 0},
|
||||
/* 3 */ {4, s_4_3, -1, 2, 0},
|
||||
/* 4 */ {5, s_4_4, 3, 1, 0},
|
||||
/* 5 */ {5, s_4_5, -1, 2, 0}
|
||||
/* 0 */ {2, s_4_0, -1, 2, 0},
|
||||
/* 1 */ {3, s_4_1, 0, 1, 0},
|
||||
/* 2 */ {3, s_4_2, -1, 2, 0},
|
||||
/* 3 */ {4, s_4_3, -1, 2, 0},
|
||||
/* 4 */ {5, s_4_4, 3, 1, 0},
|
||||
/* 5 */ {5, s_4_5, -1, 2, 0}
|
||||
};
|
||||
|
||||
static symbol s_5_0[4] = {'a', 'n', 'c', 'i'};
|
||||
@ -134,16 +134,16 @@ static symbol s_5_23[7] = {'o', 'u', 's', 'n', 'e', 's', 's'};
|
||||
|
||||
static struct among a_5[24] =
|
||||
{
|
||||
/* 0 */ {4, s_5_0, -1, 3, 0},
|
||||
/* 1 */ {4, s_5_1, -1, 2, 0},
|
||||
/* 2 */ {3, s_5_2, -1, 13, 0},
|
||||
/* 3 */ {2, s_5_3, -1, 16, 0},
|
||||
/* 4 */ {3, s_5_4, 3, 12, 0},
|
||||
/* 5 */ {4, s_5_5, 4, 4, 0},
|
||||
/* 6 */ {4, s_5_6, 3, 8, 0},
|
||||
/* 7 */ {5, s_5_7, 3, 14, 0},
|
||||
/* 8 */ {6, s_5_8, 3, 15, 0},
|
||||
/* 9 */ {5, s_5_9, 3, 10, 0},
|
||||
/* 0 */ {4, s_5_0, -1, 3, 0},
|
||||
/* 1 */ {4, s_5_1, -1, 2, 0},
|
||||
/* 2 */ {3, s_5_2, -1, 13, 0},
|
||||
/* 3 */ {2, s_5_3, -1, 16, 0},
|
||||
/* 4 */ {3, s_5_4, 3, 12, 0},
|
||||
/* 5 */ {4, s_5_5, 4, 4, 0},
|
||||
/* 6 */ {4, s_5_6, 3, 8, 0},
|
||||
/* 7 */ {5, s_5_7, 3, 14, 0},
|
||||
/* 8 */ {6, s_5_8, 3, 15, 0},
|
||||
/* 9 */ {5, s_5_9, 3, 10, 0},
|
||||
/* 10 */ {5, s_5_10, 3, 5, 0},
|
||||
/* 11 */ {5, s_5_11, -1, 8, 0},
|
||||
/* 12 */ {6, s_5_12, -1, 12, 0},
|
||||
@ -172,15 +172,15 @@ static symbol s_6_8[4] = {'n', 'e', 's', 's'};
|
||||
|
||||
static struct among a_6[9] =
|
||||
{
|
||||
/* 0 */ {5, s_6_0, -1, 4, 0},
|
||||
/* 1 */ {5, s_6_1, -1, 6, 0},
|
||||
/* 2 */ {5, s_6_2, -1, 3, 0},
|
||||
/* 3 */ {5, s_6_3, -1, 4, 0},
|
||||
/* 4 */ {4, s_6_4, -1, 4, 0},
|
||||
/* 5 */ {6, s_6_5, -1, 1, 0},
|
||||
/* 6 */ {7, s_6_6, 5, 2, 0},
|
||||
/* 7 */ {3, s_6_7, -1, 5, 0},
|
||||
/* 8 */ {4, s_6_8, -1, 5, 0}
|
||||
/* 0 */ {5, s_6_0, -1, 4, 0},
|
||||
/* 1 */ {5, s_6_1, -1, 6, 0},
|
||||
/* 2 */ {5, s_6_2, -1, 3, 0},
|
||||
/* 3 */ {5, s_6_3, -1, 4, 0},
|
||||
/* 4 */ {4, s_6_4, -1, 4, 0},
|
||||
/* 5 */ {6, s_6_5, -1, 1, 0},
|
||||
/* 6 */ {7, s_6_6, 5, 2, 0},
|
||||
/* 7 */ {3, s_6_7, -1, 5, 0},
|
||||
/* 8 */ {4, s_6_8, -1, 5, 0}
|
||||
};
|
||||
|
||||
static symbol s_7_0[2] = {'i', 'c'};
|
||||
@ -204,16 +204,16 @@ static symbol s_7_17[5] = {'e', 'm', 'e', 'n', 't'};
|
||||
|
||||
static struct among a_7[18] =
|
||||
{
|
||||
/* 0 */ {2, s_7_0, -1, 1, 0},
|
||||
/* 1 */ {4, s_7_1, -1, 1, 0},
|
||||
/* 2 */ {4, s_7_2, -1, 1, 0},
|
||||
/* 3 */ {4, s_7_3, -1, 1, 0},
|
||||
/* 4 */ {4, s_7_4, -1, 1, 0},
|
||||
/* 5 */ {3, s_7_5, -1, 1, 0},
|
||||
/* 6 */ {3, s_7_6, -1, 1, 0},
|
||||
/* 7 */ {3, s_7_7, -1, 1, 0},
|
||||
/* 8 */ {3, s_7_8, -1, 1, 0},
|
||||
/* 9 */ {2, s_7_9, -1, 1, 0},
|
||||
/* 0 */ {2, s_7_0, -1, 1, 0},
|
||||
/* 1 */ {4, s_7_1, -1, 1, 0},
|
||||
/* 2 */ {4, s_7_2, -1, 1, 0},
|
||||
/* 3 */ {4, s_7_3, -1, 1, 0},
|
||||
/* 4 */ {4, s_7_4, -1, 1, 0},
|
||||
/* 5 */ {3, s_7_5, -1, 1, 0},
|
||||
/* 6 */ {3, s_7_6, -1, 1, 0},
|
||||
/* 7 */ {3, s_7_7, -1, 1, 0},
|
||||
/* 8 */ {3, s_7_8, -1, 1, 0},
|
||||
/* 9 */ {2, s_7_9, -1, 1, 0},
|
||||
/* 10 */ {3, s_7_10, -1, 1, 0},
|
||||
/* 11 */ {3, s_7_11, -1, 2, 0},
|
||||
/* 12 */ {2, s_7_12, -1, 1, 0},
|
||||
@ -229,8 +229,8 @@ static symbol s_8_1[1] = {'l'};
|
||||
|
||||
static struct among a_8[2] =
|
||||
{
|
||||
/* 0 */ {1, s_8_0, -1, 1, 0},
|
||||
/* 1 */ {1, s_8_1, -1, 2, 0}
|
||||
/* 0 */ {1, s_8_0, -1, 1, 0},
|
||||
/* 1 */ {1, s_8_1, -1, 2, 0}
|
||||
};
|
||||
|
||||
static symbol s_9_0[7] = {'s', 'u', 'c', 'c', 'e', 'e', 'd'};
|
||||
@ -244,14 +244,14 @@ static symbol s_9_7[6] = {'o', 'u', 't', 'i', 'n', 'g'};
|
||||
|
||||
static struct among a_9[8] =
|
||||
{
|
||||
/* 0 */ {7, s_9_0, -1, -1, 0},
|
||||
/* 1 */ {7, s_9_1, -1, -1, 0},
|
||||
/* 2 */ {6, s_9_2, -1, -1, 0},
|
||||
/* 3 */ {7, s_9_3, -1, -1, 0},
|
||||
/* 4 */ {6, s_9_4, -1, -1, 0},
|
||||
/* 5 */ {7, s_9_5, -1, -1, 0},
|
||||
/* 6 */ {7, s_9_6, -1, -1, 0},
|
||||
/* 7 */ {6, s_9_7, -1, -1, 0}
|
||||
/* 0 */ {7, s_9_0, -1, -1, 0},
|
||||
/* 1 */ {7, s_9_1, -1, -1, 0},
|
||||
/* 2 */ {6, s_9_2, -1, -1, 0},
|
||||
/* 3 */ {7, s_9_3, -1, -1, 0},
|
||||
/* 4 */ {6, s_9_4, -1, -1, 0},
|
||||
/* 5 */ {7, s_9_5, -1, -1, 0},
|
||||
/* 6 */ {7, s_9_6, -1, -1, 0},
|
||||
/* 7 */ {6, s_9_7, -1, -1, 0}
|
||||
};
|
||||
|
||||
static symbol s_10_0[5] = {'a', 'n', 'd', 'e', 's'};
|
||||
@ -275,16 +275,16 @@ static symbol s_10_17[4] = {'u', 'g', 'l', 'y'};
|
||||
|
||||
static struct among a_10[18] =
|
||||
{
|
||||
/* 0 */ {5, s_10_0, -1, -1, 0},
|
||||
/* 1 */ {5, s_10_1, -1, -1, 0},
|
||||
/* 2 */ {4, s_10_2, -1, -1, 0},
|
||||
/* 3 */ {6, s_10_3, -1, -1, 0},
|
||||
/* 4 */ {5, s_10_4, -1, 3, 0},
|
||||
/* 5 */ {5, s_10_5, -1, 9, 0},
|
||||
/* 6 */ {6, s_10_6, -1, 7, 0},
|
||||
/* 7 */ {4, s_10_7, -1, -1, 0},
|
||||
/* 8 */ {4, s_10_8, -1, 6, 0},
|
||||
/* 9 */ {5, s_10_9, -1, 4, 0},
|
||||
/* 0 */ {5, s_10_0, -1, -1, 0},
|
||||
/* 1 */ {5, s_10_1, -1, -1, 0},
|
||||
/* 2 */ {4, s_10_2, -1, -1, 0},
|
||||
/* 3 */ {6, s_10_3, -1, -1, 0},
|
||||
/* 4 */ {5, s_10_4, -1, 3, 0},
|
||||
/* 5 */ {5, s_10_5, -1, 9, 0},
|
||||
/* 6 */ {6, s_10_6, -1, 7, 0},
|
||||
/* 7 */ {4, s_10_7, -1, -1, 0},
|
||||
/* 8 */ {4, s_10_8, -1, 6, 0},
|
||||
/* 9 */ {5, s_10_9, -1, 4, 0},
|
||||
/* 10 */ {4, s_10_10, -1, -1, 0},
|
||||
/* 11 */ {4, s_10_11, -1, 10, 0},
|
||||
/* 12 */ {6, s_10_12, -1, 11, 0},
|
||||
@ -1609,12 +1609,14 @@ lab0:
|
||||
return 1;
|
||||
}
|
||||
|
||||
extern struct SN_env *english_ISO_8859_1_create_env(void)
|
||||
extern struct SN_env *
|
||||
english_ISO_8859_1_create_env(void)
|
||||
{
|
||||
return SN_create_env(0, 2, 1);
|
||||
}
|
||||
|
||||
extern void english_ISO_8859_1_close_env(struct SN_env * z)
|
||||
extern void
|
||||
english_ISO_8859_1_close_env(struct SN_env * z)
|
||||
{
|
||||
SN_close_env(z);
|
||||
}
|
||||
|
||||
@ -6,10 +6,10 @@ 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 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);
|
||||
extern int english_ISO_8859_1_stem(struct SN_env * z);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
||||
@ -30,15 +30,15 @@ static symbol s_0_8[6] = {0xD9, 0xD7, 0xDB, 0xC9, 0xD3, 0xD8};
|
||||
|
||||
static struct among a_0[9] =
|
||||
{
|
||||
/* 0 */ {3, s_0_0, -1, 1, 0},
|
||||
/* 1 */ {4, s_0_1, 0, 2, 0},
|
||||
/* 2 */ {4, s_0_2, 0, 2, 0},
|
||||
/* 3 */ {1, s_0_3, -1, 1, 0},
|
||||
/* 4 */ {2, s_0_4, 3, 2, 0},
|
||||
/* 5 */ {2, s_0_5, 3, 2, 0},
|
||||
/* 6 */ {5, s_0_6, -1, 1, 0},
|
||||
/* 7 */ {6, s_0_7, 6, 2, 0},
|
||||
/* 8 */ {6, s_0_8, 6, 2, 0}
|
||||
/* 0 */ {3, s_0_0, -1, 1, 0},
|
||||
/* 1 */ {4, s_0_1, 0, 2, 0},
|
||||
/* 2 */ {4, s_0_2, 0, 2, 0},
|
||||
/* 3 */ {1, s_0_3, -1, 1, 0},
|
||||
/* 4 */ {2, s_0_4, 3, 2, 0},
|
||||
/* 5 */ {2, s_0_5, 3, 2, 0},
|
||||
/* 6 */ {5, s_0_6, -1, 1, 0},
|
||||
/* 7 */ {6, s_0_7, 6, 2, 0},
|
||||
/* 8 */ {6, s_0_8, 6, 2, 0}
|
||||
};
|
||||
|
||||
static symbol s_1_0[2] = {0xC0, 0xC0};
|
||||
@ -70,16 +70,16 @@ static symbol s_1_25[3] = {0xCF, 0xCD, 0xD5};
|
||||
|
||||
static struct among a_1[26] =
|
||||
{
|
||||
/* 0 */ {2, s_1_0, -1, 1, 0},
|
||||
/* 1 */ {2, s_1_1, -1, 1, 0},
|
||||
/* 2 */ {2, s_1_2, -1, 1, 0},
|
||||
/* 3 */ {2, s_1_3, -1, 1, 0},
|
||||
/* 4 */ {2, s_1_4, -1, 1, 0},
|
||||
/* 5 */ {2, s_1_5, -1, 1, 0},
|
||||
/* 6 */ {2, s_1_6, -1, 1, 0},
|
||||
/* 7 */ {2, s_1_7, -1, 1, 0},
|
||||
/* 8 */ {2, s_1_8, -1, 1, 0},
|
||||
/* 9 */ {2, s_1_9, -1, 1, 0},
|
||||
/* 0 */ {2, s_1_0, -1, 1, 0},
|
||||
/* 1 */ {2, s_1_1, -1, 1, 0},
|
||||
/* 2 */ {2, s_1_2, -1, 1, 0},
|
||||
/* 3 */ {2, s_1_3, -1, 1, 0},
|
||||
/* 4 */ {2, s_1_4, -1, 1, 0},
|
||||
/* 5 */ {2, s_1_5, -1, 1, 0},
|
||||
/* 6 */ {2, s_1_6, -1, 1, 0},
|
||||
/* 7 */ {2, s_1_7, -1, 1, 0},
|
||||
/* 8 */ {2, s_1_8, -1, 1, 0},
|
||||
/* 9 */ {2, s_1_9, -1, 1, 0},
|
||||
/* 10 */ {3, s_1_10, -1, 1, 0},
|
||||
/* 11 */ {3, s_1_11, -1, 1, 0},
|
||||
/* 12 */ {2, s_1_12, -1, 1, 0},
|
||||
@ -109,14 +109,14 @@ static symbol s_2_7[3] = {0xD5, 0xC0, 0xDD};
|
||||
|
||||
static struct among a_2[8] =
|
||||
{
|
||||
/* 0 */ {2, s_2_0, -1, 1, 0},
|
||||
/* 1 */ {2, s_2_1, -1, 1, 0},
|
||||
/* 2 */ {2, s_2_2, -1, 1, 0},
|
||||
/* 3 */ {3, s_2_3, 2, 2, 0},
|
||||
/* 4 */ {3, s_2_4, 2, 2, 0},
|
||||
/* 5 */ {1, s_2_5, -1, 1, 0},
|
||||
/* 6 */ {2, s_2_6, 5, 1, 0},
|
||||
/* 7 */ {3, s_2_7, 6, 2, 0}
|
||||
/* 0 */ {2, s_2_0, -1, 1, 0},
|
||||
/* 1 */ {2, s_2_1, -1, 1, 0},
|
||||
/* 2 */ {2, s_2_2, -1, 1, 0},
|
||||
/* 3 */ {3, s_2_3, 2, 2, 0},
|
||||
/* 4 */ {3, s_2_4, 2, 2, 0},
|
||||
/* 5 */ {1, s_2_5, -1, 1, 0},
|
||||
/* 6 */ {2, s_2_6, 5, 1, 0},
|
||||
/* 7 */ {3, s_2_7, 6, 2, 0}
|
||||
};
|
||||
|
||||
static symbol s_3_0[2] = {0xD3, 0xD1};
|
||||
@ -124,8 +124,8 @@ static symbol s_3_1[2] = {0xD3, 0xD8};
|
||||
|
||||
static struct among a_3[2] =
|
||||
{
|
||||
/* 0 */ {2, s_3_0, -1, 1, 0},
|
||||
/* 1 */ {2, s_3_1, -1, 1, 0}
|
||||
/* 0 */ {2, s_3_0, -1, 1, 0},
|
||||
/* 1 */ {2, s_3_1, -1, 1, 0}
|
||||
};
|
||||
|
||||
static symbol s_4_0[1] = {0xC0};
|
||||
@ -177,16 +177,16 @@ static symbol s_4_45[3] = {0xC5, 0xCE, 0xD9};
|
||||
|
||||
static struct among a_4[46] =
|
||||
{
|
||||
/* 0 */ {1, s_4_0, -1, 2, 0},
|
||||
/* 1 */ {2, s_4_1, 0, 2, 0},
|
||||
/* 2 */ {2, s_4_2, -1, 1, 0},
|
||||
/* 3 */ {3, s_4_3, 2, 2, 0},
|
||||
/* 4 */ {3, s_4_4, 2, 2, 0},
|
||||
/* 5 */ {2, s_4_5, -1, 1, 0},
|
||||
/* 6 */ {3, s_4_6, 5, 2, 0},
|
||||
/* 7 */ {3, s_4_7, -1, 1, 0},
|
||||
/* 8 */ {3, s_4_8, -1, 2, 0},
|
||||
/* 9 */ {3, s_4_9, -1, 1, 0},
|
||||
/* 0 */ {1, s_4_0, -1, 2, 0},
|
||||
/* 1 */ {2, s_4_1, 0, 2, 0},
|
||||
/* 2 */ {2, s_4_2, -1, 1, 0},
|
||||
/* 3 */ {3, s_4_3, 2, 2, 0},
|
||||
/* 4 */ {3, s_4_4, 2, 2, 0},
|
||||
/* 5 */ {2, s_4_5, -1, 1, 0},
|
||||
/* 6 */ {3, s_4_6, 5, 2, 0},
|
||||
/* 7 */ {3, s_4_7, -1, 1, 0},
|
||||
/* 8 */ {3, s_4_8, -1, 2, 0},
|
||||
/* 9 */ {3, s_4_9, -1, 1, 0},
|
||||
/* 10 */ {4, s_4_10, 9, 2, 0},
|
||||
/* 11 */ {4, s_4_11, 9, 2, 0},
|
||||
/* 12 */ {2, s_4_12, -1, 1, 0},
|
||||
@ -264,16 +264,16 @@ static symbol s_5_35[1] = {0xD9};
|
||||
|
||||
static struct among a_5[36] =
|
||||
{
|
||||
/* 0 */ {1, s_5_0, -1, 1, 0},
|
||||
/* 1 */ {2, s_5_1, 0, 1, 0},
|
||||
/* 2 */ {2, s_5_2, 0, 1, 0},
|
||||
/* 3 */ {1, s_5_3, -1, 1, 0},
|
||||
/* 4 */ {1, s_5_4, -1, 1, 0},
|
||||
/* 5 */ {2, s_5_5, 4, 1, 0},
|
||||
/* 6 */ {2, s_5_6, 4, 1, 0},
|
||||
/* 7 */ {2, s_5_7, -1, 1, 0},
|
||||
/* 8 */ {2, s_5_8, -1, 1, 0},
|
||||
/* 9 */ {3, s_5_9, 8, 1, 0},
|
||||
/* 0 */ {1, s_5_0, -1, 1, 0},
|
||||
/* 1 */ {2, s_5_1, 0, 1, 0},
|
||||
/* 2 */ {2, s_5_2, 0, 1, 0},
|
||||
/* 3 */ {1, s_5_3, -1, 1, 0},
|
||||
/* 4 */ {1, s_5_4, -1, 1, 0},
|
||||
/* 5 */ {2, s_5_5, 4, 1, 0},
|
||||
/* 6 */ {2, s_5_6, 4, 1, 0},
|
||||
/* 7 */ {2, s_5_7, -1, 1, 0},
|
||||
/* 8 */ {2, s_5_8, -1, 1, 0},
|
||||
/* 9 */ {3, s_5_9, 8, 1, 0},
|
||||
/* 10 */ {1, s_5_10, -1, 1, 0},
|
||||
/* 11 */ {2, s_5_11, 10, 1, 0},
|
||||
/* 12 */ {2, s_5_12, 10, 1, 0},
|
||||
@ -307,8 +307,8 @@ static symbol s_6_1[4] = {0xCF, 0xD3, 0xD4, 0xD8};
|
||||
|
||||
static struct among a_6[2] =
|
||||
{
|
||||
/* 0 */ {3, s_6_0, -1, 1, 0},
|
||||
/* 1 */ {4, s_6_1, -1, 1, 0}
|
||||
/* 0 */ {3, s_6_0, -1, 1, 0},
|
||||
/* 1 */ {4, s_6_1, -1, 1, 0}
|
||||
};
|
||||
|
||||
static symbol s_7_0[4] = {0xC5, 0xCA, 0xDB, 0xC5};
|
||||
@ -318,10 +318,10 @@ static symbol s_7_3[3] = {0xC5, 0xCA, 0xDB};
|
||||
|
||||
static struct among a_7[4] =
|
||||
{
|
||||
/* 0 */ {4, s_7_0, -1, 1, 0},
|
||||
/* 1 */ {1, s_7_1, -1, 2, 0},
|
||||
/* 2 */ {1, s_7_2, -1, 3, 0},
|
||||
/* 3 */ {3, s_7_3, -1, 1, 0}
|
||||
/* 0 */ {4, s_7_0, -1, 1, 0},
|
||||
/* 1 */ {1, s_7_1, -1, 2, 0},
|
||||
/* 2 */ {1, s_7_2, -1, 3, 0},
|
||||
/* 3 */ {3, s_7_3, -1, 1, 0}
|
||||
};
|
||||
|
||||
static unsigned char g_v[] = {35, 130, 34, 18};
|
||||
@ -915,12 +915,14 @@ lab0:
|
||||
return 1;
|
||||
}
|
||||
|
||||
extern struct SN_env *russian_KOI8_R_create_env(void)
|
||||
extern struct SN_env *
|
||||
russian_KOI8_R_create_env(void)
|
||||
{
|
||||
return SN_create_env(0, 2, 0);
|
||||
}
|
||||
|
||||
extern void russian_KOI8_R_close_env(struct SN_env * z)
|
||||
extern void
|
||||
russian_KOI8_R_close_env(struct SN_env * z)
|
||||
{
|
||||
SN_close_env(z);
|
||||
}
|
||||
|
||||
@ -6,10 +6,10 @@ 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 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);
|
||||
extern int russian_KOI8_R_stem(struct SN_env * z);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user