CVS: sml-dist/src/compiler/Elaborator/modules sigmatch.sml, 1.6.8.8, 1.6.8.9

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

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

Index: sigmatch.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/Elaborator/modules/sigmatch.sml,v
retrieving revision 1.6.8.8
retrieving revision 1.6.8.9
diff -C2 -d -r1.6.8.8 -r1.6.8.9
*** sigmatch.sml	10 Jul 2006 22:27:13 -0000	1.6.8.8
--- sigmatch.sml	12 Jul 2006 15:43:13 -0000	1.6.8.9
***************
*** 274,278 ****
  				      elements=strElements,...},
  			   rlzn as {stamp=strStamp,entities=strEntEnv,...},
! 			   access = rootAcc, info = rootInfo },
                strName : S.symbol,
                depth, matchEntEnv, 
--- 274,278 ----
  				      elements=strElements,...},
  			   rlzn as {stamp=strStamp,entities=strEntEnv,...},
! 			   access = rootAcc, prim = rootInfo },
                strName : S.symbol,
                depth, matchEntEnv, 
***************
*** 864,868 ****
                           val acttyp = typeInOriginal("$actty(val/val)", acttyp)
                           val dacc = DA.selAcc(rootAcc, actslot)
!                          val prim = PrimOpId.selStrPrimId(rootInfo, actslot)
                           val (btvs,ptvs) = matchTypes(spectyp, acttyp, sym)
  
--- 864,868 ----
                           val acttyp = typeInOriginal("$actty(val/val)", acttyp)
                           val dacc = DA.selAcc(rootAcc, actslot)
!                          val prim = PrimOpId.selValPrimFromStrPrim(rootInfo, actslot)
                           val (btvs,ptvs) = matchTypes(spectyp, acttyp, sym)
  
***************
*** 985,991 ****
                                    stub = NONE}
                      val dacc = DA.newAcc(mkv)
!                     val dinfo = II.List (map MU.extractInfo bindings)
                  in M.STR {sign=specSig, rlzn=strEnt, access=dacc,
!                           info=dinfo}
                  end
  
--- 985,991 ----
                                    stub = NONE}
                      val dacc = DA.newAcc(mkv)
!                     val dinfo = MU.strPrimElemInBinds bindings
                  in M.STR {sign=specSig, rlzn=strEnt, access=dacc,
!                           prim=dinfo}
                  end
  
***************
*** 1095,1099 ****
    let val fsigParDacc = DA.newAcc(mkv)
     in M.STR{sign=fsigParamSig, rlzn=fsigParEnt, 
!             access=fsigParDacc, info=II.Null}
    end
  
--- 1095,1099 ----
    let val fsigParDacc = DA.newAcc(mkv)
     in M.STR{sign=fsigParamSig, rlzn=fsigParEnt, 
!             access=fsigParDacc, prim=[]}
    end
  
***************
*** 1140,1144 ****
  
     in M.FCT{sign = specSig, rlzn = resRlzn,
!             access = DA.newAcc(mkv), info = II.Null}
    end
  
--- 1140,1144 ----
  
     in M.FCT{sign = specSig, rlzn = resRlzn,
!             access = DA.newAcc(mkv), prim = []}
    end
  
***************
*** 1214,1218 ****
  	     str as M.STR {access=rootAcc,
  			   rlzn=srcRlzn as {entities=srcEntEnv,...},
! 			   info=rootInfo, ... },
               abstycs, strName, depth, entEnv, rpath, statenv, region, 
               compInfo as {mkLvar=mkv, error, ...}: EU.compInfo) 
--- 1214,1218 ----
  	     str as M.STR {access=rootAcc,
  			   rlzn=srcRlzn as {entities=srcEntEnv,...},
! 			   prim=rootInfo, ... },
               abstycs, strName, depth, entEnv, rpath, statenv, region, 
               compInfo as {mkLvar=mkv, error, ...}: EU.compInfo) 
