Merge branch 'v3-stable' into beta

2 files changed, 0 insertions, 10 deletions

diff --git a/expr.c b/expr.c
index e6f4ef23..5c11b756 100644
--- a/expr.c
+++ b/expr.c
@@ -371,7 +371,6 @@ exprParse(expr_t *pThis, ctok_t *tok)
 	/* happy parsing... */
 	CHKiRet(expr(pThis, tok));
 	dbgoprint((obj_t*) pThis, "successfully parsed/created expression\n");
-vmprg.DebugPrint(pThis->pVmprg);
 
 finalize_it:
 	RETiRet;
@@ -392,8 +391,6 @@ CODESTARTobjQueryInterface(expr)
 	 * work here (if we can support an older interface version - that,
 	 * of course, also affects the "if" above).
 	 */
-	//xxxpIf->oID = OBJexpr;
-
 	pIf->Construct = exprConstruct;
 	pIf->ConstructFinalize = exprConstructFinalize;
 	pIf->Destruct = exprDestruct;
diff --git a/vm.c b/vm.c
index a26e4331..b97898c5 100644
--- a/vm.c
+++ b/vm.c
@@ -193,8 +193,6 @@ CODESTARTop(CMP_CONTAINS)
 	/* operand2 is on top of stack, so needs to be popped first */
 	vmstk.PopString(pThis->pStk, &operand2);
 	vmstk.PopString(pThis->pStk, &operand1);
-var.DebugPrint(operand1); \
-var.DebugPrint(operand2); \
 	/* TODO: extend cstr class so that it supports location of cstr inside cstr */
 	bRes = (rsCStrLocateInSzStr(operand2->val.pStr, rsCStrGetSzStr(operand1->val.pStr)) == -1) ? 0 : 1;
 
@@ -233,8 +231,6 @@ CODESTARTop(CMP_STARTSWITH)
 	/* operand2 is on top of stack, so needs to be popped first */
 	vmstk.PopString(pThis->pStk, &operand2);
 	vmstk.PopString(pThis->pStk, &operand1);
-var.DebugPrint(operand1); \
-var.DebugPrint(operand2); \
 	/* TODO: extend cstr class so that it supports location of cstr inside cstr */
 	bRes = (rsCStrStartsWithSzStr(operand1->val.pStr, rsCStrGetSzStr(operand2->val.pStr),
 		rsCStrLen(operand2->val.pStr)) == 0) ? 1 : 0;
@@ -254,14 +250,11 @@ CODESTARTop(CMP_STARTSWITHI)
 	/* operand2 is on top of stack, so needs to be popped first */
 	vmstk.PopString(pThis->pStk, &operand2);
 	vmstk.PopString(pThis->pStk, &operand1);
-var.DebugPrint(operand1); \
-var.DebugPrint(operand2); \
 	/* TODO: extend cstr class so that it supports location of cstr inside cstr */
 	bRes = (rsCStrCaseInsensitveStartsWithSzStr(operand1->val.pStr, rsCStrGetSzStr(operand2->val.pStr),
 		rsCStrLen(operand2->val.pStr)) == 0) ? 1 : 0;
 
 	/* we have a result, so let's push it */
-RUNLOG_VAR("%lld", bRes); \
 	PUSHRESULTop(operand1, bRes);
 	var.Destruct(&operand2); /* no longer needed */
 ENDop(CMP_STARTSWITHI)