fix lexer/parser bugs, add code in file-thread.sml to handle loading/saving of files (but loading is not completely finished yet)

fcore/common-update.sml

@@ -16,9 +16,10 @@ struct
       (model, [FILE msg])
     end
 
-  (* unimplemented *)
+  fun getLoadSquaresMsg model =
-  fun getLoadSquaresMsg model = (model, [])
+    (model, [FILE LOAD_SQUARES])
 
+  (* unimplemented *)
   fun getExportSquaresMsg model = (model, [])
 
   fun useSquaresInNormalMode (model, squares) = (model, [])

fcore/parser/int-dfa.sml

@@ -8,12 +8,10 @@ struct
     let
       val chr = Char.chr i
     in
-      if chr >= #"0" orelse chr < #"9" then
+      if Char.isDigit chr then final else dead
-        final
-      else dead
     end
 
-  val deadTable = SpaceDfa.deadTable
+  val deadTable = Vector.tabulate (255, fn _ => dead)
   val startTable  = Vector.tabulate (255, makeStart)
   val finalTable = startTable
 

fcore/parser/lexer.sml

@@ -17,7 +17,7 @@ struct
         SOME (lastSpace, acc)
       else
         let
-          val str = String.substring (str, min, finish - min)
+          val str = String.substring (str, min, finish - min + 1)
         in
           if min = lastInt then
             case Int.fromString str of
@@ -33,14 +33,15 @@ struct
     end
 
   fun scanStep (pos, str, acc, dfa, finish) =
-    if AllDfa.areAllDead dfa then
+    if pos < 0 orelse AllDfa.areAllDead dfa then
       addToken (acc, dfa, str, finish)
     else
       let
         val chr = String.sub (str, pos)
         val dfa = AllDfa.update (chr, dfa, pos)
       in
-        scanStep (pos - 1, str, acc, dfa, finish)
+        if AllDfa.areAllDead dfa then addToken (acc, dfa, str, finish)
+        else scanStep (pos - 1, str, acc, dfa, finish)
       end
 
   fun scanLoop (pos, str, acc) =

fcore/parser/parser.sml

@@ -18,18 +18,21 @@ struct
         end
     | _ => SOME (tokens, grid)
 
-  fun parse tokens =
+  fun parse string =
-    case tokens of
+    case Lexer.scan string of
-      T.INT canvasWidth :: T.INT canvasHeight :: T.L_BRACE :: tl =>
+      SOME tokens =>
-        let
+        (case tokens of
-          val grid = ParseGrid.make (canvasWidth, canvasHeight)
+           T.INT canvasWidth :: T.INT canvasHeight :: T.L_BRACE :: tl =>
-        in
+             let
-          case parseItems (tl, grid) of
+               val grid = ParseGrid.make (canvasWidth, canvasHeight)
-            SOME (tokens, grid) =>
+             in
-              (case tokens of
+               case parseItems (tl, grid) of
-                 [T.R_BRACE] => SOME grid
+                 SOME (tokens, grid) =>
-               | _ => NONE)
+                   (case tokens of
-            | NONE => NONE
+                      [T.R_BRACE] => SOME (canvasWidth, canvasHeight, grid)
-        end
+                    | _ => NONE)
-    | _ => NONE
+               | NONE => NONE
+             end
+         | _ => NONE)
+    | NONE => NONE
 end

fcore/quad-tree.sml

@@ -381,23 +381,6 @@ struct
       else y
   end
 
-  fun printItem {x, y, ex, ey, data} =
-    let
-      val msg = String.concat
-        [ "{x = "
-        , Int.toString x
-        , ", y = "
-        , Int.toString y
-        , ", ex = "
-        , Int.toString ex
-        , ", ey = "
-        , Int.toString ey
-        , "}\n"
-        ]
-    in
-      print msg
-    end
-
   local
     fun loop (tree, grid) =
       case tree of

green.dsc

@@ -0,0 +1 @@
+4 4 { {0 1 0 1 0 0 0 1 } {1 2 1 2 0 0 0 1 } }

imperative-shell/file-thread.sml

@@ -8,8 +8,6 @@ struct
   open FileMessage
   open InputMessage
 
-  datatype parse_result = OK of unit | PARSE_ERROR
-
   val structureName = "Green"
   val filename = "green.dsc"
   val exportFilename = "green.sml"
@@ -49,7 +47,21 @@ struct
 
   fun parse (io, acc) = ()
 
-  fun loadSquares (path, inputMailbox) = ()
+  fun loadIO (io, str) =
+    case TextIO.inputLine io of
+      SOME line => loadIO (io, str ^ line)
+    | NONE => str
+
+  fun loadSquares (path, inputMailbox) =
+    let
+      val io = TextIO.openIn filename
+      val str = loadIO (io, "")
+      val () = TextIO.closeIn io
+    in
+      case Parser.parse str of
+        SOME (canvasWidth, canvasHeight, grid) => ()
+      | NONE => ()
+    end
 
   fun saveSquares squaresString =
     let