Bug Fix #14389 - Modified help pages to add int64() and uint64() descriptions. (en_US... 75/17875/12
Nicolas [Tue, 8 Mar 2016 15:01:13 +0000 (16:01 +0100)]
Change-Id: Ib92d438b482e53b11ac87c4bab66d9a9d4944431

26 files changed:
scilab/CHANGES
scilab/modules/data_structures/help/en_US/type.xml
scilab/modules/data_structures/help/en_US/typeof.xml
scilab/modules/data_structures/help/fr_FR/type.xml
scilab/modules/data_structures/help/ja_JP/type.xml
scilab/modules/data_structures/help/ja_JP/typeof.xml
scilab/modules/data_structures/help/pt_BR/type.xml
scilab/modules/data_structures/help/pt_BR/typeof.xml
scilab/modules/data_structures/help/ru_RU/type.xml
scilab/modules/data_structures/help/ru_RU/typeof.xml
scilab/modules/functions/help/en_US/overloading.xml
scilab/modules/integer/help/en_US/iconvert.xml
scilab/modules/integer/help/en_US/int8.xml
scilab/modules/integer/help/en_US/inttype.xml
scilab/modules/integer/help/fr_FR/iconvert.xml
scilab/modules/integer/help/fr_FR/int8.xml
scilab/modules/integer/help/fr_FR/inttype.xml
scilab/modules/integer/help/ja_JP/iconvert.xml
scilab/modules/integer/help/ja_JP/int8.xml
scilab/modules/integer/help/ja_JP/inttype.xml
scilab/modules/integer/help/pt_BR/iconvert.xml
scilab/modules/integer/help/pt_BR/int8.xml
scilab/modules/integer/help/pt_BR/inttype.xml
scilab/modules/integer/help/ru_RU/iconvert.xml
scilab/modules/integer/help/ru_RU/int8.xml
scilab/modules/integer/help/ru_RU/inttype.xml

index b9ce356..18ac5ce 100644 (file)
@@ -314,6 +314,8 @@ In 6.0.0:
 
 * Bug #14359 fixed - Black Hole demo updated. Stop and Clear buttons did not have priority tag set. Callback_type property has been added and set to 10.
 
+* Bug #14389 fixed - Updated int8(), type(), typeof(), overloading(), iconvert() and inttype() help pages. Added int64() and uint64() descriptions.
+
 * Bug #14415 fixed - Corrected some spellings error in help pages
 
 * Bug #14416 fixed - The file extension filter in Scinotes "Save as" window did not re-used the active file's extension when applicable.
index e228a3b..6135f4e 100644 (file)
@@ -79,7 +79,7 @@
                 <term>8</term>
                 <listitem>
                     <para>
-                        a matrix of <link linkend="int8">integers</link> stored on 1 (<literal>int8</literal>), 2 (<literal>int16</literal>) or 4 (<literal>int32</literal>) bytes.
+                        a matrix of <link linkend="int8">integers</link> stored on 1 (<literal>int8</literal>), 2 (<literal>int16</literal>), 4 (<literal>int32</literal>), or 8 (<literal>int64</literal>) bytes.
                     </para>
                 </listitem>
             </varlistentry>
                 Please note that, for some variables, <function>type</function> will return <literal>tlist</literal>
                 or <literal>mlist</literal> due to the internal data structure. This is the case of
                 <emphasis role="italic">rational</emphasis> and <emphasis role="italic">state-space</emphasis> matrices,
- <emphasis role="italic">uitree</emphasis>, <emphasis role="italic">hypermat</emphasis> and <emphasis role="italic">struct</emphasis>. Please considering the use of
+                <emphasis role="italic">uitree</emphasis>, <emphasis role="italic">hypermat</emphasis> and <emphasis role="italic">struct</emphasis>. Please considering the use of
                 <link linkend="typeof">typeof</link> instead.
             </note>
         </para>
index 430bd50..cda43a9 100644 (file)
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>"int8" or "uint8" or "int16" or "uint16" or "int32" or "uint32"</term>
+                <term>"int8" or "uint8" or "int16" or "uint16" or "int32" or "uint32" or "int64" or "uint64"</term>
                 <listitem>
                     <para>
-                        if <varname>object</varname> is a matrix of [unsigned] integers stored on 8, 16 or 32 bits. (See <link linkend="int8">int</link>)
+                        if <varname>object</varname> is a matrix of [unsigned] integers stored on 8, 16, 32 or 64 bits. (See <link linkend="int8">int</link>)
                     </para>
                 </listitem>
             </varlistentry>
index 4893245..e94e29f 100644 (file)
@@ -85,7 +85,7 @@
                 <listitem>
                     <para>
                         matrice d'<link linkend="int8">entiers</link> codés
