- Cvs-hugs - Haskell.org

Feature, implement :main command
by Neil Mitchell 10 Jan '06

10 Jan '06

Hi, Attached is a patch that adds a :main command to hugs. :main arguments is equivalent to arguments `withArgs` main, but easier to use because you don't need to import anything extra, and the arguments are parsed as if they were arguments - i.e. :main my test "of this", instead of ["my","test","of this"] `withArgs` main. Since i don't know a whole lot about this area of the compiler, and it is changing the user interface for everyone, I thought it best that someone checks its at least sane before i do anything with it. Thanks Neil

2 12

cvs commit: hugs98/src command.h hugs.c
by Neil Mitchell 10 Jan '06

10 Jan '06

neil 2006/01/10 15:31:45 PST Modified files: src command.h hugs.c Log: Add :main command to the Hugs list of commands, and an implementation of this command Revision Changes Path 1.15 +3 -2 hugs98/src/command.h 1.147 +25 -3 hugs98/src/hugs.c

1 0

cvs commit: hugs98 Makefile RPM.mk hugs98/libraries Makefile.in
by Ross Paterson 17 Dec '05

17 Dec '05

ross 2005/12/17 15:38:11 PST Modified files: . Makefile RPM.mk libraries Makefile.in Log: Use local copy of hsc2hs instead of fetching from CVS. Build cpphs and hsc2hs using Cabal. Revision Changes Path 1.69 +6 -5 hugs98/Makefile 1.44 +0 -1 hugs98/RPM.mk 1.19 +16 -12 hugs98/libraries/Makefile.in

1 0

cvs commit: hugs98/hsc2hs LICENSE Main.hs hsc2hs.cabal template-hsc.h
by Ross Paterson 17 Dec '05

17 Dec '05

ross 2005/12/17 15:31:51 PST Added files: hsc2hs LICENSE Main.hs hsc2hs.cabal template-hsc.h Log: Add a Cabalize version of hsc2hs that we'll be able to use instead of fetching the ghc tree. Hopefully this will find a permanent home elsewhere.

1 0

patch for +G +L updates
by Jskud＠jskud.com 12 Dec '05

12 Dec '05

