jvm访问符号

Alumopper · Alumopper · commit 824040ba35bc · 2024-10-19T15:53:05.000+08:00
diff --git a/src/main/antlr/mcfppLexer.g4 b/src/main/antlr/mcfppLexer.g4
@@ -33,7 +33,7 @@ MOD_ASSIGNMENT: '%=' ;
 ARROW: '->' ;
 DOUBLE_ARROW: '=>' ;
 RANGE: '..' ;
-//COLONCOLON: '::' ;
+COLONCOLON: '::' ;
 //DOUBLE_SEMICOLON: ';;' ;
 HASH: '#' ;
 AT: '@' ;
diff --git a/src/main/antlr/mcfppParser.g4 b/src/main/antlr/mcfppParser.g4
@@ -377,9 +377,14 @@ castExpression
     ;
 
 basicExpression
-    :   primary
+    :   jvmAccessExpression
     |   varWithSelector
     ;
+
+jvmAccessExpression
+    :   primary (COLONCOLON Identifier)?
+    ;
+
 //初级表达式
 primary
     :   range
@@ -391,7 +396,7 @@ primary
     ;
 
 varWithSelector
-    : primary selector+
+    : jvmAccessExpression selector+
     | type selector+
     ;
 
@@ -416,6 +421,7 @@ functionCall
 identifierSuffix
     :   '[' conditionalExpression ']'
     |   '[' objectInitializer  (',' objectInitializer)* ']'
+    |   '[' ']' //empty bucket
     ;
 
 objectInitializer
