CVS: sml-dist/src/compiler/DebugProf/profile tdp-instrument.sml, 1.4.6.2, 1.4.6.3

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

Modified Files:
      Tag: primop-branch-2
	tdp-instrument.sml 
Log Message:
some more updating of tdp-instrument

Index: tdp-instrument.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/DebugProf/profile/tdp-instrument.sml,v
retrieving revision 1.4.6.2
retrieving revision 1.4.6.3
diff -C2 -d -r1.4.6.2 -r1.4.6.3
*** tdp-instrument.sml	10 Jul 2006 14:22:34 -0000	1.4.6.2
--- tdp-instrument.sml	10 Jul 2006 14:30:48 -0000	1.4.6.3
***************
*** 121,125 ****
  	val tdp_module_var = tmpvar ("<tdp_module>", BT.intTy)
  
! 	fun VARexp v = A.VARexp (ref v, NONE)
  	fun INTexp i = A.INTexp (IntInf.fromInt i, BT.intTy)
  
--- 121,125 ----
  	val tdp_module_var = tmpvar ("<tdp_module>", BT.intTy)
  
! 	fun VARexp v = A.VARexp (ref v, [])
  	fun INTexp i = A.INTexp (IntInf.fromInt i, BT.intTy)
  
***************
*** 257,266 ****
  			     val t = Reconstruct.expType lst
  			 in
! 			     A.RAISEexp (A.CONexp (matchcon, NONE), t)
  			 end
  	    in
  		A.FNexp ([A.RULE (A.VARpat arg,
  				  A.SEQexp [enterexp,
! 					    A.CASEexp (A.VARexp (ref arg, NONE),
  						       rl', true)]),
  			  A.RULE (A.WILDpat, re)],
--- 257,266 ----
  			     val t = Reconstruct.expType lst
  			 in
! 			     A.RAISEexp (A.CONexp (matchcon, []), t)
  			 end
  	    in
  		A.FNexp ([A.RULE (A.VARpat arg,
  				  A.SEQexp [enterexp,
! 					    A.CASEexp (A.VARexp (ref arg, []),
  						       rl', true)]),
  			  A.RULE (A.WILDpat, re)],
***************
*** 312,319 ****
  	    in
  		case gv pat of
! 		    SOME (VC.VALvar { path = SP.SPATH [x], info, ... }) =>
  		      if II.isSimple info then vb
  		      else recur (cons (x, n))
! 		  | SOME (VC.VALvar { info, ... }) =>
  		      if II.isSimple info then vb else recur n
  		  | _ => recur n
--- 312,319 ----
  	    in
  		case gv pat of
! 		    SOME (VC.VALvar { path = SP.SPATH [x], prim, ... }) =>
  		      if II.isSimple info then vb
  		      else recur (cons (x, n))
! 		  | SOME (VC.VALvar { prim, ... }) =>
  		      if II.isSimple info then vb else recur n
  		  | _ => recur n



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