Add lang tags to AaJson

smucclaw · Oct 14, 2024 · b3de41b · b3de41b
1 parent 7e01c08
commit b3de41b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/lib/haskell/natural4/src/LS/XPile/AaJson.hs b/lib/haskell/natural4/src/LS/XPile/AaJson.hs
@@ -93,15 +93,16 @@ translate2AaJson nlgEnvs l4i = do
   let rules = origrules l4i
 
   qaHornsAllLangs :: [Either XPileLogW String] <-
-    for nlgEnvs \nlgEnv -> do
+    for nlgEnvs \nlgEnv@(NLGEnv {gfLang}) -> do
+      let nlgEnvStrLower = gfLang |> showLanguage |$> Char.toLower
 
       hornByLang :: Either XPileLogW [(String, BoolStructLT)] <-
         qaHornsByLang rules nlgEnv l4i
 
       case hornByLang of
         Left err -> xpError err
         Right haveHorn -> xpReturn [__i|
-            #{encodePretty $ toAaJson <$> (DL.nub haveHorn)}
+            { "#{nlgEnvStrLower}" : #{encodePretty $ toAaJson <$> (DL.nub haveHorn)} }
         |]
 
   let qaHornsStrings = rights qaHornsAllLangs

diff --git a/lib/haskell/natural4/test/testdata/golden/AaJsonSpec/must_sing.json.expected b/lib/haskell/natural4/test/testdata/golden/AaJsonSpec/must_sing.json.expected
@@ -1,5 +1,5 @@
 [
-  [
+  { "nl4chi" : [
     {
         "Person": {
             "All": {
@@ -29,8 +29,8 @@
             }
         }
     }
-],
-[
+] },
+{ "nl4eng" : [
     {
         "Person": {
             "All": {
@@ -60,8 +60,8 @@
             }
         }
     }
-],
-[
+] },
+{ "nl4may" : [
     {
         "Person": {
             "All": {
@@ -91,5 +91,5 @@
             }
         }
     }
-]
+] }
 ]
diff --git a/lib/haskell/natural4/test/testdata/golden/AaJsonSpec/rodents.json.expected b/lib/haskell/natural4/test/testdata/golden/AaJsonSpec/rodents.json.expected
@@ -1,5 +1,5 @@
 [
-  [
+  { "nl4chi" : [
     {
         "Covered If …": {
             "Not": {
@@ -206,8 +206,8 @@
             }
         }
     }
-],
-[
+] },
+{ "nl4eng" : [
     {
         "Covered If …": {
             "Not": {
@@ -414,8 +414,8 @@
             }
         }
     }
-],
-[
+] },
+{ "nl4may" : [
     {
         "Covered If …": {
             "Not": {
@@ -622,5 +622,5 @@
             }
         }
     }
-]
+] }
 ]