Folder layout clean-ups.

diff --git a/src/ParsedOFL.hs b/src/HighLevel.hs
similarity index 99%
rename from src/ParsedOFL.hs
rename to src/HighLevel.hs
index aeb0692b4dc307e4a50a00508a3935c0c6b7a3ce..e00f5b0ba54c12ecb456e59a6554a3828110c76d 100644 (file)
--- a/src/ParsedOFL.hs
+++ b/src/HighLevel.hs
@@ -1,4 +1,4 @@
-module ParsedOFL where
+module HighLevel where
 import TargetMapping
 import Data.Map as Map (Map, lookup, insertWithKey, empty)
 import Data.List (foldl')

diff --git a/src/Main.hs b/src/Main.hs
index 255d36a4db7f66284c9aa08e88fef0ab7725cb49..60b5851bf6e5a37eb6de3be67f6f6385b0642c7c 100644 (file)
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -1,20 +1,20 @@
-module Main where
+module Main (main) where
 import System.Environment (getArgs)
-import Parsing
+import Parser
 
 main :: IO()
 main = do 
   args <- getArgs
-  contents <- readFile $ getFileName args
-  processOFL contents
+  processFile $ getFileName args
 
 getFileName :: [String] -> String
 getFileName [filename] = filename
 getFileName _ = error "Usage: ofc input_file"
 
-processOFL :: String -> IO()
-processOFL input = 
-  let result = parseAsOFL input in
-  case result of
-    Left err -> putStrLn $ show err
-    Right ofl -> putStrLn $ show ofl
+processFile :: String -> IO()
+processFile filename = do
+  contents <- readFile $ filename
+  let result = runOFLParser contents in
+    case result of
+      Left err -> putStrLn $ show err
+      Right ofl -> putStrLn $ show ofl

diff --git a/src/Parsing.hs b/src/Parser.hs
similarity index 97%
rename from src/Parsing.hs
rename to src/Parser.hs
index e5801285d1b8fbcd605dcc2eceeb4628792f4e0a..be0d78dd57d65c2beb84b8bccab9f16ea363ee39 100644 (file)
--- a/src/Parsing.hs
+++ b/src/Parser.hs
@@ -1,5 +1,5 @@
-module Parsing where
-import ParsedOFL
+module Parser (runOFLParser) where
+import HighLevel
 import TargetMapping
 import Data.List (foldl1')
 import Text.Parsec
@@ -184,4 +184,5 @@ parsePPDFunctionSetProperty =
   parseBasisProperty = do _ <- lSymbol "basis"; ident <- lParens lIdentifier; return $ PPDBasis ident
   parseDataProperty = do _ <- lSymbol "data"; ident <- lParens lIdentifier; return $ PPDData ident
 
-parseAsOFL inputString = runParser parseOFL emptyOFL "(unknown)" inputString
+runOFLParser :: String -> Either ParseError OFL
+runOFLParser inputString = runParser parseOFL emptyOFL "" inputString