-                        sur 1 (int8), 2 (int16) ou 4 (int32) octets.
+                        sur 1 (int8), 2 (int16), 4 (int32) ou 8 (int64) octets.
                     </para>
                 </listitem>
             </varlistentry>
         <para>Note: pour certaines variables, à cause de la représentation
             interne, <emphasis role="italic">type(x)</emphasis> retournera
             tlist (16) ou mlist (17). C'est le cas de <emphasis role="italic">rational</emphasis>, <emphasis role="italic">state-space</emphasis>,
-<emphasis role="italic">uitree</emphasis>, <emphasis role="italic">hypermat</emphasis> et <emphasis role="italic">struct</emphasis>. Merci de considérer l'utilisation
+            <emphasis role="italic">uitree</emphasis>, <emphasis role="italic">hypermat</emphasis> et <emphasis role="italic">struct</emphasis>. Merci de considérer l'utilisation
             de <link linkend="typeof">typeof</link> à la place.
         </para>
     </refsection>
index ed799c9..f785b31 100644 (file)
             <literal>x</literal>の型の種類を整数で返します :
         </para>
         <para>
-            1 
+            1
             :  実数または複素数の定数行列.
         </para>
         <para>
-            2 
+            2
             :  多項式行列.
         </para>
         <para>
-            4 
+            4
             :  論理値行列.
         </para>
         <para>
         </para>
         <para>
             8
-            :  1 2 または 4 バイトに保存される整数行列.
+            :  1 2 4 または 8 バイトに保存される整数行列.
         </para>
         <para>
             9
             :  グラフィックハンドルの行列.
         </para>
         <para>
-            10 
+            10
             :  文字列の行列.
         </para>
         <para>
-            11 
+            11
             :  コンパイル前の関数 (Scilab コード).
         </para>
         <para>
-            13 
+            13
             :  コンパイル済みの関数 (Scilab コード).
         </para>
         <para>
-            14 
+            14
             :  関数ライブラリ.
         </para>
         <para>
-            15 
+            15
             :  リスト.
         </para>
         <para>
-            16 
+            16
             :  型付リスト (tlist).
         </para>
         <para>
index 63c339d..2b3b23f 100644 (file)
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>"int8" または "uint8" または "int16" または "uint16" または "int32" または "uint32"</term>
+                <term>"int8" または "uint8" または "int16" または "uint16" または "int32" または "uint32" または "int64" または "uint64"</term>
                 <listitem>
                     <para>
-                        オブジェクトが 8,16または32ビットに保存される[符号なしの]整数の行列の場合.
+                        オブジェクトが 8,16,32または64ビットに保存される[符号なしの]整数の行列の場合.
                         <link linkend="int8">int8</link>参照)
                     </para>
                 </listitem>
index f1bd93b..f796b3b 100644 (file)
@@ -37,7 +37,7 @@
         <para> 5 : uma matriz esparsa;</para>
         <para> 6 : uma matriz de valores booleanos esparsa;</para>
         <para> 7 : uma matriz esparsa do Matlab.</para>
-        <para> 8 : uma matriz de inteiros armazenados em 1, 2 ou 4 bytes;</para>
+        <para> 8 : uma matriz de inteiros armazenados em 1, 2, 4 ou 8 bytes;</para>
         <para> 9 : uma matriz de manipuladores gráficos;</para>
         <para> 10 : uma matriz de strings;</para>
         <para> 11 : uma função não-compilada (código Scilab);</para>
index f0ce589..310cd9b 100644 (file)
                     </para>
                 </listitem>
             </varlistentry>
+            <varlistentry>
+                <term>"library"</term>
+                <listitem>
+                    <para>
+                        if <varname>object</varname> is a function <link linkend="library">library</link>.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>"int8" or "uint8" or "int16" or "uint16" or "int32" or "uint32" or "int64" or "uint64"</term>
+                <listitem>
+                    <para>
+                        if <varname>object</varname> is a matrix of [unsigned] integers stored on 8, 16, 32 or 64 bits. (See <link linkend="int8">int</link>)
+                    </para>
+                </listitem>
+            </varlistentry>
         </variablelist>
+        <para>
+            <note>
+                Note that if the <varname>object</varname> is a <link linkend="tlist">tlist</link> or <link linkend="mlist">mlist</link>, <function>typeof</function> will return the first string in the first list entry.
+            </note>
+        </para>
     </refsection>
     <refsection>
         <title>Exemplos</title>
index 9541d7d..0874026 100644 (file)
@@ -79,7 +79,7 @@
                 <term>8</term>
                 <listitem>
                     <para>
