Work done!

pyrtree/rtree.py

@@ -4,60 +4,63 @@ from dataclasses import dataclass
 @dataclass
 class ReducePath:
     path: list[bool]
-    index: int = 0
+    reasons: list[str]
+
+    @classmethod
+    def empty(cls):
+        return cls([], [])
 
     def explore(self, choice):
-        self.index = 0
+        self.reasons = []
         self.path.append(choice)
         return self
 
     def left(self):
-        return self.index - len(self.path)
+        return len(self.reasons) - len(self.path)
 
-    def dispensable(self):
-        self.index += 1
+    def check(self, reason: str):
+        self.reasons.append(reason)
         try:
-            return self.path[self.index - 1]
+            return self.path[len(self.reasons) - 1]
         except IndexError:
             return False
 
 
-def reduce(predicate, rtree):
-    r = ReducePath([])
-    i = rtree(r)
-    it = rtree(r.explore(True))
+def reduce(predicate, reducer, i):
+    r = ReducePath.empty()
+    j = i
+    ix = reducer(i, r.explore(True))
     # While we don't consume all choices going down the true branch
     while r.left() >= 0:
-        if predicate(it):
+        print(r.reasons[len(r.path) - 1], "...", end="")
+        if predicate(ix):
             # If true update the valid input
-            i = it
+            print(" Yes")
+            j = ix
         else:
             # If false we have to go down the left branch.
+            print(" No")
             r.path[-1] = False
-        it = rtree(r.explore(True))
-    return i
+        ix = reducer(i, r.explore(True))
+    return j
 
 
 def debug(predicate):
     def newpred(i):
         t = predicate(i)
-        print(t, i)
+        print(" test", i, "...", end="")
         return t
 
     return newpred
 
 
-def reduce_list(items: list):
-    def rtree(r: ReducePath) -> list:
-        results = []
-        for i in items:
-            if r.dispensable():
-                continue
-            results.append(i)
-        return results
-
-    return rtree
+def reduce_set(i: set, r) -> set:
+    result: set = set()
+    for e in sorted(i):
+        if not r.check(f"remove {e}?"):
+            result.add(e)
+    return result
 
 
 if __name__ == "__main__":
-    reduce(debug(lambda a: 1 in a), reduce_list([1, 2, 3]))
+    reduce(debug(lambda a: "a" in a), reduce_set, {"a", "b", "c"})

rtree-c/.hspec

 --failure-report .hspec-failures
+--rerun
 --rerun-all-on-success

rtree-c/bin/Main.hs

@@ -15,6 +15,7 @@ import Control.Monad.State
 import Data.Foldable
 import Data.Function
 import Data.Functor
+import Data.IORef (atomicModifyIORef', atomicWriteIORef, newIORef)
 import Data.List.NonEmpty qualified as NE
 import Data.RPath qualified as RPath
 import Data.Text qualified as Text
@@ -28,6 +29,7 @@ import System.Directory
 import System.Exit
 import System.FilePath
 import System.IO
+import System.IO.Error (tryIOError)
 import System.IO.Temp
 import System.Process.Typed
 import Text.Pretty.Simple
@@ -92,6 +94,14 @@ run = do
           , help "check the output for the validity code and output debug information"
           ]
 
+  debug <-
+    flag False True $
+      fold
+        [ long "debug"
+        , short 'D'
+        , help "keep debug versions of all copies"
+        ]
+
   fixpoint <-
     flag False True $
       fold
@@ -128,6 +138,8 @@ run = do
           )
 
     usingLoggerT (filterBySeverity Info msgSeverity $ cmapM fmt logTextStderr) do
+      counter <- liftIO (newIORef (0 :: Int))
+
       let
         test f = process D ("test " <> Text.pack f) do
           err <- liftIO $ runProcess (proc cmd [])
@@ -153,14 +165,21 @@ run = do
         check f l c = process D "Checking predictate" do
           let xs = NE.nonEmpty (filter ((RPath.Yes ==) . RPath.choice) l)
           let decided = length l - RPath.numberOfUndecided l
