[ workaround ] Do not optimise single-alternative oneOfs, don't los…

…e descr
buzden · Sep 15, 2023 · 635b8eb · 635b8eb
1 parent 53541d0
commit 635b8eb
Show file tree

Hide file tree

Showing 81 changed files with 3,492 additions and 2,044 deletions.
diff --git a/src/Deriving/DepTyCheck/Util/Reflection.idr b/src/Deriving/DepTyCheck/Util/Reflection.idr
@@ -158,7 +158,7 @@ liftWeight1 = `(Data.Nat.Pos.one)
 
 export
 callOneOf : (desc : String) -> List TTImp -> TTImp
-callOneOf _    [v]      = v
+--callOneOf _    [v]      = v -- commented out to not to lose the description; uncomment back as soon as we have proper model coverage nodes
 callOneOf desc variants = `(Test.DepTyCheck.Gen.oneOf {description=Just ~(primVal $ Str desc)} {em=MaybeEmpty}) .$ liftList variants
 
 -- List of weights and subgenerators

diff --git a/tests/derivation/core/norec nodep noext 001/expected b/tests/derivation/core/norec nodep noext 001/expected
@@ -9,16 +9,16 @@ False
 -----
 False
 -----
-False
------
-False
------
 True
 -----
 True
 -----
-True
+False
 -----
 True
 -----
+False
+-----
+False
+-----
 True
diff --git a/tests/derivation/core/norec nodep noext 002/expected b/tests/derivation/core/norec nodep noext 002/expected
@@ -7,18 +7,18 @@ X1 False
 -----
 X0
 -----
-X0
+X1 True
 -----
 X0
 -----
-X1 True
------
-X1 True
+X1 False
 -----
 X0
 -----
 X1 True
 -----
-X2 False True
+X1 False
 -----
-X0
+X1 False
+-----
+X2 False True
diff --git a/tests/derivation/core/norec nodep w_ext 001/expected b/tests/derivation/core/norec nodep w_ext 001/expected
@@ -3,17 +3,15 @@
 Generated values:
 -----
 -----
-MkX "a"
------
 MkX ""
 -----
-MkX ""
+MkX "a"
 -----
 MkX ""
 -----
-MkX ""
+MkX "bc"
 -----
-MkX "a"
+MkX ""
 -----
 MkX "a"
 -----
@@ -22,3 +20,5 @@ MkX "a"
 MkX ""
 -----
 MkX "a"
+-----
+MkX "bc"
diff --git a/tests/derivation/core/norec nodep w_ext 002/expected b/tests/derivation/core/norec nodep w_ext 002/expected
@@ -3,22 +3,22 @@
 Generated values:
 -----
 -----
-MkX "a" ""
------
 MkX "" ""
 -----
-MkX "" "a"
------
 MkX "a" "a"
 -----
 MkX "" "a"
 -----
-MkX "a" "bc"
+MkX "" ""
+-----
+MkX "a" "a"
 -----
 MkX "" ""
 -----
-MkX "bc" "a"
+MkX "a" ""
 -----
-MkX "a" "a"
+MkX "a" "bc"
 -----
 MkX "a" ""
+-----
+MkX "a" "a"
diff --git a/tests/derivation/core/norec nodep w_ext 003/expected b/tests/derivation/core/norec nodep w_ext 003/expected
@@ -3,22 +3,22 @@
 Generated values:
 -----
 -----
-MkX "a" 0
------
 MkX "" 0
 -----
-MkX "" 10
------
 MkX "a" 10
 -----
 MkX "" 10
 -----
-MkX "a" 0
------
 MkX "" 10
 -----
-MkX "" 0
+MkX "a" 10
+-----
+MkX "a" 0
 -----
 MkX "a" 10
 -----
+MkX "bc" 10
+-----
+MkX "a" 0
+-----
 MkX "a" 10
diff --git a/tests/derivation/core/norec nodep w_ext 004/expected b/tests/derivation/core/norec nodep w_ext 004/expected
@@ -5,20 +5,20 @@ Generated values:
 -----
 X2 0
 -----
