[project @ 1997-03-14 08:02:40 by simonpj]

Major update to more-or-less 2.02

GHC_ONLY/Makefile

-TOP = ../..
-SUBDIRS = $(wildcard arith* bugs cg* ghclib* io* obfuscated93 po* net* stable*)
-include $(TOP)/nofib/mk/nofib.mk
+TOP = ..
+include $(TOP)/mk/boilerplate.mk
+
+# Leave the net* tests out of it for the moment, runstdtest is 
+# geared towards batch programs
+SUBDIRS = $(wildcard frontend* arith* bugs cg* ghclib* io* obfuscated93 po* stable*)
+
+include $(TOP)/mk/target.mk
+

GHC_ONLY/arith001/Makefile

-TOP = ../../..
-PROG = arith001
-include $(TOP)/nofib/mk/nofib.mk
+TOP = ../..
+include $(TOP)/mk/boilerplate.mk
+-include opts.mk
+include $(TOP)/mk/target.mk
 

GHC_ONLY/arith002/Makefile

-TOP = ../../..
-PROG = arith002
-include $(TOP)/nofib/mk/nofib.mk
+TOP = ../..
+include $(TOP)/mk/boilerplate.mk
+-include opts.mk
+include $(TOP)/mk/target.mk
 

GHC_ONLY/arith003/Makefile

-TOP = ../../..
-PROG = arith003
-include $(TOP)/nofib/mk/nofib.mk
+TOP = ../..
+include $(TOP)/mk/boilerplate.mk
+-include opts.mk
+include $(TOP)/mk/target.mk
 

GHC_ONLY/arith004/Makefile

-TOP = ../../..
-PROG = arith004
-include $(TOP)/nofib/mk/nofib.mk
+TOP = ../..
+include $(TOP)/mk/boilerplate.mk
+-include opts.mk
+include $(TOP)/mk/target.mk
 

GHC_ONLY/arith005/Makefile

-TOP = ../../..
-PROG = arith005
-include $(TOP)/nofib/mk/nofib.mk
+TOP = ../..
+include $(TOP)/mk/boilerplate.mk
+-include opts.mk
+include $(TOP)/mk/target.mk
 

GHC_ONLY/arith006/Makefile

-TOP = ../../..
-PROG = arith006
-include $(TOP)/nofib/mk/nofib.mk
+TOP = ../..
+include $(TOP)/mk/boilerplate.mk
+-include opts.mk
+include $(TOP)/mk/target.mk
 

GHC_ONLY/arith007/Makefile

-TOP = ../../..
-PROG = arith007
-include $(TOP)/nofib/mk/nofib.mk
+TOP = ../..
+include $(TOP)/mk/boilerplate.mk
+-include opts.mk
+include $(TOP)/mk/target.mk
 

GHC_ONLY/arith008/Makefile

-TOP = ../../..
-PROG = arith008
-include $(TOP)/nofib/mk/nofib.mk
+TOP = ../..
+include $(TOP)/mk/boilerplate.mk
+-include opts.mk
+include $(TOP)/mk/target.mk
 

GHC_ONLY/arith009/Makefile

-TOP = ../../..
-PROG = arith009
-include $(TOP)/nofib/mk/nofib.mk
+TOP = ../..
+include $(TOP)/mk/boilerplate.mk
+-include opts.mk
+include $(TOP)/mk/target.mk
 

GHC_ONLY/array001/Makefile

-TOP = ../../..
-PROG = array001
-include $(TOP)/nofib/mk/nofib.mk
+TOP = ../..
+include $(TOP)/mk/boilerplate.mk
+-include opts.mk
+include $(TOP)/mk/target.mk
+

GHC_ONLY/array002/Makefile

-TOP = ../../..
-PROG = array002
-include $(TOP)/nofib/mk/nofib.mk
+TOP = ../..
+include $(TOP)/mk/boilerplate.mk
+-include opts.mk
+include $(TOP)/mk/target.mk
+

GHC_ONLY/bugs/10queens/Makefile

