CVS: sml-dist/src/compiler/Elaborator/elaborate elabcore.sml, 1.8.4.3, 1.8.4.4 elabmod.sml, 1.2.20.3, 1.2.20.4 elabsig.sml, 1.2.20.2, 1.2.20.3 elabtop.sml, 1.3, 1.3.10.1
George Kuan <[email protected]> Tue, 18 Jul 2006 12:46:37 -0700
| Newsgroups | gmane.comp.lang.sml.smlnj.commits |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/smlnj/sml-dist/src/compiler/Elaborator/elaborate
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv25153/src/compiler/Elaborator/elaborate
Modified Files:
Tag: primop-branch-2
elabcore.sml elabmod.sml elabsig.sml elabtop.sml
Log Message:
debug printout
Index: elabcore.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/Elaborator/elaborate/elabcore.sml,v
retrieving revision 1.8.4.3
retrieving revision 1.8.4.4
diff -C2 -d -r1.8.4.3 -r1.8.4.4
*** elabcore.sml 10 Jul 2006 14:06:37 -0000 1.8.4.3
--- elabcore.sml 18 Jul 2006 19:46:35 -0000 1.8.4.4
***************
*** 747,754 ****
and elabOPENdec(spaths, env, region) =
let val err = error region
! val strs = map (fn s => let val sp = SP.SPATH s
in (sp, LU.lookStr(env, sp, err))
end) spaths
!
fun loop([], env) = (OPENdec strs, env, TS.empty, no_updt)
| loop((_, s)::r, env) = loop(r, MU.openStructure(env, s))
--- 747,755 ----
and elabOPENdec(spaths, env, region) =
let val err = error region
! val _ = print "elabOPENdec\n"
! val strs = map (fn s => let val sp = SP.SPATH s
in (sp, LU.lookStr(env, sp, err))
end) spaths
!
fun loop([], env) = (OPENdec strs, env, TS.empty, no_updt)
| loop((_, s)::r, env) = loop(r, MU.openStructure(env, s))
Index: elabmod.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/Elaborator/elaborate/elabmod.sml,v
retrieving revision 1.2.20.3
retrieving revision 1.2.20.4
diff -C2 -d -r1.2.20.3 -r1.2.20.4
*** elabmod.sml 12 Jul 2006 15:43:13 -0000 1.2.20.3
--- elabmod.sml 18 Jul 2006 19:46:35 -0000 1.2.20.4
***************
*** 62,66 ****
(* debugging *)
val say = Control_Print.say
! val debugging = ElabControl.emdebugging (* ref false *)
fun debugmsg (msg: string) =
if !debugging then (say msg; say "\n") else ()
--- 62,66 ----
(* debugging *)
val say = Control_Print.say
! val debugging = ref true; (* ElabControl.emdebugging (* ref false *) *)
fun debugmsg (msg: string) =
if !debugging then (say msg; say "\n") else ()
***************
*** 665,671 ****
bug "elabStr.AppStrI -- empty arg list"
! | elab (VarStr path, env, entEnv, region) =
let val _ = debugmsg ">>elab[VarStr]"
val str = LU.lookStr(env,SP.SPATH path,error region)
(*
val _ = showStr("--elab[VarStr]: str: ",str,env)
--- 665,674 ----
bug "elabStr.AppStrI -- empty arg list"
! | elab (v as VarStr path, env, entEnv, region) =
let val _ = debugmsg ">>elab[VarStr]"
+ val _ = error region EM.WARN "VarStr lookStr: "
+ (fn ppstrm => PPAst.ppStrExp (env, NONE) ppstrm (v, 10))
val str = LU.lookStr(env,SP.SPATH path,error region)
+ val _ = print "lookStr ### \n"
(*
val _ = showStr("--elab[VarStr]: str: ",str,env)
***************
*** 684,688 ****
| _ => M.CONSTstr M.bogusStrEntity (* error recovery *)
! in (* debugmsg "<<elab[VarStr]"; *)
(A.SEQdec [], str, resExp, EE.empty)
end
--- 687,691 ----
| _ => M.CONSTstr M.bogusStrEntity (* error recovery *)
! in debugmsg "<<elab[VarStr]"; (* GK: Used to be commented out *)
(A.SEQdec [], str, resExp, EE.empty)
end
***************
*** 934,937 ****
--- 937,941 ----
val _ = debugmsg "--elabFct[BaseFct]: param EE.bind"
+ val _ = print "elabmod before env'\n"
val env' =
case paramNameOp
***************
*** 1265,1272 ****
| OpenDec paths =>
let val err = error region
val strs = map (fn s => let val sp = SP.SPATH s
in (sp, LU.lookStr(env0, sp, err))
end) paths
-
fun loop([], env) = (A.OPENdec strs, M.EMPTYdec, env, EE.empty)
| loop((_, s)::r, env) = loop(r, MU.openStructure(env, s))
--- 1269,1276 ----
| OpenDec paths =>
let val err = error region
+ val _ = print "elabDecl0 \n"
val strs = map (fn s => let val sp = SP.SPATH s
in (sp, LU.lookStr(env0, sp, err))
end) paths
fun loop([], env) = (A.OPENdec strs, M.EMPTYdec, env, EE.empty)
| loop((_, s)::r, env) = loop(r, MU.openStructure(env, s))
Index: elabsig.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/Elaborator/elaborate/elabsig.sml,v
retrieving revision 1.2.20.2
retrieving revision 1.2.20.3
diff -C2 -d -r1.2.20.2 -r1.2.20.3
*** elabsig.sml 11 Jul 2006 15:35:49 -0000 1.2.20.2
--- elabsig.sml 18 Jul 2006 19:46:35 -0000 1.2.20.3
***************
*** 1025,1029 ****
in val nsctxt = paramElmt :: sigContext
end (* a temporary work-around for the sigContext hack *)
!
val env' =
case paramNameOp
--- 1025,1029 ----
in val nsctxt = paramElmt :: sigContext
end (* a temporary work-around for the sigContext hack *)
! val _ = print "elabFctSig0\n"
val env' =
case paramNameOp
Index: elabtop.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/Elaborator/elaborate/elabtop.sml,v
retrieving revision 1.3
retrieving revision 1.3.10.1
diff -C2 -d -r1.3 -r1.3.10.1
*** elabtop.sml 13 Aug 2003 18:04:06 -0000 1.3
--- elabtop.sml 18 Jul 2006 19:46:35 -0000 1.3.10.1
***************
*** 146,149 ****
--- 146,150 ----
val strs = map (fn p => L.lookStr(env,SP.SPATH p,err)) paths
+ val _ = print "elab\n"
(* open their environments to add datatypes, etc. *)
fun h(M.ERRORstr, env) = env
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV