Use DBG macro

src/expr.c

@@ -685,16 +685,12 @@ eval_userfunc(expr_node *node, Value *locals, Value *ans, int *nonconst)
     /* Add a call to the call stack for better error messages */
     pushed = push_call(f->filename, f->name, f->lineno);
 
-    if (DebugFlag & DB_PRTEXPR) {
-        debug_enter_userfunc(node, new_locals, f->nargs);
-    }
+    DBG(debug_enter_userfunc(node, new_locals, f->nargs));
 
     /* Evaluate the function's expr_node tree */
     r = evaluate_expr_node(f->node, new_locals, ans, nonconst);
 
-    if (DebugFlag & DB_PRTEXPR) {
-        debug_exit_userfunc(node, ans, r, new_locals, f->nargs);
-    }
+    DBG(debug_exit_userfunc(node, ans, r, new_locals, f->nargs));
 
     if (r != OK) {
         /* We print the error here in order to get the call stack trace */
@@ -1506,18 +1502,7 @@ static int logical_and(expr_node *node, Value *locals, Value *ans, int *nonconst
 /*  Read a token.                                              */
 /*                                                             */
 /***************************************************************/
-static int parse_expr_token_aux(DynamicBuffer *buf, char const **in);
 static int parse_expr_token(DynamicBuffer *buf, char const **in)
-{
-    int r = parse_expr_token_aux(buf, in);
-
-    /* Munch any following whitespace */
-    while (**in && isempty(**in)) (*in)++;
-
-    return r;
-}
-
-static int parse_expr_token_aux(DynamicBuffer *buf, char const **in)
 {
 
     char c;
@@ -1700,7 +1685,7 @@ static int parse_expr_token_aux(DynamicBuffer *buf, char const **in)
 /***************************************************************/
 static int peek_expr_token(DynamicBuffer *buf, char const *in)
 {
-    return parse_expr_token_aux(buf, &in);
+    return parse_expr_token(buf, &in);
 }
 
 /***************************************************************/