CVS: sml-dist/src/compiler/DebugProf/profile tprof.sml, 1.5.4.1, 1.5.4.2

Update of /cvsroot/smlnj/sml-dist/src/compiler/DebugProf/profile
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv1837/compiler/DebugProf/profile

Modified Files:
      Tag: primop-branch-2
	tprof.sml 
Log Message:
fixup matchTypes in sigmatch, VALvar in many files

Index: tprof.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/DebugProf/profile/tprof.sml,v
retrieving revision 1.5.4.1
retrieving revision 1.5.4.2
diff -C2 -d -r1.5.4.1 -r1.5.4.2
*** tprof.sml	20 Jun 2006 17:09:18 -0000	1.5.4.1
--- tprof.sml	7 Jul 2006 21:06:08 -0000	1.5.4.2
***************
*** 91,95 ****
  fun tmpvar(str,ty,mkv) = 
      let val sym = S.varSymbol str
!      in VALvar{access=A.namedAcc(sym, mkv), info=II.Null,
                 path=SP.SPATH[sym], typ=ref ty}
      end
--- 91,95 ----
  fun tmpvar(str,ty,mkv) = 
      let val sym = S.varSymbol str
!      in VALvar{access=A.namedAcc(sym, mkv), prim=PrimOpId.NonPrim,
                 path=SP.SPATH[sym], typ=ref ty}
      end
***************
*** 181,194 ****
  	       fun instrvb(vb as VB{pat,exp,tyvars,boundtvs}) =
  	            (case getvar pat
! 		      of SOME(VALvar{info, path=SP.SPATH[n],...}) =>
!                            if II.isSimple info then vb
!                            else VB{pat=pat, tyvars=tyvars,
! 			           exp=instrexp (n::clean names, 
!                                                  ccvara) false exp,
!   			           boundtvs=boundtvs}
!                        | SOME(VALvar{info, ...}) =>
!                            if II.isSimple info then vb
!                            else VB{pat=pat, exp=instrexp sp false exp, 
!                                    tyvars=tyvars, boundtvs=boundtvs}
  		       | _ => VB{pat=pat, exp=instrexp sp false exp, 
                                   tyvars=tyvars, boundtvs=boundtvs})
--- 181,196 ----
  	       fun instrvb(vb as VB{pat,exp,tyvars,boundtvs}) =
  	            (case getvar pat
! 		      of SOME(VALvar{prim, path=SP.SPATH[n],...}) =>
!                           (case prim
!                              of PrimOpId.NonPrim => vb
!                               | _ => VB{pat=pat, tyvars=tyvars,
! 			                exp=instrexp (n::clean names, 
!                                                       ccvara) false exp,
!   			                boundtvs=boundtvs})
!                        | SOME(VALvar{prim, ...}) =>
!                           (case prim
!                              of PrimOpId.NonPrim => vb
!                               | _ =>  VB{pat=pat, exp=instrexp sp false exp, 
!                                          tyvars=tyvars, boundtvs=boundtvs})
  		       | _ => VB{pat=pat, exp=instrexp sp false exp, 
                                   tyvars=tyvars, boundtvs=boundtvs})
***************
*** 289,297 ****
  
                     | exp as APPexp (f,a) =>
!                        let fun safe(VARexp(ref(VALvar{info, ...}), _)) =
!                                if II.isSimple info then
!                                    (if mayReturnMoreThanOnce info then false
! 				    else true)
!                                else false
                               | safe(MARKexp(e,_)) = safe e
                               | safe(CONSTRAINTexp(e,_)) = safe e
--- 291,300 ----
  
                     | exp as APPexp (f,a) =>
!                        let fun safe(VARexp(ref(VALvar{prim, ...}), _)) =
!                                (case prim
!                                  of PrimOpId.NonPrim => false
!                                   | _ => 
!                                      if mayReturnMoreThanOnce prim then false
! 				     else true)
                               | safe(MARKexp(e,_)) = safe e
                               | safe(CONSTRAINTexp(e,_)) = safe e


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