langtools/src/jdk.jshell/share/classes/jdk/jshell/Corraller.java
author mcimadamore
Fri, 16 Dec 2016 15:27:47 +0000
changeset 42828 cce89649f958
parent 38535 4a25025e0b0d
permissions -rw-r--r--
8171371: Remove redundant type-arguments from generic method calls Reviewed-by: jjg, rfield, mchung
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
36499
9d823cc0fe98 8080069: JShell: Support for corralled classes
rfield
parents:
diff changeset
     1
/*
9d823cc0fe98 8080069: JShell: Support for corralled classes
rfield
parents:
diff changeset
     2
 * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
9d823cc0fe98 8080069: JShell: Support for corralled classes
rfield
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
9d823cc0fe98 8080069: JShell: Support for corralled classes
rfield
parents:
diff changeset
     4
 *
9d823cc0fe98 8080069: JShell: Support for corralled classes
rfield
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
9d823cc0fe98 8080069: JShell: Support for corralled classes
rfield
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
9d823cc0fe98 8080069: JShell: Support for corralled classes
rfield
parents:
diff changeset
     7
 * published by the Free Software Foundation.  Oracle designates this
9d823cc0fe98 8080069: JShell: Support for corralled classes
rfield
parents:
diff changeset
     8
 * particular file as subject to the "Classpath" exception as provided
9d823cc0fe98 8080069: JShell: Support for corralled classes
rfield
parents:
diff changeset
     9
 * by Oracle in the LICENSE file that accompanied this code.
9d823cc0fe98 8080069: JShell: Support for corralled classes
rfield
parents:
diff changeset
    10
 *
9d823cc0fe98 8080069: JShell: Support for corralled classes
rfield
parents:
diff changeset
    11
 * This code is distributed in the hope that it will be useful, but WITHOUT
9d823cc0fe98 8080069: JShell: Support for corralled classes
rfield
parents:
diff changeset
    12
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
9d823cc0fe98 8080069: JShell: Support for corralled classes
rfield
parents:
diff changeset
    13
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
9d823cc0fe98 8080069: JShell: Support for corralled classes
rfield
parents:
diff changeset
    14
 * version 2 for more details (a copy is included in the LICENSE file that
9d823cc0fe98 8080069: JShell: Support for corralled classes
rfield
parents:
diff changeset
    15
 * accompanied this code).
9d823cc0fe98 8080069: JShell: Support for corralled classes
rfield
parents:
diff changeset
    16
 *
9d823cc0fe98 8080069: JShell: Support for corralled classes
rfield
parents:
diff changeset
    17
 * You should have received a copy of the GNU General Public License version
9d823cc0fe98 8080069: JShell: Support for corralled classes
rfield
parents:
diff changeset
    18
 * 2 along with this work; if not, write to the Free Software Foundation,
9d823cc0fe98 8080069: JShell: Support for corralled classes
rfield
parents:
diff changeset
    19
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
9d823cc0fe98 8080069: JShell: Support for corralled classes
rfield
parents:
diff changeset
    20
 *
9d823cc0fe98 8080069: JShell: Support for corralled classes
rfield
parents:
diff changeset
    21
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
9d823cc0fe98 8080069: JShell: Support for corralled classes
rfield
parents:
diff changeset
    22
 * or visit www.oracle.com if you need additional information or have any
9d823cc0fe98 8080069: JShell: Support for corralled classes
rfield
parents:
diff changeset
    23
 * questions.
9d823cc0fe98 8080069: JShell: Support for corralled classes
rfield
parents:
diff changeset
    24
 */
9d823cc0fe98 8080069: JShell: Support for corralled classes
rfield
parents:
diff changeset
    25
9d823cc0fe98 8080069: JShell: Support for corralled classes
rfield
parents:
diff changeset
    26
package jdk.jshell;
9d823cc0fe98 8080069: JShell: Support for corralled classes
rfield
parents:
diff changeset
    27
36780
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
    28
import java.io.IOException;
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
    29
import java.io.StringWriter;
36499
9d823cc0fe98 8080069: JShell: Support for corralled classes
rfield
parents:
diff changeset
    30
import com.sun.source.tree.ClassTree;
9d823cc0fe98 8080069: JShell: Support for corralled classes
rfield
parents:
diff changeset
    31
import com.sun.source.tree.MethodTree;
9d823cc0fe98 8080069: JShell: Support for corralled classes
rfield
parents:
diff changeset
    32
import com.sun.source.tree.Tree;
36780
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
    33
import com.sun.tools.javac.code.Flags;
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
    34
import com.sun.tools.javac.tree.JCTree;
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
    35
import com.sun.tools.javac.tree.JCTree.JCBlock;
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
    36
import com.sun.tools.javac.tree.JCTree.JCClassDecl;
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
    37
import com.sun.tools.javac.tree.JCTree.JCExpression;
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
    38
import com.sun.tools.javac.tree.JCTree.JCMethodDecl;
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
    39
import com.sun.tools.javac.tree.JCTree.JCNewClass;
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
    40
import com.sun.tools.javac.tree.JCTree.JCStatement;
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
    41
