added empty tuple to syntax without adding a type syntax for the empt…

…y tuple yet. Towards fixing #2106
usethesource · Dec 19, 2024 · 67329e2 · 67329e2
1 parent 0f2e799
commit 67329e2
Show file tree

Hide file tree

Showing 67 changed files with 829 additions and 747 deletions.
diff --git a/src/org/rascalmpl/ast/Expression.java b/src/org/rascalmpl/ast/Expression.java
@@ -6465,6 +6465,82 @@ public Object clone()  {
       return newInstance(getClass(), src, (IConstructor) null , clone(elements));
     }
 
+  }
+  public boolean isTuple() {
+    return false;
+  }
+
+  static public class Tuple extends Expression {
+    // Production: sig("Tuple",[arg("java.util.List\<org.rascalmpl.ast.Expression\>","elements0")],breakable=false)
+
+
+    private final java.util.List<org.rascalmpl.ast.Expression> elements0;
+
+    public Tuple(ISourceLocation src, IConstructor node , java.util.List<org.rascalmpl.ast.Expression> elements0) {
+      super(src, node);
+
+      this.elements0 = elements0;
+    }
+
+    @Override
+    public boolean isTuple() { 
+      return true; 
+    }
+
+    @Override
+    public <T> T accept(IASTVisitor<T> visitor) {
+      return visitor.visitExpressionTuple(this);
+    }
+
+    @Override
+    protected void addForLineNumber(int $line, java.util.List<AbstractAST> $result) {
+      if (getLocation().getBeginLine() == $line) {
+        $result.add(this);
+      }
+      ISourceLocation $l;
+
+      for (AbstractAST $elem : elements0) {
+        $l = $elem.getLocation();
+        if ($l.hasLineColumn() && $l.getBeginLine() <= $line && $l.getEndLine() >= $line) {
+          $elem.addForLineNumber($line, $result);
+        }
+        if ($l.getBeginLine() > $line) {
+          return;
+        }
+
+      }
+    }
+
+    @Override
+    public boolean equals(Object o) {
+      if (!(o instanceof Tuple)) {
+        return false;
+      }        
+      Tuple tmp = (Tuple) o;
+      return true && tmp.elements0.equals(this.elements0) ; 
+    }
+
+    @Override
+    public int hashCode() {
+      return 331 + 347 * elements0.hashCode() ; 
+    } 
+
+
+    @Override
+    public java.util.List<org.rascalmpl.ast.Expression> getElements0() {
+      return this.elements0;
+    }
+
+    @Override
+    public boolean hasElements0() {
+      return true;
+    }	
+
+    @Override
+    public Object clone()  {
+      return newInstance(getClass(), src, (IConstructor) null , clone(elements0));
+    }
+
   }
   public boolean isTypedVariable() {
     return false;
@@ -6530,7 +6606,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-      return 331 + 347 * type.hashCode() + 487 * name.hashCode() ; 
+      return 487 + 53 * type.hashCode() + 983 * name.hashCode() ; 
     } 
 
 
@@ -6633,7 +6709,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-      return 53 + 983 * type.hashCode() + 653 * name.hashCode() + 29 * pattern.hashCode() ; 
+      return 653 + 29 * type.hashCode() + 487 * name.hashCode() + 653 * pattern.hashCode() ; 
     } 
 
 
@@ -6735,7 +6811,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-      return 487 + 653 * name.hashCode() + 373 * pattern.hashCode() ; 
+      return 373 + 449 * name.hashCode() + 251 * pattern.hashCode() ; 
     } 
 
 
@@ -6828,7 +6904,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-      return 449 + 251 * label.hashCode() + 109 * visit.hashCode() ; 
+      return 109 + 967 * label.hashCode() + 269 * visit.hashCode() ; 
     } 
 
 
@@ -6923,7 +6999,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-      return 967 + 269 * parameters.hashCode() + 97 * statements0.hashCode() ; 
+      return 97 + 101 * parameters.hashCode() + 467 * statements0.hashCode() ; 
     } 
 
 

diff --git a/src/org/rascalmpl/ast/Field.java b/src/org/rascalmpl/ast/Field.java
@@ -98,7 +98,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-      return 101 + 467 * fieldIndex.hashCode() ; 
+      return 89 + 727 * fieldIndex.hashCode() ; 
     } 
 
 
