Unify equivalent GolangTokenConstants

jplag.frontend.golang/src/main/java/de/jplag/golang/GoListener.java

@@ -141,7 +141,7 @@ public class GoListener extends GoParserBaseListener {
 
     @Override
     public void enterMethodDecl(GoParser.MethodDeclContext context) {
-        transformToken(METHOD_DECLARATION, context.getStart());
+        transformToken(FUNCTION_DECLARATION, context.getStart());
         enterContext(GoBlockContext.FUNCTION_BODY);
         super.enterMethodDecl(context);
     }
@@ -286,7 +286,7 @@ public class GoListener extends GoParserBaseListener {
 
     @Override
     public void enterConstSpec(GoParser.ConstSpecContext context) {
-        transformToken(CONSTANT_DECLARATION, context.getStart());
+        transformToken(VARIABLE_DECLARATION, context.getStart());
         super.enterConstSpec(context);
     }
 

jplag.frontend.golang/src/main/java/de/jplag/golang/GoToken.java

@@ -51,7 +51,6 @@ public class GoToken extends Token {
             // Functions and Methods
 
             case FUNCTION_DECLARATION -> "FUNC";
-            case METHOD_DECLARATION -> "METHOD";
             case RECEIVER -> "RECEIVER";
             case FUNCTION_PARAMETER -> "PARAM";
             case FUNCTION_BODY_BEGIN -> "FUNC{";
@@ -81,7 +80,6 @@ public class GoToken extends Token {
             // Statements
 
             case VARIABLE_DECLARATION -> "VAR_DECL";
-            case CONSTANT_DECLARATION -> "CONST_DECL";
             case FUNCTION_LITERAL -> "FUNC_LIT";
             case ASSIGNMENT -> "ASSIGN";
             case SEND_STATEMENT -> "SEND";

jplag.frontend.golang/src/main/java/de/jplag/golang/GoTokenConstants.java

@@ -33,66 +33,64 @@ public interface GoTokenConstants extends TokenConstants {
     // FUNCTIONS AND METHODS
 
     int FUNCTION_DECLARATION = 25;
-    int METHOD_DECLARATION = 26;
-    int RECEIVER = 27;
-    int FUNCTION_PARAMETER = 28;
-    int FUNCTION_BODY_BEGIN = 29;
-    int FUNCTION_BODY_END = 30;
+    int RECEIVER = 26;
+    int FUNCTION_PARAMETER = 27;
+    int FUNCTION_BODY_BEGIN = 28;
+    int FUNCTION_BODY_END = 29;
 
     // CONTROL FLOW STATEMENTS
 
-    int IF_STATEMENT = 31;
-    int IF_BLOCK_BEGIN = 32;
-    int IF_BLOCK_END = 33;
-    int ELSE_BLOCK_BEGIN = 34;
-    int ELSE_BLOCK_END = 35;
-    int FOR_STATEMENT = 36;
-    int FOR_BLOCK_BEGIN = 37;
-    int FOR_BLOCK_END = 38;
-    int SWITCH_STATEMENT = 39;
-    int SWITCH_BLOCK_BEGIN = 40;
-    int SWITCH_BLOCK_END = 41;
-    int SWITCH_CASE = 42;
-    int SELECT_STATEMENT = 43;
-    int SELECT_BLOCK_BEGIN = 44;
-    int SELECT_BLOCK_END = 45;
-    int CASE_BLOCK_BEGIN = 46;
-    int CASE_BLOCK_END = 47;
-
-    // Statements
-
-    int VARIABLE_DECLARATION = 48;
-    int CONSTANT_DECLARATION = 49;
-    int FUNCTION_LITERAL = 50;
-    int ASSIGNMENT = 51;
-    int SEND_STATEMENT = 52;
-    int RECEIVE_STATEMENT = 53;
-    int INVOCATION = 54;
-    int ARGUMENT = 55;
-    int STATEMENT_BLOCK_BEGIN = 56;
-    int STATEMENT_BLOCK_END = 57;
+    int IF_STATEMENT = 30;
+    int IF_BLOCK_BEGIN = 31;
+    int IF_BLOCK_END = 32;
+    int ELSE_BLOCK_BEGIN = 33;
+    int ELSE_BLOCK_END = 34;
+    int FOR_STATEMENT = 35;
+    int FOR_BLOCK_BEGIN = 36;
+    int FOR_BLOCK_END = 37;
+    int SWITCH_STATEMENT = 38;
+    int SWITCH_BLOCK_BEGIN = 39;
+    int SWITCH_BLOCK_END = 40;
+    int SWITCH_CASE = 41;
+    int SELECT_STATEMENT = 42;
+    int SELECT_BLOCK_BEGIN = 43;
+    int SELECT_BLOCK_END = 44;
+    int CASE_BLOCK_BEGIN = 45;
+    int CASE_BLOCK_END = 46;
+
+    // STATEMENTS
+
+    int VARIABLE_DECLARATION = 47;
+    int FUNCTION_LITERAL = 48;
+    int ASSIGNMENT = 49;
+    int SEND_STATEMENT = 50;
+    int RECEIVE_STATEMENT = 51;
+    int INVOCATION = 52;
+    int ARGUMENT = 53;
+    int STATEMENT_BLOCK_BEGIN = 54;
+    int STATEMENT_BLOCK_END = 55;
 
     // OBJECT CREATION
 
-    int ARRAY_ELEMENT = 58;
-    int MAP_ELEMENT = 59;
-    int SLICE_ELEMENT = 60;
-    int NAMED_TYPE_ELEMENT = 61;
-    int ARRAY_CONSTRUCTOR = 62;
-    int MAP_CONSTRUCTOR = 63;
-    int SLICE_CONSTRUCTOR = 64;
-    int NAMED_TYPE_CONSTRUCTOR = 65;
+    int ARRAY_ELEMENT = 56;
+    int MAP_ELEMENT = 57;
+    int SLICE_ELEMENT = 58;
+    int NAMED_TYPE_ELEMENT = 59;
+    int ARRAY_CONSTRUCTOR = 60;
+    int MAP_CONSTRUCTOR = 61;
+    int SLICE_CONSTRUCTOR = 62;
+    int NAMED_TYPE_CONSTRUCTOR = 63;
 
     // CONTROL FLOW KEYWORDS
 
-    int RETURN = 66;
-    int BREAK = 67;
-    int CONTINUE = 68;
-    int FALLTHROUGH = 69;
-    int GOTO = 70;
-    int GO = 71;
-    int DEFER = 72;
+    int RETURN = 64;
+    int BREAK = 65;
+    int CONTINUE = 66;
+    int FALLTHROUGH = 67;
+    int GOTO = 68;
+    int GO = 69;
+    int DEFER = 70;
 
-    int NUM_DIFF_TOKENS = 73;
+    int NUM_DIFF_TOKENS = 71;
 
 }