From a34678625421f2c9e63f22e7167c4fc8eb9d3698 Mon Sep 17 00:00:00 2001
From: paulklint <Paul.Klint@cwi.nl>
Date: Fri, 29 Aug 2025 10:12:59 +0200
Subject: [PATCH] Fixes for ambiguous constructors

---
 src/lang/flybytes/internal/ASTgen.rsc  | 2 --
 src/lang/flybytes/tests/ArrayTests.rsc | 6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/lang/flybytes/internal/ASTgen.rsc b/src/lang/flybytes/internal/ASTgen.rsc
index 976bff6..63932c6 100644
--- a/src/lang/flybytes/internal/ASTgen.rsc
+++ b/src/lang/flybytes/internal/ASTgen.rsc
@@ -99,7 +99,6 @@ str type2FactoryCall(Symbol t){
       case Symbol::\map(label(l1,ti),label(l2, ti2)) : return "tf.mapType(<type2FactoryCall(ti)>,\"<l1>\", <type2FactoryCall(ti2)>, \"<l2>\")";
       case Symbol::\map(ti,ti2) : return "tf.mapType(<type2FactoryCall(ti)>,<type2FactoryCall(ti2)>)";
       case Symbol::\tuple(tis) : return "tf.tupleType(<typeList2FactoryVarArgs(tis)>)";
-      case Symbol::\rel(tis) : return "tf.relType(<typeList2FactoryVarArgs(tis)>)";
       case Symbol::\adt(str name, _) : return "_<name>";
       default: 
         throw "Do not now how to construct <t>";  
@@ -194,7 +193,6 @@ str type2FactoryCall(Symbol t){
       case \bool() : return "IBool";
       case \list(_) : return "IList";
       case \map(_,_) : return "IMap";
-      case \rel(_) : return "IRelation";
       case \set(_) : return "ISet";
       case \loc() : return "ISourceLocation";
       case \str() :  return "IString";
diff --git a/src/lang/flybytes/tests/ArrayTests.rsc b/src/lang/flybytes/tests/ArrayTests.rsc
index 8265b9b..c6bade1 100644
--- a/src/lang/flybytes/tests/ArrayTests.rsc
+++ b/src/lang/flybytes/tests/ArrayTests.rsc
@@ -40,9 +40,9 @@ Exp defVal(long()) = jconst(0);
 Exp defVal(byte()) = bconst(0);
 Exp defVal(character()) = cconst(0);
 Exp defVal(short()) = sconst(0);
-Exp defVal(object(str _)) = null();
-Exp defVal(array(Type _)) = null();
-Exp defVal(string()) = null();
+Exp defVal(object(str _)) = Exp::null();
+Exp defVal(array(Type _)) = Exp::null();
+Exp defVal(string()) = Exp::null();
 Exp defVal(boolean()) = \false();
 
 list[Type] primTypes = [integer(), short(), byte(), character(), long()];