CVS: sml-dist/src/compiler/Semant/statenv prim.sml, 1.18.4.6, 1.18.4.7 primoptypemap.sml, 1.1.2.1, 1.1.2.2

Update of /cvsroot/smlnj/sml-dist/src/compiler/Semant/statenv
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv23408/src/compiler/Semant/statenv

Modified Files:
      Tag: primop-branch-2
	prim.sml primoptypemap.sml 
Log Message:
primOpTypeMap addition now compiles...makeml still does not work

Index: prim.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/Semant/statenv/prim.sml,v
retrieving revision 1.18.4.6
retrieving revision 1.18.4.7
diff -C2 -d -r1.18.4.6 -r1.18.4.7
*** prim.sml	13 Jul 2006 20:12:25 -0000	1.18.4.6
--- prim.sml	13 Jul 2006 21:10:44 -0000	1.18.4.7
***************
*** 514,518 ****
        fun mkVarElement(name,(symbols,elements,primElems,offset)) =
          let val s = S.varSymbol name
!             val ty = PrimOpTypeMap.primopTypeMap name (* the intrinsic type *)
              val sp = M.VALspec{spec=ty, slot=offset}
                      (* using universal generic type bottom for all components *)
--- 514,522 ----
        fun mkVarElement(name,(symbols,elements,primElems,offset)) =
          let val s = S.varSymbol name
!             val ty = 
! 		(case PrimOpTypeMap.primopTypeMap name (* the intrinsic type *)
! 		  of SOME ty => ty
! 		   | NONE => ErrorMsg.impossible("PrimEnv: inLine reference to \
! 						 \ undefined prim " ^ name))
              val sp = M.VALspec{spec=ty, slot=offset}
                      (* using universal generic type bottom for all components *)

Index: primoptypemap.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/Semant/statenv/Attic/primoptypemap.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
*** primoptypemap.sml	13 Jul 2006 20:20:48 -0000	1.1.2.1
--- primoptypemap.sml	13 Jul 2006 21:10:44 -0000	1.1.2.2
***************
*** 39,43 ****
   **************************************************************************)
  
! 
  fun bits size oper = P.ARITH{oper=oper, overflow=false, kind=P.INT size}
  val bits31 = bits 31		
--- 39,43 ----
   **************************************************************************)
  
! (* 
  fun bits size oper = P.ARITH{oper=oper, overflow=false, kind=P.INT size}
  val bits31 = bits 31		
***************
*** 65,69 ****
  
  val float64cmp = cmp (P.FLOAT 64)
! 
  val v1 = T.IBOUND 0
  val v2 = T.IBOUND 1
--- 65,69 ----
  
  val float64cmp = cmp (P.FLOAT 64)
!  *)
  val v1 = T.IBOUND 0
  val v2 = T.IBOUND 1
***************
*** 98,102 ****
  fun p2 t = T.POLYty {sign=[false,false], tyfun=T.TYFUN {arity=2, body=t}}
  fun p3 t = T.POLYty {sign=[false,false,false], tyfun=T.TYFUN {arity=3, body=t}}
! 
  fun sub kind = P.NUMSUBSCRIPT{kind=kind, checked=false, immutable=false}
  fun chkSub kind = P.NUMSUBSCRIPT{kind=kind, checked=true, immutable=false}
--- 98,102 ----
  fun p2 t = T.POLYty {sign=[false,false], tyfun=T.TYFUN {arity=2, body=t}}
  fun p3 t = T.POLYty {sign=[false,false,false], tyfun=T.TYFUN {arity=3, body=t}}
! (*
  fun sub kind = P.NUMSUBSCRIPT{kind=kind, checked=false, immutable=false}
  fun chkSub kind = P.NUMSUBSCRIPT{kind=kind, checked=true, immutable=false}
***************
*** 107,111 ****
  fun update kind = P.NUMUPDATE {kind=kind, checked=false}
  fun chkUpdate kind = P.NUMUPDATE {kind=kind, checked=true}
! 
  val numSubTy = p2(ar(tu[v1,i],v2))
  val numUpdTy = p2(ar(tu[v1,i,v2],u))
--- 107,111 ----
  fun update kind = P.NUMUPDATE {kind=kind, checked=false}
  fun chkUpdate kind = P.NUMUPDATE {kind=kind, checked=true}
! *)
  val numSubTy = p2(ar(tu[v1,i],v2))
  val numUpdTy = p2(ar(tu[v1,i,v2],u))



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