From f4a28c94aabfdef6011294db3d36860dcb5badb3 Mon Sep 17 00:00:00 2001 From: bringert Date: Mon, 5 Dec 2005 16:53:27 +0000 Subject: Renamed transfer compiler and interpreter. --- transfer/Makefile | 9 ++++----- transfer/compile_to_core.hs | 25 ------------------------- transfer/run_core.hs | 37 ------------------------------------- transfer/transferc.hs | 25 +++++++++++++++++++++++++ transfer/trci.hs | 37 +++++++++++++++++++++++++++++++++++++ 5 files changed, 66 insertions(+), 67 deletions(-) delete mode 100644 transfer/compile_to_core.hs delete mode 100644 transfer/run_core.hs create mode 100644 transfer/transferc.hs create mode 100644 transfer/trci.hs diff --git a/transfer/Makefile b/transfer/Makefile index 5c2e68362..b4bee8ce8 100644 --- a/transfer/Makefile +++ b/transfer/Makefile @@ -7,8 +7,8 @@ GHCFLAGS=-i$(SRCDIR) .PHONY: all bnfc bnfctest doc docclean clean bnfcclean distclean all: - $(GHC) $(GHCFLAGS) --make -o run_core run_core.hs - $(GHC) $(GHCFLAGS) --make -o compile_to_core compile_to_core.hs + $(GHC) $(GHCFLAGS) --make -o trci trci.hs + $(GHC) $(GHCFLAGS) --make -o transferc transferc.hs bnfc: bnfcclean cd $(SRCDIR) && bnfc -gadt -d -p Transfer Transfer/Core/Core.cf @@ -38,8 +38,8 @@ docclean: clean: -rm -f *.o *.hi find $(SRCDIR)/Transfer -name '*.o' -o -name '*.hi' | xargs rm -f - -rm -f run_core - -rm -f compile_to_core + -rm -f trci + -rm -f transferc -rm -f test_core test_syntax test_layout bnfcclean: @@ -47,4 +47,3 @@ bnfcclean: -rm -f $(SRCDIR)/Transfer/Syntax/{Doc,Lex,Par,Layout,Skel,Print,Test,Abs}.* distclean: clean bnfcclean - diff --git a/transfer/compile_to_core.hs b/transfer/compile_to_core.hs deleted file mode 100644 index b35d906d0..000000000 --- a/transfer/compile_to_core.hs +++ /dev/null @@ -1,25 +0,0 @@ -module Main where - -import Transfer.CompilerAPI - -import Data.List (partition, isPrefixOf) -import System.Environment -import System.Exit -import System.IO - -die :: String -> IO a -die s = do - hPutStrLn stderr s - exitFailure - -main :: IO () -main = do - args <- getArgs - let (flags,files) = partition ("-" `isPrefixOf`) args - path = [ p | ('-':'i':p) <- flags ] - case files of - [f] -> do - cf <- compileFile path f - putStrLn $ "Wrote " ++ cf - return () - _ -> die "Usage: compile_to_core [-i [-i ... ]] " diff --git a/transfer/run_core.hs b/transfer/run_core.hs deleted file mode 100644 index 0bb7f1aa8..000000000 --- a/transfer/run_core.hs +++ /dev/null @@ -1,37 +0,0 @@ -import Transfer.InterpreterAPI -import Transfer.Interpreter (prEnv) - -import Control.Monad (when) -import Data.List (partition, isPrefixOf) -import System.Environment (getArgs) -import System.IO (isEOF) - -interpretLoop :: Env -> IO () -interpretLoop env = - do - eof <- isEOF - if eof - then return () - else do - line <- getLine - r <- evaluateString env line - putStrLn r - interpretLoop env - -runMain :: Env -> IO () -runMain env = do - r <- evaluateString env "main" - putStrLn r - -main :: IO () -main = do args <- getArgs - let (flags,files) = partition ("-" `isPrefixOf`) args - env <- case files of - [f] -> loadFile f - _ -> fail "Usage: run_core [-i] " - when ("-v" `elem` flags) $ do - putStrLn "Top-level environment:" - putStrLn (prEnv env) - if "-i" `elem` flags - then interpretLoop env - else runMain env diff --git a/transfer/transferc.hs b/transfer/transferc.hs new file mode 100644 index 000000000..a363ff75c --- /dev/null +++ b/transfer/transferc.hs @@ -0,0 +1,25 @@ +module Main where + +import Transfer.CompilerAPI + +import Data.List (partition, isPrefixOf) +import System.Environment +import System.Exit +import System.IO + +die :: String -> IO a +die s = do + hPutStrLn stderr s + exitFailure + +main :: IO () +main = do + args <- getArgs + let (flags,files) = partition ("-" `isPrefixOf`) args + path = [ p | ('-':'i':p) <- flags ] + case files of + [f] -> do + cf <- compileFile path f + putStrLn $ "Wrote " ++ cf + return () + _ -> die "Usage: transferc [-i [-i ... ]] " diff --git a/transfer/trci.hs b/transfer/trci.hs new file mode 100644 index 000000000..3cfd02bd6 --- /dev/null +++ b/transfer/trci.hs @@ -0,0 +1,37 @@ +import Transfer.InterpreterAPI +import Transfer.Interpreter (prEnv) + +import Control.Monad (when) +import Data.List (partition, isPrefixOf) +import System.Environment (getArgs) +import System.IO (isEOF) + +interpretLoop :: Env -> IO () +interpretLoop env = + do + eof <- isEOF + if eof + then return () + else do + line <- getLine + r <- evaluateString env line + putStrLn r + interpretLoop env + +runMain :: Env -> IO () +runMain env = do + r <- evaluateString env "main" + putStrLn r + +main :: IO () +main = do args <- getArgs + let (flags,files) = partition ("-" `isPrefixOf`) args + env <- case files of + [f] -> loadFile f + _ -> fail "Usage: trci [-i] " + when ("-v" `elem` flags) $ do + putStrLn "Top-level environment:" + putStrLn (prEnv env) + if "-i" `elem` flags + then interpretLoop env + else runMain env -- cgit v1.2.3