* Bug 15308 fixed: evstr(['1;2' '3;4']) was not accepted, unlike ['1 2';'3 4']
[scilab.git] / scilab / modules / string / help / ru_RU / evstr.xml
index ce090ed..2a280f6 100644 (file)
     <refsynopsisdiv>
         <title>Синтаксис</title>
         <synopsis>
-            H = evstr(Z)
-            [H, ierr] = evstr(Z)
+            H = evstr(M)
+            H = evstr(list(M, subExpr))
+            [H, ierr] = evstr(..)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Аргументы</title>
         <variablelist>
-            <varlistentry>
-                <term>Z</term>
-                <listitem>
-                    <para>
-                        матрица символьных строк <varname>M</varname> или
-                        <code>list(M,Subexp)</code>
-                    </para>
-                    <variablelist>
-                        <varlistentry>
-                            <term>M</term>
-                            <listitem>
-                                <para>матрица символьных строк.</para>
-                            </listitem>
-                        </varlistentry>
-                        <varlistentry>
-                            <term>Subexp</term>
-                            <listitem>
-                                <para>вектор символьных строк.</para>
-                            </listitem>
-                        </varlistentry>
-                    </variablelist>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>H</term>
-                <listitem>
-                    <para>матрица.</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>ierr</term>
-                <listitem>
-                    <para>целое число, указатель ошибки.</para>
-                </listitem>
-            </varlistentry>
+          <varlistentry>
+              <term>M</term>
+              <listitem>
+                <para>матрица символьных строк.</para>
+              </listitem>
+          </varlistentry>
+          <varlistentry>
+            <term>subExpr</term>
+            <listitem>
+              <para>вектор символьных строк.</para>
+            </listitem>
+          </varlistentry>
+          <varlistentry>
+            <term>H</term>
+            <listitem>
+              <para>матрица.</para>
+            </listitem>
+          </varlistentry>
+          <varlistentry>
+            <term>ierr</term>
+            <listitem>
+              <para>целое число, указатель ошибки.</para>
+            </listitem>
+          </varlistentry>
         </variablelist>
     </refsection>
     <refsection>
@@ -82,7 +72,7 @@
             но возвращается номер ошибки в <varname>ierr</varname>.
         </para>
         <para>
-            Если <varname>Z</varname> - список, то <varname>Subexp</varname> -
+            Если указан список, то <varname>subExpr</varname>
             вектор символьных строк, который определяет подвыражения, которые
             вычисляются до вычисления <varname>M</varname>. К этим
             подвыражениям следует обращаться как <literal>%(k)</literal> в
@@ -114,6 +104,7 @@ Z = list(['%(1)','%(1)-%(2)'],['a+1','b+1']);
 evstr(Z)
 
 evstr('NaN'), evstr('Inf')
+
 //Вариант с двумя возвращаемыми значениями
 [H, ierr] = evstr(Z) // ошибки нет
 Z = ['a', 'b', 'c'] ;// переменная c не определена
@@ -126,6 +117,34 @@ Z = ['a', 'b', 'c'] ;// переменная c не определена
             <member>
                 <link linkend="execstr">execstr</link>
             </member>
+            <member>
+                <link linkend="sci2exp">sci2exp</link>
+            </member>
+            <member>
+                <link linkend="strtod">strtod</link>
+            </member>
+            <member>
+                <link linkend="brackets">конкатенация</link>
+            </member>
         </simplelist>
     </refsection>
+    <refsection role="history">
+        <title>История</title>
+        <revhistory>
+            <revision>
+                <revnumber>5.3.0</revnumber>
+                <revdescription>
+                <literal>"Nan"</literal> and <literal>"NaN"</literal> are now parsed as <literal>%nan</literal>.
+                <literal>"Inf"</literal> and <literal>"INF"</literal> are now parsed as <literal>%inf</literal>.
+                </revdescription>
+            </revision>
+            <revision>
+                <revnumber>6.0.1</revnumber>
+                <revdescription>
+                  Simple comments are now supported in almost all possible input expressions,
+                  whatever is the shape of <literal>M</literal>.
+                </revdescription>
+            </revision>
+        </revhistory>
+    </refsection>
 </refentry>