From 940e4429a7bf1112225f606a53248865d8f61f4d Mon Sep 17 00:00:00 2001
From: Humza Shahid <humzasaur@gmail.com>
Date: Sat, 9 Aug 2025 11:29:36 +0100
Subject: [PATCH] reimplement parsing code (but program does not compile yet
 because I have to change type of 'USE_SQUARES' constructure)

---
 dotscape.mlb            | 20 +++++++++++++++++---
 fcore/layer-tree.sml    |  3 +++
 fcore/parser/parser.md  |  4 ++--
 fcore/parser/parser.mlb | 16 ----------------
 fcore/parser/parser.sml | 28 ++++++++++++++++++++--------
 5 files changed, 42 insertions(+), 29 deletions(-)
 delete mode 100644 fcore/parser/parser.mlb

diff --git a/dotscape.mlb b/dotscape.mlb
index c95736a..f38ce06 100644
--- a/dotscape.mlb
+++ b/dotscape.mlb
@@ -3,6 +3,23 @@ $(SML_LIB)/basis/basis.mlb
 (* FUNCTIONAL CORE *)
 fcore/grid.sml
 fcore/layer-tree.sml
+
+(* parser *)
+ann
+  "allowVectorExps true"
+in
+  fcore/parser/space-dfa.sml
+  fcore/parser/int-dfa.sml
+  fcore/parser/brace-dfa.sml
+  fcore/parser/all-dfa.sml
+end
+
+fcore/parser/tokens.sml
+fcore/parser/lexer.sml
+fcore/parser/parse-grid.sml
+fcore/parser/parser.sml
+(* end of parser *)
+
 fcore/app-type.sml
 
 ann
@@ -30,9 +47,6 @@ fcore/browse-mode.sml
 fcore/move-mode.sml
 fcore/app-update.sml
 
-(* pure file parsing functions *)
-fcore/parser/parser.mlb
-
 (* IMPERATIVE SHELL *)
 $(SML_LIB)/basis/mlton.mlb
 $(SML_LIB)/cml/cml.mlb
diff --git a/fcore/layer-tree.sml b/fcore/layer-tree.sml
index 132543a..79fa68a 100644
--- a/fcore/layer-tree.sml
+++ b/fcore/layer-tree.sml
@@ -9,6 +9,9 @@ struct
     in NODE {key = minKey, value = grid, left = LEAF, right = LEAF}
     end
 
+  fun singleton grid =
+    NODE {key = minKey, value = grid, left = LEAF, right = LEAF}
+
   fun insert (newKey, newValue, tree) =
     case tree of
       LEAF => NODE {key = newKey, value = newValue, left = LEAF, right = LEAF}
diff --git a/fcore/parser/parser.md b/fcore/parser/parser.md
index 9b18895..5d879d1 100644
--- a/fcore/parser/parser.md
+++ b/fcore/parser/parser.md
@@ -11,9 +11,9 @@ int ::= (0-9)+
 
 item ::= **{** int int int int int int int int **}**
 
-grid ::= **[** item **]**
+layer ::= **[** item **]**
 
-grid_list ::= int int **{** (grid)+ **}**
+layer_tree ::= int int **{** (layer)* **}**
 ```
 
 The first two `int`s in the grid `int int **{** (item)+ **}**` always follow the order: `canvasWidth canvasHeight`.
diff --git a/fcore/parser/parser.mlb b/fcore/parser/parser.mlb
deleted file mode 100644
index fca461c..0000000
--- a/fcore/parser/parser.mlb
+++ /dev/null
@@ -1,16 +0,0 @@
-$(SML_LIB)/basis/basis.mlb
-
-ann
-  "allowVectorExps true"
-in
-  space-dfa.sml
-  int-dfa.sml
-  brace-dfa.sml
-  all-dfa.sml
-end
-
-tokens.sml
-lexer.sml
-
-parse-grid.sml
-parser.sml
diff --git a/fcore/parser/parser.sml b/fcore/parser/parser.sml
index 2011981..abc7d16 100644
--- a/fcore/parser/parser.sml
+++ b/fcore/parser/parser.sml
@@ -18,20 +18,32 @@ struct
         end
     | _ => SOME (tokens, grid)
 
+  fun parseLayers (tokens, canvasWidth, canvasHeight, tree, counter) =
+    let
+      val grid = ParseGrid.make (canvasWidth, canvasHeight)
+    in
+      case parseItems (tokens, grid) of
+        SOME (tokens, grid) =>
+          let val tree = LayerTree.insert (counter, grid, tree)
+          in parseLayers (tokens, canvasWidth, canvasHeight, tree, counter + 1)
+          end
+      | NONE => (tokens, tree)
+    end
+
   fun parse string =
     case Lexer.scan string of
       SOME tokens =>
         (case tokens of
-           T.INT canvasWidth :: T.INT canvasHeight :: T.L_BRACE :: tl =>
+           T.INT canvasWidth :: T.INT canvasHeight :: tl =>
              let
-               val grid = ParseGrid.make (canvasWidth, canvasHeight)
+               val maxSide = Int.max (canvasWidth, canvasHeight)
+               val tree = LayerTree.init maxSide
+               val (tokens, tree) = parseLayers
+                 (tl, canvasWidth, canvasHeight, tree, 1)
              in
-               case parseItems (tl, grid) of
-                 SOME (tokens, grid) =>
-                   (case tokens of
-                      [T.R_BRACE] => SOME (canvasWidth, canvasHeight, grid)
-                    | _ => NONE)
-               | NONE => NONE
+               case tokens of
+                 [T.R_BRACE] => SOME tree
+               | _ => NONE
              end
          | _ => NONE)
     | NONE => NONE