feat: add temp_score_prefix and const_score_prefix options

Author: TheWii

bolt_expressions/ast.py

@@ -38,7 +38,7 @@ def strip_run_execute(self, node: AstCommand):
 class ConstantScoreChecker(Reducer):
     objective: str = required_field()
     callback: Callable[[int], None] = required_field()
-    pattern: re.Pattern[str] = re.compile(r"^\$([-+]?\d+)\b")
+    pattern: re.Pattern[str] = re.compile(r"^[$#]([-+]?\d+)\b")
 
     @cached_property
     def objective_node(self):

bolt_expressions/node.py

@@ -86,6 +86,8 @@ class ExpressionOptions(BaseModel):
     temp_storage: str = "bolt.expr:temp"
     init_path: str = "init_expressions"
     objective_prefix: str = ""
+    const_score_prefix: str = "$"
+    temp_score_prefix: str = "$"
     default_nbt_type: NbtTypeString = "int"
     default_floating_nbt_type: str = "double"
 
@@ -226,12 +228,16 @@ def __init__(self, ctx: Context):
         self.generator = self.ctx.generate
 
         self.temp_score = TempScoreManager(
-            self.opts.temp_objective, format=lambda _: "$" + next(self.identifiers)
+            objective=self.opts.temp_objective,
+            prefix=self.opts.temp_score_prefix,
+            format=lambda _: self.opts.temp_score_prefix + next(self.identifiers),
         )
         self.temp_data = TempDataManager(
             "storage", self.opts.temp_storage, format=lambda _: next(self.identifiers)
         )
-        self.const_score = ConstScoreManager(self.opts.const_objective)
+        self.const_score = ConstScoreManager(
+            self.opts.const_objective, self.opts.const_score_prefix
+        )
 
         self.type_caster = TypeCaster(ctx=self.ctx)
         self.type_checker = TypeChecker(ctx=self.ctx)

bolt_expressions/optimizer.py

@@ -481,9 +481,18 @@ class StringDataTuple(NamedTuple):
 @dataclass
 class TempScoreManager:
     objective: str
+    prefix: str
 
-    counter: int = field(default=0, init=False)
-    format: Callable[[int], str] = field(default=lambda n: f"$s{n}")  # type: ignore
+    counter: int
+    format: Callable[[int], str]
+
+    def __init__(
+        self, objective: str, prefix: str, format: Callable[[int], str] | None = None
+    ):
+        self.objective = objective
+        self.prefix = prefix
+        self.format = format if format is not None else lambda n: f"{self.prefix}{n}"
+        self.counter = 0
 
     def __call__(self) -> ScoreTuple:
         name = self.format(self.counter)
@@ -540,11 +549,12 @@ def override(self, format: Callable[[int], str] | None = None, reset: bool = Fal
 @dataclass
 class ConstScoreManager:
     objective: str
+    prefix: str
 
     constants: set[int] = field(default_factory=set, init=False)
 
     def format(self, value: int) -> str:
-        return f"${value}"
+        return f"{self.prefix}{value}"
 
     def create(self, value: int) -> ScoreTuple:
         self.constants.add(value)
@@ -1466,7 +1476,9 @@ def rename_temp_scores(
                 ignored_sources.add(source)
 
     with (
-        opt.temp_score.override(format=lambda n: f"$i{n}", reset=True),
+        opt.temp_score.override(
+            format=lambda n: f"{opt.temp_score.prefix}i{n}", reset=True
+        ),
         opt.temp_data.override(format=lambda n: f"i{n}", reset=True),
     ):
         replace_map: dict[SourceTuple, IrSource] = {}

examples/combo_score_prefix/beet.yaml

@@ -0,0 +1,21 @@
+name: bolt-expressions-score-prefix
+
+data_pack:
+  load: [src]
+  pack_format: 10
+
+require:
+  - bolt
+  - bolt_expressions
+
+pipeline:
+  - mecha
+
+output: dist
+
+meta:
+  generate_namespace: test
+  bolt_expressions:
+    const_score_prefix: "#"
+    temp_score_prefix: "__"
+

examples/combo_score_prefix/src/data/test/functions/main.mcfunction

@@ -0,0 +1,12 @@
+from bolt_expressions import Scoreboard
+
+abc = Scoreboard("abc.obj")
+
+
+if score var (abc["@s"] % 5) matches 0
+
+abc["@s"] = (abc["#value"] * 2 + 1) / (abc["#denom"] * 5)
+abc["@s"] = abc["#value"] * 3 * 4 * 6 * 7 * 8
+abc["@s"] = abc["#value"] * -5
+abc["@s"] += 10 + abc["#value"] * 123
+abc["@s"] %= 50 + abc["#value"] * 0

tests/snapshots/examples__build_combo_score_prefix__0.data_pack/data/minecraft/tags/functions/load.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "test:init_expressions"
+  ]
+}