-TOP = ../../../..
-PROG = 10queens
-include $(TOP)/nofib/mk/nofib.mk
+TOP = ../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/target.mk
 

GHC_ONLY/bugs/Makefile

 TOP = ../../..
-SUBDIRS = 10queens andy_cherry cvh_unboxing dmgob_native1 dmgob_native2 \
-	  fast2haskell ipoole_spec_class jq_readsPrec jl_defaults \
-	  jtod_circint jules_xref jules_xref2 lennart_array lennart_range \
-	  lex life_space_leak north_array sanders_array waugh_neural \
-	  zhang_ccall
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/target.mk
 
-# andre_monad: boring -- the correct answer is a divide-by-zero
-# NOT REALLY A BUG: fun_insts
-# NOT A BUG AS FAR AS I CAN TELL: north_lias
-# NOT A BUG: stk overflow is expected w/ stranal: hill_stk_oflow
-# TESTS OLD ccall (now irrelevant): areid_pass
-
-include $(TOP)/nofib/mk/nofib.mk

GHC_ONLY/bugs/andre_monad/Makefile

 TOP = ../../..
-PROG = andre_monad
-EXTRA_RUNTESTFLAGS = 
-include $(TOP)/nofib/mk/nofib.mk
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/target.mk
 

GHC_ONLY/bugs/andy_cherry/Makefile

-TOP = ../../../..
-PROG = andy_cherry
-SRCS = DataTypes.lhs GenUtils.lhs Interp.lhs InterpUtils.lhs \
-       Parser.lhs PrintTEX.lhs Main.lhs 
-EXTRA_RUNTESTFLAGS = -d tex mygames.pgn
-include $(TOP)/nofib/mk/nofib.mk
+TOP = ../../..
+include $(TOP)/mk/boilerplate.mk
+
+SRC_HC_OPTS += -cpp
+SRC_RUNTESTFLAGS += -d tex mygames.pgn
+
+include $(TOP)/mk/target.mk
+

GHC_ONLY/bugs/areid_pass/Makefile

 TOP = ../../..
-PROG = areid_pass
-EXTRA_RUNTESTFLAGS = 
-include $(TOP)/nofib/mk/nofib.mk
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/target.mk
 

GHC_ONLY/bugs/cvh_unboxing/Append.lhs

@@ -3,6 +3,7 @@
 \begin{code}
 module Append where
 
+import PrelBase
 import Types
 \end{code}
 

GHC_ONLY/bugs/cvh_unboxing/Main.lhs

 \begin{code}
+import PrelBase
 import Types
 import Append
 

GHC_ONLY/bugs/cvh_unboxing/Makefile

-TOP = ../../../..
-PROG = cvh_unboxing
-SRCS = Types.lhs Append.lhs Main.lhs
-include $(TOP)/nofib/mk/nofib.mk
+TOP = ../../..
+include $(TOP)/mk/boilerplate.mk
+
+SRC_HC_OPTS += -fglasgow-exts
+
+include $(TOP)/mk/target.mk
+

GHC_ONLY/bugs/cvh_unboxing/Types.lhs

@@ -2,6 +2,7 @@
 
 \begin{code}
 module Types where
+import PrelBase
 
 data F a = FN | F1 a | F2 a a | F3 a a a 
          | F4 a a a a 

GHC_ONLY/bugs/dmgob_native1/Makefile

-TOP = ../../../..
-PROG = dmgob_native1
-EXTRA_RUNTESTFLAGS = test_data 
-SRCS = MaybeStateT.lhs Main.lhs
-include $(TOP)/nofib/mk/nofib.mk
+TOP = ../../..
+include $(TOP)/mk/boilerplate.mk
+
+SRC_RUNTEST_OPTS += test_data 
+SRC_HC_OPTS += -cpp
+
+include $(TOP)/mk/target.mk
+

GHC_ONLY/bugs/dmgob_native2/Makefile

