Merge pull request #678 from boriel/refact/symbols

refact: make SymbolArglist an iterable

Author: boriel

src/symbols/arglist.py

@@ -9,11 +9,13 @@
 # ----------------------------------------------------------------------
 from __future__ import annotations
 
+from collections.abc import Iterable
+
 from src.symbols.argument import SymbolARGUMENT
 from src.symbols.symbol_ import Symbol
 
 
-class SymbolARGLIST(Symbol):
+class SymbolARGLIST(Symbol, Iterable[SymbolARGUMENT]):
     """Defines a list of arguments in a function call or array access"""
 
     @property
@@ -33,6 +35,9 @@ def __setitem__(self, range_, value: SymbolARGUMENT):
         assert isinstance(value, SymbolARGUMENT)
         self.children[range_] = value
 
+    def __iter__(self):
+        return iter(self.args)
+
     def __str__(self):
         return "(%s)" % (", ".join(str(x) for x in self.args))
 

src/symbols/builtin.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# vim: ts=4:et:sw=4:
 
 # ----------------------------------------------------------------------
 # Copyleft (K), Jose M. Rodriguez-Rosa (a.k.a. Boriel)

src/symbols/symbol_.py

@@ -27,7 +27,7 @@ class Symbol(Ast):
     def __init__(self, *children):
         super().__init__()
         for child in children:
-            assert isinstance(child, Symbol)
+            assert isinstance(child, Symbol), f"{child} is not Symbol"
             self.append_child(child)
 
         self._required_by: Counter = Counter()  # Symbols that depends on this one

src/zxbc/zxbparser.py

@@ -9,7 +9,6 @@
 #                    the GNU General License
 # ----------------------------------------------------------------------
 
-import collections
 import math
 import sys
 from math import pi as PI
@@ -233,8 +232,9 @@ def make_builtin(lineno, fname, operands, func=None, type_=None):
     assert isinstance(operands, Symbol) or isinstance(operands, tuple) or isinstance(operands, list)
     # TODO: In the future, builtin functions will be implemented in an external library, like POINT or ATTR
     __DEBUG__('Creating BUILTIN "{}"'.format(fname), 1)
-    if not isinstance(operands, collections.abc.Iterable):
+    if not isinstance(operands, (list, tuple, set)):
         operands = [operands]
+
     return sym.BUILTIN.make_node(lineno, fname, func, type_, *operands)