-                        матрица <link linkend="int8">целочисленных</link> значений, хранимых в 1 (<literal>int8</literal>), 2 (<literal>int16</literal>) или 4 (<literal>int32</literal>) байтах.
+                        матрица <link linkend="int8">целочисленных</link> значений, хранимых в 1 (<literal>int8</literal>), 2 (<literal>int16</literal>) , 4 (<literal>int32</literal>) или 8 (<literal>int64</literal>) байтах.
                     </para>
                 </listitem>
             </varlistentry>
index 36ab35e..0bb16d9 100644 (file)
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>"int8" или "uint8" или "int16" или "uint16" или "int32" или "uint32"</term>
+                <term>"int8" или "uint8" или "int16" или "uint16" или "int32" или "uint32 "или "int64" или "uint64"</term>
                 <listitem>
                     <para>
-                        если <varname>object</varname> - матрица [беззнаковых] целых чисел, хранимых в 8, 16 или 32 битах. (См. <link linkend="int8">int</link>)
+                        если <varname>object</varname> - матрица [беззнаковых] целых чисел, хранимых в 8, 16, 32 или 64 битах. (См. <link linkend="int8">int</link>)
                     </para>
                 </listitem>
             </varlistentry>
index deb9c47..cb38a06 100644 (file)
                     <literal>i</literal>
                 </td>
                 <td>
-                    <literal>int8, int16, int32, uint8, uint16, uint32</literal>
+                    <literal>int8, int16, int32, int64, uint8, uint16, uint32, uint64</literal>
                 </td>
                 <td/>
             </tr>
index 47f8421..d63bc8c 100644 (file)
@@ -16,7 +16,7 @@
 <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" version="5.0-subset Scilab" xml:lang="en" xml:id="iconvert">
     <refnamediv>
         <refname>iconvert</refname>
-        <refpurpose> conversion to 1 or 4 byte integer representation</refpurpose>
+        <refpurpose> conversion to 1 to 8 byte integer representation</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
@@ -40,7 +40,7 @@
             <varlistentry>
                 <term>y</term>
                 <listitem>
-                    <para>a matrix of integers coded on one, two or four bytes.</para>
+                    <para>a matrix of integers coded on 1, 2, 4 or 8 bytes.</para>
                 </listitem>
             </varlistentry>
         </variablelist>
@@ -48,7 +48,7 @@
     <refsection>
         <title>Description</title>
         <para>
-            The <function>iconvert</function> function converts and stores data to one, two or four bytes integers.
+            The <function>iconvert</function> function converts and stores data to 1, 2, 4 or 8 bytes integers.
         </para>
         <variablelist>
             <varlistentry>
                     </para>
                 </listitem>
             </varlistentry>
+            <varlistentry>
+                <term>itype = 8</term>
+                <listitem>
+                    <para>
+                        return <literal>int64</literal> numbers in the range <literal>[-9223372036854775808,9223372036854775807]</literal>
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>itype = 18</term>
+                <listitem>
+                    <para>
+                        return <literal>uint64</literal> numbers in the range <literal>[0, 18446744073709551616]</literal>
+                    </para>
+                </listitem>
+            </varlistentry>
         </variablelist>
     </refsection>
     <refsection>
         <title>Examples</title>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 b=int32([1 -120 127 312])
 y=iconvert(b,1)
 
index da65333..a36c05d 100644 (file)
         <refname>int32</refname>
         <refpurpose> conversion to 4 bytes integer representation</refpurpose>
     </refnamediv>
+    <refnamediv xml:id="int64">
+        <refname>int64</refname>
+        <refpurpose> conversion to 8 bytes integer representation</refpurpose>
+    </refnamediv>
     <refnamediv xml:id="uint8">
         <refname>uint8</refname>
         <refpurpose> conversion to one byte unsigned integer representation</refpurpose>
         <refname>uint32</refname>
         <refpurpose> conversion to 4 bytes unsigned integer representation</refpurpose>
     </refnamediv>
+    <refnamediv xml:id="uint64">
+        <refname>uint64</refname>
+        <refpurpose> conversion to 8 bytes unsigned integer representation</refpurpose>
+    </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
         <synopsis>y = int8(X)
             y = int16(X)
             y = int32(X)
+            y = int64(X)
             y = uint8(X)
             y = uint16(X)
             y = uint32(X)
+            y = uint64(X)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
                     </para>
                 </listitem>
             </varlistentry>
+            <varlistentry>
+                <term>y = int64(X)</term>
+                <listitem>
+                    <para>
+                        return numbers in the range <literal>[-9223372036854775808,9223372036854775807]</literal>
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>y = uint64(X)</term>
+                <listitem>
+                    <para>
+                        return numbers in the range <literal>[0, 18446744073709551616]</literal>
+                    </para>
+                </listitem>
+            </varlistentry>
         </variablelist>
         <para>
             If <varname>X</varname> has numbers with a fractional part, Scilab rounds them
     </refsection>
     <refsection>
         <title>Examples</title>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 int8([1 -120 127 312])
 uint8([1 -120 127 312])
 
