author | phh |
Sat, 30 Nov 2019 14:33:05 -0800 | |
changeset 59330 | 5b96c12f909d |
parent 55397 | 5eeee2cc94f5 |
permissions | -rw-r--r-- |
33362 | 1 |
/* |
55397
5eeee2cc94f5
8200701: jdk/jshell/ExceptionsTest.java fails on Windows, after JDK-8198801
rfield
parents:
48610
diff
changeset
|
2 |
* Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. |
33362 | 3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 |
* |
|
5 |
* This code is free software; you can redistribute it and/or modify it |
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
|
7 |
* published by the Free Software Foundation. Oracle designates this |
|
8 |
* particular file as subject to the "Classpath" exception as provided |
|
9 |
* by Oracle in the LICENSE file that accompanied this code. |
|
10 |
* |
|
11 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
|
12 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
13 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
14 |
* version 2 for more details (a copy is included in the LICENSE file that |
|
15 |
* accompanied this code). |
|
16 |
* |
|
17 |
* You should have received a copy of the GNU General Public License version |
|
18 |
* 2 along with this work; if not, write to the Free Software Foundation, |
|
19 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
20 |
* |
|
21 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
|
22 |
* or visit www.oracle.com if you need additional information or have any |
|
23 |
* questions. |
|
24 |
*/ |
|
34752
9c262a013456
8145342: Some copyright notices are inconsistently and ill formatted
vasya
parents:
33362
diff
changeset
|
25 |
|
33362 | 26 |
package jdk.jshell; |
27 |
||
48610
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
28 |
import java.util.ArrayList; |
37644
33cf53901cac
8154485: JShell: infrastructure for multi-Snippet class wrappers
rfield
parents:
36780
diff
changeset
|
29 |
import java.util.Arrays; |
48610
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
30 |
import java.util.List; |
37644
33cf53901cac
8154485: JShell: infrastructure for multi-Snippet class wrappers
rfield
parents:
36780
diff
changeset
|
31 |
import static java.util.stream.Collectors.joining; |
38535
4a25025e0b0d
8156101: JShell SPI: Provide a pluggable execution control SPI
rfield
parents:
37644
diff
changeset
|
32 |
import static jdk.jshell.Util.DOIT_METHOD_NAME; |
33362 | 33 |
|
34 |
/** |
|
35 |
* Wrapping of source into Java methods, fields, etc. All but outer layer |
|
36 |
* wrapping with imports and class. |
|
37 |
*/ |
|
38 |
abstract class Wrap implements GeneralWrap { |
|
39 |
||
40 |
private static Wrap methodWrap(String prefix, String source, String suffix) { |
|
41 |
Wrap wunit = new NoWrap(source); |
|
42 |
return new DoitMethodWrap(new CompoundWrap(prefix, wunit, suffix)); |
|
43 |
} |
|
44 |
||
45 |
public static Wrap methodWrap(String source) { |
|
46 |
return methodWrap("", source, semi(source) + " return null;\n"); |
|
47 |
} |
|
48 |
||
49 |
public static Wrap methodReturnWrap(String source) { |
|
50 |
return methodWrap("return ", source, semi(source)); |
|
51 |
} |
|
52 |
||
53 |
public static Wrap methodUnreachableSemiWrap(String source) { |
|
54 |
return methodWrap("", source, semi(source)); |
|
55 |
} |
|
56 |
||
57 |
public static Wrap methodUnreachableWrap(String source) { |
|
58 |
return methodWrap("", source, ""); |
|
59 |
} |
|
60 |
||
36499 | 61 |
private static String indent(int n) { |
62 |
return " ".substring(0, n * 4); |
|
63 |
} |
|
64 |
||
65 |
private static String nlindent(int n) { |
|
66 |
return "\n" + indent(n); |
|
67 |
} |
|
68 |
||
48610
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
69 |
/**Create a stub of a compilable representation of a variable snippet. |
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
70 |
* The variable is always represented by a field. If the variable |
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
71 |
* in the snippet has an initializer, the field is initialized by |
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
72 |
* calling the DOIT_METHOD_NAME method. |
33362 | 73 |
* |
48610
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
74 |
* In some cases, the real inferred type of the variable may be non-denotable |
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
75 |
* (e.g. intersection types). The declared type of the field must always |
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
76 |
* be denotable (i.e. such that it can be written into the classfile), but |
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
77 |
* if the real type is potentially non-denotable, the {@code enhanced} parameter |
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
78 |
* must be true. |
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
79 |
* |
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
80 |
* @param source the snippet's masked source code |
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
81 |
* @param wtype variable's denotable type suitable for field declaration |
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
82 |
* @param brackets any [] that should be appended to the type |
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
83 |
* @param rname range in source that denotes the name of the |
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
84 |
* @param winit Initializer or null |
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
85 |
* @param enhanced if the real inferred type of the variable is potentially |
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
86 |
* non-denotable, this must be true |
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
87 |
* @return a Wrap that declares the given variable, potentially with |
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
88 |
* an initialization method |
33362 | 89 |
*/ |
47268
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
90 |
public static Wrap varWrap(String source, Wrap wtype, String brackets, |
48610
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
91 |
Range rname, Wrap winit, boolean enhanced, |
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
92 |
Wrap anonDeclareWrap) { |
33362 | 93 |
RangeWrap wname = new RangeWrap(source, rname); |
48610
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
94 |
List<Object> components = new ArrayList<>(); |
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
95 |
components.add(new VarDeclareWrap(wtype, brackets, wname)); |
33362 | 96 |
Wrap wmeth; |
97 |
||
47268
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
98 |
if (winit == null) { |
33362 | 99 |
wmeth = new CompoundWrap(new NoWrap(" "), " return null;\n"); |
100 |
} else { |
|
48610
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
101 |
// int x = y |
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
102 |
if (enhanced) { |
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
103 |
// private static <Z> Z do_itAux() { |
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
104 |
// wtype x_ = y; |
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
105 |
// @SuppressWarnings("unchecked") |
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
106 |
// Z x__ = (Z) x_; |
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
107 |
// return x__; |
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
108 |
// } |
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
109 |
// in do_it method: |
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
110 |
//return do_itAux(); |
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
111 |
Wrap waux = new CompoundWrap( |
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
112 |
" private static <Z> Z ", DOIT_METHOD_NAME + "Aux", "() throws Throwable {\n", |
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
113 |
wtype, brackets + " ", wname, "_ =\n ", winit, semi(winit), |
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
114 |
" @SuppressWarnings(\"unchecked\") Z ", wname, "__ = (Z)", wname, "_;\n", |
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
115 |
" return ", wname, "__;\n", |
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
116 |
"}" |
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
117 |
); |
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
118 |
components.add(waux); |
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
119 |
wmeth = new CompoundWrap( |
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
120 |
" return ", wname, " = ", DOIT_METHOD_NAME + "Aux", "();\n" |
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
121 |
); |
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
122 |
} else { |
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
123 |
// int x_ = y; return x = x_; |
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
124 |
// decl + "_ = " + init ; + "return " + name + "= " + name + "_ ;" |
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
125 |
wmeth = new CompoundWrap( |
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
126 |
wtype, brackets + " ", wname, "_ =\n ", winit, semi(winit), |
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
127 |
" return ", wname, " = ", wname, "_;\n" |
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
128 |
); |
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
129 |
} |
33362 | 130 |
} |
48610
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
131 |
components.add(new DoitMethodWrap(wmeth)); |
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
132 |
if (anonDeclareWrap != null) { |
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
133 |
components.add(anonDeclareWrap); |
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
134 |
} |
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
135 |
return new CompoundWrap(components.toArray()); |
33362 | 136 |
} |
137 |
||
48610
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
138 |
public static Wrap tempVarWrap(String source, String typename, String name, Wrap anonDeclareWrap) { |
33362 | 139 |
RangeWrap winit = new NoWrap(source); |
140 |
// y |
|
141 |
// return $1 = y; |
|
142 |
// "return " + $1 + "=" + init ; |
|
143 |
Wrap wmeth = new CompoundWrap("return " + name + " =\n ", winit, semi(winit)); |
|
144 |
Wrap wInitMeth = new DoitMethodWrap(wmeth); |
|
145 |
||
146 |
String varDecl = " public static\n " + typename + " " + name + ";\n"; |
|
48610
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
147 |
return anonDeclareWrap != null ? new CompoundWrap(varDecl, wInitMeth, anonDeclareWrap) |
a587f95313f1
8191842: JShell: Inferred type information is lost when assigning types to a \"var\"
jlahoda
parents:
47268
diff
changeset
|
148 |
: new CompoundWrap(varDecl, wInitMeth); |
33362 | 149 |
} |
150 |
||
36780
6bf2bef08a91
8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents:
36499
diff
changeset
|
151 |
public static Wrap simpleWrap(String source) { |
33362 | 152 |
return new NoWrap(source); |
153 |
} |
|
154 |
||
47268
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
155 |
public static Wrap identityWrap(String source) { |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
156 |
return new NoWrap(source); |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
157 |
} |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
158 |
|
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
159 |
public static Wrap rangeWrap(String source, Range range) { |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
160 |
return new RangeWrap(source, range); |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
161 |
} |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
162 |
|
33362 | 163 |
public static Wrap classMemberWrap(String source) { |
164 |
Wrap w = new NoWrap(source); |
|
165 |
return new CompoundWrap(" public static\n ", w); |
|
166 |
} |
|
167 |
||
168 |
private static int countLines(String s) { |
|
169 |
return countLines(s, 0, s.length()); |
|
170 |
} |
|
171 |
||
172 |
private static int countLines(String s, int from, int toEx) { |
|
173 |
int cnt = 0; |
|
174 |
int idx = from; |
|
175 |
while ((idx = s.indexOf('\n', idx)) > 0) { |
|
176 |
if (idx >= toEx) break; |
|
177 |
++cnt; |
|
178 |
++idx; |
|
179 |
} |
|
180 |
return cnt; |
|
181 |
} |
|
182 |
||
183 |
public static final class Range { |
|
184 |
final int begin; |
|
55397
5eeee2cc94f5
8200701: jdk/jshell/ExceptionsTest.java fails on Windows, after JDK-8198801
rfield
parents:
48610
diff
changeset
|
185 |
final int end; // exclusive |
33362 | 186 |
|
187 |
Range(int begin, int end) { |
|
188 |
this.begin = begin; |
|
189 |
this.end = end; |
|
190 |
} |
|
191 |
||
192 |
Range(String s) { |
|
193 |
this.begin = 0; |
|
194 |
this.end = s.length(); |
|
195 |
} |
|
196 |
||
197 |
String part(String s) { |
|
198 |
return s.substring(begin, end); |
|
199 |
} |
|
200 |
||
201 |
int length() { |
|
202 |
return end - begin; |
|
203 |
} |
|
204 |
||
205 |
boolean isEmpty() { |
|
206 |
return end == begin; |
|
207 |
} |
|
208 |
||
209 |
void verify(String s) { |
|
210 |
if (begin < 0 || end <= begin || end > s.length()) { |
|
211 |
throw new InternalError("Bad Range: " + s + "[" + begin + "," + end + "]"); |
|
212 |
} |
|
213 |
} |
|
214 |
||
215 |
@Override |
|
216 |
public String toString() { |
|
55397
5eeee2cc94f5
8200701: jdk/jshell/ExceptionsTest.java fails on Windows, after JDK-8198801
rfield
parents:
48610
diff
changeset
|
217 |
return "Range[" + begin + "," + end + ")"; |
33362 | 218 |
} |
219 |
} |
|
220 |
||
221 |
public static class CompoundWrap extends Wrap { |
|
222 |
||
223 |
final Object[] os; |
|
224 |
final String wrapped; |
|
225 |
final int snidxFirst; |
|
226 |
final int snidxLast; |
|
227 |
final int snlineFirst; |
|
228 |
final int snlineLast; |
|
229 |
||
230 |
CompoundWrap(Object... os) { |
|
231 |
this.os = os; |
|
232 |
int sniFirst = Integer.MAX_VALUE; |
|
233 |
int sniLast = Integer.MIN_VALUE; |
|
234 |
int snlnFirst = Integer.MAX_VALUE; |
|
235 |
int snlnLast = Integer.MIN_VALUE; |
|
236 |
StringBuilder sb = new StringBuilder(); |
|
237 |
for (Object o : os) { |
|
238 |
if (o instanceof String) { |
|
239 |
String s = (String) o; |
|
240 |
sb.append(s); |
|
241 |
} else if (o instanceof Wrap) { |
|
242 |
Wrap w = (Wrap) o; |
|
243 |
if (w.firstSnippetIndex() < sniFirst) { |
|
244 |
sniFirst = w.firstSnippetIndex(); |
|
245 |
} |
|
246 |
if (w.lastSnippetIndex() > sniLast) { |
|
247 |
sniLast = w.lastSnippetIndex(); |
|
248 |
} |
|
249 |
if (w.firstSnippetLine() < snlnFirst) { |
|
250 |
snlnFirst = w.firstSnippetLine(); |
|
251 |
} |
|
252 |
if (w.lastSnippetLine() > snlnLast) { |
|
253 |
snlnLast = w.lastSnippetLine(); |
|
254 |
} |
|
255 |
sb.append(w.wrapped()); |
|
256 |
} else { |
|
257 |
throw new InternalError("Bad object in CommoundWrap: " + o); |
|
258 |
} |
|
259 |
} |
|
260 |
this.wrapped = sb.toString(); |
|
261 |
this.snidxFirst = sniFirst; |
|
262 |
this.snidxLast = sniLast; |
|
263 |
this.snlineFirst = snlnFirst; |
|
264 |
this.snlineLast = snlnLast; |
|
265 |
} |
|
266 |
||
267 |
@Override |
|
268 |
public String wrapped() { |
|
269 |
return wrapped; |
|
270 |
} |
|
271 |
||
272 |
@Override |
|
273 |
public int snippetIndexToWrapIndex(int sni) { |
|
274 |
int before = 0; |
|
275 |
for (Object o : os) { |
|
276 |
if (o instanceof String) { |
|
277 |
String s = (String) o; |
|
278 |
before += s.length(); |
|
279 |
} else if (o instanceof Wrap) { |
|
280 |
Wrap w = (Wrap) o; |
|
55397
5eeee2cc94f5
8200701: jdk/jshell/ExceptionsTest.java fails on Windows, after JDK-8198801
rfield
parents:
48610
diff
changeset
|
281 |
if (sni >= w.firstSnippetIndex() && sni < w.lastSnippetIndex()) { |
5eeee2cc94f5
8200701: jdk/jshell/ExceptionsTest.java fails on Windows, after JDK-8198801
rfield
parents:
48610
diff
changeset
|
282 |
int wwi = w.snippetIndexToWrapIndex(sni); |
5eeee2cc94f5
8200701: jdk/jshell/ExceptionsTest.java fails on Windows, after JDK-8198801
rfield
parents:
48610
diff
changeset
|
283 |
debugWrap("\nCommoundWrap.snippetIndexToWrapIndex: SnippetIndex(%d) -> WrapIndex(%d + %d = %d)" |
5eeee2cc94f5
8200701: jdk/jshell/ExceptionsTest.java fails on Windows, after JDK-8198801
rfield
parents:
48610
diff
changeset
|
284 |
+ "\n === %s", |
5eeee2cc94f5
8200701: jdk/jshell/ExceptionsTest.java fails on Windows, after JDK-8198801
rfield
parents:
48610
diff
changeset
|
285 |
sni, wwi, before, wwi + before, wrapped()); |
5eeee2cc94f5
8200701: jdk/jshell/ExceptionsTest.java fails on Windows, after JDK-8198801
rfield
parents:
48610
diff
changeset
|
286 |
return wwi + before; |
33362 | 287 |
} |
288 |
before += w.wrapped().length(); |
|
289 |
} |
|
290 |
} |
|
291 |
return 0; |
|
292 |
} |
|
293 |
||
37644
33cf53901cac
8154485: JShell: infrastructure for multi-Snippet class wrappers
rfield
parents:
36780
diff
changeset
|
294 |
Wrap wrapIndexToWrap(long wi) { |
33cf53901cac
8154485: JShell: infrastructure for multi-Snippet class wrappers
rfield
parents:
36780
diff
changeset
|
295 |
int before = 0; |
33cf53901cac
8154485: JShell: infrastructure for multi-Snippet class wrappers
rfield
parents:
36780
diff
changeset
|
296 |
Wrap w = null; |
33cf53901cac
8154485: JShell: infrastructure for multi-Snippet class wrappers
rfield
parents:
36780
diff
changeset
|
297 |
for (Object o : os) { |
33cf53901cac
8154485: JShell: infrastructure for multi-Snippet class wrappers
rfield
parents:
36780
diff
changeset
|
298 |
if (o instanceof String) { |
33cf53901cac
8154485: JShell: infrastructure for multi-Snippet class wrappers
rfield
parents:
36780
diff
changeset
|
299 |
String s = (String) o; |
33cf53901cac
8154485: JShell: infrastructure for multi-Snippet class wrappers
rfield
parents:
36780
diff
changeset
|
300 |
before += s.length(); |
33cf53901cac
8154485: JShell: infrastructure for multi-Snippet class wrappers
rfield
parents:
36780
diff
changeset
|
301 |
} else if (o instanceof Wrap) { |
33cf53901cac
8154485: JShell: infrastructure for multi-Snippet class wrappers
rfield
parents:
36780
diff
changeset
|
302 |
w = (Wrap) o; |
33cf53901cac
8154485: JShell: infrastructure for multi-Snippet class wrappers
rfield
parents:
36780
diff
changeset
|
303 |
int len = w.wrapped().length(); |
33cf53901cac
8154485: JShell: infrastructure for multi-Snippet class wrappers
rfield
parents:
36780
diff
changeset
|
304 |
if ((wi - before) <= len) { |
55397
5eeee2cc94f5
8200701: jdk/jshell/ExceptionsTest.java fails on Windows, after JDK-8198801
rfield
parents:
48610
diff
changeset
|
305 |
debugWrap("CommoundWrap.wrapIndexToWrap: Defer to wrap %s - wi: %d. before; %d >>> %s\n", |
5eeee2cc94f5
8200701: jdk/jshell/ExceptionsTest.java fails on Windows, after JDK-8198801
rfield
parents:
48610
diff
changeset
|
306 |
w, wi, before, w.wrapped()); |
37644
33cf53901cac
8154485: JShell: infrastructure for multi-Snippet class wrappers
rfield
parents:
36780
diff
changeset
|
307 |
return w; |
33cf53901cac
8154485: JShell: infrastructure for multi-Snippet class wrappers
rfield
parents:
36780
diff
changeset
|
308 |
} |
33cf53901cac
8154485: JShell: infrastructure for multi-Snippet class wrappers
rfield
parents:
36780
diff
changeset
|
309 |
before += len; |
33cf53901cac
8154485: JShell: infrastructure for multi-Snippet class wrappers
rfield
parents:
36780
diff
changeset
|
310 |
} |
33cf53901cac
8154485: JShell: infrastructure for multi-Snippet class wrappers
rfield
parents:
36780
diff
changeset
|
311 |
} |
33cf53901cac
8154485: JShell: infrastructure for multi-Snippet class wrappers
rfield
parents:
36780
diff
changeset
|
312 |
return w; |
33cf53901cac
8154485: JShell: infrastructure for multi-Snippet class wrappers
rfield
parents:
36780
diff
changeset
|
313 |
} |
33cf53901cac
8154485: JShell: infrastructure for multi-Snippet class wrappers
rfield
parents:
36780
diff
changeset
|
314 |
|
33362 | 315 |
@Override |
316 |
public int wrapIndexToSnippetIndex(int wi) { |
|
317 |
int before = 0; |
|
318 |
for (Object o : os) { |
|
319 |
if (o instanceof String) { |
|
320 |
String s = (String) o; |
|
321 |
before += s.length(); |
|
322 |
} else if (o instanceof Wrap) { |
|
323 |
Wrap w = (Wrap) o; |
|
324 |
int len = w.wrapped().length(); |
|
325 |
if ((wi - before) <= len) { |
|
55397
5eeee2cc94f5
8200701: jdk/jshell/ExceptionsTest.java fails on Windows, after JDK-8198801
rfield
parents:
48610
diff
changeset
|
326 |
int si = w.wrapIndexToSnippetIndex(wi - before); |
5eeee2cc94f5
8200701: jdk/jshell/ExceptionsTest.java fails on Windows, after JDK-8198801
rfield
parents:
48610
diff
changeset
|
327 |
debugWrap("\nCommoundWrap.wrapIndexToSnippetIndex: WrapIndex(%d) -> SnippetIndex(%d)\n", |
5eeee2cc94f5
8200701: jdk/jshell/ExceptionsTest.java fails on Windows, after JDK-8198801
rfield
parents:
48610
diff
changeset
|
328 |
wi, si); |
5eeee2cc94f5
8200701: jdk/jshell/ExceptionsTest.java fails on Windows, after JDK-8198801
rfield
parents:
48610
diff
changeset
|
329 |
return si; |
33362 | 330 |
} |
331 |
before += len; |
|
332 |
} |
|
333 |
} |
|
334 |
return lastSnippetIndex(); |
|
335 |
} |
|
336 |
||
337 |
@Override |
|
338 |
public int firstSnippetIndex() { |
|
339 |
return snidxFirst; |
|
340 |
} |
|
341 |
||
342 |
@Override |
|
343 |
public int lastSnippetIndex() { |
|
344 |
return snidxLast; |
|
345 |
} |
|
346 |
||
347 |
@Override |
|
348 |
public int snippetLineToWrapLine(int snline) { |
|
349 |
int before = 0; |
|
350 |
for (Object o : os) { |
|
351 |
if (o instanceof String) { |
|
352 |
String s = (String) o; |
|
353 |
before += countLines(s); |
|
354 |
} else if (o instanceof Wrap) { |
|
355 |
Wrap w = (Wrap) o; |
|
356 |
if (snline >= w.firstSnippetLine() && snline <= w.lastSnippetLine()) { |
|
357 |
return w.snippetLineToWrapLine(snline) + before; |
|
358 |
} |
|
359 |
before += countLines(w.wrapped()); |
|
360 |
} |
|
361 |
} |
|
362 |
return 0; |
|
363 |
} |
|
364 |
||
37644
33cf53901cac
8154485: JShell: infrastructure for multi-Snippet class wrappers
rfield
parents:
36780
diff
changeset
|
365 |
Wrap wrapLineToWrap(int wline) { |
33cf53901cac
8154485: JShell: infrastructure for multi-Snippet class wrappers
rfield
parents:
36780
diff
changeset
|
366 |
int before = 0; |
33cf53901cac
8154485: JShell: infrastructure for multi-Snippet class wrappers
rfield
parents:
36780
diff
changeset
|
367 |
Wrap w = null; |
33cf53901cac
8154485: JShell: infrastructure for multi-Snippet class wrappers
rfield
parents:
36780
diff
changeset
|
368 |
for (Object o : os) { |
33cf53901cac
8154485: JShell: infrastructure for multi-Snippet class wrappers
rfield
parents:
36780
diff
changeset
|
369 |
if (o instanceof String) { |
33cf53901cac
8154485: JShell: infrastructure for multi-Snippet class wrappers
rfield
parents:
36780
diff
changeset
|
370 |
String s = (String) o; |
33cf53901cac
8154485: JShell: infrastructure for multi-Snippet class wrappers
rfield
parents:
36780
diff
changeset
|
371 |
before += countLines(s); |
33cf53901cac
8154485: JShell: infrastructure for multi-Snippet class wrappers
rfield
parents:
36780
diff
changeset
|
372 |
} else if (o instanceof Wrap) { |
33cf53901cac
8154485: JShell: infrastructure for multi-Snippet class wrappers
rfield
parents:
36780
diff
changeset
|
373 |
w = (Wrap) o; |
33cf53901cac
8154485: JShell: infrastructure for multi-Snippet class wrappers
rfield
parents:
36780
diff
changeset
|
374 |
int lns = countLines(w.wrapped()); |
55397
5eeee2cc94f5
8200701: jdk/jshell/ExceptionsTest.java fails on Windows, after JDK-8198801
rfield
parents:
48610
diff
changeset
|
375 |
if ((wline - before) <= lns) { |
37644
33cf53901cac
8154485: JShell: infrastructure for multi-Snippet class wrappers
rfield
parents:
36780
diff
changeset
|
376 |
return w; |
33cf53901cac
8154485: JShell: infrastructure for multi-Snippet class wrappers
rfield
parents:
36780
diff
changeset
|
377 |
} |
33cf53901cac
8154485: JShell: infrastructure for multi-Snippet class wrappers
rfield
parents:
36780
diff
changeset
|
378 |
before += lns; |
33cf53901cac
8154485: JShell: infrastructure for multi-Snippet class wrappers
rfield
parents:
36780
diff
changeset
|
379 |
} |
33cf53901cac
8154485: JShell: infrastructure for multi-Snippet class wrappers
rfield
parents:
36780
diff
changeset
|
380 |
} |
33cf53901cac
8154485: JShell: infrastructure for multi-Snippet class wrappers
rfield
parents:
36780
diff
changeset
|
381 |
return w; |
33cf53901cac
8154485: JShell: infrastructure for multi-Snippet class wrappers
rfield
parents:
36780
diff
changeset
|
382 |
} |
33cf53901cac
8154485: JShell: infrastructure for multi-Snippet class wrappers
rfield
parents:
36780
diff
changeset
|
383 |
|
33362 | 384 |
@Override |
385 |
public int wrapLineToSnippetLine(int wline) { |
|
386 |
int before = 0; |
|
387 |
for (Object o : os) { |
|
388 |
if (o instanceof String) { |
|
389 |
String s = (String) o; |
|
390 |
before += countLines(s); |
|
391 |
} else if (o instanceof Wrap) { |
|
392 |
Wrap w = (Wrap) o; |
|
393 |
int lns = countLines(w.wrapped()); |
|
55397
5eeee2cc94f5
8200701: jdk/jshell/ExceptionsTest.java fails on Windows, after JDK-8198801
rfield
parents:
48610
diff
changeset
|
394 |
if ((wline - before) <= lns) { |
33362 | 395 |
return w.wrapLineToSnippetLine(wline - before); |
396 |
} |
|
397 |
before += lns; |
|
398 |
} |
|
399 |
} |
|
400 |
return 0; |
|
401 |
} |
|
402 |
||
403 |
@Override |
|
404 |
public int firstSnippetLine() { |
|
405 |
return snlineFirst; |
|
406 |
} |
|
407 |
||
408 |
@Override |
|
409 |
public int lastSnippetLine() { |
|
410 |
return snlineLast; |
|
411 |
} |
|
412 |
||
37644
33cf53901cac
8154485: JShell: infrastructure for multi-Snippet class wrappers
rfield
parents:
36780
diff
changeset
|
413 |
@Override |
33cf53901cac
8154485: JShell: infrastructure for multi-Snippet class wrappers
rfield
parents:
36780
diff
changeset
|
414 |
public String toString() { |
55397
5eeee2cc94f5
8200701: jdk/jshell/ExceptionsTest.java fails on Windows, after JDK-8198801
rfield
parents:
48610
diff
changeset
|
415 |
return "CompoundWrap(" + Arrays.stream(os) |
5eeee2cc94f5
8200701: jdk/jshell/ExceptionsTest.java fails on Windows, after JDK-8198801
rfield
parents:
48610
diff
changeset
|
416 |
.map(o -> (o instanceof String) |
5eeee2cc94f5
8200701: jdk/jshell/ExceptionsTest.java fails on Windows, after JDK-8198801
rfield
parents:
48610
diff
changeset
|
417 |
? "\"" + o + "\"" |
5eeee2cc94f5
8200701: jdk/jshell/ExceptionsTest.java fails on Windows, after JDK-8198801
rfield
parents:
48610
diff
changeset
|
418 |
: o.toString()) |
5eeee2cc94f5
8200701: jdk/jshell/ExceptionsTest.java fails on Windows, after JDK-8198801
rfield
parents:
48610
diff
changeset
|
419 |
.collect(joining(",")) |
5eeee2cc94f5
8200701: jdk/jshell/ExceptionsTest.java fails on Windows, after JDK-8198801
rfield
parents:
48610
diff
changeset
|
420 |
+ ")"; |
37644
33cf53901cac
8154485: JShell: infrastructure for multi-Snippet class wrappers
rfield
parents:
36780
diff
changeset
|
421 |
} |
33362 | 422 |
} |
423 |
||
55397
5eeee2cc94f5
8200701: jdk/jshell/ExceptionsTest.java fails on Windows, after JDK-8198801
rfield
parents:
48610
diff
changeset
|
424 |
static class RangeWrap extends Wrap { |
33362 | 425 |
|
426 |
final Range range; |
|
55397
5eeee2cc94f5
8200701: jdk/jshell/ExceptionsTest.java fails on Windows, after JDK-8198801
rfield
parents:
48610
diff
changeset
|
427 |
final String wrapped; // The snippet portion of the source |
5eeee2cc94f5
8200701: jdk/jshell/ExceptionsTest.java fails on Windows, after JDK-8198801
rfield
parents:
48610
diff
changeset
|
428 |
final int firstSnline; // Line count to start of snippet portion |
5eeee2cc94f5
8200701: jdk/jshell/ExceptionsTest.java fails on Windows, after JDK-8198801
rfield
parents:
48610
diff
changeset
|
429 |
final int lastSnline; // Line count to end of snippet portion |
33362 | 430 |
|
431 |
RangeWrap(String snippetSource, Range usedWithinSnippet) { |
|
432 |
this.range = usedWithinSnippet; |
|
433 |
this.wrapped = usedWithinSnippet.part(snippetSource); |
|
434 |
usedWithinSnippet.verify(snippetSource); |
|
435 |
this.firstSnline = countLines(snippetSource, 0, range.begin); |
|
436 |
this.lastSnline = firstSnline + countLines(snippetSource, range.begin, range.end); |
|
437 |
} |
|
438 |
||
439 |
@Override |
|
440 |
public String wrapped() { |
|
441 |
return wrapped; |
|
442 |
} |
|
443 |
||
444 |
@Override |
|
445 |
public int snippetIndexToWrapIndex(int sni) { |
|
446 |
if (sni < range.begin) { |
|
55397
5eeee2cc94f5
8200701: jdk/jshell/ExceptionsTest.java fails on Windows, after JDK-8198801
rfield
parents:
48610
diff
changeset
|
447 |
debugWrap("\nRangeWrap.snippetIndexToWrapIndex: ERR before SnippetIndex(%d) -> WrapIndex(%d + %d = %d)\n", |
5eeee2cc94f5
8200701: jdk/jshell/ExceptionsTest.java fails on Windows, after JDK-8198801
rfield
parents:
48610
diff
changeset
|
448 |
sni, 0); |
33362 | 449 |
return 0; |
450 |
} |
|
451 |
if (sni > range.end) { |
|
55397
5eeee2cc94f5
8200701: jdk/jshell/ExceptionsTest.java fails on Windows, after JDK-8198801
rfield
parents:
48610
diff
changeset
|
452 |
debugWrap("\nRangeWrap.snippetIndexToWrapIndex: ERR after SnippetIndex(%d) -> WrapIndex(%d + %d = %d)\n", |
5eeee2cc94f5
8200701: jdk/jshell/ExceptionsTest.java fails on Windows, after JDK-8198801
rfield
parents:
48610
diff
changeset
|
453 |
sni, range.length()); |
33362 | 454 |
return range.length(); |
455 |
} |
|
55397
5eeee2cc94f5
8200701: jdk/jshell/ExceptionsTest.java fails on Windows, after JDK-8198801
rfield
parents:
48610
diff
changeset
|
456 |
int wi = sni - range.begin; |
5eeee2cc94f5
8200701: jdk/jshell/ExceptionsTest.java fails on Windows, after JDK-8198801
rfield
parents:
48610
diff
changeset
|
457 |
debugWrap("\nRangeWrap.snippetIndexToWrapIndex: SnippetIndex(%d) -> WrapIndex(%d + %d = %d)" |
5eeee2cc94f5
8200701: jdk/jshell/ExceptionsTest.java fails on Windows, after JDK-8198801
rfield
parents:
48610
diff
changeset
|
458 |
+ "\n === %s", |
5eeee2cc94f5
8200701: jdk/jshell/ExceptionsTest.java fails on Windows, after JDK-8198801
rfield
parents:
48610
diff
changeset
|
459 |
sni, sni, range.begin, sni - range.begin, wrapped()); |
5eeee2cc94f5
8200701: jdk/jshell/ExceptionsTest.java fails on Windows, after JDK-8198801
rfield
parents:
48610
diff
changeset
|
460 |
return wi; |
33362 | 461 |
} |
462 |
||
463 |
@Override |
|
464 |
public int wrapIndexToSnippetIndex(int wi) { |
|
465 |
if (wi < 0) { |
|
55397
5eeee2cc94f5
8200701: jdk/jshell/ExceptionsTest.java fails on Windows, after JDK-8198801
rfield
parents:
48610
diff
changeset
|
466 |
debugWrap("\nRangeWrap.wrapIndexToSnippetIndex: ERR before WrapIndex(%d) -> SnippetIndex(%d)\n", |
5eeee2cc94f5
8200701: jdk/jshell/ExceptionsTest.java fails on Windows, after JDK-8198801
rfield
parents:
48610
diff
changeset
|
467 |
wi, 0); |
33362 | 468 |
return 0; // bad index |
469 |
} |
|
470 |
int max = range.length(); |
|
471 |
if (wi > max) { |
|
55397
5eeee2cc94f5
8200701: jdk/jshell/ExceptionsTest.java fails on Windows, after JDK-8198801
rfield
parents:
48610
diff
changeset
|
472 |
debugWrap("\nRangeWrap.wrapIndexToSnippetIndex: ERR after WrapIndex(%d) -> SnippetIndex(%d)\n", |
5eeee2cc94f5
8200701: jdk/jshell/ExceptionsTest.java fails on Windows, after JDK-8198801
rfield
parents:
48610
diff
changeset
|
473 |
wi, max + range.begin); |
5eeee2cc94f5
8200701: jdk/jshell/ExceptionsTest.java fails on Windows, after JDK-8198801
rfield
parents:
48610
diff
changeset
|
474 |
return max + range.begin; |
33362 | 475 |
} |
55397
5eeee2cc94f5
8200701: jdk/jshell/ExceptionsTest.java fails on Windows, after JDK-8198801
rfield
parents:
48610
diff
changeset
|
476 |
int sni = wi + range.begin; |
5eeee2cc94f5
8200701: jdk/jshell/ExceptionsTest.java fails on Windows, after JDK-8198801
rfield
parents:
48610
diff
changeset
|
477 |
debugWrap("\nRangeWrap.wrapIndexToSnippetIndex: WrapIndex(%d) -> SnippetIndex(%d)\n", |
5eeee2cc94f5
8200701: jdk/jshell/ExceptionsTest.java fails on Windows, after JDK-8198801
rfield
parents:
48610
diff
changeset
|
478 |
wi, sni); |
5eeee2cc94f5
8200701: jdk/jshell/ExceptionsTest.java fails on Windows, after JDK-8198801
rfield
parents:
48610
diff
changeset
|
479 |
return sni; |
33362 | 480 |
} |
481 |
||
482 |
@Override |
|
483 |
public int firstSnippetIndex() { |
|
484 |
return range.begin; |
|
485 |
} |
|
486 |
||
487 |
@Override |
|
488 |
public int lastSnippetIndex() { |
|
489 |
return range.end; |
|
490 |
} |
|
491 |
||
492 |
@Override |
|
493 |
public int snippetLineToWrapLine(int snline) { |
|
494 |
if (snline < firstSnline) { |
|
495 |
return 0; |
|
496 |
} |
|
497 |
if (snline >= lastSnline) { |
|
498 |
return lastSnline - firstSnline; |
|
499 |
} |
|
500 |
return snline - firstSnline; |
|
501 |
} |
|
502 |
||
503 |
@Override |
|
504 |
public int wrapLineToSnippetLine(int wline) { |
|
505 |
if (wline < 0) { |
|
506 |
return 0; // bad index |
|
507 |
} |
|
508 |
int max = lastSnline - firstSnline; |
|
509 |
if (wline > max) { |
|
510 |
wline = max; |
|
511 |
} |
|
512 |
return wline + firstSnline; |
|
513 |
} |
|
514 |
||
515 |
@Override |
|
516 |
public int firstSnippetLine() { |
|
517 |
return firstSnline; |
|
518 |
} |
|
519 |
||
520 |
@Override |
|
521 |
public int lastSnippetLine() { |
|
522 |
return lastSnline; |
|
523 |
} |
|
524 |
||
37644
33cf53901cac
8154485: JShell: infrastructure for multi-Snippet class wrappers
rfield
parents:
36780
diff
changeset
|
525 |
@Override |
33cf53901cac
8154485: JShell: infrastructure for multi-Snippet class wrappers
rfield
parents:
36780
diff
changeset
|
526 |
public String toString() { |
33cf53901cac
8154485: JShell: infrastructure for multi-Snippet class wrappers
rfield
parents:
36780
diff
changeset
|
527 |
return "RangeWrap(" + range + ")"; |
33cf53901cac
8154485: JShell: infrastructure for multi-Snippet class wrappers
rfield
parents:
36780
diff
changeset
|
528 |
} |
33362 | 529 |
} |
530 |
||
531 |
private static class NoWrap extends RangeWrap { |
|
532 |
||
533 |
NoWrap(String unit) { |
|
534 |
super(unit, new Range(unit)); |
|
535 |
} |
|
536 |
} |
|
537 |
||
538 |
private static String semi(Wrap w) { |
|
539 |
return semi(w.wrapped()); |
|
540 |
} |
|
541 |
||
542 |
private static String semi(String s) { |
|
543 |
return ((s.endsWith(";")) ? "\n" : ((s.endsWith(";\n")) ? "" : ";\n")); |
|
544 |
} |
|
545 |
||
546 |
private static class DoitMethodWrap extends CompoundWrap { |
|
547 |
||
548 |
DoitMethodWrap(Wrap w) { |
|
549 |
super(" public static Object " + DOIT_METHOD_NAME + "() throws Throwable {\n" |
|
550 |
+ " ", w, |
|
551 |
" }\n"); |
|
552 |
} |
|
553 |
} |
|
554 |
||
555 |
private static class VarDeclareWrap extends CompoundWrap { |
|
556 |
||
557 |
VarDeclareWrap(Wrap wtype, String brackets, Wrap wname) { |
|
558 |
super(" public static ", wtype, brackets + " ", wname, semi(wname)); |
|
559 |
} |
|
560 |
} |
|
55397
5eeee2cc94f5
8200701: jdk/jshell/ExceptionsTest.java fails on Windows, after JDK-8198801
rfield
parents:
48610
diff
changeset
|
561 |
|
5eeee2cc94f5
8200701: jdk/jshell/ExceptionsTest.java fails on Windows, after JDK-8198801
rfield
parents:
48610
diff
changeset
|
562 |
void debugWrap(String format, Object... args) { |
5eeee2cc94f5
8200701: jdk/jshell/ExceptionsTest.java fails on Windows, after JDK-8198801
rfield
parents:
48610
diff
changeset
|
563 |
//System.err.printf(format, args); |
5eeee2cc94f5
8200701: jdk/jshell/ExceptionsTest.java fails on Windows, after JDK-8198801
rfield
parents:
48610
diff
changeset
|
564 |
//state.debug(this, InternalDebugControl.DBG_WRAP, format, args); |
5eeee2cc94f5
8200701: jdk/jshell/ExceptionsTest.java fails on Windows, after JDK-8198801
rfield
parents:
48610
diff
changeset
|
565 |
} |
33362 | 566 |
} |