From 76da3cdc983dc182eeb8107bda9108c0027083ad Mon Sep 17 00:00:00 2001 From: dgelessus <dgelessus@users.noreply.github.com> Date: Tue, 5 Apr 2022 18:18:21 +0200 Subject: [PATCH] Remove Cast and subclasses The "typed" collections that used them have all been removed. A second copy of Cast and TypedLinkedList still exists in the node package and are used by the node classes to store their children. These classes were generated by an old SableCC version and will disappear once we regenerate the SableCC parser. --- .../java/org/sablecc/sablecc/BooleanCast.java | 23 ------------------ src/main/java/org/sablecc/sablecc/Cast.java | 13 ---------- .../java/org/sablecc/sablecc/CharSet.java | 13 ---------- .../java/org/sablecc/sablecc/IntegerCast.java | 23 ------------------ .../java/org/sablecc/sablecc/ListCast.java | 23 ------------------ src/main/java/org/sablecc/sablecc/NoCast.java | 21 ---------------- .../java/org/sablecc/sablecc/NodeCast.java | 24 ------------------- .../java/org/sablecc/sablecc/StringCast.java | 23 ------------------ 8 files changed, 163 deletions(-) delete mode 100644 src/main/java/org/sablecc/sablecc/BooleanCast.java delete mode 100644 src/main/java/org/sablecc/sablecc/Cast.java delete mode 100644 src/main/java/org/sablecc/sablecc/IntegerCast.java delete mode 100644 src/main/java/org/sablecc/sablecc/ListCast.java delete mode 100644 src/main/java/org/sablecc/sablecc/NoCast.java delete mode 100644 src/main/java/org/sablecc/sablecc/NodeCast.java delete mode 100644 src/main/java/org/sablecc/sablecc/StringCast.java diff --git a/src/main/java/org/sablecc/sablecc/BooleanCast.java b/src/main/java/org/sablecc/sablecc/BooleanCast.java deleted file mode 100644 index b14570e..0000000 --- a/src/main/java/org/sablecc/sablecc/BooleanCast.java +++ /dev/null @@ -1,23 +0,0 @@ -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * This file is part of SableCC. * - * See the file "LICENSE" for copyright information and the * - * terms and conditions for copying, distribution and * - * modification of SableCC. * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - -package org.sablecc.sablecc; - -import java.util.*; - -public class BooleanCast implements Cast -{ - public final static BooleanCast instance = new BooleanCast(); - - private BooleanCast() - {} - - public Object cast(Object o) - { - return (Boolean) o; - } -} diff --git a/src/main/java/org/sablecc/sablecc/Cast.java b/src/main/java/org/sablecc/sablecc/Cast.java deleted file mode 100644 index 3c17b13..0000000 --- a/src/main/java/org/sablecc/sablecc/Cast.java +++ /dev/null @@ -1,13 +0,0 @@ -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * This file is part of SableCC. * - * See the file "LICENSE" for copyright information and the * - * terms and conditions for copying, distribution and * - * modification of SableCC. * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - -package org.sablecc.sablecc; - -public interface Cast -{ - Object cast(Object o); -} diff --git a/src/main/java/org/sablecc/sablecc/CharSet.java b/src/main/java/org/sablecc/sablecc/CharSet.java index 9984b7d..ec5f811 100644 --- a/src/main/java/org/sablecc/sablecc/CharSet.java +++ b/src/main/java/org/sablecc/sablecc/CharSet.java @@ -210,17 +210,4 @@ public class CharSet implements Cloneable public char start; public char end; } - - public static class IntervalCast implements Cast - { - public final static IntervalCast instance = new IntervalCast(); - - private IntervalCast() - {} - - public Object cast(Object o) - { - return (Interval) o; - } - } } diff --git a/src/main/java/org/sablecc/sablecc/IntegerCast.java b/src/main/java/org/sablecc/sablecc/IntegerCast.java deleted file mode 100644 index a05df2d..0000000 --- a/src/main/java/org/sablecc/sablecc/IntegerCast.java +++ /dev/null @@ -1,23 +0,0 @@ -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * This file is part of SableCC. * - * See the file "LICENSE" for copyright information and the * - * terms and conditions for copying, distribution and * - * modification of SableCC. * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - -package org.sablecc.sablecc; - -import java.util.*; - -public class IntegerCast implements Cast -{ - public final static IntegerCast instance = new IntegerCast(); - - private IntegerCast() - {} - - public Object cast(Object o) - { - return (Integer) o; - } -} diff --git a/src/main/java/org/sablecc/sablecc/ListCast.java b/src/main/java/org/sablecc/sablecc/ListCast.java deleted file mode 100644 index f66bd6d..0000000 --- a/src/main/java/org/sablecc/sablecc/ListCast.java +++ /dev/null @@ -1,23 +0,0 @@ -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * This file is part of SableCC. * - * See the file "LICENSE" for copyright information and the * - * terms and conditions for copying, distribution and * - * modification of SableCC. * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - -package org.sablecc.sablecc; - -import java.util.*; - -public class ListCast implements Cast -{ - public final static ListCast instance = new ListCast(); - - private ListCast() - {} - - public Object cast(Object o) - { - return (List) o; - } -} diff --git a/src/main/java/org/sablecc/sablecc/NoCast.java b/src/main/java/org/sablecc/sablecc/NoCast.java deleted file mode 100644 index 0198130..0000000 --- a/src/main/java/org/sablecc/sablecc/NoCast.java +++ /dev/null @@ -1,21 +0,0 @@ -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * This file is part of SableCC. * - * See the file "LICENSE" for copyright information and the * - * terms and conditions for copying, distribution and * - * modification of SableCC. * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - -package org.sablecc.sablecc; - -public class NoCast implements Cast -{ - public final static NoCast instance = new NoCast(); - - private NoCast() - {} - - public Object cast(Object o) - { - return o; - } -} diff --git a/src/main/java/org/sablecc/sablecc/NodeCast.java b/src/main/java/org/sablecc/sablecc/NodeCast.java deleted file mode 100644 index 202c84b..0000000 --- a/src/main/java/org/sablecc/sablecc/NodeCast.java +++ /dev/null @@ -1,24 +0,0 @@ -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * This file is part of SableCC. * - * See the file "LICENSE" for copyright information and the * - * terms and conditions for copying, distribution and * - * modification of SableCC. * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - -package org.sablecc.sablecc; - -import java.util.*; -import org.sablecc.sablecc.node.*; - -public class NodeCast implements Cast -{ - public final static NodeCast instance = new NodeCast(); - - private NodeCast() - {} - - public Object cast(Object o) - { - return (Node) o; - } -} diff --git a/src/main/java/org/sablecc/sablecc/StringCast.java b/src/main/java/org/sablecc/sablecc/StringCast.java deleted file mode 100644 index 63c9a86..0000000 --- a/src/main/java/org/sablecc/sablecc/StringCast.java +++ /dev/null @@ -1,23 +0,0 @@ -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * This file is part of SableCC. * - * See the file "LICENSE" for copyright information and the * - * terms and conditions for copying, distribution and * - * modification of SableCC. * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - -package org.sablecc.sablecc; - -import java.util.*; - -public class StringCast implements Cast -{ - public final static StringCast instance = new StringCast(); - - private StringCast() - {} - - public Object cast(Object o) - { - return (String) o; - } -} -- GitLab