index eeac921..a214157 100644 (file)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) INRIA - 
- * 
+ * Copyright (C) INRIA -
+ *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
  *
  * This file is hereby licensed under the terms of the GNU GPL v2.0,
             of <varname>x</varname> as following:
         </para>
         <para>
-            1 
+            1
             :  one byte integer representation;
         </para>
         <para>
-            2 
+            2
             :  two bytes integer representation;
         </para>
         <para>
-            4 
+            4
             :  four bytes integer representation;
         </para>
         <para>
-            11 
+            8
+            : eight bytes integer representation;
+        </para>
+        <para>
+            11
             :  one byte unsigned integer representation;
         </para>
         <para>
-            12 
+            12
             :  two bytes unsigned integer representation;
         </para>
         <para>
-            14 
-            :  four bytes unsigned integer representation.
+            14
+            :  four bytes unsigned integer representation;
+        </para>
+        <para>
+            18
+            : eight bytes unsigned integer representation.
         </para>
         <para>
             If type of <varname>x</varname> is <literal>double</literal> then <varname>i</varname> is <literal>0</literal>.
@@ -77,7 +85,7 @@
     </refsection>
     <refsection>
         <title>Examples</title>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 x=uint16(1:10);
 inttype(x)
  ]]></programlisting>
index 7b8d517..2c3b7a5 100644 (file)
@@ -2,7 +2,7 @@
 <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="fr" xml:id="iconvert">
     <refnamediv>
         <refname>iconvert </refname>
-        <refpurpose>conversion au codage entier à 1,2 ou 4 octets  </refpurpose>
+        <refpurpose>conversion au codage entier à 1, 2, 4 ou 8 octets  </refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Séquence d'appel</title>
@@ -21,7 +21,7 @@
             <varlistentry>
                 <term>y  </term>
                 <listitem>
-                    <para>matrice d'entiers codés sur 1,2 ou 4 octets.
+                    <para>matrice d'entiers codés sur 1, 2, 4 ou 8 octets.
                     </para>
                 </listitem>
             </varlistentry>
@@ -30,7 +30,7 @@
     <refsection>
         <title>Description</title>
         <para>
-            Convertit et stocke sous forme d'entiers à 1,2 ou 4 octets.
+            Convertit et stocke sous forme d'entiers à 1, 2, 4 ou 8 octets.
         </para>
         <variablelist>
             <varlistentry>
             <varlistentry>
                 <term>itype=1</term>
                 <listitem>
-                    <para>renvoie et stocke dans y des entiers int8 dans l'intervalle [-128,127] 
+                    <para>renvoie et stocke dans y des entiers int8 dans l'intervalle [-128,127]
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>itype=11</term>
                 <listitem>
-                    <para>renvoie et stocke dans y des entiers uint8 dans l'intervalle [0,255] 
+                    <para>renvoie et stocke dans y des entiers uint8 dans l'intervalle [0,255]
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>itype=2</term>
                 <listitem>
-                    <para>renvoie et stocke dans y des entiers int16 dans l'intervalle [-32768,32767] 
+                    <para>renvoie et stocke dans y des entiers int16 dans l'intervalle [-32768,32767]
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>itype=12</term>
                 <listitem>
-                    <para>renvoie et stocke dans y des entiers uint16 dans l'intervalle [0, 65535] 
+                    <para>renvoie et stocke dans y des entiers uint16 dans l'intervalle [0, 65535]
                     </para>
                 </listitem>
             </varlistentry>
                 <term>itype=4</term>
                 <listitem>
                     <para>renvoie et stocke dans y des entiers int32 dans
-                        l'intervalle[-2147483648,2147483647] 
+                        l'intervalle[-2147483648,2147483647]
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>itype=14</term>
                 <listitem>
-                    <para>renvoie et stocke dans y des entiers uint32 dans l'intervalle [0, 4294967295] 
+                    <para>renvoie et stocke dans y des entiers uint32 dans l'intervalle [0, 4294967295]
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>itype=8</term>
+                <listitem>
+                    <para>renvoie et stocke dans y des entiers int64 dans l'intervalle [-9223372036854775808, 9223372036854775807]
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>itype=18</term>
+                <listitem>
+                    <para>renvoie et stocke dans y des entiers uint64 dans l'intervalle [0, 18446744073709551616]
                     </para>
                 </listitem>
             </varlistentry>
     </refsection>
     <refsection>
         <title>Exemples</title>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 b=int32([1 -120 127 312])
 y=iconvert(b,1)
  ]]></programlisting>
index 288cf19..33b0424 100644 (file)
         <refname>int32</refname>
         <refpurpose>conversion au codage entier à 4 octets  </refpurpose>
     </refnamediv>
