CVS: sml-dist/src/compiler/ElabData/modules moduleutil.sml, 1.2.20.6, 1.2.20.7

George Kuan <[email protected]> Tue, 18 Jul 2006 07:15:38 -0700
Newsgroups gmane.comp.lang.sml.smlnj.commits
Message-ID <[email protected]>
Update of /cvsroot/smlnj/sml-dist/src/compiler/ElabData/modules
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv16564/src/compiler/ElabData/modules

Modified Files:
      Tag: primop-branch-2
	moduleutil.sml 
Log Message:
debug printout for getStrElem/getFctElem (slot selection on empty strPrimInfo) bug

Index: moduleutil.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/ElabData/modules/moduleutil.sml,v
retrieving revision 1.2.20.6
retrieving revision 1.2.20.7
diff -C2 -d -r1.2.20.6 -r1.2.20.7
*** moduleutil.sml	11 Jul 2006 15:35:49 -0000	1.2.20.6
--- moduleutil.sml	18 Jul 2006 14:15:36 -0000	1.2.20.7
***************
*** 78,85 ****
      of STRspec{sign, slot, def, entVar} => 
          (case EE.look(entEnv,entVar)
!  	  of STRent entity => 
                 (STR{sign = sign, rlzn = entity, access = A.selAcc(dacc,slot),
                      prim = POI.selStrPrimId(prims, slot)},
! 		entVar)
  	   | _ => bug "getStr: bad entity")
       | _ => bug "getStr: wrong spec"
--- 78,85 ----
      of STRspec{sign, slot, def, entVar} => 
          (case EE.look(entEnv,entVar)
!  	  of STRent entity => (print "getStr\n";
                 (STR{sign = sign, rlzn = entity, access = A.selAcc(dacc,slot),
                      prim = POI.selStrPrimId(prims, slot)},
! 		entVar))
  	   | _ => bug "getStr: bad entity")
       | _ => bug "getStr: wrong spec"
***************
*** 90,97 ****
      of FCTspec{sign, slot, entVar} => 
          (case EE.look(entEnv,entVar)
!           of FCTent entity => 
                 (FCT{sign = sign, rlzn = entity, access = A.selAcc(dacc,slot),
                      prim = POI.selStrPrimId (dinfo, slot)},
! 		entVar)
             | _ => bug "getFct: bad entity")
       | _ => bug "getFct: wrong spec"
--- 90,97 ----
      of FCTspec{sign, slot, entVar} => 
          (case EE.look(entEnv,entVar)
!           of FCTent entity => (print "getFct\n"; 
                 (FCT{sign = sign, rlzn = entity, access = A.selAcc(dacc,slot),
                      prim = POI.selStrPrimId (dinfo, slot)},
! 		entVar))
             | _ => bug "getFct: bad entity")
       | _ => bug "getFct: wrong spec"
***************
*** 194,200 ****
                    case sInfo
                     of SIGINFO ep => SIGINFO (entVar::ep)
!                     | STRINFO ({entities,...}, dacc, dinfo) =>
                        STRINFO(EE.lookStrEnt(entities,entVar), 
!                               A.selAcc(dacc,slot), POI.selStrPrimId (dinfo, slot))
                in (subsig, newInfo)
               end)
--- 194,202 ----
                    case sInfo
                     of SIGINFO ep => SIGINFO (entVar::ep)
!                     | STRINFO ({entities,...}, dacc, dinfo) => 
! 		      (print ("getStrElem " ^ (Int.toString slot) ^ "\n");
! 		       PrimOpId.ppStrInfo dinfo;
                        STRINFO(EE.lookStrEnt(entities,entVar), 
!                               A.selAcc(dacc,slot), POI.selStrPrimId (dinfo, slot)))
                in (subsig, newInfo)
               end)
***************
*** 206,213 ****
  	       sinfo as STRINFO(rlzn as {entities,...}, dacc, dinfo)) = 
        (case getSpec(elements, sym)
!         of FCTspec{sign=subfsig, entVar, slot} =>
               FCT{sign=subfsig, rlzn=EE.lookFctEnt(entities,entVar),
                   access=A.selAcc(dacc, slot),
! 		 prim=POI.selStrPrimId (dinfo, slot)}
           | _ => bug "mkFctVar - bad spec")
  
--- 208,215 ----
  	       sinfo as STRINFO(rlzn as {entities,...}, dacc, dinfo)) = 
        (case getSpec(elements, sym)
!         of FCTspec{sign=subfsig, entVar, slot} =>( print "getFctElem\n";
               FCT{sign=subfsig, rlzn=EE.lookFctEnt(entities,entVar),
                   access=A.selAcc(dacc, slot),
! 		 prim=POI.selStrPrimId (dinfo, slot)})
           | _ => bug "mkFctVar - bad spec")
  


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV