summaryrefslogtreecommitdiffstats
path: root/expr.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-02-25 15:23:57 +0000
committerRainer Gerhards <rgerhards@adiscon.com>2008-02-25 15:23:57 +0000
commit50ddd3fd7de672a2fa2df67adb27401cc38ce38c (patch)
treee509dc31fce2c6edb230147ee547b3967bc636c2 /expr.c
parentc9fc3fc06d2566aa6aed977af66392dce97d1264 (diff)
downloadrsyslog-50ddd3fd7de672a2fa2df67adb27401cc38ce38c.tar.gz
rsyslog-50ddd3fd7de672a2fa2df67adb27401cc38ce38c.tar.xz
rsyslog-50ddd3fd7de672a2fa2df67adb27401cc38ce38c.zip
added string concatenation operator & to RainerScript
Diffstat (limited to 'expr.c')
-rw-r--r--expr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/expr.c b/expr.c
index 156621c1..03ced285 100644
--- a/expr.c
+++ b/expr.c
@@ -211,8 +211,8 @@ val(expr_t *pThis, ctok_t *tok)
/* *(("+" / "-") term) part */
CHKiRet(ctok.GetToken(tok, &pToken));
- while(pToken->tok == ctok_PLUS || pToken->tok == ctok_MINUS) {
- dbgoprint((obj_t*) pThis, "+/-\n");
+ while(pToken->tok == ctok_PLUS || pToken->tok == ctok_MINUS || pToken->tok == ctok_STRADD) {
+ dbgoprint((obj_t*) pThis, "+/-/&\n");
CHKiRet(term(pThis, tok));
CHKiRet(vmprg.AddVarOperation(pThis->pVmprg, (opcode_t) pToken->tok, NULL)); /* add to program */
CHKiRet(ctok_token.Destruct(&pToken)); /* no longer needed */