+    <refnamediv xml:id="int64">
+        <refname>int64</refname>
+        <refpurpose>conversion au codage entier à 8 octets  </refpurpose>
+    </refnamediv>
     <refnamediv xml:id="uint8">
         <refname>uint8 </refname>
         <refpurpose>conversion au codage entier non signé à 1 octet  </refpurpose>
         <refname>uint32</refname>
         <refpurpose>conversion au codage entier non signé à 4 octets  </refpurpose>
     </refnamediv>
+    <refnamediv xml:id="uint64">
+        <refname>uint64</refname>
+        <refpurpose>conversion au codage entier non signé à 8 octets  </refpurpose>
+    </refnamediv>
     <refsynopsisdiv>
         <title>Séquence d'appel</title>
         <synopsis>y=int8(X)
             y=int16(X)
             y=int32(X)
+            y=int64(X)
             y=uint8(X)
             y=uint16(X)
             y=uint32(X)
+            y=uint64(X)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
@@ -47,7 +57,7 @@
             <varlistentry>
                 <term>y  </term>
                 <listitem>
-                    <para>matrice d'entiers codés sur 1,2 ou 4 octets.
+                    <para>matrice d'entiers codés sur 1, 2, 4 ou 8 octets.
                     </para>
                 </listitem>
             </varlistentry>
@@ -86,7 +96,7 @@
             <varlistentry>
                 <term>y=int32(X)</term>
                 <listitem>
-                    <para>renvoie et stocke dans y des entiers dans l'intervalle [-2147483648,2147483647] </para>
+                    <para>renvoie et stocke dans y des entiers dans l'intervalle [-2147483648, 2147483647] </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                     <para>renvoie et stocke dans y des entiers dans l'intervalle [0, 4294967295] </para>
                 </listitem>
             </varlistentry>
+            <varlistentry>
+                <term>y=int64(X)</term>
+                <listitem>
+                    <para>renvoie et stocke dans y des entiers dans l'intervalle [-9223372036854775808, 9223372036854775807] </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>y=uint64(X)</term>
+                <listitem>
+                    <para>renvoie et stocke dans y des entiers dans l'intervalle [0, 18446744073709551616] </para>
+                </listitem>
+            </varlistentry>
         </variablelist>
     </refsection>
     <refsection>
         <title>Exemples</title>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 int8([1 -120 127 312])
 uint8([1 -120 127 312])
 
index b5dc9f1..cd82674 100644 (file)
             <literal>x</literal> avec la convention suivante :
         </para>
         <para>
-            1 
+            1
             :  codage entier à 1 octet
         </para>
         <para>
-            2 
+            2
             :  codage entier à 2 octets
         </para>
         <para>
-            4 
+            4
             :  codage entier à 4 octets
         </para>
         <para>
-            11 
+            8
+            :  codage entier à 8 octets
+        </para>
+        <para>
+            11
             :  codage entier non-signé à 1 octet
         </para>
         <para>
-            12 
+            12
             :  codage entier non-signé à 2 octets
         </para>
         <para>
-            14 
+            14
             :  codage entier non-signé à 4 octets
         </para>
+        <para>
+            18
+            :  codage entier non-signé à 8 octets
+        </para>
     </refsection>
     <refsection>
         <title>Exemples</title>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 x=uint16(1:10);
 inttype(x)
  ]]></programlisting>
index 62576eb..ced5838 100644 (file)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) INRIA - 
- * 
+ * Copyright (C) INRIA -
+ *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
  *
  * This file is hereby licensed under the terms of the GNU GPL v2.0,
@@ -16,7 +16,7 @@
 <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="iconvert">
     <refnamediv>
         <refname>iconvert</refname>
-        <refpurpose>1または4バイト整数表現に変換する</refpurpose>
+        <refpurpose>1または8バイト整数表現に変換する</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>呼び出し手順</title>
@@ -34,7 +34,7 @@
             <varlistentry>
                 <term>y</term>
                 <listitem>
-                    <para>1,2または4バイト整数の行列.</para>
+                    <para>1,2,4または8バイト整数の行列.</para>
                 </listitem>
             </varlistentry>
         </variablelist>
@@ -42,7 +42,7 @@
     <refsection>
         <title>説明</title>
         <para>
-            1, 2 または 4バイト整数に変換し,保存します.
+            1, 2, 4, または 8バイト整数に変換し,保存します.
         </para>
         <variablelist>
             <varlistentry>
                     <para> [0, 4294967295]の範囲のuint32型の数を返します</para>
                 </listitem>
             </varlistentry>
