- Cvs-hugs - Haskell.org

cvs commit: hugs98/lib/exts Observe.lhs Observe.hs
by nordland＠glass.cse.ogi.edu 17 Jan '01

17 Jan '01

nordland 2001/01/17 15:26:39 PST Added files: lib/exts Observe.lhs Removed files: lib/exts Observe.hs Log: Replaced Observe.hs with Observe.lhs in order to conform with Hood.

1 0

cvs commit: hugs98/lib/exts Observe.hs
by nordland＠glass.cse.ogi.edu 17 Jan '01

17 Jan '01

nordland 2001/01/17 09:44:23 PST Added files: lib/exts Observe.hs Log: Added missing debugging library.

1 0

cvs commit: hugs98/src builtin.c
by nordland＠glass.cse.ogi.edu 16 Jan '01

16 Jan '01

nordland 2001/01/16 10:48:40 PST Modified files: src builtin.c Log: Updated debugging code in builtin.c on behalf of Richard Watson. Revision Changes Path 1.9 +4 -12 hugs98/src/builtin.c

1 0

cvs commit: hugs98/src hugs.c
by nordland＠glass.cse.ogi.edu 08 Jan '01

08 Jan '01

nordland 2001/01/08 14:51:57 PST Modified files: src hugs.c Log: A slight adjustment... Revision Changes Path 1.28 +3 -2 hugs98/src/hugs.c

1 0

cvs commit: hugs98/lib/exts MonadRec.hs hugs98/src compiler.c connect.h input.c output.c parser.y prelude.h static.c storage.h type.c
by Jeff Lewis 08 Jan '01

08 Jan '01

lewie 2001/01/08 13:43:06 PST Modified files: src compiler.c connect.h input.c output.c parser.y prelude.h static.c storage.h type.c Added files: lib/exts MonadRec.hs Log: Added recursive monadic do notation extension. Revision Changes Path 1.4 +130 -2 hugs98/src/compiler.c 1.16 +7 -2 hugs98/src/connect.h 1.19 +13 -2 hugs98/src/input.c 1.13 +7 -2 hugs98/src/output.c 1.13 +51 -2 hugs98/src/parser.y 1.11 +4 -2 hugs98/src/prelude.h 1.27 +476 -3 hugs98/src/static.c 1.15 +7 -2 hugs98/src/storage.h 1.28 +186 -2 hugs98/src/type.c

1 0

cvs commit: hugs98 Makefile
by Jeff Lewis 02 Jan '01

02 Jan '01

