Skip to content

Commit 56300d7

Browse files
committed
clean up
1 parent 3d24f99 commit 56300d7

File tree

1 file changed

+4
-10
lines changed
  • graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type

1 file changed

+4
-10
lines changed

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/TypeBuiltins.java

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1405,17 +1405,12 @@ Object dir(VirtualFrame frame, Object klass,
14051405
@Cached com.oracle.graal.python.nodes.call.CallNode callNode,
14061406
@Cached ToArrayNode toArrayNode,
14071407
@Cached("createGetAttrNode()") GetFixedAttributeNode getBasesNode) {
1408-
PSet names = dir(frame, klass,
1409-
inliningTarget, lookupAttrNode, callNode, getBasesNode, toArrayNode);
1408+
PSet names = dir(frame, inliningTarget, klass, lookupAttrNode, callNode, getBasesNode, toArrayNode);
14101409
return names;
14111410
}
14121411

1413-
private PSet dir(VirtualFrame frame, Object klass,
1414-
Node inliningTarget,
1415-
PyObjectLookupAttr lookupAttrNode,
1416-
com.oracle.graal.python.nodes.call.CallNode callNode,
1417-
GetFixedAttributeNode getBasesNode,
1418-
ToArrayNode toArrayNode) {
1412+
private PSet dir(VirtualFrame frame, Node inliningTarget, Object klass, PyObjectLookupAttr lookupAttrNode, com.oracle.graal.python.nodes.call.CallNode callNode,
1413+
GetFixedAttributeNode getBasesNode, ToArrayNode toArrayNode) {
14191414
PSet names = factory().createSet();
14201415
Object updateCallable = lookupAttrNode.execute(frame, inliningTarget, names, T_UPDATE);
14211416
Object ns = lookupAttrNode.execute(frame, inliningTarget, klass, T___DICT__);
@@ -1428,8 +1423,7 @@ private PSet dir(VirtualFrame frame, Object klass,
14281423
for (Object cls : bases) {
14291424
// Note that since we are only interested in the keys, the order
14301425
// we merge classes is unimportant
1431-
Object baseNames = dir(frame, cls,
1432-
inliningTarget, lookupAttrNode, callNode, getBasesNode, toArrayNode);
1426+
Object baseNames = dir(frame, inliningTarget, cls, lookupAttrNode, callNode, getBasesNode, toArrayNode);
14331427
callNode.execute(frame, updateCallable, baseNames);
14341428
}
14351429
}

0 commit comments

Comments
 (0)