Skip to content

Commit 424461d

Browse files
committed
Implement KeyError.__str__
1 parent 03fd114 commit 424461d

File tree

3 files changed

+101
-4
lines changed

3 files changed

+101
-4
lines changed

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/Python3Core.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@
189189
import com.oracle.graal.python.builtins.objects.enumerate.EnumerateBuiltins;
190190
import com.oracle.graal.python.builtins.objects.exception.BaseExceptionBuiltins;
191191
import com.oracle.graal.python.builtins.objects.exception.ImportErrorBuiltins;
192+
import com.oracle.graal.python.builtins.objects.exception.KeyErrorBuiltins;
192193
import com.oracle.graal.python.builtins.objects.exception.OsErrorBuiltins;
193194
import com.oracle.graal.python.builtins.objects.exception.PBaseException;
194195
import com.oracle.graal.python.builtins.objects.exception.StopIterationBuiltins;
@@ -491,6 +492,7 @@ private static PythonBuiltins[] initializeBuiltins(boolean nativeAccessAllowed)
491492
new SystemExitBuiltins(),
492493
new ImportErrorBuiltins(),
493494
new StopIterationBuiltins(),
495+
new KeyErrorBuiltins(),
494496
new SyntaxErrorBuiltins(),
495497
new OsErrorBuiltins(),
496498
new UnicodeErrorBuiltins(),

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/exception/BaseExceptionBuiltins.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,14 @@
3030
import static com.oracle.graal.python.nodes.SpecialAttributeNames.__CAUSE__;
3131
import static com.oracle.graal.python.nodes.SpecialAttributeNames.__CONTEXT__;
3232
import static com.oracle.graal.python.nodes.SpecialAttributeNames.__DICT__;
33+
import static com.oracle.graal.python.nodes.SpecialAttributeNames.__NAME__;
3334
import static com.oracle.graal.python.nodes.SpecialAttributeNames.__SUPPRESS_CONTEXT__;
3435
import static com.oracle.graal.python.nodes.SpecialAttributeNames.__TRACEBACK__;
3536
import static com.oracle.graal.python.nodes.SpecialMethodNames.__INIT__;
3637
import static com.oracle.graal.python.nodes.SpecialMethodNames.__REDUCE__;
38+
import static com.oracle.graal.python.nodes.SpecialMethodNames.__REPR__;
39+
import static com.oracle.graal.python.nodes.SpecialMethodNames.__SETSTATE__;
40+
import static com.oracle.graal.python.nodes.SpecialMethodNames.__STR__;
3741

