CVS: sml-dist/src/compiler/Elaborator/modules sigmatch.sml, 1.6.8.3, 1.6.8.4

David MacQueen <[email protected]> Tue, 20 Jun 2006 15:15:27 -0700
Newsgroups gmane.comp.lang.sml.smlnj.commits
Message-ID <[email protected]>
Update of /cvsroot/smlnj/sml-dist/src/compiler/Elaborator/modules
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv6779/src/compiler/Elaborator/modules

Modified Files:
      Tag: primop-branch-2
	sigmatch.sml 
Log Message:
further primop changes

Index: sigmatch.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/Elaborator/modules/sigmatch.sml,v
retrieving revision 1.6.8.3
retrieving revision 1.6.8.4
diff -C2 -d -r1.6.8.3 -r1.6.8.4
*** sigmatch.sml	20 Jun 2006 04:18:10 -0000	1.6.8.3
--- sigmatch.sml	20 Jun 2006 22:15:23 -0000	1.6.8.4
***************
*** 281,288 ****
  
  fun matchTypes (spec, actual, dinfo, name) : (T.ty list * T.tyvar list) = 
!   if TU.compareTypes(spec, actual) then 
!        let val (insttys, btvs) = eqvTnspTy(spec, actual, dinfo)
!         in (insttys, btvs)
!        end
    else (err EM.COMPLAIN 
              "value type in structure doesn't match signature spec"
--- 281,285 ----
  
  fun matchTypes (spec, actual, dinfo, name) : (T.ty list * T.tyvar list) = 
!   if TU.compareTypes(spec, actual) then eqvTnspTy(spec, actual, dinfo)
    else (err EM.COMPLAIN 
              "value type in structure doesn't match signature spec"
***************
*** 843,847 ****
                         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)
--- 840,844 ----
                         val acttyp = typeInOriginal("$actty(val/val)", acttyp)
                         val dacc = DA.selAcc(rootAcc, actslot)
!                        val dinfo = II.selStrInfo(rootInfo, actslot)
                         val (instys,btvs) = 
                           matchTypes(spectyp, acttyp, dinfo, sym)