Rework module system
Don't require/allow naming a module, instead require that the importer names it. Allow importing into the local scope with the name !Local. Simplify namespacing logic. Updates all tests to reflect these changes.
This commit is contained in:
137
src/FileEval.hs
137
src/FileEval.hs
@ -16,14 +16,11 @@ evaluateFileResult :: FilePath -> IO T
|
||||
evaluateFileResult filePath = do
|
||||
contents <- readFile filePath
|
||||
let tokens = lexTricu contents
|
||||
let moduleName = case parseProgram tokens of
|
||||
Right ((SModule name) : _) -> name
|
||||
_ -> ""
|
||||
case parseProgram tokens of
|
||||
Left err -> errorWithoutStackTrace (handleParseError err)
|
||||
Right _ -> do
|
||||
Right ast -> do
|
||||
ast <- preprocessFile filePath
|
||||
let finalEnv = mainAlias moduleName $ evalTricu Map.empty ast
|
||||
let finalEnv = evalTricu Map.empty ast
|
||||
case Map.lookup "main" finalEnv of
|
||||
Just finalResult -> return finalResult
|
||||
Nothing -> errorWithoutStackTrace "No `main` function detected"
|
||||
@ -32,37 +29,24 @@ evaluateFile :: FilePath -> IO Env
|
||||
evaluateFile filePath = do
|
||||
contents <- readFile filePath
|
||||
let tokens = lexTricu contents
|
||||
let moduleName = case parseProgram tokens of
|
||||
Right ((SModule name) : _) -> name
|
||||
_ -> ""
|
||||
case parseProgram tokens of
|
||||
Left err -> errorWithoutStackTrace (handleParseError err)
|
||||
Right _ -> do
|
||||
Right ast -> do
|
||||
ast <- preprocessFile filePath
|
||||
pure $ mainAlias moduleName $ evalTricu Map.empty ast
|
||||
pure $ evalTricu Map.empty ast
|
||||
|
||||
evaluateFileWithContext :: Env -> FilePath -> IO Env
|
||||
evaluateFileWithContext env filePath = do
|
||||
contents <- readFile filePath
|
||||
let tokens = lexTricu contents
|
||||
let moduleName = case parseProgram tokens of
|
||||
Right ((SModule name) : _) -> name
|
||||
_ -> ""
|
||||
case parseProgram tokens of
|
||||
Left err -> errorWithoutStackTrace (handleParseError err)
|
||||
Right _ -> do
|
||||
Right ast -> do
|
||||
ast <- preprocessFile filePath
|
||||
pure $ mainAlias moduleName $ evalTricu env ast
|
||||
|
||||
mainAlias :: String -> Env -> Env
|
||||
mainAlias "" env = env
|
||||
mainAlias moduleName env =
|
||||
case Map.lookup (moduleName ++ ".main") env of
|
||||
Just value -> Map.insert "main" value env
|
||||
Nothing -> env
|
||||
pure $ evalTricu env ast
|
||||
|
||||
preprocessFile :: FilePath -> IO [TricuAST]
|
||||
preprocessFile filePath = preprocessFile' Set.empty filePath
|
||||
preprocessFile = preprocessFile' Set.empty
|
||||
|
||||
preprocessFile' :: Set.Set FilePath -> FilePath -> IO [TricuAST]
|
||||
preprocessFile' inProgress filePath
|
||||
@ -74,77 +58,76 @@ preprocessFile' inProgress filePath
|
||||
case parseProgram tokens of
|
||||
Left err -> errorWithoutStackTrace (handleParseError err)
|
||||
Right asts -> do
|
||||
let (moduleName, restAST) = extractModule asts
|
||||
let (imports, nonImports) = partition isImport restAST
|
||||
let (imports, nonImports) = partition isImport asts
|
||||
let newInProgress = Set.insert filePath inProgress
|
||||
importedASTs <- concat <$> mapM (processImport newInProgress) imports
|
||||
let namespacedAST = namespaceDefinitions moduleName nonImports
|
||||
pure $ importedASTs ++ namespacedAST
|
||||
importedASTs <- concat <$> mapM (processImport newInProgress "") imports
|
||||
pure $ importedASTs ++ nonImports
|
||||
where
|
||||
extractModule :: [TricuAST] -> (String, [TricuAST])
|
||||
extractModule ((SModule name) : xs) = (name, xs)
|
||||
extractModule xs = ("", xs)
|
||||
|
||||
isImport :: TricuAST -> Bool
|
||||
isImport (SImport _ _) = True
|
||||
isImport _ = False
|
||||
|
||||
processImport :: Set.Set FilePath -> TricuAST -> IO [TricuAST]
|
||||
processImport inProgress (SImport filePath moduleName) = do
|
||||
importedAST <- preprocessFile' inProgress filePath
|
||||
pure $ namespaceDefinitions moduleName importedAST
|
||||
processImport _ _ = error "Unexpected non-import in processImport"
|
||||
processImport :: Set.Set FilePath -> String -> TricuAST -> IO [TricuAST]
|
||||
processImport prog currentModule (SImport path "!Local") = do
|
||||
ast <- preprocessFile' prog path
|
||||
let defs = filter (not . isImport) ast
|
||||
pure $ map (nsDefinition currentModule) defs
|
||||
processImport prog _ (SImport path name) = do
|
||||
ast <- preprocessFile' prog path
|
||||
let defs = filter (not . isImport) ast
|
||||
pure $ map (nsDefinition name) defs
|
||||
processImport _ _ _ = error "Unexpected non-import in processImport"
|
||||
|
||||
namespaceDefinitions :: String -> [TricuAST] -> [TricuAST]
|
||||
namespaceDefinitions moduleName = map (namespaceDefinition moduleName)
|
||||
nsDefinitions :: String -> [TricuAST] -> [TricuAST]
|
||||
nsDefinitions moduleName = map (nsDefinition moduleName)
|
||||
|
||||
namespaceDefinition :: String -> TricuAST -> TricuAST
|
||||
namespaceDefinition "" def = def
|
||||
namespaceDefinition moduleName (SDef name args body)
|
||||
| isPrefixed name = SDef name args (namespaceBody moduleName body)
|
||||
| otherwise = SDef (namespaceVariable moduleName name)
|
||||
args (namespaceBody moduleName body)
|
||||
namespaceDefinition moduleName other =
|
||||
namespaceBody moduleName other
|
||||
nsDefinition :: String -> TricuAST -> TricuAST
|
||||
nsDefinition "" def = def
|
||||
nsDefinition moduleName (SDef name args body)
|
||||
| isPrefixed name = SDef name args (nsBody moduleName body)
|
||||
| otherwise = SDef (nsVariable moduleName name)
|
||||
args (nsBody moduleName body)
|
||||
nsDefinition moduleName other =
|
||||
nsBody moduleName other
|
||||
|
||||
namespaceBody :: String -> TricuAST -> TricuAST
|
||||
namespaceBody moduleName (SVar name)
|
||||
nsBody :: String -> TricuAST -> TricuAST
|
||||
nsBody moduleName (SVar name)
|
||||
| isPrefixed name = SVar name
|
||||
| otherwise = SVar (namespaceVariable moduleName name)
|
||||
namespaceBody moduleName (SApp func arg) =
|
||||
SApp (namespaceBody moduleName func) (namespaceBody moduleName arg)
|
||||
namespaceBody moduleName (SLambda args body) =
|
||||
SLambda args (namespaceBodyScoped moduleName args body)
|
||||
namespaceBody moduleName (SList items) =
|
||||
SList (map (namespaceBody moduleName) items)
|
||||
namespaceBody moduleName (TFork left right) =
|
||||
TFork (namespaceBody moduleName left) (namespaceBody moduleName right)
|
||||
namespaceBody moduleName (TStem subtree) =
|
||||
TStem (namespaceBody moduleName subtree)
|
||||
namespaceBody moduleName (SDef name args body)
|
||||
| isPrefixed name = SDef name args (namespaceBody moduleName body)
|
||||
| otherwise = SDef (namespaceVariable moduleName name)
|
||||
args (namespaceBody moduleName body)
|
||||
namespaceBody _ other = other
|
||||
| otherwise = SVar (nsVariable moduleName name)
|
||||
nsBody moduleName (SApp func arg) =
|
||||
SApp (nsBody moduleName func) (nsBody moduleName arg)
|
||||
nsBody moduleName (SLambda args body) =
|
||||
SLambda args (nsBodyScoped moduleName args body)
|
||||
nsBody moduleName (SList items) =
|
||||
SList (map (nsBody moduleName) items)
|
||||
nsBody moduleName (TFork left right) =
|
||||
TFork (nsBody moduleName left) (nsBody moduleName right)
|
||||
nsBody moduleName (TStem subtree) =
|
||||
TStem (nsBody moduleName subtree)
|
||||
nsBody moduleName (SDef name args body)
|
||||
| isPrefixed name = SDef name args (nsBody moduleName body)
|
||||
| otherwise = SDef (nsVariable moduleName name)
|
||||
args (nsBody moduleName body)
|
||||
nsBody _ other = other
|
||||
|
||||
namespaceBodyScoped :: String -> [String] -> TricuAST -> TricuAST
|
||||
namespaceBodyScoped moduleName args body = case body of
|
||||
nsBodyScoped :: String -> [String] -> TricuAST -> TricuAST
|
||||
nsBodyScoped moduleName args body = case body of
|
||||
SVar name ->
|
||||
if name `elem` args
|
||||
then SVar name
|
||||
else namespaceBody moduleName (SVar name)
|
||||
SApp func arg -> SApp (namespaceBodyScoped moduleName args func) (namespaceBodyScoped moduleName args arg)
|
||||
SLambda innerArgs innerBody -> SLambda innerArgs (namespaceBodyScoped moduleName (args ++ innerArgs) innerBody)
|
||||
SList items -> SList (map (namespaceBodyScoped moduleName args) items)
|
||||
TFork left right -> TFork (namespaceBodyScoped moduleName args left) (namespaceBodyScoped moduleName args right)
|
||||
TStem subtree -> TStem (namespaceBodyScoped moduleName args subtree)
|
||||
else nsBody moduleName (SVar name)
|
||||
SApp func arg -> SApp (nsBodyScoped moduleName args func) (nsBodyScoped moduleName args arg)
|
||||
SLambda innerArgs innerBody -> SLambda innerArgs (nsBodyScoped moduleName (args ++ innerArgs) innerBody)
|
||||
SList items -> SList (map (nsBodyScoped moduleName args) items)
|
||||
TFork left right -> TFork (nsBodyScoped moduleName args left) (nsBodyScoped moduleName args right)
|
||||
TStem subtree -> TStem (nsBodyScoped moduleName args subtree)
|
||||
SDef name innerArgs innerBody ->
|
||||
SDef (namespaceVariable moduleName name) innerArgs (namespaceBodyScoped moduleName (args ++ innerArgs) innerBody)
|
||||
SDef (nsVariable moduleName name) innerArgs (nsBodyScoped moduleName (args ++ innerArgs) innerBody)
|
||||
other -> other
|
||||
|
||||
isPrefixed :: String -> Bool
|
||||
isPrefixed name = '.' `elem` name
|
||||
|
||||
namespaceVariable :: String -> String -> String
|
||||
namespaceVariable "" name = name
|
||||
namespaceVariable moduleName name = moduleName ++ "." ++ name
|
||||
nsVariable :: String -> String -> String
|
||||
nsVariable "" name = name
|
||||
nsVariable moduleName name = moduleName ++ "." ++ name
|
||||
|
||||
Reference in New Issue
Block a user