allow pass string as character name.

Author: Seng-Jik

YukimiScript.CodeGen/PyMO.fs

@@ -345,9 +345,9 @@ let private genCommand
         | "__text_begin" -> 
             match call.Arguments.[0] with
             | Symbol "null" as n -> Ok { context with CurrentComplexCommand = Some (sayCommand, [n])}
-            | Symbol x -> 
+            | String x -> 
                 match Map.tryFind x context.Characters with
-                | None -> Error ("未能找到角色定义 " + x + " 。", call.DebugInformation)
+                | None -> Ok { context with CurrentComplexCommand = Some (sayCommand, [Constant.String x])}
                 | Some x -> Ok { context with CurrentComplexCommand = Some (sayCommand, [Constant.String x])}
             | _ -> failwith ""
         | "__text_type" -> Error ("错误的__text_type用法。", call.DebugInformation)

YukimiScript.Parser/Dom.fs

@@ -198,11 +198,12 @@ module Dom =
                 | Ok (ExternDefination x) -> x
                 | _ -> failwith "Bug here!"
 
-        [ parse "- extern __text_begin character=null", [ "character", Types.symbol ]
+        [ parse "- extern __text_begin character=null", [ 
+                "character", ParameterType ("string | null", set [ String'; ExplicitSymbol' "null" ]) ]
           parse "- extern __text_type text", [ "text", Types.string ]
           parse "- extern __text_pushMark mark", [ "mark", Types.symbol ]
           parse "- extern __text_popMark mark", [ "mark", Types.symbol ]
-          parse "- extern __text_end hasMore", [ "hasMore", Types.symbol] ]
+          parse "- extern __text_end hasMore", [ "hasMore", Types.bool ] ]
 
 
     let linkToExternCommands (x: Dom) : Result<Dom, exn> =

YukimiScript.Parser/Text.fs

@@ -17,8 +17,8 @@ let private commandCall =
     }
 
 
-let private bareText =
-    let charPred x =
+let private bareText, characterNameText =
+    let charPred isCharacterNameText x =
         Seq.exists
             ((=) x)
             [ '\n'
@@ -28,14 +28,19 @@ let private bareText =
               '>'
               '#'
               '\\'
-              '\r' ]
+              '\r'
+              if isCharacterNameText then ':' ]
         |> not
 
-    let textChar = predicate charPred anyChar
+    
+    let p isCharacterNameText =
+        let textChar = predicate (charPred isCharacterNameText) anyChar
+
+        oneOrMore textChar
+        
 
-    oneOrMore textChar
-    |> map (toString >> TextSlice.Text)
-    |> name "text"
+    p false |> map (toString >> TextSlice.Text) |> name "text", 
+    p true |> map toString
 
 
 let rec private markBlock () =
@@ -70,7 +75,7 @@ let text =
             let! character =
                 parser {
                     do! whitespace0
-                    let! character = symbol
+                    let! character = characterNameText
                     do! literal ":"
                     return character
                 }
@@ -123,7 +128,7 @@ let toCommands (text: TextBlock) : CommandCall list =
         UnnamedArgs = []
         NamedArgs =
             [ if text.Character.IsSome then
-                  "character", Constant <| Symbol text.Character.Value ] }
+                  "character", Constant <| String text.Character.Value ] }
 
       let rec textSliceToCommand x =
           x
@@ -147,7 +152,6 @@ let toCommands (text: TextBlock) : CommandCall list =
 
       yield! textSliceToCommand text.Text
 
-
       { Callee = "__text_end"
         UnnamedArgs = []
         NamedArgs = [ "hasMore", Constant <| Symbol (text.HasMore.ToString().ToLower()) ] } ]