* getvariablesonstack removed. 64/16764/2
Vincent COUVERT [Thu, 2 Jul 2015 13:56:39 +0000 (15:56 +0200)]
Change-Id: I2ede53c26a767c37bfe2595cb6149727832ccfbf

scilab/CHANGES_6.0.X
scilab/modules/core/help/en_US/variables/getvariablesonstack.xml [deleted file]
scilab/modules/core/help/ja_JP/variables/getvariablesonstack.xml [deleted file]
scilab/modules/core/help/pt_BR/variables/getvariablesonstack.xml [deleted file]
scilab/modules/core/help/ru_RU/variables/getvariablesonstack.xml [deleted file]
scilab/modules/core/includes/gw_core.h
scilab/modules/core/locales/core.pot
scilab/modules/core/sci_gateway/c/sci_getvariablesonstack.c [deleted file]
scilab/modules/functions/tests/nonreg_tests/bug_4841.dia.ref [deleted file]
scilab/modules/functions/tests/nonreg_tests/bug_4841.tst [deleted file]
scilab/modules/helptools/data/configuration/scilab_primitives.txt

index 43c2583..bfeacd0 100644 (file)
@@ -1,4 +1,4 @@
-            Changes between version 5.4.X and 6.0.0 of Scilab
+            Changes between version 5.5.2 and 6.0.0 of Scilab
             =================================================
 
 Installation
@@ -24,8 +24,8 @@ File input/output
 * fileinfo can now take a row vector as input.
 
 
-Removed functions (previously declared as obsolete)
-====================================================
+Removed functions
+==================
 
 * maxfile function is now obsolete.
 
@@ -35,6 +35,14 @@ Removed functions (previously declared as obsolete)
 
 * derivative removed. Please use numderivative instead.
 
+* curblockc removed. Please use curblock instead.
+
+
+Removed functions (based on old Scilab stack)
+==============================================
+
+* getvariablesonstack removed.
+
 
 Functions modified
 ===================
@@ -44,6 +52,7 @@ Functions modified
 * pppdiv : return a scalar of type 'constant' when the rank is 0.
 * pdiv   : return a matrix of type 'constant' when all the rank are 0.
 
+
 Syntax clarifications
 =====================
 
@@ -53,6 +62,7 @@ Syntax clarifications
 
 * {"foo"} returns a cell not a string matrix.
 
+
 Deprecated behavior
 ====================
 
@@ -63,14 +73,6 @@ Deprecated behavior
     "-" + mgetl("TMPDIR/test") + "-"
 
 
-Removed functions
-==================
-
-* derivative removed. Please use numderivative instead.
-
-* curblockc removed. Please use curblock instead.
-
-
 Scilab Bug Fixes
 ================
 
