[Nice-commit] Nice/src/bossa/syntax retypedMethod.nice,1.12,1.13

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

Update of /cvsroot/nice/Nice/src/bossa/syntax
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20613/src/bossa/syntax

Modified Files:
	retypedMethod.nice 
Log Message:
Moved addToScope up to reflect pass order. Add test for nullness of
reflectMethod since ignoredRetyping is not computed yet at that point.


Index: retypedMethod.nice
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/retypedMethod.nice,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** retypedMethod.nice	1 Apr 2005 00:09:23 -0000	1.12
--- retypedMethod.nice	1 Apr 2005 09:32:32 -0000	1.13
***************
*** 64,67 ****
--- 64,75 ----
    }
  
+   addToScope()
+   {
+     // Put the symbol in the java scope, so it's available globally,
+     // even to packages that don't import the current one. See testcase.
+     if (! ignoredRetyping && reflectMethod != null)
+       addJavaSymbol(notNull(reflectMethod), this);
+   }
+ 
    doResolve()
    {
***************
*** 79,90 ****
    }
  
-   addToScope()
-   {
-     // Put the symbol in the java scope, so it's available globally,
-     // even to packages that don't import the current one. See testcase.
-     if (! ignoredRetyping)
-       addJavaSymbol(notNull(reflectMethod), this);
-   }
- 
    isIgnored() = ignoredRetyping;
  
--- 87,90 ----