New patches: [parse SPECIALIZE instance pragmas John Meacham **20090304111805 Ignore-this: c932c744c2679f7ef83ed10aa0f5bd76 ] hunk ./FrontEnd/HsParser.y 27 import FrontEnd.ParseUtils hiding(readInteger,readRational) import FrontEnd.SrcLoc +import Name.Names +import Name.Name + import Control.Monad (liftM, liftM2) import Debug.Trace (trace) hunk ./FrontEnd/HsParser.y 605 { HsTypeDecl $3 (fst $2) (snd $2) HsTyAssoc } | pinfixexp srcloc rhs {% checkValDef $2 $1 $3 []} | pinfixexp srcloc rhs 'where' decllist {% checkValDef $2 $1 $3 $5} + | srcloc PRAGMASPECIALIZE 'instance' type PRAGMAEND + { HsPragmaSpecialize { hsDeclSrcLoc = $1, hsDeclBool = $2, hsDeclName = nameName u_instance , hsDeclType = $4 + , hsDeclUniq = error "hsDeclUniq not set" } } rhs :: { HsRhs } : '=' exp {% checkExpr $2 `thenP` \e -> hunk ./FrontEnd/HsSyn.hs 231 } | HsPragmaProps SrcLoc String [HsName] | HsPragmaRules [HsRule] - | HsPragmaSpecialize { hsDeclUniq :: (Module,Int), hsDeclSrcLoc :: SrcLoc, hsDeclBool :: Bool, hsDeclName :: HsName, hsDeclType :: HsType } + | HsPragmaSpecialize { + hsDeclUniq :: (Module,Int), + hsDeclSrcLoc :: SrcLoc, + hsDeclBool :: Bool, + hsDeclName :: HsName, + hsDeclType :: HsType + } | HsDeclDeriving { hsDeclSrcLoc :: SrcLoc, hsDeclClassHead :: HsClassHead } deriving(Eq,Show) {-! derive: is !-} hunk ./Name/Names.hs 78 s_Star = toName SortName ("Jhc@","*") s_Hash = toName SortName ("Jhc@","#") +u_instance = toName UnknownType ("Jhc@","instance") + sFuncNames = FuncNames { func_equals = v_equals, [add 'containers' package to distributed packages John Meacham **20090304111831 Ignore-this: ce1e351b093742282378ba91888e4313 ] addfile ./lib/containers.cabal hunk ./Makefile.am 51 GHCLANG= -fallow-undecidable-instances -fglasgow-exts -fallow-overlapping-instances GHCOPTS= $(HSOPTS) -fbang-patterns -O -ignore-package lang $(GHCDEBUGOPTS) $(GHCINC) $(PACKAGES) $(GHCLANG) -JHC_LIBS = base-1.0.hl haskell98-1.0.hl applicative-1.0.hl +JHC_LIBS = base-1.0.hl haskell98-1.0.hl applicative-1.0.hl containers-0.2.0.hl EXTRA_DIST = data utils arch docs FrontEnd/HsParser.y $(BUILT_SOURCES) \ lib/base lib/haskell98 lib/haskell98.cabal $(JHC_LIBS) \ hunk ./Makefile.am 222 mkdir -p tmp/libho ./jhc -v $(RTSOPTS) $(JHC_TEST) --ho-dir tmp/libho -ilib/applicative --noauto -L- -L. -p base --build-hl lib/applicative/applicative.cabal -o $@ +containers-0.2.0.hl: lib/containers.cabal base-1.0.hl applicative-1.0.hl + mkdir -p tmp/libho + ./jhc -v $(RTSOPTS) $(JHC_TEST) --ho-dir tmp/libho -ilib/containers --noauto -L- -L. -p base -p applicative --build-hl lib/containers.cabal -fcpp -o $@ + haskell98-1.0.hl: lib/haskell98.cabal base-1.0.hl mkdir -p tmp/libho ./jhc -v $(RTSOPTS) $(JHC_TEST) --ho-dir tmp/libho -ilib/haskell98 --noauto -L- -L. -p base --build-hl lib/haskell98.cabal -o $@ hunk ./docs/development.mkd 38 darcs get http://repetae.net/repos/Doc cd lib darcs get http://darcs.haskell.org/packages/haskell98 + darcs get http://darcs.haskell.org/packages/containers Now you can begin to build jhc, in order to do so, switch to the jhc directory and do: hunk ./lib/containers.cabal 1 +name: containers +version: 0.2.0.1 +license: BSD3 +license-file: LICENSE +maintainer: libraries@haskell.org +bug-reports: http://hackage.haskell.org/trac/ghc/newticket?component=libraries%20%28other%29 +synopsis: Assorted concrete container types +category: Data Structures +description: + This package contains efficient general-purpose implementations + of various basic immutable container types. The declared cost of + each operation is either worst-case or amortized, but remains + valid even if structures are shared. +build-type: Simple +extra-source-files: include/Typeable.h +extensions: CPP + +exposed-modules: + Data.Graph + Data.IntMap + Data.IntSet + Data.Map + Data.Sequence + Data.Set + Data.Tree + [fix name of Read class John Meacham **20090304112234 Ignore-this: d7523e4631705e935c72801b46bf9a13 ] hunk ./data/names.txt 57 Enum Jhc.Enum.Enum Bounded Jhc.Enum.Bounded Show Jhc.Show.Show -Read Jhc.Text.Read +Read Jhc.Text.Read.Read Ix Data.Ix.Ix Functor Jhc.Monad.Functor Monad Jhc.Monad.Monad Context: [add hIsEOF and hWaitForInput to standard library John Meacham **20090228052850 Ignore-this: 557be21d165b4f938a9d041756e47785 ] [add Eq and Ord istances for ForeignPtr John Meacham **20090228050736 Ignore-this: 25a6cffd3bbaa42e0c2fa206ee4d2873 ] [major clean ups to Desugar module, remove almost 200 lines of code inherited from hatchet John Meacham **20090228045244 Ignore-this: 4fe7a717d45723b21ca6469c3434d11d ] [don't desugar do bindings until after renaming John Meacham **20090228042330 Ignore-this: aee5455f770a0827f5be4c6fddf9f8a9 ] [clean up some old cruft dealing with names John Meacham **20090228041535 Ignore-this: 7dd37bbf916f99c261aabd3abcf579e ] [don't desugar list comprehensions until after renaming has occured, always bind to the prelude functions in list comprehension expansion John Meacham **20090228034520 Ignore-this: eb81f6946c340c9681b57b755807e9b0 ] [added HsLet, HsDo, and HsLocated to syntax traversal code John Meacham **20090228023728 Ignore-this: 6e34d0e65b4ccb866d228c0a56e3e8e6 ] [thread options into the renamer and simplify renamer some by leaving wrapping of constructors to the type checker John Meacham **20090228021401 Ignore-this: 734a765b3cd3f829b2ace35d10da8aa7 ] [clean up old renaming code for HsExp John Meacham **20090227143040 Ignore-this: 1dbc2f2ac81261bfc00421bfa53379ae ] [allow foreign import specification parameters to appear in arbitrary order John Meacham **20090227142607 Ignore-this: b107a2faf20d87e1cebcc4ada1c156f9 ] [various library fixes, added minusPtr, openBinaryFile, hGetLine, fixed type for C finalizers John Meacham **20090227142545 Ignore-this: a67c83675bf1ed9299a6502e57c4839a ] [add System.Environment John Meacham **20090227124254 Ignore-this: 13e1fdeac60844d54020cfe869fc70b2 ] [add ffi export and import regression test John Meacham **20090227123945 Ignore-this: 209fd85faa4e6a27cc0b2f2cbd35874d ] [fix creation of complicated conjured type names, don't print built in data table entries unless requested John Meacham **20090227105042 Ignore-this: 81e49bfcad69a034591a880843ac727b ] [add stub typeable library John Meacham **20090227104245 Ignore-this: a9d832a8180070f3f4454f94fbf212eb ] [clean up code some, add Addr_ and FunAddr_ unboxed newtypes for when you need to use a specific calling convention with foreign code John Meacham **20090227090327 Ignore-this: ac1d1b85e7b532959bfda923a9ce6d36 ] [allow foreign exporting functions with unboxed arguments and return values John Meacham **20090227083138 Ignore-this: d95bf53200e740bb1b3d7ebdabe2a1fb ] [fix FFI exports such that the export information is saved properly in the ho file John Meacham **20090227081046 Ignore-this: 95ae977db7ea38b4d96d052d679599e2 ] [redo looking up foreign-able types and what they map to to be more general John Meacham **20090227075123 Ignore-this: e7bf5a8333660b7994d4de4c714f0929 ] [change 'dervice' to 'deriving' in standalone deriving implementation to be compatible with ghc John Meacham **20090226120656 Ignore-this: 3a3ed2ffb4c20221b9bbbaeececa7f8c ] [TAG rigwacjurrir John Meacham **20090226120636 Ignore-this: a0936ea30415b628de8de01565ff4566 ] Patch bundle hash: ab12b5e892485197ceb6f6be98e2ec7c678235b5