jdk-sandbox: comparison langtools/src/jdk.jshell/share/classes/jdk/jshell/CompletenessAnalyzer.java

equal deleted inserted replaced

-:de8df2220540
+:83877f4dd010
 private static final int XSTMT1        = XSTMT1o | XSTMT;           // OK in statement framework (anywhere)
 private static final int XANY1         = XEXPR1o | XDECL1o | XSTMT1o;  // Mask: first in statement, declaration, or expression
 private static final int XTERM         = 0b100000000;               // Can terminate (last before EOF)
 private static final int XSTART        = 0b1000000000;              // Boundary, must be XTERM before
 private static final int XERRO         = 0b10000000000;             // Is an error
+private static final int XBRACESNEEDED = 0b100000000000;            // Expect {ANY} LBRACE
 /**
 * An extension of the compiler's TokenKind which adds our combined/processed
 * kinds. Also associates each TK with a union of acceptable kinds of code
 * position it can occupy.  For example: IDENTIFER is XEXPR1|XDECL1|XTERM,
 // Special
 EOF(TokenKind.EOF, 0),  //
 ERROR(TokenKind.ERROR, XERRO),  //
 IDENTIFIER(TokenKind.IDENTIFIER, XEXPR1|XDECL1|XTERM),  //
 UNDERSCORE(TokenKind.UNDERSCORE, XERRO),  //  _
-CLASS(TokenKind.CLASS, XEXPR|XDECL1),  //  class decl (MAPPED: DOTCLASS)
+CLASS(TokenKind.CLASS, XEXPR|XDECL1|XBRACESNEEDED),  //  class decl (MAPPED: DOTCLASS)
 MONKEYS_AT(TokenKind.MONKEYS_AT, XEXPR|XDECL1),  //  @
 IMPORT(TokenKind.IMPORT, XDECL1|XSTART),  //  import -- consider declaration
 SEMI(TokenKind.SEMI, XSTMT1|XTERM|XSTART),  //  ;
 // Shouldn't see -- error
 CONST(TokenKind.CONST, XERRO),  //  reserved keyword -- const
 GOTO(TokenKind.GOTO, XERRO),  //  reserved keyword -- goto
 CUSTOM(TokenKind.CUSTOM, XERRO),  // No uses
 // Declarations
-ENUM(TokenKind.ENUM, XDECL1),  //  enum
+ENUM(TokenKind.ENUM, XDECL1|XBRACESNEEDED),  //  enum
 IMPLEMENTS(TokenKind.IMPLEMENTS, XDECL),  //  implements
-INTERFACE(TokenKind.INTERFACE, XDECL1),  //  interface
+INTERFACE(TokenKind.INTERFACE, XDECL1|XBRACESNEEDED),  //  interface
-THROWS(TokenKind.THROWS, XDECL),  //  throws
+THROWS(TokenKind.THROWS, XDECL|XBRACESNEEDED),  //  throws
 // Primarive type names
 BOOLEAN(TokenKind.BOOLEAN, XEXPR1|XDECL1),  //  boolean
 BYTE(TokenKind.BYTE, XEXPR1|XDECL1),  //  byte
 CHAR(TokenKind.CHAR, XEXPR1|XDECL1),  //  char
 boolean isStart() {
 return (belongs & XSTART) != 0;
 }
+boolean isBracesNeeded() {
+return (belongs & XBRACESNEEDED) != 0;
+}
 /**
 * After construction, check that all compiler TokenKind values have
 * corresponding TK values.
 */
 static {
 }
 }
 public Completeness parseDeclaration() {
 boolean isImport = token.kind == IMPORT;
+boolean isBracesNeeded = false;
 while (token.kind.isDeclaration()) {
+isBracesNeeded |= token.kind.isBracesNeeded();
 nextToken();
 }
 switch (token.kind) {
 case EQ:
 // Check for array initializer
 switch (in.prevCT.kind) {
 case BRACES:
 case SEMI:
 return Completeness.COMPLETE;
 case IDENTIFIER:
+return isBracesNeeded
+? Completeness.DEFINITELY_INCOMPLETE
+: Completeness.COMPLETE_WITH_SEMI;
 case BRACKETS:
 return Completeness.COMPLETE_WITH_SEMI;
 case DOTSTAR:
 if (isImport) {
 return Completeness.COMPLETE_WITH_SEMI;

changeset 41450	83877f4dd010
parent 40771	bf0e92ede33f
child 42267	a0c712fc6575