return sets instead of tuples from some symtable methods

This commit is contained in:
Benjamin Peterson 2008-08-20 02:06:00 +00:00
parent 87069fd8fe
commit 9f9fc68b0f
4 changed files with 16 additions and 13 deletions

View File

@ -95,19 +95,19 @@ Examining Symbol Tables
.. method:: get_parameters()
Return a tuple containing names of parameters to this function.
Return a set containing names of parameters to this function.
.. method:: get_locals()
Return a tuple containing names of locals in this function.
Return a set containing names of locals in this function.
.. method:: get_globals()
Return a tuple containing names of globals in this function.
Return a set containing names of globals in this function.
.. method:: get_frees()
Return a tuple containing names of free variables in this function.
Return a set containing names of free variables in this function.
.. class:: Class
@ -116,7 +116,7 @@ Examining Symbol Tables
.. method:: get_methods()
Return a tuple containing the names of methods declared in the class.
Return a set containing the names of methods declared in the class.
.. class:: Symbol

View File

@ -129,8 +129,8 @@ class Function(SymbolTable):
__globals = None
def __idents_matching(self, test_func):
return tuple([ident for ident in self.get_identifiers()
if test_func(self._table.symbols[ident])])
return frozenset(ident for ident in self.get_identifiers()
if test_func(self._table.symbols[ident]))
def get_parameters(self):
if self.__params is None:
@ -165,7 +165,7 @@ class Class(SymbolTable):
d = {}
for st in self._table.children:
d[st.name] = 1
self.__methods = tuple(d)
self.__methods = frozenset(d)
return self.__methods

View File

@ -80,11 +80,11 @@ class SymtableTest(unittest.TestCase):
def test_function_info(self):
func = self.spam
self.assertEqual(func.get_parameters(), ("a", "b", "kw", "var"))
self.assertEqual(func.get_parameters(), {"a", "b", "kw", "var"})
self.assertEqual(func.get_locals(),
("a", "b", "bar", "glob", "internal", "kw", "var", "x"))
self.assertEqual(func.get_globals(), ("bar", "glob"))
self.assertEqual(self.internal.get_frees(), ("x",))
{"a", "b", "bar", "glob", "internal", "kw", "var", "x"})
self.assertEqual(func.get_globals(), {"bar", "glob"})
self.assertEqual(self.internal.get_frees(), {"x"})
def test_globals(self):
self.assertTrue(self.spam.lookup("glob").is_global())
@ -142,7 +142,7 @@ class SymtableTest(unittest.TestCase):
self.assertEqual(self.Mine.get_name(), "Mine")
def test_class_info(self):
self.assertEqual(self.Mine.get_methods(), ('a_method',))
self.assertEqual(self.Mine.get_methods(), {'a_method'})
def test_filename_correct(self):
### Bug tickler: SyntaxError file name correct whether error raised

View File

@ -249,6 +249,9 @@ Extension Modules
Library
-------
- symtable.Function's ``get_locals()``, ``get_globals()``, ``get_parameters()``,
and ``get_frees()`` and symtable.Class's ``get_methods()`` now return sets.
- The methods ``is_in_tuple()``, ``is_vararg()``, and ``is_keywordarg()`` of
symtable.Symbol have been removed.