CVS: sml-dist/src/compiler/ElabData/basics primopid.sig, 1.1.2.3, 1.1.2.4 primopid.sml, 1.1.2.4, 1.1.2.5

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

Modified Files:
      Tag: primop-branch-2
	primopid.sig primopid.sml 
Log Message:
Use strPrimInfo instead of strPrimElem

Index: primopid.sig
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/ElabData/basics/Attic/primopid.sig,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** primopid.sig	7 Jul 2006 20:36:17 -0000	1.1.2.3
--- primopid.sig	11 Jul 2006 15:35:49 -0000	1.1.2.4
***************
*** 20,25 ****
    val isPrimCast : primId -> bool
  
!   val selStrPrimId : strPrimElem * int -> strPrimElem
!   val selValPrimFromStrPrim : strPrimElem * int -> primId
  (*
      val match : inl_info ->
--- 20,25 ----
    val isPrimCast : primId -> bool
  
!   val selStrPrimId : strPrimElem list * int -> strPrimElem list
!   val selValPrimFromStrPrim : strPrimElem list * int -> primId
  (*
      val match : inl_info ->

Index: primopid.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/ElabData/basics/Attic/primopid.sml,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** primopid.sml	7 Jul 2006 20:36:17 -0000	1.1.2.4
--- primopid.sml	11 Jul 2006 15:35:49 -0000	1.1.2.5
***************
*** 31,51 ****
      | isPrimCast _ = false
  
!   fun selStrPrimId(StrE elems, slot) = List.nth(elems, slot)
!     | selStrPrimId(PrimE id, slot) = 
!         bug "PrimOpId.selStrPrimId: unexpected PrimE"
  	(* This bug happens if we got a primid for a value 
  	   component when we expected a strPrimElem for a 
  	   structure *)
  
!   fun selValPrimFromStrPrim(StrE elems, slot) =
        (case List.nth(elems, slot)
  	of PrimE(id) => id
  	 | _ => 
! 	   bug "PrimOpId.selValPrimFromStrPrim: unexpected StrE")
             (* This bug occurs if we got a substructure's
  	      strPrimElem instead of an expected value component's
  	      primId *)
-     | selValPrimFromStrPrim(PrimE _, slot) =
-       bug "PrimOpId.selValPrimFromStrPrim: unexpected PrimE"
  
  (* 
--- 31,53 ----
      | isPrimCast _ = false
  
!   (* Select the prim ids for a substructure *)
!   fun selStrPrimId(elems, slot) = 
!       (case List.nth(elems, slot) 
! 	of StrE elems' => elems'
! 	 | PrimE _ => bug "PrimOpId.selStrPrimId: unexpected PrimE")
  	(* This bug happens if we got a primid for a value 
  	   component when we expected a strPrimElem for a 
  	   structure *)
  
!   (* Select the prim id for a value component *)
!   fun selValPrimFromStrPrim(elems, slot) =
        (case List.nth(elems, slot)
  	of PrimE(id) => id
  	 | _ => 
! 	   bug "PrimOpId.selValPrimFromStrPrim: unexpected StrE"
!       )
             (* This bug occurs if we got a substructure's
  	      strPrimElem instead of an expected value component's
  	      primId *)
  
  (* 



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