Skip to content

add 「」 as an alternative of 【】 #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LittleJianCH wants to merge 1 commit into
base: main
Choose a base branch
from
Open

add 「」 as an alternative of 【】 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions samples/「」示例.入
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
引「./libru/列.入」

以串为“你好，入语言！”
则串之「串印」
7 changes: 5 additions & 2 deletions src/Interp.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,10 @@ data InterpError
deriving (Show)

removeHeadTail :: String -> String
removeHeadTail str = Prelude.filter (/='】') (Prelude.filter (/='【') str)
removeHeadTail = Prelude.filter (/='】') .
Prelude.filter (/='」') .
Prelude.filter (/='【') .
Prelude.filter (/='「')

interp :: InterpEnv -> Expr -> ExceptT InterpError IO Atom
interp env (ExprValue val) =
Expand Down Expand Up @@ -71,4 +74,4 @@ interp env (ExprInclude var expr) = do
Right exp -> interp env $ injectHostFunctions hostFuncs exp

runInterp :: Expr -> IO (Either InterpError Atom)
runInterp expr = runExceptT $ interp M.empty expr
runInterp expr = runExceptT $ interp M.empty expr
6 changes: 4 additions & 2 deletions src/MonadicParse.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import Text.Parsec.Language (haskellDef)
import Text.Parsec.String (parseFromFile)

ruChar :: Parsec String st Char
ruChar = noneOf "令时入之取者也以为并否则即元引【】"
ruChar = noneOf "令时入之取者也以为并否则即元引【】「」"

ruWhiteSpace :: Parsec String st Char
ruWhiteSpace = oneOf " \t\n、，：！？得。"
Expand All @@ -23,7 +23,9 @@ concatParser [s] = s
concatParser (s:xs) = fmap (++) s <*> concatParser xs

variable :: Parsec String st AST.Variable
variable = try ( concatParser [ruString "【", many (noneOf "】"), ruString "】"] )
variable = try ( concatParser [(try (ruString "「") >> pure "【") <|> try (ruString "【"),
many (noneOf "】」"),
(try (ruString "」") >> pure "】") <|> try (ruString "】")] )
<|> count 1 (ruChar)

lexer = P.makeTokenParser haskellDef
Expand Down