+
+          count <- liftIO (atomicModifyIORef' counter (\a -> (a + 1, a)))
           logInfo
-            ( "Checking D="
+            ( "Checking (num: "
+                <> Text.pack (show count)
+                <> ") D="
                 <> Text.pack (show decided <> "/" <> show (length l))
                 <> ": "
                 <> Text.pack (maybe "-" ((\(r, p) -> r <> " at " <> show p) . RPath.label . NE.last) xs)
             )
           output f c
           res <- test f
+          when debug $ liftIO do
+            copyFile f ("case-" <> show count <.> "c")
+
           ret <- case res of
             ExitSuccess -> do
               liftIO $ copyFile f (f <.> "last")
@@ -169,7 +188,9 @@ run = do
               | Just x == validity -> do
                   folder <- liftIO do
                     temp <- getCanonicalTemporaryDirectory
-                    folder <- createTempDirectory temp "rtree-c"
+                    createTempDirectory temp "rtree-c"
+                  logWarning $ "Produced invalid code, see " <> Text.pack folder <> " for details"
+                  liftIO do
                     withFile (folder </> "reduction.path") WriteMode \h -> do
                       forM (takeWhile ((/= RPath.Undecided) . RPath.choice) l) \(RPath.AnnotatedChoice c' (msg, pos)) -> do
                         hPutStr h [RPath.debugShowChoice c']
@@ -178,10 +199,10 @@ run = do
                         hPutStr h " at "
                         hPrint h pos
                     copyFile cmd (folder </> takeFileName cmd)
-                    copyFile (f <.> "last") (folder </> takeFileName (f <.> "last"))
                     copyFile f (folder </> takeFileName f)
+                    tryIOError do
+                      copyFile (f <.> "last") (folder </> takeFileName (f <.> "last"))
                     pure folder
-                  logWarning $ "Produced invalid code, see " <> Text.pack folder <> " for details"
                   when pedandic do
                     logError "Pedandic, stoping now."
                     liftIO exitFailure

rtree-c/develop.sh

-ghcid --command='cabal repl rtree-c-test' -r --reload=test/cases 
+ghcid --command='cabal repl rtree-c-test' -W -r --reload=test/cases 

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

@@ -2,5 +2,6 @@ static int a = 0;
 
 int main () {
   for (a = 0;;) {
+    break;
   }
 }

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

+float fabs(float);
+float testx(float);
+float testy(float a);
+
+int main() {
+  return 0;
+}

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

+void printf(const char* fmt,...);
+
+int main(void) {
+  printf("Hello, %s %s", "World", "!");
+  return 0;
+}

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

-struct point { int x; int y; }; 
+struct point { int x, y; }; 
 
 struct point p1 = { 0, 0 };
 

rtree-c/test/expected/add/main.hs

+CTranslUnit
+    [ CFDefExt
+        ( CFunDef
+            [ CTypeSpec
+                ( CIntType () )
+            ]
+            ( CDeclr
+                ( Just
+                    ( Ident "add" 1651297 () )
+                )
+                [ CFunDeclr
+                    ( CFunParamsNew
+                        [ CDecl
+                            [ CTypeSpec
+                                ( CIntType () )
+                            ]
+                            [ CDeclarationItem
+                                ( CDeclr
+                                    ( Just
+                                        ( Ident "a" 97 () )
+                                    ) [] Nothing [] ()
+                                ) Nothing Nothing
+                            ] ()
+                        , CDecl
+                            [ CTypeSpec
+                                ( CIntType () )
+                            ]
+                            [ CDeclarationItem
+                                ( CDeclr
+                                    ( Just
+                                        ( Ident "b" 98 () )
+                                    ) [] Nothing [] ()
+                                ) Nothing Nothing
+                            ] ()
+                        ] False
+                    ) [] ()
+                ] Nothing [] ()
+            ) []
+            ( CCompound []
+                [ CBlockStmt
+                    ( CReturn
+                        ( Just
+                            ( CBinary CAddOp
+                                ( CVar
+                                    ( Ident "a" 97 () ) ()
+                                )
+                                ( CVar
+                                    ( Ident "b" 98 () ) ()
+                                ) ()
+                            )
+                        ) ()
+                    )
+                ] ()
+            ) ()
+        )
+    , CFDefExt
+        ( CFunDef
+            [ CTypeSpec
+                ( CIntType () )
+            ]
+            ( CDeclr
+                ( Just
+                    ( Ident "main" 232419565 () )
+                )
+                [ CFunDeclr
+                    ( CFunParamsNew [] False ) [] ()
+                ] Nothing [] ()
+            ) []
+            ( CCompound []
+                [ CBlockStmt
+                    ( CReturn
+                        ( Just
+                            ( CCall
+                                ( CVar
+                                    ( Ident "add" 1651297 () ) ()
+                                )
+                                [ CConst
+                                    ( CIntConst 10 () )
+                                , CConst
+                                    ( CIntConst 23 () )
+                                ] ()
+                            )
+                        ) ()
+                    )
+                ] ()
+            ) ()
+        )
+    ] ()
\ No newline at end of file

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

-// 0 remove function add at ("test/cases/small/add.c": line 1)
-// 0 remove parameter at ("test/cases/small/add.c": line 1)
-// 1 remove parameter at ("test/cases/small/add.c": line 1)
-// 0 remove return statement at ("test/cases/small/add.c": line 2)
-// 1 remove return statement at ("test/cases/small/add.c": line 6)
-
-int add(int a)
-{
-    return a;
-}
-int main()
-{
-}

rtree-c/test/expected/add/reduction/r001100.c

-// 0 remove function add at ("test/cases/small/add.c": line 1)
-// 0 remove parameter at ("test/cases/small/add.c": line 1)
+// 0 remove function add 41 at ("test/cases/small/add.c": line 1)
+// 0 remove function add 41 at ("test/cases/small/add.c": line 1)
 // 1 remove parameter at ("test/cases/small/add.c": line 1)
-// 1 remove return statement at ("test/cases/small/add.c": line 2)
+// 1 remove parameter at ("test/cases/small/add.c": line 1)
+// 0 Remove compound at ("test/cases/small/add.c": line 1)
 // 0 remove return statement at ("test/cases/small/add.c": line 6)
-// 0 do without param at ("test/cases/small/add.c": line 6)
 
-int add(int a)
+int add()
 {
 }
 int main()
 {
-    return add(10);
+    return add();
 }

rtree-c/test/expected/add/reduction/r001101.c

-// 0 remove function add at ("test/cases/small/add.c": line 1)
-// 0 remove parameter at ("test/cases/small/add.c": line 1)
-// 1 remove parameter at ("test/cases/small/add.c": line 1)
-// 1 remove return statement at ("test/cases/small/add.c": line 2)
-// 0 remove return statement at ("test/cases/small/add.c": line 6)
-// 1 do without param at ("test/cases/small/add.c": line 6)
-
-int add(int a)
-{
-}
-int main()
-{
-    return add(0);
-}

rtree-c/test/expected/add/reduction/r0111.c → rtree-c/test/expected/add/reduction/r0011010.c

-// 0 remove function add at ("test/cases/small/add.c": line 1)
+// 0 remove function add 41 at ("test/cases/small/add.c": line 1)
+// 0 remove function add 41 at ("test/cases/small/add.c": line 1)
 // 1 remove parameter at ("test/cases/small/add.c": line 1)
 // 1 remove parameter at ("test/cases/small/add.c": line 1)
+// 0 Remove compound at ("test/cases/small/add.c": line 1)
 // 1 remove return statement at ("test/cases/small/add.c": line 6)
+// 0 Remove compound at ("test/cases/small/add.c": line 5)
 
 int add()
 {

rtree-c/test/expected/add/reduction/r00111.c → rtree-c/test/expected/add/reduction/r0011011.c

-// 0 remove function add at ("test/cases/small/add.c": line 1)
-// 0 remove parameter at ("test/cases/small/add.c": line 1)
+// 0 remove function add 41 at ("test/cases/small/add.c": line 1)
+// 0 remove function add 41 at ("test/cases/small/add.c": line 1)
 // 1 remove parameter at ("test/cases/small/add.c": line 1)
-// 1 remove return statement at ("test/cases/small/add.c": line 2)
+// 1 remove parameter at ("test/cases/small/add.c": line 1)
+// 0 Remove compound at ("test/cases/small/add.c": line 1)
 // 1 remove return statement at ("test/cases/small/add.c": line 6)
+// 1 Remove compound at ("test/cases/small/add.c": line 5)
 
-int add(int a)
+int add()
 {
 }
 int main()

rtree-c/test/expected/add/reduction/r0110.c → rtree-c/test/expected/add/reduction/r001110.c

-// 0 remove function add at ("test/cases/small/add.c": line 1)
+// 0 remove function add 41 at ("test/cases/small/add.c": line 1)
+// 0 remove function add 41 at ("test/cases/small/add.c": line 1)
 // 1 remove parameter at ("test/cases/small/add.c": line 1)
 // 1 remove parameter at ("test/cases/small/add.c": line 1)
+// 1 Remove compound at ("test/cases/small/add.c": line 1)
 // 0 remove return statement at ("test/cases/small/add.c": line 6)
 
 int add()

rtree-c/test/expected/add/reduction/r0101.c → rtree-c/test/expected/add/reduction/r0011110.c

-// 0 remove function add at ("test/cases/small/add.c": line 1)
+// 0 remove function add 41 at ("test/cases/small/add.c": line 1)
+// 0 remove function add 41 at ("test/cases/small/add.c": line 1)
 // 1 remove parameter at ("test/cases/small/add.c": line 1)
-// 0 remove parameter at ("test/cases/small/add.c": line 1)
+// 1 remove parameter at ("test/cases/small/add.c": line 1)
+// 1 Remove compound at ("test/cases/small/add.c": line 1)
 // 1 remove return statement at ("test/cases/small/add.c": line 6)
+// 0 Remove compound at ("test/cases/small/add.c": line 5)
 
-int add(int b)
+int add()
 {
 }
 int main()

rtree-c/test/expected/add/reduction/r0011111.c

+// 0 remove function add 41 at ("test/cases/small/add.c": line 1)
+// 0 remove function add 41 at ("test/cases/small/add.c": line 1)
+// 1 remove parameter at ("test/cases/small/add.c": line 1)
+// 1 remove parameter at ("test/cases/small/add.c": line 1)
+// 1 Remove compound at ("test/cases/small/add.c": line 1)
+// 1 remove return statement at ("test/cases/small/add.c": line 6)
+// 1 Remove compound at ("test/cases/small/add.c": line 5)
+
+int add()
+{
+}
+int main()
+{
+}

rtree-c/test/expected/add/reduction/r010.c

+// 0 remove function add 41 at ("test/cases/small/add.c": line 1)
+// 1 remove function add 41 at ("test/cases/small/add.c": line 1)
+// 0 Remove compound at ("test/cases/small/add.c": line 5)
+
+int main()
+{
+}

rtree-c/test/expected/add/reduction/r01000.c

-// 0 remove function add at ("test/cases/small/add.c": line 1)
-// 1 remove parameter at ("test/cases/small/add.c": line 1)
-// 0 remove parameter at ("test/cases/small/add.c": line 1)
-// 0 remove return statement at ("test/cases/small/add.c": line 6)
-// 0 do without param at ("test/cases/small/add.c": line 6)
-
-int add(int b)
-{
-}
-int main()
-{
-    return add(23);
-}