Explicit Symbol Type

Author: Seng-Jik

.gitignore

@@ -3,6 +3,8 @@
 ##
 ## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
 
+.vscode
+
 # User-specific files
 *.rsuser
 *.suo

Examples/Type Checker Example.ykm

@@ -0,0 +1,16 @@
+- macro checkTypeCharacterName name
+@__type_symbol name a
+@__type_symbol name b
+@__type_symbol name c
+@__type_symbol name d
+
+- macro sayFromCharacter name text
+@checkTypeCharacterName name
+@__type text string
+
+- scene "test"
+@sayFromCharacter a "Hello"
+@sayFromCharacter b "Hello"
+@sayFromCharacter c "Hello"
+@sayFromCharacter d "Hello"
+

YukimiScript.Parser/Dom.fs

@@ -76,7 +76,7 @@ module Dom =
                             | ExternDefination (ExternCommand (n, p)) ->
                                 if
                                     List.forall (fst >> function
-                                        | CommandCall c when c.Callee = "__type" -> true
+                                        | CommandCall c when c.Callee = "__type" || c.Callee = "__type_symbol" -> true
                                         | EmptyLine -> true
                                         | _ -> false) block
                                 then

YukimiScript.Parser/ErrorStringing.fs

@@ -20,7 +20,7 @@ let header (debug: Elements.DebugInformation) =
     + string debug.LineNumber
     + "):"
 
-let schinese: ErrorStringing =
+let rec schinese: ErrorStringing =
     function
     | TypeChecker.TypeCheckFailedException (d, i, ParameterType (name, _), a) ->
         header d 
@@ -90,4 +90,11 @@ let schinese: ErrorStringing =
     | CannotDefineSceneInLibException debug -> debug + ":不能在lib中定义scene。"
     | DiagramMacroErrorException d -> header d + "__diagram_link_to宏使用方式错误。"
     | CannotFindSceneException x -> "不能找到场景\"" + x + "\"的定义。"
+    | MacroInnerException (debugInfo, x) ->
+        header debugInfo + "在展开宏时遇到以下错误：" + System.Environment.NewLine +
+        begin 
+            (schinese x).Split '\n' 
+            |> Array.map (fun x -> "    " + x.Trim('\r')) 
+            |> Array.reduce (fun a b -> a + System.Environment.NewLine + b)
+        end
     | e -> "未知错误" + e.Message

YukimiScript.Parser/Macro.fs

@@ -125,6 +125,9 @@ let private replaceParamToArgs args macroBody =
           NamedArgs = List.map (fun (name, arg) -> name, replaceArg arg) macroBody.NamedArgs }
 
 
+exception MacroInnerException of DebugInformation * exn
+
+
 let rec private expandSingleOperation macros operation : Result<Block, exn> =
     match operation with
     | CommandCall command, debug ->
@@ -146,6 +149,7 @@ let rec private expandSingleOperation macros operation : Result<Block, exn> =
             |> sequenceRL
             |> Result.map List.concat
     | x -> Ok [ x ]
+    |> Result.mapError (fun err -> MacroInnerException (snd operation, err))
 
 
 let expandBlock macros (block: Block) =
@@ -155,7 +159,7 @@ let expandBlock macros (block: Block) =
 
 
 let expandSystemMacros (block: Block) =
-    let systemMacros = [ "__diagram_link_to"; "__type" ]
+    let systemMacros = [ "__diagram_link_to"; "__type"; "__type_symbol" ]
 
     block
     |> List.map
@@ -217,7 +221,7 @@ let parametersTypeFromBlock (par: Parameter list) (b: Block) : Result<BlockParam
                                     | Some x -> Ok x
                                     | None -> Error <| IsNotAType typeName
                             | "__type_symbol" ->
-                                Ok <| ParameterType ($"^{typeName}", set [ExplicitSymbol' typeName])
+                                Ok <| ParameterType ($"{typeName}", set [ExplicitSymbol' typeName])
                             | _ -> failwith "?")
                         |> sequenceRL
                         |> Result.map (fun t ->