From d3a453a8e73bd257ecce379f4c0f844625d7c06f Mon Sep 17 00:00:00 2001
From: dgelessus <dgelessus@users.noreply.github.com>
Date: Wed, 6 Apr 2022 17:30:10 +0200
Subject: [PATCH] Use generics in Symbol and related classes
---
src/main/java/org/sablecc/sablecc/Symbol.java | 14 ++++++--------
src/main/java/org/sablecc/sablecc/SymbolSet.java | 2 +-
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/sablecc/sablecc/Symbol.java b/src/main/java/org/sablecc/sablecc/Symbol.java
index b121b18..2a74075 100644
--- a/src/main/java/org/sablecc/sablecc/Symbol.java
+++ b/src/main/java/org/sablecc/sablecc/Symbol.java
@@ -10,10 +10,10 @@ package org.sablecc.sablecc;
import java.util.*;
import java.util.Vector;
-final class Symbol implements Comparable
+final class Symbol implements Comparable<Symbol>
{
- private static Vector terminals;
- private static Vector nonterminals;
+ private static Vector<Symbol> terminals;
+ private static Vector<Symbol> nonterminals;
private static TreeMap<String, Symbol> names;
private static boolean modified_ = true;
@@ -57,8 +57,8 @@ final class Symbol implements Comparable
public static void reinit()
{
- terminals = new Vector();
- nonterminals = new Vector();
+ terminals = new Vector<>();
+ nonterminals = new Vector<>();
names = new TreeMap<>();
modified_ = true;
symbols_ = null;
@@ -134,10 +134,8 @@ final class Symbol implements Comparable
}
@Override
- public int compareTo(Object object)
+ public int compareTo(Symbol symbol)
{
- Symbol symbol = (Symbol) object;
-
if(terminal ^ symbol.terminal)
{
if(terminal)
diff --git a/src/main/java/org/sablecc/sablecc/SymbolSet.java b/src/main/java/org/sablecc/sablecc/SymbolSet.java
index 25a35b7..0f32494 100644
--- a/src/main/java/org/sablecc/sablecc/SymbolSet.java
+++ b/src/main/java/org/sablecc/sablecc/SymbolSet.java
@@ -21,7 +21,7 @@ final class SymbolSet implements Cloneable
private void computeArray()
{
- Vector symbols = new Vector(0);
+ Vector<Symbol> symbols = new Vector<>(0);
int[] elements = terminals.elements();
for(int i = 0; i < elements.length; i++)
--
GitLab