From 2d5d05e7c5d3c2c3e1575ae7e240492f7df34256 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Thu, 21 Feb 2008 14:59:18 +0000
Subject: changed tokenizer to utilize var class instead of scalar types

---
 expr.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'expr.c')

diff --git a/expr.c b/expr.c
index 23284b10..e84eab17 100644
--- a/expr.c
+++ b/expr.c
@@ -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:
-- 
cgit