From 9f1e7cdaafd83ef7465ee581e48fe13f83f3373c Mon Sep 17 00:00:00 2001
From: Kenzie Togami <ket1999@gmail.com>
Date: Sun, 13 Oct 2019 02:20:10 -0700
Subject: [PATCH] Small modifications for better visitors

---
 .../com/sk89q/worldedit/antlr/Expression.g4   | 45 +++++++++----------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/worldedit-core/src/main/antlr/com/sk89q/worldedit/antlr/Expression.g4 b/worldedit-core/src/main/antlr/com/sk89q/worldedit/antlr/Expression.g4
index 254e0bf46..b244f2c64 100644
--- a/worldedit-core/src/main/antlr/com/sk89q/worldedit/antlr/Expression.g4
+++ b/worldedit-core/src/main/antlr/com/sk89q/worldedit/antlr/Expression.g4
@@ -79,17 +79,17 @@ allStatements : statements EOF ;
 statements : statement+ ;
 
 statement
-    : block
-    | ifStatement
-    | whileStatement
-    | doStatement
-    | forStatement
-    | breakStatement
-    | continueStatement
-    | returnStatement
-    | switchStatement
-    | expressionStatement
-    | SEMI_COLON
+    : block # BlockStmt
+    | ifStatement # IfStmt
+    | whileStatement # WhileStmt
+    | doStatement # DoStmt
+    | forStatement # ForStmt
+    | breakStatement # BreakStmt
+    | continueStatement # ContinueStmt
+    | returnStatement # ReturnStmt
+    | switchStatement # SwitchStmt
+    | expressionStatement # ExpressionStmt
+    | SEMI_COLON # EmptyStmt
     ;
 
 block : '{' statements '}' ;
@@ -118,29 +118,28 @@ returnStatement : RETURN expression? ;
 switchStatement : SWITCH '(' expression ')' '{' (switchLabel ':' statements )+ '}' ;
 
 switchLabel
-    : CASE constantExpression
-    | DEFAULT
+    : CASE constantExpression # Case
+    | DEFAULT # Default
     ;
 
 expressionStatement : expression SEMI_COLON ;
 
 expression
-    : constantExpression
-    | functionCall
-    | identifierExpression
-    | '(' expression ')'
-    | unaryOp expression
-    | identifierExpression binaryAssignOp expression
-    | expression binaryOp expression
-    | expression postUnaryOp
+    : unaryOp expression # UnaryExpr
+    | expression binaryOp expression # BinaryExpr
+    | expression postUnaryOp # PostUnaryExpr
+    | ID binaryAssignOp expression # AssignExpr
+    | expression '?' expression ':' expression # TernaryExpr
+    | functionCall # FunctionCallExpr
+    | constantExpression # ConstantExpr
+    | ID # IdExpr
+    | '(' expression ')' # WrappedExpr
     ;
 
 constantExpression : NUMBER ;
 
 functionCall : ID '(' (expression ( ',' expression )*)? ')' ;
 
-identifierExpression : ID ;
-
 unaryOp
     : MINUS
     | EXCLAMATION_MARK