From 3f37da73a012abd93ca595b5d0b2ac7ca3aa0fb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jesper=20=C3=96qvist?= <jesper.oqvist@cs.lth.se>
Date: Thu, 14 Jun 2018 11:02:26 +0200
Subject: [PATCH] Remove is$Equal method generation
This removes an unused generated method for comparing tokens in two ASTs.
---
ChangeLog | 5 +++
src/jastadd/ast/ASTEqual.jrag | 54 --------------------------------
src/jastadd/ast/JaddCodeGen.jrag | 1 -
3 files changed, 5 insertions(+), 55 deletions(-)
delete mode 100644 src/jastadd/ast/ASTEqual.jrag
diff --git a/ChangeLog b/ChangeLog
index a6d92e56..3ce0d883 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-06-14 Jesper Öqvist <jesper.oqvist@cs.lth.se>
+
+ * Removed generation of the is$Equal method. The method was unused.
+ It compared tokens in two ASTs.
+
2018-05-22 Jesper Öqvist <jesper.oqvist@cs.lth.se>
* Fixed an issue causing the cacheCycle option to not work as intended.
diff --git a/src/jastadd/ast/ASTEqual.jrag b/src/jastadd/ast/ASTEqual.jrag
deleted file mode 100644
index 013fab70..00000000
--- a/src/jastadd/ast/ASTEqual.jrag
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Copyright (c) 2013-2015, The JastAdd Team
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of the Lund University nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-aspect ASTEqual {
- public void ASTDecl.emitIsEqualMethods(PrintWriter stream) {
-
- if (hasAbstract() && !isASTNodeDecl()) {
- // Don't generate isEqual methods for abstract node types.
- return;
- }
-
- TemplateContext tt = templateContext();
- StringBuilder sb = new StringBuilder();
- for (Component c : components()) {
- if (c.isTokenComponent() && !c.isNTA()) {
- TokenId token = ((TokenComponent)c).getTokenId();
- String tokenVar = String.format("token%s_%s",
- ASTNode.convTypeNameToSignature(token.getTYPE()), token.getID());
- sb.append(String.format(" && (%s == ((%s) node).%s)", tokenVar, name(), tokenVar));
- }
- }
- tt.bind("IsEqualBody", sb.toString());
- tt.expand("ASTDecl.emitIsEqualMethods", stream);
- }
-
- syn lazy boolean Component.isTokenComponent() = false;
-
- eq TokenComponent.isTokenComponent() = true;
-}
diff --git a/src/jastadd/ast/JaddCodeGen.jrag b/src/jastadd/ast/JaddCodeGen.jrag
index 2f5a72f0..729e125d 100644
--- a/src/jastadd/ast/JaddCodeGen.jrag
+++ b/src/jastadd/ast/JaddCodeGen.jrag
@@ -594,7 +594,6 @@ aspect JaddCodeGen {
emitCloneNode(out);
emitCopyNode(out);
emitFullCopy(out);
- emitIsEqualMethods(out);
if (config().concurrentEval()
&& !isASTNodeDecl()
--
GitLab