CVS: sml-dist/src/compiler/Semant/pickle pickmod-new.sml, 1.27, 1.27.4.1 unpickmod-new.sml, 1.24, 1.24.4.1

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

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

Index: pickmod-new.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/Semant/pickle/pickmod-new.sml,v
retrieving revision 1.27
retrieving revision 1.27.4.1
diff -C2 -d -r1.27 -r1.27.4.1
*** pickmod-new.sml	11 Nov 2004 00:12:40 -0000	1.27
--- pickmod-new.sml	7 Jul 2006 21:06:10 -0000	1.27.4.1
***************
*** 955,960 ****
  
  	val op $ = PU.$ VAR
! 	fun var (V.VALvar { access = a, info, path, typ = ref t }) =
! 	    "1" $ [access a, inl_info info, spath path, ty t]
  	  | var (V.OVLDvar { name, options = ref p,
  			     scheme = T.TYFUN { arity, body } }) =
--- 955,960 ----
  
  	val op $ = PU.$ VAR
! 	fun var (V.VALvar { access = a, prim, path, typ = ref t }) =
! 	    "1" $ [access a, inl_info prim, spath path, ty t]
  	  | var (V.OVLDvar { name, options = ref p,
  			     scheme = T.TYFUN { arity, body } }) =
***************
*** 1248,1252 ****
  	fun mapbinding (sym, (i, env, lvars)) =
  	    case StaticEnv.look (senv, sym) of
! 		B.VALbind (V.VALvar {access=a, info=z, path=p, typ= ref t }) =>
  		(case a of
  		     A.LVAR k =>
--- 1248,1252 ----
  	fun mapbinding (sym, (i, env, lvars)) =
  	    case StaticEnv.look (senv, sym) of
! 		B.VALbind (V.VALvar {access=a, prim=z, path=p, typ= ref t }) =>
  		(case a of
  		     A.LVAR k =>
***************
*** 1255,1259 ****
  				      B.VALbind (V.VALvar
  						     { access = newAccess i,
! 						       info = z, path = p,
  						       typ = ref t}),
  				      env),
--- 1255,1259 ----
  				      B.VALbind (V.VALvar
  						     { access = newAccess i,
! 						       prim = z, path = p,
  						       typ = ref t}),
  				      env),

Index: unpickmod-new.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/Semant/pickle/unpickmod-new.sml,v
retrieving revision 1.24
retrieving revision 1.24.4.1
diff -C2 -d -r1.24 -r1.24.4.1
*** unpickmod-new.sml	11 Nov 2004 00:12:40 -0000	1.24
--- unpickmod-new.sml	7 Jul 2006 21:06:11 -0000	1.24.4.1
***************
*** 699,703 ****
  		    val (t, tr) = ty' ()
  		in
! 		    (V.VALvar { access = a, info = i, path = p, typ = ref t },
  		     tr)
  		end
--- 699,703 ----
  		    val (t, tr) = ty' ()
  		in
! 		    (V.VALvar { access = a, prim = i, path = p, typ = ref t },
  		     tr)
  		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