3842
import java.util.IllegalFormatException;
3943
import java.util.List;
@@ -58,10 +62,6 @@
5862
import com.oracle.graal.python.nodes.ErrorMessages;
5963
import com.oracle.graal.python.nodes.PGuards;
6064
import com.oracle.graal.python.nodes.PRaiseNode;
61-
import static com.oracle.graal.python.nodes.SpecialAttributeNames.__NAME__;
62-
import static com.oracle.graal.python.nodes.SpecialMethodNames.__REPR__;
63-
import static com.oracle.graal.python.nodes.SpecialMethodNames.__SETSTATE__;
64-
import static com.oracle.graal.python.nodes.SpecialMethodNames.__STR__;
6565
import com.oracle.graal.python.nodes.argument.ReadArgumentNode;
6666
import com.oracle.graal.python.nodes.expression.CastToListExpressionNode.CastToListNode;
6767
import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
@@ -171,6 +171,10 @@ public Object args(VirtualFrame frame, PBaseException self, Object value,
171171

172172
public abstract Object executeObject(VirtualFrame frame, Object excObj, Object value);
173173

174+
public final Object executeGet(VirtualFrame frame, Object excObj) {
175+
return executeObject(frame, excObj, PNone.NO_VALUE);
176+
}
177+
174178
public static ArgsNode create() {
175179
return BaseExceptionBuiltinsFactory.ArgsNodeFactory.create(new ReadArgumentNode[]{});
176180
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
/*
2+
* Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* The Universal Permissive License (UPL), Version 1.0
6+
*
7+
* Subject to the condition set forth below, permission is hereby granted to any
8+
* person obtaining a copy of this software, associated documentation and/or
9+
* data (collectively the "Software"), free of charge and under any and all
10+
* copyright rights in the Software, and any and all patent rights owned or
11+
* freely licensable by each licensor hereunder covering either (i) the
12+
* unmodified Software as contributed to or provided by such licensor, or (ii)
13+
* the Larger Works (as defined below), to deal in both
14+
*
15+
* (a) the Software, and
16+
*
17+
* (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
18+
* one is included with the Software each a "Larger Work" to which the Software
19+
* is contributed by such licensors),
20+
*
21+
* without restriction, including without limitation the rights to copy, create
22+
* derivative works of, display, perform, and distribute the Software and make,
23+
* use, sell, offer for sale, import, export, have made, and have sold the
24+
* Software and the Larger Work(s), and to sublicense the foregoing rights on
25+
* either these or other terms.
26+
*
27+
* This license is subject to the following condition:
28+
*
29+
* The above copyright notice and either this complete permission notice or at a
30+
* minimum a reference to the UPL must be included in all copies or substantial
31+
* portions of the Software.
32+
*
33+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
34+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
35+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
36+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
37+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
38+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
39+
* SOFTWARE.
40+
*/
41+
package com.oracle.graal.python.builtins.objects.exception;
42+
43+
import static com.oracle.graal.python.nodes.SpecialMethodNames.__STR__;
44+
45+
import java.util.List;
46+
47+
import com.oracle.graal.python.builtins.Builtin;
48+
import com.oracle.graal.python.builtins.CoreFunctions;
49+
import com.oracle.graal.python.builtins.PythonBuiltinClassType;
50+
import com.oracle.graal.python.builtins.PythonBuiltins;
51+
import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes;
52+
import com.oracle.graal.python.builtins.objects.tuple.PTuple;
53+
import com.oracle.graal.python.lib.PyObjectReprAsJavaStringNode;
54+
import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
55+
import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
56+
import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage;
57+
import com.oracle.truffle.api.dsl.Cached;
58+
import com.oracle.truffle.api.dsl.GenerateNodeFactory;
59+
import com.oracle.truffle.api.dsl.NodeFactory;
60+
import com.oracle.truffle.api.dsl.Specialization;
61+
import com.oracle.truffle.api.frame.VirtualFrame;
62+
63+
@CoreFunctions(extendClasses = PythonBuiltinClassType.KeyError)
64+
public final class KeyErrorBuiltins extends PythonBuiltins {
65+
66+
@Override
67+
protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFactories() {
68+
return KeyErrorBuiltinsFactory.getFactories();
69+
}
70+
71+
@Builtin(name = __STR__, minNumOfPositionalArgs = 1)
72+
@GenerateNodeFactory
73+
abstract static class KeyErrorStrNode extends PythonUnaryBuiltinNode {
74+
@Specialization
75+
Object str(VirtualFrame frame, PBaseException self,
76+
@Cached BaseExceptionBuiltins.ArgsNode argsNode,
77+
@Cached SequenceStorageNodes.LenNode lenNode,
78+
@Cached SequenceStorageNodes.GetItemScalarNode getItemNode,
79+
@Cached BaseExceptionBuiltins.StrNode baseStrNode,
80+
@Cached PyObjectReprAsJavaStringNode reprNode) {
81+
Object args = argsNode.executeGet(frame, self);
82+
if (args instanceof PTuple) {
83+
SequenceStorage storage = ((PTuple) args).getSequenceStorage();
84+
if (lenNode.execute(storage) == 1) {
85+
return reprNode.execute(frame, getItemNode.execute(storage, 0));
86+
}
87+
}
88+
return baseStrNode.execute(frame, self);
89+
}
90+
}
91+
}

0 commit comments

Comments
 (0)