Merge branch 'master' of github.com:softwarelanguageslab/maf

Author: noahvanes

code/jvm/src/main/scala/maf/cli/runnables/IncrementalRun.scala

@@ -174,16 +174,12 @@ object IncrementalRun extends App:
         false
 
     List(
-        // Nog imprecies zelfs met bottomen van cycles. Niet door heuristieken.
-        //"test/changes/scheme/generated/R5RS_WeiChenRompf2019_the-little-schemer_ch3-5.scm",
-
-        //"test/DEBUG3.scm",
-        //"test/DEBUG1.scm",
-        //"test/changes/scheme/generated/R5RS_scp1_count-pairs2-1.scm",
-        "test/DEBUG1.scm",
-        /*
+        //"test/DEBUG1.scm", // Gereduceerd van "test/changes/scheme/generated/R5RS_various_four-in-a-row-5.scm"
+        //"test/DEBUG2.scm", // "test/changes/scheme/generated/R5RS_sigscheme_mem-1.scm"
+        "test/DEBUG3.scm", // "test/changes/scheme/generated/R5RS_scp1_dedouble-2.scm"
+
+      /*
         // Not precise yet.
-        "test/DEBUG2.scm",
         "test/changes/scheme/generated/R5RS_WeiChenRompf2019_the-little-schemer_ch3-5.scm",
         "test/changes/scheme/generated/R5RS_gabriel_puzzle-4.scm",
         "test/changes/scheme/generated/R5RS_scp1_all-but-interval-5.scm",
@@ -196,7 +192,7 @@ object IncrementalRun extends App:
         "test/changes/scheme/generated/R5RS_sigscheme_mem-1.scm",
         "test/changes/scheme/generated/R5RS_various_church-4.scm",
         "test/changes/scheme/generated/R5RS_various_four-in-a-row-5.scm", */
-    ).slice(0,1).foreach { bench =>
+    ).foreach { bench =>
         try {
             println(markTask(s"***** $bench *****"))
             val text = CSchemeParser.parseProgram(Reader.loadFile(bench))
@@ -208,7 +204,8 @@ object IncrementalRun extends App:
             if anly
             then
                 println(text)
-                println(!analyse(text, false, logging = logging && anly, images = images && anly, Some(bench)))
+                val r = analyse(text, false, logging = logging && anly, images = images && anly, Some(bench))
+                if r then println(greenText("PRECISE")) else println(redText("IMPRECISE"))
             else
                 val reduced = reduceImprecise(text)
                 println(reduced)

project/build.properties

@@ -1 +1 @@
-sbt.version=1.6.1
+sbt.version=1.10.11

test/DEBUG1.scm

@@ -1,7 +1,7 @@
-; Verder aangepaste WCR 3-5 reductie
-(letrec ((fun
-           (lambda (l)
-             (if (null? l)
-               (set! l l)
-               (<change> (fun (cdr l)) ())))))
-  (fun (cons 'f ())))
+; Gereduceerd van "test/changes/scheme/generated/R5RS_various_four-in-a-row-5.scm"
+(letrec ((f (lambda ()
+              (<change>
+                ()
+                (f))
+              ())))
+  (f))

test/DEBUG2.scm

@@ -1,7 +1,7 @@
-; WCR 3-5 reductie
-(letrec ((fun
-         (lambda (l)
-           (if (null? l)
-             (fun l)
-             (<change> (fun (cdr l)) ())))))
-  (fun (cons 'f ())))
+;"test/changes/scheme/generated/R5RS_sigscheme_mem-1.scm"
+(letrec ((foo (lambda ()
+                (<change>
+                  (lambda arg
+                    ())
+                  (foo)))))
+  (foo))

test/DEBUG3.scm

@@ -1,10 +1,9 @@
-; Aangapaste WCR 3-5 reductie
-(letrec ((fun
-           (lambda (l)
-             (if (null? l)
-               (fun2 l)
-               (<change> (fun2 (cdr l)) ()))))
-          (fun2
-            (lambda (l2)
-              (fun l2))))
-  (fun (cons 'f ())))
+; "test/changes/scheme/generated/R5RS_scp1_dedouble-2.scm"
+(letrec ((iter (lambda (bool)
+                 (if bool
+                   (<change>
+                     (lambda arg
+                       ())
+                     ())
+                   (iter ())))))
+  (iter #f))

test/DEBUG4.scm

@@ -29,7 +29,7 @@
                 (equal? (all-but-interval)))))
   ())
 
-;"test/changes/scheme/generated/R5RS_scp1_count-pairs2-1.scm"
+;"test/changes/scheme/generated/R5RS_scp1_count-pairs2-1.scm" v
 ;(letrec ((count-pairs (lambda (lst)
 ;                        (letrec ((count (lambda (current)
 ;                                          (count current))))
@@ -58,7 +58,7 @@
                              (ontdubbel-iter ())))))
   (ontdubbel-iter #f))
 
-; "test/changes/scheme/generated/R5RS_scp1_deep-map-combine-4.scm"
+; "test/changes/scheme/generated/R5RS_scp1_deep-map-combine-4.scm" v
 (letrec ((__toplevel_cons cons)
           (_0 (letrec ((deep-combine (lambda (l)
                                        (if (null? l)
@@ -111,7 +111,7 @@
             (best1 (__toplevel_cons 'Brussel ())))
     (merge best1)))
 
-;"test/changes/scheme/generated/R5RS_scp1_merge-5.scm"
+;"test/changes/scheme/generated/R5RS_scp1_merge-5.scm" v
 (letrec ((not (lambda (x)
                 (if x #f #t)))
           (_0 (letrec ((first-el (lambda ()
@@ -120,7 +120,7 @@
                 ())))
   ())
 
-; Verdere reductie met SCA refinement:
+; Verdere reductie met SCA refinement: v
 (letrec ((not (lambda (x)
                 (if x #f #t))))
   (if (<change> #f (not #f))
@@ -135,7 +135,7 @@
                   (foo)))))
   (foo))
 
-;"test/changes/scheme/generated/R5RS_various_church-4.scm"
+;"test/changes/scheme/generated/R5RS_various_church-4.scm" v
 (letrec ((plus (lambda (n1 n2)
                  (lambda (f)
                    (lambda (x)