From 02ecb53d23cf9e2df3cb5464dc9f3a04efc8651d Mon Sep 17 00:00:00 2001
From: paulklint <Paul.Klint@cwi.nl>
Date: Wed, 10 Jul 2024 16:46:50 +0200
Subject: [PATCH] Further improvements to hashes

---
 .../library/lang/rascalcore/check/CollectDataDeclaration.rsc    | 2 +-
 .../core/library/lang/rascalcore/check/CollectDeclaration.rsc   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/org/rascalmpl/core/library/lang/rascalcore/check/CollectDataDeclaration.rsc b/src/org/rascalmpl/core/library/lang/rascalcore/check/CollectDataDeclaration.rsc
index d31716a8..3d826788 100644
--- a/src/org/rascalmpl/core/library/lang/rascalcore/check/CollectDataDeclaration.rsc
+++ b/src/org/rascalmpl/core/library/lang/rascalcore/check/CollectDataDeclaration.rsc
@@ -107,7 +107,7 @@ void collect(current:(Variant) `<Name name> ( <{TypeArg ","}* arguments> <Keywor
     
         scope = c.getScope();
         c.enterScope(current);
-            args = "<for(arg <- arguments){><arg.\type> <arg.name> <}>";
+            args = "<for(arg <- arguments){><arg is typedVariable ? "<arg.\type> <arg.name>" : "<arg>"> <}>";
             md5Contrib = "<currentModuleName><adtName><dataCounter><name><variantCounter>( <args>)";
             //println("<current>: <md5Contrib>");
             c.defineInScope(adtParentScope, prettyPrintName(name), constructorId(), name, defType(adt + formals + kwFormals + commonKwFormals,
diff --git a/src/org/rascalmpl/core/library/lang/rascalcore/check/CollectDeclaration.rsc b/src/org/rascalmpl/core/library/lang/rascalcore/check/CollectDeclaration.rsc
index a9ccf294..92080e0a 100644
--- a/src/org/rascalmpl/core/library/lang/rascalcore/check/CollectDeclaration.rsc
+++ b/src/org/rascalmpl/core/library/lang/rascalcore/check/CollectDeclaration.rsc
@@ -373,7 +373,7 @@ void collect(current: (FunctionBody) `{ <Statement* statements> }`, Collector c)
 }
 
 str md5Contrib4signature(Signature signature){
-    fs = "<for(f <- signature.parameters.formals.formals){><f.\type> <f.name> <}>";
+    fs = "<for(f <- signature.parameters.formals.formals){><f is typeVariable ? "<f.\type> <f.name>" : "<f>"> <}>";
     res = "<signature.modifiers><signature.\type> <signature.name>( <fs>)";
     //println("<signature> =\> <res>");
     return res;