[pypy-svn] r20353 - in pypy/branch/somepbc-refactoring/pypy: annotation rpython/lltypesystem translator/tool

[pedronis at codespeak.net]

Author: pedronis
Date: Mon Nov 28 14:11:13 2005
New Revision: 20353

Modified:
   pypy/branch/somepbc-refactoring/pypy/annotation/classdef.py
   pypy/branch/somepbc-refactoring/pypy/rpython/lltypesystem/rclass.py
   pypy/branch/somepbc-refactoring/pypy/translator/tool/graphpage.py
Log:
introduce .shortname on ClassDefs

use it consistently



Modified: pypy/branch/somepbc-refactoring/pypy/annotation/classdef.py
==============================================================================
--- pypy/branch/somepbc-refactoring/pypy/annotation/classdef.py	(original)
+++ pypy/branch/somepbc-refactoring/pypy/annotation/classdef.py	Mon Nov 28 14:11:13 2005
@@ -129,6 +129,7 @@
         self.attrs = {}          # {name: Attribute}
         self.classdesc = classdesc
         self.name = self.classdesc.name
+        self.shortname = self.name.split('.')[-1]        
         self.subdefs = []
         self.attr_sources = {}   # {name: list-of-sources}
 

Modified: pypy/branch/somepbc-refactoring/pypy/rpython/lltypesystem/rclass.py
==============================================================================
--- pypy/branch/somepbc-refactoring/pypy/rpython/lltypesystem/rclass.py	(original)
+++ pypy/branch/somepbc-refactoring/pypy/rpython/lltypesystem/rclass.py	Mon Nov 28 14:11:13 2005
@@ -173,7 +173,7 @@
             if rsubcls.classdef is None:
                 name = 'object'
             else:
-                name = rsubcls.classdef.name.split('.')[-1]
+                name = rsubcls.classdef.shortname
             vtable.name = malloc(Array(Char), len(name)+1, immortal=True)
             for i in range(len(name)):
                 vtable.name[i] = name[i]

Modified: pypy/branch/somepbc-refactoring/pypy/translator/tool/graphpage.py
==============================================================================
--- pypy/branch/somepbc-refactoring/pypy/translator/tool/graphpage.py	(original)
+++ pypy/branch/somepbc-refactoring/pypy/translator/tool/graphpage.py	Mon Nov 28 14:11:13 2005
@@ -196,7 +196,7 @@
     """
     def compute(self, translator, cdef):
         self.translator = translator
-        dotgen = DotGen(cdef.name.split('.')[-1], rankdir="LR")
+        dotgen = DotGen(cdef.shortname, rankdir="LR")
 
         def writecdef(cdef):
             lines = [cdef.name, '']
@@ -214,12 +214,12 @@
                             name += '()'
                             info = 'SomePBC(%s)' % ', '.join(
                                 ['method %s.%s' % (
-                                  desc.originclassdef.name.split('.')[-1],
+                                  desc.originclassdef.shortname,
                                   desc.name) for desc in s_value.descriptions],)
                         lines.append(name)
                         self.links[linkname] = '%s.%s: %s' % (prefix, name, info)
 
-            prefix = cdef.name.split('.')[-1]
+            prefix = cdef.shortname
             writeadefs(prefix + '()', False)
             lines.append('')
             writeadefs(prefix, True)
@@ -297,7 +297,7 @@
             dotgen.emit_node(nameof(None), color="red", shape="octagon",
                              label="Root Class\\nobject")
             for classdef in self.translator.annotator.getuserclassdefinitions():
-                data = self.labelof(classdef, classdef.name.split('.')[-1])
+                data = self.labelof(classdef, classdef.shortname)
                 dotgen.emit_node(nameof(classdef), label=data, shape="box")
                 dotgen.emit_edge(nameof(classdef.basedef), nameof(classdef))