CVS: sml-dist/src/compiler/Semant/pickle pickmod-new.sml, 1.27.4.2, 1.27.4.3 unpickmod-new.sml, 1.24.4.2, 1.24.4.3

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

Modified Files:
      Tag: primop-branch-2
	pickmod-new.sml unpickmod-new.sml 
Log Message:
sigmatch is still functorized because of PLambda Types, the compiler builds now but does not bootstrap

Index: pickmod-new.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/Semant/pickle/pickmod-new.sml,v
retrieving revision 1.27.4.2
retrieving revision 1.27.4.3
diff -C2 -d -r1.27.4.2 -r1.27.4.3
*** pickmod-new.sml	10 Jul 2006 22:27:13 -0000	1.27.4.2
--- pickmod-new.sml	12 Jul 2006 15:43:13 -0000	1.27.4.3
***************
*** 92,96 ****
      structure IP = InvPath
      structure MI = ModuleId
!     structure II = InlInfo
      structure V = VarCon
      structure ED = EntPath.EvDict
--- 92,96 ----
      structure IP = InvPath
      structure MI = ModuleId
!     structure POI = PrimOpId
      structure V = VarCon
      structure ED = EntPath.EvDict

Index: unpickmod-new.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/Semant/pickle/unpickmod-new.sml,v
retrieving revision 1.24.4.2
retrieving revision 1.24.4.3
diff -C2 -d -r1.24.4.2 -r1.24.4.3
*** unpickmod-new.sml	10 Jul 2006 22:27:13 -0000	1.24.4.2
--- unpickmod-new.sml	12 Jul 2006 15:43:13 -0000	1.24.4.3
***************
*** 56,60 ****
      structure IP = InvPath
      structure MI = ModuleId
-     structure II = InlInfo
      structure V = VarCon
      structure ED = EntPath.EvDict
--- 56,59 ----
***************
*** 63,66 ****
--- 62,66 ----
      structure M = Modules
      structure B = Bindings
+     structure POI = PrimOpId
  
      structure UU = UnpickleUtil
***************
*** 683,687 ****
  	    (l, branch trl)
  	end
! (* GK: replaced by primId and strPrimElem
  	and inl_info () = let
  	    fun ii #"A" = II.INL_PRIM (primop (), ty ())
--- 683,688 ----
  	    (l, branch trl)
  	end
! 
! (* GK: replaced by primId and strPrimInfo type distinction
  	and inl_info () = let
  	    fun ii #"A" = II.INL_PRIM (primop (), ty ())
***************
*** 698,702 ****
              let
                  fun p #"A" = POI.Prim (string ())
!                   | p #"B" = POI.NonPrim ()
              in 
                  share primIdM p
--- 699,704 ----
              let
                  fun p #"A" = POI.Prim (string ())
!                   | p #"B" = POI.NonPrim
! 		  | p _ = raise Format
              in 
                  share primIdM p
***************
*** 706,710 ****
              let
                  fun sp #"a" = POI.PrimE (primId ())
!                   | sp #"b" = POI.StrE ( spelist ())
              in
                  share strPrimElemM sp
--- 708,713 ----
              let
                  fun sp #"a" = POI.PrimE (primId ())
!                   | sp #"b" = POI.StrE (spelist ())
! 		  | sp _ = raise Format
              in
                  share strPrimElemM sp
***************
*** 716,720 ****
  	    fun v #"1" =
  		let val a = access ()
! 		    val i = inl_info ()
  		    val p = spath ()
  		    val (t, tr) = ty' ()
--- 719,723 ----
  	    fun v #"1" =
  		let val a = access ()
! 		    val i = primId ()
  		    val p = spath ()
  		    val (t, tr) = ty' ()



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