From 2ad260c9fe57711bc94f5853c83ceac19c1dd461 Mon Sep 17 00:00:00 2001 From: melentev_i Date: Sun, 18 May 2025 15:33:08 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=B7=D0=B0=D0=BB?= =?UTF-8?q?=D0=B8=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- analyzers/test/test.l | 4 ++-- analyzers/test/test.y | 12 ++++-------- tests/test_cicle.txt | 2 -- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/analyzers/test/test.l b/analyzers/test/test.l index d27443b..fd58bec 100644 --- a/analyzers/test/test.l +++ b/analyzers/test/test.l @@ -38,8 +38,8 @@ LETTER_OR_DIGIT [a-zA-Z0-9_] "float32" { return FLOAT32; } "float64" { return FLOAT64; } "uintptr" { return UINT_PTR; } -"true" { return BOOL_LIT; } -"false" { return BOOL_LIT; } +"true" { return BOOL_LITERAL; } +"false" { return BOOL_LITERAL; } "if" { return IF; } "else" { return ELSE; } "<-" { return ARROW; } diff --git a/analyzers/test/test.y b/analyzers/test/test.y index 26efd99..2411cbe 100644 --- a/analyzers/test/test.y +++ b/analyzers/test/test.y @@ -31,7 +31,7 @@ void free_node(char *str) { %token STRING %token UINT UINT8 UINT16 UINT32 UINT64 UINT_PTR %token INT INT8 INT16 INT32 INT64 -%token RUNE BYTE BOOL_LIT +%token RUNE BYTE BOOL_LITERAL %token FLOAT32 FLOAT64 %token COMPLEX64 COMPLEX128 %token IDENTIFIER @@ -179,18 +179,14 @@ log_expr: | log_expr AND log_expr { } | log_expr OR log_expr { } | NOT log_expr %prec UMINUS { } - | comparison_expr { } - | LPAREN log_expr RPAREN { } - | BOOL_LIT - ; - -comparison_expr: | math_expr EQ math_expr { } | math_expr NEQ math_expr { } | math_expr LT math_expr { } | math_expr LEQ math_expr { } | math_expr GT math_expr { } | math_expr GEQ math_expr { } + | LPAREN log_expr RPAREN { } + | BOOL_LITERAL ; int_types: @@ -227,7 +223,7 @@ type: literal: STRING_LITERAL { } - | BOOL_LIT { } + | BOOL_LITERAL { } | FLOAT_LITERAL { } | NUMBER { } ; diff --git a/tests/test_cicle.txt b/tests/test_cicle.txt index 8896941..040331b 100644 --- a/tests/test_cicle.txt +++ b/tests/test_cicle.txt @@ -26,8 +26,6 @@ func main() { } outer: - - for p := 0; p < 3; p++ { for q := 0; q < 3; q++ { if p*q > 2 {