Remove 'Result<'a>'

Author: Seng-Jik

YukimiScript.Parser/Diagram.fs

@@ -27,7 +27,7 @@ exception DiagramMacroErrorException of DebugInformation
 exception CannotFindSceneException of string
 
 
-let analyze (files: (string * Dom) list) : Result<Diagram> =
+let analyze (files: (string * Dom) list) : Result<Diagram, exn> =
     try
         let fileNodes, arrows =
             files

YukimiScript.Parser/Dom.fs

@@ -113,7 +113,7 @@ module Dom =
     exception CannotDefineSceneInLibException of string
 
 
-    let analyze (fileName: string) (x: Parsed seq) : Result<Dom> =
+    let analyze (fileName: string) (x: Parsed seq) : Result<Dom, exn> =
         let finalState =
             x
             |> Seq.indexed
@@ -198,7 +198,7 @@ module Dom =
           parse "- extern __text_end hasMore" ]
 
 
-    let linkToExternCommands (x: Dom) : Result<Dom> =
+    let linkToExternCommands (x: Dom) : Result<Dom, exn> =
         let externs = systemCommands @ List.map fst x.Externs
 
         let linkSingleCommand (op, debugInfo) =

YukimiScript.Parser/EditorHelper.fs

@@ -4,10 +4,10 @@ open YukimiScript.Parser
 open YukimiScript.Parser.Elements
 
 
-type Runner<'State> = 'State -> CommandCall -> Result<'State>
+type Runner<'State> = 'State -> CommandCall -> Result<'State, exn>
 
 
-let rec run (state: 'State) (runner: Runner<'State>) (ops: Block) : Result<'State> =
+let rec run (state: 'State) (runner: Runner<'State>) (ops: Block) : Result<'State, exn> =
     match Seq.tryHead ops with
     | None -> Ok state
     | Some (EmptyLine, _) -> run state runner <| List.tail ops
@@ -30,6 +30,6 @@ let dispatch (dispatcher: CommandCall -> Runner<'State>) : Runner<'State> = fun
 
 
 type RunnerWrapper<'TState>(init: 'TState, mainRunner: Runner<'TState>) =
-    member _.Run(state: 'TState, ops: Block) : Result<'TState> = run state mainRunner ops
+    member _.Run(state: 'TState, ops: Block) : Result<'TState, exn> = run state mainRunner ops
 
-    member x.Run(ops: Block) : Result<'TState> = x.Run(init, ops)
+    member x.Run(ops: Block) : Result<'TState, exn> = x.Run(init, ops)

YukimiScript.Parser/Elements.fs

@@ -1,7 +1,5 @@
 namespace YukimiScript.Parser.Elements
 
-open YukimiScript.Parser
-
 
 type Constant =
     | String of string
@@ -76,12 +74,12 @@ module Operation =
     exception CanNotConvertToOperationException of Line
 
 
-    let ofLine: Line -> Result<Operation> =
+    let ofLine: Line -> Operation =
         function
-        | Line.Text t -> Ok <| Text t
-        | Line.CommandCall c -> Ok <| CommandCall c
-        | Line.EmptyLine -> Ok <| EmptyLine
-        | x -> Error <| CanNotConvertToOperationException x
+        | Line.Text t -> Text t
+        | Line.CommandCall c -> CommandCall c
+        | Line.EmptyLine -> EmptyLine
+        | x -> raise <| CanNotConvertToOperationException x
 
 
 type Block = (Operation * DebugInformation) list

YukimiScript.Parser/Macro.fs

@@ -58,7 +58,7 @@ exception ArgumentRepeatException of DebugInformation * CommandCall * string
 exception ArgumentUnmatchedException of DebugInformation * CommandCall * parameter: string
 
 
-let matchArguments debugInfo (x: Parameter list) (c: CommandCall) : Result<(string * Constant) list> =
+let matchArguments debugInfo (x: Parameter list) (c: CommandCall) : Result<(string * Constant) list, exn> =
     let defaultArgs =
         x
         |> List.choose (fun { Parameter = name; Default = x } -> Option.map (fun x -> name, x) x)
@@ -76,7 +76,7 @@ let matchArguments debugInfo (x: Parameter list) (c: CommandCall) : Result<(stri
             | None -> Ok()
             | Some (p, _) -> Error <| ArgumentRepeatException(debugInfo, c, p)
 
-    let matchArg paramName : Result<string * Constant> =
+    let matchArg paramName : Result<string * Constant, exn> =
         let find = List.tryFind (fst >> (=) paramName)
 
         match find inputArgs with
@@ -122,7 +122,7 @@ let private replaceParamToArgs args macroBody =
           NamedArgs = List.map (fun (name, arg) -> name, replaceArg arg) macroBody.NamedArgs }
 
 
-let rec private expandSingleOperation macros operation : Result<Block> =
+let rec private expandSingleOperation macros operation : Result<Block, exn> =
     match operation with
     | CommandCall command, debug ->
         match matchMacro debug command macros with

YukimiScript.Parser/ParserMonad.fs

@@ -2,7 +2,7 @@ module YukimiScript.Parser.ParserMonad
 
 
 type Parser<'a> =
-    { Run: char list -> Result<'a * char list> }
+    { Run: char list -> Result<'a * char list, exn> }
 
 
 let bind (f: 'a -> Parser<'b>) (p: Parser<'a>) : Parser<'b> =
@@ -164,7 +164,7 @@ let rec literal (x: string) : Parser<unit> =
 exception ParseUnfinishedException of string
 
 
-let run (line: string) (parser: Parser<'a>) : Result<'a> =
+let run (line: string) (parser: Parser<'a>) : Result<'a, exn> =
     try
         parser.Run(Seq.toList line)
         |> Result.bind

YukimiScript.Parser/Types.fs

@@ -4,7 +4,6 @@
     <WarnOn>3390;$(WarnOn)</WarnOn>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="Types.fs" />
     <Compile Include="Elements.fs" />
     <Compile Include="ParserMonad.fs" />
     <Compile Include="Basics.fs" />