-X1 "" 0
+X1 "a" 10
 -----
 X2 10
 -----
-X2 10
+X1 "a" 0
 -----
-X1 "a" 10
+X1 "" 0
 -----
-X3 ""
+X2 10
 -----
-X1 "bc" 10
+X2 0
 -----
-X2 10
+X1 "a" 10
 -----
-X2 10
+X1 "bc" 10
 -----
-X1 "" 0
+X3 "a"
diff --git a/tests/derivation/core/norec nodep w_ext 006/expected b/tests/derivation/core/norec nodep w_ext 006/expected
@@ -3,11 +3,9 @@
 Generated values:
 -----
 -----
-MkX True
------
 MkX False
 -----
-MkX False
+MkX True
 -----
 MkX False
 -----
@@ -19,6 +17,8 @@ MkX True
 -----
 MkX True
 -----
-MkX True
+MkX False
 -----
 MkX True
+-----
+MkX False
diff --git a/tests/derivation/core/norec t-..->p. noext 001/expected b/tests/derivation/core/norec t-..->p. noext 001/expected
@@ -3,22 +3,22 @@
 Generated values:
 -----
 -----
+(False ** (False ** MkX False False))
+-----
 (True ** (False ** MkX True False))
 -----
 (False ** (False ** MkX False False))
 -----
-(False ** (True ** MkX False True))
+(True ** (True ** MkX True True))
 -----
 (True ** (True ** MkX True True))
 -----
 (True ** (True ** MkX True True))
 -----
-(False ** (True ** MkX False True))
+(False ** (False ** MkX False False))
 -----
 (True ** (False ** MkX True False))
 -----
-(False ** (True ** MkX False True))
+(True ** (True ** MkX True True))
 -----
 (False ** (False ** MkX False False))
------
-(True ** (True ** MkX True True))
diff --git a/tests/derivation/core/norec t-..->p. noext 002/expected b/tests/derivation/core/norec t-..->p. noext 002/expected
@@ -5,20 +5,20 @@ Generated values:
 -----
 (False ** (False ** X1))
 -----
-(False ** (True ** X0 False True))
+(False ** (True ** X1))
+-----
+(False ** (False ** X1))
 -----
 (True ** (True ** X1))
 -----
-(True ** (False ** X1))
+(True ** (True ** X0 True True))
 -----
-(False ** (False ** X1))
+(True ** (True ** X0 True True))
 -----
 (False ** (False ** X1))
 -----
-(True ** (True ** X1))
------
 (False ** (True ** X1))
 -----
-(False ** (True ** X0 False True))
+(True ** (True ** X0 True True))
 -----
-(False ** (True ** X1))
+(False ** (False ** X0 False False))
diff --git a/tests/derivation/core/norec t-p.->.. noext 002/expected b/tests/derivation/core/norec t-p.->.. noext 002/expected
@@ -9,26 +9,22 @@ X0 True False
 -----
 X0 True False
 -----
-X0 True False
------
-X0 True False
------
 X1
 -----
 X1
 -----
-X1
+X0 True False
 -----
 X1
 -----
-X1
+X0 True False
 -----
+X0 True False
 -----
 X1
 -----
-X0 True True
 -----
-X0 True True
+X1
 -----
 X0 True True
 -----
@@ -38,18 +34,18 @@ X1
 -----
 X1
 -----
-X1
+X0 True True
 -----
 X1
 -----
-X1
+X0 True True
 -----
+X0 True True
 -----
 X1
 -----
-X0 False True
 -----
-X0 False True
+X1
 -----
 X0 False True
 -----
@@ -59,18 +55,18 @@ X1
 -----
 X1
 -----
-X1
+X0 False True
 -----
 X1
 -----
-X1
+X0 False True
 -----
+X0 False True
 -----
 X1
 -----
-X0 False False
 -----
-X0 False False
+X1
 -----
 X0 False False
 -----
@@ -80,8 +76,12 @@ X1
 -----
 X1
 -----
-X1
+X0 False False
 -----
 X1
 -----
+X0 False False
+-----
+X0 False False
+-----
 X1