* Bug 12837 fixed: strcmpi() actual removal 97/20597/5
Samuel GOUGEON [Wed, 31 Oct 2018 00:41:49 +0000 (01:41 +0100)]
  http://bugzilla.scilab.org/12837

  Obsolescence set and code cleaned @ https://codereview.scilab.org/18324

Change-Id: If199eaeb304a699cbd9a2e9f2aed2dd729240ca0

scilab/CHANGES.md
scilab/modules/helptools/data/configuration/scilab_macros.txt
scilab/modules/m2sci/help/en_US/m2sci_equivalents/s/strcmpi.xml
scilab/modules/string/help/en_US/strcmpi.xml [deleted file]
scilab/modules/string/help/ja_JP/strcmpi.xml [deleted file]
scilab/modules/string/help/pt_BR/strcmpi.xml [deleted file]
scilab/modules/string/help/ru_RU/strcmpi.xml [deleted file]
scilab/modules/string/macros/strcmpi.sci [deleted file]

index f61eec0..f362c52 100644 (file)
@@ -185,6 +185,7 @@ Removed Functions
 * `hypermat` was obsolete and has been removed. Please use `matrix` instead.
 * `lstsize` was obsolete and has been removed. Please use `size` instead.
 * `square` was obsolete and has been removed.
+* `strcmpi` was obsolete and has been removed. Please use `strcmp(,'i')` instead.
 * `xgetech` was obsolete and has been removed. Please use `gca` instead.
 
 
