add some tests and fix some bugs

src/libraries/OS-Independent/Control/Monad/RWST.dcl

-definition module RWST
+definition module Control.Monad.RWST
 
 from Control.Applicative import class Applicative
 from Control.Monad import class Monad

src/libraries/OS-Independent/Control/Monad/RWST.icl

-implementation module RWST
+implementation module Control.Monad.RWST
 
 import StdTuple
 

src/libraries/OS-Independent/Control/Monad/Reader.icl

@@ -2,6 +2,7 @@ implementation module Control.Monad.Reader
 
 import Data.Functor.Identity
 import Control.Monad
+import Control.Applicative
 from StdFunc import o, const
 import Control.Monad.Trans
 
@@ -13,7 +14,7 @@ instance Functor (ReaderT r m) | Monad m where
   fmap f m = liftM f m
 
 instance Applicative (ReaderT r m) | Monad m where
-  pure x = (liftT o return) x
+  pure x = (liftT o pure) x
   <*> mf mx = ap mf mx
 
 instance Monad (ReaderT r m) | Monad m where
@@ -47,7 +48,7 @@ liftReaderT :: (a .b) -> .(ReaderT .c a .b)
 liftReaderT m = ReaderT (const m)
 
 ask :: .(ReaderT a b a) | Monad b
-ask = ReaderT return
+ask = ReaderT pure
 
 local :: u:((.a -> .b) -> v:(.(ReaderT .b .c .d) -> .(ReaderT .a .c .d))), [v <= u]
 local = withReaderT

src/libraries/OS-Independent/Control/Monad/Writer.icl

@@ -2,6 +2,7 @@ implementation module Control.Monad.Writer
 
 import Data.Functor.Identity
 import Control.Monad
+import Control.Applicative
 import Data.Monoid
 import Control.Monad.Trans
 from StdFunc import o

src/libraries/OS-Independent/Database/SQL/RelationalMapping.dcl

@@ -68,4 +68,4 @@ generic	relMap t ::
 		(!(Maybe MappingError), !(Maybe t),![RelMapFieldInfo],![RelMapToken],!*cur)	| SQLCursor cur
 
 // Instances for the standard data types
-derive 		relMap Int, Real, Bool, Char, String, UNIT, PAIR, EITHER, CONS, FIELD, OBJECT, {}, {!}, Maybe, []
+derive 		relMap Int, Real, Bool, Char, String, UNIT, PAIR, EITHER, CONS of d, FIELD of d, OBJECT, {}, {!}, Maybe, []

tests/linux64/Makefile

+CLEAN_HOME?=/opt/clean
+CLM:=clm
+override CLMFLAGS+=-dynamics -l -no-pie
+CLMLIBS:=\
+	-I ../../src/libraries/OS-Independent\
+	-I ../../src/libraries/OS-Independent/Deprecated/StdLib\
+	-I ../../src/libraries/OS-Posix\
+	-I ../../src/libraries/OS-Linux\
+	-I ../../src/libraries/OS-Linux-64\
+	-I $(CLEAN_HOME)/lib/StdEnv\
+	-I $(CLEAN_HOME)/lib/Generics\
+	-I $(CLEAN_HOME)/lib/Dynamics\
+	-I $(CLEAN_HOME)/lib/TCPIP\
+
+BINARIES:=test
+
+all: $(BINARIES)
+
+%: %.icl $(wildcard *.[id]cl)
+	$(CLM) $(CLMLIBS) $(CLMFLAGS) $(basename $<) -o $@
+
+clean:
+	$(RM) -r $(BINARIES) Clean\ System\ Files

tests/linux64/test.icl

