Skip to content

Commit 4304478

Browse files
committed
fix style
1 parent b4eb977 commit 4304478

File tree

8 files changed

+27
-41
lines changed

8 files changed

+27
-41
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* The Universal Permissive License (UPL), Version 1.0

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* The Universal Permissive License (UPL), Version 1.0

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/LazyString.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* The Universal Permissive License (UPL), Version 1.0
@@ -83,6 +83,7 @@ private static boolean assertChecked(CharSequence left, CharSequence right, int
8383
/**
8484
* Variant of {@link #createChecked} that tries to concatenate a very short string to an already
8585
* short root leaf up-front, e.g. when appending single characters.
86+
*
8687
* @param minLazyStringLength
8788
*/
8889
@TruffleBoundary

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/argument/ReadVarKeywordsNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, 2019, Oracle and/or its affiliates.
2+
* Copyright (c) 2017, 2020, Oracle and/or its affiliates.
33
* Copyright (c) 2013, Regents of the University of California
44
*
55
* All rights reserved.

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/InvokeNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, 2019, Oracle and/or its affiliates.
2+
* Copyright (c) 2017, 2020, Oracle and/or its affiliates.
33
* Copyright (c) 2014, Regents of the University of California
44
*
55
* All rights reserved.

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/control/TopLevelExceptionHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* The Universal Permissive License (UPL), Version 1.0

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/ExceptNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, 2019, Oracle and/or its affiliates.
2+
* Copyright (c) 2017, 2020, Oracle and/or its affiliates.
33
* Copyright (c) 2013, Regents of the University of California
44
*
55
* All rights reserved.

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonOptions.java

Lines changed: 19 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, 2019, Oracle and/or its affiliates.
2+
* Copyright (c) 2017, 2020, Oracle and/or its affiliates.
33
* Copyright (c) 2013, Regents of the University of California
44
*
55
* All rights reserved.
@@ -48,10 +48,9 @@
4848
import org.graalvm.options.OptionValues;
4949

5050
/**
51-
* The options for Python. Note that some options have an effect on the AST
52-
* structure, and thus must be the same for all contexts in an engine. We
53-
* annotate these with {@link EngineOption} and the PythonLanguage will ensure
54-
* that these are matched across contexts.
51+
* The options for Python. Note that some options have an effect on the AST structure, and thus must
52+
* be the same for all contexts in an engine. We annotate these with {@link EngineOption} and the
53+
* PythonLanguage will ensure that these are matched across contexts.
5554
*/
5655
@Option.Group(PythonLanguage.ID)
5756
public final class PythonOptions {
@@ -106,19 +105,16 @@ private PythonOptions() {
106105
@Option(category = OptionCategory.INTERNAL, help = "Set the location of C API home. Overrides any environment variables or Java options.", stability = OptionStability.STABLE) //
107106
public static final OptionKey<String> CAPI = new OptionKey<>("");
108107

109-
@EngineOption
110-
@Option(category = OptionCategory.INTERNAL, help = "Expose internal sources as normal sources, so they will show up in the debugger and stacks") //
108+
@EngineOption @Option(category = OptionCategory.INTERNAL, help = "Expose internal sources as normal sources, so they will show up in the debugger and stacks") //
111109
public static final OptionKey<Boolean> ExposeInternalSources = new OptionKey<>(false);
112110

113-
@EngineOption
114-
@Option(category = OptionCategory.INTERNAL, help = "Print the java stacktrace if enabled") //
111+
@EngineOption @Option(category = OptionCategory.INTERNAL, help = "Print the java stacktrace if enabled") //
115112
public static final OptionKey<Boolean> WithJavaStacktrace = new OptionKey<>(false);
116113

117114
@Option(category = OptionCategory.INTERNAL, help = "") //
118115
public static final OptionKey<Boolean> CatchGraalPythonExceptionForUnitTesting = new OptionKey<>(false);
119116

120-
@EngineOption
121-
@Option(category = OptionCategory.INTERNAL, help = "Enable catching all Exceptions in generic try-catch statements.") //
117+
@EngineOption @Option(category = OptionCategory.INTERNAL, help = "Enable catching all Exceptions in generic try-catch statements.") //
122118
public static final OptionKey<Boolean> CatchAllExceptions = new OptionKey<>(false);
123119

124120
@Option(category = OptionCategory.EXPERT, help = "Prints path to parsed files") //
@@ -127,24 +123,19 @@ private PythonOptions() {
127123
@Option(category = OptionCategory.EXPERT, help = "Prints parser time statistis after number of parsed files, set by this option. 0 or <0 means no statistics are printed.") //
128124
public static final OptionKey<Integer> ParserStatistics = new OptionKey<>(0);
129125

130-
@EngineOption
131-
@Option(category = OptionCategory.EXPERT, help = "") //
126+
@EngineOption @Option(category = OptionCategory.EXPERT, help = "") //
132127
public static final OptionKey<Integer> AttributeAccessInlineCacheMaxDepth = new OptionKey<>(5);
133128

134-
@EngineOption
135-
@Option(category = OptionCategory.EXPERT, help = "") //
129+
@EngineOption @Option(category = OptionCategory.EXPERT, help = "") //
136130
public static final OptionKey<Integer> CallSiteInlineCacheMaxDepth = new OptionKey<>(4);
137131

138-
@EngineOption
139-
@Option(category = OptionCategory.EXPERT, help = "") //
132+
@EngineOption @Option(category = OptionCategory.EXPERT, help = "") //
140133
public static final OptionKey<Integer> VariableArgumentReadUnrollingLimit = new OptionKey<>(5);
141134

142-
@EngineOption
143-
@Option(category = OptionCategory.EXPERT, help = "") //
135+
@EngineOption @Option(category = OptionCategory.EXPERT, help = "") //
144136
public static final OptionKey<Integer> VariableArgumentInlineCacheLimit = new OptionKey<>(3);
145137

146-
@EngineOption
147-
@Option(category = OptionCategory.EXPERT, help = "") //
138+
@EngineOption @Option(category = OptionCategory.EXPERT, help = "") //
148139
public static final OptionKey<Boolean> ForceInlineGeneratorCalls = new OptionKey<>(false);
149140

150141
@Option(category = OptionCategory.EXPERT, help = "Minimal size of string, when lazy strings are used. Default 20") //
@@ -153,21 +144,18 @@ private PythonOptions() {
153144
@Option(category = OptionCategory.EXPERT, help = "This option is set by the Python launcher to tell the language it can print exceptions directly") //
154145
public static final OptionKey<Boolean> AlwaysRunExcepthook = new OptionKey<>(false);
155146

156-
@EngineOption
157-
@Option(category = OptionCategory.EXPERT, help = "This option control builtin _thread module support") //
147+
@EngineOption @Option(category = OptionCategory.EXPERT, help = "This option control builtin _thread module support") //
158148
public static final OptionKey<Boolean> WithThread = new OptionKey<>(false);
159149

160150
// disabling TRegex has an effect on the _sre Python functions that are
161151
// dynamically created, so we cannot change that option again.
162-
@EngineOption
163-
@Option(category = OptionCategory.EXPERT, help = "Use the optimized TRegex engine and call the CPython sre engine only as a fallback. Default true") //
152+
@EngineOption @Option(category = OptionCategory.EXPERT, help = "Use the optimized TRegex engine and call the CPython sre engine only as a fallback. Default true") //
164153
public static final OptionKey<Boolean> WithTRegex = new OptionKey<>(true);
165154

166155
@Option(category = OptionCategory.EXPERT, help = "Switch on/off using lazy strings for performance reasons. Default true.") //
167156
public static final OptionKey<Boolean> LazyStrings = new OptionKey<>(true);
168157

169-
@EngineOption
170-
@Option(category = OptionCategory.EXPERT, help = "Enable forced splitting (of builtins). Default false.") //
158+
@EngineOption @Option(category = OptionCategory.EXPERT, help = "Enable forced splitting (of builtins). Default false.") //
171159
public static final OptionKey<Boolean> EnableForcedSplits = new OptionKey<>(false);
172160

173161
@Option(category = OptionCategory.EXPERT, help = "Set by the launcher if an interactive console is used to run Python.") //
@@ -191,15 +179,13 @@ private PythonOptions() {
191179
@Option(category = OptionCategory.EXPERT, help = "Embedder option: what to print in response to PythonLanguage#toString.") //
192180
public static final OptionKey<Boolean> UseReprForPrintString = new OptionKey<>(true);
193181

194-
@EngineOption
195-
@Option(category = OptionCategory.EXPERT, help = "Stop inlining of builtins if caller's cumulative tree size would exceed this limit") //
182+
@EngineOption @Option(category = OptionCategory.EXPERT, help = "Stop inlining of builtins if caller's cumulative tree size would exceed this limit") //
196183
public static final OptionKey<Integer> BuiltinsInliningMaxCallerSize = new OptionKey<>(2250);
197184

198185
@Option(category = OptionCategory.EXPERT, help = "Propagate append operations to lists created as literals back to where they were created, to inform overallocation to avoid having to grow them later.") //
199186
public static final OptionKey<Boolean> OverallocateLiteralLists = new OptionKey<>(true);
200187

201-
@EngineOption
202-
@Option(category = OptionCategory.USER, help = "Emulate some Jython features that can cause performance degradation") //
188+
@EngineOption @Option(category = OptionCategory.USER, help = "Emulate some Jython features that can cause performance degradation") //
203189
public static final OptionKey<Boolean> EmulateJython = new OptionKey<>(false);
204190

205191
public static final OptionDescriptors DESCRIPTORS = new PythonOptionsOptionDescriptors();
@@ -245,9 +231,8 @@ public static Object[] createOptionValuesStorage(Env env) {
245231
}
246232

247233
/**
248-
* Check if the options set in the {@code first} and {@code second} set are
249-
* compatible, i.e, there are no Python per-engine options in these sets
250-
* that differ.
234+
* Check if the options set in the {@code first} and {@code second} set are compatible, i.e,
235+
* there are no Python per-engine options in these sets that differ.
251236
*/
252237
public static boolean areOptionsCompatible(OptionValues first, OptionValues second) {
253238
for (OptionKey<?> key : ENGINE_OPTION_KEYS) {

0 commit comments

Comments
 (0)