lewie 2001/01/02 14:22:33 PST Modified files: . Makefile Log: Make `make rpm' more friendly to re-builds. Revision Changes Path 1.6 +1 -0 hugs98/Makefile

1 0

cvs commit: hugs98/src input.c parser.y
by Jeff Lewis 02 Jan '01

02 Jan '01

lewie 2001/01/02 14:17:14 PST Modified files: src input.c parser.y Log: Make `export', `dynamic', `ccall', `stdcall', `unsafe' and `label' be varids. Revision Changes Path 1.18 +22 -2 hugs98/src/input.c 1.12 +8 -2 hugs98/src/parser.y

1 0

cvs commit: hugs98/src builtin.c command.h connect.h errors.h hugs.c input.c interns.c machine.c output.c prelude.h printer.c storage.c storage.h
by nordland＠glass.cse.ogi.edu 02 Jan '01

02 Jan '01

nordland 2001/01/02 10:21:41 PST Modified files: src builtin.c command.h connect.h errors.h hugs.c input.c interns.c machine.c output.c prelude.h printer.c storage.c storage.h Log: Added Richard Watson's debugging extensions (flagged OBSERVATIONS). Revision Changes Path 1.8 +87 -3 hugs98/src/builtin.c 1.8 +12 -2 hugs98/src/command.h 1.15 +16 -2 hugs98/src/connect.h 1.4 +7 -2 hugs98/src/errors.h 1.27 +66 -2 hugs98/src/hugs.c 1.17 +7 -2 hugs98/src/input.c 1.4 +6 -3 hugs98/src/interns.c 1.4 +215 -3 hugs98/src/machine.c 1.12 +185 -7 hugs98/src/output.c 1.10 +14 -5 hugs98/src/prelude.h 1.4 +7 -2 hugs98/src/printer.c 1.13 +206 -3 hugs98/src/storage.c 1.14 +66 -3 hugs98/src/storage.h

1 0

RE: cvs commit: hugs98/src GreenCard.h connect.h hugs.c input.c p arser.y static.c
by Simon Marlow 14 Dec '00

14 Dec '00

> reid 2000/12/13 01:36:05 PST > > Modified files: > src GreenCard.h connect.h hugs.c input.c > parser.y static.c > Log: > Final commit in the series. Alastair - this is great stuff. Nice one. We should work together on getting the FFI libraries into Hugs too, and sync up as much as possible. BTW, we're using (Ptr a) instead of Addr these days. Cheers, Simon

1 0

cvs commit: hugs98/src GreenCard.h connect.h hugs.c input.c parser.y static.c
by Alastair Reid 13 Dec '00

13 Dec '00

reid 2000/12/13 01:36:05 PST Modified files: src GreenCard.h connect.h hugs.c input.c parser.y static.c Log: Final commit in the series. Added +G flag to options in hugs.c. Lexer, parser and static checker additions. Note that foreign export (static) is not implemented. My problem was how to handle the following: plus x y = x + y foreign export "plusInt" plus :: Int -> Int -> Int foreign export "plusFloat" plus :: Float -> Float -> Float What I want to do is to define: __plusInt :: Int -> Int -> Int __plusInt = plus __plusFloat :: Float -> Float -> Float __plusFloat = plus then invoke the typechecker which will insert dictionaries, check that the instances make sense, etc. And now I can foreign export each individual instance with no bother at all. One problem is that ffi declarations are processed fairly early in the checking process - it's a bad time to go invoking the typechecker. Another problem is that I'm not entirely sure how to actually do the above. I think it should be like checking the bindings in an instance declaration but I don't quite grok that code. [This is a subtly disguised plea for help from Mark, Jeff or someone else who feels happy in the typechecker. (I'm assuming someone suitably qualified is on the commit mailing list.)] Anyway, enough about what if can't do. Here's what it can do: 1) Copy the following files into Test.hs and test.c 2) hugs +G Test.hs This generates Test.c 3) cc -shared Test.c test.c -o Test.so This generates Test.so 4) hugs Test.hs This loads Test.hs and Test.so 5) test (+) 1 1 This should print 2! I know it's a lot of work just to add two numbers... but there's a certain satisfaction in knowing that the addition was done in C isn't there? ---------------------------------------------------------------- -- Start of Haskell part of test file Test.hs ---------------------------------------------------------------- -- Doesn't support: -- o foreign export static -- o Int64, Word64, Int32, Word32, Int16, Word16, Int8, Word8 -- o The named C types HsChar, HsInt16, etc module Test where foreign import x :: Int -> Char -> IO Addr foreign import z :: Int -> Int -> Int foreign import dynamic x' :: Addr -> (Int -> Char -> IO Addr) -- foreign export static isn't implemented (typechecking problems) -- foreign export y :: Int -> Char -> IO Float -- y _ _ = return 1.0 foreign export dynamic toC :: (Int -> Int -> Int) -> IO Addr -- You can use either of these definitions - both work -- foreign import "fromC" fromC :: Addr -> (Int -> Int -> Int) fromC = fromfromC fromC_addr foreign import dynamic fromfromC :: Addr -> (Addr -> (Int -> Int -> Int)) foreign label "fromC" fromC_addr :: Addr test f x y = do{ f' <- toC f; print (fromC f' x y) } ---------------------------------------------------------------- -- Start of Haskell part of test file Test.hs ---------------------------------------------------------------- /**************************************************************** * Start of C part of test file test.c ****************************************************************/ extern void* y(int a, char b); void* x(int a, char b) { // return y(a,b); } int z(int a, int b) { return a+b; } void* from_dyn(void* (*f)(int i, char c),int i, char c) { return (*f)(i,c); } void* fromC(void* (*f)(int a, int b),int a, int b) { return (*f)(a,b); } /**************************************************************** * Start of C part of test file test.c ****************************************************************/ Revision Changes Path 1.4 +12 -5 hugs98/src/GreenCard.h 1.14 +9 -2 hugs98/src/connect.h 1.26 +8 -3 hugs98/src/hugs.c 1.16 +29 -2 hugs98/src/input.c 1.11 +44 -4 hugs98/src/parser.y 1.26 +357 -2 hugs98/src/static.c

1 0