tests/snapshots/examples__build_combo_score_prefix__0.data_pack/data/test/functions/init_expressions.mcfunction

@@ -0,0 +1,12 @@
+scoreboard objectives add bolt.expr.const dummy
+scoreboard objectives add bolt.expr.temp dummy
+scoreboard players set #5 bolt.expr.const 5
+scoreboard players set #2 bolt.expr.const 2
+scoreboard players set #3 bolt.expr.const 3
+scoreboard players set #4 bolt.expr.const 4
+scoreboard players set #6 bolt.expr.const 6
+scoreboard players set #7 bolt.expr.const 7
+scoreboard players set #8 bolt.expr.const 8
+scoreboard players set #-5 bolt.expr.const -5
+scoreboard players set #123 bolt.expr.const 123
+scoreboard players set #0 bolt.expr.const 0

tests/snapshots/examples__build_combo_score_prefix__0.data_pack/data/test/functions/main.mcfunction

@@ -0,0 +1,25 @@
+scoreboard players operation __2384k242hd495_0 bolt.expr.temp = @s abc.obj
+scoreboard players operation __2384k242hd495_0 bolt.expr.temp %= #5 bolt.expr.const
+execute if score __2384k242hd495_0 bolt.expr.temp matches 0
+scoreboard players operation @s abc.obj = #value abc.obj
+scoreboard players operation @s abc.obj *= #2 bolt.expr.const
+scoreboard players add @s abc.obj 1
+scoreboard players operation __i0 bolt.expr.temp = #denom abc.obj
+scoreboard players operation __i0 bolt.expr.temp *= #5 bolt.expr.const
+scoreboard players operation @s abc.obj /= __i0 bolt.expr.temp
+scoreboard players operation @s abc.obj = #value abc.obj
+scoreboard players operation @s abc.obj *= #3 bolt.expr.const
+scoreboard players operation @s abc.obj *= #4 bolt.expr.const
+scoreboard players operation @s abc.obj *= #6 bolt.expr.const
+scoreboard players operation @s abc.obj *= #7 bolt.expr.const
+scoreboard players operation @s abc.obj *= #8 bolt.expr.const
+scoreboard players operation @s abc.obj = #value abc.obj
+scoreboard players operation @s abc.obj *= #-5 bolt.expr.const
+scoreboard players operation __i0 bolt.expr.temp = #value abc.obj
+scoreboard players operation __i0 bolt.expr.temp *= #123 bolt.expr.const
+scoreboard players add __i0 bolt.expr.temp 10
+scoreboard players operation @s abc.obj += __i0 bolt.expr.temp
+scoreboard players operation __i0 bolt.expr.temp = #value abc.obj
+scoreboard players operation __i0 bolt.expr.temp *= #0 bolt.expr.const
+scoreboard players add __i0 bolt.expr.temp 50
+scoreboard players operation @s abc.obj %= __i0 bolt.expr.temp

tests/snapshots/examples__build_combo_score_prefix__0.data_pack/pack.mcmeta

@@ -0,0 +1,6 @@
+{
+  "pack": {
+    "pack_format": 10,
+    "description": ""
+  }
+}