+            <varlistentry>
+                <term>itype=4</term>
+                <listitem>
+                    <para>[-9223372036854775808,9223372036854775807]の範囲のint32型の数を返します</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>itype=14</term>
+                <listitem>
+                    <para> [0, 18446744073709551616]の範囲のuint32型の数を返します</para>
+                </listitem>
+            </varlistentry>
         </variablelist>
     </refsection>
     <refsection>
         <title>例</title>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 b=int32([1 -120 127 312])
 y=iconvert(b,1)
  ]]></programlisting>
index 2e7a35f..3d4c42e 100644 (file)
@@ -2,7 +2,7 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2008 - INRIA
- * 
+ *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
  *
  * This file is hereby licensed under the terms of the GNU GPL v2.0,
         <refname>int32</refname>
         <refpurpose>4バイト整数形式に変換する</refpurpose>
     </refnamediv>
+    <refnamediv xml:id="int64">
+        <refname>int64</refname>
+        <refpurpose>8バイト整数形式に変換する</refpurpose>
+    </refnamediv>
     <refnamediv xml:id="uint8">
         <refname>uint8</refname>
         <refpurpose>1バイト符号なし整数形式に変換する</refpurpose>
         <refname>uint32</refname>
         <refpurpose>4バイト符号なし整数形式に変換する</refpurpose>
     </refnamediv>
+    <refnamediv xml:id="uint64">
+        <refname>uint64</refname>
+        <refpurpose>8バイト符号なし整数形式に変換する</refpurpose>
+    </refnamediv>
     <refsynopsisdiv>
         <title>呼び出し手順</title>
         <synopsis>y=int8(X)
             y=int16(X)
             y=int32(X)
+            y=int64(X)
             y=uint8(X)
             y=uint16(X)
             y=uint32(X)
+            y=uint64(X)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
                     <para>[0, 4294967295]の範囲の数を返します</para>
                 </listitem>
             </varlistentry>
+            <varlistentry>
+                <term>y=int64(X)</term>
+                <listitem>
+                    <para>[-9223372036854775808, 9223372036854775807]の範囲の数を返します</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>y=uint64(X)</term>
+                <listitem>
+                    <para>[0, 18446744073709551616]の範囲の数を返します</para>
+                </listitem>
+            </varlistentry>
         </variablelist>
     </refsection>
     <refsection>
         <title>例</title>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 int8([1 -120 127 312])
 uint8([1 -120 127 312])
 x=int32(-200:100:400)
index 21144b8..32cecc2 100644 (file)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) INRIA - 
- * 
+ * Copyright (C) INRIA -
+ *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
  *
  * This file is hereby licensed under the terms of the GNU GPL v2.0,
             のエントリの型を以下のように整数で返します :
         </para>
         <para>
-            1 
+            1
             :  1バイト整数表現
         </para>
         <para>
-            2 
+            2
             :  2バイト整数表現
         </para>
         <para>
-            4 
+            4
             :  4バイト整数表現
         </para>
         <para>
-            11 
+            8
+            :  8バイト整数表現
+        </para>
+        <para>
+            11
             :  1バイト符号なし整数表現
         </para>
         <para>
-            12 
+            12
             :  2バイト符号なし整数表現
         </para>
         <para>
-            14 
+            14
             :  4バイト符号なし整数表現
         </para>
+        <para>
+            18
+            :  8バイト符号なし整数表現
+        </para>
     </refsection>
     <refsection>
         <title>例</title>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 x=uint16(1:10);
 inttype(x)
  ]]></programlisting>
index 7158229..e20754f 100644 (file)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) INRIA - 
- * 
+ * Copyright (C) INRIA -
+ *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
  *
  * This file is hereby licensed under the terms of the GNU GPL v2.0,
@@ -16,7 +16,7 @@
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns4="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="iconvert" xml:lang="en">
     <refnamediv>
         <refname>iconvert</refname>
-        <refpurpose>conversão para representação inteira de 1 a 4
+        <refpurpose>conversão para representação inteira de 1 a 8
             bytes
         </refpurpose>
     </refnamediv>
             <varlistentry>
                 <term>y</term>
                 <listitem>
-                    <para>matriz de inteiros codificados em 1, 2 ou 4 bytes </para>
+                    <para>matriz de inteiros codificados em 1, 2, 4 ou 8 bytes </para>
                 </listitem>
             </varlistentry>
         </variablelist>
     </refsection>
     <refsection>
         <title>Descrição</title>
-        <para>Converte e armazena dados para inteiros de 1, 2 ou 4 bytes.</para>
+        <para>Converte e armazena dados para inteiros de 1, 2, 4 ou 8 bytes.</para>
         <variablelist>
             <varlistentry>
                 <term>itype=0</term>
                     <para>retorna números uint32 no intervalo [0, 4294967295]</para>
                 </listitem>
             </varlistentry>
