diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-05 12:33:48 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-05 12:33:48 +0200 |
| commit | f8e7c7e3656085bee11b1667f32828dfb4e3df06 (patch) | |
| tree | a70921c7ae31d4174c7c166a05619f4506a7e62f /grammar/grammar.y | |
| parent | 6175ce90b59d742976aa5a8b2603902761e540ae (diff) | |
| download | rsyslog-f8e7c7e3656085bee11b1667f32828dfb4e3df06.tar.gz rsyslog-f8e7c7e3656085bee11b1667f32828dfb4e3df06.tar.xz rsyslog-f8e7c7e3656085bee11b1667f32828dfb4e3df06.zip | |
milestone: some plumbing for rsyslog/stand alone parsing
Diffstat (limited to 'grammar/grammar.y')
| -rw-r--r-- | grammar/grammar.y | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/grammar/grammar.y b/grammar/grammar.y index 76881fd1..43e0289a 100644 --- a/grammar/grammar.y +++ b/grammar/grammar.y @@ -17,6 +17,7 @@ #include <stdio.h> #include <libestr.h> #include "utils.h" +#include "parserif.h" #define YYDEBUG 1 extern int yylineno; @@ -103,13 +104,13 @@ extern int yyerror(char*); * one by one. */ conf: /* empty (to end recursion) */ - | conf obj { printf("global:config: "); + | conf obj { dbgprintf("global:config: "); cnfobjPrint($2); cnfobjDestruct($2); } - | conf rule { printf("global:rule processed\n"); + | conf rule { dbgprintf("global:rule processed\n"); cnfrulePrint($2); } - | conf cfsysline { printf("global:cfsysline: %s\n", $2); } - | conf BSD_TAG_SELECTOR { printf("global:BSD tag '%s'\n", $2); } - | conf BSD_HOST_SELECTOR { printf("global:BSD host '%s'\n", $2); } + | conf cfsysline { dbgprintf("global:cfsysline: %s\n", $2); } + | conf BSD_TAG_SELECTOR { dbgprintf("global:BSD tag '%s'\n", $2); } + | conf BSD_HOST_SELECTOR { dbgprintf("global:BSD host '%s'\n", $2); } obj: BEGINOBJ nvlst ENDOBJ { $$ = cnfobjNew($1, $2); } | BEGIN_ACTION nvlst ENDOBJ { $$ = cnfobjNew(CNFOBJ_ACTION, $2); } @@ -162,8 +163,10 @@ fparams: expr { $$ = cnffparamlstNew($1, NULL); } | expr ',' fparams { $$ = cnffparamlstNew($1, $3); } %% +/* int yyerror(char *s) { printf("parse failure on or before line %d: %s\n", yylineno, s); return 0; } +*/ |