CVS: sml-dist/src/compiler/ElabData/basics primopid.sig, 1.1.2.1, 1.1.2.2 primopid.sml, 1.1.2.1, 1.1.2.2

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

Modified Files:
      Tag: primop-branch-2
	primopid.sig primopid.sml 
Log Message:
revised primopid.sml/sig

Index: primopid.sig
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/ElabData/basics/Attic/primopid.sig,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** primopid.sig	6 Jul 2006 16:35:38 -0000	1.1.2.1
--- primopid.sig	6 Jul 2006 20:10:32 -0000	1.1.2.2
***************
*** 7,13 ****
  sig
  
!     type primId
!     type strElemPrimIds
  
  (*
      val match : inl_info ->
--- 7,24 ----
  sig
  
!   datatype primId = Prim of string | NonPrim
! 
!   datatype strPrimElem
!     = PrimE of primId
!     | StrE of strPrimInfo
  
+   withtype strPrimInfo = strPrimElem list
+ 
+   val isPrimop : primId -> bool
+ 
+   val isPrimCallcc : primId -> bool
+   val isPrimCast : primId -> bool
+ 
+   val selStrPrimId : strPrimInfo * int -> strPrimElem
  (*
      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.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** primopid.sml	6 Jul 2006 16:35:38 -0000	1.1.2.1
--- primopid.sml	6 Jul 2006 20:10:33 -0000	1.1.2.2
***************
*** 12,25 ****
  struct
  
!     fun bug s = ErrorMsg.impossible ("PrimOpId: " ^ s)
  
!     datatype primId = Prim of int | NonPrim
!     datatype strElemPrimIds = PrimE of primId
!                             | StrE of strInfo
!     withtype strInfo = strElemPrimIds list
  
  
-     fun isPrimop (Prim _) = true
-       | isPrimop NonPrim  = false
  (* 
      fun selStrInfo (StrE l, i) =
--- 12,36 ----
  struct
  
!   (* in the front end, primops are identified by a primop number *)
!   datatype primId = Prim of string | NonPrim
  
!   datatype strPrimElem = PrimE of primId
!                        | StrE of strPrimInfo
  
+   withtype strPrimInfo = strPrimElem list
+ 
+   fun bug s = ErrorMsg.impossible ("PrimOpId: " ^ s)
+ 
+   fun isPrimop (Prim _) = true
+     | isPrimop NonPrim  = false
+ 
+   fun isPrimCallcc (Prim("callcc" | "capture")) = true
+     | isPrimCallcc _ = false
+ 
+   fun isPrimCast (Prim "cast") = true
+     | isPrimCast _ = false
+ 
+   val selStrPrimId = nth
  
  (* 
      fun selStrInfo (StrE l, i) =


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