+            <varlistentry>
+                <term>itype=4</term>
+                <listitem>
+                    <para>retorna números int32 no intervalo [-9223372036854775808,9223372036854775807]
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>itype=14</term>
+                <listitem>
+                    <para>retorna números uint32 no intervalo [0, 18446744073709551616]</para>
+                </listitem>
+            </varlistentry>
         </variablelist>
     </refsection>
     <refsection>
         <title>Exemplos</title>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 b=int32([1 -120 127 312])
 y=iconvert(b,1)
  ]]></programlisting>
index 9028b5c..2901760 100644 (file)
@@ -2,7 +2,7 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2008 - INRIA
- * 
+ *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
  *
  * This file is hereby licensed under the terms of the GNU GPL v2.0,
     </refnamediv>
     <refnamediv xml:id="int32">
         <refname>int32</refname>
-        <refpurpose>conversão para representação de inteiro de 1 byte sem
-            sinal
+        <refpurpose>conversão para representação de inteiro de 4 bytes
+        </refpurpose>
+    </refnamediv>
+    <refnamediv xml:id="int64">
+        <refname>int64</refname>
+        <refpurpose>conversão para representação de inteiro de 8 bytes
         </refpurpose>
     </refnamediv>
     <refnamediv xml:id="uint8">
         <refname>uint8</refname>
-        <refpurpose>conversão para representação de inteiro de 2 byte sem
+        <refpurpose>conversão para representação de inteiro de 1 byte sem
             sinal
         </refpurpose>
     </refnamediv>
     <refnamediv xml:id="uint16">
         <refname>uint16</refname>
-        <refpurpose>conversão para representação de inteiro de 4 byte sem
+        <refpurpose>conversão para representação de inteiro de 2 bytes sem
             sinal
         </refpurpose>
     </refnamediv>
     <refnamediv xml:id="uint32">
         <refname>uint32</refname>
-        <refpurpose>conversão para representação de inteiro de 4 byte sem
+        <refpurpose>conversão para representação de inteiro de 4 bytes sem
+            sinal
+        </refpurpose>
+    </refnamediv>
+    <refnamediv xml:id="uint64">
+        <refname>uint32</refname>
+        <refpurpose>conversão para representação de inteiro de 8 bytes sem
             sinal
         </refpurpose>
     </refnamediv>
         <synopsis>y=int8(X)
             y=int16(X)
             y=int32(X)
+            y=int64(X)
             y=uint8(X)
             y=uint16(X)
             y=uint32(X)
+            y=uint64(X)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
@@ -79,7 +91,7 @@
         <title>Descrição</title>
         <para>Converte e armazena dados em interos de 1, 2 ou 4 bytes. Estes tipos
             de dados são especialmente úteis para armazenar objetos grandes como
-            imagens, sinais longos,... 
+            imagens, sinais longos,...
         </para>
         <variablelist>
             <varlistentry>
                     <para>retorna números no intervalo [0, 4294967295]</para>
                 </listitem>
             </varlistentry>
+            <varlistentry>
+                <term>y=int64(X)</term>
+                <listitem>
+                    <para>retorna números no intervalo [-9223372036854775808, 9223372036854775807] </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>y=uint64(X)</term>
+                <listitem>
+                    <para>retorna números no intervalo [0, 18446744073709551616]</para>
+                </listitem>
+            </varlistentry>
         </variablelist>
     </refsection>
     <refsection>
         <title>Exemplos</title>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 int8([1 -120 127 312])
 uint8([1 -120 127 312])
 
index 6eb4861..4192b60 100644 (file)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) INRIA - 
- * 
+ * Copyright (C) INRIA -
+ *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
  *
  * This file is hereby licensed under the terms of the GNU GPL v2.0,
         <para>1 : representação de inteiros de um byte</para>
         <para>2 : representação de inteiros de dois bytes</para>
         <para>4 : representação de inteiros de quatro bytes</para>
+        <para>8 : representação de inteiros de oito bytes</para>
         <para>11 : representação de inteiros de um byte sem sinal</para>
         <para>12 : representação de inteiros de dois bytes sem sinal</para>
         <para>14 : representação de inteiros de quatro bytes sem sinal</para>
+        <para>18 : representação de inteiros de oito bytes sem sinal</para>
     </refsection>
     <refsection>
         <title>Exemplos</title>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 x=uint16(1:10);
 inttype(x)
  ]]></programlisting>
index 4aaf7e7..16fb059 100644 (file)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) INRIA - 
- * 
+ * Copyright (C) INRIA -
+ *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
  *
  * This file is hereby licensed under the terms of the GNU GPL v2.0,
@@ -16,7 +16,7 @@
 <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" version="5.0-subset Scilab" xml:lang="ru" xml:id="iconvert">
     <refnamediv>
         <refname>iconvert</refname>
