Rearranged the Rain source files, renamed a couple of Rain files, and changed the Makefile accordingly.

Main.hs

@@ -36,7 +36,7 @@ import ParseOccam
 import Pass
 import PreprocessOccam
 import PrettyShow
-import RainParse
+import ParseRain
 import RainPasses
 import SimplifyExprs
 import SimplifyProcs

Makefile

@@ -2,7 +2,9 @@ targets = tock tocktest
 
 all: $(targets)
 
-sources = $(wildcard *.hs) $(patsubst %.x,%.hs,$(wildcard *.x))
+sources = $(wildcard *.hs frontends/*.hs backends/*.hs transformations/*.hs common/*.hs) $(patsubst %.x,%.hs,$(wildcard frontends/*.x))
+
+builtfiles = $(patsubst %.hs,%.hi,$(sources)) $(patsubst %.hs,%.o,$(sources)) $(patsubst %.x,%.hs,$(wildcard frontends/*.x))
 
 %.hs: %.x
 	alex $<
@@ -12,6 +14,7 @@ ghc_opts = \
 	-fglasgow-exts \
 	-fallow-undecidable-instances \
 	-fwarn-unused-binds \
+	-icommon -itransformations -ifrontends -ibackends \
 	$(profile_opts)
 
 tock: $(sources)
@@ -74,7 +77,7 @@ haddock:
 	@mv doc/index.html-2 doc/index.html
 
 clean:
-	rm -f $(targets) *.o *.hi
+	rm -f $(targets) $(builtfiles)
 
 # Don't delete intermediate files.
 .SECONDARY:

TestMain.hs

@@ -27,8 +27,8 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 -- * "UsageCheckTest"
 module TestMain () where
 
-import qualified RainParseTest (tests)
+import qualified ParseRainTest (tests)
-import qualified RainPassTest (tests)
+import qualified RainPassesTest (tests)
 import qualified UsageCheckTest (tests)
 import qualified PassTest (tests)
 import Test.HUnit
@@ -37,8 +37,8 @@ main :: IO ()
 main = do runTestTT $ TestList
             [
               PassTest.tests
-              ,RainParseTest.tests
+              ,ParseRainTest.tests
-              ,RainPassTest.tests
+              ,RainPassesTest.tests
               ,UsageCheckTest.tests
             ]
           return ()

frontends/ParseRain.hs

@@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along
 with this program.  If not, see <http://www.gnu.org/licenses/>.
 -}
 
-module RainParse where
+module ParseRain where
 
 import qualified Text.ParserCombinators.Parsec.Token as P
 import qualified LexRain as L

frontends/ParseRainTest.hs

@@ -16,9 +16,9 @@ You should have received a copy of the GNU General Public License along
 with this program.  If not, see <http://www.gnu.org/licenses/>.
 -}
 
-module RainParseTest (tests) where
+module ParseRainTest (tests) where
 
-import qualified RainParse as RP
+import qualified ParseRain as RP
 import qualified AST as A
 import qualified LexRain as L
 import Text.ParserCombinators.Parsec (runParser,eof)

frontends/RainPassesTest.hs

@@ -18,7 +18,7 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 -- #ignore-exports
 
-module RainPassTest (tests) where
+module RainPassesTest (tests) where
 
 import Test.HUnit hiding (State)
 import Control.Monad.State as CSM