From 32a97944a8975d891b5c3b7d49be796cf0ffee8b Mon Sep 17 00:00:00 2001
From: "Daniel A. A. Pelsmaeker" <developer@pelsmaeker.net>
Date: Mon, 28 Apr 2025 09:50:23 +0200
Subject: [PATCH 1/2] Constructors must have unique names

---
 .../StrategoLang/gradual-types/signatures-namespaced.sdf3 | 8 ++++----
 ql/src/StrategoLang/sugar/strategies-namespaced.sdf3      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ql/src/StrategoLang/gradual-types/signatures-namespaced.sdf3 b/ql/src/StrategoLang/gradual-types/signatures-namespaced.sdf3
index 5be6dbb..b3128aa 100644
--- a/ql/src/StrategoLang/gradual-types/signatures-namespaced.sdf3
+++ b/ql/src/StrategoLang/gradual-types/signatures-namespaced.sdf3
@@ -12,10 +12,10 @@ context-free syntax
   StrategoLang-Dyn.Dyn = [?] { }
   StrategoLang-Type.TupleT = [[StrategoLang-Type] * [{StrategoLang-Type " * "}+]] { }
   StrategoLang-Type.DynT = StrategoLang-Dyn { }
-  StrategoLang-Type.StringT = "string" { }
-  StrategoLang-Type.IntT = "int" { }
-  StrategoLang-Type.RealT = "real" { }
-  StrategoLang-Type.BlobT = "blob" { }
+  StrategoLang-Type.StringGT = "string" { }
+  StrategoLang-Type.IntGT = "int" { }
+  StrategoLang-Type.RealGT = "real" { }
+  StrategoLang-Type.BlobGT = "blob" { }
   StrategoLang-Type = [([StrategoLang-Type])] {bracket}
   StrategoLang-Type = StrategoLang-SortT { }
   StrategoLang-SortT.SortT = [[StrategoLang-Id]([{StrategoLang-Type ", "}*])] { }
diff --git a/ql/src/StrategoLang/sugar/strategies-namespaced.sdf3 b/ql/src/StrategoLang/sugar/strategies-namespaced.sdf3
index 5924f01..5dba21f 100644
--- a/ql/src/StrategoLang/sugar/strategies-namespaced.sdf3
+++ b/ql/src/StrategoLang/sugar/strategies-namespaced.sdf3
@@ -42,7 +42,7 @@ context-free syntax
   StrategoLang-Strategy.BA = [<[StrategoLang-Strategy]> [StrategoLang-Term]] { }
   StrategoLang-Strategy.LChoice = [[StrategoLang-Strategy] <+ [StrategoLang-Strategy]] {right}
   StrategoLang-Strategy.Rec = <rec <StrategoLang-SId>( <StrategoLang-Strategy> )> { }
-  StrategoLang-Strategy.Not = <not(<StrategoLang-Strategy>)> { }
+  StrategoLang-Strategy.NNot = <not(<StrategoLang-Strategy>)> { }
   StrategoLang-Strategy.Where = <where(<StrategoLang-Strategy>)> { }
   StrategoLang-Strategy = StrategoLang-With { }
   StrategoLang-With.With = <with(<StrategoLang-Strategy>)> { }

From 4591fefe64783a3f4238baf377ad11b11bad7ca8 Mon Sep 17 00:00:00 2001
From: "Daniel A. A. Pelsmaeker" <developer@pelsmaeker.net>
Date: Mon, 28 Apr 2025 09:50:33 +0200
Subject: [PATCH 2/2] Cannot add CF constructor to LEX sort

---
 ql/src/mix.sdf3 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ql/src/mix.sdf3 b/ql/src/mix.sdf3
index 7416a7b..49bc080 100644
--- a/ql/src/mix.sdf3
+++ b/ql/src/mix.sdf3
@@ -34,9 +34,9 @@ context-free syntax
   Type.StrategoMetaVar3 = TypeVar
   TyExpr.StrategoMetaVar4 = TyExprVar
 
-syntax
+//syntax
 
-  ID-CF.StrategoMetaVar5 = IDVar
+//  ID-CF.StrategoMetaVar5 = IDVar
 
 lexical sorts