CVS: sml-dist/src/compiler/FLINT/kernel pplty.sml, 1.1.2.10, 1.1.2.11

Update of /cvsroot/smlnj/sml-dist/src/compiler/FLINT/kernel
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv14232/src/compiler/FLINT/kernel

Modified Files:
      Tag: primop-branch-2
	pplty.sml 
Log Message:
tycEnv representation change propagated through pplty.sml

Index: pplty.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/FLINT/kernel/Attic/pplty.sml,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -C2 -d -r1.1.2.10 -r1.1.2.11
*** pplty.sml	15 Aug 2006 23:01:32 -0000	1.1.2.10
--- pplty.sml	17 Aug 2006 21:26:26 -0000	1.1.2.11
***************
*** 65,85 ****
  
  fun tycEnvFlatten(tycenv) = 
!     (case Lty.tcSplit(tycenv)
         of NONE => []
          | SOME(elem, rest) => elem::tycEnvFlatten(rest))
  
! fun ppTycEnvElem pd ppstrm ((tycop,i): Lty.tycEnvElem) =
!     if pd < 1 then pps ppstrm "<tee>" else
      let val {openHOVBox, closeBox, pps, ppi, ...} = en_pp ppstrm
      in openHOVBox 1;
! 	pps "(";
! 	(case tycop
! 	   of NONE => pps "*"
! 	    | SOME(tycs) => ppList ppstrm {sep=",", pp=ppTyc (pd-1)} tycs);
! 	pps ",";
! 	ppi i;
! 	pps ")";
         closeBox()
!     end (* function ppTycEnvElem *)
  
  and ppTyc pd ppstrm (tycon : Lty.tyc) =
--- 65,93 ----
  
  fun tycEnvFlatten(tycenv) = 
!     (case Lty.teDest(tycenv)
         of NONE => []
          | SOME(elem, rest) => elem::tycEnvFlatten(rest))
  
! fun ppTEBinder pd ppstrm (binder: Lty.teBinder) =
!     if pd < 1 then pps ppstrm "<teBinder>" else
      let val {openHOVBox, closeBox, pps, ppi, ...} = en_pp ppstrm
      in openHOVBox 1;
! 	let val ks = 
! 		(case binder
! 		  of Lty.Lamb (level, ks) => (pps "L"; ppi level; ks) 
! 		   | Lty.Beta (level, args, ks) =>
! 	             (pps "B";
! 		      ppi level;
! 		      pps "(";
! 		      ppList ppstrm {sep=",", pp=ppTyc (pd-1)} args;
! 		      pps ")";
! 		      ks)
! 		)
! 	in if pd < 2 then () 
! 	   else (pps " : ";
! 		 ppList ppstrm {sep="*", pp=ppTKind (pd-1)} ks)
! 	end;
         closeBox()
!     end (* function ppTEBinder *)
  
  and ppTyc pd ppstrm (tycon : Lty.tyc) =
***************
*** 268,272 ****
  	     pps ",";
  	     PP.break ppstrm {nsp=1,offset=0};
! 	     ppList' {sep=",", pp=ppTycEnvElem (pd-1)} (tycEnvFlatten tenv);
  	     closeBox())
      in ppTycI (Lty.tc_outX tycon)
--- 276,280 ----
  	     pps ",";
  	     PP.break ppstrm {nsp=1,offset=0};
! 	     ppList' {sep=",", pp=ppTEBinder (pd-1)} (tycEnvFlatten tenv);
  	     closeBox())
      in ppTycI (Lty.tc_outX tycon)
***************
*** 278,282 ****
       in openHOVBox 1;
  	 pps "TycEnv(";
! 	 ppList ppstrm {sep=", ", pp=ppTycEnvElem (pd-1)} (tycEnvFlatten tycEnv);
  	 pps ")";
  	closeBox()
--- 286,290 ----
       in openHOVBox 1;
  	 pps "TycEnv(";
! 	 ppList ppstrm {sep=", ", pp=ppTEBinder (pd-1)} (tycEnvFlatten tycEnv);
  	 pps ")";
  	closeBox()


-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642