-TOP = ../../../..
-PROG = dmgob_native2
-SRCS = LPA.lhs Main.lhs
-include $(TOP)/nofib/mk/nofib.mk
+TOP = ../../..
+include $(TOP)/mk/boilerplate.mk
+
+SRC_HC_OPTS += -cpp
+
+include $(TOP)/mk/target.mk
+

GHC_ONLY/bugs/fast2haskell/Makefile

-TOP = ../../../..
-PROG = fast2haskell
-SRCS = Word2.hs Fast2haskell.hs Main.hs
-include $(TOP)/nofib/mk/nofib.mk
+TOP = ../../..
+include $(TOP)/mk/boilerplate.mk
+
+SRC_HC_OPTS += -fglasgow-exts
+
+include $(TOP)/mk/target.mk
+

GHC_ONLY/bugs/fast2haskell/Word2.hs

 -- mimic "hbc_library" module, Word.
 -- [seriously non-std Haskell here]
---
+
 module Word2 (
 	Bits(..),		-- class
 	Byte, Short, Word,	-- data types: abstract
 	byteToInt, shortToInt, wordToInt
     ) where
 
+import GHC
+import PrelBase
+
 infixl 8 `bitLsh`, `bitRsh`
 infixl 7 `bitAnd`
 infixl 6 `bitXor`

GHC_ONLY/bugs/fun_insts/Makefile

 TOP = ../../..
-PROG = fun_insts
-EXTRA_RUNTESTFLAGS = 
-include $(TOP)/nofib/mk/nofib.mk
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/target.mk
 

GHC_ONLY/bugs/hill_stk_oflow/Makefile

 TOP = ../../..
-PROG = hill_stk_oflow
-EXTRA_RUNTESTFLAGS = 
-include $(TOP)/nofib/mk/nofib.mk
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/target.mk
 

GHC_ONLY/bugs/ipoole_spec_class/Makefile

-TOP = ../../../..
-PROG = ipoole_spec_class
-SRCS = GoferPreludeBits.lhs Lib.lhs Io.lhs JobImp.lhs \
-       JobApp.lhs Lognum.lhs Main.lhs
-include $(TOP)/nofib/mk/nofib.mk
+TOP = ../../..
+include $(TOP)/mk/boilerplate.mk
+
+SRC_HC_OPTS += -cpp
+
+include $(TOP)/mk/target.mk
+

GHC_ONLY/bugs/jl_defaults/Makefile

-TOP = ../../../..
-PROG = jl_defaults
-include $(TOP)/nofib/mk/nofib.mk
+TOP = ../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/target.mk
 

GHC_ONLY/bugs/jq_readsPrec/Makefile

-TOP = ../../../..
-PROG = jq_readsPrec
-include $(TOP)/nofib/mk/nofib.mk
+TOP = ../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/target.mk
 

GHC_ONLY/bugs/jtod_circint/Makefile

-TOP = ../../../..
-PROG = jtod_circint
-SRCS = Bit.hs LogFun.hs Signal.hs Main.hs
-include $(TOP)/nofib/mk/nofib.mk
+TOP = ../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/target.mk
+

GHC_ONLY/bugs/jules_xref/Makefile

-TOP = ../../../..
-PROG = jules_xref
-include $(TOP)/nofib/mk/nofib.mk
+TOP = ../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/target.mk
 

GHC_ONLY/bugs/jules_xref2/Makefile

-TOP = ../../../..
-PROG = jules_xref2
-include $(TOP)/nofib/mk/nofib.mk
+TOP = ../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/target.mk
 

GHC_ONLY/bugs/lennart_array/Makefile

-TOP = ../../../..
-PROG = lennart_array
-EXTRA_RUNTESTFLAGS = 
-include $(TOP)/nofib/mk/nofib.mk
+TOP = ../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/target.mk
 

GHC_ONLY/bugs/lennart_range/Makefile

-TOP = ../../../..
-PROG = lennart_range
-EXTRA_RUNTESTFLAGS = 
-include $(TOP)/nofib/mk/nofib.mk
+TOP = ../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/target.mk
 

