From 947d1d99c1b00fc0ec2cee154415f8884eeb0305 Mon Sep 17 00:00:00 2001
From: Francis Russell <francis@unchartedbackwaters.co.uk>
Date: Sun, 16 Sep 2012 00:37:36 +0100
Subject: [PATCH] Folder layout clean-ups.

---
 src/{ParsedOFL.hs => HighLevel.hs} |  2 +-
 src/Main.hs                        | 20 ++++++++++----------
 src/{Parsing.hs => Parser.hs}      |  7 ++++---
 3 files changed, 15 insertions(+), 14 deletions(-)
 rename src/{ParsedOFL.hs => HighLevel.hs} (99%)
 rename src/{Parsing.hs => Parser.hs} (97%)

diff --git a/src/ParsedOFL.hs b/src/HighLevel.hs
similarity index 99%
rename from src/ParsedOFL.hs
rename to src/HighLevel.hs
index aeb0692..e00f5b0 100644
--- 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 255d36a..60b5851 100644
--- 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 e580128..be0d78d 100644
--- 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
-- 
2.47.3