[Nice-commit] Nice/src/mlsub/compilation make.nice,1.19,1.20 Module.java,1.4,1.5

[<bo...@us...>]

Update of /cvsroot/nice/Nice/src/mlsub/compilation
In directory sc8-pr-cvs1:/tmp/cvs-serv26840/src/mlsub/compilation

Modified Files:
	make.nice Module.java 
Log Message:
Fixed compilation of packages cyclically importing each other (exhibited by
some code written by Alex).


Index: make.nice
===================================================================
RCS file: /cvsroot/nice/Nice/src/mlsub/compilation/make.nice,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** make.nice	18 Feb 2003 23:33:09 -0000	1.19
--- make.nice	4 Mar 2003 16:50:17 -0000	1.20
***************
*** 34,37 ****
--- 34,48 ----
  
    try {
+     modules.foreach(Module m => m.typedResolve());
+   }
+   finally {
+     notNull(compilation.root).unfreezeGlobalContext();
+   }
+ 
+   modules.foreach(Module m => m.localResolve());
+ 
+   notNull(compilation.root).freezeGlobalContext();
+ 
+   try {
      modules.foreach(Module m => m.compile());
  

Index: Module.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/mlsub/compilation/Module.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Module.java	28 Aug 2002 09:27:40 -0000	1.4
--- Module.java	4 Mar 2003 16:50:17 -0000	1.5
***************
*** 36,39 ****
--- 36,45 ----
    void load();
  
+   /** Resolve scoping for entities that need the global context. */
+   void typedResolve();
+ 
+   /** Resolve local entities, that might increase the global context. */
+   void localResolve();
+ 
    /** Compile the module.