Change AAJson format from array to object (#628)

smucclaw · Oct 16, 2024 · ddb3ab1 · ddb3ab1
1 parent cd82919
commit ddb3ab1
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/lib/haskell/natural4/src/LS/XPile/AaJson.hs b/lib/haskell/natural4/src/LS/XPile/AaJson.hs
@@ -102,14 +102,14 @@ translate2AaJson nlgEnvs l4i = do
       case hornByLang of
         Left err -> xpError err
         Right haveHorn -> xpReturn [__i|
-            { "#{nlgEnvStrLower}" : #{encodePretty $ toAaJson <$> (DL.nub haveHorn)} }
+           "#{nlgEnvStrLower}" : #{encodePretty $ toAaJson <$> (DL.nub haveHorn)}
         |]
 
   let qaHornsStrings = rights qaHornsAllLangs
   xpReturn [__i|
-    [
+    {
       #{DL.intercalate ",\n" qaHornsStrings}
-    ]
+    }
   |]
 
 qaHornsByLang :: [Rule] -> NLGEnv -> Interpreted -> XPileLogE [(String, BoolStructLT)]

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" : [
+{
+  "nl4chi" : [
     {
         "Person": {
             "All": {
@@ -29,8 +29,8 @@
             }
         }
     }
-] },
-{ "nl4eng" : [
+],
+"nl4eng" : [
     {
         "Person": {
             "All": {
@@ -60,8 +60,8 @@
             }
         }
     }
-] },
-{ "nl4may" : [
+],
+"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" : [
+{
+  "nl4chi" : [
     {
         "Covered If …": {
             "Not": {
@@ -206,8 +206,8 @@
             }
         }
     }
-] },
-{ "nl4eng" : [
+],
+"nl4eng" : [
     {
         "Covered If …": {
             "Not": {
@@ -414,8 +414,8 @@
             }
         }
     }
-] },
-{ "nl4may" : [
+],
+"nl4may" : [
     {
         "Covered If …": {
             "Not": {
@@ -622,5 +622,5 @@
             }
         }
     }
-] }
-]
+]
+}