Add declaration and definition case

flake.nix

@@ -16,10 +16,12 @@
     nix-filter,
     ...
   } @ inputs: let
-    load = p: n: {
+    load = final: p: n: {
       "${n}" =
-        p.callCabal2nixWithOptions n
-        (nix-filter.lib {root = "${self}/${n}";}) "" {};
+        final.haskell.lib.overrideCabal
+        (p.callCabal2nixWithOptions n (nix-filter.lib {root = "${self}/${n}";}) "" {}) {
+          doCheck = true;
+        };
     };
     packages = final: p:
       {
@@ -29,8 +31,8 @@
             doCheck = false;
           };
       }
-      // load p "rtree"
-      // load p "rtree-c";
+      // load final p "rtree"
+      // load final p "rtree-c";
     overlays = final: prev: {
       haskellPackages = prev.haskellPackages.extend (p: _: packages final p);
     };
@@ -67,8 +69,12 @@
           hpkgs.shellFor
           {
             name = "rtree-shells";
-            packages = p: [p.rtree p.rtree-c];
+            packages = p: [
+              p.rtree
+              p.rtree-c
+            ];
             doBenchmark = true;
+            doCheck = true;
             inherit nativeBuildInputs withHoogle;
           };
       };

rtree-c/src/ReduceC.hs

@@ -121,7 +121,9 @@ reduceCExternalDeclaration r cont ctx = do
       | otherwise ->
           split ("remove function " <> maybe "" C.identToString (functionName fun), C.posOf r) (cont ctx) do
             r' <- C.CFDefExt <$> reduceCFunDef fun ctx
-            (r' :) <$> cont ctx
+            (r' :) <$> case functionName fun of
+              Just fid -> cont (addInlineExpr fid (C.CVar fid C.undefNode) ctx)
+              Nothing -> cont ctx
     C.CDeclExt result ->
       case result of
         -- A typedef
@@ -206,7 +208,7 @@ reduceCDeclarationItem d ma = case d of
             , addInlineExpr i (C.CVar i ni) ctx
             )
         )
-  C.CDeclarationItem (C.CDeclr (Just i) [] Nothing [] ni) Nothing Nothing -> do
+  C.CDeclarationItem (C.CDeclr (Just i) _ Nothing [] ni) Nothing Nothing -> do
     (ds, ctx) <- ma
     split
       ("remove variable " <> C.identToString i, C.posOf ni)
@@ -417,12 +419,14 @@ reduceCExpr expr ctx = case expr of
     Just $ split ("reduce to operant", C.posOf expr) elhs' do
       e <- elhs'
       pure $ C.CUnary o e ni
+  C.CCall e es ni -> do
+    re <- reduceCExpr e (addKeyword DisallowVariableInlining ctx)
+    Just $ do
+      e' <- re
+      es' <- traverse (`reduceCExprOrZero` ctx) es
+      pure $ C.CCall e' es' ni
   a -> error (show a)
 
---     C.CCall e es ni -> do
---       e' <- reduce e
---       es' <- traverse (fmap orZero reduce) es
---       pure $ C.CCall e' es' ni
 --     C.CCond ec et ef ni -> do
 --       ec' <- reduce ec
 --       ef' <- reduce ef

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

+int printf(const char *, ...);
+
+int main () {
+  printf("Hello, World!");
+}

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

+int f() {
+  return 0;
+}
+
+int main() {
+  return f();
+}

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

+int printf(const char *, ...);
+int main()
+{
+    printf("Hello, World!");
+}

rtree-c/test/expected/declaration/reduction/r000.c

+// 0 remove variable printf at ("test/cases/small/declaration.c": line 1)
+// 0 remove statement at ("test/cases/small/declaration.c": line 4)
+// 0 replace by zero at ("test/cases/small/declaration.c": line 4)
+
+int printf(const char *, ...);
+int main()
+{
+    printf("Hello, World!");
+}

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

+// 0 remove variable printf at ("test/cases/small/declaration.c": line 1)
+// 0 remove statement at ("test/cases/small/declaration.c": line 4)
+// 1 replace by zero at ("test/cases/small/declaration.c": line 4)
+
+int printf(const char *, ...);
+int main()
+{
+    printf(0);
+}

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

+// 0 remove variable printf at ("test/cases/small/declaration.c": line 1)
+// 1 remove statement at ("test/cases/small/declaration.c": line 4)
+
+int printf(const char *, ...);
+int main()
+{
+}

