From 0db7a30af0dc088ea50eb093b11ef466e5fbc7ca Mon Sep 17 00:00:00 2001
From: Gleb Koval <gleb@koval.net>
Date: Sat, 1 Feb 2025 21:05:42 +0000
Subject: [PATCH] refactor: remove excessive atomics

---
 src/main/wacc/parser.scala | 44 +++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 24 deletions(-)

diff --git a/src/main/wacc/parser.scala b/src/main/wacc/parser.scala
index 0d4b03b..237b6b5 100644
--- a/src/main/wacc/parser.scala
+++ b/src/main/wacc/parser.scala
@@ -88,38 +88,34 @@ object parser {
   private lazy val `<stmt>`: Parsley[NonEmptyList[Stmt]] =
     sepBy1(`<basic-stmt>`, ";")
   private lazy val `<basic-stmt>` =
-    (Skip from atomic("skip"))
-      | Read(atomic("read") ~> `<lvalue>`)
-      | Free(atomic("free") ~> `<expr>`)
-      | Return(atomic("return") ~> `<expr>`)
-      | Exit(atomic("exit") ~> `<expr>`)
-      | Print(atomic("print") ~> `<expr>`, pure(false))
-      | Print(atomic("println") ~> `<expr>`, pure(true))
+    (Skip from "skip")
+      | Read("read" ~> `<lvalue>`)
+      | Free("free" ~> `<expr>`)
+      | Return("return" ~> `<expr>`)
+      | Exit("exit" ~> `<expr>`)
+      | Print("print" ~> `<expr>`, pure(false))
+      | Print("println" ~> `<expr>`, pure(true))
       | If(
-        atomic("if") ~> `<expr>` <~ "then",
+        "if" ~> `<expr>` <~ "then",
         `<stmt>` <~ "else",
         `<stmt>` <~ "fi"
       )
-      | While(atomic("while") ~> `<expr>` <~ "do", `<stmt>` <~ "done")
-      | Block(atomic("begin") ~> `<stmt>` <~ "end")
-      | VarDecl(atomic(`<type>`), `<ident>` <~ "=", `<rvalue>`)
+      | While("while" ~> `<expr>` <~ "do", `<stmt>` <~ "done")
+      | Block("begin" ~> `<stmt>` <~ "end")
+      | VarDecl(`<type>`, `<ident>` <~ "=", `<rvalue>`)
       | Assign(`<ident>` <~ "=", `<rvalue>`)
   private lazy val `<lvalue>`: Parsley[LValue] =
-    atomic(`<pair-elem>`) | atomic(`<ident-or-array-elem>`)
+    `<pair-elem>` | `<ident-or-array-elem>`
   private lazy val `<rvalue>`: Parsley[RValue] =
-    atomic(`<array-liter>`) |
-      atomic(
-        NewPair(
-          "newpair" ~> "(" ~> `<expr>` <~ ",",
-          `<expr>` <~ ")"
-        )
+    `<array-liter>` |
+      NewPair(
+        "newpair" ~> "(" ~> `<expr>` <~ ",",
+        `<expr>` <~ ")"
       ) |
-      atomic(`<pair-elem>`) |
-      atomic(
-        Call(
-          "call" ~> `<ident>` <~ "(",
-          sepBy(`<expr>`, ",") <~ ")"
-        )
+      `<pair-elem>` |
+      Call(
+        "call" ~> `<ident>` <~ "(",
+        sepBy(`<expr>`, ",") <~ ")"
       ) | `<expr>`
   private lazy val `<pair-elem>` =
     Fst("fst" ~> `<lvalue>`) | Snd("snd" ~> `<lvalue>`)