@@ -172,7 +172,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-      return 89 + 727 * fieldName.hashCode() ; 
+      return 673 + 743 * fieldName.hashCode() ; 
     } 
 
 

diff --git a/src/org/rascalmpl/ast/Formals.java b/src/org/rascalmpl/ast/Formals.java
@@ -93,7 +93,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-      return 673 + 743 * formals.hashCode() ; 
+      return 29 + 571 * formals.hashCode() ; 
     } 
 
 

diff --git a/src/org/rascalmpl/ast/FunctionBody.java b/src/org/rascalmpl/ast/FunctionBody.java
@@ -93,7 +93,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-      return 29 + 571 * statements.hashCode() ; 
+      return 211 + 727 * statements.hashCode() ; 
     } 
 
 

diff --git a/src/org/rascalmpl/ast/FunctionDeclaration.java b/src/org/rascalmpl/ast/FunctionDeclaration.java
@@ -146,7 +146,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-      return 211 + 727 * tags.hashCode() + 251 * visibility.hashCode() + 131 * signature.hashCode() ; 
+      return 251 + 131 * tags.hashCode() + 811 * visibility.hashCode() + 199 * signature.hashCode() ; 
     } 
 
 
@@ -280,7 +280,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-      return 811 + 199 * tags.hashCode() + 5 * visibility.hashCode() + 157 * signature.hashCode() + 389 * expression.hashCode() + 163 * conditions.hashCode() ; 
+      return 5 + 157 * tags.hashCode() + 389 * visibility.hashCode() + 163 * signature.hashCode() + 163 * expression.hashCode() + 71 * conditions.hashCode() ; 
     } 
 
 
@@ -420,7 +420,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-      return 163 + 71 * tags.hashCode() + 503 * visibility.hashCode() + 31 * signature.hashCode() + 181 * body.hashCode() ; 
+      return 503 + 31 * tags.hashCode() + 181 * visibility.hashCode() + 313 * signature.hashCode() + 463 * body.hashCode() ; 
     } 
 
 
@@ -551,7 +551,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-      return 313 + 463 * tags.hashCode() + 257 * visibility.hashCode() + 211 * signature.hashCode() + 179 * expression.hashCode() ; 
+      return 257 + 211 * tags.hashCode() + 179 * visibility.hashCode() + 457 * signature.hashCode() + 839 * expression.hashCode() ; 
     } 
 
 

diff --git a/src/org/rascalmpl/ast/FunctionModifier.java b/src/org/rascalmpl/ast/FunctionModifier.java
@@ -74,7 +74,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-      return 457 ; 
+      return 2 ; 
     } 
 
 
@@ -129,7 +129,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-      return 839 ; 
+      return 461 ; 
     } 
 
 
@@ -184,7 +184,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-      return 2 ; 
+      return 877 ; 
     } 
 
 

diff --git a/src/org/rascalmpl/ast/FunctionModifiers.java b/src/org/rascalmpl/ast/FunctionModifiers.java
@@ -93,7 +93,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-      return 461 + 877 * modifiers.hashCode() ; 
+      return 599 + 281 * modifiers.hashCode() ; 
     } 
 
 

diff --git a/src/org/rascalmpl/ast/FunctionType.java b/src/org/rascalmpl/ast/FunctionType.java
@@ -110,7 +110,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-      return 599 + 281 * type.hashCode() + 43 * arguments.hashCode() ; 
+      return 43 + 103 * type.hashCode() + 673 * arguments.hashCode() ; 
     } 
 
 

diff --git a/src/org/rascalmpl/ast/Header.java b/src/org/rascalmpl/ast/Header.java
@@ -134,7 +134,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-      return 103 + 673 * tags.hashCode() + 509 * name.hashCode() + 61 * imports.hashCode() ; 
+      return 509 + 61 * tags.hashCode() + 173 * name.hashCode() + 761 * imports.hashCode() ; 
     } 
 
 