import com.sun.tools.javac.tree.JCTree.JCVariableDecl;
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
    42
import com.sun.tools.javac.tree.Pretty;
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
    43
import com.sun.tools.javac.tree.TreeMaker;
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
    44
import com.sun.tools.javac.util.Context;
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
    45
import com.sun.tools.javac.util.List;
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
    46
import com.sun.tools.javac.util.ListBuffer;
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
    47
import com.sun.tools.javac.util.Names;
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
    48
import static com.sun.tools.javac.code.Flags.STATIC;
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
    49
import static com.sun.tools.javac.code.Flags.INTERFACE;
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
    50
import static com.sun.tools.javac.code.Flags.ENUM;
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
    51
import static com.sun.tools.javac.code.Flags.PUBLIC;
38535
4a25025e0b0d 8156101: JShell SPI: Provide a pluggable execution control SPI
rfield
parents: 36780
diff changeset
    52
import com.sun.tools.javac.util.Name;
4a25025e0b0d 8156101: JShell SPI: Provide a pluggable execution control SPI
rfield
parents: 36780
diff changeset
    53
import jdk.jshell.spi.SPIResolutionException;
36499
9d823cc0fe98 8080069: JShell: Support for corralled classes
rfield
parents:
diff changeset
    54
9d823cc0fe98 8080069: JShell: Support for corralled classes
rfield
parents:
diff changeset
    55
/**
9d823cc0fe98 8080069: JShell: Support for corralled classes
rfield
parents:
diff changeset
    56
 * Produce a corralled version of the Wrap for a snippet.
36780
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
    57
 * Incoming tree is mutated.
36499
9d823cc0fe98 8080069: JShell: Support for corralled classes
rfield
parents:
diff changeset
    58
 *
9d823cc0fe98 8080069: JShell: Support for corralled classes
rfield
parents:
diff changeset
    59
 * @author Robert Field
9d823cc0fe98 8080069: JShell: Support for corralled classes
rfield
parents:
diff changeset
    60
 */
36780
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
    61
