Fix calculation of hardest_arg.

The argument properties are ordered from easiest to hardest.  The
harder the arg, the more complicated that code that must be generated
to return it from getChildren() and/or getChildNodes().  The old
calculation routine was bogus, because it always set hardest_arg to
the hardness of the last argument.  Now use max() to always set it to
the hardness of the hardest argument.

diff --git a/Tools/compiler/astgen.py b/Tools/compiler/astgen.py
index 245eebd30bbabc150fb16c8350589fab75e6eeb9..90201d31e35f8849e98b0c39139e1b875ed0131a 100644 (file)
--- a/Tools/compiler/astgen.py
+++ b/Tools/compiler/astgen.py
@@ -71,15 +71,15 @@ class NodeInfo:
             if arg.endswith('*'):
                 arg = self.argnames[i] = arg[:-1]
                 d[arg] = P_OTHER
-                hardest_arg = P_OTHER
+                hardest_arg = max(hardest_arg, P_OTHER)
             elif arg.endswith('!'):
                 arg = self.argnames[i] = arg[:-1]
                 d[arg] = P_NESTED
-                hardest_arg = P_NESTED
+                hardest_arg = max(hardest_arg, P_NESTED)
             elif arg.endswith('&'):
                 arg = self.argnames[i] = arg[:-1]
                 d[arg] = P_NONE
-                hardest_arg = P_NONE
+                hardest_arg = max(hardest_arg, P_NONE)
             else:
                 d[arg] = P_NODE
         self.hardest_arg = hardest_arg

diff --git a/Tools/compiler/compiler/astgen.py b/Tools/compiler/compiler/astgen.py
index 245eebd30bbabc150fb16c8350589fab75e6eeb9..90201d31e35f8849e98b0c39139e1b875ed0131a 100644 (file)
--- a/Tools/compiler/compiler/astgen.py
+++ b/Tools/compiler/compiler/astgen.py
@@ -71,15 +71,15 @@ class NodeInfo:
             if arg.endswith('*'):
                 arg = self.argnames[i] = arg[:-1]
                 d[arg] = P_OTHER
-                hardest_arg = P_OTHER
+                hardest_arg = max(hardest_arg, P_OTHER)
             elif arg.endswith('!'):
                 arg = self.argnames[i] = arg[:-1]
                 d[arg] = P_NESTED
-                hardest_arg = P_NESTED
+                hardest_arg = max(hardest_arg, P_NESTED)
             elif arg.endswith('&'):
                 arg = self.argnames[i] = arg[:-1]
                 d[arg] = P_NONE
-                hardest_arg = P_NONE
+                hardest_arg = max(hardest_arg, P_NONE)
             else:
                 d[arg] = P_NODE
         self.hardest_arg = hardest_arg