added parameter annotation @ignoreForEquality

parameters annotated with this will not be considered for structuralEquality
peterzeller · May 25, 2018 · 5a96ab9 · 5a96ab9
1 parent 48afaca
commit 5a96ab9
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'signing'
 apply plugin: 'antlr'
 
 group = 'com.github.peterzeller'
-version = '0.2.1'
+version = '0.3.0'
 
 description = """Abstract Syntax Generator"""
 

diff --git a/src/main/antlr/asg/asts/parser/AsgAntlrParser.g4 b/src/main/antlr/asg/asts/parser/AsgAntlrParser.g4
@@ -45,11 +45,13 @@ contructorDef[Program prog] returns [ConstructorDef c]:
 paramDef[ConstructorDef c]:
 	{
 		boolean ref = false;
+		boolean ignoreEquality = false;
 	}
+	('@ignoreForEquality' {ignoreEquality = true;})?
 	('ref' {ref = true;})?
 	 t=javaType n=ID 
 	{ 
-		$c.addParam(ref, $t.name, $n.text);
+		$c.addParam(ref, ignoreEquality, $t.name, $n.text);
 	}
 	;
 

diff --git a/src/main/java/asg/asts/Generator.java b/src/main/java/asg/asts/Generator.java
@@ -316,15 +316,24 @@ private void createStructuralEquals(ConstructorDef c, StringBuilder sb) {
 			sb.append("		if (e instanceof " + c.getName(typePrefix) + ") {\n");
 			sb.append("			" + c.getName(typePrefix) + " o = (" + c.getName(typePrefix) + ") e;\n");
 			sb.append("			return ");
+			boolean first = true;
 			for (Parameter p : c.parameters) {
-				if (p != c.parameters.get(0)) {
+				if (p.isIgnoreEquality()) {
+					continue;
+				}
+				if (!first) {
 					sb.append("\n			    && ");
 				}
-				if (prog.hasElement(p.getTyp()) && !p.isRef) {
-					sb.append("this." + p.name + ".structuralEquals(o.get"+toFirstUpper(p.name)+"())");
+				if (prog.hasElement(p.getTyp())) {
+					if (p.isRef) {
+						sb.append("this." + p.name + " == o.get"+toFirstUpper(p.name)+"()");
+					} else {
+						sb.append("this." + p.name + ".structuralEquals(o.get"+toFirstUpper(p.name)+"())");
+					}
 				} else {
 					sb.append("java.util.Objects.equals(" + p.name + ", o.get"+toFirstUpper(p.name)+"())");
 				}
+				first = false;
 			}
 			sb.append(";\n");
 			sb.append("		} else {\n");

diff --git a/src/main/java/asg/asts/ast/ConstructorDef.java b/src/main/java/asg/asts/ast/ConstructorDef.java
@@ -40,8 +40,8 @@ public String toString() {
 		return result;
 	}
 
-	public void addParam(boolean ref, String type, String name) {
-		parameters.add(new Parameter(ref, type, name));
+	public void addParam(boolean ref, boolean ignoreEquality, String type, String name) {
+		parameters.add(new Parameter(ref, ignoreEquality, type, name));
 	}
 
 

diff --git a/src/main/java/asg/asts/ast/Parameter.java b/src/main/java/asg/asts/ast/Parameter.java
@@ -2,18 +2,21 @@
 
 public final class Parameter {
 
+	private final boolean ignoreEquality;
 	private final String typ;
 	public final  String name;
 	public final boolean isRef;
 
 
-	public Parameter(boolean isRef, String typ, String name) {
+	public Parameter(boolean isRef, boolean ignoreEquality, String typ, String name) {
 		this.isRef = isRef;
+		this.ignoreEquality = ignoreEquality;
 		this.typ = typ;
 		this.name = name;
 	}
 
 	public Parameter(String typ, String name) {
+		this.ignoreEquality = false;
 		this.isRef = false;
 		this.typ = typ;
 		this.name = name;
@@ -43,4 +46,8 @@ public String getTyp() {
 		return typ;
 	}
 
+	public boolean isIgnoreEquality() {
+		return ignoreEquality;
+	}
+
 }