diff --git a/src/main/java/top/mcfpp/mni/System.java b/src/main/java/top/mcfpp/mni/System.java
@@ -67,7 +67,7 @@ public static void print(@NotNull MCInt var) {
     @MNIFunction(normalParams = {"nbt n"})
     public static void print(@NotNull NBTBasedData var){
         if(var instanceof NBTBasedDataConcrete varC){
-            Function.Companion.addCommand("tellraw @a " + NBTUtil.INSTANCE.toJava(varC.getValue()));
+            Function.Companion.addCommand("tellraw @a \"" + NBTUtil.INSTANCE.toJava(varC.getValue()) + "\"");
         }else {
             //TODO
         }
diff --git a/src/main/kotlin/top/mcfpp/antlr/MCFPPExprVisitor.kt b/src/main/kotlin/top/mcfpp/antlr/MCFPPExprVisitor.kt
@@ -260,8 +260,8 @@ class MCFPPExprVisitor(private var defaultGenericClassType : MCFPPGenericClassTy
     @Override
     override fun visitBasicExpression(ctx: mcfppParser.BasicExpressionContext): Var<*> {
         Project.ctx = ctx
-        return if (ctx.primary() != null) {
-            visit(ctx.primary())
+        return if (ctx.jvmAccessExpression() != null) {
+            visitJvmAccessExpression(ctx.jvmAccessExpression())
         } else {
             visit(ctx.varWithSelector())
         }
@@ -276,11 +276,11 @@ class MCFPPExprVisitor(private var defaultGenericClassType : MCFPPGenericClassTy
     @Override
     override fun visitVarWithSelector(ctx: mcfppParser.VarWithSelectorContext): Var<*> {
         Project.ctx = ctx
-        if(ctx.primary() != null){
-            currSelector = visit(ctx.primary())
+        if(ctx.jvmAccessExpression() != null){
+            currSelector = visitJvmAccessExpression(ctx.jvmAccessExpression())
         }
         if(currSelector is UnknownVar){
-            val typeStr = ctx.primary()?.text?:ctx.type().text
+            val typeStr = ctx.jvmAccessExpression()?.text?:ctx.type().text
             val type = MCFPPType.parseFromIdentifier(typeStr, Function.currFunction.field)
             if(type == null){
                 if(ctx.selector().size == 0){
@@ -299,6 +299,15 @@ class MCFPPExprVisitor(private var defaultGenericClassType : MCFPPGenericClassTy
         return currSelector!!
     }
 
+    override fun visitJvmAccessExpression(ctx: mcfppParser.JvmAccessExpressionContext): Var<*> {
+        val re = visitPrimary(ctx.primary())
+        if(ctx.Identifier() != null){
+            return re.getJVM(ctx.Identifier().text)
+        }else{
+            return re
+        }
+    }
+
     @Override
     override fun visitSelector(ctx: mcfppParser.SelectorContext?): Var<*> {
         //进入visitVar，currSelector作为成员选择的上下文
diff --git a/src/main/kotlin/top/mcfpp/antlr/McfppLeftExprVisitor.kt b/src/main/kotlin/top/mcfpp/antlr/McfppLeftExprVisitor.kt
@@ -22,20 +22,20 @@ open class McfppLeftExprVisitor : mcfppParserBaseVisitor<Var<*>>(){
 
     override fun visitBasicExpression(ctx: mcfppParser.BasicExpressionContext): Var<*> {
         Project.ctx = ctx
-        return if (ctx.primary() != null) {
-            visit(ctx.primary())
+        return if (ctx.jvmAccessExpression() != null) {
+            visit(ctx.jvmAccessExpression())
         } else {
             visit(ctx.varWithSelector())
         }
     }
 
     override fun visitVarWithSelector(ctx: mcfppParser.VarWithSelectorContext): Var<*> {
         Project.ctx = ctx
-        if(ctx.primary() != null){
-            currSelector = visit(ctx.primary())
+        if(ctx.jvmAccessExpression() != null){
+            currSelector = visit(ctx.jvmAccessExpression())
         }
         if(currSelector is UnknownVar){
-            val typeStr = ctx.primary()?.text?:ctx.type().text
+            val typeStr = ctx.jvmAccessExpression()?.text?:ctx.type().text
             val type = MCFPPType.parseFromIdentifier(typeStr, Function.currFunction.field)
             if(type == null){
                 LogProcessor.error(TextTranslator.INVALID_TYPE_ERROR.translate(typeStr))
@@ -50,6 +50,16 @@ open class McfppLeftExprVisitor : mcfppParserBaseVisitor<Var<*>>(){
         return currSelector as Var<*>
     }
 
+    override fun visitJvmAccessExpression(ctx: mcfppParser.JvmAccessExpressionContext): Var<*> {
+        Project.ctx = ctx
+        val re = visit(ctx.primary())
+        if(ctx.Identifier() != null){
+            return re.getJVM(ctx.Identifier().text)
+        }else{
+            return re
+        }
+    }
+
     override fun visitSelector(ctx: mcfppParser.SelectorContext?): Var<*> {
         //进入visitVar，currSelector作为成员选择的上下文
         currSelector = visit(ctx!!.`var`())
diff --git a/src/main/kotlin/top/mcfpp/core/lang/JavaVar.kt b/src/main/kotlin/top/mcfpp/core/lang/JavaVar.kt
@@ -34,21 +34,6 @@ class JavaVar : Var<JavaVar>, MCFPPValue<Any?> {
 
     override var type: MCFPPType = MCFPPConcreteType.JavaVar
 
-    /**
-     * 创建一个固定的JavaVar
-     *
-     * @param identifier 标识符
-     * @param curr 域容器
-     * @param value 值
-     */
-    constructor(
-        curr: FieldContainer,
-        value: Any?,
-        identifier: String = UUID.randomUUID().toString()
-    ) : super(curr.prefix + identifier) {
-        this.value = value
-    }
-
     /**
      * 创建一个固定的JavaVar。它的标识符和mc名一致
      * @param identifier 标识符。如不指定，则为随机uuid
@@ -111,7 +96,7 @@ class JavaVar : Var<JavaVar>, MCFPPValue<Any?> {
         //获取value中的一个成员变量
         if(value == null) {
             LogProcessor.error("Cannot access properties in $identifier because its value is null")
-            throw NullPointerException()
+            UnknownVar("error_null")
         }
         val member = value!!::class.memberProperties.find { it.name == key } as KProperty1<Any, *>?
         if(member != null){
@@ -140,7 +125,7 @@ class JavaVar : Var<JavaVar>, MCFPPValue<Any?> {
         }
         try{
             val member = value!!::class.java.getDeclaredMethod(key, *getTypeArray(normalArgs.map { it.type }))
-            return Pair(JavaFunction(member, this), member.canAccess(Any()))
+            return Pair(JavaFunction(member, this), true)
         }catch (e: NoSuchMethodException){
             LogProcessor.error("No method '$key' in $identifier}")
             throw e
diff --git a/src/main/kotlin/top/mcfpp/core/lang/Var.kt b/src/main/kotlin/top/mcfpp/core/lang/Var.kt
@@ -514,6 +514,21 @@ abstract class Var<Self: Var<Self>> : Member, Cloneable, CanSelectMember, Serial
         }
     }
 
+    fun getJVM(key: String): Var<*>{
+        return when(key){
+            "jvm" -> {
+                JavaVar(this,identifier + "_jvm")
+            }
+            else -> {
+                LogProcessor.error("Unknown jvm key: $key")
+                UnknownVar("error_jvm_" + UUID.randomUUID().toString())
+            }
+        }.apply {
+            isConst = true
+            hasAssigned = true
+        }
+    }
+
     companion object {
 
         fun buildCastErrorVar(type: MCFPPType): Var<*>{
diff --git a/src/main/kotlin/top/mcfpp/model/function/NativeFunction.kt b/src/main/kotlin/top/mcfpp/model/function/NativeFunction.kt
@@ -49,7 +49,6 @@ class NativeFunction : Function, Native {
      *
      * @param name mcfpp方法的名字
      * @param javaMethod java方法
-     * @param returnType 返回值的类型
      * @param namespace 命名空间
      */
     constructor(name: String, namespace: String = Project.currNamespace, javaMethod: Method = Companion::defaultNativeFunction.javaMethod!!) : super(name, namespace, context = null) {
@@ -219,7 +218,7 @@ class NativeFunction : Function, Native {
             primitiveTypes["void"] = Void::class.java
         }
 
-        fun defaultNativeFunction(vararg args: Any?){
+        private fun defaultNativeFunction(vararg args: Any?){
             throw Exception("A nativeFunction hadn't linked to a java method.")
         }
 
diff --git a/src/main/kotlin/top/mcfpp/type/MCFPPConcreteType.kt b/src/main/kotlin/top/mcfpp/type/MCFPPConcreteType.kt
@@ -52,9 +52,9 @@ open class MCFPPConcreteType(objectData: CompoundData = CompoundData("unknown",
             get() = "JavaVar"
 
         override fun build(identifier: String, container: FieldContainer): Var<*> =
-            JavaVar(container, null, identifier)
+            JavaVar(null, identifier)
         override fun build(identifier: String): Var<*> = JavaVar(null, identifier)
-        override fun build(identifier: String, clazz: Class): Var<*> = JavaVar(clazz, null, identifier)
+        override fun build(identifier: String, clazz: Class): Var<*> = JavaVar(null, identifier)
  }
 
 }
diff --git a/src/test/kotlin/top/mcfpp/test/MNITest.kt b/src/test/kotlin/top/mcfpp/test/MNITest.kt
@@ -9,7 +9,10 @@ class MNITest {
     fun baseMNITest(){
         val test =
             """
-                func base(){
+                func main(){
+                    int qwq = 1;
+                    print(qwq::jvm.identifier);
+                    print(qwq::jvm.sbObject.toString());
                 }
             """.trimIndent()
         MCFPPStringTest.readFromString(test)
diff --git a/test/test.mcfpp b/test/test.mcfpp
@@ -1,7 +1,7 @@
 namespace test;
 
 func main(){
-    var qwq = 1;
+    int qwq = 1;
     print(qwq::identifier)
     print(qwq::sbObject.toString())
     ::top.mcfpp.model.function$Function.addCommand(::top.mcfpp.command$Command.build("say hello"))

Original file line number	Diff line number	Diff line change
`@@ -377,9 +377,14 @@ castExpression`
`377`	`377`	`;`
`378`	`378`
`379`	`379`	`basicExpression`
`380`		`- : primary`
	`380`	`+ : jvmAccessExpression`
`381`	`381`	`\| varWithSelector`
`382`	`382`	`;`
	`383`	`+`
	`384`	`+jvmAccessExpression`
	`385`	`+ : primary (COLONCOLON Identifier)?`
	`386`	`+ ;`
	`387`	`+`
`383`	`388`	`//初级表达式`
`384`	`389`	`primary`
`385`	`390`	`: range`
`@@ -391,7 +396,7 @@ primary`
`391`	`396`	`;`
`392`	`397`
`393`	`398`	`varWithSelector`
`394`		`- : primary selector+`
	`399`	`+ : jvmAccessExpression selector+`
`395`	`400`	`\| type selector+`
`396`	`401`	`;`
`397`	`402`
`@@ -416,6 +421,7 @@ functionCall`
`416`	`421`	`identifierSuffix`
`417`	`422`	`: '[' conditionalExpression ']'`
`418`	`423`	`\| '[' objectInitializer (',' objectInitializer)* ']'`
	`424`	`+ \| '[' ']' //empty bucket`
`419`	`425`	`;`
`420`	`426`
`421`	`427`	`objectInitializer`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public static void print(@NotNull MCInt var) {`
`67`	`67`	`@MNIFunction(normalParams = {"nbt n"})`
`68`	`68`	`public static void print(@NotNull NBTBasedData var){`
`69`	`69`	`if(var instanceof NBTBasedDataConcrete varC){`
`70`		`- Function.Companion.addCommand("tellraw @a " + NBTUtil.INSTANCE.toJava(varC.getValue()));`
	`70`	`+ Function.Companion.addCommand("tellraw @a \"" + NBTUtil.INSTANCE.toJava(varC.getValue()) + "\"");`
`71`	`71`	`}else {`
`72`	`72`	`//TODO`
`73`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,6 @@ class NativeFunction : Function, Native {`
`49`	`49`	`*`
`50`	`50`	`* @param name mcfpp方法的名字`
`51`	`51`	`* @param javaMethod java方法`
`52`		`- * @param returnType 返回值的类型`
`53`	`52`	`* @param namespace 命名空间`
`54`	`53`	`*/`
`55`	`54`	`constructor(name: String, namespace: String = Project.currNamespace, javaMethod: Method = Companion::defaultNativeFunction.javaMethod!!) : super(name, namespace, context = null) {`
`@@ -219,7 +218,7 @@ class NativeFunction : Function, Native {`
`219`	`218`	`primitiveTypes["void"] = Void::class.java`
`220`	`219`	`}`
`221`	`220`
`222`		`- fun defaultNativeFunction(vararg args: Any?){`
	`221`	`+ private fun defaultNativeFunction(vararg args: Any?){`
`223`	`222`	`throw Exception("A nativeFunction hadn't linked to a java method.")`
`224`	`223`	`}`
`225`	`224`
Original file line number	Diff line number	Diff line change
`@@ -52,9 +52,9 @@ open class MCFPPConcreteType(objectData: CompoundData = CompoundData("unknown",`
`52`	`52`	`get() = "JavaVar"`
`53`	`53`
`54`	`54`	`override fun build(identifier: String, container: FieldContainer): Var<*> =`
`55`		`- JavaVar(container, null, identifier)`
	`55`	`+ JavaVar(null, identifier)`
`56`	`56`	`override fun build(identifier: String): Var<*> = JavaVar(null, identifier)`
`57`		`- override fun build(identifier: String, clazz: Class): Var<*> = JavaVar(clazz, null, identifier)`
	`57`	`+ override fun build(identifier: String, clazz: Class): Var<*> = JavaVar(null, identifier)`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`}`