From 7a114f546840dbcbced4c915ed455e1829c87932 Mon Sep 17 00:00:00 2001
From: Johannes Mey <johannes.mey@tu-dresden.de>
Date: Sun, 20 Feb 2022 16:52:00 +0100
Subject: [PATCH] use Ellipsis ('...') correctly in parser

---
 src/main/grammar/Aspect.bnf                                   | 4 ++--
 .../org/jastadd/tooling/aspect/AspectSyntaxHighlighter.java   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/grammar/Aspect.bnf b/src/main/grammar/Aspect.bnf
index 1bd54a8..e37e1f1 100644
--- a/src/main/grammar/Aspect.bnf
+++ b/src/main/grammar/Aspect.bnf
@@ -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
diff --git a/src/main/java/org/jastadd/tooling/aspect/AspectSyntaxHighlighter.java b/src/main/java/org/jastadd/tooling/aspect/AspectSyntaxHighlighter.java
index 1c91d8e..9dea0a1 100644
--- a/src/main/java/org/jastadd/tooling/aspect/AspectSyntaxHighlighter.java
+++ b/src/main/java/org/jastadd/tooling/aspect/AspectSyntaxHighlighter.java
@@ -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};
 
-- 
GitLab