X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Finterpreter%2Foutput.c;h=c4ed363e5270c617d4b0fc128661258b817bc119;hb=4bac90dcd705b922910995b2cdf2fc4ee7a0f09b;hp=656adef9ed8ec06044488f9a2b318125a6d44443;hpb=42d2afc52ff5ffec48a5a56a94c110deba4a9549;p=ghc-hetmet.git diff --git a/ghc/interpreter/output.c b/ghc/interpreter/output.c index 656adef..c4ed363 100644 --- a/ghc/interpreter/output.c +++ b/ghc/interpreter/output.c @@ -10,11 +10,11 @@ * included in the distribution. * * $RCSfile: output.c,v $ - * $Revision: 1.14 $ - * $Date: 2000/03/10 14:53:00 $ + * $Revision: 1.18 $ + * $Date: 2000/04/25 17:43:50 $ * ------------------------------------------------------------------------*/ -#include "prelude.h" +#include "hugsbasictypes.h" #include "storage.h" #include "connect.h" #include "errors.h" @@ -26,30 +26,30 @@ * Local function prototypes: * ------------------------------------------------------------------------*/ -static Void local put Args((Int,Cell)); -static Void local putFlds Args((Cell,List)); -static Void local putComp Args((Cell,List)); -static Void local putQual Args((Cell)); -static Bool local isDictVal Args((Cell)); -static Cell local maySkipDict Args((Cell)); -static Void local putAp Args((Int,Cell)); -static Void local putOverInfix Args((Int,Text,Syntax,Cell)); -static Void local putInfix Args((Int,Text,Syntax,Cell,Cell)); -static Void local putSimpleAp Args((Cell,Int)); -static Void local putTuple Args((Int,Cell)); -static Int local unusedTups Args((Int,Cell)); -static Void local unlexOp Args((Text)); - -static Void local putSigType Args((Cell)); -static Void local putContext Args((List,List,Int)); -static Void local putPred Args((Cell,Int)); -static Void local putType Args((Cell,Int,Int)); -static Void local putTyVar Args((Int)); -static Bool local putTupleType Args((Cell,Int)); -static Void local putApType Args((Type,Int,Int)); - -static Void local putKind Args((Kind)); -static Void local putKinds Args((Kinds)); +static Void local put ( Int,Cell ); +static Void local putFlds ( Cell,List ); +static Void local putComp ( Cell,List ); +static Void local putQual ( Cell ); +static Bool local isDictVal ( Cell ); +static Cell local maySkipDict ( Cell ); +static Void local putAp ( Int,Cell ); +static Void local putOverInfix ( Int,Text,Syntax,Cell ); +static Void local putInfix ( Int,Text,Syntax,Cell,Cell ); +static Void local putSimpleAp ( Cell,Int ); +static Void local putTuple ( Int,Cell ); +static Int local unusedTups ( Int,Cell ); +static Void local unlexOp ( Text ); + +static Void local putSigType ( Cell ); +static Void local putContext ( List,List,Int ); +static Void local putPred ( Cell,Int ); +static Void local putType ( Cell,Int,Int ); +static Void local putTyVar ( Int ); +static Bool local putTupleType ( Cell,Int ); +static Void local putApType ( Type,Int,Int ); + +static Void local putKind ( Kind ); +static Void local putKinds ( Kinds ); /* -------------------------------------------------------------------------- @@ -188,6 +188,9 @@ Cell e; { case DOCOMP : putStr("do {...}"); break; + case MDOCOMP : putStr("do {...}"); + break; + case COMP : putComp(fst(snd(e)),snd(snd(e))); break; @@ -215,7 +218,7 @@ Cell e; { break; case LETREC : OPEN(d>WHERE_PREC); -#if DEBUG_CODE +#if 0 putStr("let {"); put(NEVER,fst(snd(e))); putStr("} in "); @@ -271,7 +274,7 @@ Cell e; { case CASE : putStr("case "); put(NEVER,fst(snd(e))); -#if DEBUG_CODE +#if 0 putStr(" of {"); put(NEVER,snd(snd(e))); putChr('}'); @@ -357,7 +360,7 @@ Cell q; { static Bool local isDictVal(e) /* Look for dictionary value */ Cell e; { -#if !DEBUG_CODE +#if 0 /* was !DEBUG_CODE -- is it necessary? */ Cell h = getHead(e); switch (whatIs(h)) { case DICTVAR : return TRUE; @@ -925,8 +928,7 @@ Kinds ks; { * Main drivers: * ------------------------------------------------------------------------*/ -extern FILE *mystdout Args((Void)); -FILE *mystdout() { +FILE *mystdout ( Void ) { /* We use this from the gdb command line when debugging */ return stdout; }