Added input instruction

4 files changed, 26 insertions, 8 deletions

diff --git a/editors/vim/syntax/bruijn.vim b/editors/vim/syntax/bruijn.vim
index 5ea9017..ef78a72 100644
--- a/editors/vim/syntax/bruijn.vim
+++ b/editors/vim/syntax/bruijn.vim
@@ -10,7 +10,7 @@ syn match bruijnAbstraction /[[\]]/
 syn match bruijnIndex /\([^0-9]\)\@<=\d\([^0-9]\)\@=/
 syn match bruijnNumber /([+-]\d\+)/
 syn match bruijnDefinition /^\t*\S\+/
-syn match bruijnKeyword /:test\|:import\|:print/
+syn match bruijnKeyword /:test\|:import\|:input\|:print/
 syn match bruijnNamespace /[A-Z][a-z]*\(\.\)\@=/
 syn match bruijnNamespaceDelim /\([A-Z][a-z]*\)\@<=\./
 
diff --git a/src/Eval.hs b/src/Eval.hs
index 4051643..c80212d 100644
--- a/src/Eval.hs
+++ b/src/Eval.hs
@@ -122,6 +122,13 @@ evalInstruction (ContextualInstruction instr inp) s@(EnvState env) rec conf = ca
             then (putStrLn $ name <> " = " <> show e)
               >> return (EnvState env')
             else rec (EnvState env') conf
+  Input path -> do
+    lib           <- getDataFileName path -- TODO: Use actual lib directory
+    exists        <- doesFileExist lib
+    actual        <- pure $ if exists then lib else path
+    if actual `elem` evalPaths conf then print (ContextualError (ImportError path) (Context inp $ nicePath conf)) >> pure s else do
+      EnvState env' <- loadFile actual (conf { nicePath = path }) -- TODO: Fix wrong `within` in import error
+      rec (EnvState $ env' <> env) (conf { isRepl = False, evalPaths = evalPaths conf }) -- import => isRepl = False
   -- TODO: Don't import subimports into main env
   Import path namespace -> do
     lib           <- getDataFileName path -- TODO: Use actual lib directory
diff --git a/src/Helper.hs b/src/Helper.hs
index 47c106d..f53a700 100644
--- a/src/Helper.hs
+++ b/src/Helper.hs
@@ -91,7 +91,7 @@ printBundle ParseErrorBundle {..} =
 
 data Expression = Bruijn Int | Variable String | Abstraction Expression | Application Expression Expression | Infix Expression String Expression | Prefix String Expression
   deriving (Ord, Eq)
-data Instruction = Define String Expression [Instruction] | Evaluate Expression | Comment | Import String String | Test Expression Expression | ContextualInstruction Instruction String
+data Instruction = Define String Expression [Instruction] | Evaluate Expression | Comment | Input String | Import String String | Test Expression Expression | ContextualInstruction Instruction String
   deriving (Show)
 instance Show Expression where
   show (Bruijn      x  ) = "\ESC[91m" <> show x <> "\ESC[0m"
diff --git a/src/Parser.hs b/src/Parser.hs
index 9a4a793..1b3ac41 100644
--- a/src/Parser.hs
+++ b/src/Parser.hs
@@ -18,7 +18,7 @@ sc :: Parser ()
 sc = void $ char ' '
 
 specialChar :: Parser Char
-specialChar = oneOf "!?*@.:;+-_#$%^&<>/\\|~='"
+specialChar = oneOf "!?*@.:;+-_#$%^&<>/\\|~="
 
 infixOperator :: Parser String
 infixOperator = some specialChar
@@ -29,7 +29,7 @@ prefixOperator = some specialChar
 -- def identifier disallows the import prefix dots
 defIdentifier :: Parser String
 defIdentifier =
-  ((:) <$> letterChar <*> many (alphaNumChar <|> specialChar))
+  ((:) <$> letterChar <*> many (alphaNumChar <|> specialChar <|> char '\''))
     <|> ((\l i r -> [l] ++ i ++ [r]) <$> char '(' <*> infixOperator <*> char ')'
         )
     <|> ((\p i -> p ++ [i]) <$> prefixOperator <*> char '(')
@@ -38,7 +38,10 @@ defIdentifier =
 -- TODO: write as extension to defIdentifier
 identifier :: Parser String
 identifier =
-  ((:) <$> letterChar <*> many (alphaNumChar <|> specialChar <|> char '.'))
+  ((:) <$> letterChar <*> many (alphaNumChar <|> specialChar <|> oneOf ".\'"))
+    <|> ((\l i r -> [l] ++ i ++ [r]) <$> char '(' <*> infixOperator <*> char ')'
+        )
+    <|> ((\p i -> p ++ [i]) <$> prefixOperator <*> char '(')
     <?> "identifier"
 
 namespace :: Parser String
@@ -129,9 +132,9 @@ parseSingleton =
     <|> parseString
     <|> parseChar
     <|> parseAbstraction
+    <|> try parseVariable
     <|> try (parens parseInfix <?> "enclosed infix expr")
     <|> (parens parseApplication <?> "enclosed application")
-    <|> parseVariable
     <|> parsePrefix
 
 parseExpression :: Parser Expression
@@ -173,15 +176,22 @@ parseComment = do
 parseImport :: Parser Instruction
 parseImport = do
   inp  <- getInput
-  _    <- string ":import " <?> "import"
+  _    <- string ":import " <?> "import instruction"
   path <- importPath
   ns   <- (try $ sc *> namespace) <|> (eof >> return "")
   pure $ ContextualInstruction (Import (path ++ ".bruijn") ns) inp
 
+parseInput :: Parser Instruction
+parseInput = do
+  inp  <- getInput
+  _    <- string ":input " <?> "input instruction"
+  path <- importPath
+  pure $ ContextualInstruction (Input $ path ++ ".bruijn") inp
+
 parsePrint :: Parser Instruction
 parsePrint = do
   inp <- getInput
-  _   <- string ":print " <?> "print"
+  _   <- string ":print " <?> "print instruction"
   e   <- parseExpression
   pure $ ContextualInstruction (Evaluate e) inp
 
@@ -209,6 +219,7 @@ parseDefBlock lvl =
     *> (   try (parseDefine lvl)
        <|> try parsePrint
        <|> try parseImport
+       <|> try parseInput
        <|> try parseTest
        )