@@ -258,7 +258,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-      return 173 + 761 * tags.hashCode() + 409 * name.hashCode() + 997 * params.hashCode() + 367 * imports.hashCode() ; 
+      return 409 + 997 * tags.hashCode() + 367 * name.hashCode() + 401 * params.hashCode() + 139 * imports.hashCode() ; 
     } 
 
 

diff --git a/src/org/rascalmpl/ast/IASTVisitor.java b/src/org/rascalmpl/ast/IASTVisitor.java
@@ -323,6 +323,8 @@ public interface IASTVisitor<T> {
 
   public T visitExpressionTuple(Expression.Tuple x);
 
+  public T visitExpressionTuple(Expression.Tuple x);
+
   public T visitExpressionTypedVariable(Expression.TypedVariable x);
 
   public T visitExpressionTypedVariableBecomes(Expression.TypedVariableBecomes x);

diff --git a/src/org/rascalmpl/ast/Import.java b/src/org/rascalmpl/ast/Import.java
@@ -112,7 +112,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-      return 401 + 139 * module.hashCode() ; 
+      return 937 + 521 * module.hashCode() ; 
     } 
 
 
@@ -186,7 +186,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-      return 937 + 521 * module.hashCode() ; 
+      return 719 + 773 * module.hashCode() ; 
     } 
 
 
@@ -270,7 +270,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-      return 719 + 773 * name.hashCode() + 277 * at.hashCode() ; 
+      return 277 + 239 * name.hashCode() + 151 * at.hashCode() ; 
     } 
 
 
@@ -353,7 +353,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-      return 239 + 151 * syntax.hashCode() ; 
+      return 397 + 137 * syntax.hashCode() ; 
     } 
 
 

diff --git a/src/org/rascalmpl/ast/ImportedModule.java b/src/org/rascalmpl/ast/ImportedModule.java
@@ -115,7 +115,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-      return 397 + 137 * name.hashCode() + 811 * actuals.hashCode() ; 
+      return 811 + 709 * name.hashCode() + 167 * actuals.hashCode() ; 
     } 
 
 
@@ -218,7 +218,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-      return 709 + 167 * name.hashCode() + 53 * actuals.hashCode() + 463 * renamings.hashCode() ; 
+      return 53 + 463 * name.hashCode() + 127 * actuals.hashCode() + 67 * renamings.hashCode() ; 
     } 
 
 
@@ -310,7 +310,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-      return 127 + 67 * name.hashCode() ; 
+      return 643 + 229 * name.hashCode() ; 
     } 
 
 
@@ -394,7 +394,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-      return 643 + 229 * name.hashCode() + 271 * renamings.hashCode() ; 
+      return 271 + 331 * name.hashCode() + 17 * renamings.hashCode() ; 
     } 
 
 

diff --git a/src/org/rascalmpl/ast/IntegerLiteral.java b/src/org/rascalmpl/ast/IntegerLiteral.java
@@ -105,7 +105,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-      return 331 + 17 * decimal.hashCode() ; 
+      return 401 + 313 * decimal.hashCode() ; 
     } 
 
 
@@ -179,7 +179,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-      return 401 + 313 * hex.hashCode() ; 
+      return 449 + 463 * hex.hashCode() ; 
     } 
 
 
@@ -253,7 +253,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-      return 449 + 463 * octal.hashCode() ; 
+      return 971 + 179 * octal.hashCode() ; 
     } 
 
 

diff --git a/src/org/rascalmpl/ast/KeywordArgument_Expression.java b/src/org/rascalmpl/ast/KeywordArgument_Expression.java
@@ -108,7 +108,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-      return 971 + 179 * name.hashCode() + 229 * expression.hashCode() ; 
+      return 229 + 823 * name.hashCode() + 43 * expression.hashCode() ; 
     } 
 
 

diff --git a/src/org/rascalmpl/ast/KeywordArguments_Expression.java b/src/org/rascalmpl/ast/KeywordArguments_Expression.java
@@ -110,7 +110,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-      return 823 + 43 * optionalComma.hashCode() + 733 * keywordArgumentList.hashCode() ; 
+      return 733 + 239 * optionalComma.hashCode() + 941 * keywordArgumentList.hashCode() ; 
     } 
 
 
@@ -183,7 +183,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-      return 239 ; 
+      return 941 ; 
     }