Bug fix R_integer_plus with overflow

Mbodin · Jun 12, 2018 · a8cf22d · a8cf22d
1 parent f39f944
commit a8cf22d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/features/FArithmetic.v b/src/features/FArithmetic.v
@@ -67,7 +67,7 @@ Definition R_allocOrReuseVector S s1 s2 type n :=
 Definition R_integer_plus x y :=
   ifb x = NA_INTEGER \/ y = NA_INTEGER then NA_INTEGER
   else
-    ifb (y < 0 /\ x > R_INT_MAX - y)%Z \/ (y > 0 /\ x < R_INT_MIN - y)%Z then
+    ifb (y > 0 /\ x > R_INT_MAX - y)%Z \/ (y < 0 /\ x < R_INT_MIN - y)%Z then
       (* A warning has been formalised out here. *)
       NA_INTEGER
     else (x + y)%Z.

diff --git a/tests/do_for.R b/tests/do_for.R
@@ -0,0 +1,11 @@
+# @line
+# do_for tests
+
+for(1 in 1:10) 1
+for("x" in  1:10) 1
+
+f<-function() { x<-1 ; for(i in 1:10) { x<-x+1 } ; x } ; f(); f()
+f<-function(r) { x<-0 ; for(i in r) { x<-x+i } ; x } ; f(c(1,2,3,4,5)) ; f(1:10)
+f<-function(r) { x<-0 ; for(i in r) { x<-x+i } ; x } ; f(1:10) ; f(c(1,2,3,4,5))
+f<-function(i) { if (i<=1) {1} else {r<-i; for(j in 2:(i-1)) {r=r*j}; r} }; f(10)
+x<-1 ; for(i in 1:10) { x<-x+1 } ; x