From 43e257368f69311fdc86d3e45be36f5203edc113 Mon Sep 17 00:00:00 2001
From: mxr <>
Date: Thu, 19 Mar 2026 12:48:29 +0800
Subject: [PATCH] =?UTF-8?q?fix(frontend):=20=E4=BF=AE=E6=94=B9SysY.g4?=
 =?UTF-8?q?=E8=AF=AD=E6=B3=95=E8=A7=84=E5=88=99=EF=BC=8C=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E7=BC=96=E8=AF=91=EF=BC=8C=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87=E5=85=A8=E9=87=8F=E7=BC=96=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/antlr4/SysY.g4 | 50 ++++++++++++++--------------------------------
 1 file changed, 15 insertions(+), 35 deletions(-)

diff --git a/src/antlr4/SysY.g4 b/src/antlr4/SysY.g4
index 17cd890..502de56 100644
--- a/src/antlr4/SysY.g4
+++ b/src/antlr4/SysY.g4
@@ -44,8 +44,15 @@ L_BRACE : '{';
 R_BRACE : '}';
 
 //const numeric classes
-//Number... change
-// float first
+Number
+    : HEX_FLOAT
+    | DEC_FLOAT
+    | HEX_INT
+    | OCTAL_INT
+    | DECIMAL_INT
+    | ZERO
+    ;
+
 // 16进制float first
 HEX_FLOAT
     : '0' [xX](
@@ -72,18 +79,8 @@ HEX_INT: '0' [xX] [0-9a-fA-F]+; //16进制
 OCTAL_INT: '0' [0-7]*; //8进制
 DECIMAL_INT: [1-9][0-9]*; //10进制
 ZERO: '0'; //单独0
-
-// TODO: 后续完善IR后，移除Number兼容规则
-Number
-    : HEX_FLOAT
-    | DEC_FLOAT
-    | HEX_INT
-    | OCTAL_INT
-    | DECIMAL_INT
-    | ZERO
-    ;
   
-// 标识符（放最后）
+// 标识符
 Ident
     : [a-zA-Z_][a-zA-Z_0-9]*
     ;
@@ -103,11 +100,7 @@ BLOCK_COMMENT
 
 //----语法规则----//
 compUnit
-    : (funcDef|decl|program) EOF
-    ;
-
-program
-    : (decl|funcDef)+
+    : (funcDef|decl)+ EOF
     ;
 
 decl
@@ -135,7 +128,6 @@ constInitVal
 
 varDecl
     : bType varDef (Comma varDef)* Semi
-    | Int Ident (Assign exp)? Semi
     ;
 
 varDef
@@ -182,11 +174,7 @@ stmt
     | While L_PAREN cond R_PAREN stmt
     | Break Semi
     | Continue Semi
-    | returnStmt
-    ;
-
-returnStmt
-    : Return (exp)? Semi
+    | Return (exp)? Semi
     ;
 
 exp
@@ -201,21 +189,14 @@ lVal
     : Ident (L_BRACK exp R_BRACK)*
     ;
 
-primary
+primaryExp
     : L_PAREN exp R_PAREN
     | lVal
-    | Number              // 让旧代码能用
-    | HEX_FLOAT
-    | DEC_FLOAT
-    | HEX_INT
-    | OCTAL_INT
-    | DECIMAL_INT
-    | ZERO
-    | Ident
+    | Number
     ;
 
 unaryExp
-    : primary
+    : primaryExp
     | Ident L_PAREN (funcRParams)? R_PAREN
     | unaryOp unaryExp
     ;
@@ -238,7 +219,6 @@ mulExp
 addExp
     : mulExp
     | addExp (AddOp|SubOp) mulExp
-    | primary (AddOp primary)*
     ;
 
 relExp
-- 
2.34.1