Bug 13041 fixed: Invalid result with int minus vect_int

Change-Id: I29f3910b7df19bb39e9109837cf57da8fba8ad37

diff --git a/scilab/CHANGES_5.5.X b/scilab/CHANGES_5.5.X
index 832d219..6c6848d 100644 (file)
--- a/scilab/CHANGES_5.5.X
+++ b/scilab/CHANGES_5.5.X
@@ -109,6 +109,8 @@ Scilab Bug Fixes
 
 * Bug #13036 fixed - Help page associated to history browser was wrong.
 
+* Bug #13041 fixed - Wrong result was returned for "integer scalar" minus "integer vector".
+
 * Bug #13042 fixed - Texts in graphics were not correctly centered.
 
 * Bug #13047 fixed - jcompile did not allow class reloading.

diff --git a/scilab/modules/integer/includes/gensubst.h b/scilab/modules/integer/includes/gensubst.h
index dbfe951..54fcdc4 100644 (file)
--- a/scilab/modules/integer/includes/gensubst.h
+++ b/scilab/modules/integer/includes/gensubst.h
@@ -30,4 +30,6 @@
  */
 INTEGER_IMPEXP int C2F(gensubst)(int *typ, int *n, int *dx, int *incx, int *dy, int *incy);
 
+INTEGER_IMPEXP int C2F(gensubst1)(int *typ, int *n, int *dx, int *incx, int *dy, int *incy);
+
 #endif /* __GENSUBST_H__ */

diff --git a/scilab/modules/integer/src/c/gensubst.c b/scilab/modules/integer/src/c/gensubst.c
index 39e0c12..fda19b0 100644 (file)
--- a/scilab/modules/integer/src/c/gensubst.c
+++ b/scilab/modules/integer/src/c/gensubst.c
@@ -69,3 +69,59 @@ int C2F(gensubst)(int *typ, int *n, int *dx, int *incx, int *dy, int *incy)
     return 0;
 }
 
+#define SUBST1(Type) {\
+Type *DX;\
+Type *DY;\
+    DX=(Type *)dx;\
+    --DX;\
+    DY=(Type *)dy;\
+    --DY;\
+    if (*incx == 1 && *incy == 1){\
+       for (i = 1; i <= i1; ++i)  DX[i] = DY[i] - DX[i];\
+    }\
+    else {\
+      ix = 1; iy = 1;\
+      if (*incx < 0) ix = (-(*n) + 1) * *incx + 1;\
+      if (*incy < 0) iy = (-(*n) + 1) * *incy + 1;\
+      for (i = 1; i <= i1; ++i) {\
+       DX[ix] = DY[iy] - DX[ix];\
+       ix += *incx; iy += *incy;\
+      }\
+ }\
+}
+
+
+
+int C2F(gensubst1)(int *typ, int *n, int *dx, int *incx, int *dy, int *incy)
+{
+    static int i, ix, iy, i1;
+    i1 = *n;
+    if (i1 <= 0)
+    {
+        return 0;
+    }
+
+    switch (*typ)
+    {
+        case 1:
+            SUBST1(integer1);
+            break;
+        case 2:
+            SUBST1(integer2);
+            break;
+        case 4:
+            SUBST1(int) ;
+            break;
+        case 11:
+            SUBST1(unsigned char);
+            break;
+        case 12:
+            SUBST1(unsigned short);
+            break;
+        case 14:
+            SUBST1(unsigned int);
+            break;
+    }
+    return 0;
+}
+

diff --git a/scilab/modules/integer/src/fortran/i_s_i.f b/scilab/modules/integer/src/fortran/i_s_i.f
index a534105..4895a2f 100644 (file)
--- a/scilab/modules/integer/src/fortran/i_s_i.f
+++ b/scilab/modules/integer/src/fortran/i_s_i.f
@@ -102,7 +102,7 @@ c     .   vector-const
 c     .  cst-vector
          call gencopy(it1,1,istk(l1),1,is1,1)
          call gencopy(it1,mn2,istk(l2),1,istk(l1),1)
-         call gensubst(it1,mn2,istk(l1),1,is1,0)
+         call gensubst1(it1,mn2,istk(l1),1,is1,0)
          lstk(top+1)=sadr(l1+memused(it1,mn2))
 
          istk(il1+1)=m2

diff --git a/scilab/modules/integer/tests/nonreg_tests/bug_13041.dia.ref b/scilab/modules/integer/tests/nonreg_tests/bug_13041.dia.ref
new file mode 100644 (file)
index 0000000..adf6b4d
--- /dev/null
+++ b/scilab/modules/integer/tests/nonreg_tests/bug_13041.dia.ref
@@ -0,0 +1,35 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2013 - Scilab Enterprises - Calixte DENIZET
+//
+//  This file is distributed under the same license as the Scilab package.
+// ===========================================================================
+//
+// <-- Non-regression test for bug 13041 -->
+//
+// <-- CLI SHELL MODE -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/13041
+//
+// <-- Short Description -->
+// Invalid result with int minus vect_int
+//
+b = int8(-9);
+a = int8([-7 5]);
+assert_checkequal(-a+b, b-a);
+b = int16(-9);
+a = int16([-7 5]);
+assert_checkequal(-a+b, b-a);
+b = int32(-9);
+a = int32([-7 5]);
+assert_checkequal(-a+b, b-a);
+b = uint8(-9);
+a = uint8([-7 5]);
+assert_checkequal(-a+b, b-a);
+b = uint16(-9);
+a = uint16([-7 5]);
+assert_checkequal(-a+b, b-a);
+b = uint32(-9);
+a = uint32([-7 5]);
+assert_checkequal(-a+b, b-a);

diff --git a/scilab/modules/integer/tests/nonreg_tests/bug_13041.tst b/scilab/modules/integer/tests/nonreg_tests/bug_13041.tst
new file mode 100644 (file)
index 0000000..1c44bcb
--- /dev/null
+++ b/scilab/modules/integer/tests/nonreg_tests/bug_13041.tst
@@ -0,0 +1,42 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2013 - Scilab Enterprises - Calixte DENIZET
+//
+//  This file is distributed under the same license as the Scilab package.
+// ===========================================================================
+//
+// <-- Non-regression test for bug 13041 -->
+//
+// <-- CLI SHELL MODE -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/13041
+//
+// <-- Short Description -->
+// Invalid result with int minus vect_int
+//
+
+b = int8(-9);
+a = int8([-7 5]);
+assert_checkequal(-a+b, b-a);
+
+b = int16(-9);
+a = int16([-7 5]);
+assert_checkequal(-a+b, b-a);
+
+b = int32(-9);
+a = int32([-7 5]);
+assert_checkequal(-a+b, b-a);
+
+b = uint8(-9);
+a = uint8([-7 5]);
+assert_checkequal(-a+b, b-a);
+
+b = uint16(-9);
+a = uint16([-7 5]);
+assert_checkequal(-a+b, b-a);
+
+b = uint32(-9);
+a = uint32([-7 5]);
+assert_checkequal(-a+b, b-a);
+