GHC_ONLY/bugs/lex/Main.hs

@@ -2,4 +2,8 @@ module Main where
 
 main = interact ( \ s -> shows (lex' s) "\n")
      where lex' "" = []
-	   lex' s = tok : lex' s' where [(tok,s')] = lex s
+	   lex' s = tok : lex' s' where -- [(tok,s')] = lex s
+					(tok,s') = case lex s of
+						    [r]   -> r
+						    []    -> error ("Empty: " ++ s) 
+						    other -> error ("Multi: " ++ s)

GHC_ONLY/bugs/lex/Makefile

-TOP = ../../../..
-PROG = lex
-include $(TOP)/nofib/mk/nofib.mk
+TOP = ../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/target.mk
 

GHC_ONLY/bugs/life_space_leak/Makefile

-TOP = ../../../..
-PROG = life_space_leak
-EXTRA_RUNTESTFLAGS = -prescript ./life.test
-include $(TOP)/nofib/mk/nofib.mk
+TOP = ../../..
+include $(TOP)/mk/boilerplate.mk
+
+SRC_RUNTEST_OPTS += -prescript ./life.test
+
+include $(TOP)/mk/target.mk
+

GHC_ONLY/bugs/north_array/Makefile

-TOP = ../../../..
-PROG = north_array
-EXTRA_RUNTESTFLAGS = 
-include $(TOP)/nofib/mk/nofib.mk
+TOP = ../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/target.mk
 

GHC_ONLY/bugs/north_lias/Makefile

-SRCS_LHS = Main.lhs Bits.lhs LIAS.lhs
-OBJS_O   = Main.o   Bits.o   LIAS.o
- 
-NoFibMultiModuleCompileAndRun(north_lias,-o1 north_lias.stdout)
+TOP = ../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/target.mk
 
-NoFibHaskellCompile(north_lias,Main,lhs)
-NoFibHaskellCompile(north_lias,Bits,lhs)
-NoFibHaskellCompile(north_lias,LIAS,lhs)
-
-NoFibDependTarget(north_lias, $(SRCS_LHS))

GHC_ONLY/bugs/sanders_array/Makefile

-TOP = ../../../..
-PROG = sanders_array
-include $(TOP)/nofib/mk/nofib.mk
+TOP = ../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/target.mk
+

GHC_ONLY/bugs/waugh_neural/Makefile

-TOP = ../../../..
-PROG = waugh_neural
-SRCS = BpGen.lhs ReadLists.lhs Main.lhs
-include $(TOP)/nofib/mk/nofib.mk
+TOP = ../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/target.mk
+

GHC_ONLY/bugs/zhang_ccall/Main.hs

 module Main where
 
-import PreludeGlaST
+import STBase
 
 main = putStr (shows res "\n")
 	where

GHC_ONLY/bugs/zhang_ccall/Makefile

-TOP = ../../../..
-PROG = zhang_ccall
-LIBS = ccall.o
-include $(TOP)/nofib/mk/nofib.mk
+TOP = ../../..
+include $(TOP)/mk/boilerplate.mk
+
+SRC_HC_OPTS += -fglasgow-exts
+
+include $(TOP)/mk/target.mk
 
-ccall.o : ccall.c
-	$(CC) -c $(CFLAGS) ccall.c

GHC_ONLY/cg001/Makefile

-TOP = ../../..
-PROG = cg001
-include $(TOP)/nofib/mk/nofib.mk
+TOP = ../..
+include $(TOP)/mk/boilerplate.mk
+-include opts.mk
+include $(TOP)/mk/target.mk
 

GHC_ONLY/cg002/Makefile

-TOP = ../../..
-PROG = cg002
-include $(TOP)/nofib/mk/nofib.mk
+TOP = ../..
+include $(TOP)/mk/boilerplate.mk
+-include opts.mk
+include $(TOP)/mk/target.mk
 

GHC_ONLY/cg003/Makefile

-TOP = ../../..
-PROG = cg003
-include $(TOP)/nofib/mk/nofib.mk
+TOP = ../..
+include $(TOP)/mk/boilerplate.mk
+-include opts.mk
+include $(TOP)/mk/target.mk
 

GHC_ONLY/cg004/Makefile

-TOP = ../../..
-PROG = cg004
-include $(TOP)/nofib/mk/nofib.mk
+TOP = ../..
+include $(TOP)/mk/boilerplate.mk
+-include opts.mk
+include $(TOP)/mk/target.mk
 

GHC_ONLY/cg005/Makefile

-TOP = ../../..
-PROG = cg005
-include $(TOP)/nofib/mk/nofib.mk
+TOP = ../..
+include $(TOP)/mk/boilerplate.mk
+-include opts.mk
+include $(TOP)/mk/target.mk
 

GHC_ONLY/cg006/Makefile

-TOP = ../../..
-PROG = cg006
-include $(TOP)/nofib/mk/nofib.mk
+TOP = ../..
+include $(TOP)/mk/boilerplate.mk
+-include opts.mk
+include $(TOP)/mk/target.mk
 

GHC_ONLY/cg007/Makefile

-TOP = ../../..
-PROG = cg007
-include $(TOP)/nofib/mk/nofib.mk
+TOP = ../..
+include $(TOP)/mk/boilerplate.mk
+-include opts.mk
+include $(TOP)/mk/target.mk
 

GHC_ONLY/cg008/Makefile

-TOP = ../../..
-PROG = cg008
-include $(TOP)/nofib/mk/nofib.mk
+TOP = ../..
+include $(TOP)/mk/boilerplate.mk
+-include opts.mk
+include $(TOP)/mk/target.mk
 

GHC_ONLY/cg009/Makefile

-TOP = ../../..
-PROG = cg009
-include $(TOP)/nofib/mk/nofib.mk
+TOP = ../..
+include $(TOP)/mk/boilerplate.mk
+-include opts.mk
+include $(TOP)/mk/target.mk
 

GHC_ONLY/cg010/Makefile

-TOP = ../../..
-PROG = cg010
-include $(TOP)/nofib/mk/nofib.mk
+TOP = ../..
+include $(TOP)/mk/boilerplate.mk
+-include opts.mk
+include $(TOP)/mk/target.mk
 

GHC_ONLY/cg011/Makefile

-TOP = ../../..
-PROG = cg011
-include $(TOP)/nofib/mk/nofib.mk
+TOP = ../..
+include $(TOP)/mk/boilerplate.mk
+-include opts.mk
+include $(TOP)/mk/target.mk
 

GHC_ONLY/cg012/Main.hs

 --!!! move arguments around on the stacks, mainly the B stack
 
+import PrelBase	( Float#, Double#, Int#, Int(..) )
+
+
 main = print foo
 
 foo = I#

GHC_ONLY/cg012/Makefile

-TOP = ../../..
-PROG = cg012
-EXTRA_HCFLAGS = -fglasgow-exts
-include $(TOP)/nofib/mk/nofib.mk
+TOP = ../..
+include $(TOP)/mk/boilerplate.mk
+
+EXTRA_HC_OPTS += -fglasgow-exts
+
+include $(TOP)/mk/target.mk
 

GHC_ONLY/cg013/Makefile

-TOP = ../../..
-PROG = cg013
-include $(TOP)/nofib/mk/nofib.mk
+TOP = ../..
+include $(TOP)/mk/boilerplate.mk
+-include opts.mk
+include $(TOP)/mk/target.mk
 

GHC_ONLY/cg014/Makefile

-TOP = ../../..
-PROG = cg014
-include $(TOP)/nofib/mk/nofib.mk
+TOP = ../..
+include $(TOP)/mk/boilerplate.mk
+-include opts.mk
+include $(TOP)/mk/target.mk
 

GHC_ONLY/cg015/Main.hs

 module GHCmain ( mainPrimIO ) where
 
-import PreludeGlaST
+import GlaExts
+import PrelBase