-        <refpurpose>преобразование в 1- или 4-байтное представление целого числа</refpurpose>
+        <refpurpose>преобразование в 1- или 8-байтное представление целого числа</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Последовательность вызова</title>
@@ -40,7 +40,7 @@
             <varlistentry>
                 <term>y</term>
                 <listitem>
-                    <para>матрица целых чисел, закодированных в одном, двух или четырёх байтах.</para>
+                    <para>матрица целых чисел, закодированных в 1, 2, 4 или 8 байтах.</para>
                 </listitem>
             </varlistentry>
         </variablelist>
@@ -48,8 +48,8 @@
     <refsection>
         <title>Описание</title>
         <para>
-            Функция <function>iconvert</function> преобразует и хранит данные в виде одно-,
-            двух- или четырёхбайтных целых чисел.
+            Функция <function>iconvert</function> преобразует и хранит данные в виде 1-,
+            2-, 4- или 8-байтных целых чисел.
         </para>
         <variablelist>
             <varlistentry>
                     </para>
                 </listitem>
             </varlistentry>
+            <varlistentry>
+                <term>itype = 8</term>
+                <listitem>
+                    <para>
+                        возвращает числа <literal>int32</literal> в диапазоне <literal>[-9223372036854775808,9223372036854775807]</literal>
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>itype = 18</term>
+                <listitem>
+                    <para>
+                        возвращает числа <literal>uint32</literal> в диапазоне <literal>[0, 18446744073709551616]</literal>
+                    </para>
+                </listitem>
+            </varlistentry>
         </variablelist>
     </refsection>
     <refsection>
         <title>Примеры</title>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 b=int32([1 -120 127 312])
 y=iconvert(b,1)
+
 typeof(b)
 typeof(y)
  ]]></programlisting>
index 7ab1ac5..70de3e0 100644 (file)
         <refname>int32</refname>
         <refpurpose>преобразование в четырёхбайтное представление целого числа</refpurpose>
     </refnamediv>
+    <refnamediv xml:id="int64">
+        <refname>int64</refname>
+        <refpurpose>conversion to 8 bytes integer representation</refpurpose>
+    </refnamediv>
     <refnamediv xml:id="uint8">
         <refname>uint8</refname>
         <refpurpose>преобразование в однобайтное представление беззнакового целого числа</refpurpose>
         <refname>uint32</refname>
         <refpurpose>преобразование в четырёхбайтное представление беззнакового целого числа</refpurpose>
     </refnamediv>
+    <refnamediv xml:id="uint64">
+        <refname>uint64</refname>
+        <refpurpose> conversion to 8 bytes unsigned integer representation</refpurpose>
+    </refnamediv>
     <refsynopsisdiv>
         <title>Последовательность вызова</title>
         <synopsis>y = int8(X)
             y = int16(X)
             y = int32(X)
+            y = int64(X)
             y = uint8(X)
             y = uint16(X)
             y = uint32(X)
+            y = uint64(X)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
                     </para>
                 </listitem>
             </varlistentry>
+            <varlistentry>
+                <term>y = int64(X)</term>
+                <listitem>
+                    <para>
+                        возврат чисел в диапазоне <literal>[-9223372036854775808,9223372036854775807]</literal>
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>y = uint64(X)</term>
+                <listitem>
+                    <para>
+                        возврат чисел в диапазоне <literal>[0, 18446744073709551616]</literal>
+                    </para>
+                </listitem>
+            </varlistentry>
         </variablelist>
         <para>
             Если <varname>X</varname> содержит числа с дробной частью, то Scilab округлит 
index 9b8d14f..a2b5261 100644 (file)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) INRIA - 
- * 
+ * Copyright (C) INRIA -
+ *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
  *
  * This file is hereby licensed under the terms of the GNU GPL v2.0,
             типом элементов <varname>x</varname> как показано ниже:
         </para>
         <para>
-            1 
+            1
             :  однобайтное представление целого числа;
         </para>
         <para>
-            2 
+            2
             :  двухбайтное представление целого числа;
         </para>
         <para>
-            4 
+            4
             :  четырёхбайтное представление целого числа;
         </para>
         <para>
-            11 
+            8
+            : eight bytes integer representation;
+        </para>
+        <para>
+            11
             :  однобайтное представление беззнакового целого числа;
         </para>
         <para>
-            12 
+            12
             :  двухбайтное представление беззнакового целого числа;
         </para>
         <para>
-            14 
+            14
             :  четырёхбайтное представление беззнакового целого числа.
         </para>
         <para>
+            18
+            : eight bytes unsigned integer representation.
+        </para>
+        <para>
             Если тип <varname>x</varname> - <literal>double</literal> (число
             удвоенной точности), то <varname>i</varname> равен <literal>0</literal>.
         </para>
     </refsection>
     <refsection>
         <title>Примеры</title>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 x=uint16(1:10);
 inttype(x)
  ]]></programlisting>