Wed Oct 6 16:09:06 PDT 2004
- Previous message: [Slony1-commit] By cbbrowne: Vivek Khera's changes that add the $MASTERNODE variable
- Next message: [Slony1-commit] By wieck: Bugfix: The Slony1 log trigger assumed that if
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Log Message:
-----------
Bugfix: The Slony1 log trigger assumed that if lookup_type_cache()
returned an entry at all, that the eq_opr_finfo will be filled with
a valid operator call address. But this is not true for user defined
data types that do not have any equal operator at all. The log trigger
will now fall back to string comparision of the output format for
those data types.
Jan
Tags:
----
REL_1_0_STABLE
Modified Files:
--------------
slony1-engine/src/backend:
slony1_funcs.c (r1.17.2.2 -> r1.17.2.3)
slony1-engine/src/slonik:
parser.c (r1.16.2.1 -> r1.16.2.2)
scan.c (r1.17.2.1 -> r1.17.2.2)
-------------- next part --------------
Index: slony1_funcs.c
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/backend/slony1_funcs.c,v
retrieving revision 1.17.2.2
retrieving revision 1.17.2.3
diff -Lsrc/backend/slony1_funcs.c -Lsrc/backend/slony1_funcs.c -u -w -r1.17.2.2 -r1.17.2.3
--- src/backend/slony1_funcs.c
+++ src/backend/slony1_funcs.c
@@ -19,14 +19,18 @@
#include "executor/spi.h"
#include "commands/trigger.h"
#include "commands/async.h"
+#include "catalog/pg_operator.h"
#include "access/xact.h"
#include "utils/builtins.h"
#ifdef HAVE_TYPCACHE
#include "utils/typcache.h"
+#else
+#include "parser/parse_oper.h"
#endif
#include "mb/pg_wchar.h"
#include <signal.h>
+#include <errno.h>
PG_FUNCTION_INFO_V1(_Slony_I_createEvent);
@@ -594,30 +598,55 @@
*/
if (!old_isnull && !new_isnull)
{
+ Oid opr_oid;
+ FmgrInfo *opr_finfo_p;
+
+ /*
+ * Lookup the equal operators function call info
+ * using the typecache if available
+ */
#ifdef HAVE_TYPCACHE
TypeCacheEntry *type_cache;
type_cache = lookup_type_cache(
SPI_gettypeid(tupdesc, i + 1),
TYPECACHE_EQ_OPR | TYPECACHE_EQ_OPR_FINFO);
- if (DatumGetBool(FunctionCall2(&(type_cache->eq_opr_finfo),
- old_value, new_value)))
- continue;
+ opr_oid = type_cache->eq_opr;
+ if (opr_oid == ARRAY_EQ_OP)
+ opr_oid = InvalidOid;
+ else
+ opr_finfo_p = &(type_cache->eq_opr_finfo);
#else
- Oid opr_proc;
FmgrInfo opr_finfo;
- opr_proc = compatible_oper_funcid(makeList1(makeString("=")),
+ opr_oid = compatible_oper_funcid(makeList1(makeString("=")),
SPI_gettypeid(tupdesc, i + 1),
SPI_gettypeid(tupdesc, i + 1), true);
- if (!OidIsValid(opr_proc))
- elog(ERROR, "Slony-I: failed to find '=' operator");
-
- fmgr_info(opr_proc, &opr_finfo);
- if (DatumGetBool(FunctionCall2(&opr_finfo,
+ if (OidIsValid(opr_oid))
+ {
+ fmgr_info(opr_oid, &opr_finfo);
+ opr_finfo_p = & opr_finfo;
+ }
+#endif
+ /*
+ * If we have an equal operator, use that to do binary
+ * comparision. Else get the string representation of
+ * both attributes and do string comparision.
+ */
+ if (OidIsValid(opr_oid))
+ {
+ if (DatumGetBool(FunctionCall2(opr_finfo_p,
old_value, new_value)))
continue;
-#endif
+ }
+ else
+ {
+ char *old_strval = SPI_getvalue(old_row, tupdesc, i + 1);
+ char *new_strval = SPI_getvalue(new_row, tupdesc, i + 1);
+
+ if (strcmp(old_strval, new_strval) == 0)
+ continue;
+ }
}
if (need_comma)
Index: parser.c
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slonik/Attic/parser.c,v
retrieving revision 1.16.2.1
retrieving revision 1.16.2.2
diff -Lsrc/slonik/parser.c -Lsrc/slonik/parser.c -u -w -r1.16.2.1 -r1.16.2.2
--- src/slonik/parser.c
+++ src/slonik/parser.c
@@ -426,16 +426,16 @@
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 4
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 289
+#define YYLAST 296
/* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 78
/* YYNNTS -- Number of nonterminals. */
-#define YYNNTS 54
+#define YYNNTS 56
/* YYNRULES -- Number of rules. */
-#define YYNRULES 125
+#define YYNRULES 129
/* YYNRULES -- Number of states. */
-#define YYNSTATES 273
+#define YYNSTATES 280
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2
@@ -491,27 +491,27 @@
35, 37, 44, 52, 60, 67, 73, 79, 85, 87,
90, 92, 94, 96, 98, 100, 102, 104, 106, 108,
110, 112, 114, 116, 118, 120, 122, 124, 126, 128,
- 130, 132, 134, 136, 138, 140, 142, 144, 146, 149,
- 154, 159, 165, 167, 170, 173, 178, 183, 188, 192,
- 197, 202, 207, 212, 217, 222, 227, 232, 238, 244,
- 250, 255, 260, 265, 270, 275, 280, 285, 290, 295,
- 301, 303, 308, 310, 314, 318, 323, 328, 332, 336,
- 340, 345, 350, 354, 358, 362, 366, 370, 375, 380,
- 385, 390, 395, 401, 405, 409, 413, 417, 421, 425,
- 429, 434, 438, 440, 442, 444, 446, 448, 450, 452,
- 454, 456, 458, 460, 462, 464
+ 130, 132, 134, 136, 138, 140, 142, 144, 146, 148,
+ 150, 153, 158, 163, 169, 171, 174, 177, 182, 187,
+ 192, 196, 201, 206, 211, 216, 221, 226, 231, 236,
+ 242, 248, 254, 260, 266, 271, 276, 281, 286, 291,
+ 296, 301, 306, 311, 317, 319, 324, 326, 330, 334,
+ 339, 344, 348, 352, 356, 361, 366, 370, 374, 378,
+ 382, 386, 391, 396, 401, 406, 411, 417, 421, 425,
+ 429, 433, 437, 441, 445, 450, 454, 456, 458, 460,
+ 462, 464, 466, 468, 470, 472, 474, 476, 478, 480
};
/* YYRHS -- A `-1'-separated list of the rules' RHS. */
static const short yyrhs[] =
{
- 79, 0, -1, 80, 81, 83, -1, 131, 8, 35,
- 70, 129, 71, -1, 82, -1, 82, 81, -1, 131,
- 38, 128, 4, 12, 70, 130, 71, -1, 84, -1,
- 84, 83, -1, 85, -1, 89, -1, 131, 60, 72,
- 88, 73, 86, -1, 131, 60, 72, 88, 73, 87,
- 86, -1, 131, 60, 72, 88, 73, 86, 87, -1,
- 131, 60, 72, 88, 73, 87, -1, 131, 60, 72,
+ 79, 0, -1, 80, 81, 83, -1, 133, 8, 35,
+ 70, 131, 71, -1, 82, -1, 82, 81, -1, 133,
+ 38, 130, 4, 12, 70, 132, 71, -1, 84, -1,
+ 84, 83, -1, 85, -1, 89, -1, 133, 60, 72,
+ 88, 73, 86, -1, 133, 60, 72, 88, 73, 87,
+ 86, -1, 133, 60, 72, 88, 73, 86, 87, -1,
+ 133, 60, 72, 88, 73, 87, -1, 133, 60, 72,
88, 73, -1, 41, 17, 72, 83, 73, -1, 41,
55, 72, 83, 73, -1, 89, -1, 89, 88, -1,
90, -1, 91, -1, 92, -1, 95, -1, 96, -1,
@@ -519,57 +519,59 @@
102, -1, 103, -1, 104, -1, 105, -1, 106, -1,
107, -1, 108, -1, 109, -1, 110, -1, 111, -1,
112, -1, 113, -1, 114, -1, 115, -1, 116, -1,
- 117, -1, 118, -1, 119, -1, 94, 71, -1, 131,
- 16, 130, 71, -1, 131, 20, 93, 71, -1, 131,
- 47, 38, 128, 71, -1, 69, -1, 74, 93, -1,
- 131, 1, -1, 131, 29, 8, 120, -1, 131, 53,
- 38, 120, -1, 131, 15, 38, 120, -1, 131, 21,
- 120, -1, 131, 61, 38, 120, -1, 131, 53, 43,
- 120, -1, 131, 15, 43, 120, -1, 131, 53, 31,
- 120, -1, 131, 15, 31, 120, -1, 131, 14, 52,
- 120, -1, 131, 15, 52, 120, -1, 131, 33, 52,
- 120, -1, 131, 56, 3, 30, 120, -1, 131, 52,
- 3, 56, 120, -1, 131, 52, 3, 49, 120, -1,
- 131, 53, 58, 120, -1, 131, 15, 58, 120, -1,
- 131, 54, 52, 120, -1, 131, 63, 52, 120, -1,
- 131, 32, 52, 120, -1, 131, 62, 52, 120, -1,
- 131, 34, 52, 120, -1, 131, 19, 48, 120, -1,
- 131, 64, 27, 120, -1, 131, 66, 24, 18, 120,
- -1, 71, -1, 75, 121, 76, 71, -1, 122, -1,
- 122, 77, 121, -1, 28, 70, 123, -1, 6, 38,
- 70, 123, -1, 18, 38, 70, 123, -1, 51, 70,
- 123, -1, 7, 70, 123, -1, 42, 70, 123, -1,
- 40, 42, 70, 123, -1, 36, 42, 70, 123, -1,
- 46, 70, 123, -1, 44, 70, 123, -1, 13, 70,
- 123, -1, 10, 70, 124, -1, 12, 70, 124, -1,
- 52, 28, 70, 123, -1, 3, 28, 70, 123, -1,
- 38, 28, 70, 123, -1, 56, 28, 70, 123, -1,
- 58, 35, 70, 124, -1, 26, 45, 35, 70, 124,
- -1, 30, 70, 124, -1, 30, 70, 50, -1, 25,
- 70, 125, -1, 23, 70, 124, -1, 42, 70, 5,
- -1, 11, 70, 123, -1, 11, 70, 5, -1, 66,
- 41, 70, 123, -1, 57, 70, 123, -1, 128, -1,
- 130, -1, 126, -1, 127, -1, 65, -1, 41, -1,
- 59, -1, 37, -1, 39, -1, 22, -1, 69, -1,
- 67, -1, 68, -1, -1
+ 117, -1, 118, -1, 119, -1, 120, -1, 121, -1,
+ 94, 71, -1, 133, 16, 132, 71, -1, 133, 20,
+ 93, 71, -1, 133, 47, 38, 130, 71, -1, 69,
+ -1, 74, 93, -1, 133, 1, -1, 133, 29, 8,
+ 122, -1, 133, 53, 38, 122, -1, 133, 15, 38,
+ 122, -1, 133, 21, 122, -1, 133, 61, 38, 122,
+ -1, 133, 53, 43, 122, -1, 133, 15, 43, 122,
+ -1, 133, 53, 31, 122, -1, 133, 15, 31, 122,
+ -1, 133, 14, 52, 122, -1, 133, 15, 52, 122,
+ -1, 133, 33, 52, 122, -1, 133, 56, 3, 30,
+ 122, -1, 133, 52, 3, 56, 122, -1, 133, 52,
+ 3, 49, 122, -1, 133, 52, 15, 56, 122, -1,
+ 133, 52, 15, 49, 122, -1, 133, 53, 58, 122,
+ -1, 133, 15, 58, 122, -1, 133, 54, 52, 122,
+ -1, 133, 63, 52, 122, -1, 133, 32, 52, 122,
+ -1, 133, 62, 52, 122, -1, 133, 34, 52, 122,
+ -1, 133, 19, 48, 122, -1, 133, 64, 27, 122,
+ -1, 133, 66, 24, 18, 122, -1, 71, -1, 75,
+ 123, 76, 71, -1, 124, -1, 124, 77, 123, -1,
+ 28, 70, 125, -1, 6, 38, 70, 125, -1, 18,
+ 38, 70, 125, -1, 51, 70, 125, -1, 7, 70,
+ 125, -1, 42, 70, 125, -1, 40, 42, 70, 125,
+ -1, 36, 42, 70, 125, -1, 46, 70, 125, -1,
+ 44, 70, 125, -1, 13, 70, 125, -1, 10, 70,
+ 126, -1, 12, 70, 126, -1, 52, 28, 70, 125,
+ -1, 3, 28, 70, 125, -1, 38, 28, 70, 125,
+ -1, 56, 28, 70, 125, -1, 58, 35, 70, 126,
+ -1, 26, 45, 35, 70, 126, -1, 30, 70, 126,
+ -1, 30, 70, 50, -1, 25, 70, 127, -1, 23,
+ 70, 126, -1, 42, 70, 5, -1, 11, 70, 125,
+ -1, 11, 70, 5, -1, 66, 41, 70, 125, -1,
+ 57, 70, 125, -1, 130, -1, 132, -1, 128, -1,
+ 129, -1, 65, -1, 41, -1, 59, -1, 37, -1,
+ 39, -1, 22, -1, 69, -1, 67, -1, 68, -1,
+ -1
};
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const unsigned short yyrline[] =
{
- 0, 242, 242, 257, 263, 265, 269, 287, 289, 293,
- 295, 299, 316, 334, 352, 369, 386, 389, 393, 395,
- 399, 401, 403, 405, 407, 409, 411, 413, 415, 417,
- 419, 421, 423, 425, 427, 429, 431, 433, 435, 437,
- 439, 441, 443, 445, 447, 449, 451, 453, 455, 460,
- 477, 494, 511, 513, 517, 532, 560, 590, 618, 646,
- 672, 704, 734, 764, 794, 824, 852, 882, 910, 948,
- 982, 1012, 1042, 1074, 1102, 1130, 1158, 1188, 1219, 1245,
- 1277, 1279, 1283, 1285, 1289, 1294, 1299, 1304, 1309, 1314,
- 1319, 1324, 1329, 1334, 1339, 1344, 1349, 1354, 1359, 1364,
- 1369, 1374, 1379, 1384, 1389, 1402, 1407, 1412, 1425, 1430,
- 1443, 1448, 1455, 1469, 1483, 1495, 1509, 1510, 1511, 1514,
- 1515, 1516, 1519, 1525, 1537, 1550
+ 0, 244, 244, 259, 265, 267, 271, 289, 291, 295,
+ 297, 301, 318, 336, 354, 371, 388, 391, 395, 397,
+ 401, 403, 405, 407, 409, 411, 413, 415, 417, 419,
+ 421, 423, 425, 427, 429, 431, 433, 435, 437, 439,
+ 441, 443, 445, 447, 449, 451, 453, 455, 457, 459,
+ 461, 466, 483, 500, 517, 519, 523, 538, 566, 596,
+ 624, 652, 678, 710, 740, 770, 800, 830, 858, 888,
+ 916, 954, 988, 1014, 1042, 1072, 1102, 1134, 1162, 1190,
+ 1218, 1248, 1279, 1305, 1337, 1339, 1343, 1345, 1349, 1354,
+ 1359, 1364, 1369, 1374, 1379, 1384, 1389, 1394, 1399, 1404,
+ 1409, 1414, 1419, 1424, 1429, 1434, 1439, 1444, 1449, 1462,
+ 1467, 1472, 1485, 1490, 1503, 1508, 1515, 1529, 1543, 1555,
+ 1569, 1570, 1571, 1574, 1575, 1576, 1579, 1585, 1597, 1610
};
#endif
@@ -599,13 +601,13 @@
"stmt_drop_path", "stmt_store_listen", "stmt_drop_listen",
"stmt_create_set", "stmt_drop_set", "stmt_merge_set",
"stmt_table_add_key", "stmt_set_add_table", "stmt_set_add_sequence",
- "stmt_store_trigger", "stmt_drop_trigger", "stmt_subscribe_set",
- "stmt_unsubscribe_set", "stmt_lock_set", "stmt_unlock_set",
- "stmt_move_set", "stmt_ddl_script", "stmt_update_functions",
- "stmt_wait_event", "option_list", "option_list_items",
- "option_list_item", "option_item_id", "option_item_literal",
- "option_item_yn", "option_item_yn_yes", "option_item_yn_no", "id",
- "ident", "literal", "lno", 0
+ "stmt_set_drop_table", "stmt_set_drop_sequence", "stmt_store_trigger",
+ "stmt_drop_trigger", "stmt_subscribe_set", "stmt_unsubscribe_set",
+ "stmt_lock_set", "stmt_unlock_set", "stmt_move_set", "stmt_ddl_script",
+ "stmt_update_functions", "stmt_wait_event", "option_list",
+ "option_list_items", "option_list_item", "option_item_id",
+ "option_item_literal", "option_item_yn", "option_item_yn_yes",
+ "option_item_yn_no", "id", "ident", "literal", "lno", 0
};
#endif
@@ -632,15 +634,15 @@
84, 85, 85, 85, 85, 85, 86, 87, 88, 88,
89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
- 89, 89, 89, 89, 89, 89, 89, 89, 89, 90,
- 91, 92, 93, 93, 94, 95, 96, 97, 98, 99,
- 100, 101, 102, 103, 104, 105, 106, 107, 108, 109,
- 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
- 120, 120, 121, 121, 122, 122, 122, 122, 122, 122,
- 122, 122, 122, 122, 122, 122, 122, 122, 122, 122,
- 122, 122, 122, 122, 122, 122, 122, 122, 122, 122,
- 122, 122, 123, 124, 125, 125, 126, 126, 126, 127,
- 127, 127, 128, 129, 130, 131
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 90, 91, 92, 93, 93, 94, 95, 96, 97,
+ 98, 99, 100, 101, 102, 103, 104, 105, 106, 107,
+ 108, 109, 110, 111, 112, 113, 114, 115, 116, 117,
+ 118, 119, 120, 121, 122, 122, 123, 123, 124, 124,
+ 124, 124, 124, 124, 124, 124, 124, 124, 124, 124,
+ 124, 124, 124, 124, 124, 124, 124, 124, 124, 124,
+ 124, 124, 124, 124, 124, 124, 125, 126, 127, 127,
+ 128, 128, 128, 129, 129, 129, 130, 131, 132, 133
};
/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
@@ -650,15 +652,15 @@
1, 6, 7, 7, 6, 5, 5, 5, 1, 2,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 2, 4,
- 4, 5, 1, 2, 2, 4, 4, 4, 3, 4,
- 4, 4, 4, 4, 4, 4, 4, 5, 5, 5,
- 4, 4, 4, 4, 4, 4, 4, 4, 4, 5,
- 1, 4, 1, 3, 3, 4, 4, 3, 3, 3,
- 4, 4, 3, 3, 3, 3, 3, 4, 4, 4,
- 4, 4, 5, 3, 3, 3, 3, 3, 3, 3,
- 4, 3, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 0
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 2, 4, 4, 5, 1, 2, 2, 4, 4, 4,
+ 3, 4, 4, 4, 4, 4, 4, 4, 4, 5,
+ 5, 5, 5, 5, 4, 4, 4, 4, 4, 4,
+ 4, 4, 4, 5, 1, 4, 1, 3, 3, 4,
+ 4, 3, 3, 3, 4, 4, 3, 3, 3, 3,
+ 3, 4, 4, 4, 4, 4, 5, 3, 3, 3,
+ 3, 3, 3, 3, 4, 3, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 0
};
/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -666,196 +668,198 @@
means the default is an error. */
static const unsigned char yydefact[] =
{
- 125, 0, 125, 0, 1, 125, 4, 0, 0, 2,
- 125, 9, 10, 20, 21, 22, 0, 23, 24, 25,
+ 129, 0, 129, 0, 1, 129, 4, 0, 0, 2,
+ 129, 9, 10, 20, 21, 22, 0, 23, 24, 25,
26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
- 46, 47, 0, 5, 0, 0, 8, 48, 54, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 46, 47, 48, 49, 0, 5, 0, 0, 8, 50,
+ 56, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 122, 0, 0, 0, 0, 0, 0, 0, 0, 124,
- 0, 0, 52, 0, 0, 80, 0, 58, 0, 0,
+ 0, 0, 126, 0, 0, 0, 0, 0, 0, 0,
+ 0, 128, 0, 0, 54, 0, 0, 84, 0, 60,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 125, 0, 0, 0, 0, 0, 0, 123, 0, 64,
- 63, 57, 61, 65, 71, 49, 77, 53, 50, 0,
+ 0, 0, 0, 129, 0, 0, 0, 0, 0, 0,
+ 127, 0, 66, 65, 59, 63, 67, 75, 51, 81,
+ 55, 52, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 86, 57,
+ 78, 68, 80, 0, 0, 0, 0, 0, 64, 58,
+ 62, 74, 76, 0, 0, 129, 0, 61, 79, 77,
+ 82, 0, 0, 3, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 82, 55, 74, 66, 76,
- 0, 0, 0, 62, 56, 60, 70, 72, 0, 0,
- 125, 0, 59, 75, 73, 78, 0, 0, 3, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 51, 69, 68, 67,
- 15, 19, 79, 0, 0, 0, 88, 112, 95, 113,
- 109, 108, 96, 94, 0, 106, 121, 119, 120, 117,
- 118, 116, 105, 114, 115, 0, 84, 104, 103, 0,
- 0, 0, 107, 89, 93, 92, 87, 0, 0, 111,
- 0, 0, 81, 83, 0, 11, 14, 0, 98, 85,
- 86, 0, 91, 99, 90, 97, 100, 101, 110, 0,
- 0, 0, 13, 0, 12, 6, 102, 125, 125, 0,
- 0, 16, 17
+ 0, 53, 71, 70, 73, 72, 69, 15, 19, 83,
+ 0, 0, 0, 92, 116, 99, 117, 113, 112, 100,
+ 98, 0, 110, 125, 123, 124, 121, 122, 120, 109,
+ 118, 119, 0, 88, 108, 107, 0, 0, 0, 111,
+ 93, 97, 96, 91, 0, 0, 115, 0, 0, 85,
+ 87, 0, 11, 14, 0, 102, 89, 90, 0, 95,
+ 103, 94, 101, 104, 105, 114, 0, 0, 0, 13,
+ 0, 12, 6, 106, 129, 129, 0, 0, 16, 17
};
/* YYDEFGOTO[NTERM-NUM]. */
static const short yydefgoto[] =
{
- -1, 1, 2, 5, 6, 9, 10, 11, 245, 246,
- 159, 12, 13, 14, 15, 84, 16, 17, 18, 19,
+ -1, 1, 2, 5, 6, 9, 10, 11, 252, 253,
+ 164, 12, 13, 14, 15, 86, 16, 17, 18, 19,
20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
- 40, 41, 87, 144, 145, 206, 208, 222, 223, 224,
- 207, 108, 209, 42
+ 40, 41, 42, 43, 89, 147, 148, 213, 215, 229,
+ 230, 231, 214, 111, 216, 44
};
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
-#define YYPACT_NINF -160
+#define YYPACT_NINF -165
static const short yypact[] =
{
- -160, 8, -160, 15, -160, -160, -3, -2, 7, -160,
- 4, -160, -160, -160, -160, -160, -27, -160, -160, -160,
- -160, -160, -160, -160, -160, -160, -160, -160, -160, -160,
- -160, -160, -160, -160, -160, -160, -160, -160, -160, -160,
- -160, -160, 103, -160, -20, -19, -160, -160, -160, 5,
- 33, -16, 12, -24, -1, 54, 16, 23, 26, 41,
- 81, 69, 34, 87, 21, 57, 44, 51, 83, 84,
- -160, 107, 46, -1, -1, -1, -1, -1, -1, -160,
- 43, -1, -160, -24, 45, -160, 223, -160, -1, -1,
- -1, -1, -20, -28, -1, -1, -1, -1, -1, 85,
- -160, -1, -1, -1, -1, 102, 109, -160, 55, -160,
- -160, -160, -160, -160, -160, -160, -160, -160, -160, 97,
- 90, 59, 60, 61, 63, 64, 100, 70, 71, 94,
- 72, 73, 104, 116, 105, 75, 78, 79, 82, 123,
- 125, 92, 133, 119, 98, 93, -160, -160, -160, -160,
- 108, -1, -1, -160, -160, -160, -160, -160, -1, 110,
- 111, 157, -160, -160, -160, -160, -1, 112, -160, 115,
- 117, -20, -16, 0, -16, -20, 118, -16, 24, 140,
- -20, -21, 122, 124, 126, 11, -20, -20, -20, 127,
- 128, -20, 129, 130, 131, 223, -160, -160, -160, -160,
- 139, -160, -160, -16, -20, -20, -160, -160, -160, -160,
- -160, -160, -160, -160, -20, -160, -160, -160, -160, -160,
- -160, -160, -160, -160, -160, 135, -160, -160, -160, -20,
- -20, -20, -160, -160, -160, -160, -160, -20, -20, -160,
- -16, -20, -160, -160, 3, 152, 154, 132, -160, -160,
- -160, -16, -160, -160, -160, -160, -160, -160, -160, 134,
- 136, 146, -160, 164, -160, -160, -160, -160, -160, 141,
- 142, -160, -160
+ -165, 20, -165, 13, -165, -165, 14, 21, 15, -165,
+ 4, -165, -165, -165, -165, -165, -20, -165, -165, -165,
+ -165, -165, -165, -165, -165, -165, -165, -165, -165, -165,
+ -165, -165, -165, -165, -165, -165, -165, -165, -165, -165,
+ -165, -165, -165, -165, 109, -165, -8, 9, -165, -165,
+ -165, 10, 35, 16, 32, -11, -1, 73, 30, 34,
+ 40, 57, 33, 68, 44, 95, 31, 69, 61, 62,
+ 88, 92, -165, 113, 51, -1, -1, -1, -1, -1,
+ -1, -165, 48, -1, -165, -11, 49, -165, 230, -165,
+ -1, -1, -1, -1, -8, -26, -3, -1, -1, -1,
+ -1, -1, 91, -165, -1, -1, -1, -1, 104, 115,
+ -165, 60, -165, -165, -165, -165, -165, -165, -165, -165,
+ -165, -165, 105, 94, 64, 65, 66, 67, 70, 101,
+ 74, 75, 102, 76, 78, 107, 122, 110, 81, 83,
+ 84, 85, 129, 130, 90, 132, 127, 98, 99, -165,
+ -165, -165, -165, 114, -1, -1, -1, -1, -165, -165,
+ -165, -165, -165, -1, 108, 116, 163, -165, -165, -165,
+ -165, -1, 117, -165, 118, 120, -8, 16, 0, 16,
+ -8, 121, 16, 6, 145, -8, -31, 123, 124, 128,
+ 3, -8, -8, -8, 131, 133, -8, 134, 135, 136,
+ 230, -165, -165, -165, -165, -165, -165, 158, -165, -165,
+ 16, -8, -8, -165, -165, -165, -165, -165, -165, -165,
+ -165, -8, -165, -165, -165, -165, -165, -165, -165, -165,
+ -165, -165, 138, -165, -165, -165, -8, -8, -8, -165,
+ -165, -165, -165, -165, -8, -8, -165, 16, -8, -165,
+ -165, 12, 159, 161, 140, -165, -165, -165, 16, -165,
+ -165, -165, -165, -165, -165, -165, 137, 141, 151, -165,
+ 169, -165, -165, -165, -165, -165, 139, 147, -165, -165
};
/* YYPGOTO[NTERM-NUM]. */
static const short yypgoto[] =
{
- -160, -160, -160, 201, -160, -10, -160, -160, -34, -29,
- 62, -94, -160, -160, -160, 144, -160, -160, -160, -160,
- -160, -160, -160, -160, -160, -160, -160, -160, -160, -160,
- -160, -160, -160, -160, -160, -160, -160, -160, -160, -160,
- -160, -160, -64, 22, -160, -132, -159, -160, -160, -160,
- -25, -160, -49, 1
+ -165, -165, -165, 208, -165, -10, -165, -165, -35, -29,
+ 56, -97, -165, -165, -165, 143, -165, -165, -165, -165,
+ -165, -165, -165, -165, -165, -165, -165, -165, -165, -165,
+ -165, -165, -165, -165, -165, -165, -165, -165, -165, -165,
+ -165, -165, -165, -165, -66, 22, -165, -136, -164, -165,
+ -165, -165, -30, -165, -51, 1
};
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
positive, shift that token. If negative, reduce the rule which
number is the opposite. If zero, do what YYDEFACT says.
If YYTABLE_NINF, syntax error. */
-#define YYTABLE_NINF -126
+#define YYTABLE_NINF -130
static const short yytable[] =
{
- 46, 3, 80, 7, -7, 210, 160, 7, 4, 109,
- 110, 111, 112, 113, 114, 212, 232, 116, 215, 71,
- 259, 151, 228, 8, 146, 147, 148, 149, 152, 227,
- 153, 154, 155, 156, 157, -125, 44, 162, 163, 164,
- 165, 211, 45, 213, 47, 82, 216, 79, 226, 70,
- 83, 72, 79, 233, 234, 235, 236, 73, 260, 239,
- 81, 217, 88, 218, 74, 219, 160, 150, 89, 70,
- 85, 75, 248, 249, 86, 90, 76, -7, 91, 92,
- 70, 257, 250, 220, 93, 77, 98, 197, 198, 221,
- 99, 78, 266, 100, 199, 101, 102, 252, 253, 254,
- 94, 161, 202, 103, 48, 255, 256, 95, 105, 258,
- 104, 106, 96, 107, 115, 158, 118, 49, 50, 51,
- 166, 167, 52, 53, 54, 169, 168, 97, 170, 171,
- 172, 173, 55, 174, 175, 56, 57, 58, 176, 179,
- 177, 178, 180, 181, 183, 185, 182, 184, 186, 187,
- 59, 189, 188, 190, 247, 60, 61, 62, 48, 63,
- 193, 161, 191, 64, 65, 66, 67, 68, 192, 69,
- 195, 49, 50, 51, 194, 225, 52, 53, 54, 196,
- 244, 259, 203, 200, -18, 204, 55, 205, 214, 56,
- 57, 58, 229, 261, 230, 263, 231, 237, 238, 240,
- 241, 260, 242, 265, 59, 251, 267, 43, 268, 60,
- 61, 62, 264, 63, 271, 272, 262, 243, 65, 66,
- 67, 68, 201, 69, 0, 0, 119, 117, 0, 120,
- 121, 0, 0, 122, 123, 124, 125, 0, 0, 0,
- 0, 126, 0, 0, 0, 0, 127, 0, 128, 129,
- 0, 130, 0, 131, 0, 0, 0, 269, 270, 132,
- 0, 133, 0, 134, 0, 135, 0, 136, 0, 137,
- 0, 0, 0, 0, 138, 139, 0, 0, 0, 140,
- 141, 142, 0, 0, 0, 0, 0, 0, 0, 143
+ 48, 3, 82, 7, -7, 217, 165, 7, 239, 112,
+ 113, 114, 115, 116, 117, 219, 73, 119, 222, 234,
+ 4, 8, 235, 154, 149, 150, 151, 152, 223, 266,
+ 155, 158, 159, 160, 161, 162, 95, 81, 167, 168,
+ 169, 170, 218, 224, 220, 225, 156, 226, 96, 233,
+ 47, 49, -129, 157, 240, 241, 242, 243, 84, 46,
+ 246, 72, 75, 85, 153, 227, 76, 267, 165, 72,
+ 87, 228, 72, 77, 88, 255, 256, -7, 78, 74,
+ 83, 90, 91, 264, 81, 257, 92, 79, 202, 203,
+ 204, 205, 93, 80, 273, 94, 101, 206, 102, 97,
+ 259, 260, 261, 103, 166, 209, 98, 104, 262, 263,
+ 50, 99, 265, 105, 106, 107, 108, 109, 110, 118,
+ 121, 163, 171, 51, 52, 53, 100, 172, 54, 55,
+ 56, 173, 175, 174, 176, 177, 178, 179, 57, 181,
+ 180, 58, 59, 60, 182, 183, 185, 184, 186, 187,
+ 188, 190, 189, 191, 192, 193, 61, 194, 195, 254,
+ 196, 62, 63, 64, 50, 65, 166, 197, 198, 66,
+ 67, 68, 69, 70, 199, 71, 200, 51, 52, 53,
+ 232, 207, 54, 55, 56, 201, 266, 210, 211, -18,
+ 212, 221, 57, 236, 237, 58, 59, 60, 238, 251,
+ 268, 244, 270, 245, 247, 248, 267, 249, 258, 274,
+ 61, 272, 278, 275, 45, 62, 63, 64, 271, 65,
+ 279, 208, 250, 269, 67, 68, 69, 70, 120, 71,
+ 0, 0, 0, 122, 0, 0, 123, 124, 0, 0,
+ 125, 126, 127, 128, 0, 0, 0, 0, 129, 0,
+ 0, 0, 0, 130, 0, 131, 132, 0, 133, 0,
+ 134, 0, 0, 0, 276, 277, 135, 0, 136, 0,
+ 137, 0, 138, 0, 139, 0, 140, 0, 0, 0,
+ 0, 141, 142, 0, 0, 0, 143, 144, 145, 0,
+ 0, 0, 0, 0, 0, 0, 146
};
static const short yycheck[] =
{
- 10, 0, 51, 2, 0, 5, 100, 6, 0, 73,
- 74, 75, 76, 77, 78, 174, 5, 81, 177, 44,
- 17, 49, 181, 8, 88, 89, 90, 91, 56, 50,
- 94, 95, 96, 97, 98, 38, 38, 101, 102, 103,
- 104, 173, 35, 175, 71, 69, 22, 68, 180, 69,
- 74, 70, 68, 185, 186, 187, 188, 52, 55, 191,
- 48, 37, 8, 39, 31, 41, 160, 92, 52, 69,
- 71, 38, 204, 205, 75, 52, 43, 73, 52, 38,
- 69, 240, 214, 59, 3, 52, 52, 151, 152, 65,
- 3, 58, 251, 72, 158, 38, 52, 229, 230, 231,
- 31, 100, 166, 52, 1, 237, 238, 38, 24, 241,
- 27, 4, 43, 67, 71, 30, 71, 14, 15, 16,
- 18, 12, 19, 20, 21, 28, 71, 58, 38, 70,
- 70, 70, 29, 70, 70, 32, 33, 34, 38, 45,
- 70, 70, 70, 70, 28, 70, 42, 42, 70, 70,
- 47, 28, 70, 28, 203, 52, 53, 54, 1, 56,
- 41, 160, 70, 60, 61, 62, 63, 64, 35, 66,
- 77, 14, 15, 16, 76, 35, 19, 20, 21, 71,
- 41, 17, 70, 73, 73, 70, 29, 70, 70, 32,
- 33, 34, 70, 41, 70, 41, 70, 70, 70, 70,
- 70, 55, 71, 71, 47, 70, 72, 6, 72, 52,
- 53, 54, 246, 56, 73, 73, 245, 195, 61, 62,
- 63, 64, 160, 66, -1, -1, 3, 83, -1, 6,
- 7, -1, -1, 10, 11, 12, 13, -1, -1, -1,
- -1, 18, -1, -1, -1, -1, 23, -1, 25, 26,
- -1, 28, -1, 30, -1, -1, -1, 267, 268, 36,
- -1, 38, -1, 40, -1, 42, -1, 44, -1, 46,
- -1, -1, -1, -1, 51, 52, -1, -1, -1, 56,
- 57, 58, -1, -1, -1, -1, -1, -1, -1, 66
+ 10, 0, 53, 2, 0, 5, 103, 6, 5, 75,
+ 76, 77, 78, 79, 80, 179, 46, 83, 182, 50,
+ 0, 8, 186, 49, 90, 91, 92, 93, 22, 17,
+ 56, 97, 98, 99, 100, 101, 3, 68, 104, 105,
+ 106, 107, 178, 37, 180, 39, 49, 41, 15, 185,
+ 35, 71, 38, 56, 190, 191, 192, 193, 69, 38,
+ 196, 69, 52, 74, 94, 59, 31, 55, 165, 69,
+ 71, 65, 69, 38, 75, 211, 212, 73, 43, 70,
+ 48, 8, 52, 247, 68, 221, 52, 52, 154, 155,
+ 156, 157, 52, 58, 258, 38, 52, 163, 3, 31,
+ 236, 237, 238, 72, 103, 171, 38, 38, 244, 245,
+ 1, 43, 248, 52, 52, 27, 24, 4, 67, 71,
+ 71, 30, 18, 14, 15, 16, 58, 12, 19, 20,
+ 21, 71, 38, 28, 70, 70, 70, 70, 29, 38,
+ 70, 32, 33, 34, 70, 70, 70, 45, 70, 42,
+ 28, 70, 42, 70, 70, 70, 47, 28, 28, 210,
+ 70, 52, 53, 54, 1, 56, 165, 35, 41, 60,
+ 61, 62, 63, 64, 76, 66, 77, 14, 15, 16,
+ 35, 73, 19, 20, 21, 71, 17, 70, 70, 73,
+ 70, 70, 29, 70, 70, 32, 33, 34, 70, 41,
+ 41, 70, 41, 70, 70, 70, 55, 71, 70, 72,
+ 47, 71, 73, 72, 6, 52, 53, 54, 253, 56,
+ 73, 165, 200, 252, 61, 62, 63, 64, 85, 66,
+ -1, -1, -1, 3, -1, -1, 6, 7, -1, -1,
+ 10, 11, 12, 13, -1, -1, -1, -1, 18, -1,
+ -1, -1, -1, 23, -1, 25, 26, -1, 28, -1,
+ 30, -1, -1, -1, 274, 275, 36, -1, 38, -1,
+ 40, -1, 42, -1, 44, -1, 46, -1, -1, -1,
+ -1, 51, 52, -1, -1, -1, 56, 57, 58, -1,
+ -1, -1, -1, -1, -1, -1, 66
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
symbol of state STATE-NUM. */
static const unsigned char yystos[] =
{
- 0, 79, 80, 131, 0, 81, 82, 131, 8, 83,
+ 0, 79, 80, 133, 0, 81, 82, 133, 8, 83,
84, 85, 89, 90, 91, 92, 94, 95, 96, 97,
98, 99, 100, 101, 102, 103, 104, 105, 106, 107,
108, 109, 110, 111, 112, 113, 114, 115, 116, 117,
- 118, 119, 131, 81, 38, 35, 83, 71, 1, 14,
- 15, 16, 19, 20, 21, 29, 32, 33, 34, 47,
- 52, 53, 54, 56, 60, 61, 62, 63, 64, 66,
- 69, 128, 70, 52, 31, 38, 43, 52, 58, 68,
- 130, 48, 69, 74, 93, 71, 75, 120, 8, 52,
- 52, 52, 38, 3, 31, 38, 43, 58, 52, 3,
- 72, 38, 52, 52, 27, 24, 4, 67, 129, 120,
- 120, 120, 120, 120, 120, 71, 120, 93, 71, 3,
- 6, 7, 10, 11, 12, 13, 18, 23, 25, 26,
- 28, 30, 36, 38, 40, 42, 44, 46, 51, 52,
- 56, 57, 58, 66, 121, 122, 120, 120, 120, 120,
- 128, 49, 56, 120, 120, 120, 120, 120, 30, 88,
- 89, 131, 120, 120, 120, 120, 18, 12, 71, 28,
- 38, 70, 70, 70, 70, 70, 38, 70, 70, 45,
- 70, 70, 42, 28, 42, 70, 70, 70, 70, 28,
- 28, 70, 35, 41, 76, 77, 71, 120, 120, 120,
- 73, 88, 120, 70, 70, 70, 123, 128, 124, 130,
- 5, 123, 124, 123, 70, 124, 22, 37, 39, 41,
- 59, 65, 125, 126, 127, 35, 123, 50, 124, 70,
- 70, 70, 5, 123, 123, 123, 123, 70, 70, 123,
- 70, 70, 71, 121, 41, 86, 87, 130, 123, 123,
- 123, 70, 123, 123, 123, 123, 123, 124, 123, 17,
- 55, 41, 87, 41, 86, 71, 124, 72, 72, 83,
- 83, 73, 73
+ 118, 119, 120, 121, 133, 81, 38, 35, 83, 71,
+ 1, 14, 15, 16, 19, 20, 21, 29, 32, 33,
+ 34, 47, 52, 53, 54, 56, 60, 61, 62, 63,
+ 64, 66, 69, 130, 70, 52, 31, 38, 43, 52,
+ 58, 68, 132, 48, 69, 74, 93, 71, 75, 122,
+ 8, 52, 52, 52, 38, 3, 15, 31, 38, 43,
+ 58, 52, 3, 72, 38, 52, 52, 27, 24, 4,
+ 67, 131, 122, 122, 122, 122, 122, 122, 71, 122,
+ 93, 71, 3, 6, 7, 10, 11, 12, 13, 18,
+ 23, 25, 26, 28, 30, 36, 38, 40, 42, 44,
+ 46, 51, 52, 56, 57, 58, 66, 123, 124, 122,
+ 122, 122, 122, 130, 49, 56, 49, 56, 122, 122,
+ 122, 122, 122, 30, 88, 89, 133, 122, 122, 122,
+ 122, 18, 12, 71, 28, 38, 70, 70, 70, 70,
+ 70, 38, 70, 70, 45, 70, 70, 42, 28, 42,
+ 70, 70, 70, 70, 28, 28, 70, 35, 41, 76,
+ 77, 71, 122, 122, 122, 122, 122, 73, 88, 122,
+ 70, 70, 70, 125, 130, 126, 132, 5, 125, 126,
+ 125, 70, 126, 22, 37, 39, 41, 59, 65, 127,
+ 128, 129, 35, 125, 50, 126, 70, 70, 70, 5,
+ 125, 125, 125, 125, 70, 70, 125, 70, 70, 71,
+ 123, 41, 86, 87, 132, 125, 125, 125, 70, 125,
+ 125, 125, 125, 125, 126, 125, 17, 55, 41, 87,
+ 41, 86, 71, 126, 72, 72, 83, 83, 73, 73
};
#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
@@ -1465,7 +1469,7 @@
switch (yyn)
{
case 2:
-#line 245 "parser.y"
+#line 247 "parser.y"
{
parser_script = (SlonikScript *)
malloc(sizeof(SlonikScript));
@@ -1479,24 +1483,24 @@
break;
case 3:
-#line 258 "parser.y"
+#line 260 "parser.y"
{
yyval.str = yyvsp[-1].str;
}
break;
case 4:
-#line 264 "parser.y"
+#line 266 "parser.y"
{ yyval.adm_info = yyvsp[0].adm_info; }
break;
case 5:
-#line 266 "parser.y"
+#line 268 "parser.y"
{ yyvsp[-1].adm_info->next = yyvsp[0].adm_info; yyval.adm_info = yyvsp[-1].adm_info; }
break;
case 6:
-#line 270 "parser.y"
+#line 272 "parser.y"
{
SlonikAdmInfo *new;
@@ -1515,27 +1519,27 @@
break;
case 7:
-#line 288 "parser.y"
+#line 290 "parser.y"
{ yyval.statement = yyvsp[0].statement; }
break;
case 8:
-#line 290 "parser.y"
+#line 292 "parser.y"
{ yyvsp[-1].statement->next = yyvsp[0].statement; yyval.statement = yyvsp[-1].statement; }
break;
case 9:
-#line 294 "parser.y"
+#line 296 "parser.y"
{ yyval.statement = yyvsp[0].statement; }
break;
case 10:
-#line 296 "parser.y"
+#line 298 "parser.y"
{ yyval.statement = yyvsp[0].statement; }
break;
case 11:
-#line 301 "parser.y"
+#line 303 "parser.y"
{
SlonikStmt_try *new;
@@ -1554,7 +1558,7 @@
break;
case 12:
-#line 318 "parser.y"
+#line 320 "parser.y"
{
SlonikStmt_try *new;
@@ -1574,7 +1578,7 @@
break;
case 13:
-#line 336 "parser.y"
+#line 338 "parser.y"
{
SlonikStmt_try *new;
@@ -1594,7 +1598,7 @@
break;
case 14:
-#line 354 "parser.y"
+#line 356 "parser.y"
{
SlonikStmt_try *new;
@@ -1613,7 +1617,7 @@
break;
case 15:
-#line 370 "parser.y"
+#line 372 "parser.y"
{
SlonikStmt_try *new;
@@ -1631,173 +1635,183 @@
break;
case 16:
-#line 387 "parser.y"
+#line 389 "parser.y"
{ yyval.statement = yyvsp[-1].statement; }
break;
case 17:
-#line 390 "parser.y"
+#line 392 "parser.y"
{ yyval.statement = yyvsp[-1].statement; }
break;
case 18:
-#line 394 "parser.y"
+#line 396 "parser.y"
{ yyval.statement = yyvsp[0].statement; }
break;
case 19:
-#line 396 "parser.y"
+#line 398 "parser.y"
{ yyvsp[-1].statement->next = yyvsp[0].statement; yyval.statement = yyvsp[-1].statement; }
break;
case 20:
-#line 400 "parser.y"
+#line 402 "parser.y"
{ yyval.statement = yyvsp[0].statement; }
break;
case 21:
-#line 402 "parser.y"
+#line 404 "parser.y"
{ yyval.statement = yyvsp[0].statement; }
break;
case 22:
-#line 404 "parser.y"
+#line 406 "parser.y"
{ yyval.statement = yyvsp[0].statement; }
break;
case 23:
-#line 406 "parser.y"
+#line 408 "parser.y"
{ yyval.statement = yyvsp[0].statement; }
break;
case 24:
-#line 408 "parser.y"
+#line 410 "parser.y"
{ yyval.statement = yyvsp[0].statement; }
break;
case 25:
-#line 410 "parser.y"
+#line 412 "parser.y"
{ yyval.statement = yyvsp[0].statement; }
break;
case 26:
-#line 412 "parser.y"
+#line 414 "parser.y"
{ yyval.statement = yyvsp[0].statement; }
break;
case 27:
-#line 414 "parser.y"
+#line 416 "parser.y"
{ yyval.statement = yyvsp[0].statement; }
break;
case 28:
-#line 416 "parser.y"
+#line 418 "parser.y"
{ yyval.statement = yyvsp[0].statement; }
break;
case 29:
-#line 418 "parser.y"
+#line 420 "parser.y"
{ yyval.statement = yyvsp[0].statement; }
break;
case 30:
-#line 420 "parser.y"
+#line 422 "parser.y"
{ yyval.statement = yyvsp[0].statement; }
break;
case 31:
-#line 422 "parser.y"
+#line 424 "parser.y"
{ yyval.statement = yyvsp[0].statement; }
break;
case 32:
-#line 424 "parser.y"
+#line 426 "parser.y"
{ yyval.statement = yyvsp[0].statement; }
break;
case 33:
-#line 426 "parser.y"
+#line 428 "parser.y"
{ yyval.statement = yyvsp[0].statement; }
break;
case 34:
-#line 428 "parser.y"
+#line 430 "parser.y"
{ yyval.statement = yyvsp[0].statement; }
break;
case 35:
-#line 430 "parser.y"
+#line 432 "parser.y"
{ yyval.statement = yyvsp[0].statement; }
break;
case 36:
-#line 432 "parser.y"
+#line 434 "parser.y"
{ yyval.statement = yyvsp[0].statement; }
break;
case 37:
-#line 434 "parser.y"
+#line 436 "parser.y"
{ yyval.statement = yyvsp[0].statement; }
break;
case 38:
-#line 436 "parser.y"
+#line 438 "parser.y"
{ yyval.statement = yyvsp[0].statement; }
break;
case 39:
-#line 438 "parser.y"
+#line 440 "parser.y"
{ yyval.statement = yyvsp[0].statement; }
break;
case 40:
-#line 440 "parser.y"
+#line 442 "parser.y"
{ yyval.statement = yyvsp[0].statement; }
break;
case 41:
-#line 442 "parser.y"
+#line 444 "parser.y"
{ yyval.statement = yyvsp[0].statement; }
break;
case 42:
-#line 444 "parser.y"
+#line 446 "parser.y"
{ yyval.statement = yyvsp[0].statement; }
break;
case 43:
-#line 446 "parser.y"
+#line 448 "parser.y"
{ yyval.statement = yyvsp[0].statement; }
break;
case 44:
-#line 448 "parser.y"
+#line 450 "parser.y"
{ yyval.statement = yyvsp[0].statement; }
break;
case 45:
-#line 450 "parser.y"
+#line 452 "parser.y"
{ yyval.statement = yyvsp[0].statement; }
break;
case 46:
-#line 452 "parser.y"
+#line 454 "parser.y"
{ yyval.statement = yyvsp[0].statement; }
break;
case 47:
-#line 454 "parser.y"
+#line 456 "parser.y"
{ yyval.statement = yyvsp[0].statement; }
break;
case 48:
-#line 456 "parser.y"
+#line 458 "parser.y"
+ { yyval.statement = yyvsp[0].statement; }
+ break;
+
+ case 49:
+#line 460 "parser.y"
+ { yyval.statement = yyvsp[0].statement; }
+ break;
+
+ case 50:
+#line 462 "parser.y"
{ yyerrok;
yyval.statement = yyvsp[-1].statement; }
break;
- case 49:
-#line 461 "parser.y"
+ case 51:
+#line 467 "parser.y"
{
SlonikStmt_echo *new;
@@ -1814,8 +1828,8 @@
}
break;
- case 50:
-#line 478 "parser.y"
+ case 52:
+#line 484 "parser.y"
{
SlonikStmt_exit *new;
@@ -1832,8 +1846,8 @@
}
break;
- case 51:
-#line 495 "parser.y"
+ case 53:
+#line 501 "parser.y"
{
SlonikStmt_restart_node *new;
@@ -1850,18 +1864,18 @@
}
break;
- case 52:
-#line 512 "parser.y"
+ case 54:
+#line 518 "parser.y"
{ yyval.ival = strtol(yytext, NULL, 10); }
break;
- case 53:
-#line 514 "parser.y"
+ case 55:
+#line 520 "parser.y"
{ yyval.ival = -yyvsp[0].ival; }
break;
- case 54:
-#line 518 "parser.y"
+ case 56:
+#line 524 "parser.y"
{
SlonikStmt *new;
@@ -1876,8 +1890,8 @@
}
break;
- case 55:
-#line 533 "parser.y"
+ case 57:
+#line 539 "parser.y"
{
SlonikStmt_init_cluster *new;
statement_option opt[] = {
@@ -1905,8 +1919,8 @@
}
break;
- case 56:
-#line 561 "parser.y"
+ case 58:
+#line 567 "parser.y"
{
SlonikStmt_store_node *new;
statement_option opt[] = {
@@ -1936,8 +1950,8 @@
}
break;
- case 57:
-#line 591 "parser.y"
+ case 59:
+#line 597 "parser.y"
{
SlonikStmt_drop_node *new;
statement_option opt[] = {
@@ -1965,8 +1979,8 @@
}
break;
- case 58:
-#line 619 "parser.y"
+ case 60:
+#line 625 "parser.y"
{
SlonikStmt_failed_node *new;
statement_option opt[] = {
@@ -1994,8 +2008,8 @@
}
break;
- case 59:
-#line 647 "parser.y"
+ case 61:
+#line 653 "parser.y"
{
SlonikStmt_uninstall_node *new;
statement_option opt[] = {
@@ -2021,8 +2035,8 @@
}
break;
- case 60:
-#line 673 "parser.y"
+ case 62:
+#line 679 "parser.y"
{
SlonikStmt_store_path *new;
statement_option opt[] = {
@@ -2054,8 +2068,8 @@
}
break;
- case 61:
-#line 705 "parser.y"
+ case 63:
+#line 711 "parser.y"
{
SlonikStmt_drop_path *new;
statement_option opt[] = {
@@ -2085,8 +2099,8 @@
}
break;
- case 62:
-#line 735 "parser.y"
+ case 64:
+#line 741 "parser.y"
{
SlonikStmt_store_listen *new;
statement_option opt[] = {
@@ -2116,8 +2130,8 @@
}
break;
- case 63:
-#line 765 "parser.y"
+ case 65:
+#line 771 "parser.y"
{
SlonikStmt_drop_listen *new;
statement_option opt[] = {
@@ -2147,8 +2161,8 @@
}
break;
- case 64:
-#line 795 "parser.y"
+ case 66:
+#line 801 "parser.y"
{
SlonikStmt_create_set *new;
statement_option opt[] = {
@@ -2178,8 +2192,8 @@
}
break;
- case 65:
-#line 825 "parser.y"
+ case 67:
+#line 831 "parser.y"
{
SlonikStmt_drop_set *new;
statement_option opt[] = {
@@ -2207,8 +2221,8 @@
}
break;
- case 66:
-#line 853 "parser.y"
+ case 68:
+#line 859 "parser.y"
{
SlonikStmt_merge_set *new;
statement_option opt[] = {
@@ -2238,8 +2252,8 @@
}
break;
- case 67:
-#line 883 "parser.y"
+ case 69:
+#line 889 "parser.y"
{
SlonikStmt_table_add_key *new;
statement_option opt[] = {
@@ -2267,8 +2281,8 @@
}
break;
- case 68:
-#line 911 "parser.y"
+ case 70:
+#line 917 "parser.y"
{
SlonikStmt_set_add_table *new;
statement_option opt[] = {
@@ -2306,8 +2320,8 @@
}
break;
- case 69:
-#line 949 "parser.y"
+ case 71:
+#line 955 "parser.y"
{
SlonikStmt_set_add_sequence *new;
statement_option opt[] = {
@@ -2341,8 +2355,64 @@
}
break;
- case 70:
-#line 983 "parser.y"
+ case 72:
+#line 989 "parser.y"
+ {
+ SlonikStmt_set_drop_table *new;
+ statement_option opt[] = {
+ STMT_OPTION_INT( O_ORIGIN, -1 ),
+ STMT_OPTION_INT( O_ID, -1 ),
+ STMT_OPTION_END
+ };
+ new = (SlonikStmt_set_drop_table *)
+ malloc(sizeof(SlonikStmt_set_drop_table));
+ memset(new, 0, sizeof(SlonikStmt_set_drop_table));
+ new->hdr.stmt_type = STMT_SET_DROP_TABLE;
+ new->hdr.stmt_filename = current_file;
+ new->hdr.stmt_lno = yyvsp[-4].ival;
+
+ if (assign_options(opt, yyvsp[0].opt_list) == 0) {
+ new->set_origin = opt[0].ival;
+ new->tab_id = opt[1].ival;
+ }
+ else
+ parser_errors++;
+
+ yyval.statement = (SlonikStmt *)new;
+ }
+ break;
+
+ case 73:
+#line 1015 "parser.y"
+ {
+ SlonikStmt_set_drop_sequence *new;
+ statement_option opt[] = {
+ STMT_OPTION_INT( O_ORIGIN, -1 ),
+ STMT_OPTION_INT( O_ID, -1 ),
+ STMT_OPTION_END
+ };
+
+ new = (SlonikStmt_set_drop_sequence *)
+ malloc(sizeof(SlonikStmt_set_drop_sequence));
+ memset(new, 0, sizeof(SlonikStmt_set_drop_sequence));
+ new->hdr.stmt_type = STMT_SET_DROP_SEQUENCE;
+ new->hdr.stmt_filename = current_file;
+ new->hdr.stmt_lno = yyvsp[-4].ival;
+
+ if (assign_options(opt, yyvsp[0].opt_list) == 0)
+ {
+ new->set_origin = opt[0].ival;
+ new->seq_id = opt[1].ival;
+ }
+ else
+ parser_errors++;
+
+ yyval.statement = (SlonikStmt *)new;
+ }
+ break;
+
+ case 74:
+#line 1043 "parser.y"
{
SlonikStmt_store_trigger *new;
statement_option opt[] = {
@@ -2372,8 +2442,8 @@
}
break;
- case 71:
-#line 1013 "parser.y"
+ case 75:
+#line 1073 "parser.y"
{
SlonikStmt_drop_trigger *new;
statement_option opt[] = {
@@ -2403,8 +2473,8 @@
}
break;
- case 72:
-#line 1043 "parser.y"
+ case 76:
+#line 1103 "parser.y"
{
SlonikStmt_subscribe_set *new;
statement_option opt[] = {
@@ -2436,8 +2506,8 @@
}
break;
- case 73:
-#line 1075 "parser.y"
+ case 77:
+#line 1135 "parser.y"
{
SlonikStmt_unsubscribe_set *new;
statement_option opt[] = {
@@ -2465,8 +2535,8 @@
}
break;
- case 74:
-#line 1103 "parser.y"
+ case 78:
+#line 1163 "parser.y"
{
SlonikStmt_lock_set *new;
statement_option opt[] = {
@@ -2494,8 +2564,8 @@
}
break;
- case 75:
-#line 1131 "parser.y"
+ case 79:
+#line 1191 "parser.y"
{
SlonikStmt_unlock_set *new;
statement_option opt[] = {
@@ -2523,8 +2593,8 @@
}
break;
- case 76:
-#line 1159 "parser.y"
+ case 80:
+#line 1219 "parser.y"
{
SlonikStmt_move_set *new;
statement_option opt[] = {
@@ -2554,8 +2624,8 @@
}
break;
- case 77:
-#line 1189 "parser.y"
+ case 81:
+#line 1249 "parser.y"
{
SlonikStmt_ddl_script *new;
statement_option opt[] = {
@@ -2586,8 +2656,8 @@
}
break;
- case 78:
-#line 1220 "parser.y"
+ case 82:
+#line 1280 "parser.y"
{
SlonikStmt_update_functions *new;
statement_option opt[] = {
@@ -2613,8 +2683,8 @@
}
break;
- case 79:
-#line 1246 "parser.y"
+ case 83:
+#line 1306 "parser.y"
{
SlonikStmt_wait_event *new;
statement_option opt[] = {
@@ -2646,188 +2716,188 @@
}
break;
- case 80:
-#line 1278 "parser.y"
+ case 84:
+#line 1338 "parser.y"
{ yyval.opt_list = NULL; }
break;
- case 81:
-#line 1280 "parser.y"
+ case 85:
+#line 1340 "parser.y"
{ yyval.opt_list = yyvsp[-2].opt_list; }
break;
- case 82:
-#line 1284 "parser.y"
+ case 86:
+#line 1344 "parser.y"
{ yyval.opt_list = yyvsp[0].opt_list; }
break;
- case 83:
-#line 1286 "parser.y"
+ case 87:
+#line 1346 "parser.y"
{ yyvsp[-2].opt_list->next = yyvsp[0].opt_list; yyval.opt_list = yyvsp[-2].opt_list; }
break;
- case 84:
-#line 1290 "parser.y"
+ case 88:
+#line 1350 "parser.y"
{
yyvsp[0].opt_list->opt_code = O_ID;
yyval.opt_list = yyvsp[0].opt_list;
}
break;
- case 85:
-#line 1295 "parser.y"
+ case 89:
+#line 1355 "parser.y"
{
yyvsp[0].opt_list->opt_code = O_BACKUP_NODE;
yyval.opt_list = yyvsp[0].opt_list;
}
break;
- case 86:
-#line 1300 "parser.y"
+ case 90:
+#line 1360 "parser.y"
{
yyvsp[0].opt_list->opt_code = O_EVENT_NODE;
yyval.opt_list = yyvsp[0].opt_list;
}
break;
- case 87:
-#line 1305 "parser.y"
+ case 91:
+#line 1365 "parser.y"
{
yyvsp[0].opt_list->opt_code = O_SERVER;
yyval.opt_list = yyvsp[0].opt_list;
}
break;
- case 88:
-#line 1310 "parser.y"
+ case 92:
+#line 1370 "parser.y"
{
yyvsp[0].opt_list->opt_code = O_CLIENT;
yyval.opt_list = yyvsp[0].opt_list;
}
break;
- case 89:
-#line 1315 "parser.y"
+ case 93:
+#line 1375 "parser.y"
{
yyvsp[0].opt_list->opt_code = O_ORIGIN;
yyval.opt_list = yyvsp[0].opt_list;
}
break;
- case 90:
-#line 1320 "parser.y"
+ case 94:
+#line 1380 "parser.y"
{
yyvsp[0].opt_list->opt_code = O_OLD_ORIGIN;
yyval.opt_list = yyvsp[0].opt_list;
}
break;
- case 91:
-#line 1325 "parser.y"
+ case 95:
+#line 1385 "parser.y"
{
yyvsp[0].opt_list->opt_code = O_NEW_ORIGIN;
yyval.opt_list = yyvsp[0].opt_list;
}
break;
- case 92:
-#line 1330 "parser.y"
+ case 96:
+#line 1390 "parser.y"
{
yyvsp[0].opt_list->opt_code = O_RECEIVER;
yyval.opt_list = yyvsp[0].opt_list;
}
break;
- case 93:
-#line 1335 "parser.y"
+ case 97:
+#line 1395 "parser.y"
{
yyvsp[0].opt_list->opt_code = O_PROVIDER;
yyval.opt_list = yyvsp[0].opt_list;
}
break;
- case 94:
-#line 1340 "parser.y"
+ case 98:
+#line 1400 "parser.y"
{
yyvsp[0].opt_list->opt_code = O_CONNRETRY;
yyval.opt_list = yyvsp[0].opt_list;
}
break;
- case 95:
-#line 1345 "parser.y"
+ case 99:
+#line 1405 "parser.y"
{
yyvsp[0].opt_list->opt_code = O_COMMENT;
yyval.opt_list = yyvsp[0].opt_list;
}
break;
- case 96:
-#line 1350 "parser.y"
+ case 100:
+#line 1410 "parser.y"
{
yyvsp[0].opt_list->opt_code = O_CONNINFO;
yyval.opt_list = yyvsp[0].opt_list;
}
break;
- case 97:
-#line 1355 "parser.y"
+ case 101:
+#line 1415 "parser.y"
{
yyvsp[0].opt_list->opt_code = O_SET_ID;
yyval.opt_list = yyvsp[0].opt_list;
}
break;
- case 98:
-#line 1360 "parser.y"
+ case 102:
+#line 1420 "parser.y"
{
yyvsp[0].opt_list->opt_code = O_ADD_ID;
yyval.opt_list = yyvsp[0].opt_list;
}
break;
- case 99:
-#line 1365 "parser.y"
+ case 103:
+#line 1425 "parser.y"
{
yyvsp[0].opt_list->opt_code = O_NODE_ID;
yyval.opt_list = yyvsp[0].opt_list;
}
break;
- case 100:
-#line 1370 "parser.y"
+ case 104:
+#line 1430 "parser.y"
{
yyvsp[0].opt_list->opt_code = O_TAB_ID;
yyval.opt_list = yyvsp[0].opt_list;
}
break;
- case 101:
-#line 1375 "parser.y"
+ case 105:
+#line 1435 "parser.y"
{
yyvsp[0].opt_list->opt_code = O_TRIG_NAME;
yyval.opt_list = yyvsp[0].opt_list;
}
break;
- case 102:
-#line 1380 "parser.y"
+ case 106:
+#line 1440 "parser.y"
{
yyvsp[0].opt_list->opt_code = O_FQNAME;
yyval.opt_list = yyvsp[0].opt_list;
}
break;
- case 103:
-#line 1385 "parser.y"
+ case 107:
+#line 1445 "parser.y"
{
yyvsp[0].opt_list->opt_code = O_USE_KEY;
yyval.opt_list = yyvsp[0].opt_list;
}
break;
- case 104:
-#line 1390 "parser.y"
+ case 108:
+#line 1450 "parser.y"
{
option_list *new;
new = (option_list *)malloc(sizeof(option_list));
@@ -2842,24 +2912,24 @@
}
break;
- case 105:
-#line 1403 "parser.y"
+ case 109:
+#line 1463 "parser.y"
{
yyvsp[0].opt_list->opt_code = O_FORWARD;
yyval.opt_list = yyvsp[0].opt_list;
}
break;
- case 106:
-#line 1408 "parser.y"
+ case 110:
+#line 1468 "parser.y"
{
yyvsp[0].opt_list->opt_code = O_FILENAME;
yyval.opt_list = yyvsp[0].opt_list;
}
break;
- case 107:
-#line 1413 "parser.y"
+ case 111:
+#line 1473 "parser.y"
{
option_list *new;
new = (option_list *)malloc(sizeof(option_list));
@@ -2874,16 +2944,16 @@
}
break;
- case 108:
-#line 1426 "parser.y"
+ case 112:
+#line 1486 "parser.y"
{
yyvsp[0].opt_list->opt_code = O_WAIT_CONFIRMED;
yyval.opt_list = yyvsp[0].opt_list;
}
break;
- case 109:
-#line 1431 "parser.y"
+ case 113:
+#line 1491 "parser.y"
{
option_list *new;
new = (option_list *)malloc(sizeof(option_list));
@@ -2898,24 +2968,24 @@
}
break;
- case 110:
-#line 1444 "parser.y"
+ case 114:
+#line 1504 "parser.y"
{
yyvsp[0].opt_list->opt_code = O_WAIT_ON;
yyval.opt_list = yyvsp[0].opt_list;
}
break;
- case 111:
-#line 1449 "parser.y"
+ case 115:
+#line 1509 "parser.y"
{
yyvsp[0].opt_list->opt_code = O_TIMEOUT;
yyval.opt_list = yyvsp[0].opt_list;
}
break;
- case 112:
-#line 1456 "parser.y"
+ case 116:
+#line 1516 "parser.y"
{
option_list *new;
new = (option_list *)malloc(sizeof(option_list));
@@ -2929,8 +2999,8 @@
}
break;
- case 113:
-#line 1470 "parser.y"
+ case 117:
+#line 1530 "parser.y"
{
option_list *new;
new = (option_list *)malloc(sizeof(option_list));
@@ -2944,8 +3014,8 @@
}
break;
- case 114:
-#line 1484 "parser.y"
+ case 118:
+#line 1544 "parser.y"
{
option_list *new;
new = (option_list *)malloc(sizeof(option_list));
@@ -2959,8 +3029,8 @@
}
break;
- case 115:
-#line 1496 "parser.y"
+ case 119:
+#line 1556 "parser.y"
{
option_list *new;
new = (option_list *)malloc(sizeof(option_list));
@@ -2974,15 +3044,15 @@
}
break;
- case 122:
-#line 1520 "parser.y"
+ case 126:
+#line 1580 "parser.y"
{
yyval.ival = strtol(yytext, NULL, 10);
}
break;
- case 123:
-#line 1526 "parser.y"
+ case 127:
+#line 1586 "parser.y"
{
char *ret;
@@ -2994,8 +3064,8 @@
}
break;
- case 124:
-#line 1538 "parser.y"
+ case 128:
+#line 1598 "parser.y"
{
char *ret;
@@ -3007,8 +3077,8 @@
}
break;
- case 125:
-#line 1550 "parser.y"
+ case 129:
+#line 1610 "parser.y"
{ yyval.ival = yylineno; }
break;
@@ -3016,7 +3086,7 @@
}
/* Line 991 of yacc.c. */
-#line 3019 "y.tab.c"
+#line 3089 "y.tab.c"
yyvsp -= yylen;
yyssp -= yylen;
@@ -3225,7 +3295,7 @@
}
-#line 1553 "parser.y"
+#line 1613 "parser.y"
@@ -3336,3 +3406,11 @@
+/*
+ * Local Variables:
+ * tab-width: 4
+ * c-indent-level: 4
+ * c-basic-offset: 4
+ * End:
+ */
+
- Previous message: [Slony1-commit] By cbbrowne: Vivek Khera's changes that add the $MASTERNODE variable
- Next message: [Slony1-commit] By wieck: Bugfix: The Slony1 log trigger assumed that if
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
More information about the Slony1-commit mailing list