From 6d347ac638d29ce82036c99a93cf6da2e34491ac Mon Sep 17 00:00:00 2001
From: Noah <cardoson@mcmaster.ca>
Date: Mon, 24 Jun 2024 13:40:46 -0400
Subject: [PATCH 1/2] stop nomThick form calling itself

---
 code/drasil-build/package.yaml                            | 3 +++
 code/drasil-code/package.yaml                             | 3 +++
 code/drasil-codeLang/package.yaml                         | 3 +++
 code/drasil-data/package.yaml                             | 3 +++
 code/drasil-example/glassbr/lib/Drasil/GlassBR/Unitals.hs | 8 +++++++-
 code/drasil-example/glassbr/package.yaml                  | 3 +++
 6 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/code/drasil-build/package.yaml b/code/drasil-build/package.yaml
index bab91bf8f4..8b70f0c592 100644
--- a/code/drasil-build/package.yaml
+++ b/code/drasil-build/package.yaml
@@ -20,6 +20,9 @@ ghc-options:
 - -Wall
 - -Wredundant-constraints
 
+default-extensions:
+- StrictData
+
 library:
   source-dirs: lib
   exposed-modules:
diff --git a/code/drasil-code/package.yaml b/code/drasil-code/package.yaml
index 5bacd919e3..5f68803b73 100644
--- a/code/drasil-code/package.yaml
+++ b/code/drasil-code/package.yaml
@@ -32,6 +32,9 @@ ghc-options:
 - -Wall
 - -Wredundant-constraints
 
+default-extensions:
+- StrictData
+
 library:
   source-dirs: lib
   exposed-modules:
diff --git a/code/drasil-codeLang/package.yaml b/code/drasil-codeLang/package.yaml
index bbab8b41e0..676df8370b 100644
--- a/code/drasil-codeLang/package.yaml
+++ b/code/drasil-codeLang/package.yaml
@@ -16,6 +16,9 @@ ghc-options:
 - -Wall
 - -Wredundant-constraints
 
+default-extensions:
+- StrictData
+
 library:
   source-dirs: lib
   exposed-modules:
diff --git a/code/drasil-data/package.yaml b/code/drasil-data/package.yaml
index bf657fc6e8..50d4ae6c36 100644
--- a/code/drasil-data/package.yaml
+++ b/code/drasil-data/package.yaml
@@ -21,6 +21,9 @@ ghc-options:
 - -Wall
 - -Wredundant-constraints
 
+default-extensions:
+- StrictData
+
 library:
   source-dirs: lib
   exposed-modules:
diff --git a/code/drasil-example/glassbr/lib/Drasil/GlassBR/Unitals.hs b/code/drasil-example/glassbr/lib/Drasil/GlassBR/Unitals.hs
index 46f165dcab..2572a3d5cd 100644
--- a/code/drasil-example/glassbr/lib/Drasil/GlassBR/Unitals.hs
+++ b/code/drasil-example/glassbr/lib/Drasil/GlassBR/Unitals.hs
@@ -104,9 +104,15 @@ standOffDist = uq (constrained' (uc sD (variable "SD") Real metre)
   [ gtZeroConstr,
     sfwrc $ Bounded (Inc, sy sdMin) (Inc, sy sdMax)] (exactDbl 45)) defaultUncrt
 
+nomThick' :: ConstrainedChunk
+nomThick' = cuc "nomThick" 
+  (nounPhraseSent $ S "nominal thickness")
+  lT millimetre Rational 
+  [] $ exactDbl 0
+
 nomThick = cuc "nomThick" 
   (nounPhraseSent $ S "nominal thickness" +:+ displayDblConstrntsAsSet 
-    nomThick nominalThicknesses)
+    nomThick' nominalThicknesses)
   lT millimetre {-Discrete nominalThicknesses, but not implemented-} Rational 
   [{- TODO: add back constraint: enumc nominalThicknesses -}] $ exactDbl 8
 
diff --git a/code/drasil-example/glassbr/package.yaml b/code/drasil-example/glassbr/package.yaml
index 164a06875d..f5639d3842 100644
--- a/code/drasil-example/glassbr/package.yaml
+++ b/code/drasil-example/glassbr/package.yaml
@@ -26,6 +26,9 @@ dependencies:
 - drasil-theory
 - drasil-utils
 
+default-extensions:
+- StrictData
+
 library:
   source-dirs: lib
   when:

From e4586e26f2a49f2193e21d27f50dcab2098a24a6 Mon Sep 17 00:00:00 2001
From: Noah <cardoson@mcmaster.ca>
Date: Tue, 25 Jun 2024 14:10:09 -0400
Subject: [PATCH 2/2] rm nomThick'

---
 code/drasil-example/glassbr/lib/Drasil/GlassBR/Unitals.hs | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/code/drasil-example/glassbr/lib/Drasil/GlassBR/Unitals.hs b/code/drasil-example/glassbr/lib/Drasil/GlassBR/Unitals.hs
index 2572a3d5cd..dc0c8319ac 100644
--- a/code/drasil-example/glassbr/lib/Drasil/GlassBR/Unitals.hs
+++ b/code/drasil-example/glassbr/lib/Drasil/GlassBR/Unitals.hs
@@ -104,15 +104,9 @@ standOffDist = uq (constrained' (uc sD (variable "SD") Real metre)
   [ gtZeroConstr,
     sfwrc $ Bounded (Inc, sy sdMin) (Inc, sy sdMax)] (exactDbl 45)) defaultUncrt
 
-nomThick' :: ConstrainedChunk
-nomThick' = cuc "nomThick" 
-  (nounPhraseSent $ S "nominal thickness")
-  lT millimetre Rational 
-  [] $ exactDbl 0
-
 nomThick = cuc "nomThick" 
   (nounPhraseSent $ S "nominal thickness" +:+ displayDblConstrntsAsSet 
-    nomThick' nominalThicknesses)
+    (mkQuant "nomThick" (nounPhraseSent $ S "nominal thickness") lT Rational Nothing Nothing) nominalThicknesses)
   lT millimetre {-Discrete nominalThicknesses, but not implemented-} Rational 
   [{- TODO: add back constraint: enumc nominalThicknesses -}] $ exactDbl 8