Merge pull request #436 from ArkScript-lang/remove-macro-blocks

feat!: $* macro as it is not needed anymore
ArkScript-lang · Mar 17, 2024 · 061c2f3 · 061c2f3
2 parents 936307f + 2d88098
commit 061c2f3
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 37 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -69,7 +69,7 @@ jobs:
         config:
           - {
             os: ubuntu-latest, name: "Ubuntu Clang 15", cc: "clang-15", cxx: "clang++-15",
-            artifact: "ubuntu-clang-15", sanitizers: "On", preconfigure: ""
+            artifact: "ubuntu-clang-15", sanitizers: "Off", preconfigure: ""
           }
           - {
             os: ubuntu-latest, name: "Ubuntu Clang 15 (valgrind)", cc: "clang-15", cxx: "clang++-15",

diff --git a/include/Ark/Compiler/AST/Parser.hpp b/include/Ark/Compiler/AST/Parser.hpp
@@ -44,7 +44,6 @@ namespace Ark::internal
         std::optional<Node> functionArgs();
         std::optional<Node> function();
         std::optional<Node> macroCondition();
-        std::optional<Node> macroBlock();
         std::optional<Node> macroArgs();
         std::optional<Node> macro();
         std::optional<Node> functionCall();

diff --git a/lib/std b/lib/std
diff --git a/src/arkreactor/Compiler/AST/Parser.cpp b/src/arkreactor/Compiler/AST/Parser.cpp
@@ -87,11 +87,6 @@ namespace Ark::internal
         else
             backtrack(position);
 
-        if (auto result = macroBlock())
-            return result;
-        else
-            backtrack(position);
-
         if (auto result = macro(); result.has_value())
             return result;
         else
@@ -505,34 +500,6 @@ namespace Ark::internal
         return leaf;
     }
 
-    std::optional<Node> Parser::macroBlock()
-    {
-        if (!accept(IsChar('(')))
-            return std::nullopt;
-        newlineOrComment();
-
-        if (!oneOf({ "$*" }))
-            return std::nullopt;
-        newlineOrComment();
-
-        Node leaf(NodeType::List);
-
-        while (!isEOF())
-        {
-            if (auto value = nodeOrValue(); value.has_value())
-            {
-                leaf.push_back(value.value());
-                newlineOrComment();
-            }
-            else
-                break;
-        }
-
-        newlineOrComment();
-        expect(IsChar(')'));
-        return leaf;
-    }
-
     std::optional<Node> Parser::macroArgs()
     {
         if (accept(IsChar('(')))

diff --git a/tests/arkscript/macro-tests.ark b/tests/arkscript/macro-tests.ark
@@ -146,7 +146,7 @@
         ($if (> x 1)
             (suffix-dup sym (- x 1)))
         (symcat sym x)})
-    (let magic_func (fun ($* (suffix-dup a 3)) (- a1 a2 a3)))
+    (let magic_func (fun ((suffix-dup a 3)) (- a1 a2 a3)))
     (set tests (assert-eq (magic_func 1 2 3) (- 1 2 3) "macro symdup" tests))
 
     ($ partial (func ...defargs) {