@@ -217,6 +218,7 @@ Bug Fixes
 * [#11363](http://bugzilla.scilab.org/show_bug.cgi?id=11363): show_window() did not raise the current graphics window.
 * [#12520](http://bugzilla.scilab.org/show_bug.cgi?id=12520): Vriable browser did not display the size of the variables.
 * [#12534](http://bugzilla.scilab.org/show_bug.cgi?id=12534): Variable browser did not display the size of the variables.
+* [#12837](http://bugzilla.scilab.org/show_bug.cgi?id=12837): `strcmpi` was an obsolete duplicate of `strcmp(,'i')`. It is removed.
 * [#13766](http://bugzilla.scilab.org/show_bug.cgi?id=13766): Minimal values for `.figure_size` were not documented.
 * [#14015](http://bugzilla.scilab.org/show_bug.cgi?id=14015): Nan terms added to a polynomial were ignored.
 * [#14422](http://bugzilla.scilab.org/show_bug.cgi?id=14422): `clc(0)` did nothing, now clears last console entry. Remove leading blank after a `clc()`.
index ce6de9e..8cf5cd1 100644 (file)
  * along with this program.
  *
  -->
-<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:id="m2sci_strcmpi">
+<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:id="m2sci_strcmpi">
     <refnamediv>
         <refname>strcmpi (Matlab function)</refname>
         <refpurpose>Compare strings ignoring case</refpurpose>
             <tr>
                 <td>
                     <programlisting role="example"><![CDATA[
-strcmpi(str1,str2)
+strcmpi(str1, str2)
 ]]></programlisting>
                 </td>
                 <td>
                     <programlisting role="example"><![CDATA[
-convstr(str1)==convstr(str2)
+strcmp(str1, str2, 'i')
 ]]></programlisting>
                 </td>
             </tr>
@@ -47,7 +50,8 @@ convstr(str1)==convstr(str2)
         <title>Particular cases</title>
         <para>
             <note>
-                Note that <emphasis role="bold">strcmpi</emphasis> can be use with not string inputs, in this case Matlab returns <emphasis role="bold">0</emphasis>. Scilab <emphasis role="bold">==</emphasis> will in this case return <emphasis role="bold">%T</emphasis> if both inputs are equal.
+                Note that <emphasis role="bold">strcmpi</emphasis> can be use without string inputs.
+                In this case, Matlab returns <emphasis role="bold">0</emphasis>.
             </note>
         </para>
     </refsection>
diff --git a/scilab/modules/string/help/en_US/strcmpi.xml b/scilab/modules/string/help/en_US/strcmpi.xml
deleted file mode 100644 (file)
index 5a34480..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) INRIA -
- *
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
- *
- -->
-<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="strcmpi">
-    <refnamediv>
-        <refname>strcmpi</refname>
-        <refpurpose>
-            compare character strings (case independent). <emphasis role="bold">This function is obsolete.</emphasis>
-        </refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Syntax</title>
-        <synopsis>res = strcmpi(string_one, string_two)</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Arguments</title>
-        <variablelist>
-            <varlistentry>
-                <term>string_one</term>
-                <listitem>
-                    <para>
-                        a character string or matrix of character strings.
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>string_two</term>
-                <listitem>
-                    <para>
-                        a character string or matrix of character strings.
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>res</term>
-                <listitem>
-                    <para>a matrix of integers.</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <para>
-            <code>res = strcmpi(string_one, string_two)</code> returns an
-            integral value indicating the relationship between the strings. The two strings are compared in using the <emphasis role="bold">lexicographical order</emphasis>.
-        </para>
-        <para>
-            The value is <literal>0</literal> if <varname>string_one</varname>
-            is equal to <varname>string_two</varname> (case independently),
-            <literal>1</literal> if <varname>string_one</varname> is greater than <varname>string_two</varname> and <literal>-1</literal> else.
-        </para>
-        <warning>
-            This function is obsolete. Please use <link linkend="strcmp">strcmp(s1,s1,"i")</link> instead.
-        </warning>
-    </refsection>
-    <refsection>
-        <title>Examples</title>
-        <programlisting role="example"><![CDATA[
-TXT1 = ['scilab','SciLab';'Strcmp','STRcmp'];
-TXT2 = ['ScIlAb','sciLab';'sTrCmP','StrCMP'];
-strcmpi(TXT1,TXT2)
-strcmpi(TXT1,'scilab')
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>See also</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="strcat">strcat</link>
-            </member>
-            <member>
-                <link linkend="strcmp">strcmp</link>
-            </member>
-        </simplelist>
-    </refsection>
-    <refsection>
-        <title>History</title>
-        <revhistory>
-            <revision>
-                <revnumber>6.0</revnumber>
-                <revdescription>
-                    Function tagged as obsolete. Will be removed from Scilab 6.1
-                </revdescription>
-            </revision>
-        </revhistory>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/string/help/ja_JP/strcmpi.xml b/scilab/modules/string/help/ja_JP/strcmpi.xml
deleted file mode 100644 (file)
index c30c4c3..0000000
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) INRIA -
- *
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
- *
- -->
-
-<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="strcmpi">
-
-    <refnamediv>
-
-        <refname>strcmpi</refname>
-
-        <refpurpose>
-            文字列を比較 (大文字小文字を区別) <emphasis role="bold">This function is obsolete.</emphasis>
-        </refpurpose>
-
-    </refnamediv>
-
-    <refsynopsisdiv>
-
-        <title>呼び出し手順</title>
-
-        <synopsis>res = strcmpi(string_one,string_two)</synopsis>
-
-    </refsynopsisdiv>
-
-    <refsection>
-
-        <title>引数</title>
-
-        <variablelist>
-
-            <varlistentry>
-
-                <term>string_one</term>
-
-                <listitem>
-
-                    <para>文字列または文字列の行列</para>
-
-                </listitem>
-
-            </varlistentry>
-
-            <varlistentry>
-
-                <term>string_two</term>
-
-                <listitem>
-
-                    <para>文字列または文字列の行列</para>
-
-                </listitem>
-
-            </varlistentry>
-
-            <varlistentry>
-
-                <term>res</term>
-
-                <listitem>
-
-                    <para>整数の行列.</para>
-
-                </listitem>
-
-            </varlistentry>
-
-        </variablelist>
-
-    </refsection>
-
-    <refsection>
-
-        <title>説明</title>
-
-        <para>
-
-            <code>res = strcmpi(string_one, string_two)</code>は,
-
-            文字列の間の関係を示す内部的な値を返します.
-
-            2つの文字列は<emphasis role="bold">辞書式順序</emphasis>により
-
-            比較されます.
-
-        </para>
-
-        <para>
-
-            <varname>string_one</varname>が <varname>string_two</varname>
-
-            に等しい場合(大文字小文字を区別しません), 値は
-
-            <literal>0</literal> となり,
-
-            <varname>string_one</varname>が
-
-            <varname>string_two</varname>より大きい場合に<literal>1</literal>,
-
-            それ以外は<literal>-1</literal>となります.
-
-        </para>
-
-        <warning>
-            This function is obsolete. Please use <link linkend="strcmp">strcmp(s1,s1,"i")</link> instead.
-        </warning>
-    </refsection>
-
-    <refsection>
-
-        <title>例</title>
-
-        <programlisting role="example"><![CDATA[
-TXT1 = ['scilab','SciLab';'Strcmp','STRcmp'];
-TXT2 = ['ScIlAb','sciLab';'sTrCmP','StrCMP'];
-strcmpi(TXT1,TXT2)
-strcmpi(TXT1,'scilab')
- ]]></programlisting>
-
-    </refsection>
-
-    <refsection role="see also">
-
-        <title>参照</title>
-
-        <simplelist type="inline">
-
-            <member>
-
-                <link linkend="strcat">strcat</link>
-
-            </member>
-
-            <member>
-
-                <link linkend="strcmp">strcmp</link>
-
-            </member>
-
-        </simplelist>
-
-    </refsection>
-
-    <refsection>
-        <title>History</title>
-        <revhistory>
-            <revision>
-                <revnumber>6.0</revnumber>
-                <revdescription>
-                    Function tagged as obsolete. Will be removed from Scilab 6.1
-                </revdescription>
-            </revision>
-        </revhistory>
-    </refsection>
-</refentry>
-
diff --git a/scilab/modules/string/help/pt_BR/strcmpi.xml b/scilab/modules/string/help/pt_BR/strcmpi.xml
deleted file mode 100644 (file)
index b393023..0000000
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) INRIA -
- *
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
- *
- -->
-<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="strcmpi" xml:lang="pt">
-    <refnamediv>
-        <refname>strcmpi</refname>
-        <refpurpose>
-          compara strings (caso independente) <emphasis role="bold">(Obsolete => strcmp(..,"i"))</emphasis>
-        </refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
-        <synopsis>res = strcmpi(string_one,string_two)</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Parâmetros</title>
-        <variablelist>
-            <varlistentry>
-                <term>string_one</term>
-                <listitem>
-                    <para>string ou matriz de strings</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>string_two</term>
-                <listitem>
-                    <para>string ou matriz de strings</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>res</term>
-                <listitem>
-                    <para>matriz</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Descrição</title>
-        <para>
-            <literal>res = strcmpi(string_one,string_two)</literal> retorna um
-            valor inteiro indicando a relação entre os strings.
-        </para>
-        <para>Um valor inteiro maior que zero indica que o primeiro caractere que
-            não corresponde possui valor maior em <literal>string_one</literal> que em
-            <literal>string_two</literal>
-        </para>
-        <para>Um valor negativo indica o contrário.</para>
-        <warning>
-            This function is obsolete. Please use <literal>strcmp(s1,s2,"i")</literal> instead.
-        </warning>
-    </refsection>
-    <refsection>
-        <title>Exemplos</title>
-        <programlisting role="example"><![CDATA[
-TXT1 = ['scilab','SciLab';'Strcmp','STRcmp'];
-TXT2 = ['ScIlAb','sciLab';'sTrCmP','StrCMP'];
-strcmpi(TXT1,TXT2)
-strcmpi(TXT1,'scilab')
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>Ver Também</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="strcat">strcat</link>
-            </member>
-            <member>
-                <link linkend="strcmp">strcmp</link>
-            </member>
-        </simplelist>
-    </refsection>
-    <refsection>
-        <title>Histórico</title>
-        <revhistory>
-            <revision>
-                <revnumber>6.0</revnumber>
-                <revdescription>
-                    Function tagged as obsolete. Will be removed from Scilab 6.1
-                </revdescription>
-            </revision>
-        </revhistory>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/string/help/ru_RU/strcmpi.xml b/scilab/modules/string/help/ru_RU/strcmpi.xml
deleted file mode 100644 (file)
index 1e9dba5..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) INRIA -
- *
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
- *
- -->
-<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="strcmpi">
-    <refnamediv>
-        <refname>strcmpi</refname>
-        <refpurpose>
-            сравнение символьных строк (без учёта регистра)
-        </refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Синтаксис</title>
-        <synopsis>
-            res = strcmpi(string_one, string_two)  <emphasis role="bold">Эта функция устарела.</emphasis>
-        </synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Аргументы</title>
-        <variablelist>
-            <varlistentry>
-                <term>string_one</term>
-                <listitem>
-                    <para>
-                        символьная строка или матрица символьных строк.
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>string_two</term>
-                <listitem>
-                    <para>
-                        символьная строка или матрица символьных строк.
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>res</term>
-                <listitem>
-                    <para>матрица целочисленных значений.</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Описание</title>
-        <para>
-            <code>res = strcmpi(string_one, string_two)</code> возвращает
-            интегральное значение, указывающее отношение между строками.
-        </para>
-        <para>
-            Значение равно <literal>0</literal>, если
-            <varname>string_one</varname> равна <varname>string_two</varname>
-            (независимо от регистра), а <literal>1</literal> указывает обратное.
-        </para>
-        <warning>
-            Эта функция устарела. Пожалуйста, используйте вместо неё функцию <link linkend="strcmp">strcmp(s1,s1,"i")</link>.
-        </warning>
-    </refsection>
-    <refsection>
-        <title>Примеры</title>
-        <programlisting role="example"><![CDATA[
-TXT1 = ['scilab','SciLab';'Strcmp','STRcmp'];
-TXT2 = ['ScIlAb','sciLab';'sTrCmP','StrCMP'];
-strcmpi(TXT1,TXT2)
-strcmpi(TXT1,'scilab')
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>Смотрите также</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="strcat">strcat</link>
-            </member>
-            <member>
-                <link linkend="strcmp">strcmp</link>
-            </member>
-        </simplelist>
-    </refsection>
-    <refsection>
-        <title>История</title>
-        <revhistory>
-            <revision>
-                <revnumber>6.0</revnumber>
-                <revdescription>
-                    Функция помечена как устаревшая. Будет удалена из Scilab 6.1.
-                </revdescription>
-            </revision>
-        </revhistory>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/string/macros/strcmpi.sci b/scilab/modules/string/macros/strcmpi.sci
deleted file mode 100644 (file)
index 07c6bcc..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-//===============================
-// strcmpi function
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) INRIA - Allan CORNET
-//
-// Copyright (C) 2012 - 2016 - Scilab Enterprises
-//
-// This file is hereby licensed under the terms of the GNU GPL v2.0,
-// pursuant to article 5.3.4 of the CeCILL v.2.1.
-// This file was originally licensed under the terms of the CeCILL v2.1,
-// and continues to be available under such terms.
-// For more information, see the COPYING file which you should have received
-// along with this program.
-
-
-//===============================
-function res = strcmpi(str_one,str_two)
-    warnobsolete("strcmp", "6.1")
-    res = strcmp(str_one,str_two,"i");
-endfunction
-//===============================