diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-02-21 14:59:18 +0000 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-02-21 14:59:18 +0000 |
| commit | 2d5d05e7c5d3c2c3e1575ae7e240492f7df34256 (patch) | |
| tree | cbf6cd6b6bde716e7f55de1a3bb6944afc0093b0 /expr.c | |
| parent | 45136c665690534d934d0c0c188dbb18a0131b96 (diff) | |
| download | rsyslog-2d5d05e7c5d3c2c3e1575ae7e240492f7df34256.tar.gz rsyslog-2d5d05e7c5d3c2c3e1575ae7e240492f7df34256.tar.xz rsyslog-2d5d05e7c5d3c2c3e1575ae7e240492f7df34256.zip | |
changed tokenizer to utilize var class instead of scalar types
Diffstat (limited to 'expr.c')
| -rw-r--r-- | expr.c | 6 |
1 files changed, 1 insertions, 5 deletions
@@ -64,7 +64,6 @@ terminal(expr_t *pThis, ctok_t *tok) DEFiRet; ctok_token_t *pToken; var_t *pVar; - cstr_t *pCStr; ISOBJ_TYPE_assert(pThis, expr); ISOBJ_TYPE_assert(tok, ctok); @@ -73,11 +72,8 @@ terminal(expr_t *pThis, ctok_t *tok) switch(pToken->tok) { case ctok_SIMPSTR: - CHKiRet(var.Construct(&pVar)); - CHKiRet(var.ConstructFinalize(pVar)); - CHKiRet(ctok_token.UnlinkCStr(pToken, &pCStr)); - CHKiRet(var.SetString(pVar, pCStr)); dbgoprint((obj_t*) pThis, "simpstr\n"); + CHKiRet(ctok_token.UnlinkVar(pToken, &pVar)); CHKiRet(vmprg.AddVarOperation(pThis->pVmprg, opcode_PUSHCONSTANT, pVar)); /* add to program */ break; case ctok_NUMBER: |