From f455605399ea9bd22ee5f115fa06994840b648e0 Mon Sep 17 00:00:00 2001
From: Dave Halter <davidhalter88@gmail.com>
Date: Mon, 21 Sep 2015 14:43:51 +0200
Subject: [PATCH] Remove final bugs from the execute_nodes implementation.

---
 jedi/evaluate/analysis.py | 9 +++++----
 jedi/parser/tree.py       | 3 ++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/jedi/evaluate/analysis.py b/jedi/evaluate/analysis.py
index 615e43cf..89a1a0ce 100644
--- a/jedi/evaluate/analysis.py
+++ b/jedi/evaluate/analysis.py
@@ -280,10 +280,6 @@ testlist_star_expr  # should probably just work with expr_stmt
 star_expr
 exprlist  # just ignore? then names are just resolved. Strange anyway, bc expr is not really allowed in the list, typically.
 
-# always execute function arguments? -> no problem with stars.
-arglist
-argument
-
 ----------- ignore:
 suite
 subscriptlist
@@ -295,6 +291,11 @@ dictorsetmaker
 trailer
 decorators
 decorated
+# always execute function arguments? -> no problem with stars.
+# Also arglist and argument are different in different grammars.
+arglist
+argument
+
 
 ----------- remove:
 tname      # only exists in current Jedi parser. REMOVE!
diff --git a/jedi/parser/tree.py b/jedi/parser/tree.py
index 98fc3843..ee5d27ea 100644
--- a/jedi/parser/tree.py
+++ b/jedi/parser/tree.py
@@ -488,7 +488,8 @@ class Node(BaseNode):
 
     _IGNORE_EXECUTE_NODES = set([
         'suite', 'subscriptlist', 'subscript', 'simple_stmt', 'sliceop',
-        'testlist_comp', 'dictorsetmaker', 'trailer', 'decorators', 'decorated'
+        'testlist_comp', 'dictorsetmaker', 'trailer', 'decorators',
+        'decorated', 'arglist', 'argument'
     ])
 
     def __init__(self, type, children):