Revert "

    Remove the warnig on this case
    mprintf(gettext("%s: almost 0.\n"),"linfn");

    to reproduce it:
    exec ./modules/cacsd/macros/linfn.sci;
"
It was disabling this commit:
commit 56d16e8be39c72983fb52671c790addd871d4209
Author: steer <serge.steer@scilab.org>
Date:   Fri Sep 21 17:21:25 2012 +0200

    A warning has been added for 1./x and 1.\x syntax

This reverts commit f2c8866221db542f7666856307a0ba884fe6c0c8.

Change-Id: I4f73a7232dacb260b558387d067031c2713545b0

diff --git a/scilab/modules/core/src/c/getval.c b/scilab/modules/core/src/c/getval.c
index 4b9e639..c3ec37f 100644 (file)
--- a/scilab/modules/core/src/c/getval.c
+++ b/scilab/modules/core/src/c/getval.c
@@ -159,7 +159,7 @@
 extern int C2F(fortrangetch)();
 
 
-int C2F(getval)(double *s, int *dotdet, int *opt)
+int C2F(getval)(double *s, int *dotdet)
 {
     /* Initialized constants */
     static double toto = 0.;
@@ -212,7 +212,7 @@ int C2F(getval)(double *s, int *dotdet, int *opt)
         {
             detdot = TRUE;
             C2F(fortrangetch)();
-            if (opt == 0 && getWarningMode())
+            if (getWarningMode())
             {
                 if ((abs(C2F(com).char1) == slash) || (abs(C2F(com).char1) == bchar_slash))
                 {

diff --git a/scilab/modules/core/src/c/getval.h b/scilab/modules/core/src/c/getval.h
index 858763a..a694871 100644 (file)
--- a/scilab/modules/core/src/c/getval.h
+++ b/scilab/modules/core/src/c/getval.h
@@ -1,11 +1,11 @@
 /*
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2006 - INRIA - Sylvestre LEDRU
- *
+ * 
  * This file must be used under the terms of the CeCILL.
  * This source file is licensed as described in the file COPYING, which
  * you should have received as part of this distribution.  The terms
- * are also available at
+ * are also available at    
  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
  *
  */
@@ -17,11 +17,10 @@
 /**
  * @TODO add comment
  *
- * @param s
- * @param dotdet
- * @param opt
+ * @param s 
+ * @param dotdet    
  * @return <ReturnValue>
  */
-int C2F(getval)(double *s, int *dotdet, int *opt);
+int C2F(getval)(double *s, int *dotdet);
 
 #endif /* __GETVAL_H__ */

diff --git a/scilab/modules/core/src/fortran/getsym.f b/scilab/modules/core/src/fortran/getsym.f
index ba87da1..cad9902 100644 (file)
--- a/scilab/modules/core/src/fortran/getsym.f
+++ b/scilab/modules/core/src/fortran/getsym.f
@@ -92,6 +92,7 @@ c http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
       isBlank(c)    = abs(c) .eq. blank
 
       fin=1
+
 *     go to the first "no like blank" char
       do while ( isBlank(char1) )
          call fortrangetch
@@ -104,7 +105,7 @@ c http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
       if ( isDigit(char1) ) then 
 *        -> number (beginning with a digit => 2d arg of getval : dotdet = .false.)
          sym = num
-         call getval(syv, .false.,opt)
+         call getval(syv, .false.)
          stk(lstk(isiz)) = syv
 
       elseif ( isAlphaNum(char1) .or. char1.eq.percen) then
@@ -135,7 +136,7 @@ c http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
          elseif (sym.eq.dot .and. isDigit(char1)) then
 *           -> it is a number (beginning with a dot => 2d arg of getval : dotdet = .true.)
             sym = num
-            call getval(syv, .true.,opt)
+            call getval(syv, .true.)
             stk(lstk(isiz)) = syv
          endif
       endif