Intermediate

Author: Seng-Jik

YukimiScript.CodeGen.Lua/Lua.fs

@@ -1,62 +1,49 @@
 module YukimiScript.CodeGen.Lua
 
 open YukimiScript.Parser
-open YukimiScript.Parser.Dom
 open YukimiScript.Parser.Elements
 
 
-let generateLua (x: Dom) : string =
+let generateLua (Intermediate scenes) : string =
     let luaCall (x: string) =
         let i = x.LastIndexOf '.'
         x.[..i-1] + ":" + x.[i+1..]
 
     let sb = System.Text.StringBuilder ()
-    sb.Append("return function(api) return {") |> ignore
+    sb.AppendLine("return function(api) return {") |> ignore
 
-    x.Scenes
-    |> List.iter (fun (defination, block, debugInfo) ->
+    scenes
+    |> List.iter (fun (IntermediateScene (defination, commands)) ->
         sb  .Append("  [\"")
             .Append(Constants.string2literal defination.Name)
             .Append("\"] = {") |> ignore
 
-        if debugInfo.Comment.IsSome then
-            sb  .Append("    -- ")
-                .Append(debugInfo.Comment.Value) |> ignore
-
         sb.AppendLine() |> ignore
 
-        block
-        |> List.iter (fun (op, debugInfo) ->
-            match op with
-            | EmptyLine -> ()
-            | CommandCall c ->
-                sb  .Append("    function() ")
-                    .Append(luaCall <| "api." + c.Callee)
-                    .Append("(") |> ignore
-
-                let args =
-                    c.UnnamedArgs
-                    |> List.map (function
-                        | Symbol "true" -> "true"
-                        | Symbol "false" -> "false"
-                        | Symbol "null" | Symbol "nil" -> "nil"
-                        | Symbol x -> luaCall <| "api." + x
-                        | Integer x -> string x
-                        | Number x -> string x
-                        | String x -> "\"" + Constants.string2literal x + "\"")
-                        
-                if not <| List.isEmpty args then
-                    args
-                    |> List.reduce (fun a b -> a + ", " + b)
-                    |> sb.Append
-                    |> ignore
-
-                sb.Append(") end,") |> ignore
-
-            | _ -> failwith "This construction is not supported."
-
-            if debugInfo.Comment.IsSome then
-                sb.Append("    -- ").Append(debugInfo.Comment.Value) |> ignore
+        commands
+        |> List.iter (fun c ->
+            sb  .Append("    function() ")
+                .Append(luaCall <| "api." + c.Callee)
+                .Append("(") |> ignore
+
+            let args =
+                c.UnnamedArgs
+                |> List.map (function
+                    | Symbol "true" -> "true"
+                    | Symbol "false" -> "false"
+                    | Symbol "null" | Symbol "nil" -> "nil"
+                    | Symbol x -> "api." + x
+                    | Integer x -> string x
+                    | Number x -> string x
+                    | String x -> "\"" + Constants.string2literal x + "\"")
+                    
+            if not <| List.isEmpty args then
+                args
+                |> List.reduce (fun a b -> a + ", " + b)
+                |> sb.Append
+                |> ignore
+
+            sb.Append(") end,") |> ignore
 
             sb.AppendLine() |> ignore
         )

YukimiScript.CommandLineTool/Compile.fs

@@ -43,7 +43,7 @@ let private findRepeat (items: (string * Elements.DebugInformation) seq) =
         else Some (key, matches |> Seq.map snd))
 
 
-let checkRepeat errStringing (dom: Dom.Dom) =
+let checkRepeat errStringing (dom: Dom) =
     dom.Externs 
     |> Seq.map (fun (Elements.ExternCommand (cmd, _), dbg) -> cmd, dbg)
     |> findRepeat 
@@ -108,7 +108,7 @@ let loadLibs errStringing libPaths =
     |> List.fold Dom.merge Dom.empty
 
 
-let loadSrc errStringing (lib: Dom.Dom) srcPath =
+let loadSrc errStringing (lib: Dom) srcPath =
     Dom.merge lib (loadDom errStringing srcPath)
     |> Dom.expandTextCommands
     |> Dom.expandUserMacros

YukimiScript.CommandLineTool/Program.fs

@@ -101,8 +101,7 @@ let doAction errStringing =
         targets
         |> List.iter (function
             | Lua output -> 
-                let functionName = Path.GetFileNameWithoutExtension inputFile
-                let lua = YukimiScript.CodeGen.Lua.generateLua dom
+                let lua = YukimiScript.CodeGen.Lua.generateLua <| Intermediate.ofDom dom
                 File.WriteAllText(output, lua, Text.Encoding.UTF8))
 
     | Dgml (inputDir, outDgml, options) -> 

YukimiScript.Parser/Diagram.fs

@@ -1,7 +1,6 @@
 module YukimiScript.Parser.Diagram
 
 open YukimiScript.Parser.Elements
-open YukimiScript.Parser.Dom
 open YukimiScript.Parser.Macro
 open System.IO