CVS: sml-dist/src/compiler/Semant/modules sigmatchfn.sml, 1.1.2.1, 1.1.2.2

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

Modified Files:
      Tag: primop-branch-2
	sigmatchfn.sml 
Log Message:
fixup matchTypes in sigmatch, VALvar in many files

Index: sigmatchfn.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/Semant/modules/Attic/sigmatchfn.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
*** sigmatchfn.sml	20 Jun 2006 13:56:17 -0000	1.1.2.1
--- sigmatchfn.sml	7 Jul 2006 21:06:10 -0000	1.1.2.2
***************
*** 775,785 ****
                         val acttyp = typeInOriginal("$actty(val/val)", acttyp)
                         val dacc = DA.selAcc(rootAcc, actslot)
!                        val dinfo = II.sel(rootInfo, actslot)
!                        val (instys,btvs) = 
!                          matchTypes(spectyp, acttyp, dinfo, sym)
  
                         val spath = SP.SPATH[sym]
                         val actvar = VALvar{path=spath, typ=ref acttyp,
!                                            access=dacc, info=dinfo}
  
                         val (decs', nv) = 
--- 775,784 ----
                         val acttyp = typeInOriginal("$actty(val/val)", acttyp)
                         val dacc = DA.selAcc(rootAcc, actslot)
!                        val prim = PrimOpId.selStrPrimId(rootInfo, actslot)
!                        val (instys,btvs) = matchTypes(spectyp, acttyp, sym)
  
                         val spath = SP.SPATH[sym]
                         val actvar = VALvar{path=spath, typ=ref acttyp,
!                                            access=dacc, prim=prim}
  
                         val (decs', nv) = 
***************
*** 790,794 ****
                                    val specvar = 
                                      VALvar{path=spath, typ=ref spectyp,
!                                            access=acc, info=dinfo}
  				  (** This seems a bit sensitive. Here, a VB 
  				      is constructed with a VARexp field that
--- 789,793 ----
                                    val specvar = 
                                      VALvar{path=spath, typ=ref spectyp,
!                                            access=acc, info=prim}
  				  (** This seems a bit sensitive. Here, a VB 
  				      is constructed with a VARexp field that
***************
*** 828,832 ****
                               val specvar = 
                                 VALvar{path=SP.SPATH[name], access=acc,
!                                       info=II.Null,
  				      typ=ref spectyp}
                               val vb = 
--- 827,831 ----
                               val specvar = 
                                 VALvar{path=SP.SPATH[name], access=acc,
!                                       prim=PrimOpId.NonPrim,
  				      typ=ref spectyp}
                               val vb = 
***************
*** 903,909 ****
  				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
  
--- 902,908 ----
  				stub = NONE}
  		  val dacc = DA.newAcc(mkv)
! 		  val dinfo = (map MU.extractInfo bindings)
  	      in M.STR {sign=specSig, rlzn=strEnt, access=dacc,
! 			prim=dinfo}
  	      end
  
***************
*** 1215,1219 ****
                     val srctyp = typeInSrc("$spec-srcty(packStr-val)", spectyp)
                     val dacc = DA.selAcc(rootAcc, s)
!                    val dinfo = II.sel(rootInfo, s)
                     val (instys, btvs, resinst, eqflag) = 
                       absEqvTy(restyp, srctyp, dinfo)
--- 1214,1218 ----
                     val srctyp = typeInSrc("$spec-srcty(packStr-val)", spectyp)
                     val dacc = DA.selAcc(rootAcc, s)
!                    val prim = PrimOpId.selStrPrimId(rootInfo, s)
                     val (instys, btvs, resinst, eqflag) = 
                       absEqvTy(restyp, srctyp, dinfo)
***************
*** 1221,1225 ****
                     val spath = SP.SPATH[sym]
                     val srcvar = VALvar{path=spath, typ=ref srctyp,
!                                        access=dacc, info=dinfo}
  
                     val (decs', nv) =
--- 1220,1224 ----
                     val spath = SP.SPATH[sym]
                     val srcvar = VALvar{path=spath, typ=ref srctyp,
!                                        access=dacc, prim=prim}
  
                     val (decs', nv) =
***************
*** 1228,1232 ****
                                 val resvar = 
                                   VALvar{path=spath, typ=ref restyp,
!                                         access=acc, info=II.Null}
  
                                 val ntycs = TU.filterSet(resinst, abstycs)
--- 1227,1231 ----
                                 val resvar = 
                                   VALvar{path=spath, typ=ref restyp,
!                                         access=acc, prim=PrimOpId.NonPrim}
  
                                 val ntycs = TU.filterSet(resinst, abstycs)
***************
*** 1275,1280 ****
  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
  
--- 1274,1279 ----
  val resStr =
    let val dacc = DA.newAcc(mkv)
!       val prim = map MU.extractInfo bindings
!    in M.STR{sign=specSig, rlzn=resRlzn, access=dacc, prim=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