rtree-c/test/expected/declaration/reduction/r1.c

+// 1 remove variable printf at ("test/cases/small/declaration.c": line 1)
+
+int main()
+{
+}

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

+int f()
+{
+    return 0;
+}
+int main()
+{
+    return f();
+}

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

+// 0 remove function f at ("test/cases/small/definition.c": line 1)
+// 0 remove statement at ("test/cases/small/definition.c": line 2)
+// 0 replace by zero at ("test/cases/small/definition.c": line 2)
+// 0 remove statement at ("test/cases/small/definition.c": line 6)
+// 0 replace by zero at ("test/cases/small/definition.c": line 6)
+
+int f()
+{
+    return 0;
+}
+int main()
+{
+    return f();
+}

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

+// 0 remove function f at ("test/cases/small/definition.c": line 1)
+// 0 remove statement at ("test/cases/small/definition.c": line 2)
+// 0 replace by zero at ("test/cases/small/definition.c": line 2)
+// 0 remove statement at ("test/cases/small/definition.c": line 6)
+// 1 replace by zero at ("test/cases/small/definition.c": line 6)
+
+int f()
+{
+    return 0;
+}
+int main()
+{
+    return 0;
+}

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

+// 0 remove function f at ("test/cases/small/definition.c": line 1)
+// 0 remove statement at ("test/cases/small/definition.c": line 2)
+// 0 replace by zero at ("test/cases/small/definition.c": line 2)
+// 1 remove statement at ("test/cases/small/definition.c": line 6)
+
+int f()
+{
+    return 0;
+}
+int main()
+{
+}

rtree-c/test/expected/definition/reduction/r00100.c

+// 0 remove function f at ("test/cases/small/definition.c": line 1)
+// 0 remove statement at ("test/cases/small/definition.c": line 2)
+// 1 replace by zero at ("test/cases/small/definition.c": line 2)
+// 0 remove statement at ("test/cases/small/definition.c": line 6)
+// 0 replace by zero at ("test/cases/small/definition.c": line 6)
+
+int f()
+{
+    return 0;
+}
+int main()
+{
+    return f();
+}

rtree-c/test/expected/definition/reduction/r00101.c

+// 0 remove function f at ("test/cases/small/definition.c": line 1)
+// 0 remove statement at ("test/cases/small/definition.c": line 2)
+// 1 replace by zero at ("test/cases/small/definition.c": line 2)
+// 0 remove statement at ("test/cases/small/definition.c": line 6)
+// 1 replace by zero at ("test/cases/small/definition.c": line 6)
+
+int f()
+{
+    return 0;
+}
+int main()
+{
+    return 0;
+}

rtree-c/test/expected/definition/reduction/r0011.c

+// 0 remove function f at ("test/cases/small/definition.c": line 1)
+// 0 remove statement at ("test/cases/small/definition.c": line 2)
+// 1 replace by zero at ("test/cases/small/definition.c": line 2)
+// 1 remove statement at ("test/cases/small/definition.c": line 6)
+
+int f()
+{
+    return 0;
+}
+int main()
+{
+}

rtree-c/test/expected/definition/reduction/r0100.c

+// 0 remove function f at ("test/cases/small/definition.c": line 1)
+// 1 remove statement at ("test/cases/small/definition.c": line 2)
+// 0 remove statement at ("test/cases/small/definition.c": line 6)
+// 0 replace by zero at ("test/cases/small/definition.c": line 6)
+
+int f()
+{
+}
+int main()
+{
+    return f();
+}

rtree-c/test/expected/definition/reduction/r0101.c

+// 0 remove function f at ("test/cases/small/definition.c": line 1)
+// 1 remove statement at ("test/cases/small/definition.c": line 2)
+// 0 remove statement at ("test/cases/small/definition.c": line 6)
+// 1 replace by zero at ("test/cases/small/definition.c": line 6)
+
+int f()
+{
+}
+int main()
+{
+    return 0;
+}

rtree-c/test/expected/definition/reduction/r011.c

+// 0 remove function f at ("test/cases/small/definition.c": line 1)
+// 1 remove statement at ("test/cases/small/definition.c": line 2)
+// 1 remove statement at ("test/cases/small/definition.c": line 6)
+
+int f()
+{
+}
+int main()
+{
+}

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

+// 1 remove function f at ("test/cases/small/definition.c": line 1)
+// 0 remove statement at ("test/cases/small/definition.c": line 6)
+
+int main()
+{
+    return 0;
+}