Bug fix for #7138

Change-Id: Id26f7f23ff1f64418dad73f95dd797a9168f5d56

3 files changed, 60 insertions, 10 deletions

diff --git a/scilab/modules/core/src/cpp/search_functions.cpp b/scilab/modules/core/src/cpp/search_functions.cpp
index d44ad8b..c49cee1 100644
--- a/scilab/modules/core/src/cpp/search_functions.cpp
+++ b/scilab/modules/core/src/cpp/search_functions.cpp
@@ -143,7 +143,22 @@ void C2F(siflibs)(int* id, int* k_ptr, int* istr, int* lbibn_ptr, int* nbibn_ptr
     return;
 }
 
-/* search for an id in vars, also lifted from Fortran code in funs.f */
+/* search for an id in vars, also lifted from Fortran code in funs.f 
+ 30   k=bot-1
+ 31   k=k+1
+      if(k.gt.isiz) goto 35
+      if(.not.eqid(idstk(1,k),id)) goto 31
+      il=iadr(lstk(k))
+c     modif 1.3 SS
+      if(istk(il).ne.11.and.istk(il).ne.13) then
+         fin=0
+         fun=0
+         return
+      endif
+      fin=k
+      fun=-1
+      return
+*/
 void C2F(sivars)(int* id, int* should_return)
 {
     int* const lstk_ptr = (int*)C2F(vstk).lstk-1;
@@ -159,19 +174,18 @@ void C2F(sivars)(int* id, int* should_return)
 
     if (k <=  C2F(vstk).isiz)
     {/* eq_id */
-        int il=lstk_ptr[k];/* iadr() */
-        il<<=1;
-        ++il;
-
+        int il=lstk_ptr[k];
+        il=il+il-1;/* iadr() */
         if ((*istk(il) != sci_u_function) && (*istk(il) != sci_c_function))
         {
             C2F(com).fun= Fin= 0;
-            *should_return= f_true;
         }
-
-        C2F(com).fun= -1;
-        Fin= k;
+        else
+        {
+          C2F(com).fun= -1;
+          Fin= k;
+        }
         *should_return= f_true;
     }
-    return; /*    *should_return= f_false; */
+    return; 
 }
diff --git a/scilab/modules/core/tests/nonreg_tests/bug_7138.dia.ref b/scilab/modules/core/tests/nonreg_tests/bug_7138.dia.ref
new file mode 100644
index 0000000..b1e6384
--- /dev/null
+++ b/scilab/modules/core/tests/nonreg_tests/bug_7138.dia.ref
@@ -0,0 +1,16 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2010 - DIGITEO - Bernard HUGUENEY
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+// <-- Non-regression test for bug 7138 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/show_bug.cgi?id=7138
+//
+// <-- Short Description -->
+// could not assign a function to a var anymore
+// <-- JVM NOT MANDATORY -->
+a= rand;
+r=a(1);
diff --git a/scilab/modules/core/tests/nonreg_tests/bug_7138.tst b/scilab/modules/core/tests/nonreg_tests/bug_7138.tst
new file mode 100644
index 0000000..bee339a
--- /dev/null
+++ b/scilab/modules/core/tests/nonreg_tests/bug_7138.tst
@@ -0,0 +1,20 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2010 - DIGITEO - Bernard HUGUENEY
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+
+// <-- Non-regression test for bug 7138 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/show_bug.cgi?id=7138
+//
+// <-- Short Description -->
+// could not assign a function to a var anymore
+
+// <-- JVM NOT MANDATORY -->
+
+a= rand;
+r=a(1);
+