CVS: sml-dist/src/compiler/FLINT/kernel ltykernel.sml, 1.18.12.11, 1.18.12.12 pplty.sml, 1.1.2.6, 1.1.2.7

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

Modified Files:
      Tag: primop-branch-2
	ltykernel.sml pplty.sml 
Log Message:
cleaned up pplty tyc part

Index: ltykernel.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/FLINT/kernel/ltykernel.sml,v
retrieving revision 1.18.12.11
retrieving revision 1.18.12.12
diff -C2 -d -r1.18.12.11 -r1.18.12.12
*** ltykernel.sml	6 Aug 2006 06:05:09 -0000	1.18.12.11
--- ltykernel.sml	8 Aug 2006 18:02:53 -0000	1.18.12.12
***************
*** 489,502 ****
        | TC_SUM tcs =>
            "TSUM(" ^ (plist(tc_print, tcs)) ^ ")"
!       | TC_FIX ((_, tc, ts), i) =>
!           (* if tc_eqv(x,tcc_bool) then "B" 
!           else if tc_eqv(x,tcc_list) then "LST" 
!                else *) (let (* val ntc = case ts of [] => tc
!                                             | _ => tcc_app(tc, ts) *)
!                          val _ = 1
!                       in ("DT{" ^ "DATA"  ^ "[" ^ (tc_print tc)  
!                                 ^ "] &&" ^ (plist(tc_print, ts))
!                                       ^ "&&" ^ "===" ^ (itos i) ^ "}")
!                      end)
        | TC_ABS t => "Ax(" ^ (tc_print t) ^ ")"
        | TC_BOX t => "Bx(" ^ (tc_print t) ^ ")"
--- 489,517 ----
        | TC_SUM tcs =>
            "TSUM(" ^ (plist(tc_print, tcs)) ^ ")"
!       | TC_FIX ((_, datatypeFamily, ts), index) =>
! 	     concat["TC_FIX(",
! 	     (case (tc_outX datatypeFamily) of
! 		  TC_FN(params, rectyc) => (* generator function *) 
! 		  let fun ppMus 0 = ""
! 			| ppMus i = (concat["mu", 
! 					    Int.toString i, 
! 					    " ",
! 					    ppMus (i - 1)])
! 		  in 
! 		  (concat["RECTYCGEN(",
! 		   if (length params) > 0 then (concat["[",
! 						ppMus (length params),
! 						"]"])
! 		   else "",
! 		   
! 		  (case (tc_outX rectyc) of
! 			 (rectycI as TC_FN _) => tc_print rectyc
! 		       | TC_SEQ(dconstycs) => 
! 			 tc_print (List.nth(dconstycs, index))
! 		       | tycI => tc_print rectyc),
! 		  ")"])
! 		  end
! 		| _ => "<No rectyc generator>"),
! 	     ")"]
        | TC_ABS t => "Ax(" ^ (tc_print t) ^ ")"
        | TC_BOX t => "Bx(" ^ (tc_print t) ^ ")"

Index: pplty.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/FLINT/kernel/Attic/pplty.sml,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -C2 -d -r1.1.2.6 -r1.1.2.7
*** pplty.sml	3 Aug 2006 18:10:26 -0000	1.1.2.6
--- pplty.sml	8 Aug 2006 18:02:53 -0000	1.1.2.7
***************
*** 27,33 ****
  		     pr = (fn _ => fn elem => 
  				      (openHOVBox 1;
! 				       pps "(";
  				       pp elem;
! 				       pps ")";
  				       closeBox()))}
  		    list)
--- 27,33 ----
  		     pr = (fn _ => fn elem => 
  				      (openHOVBox 1;
! 				       (* pps "("; *)
  				       pp elem;
! 				       (* pps ")"; *)
  				       closeBox()))}
  		    list)
***************
*** 70,74 ****
      in
  	openHOVBox 1;
! 	pps "(";
  	(case tycop of
  	     NONE => pps "*"
--- 70,74 ----
      in
  	openHOVBox 1;
! 	(* pps "("; *)
  	(case tycop of
  	     NONE => pps "*"
***************
*** 77,81 ****
  	PP.break ppstrm {nsp = 1, offset=0}; 
  	ppi ppstrm i;
! 	pps ")";
  	closeBox()
      end (* function ppTycEnvElem *)
--- 77,81 ----
  	PP.break ppstrm {nsp = 1, offset=0}; 
  	ppi ppstrm i;
! 	(* pps ")"; *)
  	closeBox()
      end (* function ppTycEnvElem *)
***************
*** 215,222 ****
  	    (* rflag is a tuple kind template, a singleton datatype RF_TMP *)
  	  | ppTycI (LK.TC_TUPLE (rflag, tycs)) =
! 	    (pps "TC_TUPLE(";
! 	     PP.break ppstrm {nsp=1,offset=1};
! 	     ppList' {sep="* ", pp=ppTyc'} tycs;
! 	     pps ")")
  	    (* fflag records the calling convention: either FF_FIXED or FF_VAR *)
  	  | ppTycI (LK.TC_ARROW (fflag, argTycs, resTycs)) =
--- 215,224 ----
  	    (* rflag is a tuple kind template, a singleton datatype RF_TMP *)
  	  | ppTycI (LK.TC_TUPLE (rflag, tycs)) =
! 	    (case tycs of
! 		 [] => pps "UNIT"
! 	       | _ => (pps "TC_TUPLE(";
! 		       PP.break ppstrm {nsp=1,offset=1};
! 		       ppList' {sep="* ", pp=ppTyc'} tycs;
! 		       pps ")"))
  	    (* fflag records the calling convention: either FF_FIXED or FF_VAR *)
  	  | ppTycI (LK.TC_ARROW (fflag, argTycs, resTycs)) =


-------------------------------------------------------------------------
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