clash-cosim: Fixup files for formatting compatibility

Author: rowanG077

clash-cosim/Setup.hs

@@ -196,11 +196,7 @@ blackboxObject
     -- ^ templateD
     -> Value
 blackboxObject bbname type_ templateD =
-#if MIN_VERSION_aeson(2,0,0)
   Object (KM.fromList [("BlackBox", Object (KM.fromList [
-#else
-  Object (fromList [("BlackBox", Object (fromList [
-#endif
       ("name", String $ Text.pack bbname)
     , ("kind", "Declaration")
     , ("type", String $ Text.pack type_)

clash-cosim/clash-cosim.cabal

@@ -44,7 +44,7 @@ flag pedantic
 
 custom-setup
 --  ghc-options:   -Wall -Werror
-  setup-depends: aeson,
+  setup-depends: aeson >= 2.0.0,
                  base >= 4.10 && < 5,
                  bytestring,
                  Cabal,

clash-cosim/src/Clash/CoSim/CodeGeneration.hs

@@ -47,6 +47,17 @@ arrowsR (t0:ts) t = arrow t0 (arrowsR ts t)
 applyE :: Foldable t => ExpQ -> t Name -> ExpQ
 applyE = foldl (\f x -> [| $f $(varE x) |])
 
+maxNumberOfClocks :: IO Int
+maxNumberOfArgs :: IO Int
+#ifdef CABAL
+-- We're running in a CABAL environment, so we know this environment
+-- variable is set:
+maxNumberOfClocks = read <$> runIO (getEnv "COSIM_MAX_NUMBER_OF_CLOCKS")
+maxNumberOfArgs = read <$> runIO (getEnv "COSIM_MAX_NUMBER_OF_ARGUMENTS")
+#else
+maxNumberOfClocks = pure 1
+maxNumberOfArgs = pure 16
+#endif
 --------------------------------------
 ---- CODE GENERATION -----------------
 --------------------------------------
@@ -56,16 +67,8 @@ applyE = foldl (\f x -> [| $f $(varE x) |])
 -- to 16.)
 coSimGen :: Q [Dec]
 coSimGen = do
-#ifdef CABAL
-    -- We're running in a CABAL environment, so we know this environment
-    -- variable is set:
-    m <- read <$> runIO (getEnv "COSIM_MAX_NUMBER_OF_CLOCKS")
-    n <- read <$> runIO (getEnv "COSIM_MAX_NUMBER_OF_ARGUMENTS")
-#else
-    let m = 1
-    let n = 16
-#endif
-
+    m <- maxNumberOfClocks
+    n <- maxNumberOfArgs
 
     concat <$> (sequence  [coSimGen' clks args | clks <- [0..m], args <-  [1..n]])