命令支持内联表达式

Author: Alumopper

README_CN.md

@@ -1,4 +1,5 @@
 ![](https://user-images.githubusercontent.com/90548686/236462051-b901f99c-bdef-435c-8ca2-0dda37b25285.png)
+[![Stargazers over time](https://starchart.cc/MinecraftFunctionPlusPlus/MCFPP.svg?variant=adaptive)](https://starchart.cc/MinecraftFunctionPlusPlus/MCFPP)
 [English](./README.md)
 ------------
 

src/main/antlr/mcfppLexer.g4

@@ -14,7 +14,7 @@ LCURL: '{' -> pushMode(DEFAULT_MODE);
 RCURL: '}' -> popMode;
 MULT: '*' ;
 MOD: '%' ;
-DIV: '/' ;
+DIV: '/'  -> pushMode(OrgCommand);
 ADD: '+' ;
 SUB: '-' ;
 INCR: '++' ;
@@ -213,10 +213,6 @@ BooleanConstant
 
 LineString: ('"' .*? '"' )|( '\'' .*? '\'' );
 
-OrgCommand
-    :   '/' [a-z]* ([ ][a-z:._{}\\[0-9A-Z\]]*)+
-    ;
-
 WS  :  [ \t\r\n\u000C]+ -> skip
     ;
 
@@ -232,8 +228,19 @@ LINE_COMMENT
     :   '#' ~[\r\n]* -> skip
     ;
 
+mode OrgCommand ;
+
+OrgCommandText
+    :  ~('$'|[\r\n])+ | '$'
+    ;
 
+OrgCommandExprStart
+    :   '${' -> pushMode(DEFAULT_MODE)
+    ;
 
+OrgCommandEnd
+    :   ('\r\n' | '\n') -> popMode
+    ;
 
 mode MultiLineString ;
 

src/main/antlr/mcfppParser.g4

@@ -477,7 +477,16 @@ executeExpression
     ;
 
 orgCommand
-    :   OrgCommand
+    :   DIV orgCommandContent+ OrgCommandEnd
+    ;
+
+orgCommandContent
+    :   orgCommandExpression
+    |   OrgCommandText
+    ;
+
+orgCommandExpression
+    :   OrgCommandExprStart expression '}'
     ;
 
 controlStatement

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

@@ -914,11 +914,26 @@ open class MCFPPImVisitor: mcfppParserBaseVisitor<Any?>() {
 
 //endregion
 
-    
+    /**
+     * 使用原版命令
+     */
     @InsertCommand
     override fun visitOrgCommand(ctx: mcfppParser.OrgCommandContext):Any? {
         Project.ctx = ctx
-        Function.addCommand(ctx.text.substring(1))
+        val sb = StringBuilder()
+        for (content in ctx.orgCommandContent()){
+            if(content.OrgCommandText() != null){
+                sb.append(content.OrgCommandText().text)
+            }else{
+                val exp = MCFPPExprVisitor().visit(content.orgCommandExpression().expression())
+                if(exp is MCFPPValue<*>){
+                    sb.append(exp.value)
+                }else{
+                    sb.append(exp)
+                }
+            }
+        }
+        Function.addCommand(sb.toString())
         return null
     }
 

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

@@ -13,6 +13,9 @@ class MNITest {
                     int qwq = 1;
                     print(qwq::jvm.identifier);
                     print(qwq::jvm.sbObject.toString());
+                    /say ${'$'}{qwq}
+                    /say ${'$'}{qwq::jvm.identifier}
+                    /say ${'$'}{qwq::jvm.sbObject}
                 }
             """.trimIndent()
         MCFPPStringTest.readFromString(test)