Revert "Revert "Fix some iterate TODO's in layout pass""

This reverts commit 5b34c91.

Author: vidsinghal

.github/workflows/haskell-ci.yml

@@ -28,9 +28,9 @@ jobs:
     strategy:
       matrix:
         include:
-          - compiler: ghc-9.6.2
+          - compiler: ghc-9.4.6
             compilerKind: ghc
-            compilerVersion: 9.6.2
+            compilerVersion: 9.4.6
             setup-method: ghcup
             allow-failure: false
           - compiler: ghc-9.4.5

.github/workflows/test-gibbon-examples.yml

@@ -14,10 +14,15 @@ jobs:
           sudo apt update
           sudo apt-get install -y libgc-dev libgmp-dev uthash-dev gcc-11 racket
           sudo unlink /usr/bin/gcc && sudo ln -s /usr/bin/gcc-11 /usr/bin/gcc
+      - name: cplex and docplex
+        run: | 
+          sudo apt-get install python3
+          pip3 install cplex
+          pip3 install docplex
       - name: ghc and cabal
         env:
           HCKIND: ghc
-          HCVER: 9.6.2
+          HCVER: 9.4.6
         run: |
             mkdir -p "$HOME/.ghcup/bin"
             curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"