Skip to content

Commit 5453a81

Browse files
committed
remove AbstractKeywordsNode class
- style fix
1 parent 3f29d87 commit 5453a81

File tree

2 files changed

+17
-19
lines changed

2 files changed

+17
-19
lines changed

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/GraalPythonModuleBuiltins.java

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -151,21 +151,21 @@ public void postInitialize(PythonCore core) {
151151
mod.setAttribute("capi_home", capiHome);
152152
mod.setAttribute("platform_id", toolchain.getIdentifier());
153153
mod.setAttribute("flags", core.factory().createTuple(new Object[]{
154-
false, // bytes_warning
155-
!context.getOption(PythonOptions.PythonOptimizeFlag), // debug
156-
context.getOption(PythonOptions.DontWriteBytecodeFlag), // dont_write_bytecode
157-
false, // hash_randomization
158-
context.getOption(PythonOptions.IgnoreEnvironmentFlag), // ignore_environment
159-
context.getOption(PythonOptions.InspectFlag), // inspect
160-
context.getOption(PythonOptions.TerminalIsInteractive), // interactive
161-
context.getOption(PythonOptions.IsolateFlag), // isolated
162-
context.getOption(PythonOptions.NoSiteFlag), // no_site
163-
context.getOption(PythonOptions.NoUserSiteFlag), // no_user_site
164-
context.getOption(PythonOptions.PythonOptimizeFlag), // optimize
165-
context.getOption(PythonOptions.QuietFlag), // quiet
166-
context.getOption(PythonOptions.VerboseFlag), // verbose
167-
false, // dev_mode
168-
0, // utf8_mode
154+
false, // bytes_warning
155+
!context.getOption(PythonOptions.PythonOptimizeFlag), // debug
156+
context.getOption(PythonOptions.DontWriteBytecodeFlag), // dont_write_bytecode
157+
false, // hash_randomization
158+
context.getOption(PythonOptions.IgnoreEnvironmentFlag), // ignore_environment
159+
context.getOption(PythonOptions.InspectFlag), // inspect
160+
context.getOption(PythonOptions.TerminalIsInteractive), // interactive
161+
context.getOption(PythonOptions.IsolateFlag), // isolated
162+
context.getOption(PythonOptions.NoSiteFlag), // no_site
163+
context.getOption(PythonOptions.NoUserSiteFlag), // no_user_site
164+
context.getOption(PythonOptions.PythonOptimizeFlag), // optimize
165+
context.getOption(PythonOptions.QuietFlag), // quiet
166+
context.getOption(PythonOptions.VerboseFlag), // verbose
167+
false, // dev_mode
168+
0, // utf8_mode
169169
}));
170170
}
171171

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/argument/keywords/CopyKeywordsNode.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,18 +91,16 @@ public HashingStorage getHashingStorage() {
9191
}
9292
}
9393

94+
@GenerateUncached
9495
@ImportStatic(PythonOptions.class)
95-
abstract static class AbstractKeywordsNode extends HashingStorageLibrary.ForEachNode<CopyKeywordsState> {
96+
abstract static class AddKeywordNode extends HashingStorageLibrary.ForEachNode<CopyKeywordsState> {
9697
public abstract CopyKeywordsState executeWithState(Object key, CopyKeywordsState state);
9798

9899
@Override
99100
public CopyKeywordsState execute(Object key, CopyKeywordsState state) {
100101
return executeWithState(key, state);
101102
}
102-
}
103103

104-
@GenerateUncached
105-
abstract static class AddKeywordNode extends AbstractKeywordsNode {
106104
@Specialization(rewriteOn = CannotCastException.class, limit = "getCallSiteInlineCacheMaxDepth()")
107105
public CopyKeywordsState add(Object key, CopyKeywordsState state,
108106
@Cached CastToJavaStringNode castToJavaStringNode,

0 commit comments

Comments
 (0)