From 5acd14ba5b911aff28cb259cabdb84c5f8233e55 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Thu, 20 Dec 2018 16:48:50 +0100 Subject: [PATCH] bc: fix keyword matching to not think "ifz" is the "if" keyword function old new delta zbc_lex_next 2224 2225 +1 Signed-off-by: Denys Vlasenko --- miscutils/bc.c | 2 ++ testsuite/bc.tests | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/miscutils/bc.c b/miscutils/bc.c index c5288102d..1e2ca8b83 100644 --- a/miscutils/bc.c +++ b/miscutils/bc.c @@ -2950,6 +2950,8 @@ static BC_STATUS zbc_lex_identifier(BcLex *l) continue; match: // buf starts with keyword bc_lex_kws[i] + if (isalnum(buf[j]) || buf[j]=='_') + continue; // "ifz" does not match "if" keyword, "if." does l->t.t = BC_LEX_KEY_1st_keyword + i; if (!bc_lex_kws_POSIX(i)) { s = bc_posix_error_fmt("%sthe '%.8s' keyword", "POSIX does not allow ", bc_lex_kws[i].name8); diff --git a/testsuite/bc.tests b/testsuite/bc.tests index e303cf6ae..d33f8c90a 100755 --- a/testsuite/bc.tests +++ b/testsuite/bc.tests @@ -76,6 +76,11 @@ testing "bc while(cond)" \ "8\n7\n6\n5\n4\n3\n2\n1\n9\n" \ "" "i=9;while(--i)\ni\n9" +testing "bc ifz does not match if keyword" \ + "bc" \ + "1\n2\n2\n3\n" \ + "" "ifz=1;ifz\n++ifz;ifz++\nifz" + testing "bc print 1,2,3" \ "bc" \ "123" \