This is a follow up to a hugs bug submitted last night. The following patch updates the man page and the option processing to reflect the changes in f +G and +L argument processing for ffihugs. After applying the patch, ffihugs will behave as follows: $ HUGSDIR=hugsdir src/ffihugs +G +L"silly" ~/Technical/queen.hs ERROR: +G is no longer needed for ffihugs and is no longer supported - ignoring it. ERROR: +L is no longer supported for ffihugs - put the argument (without +L) *after* the module - ignoring it. $ the manpage will read (in part): ffihugs [ options ] module [ compiler_argument ] ... ... Additional arguments for the C compiler may be supplied via compiler_arguments. For example, suppose you have some C functions in test.c and some FFI declarations for those functions in Test.hs and the code in test.c needs to be compiled with -lm. Then you would compile the module with the command ffihugs Test.hs test.c -lm which generates an object file Test.so. Then when hugs loads Test.hs, it will also load Test.so. ... Updated for the March 2005 ffihugs changes by Joseph P. Skudlarek. December 2005 HUGS(1) I hope you find the patch useful, and will apply it. Questions to me. /Jskud Here's the patch. [Jskud@briareus src]$ diff -u hugs_via_cvs/hugs98/src/opts.c hugs98-20051105/src/opts.c --- hugs_via_cvs/hugs98/src/opts.c 2005-09-02 06:56:09.000000000 -0700 +++ hugs98-20051105/src/opts.c 2005-12-09 19:35:05.000000000 -0800 @@ -503,6 +503,20 @@ cutoff = cutcand; } return TRUE; + + /* + * FYI: We are unable to use #ifdef defined (FFI_COMPILER) to make this processing conditional + * since this file is shared, and it is never compiled with FFI_COMPILER specified. + * Since we only expect ffihugs users to encounter this error, always checking is acceptable. + * FYI: We need to return TRUE so that ffihugs will process and see all the arguments. + */ + + case 'G' : Printf("ERROR: +G is no longer needed for ffihugs and is no longer supported - ignoring it.\n"); + return TRUE; + + case 'L' : Printf("ERROR: +L is no longer supported for ffihugs - put the argument (without +L) *after* the module - ignoring it.\n"); + return TRUE; + default : #if !HASKELL_98_ONLY if (strcmp("98",s)==0) { [Jskud@briareus src]$ diff -u {hugs_via_cvs/hugs98,hugs98-20051105}/docs/hugs.1.in --- hugs_via_cvs/hugs98/docs/hugs.1.in 2003-10-12 06:12:18.000000000 -0700 +++ hugs98-20051105/docs/hugs.1.in 2005-12-09 18:52:01.000000000 -0800 @@ -1,5 +1,5 @@ .\" @configure_input@ -.TH HUGS 1 "September 2003" "" "" +.TH HUGS 1 "December 2005" "" "" .ds LB @HUGSDIR@ .ds BN @BINDIR@ .ds HP @HUGSPATH@ @@ -26,14 +26,13 @@ ] .br .B ffihugs -.B +G [ .I options ] +.I module [ -.BI +L arg +.BI compiler_argument ] ... -.I module .SH DESCRIPTION Hugs is an interpreter for Haskell, a standard non-strict functional programming language. Hugs implements almost all of the @@ -279,19 +278,15 @@ .B foreign declarations must be compiled using the .I ffihugs -command with the -.B +G -option. -Additional arguments for the C compiler may be supplied with -.B +L -options. +command. +Additional arguments for the C compiler may be supplied via \fBcompiler_argument\fPs. For example, suppose you have some C functions in \fBtest.c\fP and some FFI declarations for those functions in \fBTest.hs\fP and the code in \fBtest.c\fP needs to be compiled with \fB\-lm\fP. Then you would compile the module with the command .IP -\fBffihugs +G +L"test.c" +L"\-lm" Test.hs\fP +\fBffihugs Test.hs test.c \-lm \fP .LP which generates an object file \fBTest.so\fP. Then when \fIhugs\fP loads \fBTest.hs\fP, it will also load \fBTest.so\fP. @@ -347,3 +342,4 @@ Manual page: Jonathan Bowen, modified by Gary Leavens, and then (with apologies to the original authors) by Mark Jones. Updated for Hugs 98 by Antti-Juhani Kaijanaho and Ross Paterson. +Updated for the March 2005 ffihugs changes by Joseph P. Skudlarek.

2 1

cvs commit: hugs98/docs hugs.1.in
by Ross Paterson 12 Dec '05

12 Dec '05

ross 2005/12/12 06:18:44 PST Modified files: docs hugs.1.in Log: update to track recent options changes (from Joseph P. Skudlarek) Revision Changes Path 1.22 +30 -13 hugs98/docs/hugs.1.in

1 0

cvs commit: hugs98/src opts.c
by Ross Paterson 12 Dec '05

12 Dec '05

ross 2005/12/12 06:18:04 PST Modified files: src opts.c Log: warnings for obsolete options (from Joseph P. Skudlarek) Revision Changes Path 1.23 +14 -0 hugs98/src/opts.c

1 0

cvs commit: hugs98/docs/users_guide others.xml
by Ross Paterson 10 Dec '05

10 Dec '05

ross 2005/12/10 03:25:59 PST Modified files: docs/users_guide others.xml Log: add sentence about ffihugs Revision Changes Path 1.2 +6 -0 hugs98/docs/users_guide/others.xml

1 0

cvs commit: hugs98/src static.c type.c hugs98/docs/users_guide hugs_ghc.xml
by Ross Paterson 10 Dec '05

10 Dec '05

ross 2005/12/10 03:25:14 PST Modified files: src static.c type.c docs/users_guide hugs_ghc.xml Log: Parallel list comprehensions: look for zipN functions in both List and Data.List. Revision Changes Path 1.179 +5 -3 hugs98/src/static.c 1.81 +8 -6 hugs98/src/type.c 1.8 +5 -0 hugs98/docs/users_guide/hugs_ghc.xml

1 0

cvs commit: hugs98/src machdep.c
by Ross Paterson 09 Dec '05

09 Dec '05

ross 2005/12/09 16:49:27 PST Modified files: src machdep.c Log: fix to Word74/Int64 marshalling (bug reported by Bulat Ziganshin) Revision Changes Path 1.136 +3 -3 hugs98/src/machdep.c

1 0