test/awtk
1
0
Fork 0
mirror of https://gitee.com/zlgopen/awtk.git synced 2024-12-02 20:18:22 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

improve expr eval

Browse Source
This commit is contained in:
lixianjing 2019-05-29 11:13:59 +08:00
parent bf54ad1e42
commit 60fe075c79
2 changed files with 82 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/tkc/expr_eval.c
View File

@ -806,11 +806,7 @@ static EvalResult parse_product(EvalContext* ctx, ExprValue* output) {
for (;;) { for (;;) {
int type = ctx->token.type; int type = ctx->token.type;
if (type == EVAL_TOKEN_TYPE_MULTIPLY || type == EVAL_TOKEN_TYPE_DIVIDE || if (type == EVAL_TOKEN_TYPE_MULTIPLY || type == EVAL_TOKEN_TYPE_DIVIDE) {
type == EVAL_TOKEN_TYPE_E || type == EVAL_TOKEN_TYPE_L || type == EVAL_TOKEN_TYPE_G ||
type == EVAL_TOKEN_TYPE_NE || type == EVAL_TOKEN_TYPE_LE || type == EVAL_TOKEN_TYPE_GE ||
type == EVAL_TOKEN_TYPE_OR || type == EVAL_TOKEN_TYPE_AND ||
type == EVAL_TOKEN_TYPE_BITS_OR || type == EVAL_TOKEN_TYPE_BITS_AND) {
result = get_token(ctx); result = get_token(ctx);
if (result != EVAL_RESULT_OK) return result; if (result != EVAL_RESULT_OK) return result;
@ -861,6 +857,72 @@ static EvalResult parse_sum(EvalContext* ctx, ExprValue* output) {
return EVAL_RESULT_OK; return EVAL_RESULT_OK;
} }
static EvalResult parse_compare(EvalContext* ctx, ExprValue* output) {
ExprValue lhs;
ExprValue rhs;
EvalResult result;
expr_value_init(&lhs);
expr_value_init(&rhs);
result = parse_sum(ctx, &lhs);
if (result != EVAL_RESULT_OK) return result;
for (;;) {
int type = ctx->token.type;
if (type == EVAL_TOKEN_TYPE_E || type == EVAL_TOKEN_TYPE_L || type == EVAL_TOKEN_TYPE_G ||
type == EVAL_TOKEN_TYPE_NE || type == EVAL_TOKEN_TYPE_LE || type == EVAL_TOKEN_TYPE_GE) {
result = get_token(ctx);
if (result != EVAL_RESULT_OK) return result;
result = parse_sum(ctx, &rhs);
if (result != EVAL_RESULT_OK) return result;
expr_value_op(&lhs, &rhs, (EvalTokenType)type);
} else {
break;
}
}
*output = lhs;
expr_value_clear(&rhs);
return EVAL_RESULT_OK;
}
static EvalResult parse_logic(EvalContext* ctx, ExprValue* output) {
ExprValue lhs;
ExprValue rhs;
EvalResult result;
expr_value_init(&lhs);
expr_value_init(&rhs);
result = parse_compare(ctx, &lhs);
if (result != EVAL_RESULT_OK) return result;
for (;;) {
int type = ctx->token.type;
if (type == EVAL_TOKEN_TYPE_OR || type == EVAL_TOKEN_TYPE_AND ||
type == EVAL_TOKEN_TYPE_BITS_OR || type == EVAL_TOKEN_TYPE_BITS_AND) {
result = get_token(ctx);
if (result != EVAL_RESULT_OK) return result;
result = parse_compare(ctx, &rhs);
if (result != EVAL_RESULT_OK) return result;
expr_value_op(&lhs, &rhs, (EvalTokenType)type);
} else {
break;
}
}
*output = lhs;
expr_value_clear(&rhs);
return EVAL_RESULT_OK;
}
static EvalResult parse_expr(EvalContext* ctx, ExprValue* output) { static EvalResult parse_expr(EvalContext* ctx, ExprValue* output) {
EvalResult result; EvalResult result;
@ -869,7 +931,7 @@ static EvalResult parse_expr(EvalContext* ctx, ExprValue* output) {
} }
ctx->stack_level++; ctx->stack_level++;
result = parse_sum(ctx, output); result = parse_logic(ctx, output);
ctx->stack_level--; ctx->stack_level--;
return result; return result;

14
tests/expr_test.cc
View File

@ -2,6 +2,20 @@
#include "gtest/gtest.h" #include "gtest/gtest.h"
TEST(ExprEval, basic) { TEST(ExprEval, basic) {
ASSERT_EQ(0, tk_expr_eval("(2-2) && 3 + 2 * 2"));
ASSERT_EQ(0, tk_expr_eval("(2-2) && (3 + 2 * 2)"));
ASSERT_EQ(1, tk_expr_eval("(2-2) || 3 + 2 * 2"));
ASSERT_EQ(1, tk_expr_eval("(2-2) || (3 + 2 * 2)"));
ASSERT_EQ(0, tk_expr_eval("2-2 && 3 + 2 * 2"));
ASSERT_EQ(0, tk_expr_eval("2-2 && (3 + 2 * 2)"));
ASSERT_EQ(1, tk_expr_eval("2-2 || 3 + 2 * 2"));
ASSERT_EQ(1, tk_expr_eval("2-2 || (3 + 2 * 2)"));
ASSERT_EQ(1, tk_expr_eval("2*3 && 3 + 2 * 2"));
ASSERT_EQ(1, tk_expr_eval("2*3 && (3 + 2 * 2)"));
ASSERT_EQ(1, tk_expr_eval("2*3 || 3 + 2 * 2"));
ASSERT_EQ(1, tk_expr_eval("2*3 || (3 + 2 * 2)"));
ASSERT_EQ(0, tk_expr_eval("2*3 > 3 + 2 * 2"));
ASSERT_EQ(0, tk_expr_eval("2-3 > 3 + 2 * 2"));
ASSERT_EQ(1, tk_expr_eval("1")); ASSERT_EQ(1, tk_expr_eval("1"));
ASSERT_EQ(2, tk_expr_eval("1 + 1")); ASSERT_EQ(2, tk_expr_eval("1 + 1"));
ASSERT_EQ(2, tk_expr_eval("1 * 2")); ASSERT_EQ(2, tk_expr_eval("1 * 2"));