Skip to content
Snippets Groups Projects
Commit 7a114f54 authored by Johannes Mey's avatar Johannes Mey
Browse files

use Ellipsis ('...') correctly in parser

parent b98a4c28
No related branches found
No related tags found
1 merge request!12Resolve "Grammar Bugs (VariableArityParameter and multiple catch types)"
This commit is part of merge request !12. Comments created here will be created in the context of that merge request.
......@@ -197,7 +197,7 @@ method_declarator ::= java_identifier formal_parameters (LBRACKET RBRACKET)*
formal_parameters ::= LPAREN ( formal_parameter ( COMMA formal_parameter )* )? RPAREN
formal_parameter ::= FINAL? type DOTS? variable_declarator_id
formal_parameter ::= FINAL? type ELLIPSIS? variable_declarator_id
constructor_declaration ::= type_parameters? java_identifier formal_parameters (THROWS name_list)? LBRACE explicit_constructor_invocation? block_statement* RBRACE
......@@ -409,4 +409,4 @@ parameter_name ::= IDENTIFIER
method_name ::= IDENTIFIER
// unused keywords must still appear somewhere
unused_keywords ::= GOTO | CONST ELLIPSIS | PACKAGE
unused_keywords ::= GOTO | CONST | PACKAGE
......@@ -51,7 +51,7 @@ public class AspectSyntaxHighlighter extends SyntaxHighlighterBase {
AspectTypes.NE, AspectTypes.ORASSIGN, AspectTypes.XOR, AspectTypes.XORASSIGN, AspectTypes.STAR,
AspectTypes.STARASSIGN, AspectTypes.REM, AspectTypes.REMASSIGN, AspectTypes.SC_AND, AspectTypes.SC_OR,
AspectTypes.AMPERSAND, AspectTypes.RSIGNEDSHIFTASSIGN, AspectTypes.RUNSIGNEDSHIFTASSIGN, AspectTypes.TILDE,
AspectTypes.BANG, AspectTypes.ARROW, AspectTypes.DOTS);
AspectTypes.BANG, AspectTypes.ARROW, AspectTypes.ELLIPSIS);
public static final TextAttributesKey OPERATOR = createTextAttributesKey("JASTADD_OPERATOR", DefaultLanguageHighlighterColors.OPERATION_SIGN);
private static final TextAttributesKey[] OPERATOR_KEYS = new TextAttributesKey[]{OPERATOR};
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment