The expression's head was first checking for LT, and then for LTIME,

and the latter was never reached. -- Stanislav Sinyagin <ssinyagin@yahoo.com>

git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@258 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/src/rrd_rpncalc.c b/src/rrd_rpncalc.c
index 52d7a11..94796d1 100644 (file)
--- a/src/rrd_rpncalc.c
+++ b/src/rrd_rpncalc.c
@@ -300,6 +300,7 @@ rpn_parse(void *key_hash,char *expr,long (*lookup)(void *,char*)){
        match_op(OP_DUP,DUP)
        match_op(OP_EXC,EXC)
        match_op(OP_POP,POP)
        match_op(OP_DUP,DUP)
        match_op(OP_EXC,EXC)
        match_op(OP_POP,POP)

+       match_op(OP_LTIME,LTIME)

        match_op(OP_LT,LT)
        match_op(OP_LE,LE)
        match_op(OP_GT,GT)
        match_op(OP_LT,LT)
        match_op(OP_LE,LE)
        match_op(OP_GT,GT)


@@ -320,7 +321,6 @@ rpn_parse(void *key_hash,char *expr,long (*lookup)(void *,char*)){
        match_op(OP_INF,INF)
        match_op(OP_ISINF,ISINF)
        match_op(OP_NOW,NOW)
        match_op(OP_INF,INF)
        match_op(OP_ISINF,ISINF)
        match_op(OP_NOW,NOW)

-       match_op(OP_LTIME,LTIME)

        match_op(OP_TIME,TIME)
        match_op(OP_ATAN,ATAN)
 
        match_op(OP_TIME,TIME)
        match_op(OP_ATAN,ATAN)