From fc4daa4c3597656d8488557a89c7b94208fb2546 Mon Sep 17 00:00:00 2001 From: mtardy Date: Wed, 17 Jun 2020 19:17:17 +0200 Subject: [PATCH 1/3] Update gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 97c85da..b1b7b45 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +# vscode settings +.vscode/ + # ignore generated parser calc.c From 8de3ac90aaef73fc068efda03ec667d238d62279 Mon Sep 17 00:00:00 2001 From: mtardy Date: Wed, 17 Jun 2020 19:17:33 +0200 Subject: [PATCH 2/3] Add tests for simple variables --- test.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test.sh b/test.sh index 1b614e7..0e36626 100755 --- a/test.sh +++ b/test.sh @@ -15,5 +15,8 @@ echo "5%2" | ./${PROG} | cmp <(echo "1") && echo "test#9 passed!" || true echo "3*2+10*2" | ./${PROG} | cmp <(echo "26") && echo "test#10 passed!" || true echo "-3*2+10*2" | ./${PROG} | cmp <(echo "14") && echo "test#11 passed!" || true echo "- 5% 2 +2-6 / 2" | ./${PROG} | cmp <(echo "-2") && echo "test#12 passed!" || true +echo "a=3" | ./${PROG} | cmp <(echo "3") && echo "test#13 passed!" || true +echo "a=3 a*2" | ./${PROG} | cmp <(printf "3\n6\n") && echo "test#14 passed!" || true +echo "a=10 z=13 A+z" | ./${PROG} | cmp <(printf "10\n13\n23\n") && echo "test#15 passed!" || true make clean \ No newline at end of file From 76fd9ab57cbc132465b197cd846593870c54c733 Mon Sep 17 00:00:00 2001 From: mtardy Date: Wed, 17 Jun 2020 19:17:41 +0200 Subject: [PATCH 3/3] Add single char variables --- calc.leg | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/calc.leg b/calc.leg index 89b76ac..8a4d8c4 100644 --- a/calc.leg +++ b/calc.leg @@ -8,12 +8,17 @@ #define YYSTYPE int YYSTYPE yylval = 0; +int var[26]; %} start = e:exp { yylval = e } -exp = - s:sum { $$ = s } +exp = - (a:assign { $$ = a } + | s:sum { $$ = s } + ) + +assign = l:LETTER EQUAL n:sum { $$ = var[l - 'a'] = n } sum = PLUS* l:prod ( PLUS+ r:prod { l += r } @@ -23,11 +28,14 @@ sum = PLUS* l:prod prod = l:neg ( MULTI r:neg { l *= r } | DIVIDE r:neg { l /= r } - | MODULO r:neg { l %= r } + | MODULO r:neg { l %= r } )* { $$ = l } neg = MINUS n:neg { $$ = -n } - | n:NUMBER { $$ = n } + | n:value { $$ = n } + +value = n:NUMBER { $$ = n } + | l:LETTER { $$ = var[l - 'a'] } - = [ \t]* NUMBER = < [0-9]+ > - { $$ = atoi(yytext) } @@ -35,7 +43,11 @@ PLUS = '+' - MINUS = '-' - MULTI = '*' - DIVIDE = '/' - -MODULO = '%' - +MODULO = '%' - +LETTER = (< [a-z] > { $$ = yytext[0] } + |< [A-Z] > { $$ = yytext[0] + 'a' - 'A' } + ) - +EQUAL = '=' - %% @@ -44,6 +56,11 @@ int main(int argc, char **argv) while (yyparse()) { printf("%d\n", yylval); } + /* + for (int i = 0; i < 26; i++) { + printf("var[%d]=%d ", i, var[i]); + } + */ return 0; }