class Corraller extends Pretty {
36499
9d823cc0fe98 8080069: JShell: Support for corralled classes
rfield
parents:
diff changeset
    62
36780
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
    63
    private final StringWriter out;
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
    64
    private final int keyIndex;
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
    65
    private final TreeMaker make;
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
    66
    private final Names names;
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
    67
    private JCBlock resolutionExceptionBlock;
36499
9d823cc0fe98 8080069: JShell: Support for corralled classes
rfield
parents:
diff changeset
    68
36780
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
    69
    public Corraller(int keyIndex, Context context) {
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
    70
        this(new StringWriter(), keyIndex, context);
36499
9d823cc0fe98 8080069: JShell: Support for corralled classes
rfield
parents:
diff changeset
    71
    }
9d823cc0fe98 8080069: JShell: Support for corralled classes
rfield
parents:
diff changeset
    72
36780
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
    73
    private Corraller(StringWriter out, int keyIndex, Context context) {
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
    74
        super(out, false);
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
    75
        this.out = out;
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
    76
        this.keyIndex = keyIndex;
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
    77
        this.make = TreeMaker.instance(context);
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
    78
        this.names = Names.instance(context);
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
    79
    }
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
    80
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
    81
    public Wrap corralType(ClassTree ct) {
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
    82
        ((JCClassDecl) ct).mods.flags |= Flags.STATIC | Flags.PUBLIC;
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
    83
        return corral(ct);
36499
9d823cc0fe98 8080069: JShell: Support for corralled classes
rfield
parents:
diff changeset
    84
    }
9d823cc0fe98 8080069: JShell: Support for corralled classes
rfield
parents:
diff changeset
    85
36780
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
    86
    public Wrap corralMethod(MethodTree mt) {
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
    87
        ((JCMethodDecl) mt).mods.flags |= Flags.STATIC | Flags.PUBLIC;
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
    88
        return corral(mt);
36499
9d823cc0fe98 8080069: JShell: Support for corralled classes
rfield
parents:
diff changeset
    89
    }
9d823cc0fe98 8080069: JShell: Support for corralled classes
rfield
parents:
diff changeset
    90
36780
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
    91
    private Wrap corral(Tree tree) {
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
    92
        try {
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
    93
            printStat((JCTree) tree);
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
    94
        } catch (IOException e) {
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
    95
            throw new AssertionError(e);
36499
9d823cc0fe98 8080069: JShell: Support for corralled classes
rfield
parents:
diff changeset
    96
        }
36780
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
    97
        return Wrap.simpleWrap(out.toString());
36499
9d823cc0fe98 8080069: JShell: Support for corralled classes
rfield
parents:
diff changeset
    98
    }
9d823cc0fe98 8080069: JShell: Support for corralled classes
rfield
parents:
diff changeset
    99
36780
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
   100
    @Override
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
   101
    public void visitBlock(JCBlock tree) {
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
   102
        // Top-level executable blocks (usually method bodies) are corralled
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
   103
        super.visitBlock((tree.flags & STATIC) != 0
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
   104
                ? tree
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
   105
                : resolutionExceptionBlock());
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
   106
    }
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
   107
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
   108
    @Override
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
   109
    public void visitVarDef(JCVariableDecl tree) {
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
   110
        // No field inits in corralled classes
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
   111
        tree.init = null;
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
   112
        super.visitVarDef(tree);
36499
9d823cc0fe98 8080069: JShell: Support for corralled classes
rfield
parents:
diff changeset
   113
    }
9d823cc0fe98 8080069: JShell: Support for corralled classes
rfield
parents:
diff changeset
   114
36780
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
   115
    @Override
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
   116
    public void visitClassDef(JCClassDecl tree) {
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
   117
        if ((tree.mods.flags & (INTERFACE | ENUM)) == 0 &&
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
   118
                !tree.getMembers().stream()
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
   119
                .anyMatch(t -> t.getKind() == Tree.Kind.METHOD &&
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
   120
                ((MethodTree) t).getName() == tree.name.table.names.init)) {
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
   121
            // Generate a default constructor, since
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
   122
            // this is a regular class and there are no constructors
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
   123
            ListBuffer<JCTree> ndefs = new ListBuffer<>();
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
   124
            ndefs.addAll(tree.defs);
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
   125
            ndefs.add(make.MethodDef(make.Modifiers(PUBLIC),
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
   126
                    tree.name.table.names.init,
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
   127
                    null, List.nil(), List.nil(), List.nil(),
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
   128
                    resolutionExceptionBlock(), null));
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
   129
            tree.defs = ndefs.toList();
36499
9d823cc0fe98 8080069: JShell: Support for corralled classes
rfield
parents:
diff changeset
   130
        }
36780
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
   131
        super.visitClassDef(tree);
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
   132
    }
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
   133
38535
4a25025e0b0d 8156101: JShell SPI: Provide a pluggable execution control SPI
rfield
parents: 36780
diff changeset
   134
    // Build a compiler tree for an exception throwing block, e.g.:
4a25025e0b0d 8156101: JShell SPI: Provide a pluggable execution control SPI
rfield
parents: 36780
diff changeset
   135
    // {
4a25025e0b0d 8156101: JShell SPI: Provide a pluggable execution control SPI
rfield
parents: 36780
diff changeset
   136
    //     throw new jdk.jshell.spi.SPIResolutionException(9);
4a25025e0b0d 8156101: JShell SPI: Provide a pluggable execution control SPI
rfield
parents: 36780
diff changeset
   137
    // }
36780
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
   138
    private JCBlock resolutionExceptionBlock() {
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
   139
        if (resolutionExceptionBlock == null) {
38535
4a25025e0b0d 8156101: JShell SPI: Provide a pluggable execution control SPI
rfield
parents: 36780
diff changeset
   140
            JCExpression expClass = null;
4a25025e0b0d 8156101: JShell SPI: Provide a pluggable execution control SPI
rfield
parents: 36780
diff changeset
   141
            // Split the exception class name at dots
4a25025e0b0d 8156101: JShell SPI: Provide a pluggable execution control SPI
rfield
parents: 36780
diff changeset
   142
            for (String id : SPIResolutionException.class.getName().split("\\.")) {
4a25025e0b0d 8156101: JShell SPI: Provide a pluggable execution control SPI
rfield
parents: 36780
diff changeset
   143
                Name nm = names.fromString(id);
4a25025e0b0d 8156101: JShell SPI: Provide a pluggable execution control SPI
rfield
parents: 36780
diff changeset
   144
                if (expClass == null) {
4a25025e0b0d 8156101: JShell SPI: Provide a pluggable execution control SPI
rfield
parents: 36780
diff changeset
   145
                    expClass = make.Ident(nm);
4a25025e0b0d 8156101: JShell SPI: Provide a pluggable execution control SPI
rfield
parents: 36780
diff changeset
   146
                } else {
4a25025e0b0d 8156101: JShell SPI: Provide a pluggable execution control SPI
rfield
parents: 36780
diff changeset
   147
                    expClass = make.Select(expClass, nm);
4a25025e0b0d 8156101: JShell SPI: Provide a pluggable execution control SPI
rfield
parents: 36780
diff changeset
   148
                }
4a25025e0b0d 8156101: JShell SPI: Provide a pluggable execution control SPI
rfield
parents: 36780
diff changeset
   149
            }
36780
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
   150
            JCNewClass exp = make.NewClass(null,
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
   151
                    null, expClass, List.of(make.Literal(keyIndex)), null);
42828
cce89649f958 8171371: Remove redundant type-arguments from generic method calls
mcimadamore
parents: 38535
diff changeset
   152
            resolutionExceptionBlock = make.Block(0L, List.of(make.Throw(exp)));
36780
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
   153
        }
6bf2bef08a91 8152925: JShell: enable corralling of any type declaration, including enum
rfield
parents: 36499
diff changeset
   154
        return resolutionExceptionBlock;
36499
9d823cc0fe98 8080069: JShell: Support for corralled classes
rfield
parents:
diff changeset
   155
    }
9d823cc0fe98 8080069: JShell: Support for corralled classes
rfield
parents:
diff changeset
   156
}