enum变量在声明的时候若已知类型则可略去enum主类型名而只写成员

Author: Alumopper

src/main/kotlin/top/mcfpp/antlr/McfppExprVisitor.kt

@@ -5,6 +5,7 @@ import net.querz.nbt.tag.StringTag
 import top.mcfpp.Project
 import top.mcfpp.annotations.InsertCommand
 import top.mcfpp.lang.*
+import top.mcfpp.lang.type.MCFPPEnumType
 import top.mcfpp.lang.type.MCFPPGenericClassType
 import top.mcfpp.lang.type.MCFPPType
 import top.mcfpp.lang.value.MCFPPValue
@@ -29,7 +30,7 @@ import kotlin.system.exitProcess
 /**
  * 获取表达式结果用的visitor。解析并计算一个形如a+b*c的表达式。
  */
-class McfppExprVisitor(private var defaultGenericClassType : MCFPPGenericClassType? = null): mcfppParserBaseVisitor<Var<*>>() {
+class McfppExprVisitor(private var defaultGenericClassType : MCFPPGenericClassType? = null, private var enumType: MCFPPEnumType? = null): mcfppParserBaseVisitor<Var<*>>() {
 
     private val tempVarCommandCache = HashMap<Var<*>, String>()
 
@@ -498,6 +499,9 @@ class McfppExprVisitor(private var defaultGenericClassType : MCFPPGenericClassTy
             //变量
             //没有数组选取
             val qwq: String = ctx.Identifier().text
+            if(enumType != null && currSelector == null){
+                currSelector = enumType
+            }
             var re = if(currSelector == null) {
                 Function.currFunction.field.getVar(qwq) ?: UnknownVar(qwq)
             }else{

src/main/kotlin/top/mcfpp/antlr/McfppImVisitor.kt

@@ -11,6 +11,7 @@ import top.mcfpp.exception.*
 import top.mcfpp.io.MCFPPFile
 import top.mcfpp.lang.*
 import top.mcfpp.lang.type.MCFPPBaseType
+import top.mcfpp.lang.type.MCFPPEnumType
 import top.mcfpp.lang.type.MCFPPGenericClassType
 import top.mcfpp.lang.type.MCFPPType
 import top.mcfpp.lang.value.MCFPPValue
@@ -165,7 +166,7 @@ open class McfppImVisitor: mcfppParserBaseVisitor<Any?>() {
                 Function.addCommand("#field: " + ctx.type().text + " " + c.Identifier().text + if (c.expression() != null) " = " + c.expression().text else "")
                 //变量初始化
                 if (c.expression() != null) {
-                    val init: Var<*> = McfppExprVisitor(if(type is MCFPPGenericClassType) type else null).visit(c.expression())!!
+                    val init: Var<*> = McfppExprVisitor(if(type is MCFPPGenericClassType) type else null, if(type is MCFPPEnumType) type else null).visit(c.expression())!!
                     try {
                         `var` = `var`.assign(init)
                     } catch (e: VariableConverseException) {
@@ -203,13 +204,14 @@ open class McfppImVisitor: mcfppParserBaseVisitor<Any?>() {
     override fun visitStatementExpression(ctx: mcfppParser.StatementExpressionContext):Any? {
         Project.ctx = ctx
         Function.addCommand("#expression: " + ctx.text)
-        val right: Var<*> = McfppExprVisitor().visit(ctx.expression())!!
         if(ctx.basicExpression() != null){
             val left: Var<*> = McfppLeftExprVisitor().visit(ctx.basicExpression())!!
             if (left.isConst) {
                 LogProcessor.error("Cannot assign a constant repeatedly: " + left.identifier)
                 return null
             }
+            val type = left.type
+            val right: Var<*> = McfppExprVisitor(if(type is MCFPPGenericClassType) type else null, if(type is MCFPPEnumType) type else null).visit(ctx.expression())!!
             try {
                 left.replacedBy(left.assign(right))
             } catch (e: VariableConverseException) {

src/test/kotlin/top/mcfpp/test/EnumTest.kt

@@ -13,7 +13,7 @@ class EnumTest {
                 } 
                 
                 func main(){
-                    Test qwq = Test.A;
+                    Test qwq = A;
                     print(qwq);
                 }
             """.trimIndent()