修复了数据包路径错误的问题，修复了数据模板的成员赋值时数据模板动态化时机过晚的问题

Author: Alumopper

src/main/kotlin/top/mcfpp/MCFPP.kt

@@ -12,6 +12,7 @@ import java.io.FileInputStream
  * 编译器的启动入口
  */
 fun main(args: Array<String>) {
+    //获取log4j2.xml配置文件
     val source:ConfigurationSource
     try {
         source = ConfigurationSource(FileInputStream("log4j2.xml"))

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

@@ -231,14 +231,14 @@ class McfppExprVisitor(private var defaultGenericClassType : MCFPPGenericClassTy
             if (re is MCInt && b is MCInt) {
                 when (ctx.relationalOp().text) {
                     ">" -> re = re.isBigger(b)
-                    ">=" -> re = re.isGreaterOrEqual(b)
+                    ">=" -> re = re.isBiggerOrEqual(b)
                     "<" -> re = re.isSmaller(b)
                     "<=" -> re = re.isSmallerOrEqual(b)
                 }
             } else if(re is MCFloat && b is MCFloat){
                 when (ctx.relationalOp().text) {
                     ">" -> re = re.isBigger(b)
-                    ">=" -> re = re.isGreaterOrEqual(b)
+                    ">=" -> re = re.isBiggerOrEqual(b)
                     "<" -> re = re.isSmaller(b)
                     "<=" -> re = re.isSmallerOrEqual(b)
                 }
@@ -410,7 +410,6 @@ class McfppExprVisitor(private var defaultGenericClassType : MCFPPGenericClassTy
     @Override
     override fun visitVarWithSelector(ctx: mcfppParser.VarWithSelectorContext): Var<*> {
         Project.ctx = ctx
-        val namespaceID : Pair<String?, String>
         if(ctx.primary() != null){
             currSelector = visit(ctx.primary())
         }
@@ -598,7 +597,7 @@ class McfppExprVisitor(private var defaultGenericClassType : MCFPPGenericClassTy
                         LogProcessor.error("Template constructor ${template.identifier} cannot have arguments")
                         return UnknownVar("${template.identifier}_type_" + UUID.randomUUID())
                     }
-                    return DataTemplateObject(template)
+                    return DataTemplateObjectConcrete(template, template.getDefaultValue())
                 }
                 if(cls is GenericClass){
                     if(defaultGenericClassType != null){

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

@@ -214,6 +214,9 @@ open class McfppImVisitor: mcfppParserBaseVisitor<Any?>() {
             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 {
+                if(right !is MCFPPValue<*> && left.parent is DataTemplateObjectConcrete){
+                    left.parent = (left.parent as DataTemplateObjectConcrete).toDynamic(true)
+                }
                 left.replacedBy(left.assign(right))
             } catch (e: VariableConverseException) {
                 LogProcessor.error("Cannot convert " + right.javaClass + " to " + left.javaClass)

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

@@ -3,6 +3,8 @@ package top.mcfpp.antlr
 import top.mcfpp.Project
 import top.mcfpp.annotations.InsertCommand
 import top.mcfpp.lang.*
+import top.mcfpp.lang.type.MCFPPType
+import top.mcfpp.lang.value.MCFPPValue
 import top.mcfpp.model.*
 import top.mcfpp.model.function.Function
 import top.mcfpp.model.field.GlobalField
@@ -41,33 +43,12 @@ class McfppLeftExprVisitor : mcfppParserBaseVisitor<Var<*>>(){
     @Override
     override fun visitVarWithSelector(ctx: mcfppParser.VarWithSelectorContext): Var<*> {
         Project.ctx = ctx
-        val namespaceID : Pair<String?, String>
         if(ctx.primary() != null){
             currSelector = visit(ctx.primary())
         }
         if(currSelector is UnknownVar){
-            if(ctx.primary() != null || ctx.type().className() != null){
-                namespaceID = if(ctx.primary() != null){
-                    null to ctx.primary().text
-                } else{
-                    StringHelper.splitNamespaceID(ctx.type().text)
-                }
-                val o = GlobalField.getObject(namespaceID.first, namespaceID.second)
-                if(o != null) {
-                    currSelector = o.getType()
-                } else{
-                    LogProcessor.error("Undefined type: ${namespaceID.second}")
-                    currSelector = UnknownVar("${ctx.type().className().text}_type_" + UUID.randomUUID())
-                }
-            }else{
-                currSelector = CompoundDataCompanion(
-                    //基本类型
-                    when(ctx.type().text){
-                        "int" -> MCInt.data
-                        else -> TODO()
-                    }
-                )
-            }
+            val type = MCFPPType.parseFromIdentifier(ctx.type().text, Function.currFunction.field)
+            currSelector = type
         }
         for (selector in ctx.selector()){
             visit(selector)
@@ -77,8 +58,9 @@ class McfppLeftExprVisitor : mcfppParserBaseVisitor<Var<*>>(){
 
     @Override
     override fun visitSelector(ctx: mcfppParser.SelectorContext?): Var<*> {
-        currSelector = visit(ctx!!.`var`())!!.getTempVar()
-        return (currSelector as Var<*>)
+        //进入visitVar，currSelector作为成员选择的上下文
+        currSelector = visit(ctx!!.`var`())
+        return currSelector as Var<*>
     }
 
     /**
@@ -95,6 +77,31 @@ class McfppLeftExprVisitor : mcfppParserBaseVisitor<Var<*>>(){
         } else if (ctx.value() != null) {
             //数字
             return visit(ctx.value())
+        } else if (ctx.range() != null){
+            //是范围
+            val left = ctx.range().num1?.let { visit(it) }
+            val right = ctx.range().num2?.let { visit(it) }
+            if(left is MCNumber<*>? && right is MCNumber<*>?){
+                if(left is MCFPPValue<*>? && right is MCFPPValue<*>?){
+                    val leftValue = left?.value.toString().toFloatOrNull()
+                    val rightValue = right?.value.toString().toFloatOrNull()
+                    return RangeVarConcrete(leftValue to rightValue)
+                }else{
+                    val range = RangeVar()
+                    if(left is MCInt){
+                        range.left = MCFloat(range.identifier + "_left")
+                    }
+                    if(right is MCInt){
+                        range.right = MCFloat(range.identifier + "_right")
+                    }
+                    left?.let { range.left.assign(it) }
+                    right?.let { range.right.assign(it) }
+                    return range
+                }
+            }else{
+                LogProcessor.error("Range sides should be a number: ${left?.type} and ${right?.type}")
+                return UnknownVar("range_" + UUID.randomUUID())
+            }
         } else {
             //this或者super
             val s = if(ctx.SUPER() != null){
@@ -120,7 +127,7 @@ class McfppLeftExprVisitor : mcfppParserBaseVisitor<Var<*>>(){
     @InsertCommand
     override fun visitVar(ctx: mcfppParser.VarContext): Var<*> {
         Project.ctx = ctx
-        return if (ctx.Identifier() != null && ctx.arguments() == null) {
+        if (ctx.Identifier() != null && ctx.arguments() == null) {
             //变量
             //没有数组选取
             val qwq: String = ctx.Identifier().text
@@ -142,19 +149,38 @@ class McfppLeftExprVisitor : mcfppParserBaseVisitor<Var<*>>(){
             if (ctx.identifierSuffix() == null || ctx.identifierSuffix().size == 0) {
                 return re
             } else {
-                if(re is Indexable<*>){
-                    for (value in ctx.identifierSuffix()) {
+                for (value in ctx.identifierSuffix()) {
+                    if(value.conditionalExpression() != null){
+                        if(re !is Indexable<*>){
+                            LogProcessor.error("Cannot index ${re.type}")
+                            return UnknownVar("${re.identifier}_index_" + UUID.randomUUID())
+                        }
+                        //索引
                         val index = visit(value.conditionalExpression())!!
                         re = (re as Indexable<*>).getByIndex(index)
+                    }else{
+                        if(!re.isTemp) re = re.getTempVar()
+                        //初始化
+                        for (initializer in value.objectInitializer()){
+                            val id = initializer.Identifier().text
+                            val v = visit(initializer.expression())
+                            val (m, b) = re.getMemberVar(id, re.getAccess(Function.currFunction))
+                            if(!b){
+                                LogProcessor.error("Cannot access member $id")
+                            }
+                            if(m == null) {
+                                LogProcessor.error("Member $id not found")
+                                continue
+                            }
+                            m.replacedBy(m.assign(v))
+                        }
                     }
-                }else{
-                    throw IllegalArgumentException("Cannot index ${re.type}")
                 }
                 return re
             }
         } else if (ctx.expression() != null) {
             // '(' expression ')'
-            visit(ctx.expression())
+            return McfppLeftExprVisitor().visit(ctx.expression())
         } else {
             //函数的调用
             Function.addComment(ctx.text)
@@ -184,15 +210,28 @@ class McfppLeftExprVisitor : mcfppParserBaseVisitor<Var<*>>(){
             }
             //调用函数
             return if (func is UnknownFunction) {
-                //可能是构造函数
-                var cls: Class? = GlobalField.getClass(p.first, p.second)
-                if (cls == null) {
-                    LogProcessor.error("Function " + ctx.text + " not defined")
-                    Function.addComment("[Failed to Compile]${ctx.text}")
-                    func.invoke(normalArgs,currSelector)
-                    return func.returnVar
-                }
-                if(cls is GenericClass){
+                var cls: Class? = if(ctx.arguments().readOnlyArgs() != null){
+                    GlobalField.getClass(p.first, p.second ,readOnlyArgs.map { it.type })
+                 }else{
+                     GlobalField.getClass(p.first, p.second)
+                 }
+                 //可能是构造函数
+                 if (cls == null) {
+                     val template: DataTemplate? = GlobalField.getTemplate(p.first, p.second)
+                     if(template == null){
+                         LogProcessor.error("Function ${func.identifier}<${readOnlyArgs.joinToString(",") { it.type.typeName }}>(${normalArgs.map { it.type.typeName }.joinToString(",")}) not defined")
+                         Function.addComment("[Failed to Compile]${ctx.text}")
+                         func.invoke(normalArgs,currSelector)
+                         return func.returnVar
+                     }
+                     //模板默认构造函数
+                     if(readOnlyArgs.isNotEmpty() || normalArgs.isNotEmpty()){
+                         LogProcessor.error("Template constructor ${template.identifier} cannot have arguments")
+                         return UnknownVar("${template.identifier}_type_" + UUID.randomUUID())
+                     }
+                     return DataTemplateObject(template)
+                 }
+                 if(cls is GenericClass){
                     //实例化泛型函数
                     cls = cls.compile(readOnlyArgs)
                 }

src/main/kotlin/top/mcfpp/lang/DataTemplateObject.kt

@@ -50,6 +50,7 @@ open class DataTemplateObject : Var<DataTemplateObject> {
     constructor(templateObject: DataTemplateObject) : super(templateObject) {
         templateType = templateObject.templateType
         instanceField = templateObject.instanceField
+
     }
 
     override fun doAssign(b: Var<*>): DataTemplateObject {
@@ -247,6 +248,7 @@ open class DataTemplateObject : Var<DataTemplateObject> {
         }
     }
 
+
 }
 
 class DataTemplateObjectConcrete: DataTemplateObject, MCFPPValue<CompoundTag>{

src/main/kotlin/top/mcfpp/lang/MCFloat.kt

@@ -298,9 +298,9 @@ open class MCFloat : MCNumber<Float> {
      * @return 计算结果
      */
     @InsertCommand
-    override fun isGreaterOrEqual(a: Var<*>): MCBool {
+    override fun isBiggerOrEqual(a: Var<*>): MCBool {
         //re = t >= a
-        if(!isTemp) return getTempVar().isGreaterOrEqual(a)
+        if(!isTemp) return getTempVar().isBiggerOrEqual(a)
         val qwq: MCFloat = if (a !is MCFloat) a.explicitCast(MCFPPBaseType.Float) as MCFloat else a
         val re = MCBool()
         if(qwq != tempFloat) qwq.toTempEntity()
@@ -749,7 +749,7 @@ class MCFloatConcrete : MCFloat, MCFPPValue<Float>{
      * @return 计算结果
      */
     @InsertCommand
-    override fun isGreaterOrEqual(a: Var<*>): MCBool {
+    override fun isBiggerOrEqual(a: Var<*>): MCBool {
         //re = t >= a
         if(!isTemp) return (getTempVar() as MCFloat).isSmallerOrEqual(a)
         val qwq: MCFloat = if (a !is MCFloat) a.explicitCast(MCFPPBaseType.Float) as MCFloat else a

src/main/kotlin/top/mcfpp/lang/MCInt.kt

@@ -281,7 +281,7 @@ open class MCInt : MCNumber<Int> {
     }
 
     @InsertCommand
-    override fun isGreaterOrEqual(a: Var<*>): MCBool {
+    override fun isBiggerOrEqual(a: Var<*>): MCBool {
         //re = t <= a
         val qwq: MCInt = if (a !is MCInt) a.explicitCast(MCFPPBaseType.Int) as MCInt else a
         val re: MCBool
@@ -602,13 +602,13 @@ class MCIntConcrete : MCInt, MCFPPValue<Int>{
         return if (qwq is MCIntConcrete) {
             MCBoolConcrete(value <= qwq.value)
         } else {
-            qwq.isGreaterOrEqual(this)
+            qwq.isBiggerOrEqual(this)
         }
     }
 
     @Override
     @InsertCommand
-    override fun isGreaterOrEqual(a: Var<*>): MCBool {
+    override fun isBiggerOrEqual(a: Var<*>): MCBool {
         //re = t <= a
         val qwq: MCInt = if (a !is MCInt) a.explicitCast(MCFPPBaseType.Int) as MCInt else a
         return if (qwq is MCIntConcrete) {

src/main/kotlin/top/mcfpp/lang/MCNumber.kt

@@ -111,7 +111,7 @@ abstract class MCNumber<T> : Var<MCNumber<T>>, OnScoreboard {
      * @param a 右侧值
      * @return 计算结果
      */
-    abstract override fun isGreaterOrEqual(a: Var<*>): MCBool
+    abstract override fun isBiggerOrEqual(a: Var<*>): MCBool
 
     /**
      * 这个数是否等于a

src/main/kotlin/top/mcfpp/lang/Var.kt

@@ -17,7 +17,6 @@ import top.mcfpp.util.TextTranslator
 import top.mcfpp.util.TextTranslator.translate
 import java.io.Serializable
 import java.util.*
-import javax.xml.crypto.Data
 
 /**
  * mcfpp所有类型的基类。在mcfpp中，一个变量可以是固定的，也就是mcfpp编译
@@ -31,9 +30,9 @@ import javax.xml.crypto.Data
  * 除此之外，变量还有临时变量的区别，对于匿名的变量，编译器一般会默认它为临时
  * 的变量，从而在各种处理上进行优化。当然，匿名变量的声明往往在编译过程中声明。
  * mcfpp本身的语法并不支持匿名变量。
- *
  */
 abstract class Var<Self: Var<Self>> : Member, Cloneable, CanSelectMember, Serializable{
+
     /**
      * 在Minecraft中的标识符
      */
@@ -72,11 +71,6 @@ abstract class Var<Self: Var<Self>> : Member, Cloneable, CanSelectMember, Serial
      */
     var isTemp = false
 
-    /**
-     * 这个变量是否已经被初始化
-     */
-    var hasInit = false
-
     open var parent : CanSelectMember? = null
 
     /**
@@ -117,7 +111,7 @@ abstract class Var<Self: Var<Self>> : Member, Cloneable, CanSelectMember, Serial
         isTemp = `var`.isTemp
         stackIndex = `var`.stackIndex
         isConst = `var`.isConst
-        nbtPath = `var`.nbtPath
+        nbtPath = `var`.nbtPath.clone()
     }
 
     /**
@@ -376,7 +370,7 @@ abstract class Var<Self: Var<Self>> : Member, Cloneable, CanSelectMember, Serial
      * @param a 右侧值
      * @return 计算结果
      */
-    open fun isGreaterOrEqual(a: Var<*>): MCBool {
+    open fun isBiggerOrEqual(a: Var<*>): MCBool {
         LogProcessor.error("type ${type.typeName} not support operation '>='")
         return MCBool("")
     }
@@ -429,6 +423,10 @@ abstract class Var<Self: Var<Self>> : Member, Cloneable, CanSelectMember, Serial
         return Member.AccessModifier.PUBLIC
     }
 
+    fun assignMemberVar(member: String, b: Var<*>) {
+        getMemberVar(member, Member.AccessModifier.PUBLIC).first?.assign(b)
+    }
+
     override fun toString(): String {
         return if(this is MCFPPValue<*>){
             "[$type,value=$value]"