bugfix star macro

Author: h908714124

src/main/java/io/polypen/parse/Macro.java

@@ -20,7 +20,7 @@ static ListExpr applyStarMacro(ListExpr listExpr) {
         Expr previous = null;
         for (int i = 0; i < exprs.size(); i++) {
             Expr expr = exprs.get(i);
-            if (isStrongBind(previous) && (!isPlus(expr) || !region.isEmpty())) {
+            if (isStrongBind(previous) && (isStrongBind(expr) || !region.isEmpty())) {
                 region.add(previous);
             } else {
                 if (!region.isEmpty()) {
@@ -46,7 +46,7 @@ public static boolean isStrongBind(Expr expr) {
         if (expr == null) {
             return false;
         }
-        return expr instanceof MultExpr || expr instanceof VarExp || expr instanceof NumberExpr;
+        return expr instanceof MultExpr || expr instanceof VarExp || expr instanceof NumberExpr || expr instanceof ListExpr;
     }
 
     public static boolean isPlus(Expr expr) {

src/test/java/io/polypen/parse/ParserTest.java

@@ -37,4 +37,15 @@ void starMacro2() {
                         NumberExpr.of(1), PLUS, ListExpr.of(NumberExpr.of(2), MULT, NumberExpr.of(3)), PLUS, NumberExpr.of(4)),
                 expanded);
     }
+
+    @Test
+    void starMacro3() {
+        ListExpr result = Parser.parse("(1 + 2) * 3");
+        ListExpr expanded = applyStarMacro(result);
+        assertEquals(ListExpr.of(
+                        ListExpr.of(
+                                ListExpr.of(NumberExpr.of(1), PLUS, NumberExpr.of(2)),
+                                MULT, NumberExpr.of(3))),
+                expanded);
+    }
 }