diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-06 10:05:29 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-06 10:05:29 +0200 |
| commit | 2081c264a3b3219ed4756e548ec9b122fae9328c (patch) | |
| tree | 5d34b18c4db4c98a7f086d7d651141761029f6c0 /grammar/grammar.y | |
| parent | f8e7c7e3656085bee11b1667f32828dfb4e3df06 (diff) | |
| download | rsyslog-2081c264a3b3219ed4756e548ec9b122fae9328c.tar.gz rsyslog-2081c264a3b3219ed4756e548ec9b122fae9328c.tar.xz rsyslog-2081c264a3b3219ed4756e548ec9b122fae9328c.zip | |
milestone: abstracted parser interface ...
so that both testdriver and other callers (rsyslog!) can use it
without changing the parser (this simplifies development).
Diffstat (limited to 'grammar/grammar.y')
| -rw-r--r-- | grammar/grammar.y | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/grammar/grammar.y b/grammar/grammar.y index 43e0289a..428011c5 100644 --- a/grammar/grammar.y +++ b/grammar/grammar.y @@ -104,14 +104,11 @@ extern int yyerror(char*); * one by one. */ conf: /* empty (to end recursion) */ - | conf obj { dbgprintf("global:config: "); - cnfobjPrint($2); cnfobjDestruct($2); } - | conf rule { dbgprintf("global:rule processed\n"); - cnfrulePrint($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); } - + | conf obj { cnfDoObj($2); } + | conf rule { cnfDoRule($2); } + | conf cfsysline { cnfDoCfsysline($2); } + | conf BSD_TAG_SELECTOR { cnfDoBSDTag($2); } + | conf BSD_HOST_SELECTOR { cnfDoBSDHost($2); } obj: BEGINOBJ nvlst ENDOBJ { $$ = cnfobjNew($1, $2); } | BEGIN_ACTION nvlst ENDOBJ { $$ = cnfobjNew(CNFOBJ_ACTION, $2); } cfsysline: CFSYSLINE { $$ = $1; } |