CVS: sml-dist/src/compiler/Elaborator/elaborate elabmod.sml, 1.2.20.1, 1.2.20.2 elabsig.sml, 1.2.20.1, 1.2.20.2 elabutil.sml, 1.9.4.3, 1.9.4.4

Update of /cvsroot/smlnj/sml-dist/src/compiler/Elaborator/elaborate
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv26115/src/compiler/Elaborator/elaborate

Modified Files:
      Tag: primop-branch-2
	elabmod.sml elabsig.sml elabutil.sml 
Log Message:
Use strPrimInfo instead of strPrimElem

Index: elabmod.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/Elaborator/elaborate/elabmod.sml,v
retrieving revision 1.2.20.1
retrieving revision 1.2.20.2
diff -C2 -d -r1.2.20.1 -r1.2.20.2
*** elabmod.sml	10 Jul 2006 14:06:37 -0000	1.2.20.1
--- elabmod.sml	11 Jul 2006 15:35:49 -0000	1.2.20.2
***************
*** 925,929 ****
              let val paramDacc = DA.namedAcc(paramName, mkv)
               in M.STR{sign=paramSig, rlzn=paramRlzn, 
!                       access=paramDacc, prim=PrimOpId.StrE []}
              end
  
--- 925,929 ----
              let val paramDacc = DA.namedAcc(paramName, mkv)
               in M.STR{sign=paramSig, rlzn=paramRlzn, 
!                       access=paramDacc, prim=[]}
              end
  
***************
*** 1010,1014 ****
                  val dacc = DA.namedAcc(name, mkv)
  
!              in M.FCT{sign=fctSig, rlzn=rlzn, access=dacc, prim=PrimOpId.StrE []}
              end
  
--- 1010,1014 ----
                  val dacc = DA.namedAcc(name, mkv)
  
!              in M.FCT{sign=fctSig, rlzn=rlzn, access=dacc, prim=[]}
              end
  

Index: elabsig.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/Elaborator/elaborate/elabsig.sml,v
retrieving revision 1.2.20.1
retrieving revision 1.2.20.2
diff -C2 -d -r1.2.20.1 -r1.2.20.2
*** elabsig.sml	10 Jul 2006 14:06:37 -0000	1.2.20.1
--- elabsig.sml	11 Jul 2006 15:35:49 -0000	1.2.20.2
***************
*** 316,320 ****
  				   CONSTstrDef(STR{sign=sign,rlzn=rlzn,
  						   access=Access.nullAcc,
! 						   prim=PrimOpId.StrE []})
  				 | _ => strDef
  		       in loop1(rest,STRdef(lhspath,strDef)::defs)
--- 316,320 ----
  				   CONSTstrDef(STR{sign=sign,rlzn=rlzn,
  						   access=Access.nullAcc,
! 						   prim=[]})
  				 | _ => strDef
  		       in loop1(rest,STRdef(lhspath,strDef)::defs)

Index: elabutil.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/Elaborator/elaborate/elabutil.sml,v
retrieving revision 1.9.4.3
retrieving revision 1.9.4.4
diff -C2 -d -r1.9.4.3 -r1.9.4.4
*** elabutil.sml	7 Jul 2006 21:49:48 -0000	1.9.4.3
--- elabutil.sml	11 Jul 2006 15:35:49 -0000	1.9.4.4
***************
*** 420,424 ****
  fun makeAPPpat err (CONpat(d as DATACON{const=false,lazyp,...},t),p) =
        let 
! 	  val p1 = APPpat(d,t,p) 
         in if lazyp (* LAZY *)
  	  then APPpat(BT.dollarDcon, [], p1)
--- 420,424 ----
  fun makeAPPpat err (CONpat(d as DATACON{const=false,lazyp,...},t),p) =
        let 
! 	  val p1 = APPpat(d,map VARty t,p) 
         in if lazyp (* LAZY *)
  	  then APPpat(BT.dollarDcon, [], p1)



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