***************
*** 1241,1245 ****
  		     let val srcStr = M.STR{sign=thisSpecsig, rlzn=srcStrRlzn,
  					    access=DA.selAcc(rootAcc,s),
! 					    info=II.sel(rootInfo,s)}
  
  			 val rpath' = IP.extend(rpath, sym)
--- 1241,1245 ----
  		     let val srcStr = M.STR{sign=thisSpecsig, rlzn=srcStrRlzn,
  					    access=DA.selAcc(rootAcc,s),
! 					    prim=PrimOpId.selStrPrimId(rootInfo,s)}
  
  			 val rpath' = IP.extend(rpath, sym)
***************
*** 1270,1274 ****
  			     M.FCT {sign=thisSpecsig, rlzn=srcFctRlzn,
  				    access=DA.selAcc(rootAcc,s),
! 				    info=II.sel(rootInfo,s)}
  
  			 val rpath' = IP.extend(rpath, sym)
--- 1270,1274 ----
  			     M.FCT {sign=thisSpecsig, rlzn=srcFctRlzn,
  				    access=DA.selAcc(rootAcc,s),
! 				    prim=PrimOpId.selStrPrimId(rootInfo,s)}
  
  			 val rpath' = IP.extend(rpath, sym)
***************
*** 1297,1301 ****
                     val srctyp = typeInSrc("$spec-srcty(packStr-val)", spectyp)
                     val dacc = DA.selAcc(rootAcc, s)
!                    val dinfo = PrimOpId.selStrPrimId(rootInfo, s)
  (* dbm: assume that eqflag will always be true because of prior successful
   * sigmatch, therefore this does nothing ---
--- 1297,1301 ----
                     val srctyp = typeInSrc("$spec-srcty(packStr-val)", spectyp)
                     val dacc = DA.selAcc(rootAcc, s)
!                    val dinfo = PrimOpId.selValPrimFromStrPrim(rootInfo, s)
  (* dbm: assume that eqflag will always be true because of prior successful
   * sigmatch, therefore this does nothing ---
***************
*** 1363,1368 ****
  val resStr =
    let val dacc = DA.newAcc(mkv)
!       val dinfo = II.List (map MU.extractInfo bindings)
!    in M.STR{sign=specSig, rlzn=resRlzn, access=dacc, info=dinfo}
    end
  
--- 1363,1368 ----
  val resStr =
    let val dacc = DA.newAcc(mkv)
!       val dprim = MU.strPrimElemInBinds bindings
!    in M.STR{sign=specSig, rlzn=resRlzn, access=dacc, prim=dprim}
    end
  
***************
*** 1449,1453 ****
    let val paramDacc = DA.newAcc(mkv)
     in M.STR{sign=paramsig, rlzn=paramEnt, access=paramDacc,
! 	    info=II.Null}
    end
  
--- 1449,1453 ----
    let val paramDacc = DA.newAcc(mkv)
     in M.STR{sign=paramsig, rlzn=paramEnt, access=paramDacc,
! 	    prim=[]}
    end
  
***************
*** 1480,1484 ****
  val resFct = 
    let val resDacc = DA.newAcc(mkv)
!    in M.FCT{sign=specSig, rlzn=resFctRlzn, access=resDacc, info=II.Null}
    end
  
--- 1480,1484 ----
  val resFct = 
    let val resDacc = DA.newAcc(mkv)
!    in M.FCT{sign=specSig, rlzn=resFctRlzn, access=resDacc, prim=[]}
    end
  
***************
*** 1541,1545 ****
          let val bodyDacc = DA.namedAcc(anonSym,mkv)
           in M.STR {sign=bodysig, rlzn=bodyRlzn,
! 		   access=bodyDacc, info=II.Null}
          end
  
--- 1541,1545 ----
          let val bodyDacc = DA.namedAcc(anonSym,mkv)
           in M.STR {sign=bodysig, rlzn=bodyRlzn,
! 		   access=bodyDacc, prim=[]}
          end
  



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