diff --git a/scilab/modules/core/help/en_US/variables/getvariablesonstack.xml b/scilab/modules/core/help/en_US/variables/getvariablesonstack.xml
deleted file mode 100644 (file)
index 03290e3..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="en" xml:id="getvariablesonstack">
-    <refnamediv>
-        <refname>getvariablesonstack</refname>
-        <refpurpose>get variable names on stack of scilab</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Calling Sequence</title>
-        <synopsis>
-            s=getvariablesonstack()
-            s=getvariablesonstack('local')
-            s=getvariablesonstack('global')
-        </synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Arguments</title>
-        <variablelist>
-            <varlistentry>
-                <term>s</term>
-                <listitem>
-                    <para>a string matrix</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <para>
-            <literal>s = getvariablesonstack()</literal> returns in <literal>s</literal> the variable names on Scilab stack.
-        </para>
-        <para>
-            <literal>getvariablesonstack('local')</literal> returns the local variables on Scilab stack.
-        </para>
-        <para>
-            <literal>getvariablesonstack('global')</literal> returns the global variables on Scilab stack.
-        </para>
-        <para>Variables are sorted by alphabetical order.</para>
-    </refsection>
-    <refsection>
-        <title>Examples</title>
-        <programlisting role="example"><![CDATA[
-getvariablesonstack()
-getvariablesonstack('local')
-getvariablesonstack('global')
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>See Also</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="who">who</link>
-            </member>
-            <member>
-                <link linkend="whos">whos</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/core/help/ja_JP/variables/getvariablesonstack.xml b/scilab/modules/core/help/ja_JP/variables/getvariablesonstack.xml
deleted file mode 100644 (file)
index e8f6b43..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="ja" xml:id="getvariablesonstack">
-    <refnamediv>
-        <refname>getvariablesonstack</refname>
-        <refpurpose>Scilabスタック上の変数名を取得</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>呼出し手順</title>
-        <synopsis>
-            s=getvariablesonstack()
-            s=getvariablesonstack('local')
-            s=getvariablesonstack('global')
-        </synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>引数</title>
-        <variablelist>
-            <varlistentry>
-                <term>s</term>
-                <listitem>
-                    <para>文字列行列</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>説明</title>
-        <para>
-            <literal>s = getvariablesonstack()</literal>は,
-            Scilabスタック上の変数名を<literal>s</literal>に返します.
-        </para>
-        <para>
-            <literal>getvariablesonstack('local')</literal>
-            は,Scilabスタック上のローカル変数を返します.
-        </para>
-        <para>
-            <literal>getvariablesonstack('global')</literal>
-            は,Scilabスタック上のグローバル変数を返します.
-        </para>
-        <para>変数はアルファベット順にソートされます.</para>
-    </refsection>
-    <refsection>
-        <title>例</title>
-        <programlisting role="example"><![CDATA[ 
-getvariablesonstack()
-getvariablesonstack('local')
-getvariablesonstack('global')
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>参照</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="who">who</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/core/help/pt_BR/variables/getvariablesonstack.xml b/scilab/modules/core/help/pt_BR/variables/getvariablesonstack.xml
deleted file mode 100644 (file)
index 0204204..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="getvariablesonstack" xml:lang="en">
-    <refnamediv>
-        <refname>getvariablesonstack</refname>
-        <refpurpose>retorna nomes de variáveis em na pilha Scilab</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
-        <synopsis>s=getvariablesonstack()
-            s=getvariablesonstack('local')
-            s=getvariablesonstack('global')
-        </synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Parâmetros</title>
-        <variablelist>
-            <varlistentry>
-                <term>s</term>
-                <listitem>
-                    <para>uma matriz de strings</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Descrição</title>
-        <para>
-            Retorna na variável <literal>s</literal> nomes de variáveis na pilha
-            do Scilab.
-        </para>
-        <para>getvariablesonstack('local') retorna o nome das variáveis locais na
-            pilha.
-        </para>
-        <para>getvariablesonstack('global') retorna o nome das variáveis globais
-            na pilha.
-        </para>
-        <para>As variáveis são organizadas na ordem alfabética.</para>
-    </refsection>
-    <refsection>
-        <title>Exemplos</title>
-        <programlisting role="example"><![CDATA[ 
-getvariablesonstack()
-getvariablesonstack('local')
-getvariablesonstack('global')
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>Ver Também</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="who">who</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/core/help/ru_RU/variables/getvariablesonstack.xml b/scilab/modules/core/help/ru_RU/variables/getvariablesonstack.xml
deleted file mode 100644 (file)
index 290f1d6..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="ru" xml:id="getvariablesonstack">
-    <refnamediv>
-        <refname>getvariablesonstack</refname>
-        <refpurpose>получение имён переменных в стеке Scilab'а</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Последовательность вызова</title>
-        <synopsis>
-            s=getvariablesonstack()
-            s=getvariablesonstack('local')
-            s=getvariablesonstack('global')
-        </synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Аргументы</title>
-        <variablelist>
-            <varlistentry>
-                <term>s</term>
-                <listitem>
-                    <para>матрица строк</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Описание</title>
-        <para>
-            <literal>getvariablesonstack()</literal> возвращает в <literal>s</literal> 
-            имена переменных в стеке Scilab'а. 
-        </para>
-        <para>
-            <literal>getvariablesonstack('local')</literal> возвращает локальные переменные в стеке 
-            Scilab'а.
-        </para>
-        <para>
-            <literal>getvariablesonstack('global')</literal> возвращает локальные переменные в стеке 
-            Scilab'а.
-        </para>
-        <para>Переменные отсортированы в алфавитном порядке.</para>
-    </refsection>
-    <refsection>
-        <title>Примеры</title>
-        <programlisting role="example"><![CDATA[ 
-getvariablesonstack()
-getvariablesonstack('local')
-getvariablesonstack('global')
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>Смотрите также</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="who">who</link>
-            </member>
-            <member>
-                <link linkend="whos">whos</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
index c75f286..774c06b 100644 (file)
@@ -49,7 +49,7 @@ int C2F(sci_getmodules)(char *fname, unsigned long fname_len);
 int C2F(sci_with_module)(char *fname, unsigned long fname_len);
 int C2F(sci_getscilabmode)(char *fname, unsigned long fname_len);
 int C2F(sci_librarieslist)(char *fname, unsigned long fname_len);
-int C2F(sci_getvariablesonstack)(char *fname, unsigned long fname_len);
+//int C2F(sci_getvariablesonstack)(char *fname, unsigned long fname_len);
 
 //C_GATEWAY_PROTOTYPE(sci_typename); -> c++
 int C2F(sci_funcprot)(char *fname, void* pvApiCtx);
index b6591a0..91bfbe9 100644 (file)
@@ -65,7 +65,6 @@ msgstr ""
 #
 # File: sci_gateway/c/sci_clearfun.c, line: 70
 # File: sci_gateway/c/sci_funptr.c, line: 49
-# File: sci_gateway/c/sci_getvariablesonstack.c, line: 60
 # File: sci_gateway/c/sci_getversion.c, line: 211
 # File: sci_gateway/c/sci_readgateway.c, line: 130
 # File: sci_gateway/c/sci_warning.c, line: 157
@@ -311,7 +310,6 @@ msgstr ""
 # File: sci_gateway/c/sci_format.c, line: 92
 # File: sci_gateway/c/sci_format.c, line: 121
 # File: sci_gateway/c/sci_format.c, line: 425
-# File: sci_gateway/c/sci_getvariablesonstack.c, line: 54
 # File: sci_gateway/c/sci_predef.c, line: 121
 #, c-format
 msgid "%s: Wrong value for input argument #%d: '%s' or '%s' expected.\n"
diff --git a/scilab/modules/core/sci_gateway/c/sci_getvariablesonstack.c b/scilab/modules/core/sci_gateway/c/sci_getvariablesonstack.c
deleted file mode 100644 (file)
index 20bb49e..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2006 - INRIA - Allan CORNET
- *
- * 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
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
- *
- */
-#include "stack-c.h"
-#include "gw_core.h"
-#include "getvariablesname.h"
-#include "MALLOC.h"
-#include "Scierror.h"
-#include "localization.h"
-#include "freeArrayOfString.h"
-/*--------------------------------------------------------------------------*/
-int C2F(sci_getvariablesonstack)(char *fname, unsigned long fname_len)
-{
-    int l1, n1, m1;
-    char **Variables = NULL;
-    int sizeVariables = 0;
-
-    CheckRhs(0, 1);
-    CheckLhs(0, 1);
-
-    if (Rhs == 0)
-    {
-        Variables = getVariablesName(&sizeVariables, TRUE);
-    }
-    else
-    {
-        if (GetType(1) == sci_strings)
-        {
-            char *parameter = NULL;
-            GetRhsVar(1, STRING_DATATYPE, &m1, &n1, &l1);
-            parameter = cstk(l1);
-
-            if ( ( strcmp(parameter, "local") == 0 ) || ( strcmp(parameter, "global") == 0) )
-            {
-                if (strcmp(parameter, "local") == 0)
-                {
-                    Variables = getLocalVariablesName(&sizeVariables, TRUE);
-                }
-                else /* global */
-                {
-                    Variables = getGlobalVariablesName(&sizeVariables, TRUE);
-                }
-            }
-            else
-            {
-                Scierror(999, _("%s: Wrong value for input argument #%d: '%s' or '%s' expected.\n"), fname, 1, "global", "locale");
-                return 0;
-            }
-        }
-        else
-        {
-            Scierror(999, _("%s: Wrong type for input argument #%d: String expected.\n"), fname, 1);
-            return 0;
-        }
-    }
-
-    m1 = sizeVariables;
-    n1 = 1;
-    CreateVarFromPtr(Rhs + 1, MATRIX_OF_STRING_DATATYPE, &m1, &n1, Variables);
-
-    LhsVar(1) = Rhs + 1;
-
-    freeArrayOfString(Variables, sizeVariables);
-    PutLhsVar();
-
-    return 0;
-}
-/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/functions/tests/nonreg_tests/bug_4841.dia.ref b/scilab/modules/functions/tests/nonreg_tests/bug_4841.dia.ref
deleted file mode 100644 (file)
index 99dbf52..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-// =============================================================================
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2010 - DIGITEO - Allan CORNET
-//
-//  This file is distributed under the same license as the Scilab package.
-// =============================================================================
-//
-// <-- CLI SHELL MODE -->
-//
-// <-- Non-regression test for bug 4841 -->
-//
-// <-- Bugzilla URL -->
-// http://bugzilla.scilab.org/show_bug.cgi?id=4841
-//
-// <-- Short Description -->
-// functions created by 'getd' were unknown to scilab.
-cd TMPDIR;
-mkdir('bug_2807');
-txt = ['function bug_2807()';
-       'endfunction'];
-mputl(txt, TMPDIR + '/bug_2807/bug_2807.sci');
-cd(SCI);
-getd(TMPDIR + '/bug_2807');
-v = getvariablesonstack();
-if grep(v,'bug_2807') == [] then bugmes();quit;end
diff --git a/scilab/modules/functions/tests/nonreg_tests/bug_4841.tst b/scilab/modules/functions/tests/nonreg_tests/bug_4841.tst
deleted file mode 100644 (file)
index 4f5480d..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-// =============================================================================
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2010 - DIGITEO - Allan CORNET
-//
-//  This file is distributed under the same license as the Scilab package.
-// =============================================================================
-//
-// <-- CLI SHELL MODE -->
-//
-// <-- Non-regression test for bug 4841 -->
-//
-// <-- Bugzilla URL -->
-// http://bugzilla.scilab.org/show_bug.cgi?id=4841
-//
-// <-- Short Description -->
-// functions created by 'getd' were unknown to scilab.
-
-cd TMPDIR;
-mkdir('bug_2807');
-txt = ['function bug_2807()';
-       'endfunction'];
-mputl(txt, TMPDIR + '/bug_2807/bug_2807.sci');
-cd(SCI);
-getd(TMPDIR + '/bug_2807');
-v = getvariablesonstack();
-if grep(v,'bug_2807') == [] then pause, end