CVS: sml-dist/src/cm/main cm-boot.sml,1.87,1.88

Update of /cvsroot/smlnj/sml-dist/src/cm/main
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv6955/src/cm/main

Modified Files:
	cm-boot.sml 
Log Message:
fixed ml-makedepend bug

Index: cm-boot.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/cm/main/cm-boot.sml,v
retrieving revision 1.87
retrieving revision 1.88
diff -C2 -d -r1.87 -r1.88
*** cm-boot.sml	14 Feb 2006 23:31:14 -0000	1.87
--- cm-boot.sml	12 May 2006 20:16:43 -0000	1.88
***************
*** 337,352 ****
  		      NONE => fnpolicy
  		    | SOME ao => FilenamePolicy.colocate_generic ao
! 	      fun sourcesOf ((p, gth, _), (v, a)) =
  		  let val v' = SrcPathSet.add (v, p)
  		  in case gth () of
! 			 GG.ERRORGROUP => (v', a)
  		       | GG.GROUP { kind, sources, ... } =>
  			 let fun add (p, x, a) =
  				 StringMap.insert (a, SrcPath.osstring p, x)
  			     fun sg l =
! 				 if SrcPathSet.member (v, p) then (v, a)
  				 else foldl sourcesOf
  					    (v', SrcPathMap.foldli
! 						     add a sources)
  					    l
  			 in case kind of
--- 337,352 ----
  		      NONE => fnpolicy
  		    | SOME ao => FilenamePolicy.colocate_generic ao
! 	      fun sourcesOf ((p, gth, _), (v, a, r)) =
  		  let val v' = SrcPathSet.add (v, p)
  		  in case gth () of
! 			 GG.ERRORGROUP => (v', a, r)
  		       | GG.GROUP { kind, sources, ... } =>
  			 let fun add (p, x, a) =
  				 StringMap.insert (a, SrcPath.osstring p, x)
  			     fun sg l =
! 				 if SrcPathSet.member (v, p) then (v, a, r)
  				 else foldl sourcesOf
  					    (v', SrcPathMap.foldli
! 						     add a sources, r)
  					    l
  			 in case kind of
***************
*** 355,362 ****
  				     GG.STABLE _ =>
  				     let val f = SrcPath.osstring p
! 					 val (a, x) = StringMap.remove (a, f)
  					 val sf = FilenamePolicy.mkStableName
  						      policy (p, version)
! 				     in (v', StringMap.insert (a, sf, x))
  				     end
  				   | GG.DEVELOPED d => sg (#subgroups d))
--- 355,363 ----
  				     GG.STABLE _ =>
  				     let val f = SrcPath.osstring p
! 					 val r' = StringSet.add (r, f)
! 					 val x = valOf (StringMap.find (a, f))
  					 val sf = FilenamePolicy.mkStableName
  						      policy (p, version)
! 				     in (v', StringMap.insert (a, sf, x), r')
  				     end
  				   | GG.DEVELOPED d => sg (#subgroups d))
***************
*** 369,373 ****
  	      (case Parse.parse (parse_arg (gr, NONE, p)) of
  		   SOME (g, _) => let
! 		       val (_, sm) =
  			   sourcesOf ((p, fn () => g, []),
  				      (SrcPathSet.empty,
--- 370,374 ----
  	      (case Parse.parse (parse_arg (gr, NONE, p)) of
  		   SOME (g, _) => let
! 		       val (_, sm, removed) =
  			   sourcesOf ((p, fn () => g, []),
  				      (SrcPathSet.empty,
***************
*** 375,379 ****
  					   (SrcPath.osstring p,
  					    { class = "cm",
! 					      derived = false })))
  		       fun add (s, { class, derived }, l) =
  			   { file = s, class = class, derived = derived } :: l
--- 376,383 ----
  					   (SrcPath.osstring p,
  					    { class = "cm",
! 					      derived = false }),
! 				       StringSet.empty))
! 		       fun trim (f, sm) = #1 (StringMap.remove (sm, f))
! 		       val sm = StringSet.foldl trim sm removed
  		       fun add (s, { class, derived }, l) =
  			   { file = s, class = class, derived = derived } :: l



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