Merge pull request #2184 from jkmar/return_result_in_visitor

[Python3] return result instead of None in visitor
antlr · Jan 1, 2018 · 4cca8cd · 4cca8cd
2 parents 74779f3 + 6326725
commit 4cca8cd
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/contributors.txt b/contributors.txt
@@ -178,3 +178,4 @@ YYYY/MM/DD, github id, Full name, email
 2017/12/01, DavidMoraisFerreira, David Morais Ferreira, [email protected]
 2017/12/01, SebastianLng, Sebastian Lang, [email protected]
 2017/12/03, oranoran, Oran Epelbaum, oran / epelbaum me
+2017/12/27, jkmar, Jakub Marciniszyn, [email protected]
diff --git a/runtime/Python2/src/antlr4/tree/Tree.py b/runtime/Python2/src/antlr4/tree/Tree.py
@@ -40,7 +40,7 @@ def visitChildren(self, node):
         n = node.getChildCount()
         for i in range(n):
             if not self.shouldVisitNextChild(node, result):
-                return
+                return result
 
             c = node.getChild(i)
             childResult = c.accept(self)

diff --git a/runtime/Python3/src/antlr4/tree/Tree.py b/runtime/Python3/src/antlr4/tree/Tree.py
@@ -38,7 +38,7 @@ def visitChildren(self, node):
         n = node.getChildCount()
         for i in range(n):
             if not self.shouldVisitNextChild(node, result):
-                return
+                return result
 
             c = node.getChild(i)
             childResult = c.accept(self)