Fix many problems

flake.nix

@@ -20,7 +20,7 @@
       p.callCabal2nixWithOptions n (nix-filter.lib {root = "${self}/${n}";}) "" {};
 
     packages = lib: p: {
-      "language-c" = p.callCabal2nixWithOptions "language-c" inputs.language-c "" {};
+      "language-c" = lib.dontCheck (p.callCabal2nixWithOptions "language-c" inputs.language-c "" {});
       "hspec-glitter" = p.callCabal2nixWithOptions "hspec-glitter" inputs.hspec-glitter "" {};
       "rtree" = lib.dontCheck (load p "rtree");
       "rtree-c" = lib.dontCheck (load p "rtree-c");

rtree-c/src/ReduceC.hs

@@ -348,12 +348,13 @@ reduceCStatement smt ctx = case smt of
                 (pure $ Just $ C.CForDecl (C.CDecl rec decl' ni'))
             else pure $ Just $ C.CForDecl (C.CDecl rec decl' ni')
         pure (res, ctx')
-      C.CForInitializing e ->
+      C.CForInitializing e -> do
+        e' <- maybeSplit ("remove initializer", C.posOf ni) (e >>= \e' -> reduceCExpr e' ctx)
         whenSplit
           (AllowEmptyDeclarations `isIn` ctx)
           ("remove empty declaration", C.posOf ni)
           (pure (Nothing, ctx))
-          (pure (Just $ C.CForInitializing e, ctx))
+          (pure (Just $ C.CForInitializing e', ctx))
       d -> don'tHandle d
 
     s' <- reduceCStatementOrEmptyBlock s ctx'

rtree-c/test/cases/small/for.c

+static int a = 0;
+
+int main () {
+  for (a = 0;;) {
+  }
+}

rtree-c/test/expected/for/main.c

+static int a = 0;
+int main()
+{
+    for (a = 0;;)
+    {
+    }
+}

rtree-c/test/expected/for/reduction/r00000.c

+// 0 inline variable a at ("test/cases/small/for.c": line 1)
+// 0 remove statement at ("test/cases/small/for.c": line 4)
+// 0 remove initializer at ("test/cases/small/for.c": line 4)
+// 0 reduce to left at ("test/cases/small/for.c": line 4)
+// 0 reduce to right at ("test/cases/small/for.c": line 4)
+
+static int a = 0;
+int main()
+{
+    for (a = 0;;)
+    {
+    }
+}

rtree-c/test/expected/for/reduction/r00001.c

+// 0 inline variable a at ("test/cases/small/for.c": line 1)
+// 0 remove statement at ("test/cases/small/for.c": line 4)
+// 0 remove initializer at ("test/cases/small/for.c": line 4)
+// 0 reduce to left at ("test/cases/small/for.c": line 4)
+// 1 reduce to right at ("test/cases/small/for.c": line 4)
+
+static int a = 0;
+int main()
+{
+    for (0;;)
+    {
+    }
+}

rtree-c/test/expected/for/reduction/r0001.c

+// 0 inline variable a at ("test/cases/small/for.c": line 1)
+// 0 remove statement at ("test/cases/small/for.c": line 4)
+// 0 remove initializer at ("test/cases/small/for.c": line 4)
+// 1 reduce to left at ("test/cases/small/for.c": line 4)
+
+static int a = 0;
+int main()
+{
+    for (a;;)
+    {
+    }
+}

rtree-c/test/expected/for/reduction/r001.c

+// 0 inline variable a at ("test/cases/small/for.c": line 1)
+// 0 remove statement at ("test/cases/small/for.c": line 4)
+// 1 remove initializer at ("test/cases/small/for.c": line 4)
+
+static int a = 0;
+int main()
+{
+    for (;;)
+    {
+    }
+}

rtree-c/test/expected/for/reduction/r01.c

+// 0 inline variable a at ("test/cases/small/for.c": line 1)
+// 1 remove statement at ("test/cases/small/for.c": line 4)
+
+static int a = 0;
+int main()
+{
+}

rtree-c/test/expected/for/reduction/r10.c

+// 1 inline variable a at ("test/cases/small/for.c": line 1)
+// 0 remove statement at ("test/cases/small/for.c": line 4)
+
+int main()
+{
+    for (;;)
+    {
+    }
+}

rtree-c/test/expected/for/reduction/r11.c

+// 1 inline variable a at ("test/cases/small/for.c": line 1)
+// 1 remove statement at ("test/cases/small/for.c": line 4)
+
+int main()
+{
+}