+module test
+
+//StdLib compatability
+import qualified StdLib
+import qualified StdArrayExtensions
+import qualified StdListExtensions
+import qualified StdMaybe
+import qualified StdLibMisc
+
+//Haskell code??????????????
+//import qualified Data.Graph.Inductive.Internal.Heap
+//import qualified Data.Graph.Inductive.Tree
+//import qualified Data.Graph.Inductive.Query.SP
+//import qualified Data.Graph.Inductive.Query.Dominators
+//import qualified Data.Graph.Inductive.Query.MaxFlow2
+//import qualified Data.Graph.Inductive.Query.ArtPoint
+//import qualified Data.Graph.Inductive.Query.TransClos
+//import qualified Data.Graph.Inductive.Query.DFS
+//import qualified Data.Graph.Inductive.Query.MST
+//import qualified Data.Graph.Inductive.Query.GVD
+//import qualified Data.Graph.Inductive.Query.Monad
+//import qualified Data.Graph.Inductive.Query.BCC
+//import qualified Data.Graph.Inductive.Query.Indep
+
+//Broken example
+//import qualified Text.Parsers.ZParsers.MetarDemo.MetarParser
+
+import qualified Control.Applicative
+import qualified Control.Arrow
+import qualified Control.Category
+import qualified Control.Monad
+import qualified Control.Monad.Fix
+import qualified Control.Monad.Identity
+import qualified Control.Monad.RWST
+import qualified Control.Monad.Reader
+import qualified Control.Monad.State
+import qualified Control.Monad.Trans
+import qualified Control.Monad.Writer
+import qualified Crypto.Hash.MD5
+import qualified Crypto.Hash.SHA1
+import qualified Data.Array
+import qualified Data.Bifunctor
+import qualified Data.CircularStack
+import qualified Data.Complex
+import qualified Data.Data
+import qualified Data.Either
+import qualified Data.Encoding.RunLength
+import qualified Data.Eq
+import qualified Data.Error
+import qualified Data.Foldable
+import qualified Data.Func
+import qualified Data.Functor
+import qualified Data.Functor.Identity
+import qualified Data.Generic
+import qualified Data.Graph
+import qualified Data.Graph.Inductive
+import qualified Data.Graph.Inductive.Basic
+import qualified Data.Graph.Inductive.Graph
+import qualified Data.Graph.Inductive.Internal.Queue
+import qualified Data.Graph.Inductive.Internal.RootPath
+import qualified Data.Graph.Inductive.Internal.Thread
+import qualified Data.Graph.Inductive.Monad
+import qualified Data.Graph.Inductive.NodeMap
+import qualified Data.Graph.Inductive.PatriciaTree
+import qualified Data.Graph.Inductive.Query
+import qualified Data.Graph.Inductive.Query.BFS
+import qualified Data.Graph.Inductive.Query.MaxFlow
+import qualified Data.Graphviz
+import qualified Data.Heap
+import qualified Data.IntMap.Base
+import qualified Data.IntMap.Strict
+import qualified Data.IntSet
+import qualified Data.IntSet.Base
+import qualified Data.List
+import qualified Data.Map
+import qualified Data.Matrix
+import qualified Data.Maybe
+import qualified Data.Monoid
+import qualified Data.Queue
+import qualified Data.Set
+import qualified Data.Traversable
+import qualified Data.Tree
+import qualified Data.Tuple
+import qualified Data.Void
+import qualified Data.Word8
+import qualified Database.SQL
+import qualified Database.SQL.MySQL
+import qualified Database.SQL.RelationalMapping
+import qualified Database.SQL.SQLite
+import qualified Database.SQL._MySQL
+import qualified Database.SQL._SQLite
+import qualified Graphics.Layout
+import qualified Graphics.Scalable
+import qualified Graphics.Scalable.Internal
+import qualified Internet.HTTP
+import qualified Internet.HTTP.CGI
+import qualified Math.Geometry
+import qualified Math.Random
+import qualified Network.IP
+import qualified System.CommandLine
+import qualified System.Directory
+import qualified System.Environment
+import qualified System.File
+import qualified System.FilePath
+import qualified System.GetOpt
+import qualified System.IO
+import qualified System.OS
+import qualified System.OSError
+import qualified System.Process
+import qualified System.TTS
+import qualified System.Time
+import qualified System._Pointer
+import qualified System._Posix
+import qualified System._Unsafe
+import qualified Text
+import qualified Text.CSV
+import qualified Text.Encodings.Base64
+import qualified Text.Encodings.MIME
+import qualified Text.Encodings.UrlEncoding
+import qualified Text.HTML
+import qualified Text.JSON
+import qualified Text.LaTeX
+import qualified Text.PPrint
+import qualified Text.Parsers.CParsers.ParserCombinators
+import qualified Text.Parsers.Simple.Chars
+import qualified Text.Parsers.Simple.Core
+import qualified Text.Parsers.Simple.ParserCombinators
+import qualified Text.Parsers.ZParsers.ParserLanguage
+import qualified Text.Parsers.ZParsers.Parsers
+import qualified Text.Parsers.ZParsers.ParsersAccessories
+import qualified Text.Parsers.ZParsers.ParsersDerived
+import qualified Text.Parsers.ZParsers.ParsersKernel
+import qualified Text.Show
+import qualified Text.StringAppender
+import qualified Text.URI
+import qualified Text.Unicode
+import qualified Text.Unicode.Encodings.JS
+import qualified Text.Unicode.Encodings.UTF8
+import qualified Text.Unicode.UChar
+import qualified Text.XML
+
+Start = "Hello World!"