[Jython-checkins] CVS: jython/Tools/jythonc BaseEvaluator.py,2.8,2.9 SimpleCompiler.py,2.8,2.9

[Finn B. <bc...@us...>]

Update of /cvsroot/jython/jython/Tools/jythonc
In directory slayer.i.sourceforge.net:/tmp/cvs-serv30317

Modified Files:
	BaseEvaluator.py SimpleCompiler.py 
Log Message:
SimpleCompiler.get_module(): Clear up the meaning of the "topmost"
flag. This fixes a bug where this example failed:

import javax.swing
class Action(javax.swing.AbstractAction):
  pass



Index: BaseEvaluator.py
===================================================================
RCS file: /cvsroot/jython/jython/Tools/jythonc/BaseEvaluator.py,v
retrieving revision 2.8
retrieving revision 2.9
diff -C2 -r2.8 -r2.9
*** BaseEvaluator.py	2000/10/13 19:07:25	2.8
--- BaseEvaluator.py	2000/11/10 15:06:56	2.9
***************
*** 261,265 ****
  
      def importfrom_stmt(self, top, names):                      
!         module = self.get_module(top, 1)
          if names == '*':
              return self.importall_stmt(module)
--- 261,265 ----
  
      def importfrom_stmt(self, top, names):                      
!         module = self.get_module(top, 0)
          if names == '*':
              return self.importall_stmt(module)

Index: SimpleCompiler.py
===================================================================
RCS file: /cvsroot/jython/jython/Tools/jythonc/SimpleCompiler.py,v
retrieving revision 2.8
retrieving revision 2.9
diff -C2 -r2.8 -r2.9
*** SimpleCompiler.py	2000/10/18 13:01:11	2.8
--- SimpleCompiler.py	2000/11/10 15:06:56	2.9
***************
*** 285,288 ****
--- 285,291 ----
          return self.factory.makeString(value)
  
+     def ellipsis_const(self):
+         return self.factory.makeEllipsis()
+ 
      # builtin types
      def visitall(self, values):
***************
*** 373,377 ****
  
          for part in names[1:]:
!             top = top.getattr(part)
          if topmost:
              return top
--- 376,380 ----
  
          for part in names[1:]:
!             ret = ret.getattr(part)
          if topmost:
              return top
***************
*** 389,393 ****
  
      def _getnames(self, module):
!        #print module.value, module.value.__class__
          mod = ImportName.lookupName(module.value.name)
          if mod:
--- 392,396 ----
  
      def _getnames(self, module):
!         #print module.value, module.value.__class__
          mod = ImportName.lookupName(module.value.name)
          if mod:
***************
*** 399,403 ****
          for name in names:
              if name == "__all__":
!                loadNames(module.getattr(name).value, module)
              elif name[:2] == "__":
                  continue;
--- 402,406 ----
          for name in names:
              if name == "__all__":
!                 loadNames(module.getattr(name).value, module)
              elif name[:2] == "__":
                  continue;