diff options
Diffstat (limited to 'grammar')
| -rw-r--r-- | grammar/Makefile.in | 27 | ||||
| -rw-r--r-- | grammar/grammar.c | 169 | ||||
| -rw-r--r-- | grammar/grammar.h | 2 | ||||
| -rw-r--r-- | grammar/grammar.y | 59 | ||||
| -rw-r--r-- | grammar/lexer.c | 2219 | ||||
| -rw-r--r-- | grammar/lexer.l | 48 | ||||
| -rw-r--r-- | grammar/parserif.h | 22 | ||||
| -rw-r--r-- | grammar/rainerscript.c | 689 | ||||
| -rw-r--r-- | grammar/rainerscript.h | 46 |
9 files changed, 1947 insertions, 1334 deletions
diff --git a/grammar/Makefile.in b/grammar/Makefile.in index 73648f1..da227b1 100644 --- a/grammar/Makefile.in +++ b/grammar/Makefile.in @@ -137,7 +137,6 @@ GREP = @GREP@ GSS_LIBS = @GSS_LIBS@ GUARDTIME_CFLAGS = @GUARDTIME_CFLAGS@ GUARDTIME_LIBS = @GUARDTIME_LIBS@ -HAVE_LIBGCRYPT_CONFIG = @HAVE_LIBGCRYPT_CONFIG@ HAVE_MYSQL_CONFIG = @HAVE_MYSQL_CONFIG@ HAVE_ORACLE_CONFIG = @HAVE_ORACLE_CONFIG@ HAVE_PGSQL_CONFIG = @HAVE_PGSQL_CONFIG@ @@ -158,14 +157,15 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBDBI_CFLAGS = @LIBDBI_CFLAGS@ LIBDBI_LIBS = @LIBDBI_LIBS@ -LIBEE_CFLAGS = @LIBEE_CFLAGS@ -LIBEE_LIBS = @LIBEE_LIBS@ LIBESTR_CFLAGS = @LIBESTR_CFLAGS@ LIBESTR_LIBS = @LIBESTR_LIBS@ LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ +LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ LIBLOGGING_CFLAGS = @LIBLOGGING_CFLAGS@ LIBLOGGING_LIBS = @LIBLOGGING_LIBS@ +LIBLOGGING_STDLOG_CFLAGS = @LIBLOGGING_STDLOG_CFLAGS@ +LIBLOGGING_STDLOG_LIBS = @LIBLOGGING_STDLOG_LIBS@ LIBLOGNORM_CFLAGS = @LIBLOGNORM_CFLAGS@ LIBLOGNORM_LIBS = @LIBLOGNORM_LIBS@ LIBM = @LIBM@ @@ -190,6 +190,8 @@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OPENSSL_CFLAGS = @OPENSSL_CFLAGS@ +OPENSSL_LIBS = @OPENSSL_LIBS@ ORACLE_CFLAGS = @ORACLE_CFLAGS@ ORACLE_LIBS = @ORACLE_LIBS@ OTOOL = @OTOOL@ @@ -363,22 +365,25 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgrammar_la-rainerscript.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< diff --git a/grammar/grammar.c b/grammar/grammar.c index 4a70e3d..3aa9c43 100644 --- a/grammar/grammar.c +++ b/grammar/grammar.c @@ -66,8 +66,9 @@ /* Copy the first part of user declarations. */ /* Line 268 of yacc.c */ -#line 31 "grammar.y" +#line 29 "grammar.y" +#include "config.h" #include <stdio.h> #include <libestr.h> #include "rainerscript.h" @@ -81,7 +82,7 @@ extern int yyerror(char*); /* Line 268 of yacc.c */ -#line 85 "grammar.c" +#line 86 "grammar.c" /* Enabling traces. */ #ifndef YYDEBUG @@ -200,7 +201,7 @@ typedef union YYSTYPE { /* Line 293 of yacc.c */ -#line 44 "grammar.y" +#line 43 "grammar.y" char *s; long long n; @@ -218,7 +219,7 @@ typedef union YYSTYPE /* Line 293 of yacc.c */ -#line 222 "grammar.c" +#line 223 "grammar.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -230,7 +231,7 @@ typedef union YYSTYPE /* Line 343 of yacc.c */ -#line 234 "grammar.c" +#line 235 "grammar.c" #ifdef short # undef short @@ -550,14 +551,14 @@ static const yytype_int8 yyrhs[] = /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint8 yyrline[] = { - 0, 122, 122, 123, 124, 125, 126, 127, 128, 129, - 130, 134, 138, 139, 140, 141, 142, 143, 144, 145, - 146, 147, 148, 149, 150, 151, 155, 159, 160, 161, - 162, 163, 164, 165, 166, 168, 169, 170, 171, 172, - 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, - 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, - 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, - 203, 204 + 0, 121, 121, 122, 123, 124, 125, 126, 127, 128, + 129, 133, 137, 138, 139, 140, 141, 142, 143, 144, + 145, 146, 147, 148, 149, 150, 154, 158, 159, 160, + 161, 162, 163, 164, 165, 167, 168, 169, 170, 171, + 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, + 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, + 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, + 202, 203 }; #endif @@ -1611,56 +1612,56 @@ yyreduce: case 3: /* Line 1806 of yacc.c */ -#line 123 "grammar.y" +#line 122 "grammar.y" { cnfDoObj((yyvsp[(2) - (2)].obj)); } break; case 4: /* Line 1806 of yacc.c */ -#line 124 "grammar.y" +#line 123 "grammar.y" { cnfDoScript((yyvsp[(2) - (2)].stmt)); } break; case 5: /* Line 1806 of yacc.c */ -#line 125 "grammar.y" +#line 124 "grammar.y" { cnfDoCfsysline((yyvsp[(2) - (2)].s)); } break; case 6: /* Line 1806 of yacc.c */ -#line 126 "grammar.y" +#line 125 "grammar.y" { cnfDoBSDTag((yyvsp[(2) - (2)].s)); } break; case 7: /* Line 1806 of yacc.c */ -#line 127 "grammar.y" +#line 126 "grammar.y" { cnfDoBSDHost((yyvsp[(2) - (2)].s)); } break; case 8: /* Line 1806 of yacc.c */ -#line 128 "grammar.y" +#line 127 "grammar.y" { (yyval.obj) = cnfobjNew((yyvsp[(1) - (3)].objType), (yyvsp[(2) - (3)].nvlst)); } break; case 9: /* Line 1806 of yacc.c */ -#line 129 "grammar.y" +#line 128 "grammar.y" { (yyval.obj) = cnfobjNew(CNFOBJ_TPL, (yyvsp[(2) - (3)].nvlst)); } break; case 10: /* Line 1806 of yacc.c */ -#line 131 "grammar.y" +#line 130 "grammar.y" { (yyval.obj) = cnfobjNew(CNFOBJ_TPL, (yyvsp[(2) - (6)].nvlst)); (yyval.obj)->subobjs = (yyvsp[(5) - (6)].objlst); } @@ -1669,7 +1670,7 @@ yyreduce: case 11: /* Line 1806 of yacc.c */ -#line 135 "grammar.y" +#line 134 "grammar.y" { (yyval.obj) = cnfobjNew(CNFOBJ_RULESET, (yyvsp[(2) - (6)].nvlst)); (yyval.obj)->script = (yyvsp[(5) - (6)].stmt); } @@ -1678,98 +1679,98 @@ yyreduce: case 12: /* Line 1806 of yacc.c */ -#line 138 "grammar.y" +#line 137 "grammar.y" { (yyval.objlst) = NULL; } break; case 13: /* Line 1806 of yacc.c */ -#line 139 "grammar.y" +#line 138 "grammar.y" { (yyval.objlst) = objlstAdd((yyvsp[(1) - (2)].objlst), (yyvsp[(2) - (2)].obj)); } break; case 14: /* Line 1806 of yacc.c */ -#line 140 "grammar.y" +#line 139 "grammar.y" { (yyval.objlst) = objlstAdd((yyvsp[(1) - (2)].objlst), (yyvsp[(2) - (2)].obj)); } break; case 15: /* Line 1806 of yacc.c */ -#line 141 "grammar.y" +#line 140 "grammar.y" { (yyval.obj) = cnfobjNew(CNFOBJ_PROPERTY, (yyvsp[(2) - (3)].nvlst)); } break; case 16: /* Line 1806 of yacc.c */ -#line 142 "grammar.y" +#line 141 "grammar.y" { (yyval.obj) = cnfobjNew(CNFOBJ_CONSTANT, (yyvsp[(2) - (3)].nvlst)); } break; case 17: /* Line 1806 of yacc.c */ -#line 143 "grammar.y" +#line 142 "grammar.y" { (yyval.nvlst) = NULL; } break; case 18: /* Line 1806 of yacc.c */ -#line 144 "grammar.y" +#line 143 "grammar.y" { (yyvsp[(2) - (2)].nvlst)->next = (yyvsp[(1) - (2)].nvlst); (yyval.nvlst) = (yyvsp[(2) - (2)].nvlst); } break; case 19: /* Line 1806 of yacc.c */ -#line 145 "grammar.y" +#line 144 "grammar.y" { (yyval.nvlst) = nvlstSetName((yyvsp[(3) - (3)].nvlst), (yyvsp[(1) - (3)].estr)); } break; case 20: /* Line 1806 of yacc.c */ -#line 146 "grammar.y" +#line 145 "grammar.y" { (yyval.nvlst) = nvlstNewStr((yyvsp[(1) - (1)].estr)); } break; case 21: /* Line 1806 of yacc.c */ -#line 147 "grammar.y" +#line 146 "grammar.y" { (yyval.nvlst) = nvlstNewArray((yyvsp[(1) - (1)].arr)); } break; case 22: /* Line 1806 of yacc.c */ -#line 148 "grammar.y" +#line 147 "grammar.y" { (yyval.stmt) = (yyvsp[(1) - (1)].stmt); } break; case 23: /* Line 1806 of yacc.c */ -#line 149 "grammar.y" +#line 148 "grammar.y" { (yyval.stmt) = scriptAddStmt((yyvsp[(1) - (2)].stmt), (yyvsp[(2) - (2)].stmt)); } break; case 24: /* Line 1806 of yacc.c */ -#line 150 "grammar.y" +#line 149 "grammar.y" { (yyval.stmt) = (yyvsp[(1) - (1)].stmt); } break; case 25: /* Line 1806 of yacc.c */ -#line 151 "grammar.y" +#line 150 "grammar.y" { (yyval.stmt) = cnfstmtNew(S_IF); (yyval.stmt)->d.s_if.expr = (yyvsp[(2) - (4)].expr); (yyval.stmt)->d.s_if.t_then = (yyvsp[(4) - (4)].stmt); @@ -1779,7 +1780,7 @@ yyreduce: case 26: /* Line 1806 of yacc.c */ -#line 155 "grammar.y" +#line 154 "grammar.y" { (yyval.stmt) = cnfstmtNew(S_IF); (yyval.stmt)->d.s_if.expr = (yyvsp[(2) - (6)].expr); (yyval.stmt)->d.s_if.t_then = (yyvsp[(4) - (6)].stmt); @@ -1789,322 +1790,322 @@ yyreduce: case 27: /* Line 1806 of yacc.c */ -#line 159 "grammar.y" +#line 158 "grammar.y" { (yyval.stmt) = cnfstmtNewSet((yyvsp[(2) - (5)].s), (yyvsp[(4) - (5)].expr)); } break; case 28: /* Line 1806 of yacc.c */ -#line 160 "grammar.y" +#line 159 "grammar.y" { (yyval.stmt) = cnfstmtNewUnset((yyvsp[(2) - (3)].s)); } break; case 29: /* Line 1806 of yacc.c */ -#line 161 "grammar.y" +#line 160 "grammar.y" { (yyval.stmt) = cnfstmtNewPRIFILT((yyvsp[(1) - (2)].s), (yyvsp[(2) - (2)].stmt)); } break; case 30: /* Line 1806 of yacc.c */ -#line 162 "grammar.y" +#line 161 "grammar.y" { (yyval.stmt) = cnfstmtNewPROPFILT((yyvsp[(1) - (2)].s), (yyvsp[(2) - (2)].stmt)); } break; case 31: /* Line 1806 of yacc.c */ -#line 163 "grammar.y" +#line 162 "grammar.y" { (yyval.stmt) = (yyvsp[(1) - (1)].stmt); } break; case 32: /* Line 1806 of yacc.c */ -#line 164 "grammar.y" +#line 163 "grammar.y" { (yyval.stmt) = (yyvsp[(2) - (3)].stmt); } break; case 33: /* Line 1806 of yacc.c */ -#line 165 "grammar.y" +#line 164 "grammar.y" { (yyval.stmt) = (yyvsp[(1) - (1)].stmt); } break; case 34: /* Line 1806 of yacc.c */ -#line 166 "grammar.y" +#line 165 "grammar.y" { (yyval.stmt) = scriptAddStmt((yyvsp[(1) - (3)].stmt), (yyvsp[(3) - (3)].stmt)); } break; case 35: /* Line 1806 of yacc.c */ -#line 168 "grammar.y" +#line 167 "grammar.y" { (yyval.stmt) = cnfstmtNewAct((yyvsp[(2) - (3)].nvlst)); } break; case 36: /* Line 1806 of yacc.c */ -#line 169 "grammar.y" +#line 168 "grammar.y" { (yyval.stmt) = cnfstmtNewLegaAct((yyvsp[(1) - (1)].s)); } break; case 37: /* Line 1806 of yacc.c */ -#line 170 "grammar.y" +#line 169 "grammar.y" { (yyval.stmt) = cnfstmtNew(S_STOP); } break; case 38: /* Line 1806 of yacc.c */ -#line 171 "grammar.y" +#line 170 "grammar.y" { (yyval.stmt) = cnfstmtNewCall((yyvsp[(2) - (2)].estr)); } break; case 39: /* Line 1806 of yacc.c */ -#line 172 "grammar.y" +#line 171 "grammar.y" { (yyval.stmt) = cnfstmtNewContinue(); } break; case 40: /* Line 1806 of yacc.c */ -#line 173 "grammar.y" +#line 172 "grammar.y" { (yyval.expr) = cnfexprNew(AND, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } break; case 41: /* Line 1806 of yacc.c */ -#line 174 "grammar.y" +#line 173 "grammar.y" { (yyval.expr) = cnfexprNew(OR, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } break; case 42: /* Line 1806 of yacc.c */ -#line 175 "grammar.y" +#line 174 "grammar.y" { (yyval.expr) = cnfexprNew(NOT, NULL, (yyvsp[(2) - (2)].expr)); } break; case 43: /* Line 1806 of yacc.c */ -#line 176 "grammar.y" +#line 175 "grammar.y" { (yyval.expr) = cnfexprNew(CMP_EQ, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } break; case 44: /* Line 1806 of yacc.c */ -#line 177 "grammar.y" +#line 176 "grammar.y" { (yyval.expr) = cnfexprNew(CMP_NE, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } break; case 45: /* Line 1806 of yacc.c */ -#line 178 "grammar.y" +#line 177 "grammar.y" { (yyval.expr) = cnfexprNew(CMP_LE, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } break; case 46: /* Line 1806 of yacc.c */ -#line 179 "grammar.y" +#line 178 "grammar.y" { (yyval.expr) = cnfexprNew(CMP_GE, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } break; case 47: /* Line 1806 of yacc.c */ -#line 180 "grammar.y" +#line 179 "grammar.y" { (yyval.expr) = cnfexprNew(CMP_LT, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } break; case 48: /* Line 1806 of yacc.c */ -#line 181 "grammar.y" +#line 180 "grammar.y" { (yyval.expr) = cnfexprNew(CMP_GT, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } break; case 49: /* Line 1806 of yacc.c */ -#line 182 "grammar.y" +#line 181 "grammar.y" { (yyval.expr) = cnfexprNew(CMP_CONTAINS, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } break; case 50: /* Line 1806 of yacc.c */ -#line 183 "grammar.y" +#line 182 "grammar.y" { (yyval.expr) = cnfexprNew(CMP_CONTAINSI, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } break; case 51: /* Line 1806 of yacc.c */ -#line 184 "grammar.y" +#line 183 "grammar.y" { (yyval.expr) = cnfexprNew(CMP_STARTSWITH, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } break; case 52: /* Line 1806 of yacc.c */ -#line 185 "grammar.y" +#line 184 "grammar.y" { (yyval.expr) = cnfexprNew(CMP_STARTSWITHI, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } break; case 53: /* Line 1806 of yacc.c */ -#line 186 "grammar.y" +#line 185 "grammar.y" { (yyval.expr) = cnfexprNew('&', (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } break; case 54: /* Line 1806 of yacc.c */ -#line 187 "grammar.y" +#line 186 "grammar.y" { (yyval.expr) = cnfexprNew('+', (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } break; case 55: /* Line 1806 of yacc.c */ -#line 188 "grammar.y" +#line 187 "grammar.y" { (yyval.expr) = cnfexprNew('-', (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } break; case 56: /* Line 1806 of yacc.c */ -#line 189 "grammar.y" +#line 188 "grammar.y" { (yyval.expr) = cnfexprNew('*', (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } break; case 57: /* Line 1806 of yacc.c */ -#line 190 "grammar.y" +#line 189 "grammar.y" { (yyval.expr) = cnfexprNew('/', (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } break; case 58: /* Line 1806 of yacc.c */ -#line 191 "grammar.y" +#line 190 "grammar.y" { (yyval.expr) = cnfexprNew('%', (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } break; case 59: /* Line 1806 of yacc.c */ -#line 192 "grammar.y" +#line 191 "grammar.y" { (yyval.expr) = (yyvsp[(2) - (3)].expr); } break; case 60: /* Line 1806 of yacc.c */ -#line 193 "grammar.y" +#line 192 "grammar.y" { (yyval.expr) = cnfexprNew('M', NULL, (yyvsp[(2) - (2)].expr)); } break; case 61: /* Line 1806 of yacc.c */ -#line 194 "grammar.y" +#line 193 "grammar.y" { (yyval.expr) = (struct cnfexpr*) cnffuncNew((yyvsp[(1) - (3)].estr), NULL); } break; case 62: /* Line 1806 of yacc.c */ -#line 195 "grammar.y" +#line 194 "grammar.y" { (yyval.expr) = (struct cnfexpr*) cnffuncNew((yyvsp[(1) - (4)].estr), (yyvsp[(3) - (4)].fparams)); } break; case 63: /* Line 1806 of yacc.c */ -#line 196 "grammar.y" +#line 195 "grammar.y" { (yyval.expr) = (struct cnfexpr*) cnfnumvalNew((yyvsp[(1) - (1)].n)); } break; case 64: /* Line 1806 of yacc.c */ -#line 197 "grammar.y" +#line 196 "grammar.y" { (yyval.expr) = (struct cnfexpr*) cnfstringvalNew((yyvsp[(1) - (1)].estr)); } break; case 65: /* Line 1806 of yacc.c */ -#line 198 "grammar.y" +#line 197 "grammar.y" { (yyval.expr) = (struct cnfexpr*) cnfvarNew((yyvsp[(1) - (1)].s)); } break; case 66: /* Line 1806 of yacc.c */ -#line 199 "grammar.y" +#line 198 "grammar.y" { (yyval.expr) = (struct cnfexpr*) (yyvsp[(1) - (1)].arr); } break; case 67: /* Line 1806 of yacc.c */ -#line 200 "grammar.y" +#line 199 "grammar.y" { (yyval.fparams) = cnffparamlstNew((yyvsp[(1) - (1)].expr), NULL); } break; case 68: /* Line 1806 of yacc.c */ -#line 201 "grammar.y" +#line 200 "grammar.y" { (yyval.fparams) = cnffparamlstNew((yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].fparams)); } break; case 69: /* Line 1806 of yacc.c */ -#line 202 "grammar.y" +#line 201 "grammar.y" { (yyval.arr) = (yyvsp[(2) - (3)].arr); } break; case 70: /* Line 1806 of yacc.c */ -#line 203 "grammar.y" +#line 202 "grammar.y" { (yyval.arr) = cnfarrayNew((yyvsp[(1) - (1)].estr)); } break; case 71: /* Line 1806 of yacc.c */ -#line 204 "grammar.y" +#line 203 "grammar.y" { (yyval.arr) = cnfarrayAdd((yyvsp[(1) - (3)].arr), (yyvsp[(3) - (3)].estr)); } break; /* Line 1806 of yacc.c */ -#line 2108 "grammar.c" +#line 2109 "grammar.c" default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -2335,7 +2336,7 @@ yyreturn: /* Line 2067 of yacc.c */ -#line 206 "grammar.y" +#line 205 "grammar.y" /* int yyerror(char *s) diff --git a/grammar/grammar.h b/grammar/grammar.h index cad1d92..c9bb3db 100644 --- a/grammar/grammar.h +++ b/grammar/grammar.h @@ -129,7 +129,7 @@ typedef union YYSTYPE { /* Line 2068 of yacc.c */ -#line 44 "grammar.y" +#line 43 "grammar.y" char *s; long long n; diff --git a/grammar/grammar.y b/grammar/grammar.y index c5bad68..488d332 100644 --- a/grammar/grammar.y +++ b/grammar/grammar.y @@ -1,34 +1,33 @@ - /* Bison file for rsyslog config format v2 (RainerScript). - * Please note: this file introduces the new config format, but maintains - * backward compatibility. In order to do so, the grammar is not 100% clean, - * but IMHO still sufficiently easy both to understand for programmers - * maitaining the code as well as users writing the config file. Users are, - * of course, encouraged to use new constructs only. But it needs to be noted - * that some of the legacy constructs (specifically the in-front-of-action - * PRI filter) are very hard to beat in ease of use, at least for simpler - * cases. - * - * Copyright 2011-2012 Rainer Gerhards and Adiscon GmbH. - * - * This file is part of the rsyslog runtime library. - * - * The rsyslog runtime library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * The rsyslog runtime library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with the rsyslog runtime library. If not, see <http://www.gnu.org/licenses/>. - * - * A copy of the GPL can be found in the file "COPYING" in this distribution. - * A copy of the LGPL can be found in the file "COPYING.LESSER" in this distribution. - */ +/* Bison file for rsyslog config format v2 (RainerScript). + * Please note: this file introduces the new config format, but maintains + * backward compatibility. In order to do so, the grammar is not 100% clean, + * but IMHO still sufficiently easy both to understand for programmers + * maitaining the code as well as users writing the config file. Users are, + * of course, encouraged to use new constructs only. But it needs to be noted + * that some of the legacy constructs (specifically the in-front-of-action + * PRI filter) are very hard to beat in ease of use, at least for simpler + * cases. + * + * Copyright 2011-2014 Rainer Gerhards and Adiscon GmbH. + * + * This file is part of the rsyslog runtime library. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * -or- + * see COPYING.ASL20 in the source distribution + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ %{ +#include "config.h" #include <stdio.h> #include <libestr.h> #include "rainerscript.h" diff --git a/grammar/lexer.c b/grammar/lexer.c index b1af617..a498352 100644 --- a/grammar/lexer.c +++ b/grammar/lexer.c @@ -384,8 +384,8 @@ static void yy_fatal_error (yyconst char msg[] ); *yy_cp = '\0'; \ (yy_c_buf_p) = yy_cp; -#define YY_NUM_RULES 97 -#define YY_END_OF_BUFFER 98 +#define YY_NUM_RULES 101 +#define YY_END_OF_BUFFER 102 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -393,57 +393,64 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[443] = +static yyconst flex_int16_t yy_accept[505] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 98, 96, 95, 95, 96, 96, - 96, 42, 68, 96, 96, 96, 96, 73, 96, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 43, 44, 67, 95, 68, 96, 96, 96, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 88, 87, 87, 88, 88, 74, 76, 88, 79, 75, - 77, 78, 85, 85, 85, 55, 55, 54, 53, 52, - 40, 39, 39, 40, 38, 36, 36, 38, 38, 38, - 11, 13, 38, 17, 18, 9, 12, 8, 14, 10, - - 32, 32, 3, 24, 7, 25, 37, 37, 37, 37, - 37, 37, 37, 15, 16, 0, 0, 94, 0, 0, - 72, 72, 72, 70, 81, 73, 0, 73, 73, 73, - 73, 73, 1, 73, 73, 73, 73, 73, 73, 73, - 73, 0, 0, 0, 0, 0, 0, 0, 0, 72, - 0, 0, 0, 73, 73, 73, 73, 73, 73, 73, - 73, 1, 73, 73, 73, 73, 73, 73, 73, 73, - 0, 80, 0, 0, 86, 82, 75, 85, 85, 84, + 0, 0, 0, 0, 102, 100, 99, 99, 100, 100, + 100, 42, 72, 100, 100, 100, 100, 77, 100, 77, + 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, + 77, 43, 44, 71, 99, 72, 100, 100, 100, 77, + 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, + 77, 77, 92, 91, 91, 92, 92, 78, 80, 92, + 83, 79, 81, 82, 89, 89, 89, 55, 55, 54, + 53, 52, 40, 39, 39, 40, 38, 36, 36, 38, + 38, 38, 11, 13, 38, 17, 18, 9, 12, 8, + + 14, 10, 32, 32, 3, 24, 7, 25, 37, 37, + 37, 37, 37, 37, 37, 15, 16, 0, 0, 98, + 0, 0, 76, 76, 76, 74, 85, 77, 0, 77, + 77, 77, 77, 77, 1, 77, 77, 77, 77, 77, + 77, 77, 77, 77, 77, 77, 77, 0, 0, 0, + 0, 0, 0, 0, 0, 76, 0, 0, 0, 77, + 77, 77, 77, 77, 77, 77, 77, 1, 77, 77, + 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, + 0, 84, 0, 0, 90, 86, 79, 89, 89, 88, 56, 52, 41, 22, 0, 35, 0, 0, 33, 0, - 34, 0, 83, 30, 0, 32, 20, 23, 19, 21, - - 37, 37, 37, 37, 4, 37, 37, 0, 90, 0, - 89, 0, 0, 92, 0, 72, 72, 69, 69, 70, - 71, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 48, 73, 73, 73, 66, 0, 93, 72, 0, - 0, 66, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 48, 73, 73, 73, 0, 0, 0, 33, - 0, 0, 31, 5, 37, 6, 37, 37, 0, 91, - 72, 69, 69, 71, 73, 47, 73, 73, 46, 73, - 73, 73, 73, 73, 73, 45, 73, 73, 0, 0, - 0, 73, 47, 73, 73, 46, 73, 73, 73, 73, - - 73, 73, 45, 73, 73, 0, 0, 0, 0, 0, - 37, 37, 2, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 49, 0, 0, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 49, 0, 37, 37, - 73, 73, 73, 73, 0, 62, 73, 73, 73, 73, - 73, 0, 0, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 37, 37, 0, 64, 73, 73, 0, 57, - 0, 63, 73, 73, 73, 73, 0, 65, 0, 73, - 73, 73, 73, 73, 73, 37, 37, 73, 50, 73, - 73, 0, 59, 73, 65, 73, 50, 73, 73, 73, - - 26, 37, 0, 61, 73, 0, 60, 0, 58, 73, - 37, 37, 73, 73, 27, 28, 73, 73, 37, 73, - 73, 29, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 51, 0 + + 34, 0, 87, 30, 0, 32, 20, 23, 19, 21, + 37, 37, 37, 37, 4, 37, 37, 0, 94, 0, + 93, 0, 0, 96, 0, 76, 76, 73, 73, 74, + 75, 77, 77, 77, 77, 77, 77, 77, 77, 77, + 77, 77, 77, 77, 48, 77, 77, 77, 77, 70, + 0, 97, 76, 0, 0, 70, 77, 77, 77, 77, + 77, 77, 77, 77, 77, 77, 77, 77, 77, 48, + 77, 77, 77, 77, 0, 0, 0, 33, 0, 0, + 31, 5, 37, 6, 37, 37, 0, 95, 76, 73, + 73, 75, 77, 47, 77, 77, 46, 77, 77, 77, + + 77, 77, 77, 77, 77, 77, 45, 77, 77, 77, + 0, 0, 0, 77, 47, 77, 77, 46, 77, 77, + 77, 77, 77, 77, 77, 77, 77, 45, 77, 77, + 77, 0, 0, 0, 0, 0, 37, 37, 2, 77, + 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, + 77, 77, 77, 49, 0, 0, 77, 77, 77, 77, + 77, 77, 77, 77, 77, 77, 77, 77, 77, 49, + 0, 37, 37, 77, 77, 77, 77, 0, 65, 77, + 77, 77, 77, 77, 77, 77, 77, 77, 0, 0, + 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, + + 77, 77, 37, 37, 0, 68, 77, 77, 0, 60, + 77, 77, 0, 66, 0, 59, 77, 77, 77, 77, + 77, 0, 69, 0, 77, 77, 77, 77, 77, 77, + 77, 37, 37, 77, 50, 77, 77, 77, 77, 0, + 62, 77, 77, 69, 77, 50, 77, 77, 77, 77, + 26, 37, 0, 64, 77, 77, 77, 0, 63, 0, + 61, 0, 58, 77, 37, 37, 77, 77, 77, 77, + 27, 28, 77, 0, 57, 77, 77, 37, 77, 77, + 77, 29, 0, 67, 77, 77, 77, 77, 77, 77, + 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, + + 77, 77, 51, 0 } ; static yyconst flex_int32_t yy_ec[256] = @@ -455,13 +462,13 @@ static yyconst flex_int32_t yy_ec[256] = 13, 14, 15, 16, 17, 18, 19, 20, 21, 21, 21, 21, 21, 21, 21, 22, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, - 36, 37, 38, 39, 39, 40, 41, 42, 43, 44, - 39, 45, 46, 47, 48, 49, 50, 51, 52, 39, - 53, 54, 55, 29, 56, 1, 57, 58, 59, 60, + 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, + 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, + 56, 57, 58, 59, 60, 1, 61, 62, 63, 64, - 61, 62, 63, 64, 65, 39, 39, 66, 67, 68, - 69, 70, 39, 71, 72, 73, 74, 49, 75, 76, - 77, 39, 78, 29, 79, 80, 1, 1, 1, 1, + 65, 66, 67, 68, 69, 39, 70, 71, 72, 73, + 74, 75, 76, 77, 78, 79, 80, 51, 81, 82, + 83, 84, 85, 59, 86, 87, 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, 1, 1, 1, 1, 1, 1, @@ -478,504 +485,565 @@ static yyconst flex_int32_t yy_ec[256] = 1, 1, 1, 1, 1 } ; -static yyconst flex_int32_t yy_meta[81] = +static yyconst flex_int32_t yy_meta[88] = { 0, 1, 2, 3, 4, 5, 6, 1, 7, 1, 1, - 6, 1, 1, 8, 9, 10, 11, 12, 1, 13, - 13, 14, 15, 16, 1, 17, 1, 18, 1, 19, - 20, 21, 21, 21, 19, 22, 22, 22, 22, 22, - 22, 23, 22, 22, 23, 22, 23, 22, 24, 22, - 25, 22, 1, 6, 1, 26, 19, 20, 21, 21, - 21, 19, 22, 22, 22, 22, 22, 23, 22, 22, - 23, 22, 23, 22, 22, 25, 22, 1, 1, 1 + 6, 1, 1, 8, 9, 10, 11, 12, 13, 14, + 14, 15, 16, 17, 1, 18, 1, 19, 20, 21, + 22, 23, 23, 23, 21, 24, 24, 24, 24, 24, + 24, 24, 25, 24, 24, 24, 25, 24, 25, 24, + 26, 24, 27, 24, 24, 1, 6, 1, 1, 28, + 21, 22, 23, 23, 23, 21, 24, 24, 24, 24, + 24, 24, 25, 24, 24, 24, 25, 24, 25, 24, + 24, 27, 24, 24, 1, 1, 1 } ; -static yyconst flex_int16_t yy_base[515] = +static yyconst flex_int16_t yy_base[580] = { 0, - 0, 80, 160, 0, 238, 239, 241, 244, 236, 241, - 263, 0, 343, 0, 1068, 3182, 3182, 3182, 0, 1059, - 0, 3182, 3182, 953, 236, 0, 942, 0, 0, 392, - 395, 387, 388, 394, 388, 387, 385, 400, 405, 395, - 3182, 3182, 0, 463, 424, 932, 486, 462, 502, 529, - 572, 538, 540, 568, 505, 569, 570, 612, 613, 592, - 3182, 3182, 3182, 420, 933, 3182, 3182, 904, 3182, 0, - 3182, 3182, 904, 899, 863, 0, 3182, 3182, 3182, 428, - 3182, 3182, 3182, 0, 3182, 3182, 3182, 852, 435, 438, - 3182, 3182, 449, 3182, 3182, 3182, 3182, 3182, 3182, 830, - - 455, 487, 3182, 233, 798, 783, 413, 0, 461, 485, - 484, 486, 488, 3182, 3182, 534, 778, 3182, 685, 569, - 0, 617, 518, 0, 3182, 0, 754, 509, 535, 537, - 545, 588, 0, 588, 524, 611, 610, 604, 609, 612, - 720, 765, 646, 0, 767, 752, 0, 758, 781, 792, - 676, 667, 806, 835, 814, 859, 872, 796, 791, 740, - 794, 742, 795, 851, 861, 859, 778, 854, 862, 866, - 554, 3182, 448, 665, 3182, 3182, 0, 630, 613, 3182, - 0, 834, 0, 3182, 860, 3182, 896, 0, 0, 760, - 3182, 900, 3182, 451, 0, 920, 3182, 3182, 3182, 3182, - - 0, 798, 858, 858, 0, 880, 899, 946, 3182, 574, - 3182, 976, 950, 959, 560, 966, 524, 0, 0, 0, - 0, 906, 1017, 1012, 1026, 1030, 1015, 1016, 1021, 1022, - 1033, 0, 1025, 1026, 1037, 0, 1070, 3182, 1073, 939, - 786, 1088, 1101, 1112, 1101, 1046, 1080, 1095, 1097, 1038, - 1109, 1116, 1114, 1115, 1118, 1130, 1166, 938, 0, 0, - 944, 0, 3182, 0, 1129, 0, 1138, 1147, 482, 3182, - 474, 0, 0, 0, 1147, 0, 1145, 1059, 0, 1083, - 1146, 1155, 1152, 1164, 1154, 0, 1161, 1156, 970, 1095, - 1201, 1164, 1168, 1184, 1172, 1173, 1192, 1188, 1174, 1196, - - 1208, 1205, 1204, 1206, 1212, 1259, 1235, 0, 1243, 0, - 1230, 1200, 0, 1224, 1238, 1233, 1236, 1279, 1250, 1243, - 1243, 1255, 1260, 0, 1195, 563, 1254, 1267, 1263, 1253, - 1296, 1281, 1266, 1278, 1294, 1297, 1264, 1304, 1287, 1292, - 1363, 1301, 1297, 1370, 1374, 3182, 1377, 1294, 1310, 1312, - 1314, 659, 1334, 1388, 1328, 1353, 1395, 1400, 1373, 1368, - 1370, 1371, 1353, 573, 1421, 3182, 1369, 1386, 1446, 3182, - 1453, 3182, 1391, 808, 1460, 1412, 1416, 3182, 1423, 1405, - 1434, 1440, 1427, 1479, 1450, 1413, 1422, 1495, 0, 1431, - 1506, 1510, 3182, 1521, 1432, 1524, 1449, 1465, 1535, 1538, - - 379, 1447, 1549, 3182, 1477, 1553, 3182, 1556, 3182, 1504, - 1483, 1498, 1512, 1532, 0, 374, 1514, 1523, 1511, 1529, - 1531, 0, 1532, 1537, 1547, 1548, 1542, 1545, 1538, 1551, - 1551, 1566, 1564, 1584, 1568, 1586, 1574, 1583, 239, 1604, - 3182, 3182, 1670, 1696, 1722, 1748, 1774, 1782, 1807, 1833, - 1851, 1865, 1889, 1907, 1925, 1950, 1970, 1988, 2014, 2040, - 2055, 2081, 2107, 2122, 2148, 2170, 2195, 2209, 2235, 2261, - 2275, 2299, 2317, 2332, 2351, 2372, 2397, 2420, 2441, 2460, - 2486, 2507, 2531, 2546, 2572, 2598, 2613, 2639, 2660, 2667, - 2688, 2714, 2735, 2748, 2757, 2783, 2809, 2835, 2861, 2887, - - 2913, 2939, 2965, 2983, 3005, 3027, 3048, 3067, 3093, 3107, - 3116, 3125, 3134, 3155 + 0, 87, 174, 0, 259, 260, 262, 265, 257, 262, + 284, 0, 371, 0, 1310, 3608, 3608, 3608, 0, 1257, + 0, 3608, 3608, 1232, 257, 0, 1192, 0, 0, 427, + 430, 421, 422, 429, 422, 437, 438, 420, 445, 444, + 428, 3608, 3608, 0, 503, 468, 1191, 526, 539, 555, + 574, 621, 579, 586, 619, 519, 570, 622, 626, 654, + 674, 628, 3608, 3608, 3608, 455, 1198, 3608, 3608, 1062, + 3608, 0, 3608, 3608, 1059, 1057, 974, 0, 3608, 3608, + 3608, 455, 3608, 3608, 3608, 0, 3608, 3608, 3608, 894, + 459, 614, 3608, 3608, 462, 3608, 3608, 3608, 3608, 3608, + + 3608, 901, 544, 501, 3608, 254, 849, 822, 444, 0, + 470, 504, 527, 550, 580, 3608, 3608, 564, 834, 3608, + 748, 599, 0, 671, 466, 0, 3608, 0, 703, 576, + 620, 621, 619, 633, 0, 634, 642, 590, 657, 663, + 802, 670, 665, 673, 796, 797, 792, 839, 704, 0, + 715, 711, 0, 829, 734, 876, 705, 726, 890, 904, + 837, 923, 935, 875, 850, 849, 922, 793, 923, 925, + 937, 909, 930, 948, 929, 795, 936, 945, 963, 941, + 500, 3608, 587, 702, 3608, 3608, 0, 665, 643, 3608, + 0, 839, 0, 3608, 857, 3608, 1005, 0, 0, 472, + + 3608, 1008, 3608, 725, 0, 844, 3608, 3608, 3608, 3608, + 0, 884, 938, 942, 0, 973, 984, 1028, 3608, 621, + 3608, 1090, 1034, 1041, 618, 1048, 602, 0, 0, 0, + 0, 985, 992, 991, 1012, 1016, 1003, 1016, 1016, 1128, + 1131, 1135, 1136, 1023, 0, 1137, 1138, 1150, 1151, 0, + 1062, 3608, 1069, 542, 847, 1181, 1204, 1215, 1199, 1209, + 1214, 1173, 1211, 1216, 1208, 1156, 1220, 1221, 1249, 1146, + 1222, 1227, 1260, 1265, 1297, 1047, 0, 0, 1054, 0, + 3608, 0, 1205, 0, 1257, 1262, 559, 3608, 540, 0, + 0, 0, 1263, 0, 1259, 1200, 0, 1279, 1262, 1262, + + 465, 1272, 1281, 1272, 1282, 1273, 0, 1281, 526, 1274, + 1075, 1077, 1184, 1285, 1286, 1309, 1307, 1291, 1303, 1314, + 1319, 1324, 1320, 1332, 1330, 1341, 1331, 1327, 1329, 1353, + 1340, 1407, 1064, 0, 1170, 0, 1353, 1337, 0, 1344, + 1362, 1353, 1363, 1190, 1360, 1364, 1381, 1371, 1376, 1374, + 1388, 1395, 1385, 0, 892, 867, 1389, 1406, 1390, 1397, + 1440, 1400, 1424, 1408, 1413, 1425, 1435, 1452, 1447, 1432, + 919, 1401, 1426, 1495, 1435, 1430, 1512, 1523, 3608, 448, + 1440, 1526, 1529, 1454, 1443, 1460, 1463, 1476, 961, 1477, + 1541, 1505, 1506, 1548, 1495, 1555, 1559, 1532, 1531, 1534, + + 1538, 1547, 1497, 879, 1589, 3608, 1505, 1503, 1595, 3608, + 1525, 1551, 1619, 3608, 1625, 3608, 1559, 1217, 1630, 1574, + 1580, 1600, 3608, 1605, 1594, 1606, 1603, 1595, 1648, 1614, + 1622, 1576, 1577, 1678, 0, 1611, 1603, 1623, 1692, 1695, + 3608, 1698, 1709, 1652, 1712, 1634, 1665, 1723, 1726, 1729, + 443, 1639, 1740, 3608, 1655, 1657, 1679, 1743, 3608, 1754, + 3608, 1757, 3608, 1707, 1670, 1686, 1708, 1769, 1703, 1741, + 0, 437, 1728, 1783, 3608, 1733, 1736, 1727, 1786, 1742, + 1761, 0, 1806, 3608, 1741, 1760, 1757, 1779, 1762, 1774, + 1766, 1778, 1779, 1782, 1794, 1795, 1795, 1800, 1790, 1801, + + 260, 1827, 3608, 3608, 1898, 1926, 1954, 1982, 2010, 2018, + 2045, 2073, 2093, 2108, 2134, 2154, 2174, 2201, 2223, 2243, + 2271, 2299, 2316, 2344, 2372, 2389, 2417, 2441, 2468, 2483, + 2511, 2539, 2567, 2595, 2615, 2630, 2656, 2676, 2693, 2714, + 2737, 2764, 2789, 2812, 2833, 2861, 2884, 2910, 2927, 2955, + 2983, 3000, 3028, 3051, 3059, 3082, 3110, 3133, 1841, 3147, + 3175, 3203, 3231, 3259, 3287, 3315, 3343, 3371, 3391, 3415, + 3439, 3462, 3483, 3511, 3526, 3536, 3546, 3556, 3579 } ; -static yyconst flex_int16_t yy_def[515] = +static yyconst flex_int16_t yy_def[580] = { 0, - 442, 442, 442, 3, 443, 443, 444, 444, 445, 445, - 442, 11, 442, 13, 442, 442, 442, 442, 446, 447, - 448, 442, 442, 442, 449, 449, 450, 451, 452, 451, - 451, 451, 451, 451, 451, 451, 451, 451, 451, 451, - 442, 442, 449, 453, 454, 455, 456, 457, 458, 458, - 458, 51, 51, 51, 51, 51, 51, 51, 51, 51, - 442, 442, 442, 459, 460, 442, 442, 442, 442, 461, - 442, 442, 462, 462, 442, 463, 442, 442, 442, 442, - 442, 442, 442, 464, 442, 442, 442, 442, 465, 466, - 442, 442, 467, 442, 442, 442, 442, 442, 442, 442, - - 442, 442, 442, 442, 442, 442, 468, 468, 468, 468, - 468, 468, 468, 442, 442, 446, 447, 442, 442, 442, - 449, 449, 469, 470, 442, 451, 471, 451, 451, 451, - 451, 451, 451, 451, 451, 451, 451, 451, 451, 451, - 451, 472, 473, 474, 475, 473, 476, 442, 474, 477, - 475, 475, 478, 479, 451, 480, 480, 157, 157, 157, - 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, - 481, 442, 482, 483, 442, 442, 484, 485, 485, 442, - 486, 442, 487, 442, 488, 442, 489, 490, 491, 492, - 442, 493, 442, 442, 494, 442, 442, 442, 442, 442, - - 495, 495, 495, 495, 495, 495, 495, 442, 442, 496, - 442, 442, 442, 442, 497, 498, 499, 500, 501, 502, - 503, 504, 504, 504, 504, 504, 504, 504, 504, 504, - 504, 504, 504, 504, 504, 505, 442, 442, 498, 442, - 506, 507, 508, 508, 244, 244, 244, 244, 244, 244, - 244, 244, 244, 244, 244, 244, 509, 442, 510, 491, - 442, 511, 442, 495, 495, 495, 495, 495, 497, 442, - 499, 500, 501, 503, 504, 504, 504, 504, 504, 504, - 504, 504, 504, 504, 504, 504, 504, 504, 506, 506, - 506, 244, 244, 244, 244, 244, 244, 244, 244, 244, - - 244, 244, 244, 244, 244, 509, 442, 512, 442, 513, - 495, 495, 495, 504, 504, 504, 504, 504, 504, 504, - 504, 504, 504, 504, 442, 442, 244, 244, 244, 244, - 244, 244, 244, 244, 244, 244, 244, 509, 495, 495, - 504, 504, 504, 504, 442, 442, 504, 504, 504, 504, - 504, 442, 514, 244, 244, 244, 244, 244, 244, 244, - 244, 244, 495, 495, 442, 442, 504, 504, 442, 442, - 442, 442, 504, 504, 504, 504, 514, 442, 514, 244, - 244, 244, 244, 244, 244, 495, 495, 504, 504, 504, - 504, 442, 442, 504, 514, 244, 244, 244, 244, 244, - - 495, 495, 442, 442, 504, 442, 442, 442, 442, 244, - 495, 495, 504, 244, 495, 495, 504, 244, 495, 504, - 244, 495, 504, 244, 504, 244, 504, 244, 504, 244, - 504, 244, 504, 244, 504, 244, 504, 244, 504, 244, - 442, 0, 442, 442, 442, 442, 442, 442, 442, 442, - 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, - 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, - 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, - 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, - 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, - - 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, - 442, 442, 442, 442 + 504, 504, 504, 3, 505, 505, 506, 506, 507, 507, + 504, 11, 504, 13, 504, 504, 504, 504, 508, 509, + 510, 504, 504, 504, 511, 511, 512, 513, 514, 513, + 513, 513, 513, 513, 513, 513, 513, 513, 513, 513, + 513, 504, 504, 511, 515, 516, 517, 518, 519, 520, + 520, 520, 52, 52, 52, 52, 52, 52, 52, 52, + 52, 52, 504, 504, 504, 521, 522, 504, 504, 504, + 504, 523, 504, 504, 524, 524, 504, 525, 504, 504, + 504, 504, 504, 504, 504, 526, 504, 504, 504, 504, + 527, 528, 504, 504, 529, 504, 504, 504, 504, 504, + + 504, 504, 504, 504, 504, 504, 504, 504, 530, 530, + 530, 530, 530, 530, 530, 504, 504, 531, 532, 504, + 504, 504, 511, 511, 533, 534, 504, 535, 536, 535, + 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, + 535, 535, 535, 535, 535, 535, 535, 537, 538, 539, + 540, 538, 541, 504, 539, 542, 540, 540, 543, 544, + 535, 545, 545, 163, 163, 163, 163, 163, 163, 163, + 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, + 546, 504, 547, 548, 504, 504, 549, 550, 550, 504, + 551, 504, 552, 504, 553, 504, 554, 555, 556, 557, + + 504, 558, 504, 504, 559, 504, 504, 504, 504, 504, + 560, 560, 560, 560, 560, 560, 560, 504, 504, 561, + 504, 504, 504, 504, 562, 563, 564, 565, 566, 567, + 568, 569, 569, 569, 569, 569, 569, 569, 569, 569, + 569, 569, 569, 569, 569, 569, 569, 569, 569, 570, + 504, 504, 563, 504, 571, 572, 573, 573, 258, 258, + 258, 258, 258, 258, 258, 258, 258, 258, 258, 258, + 258, 258, 258, 258, 574, 504, 575, 556, 504, 576, + 504, 560, 560, 560, 560, 560, 562, 504, 564, 565, + 566, 568, 569, 569, 569, 569, 569, 569, 569, 569, + + 569, 569, 569, 569, 569, 569, 569, 569, 569, 569, + 571, 571, 571, 258, 258, 258, 258, 258, 258, 258, + 258, 258, 258, 258, 258, 258, 258, 258, 258, 258, + 258, 574, 504, 577, 504, 578, 560, 560, 560, 569, + 569, 569, 569, 569, 569, 569, 569, 569, 569, 569, + 569, 569, 569, 569, 504, 504, 258, 258, 258, 258, + 258, 258, 258, 258, 258, 258, 258, 258, 258, 258, + 574, 560, 560, 569, 569, 569, 569, 504, 504, 569, + 569, 569, 569, 569, 569, 569, 569, 569, 504, 579, + 258, 258, 258, 258, 258, 258, 258, 258, 258, 258, + + 258, 258, 560, 560, 504, 504, 569, 569, 504, 504, + 569, 569, 504, 504, 504, 504, 569, 569, 569, 569, + 569, 579, 504, 579, 258, 258, 258, 258, 258, 258, + 258, 560, 560, 569, 569, 569, 569, 569, 569, 504, + 504, 569, 569, 579, 258, 258, 258, 258, 258, 258, + 560, 560, 504, 504, 569, 569, 569, 504, 504, 504, + 504, 504, 504, 258, 560, 560, 569, 569, 569, 258, + 560, 560, 569, 504, 504, 569, 258, 560, 569, 569, + 258, 560, 504, 504, 569, 258, 569, 258, 569, 258, + 569, 258, 569, 258, 569, 258, 569, 258, 569, 258, + + 569, 258, 504, 0, 504, 504, 504, 504, 504, 504, + 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, + 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, + 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, + 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, + 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, + 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, + 504, 504, 504, 504, 504, 504, 504, 504, 504 } ; -static yyconst flex_int16_t yy_nxt[3263] = +static yyconst flex_int16_t yy_nxt[3696] = { 0, 16, 17, 18, 17, 19, 16, 20, 21, 16, 22, 16, 16, 16, 23, 24, 16, 25, 26, 27, 28, 28, 28, 29, 16, 16, 16, 26, 26, 26, 30, 28, 31, 28, 32, 28, 33, 28, 34, 28, 28, - 35, 28, 28, 36, 37, 38, 39, 40, 28, 28, - 28, 28, 16, 16, 16, 28, 30, 28, 31, 28, - 32, 28, 33, 28, 34, 28, 35, 28, 28, 36, - 37, 38, 39, 40, 28, 28, 28, 41, 42, 43, - 16, 44, 18, 44, 19, 16, 20, 21, 16, 22, - 16, 16, 16, 45, 46, 16, 47, 26, 27, 28, - - 28, 28, 48, 16, 16, 16, 26, 26, 26, 49, - 50, 51, 50, 52, 50, 53, 50, 54, 50, 50, - 55, 50, 50, 56, 57, 58, 59, 60, 50, 50, - 50, 50, 16, 16, 16, 28, 49, 50, 51, 50, - 52, 50, 53, 50, 54, 50, 55, 50, 50, 56, - 57, 58, 59, 60, 50, 50, 50, 41, 42, 43, - 61, 62, 63, 62, 61, 64, 65, 61, 61, 61, - 61, 61, 66, 61, 61, 67, 61, 61, 68, 61, - 61, 61, 61, 61, 61, 69, 61, 61, 61, 70, - 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, - - 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, - 70, 70, 71, 61, 72, 61, 70, 70, 70, 70, - 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, - 70, 70, 70, 70, 70, 70, 70, 61, 61, 61, - 74, 74, 77, 77, 77, 77, 77, 77, 79, 122, - 441, 75, 75, 79, 123, 80, 80, 80, 197, 198, - 80, 80, 80, 81, 82, 83, 82, 81, 81, 81, - 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, - 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, - 81, 81, 84, 84, 84, 84, 84, 84, 84, 84, - - 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, - 84, 84, 84, 84, 84, 81, 81, 81, 81, 84, - 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, - 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, - 81, 81, 81, 85, 86, 87, 86, 88, 89, 85, - 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, - 85, 100, 101, 102, 102, 85, 103, 104, 105, 106, - 85, 85, 107, 108, 109, 108, 108, 108, 108, 108, - 108, 108, 108, 108, 110, 111, 108, 108, 112, 113, - 108, 108, 108, 108, 108, 114, 85, 115, 85, 107, - - 108, 109, 108, 108, 108, 108, 108, 108, 108, 108, - 110, 111, 108, 108, 112, 113, 108, 108, 108, 108, - 85, 85, 85, 128, 129, 172, 131, 132, 133, 419, - 135, 136, 137, 138, 411, 134, 141, 130, 140, 147, - 186, 147, 188, 148, 148, 188, 139, 182, 182, 182, - 128, 129, 131, 132, 202, 133, 135, 136, 137, 191, - 138, 134, 141, 130, 142, 140, 142, 257, 257, 151, - 194, 194, 139, 173, 194, 194, 270, 144, 152, 144, - 202, 127, 127, 127, 270, 145, 121, 121, 187, 121, - 121, 121, 121, 121, 121, 121, 121, 121, 121, 122, - - 121, 121, 192, 203, 123, 195, 196, 196, 196, 121, - 121, 121, 121, 121, 121, 146, 126, 154, 126, 147, - 219, 155, 155, 126, 207, 126, 270, 204, 205, 203, - 195, 121, 206, 157, 156, 208, 209, 208, 121, 121, - 121, 121, 146, 126, 154, 126, 147, 164, 155, 155, - 126, 207, 126, 204, 205, 222, 228, 126, 206, 172, - 157, 156, 270, 121, 121, 121, 352, 156, 353, 156, - 213, 214, 213, 164, 223, 215, 211, 160, 224, 161, - 156, 222, 156, 228, 126, 146, 126, 154, 126, 147, - 225, 155, 155, 126, 156, 126, 156, 156, 156, 156, - - 223, 158, 162, 160, 224, 161, 156, 173, 156, 163, - 156, 156, 156, 165, 159, 179, 225, 166, 216, 214, - 216, 156, 387, 217, 156, 156, 156, 126, 158, 162, - 226, 227, 179, 170, 156, 163, 156, 156, 156, 165, - 159, 156, 156, 166, 229, 167, 169, 387, 156, 231, - 232, 233, 234, 230, 156, 156, 226, 227, 168, 170, - 156, 147, 352, 147, 353, 148, 148, 175, 156, 156, - 240, 229, 167, 169, 442, 231, 232, 233, 234, 230, - 156, 156, 241, 442, 168, 210, 210, 211, 210, 210, - 210, 210, 210, 210, 210, 210, 210, 210, 210, 210, - - 210, 210, 210, 210, 210, 210, 210, 210, 210, 210, - 210, 210, 210, 210, 212, 212, 212, 212, 212, 212, - 212, 212, 212, 212, 212, 212, 212, 212, 212, 212, - 212, 212, 212, 212, 212, 212, 212, 210, 210, 210, - 210, 212, 212, 212, 212, 212, 212, 212, 212, 212, - 212, 212, 212, 212, 212, 212, 212, 212, 212, 212, - 212, 212, 210, 210, 210, 235, 142, 147, 142, 147, - 191, 148, 148, 147, 151, 147, 221, 148, 148, 144, - 118, 144, 237, 238, 237, 246, 156, 145, 156, 289, - 290, 235, 121, 239, 238, 239, 121, 121, 121, 121, - - 121, 121, 121, 121, 121, 121, 121, 121, 200, 240, - 121, 246, 156, 192, 156, 121, 121, 121, 121, 121, - 121, 241, 152, 199, 253, 127, 127, 127, 221, 154, - 264, 147, 245, 155, 155, 244, 247, 156, 248, 236, - 156, 156, 156, 193, 121, 121, 121, 121, 236, 126, - 253, 126, 236, 182, 182, 182, 126, 264, 245, 391, - 236, 244, 247, 156, 248, 186, 156, 156, 156, 121, - 121, 121, 146, 126, 154, 126, 147, 184, 155, 155, - 126, 180, 126, 249, 391, 146, 126, 154, 126, 147, - 126, 155, 155, 126, 250, 126, 254, 156, 252, 265, - - 156, 179, 255, 251, 266, 156, 179, 156, 156, 267, - 249, 256, 156, 187, 126, 258, 258, 176, 243, 261, - 261, 250, 254, 156, 252, 265, 156, 126, 255, 251, - 266, 156, 268, 156, 156, 175, 267, 256, 156, 196, - 196, 196, 240, 275, 243, 120, 259, 208, 209, 208, - 262, 213, 214, 213, 241, 125, 215, 307, 307, 268, - 213, 214, 213, 309, 309, 215, 120, 216, 214, 216, - 275, 259, 217, 289, 290, 262, 210, 210, 211, 210, - 210, 210, 210, 210, 210, 210, 210, 210, 210, 210, - 210, 210, 210, 210, 210, 210, 210, 210, 210, 210, - - 210, 210, 210, 210, 210, 212, 212, 212, 212, 212, - 212, 212, 212, 212, 212, 212, 212, 212, 212, 212, - 212, 212, 212, 212, 212, 212, 212, 212, 210, 210, - 210, 210, 212, 212, 212, 212, 212, 212, 212, 212, - 212, 212, 212, 212, 212, 212, 212, 212, 212, 212, - 212, 212, 212, 210, 210, 210, 276, 277, 278, 279, - 280, 118, 281, 282, 283, 284, 285, 442, 286, 287, - 288, 237, 238, 237, 239, 238, 239, 156, 442, 296, - 442, 300, 276, 277, 278, 156, 279, 280, 281, 282, - 283, 284, 236, 285, 286, 287, 316, 288, 442, 442, - - 442, 236, 126, 156, 126, 236, 296, 300, 442, 126, - 297, 156, 317, 236, 146, 126, 154, 126, 147, 156, - 155, 155, 126, 316, 126, 146, 126, 154, 126, 147, - 442, 155, 155, 126, 156, 126, 156, 297, 292, 317, - 156, 442, 298, 126, 299, 156, 294, 295, 156, 302, - 442, 293, 301, 156, 156, 156, 126, 156, 303, 442, - 156, 304, 156, 305, 442, 292, 156, 126, 298, 156, - 299, 172, 294, 295, 156, 311, 302, 293, 301, 156, - 156, 156, 312, 156, 303, 306, 306, 304, 313, 314, - 305, 315, 318, 442, 319, 156, 320, 321, 325, 322, - - 323, 311, 324, 156, 325, 442, 327, 156, 312, 329, - 326, 156, 156, 332, 313, 314, 326, 315, 318, 173, - 319, 330, 320, 156, 321, 322, 323, 156, 324, 156, - 328, 156, 327, 156, 331, 156, 329, 156, 156, 332, - 333, 334, 442, 156, 156, 336, 340, 156, 330, 156, - 335, 156, 442, 156, 185, 185, 328, 156, 337, 339, - 331, 156, 190, 190, 172, 341, 333, 342, 334, 156, - 156, 336, 340, 156, 343, 344, 335, 156, 338, 338, - 345, 345, 345, 347, 337, 348, 339, 349, 350, 351, - 346, 341, 357, 156, 342, 354, 355, 345, 345, 345, - - 343, 344, 156, 156, 356, 156, 156, 346, 359, 172, - 347, 348, 173, 349, 358, 350, 351, 156, 357, 156, - 156, 354, 360, 355, 363, 373, 362, 361, 156, 156, - 356, 156, 156, 156, 359, 156, 156, 364, 442, 378, - 442, 358, 367, 156, 368, 442, 156, 442, 360, 442, - 442, 363, 373, 362, 361, 442, 374, 173, 375, 156, - 376, 156, 156, 364, 365, 365, 365, 156, 367, 380, - 368, 369, 369, 369, 366, 345, 345, 345, 371, 371, - 371, 370, 374, 442, 375, 346, 376, 379, 372, 365, - 365, 365, 156, 156, 386, 380, 369, 369, 369, 366, - - 381, 371, 371, 371, 382, 442, 370, 156, 442, 156, - 156, 372, 156, 442, 383, 388, 384, 385, 156, 389, - 386, 378, 365, 365, 365, 390, 381, 156, 395, 442, - 442, 382, 366, 156, 156, 156, 156, 378, 156, 156, - 383, 388, 384, 385, 156, 394, 389, 369, 369, 369, - 442, 396, 390, 156, 371, 371, 371, 370, 401, 402, - 156, 392, 392, 392, 372, 156, 156, 397, 405, 379, - 156, 393, 394, 156, 398, 442, 379, 396, 399, 156, - 392, 392, 392, 400, 401, 379, 402, 442, 156, 156, - 393, 442, 156, 412, 397, 405, 403, 403, 403, 156, - - 442, 398, 410, 399, 156, 156, 404, 406, 406, 406, - 400, 392, 392, 392, 156, 156, 413, 407, 156, 412, - 415, 393, 408, 408, 408, 403, 403, 403, 442, 410, - 156, 442, 409, 442, 416, 404, 406, 406, 406, 408, - 408, 408, 413, 414, 156, 417, 407, 415, 422, 409, - 403, 403, 403, 420, 406, 406, 406, 408, 408, 408, - 404, 416, 421, 156, 407, 418, 423, 409, 424, 414, - 156, 156, 417, 425, 156, 422, 156, 156, 426, 420, - 427, 428, 442, 429, 156, 431, 430, 156, 421, 156, - 156, 433, 418, 423, 435, 424, 156, 156, 432, 425, - - 156, 437, 156, 156, 426, 156, 434, 427, 428, 429, - 156, 431, 430, 156, 436, 441, 156, 433, 439, 438, - 442, 435, 156, 156, 432, 156, 442, 440, 437, 442, - 442, 156, 434, 442, 442, 442, 442, 442, 442, 442, - 442, 436, 442, 156, 439, 442, 438, 442, 156, 156, - 442, 156, 442, 440, 442, 442, 442, 442, 442, 442, - 442, 442, 442, 442, 442, 442, 442, 442, 442, 156, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 76, 76, 76, 76, - - 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, - 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, - 76, 76, 78, 78, 78, 78, 78, 78, 78, 78, + 35, 36, 28, 28, 37, 28, 38, 39, 40, 41, + 28, 28, 28, 28, 28, 16, 16, 16, 26, 28, + 30, 28, 31, 28, 32, 28, 33, 28, 34, 28, + 35, 36, 28, 28, 37, 28, 38, 39, 40, 41, + 28, 28, 28, 28, 42, 43, 44, 16, 45, 18, + 45, 19, 16, 20, 21, 16, 22, 16, 16, 16, + + 46, 47, 16, 48, 26, 27, 28, 28, 28, 49, + 16, 16, 16, 26, 26, 26, 50, 51, 52, 51, + 53, 51, 54, 51, 55, 51, 51, 56, 57, 51, + 51, 58, 51, 59, 60, 61, 62, 51, 51, 51, + 51, 51, 16, 16, 16, 26, 28, 50, 51, 52, + 51, 53, 51, 54, 51, 55, 51, 56, 57, 51, + 51, 58, 51, 59, 60, 61, 62, 51, 51, 51, + 51, 42, 43, 44, 63, 64, 65, 64, 63, 66, + 67, 63, 63, 63, 63, 63, 68, 63, 63, 69, + 63, 63, 70, 63, 63, 63, 63, 63, 63, 71, + + 63, 63, 63, 72, 72, 72, 72, 72, 72, 72, + 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, + 72, 72, 72, 72, 72, 72, 72, 72, 72, 73, + 63, 74, 63, 63, 72, 72, 72, 72, 72, 72, + 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, + 72, 72, 72, 72, 72, 72, 72, 72, 63, 63, + 63, 76, 76, 79, 79, 79, 79, 79, 79, 81, + 124, 503, 77, 77, 81, 125, 82, 82, 82, 207, + 208, 82, 82, 82, 83, 84, 85, 84, 83, 83, + 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, + + 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, + 83, 83, 83, 86, 86, 86, 86, 86, 86, 86, + 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, + 86, 86, 86, 86, 86, 86, 86, 86, 86, 83, + 83, 83, 83, 83, 86, 86, 86, 86, 86, 86, + 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, + 86, 86, 86, 86, 86, 86, 86, 86, 83, 83, + 83, 87, 88, 89, 88, 90, 91, 87, 92, 93, + 94, 95, 96, 97, 98, 99, 100, 101, 87, 102, + 103, 104, 104, 87, 105, 106, 107, 108, 87, 87, + + 109, 110, 111, 110, 110, 110, 110, 110, 110, 110, + 110, 110, 110, 112, 113, 110, 110, 110, 114, 115, + 110, 110, 110, 110, 110, 110, 116, 87, 117, 87, + 87, 109, 110, 111, 110, 110, 110, 110, 110, 110, + 110, 110, 110, 112, 113, 110, 110, 110, 114, 115, + 110, 110, 110, 110, 110, 87, 87, 87, 130, 131, + 182, 133, 134, 135, 196, 137, 138, 140, 229, 142, + 147, 136, 201, 132, 192, 192, 192, 145, 143, 123, + 139, 146, 201, 153, 141, 153, 212, 154, 154, 130, + 131, 133, 134, 144, 135, 137, 478, 138, 140, 142, + + 147, 136, 465, 132, 148, 182, 148, 411, 145, 143, + 139, 183, 146, 213, 141, 197, 212, 150, 202, 150, + 206, 206, 206, 144, 346, 151, 123, 123, 202, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 124, + 123, 123, 288, 213, 125, 254, 157, 214, 162, 123, + 123, 123, 123, 123, 123, 158, 183, 255, 129, 129, + 129, 288, 170, 204, 204, 218, 219, 218, 152, 128, + 160, 128, 153, 215, 161, 161, 128, 214, 128, 162, + 353, 123, 123, 123, 123, 123, 163, 152, 128, 160, + 128, 153, 170, 161, 161, 128, 205, 128, 216, 171, + + 223, 224, 223, 215, 288, 225, 275, 275, 162, 353, + 123, 123, 123, 172, 128, 162, 217, 163, 198, 166, + 288, 198, 162, 221, 232, 205, 167, 239, 216, 162, + 171, 198, 198, 128, 152, 128, 160, 128, 153, 162, + 161, 161, 128, 172, 128, 189, 162, 217, 162, 166, + 164, 173, 162, 168, 232, 162, 167, 162, 239, 162, + 233, 169, 162, 234, 165, 162, 235, 189, 174, 162, + 180, 162, 226, 224, 226, 175, 236, 227, 237, 162, + 128, 164, 173, 162, 168, 238, 162, 176, 162, 240, + 233, 169, 162, 234, 165, 162, 235, 162, 174, 162, + + 180, 162, 177, 162, 185, 175, 236, 178, 237, 241, + 244, 179, 504, 245, 162, 238, 246, 162, 176, 153, + 240, 153, 157, 154, 154, 231, 153, 162, 153, 254, + 154, 154, 177, 504, 162, 251, 252, 251, 178, 241, + 244, 255, 179, 245, 204, 204, 246, 162, 220, 220, + 221, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 222, 222, 222, + 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, + 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, + + 222, 222, 222, 220, 220, 220, 220, 220, 222, 222, + 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, + 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, + 222, 222, 220, 220, 220, 242, 120, 247, 248, 249, + 148, 162, 148, 270, 153, 243, 153, 210, 154, 154, + 311, 312, 160, 150, 153, 150, 161, 161, 192, 192, + 192, 151, 196, 206, 206, 206, 242, 247, 248, 249, + 389, 162, 390, 270, 209, 243, 123, 253, 252, 253, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 259, 254, 123, 355, 260, 162, 162, 123, + + 123, 123, 123, 123, 123, 255, 158, 356, 250, 129, + 129, 129, 231, 197, 203, 258, 282, 250, 128, 194, + 128, 250, 259, 162, 182, 128, 260, 162, 162, 250, + 433, 123, 123, 123, 123, 123, 152, 128, 160, 128, + 153, 265, 161, 161, 128, 258, 128, 282, 152, 128, + 160, 128, 153, 162, 161, 161, 128, 162, 128, 433, + 123, 123, 123, 128, 389, 261, 390, 262, 263, 269, + 162, 162, 265, 162, 264, 183, 266, 162, 162, 271, + 283, 267, 128, 257, 162, 162, 272, 162, 274, 162, + 284, 268, 190, 162, 128, 261, 162, 262, 263, 269, + + 162, 162, 285, 162, 273, 264, 266, 162, 162, 271, + 283, 162, 267, 257, 162, 162, 272, 286, 274, 162, + 284, 268, 293, 162, 276, 276, 162, 279, 279, 218, + 219, 218, 294, 285, 273, 223, 224, 223, 295, 296, + 225, 162, 223, 224, 223, 297, 298, 225, 286, 226, + 224, 226, 299, 293, 227, 300, 306, 277, 301, 189, + 280, 189, 294, 251, 252, 251, 333, 333, 295, 296, + 253, 252, 253, 335, 335, 186, 297, 298, 311, 312, + 504, 504, 299, 195, 195, 300, 277, 306, 301, 280, + 220, 220, 221, 220, 220, 220, 220, 220, 220, 220, + + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 222, + 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, + 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, + 222, 222, 222, 222, 222, 220, 220, 220, 220, 220, + 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, + 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, + 222, 222, 222, 222, 220, 220, 220, 302, 303, 304, + 305, 307, 308, 309, 310, 250, 162, 355, 504, 200, + 200, 378, 378, 378, 250, 128, 162, 128, 250, 356, + + 185, 379, 128, 324, 122, 127, 250, 302, 303, 304, + 305, 307, 308, 162, 309, 310, 162, 152, 128, 160, + 128, 153, 320, 161, 161, 128, 162, 128, 152, 128, + 160, 128, 153, 324, 161, 161, 128, 342, 128, 162, + 128, 314, 318, 162, 319, 122, 316, 317, 162, 162, + 321, 162, 320, 337, 162, 315, 162, 323, 322, 120, + 162, 162, 162, 128, 325, 326, 328, 162, 342, 162, + 439, 329, 314, 318, 128, 319, 316, 317, 162, 162, + 321, 162, 327, 337, 162, 315, 162, 323, 322, 162, + 162, 162, 162, 330, 325, 326, 328, 162, 331, 439, + + 162, 329, 182, 338, 339, 162, 340, 341, 343, 504, + 344, 345, 347, 327, 348, 350, 332, 332, 349, 162, + 351, 352, 354, 504, 330, 162, 162, 504, 357, 331, + 162, 162, 360, 338, 339, 162, 340, 341, 504, 343, + 344, 345, 347, 162, 359, 348, 350, 162, 349, 162, + 351, 352, 354, 183, 162, 162, 162, 358, 357, 162, + 363, 162, 361, 360, 162, 364, 504, 162, 362, 368, + 162, 162, 162, 162, 366, 359, 365, 162, 367, 162, + 162, 162, 372, 346, 162, 373, 374, 358, 370, 162, + 363, 375, 361, 162, 162, 376, 364, 162, 362, 368, + + 162, 162, 162, 377, 380, 366, 365, 369, 367, 381, + 162, 162, 182, 372, 382, 373, 374, 383, 370, 384, + 385, 386, 375, 162, 387, 376, 371, 371, 388, 162, + 162, 391, 393, 377, 380, 392, 369, 394, 403, 381, + 162, 378, 378, 378, 395, 382, 162, 383, 162, 384, + 385, 379, 386, 162, 397, 387, 398, 396, 388, 162, + 162, 391, 393, 183, 162, 162, 392, 394, 400, 403, + 162, 399, 162, 404, 395, 162, 162, 407, 162, 408, + 162, 401, 423, 162, 397, 417, 398, 162, 396, 412, + 402, 418, 162, 504, 162, 162, 405, 405, 405, 400, + + 504, 399, 162, 404, 504, 162, 406, 407, 419, 408, + 162, 420, 401, 409, 409, 409, 417, 162, 421, 412, + 402, 418, 162, 410, 378, 378, 378, 413, 413, 413, + 415, 415, 415, 424, 379, 162, 435, 414, 419, 432, + 416, 420, 405, 405, 405, 162, 162, 425, 421, 409, + 409, 409, 406, 434, 411, 426, 413, 413, 413, 410, + 415, 415, 415, 427, 504, 162, 414, 435, 504, 432, + 416, 162, 162, 436, 162, 162, 162, 425, 162, 428, + 504, 162, 429, 434, 437, 426, 430, 162, 162, 431, + 405, 405, 405, 438, 427, 162, 409, 409, 409, 162, + + 406, 162, 162, 436, 162, 423, 410, 442, 162, 428, + 444, 162, 429, 443, 452, 437, 430, 162, 162, 431, + 413, 413, 413, 451, 438, 162, 415, 415, 415, 162, + 414, 440, 440, 440, 162, 162, 416, 447, 442, 446, + 455, 441, 445, 162, 443, 452, 162, 449, 448, 440, + 440, 440, 456, 451, 162, 450, 424, 423, 504, 441, + 457, 424, 162, 504, 162, 162, 504, 504, 447, 504, + 446, 455, 445, 162, 162, 504, 162, 448, 449, 453, + 453, 453, 456, 504, 162, 467, 450, 466, 162, 454, + 468, 457, 162, 458, 458, 458, 440, 440, 440, 460, + + 460, 460, 464, 459, 162, 162, 441, 471, 424, 461, + 462, 462, 462, 453, 453, 453, 467, 466, 162, 469, + 463, 468, 472, 454, 458, 458, 458, 460, 460, 460, + 462, 462, 462, 464, 459, 162, 476, 461, 471, 504, + 463, 453, 453, 453, 458, 458, 458, 470, 473, 469, + 504, 454, 162, 472, 459, 460, 460, 460, 462, 462, + 462, 479, 504, 162, 482, 461, 162, 476, 463, 162, + 474, 474, 474, 480, 477, 504, 481, 470, 473, 485, + 475, 162, 162, 487, 474, 474, 474, 483, 483, 483, + 489, 504, 479, 162, 475, 482, 162, 484, 486, 162, + + 162, 162, 488, 480, 491, 477, 481, 483, 483, 483, + 485, 162, 490, 487, 162, 493, 492, 484, 162, 162, + 495, 489, 162, 496, 497, 498, 504, 494, 499, 486, + 162, 162, 488, 500, 491, 162, 501, 504, 503, 504, + 162, 162, 504, 490, 162, 493, 492, 502, 162, 162, + 495, 504, 162, 496, 281, 497, 498, 494, 504, 499, + 504, 281, 281, 281, 500, 162, 501, 162, 504, 504, + 162, 162, 504, 504, 504, 504, 504, 502, 504, 504, + 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, + 504, 504, 504, 504, 504, 504, 504, 162, 75, 75, + + 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, + 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, + 75, 75, 75, 75, 75, 75, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 78, 116, 442, - 442, 442, 116, 116, 116, 116, 116, 116, 116, 116, - 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, - 116, 116, 116, 116, 117, 117, 117, 117, 117, 117, - 117, 117, 117, 117, 117, 117, 117, 117, 117, 117, - 117, 117, 117, 117, 117, 117, 117, 117, 117, 117, - - 119, 119, 119, 119, 119, 119, 119, 121, 121, 442, - 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, - 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, - 121, 121, 121, 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, 126, - 126, 126, 442, 126, 126, 442, 126, 442, 442, 126, - 126, 126, 126, 126, 126, 126, 126, 127, 127, 442, - 442, 442, 442, 127, 127, 127, 127, 127, 127, 127, - 143, 442, 143, 442, 442, 442, 143, 143, 442, 143, - - 442, 442, 442, 143, 442, 442, 442, 143, 143, 143, - 143, 143, 143, 143, 146, 442, 146, 442, 146, 146, - 442, 442, 442, 442, 442, 146, 146, 146, 146, 146, - 146, 146, 149, 442, 442, 149, 149, 149, 149, 149, - 442, 442, 442, 149, 149, 149, 149, 149, 149, 149, - 150, 150, 442, 150, 150, 150, 150, 150, 150, 150, - 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, - 150, 150, 150, 150, 150, 150, 153, 442, 442, 442, - 153, 442, 153, 153, 442, 442, 442, 442, 153, 153, - 153, 153, 153, 153, 153, 156, 156, 156, 156, 156, - - 156, 156, 442, 156, 442, 442, 156, 156, 156, 156, - 156, 156, 156, 156, 171, 171, 171, 171, 171, 171, - 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, - 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, - 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, - 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, - 174, 174, 174, 174, 174, 174, 177, 177, 177, 442, - 442, 442, 442, 177, 177, 177, 177, 177, 177, 177, - 177, 178, 178, 178, 178, 178, 178, 178, 442, 178, - 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, - - 178, 178, 178, 178, 178, 178, 178, 181, 442, 442, - 442, 181, 181, 181, 181, 181, 181, 181, 181, 181, + 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, + 78, 78, 78, 78, 80, 80, 80, 80, 80, 80, + 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, + 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, + 80, 80, 118, 504, 504, 504, 118, 118, 118, 118, + 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, + + 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, + 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, + 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, + 119, 119, 119, 119, 119, 119, 119, 119, 121, 121, + 121, 121, 121, 121, 121, 123, 123, 504, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 126, 126, 126, 126, 126, 126, 126, + 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, + 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, + + 126, 128, 128, 128, 504, 504, 128, 128, 504, 128, + 504, 504, 504, 128, 128, 128, 128, 128, 128, 128, + 128, 129, 129, 504, 504, 504, 504, 504, 129, 129, + 129, 129, 129, 129, 129, 149, 504, 149, 504, 504, + 504, 149, 149, 504, 149, 504, 504, 504, 504, 149, + 504, 504, 504, 504, 149, 149, 149, 149, 149, 149, + 149, 152, 504, 152, 504, 152, 504, 152, 504, 504, + 504, 504, 504, 504, 152, 152, 152, 152, 152, 152, + 152, 155, 504, 504, 155, 155, 504, 155, 155, 155, + 504, 504, 504, 504, 155, 155, 155, 155, 155, 155, + + 155, 156, 156, 504, 156, 156, 156, 156, 156, 156, + 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, + 156, 156, 156, 156, 156, 156, 156, 156, 156, 159, + 504, 504, 504, 159, 504, 504, 159, 159, 504, 504, + 504, 504, 504, 159, 159, 159, 159, 159, 159, 159, + 162, 162, 162, 162, 162, 504, 162, 162, 504, 162, + 504, 504, 504, 162, 162, 162, 162, 162, 162, 162, + 162, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, - 181, 181, 181, 183, 183, 183, 442, 442, 442, 442, - 183, 183, 183, 183, 183, 183, 183, 183, 185, 185, - 185, 185, 185, 185, 442, 185, 185, 185, 185, 185, - 185, 185, 185, 185, 185, 185, 185, 185, 185, 185, - 185, 185, 185, 185, 189, 442, 189, 442, 442, 442, - 442, 442, 442, 442, 442, 442, 442, 442, 189, 189, - 189, 189, 189, 189, 189, 190, 190, 190, 190, 190, - - 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, - 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, - 190, 201, 201, 442, 442, 442, 442, 201, 201, 201, - 201, 201, 201, 201, 201, 218, 218, 218, 218, 218, - 218, 218, 218, 218, 218, 218, 218, 218, 218, 218, - 218, 218, 218, 218, 218, 218, 218, 218, 218, 218, - 218, 220, 220, 442, 220, 220, 220, 220, 220, 220, - 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, - 220, 220, 220, 220, 220, 220, 220, 127, 127, 127, - 442, 442, 442, 127, 127, 127, 127, 127, 127, 127, - - 143, 442, 143, 442, 442, 442, 143, 143, 442, 143, - 442, 442, 442, 143, 442, 442, 442, 143, 143, 143, - 143, 143, 143, 143, 146, 442, 146, 442, 146, 146, - 442, 442, 442, 442, 442, 146, 146, 146, 146, 146, - 146, 146, 149, 149, 149, 149, 149, 442, 442, 442, - 149, 149, 149, 149, 149, 149, 149, 152, 442, 442, - 442, 152, 442, 442, 442, 442, 442, 442, 442, 152, - 152, 152, 152, 152, 152, 152, 236, 442, 442, 236, - 442, 236, 442, 236, 236, 442, 442, 236, 236, 442, - 236, 236, 236, 236, 236, 236, 236, 150, 150, 150, - - 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, - 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, - 150, 150, 150, 153, 442, 442, 442, 442, 442, 153, - 153, 442, 153, 153, 153, 442, 442, 442, 153, 153, - 153, 153, 153, 153, 153, 242, 442, 442, 242, 242, - 242, 242, 242, 242, 242, 442, 242, 242, 442, 242, - 242, 242, 242, 242, 242, 242, 242, 156, 156, 156, - 156, 156, 156, 156, 442, 156, 442, 442, 156, 156, - 156, 156, 156, 156, 156, 156, 171, 171, 171, 171, - 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, - - 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, - 171, 171, 171, 442, 442, 442, 442, 442, 442, 171, - 442, 442, 442, 442, 171, 171, 171, 442, 442, 171, - 171, 174, 174, 174, 174, 174, 174, 174, 174, 174, - 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, - 174, 174, 174, 174, 174, 174, 174, 177, 177, 177, - 442, 442, 442, 442, 177, 177, 177, 177, 177, 177, - 177, 177, 178, 178, 178, 178, 178, 178, 178, 442, - 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, - 178, 178, 178, 178, 178, 178, 178, 178, 181, 442, - - 442, 442, 181, 181, 181, 181, 181, 181, 181, 181, + 181, 181, 181, 181, 181, 181, 181, 181, 181, 184, + + 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, + 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, + 184, 184, 184, 184, 184, 184, 184, 187, 504, 187, + 187, 504, 504, 504, 504, 504, 187, 187, 187, 187, + 187, 187, 187, 187, 188, 188, 188, 188, 188, 188, + 188, 504, 188, 188, 188, 188, 188, 188, 188, 188, + 188, 188, 188, 188, 188, 188, 188, 188, 188, 188, + 188, 188, 191, 504, 504, 504, 191, 191, 191, 191, + 191, 191, 191, 191, 191, 191, 191, 191, 191, 191, + 191, 191, 191, 191, 191, 191, 191, 191, 191, 191, + + 193, 504, 193, 193, 504, 504, 504, 504, 504, 193, + 193, 193, 193, 193, 193, 193, 193, 195, 195, 195, + 195, 195, 195, 504, 195, 195, 195, 195, 195, 195, + 195, 195, 195, 195, 195, 195, 195, 195, 195, 195, + 195, 195, 195, 195, 195, 199, 504, 199, 504, 504, + 504, 504, 199, 199, 504, 504, 504, 504, 504, 504, + 199, 199, 199, 199, 199, 199, 199, 199, 200, 200, + 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, + 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, + 200, 200, 200, 200, 200, 200, 211, 211, 504, 504, + + 504, 504, 504, 211, 211, 211, 211, 211, 211, 211, + 211, 118, 118, 118, 118, 118, 118, 118, 118, 118, + 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, + 118, 118, 118, 118, 118, 118, 118, 118, 118, 119, + 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, + 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, + 119, 119, 119, 119, 119, 119, 119, 228, 228, 228, + 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, + 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, + 228, 228, 228, 228, 228, 230, 230, 504, 230, 230, + + 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, + 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, + 230, 230, 230, 128, 128, 128, 504, 504, 128, 128, + 504, 128, 504, 504, 504, 128, 128, 128, 128, 128, + 128, 128, 128, 129, 129, 129, 504, 504, 504, 504, + 129, 129, 129, 129, 129, 129, 129, 149, 504, 149, + 504, 504, 504, 149, 149, 504, 149, 504, 504, 504, + 504, 149, 504, 504, 504, 504, 149, 149, 149, 149, + 149, 149, 149, 152, 504, 152, 504, 152, 504, 152, + 504, 504, 504, 504, 504, 504, 152, 152, 152, 152, + + 152, 152, 152, 155, 155, 504, 155, 155, 155, 504, + 504, 504, 504, 155, 155, 155, 155, 155, 155, 155, + 158, 504, 504, 504, 158, 504, 504, 504, 504, 504, + 504, 504, 504, 504, 158, 158, 158, 158, 158, 158, + 158, 250, 504, 504, 250, 504, 250, 504, 250, 504, + 250, 504, 504, 250, 250, 504, 504, 250, 250, 250, + 250, 250, 250, 250, 156, 156, 156, 156, 156, 156, + 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, + 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, + 156, 156, 159, 504, 504, 504, 504, 504, 159, 159, + + 504, 504, 159, 159, 159, 504, 504, 504, 504, 159, + 159, 159, 159, 159, 159, 159, 256, 504, 504, 256, + 256, 256, 256, 256, 504, 256, 256, 504, 256, 256, + 504, 504, 256, 256, 256, 256, 256, 256, 256, 256, + 162, 162, 162, 162, 162, 504, 162, 162, 504, 162, + 504, 504, 504, 162, 162, 162, 162, 162, 162, 162, + 162, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, - 181, 181, 181, 181, 183, 183, 183, 442, 442, 442, - 442, 183, 183, 183, 183, 183, 183, 183, 183, 185, - 185, 185, 185, 185, 185, 442, 185, 185, 185, 185, - 185, 185, 185, 185, 185, 185, 185, 185, 185, 185, - 185, 185, 185, 185, 185, 185, 185, 442, 442, 442, - 442, 442, 185, 442, 442, 442, 442, 442, 442, 185, - 442, 442, 185, 442, 185, 189, 189, 189, 189, 189, - 189, 189, 260, 442, 442, 442, 442, 442, 260, 260, - - 260, 260, 442, 442, 442, 442, 260, 260, 260, 260, - 260, 260, 260, 260, 190, 190, 190, 190, 190, 190, - 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, - 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, - 190, 190, 442, 442, 442, 442, 442, 190, 442, 442, - 442, 442, 442, 442, 190, 442, 442, 190, 442, 190, - 263, 442, 442, 442, 442, 442, 263, 263, 263, 201, - 201, 442, 442, 442, 442, 201, 201, 201, 201, 201, - 201, 201, 201, 210, 210, 210, 210, 210, 210, 210, - 210, 210, 210, 210, 210, 210, 210, 210, 210, 210, - - 210, 210, 210, 210, 210, 210, 210, 210, 210, 269, - 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, - 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, - 269, 269, 269, 269, 269, 121, 121, 121, 121, 121, - 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, - 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, - 121, 271, 271, 271, 271, 271, 271, 271, 271, 271, - 271, 271, 271, 271, 271, 271, 271, 271, 271, 271, - 271, 271, 271, 271, 271, 271, 271, 272, 272, 442, - 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, - - 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, - 272, 272, 272, 273, 273, 442, 273, 273, 273, 273, - 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, - 273, 273, 273, 273, 273, 273, 273, 273, 273, 220, - 220, 442, 220, 220, 220, 220, 220, 220, 220, 220, + 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, + 504, 504, 504, 504, 504, 504, 504, 181, 504, 504, + + 504, 504, 181, 504, 181, 181, 504, 504, 181, 181, + 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, + 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, + 184, 184, 184, 184, 184, 184, 184, 184, 187, 504, + 187, 187, 504, 504, 504, 504, 504, 187, 187, 187, + 187, 187, 187, 187, 187, 188, 188, 188, 188, 188, + 188, 188, 504, 188, 188, 188, 188, 188, 188, 188, + 188, 188, 188, 188, 188, 188, 188, 188, 188, 188, + 188, 188, 188, 191, 504, 504, 504, 191, 191, 191, + 191, 191, 191, 191, 191, 191, 191, 191, 191, 191, + + 191, 191, 191, 191, 191, 191, 191, 191, 191, 191, + 191, 193, 504, 193, 193, 504, 504, 504, 504, 504, + 193, 193, 193, 193, 193, 193, 193, 193, 195, 195, + 195, 195, 195, 195, 504, 195, 195, 195, 195, 195, + 195, 195, 195, 195, 195, 195, 195, 195, 195, 195, + 195, 195, 195, 195, 195, 195, 195, 195, 504, 504, + 504, 504, 504, 504, 195, 504, 504, 504, 504, 504, + 504, 504, 195, 504, 504, 195, 504, 195, 199, 199, + 199, 199, 199, 199, 199, 199, 278, 504, 504, 504, + 504, 504, 278, 278, 504, 278, 278, 504, 504, 504, + + 504, 278, 278, 278, 278, 278, 278, 278, 278, 278, + 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, + 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, + 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, + 504, 504, 504, 504, 504, 504, 200, 504, 504, 504, + 504, 504, 504, 504, 200, 504, 504, 200, 504, 200, + 211, 211, 504, 504, 504, 504, 504, 211, 211, 211, + 211, 211, 211, 211, 211, 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, - 220, 220, 220, 220, 220, 274, 274, 442, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 126, 126, 126, 442, 126, 126, 442, 126, 442, - - 442, 126, 126, 126, 126, 126, 126, 126, 126, 236, - 442, 442, 236, 442, 236, 442, 236, 236, 442, 442, - 236, 236, 442, 236, 236, 236, 236, 236, 236, 236, - 291, 291, 442, 442, 442, 442, 442, 442, 442, 442, - 442, 442, 442, 442, 442, 291, 291, 291, 291, 291, - 291, 291, 242, 442, 442, 242, 242, 242, 242, 242, - 242, 242, 442, 242, 242, 442, 242, 242, 242, 242, - 242, 242, 242, 242, 156, 156, 156, 156, 156, 156, - 156, 442, 156, 442, 442, 156, 156, 156, 156, 156, - 156, 156, 156, 171, 171, 171, 171, 171, 171, 171, - - 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, - 171, 171, 171, 171, 171, 171, 171, 171, 171, 308, - 308, 442, 442, 442, 442, 308, 308, 308, 310, 310, - 442, 442, 442, 442, 310, 310, 310, 185, 185, 442, - 442, 442, 442, 185, 185, 185, 190, 190, 442, 442, - 442, 442, 190, 190, 190, 377, 377, 377, 377, 377, - 377, 377, 377, 377, 377, 377, 377, 377, 377, 377, - 377, 377, 377, 377, 377, 377, 377, 377, 377, 377, - 377, 15, 442, 442, 442, 442, 442, 442, 442, 442, - 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, - - 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, - 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, - 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, - 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, - 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, - 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, - 442, 442 + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + + 220, 220, 220, 287, 287, 287, 287, 287, 287, 287, + 287, 287, 287, 287, 287, 287, 287, 287, 287, 287, + 287, 287, 287, 287, 287, 287, 287, 287, 287, 287, + 287, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 290, 290, 504, + 290, 290, 290, 290, 290, 290, 290, 290, 290, 290, + + 290, 290, 290, 290, 290, 290, 290, 290, 290, 290, + 290, 290, 290, 290, 290, 291, 291, 504, 291, 291, + 291, 291, 291, 291, 291, 291, 291, 291, 291, 291, + 291, 291, 291, 291, 291, 291, 291, 291, 291, 291, + 291, 291, 291, 230, 230, 504, 230, 230, 230, 230, + 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, + 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, + 230, 292, 292, 504, 292, 292, 292, 292, 292, 292, + 292, 292, 292, 292, 292, 292, 292, 292, 292, 292, + 292, 292, 292, 292, 292, 292, 292, 292, 292, 128, + + 128, 128, 504, 504, 128, 128, 504, 128, 504, 504, + 504, 128, 128, 128, 128, 128, 128, 128, 128, 250, + 504, 504, 250, 504, 250, 504, 250, 504, 250, 504, + 504, 250, 250, 504, 504, 250, 250, 250, 250, 250, + 250, 250, 313, 313, 504, 504, 504, 504, 504, 504, + 504, 504, 504, 504, 504, 504, 504, 504, 504, 313, + 313, 313, 313, 313, 313, 313, 256, 504, 504, 256, + 256, 256, 256, 256, 504, 256, 256, 504, 256, 256, + 504, 504, 256, 256, 256, 256, 256, 256, 256, 256, + 162, 162, 162, 162, 162, 504, 162, 162, 504, 162, + + 504, 504, 504, 162, 162, 162, 162, 162, 162, 162, + 162, 181, 181, 181, 181, 181, 181, 181, 181, 181, + 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, + 181, 181, 181, 181, 181, 181, 181, 181, 181, 334, + 334, 504, 504, 504, 504, 504, 334, 334, 334, 336, + 336, 504, 504, 504, 504, 504, 336, 336, 336, 195, + 195, 504, 504, 504, 504, 504, 195, 195, 195, 200, + 200, 504, 504, 504, 504, 504, 200, 200, 200, 422, + 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, + 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, + + 422, 422, 422, 422, 422, 422, 422, 15, 504, 504, + 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, + 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, + 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, + 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, + 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, + 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, + 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, + 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, + 504, 504, 504, 504, 504 + } ; -static yyconst flex_int16_t yy_chk[3263] = +static yyconst flex_int16_t yy_chk[3696] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -985,7 +1053,7 @@ static yyconst flex_int16_t yy_chk[3263] = 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, 1, 1, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -994,358 +1062,407 @@ static yyconst flex_int16_t yy_chk[3263] = 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 5, 6, 7, 7, 7, 8, 8, 8, 9, 25, - 439, 5, 6, 10, 25, 9, 9, 9, 104, 104, - 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, + 3, 5, 6, 7, 7, 7, 8, 8, 8, 9, + 25, 501, 5, 6, 10, 25, 9, 9, 9, 106, + 106, 10, 10, 10, 11, 11, 11, 11, 11, 11, + 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, + 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, - 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, - 11, 11, 11, 13, 13, 13, 13, 13, 13, 13, + 11, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, + 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, - 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, - 13, 13, 13, 30, 31, 64, 32, 33, 34, 416, - 35, 36, 37, 38, 401, 34, 40, 31, 39, 45, - 89, 45, 90, 45, 45, 90, 38, 80, 80, 80, - 30, 31, 32, 33, 107, 34, 35, 36, 37, 93, - 38, 34, 40, 31, 44, 39, 44, 173, 173, 48, - 194, 194, 38, 64, 101, 101, 271, 44, 48, 44, - 107, 48, 48, 48, 269, 44, 47, 47, 89, 47, - 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, - - 47, 47, 93, 109, 47, 101, 102, 102, 102, 47, - 47, 47, 47, 47, 47, 49, 49, 49, 49, 49, - 123, 49, 49, 49, 113, 49, 217, 110, 111, 109, - 101, 123, 112, 49, 55, 116, 116, 116, 47, 47, - 47, 47, 50, 50, 50, 50, 50, 55, 50, 50, - 50, 113, 50, 110, 111, 128, 135, 49, 112, 171, - 49, 55, 215, 47, 47, 47, 326, 52, 326, 53, - 120, 120, 120, 55, 129, 120, 210, 52, 130, 53, - 52, 128, 53, 135, 50, 51, 51, 51, 51, 51, - 131, 51, 51, 51, 52, 51, 53, 54, 56, 57, - - 129, 51, 54, 52, 130, 53, 52, 171, 53, 54, - 54, 56, 57, 56, 51, 179, 131, 57, 122, 122, - 122, 60, 364, 122, 54, 56, 57, 51, 51, 54, - 132, 134, 178, 60, 60, 54, 54, 56, 57, 56, - 51, 58, 59, 57, 136, 58, 59, 364, 60, 137, - 138, 139, 140, 136, 58, 59, 132, 134, 58, 60, - 60, 143, 352, 143, 352, 143, 143, 174, 58, 59, - 152, 136, 58, 59, 152, 137, 138, 139, 140, 136, - 58, 59, 152, 151, 58, 119, 119, 119, 119, 119, - 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, - - 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, - 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, - 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, - 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, - 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, - 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, - 119, 119, 119, 119, 119, 141, 142, 146, 142, 146, - 190, 146, 146, 148, 145, 148, 127, 148, 148, 142, - 117, 142, 149, 149, 149, 160, 160, 142, 162, 241, - 241, 141, 150, 150, 150, 150, 150, 150, 150, 150, - - 150, 150, 150, 150, 150, 150, 150, 150, 106, 153, - 150, 160, 160, 190, 162, 150, 150, 150, 150, 150, - 150, 153, 153, 105, 167, 153, 153, 153, 153, 155, - 202, 155, 159, 155, 155, 158, 161, 159, 163, 154, - 161, 163, 158, 100, 150, 150, 150, 150, 154, 154, - 167, 154, 154, 182, 182, 182, 154, 202, 159, 374, - 154, 158, 161, 159, 163, 185, 161, 163, 158, 150, - 150, 150, 156, 156, 156, 156, 156, 88, 156, 156, - 156, 75, 156, 164, 374, 157, 157, 157, 157, 157, - 154, 157, 157, 157, 165, 157, 168, 164, 166, 203, - - 168, 74, 169, 165, 204, 166, 73, 165, 169, 206, - 164, 170, 170, 185, 156, 187, 187, 68, 157, 192, - 192, 165, 168, 164, 166, 203, 168, 157, 169, 165, - 204, 166, 207, 165, 169, 65, 206, 170, 170, 196, - 196, 196, 240, 222, 157, 46, 187, 208, 208, 208, - 192, 213, 213, 213, 240, 27, 213, 258, 258, 207, - 214, 214, 214, 261, 261, 214, 24, 216, 216, 216, - 222, 187, 216, 289, 289, 192, 212, 212, 212, 212, - 212, 212, 212, 212, 212, 212, 212, 212, 212, 212, - 212, 212, 212, 212, 212, 212, 212, 212, 212, 212, - - 212, 212, 212, 212, 212, 212, 212, 212, 212, 212, - 212, 212, 212, 212, 212, 212, 212, 212, 212, 212, - 212, 212, 212, 212, 212, 212, 212, 212, 212, 212, - 212, 212, 212, 212, 212, 212, 212, 212, 212, 212, - 212, 212, 212, 212, 212, 212, 212, 212, 212, 212, - 212, 212, 212, 212, 212, 212, 223, 224, 224, 225, - 226, 20, 227, 228, 229, 230, 231, 15, 233, 234, - 235, 237, 237, 237, 239, 239, 239, 250, 0, 246, - 0, 250, 223, 224, 224, 246, 225, 226, 227, 228, - 229, 230, 242, 231, 233, 234, 278, 235, 290, 290, - - 0, 242, 242, 250, 242, 242, 246, 250, 0, 242, - 247, 246, 280, 242, 243, 243, 243, 243, 243, 247, - 243, 243, 243, 278, 243, 244, 244, 244, 244, 244, - 0, 244, 244, 244, 248, 244, 249, 247, 243, 280, - 245, 0, 248, 242, 249, 247, 245, 245, 251, 252, - 0, 244, 251, 253, 254, 252, 243, 255, 254, 0, - 248, 255, 249, 256, 0, 243, 245, 244, 248, 256, - 249, 257, 245, 245, 251, 265, 252, 244, 251, 253, - 254, 252, 267, 255, 254, 257, 257, 255, 268, 275, - 256, 277, 281, 0, 282, 256, 283, 284, 325, 285, - - 287, 265, 288, 292, 291, 291, 292, 293, 267, 295, - 325, 295, 296, 299, 268, 275, 291, 277, 281, 257, - 282, 297, 283, 294, 284, 285, 287, 298, 288, 292, - 294, 297, 292, 293, 298, 300, 295, 295, 296, 299, - 300, 301, 0, 303, 302, 304, 312, 301, 297, 294, - 302, 305, 0, 298, 307, 307, 294, 297, 305, 311, - 298, 300, 309, 309, 306, 314, 300, 315, 301, 303, - 302, 304, 312, 301, 316, 317, 302, 305, 306, 306, - 318, 318, 318, 319, 305, 320, 311, 321, 322, 323, - 318, 314, 330, 327, 315, 327, 328, 331, 331, 331, - - 316, 317, 329, 337, 329, 333, 328, 331, 333, 338, - 319, 320, 306, 321, 332, 322, 323, 334, 330, 327, - 332, 327, 334, 328, 339, 348, 336, 335, 329, 337, - 329, 333, 328, 335, 333, 331, 336, 340, 0, 353, - 0, 332, 342, 334, 343, 0, 332, 0, 334, 0, - 0, 339, 348, 336, 335, 0, 349, 338, 350, 335, - 351, 331, 336, 340, 341, 341, 341, 355, 342, 355, - 343, 344, 344, 344, 341, 345, 345, 345, 347, 347, - 347, 344, 349, 0, 350, 345, 351, 353, 347, 354, - 354, 354, 356, 355, 363, 355, 357, 357, 357, 354, - - 356, 358, 358, 358, 359, 0, 357, 360, 0, 361, - 362, 358, 359, 0, 360, 367, 361, 362, 356, 368, - 363, 377, 365, 365, 365, 373, 356, 354, 379, 0, - 0, 359, 365, 360, 357, 361, 362, 395, 359, 358, - 360, 367, 361, 362, 380, 376, 368, 369, 369, 369, - 0, 380, 373, 354, 371, 371, 371, 369, 386, 387, - 357, 375, 375, 375, 371, 358, 383, 381, 390, 377, - 380, 375, 376, 381, 382, 0, 379, 380, 383, 382, - 384, 384, 384, 385, 386, 395, 387, 0, 397, 385, - 384, 0, 383, 402, 381, 390, 388, 388, 388, 381, - - 0, 382, 398, 383, 398, 382, 388, 391, 391, 391, - 385, 392, 392, 392, 397, 385, 405, 391, 384, 402, - 411, 392, 394, 394, 394, 396, 396, 396, 0, 398, - 398, 0, 394, 0, 412, 396, 399, 399, 399, 400, - 400, 400, 405, 410, 384, 413, 399, 411, 419, 400, - 403, 403, 403, 417, 406, 406, 406, 408, 408, 408, - 403, 412, 418, 396, 406, 414, 420, 408, 421, 410, - 421, 414, 413, 423, 399, 419, 424, 400, 424, 417, - 425, 426, 0, 427, 428, 429, 428, 426, 418, 396, - 430, 431, 414, 420, 433, 421, 421, 414, 430, 423, - - 399, 435, 424, 400, 424, 432, 432, 425, 426, 427, - 428, 429, 428, 426, 434, 440, 430, 431, 437, 436, - 0, 433, 438, 434, 430, 436, 0, 438, 435, 0, - 0, 432, 432, 0, 0, 0, 0, 0, 0, 0, - 0, 434, 0, 440, 437, 0, 436, 0, 438, 434, - 0, 436, 0, 438, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 440, - 443, 443, 443, 443, 443, 443, 443, 443, 443, 443, - 443, 443, 443, 443, 443, 443, 443, 443, 443, 443, - 443, 443, 443, 443, 443, 443, 444, 444, 444, 444, - - 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, - 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, - 444, 444, 445, 445, 445, 445, 445, 445, 445, 445, - 445, 445, 445, 445, 445, 445, 445, 445, 445, 445, - 445, 445, 445, 445, 445, 445, 445, 445, 446, 0, - 0, 0, 446, 446, 446, 446, 446, 446, 446, 446, - 446, 446, 446, 446, 446, 446, 446, 446, 446, 446, - 446, 446, 446, 446, 447, 447, 447, 447, 447, 447, - 447, 447, 447, 447, 447, 447, 447, 447, 447, 447, - 447, 447, 447, 447, 447, 447, 447, 447, 447, 447, - - 448, 448, 448, 448, 448, 448, 448, 449, 449, 0, - 449, 449, 449, 449, 449, 449, 449, 449, 449, 449, - 449, 449, 449, 449, 449, 449, 449, 449, 449, 449, - 449, 449, 449, 450, 450, 450, 450, 450, 450, 450, - 450, 450, 450, 450, 450, 450, 450, 450, 450, 450, - 450, 450, 450, 450, 450, 450, 450, 450, 450, 451, - 451, 451, 0, 451, 451, 0, 451, 0, 0, 451, - 451, 451, 451, 451, 451, 451, 451, 452, 452, 0, - 0, 0, 0, 452, 452, 452, 452, 452, 452, 452, - 453, 0, 453, 0, 0, 0, 453, 453, 0, 453, - - 0, 0, 0, 453, 0, 0, 0, 453, 453, 453, - 453, 453, 453, 453, 454, 0, 454, 0, 454, 454, - 0, 0, 0, 0, 0, 454, 454, 454, 454, 454, - 454, 454, 455, 0, 0, 455, 455, 455, 455, 455, - 0, 0, 0, 455, 455, 455, 455, 455, 455, 455, - 456, 456, 0, 456, 456, 456, 456, 456, 456, 456, - 456, 456, 456, 456, 456, 456, 456, 456, 456, 456, - 456, 456, 456, 456, 456, 456, 457, 0, 0, 0, - 457, 0, 457, 457, 0, 0, 0, 0, 457, 457, - 457, 457, 457, 457, 457, 458, 458, 458, 458, 458, - - 458, 458, 0, 458, 0, 0, 458, 458, 458, 458, - 458, 458, 458, 458, 459, 459, 459, 459, 459, 459, - 459, 459, 459, 459, 459, 459, 459, 459, 459, 459, - 459, 459, 459, 459, 459, 459, 459, 459, 459, 459, - 460, 460, 460, 460, 460, 460, 460, 460, 460, 460, - 460, 460, 460, 460, 460, 460, 460, 460, 460, 460, - 460, 460, 460, 460, 460, 460, 461, 461, 461, 0, - 0, 0, 0, 461, 461, 461, 461, 461, 461, 461, - 461, 462, 462, 462, 462, 462, 462, 462, 0, 462, - 462, 462, 462, 462, 462, 462, 462, 462, 462, 462, - - 462, 462, 462, 462, 462, 462, 462, 463, 0, 0, - 0, 463, 463, 463, 463, 463, 463, 463, 463, 463, - 463, 463, 463, 463, 463, 463, 463, 463, 463, 463, - 463, 463, 463, 464, 464, 464, 0, 0, 0, 0, - 464, 464, 464, 464, 464, 464, 464, 464, 465, 465, - 465, 465, 465, 465, 0, 465, 465, 465, 465, 465, - 465, 465, 465, 465, 465, 465, 465, 465, 465, 465, - 465, 465, 465, 465, 466, 0, 466, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 466, 466, - 466, 466, 466, 466, 466, 467, 467, 467, 467, 467, - - 467, 467, 467, 467, 467, 467, 467, 467, 467, 467, - 467, 467, 467, 467, 467, 467, 467, 467, 467, 467, - 467, 468, 468, 0, 0, 0, 0, 468, 468, 468, - 468, 468, 468, 468, 468, 469, 469, 469, 469, 469, - 469, 469, 469, 469, 469, 469, 469, 469, 469, 469, - 469, 469, 469, 469, 469, 469, 469, 469, 469, 469, - 469, 470, 470, 0, 470, 470, 470, 470, 470, 470, - 470, 470, 470, 470, 470, 470, 470, 470, 470, 470, - 470, 470, 470, 470, 470, 470, 470, 471, 471, 471, - 0, 0, 0, 471, 471, 471, 471, 471, 471, 471, - - 472, 0, 472, 0, 0, 0, 472, 472, 0, 472, - 0, 0, 0, 472, 0, 0, 0, 472, 472, 472, - 472, 472, 472, 472, 473, 0, 473, 0, 473, 473, - 0, 0, 0, 0, 0, 473, 473, 473, 473, 473, - 473, 473, 474, 474, 474, 474, 474, 0, 0, 0, - 474, 474, 474, 474, 474, 474, 474, 475, 0, 0, - 0, 475, 0, 0, 0, 0, 0, 0, 0, 475, - 475, 475, 475, 475, 475, 475, 476, 0, 0, 476, - 0, 476, 0, 476, 476, 0, 0, 476, 476, 0, - 476, 476, 476, 476, 476, 476, 476, 477, 477, 477, - - 477, 477, 477, 477, 477, 477, 477, 477, 477, 477, - 477, 477, 477, 477, 477, 477, 477, 477, 477, 477, - 477, 477, 477, 478, 0, 0, 0, 0, 0, 478, - 478, 0, 478, 478, 478, 0, 0, 0, 478, 478, - 478, 478, 478, 478, 478, 479, 0, 0, 479, 479, - 479, 479, 479, 479, 479, 0, 479, 479, 0, 479, - 479, 479, 479, 479, 479, 479, 479, 480, 480, 480, - 480, 480, 480, 480, 0, 480, 0, 0, 480, 480, - 480, 480, 480, 480, 480, 480, 481, 481, 481, 481, - 481, 481, 481, 481, 481, 481, 481, 481, 481, 481, - - 481, 481, 481, 481, 481, 481, 481, 481, 481, 481, - 481, 481, 482, 0, 0, 0, 0, 0, 0, 482, - 0, 0, 0, 0, 482, 482, 482, 0, 0, 482, - 482, 483, 483, 483, 483, 483, 483, 483, 483, 483, - 483, 483, 483, 483, 483, 483, 483, 483, 483, 483, - 483, 483, 483, 483, 483, 483, 483, 484, 484, 484, - 0, 0, 0, 0, 484, 484, 484, 484, 484, 484, - 484, 484, 485, 485, 485, 485, 485, 485, 485, 0, - 485, 485, 485, 485, 485, 485, 485, 485, 485, 485, - 485, 485, 485, 485, 485, 485, 485, 485, 486, 0, - - 0, 0, 486, 486, 486, 486, 486, 486, 486, 486, - 486, 486, 486, 486, 486, 486, 486, 486, 486, 486, - 486, 486, 486, 486, 487, 487, 487, 0, 0, 0, - 0, 487, 487, 487, 487, 487, 487, 487, 487, 488, - 488, 488, 488, 488, 488, 0, 488, 488, 488, 488, - 488, 488, 488, 488, 488, 488, 488, 488, 488, 488, - 488, 488, 488, 488, 488, 489, 489, 0, 0, 0, - 0, 0, 489, 0, 0, 0, 0, 0, 0, 489, - 0, 0, 489, 0, 489, 490, 490, 490, 490, 490, - 490, 490, 491, 0, 0, 0, 0, 0, 491, 491, - - 491, 491, 0, 0, 0, 0, 491, 491, 491, 491, - 491, 491, 491, 491, 492, 492, 492, 492, 492, 492, - 492, 492, 492, 492, 492, 492, 492, 492, 492, 492, - 492, 492, 492, 492, 492, 492, 492, 492, 492, 492, - 493, 493, 0, 0, 0, 0, 0, 493, 0, 0, - 0, 0, 0, 0, 493, 0, 0, 493, 0, 493, - 494, 0, 0, 0, 0, 0, 494, 494, 494, 495, - 495, 0, 0, 0, 0, 495, 495, 495, 495, 495, - 495, 495, 495, 496, 496, 496, 496, 496, 496, 496, - 496, 496, 496, 496, 496, 496, 496, 496, 496, 496, - - 496, 496, 496, 496, 496, 496, 496, 496, 496, 497, - 497, 497, 497, 497, 497, 497, 497, 497, 497, 497, - 497, 497, 497, 497, 497, 497, 497, 497, 497, 497, - 497, 497, 497, 497, 497, 498, 498, 498, 498, 498, - 498, 498, 498, 498, 498, 498, 498, 498, 498, 498, - 498, 498, 498, 498, 498, 498, 498, 498, 498, 498, - 498, 499, 499, 499, 499, 499, 499, 499, 499, 499, - 499, 499, 499, 499, 499, 499, 499, 499, 499, 499, - 499, 499, 499, 499, 499, 499, 499, 500, 500, 0, - 500, 500, 500, 500, 500, 500, 500, 500, 500, 500, - - 500, 500, 500, 500, 500, 500, 500, 500, 500, 500, - 500, 500, 500, 501, 501, 0, 501, 501, 501, 501, - 501, 501, 501, 501, 501, 501, 501, 501, 501, 501, - 501, 501, 501, 501, 501, 501, 501, 501, 501, 502, - 502, 0, 502, 502, 502, 502, 502, 502, 502, 502, - 502, 502, 502, 502, 502, 502, 502, 502, 502, 502, - 502, 502, 502, 502, 502, 503, 503, 0, 503, 503, - 503, 503, 503, 503, 503, 503, 503, 503, 503, 503, - 503, 503, 503, 503, 503, 503, 503, 503, 503, 503, - 503, 504, 504, 504, 0, 504, 504, 0, 504, 0, - - 0, 504, 504, 504, 504, 504, 504, 504, 504, 505, - 0, 0, 505, 0, 505, 0, 505, 505, 0, 0, - 505, 505, 0, 505, 505, 505, 505, 505, 505, 505, - 506, 506, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 506, 506, 506, 506, 506, - 506, 506, 507, 0, 0, 507, 507, 507, 507, 507, - 507, 507, 0, 507, 507, 0, 507, 507, 507, 507, - 507, 507, 507, 507, 508, 508, 508, 508, 508, 508, - 508, 0, 508, 0, 0, 508, 508, 508, 508, 508, - 508, 508, 508, 509, 509, 509, 509, 509, 509, 509, + 13, 13, 13, 13, 13, 13, 13, 13, 30, 31, + 66, 32, 33, 34, 91, 35, 36, 37, 125, 38, + 41, 34, 95, 31, 82, 82, 82, 40, 39, 125, + 36, 40, 200, 46, 37, 46, 109, 46, 46, 30, + 31, 32, 33, 39, 34, 35, 472, 36, 37, 38, + + 41, 34, 451, 31, 45, 181, 45, 380, 40, 39, + 36, 66, 40, 111, 37, 91, 109, 45, 95, 45, + 104, 104, 104, 39, 301, 45, 48, 48, 200, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 289, 111, 48, 254, 49, 112, 56, 48, + 48, 48, 48, 48, 48, 49, 181, 254, 49, 49, + 49, 287, 56, 103, 103, 118, 118, 118, 50, 50, + 50, 50, 50, 113, 50, 50, 50, 112, 50, 56, + 309, 48, 48, 48, 48, 48, 50, 51, 51, 51, + 51, 51, 56, 51, 51, 51, 103, 51, 114, 57, + + 122, 122, 122, 113, 227, 122, 183, 183, 53, 309, + 48, 48, 48, 57, 50, 54, 115, 50, 92, 53, + 225, 92, 53, 220, 130, 103, 54, 138, 114, 54, + 57, 92, 92, 51, 52, 52, 52, 52, 52, 53, + 52, 52, 52, 57, 52, 189, 54, 115, 55, 53, + 52, 58, 53, 55, 130, 59, 54, 62, 138, 54, + 131, 55, 55, 132, 52, 58, 133, 188, 58, 59, + 62, 62, 124, 124, 124, 59, 134, 124, 136, 55, + 52, 52, 58, 60, 55, 137, 59, 60, 62, 139, + 131, 55, 55, 132, 52, 58, 133, 60, 58, 59, + + 62, 62, 60, 61, 184, 59, 134, 61, 136, 140, + 142, 61, 157, 143, 60, 137, 144, 61, 60, 149, + 139, 149, 151, 149, 149, 129, 152, 60, 152, 158, + 152, 152, 60, 158, 61, 155, 155, 155, 61, 140, + 142, 158, 61, 143, 204, 204, 144, 61, 121, 121, + 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, + 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, + 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, + 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, + 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, + 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, + 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, + 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, + 121, 121, 121, 121, 121, 141, 119, 145, 146, 147, + 148, 168, 148, 176, 154, 141, 154, 108, 154, 154, + 255, 255, 161, 148, 161, 148, 161, 161, 192, 192, + 192, 148, 195, 206, 206, 206, 141, 145, 146, 147, + 356, 168, 356, 176, 107, 141, 156, 156, 156, 156, + 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, + 156, 156, 165, 159, 156, 355, 166, 166, 165, 156, + + 156, 156, 156, 156, 156, 159, 159, 355, 160, 159, + 159, 159, 159, 195, 102, 164, 212, 160, 160, 90, + 160, 160, 165, 164, 371, 160, 166, 166, 165, 160, + 404, 156, 156, 156, 156, 156, 162, 162, 162, 162, + 162, 172, 162, 162, 162, 164, 162, 212, 163, 163, + 163, 163, 163, 164, 163, 163, 163, 172, 163, 404, + 156, 156, 156, 160, 389, 167, 389, 169, 170, 175, + 167, 169, 172, 170, 171, 371, 173, 175, 173, 177, + 213, 174, 162, 163, 177, 171, 178, 172, 180, 180, + 214, 174, 77, 178, 163, 167, 174, 169, 170, 175, + + 167, 169, 216, 170, 179, 171, 173, 175, 173, 177, + 213, 179, 174, 163, 177, 171, 178, 217, 180, 180, + 214, 174, 232, 178, 197, 197, 174, 202, 202, 218, + 218, 218, 233, 216, 179, 223, 223, 223, 234, 234, + 223, 179, 224, 224, 224, 235, 236, 224, 217, 226, + 226, 226, 237, 232, 226, 238, 244, 197, 239, 76, + 202, 75, 233, 251, 251, 251, 276, 276, 234, 234, + 253, 253, 253, 279, 279, 70, 235, 236, 311, 311, + 312, 312, 237, 333, 333, 238, 197, 244, 239, 202, + 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, + + 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, + 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, + 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, + 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, + 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, + 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, + 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, + 222, 222, 222, 222, 222, 222, 222, 240, 241, 242, + 243, 246, 247, 248, 249, 256, 270, 313, 313, 335, + 335, 344, 344, 344, 256, 256, 266, 256, 256, 313, + + 67, 344, 256, 266, 47, 27, 256, 240, 241, 242, + 243, 246, 247, 262, 248, 249, 270, 257, 257, 257, + 257, 257, 262, 257, 257, 257, 266, 257, 258, 258, + 258, 258, 258, 266, 258, 258, 258, 296, 258, 259, + 256, 257, 260, 262, 261, 24, 259, 259, 265, 260, + 263, 263, 262, 283, 261, 258, 264, 265, 264, 20, + 267, 268, 271, 257, 267, 268, 271, 272, 296, 259, + 418, 272, 257, 260, 258, 261, 259, 259, 265, 260, + 263, 263, 269, 283, 261, 258, 264, 265, 264, 269, + 267, 268, 271, 273, 267, 268, 271, 272, 274, 418, + + 273, 272, 275, 285, 286, 274, 293, 295, 298, 15, + 299, 300, 302, 269, 303, 305, 275, 275, 304, 269, + 306, 308, 310, 0, 273, 314, 315, 0, 314, 274, + 273, 318, 319, 285, 286, 274, 293, 295, 0, 298, + 299, 300, 302, 319, 317, 303, 305, 317, 304, 316, + 306, 308, 310, 275, 320, 314, 315, 316, 314, 321, + 323, 318, 320, 319, 322, 324, 0, 328, 321, 329, + 325, 327, 324, 319, 326, 317, 325, 317, 327, 316, + 331, 326, 337, 322, 320, 338, 340, 316, 331, 321, + 323, 341, 320, 330, 322, 342, 324, 328, 321, 329, + + 325, 327, 324, 343, 345, 326, 325, 330, 327, 346, + 331, 326, 332, 337, 347, 338, 340, 348, 331, 349, + 350, 351, 341, 330, 352, 342, 332, 332, 353, 357, + 359, 357, 359, 343, 345, 358, 330, 360, 372, 346, + 362, 361, 361, 361, 362, 347, 358, 348, 364, 349, + 350, 361, 351, 365, 364, 352, 365, 363, 353, 357, + 359, 357, 359, 332, 363, 366, 358, 360, 367, 372, + 362, 366, 370, 373, 362, 367, 358, 375, 364, 376, + 361, 368, 390, 365, 364, 384, 365, 369, 363, 381, + 369, 385, 368, 0, 363, 366, 374, 374, 374, 367, + + 0, 366, 370, 373, 0, 367, 374, 375, 386, 376, + 361, 387, 368, 377, 377, 377, 384, 369, 388, 381, + 369, 385, 368, 377, 378, 378, 378, 382, 382, 382, + 383, 383, 383, 390, 378, 395, 408, 382, 386, 403, + 383, 387, 391, 391, 391, 392, 393, 392, 388, 394, + 394, 394, 391, 407, 395, 393, 396, 396, 396, 394, + 397, 397, 397, 398, 0, 395, 396, 408, 0, 403, + 397, 399, 398, 411, 400, 392, 393, 392, 401, 399, + 0, 391, 400, 407, 412, 393, 401, 402, 394, 402, + 405, 405, 405, 417, 398, 396, 409, 409, 409, 397, + + 405, 399, 398, 411, 400, 422, 409, 420, 401, 399, + 424, 391, 400, 421, 433, 412, 401, 402, 394, 402, + 413, 413, 413, 432, 417, 396, 415, 415, 415, 397, + 413, 419, 419, 419, 425, 428, 415, 427, 420, 426, + 436, 419, 425, 427, 421, 433, 426, 430, 428, 429, + 429, 429, 437, 432, 430, 431, 422, 444, 0, 429, + 438, 424, 431, 0, 425, 428, 0, 0, 427, 0, + 426, 436, 425, 427, 446, 0, 426, 428, 430, 434, + 434, 434, 437, 0, 430, 455, 431, 452, 429, 434, + 456, 438, 431, 439, 439, 439, 440, 440, 440, 442, + + 442, 442, 447, 439, 446, 447, 440, 465, 444, 442, + 443, 443, 443, 445, 445, 445, 455, 452, 429, 457, + 443, 456, 466, 445, 448, 448, 448, 449, 449, 449, + 450, 450, 450, 447, 448, 447, 469, 449, 465, 0, + 450, 453, 453, 453, 458, 458, 458, 464, 467, 457, + 0, 453, 445, 466, 458, 460, 460, 460, 462, 462, + 462, 473, 0, 448, 478, 460, 449, 469, 462, 450, + 468, 468, 468, 476, 470, 0, 477, 464, 467, 480, + 468, 470, 445, 485, 474, 474, 474, 479, 479, 479, + 487, 0, 473, 448, 474, 478, 449, 479, 481, 450, + + 486, 481, 486, 476, 489, 470, 477, 483, 483, 483, + 480, 470, 488, 485, 490, 491, 490, 483, 492, 488, + 493, 487, 494, 494, 495, 496, 0, 492, 497, 481, + 486, 481, 486, 498, 489, 496, 499, 0, 502, 0, + 498, 500, 0, 488, 490, 491, 490, 500, 492, 488, + 493, 0, 494, 494, 559, 495, 496, 492, 0, 497, + 0, 559, 559, 559, 498, 496, 499, 502, 0, 0, + 498, 500, 0, 0, 0, 0, 0, 500, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 502, 505, 505, + + 505, 505, 505, 505, 505, 505, 505, 505, 505, 505, + 505, 505, 505, 505, 505, 505, 505, 505, 505, 505, + 505, 505, 505, 505, 505, 505, 506, 506, 506, 506, + 506, 506, 506, 506, 506, 506, 506, 506, 506, 506, + 506, 506, 506, 506, 506, 506, 506, 506, 506, 506, + 506, 506, 506, 506, 507, 507, 507, 507, 507, 507, + 507, 507, 507, 507, 507, 507, 507, 507, 507, 507, + 507, 507, 507, 507, 507, 507, 507, 507, 507, 507, + 507, 507, 508, 0, 0, 0, 508, 508, 508, 508, + 508, 508, 508, 508, 508, 508, 508, 508, 508, 508, + + 508, 508, 508, 508, 508, 508, 508, 508, 508, 508, + 509, 509, 509, 509, 509, 509, 509, 509, 509, 509, 509, 509, 509, 509, 509, 509, 509, 509, 509, 509, - 509, 509, 509, 509, 509, 509, 509, 509, 509, 510, - 510, 0, 0, 0, 0, 510, 510, 510, 511, 511, - 0, 0, 0, 0, 511, 511, 511, 512, 512, 0, - 0, 0, 0, 512, 512, 512, 513, 513, 0, 0, - 0, 0, 513, 513, 513, 514, 514, 514, 514, 514, - 514, 514, 514, 514, 514, 514, 514, 514, 514, 514, - 514, 514, 514, 514, 514, 514, 514, 514, 514, 514, - 514, 442, 442, 442, 442, 442, 442, 442, 442, 442, - 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, - - 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, - 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, - 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, - 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, - 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, - 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, - 442, 442 + 509, 509, 509, 509, 509, 509, 509, 509, 510, 510, + 510, 510, 510, 510, 510, 511, 511, 0, 511, 511, + 511, 511, 511, 511, 511, 511, 511, 511, 511, 511, + 511, 511, 511, 511, 511, 511, 511, 511, 511, 511, + 511, 511, 511, 512, 512, 512, 512, 512, 512, 512, + 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, + 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, + + 512, 513, 513, 513, 0, 0, 513, 513, 0, 513, + 0, 0, 0, 513, 513, 513, 513, 513, 513, 513, + 513, 514, 514, 0, 0, 0, 0, 0, 514, 514, + 514, 514, 514, 514, 514, 515, 0, 515, 0, 0, + 0, 515, 515, 0, 515, 0, 0, 0, 0, 515, + 0, 0, 0, 0, 515, 515, 515, 515, 515, 515, + 515, 516, 0, 516, 0, 516, 0, 516, 0, 0, + 0, 0, 0, 0, 516, 516, 516, 516, 516, 516, + 516, 517, 0, 0, 517, 517, 0, 517, 517, 517, + 0, 0, 0, 0, 517, 517, 517, 517, 517, 517, + + 517, 518, 518, 0, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 519, + 0, 0, 0, 519, 0, 0, 519, 519, 0, 0, + 0, 0, 0, 519, 519, 519, 519, 519, 519, 519, + 520, 520, 520, 520, 520, 0, 520, 520, 0, 520, + 0, 0, 0, 520, 520, 520, 520, 520, 520, 520, + 520, 521, 521, 521, 521, 521, 521, 521, 521, 521, + 521, 521, 521, 521, 521, 521, 521, 521, 521, 521, + 521, 521, 521, 521, 521, 521, 521, 521, 521, 522, + + 522, 522, 522, 522, 522, 522, 522, 522, 522, 522, + 522, 522, 522, 522, 522, 522, 522, 522, 522, 522, + 522, 522, 522, 522, 522, 522, 522, 523, 0, 523, + 523, 0, 0, 0, 0, 0, 523, 523, 523, 523, + 523, 523, 523, 523, 524, 524, 524, 524, 524, 524, + 524, 0, 524, 524, 524, 524, 524, 524, 524, 524, + 524, 524, 524, 524, 524, 524, 524, 524, 524, 524, + 524, 524, 525, 0, 0, 0, 525, 525, 525, 525, + 525, 525, 525, 525, 525, 525, 525, 525, 525, 525, + 525, 525, 525, 525, 525, 525, 525, 525, 525, 525, + + 526, 0, 526, 526, 0, 0, 0, 0, 0, 526, + 526, 526, 526, 526, 526, 526, 526, 527, 527, 527, + 527, 527, 527, 0, 527, 527, 527, 527, 527, 527, + 527, 527, 527, 527, 527, 527, 527, 527, 527, 527, + 527, 527, 527, 527, 527, 528, 0, 528, 0, 0, + 0, 0, 528, 528, 0, 0, 0, 0, 0, 0, + 528, 528, 528, 528, 528, 528, 528, 528, 529, 529, + 529, 529, 529, 529, 529, 529, 529, 529, 529, 529, + 529, 529, 529, 529, 529, 529, 529, 529, 529, 529, + 529, 529, 529, 529, 529, 529, 530, 530, 0, 0, + + 0, 0, 0, 530, 530, 530, 530, 530, 530, 530, + 530, 531, 531, 531, 531, 531, 531, 531, 531, 531, + 531, 531, 531, 531, 531, 531, 531, 531, 531, 531, + 531, 531, 531, 531, 531, 531, 531, 531, 531, 532, + 532, 532, 532, 532, 532, 532, 532, 532, 532, 532, + 532, 532, 532, 532, 532, 532, 532, 532, 532, 532, + 532, 532, 532, 532, 532, 532, 532, 533, 533, 533, + 533, 533, 533, 533, 533, 533, 533, 533, 533, 533, + 533, 533, 533, 533, 533, 533, 533, 533, 533, 533, + 533, 533, 533, 533, 533, 534, 534, 0, 534, 534, + + 534, 534, 534, 534, 534, 534, 534, 534, 534, 534, + 534, 534, 534, 534, 534, 534, 534, 534, 534, 534, + 534, 534, 534, 535, 535, 535, 0, 0, 535, 535, + 0, 535, 0, 0, 0, 535, 535, 535, 535, 535, + 535, 535, 535, 536, 536, 536, 0, 0, 0, 0, + 536, 536, 536, 536, 536, 536, 536, 537, 0, 537, + 0, 0, 0, 537, 537, 0, 537, 0, 0, 0, + 0, 537, 0, 0, 0, 0, 537, 537, 537, 537, + 537, 537, 537, 538, 0, 538, 0, 538, 0, 538, + 0, 0, 0, 0, 0, 0, 538, 538, 538, 538, + + 538, 538, 538, 539, 539, 0, 539, 539, 539, 0, + 0, 0, 0, 539, 539, 539, 539, 539, 539, 539, + 540, 0, 0, 0, 540, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 540, 540, 540, 540, 540, 540, + 540, 541, 0, 0, 541, 0, 541, 0, 541, 0, + 541, 0, 0, 541, 541, 0, 0, 541, 541, 541, + 541, 541, 541, 541, 542, 542, 542, 542, 542, 542, + 542, 542, 542, 542, 542, 542, 542, 542, 542, 542, + 542, 542, 542, 542, 542, 542, 542, 542, 542, 542, + 542, 542, 543, 0, 0, 0, 0, 0, 543, 543, + + 0, 0, 543, 543, 543, 0, 0, 0, 0, 543, + 543, 543, 543, 543, 543, 543, 544, 0, 0, 544, + 544, 544, 544, 544, 0, 544, 544, 0, 544, 544, + 0, 0, 544, 544, 544, 544, 544, 544, 544, 544, + 545, 545, 545, 545, 545, 0, 545, 545, 0, 545, + 0, 0, 0, 545, 545, 545, 545, 545, 545, 545, + 545, 546, 546, 546, 546, 546, 546, 546, 546, 546, + 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, + 546, 546, 546, 546, 546, 546, 546, 546, 546, 547, + 0, 0, 0, 0, 0, 0, 0, 547, 0, 0, + + 0, 0, 547, 0, 547, 547, 0, 0, 547, 547, + 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, + 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, + 548, 548, 548, 548, 548, 548, 548, 548, 549, 0, + 549, 549, 0, 0, 0, 0, 0, 549, 549, 549, + 549, 549, 549, 549, 549, 550, 550, 550, 550, 550, + 550, 550, 0, 550, 550, 550, 550, 550, 550, 550, + 550, 550, 550, 550, 550, 550, 550, 550, 550, 550, + 550, 550, 550, 551, 0, 0, 0, 551, 551, 551, + 551, 551, 551, 551, 551, 551, 551, 551, 551, 551, + + 551, 551, 551, 551, 551, 551, 551, 551, 551, 551, + 551, 552, 0, 552, 552, 0, 0, 0, 0, 0, + 552, 552, 552, 552, 552, 552, 552, 552, 553, 553, + 553, 553, 553, 553, 0, 553, 553, 553, 553, 553, + 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, + 553, 553, 553, 553, 553, 553, 554, 554, 0, 0, + 0, 0, 0, 0, 554, 0, 0, 0, 0, 0, + 0, 0, 554, 0, 0, 554, 0, 554, 555, 555, + 555, 555, 555, 555, 555, 555, 556, 0, 0, 0, + 0, 0, 556, 556, 0, 556, 556, 0, 0, 0, + + 0, 556, 556, 556, 556, 556, 556, 556, 556, 556, + 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, + 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, + 557, 557, 557, 557, 557, 557, 557, 557, 558, 558, + 0, 0, 0, 0, 0, 0, 558, 0, 0, 0, + 0, 0, 0, 0, 558, 0, 0, 558, 0, 558, + 560, 560, 0, 0, 0, 0, 0, 560, 560, 560, + 560, 560, 560, 560, 560, 561, 561, 561, 561, 561, + 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, + 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, + + 561, 561, 561, 562, 562, 562, 562, 562, 562, 562, + 562, 562, 562, 562, 562, 562, 562, 562, 562, 562, + 562, 562, 562, 562, 562, 562, 562, 562, 562, 562, + 562, 563, 563, 563, 563, 563, 563, 563, 563, 563, + 563, 563, 563, 563, 563, 563, 563, 563, 563, 563, + 563, 563, 563, 563, 563, 563, 563, 563, 563, 564, + 564, 564, 564, 564, 564, 564, 564, 564, 564, 564, + 564, 564, 564, 564, 564, 564, 564, 564, 564, 564, + 564, 564, 564, 564, 564, 564, 564, 565, 565, 0, + 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, + + 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, + 565, 565, 565, 565, 565, 566, 566, 0, 566, 566, + 566, 566, 566, 566, 566, 566, 566, 566, 566, 566, + 566, 566, 566, 566, 566, 566, 566, 566, 566, 566, + 566, 566, 566, 567, 567, 0, 567, 567, 567, 567, + 567, 567, 567, 567, 567, 567, 567, 567, 567, 567, + 567, 567, 567, 567, 567, 567, 567, 567, 567, 567, + 567, 568, 568, 0, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 569, + + 569, 569, 0, 0, 569, 569, 0, 569, 0, 0, + 0, 569, 569, 569, 569, 569, 569, 569, 569, 570, + 0, 0, 570, 0, 570, 0, 570, 0, 570, 0, + 0, 570, 570, 0, 0, 570, 570, 570, 570, 570, + 570, 570, 571, 571, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 571, + 571, 571, 571, 571, 571, 571, 572, 0, 0, 572, + 572, 572, 572, 572, 0, 572, 572, 0, 572, 572, + 0, 0, 572, 572, 572, 572, 572, 572, 572, 572, + 573, 573, 573, 573, 573, 0, 573, 573, 0, 573, + + 0, 0, 0, 573, 573, 573, 573, 573, 573, 573, + 573, 574, 574, 574, 574, 574, 574, 574, 574, 574, + 574, 574, 574, 574, 574, 574, 574, 574, 574, 574, + 574, 574, 574, 574, 574, 574, 574, 574, 574, 575, + 575, 0, 0, 0, 0, 0, 575, 575, 575, 576, + 576, 0, 0, 0, 0, 0, 576, 576, 576, 577, + 577, 0, 0, 0, 0, 0, 577, 577, 577, 578, + 578, 0, 0, 0, 0, 0, 578, 578, 578, 579, + 579, 579, 579, 579, 579, 579, 579, 579, 579, 579, + 579, 579, 579, 579, 579, 579, 579, 579, 579, 579, + + 579, 579, 579, 579, 579, 579, 579, 504, 504, 504, + 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, + 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, + 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, + 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, + 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, + 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, + 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, + 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, + 504, 504, 504, 504, 504 + } ; /* Table of booleans, true if rule could match eol. */ -static yyconst flex_int32_t yy_rule_can_match_eol[98] = +static yyconst flex_int32_t yy_rule_can_match_eol[102] = { 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, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, }; + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, + 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 1, + 0, 0, }; static yy_state_type yy_last_accepting_state; static char *yy_last_accepting_cpos; @@ -1373,26 +1490,28 @@ char *yytext; * cases. So while we hope that cfsysline support can be dropped some time in * the future, we will probably keep these useful constructs. * -* Copyright 2011-2012 Rainer Gerhards and Adiscon GmbH. +* Copyright 2011-2014 Rainer Gerhards and Adiscon GmbH. * * This file is part of the rsyslog runtime library. * -* The rsyslog runtime library is free software: you can redistribute it and/or modify -* it under the terms of the GNU Lesser General Public License as published by -* the Free Software Foundation, either version 3 of the License, or -* (at your option) any later version. -* -* The rsyslog runtime library is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License -* along with the rsyslog runtime library. If not, see <http://www.gnu.org/licenses/>. -* -* A copy of the GPL can be found in the file "COPYING" in this distribution. -* A copy of the LGPL can be found in the file "COPYING.LESSER" in this distribution. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* -or- +* see COPYING.ASL20 in the source distribution +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. */ +#line 32 "lexer.l" +#include "config.h" +#include "parserif.h" +extern char *strdup(char*); /* somehow we do not get this from string.h... */ /*%option noyywrap nodefault case-insensitive */ /* avoid compiler warning: `yyunput' defined but not used */ #define YY_NO_INPUT 1 @@ -1418,7 +1537,7 @@ char *yytext; * wrote this ugly, but the price needed to pay in order to remain * compatible to the previous format. */ -#line 63 "lexer.l" +#line 67 "lexer.l" #include <ctype.h> #include <stdio.h> #include <stdlib.h> @@ -1447,9 +1566,11 @@ extern int yydebug; /* somehow, I need these prototype even though the headers are * included. I guess that's some autotools magic I don't understand... */ +#if !defined(__FreeBSD__) int fileno(FILE *stream); +#endif -#line 1453 "lexer.c" +#line 1574 "lexer.c" #define INITIAL 0 #define INOBJ 1 @@ -1643,11 +1764,11 @@ YY_DECL register char *yy_cp, *yy_bp; register int yy_act; -#line 95 "lexer.l" +#line 101 "lexer.l" /* keywords */ -#line 1651 "lexer.c" +#line 1772 "lexer.c" if ( !(yy_init) ) { @@ -1701,13 +1822,13 @@ yy_match: while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 443 ) + if ( yy_current_state >= 505 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; ++yy_cp; } - while ( yy_base[yy_current_state] != 3182 ); + while ( yy_base[yy_current_state] != 3608 ); yy_find_action: yy_act = yy_accept[yy_current_state]; @@ -1743,131 +1864,131 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 98 "lexer.l" +#line 104 "lexer.l" { BEGIN EXPR; return IF; } YY_BREAK case 2: YY_RULE_SETUP -#line 99 "lexer.l" +#line 105 "lexer.l" { BEGIN INITIAL; return THEN; } YY_BREAK case 3: YY_RULE_SETUP -#line 100 "lexer.l" +#line 106 "lexer.l" { BEGIN INITIAL; return ';'; } YY_BREAK case 4: YY_RULE_SETUP -#line 101 "lexer.l" +#line 107 "lexer.l" { return OR; } YY_BREAK case 5: YY_RULE_SETUP -#line 102 "lexer.l" +#line 108 "lexer.l" { return AND; } YY_BREAK case 6: YY_RULE_SETUP -#line 103 "lexer.l" +#line 109 "lexer.l" { return NOT; } YY_BREAK case 7: -#line 105 "lexer.l" +#line 111 "lexer.l" case 8: -#line 106 "lexer.l" +#line 112 "lexer.l" case 9: -#line 107 "lexer.l" +#line 113 "lexer.l" case 10: -#line 108 "lexer.l" +#line 114 "lexer.l" case 11: -#line 109 "lexer.l" +#line 115 "lexer.l" case 12: -#line 110 "lexer.l" +#line 116 "lexer.l" case 13: -#line 111 "lexer.l" +#line 117 "lexer.l" case 14: -#line 112 "lexer.l" +#line 118 "lexer.l" case 15: -#line 113 "lexer.l" +#line 119 "lexer.l" case 16: -#line 114 "lexer.l" +#line 120 "lexer.l" case 17: -#line 115 "lexer.l" +#line 121 "lexer.l" case 18: YY_RULE_SETUP -#line 115 "lexer.l" +#line 121 "lexer.l" { return yytext[0]; } YY_BREAK case 19: YY_RULE_SETUP -#line 116 "lexer.l" +#line 122 "lexer.l" { return CMP_EQ; } YY_BREAK case 20: YY_RULE_SETUP -#line 117 "lexer.l" +#line 123 "lexer.l" { return CMP_LE; } YY_BREAK case 21: YY_RULE_SETUP -#line 118 "lexer.l" +#line 124 "lexer.l" { return CMP_GE; } YY_BREAK case 22: -#line 120 "lexer.l" +#line 126 "lexer.l" case 23: YY_RULE_SETUP -#line 120 "lexer.l" +#line 126 "lexer.l" { return CMP_NE; } YY_BREAK case 24: YY_RULE_SETUP -#line 121 "lexer.l" +#line 127 "lexer.l" { return CMP_LT; } YY_BREAK case 25: YY_RULE_SETUP -#line 122 "lexer.l" +#line 128 "lexer.l" { return CMP_GT; } YY_BREAK case 26: YY_RULE_SETUP -#line 123 "lexer.l" +#line 129 "lexer.l" { return CMP_CONTAINS; } YY_BREAK case 27: YY_RULE_SETUP -#line 124 "lexer.l" +#line 130 "lexer.l" { return CMP_CONTAINSI; } YY_BREAK case 28: YY_RULE_SETUP -#line 125 "lexer.l" +#line 131 "lexer.l" { return CMP_STARTSWITH; } YY_BREAK case 29: YY_RULE_SETUP -#line 126 "lexer.l" +#line 132 "lexer.l" { return CMP_STARTSWITHI; } YY_BREAK case 30: -#line 128 "lexer.l" +#line 134 "lexer.l" case 31: -#line 129 "lexer.l" +#line 135 "lexer.l" case 32: YY_RULE_SETUP -#line 129 "lexer.l" +#line 135 "lexer.l" { yylval.n = strtoll(yytext, NULL, 0); return NUMBER; } YY_BREAK case 33: YY_RULE_SETUP -#line 130 "lexer.l" -{ yylval.s = strdup(yytext); return VAR; } +#line 136 "lexer.l" +{ yylval.s = strdup(yytext+1); return VAR; } YY_BREAK case 34: /* rule 34 can match eol */ YY_RULE_SETUP -#line 131 "lexer.l" +#line 137 "lexer.l" { yytext[yyleng-1] = '\0'; unescapeStr((uchar*)yytext+1, yyleng-2); @@ -1877,7 +1998,7 @@ YY_RULE_SETUP case 35: /* rule 35 can match eol */ YY_RULE_SETUP -#line 136 "lexer.l" +#line 142 "lexer.l" { yytext[yyleng-1] = '\0'; unescapeStr((uchar*)yytext+1, yyleng-2); @@ -1887,18 +2008,18 @@ YY_RULE_SETUP case 36: /* rule 36 can match eol */ YY_RULE_SETUP -#line 141 "lexer.l" +#line 147 "lexer.l" YY_BREAK case 37: YY_RULE_SETUP -#line 142 "lexer.l" +#line 148 "lexer.l" { yylval.estr = es_newStrFromCStr(yytext, yyleng); return FUNC; } YY_BREAK case 38: YY_RULE_SETUP -#line 144 "lexer.l" +#line 150 "lexer.l" { parser_errmsg("invalid character '%s' in expression " "- is there an invalid escape sequence somewhere?", yytext); } @@ -1906,66 +2027,66 @@ YY_RULE_SETUP case 39: /* rule 39 can match eol */ YY_RULE_SETUP -#line 147 "lexer.l" +#line 153 "lexer.l" YY_BREAK case 40: YY_RULE_SETUP -#line 148 "lexer.l" +#line 154 "lexer.l" { parser_errmsg("invalid character '%s' in 'call' statement" "- is there an invalid escape sequence somewhere?", yytext); } YY_BREAK case 41: YY_RULE_SETUP -#line 151 "lexer.l" +#line 157 "lexer.l" { yylval.estr = es_newStrFromCStr(yytext, yyleng); BEGIN INITIAL; return NAME; } YY_BREAK case 42: YY_RULE_SETUP -#line 154 "lexer.l" +#line 160 "lexer.l" { return '&'; } YY_BREAK case 43: YY_RULE_SETUP -#line 155 "lexer.l" +#line 161 "lexer.l" { return '{'; } YY_BREAK case 44: YY_RULE_SETUP -#line 156 "lexer.l" +#line 162 "lexer.l" { return '}'; } YY_BREAK case 45: YY_RULE_SETUP -#line 157 "lexer.l" +#line 163 "lexer.l" { return STOP; } YY_BREAK case 46: YY_RULE_SETUP -#line 158 "lexer.l" +#line 164 "lexer.l" { return ELSE; } YY_BREAK case 47: YY_RULE_SETUP -#line 159 "lexer.l" +#line 165 "lexer.l" { BEGIN INCALL; return CALL; } YY_BREAK case 48: YY_RULE_SETUP -#line 160 "lexer.l" +#line 166 "lexer.l" { BEGIN EXPR; return SET; } YY_BREAK case 49: YY_RULE_SETUP -#line 161 "lexer.l" +#line 167 "lexer.l" { BEGIN EXPR; return UNSET; } YY_BREAK case 50: YY_RULE_SETUP -#line 162 "lexer.l" +#line 168 "lexer.l" { return CONTINUE; } YY_BREAK /* line number support because the "preprocessor" combines lines and so needs @@ -1973,23 +2094,23 @@ YY_RULE_SETUP */ case 51: YY_RULE_SETUP -#line 166 "lexer.l" +#line 172 "lexer.l" { BEGIN LINENO; } YY_BREAK case 52: YY_RULE_SETUP -#line 167 "lexer.l" +#line 173 "lexer.l" { yylineno = atoi(yytext) - 1; } YY_BREAK case 53: YY_RULE_SETUP -#line 168 "lexer.l" +#line 174 "lexer.l" { BEGIN INITIAL; } YY_BREAK case 54: /* rule 54 can match eol */ YY_RULE_SETUP -#line 169 "lexer.l" +#line 175 "lexer.l" YY_BREAK /* $IncludeConfig must be detected as part of CFSYSLINE, because this is @@ -1998,12 +2119,12 @@ YY_RULE_SETUP case 55: /* rule 55 can match eol */ YY_RULE_SETUP -#line 173 "lexer.l" +#line 179 "lexer.l" YY_BREAK case 56: YY_RULE_SETUP -#line 174 "lexer.l" +#line 180 "lexer.l" { if(cnfDoInclude(yytext) != 0) yyterminate(); BEGIN INITIAL; } @@ -2011,121 +2132,149 @@ YY_RULE_SETUP case 57: /* rule 57 can match eol */ YY_RULE_SETUP -#line 177 "lexer.l" -{ yylval.objType = CNFOBJ_GLOBAL; +#line 183 "lexer.l" +{ yylval.objType = CNFOBJ_MAINQ; BEGIN INOBJ; return BEGINOBJ; } YY_BREAK case 58: /* rule 58 can match eol */ YY_RULE_SETUP -#line 179 "lexer.l" -{ yylval.objType = CNFOBJ_TPL; - BEGIN INOBJ; return BEGIN_TPL; } +#line 185 "lexer.l" +{ yylval.objType = CNFOBJ_TIMEZONE; + BEGIN INOBJ; return BEGINOBJ; } YY_BREAK case 59: /* rule 59 can match eol */ YY_RULE_SETUP -#line 181 "lexer.l" -{ yylval.objType = CNFOBJ_RULESET; - BEGIN INOBJ; return BEGIN_RULESET; } +#line 187 "lexer.l" +{ yylval.objType = CNFOBJ_PARSER; + BEGIN INOBJ; return BEGINOBJ; } YY_BREAK case 60: /* rule 60 can match eol */ YY_RULE_SETUP -#line 183 "lexer.l" -{ yylval.objType = CNFOBJ_PROPERTY; - BEGIN INOBJ; return BEGIN_PROPERTY; } +#line 189 "lexer.l" +{ yylval.objType = CNFOBJ_GLOBAL; + BEGIN INOBJ; return BEGINOBJ; } YY_BREAK case 61: /* rule 61 can match eol */ YY_RULE_SETUP -#line 185 "lexer.l" -{ yylval.objType = CNFOBJ_CONSTANT; - BEGIN INOBJ; return BEGIN_CONSTANT; } +#line 191 "lexer.l" +{ yylval.objType = CNFOBJ_TPL; + BEGIN INOBJ; return BEGIN_TPL; } YY_BREAK case 62: /* rule 62 can match eol */ YY_RULE_SETUP -#line 187 "lexer.l" -{ yylval.objType = CNFOBJ_INPUT; - BEGIN INOBJ; return BEGINOBJ; } +#line 193 "lexer.l" +{ yylval.objType = CNFOBJ_RULESET; + BEGIN INOBJ; return BEGIN_RULESET; } YY_BREAK case 63: /* rule 63 can match eol */ YY_RULE_SETUP -#line 189 "lexer.l" -{ yylval.objType = CNFOBJ_MODULE; - BEGIN INOBJ; return BEGINOBJ; } +#line 195 "lexer.l" +{ yylval.objType = CNFOBJ_PROPERTY; + BEGIN INOBJ; return BEGIN_PROPERTY; } YY_BREAK case 64: /* rule 64 can match eol */ YY_RULE_SETUP -#line 191 "lexer.l" -{ BEGIN INOBJ; return BEGIN_ACTION; } +#line 197 "lexer.l" +{ yylval.objType = CNFOBJ_CONSTANT; + BEGIN INOBJ; return BEGIN_CONSTANT; } YY_BREAK case 65: /* rule 65 can match eol */ YY_RULE_SETUP -#line 192 "lexer.l" -{ - yylval.s = strdup(rmLeadingSpace(yytext)); - dbgprintf("lexer: propfilt is '%s'\n", yylval.s); - return PROPFILT; - } +#line 199 "lexer.l" +{ yylval.objType = CNFOBJ_INPUT; + BEGIN INOBJ; return BEGINOBJ; } YY_BREAK case 66: +/* rule 66 can match eol */ YY_RULE_SETUP -#line 197 "lexer.l" -{ yylval.s = strdup(rmLeadingSpace(yytext)); return PRIFILT; } +#line 201 "lexer.l" +{ yylval.objType = CNFOBJ_MODULE; + BEGIN INOBJ; return BEGINOBJ; } YY_BREAK case 67: -#line 199 "lexer.l" +/* rule 67 can match eol */ +YY_RULE_SETUP +#line 203 "lexer.l" +{ yylval.objType = CNFOBJ_LOOKUP_TABLE; + BEGIN INOBJ; return BEGINOBJ; } + YY_BREAK case 68: -#line 200 "lexer.l" +/* rule 68 can match eol */ +YY_RULE_SETUP +#line 205 "lexer.l" +{ BEGIN INOBJ; return BEGIN_ACTION; } + YY_BREAK case 69: /* rule 69 can match eol */ -#line 201 "lexer.l" +YY_RULE_SETUP +#line 206 "lexer.l" +{ + yylval.s = strdup(rmLeadingSpace(yytext)); + dbgprintf("lexer: propfilt is '%s'\n", yylval.s); + return PROPFILT; + } + YY_BREAK case 70: -/* rule 70 can match eol */ -#line 202 "lexer.l" +YY_RULE_SETUP +#line 211 "lexer.l" +{ yylval.s = strdup(rmLeadingSpace(yytext)); return PRIFILT; } + YY_BREAK case 71: -/* rule 71 can match eol */ -#line 203 "lexer.l" +#line 213 "lexer.l" case 72: -/* rule 72 can match eol */ -#line 204 "lexer.l" +#line 214 "lexer.l" case 73: /* rule 73 can match eol */ +#line 215 "lexer.l" +case 74: +/* rule 74 can match eol */ +#line 216 "lexer.l" +case 75: +/* rule 75 can match eol */ +#line 217 "lexer.l" +case 76: +/* rule 76 can match eol */ +#line 218 "lexer.l" +case 77: +/* rule 77 can match eol */ YY_RULE_SETUP -#line 204 "lexer.l" +#line 218 "lexer.l" { yylval.s = yytext; return LEGACY_ACTION; } YY_BREAK -case 74: +case 78: YY_RULE_SETUP -#line 205 "lexer.l" +#line 219 "lexer.l" { BEGIN INITIAL; return ENDOBJ; } YY_BREAK -case 75: +case 79: YY_RULE_SETUP -#line 206 "lexer.l" +#line 220 "lexer.l" { yylval.estr = es_newStrFromCStr(yytext, yyleng); return NAME; } YY_BREAK -case 76: -#line 209 "lexer.l" -case 77: -#line 210 "lexer.l" -case 78: -#line 211 "lexer.l" -case 79: +case 80: +#line 223 "lexer.l" +case 81: +#line 224 "lexer.l" +case 82: +#line 225 "lexer.l" +case 83: YY_RULE_SETUP -#line 211 "lexer.l" +#line 225 "lexer.l" { return(yytext[0]); } YY_BREAK -case 80: -/* rule 80 can match eol */ +case 84: +/* rule 84 can match eol */ YY_RULE_SETUP -#line 212 "lexer.l" +#line 226 "lexer.l" { yytext[yyleng-1] = '\0'; unescapeStr((uchar*)yytext+1, yyleng-2); @@ -2134,59 +2283,59 @@ YY_RULE_SETUP YY_BREAK /*yylval.estr = es_newStrFromBuf(yytext+1, yyleng-2); return VALUE; }*/ -case 81: +case 85: YY_RULE_SETUP -#line 219 "lexer.l" +#line 233 "lexer.l" { preCommentState = YY_START; BEGIN COMMENT; } YY_BREAK -case 82: +case 86: YY_RULE_SETUP -#line 220 "lexer.l" +#line 234 "lexer.l" { preCommentState = YY_START; BEGIN COMMENT; } YY_BREAK -case 83: +case 87: YY_RULE_SETUP -#line 221 "lexer.l" +#line 235 "lexer.l" { preCommentState = YY_START; BEGIN COMMENT; } YY_BREAK -case 84: +case 88: YY_RULE_SETUP -#line 222 "lexer.l" +#line 236 "lexer.l" { BEGIN preCommentState; } YY_BREAK -case 85: -/* rule 85 can match eol */ +case 89: +/* rule 89 can match eol */ YY_RULE_SETUP -#line 223 "lexer.l" +#line 237 "lexer.l" YY_BREAK -case 86: +case 90: *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 224 "lexer.l" +#line 238 "lexer.l" /* skip comments in input */ YY_BREAK -case 87: -/* rule 87 can match eol */ +case 91: +/* rule 91 can match eol */ YY_RULE_SETUP -#line 225 "lexer.l" +#line 239 "lexer.l" YY_BREAK -case 88: +case 92: YY_RULE_SETUP -#line 226 "lexer.l" +#line 240 "lexer.l" { parser_errmsg("invalid character '%s' in object definition " "- is there an invalid escape sequence somewhere?", yytext); } YY_BREAK -case 89: +case 93: *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 229 "lexer.l" +#line 243 "lexer.l" { /* see comment on $IncludeConfig above */ if(!strncasecmp(yytext, "$includeconfig ", 14)) { yyless(14); @@ -2199,55 +2348,55 @@ YY_RULE_SETUP } } YY_BREAK -case 90: +case 94: *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 240 "lexer.l" +#line 254 "lexer.l" { yylval.s = strdup(yytext); return BSD_TAG_SELECTOR; } YY_BREAK -case 91: -/* rule 91 can match eol */ +case 95: +/* rule 95 can match eol */ *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 241 "lexer.l" +#line 255 "lexer.l" { yylval.s = strdup(yytext); return BSD_HOST_SELECTOR; } YY_BREAK -case 92: -/* rule 92 can match eol */ +case 96: +/* rule 96 can match eol */ *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 242 "lexer.l" +#line 256 "lexer.l" { yylval.s = strdup(yytext); return BSD_HOST_SELECTOR; } YY_BREAK -case 93: +case 97: *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 243 "lexer.l" +#line 257 "lexer.l" { yylval.s = strdup(yytext); return BSD_HOST_SELECTOR; } YY_BREAK -case 94: -/* rule 94 can match eol */ +case 98: +/* rule 98 can match eol */ YY_RULE_SETUP -#line 244 "lexer.l" +#line 258 "lexer.l" /* skip comments in input */ YY_BREAK -case 95: -/* rule 95 can match eol */ +case 99: +/* rule 99 can match eol */ YY_RULE_SETUP -#line 245 "lexer.l" +#line 259 "lexer.l" /* drop whitespace */ YY_BREAK -case 96: +case 100: YY_RULE_SETUP -#line 246 "lexer.l" +#line 260 "lexer.l" { parser_errmsg("invalid character '%s' " "- is there an invalid escape sequence somewhere?", yytext); } @@ -2259,15 +2408,15 @@ case YY_STATE_EOF(INCL): case YY_STATE_EOF(LINENO): case YY_STATE_EOF(INCALL): case YY_STATE_EOF(EXPR): -#line 249 "lexer.l" +#line 263 "lexer.l" { if(popfile() != 0) yyterminate(); } YY_BREAK -case 97: +case 101: YY_RULE_SETUP -#line 251 "lexer.l" +#line 265 "lexer.l" YY_FATAL_ERROR( "flex scanner jammed" ); YY_BREAK -#line 2271 "lexer.c" +#line 2420 "lexer.c" case YY_END_OF_BUFFER: { @@ -2558,7 +2707,7 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 443 ) + if ( yy_current_state >= 505 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -2586,11 +2735,11 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 443 ) + if ( yy_current_state >= 505 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - yy_is_jam = (yy_current_state == 442); + yy_is_jam = (yy_current_state == 504); return yy_is_jam ? 0 : yy_current_state; } @@ -3236,7 +3385,7 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 251 "lexer.l" +#line 265 "lexer.l" int diff --git a/grammar/lexer.l b/grammar/lexer.l index 237eb2a..796815c 100644 --- a/grammar/lexer.l +++ b/grammar/lexer.l @@ -9,27 +9,31 @@ * cases. So while we hope that cfsysline support can be dropped some time in * the future, we will probably keep these useful constructs. * - * Copyright 2011-2012 Rainer Gerhards and Adiscon GmbH. + * Copyright 2011-2014 Rainer Gerhards and Adiscon GmbH. * * This file is part of the rsyslog runtime library. * - * The rsyslog runtime library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * The rsyslog runtime library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with the rsyslog runtime library. If not, see <http://www.gnu.org/licenses/>. - * - * A copy of the GPL can be found in the file "COPYING" in this distribution. - * A copy of the LGPL can be found in the file "COPYING.LESSER" in this distribution. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * -or- + * see COPYING.ASL20 in the source distribution + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ +%{ +#include "config.h" +#include "parserif.h" +extern char *strdup(char*); /* somehow we do not get this from string.h... */ +%} + %option noyywrap nodefault case-insensitive yylineno /*%option noyywrap nodefault case-insensitive */ @@ -88,7 +92,9 @@ extern int yydebug; /* somehow, I need these prototype even though the headers are * included. I guess that's some autotools magic I don't understand... */ +#if !defined(__FreeBSD__) int fileno(FILE *stream); +#endif %} @@ -127,7 +133,7 @@ int fileno(FILE *stream); <EXPR>0[0-7]+ | /* octal number */ <EXPR>0x[0-7a-f] | /* hex number, following rule is dec; strtoll handles all! */ <EXPR>([1-9][0-9]*|0) { yylval.n = strtoll(yytext, NULL, 0); return NUMBER; } -<EXPR>\$[$!]{0,1}[a-z][!a-z0-9\-_\.]* { yylval.s = strdup(yytext); return VAR; } +<EXPR>\$[$!./]{0,1}[@a-z][!@a-z0-9\-_\.]* { yylval.s = strdup(yytext+1); return VAR; } <EXPR>\'([^'\\]|\\['"\\$bntr]|\\x[0-9a-f][0-9a-f]|\\[0-7][0-7][0-7])*\' { yytext[yyleng-1] = '\0'; unescapeStr((uchar*)yytext+1, yyleng-2); @@ -174,6 +180,12 @@ int fileno(FILE *stream); <INCL>[^ \t\n]+ { if(cnfDoInclude(yytext) != 0) yyterminate(); BEGIN INITIAL; } +"main_queue"[ \n\t]*"(" { yylval.objType = CNFOBJ_MAINQ; + BEGIN INOBJ; return BEGINOBJ; } +"timezone"[ \n\t]*"(" { yylval.objType = CNFOBJ_TIMEZONE; + BEGIN INOBJ; return BEGINOBJ; } +"parser"[ \n\t]*"(" { yylval.objType = CNFOBJ_PARSER; + BEGIN INOBJ; return BEGINOBJ; } "global"[ \n\t]*"(" { yylval.objType = CNFOBJ_GLOBAL; BEGIN INOBJ; return BEGINOBJ; } "template"[ \n\t]*"(" { yylval.objType = CNFOBJ_TPL; @@ -188,6 +200,8 @@ int fileno(FILE *stream); BEGIN INOBJ; return BEGINOBJ; } "module"[ \n\t]*"(" { yylval.objType = CNFOBJ_MODULE; BEGIN INOBJ; return BEGINOBJ; } +"lookup_table"[ \n\t]*"(" { yylval.objType = CNFOBJ_LOOKUP_TABLE; + BEGIN INOBJ; return BEGINOBJ; } "action"[ \n\t]*"(" { BEGIN INOBJ; return BEGIN_ACTION; } ^[ \t]*:\$?[a-z\-]+[ ]*,[ ]*!?[a-z]+[ ]*,[ ]*\"(\\\"|[^\"])*\" { yylval.s = strdup(rmLeadingSpace(yytext)); diff --git a/grammar/parserif.h b/grammar/parserif.h index aa271ec..b66023d 100644 --- a/grammar/parserif.h +++ b/grammar/parserif.h @@ -1,3 +1,21 @@ +/* rsyslog parser interface. + * + * Copyright 2011-2014 Rainer Gerhards + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * -or- + * see COPYING.ASL20 in the source distribution + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ #ifndef PARSERIF_H_DEFINED #define PARSERIF_H_DEFINED #include "rainerscript.h" @@ -6,6 +24,7 @@ int yyparse(); char *cnfcurrfn; void dbgprintf(char *fmt, ...) __attribute__((format(printf, 1, 2))); void parser_errmsg(char *fmt, ...) __attribute__((format(printf, 1, 2))); +void parser_warnmsg(char *fmt, ...) __attribute__((format(printf, 1, 2))); void tellLexEndParsing(void); extern int yydebug; extern int yylineno; @@ -19,5 +38,4 @@ void cnfDoScript(struct cnfstmt *script); void cnfDoCfsysline(char *ln); void cnfDoBSDTag(char *ln); void cnfDoBSDHost(char *ln); -es_str_t *cnfGetVar(char *name, void *usrptr); -#endif + #endif diff --git a/grammar/rainerscript.c b/grammar/rainerscript.c index 89cf946..ccfa0e2 100644 --- a/grammar/rainerscript.c +++ b/grammar/rainerscript.c @@ -2,7 +2,7 @@ * * Module begun 2011-07-01 by Rainer Gerhards * - * Copyright 2011-2013 Rainer Gerhards and Adiscon GmbH. + * Copyright 2011-2014 Rainer Gerhards and Adiscon GmbH. * * This file is part of the rsyslog runtime library. * @@ -38,6 +38,7 @@ #include "rainerscript.h" #include "conf.h" #include "parserif.h" +#include "parse.h" #include "rsconf.h" #include "grammar.h" #include "queue.h" @@ -46,6 +47,9 @@ #include "obj.h" #include "modules.h" #include "ruleset.h" +#include "msg.h" +#include "wti.h" +#include "unicode-helper.h" DEFobjCurrIf(obj) DEFobjCurrIf(regexp) @@ -62,8 +66,8 @@ struct cnffunc * cnffuncNew_prifilt(int fac); * NOTE: This function MUST be updated if new tokens are defined in the * grammar. */ -char * -tokenToString(int token) +const char * +tokenToString(const int token) { char *tokstr; static char tokbuf[512]; @@ -114,8 +118,8 @@ tokenToString(int token) } -char* -getFIOPName(unsigned iFIOP) +const char* +getFIOPName(const unsigned iFIOP) { char *pRet; switch(iFIOP) { @@ -144,8 +148,106 @@ getFIOPName(unsigned iFIOP) return pRet; } + +/* This function takes the filter part of a property + * based filter and decodes it. It processes the line up to the beginning + * of the action part. + */ +static rsRetVal +DecodePropFilter(uchar *pline, struct cnfstmt *stmt) +{ + rsParsObj *pPars = NULL; + cstr_t *pCSCompOp = NULL; + cstr_t *pCSPropName = NULL; + int iOffset; /* for compare operations */ + DEFiRet; + + ASSERT(pline != NULL); + + DBGPRINTF("Decoding property-based filter '%s'\n", pline); + + /* create parser object starting with line string without leading colon */ + if((iRet = rsParsConstructFromSz(&pPars, pline+1)) != RS_RET_OK) { + parser_errmsg("error %d constructing parser object", iRet); + ABORT_FINALIZE(iRet); + } + + /* read property */ + iRet = parsDelimCStr(pPars, &pCSPropName, ',', 1, 1, 1); + if(iRet != RS_RET_OK) { + parser_errmsg("error %d parsing filter property", iRet); + rsParsDestruct(pPars); + ABORT_FINALIZE(iRet); + } + CHKiRet(msgPropDescrFill(&stmt->d.s_propfilt.prop, cstrGetSzStrNoNULL(pCSPropName), + cstrLen(pCSPropName))); + + /* read operation */ + iRet = parsDelimCStr(pPars, &pCSCompOp, ',', 1, 1, 1); + if(iRet != RS_RET_OK) { + parser_errmsg("error %d compare operation property - ignoring selector", iRet); + rsParsDestruct(pPars); + ABORT_FINALIZE(iRet); + } + + /* we now first check if the condition is to be negated. To do so, we first + * must make sure we have at least one char in the param and then check the + * first one. + * rgerhards, 2005-09-26 + */ + if(rsCStrLen(pCSCompOp) > 0) { + if(*rsCStrGetBufBeg(pCSCompOp) == '!') { + stmt->d.s_propfilt.isNegated = 1; + iOffset = 1; /* ignore '!' */ + } else { + stmt->d.s_propfilt.isNegated = 0; + iOffset = 0; + } + } else { + stmt->d.s_propfilt.isNegated = 0; + iOffset = 0; + } + + if(!rsCStrOffsetSzStrCmp(pCSCompOp, iOffset, (uchar*) "contains", 8)) { + stmt->d.s_propfilt.operation = FIOP_CONTAINS; + } else if(!rsCStrOffsetSzStrCmp(pCSCompOp, iOffset, (uchar*) "isequal", 7)) { + stmt->d.s_propfilt.operation = FIOP_ISEQUAL; + } else if(!rsCStrOffsetSzStrCmp(pCSCompOp, iOffset, (uchar*) "isempty", 7)) { + stmt->d.s_propfilt.operation = FIOP_ISEMPTY; + } else if(!rsCStrOffsetSzStrCmp(pCSCompOp, iOffset, (uchar*) "startswith", 10)) { + stmt->d.s_propfilt.operation = FIOP_STARTSWITH; + } else if(!rsCStrOffsetSzStrCmp(pCSCompOp, iOffset, (unsigned char*) "regex", 5)) { + stmt->d.s_propfilt.operation = FIOP_REGEX; + } else if(!rsCStrOffsetSzStrCmp(pCSCompOp, iOffset, (unsigned char*) "ereregex", 8)) { + stmt->d.s_propfilt.operation = FIOP_EREREGEX; + } else { + parser_errmsg("error: invalid compare operation '%s'", + (char*) rsCStrGetSzStrNoNULL(pCSCompOp)); + ABORT_FINALIZE(RS_RET_ERR); + } + + if(stmt->d.s_propfilt.operation != FIOP_ISEMPTY) { + /* read compare value */ + iRet = parsQuotedCStr(pPars, &stmt->d.s_propfilt.pCSCompValue); + if(iRet != RS_RET_OK) { + parser_errmsg("error %d compare value property", iRet); + rsParsDestruct(pPars); + ABORT_FINALIZE(iRet); + } + } + +finalize_it: + if(pPars != NULL) + rsParsDestruct(pPars); + if(pCSCompOp != NULL) + rsCStrDestruct(&pCSCompOp); + if(pCSPropName != NULL) + cstrDestruct(&pCSPropName); + RETiRet; +} + static void -prifiltInvert(struct funcData_prifilt *prifilt) +prifiltInvert(struct funcData_prifilt *__restrict__ const prifilt) { int i; for(i = 0 ; i < LOG_NFACILITIES+1 ; ++i) { @@ -187,7 +289,7 @@ prifiltSetSeverity(struct funcData_prifilt *prifilt, int sev, int mode) * NOTE: fac MUST be in the range 0..24 (not multiplied by 8)! */ static void -prifiltSetFacility(struct funcData_prifilt *prifilt, int fac, int mode) +prifiltSetFacility(struct funcData_prifilt *__restrict__ const prifilt, const int fac, const int mode) { int i; @@ -224,7 +326,9 @@ prifiltSetFacility(struct funcData_prifilt *prifilt, int fac, int mode) * used to keep things simple). */ static void -prifiltCombine(struct funcData_prifilt *prifilt, struct funcData_prifilt *prifilt2, int mode) +prifiltCombine(struct funcData_prifilt *__restrict__ const prifilt, + struct funcData_prifilt *__restrict__ const prifilt2, + const int mode) { int i; for(i = 0 ; i < LOG_NFACILITIES+1 ; ++i) { @@ -237,7 +341,7 @@ prifiltCombine(struct funcData_prifilt *prifilt, struct funcData_prifilt *prifil void -readConfFile(FILE *fp, es_str_t **str) +readConfFile(FILE * const fp, es_str_t **str) { char ln[10240]; char buf[512]; @@ -854,7 +958,7 @@ nvlstGetParam(struct nvlst *valnode, struct cnfparamdescr *param, r = doGetInt(valnode, param, val); break; case eCmdHdlrNonNegInt: - r = doGetPositiveInt(valnode, param, val); + r = doGetNonNegInt(valnode, param, val); break; case eCmdHdlrPositiveInt: r = doGetPositiveInt(valnode, param, val); @@ -938,8 +1042,14 @@ nvlstGetParams(struct nvlst *lst, struct cnfparamblk *params, for(i = 0 ; i < params->nParams ; ++i) { param = params->descr + i; - if((valnode = nvlstFindNameCStr(lst, param->name)) == NULL) + if((valnode = nvlstFindNameCStr(lst, param->name)) == NULL) { + if(param->flags & CNFPARAM_REQUIRED) { + parser_errmsg("parameter '%s' required but not specified - " + "fix config", param->name); + bInError = 1; + } continue; + } if(vals[i].bUsed) { parser_errmsg("parameter '%s' specified more than once - " "one instance is ignored. Fix config", param->name); @@ -950,7 +1060,6 @@ nvlstGetParams(struct nvlst *lst, struct cnfparamblk *params, } } - if(bInError) { if(bValsWasNULL) cnfparamvalsDestruct(vals, params); @@ -1023,7 +1132,7 @@ cnfobjNew(enum cnfobjType objType, struct nvlst *lst) { struct cnfobj *o; - if((o = malloc(sizeof(struct nvlst))) != NULL) { + if((o = malloc(sizeof(struct cnfobj))) != NULL) { nvlstChkDupes(lst); o->objType = objType; o->nvlst = lst; @@ -1086,7 +1195,11 @@ var2Number(struct var *r, int *bSuccess) n = es_str2num(r->d.estr, bSuccess); } else { if(r->datatype == 'J') { +#ifdef HAVE_JSON_OBJECT_NEW_INT64 + n = (r->d.json == NULL) ? 0 : json_object_get_int64(r->d.json); +#else /* HAVE_JSON_OBJECT_NEW_INT64 */ n = (r->d.json == NULL) ? 0 : json_object_get_int(r->d.json); +#endif /* HAVE_JSON_OBJECT_NEW_INT64 */ } else { n = r->d.n; } @@ -1098,8 +1211,8 @@ var2Number(struct var *r, int *bSuccess) /* ensure that retval is a string */ -static inline es_str_t * -var2String(struct var *r, int *bMustFree) +static es_str_t * +var2String(struct var *__restrict__ const r, int *__restrict__ const bMustFree) { es_str_t *estr; char *cstr; @@ -1125,7 +1238,7 @@ var2String(struct var *r, int *bMustFree) } static uchar* -var2CString(struct var *r, int *bMustFree) +var2CString(struct var *__restrict__ const r, int *__restrict__ const bMustFree) { uchar *cstr; es_str_t *estr; @@ -1137,8 +1250,25 @@ var2CString(struct var *r, int *bMustFree) return cstr; } +/* frees struct var members, but not the struct itself. This is because + * it usually is allocated on the stack. Callers why dynamically allocate + * struct var need to free the struct themselfes! + */ +static void +varFreeMembers(struct var *r) +{ + /* Note: we do NOT need to free JSON objects, as we use + * json_object_object_get() to obtain the values, which does not + * increment the reference count. So json_object_put() [free] is + * neither required nor permitted (would free the original object!). + * So for the time being the string data type is the only one that + * we currently need to free. + */ + if(r->datatype == 'S') es_deleteStr(r->d.estr); +} + static rsRetVal -doExtractFieldByChar(uchar *str, uchar delim, int matchnbr, uchar **resstr) +doExtractFieldByChar(uchar *str, uchar delim, const int matchnbr, uchar **resstr) { int iCurrFld; int iLen; @@ -1171,7 +1301,7 @@ doExtractFieldByChar(uchar *str, uchar delim, int matchnbr, uchar **resstr) * step back a little not to copy it as part of the field. */ /* we got our end pointer, now do the copy */ iLen = pFldEnd - pFld + 1; /* the +1 is for an actual char, NOT \0! */ - CHKmalloc(pBuf = MALLOC((iLen + 1) * sizeof(char))); + CHKmalloc(pBuf = MALLOC((iLen + 1) * sizeof(uchar))); /* now copy */ memcpy(pBuf, pFld, iLen); pBuf[iLen] = '\0'; /* terminate it */ @@ -1185,7 +1315,7 @@ finalize_it: static rsRetVal -doExtractFieldByStr(uchar *str, char *delim, rs_size_t lenDelim, int matchnbr, uchar **resstr) +doExtractFieldByStr(uchar *str, char *delim, const rs_size_t lenDelim, const int matchnbr, uchar **resstr) { int iCurrFld; int iLen; @@ -1194,6 +1324,9 @@ doExtractFieldByStr(uchar *str, char *delim, rs_size_t lenDelim, int matchnbr, u uchar *pFldEnd; DEFiRet; + if (str == NULL || delim == NULL) + ABORT_FINALIZE(RS_RET_FIELD_NOT_FOUND); + /* first, skip to the field in question */ iCurrFld = 1; pFld = str; @@ -1216,7 +1349,7 @@ doExtractFieldByStr(uchar *str, char *delim, rs_size_t lenDelim, int matchnbr, u iLen = pFldEnd - pFld; } /* we got our end pointer, now do the copy */ - CHKmalloc(pBuf = MALLOC((iLen + 1) * sizeof(char))); + CHKmalloc(pBuf = MALLOC((iLen + 1) * sizeof(uchar))); /* now copy */ memcpy(pBuf, pFld, iLen); pBuf[iLen] = '\0'; /* terminate it */ @@ -1235,7 +1368,7 @@ doFunc_re_extract(struct cnffunc *func, struct var *ret, void* usrptr) short matchnbr; regmatch_t pmatch[50]; int bMustFree; - es_str_t *estr; + es_str_t *estr = NULL; /* init just to keep compiler happy */ char *str; struct var r[CNFFUNC_MAX_ARGS]; int iLenBuf; @@ -1254,8 +1387,8 @@ doFunc_re_extract(struct cnffunc *func, struct var *ret, void* usrptr) str = (char*) var2CString(&r[0], &bMustFree); matchnbr = (short) var2Number(&r[2], NULL); submatchnbr = (size_t) var2Number(&r[3], NULL); - if(submatchnbr > sizeof(pmatch)/sizeof(regmatch_t)) { - DBGPRINTF("re_extract() submatch %d is too large\n", submatchnbr); + if(submatchnbr >= sizeof(pmatch)/sizeof(regmatch_t)) { + DBGPRINTF("re_extract() submatch %zd is too large\n", submatchnbr); bHadNoMatch = 1; goto finalize_it; } @@ -1302,15 +1435,19 @@ doFunc_re_extract(struct cnffunc *func, struct var *ret, void* usrptr) iLenBuf); } - if(bMustFree) free(str); - if(r[0].datatype == 'S') es_deleteStr(r[0].d.estr); - if(r[2].datatype == 'S') es_deleteStr(r[2].d.estr); - if(r[3].datatype == 'S') es_deleteStr(r[3].d.estr); finalize_it: + if(bMustFree) free(str); + varFreeMembers(&r[0]); + varFreeMembers(&r[2]); + varFreeMembers(&r[3]); + if(bHadNoMatch) { cnfexprEval(func->expr[4], &r[4], usrptr); estr = var2String(&r[4], &bMustFree); - if(r[4].datatype == 'S') es_deleteStr(r[4].d.estr); + /* Note that we do NOT free the string that was returned/created + * for r[4]. We pass it to the caller, which in turn frees it. + * This saves us doing one unnecessary memory alloc & write. + */ } ret->datatype = 'S'; ret->d.estr = estr; @@ -1318,11 +1455,39 @@ finalize_it: } +/* note that we do not need to evaluate any parameters, as the template pointer + * is set during initialization(). + * TODO: think if we can keep our buffer; but that may not be trival thinking about + * multiple threads. + */ +static void +doFunc_exec_template(struct cnffunc *__restrict__ const func, + struct var *__restrict__ const ret, + msg_t *const pMsg) +{ + rsRetVal localRet; + actWrkrIParams_t iparam; + + wtiInitIParam(&iparam); + localRet = tplToString(func->funcdata, pMsg, &iparam, NULL); + if(localRet == RS_RET_OK) { + ret->d.estr = es_newStrFromCStr((char*)iparam.param, iparam.lenStr); + } else { + ret->d.estr = es_newStrFromCStr("", 0); + } + ret->datatype = 'S'; + free(iparam.param); + + return; +} + + /* Perform a function call. This has been moved out of cnfExprEval in order * to keep the code small and easier to maintain. */ static inline void -doFuncCall(struct cnffunc *func, struct var *ret, void* usrptr) +doFuncCall(struct cnffunc *__restrict__ const func, struct var *__restrict__ const ret, + void *__restrict__ const usrptr) { char *fname; char *envvar; @@ -1350,6 +1515,7 @@ doFuncCall(struct cnffunc *func, struct var *ret, void* usrptr) estr = var2String(&r[0], &bMustFree); ret->d.n = es_strlen(estr); if(bMustFree) es_deleteStr(estr); + if(r[0].datatype == 'S') es_deleteStr(r[0].d.estr); } ret->datatype = 'N'; break; @@ -1370,7 +1536,7 @@ doFuncCall(struct cnffunc *func, struct var *ret, void* usrptr) } ret->datatype = 'S'; if(bMustFree) es_deleteStr(estr); - if(r[0].datatype == 'S') es_deleteStr(r[0].d.estr); + varFreeMembers(&r[0]); free(str); break; case CNFFUNC_TOLOWER: @@ -1381,7 +1547,7 @@ doFuncCall(struct cnffunc *func, struct var *ret, void* usrptr) es_tolower(estr); ret->datatype = 'S'; ret->d.estr = estr; - if(r[0].datatype == 'S') es_deleteStr(r[0].d.estr); + varFreeMembers(&r[0]); break; case CNFFUNC_CSTR: cnfexprEval(func->expr[0], &r[0], usrptr); @@ -1390,7 +1556,7 @@ doFuncCall(struct cnffunc *func, struct var *ret, void* usrptr) estr = es_strdup(estr); ret->datatype = 'S'; ret->d.estr = estr; - if(r[0].datatype == 'S') es_deleteStr(r[0].d.estr); + varFreeMembers(&r[0]); break; case CNFFUNC_CNUM: if(func->expr[0]->nodetype == 'N') { @@ -1401,7 +1567,7 @@ doFuncCall(struct cnffunc *func, struct var *ret, void* usrptr) } else { cnfexprEval(func->expr[0], &r[0], usrptr); ret->d.n = var2Number(&r[0], NULL); - if(r[0].datatype == 'S') es_deleteStr(r[0].d.estr); + varFreeMembers(&r[0]); } ret->datatype = 'N'; break; @@ -1419,11 +1585,14 @@ doFuncCall(struct cnffunc *func, struct var *ret, void* usrptr) } ret->datatype = 'N'; if(bMustFree) free(str); - if(r[0].datatype == 'S') es_deleteStr(r[0].d.estr); + varFreeMembers(&r[0]); break; case CNFFUNC_RE_EXTRACT: doFunc_re_extract(func, ret, usrptr); break; + case CNFFUNC_EXEC_TEMPLATE: + doFunc_exec_template(func, ret, (msg_t*) usrptr); + break; case CNFFUNC_FIELD: cnfexprEval(func->expr[0], &r[0], usrptr); cnfexprEval(func->expr[1], &r[1], usrptr); @@ -1452,9 +1621,9 @@ doFuncCall(struct cnffunc *func, struct var *ret, void* usrptr) } ret->datatype = 'S'; if(bMustFree) free(str); - if(r[0].datatype == 'S') es_deleteStr(r[0].d.estr); - if(r[1].datatype == 'S') es_deleteStr(r[1].d.estr); - if(r[2].datatype == 'S') es_deleteStr(r[2].d.estr); + varFreeMembers(&r[0]); + varFreeMembers(&r[1]); + varFreeMembers(&r[2]); break; case CNFFUNC_PRIFILT: pPrifilt = (struct funcData_prifilt*) func->funcdata; @@ -1466,6 +1635,19 @@ doFuncCall(struct cnffunc *func, struct var *ret, void* usrptr) ret->d.n = 1; ret->datatype = 'N'; break; + case CNFFUNC_LOOKUP: +dbgprintf("DDDD: executing lookup\n"); + ret->datatype = 'S'; + if(func->funcdata == NULL) { + ret->d.estr = es_newStrFromCStr("TABLE-NOT-FOUND", sizeof("TABLE-NOT-FOUND")-1); + break; + } + cnfexprEval(func->expr[1], &r[1], usrptr); + str = (char*) var2CString(&r[1], &bMustFree); + ret->d.estr = lookupKey_estr(func->funcdata, (uchar*)str); + if(bMustFree) free(str); + if(r[1].datatype == 'S') es_deleteStr(r[1].d.estr); + break; default: if(Debug) { fname = es_str2cstr(func->fname, NULL); @@ -1479,22 +1661,31 @@ doFuncCall(struct cnffunc *func, struct var *ret, void* usrptr) } static inline void -evalVar(struct cnfvar *var, void *usrptr, struct var *ret) +evalVar(struct cnfvar *__restrict__ const var, void *__restrict__ const usrptr, + struct var *__restrict__ const ret) { + rs_size_t propLen; + uchar *pszProp = NULL; + unsigned short bMustBeFreed = 0; rsRetVal localRet; - es_str_t *estr; struct json_object *json; - if(var->name[0] == '$' && var->name[1] == '!') { - /* TODO: unify string libs */ - estr = es_newStrFromBuf(var->name+1, strlen(var->name)-1); - localRet = msgGetCEEPropJSON((msg_t*)usrptr, estr, &json); - es_deleteStr(estr); + if(var->prop.id == PROP_CEE || + var->prop.id == PROP_LOCAL_VAR || + var->prop.id == PROP_GLOBAL_VAR ) { + localRet = msgGetJSONPropJSON((msg_t*)usrptr, &var->prop, &json); ret->datatype = 'J'; ret->d.json = (localRet == RS_RET_OK) ? json : NULL; + + DBGPRINTF("rainerscript: var %d:%s: '%s'\n", var->prop.id, var->prop.name, + (ret->d.json == NULL) ? "" : json_object_get_string(ret->d.json)); } else { ret->datatype = 'S'; - ret->d.estr = cnfGetVar(var->name, usrptr); + pszProp = (uchar*) MsgGetProp((msg_t*)usrptr, NULL, &var->prop, &propLen, &bMustBeFreed, NULL); + ret->d.estr = es_newStrFromCStr((char*)pszProp, propLen); + DBGPRINTF("rainerscript: var %d: '%s'\n", var->prop.id, pszProp); + if(bMustBeFreed) + free(pszProp); } } @@ -1507,7 +1698,8 @@ evalVar(struct cnfvar *var, void *usrptr, struct var *ret) * and it was generally 5 to 10 times SLOWER than what we do here... */ static int -evalStrArrayCmp(es_str_t *estr_l, struct cnfarray* ar, int cmpop) +evalStrArrayCmp(es_str_t *const estr_l, struct cnfarray *__restrict__ const ar, + const int cmpop) { int i; int r = 0; @@ -1540,8 +1732,8 @@ evalStrArrayCmp(es_str_t *estr_l, struct cnfarray* ar, int cmpop) } #define FREE_BOTH_RET \ - if(r.datatype == 'S') es_deleteStr(r.d.estr); \ - if(l.datatype == 'S') es_deleteStr(l.d.estr) + varFreeMembers(&r); \ + varFreeMembers(&l) #define COMP_NUM_BINOP(x) \ cnfexprEval(expr->l, &l, usrptr); \ @@ -1550,6 +1742,17 @@ evalStrArrayCmp(es_str_t *estr_l, struct cnfarray* ar, int cmpop) ret->d.n = var2Number(&l, &convok_l) x var2Number(&r, &convok_r); \ FREE_BOTH_RET +#define COMP_NUM_BINOP_DIV(x) \ + cnfexprEval(expr->l, &l, usrptr); \ + cnfexprEval(expr->r, &r, usrptr); \ + ret->datatype = 'N'; \ + if((ret->d.n = var2Number(&r, &convok_r)) == 0) { \ + /* division by zero */ \ + } else { \ + ret->d.n = var2Number(&l, &convok_l) x ret->d.n; \ + } \ + FREE_BOTH_RET + /* NOTE: array as right-hand argument MUST be handled by user */ #define PREP_TWO_STRINGS \ cnfexprEval(expr->l, &l, usrptr); \ @@ -1568,9 +1771,9 @@ evalStrArrayCmp(es_str_t *estr_l, struct cnfarray* ar, int cmpop) #define FREE_TWO_STRINGS \ if(bMustFree) es_deleteStr(estr_r); \ - if(expr->r->nodetype != 'S' && expr->r->nodetype != 'A' && r.datatype == 'S') es_deleteStr(r.d.estr); \ + if(expr->r->nodetype != 'S' && expr->r->nodetype != 'A') varFreeMembers(&r); \ if(bMustFree2) es_deleteStr(estr_l); \ - if(l.datatype == 'S') es_deleteStr(l.d.estr) + varFreeMembers(&l) /* evaluate an expression. * Note that we try to avoid malloc whenever possible (because of @@ -1583,15 +1786,16 @@ evalStrArrayCmp(es_str_t *estr_l, struct cnfarray* ar, int cmpop) * simply is no case where full evaluation would make any sense at all. */ void -cnfexprEval(struct cnfexpr *expr, struct var *ret, void* usrptr) +cnfexprEval(const struct cnfexpr *__restrict__ const expr, struct var *__restrict__ const ret, + void *__restrict__ const usrptr) { struct var r, l; /* memory for subexpression results */ - es_str_t *estr_r, *estr_l; + es_str_t *__restrict__ estr_r, *__restrict__ estr_l; int convok_r, convok_l; int bMustFree, bMustFree2; long long n_r, n_l; - dbgprintf("eval expr %p, type '%s'\n", expr, tokenToString(expr->nodetype)); + DBGPRINTF("eval expr %p, type '%s'\n", expr, tokenToString(expr->nodetype)); switch(expr->nodetype) { /* note: comparison operations are extremely similar. The code can be copyied, only * places flagged with "CMP" need to be changed. @@ -1621,7 +1825,7 @@ cnfexprEval(struct cnfexpr *expr, struct var *ret, void* usrptr) if(bMustFree) es_deleteStr(estr_r); } } - if(r.datatype == 'S') es_deleteStr(r.d.estr); + varFreeMembers(&r); } } else if(l.datatype == 'J') { estr_l = var2String(&l, &bMustFree); @@ -1638,12 +1842,12 @@ cnfexprEval(struct cnfexpr *expr, struct var *ret, void* usrptr) if(convok_l) { ret->d.n = (n_l == r.d.n); /*CMP*/ } else { - estr_r = var2String(&r, &bMustFree); + estr_r = var2String(&r, &bMustFree2); ret->d.n = !es_strcmp(estr_l, estr_r); /*CMP*/ - if(bMustFree) es_deleteStr(estr_r); + if(bMustFree2) es_deleteStr(estr_r); } } - if(r.datatype == 'S') es_deleteStr(r.d.estr); + varFreeMembers(&r); } if(bMustFree) es_deleteStr(estr_l); } else { @@ -1660,9 +1864,9 @@ cnfexprEval(struct cnfexpr *expr, struct var *ret, void* usrptr) } else { ret->d.n = (l.d.n == r.d.n); /*CMP*/ } - if(r.datatype == 'S') es_deleteStr(r.d.estr); + varFreeMembers(&r); } - if(l.datatype == 'S') es_deleteStr(l.d.estr); + varFreeMembers(&l); break; case CMP_NE: cnfexprEval(expr->l, &l, usrptr); @@ -1687,6 +1891,21 @@ cnfexprEval(struct cnfexpr *expr, struct var *ret, void* usrptr) } } } + } else if(l.datatype == 'J') { + estr_l = var2String(&l, &bMustFree); + if(r.datatype == 'S') { + ret->d.n = es_strcmp(estr_l, r.d.estr); /*CMP*/ + } else { + n_l = var2Number(&l, &convok_l); + if(convok_l) { + ret->d.n = (n_l != r.d.n); /*CMP*/ + } else { + estr_r = var2String(&r, &bMustFree2); + ret->d.n = es_strcmp(estr_l, estr_r); /*CMP*/ + if(bMustFree2) es_deleteStr(estr_r); + } + } + if(bMustFree) es_deleteStr(estr_l); } else { if(r.datatype == 'S') { n_r = var2Number(&r, &convok_r); @@ -1720,6 +1939,21 @@ cnfexprEval(struct cnfexpr *expr, struct var *ret, void* usrptr) if(bMustFree) es_deleteStr(estr_r); } } + } else if(l.datatype == 'J') { + estr_l = var2String(&l, &bMustFree); + if(r.datatype == 'S') { + ret->d.n = es_strcmp(estr_l, r.d.estr) <= 0; /*CMP*/ + } else { + n_l = var2Number(&l, &convok_l); + if(convok_l) { + ret->d.n = (n_l <= r.d.n); /*CMP*/ + } else { + estr_r = var2String(&r, &bMustFree2); + ret->d.n = es_strcmp(estr_l, estr_r) <= 0; /*CMP*/ + if(bMustFree2) es_deleteStr(estr_r); + } + } + if(bMustFree) es_deleteStr(estr_l); } else { if(r.datatype == 'S') { n_r = var2Number(&r, &convok_r); @@ -1753,6 +1987,21 @@ cnfexprEval(struct cnfexpr *expr, struct var *ret, void* usrptr) if(bMustFree) es_deleteStr(estr_r); } } + } else if(l.datatype == 'J') { + estr_l = var2String(&l, &bMustFree); + if(r.datatype == 'S') { + ret->d.n = es_strcmp(estr_l, r.d.estr) >= 0; /*CMP*/ + } else { + n_l = var2Number(&l, &convok_l); + if(convok_l) { + ret->d.n = (n_l >= r.d.n); /*CMP*/ + } else { + estr_r = var2String(&r, &bMustFree2); + ret->d.n = es_strcmp(estr_l, estr_r) >= 0; /*CMP*/ + if(bMustFree2) es_deleteStr(estr_r); + } + } + if(bMustFree) es_deleteStr(estr_l); } else { if(r.datatype == 'S') { n_r = var2Number(&r, &convok_r); @@ -1786,6 +2035,21 @@ cnfexprEval(struct cnfexpr *expr, struct var *ret, void* usrptr) if(bMustFree) es_deleteStr(estr_r); } } + } else if(l.datatype == 'J') { + estr_l = var2String(&l, &bMustFree); + if(r.datatype == 'S') { + ret->d.n = es_strcmp(estr_l, r.d.estr) < 0; /*CMP*/ + } else { + n_l = var2Number(&l, &convok_l); + if(convok_l) { + ret->d.n = (n_l < r.d.n); /*CMP*/ + } else { + estr_r = var2String(&r, &bMustFree2); + ret->d.n = es_strcmp(estr_l, estr_r) < 0; /*CMP*/ + if(bMustFree2) es_deleteStr(estr_r); + } + } + if(bMustFree) es_deleteStr(estr_l); } else { if(r.datatype == 'S') { n_r = var2Number(&r, &convok_r); @@ -1819,6 +2083,21 @@ cnfexprEval(struct cnfexpr *expr, struct var *ret, void* usrptr) if(bMustFree) es_deleteStr(estr_r); } } + } else if(l.datatype == 'J') { + estr_l = var2String(&l, &bMustFree); + if(r.datatype == 'S') { + ret->d.n = es_strcmp(estr_l, r.d.estr) > 0; /*CMP*/ + } else { + n_l = var2Number(&l, &convok_l); + if(convok_l) { + ret->d.n = (n_l > r.d.n); /*CMP*/ + } else { + estr_r = var2String(&r, &bMustFree2); + ret->d.n = es_strcmp(estr_l, estr_r) > 0; /*CMP*/ + if(bMustFree2) es_deleteStr(estr_r); + } + } + if(bMustFree) es_deleteStr(estr_l); } else { if(r.datatype == 'S') { n_r = var2Number(&r, &convok_r); @@ -1890,9 +2169,9 @@ cnfexprEval(struct cnfexpr *expr, struct var *ret, void* usrptr) ret->d.n = 1ll; else ret->d.n = 0ll; - if(r.datatype == 'S') es_deleteStr(r.d.estr); + varFreeMembers(&r); } - if(l.datatype == 'S') es_deleteStr(l.d.estr); + varFreeMembers(&l); break; case AND: cnfexprEval(expr->l, &l, usrptr); @@ -1903,17 +2182,17 @@ cnfexprEval(struct cnfexpr *expr, struct var *ret, void* usrptr) ret->d.n = 1ll; else ret->d.n = 0ll; - if(r.datatype == 'S') es_deleteStr(r.d.estr); + varFreeMembers(&r); } else { ret->d.n = 0ll; } - if(l.datatype == 'S') es_deleteStr(l.d.estr); + varFreeMembers(&l); break; case NOT: cnfexprEval(expr->r, &r, usrptr); ret->datatype = 'N'; ret->d.n = !var2Number(&r, &convok_r); - if(r.datatype == 'S') es_deleteStr(r.d.estr); + varFreeMembers(&r); break; case 'N': ret->datatype = 'N'; @@ -1955,16 +2234,16 @@ cnfexprEval(struct cnfexpr *expr, struct var *ret, void* usrptr) COMP_NUM_BINOP(*); break; case '/': - COMP_NUM_BINOP(/); + COMP_NUM_BINOP_DIV(/); break; case '%': - COMP_NUM_BINOP(%); + COMP_NUM_BINOP_DIV(%); break; case 'M': cnfexprEval(expr->r, &r, usrptr); ret->datatype = 'N'; ret->d.n = -var2Number(&r, &convok_r); - if(r.datatype == 'S') es_deleteStr(r.d.estr); + varFreeMembers(&r); break; case 'F': doFuncCall((struct cnffunc*) expr, ret, usrptr); @@ -1976,6 +2255,7 @@ cnfexprEval(struct cnfexpr *expr, struct var *ret, void* usrptr) (unsigned) expr->nodetype, (char) expr->nodetype); break; } + DBGPRINTF("eval expr %p, return datatype '%c'\n", expr, ret->datatype); } //--------------------------------------------------------- @@ -2007,14 +2287,15 @@ cnffuncDestruct(struct cnffunc *func) break; default:break; } - free(func->funcdata); + if(func->fID != CNFFUNC_EXEC_TEMPLATE) + free(func->funcdata); free(func->fname); } /* Destruct an expression and all sub-expressions contained in it. */ void -cnfexprDestruct(struct cnfexpr *expr) +cnfexprDestruct(struct cnfexpr *__restrict__ const expr) { if(expr == NULL) { @@ -2057,6 +2338,7 @@ cnfexprDestruct(struct cnfexpr *expr) break; case 'V': free(((struct cnfvar*)expr)->name); + msgPropDescrDestruct(&(((struct cnfvar*)expr)->prop)); break; case 'F': cnffuncDestruct((struct cnffunc*)expr); @@ -2077,7 +2359,7 @@ cnfexprDestruct(struct cnfexpr *expr) * important. */ int -cnfexprEvalBool(struct cnfexpr *expr, void *usrptr) +cnfexprEvalBool(struct cnfexpr *__restrict__ const expr, void *__restrict__ const usrptr) { int convok; struct var ret; @@ -2269,11 +2551,13 @@ cnfstmtPrintOnly(struct cnfstmt *stmt, int indent, sbool subtree) break; case S_CALL: cstr = es_str2cstr(stmt->d.s_call.name, NULL); - doIndent(indent); dbgprintf("CALL [%s]\n", cstr); + doIndent(indent); dbgprintf("CALL [%s, queue:%d]\n", cstr, + stmt->d.s_call.ruleset == NULL ? 0 : 1); free(cstr); break; case S_ACT: - doIndent(indent); dbgprintf("ACTION %p [%s]\n", stmt->d.act, stmt->printable); + doIndent(indent); dbgprintf("ACTION %d [%s:%s]\n", stmt->d.act->iActionNbr, + modGetName(stmt->d.act->pMod), stmt->printable); break; case S_IF: doIndent(indent); dbgprintf("IF\n"); @@ -2313,12 +2597,12 @@ cnfstmtPrintOnly(struct cnfstmt *stmt, int indent, sbool subtree) case S_PROPFILT: doIndent(indent); dbgprintf("PROPFILT\n"); doIndent(indent); dbgprintf("\tProperty.: '%s'\n", - propIDToName(stmt->d.s_propfilt.propID)); - if(stmt->d.s_propfilt.propName != NULL) { - cstr = es_str2cstr(stmt->d.s_propfilt.propName, NULL); + propIDToName(stmt->d.s_propfilt.prop.id)); + if(stmt->d.s_propfilt.prop.id == PROP_CEE || + stmt->d.s_propfilt.prop.id == PROP_LOCAL_VAR || + stmt->d.s_propfilt.prop.id == PROP_GLOBAL_VAR) { doIndent(indent); - dbgprintf("\tCEE-Prop.: '%s'\n", cstr); - free(cstr); + dbgprintf("\tCEE-Prop.: '%s'\n", stmt->d.s_propfilt.prop.name); } doIndent(indent); dbgprintf("\tOperation: "); if(stmt->d.s_propfilt.isNegated) @@ -2351,7 +2635,7 @@ cnfstmtPrint(struct cnfstmt *root, int indent) } struct cnfnumval* -cnfnumvalNew(long long val) +cnfnumvalNew(const long long val) { struct cnfnumval *numval; if((numval = malloc(sizeof(struct cnfnumval))) != NULL) { @@ -2362,7 +2646,7 @@ cnfnumvalNew(long long val) } struct cnfstringval* -cnfstringvalNew(es_str_t *estr) +cnfstringvalNew(es_str_t *const estr) { struct cnfstringval *strval; if((strval = malloc(sizeof(struct cnfstringval))) != NULL) { @@ -2391,7 +2675,7 @@ done: return ar; } struct cnfarray* -cnfarrayAdd(struct cnfarray *ar, es_str_t *val) +cnfarrayAdd(struct cnfarray *__restrict__ const ar, es_str_t *__restrict__ val) { es_str_t **newptr; if((newptr = realloc(ar->arr, (ar->nmemb+1)*sizeof(es_str_t*))) == NULL) { @@ -2425,6 +2709,7 @@ cnfvarNew(char *name) if((var = malloc(sizeof(struct cnfvar))) != NULL) { var->nodetype = 'V'; var->name = name; + msgPropDescrFill(&var->prop, (uchar*)var->name, strlen(var->name)); } return var; } @@ -2441,59 +2726,68 @@ cnfstmtNew(unsigned s_type) return cnfstmt; } +void cnfstmtDestructLst(struct cnfstmt *root); + +/* delete a single stmt */ +static void +cnfstmtDestruct(struct cnfstmt *stmt) +{ + switch(stmt->nodetype) { + case S_NOP: + case S_STOP: + break; + case S_CALL: + es_deleteStr(stmt->d.s_call.name); + break; + case S_ACT: + actionDestruct(stmt->d.act); + break; + case S_IF: + cnfexprDestruct(stmt->d.s_if.expr); + if(stmt->d.s_if.t_then != NULL) { + cnfstmtDestructLst(stmt->d.s_if.t_then); + } + if(stmt->d.s_if.t_else != NULL) { + cnfstmtDestructLst(stmt->d.s_if.t_else); + } + break; + case S_SET: + free(stmt->d.s_set.varname); + cnfexprDestruct(stmt->d.s_set.expr); + break; + case S_UNSET: + free(stmt->d.s_set.varname); + break; + case S_PRIFILT: + cnfstmtDestructLst(stmt->d.s_prifilt.t_then); + cnfstmtDestructLst(stmt->d.s_prifilt.t_else); + break; + case S_PROPFILT: + msgPropDescrDestruct(&stmt->d.s_propfilt.prop); + if(stmt->d.s_propfilt.regex_cache != NULL) + rsCStrRegexDestruct(&stmt->d.s_propfilt.regex_cache); + if(stmt->d.s_propfilt.pCSCompValue != NULL) + cstrDestruct(&stmt->d.s_propfilt.pCSCompValue); + cnfstmtDestructLst(stmt->d.s_propfilt.t_then); + break; + default: + dbgprintf("error: unknown stmt type during destruct %u\n", + (unsigned) stmt->nodetype); + break; + } + free(stmt->printable); + free(stmt); +} + +/* delete a stmt and all others following it */ void -cnfstmtDestruct(struct cnfstmt *root) +cnfstmtDestructLst(struct cnfstmt *root) { struct cnfstmt *stmt, *todel; for(stmt = root ; stmt != NULL ; ) { - switch(stmt->nodetype) { - case S_NOP: - case S_STOP: - break; - case S_CALL: - es_deleteStr(stmt->d.s_call.name); - break; - case S_ACT: - actionDestruct(stmt->d.act); - break; - case S_IF: - cnfexprDestruct(stmt->d.s_if.expr); - if(stmt->d.s_if.t_then != NULL) { - cnfstmtDestruct(stmt->d.s_if.t_then); - } - if(stmt->d.s_if.t_else != NULL) { - cnfstmtDestruct(stmt->d.s_if.t_else); - } - break; - case S_SET: - free(stmt->d.s_set.varname); - cnfexprDestruct(stmt->d.s_set.expr); - break; - case S_UNSET: - free(stmt->d.s_set.varname); - break; - case S_PRIFILT: - cnfstmtDestruct(stmt->d.s_prifilt.t_then); - cnfstmtDestruct(stmt->d.s_prifilt.t_else); - break; - case S_PROPFILT: - if(stmt->d.s_propfilt.propName != NULL) - es_deleteStr(stmt->d.s_propfilt.propName); - if(stmt->d.s_propfilt.regex_cache != NULL) - rsCStrRegexDestruct(&stmt->d.s_propfilt.regex_cache); - if(stmt->d.s_propfilt.pCSCompValue != NULL) - cstrDestruct(&stmt->d.s_propfilt.pCSCompValue); - cnfstmtDestruct(stmt->d.s_propfilt.t_then); - break; - default: - dbgprintf("error: unknown stmt type during destruct %u\n", - (unsigned) stmt->nodetype); - break; - } - free(stmt->printable); todel = stmt; stmt = stmt->next; - free(todel); + cnfstmtDestruct(todel); } } @@ -2551,14 +2845,15 @@ struct cnfstmt * cnfstmtNewPROPFILT(char *propfilt, struct cnfstmt *t_then) { struct cnfstmt* cnfstmt; - rsRetVal lRet; if((cnfstmt = cnfstmtNew(S_PROPFILT)) != NULL) { cnfstmt->printable = (uchar*)propfilt; cnfstmt->d.s_propfilt.t_then = t_then; - cnfstmt->d.s_propfilt.propName = NULL; cnfstmt->d.s_propfilt.regex_cache = NULL; cnfstmt->d.s_propfilt.pCSCompValue = NULL; - lRet = DecodePropFilter((uchar*)propfilt, cnfstmt); + if(DecodePropFilter((uchar*)propfilt, cnfstmt) != RS_RET_OK) { + cnfstmt->nodetype = S_NOP; /* disable action! */ + cnfstmtDestructLst(t_then); /* we do no longer need this */ + } } return cnfstmt; } @@ -2599,7 +2894,7 @@ cnfstmtNewLegaAct(char *actline) goto done; cnfstmt->printable = (uchar*)strdup((char*)actline); localRet = cflineDoAction(loadConf, (uchar**)&actline, &cnfstmt->d.act); - if(localRet != RS_RET_OK && localRet != RS_RET_OK_WARN) { + if(localRet != RS_RET_OK) { parser_errmsg("%s occured in file '%s' around line %d", (localRet == RS_RET_OK_WARN) ? "warnings" : "errors", cnfcurrfn, yylineno); @@ -2714,7 +3009,10 @@ cnfexprOptimize_CMP_severity_facility(struct cnfexpr *expr) { struct cnffunc *func; - if(!strcmp("$syslogseverity", ((struct cnfvar*)expr->l)->name)) { + if(expr->l->nodetype != 'V') + FINALIZE; + + if(!strcmp("syslogseverity", ((struct cnfvar*)expr->l)->name)) { if(expr->r->nodetype == 'N') { int sev = (int) ((struct cnfnumval*)expr->r)->val; if(sev >= 0 && sev <= 7) { @@ -2728,7 +3026,7 @@ cnfexprOptimize_CMP_severity_facility(struct cnfexpr *expr) "evaluate to FALSE", sev); } } - } else if(!strcmp("$syslogfacility", ((struct cnfvar*)expr->l)->name)) { + } else if(!strcmp("syslogfacility", ((struct cnfvar*)expr->l)->name)) { if(expr->r->nodetype == 'N') { int fac = (int) ((struct cnfnumval*)expr->r)->val; if(fac >= 0 && fac <= 24) { @@ -2743,6 +3041,7 @@ cnfexprOptimize_CMP_severity_facility(struct cnfexpr *expr) } } } +finalize_it: return expr; } @@ -2755,7 +3054,7 @@ cnfexprOptimize_CMP_var(struct cnfexpr *expr) { struct cnffunc *func; - if(!strcmp("$syslogfacility-text", ((struct cnfvar*)expr->l)->name)) { + if(!strcmp("syslogfacility-text", ((struct cnfvar*)expr->l)->name)) { if(expr->r->nodetype == 'S') { char *cstr = es_str2cstr(((struct cnfstringval*)expr->r)->estr, NULL); int fac = decodeSyslogName((uchar*)cstr, syslogFacNames); @@ -2763,7 +3062,7 @@ cnfexprOptimize_CMP_var(struct cnfexpr *expr) parser_errmsg("invalid facility '%s', expression will always " "evaluate to FALSE", cstr); } else { - /* we can acutally optimize! */ + /* we can actually optimize! */ DBGPRINTF("optimizer: change comparison OP to FUNC prifilt()\n"); func = cnffuncNew_prifilt(fac); if(expr->nodetype == CMP_NE) @@ -2773,7 +3072,7 @@ cnfexprOptimize_CMP_var(struct cnfexpr *expr) } free(cstr); } - } else if(!strcmp("$syslogseverity-text", ((struct cnfvar*)expr->l)->name)) { + } else if(!strcmp("syslogseverity-text", ((struct cnfvar*)expr->l)->name)) { if(expr->r->nodetype == 'S') { char *cstr = es_str2cstr(((struct cnfstringval*)expr->r)->estr, NULL); int sev = decodeSyslogName((uchar*)cstr, syslogPriNames); @@ -2842,7 +3141,7 @@ cnfexprOptimize_AND_OR(struct cnfexpr *expr) static inline void cnfexprOptimize_CMPEQ_arr(struct cnfarray *arr) { - DBGPRINTF("optimizer: sorting array for CMP_EQ/NEQ comparison\n"); + DBGPRINTF("optimizer: sorting array of %d members for CMP_EQ/NEQ comparison\n", arr->nmemb); qsort(arr->arr, arr->nmemb, sizeof(es_str_t*), qs_arrcmp); } @@ -2880,13 +3179,23 @@ cnfexprOptimize(struct cnfexpr *expr) case '/': if(getConstNumber(expr, &ln, &rn)) { expr->nodetype = 'N'; - ((struct cnfnumval*)expr)->val = ln / rn; + if(rn == 0) { + /* division by zero */ + ((struct cnfnumval*)expr)->val = 0; + } else { + ((struct cnfnumval*)expr)->val = ln / rn; + } } break; case '%': if(getConstNumber(expr, &ln, &rn)) { expr->nodetype = 'N'; - ((struct cnfnumval*)expr)->val = ln % rn; + if(rn == 0) { + /* division by zero */ + ((struct cnfnumval*)expr)->val = 0; + } else { + ((struct cnfnumval*)expr)->val = ln % rn; + } } break; case CMP_NE: @@ -2904,10 +3213,14 @@ cnfexprOptimize(struct cnfexpr *expr) expr->r = exprswap; } } + if(expr->r->nodetype == 'A') { + cnfexprOptimize_CMPEQ_arr((struct cnfarray *)expr->r); + } + /* This should be evaluated last because it may change expr + * to a function. + */ if(expr->l->nodetype == 'V') { expr = cnfexprOptimize_CMP_var(expr); - } else if(expr->r->nodetype == 'A') { - cnfexprOptimize_CMPEQ_arr((struct cnfarray *)expr->r); } break; case CMP_LE: @@ -3044,7 +3357,7 @@ cnfstmtOptimizePRIFilt(struct cnfstmt *stmt) DBGPRINTF("optimizer: removing always-true PRIFILT %p\n", stmt); if(stmt->d.s_prifilt.t_else != NULL) { parser_errmsg("error: always-true PRI filter has else part!\n"); - cnfstmtDestruct(stmt->d.s_prifilt.t_else); + cnfstmtDestructLst(stmt->d.s_prifilt.t_else); } free(stmt->printable); stmt->printable = NULL; @@ -3084,8 +3397,14 @@ cnfstmtOptimizeCall(struct cnfstmt *stmt) stmt->nodetype = S_NOP; goto done; } - DBGPRINTF("CALL obtained ruleset ptr %p for ruleset %s\n", pRuleset, rsName); - stmt->d.s_call.stmt = pRuleset->root; + DBGPRINTF("CALL obtained ruleset ptr %p for ruleset %s [hasQueue:%d]\n", + pRuleset, rsName, rulesetHasQueue(pRuleset)); + if(rulesetHasQueue(pRuleset)) { + stmt->d.s_call.ruleset = pRuleset; + } else { + stmt->d.s_call.ruleset = NULL; + stmt->d.s_call.stmt = pRuleset->root; + } done: free(rsName); return; @@ -3210,6 +3529,13 @@ funcName2ID(es_str_t *fname, unsigned short nParams) return CNFFUNC_INVALID; } return CNFFUNC_FIELD; + } else if(!es_strbufcmp(fname, (unsigned char*)"exec_template", sizeof("exec_template") - 1)) { + if(nParams != 1) { + parser_errmsg("number of parameters for exec-template() must be one " + "but is %d.", nParams); + return CNFFUNC_INVALID; + } + return CNFFUNC_EXEC_TEMPLATE; } else if(!es_strbufcmp(fname, (unsigned char*)"prifilt", sizeof("prifilt") - 1)) { if(nParams != 1) { parser_errmsg("number of parameters for prifilt() must be one " @@ -3217,6 +3543,13 @@ funcName2ID(es_str_t *fname, unsigned short nParams) return CNFFUNC_INVALID; } return CNFFUNC_PRIFILT; + } else if(!es_strbufcmp(fname, (unsigned char*)"lookup", sizeof("lookup") - 1)) { + if(nParams != 2) { + parser_errmsg("number of parameters for lookup() must be two " + "but is %d.", nParams); + return CNFFUNC_INVALID; + } + return CNFFUNC_LOOKUP; } else { return CNFFUNC_INVALID; } @@ -3258,6 +3591,31 @@ finalize_it: } +static rsRetVal +initFunc_exec_template(struct cnffunc *func) +{ + char *tplName = NULL; + DEFiRet; + + if(func->expr[0]->nodetype != 'S') { + parser_errmsg("exec_template(): param 1 must be a constant string"); + FINALIZE; + } + + tplName = es_str2cstr(((struct cnfstringval*) func->expr[0])->estr, NULL); + func->funcdata = tplFind(ourConf, tplName, strlen(tplName)); + if(func->funcdata == NULL) { + parser_errmsg("exec_template(): template '%s' could not be found", tplName); + FINALIZE; + } + + +finalize_it: + free(tplName); + RETiRet; +} + + static inline rsRetVal initFunc_prifilt(struct cnffunc *func) { @@ -3281,6 +3639,30 @@ finalize_it: } +static inline rsRetVal +initFunc_lookup(struct cnffunc *func) +{ + uchar *cstr = NULL; + DEFiRet; + + func->funcdata = NULL; + if(func->expr[0]->nodetype != 'S') { + parser_errmsg("table name (param 1) of lookup() must be a constant string"); + FINALIZE; + } + + cstr = (uchar*)es_str2cstr(((struct cnfstringval*) func->expr[0])->estr, NULL); + if((func->funcdata = lookupFindTable(cstr)) == NULL) { + parser_errmsg("lookup table '%s' not found", cstr); + FINALIZE; + } + +finalize_it: + free(cstr); + RETiRet; +} + + struct cnffunc * cnffuncNew(es_str_t *fname, struct cnffparamlst* paramlst) { @@ -3318,6 +3700,12 @@ cnffuncNew(es_str_t *fname, struct cnffparamlst* paramlst) case CNFFUNC_PRIFILT: initFunc_prifilt(func); break; + case CNFFUNC_LOOKUP: + initFunc_lookup(func); + break; + case CNFFUNC_EXEC_TEMPLATE: + initFunc_exec_template(func); + break; default:break; } } @@ -3333,13 +3721,20 @@ cnffuncNew_prifilt(int fac) { struct cnffunc* func; + fac >>= 3; + if (fac >= LOG_NFACILITIES + 1 || fac < 0) + return NULL; + if((func = malloc(sizeof(struct cnffunc))) != NULL) { + if ((func->funcdata = calloc(1, sizeof(struct funcData_prifilt))) == NULL) { + free(func); + return NULL; + } func->nodetype = 'F'; func->fname = es_newStrFromCStr("prifilt", sizeof("prifilt")-1); func->nParams = 0; func->fID = CNFFUNC_PRIFILT; - func->funcdata = calloc(1, sizeof(struct funcData_prifilt)); - ((struct funcData_prifilt *)func->funcdata)->pmask[fac >> 3] = TABLE_ALLPRI; + ((struct funcData_prifilt *)func->funcdata)->pmask[fac] = TABLE_ALLPRI; } return func; } @@ -3444,6 +3839,8 @@ void cnfparamvalsDestruct(struct cnfparamvals *paramvals, struct cnfparamblk *blk) { int i; + if(paramvals == NULL) + return; for(i = 0 ; i < blk->nParams ; ++i) { if(paramvals[i].bUsed) { varDelete(¶mvals[i].val); diff --git a/grammar/rainerscript.h b/grammar/rainerscript.h index 31b2eb9..453b0f3 100644 --- a/grammar/rainerscript.h +++ b/grammar/rainerscript.h @@ -1,3 +1,21 @@ +/* rsyslog rainerscript definitions + * + * Copyright 2011-2014 Rainer Gerhards + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * -or- + * see COPYING.ASL20 in the source distribution + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ #ifndef INC_UTILS_H #define INC_UTILS_H #include <stdio.h> @@ -5,9 +23,9 @@ #include <typedefs.h> #include <sys/types.h> #include <regex.h> +#include "typedefs.h" - -#define LOG_NFACILITIES 24 /* current number of syslog facilities */ +#define LOG_NFACILITIES 24+1 /* we copy&paste this as including rsyslog.h gets us in off64_t trouble... :-( */ #define CNFFUNC_MAX_ARGS 32 /**< maximum number of arguments that any function can have (among * others, this is used to size data structures). @@ -24,6 +42,10 @@ enum cnfobjType { CNFOBJ_TPL, CNFOBJ_PROPERTY, CNFOBJ_CONSTANT, + CNFOBJ_MAINQ, + CNFOBJ_LOOKUP_TABLE, + CNFOBJ_PARSER, + CNFOBJ_TIMEZONE, CNFOBJ_INVALID = 0 }; @@ -55,6 +77,11 @@ cnfobjType2str(enum cnfobjType ot) case CNFOBJ_CONSTANT: return "constant"; break; + case CNFOBJ_MAINQ: + return "main_queue"; + case CNFOBJ_LOOKUP_TABLE: + return "lookup_table"; + break; default:return "error: invalid cnfobjType"; } } @@ -164,6 +191,7 @@ struct cnfstmt { struct { es_str_t *name; struct cnfstmt *stmt; + ruleset_t *ruleset; /* non-NULL if the ruleset has a queue assigned */ } s_call; struct { uchar pmask[LOG_NFACILITIES+1]; /* priority mask */ @@ -175,8 +203,7 @@ struct cnfstmt { regex_t *regex_cache;/* cache for compiled REs, if used */ struct cstr_s *pCSCompValue;/* value to "compare" against */ sbool isNegated; - uintTiny propID;/* ID of the requested property */ - es_str_t *propName;/* name of property for CEE-based filters */ + msgPropDescr_t prop; /* requested property */ struct cnfstmt *t_then; struct cnfstmt *t_else; } s_propfilt; @@ -203,6 +230,7 @@ struct cnfstringval { struct cnfvar { unsigned nodetype; char *name; + msgPropDescr_t prop; }; struct cnfarray { @@ -228,7 +256,9 @@ enum cnffuncid { CNFFUNC_RE_MATCH, CNFFUNC_RE_EXTRACT, CNFFUNC_FIELD, - CNFFUNC_PRIFILT + CNFFUNC_PRIFILT, + CNFFUNC_LOOKUP, + CNFFUNC_EXEC_TEMPLATE }; struct cnffunc { @@ -301,7 +331,7 @@ void cnfobjDestruct(struct cnfobj *o); void cnfobjPrint(struct cnfobj *o); struct cnfexpr* cnfexprNew(unsigned nodetype, struct cnfexpr *l, struct cnfexpr *r); void cnfexprPrint(struct cnfexpr *expr, int indent); -void cnfexprEval(struct cnfexpr *expr, struct var *ret, void *pusr); +void cnfexprEval(const struct cnfexpr *const expr, struct var *ret, void *pusr); int cnfexprEvalBool(struct cnfexpr *expr, void *usrptr); void cnfexprDestruct(struct cnfexpr *expr); struct cnfnumval* cnfnumvalNew(long long val); @@ -331,13 +361,13 @@ struct cnfstmt * cnfstmtNewSet(char *var, struct cnfexpr *expr); struct cnfstmt * cnfstmtNewUnset(char *var); struct cnfstmt * cnfstmtNewCall(es_str_t *name); struct cnfstmt * cnfstmtNewContinue(void); -void cnfstmtDestruct(struct cnfstmt *root); +void cnfstmtDestructLst(struct cnfstmt *root); void cnfstmtOptimize(struct cnfstmt *root); struct cnfarray* cnfarrayNew(es_str_t *val); struct cnfarray* cnfarrayDup(struct cnfarray *old); struct cnfarray* cnfarrayAdd(struct cnfarray *ar, es_str_t *val); void cnfarrayContentDestruct(struct cnfarray *ar); -char* getFIOPName(unsigned iFIOP); +const char* getFIOPName(unsigned iFIOP); rsRetVal initRainerscript(void); void unescapeStr(uchar *s, int len); char * tokenval2str(int tok); |