* Bug 16484: remove mlist(["st"..],..) from Scilab 17/21517/7
Samuel GOUGEON [Tue, 30 Jun 2020 22:46:39 +0000 (00:46 +0200)]
  http://bugzilla.scilab.org/16484

Change-Id: I4de80fd073fe6d0fa481c77b31c5b8145cbe58c3

61 files changed:
scilab/modules/helptools/data/configuration/scilab_macros.txt
scilab/modules/m2sci/macros/compat_functions/%msp_i_st.sci [deleted file]
scilab/modules/m2sci/macros/compat_functions/mtlb_dir.sci
scilab/modules/m2sci/macros/kernel/%infer_i_st.sci [deleted file]
scilab/modules/mexlib/src/cpp/mexlib.cpp
scilab/modules/overloading/macros/%0_i_st.sci [deleted file]
scilab/modules/overloading/macros/%b_i_st.sci [deleted file]
scilab/modules/overloading/macros/%c_i_st.sci [deleted file]
scilab/modules/overloading/macros/%c_n_st.sci [deleted file]
scilab/modules/overloading/macros/%c_o_st.sci [deleted file]
scilab/modules/overloading/macros/%ce_i_st.sci [deleted file]
scilab/modules/overloading/macros/%fptr_i_st.sci [deleted file]
scilab/modules/overloading/macros/%function_i_st.sci [deleted file]
scilab/modules/overloading/macros/%function_n_st.sci [deleted file]
scilab/modules/overloading/macros/%function_o_st.sci [deleted file]
scilab/modules/overloading/macros/%h_i_st.sci [deleted file]
scilab/modules/overloading/macros/%hm_i_st.sci [deleted file]
scilab/modules/overloading/macros/%i_i_st.sci [deleted file]
scilab/modules/overloading/macros/%ip_i_st.sci [deleted file]
scilab/modules/overloading/macros/%l_i_st.sci [deleted file]
scilab/modules/overloading/macros/%l_n_st.sci [deleted file]
scilab/modules/overloading/macros/%l_o_st.sci [deleted file]
scilab/modules/overloading/macros/%lss_i_st.sci [deleted file]
scilab/modules/overloading/macros/%p_i_st.sci [deleted file]
scilab/modules/overloading/macros/%r_i_st.sci [deleted file]
scilab/modules/overloading/macros/%s_i_st.sci [deleted file]
scilab/modules/overloading/macros/%s_n_st.sci [deleted file]
scilab/modules/overloading/macros/%s_o_st.sci [deleted file]
scilab/modules/overloading/macros/%sp_i_st.sci [deleted file]
scilab/modules/overloading/macros/%spb_i_st.sci [deleted file]
scilab/modules/overloading/macros/%st_6.sci [deleted file]
scilab/modules/overloading/macros/%st_e.sci [deleted file]
scilab/modules/overloading/macros/%st_i_b.sci [deleted file]
scilab/modules/overloading/macros/%st_i_c.sci [deleted file]
scilab/modules/overloading/macros/%st_i_fptr.sci [deleted file]
scilab/modules/overloading/macros/%st_i_h.sci [deleted file]
scilab/modules/overloading/macros/%st_i_i.sci [deleted file]
scilab/modules/overloading/macros/%st_i_ip.sci [deleted file]
scilab/modules/overloading/macros/%st_i_lss.sci [deleted file]
scilab/modules/overloading/macros/%st_i_msp.sci [deleted file]
scilab/modules/overloading/macros/%st_i_p.sci [deleted file]
scilab/modules/overloading/macros/%st_i_r.sci [deleted file]
scilab/modules/overloading/macros/%st_i_s.sci [deleted file]
scilab/modules/overloading/macros/%st_i_sp.sci [deleted file]
scilab/modules/overloading/macros/%st_i_spb.sci [deleted file]
scilab/modules/overloading/macros/%st_i_st.sci [deleted file]
scilab/modules/overloading/macros/%st_n_c.sci [deleted file]
scilab/modules/overloading/macros/%st_n_l.sci [deleted file]
scilab/modules/overloading/macros/%st_n_mc.sci [deleted file]
scilab/modules/overloading/macros/%st_n_p.sci [deleted file]
scilab/modules/overloading/macros/%st_n_s.sci [deleted file]
scilab/modules/overloading/macros/%st_o_c.sci [deleted file]
scilab/modules/overloading/macros/%st_o_l.sci [deleted file]
scilab/modules/overloading/macros/%st_o_mc.sci [deleted file]
scilab/modules/overloading/macros/%st_o_p.sci [deleted file]
scilab/modules/overloading/macros/%st_o_s.sci [deleted file]
scilab/modules/overloading/macros/%st_p.sci
scilab/modules/overloading/macros/%st_string.sci [deleted file]
scilab/modules/overloading/macros/%zpk_i_st.sci [deleted file]
scilab/modules/overloading/macros/createstruct.sci
scilab/modules/overloading/macros/st_i_generic.sci [deleted file]

index 0187c7a..382907c 100644 (file)
@@ -574,7 +574,6 @@ polfact
 rowcompr
 sylm
 systmat
-%0_i_st
 %3d_i_h
 %ar_p
 %b_c_spb
@@ -589,7 +588,6 @@ systmat
 %b_i_s
 %b_i_sp
 %b_i_spb
-%b_i_st
 %b_n_hm
 %b_o_hm
 %b_string
@@ -607,11 +605,8 @@ systmat
 %c_i_lss
 %c_i_r
 %c_i_s
-%c_i_st
 %c_n_l
-%c_n_st
 %c_o_l
-%c_o_st
 %c_ones
 %c_rand
 %c_tril
@@ -625,14 +620,11 @@ systmat
 %ce_6
 %ce_e
 %ce_i_s
-%ce_i_st
 %ce_size
 %ce_t
 %champdat_i_h
 %choose
-%fptr_i_st
 %grayplot_i_h
-%h_i_st
 %hm_1_hm
 %hm_2_hm
 %hm_3_hm
@@ -651,7 +643,6 @@ systmat
 %hm_i_i
 %hm_i_p
 %hm_i_s
-%hm_i_st
 %hm_j_hm
 %hm_j_s
 %hm_k_hm
@@ -691,7 +682,6 @@ systmat
 %i_i_hm
 %i_i_i
 %i_i_s
-%i_i_st
 %i_length
 %i_m_i
 %i_or
@@ -700,7 +690,6 @@ systmat
 %i_s_i
 %i_x_i
 %ip_a_s
-%ip_i_st
 %ip_m_s
 %ip_n_ip
 %ip_o_ip
@@ -709,19 +698,16 @@ systmat
 %ip_string
 %l_i_h
 %l_i_s
-%l_i_st
 %l_n_c
 %l_n_l
 %l_n_m
 %l_n_p
 %l_n_s
-%l_n_st
 %l_o_c
 %l_o_l
 %l_o_m
 %l_o_p
 %l_o_s
-%l_o_st
 %lss_a_lss
 %lss_a_p
 %lss_a_r
@@ -741,7 +727,6 @@ systmat
 %lss_i_p
 %lss_i_r
 %lss_i_s
-%lss_i_st
 %lss_inv
 %lss_l_lss
 %lss_l_p
@@ -782,11 +767,7 @@ systmat
 %m_o_l
 %function_i_h
 %function_i_s
-%function_i_st
-%function_n_st
-%function_o_st
 %msp_i_s
-%msp_i_st
 %msp_n_msp
 %msp_o_msp
 %msp_p
@@ -808,7 +789,6 @@ systmat
 %p_i_p
 %p_i_r
 %p_i_s
-%p_i_st
 %p_inv
 %p_j_s
 %p_k_p
@@ -881,7 +861,6 @@ systmat
 %r_i_p
 %r_i_r
 %r_i_s
-%r_i_st
 %r_inv
 %r_j_s
 %r_k_p
@@ -975,7 +954,6 @@ systmat
 %s_i_s
 %s_i_sp
 %s_i_spb
-%s_i_st
 %s_k_hm
 %s_k_p
 %s_k_r
@@ -993,12 +971,10 @@ systmat
 %s_n_l
 %s_n_lss
 %s_n_r
-%s_n_st
 %s_o_hm
 %s_o_l
 %s_o_lss
 %s_o_r
-%s_o_st
 %s_or
 %s_pow
 %s_q_hm
@@ -1038,7 +1014,6 @@ systmat
 %sp_i_h
 %sp_i_s
 %sp_i_sp
-%sp_i_st
 %sp_inv
 %sp_k_s
 %sp_k_sp
@@ -1077,7 +1052,6 @@ systmat
 %spb_i_b
 %spb_i_ce
 %spb_i_h
-%spb_i_st
 %spb_m_b
 %spb_m_s
 %spb_m_sp
@@ -1091,36 +1065,8 @@ systmat
 %spb_x_s
 %spb_x_sp
 %spb_x_spb
-%st_6
-%st_c_st
-%st_e
 %st_f_st
-%st_i_b
-%st_i_c
-%st_i_fptr
-%st_i_h
-%st_i_i
-%st_i_ip
-%st_i_lss
-%st_i_msp
-%st_i_p
-%st_i_r
-%st_i_s
-%st_i_sp
-%st_i_spb
-%st_i_st
-%st_n_c
-%st_n_l
-%st_n_mc
-%st_n_p
-%st_n_s
-%st_o_c
-%st_o_l
-%st_o_mc
-%st_o_p
-%st_o_s
 %st_p
-%st_string
 %ticks_i_h
 %xls_e
 %xls_p
@@ -1133,7 +1079,6 @@ generic_i_ce
 generic_i_h
 generic_i_hm
 generic_i_s
-st_i_generic
 %TSIMPLEX_p
 %TSIMPLEX_string
 optimsimplex_center
diff --git a/scilab/modules/m2sci/macros/compat_functions/%msp_i_st.sci b/scilab/modules/m2sci/macros/compat_functions/%msp_i_st.sci
deleted file mode 100644 (file)
index ec80cbf..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-// 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.
-
-function out=%msp_i_st(i,in,out)
-    out=generic_i_st(i,in,out)
-endfunction
index c0a3c7c..4c5635f 100644 (file)
@@ -69,6 +69,6 @@ function [L]=mtlb_dir(path)
         lbytes=lbytes(1);
         lisdir=lisdir(1);
     end
-    L=mlist(["st","dims","name","date","bytes","isdir"],int32([n 1]),lfiles,ldate,lbytes,lisdir)
-
+    d = [n 1];  
+    L = struct("name",makecell(d, lfiles(:)), "date",makecell(d,ldate(:)), "bytes",makecell(d,lbytes(:)), "isdir",makecell(d,lisdir(:)));
 endfunction
diff --git a/scilab/modules/m2sci/macros/kernel/%infer_i_st.sci b/scilab/modules/m2sci/macros/kernel/%infer_i_st.sci
deleted file mode 100644 (file)
index 1e663a6..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) ???? - INRIA - Scilab
-//
-// 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 st=%infer_i_st(field,infer,st)
-    st=generic_i_st(field,infer,st)
-endfunction
index 4f08892..993f1aa 100644 (file)
  *    format. If A is a sparse Scilab matrix, it should be converted
  *    by the command A=mtlb_sparse(A) in the syntax of the
  *    mex function.
- *    -Structs and Cells are Scilab mlists:
- *    Struct=mlist(["st","dims","field1",...,"fieldk"],
- *                 int32([d1,d2,...,dn]),
- *                 list(obj1,      objN),
- *                 .....
- *                 list(obj1,      objN))     k such lists
- *           N = d1 x d2    x dn
- *           obj = Scilab variable or pointer to Scilab variable.
- *     Cell = Struct with one field called "entries" and "st" <- "ce"
- *    One dimensional structs or cells are as follows:
- *    Struct=mlist(["st","dims","field1",...,"fieldk"],
- *                 int32([1,1]),
- *                 obj1,...,objk)
- *
- *    -Nd dimensional arrays are Scilab mlists (for Nd > 2):
- *     X = mlist(["hm","dims","entries"],
- *                 int32([d1,d2,...,dn]),
- *                 values)
- *     values = vector of doubles or int8-16-32 or char
- --------------------------------------------------------------------------*/
+  --------------------------------------------------------------------------*/
 #include <stdarg.h>
 
 #include <limits>
@@ -911,7 +892,7 @@ int mxSetDimensions(mxArray *array_ptr, const int *dims, int ndim)
     else if (mxIsSparse(array_ptr))
     {
         int temp_dim = 0;
-        
+
         for (int i = 0; i < ndim; i++)
         {
             temp_dim += dims[i];
@@ -1606,11 +1587,11 @@ int mxGetNzmax(const mxArray *ptr)
     {
         return 0;
     }
-    
+
     types::GenericType *pGT = pIT->getAs<types::GenericType>();
 
     int nzmax = ((types::Sparse *)pGT)->nonZeros();
-    
+
     return nzmax;
 }
 
@@ -1648,7 +1629,7 @@ int *mxGetJc(const mxArray *ptr)
     {
         return NULL;
     }
-                    
+
     types::GenericType *pGT = pIT->getAs<types::GenericType>();
 
     int nzmax = ((types::Sparse *)pGT)->nonZeros();
diff --git a/scilab/modules/overloading/macros/%0_i_st.sci b/scilab/modules/overloading/macros/%0_i_st.sci
deleted file mode 100644 (file)
index e95a19c..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2010 - INRIA - Serge Steer <serge.steer@inria.fr>
-//
-// 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 st=%0_i_st(i,void,st)
-    if type(i)==10 then
-        f=getfield(1,st);
-        k=find(f(3:$)==i);
-        if k<>[] then
-            f(k+2)=[];
-            st = setfield(k+2,null(),st);
-            st = setfield(1,f,st);
-        else
-            error(msprintf(_("%s: Invalid index.\n"),"%0_i_st"));
-        end
-    else
-        error(msprintf(_("%s: Wrong type for input argument #%d: String expected.\n"),"%0_i_st",1));
-    end
-endfunction
diff --git a/scilab/modules/overloading/macros/%b_i_st.sci b/scilab/modules/overloading/macros/%b_i_st.sci
deleted file mode 100644 (file)
index ae0400e..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-// 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.
-function out=%b_i_st(i,in,out)
-    out=generic_i_st(i,in,out)
-endfunction
diff --git a/scilab/modules/overloading/macros/%c_i_st.sci b/scilab/modules/overloading/macros/%c_i_st.sci
deleted file mode 100644 (file)
index 176c267..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-// 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.
-
-function out=%c_i_st(i,in,out)
-    out=generic_i_st(i,in,out)
-endfunction
diff --git a/scilab/modules/overloading/macros/%c_n_st.sci b/scilab/modules/overloading/macros/%c_n_st.sci
deleted file mode 100644 (file)
index 9424ddb..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) INRIA, Serge Steer
-//
-// 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 r=%c_n_st(a,b)
-    // implements r=a~=b
-    // for a a matrix of strings and b a struct
-    r=%t
-endfunction
diff --git a/scilab/modules/overloading/macros/%c_o_st.sci b/scilab/modules/overloading/macros/%c_o_st.sci
deleted file mode 100644 (file)
index 39bb15b..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) INRIA, Serge Steer
-//
-// 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 r=%c_o_st(a,b)
-    // implements r=a==b
-    // for a a matrix of strings and b a struct
-    r=%f
-endfunction
diff --git a/scilab/modules/overloading/macros/%ce_i_st.sci b/scilab/modules/overloading/macros/%ce_i_st.sci
deleted file mode 100644 (file)
index 2d8e0f3..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-// 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.
-function out=%ce_i_st(i,in,out)
-    out=generic_i_st(i,in,out)
-endfunction
diff --git a/scilab/modules/overloading/macros/%fptr_i_st.sci b/scilab/modules/overloading/macros/%fptr_i_st.sci
deleted file mode 100644 (file)
index 767583a..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-// 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.
-
-function out=%fptr_i_st(i,in,out)
-    out=generic_i_st(i,in,out)
-endfunction
diff --git a/scilab/modules/overloading/macros/%function_i_st.sci b/scilab/modules/overloading/macros/%function_i_st.sci
deleted file mode 100644 (file)
index e57fc0d..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-// 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.
-
-function out = %function_i_st(i,in,out)
-    out=generic_i_st(i,in,out)
-endfunction
diff --git a/scilab/modules/overloading/macros/%function_n_st.sci b/scilab/modules/overloading/macros/%function_n_st.sci
deleted file mode 100644 (file)
index aaf11f0..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) INRIA, Serge Steer
-//
-// 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 r = %function_n_st(a,b)
-    // implements r=a~=b
-    // for a a function  and b a struct
-    r=%t
-endfunction
diff --git a/scilab/modules/overloading/macros/%function_o_st.sci b/scilab/modules/overloading/macros/%function_o_st.sci
deleted file mode 100644 (file)
index dbe7b95..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) INRIA, Serge Steer
-//
-// 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 r = %function_o_st(a,b)
-    // implements r=a==b
-    // for a a function  and b a struct
-    r=%f
-endfunction
diff --git a/scilab/modules/overloading/macros/%h_i_st.sci b/scilab/modules/overloading/macros/%h_i_st.sci
deleted file mode 100644 (file)
index cebe8c5..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-// 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.
-function out=%h_i_st(i,in,out)
-    out=generic_i_st(i,in,out)
-endfunction
diff --git a/scilab/modules/overloading/macros/%hm_i_st.sci b/scilab/modules/overloading/macros/%hm_i_st.sci
deleted file mode 100644 (file)
index 68be6f3..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-// 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.
-
-function out=%hm_i_st(i,in,out)
-    out=generic_i_st(i,in,out)
-endfunction
diff --git a/scilab/modules/overloading/macros/%i_i_st.sci b/scilab/modules/overloading/macros/%i_i_st.sci
deleted file mode 100644 (file)
index 268037a..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-// 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.
-
-function out=%i_i_st(i,in,out)
-    out=generic_i_st(i,in,out)
-endfunction
diff --git a/scilab/modules/overloading/macros/%ip_i_st.sci b/scilab/modules/overloading/macros/%ip_i_st.sci
deleted file mode 100644 (file)
index 54b7da4..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-// 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.
-
-function out=%ip_i_st(i,in,out)
-    out=generic_i_st(i,in,out)
-endfunction
diff --git a/scilab/modules/overloading/macros/%l_i_st.sci b/scilab/modules/overloading/macros/%l_i_st.sci
deleted file mode 100644 (file)
index 9f53566..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-// 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.
-
-function out=%l_i_st(i,in,out)
-    out=generic_i_st(i,in,out)
-endfunction
diff --git a/scilab/modules/overloading/macros/%l_n_st.sci b/scilab/modules/overloading/macros/%l_n_st.sci
deleted file mode 100644 (file)
index 6e2dfd1..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) INRIA, Serge Steer
-//
-// 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 r=%l_n_st(a,b)
-    // implements r=a~=b
-    // for a a list and b a struct
-    r=%t
-endfunction
diff --git a/scilab/modules/overloading/macros/%l_o_st.sci b/scilab/modules/overloading/macros/%l_o_st.sci
deleted file mode 100644 (file)
index fd77292..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) INRIA, Serge Steer
-//
-// 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 r=%l_o_st(a,b)
-    // implements r=a==b
-    // for a a list and b a struct
-    r=%f
-endfunction
diff --git a/scilab/modules/overloading/macros/%lss_i_st.sci b/scilab/modules/overloading/macros/%lss_i_st.sci
deleted file mode 100644 (file)
index ce5de0d..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-// 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.
-
-function out=%lss_i_st(i,in,out)
-    out=generic_i_st(i,in,out)
-endfunction
diff --git a/scilab/modules/overloading/macros/%p_i_st.sci b/scilab/modules/overloading/macros/%p_i_st.sci
deleted file mode 100644 (file)
index 6d4ab38..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-// 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.
-
-function out=%p_i_st(i,in,out)
-    out=generic_i_st(i,in,out)
-endfunction
diff --git a/scilab/modules/overloading/macros/%r_i_st.sci b/scilab/modules/overloading/macros/%r_i_st.sci
deleted file mode 100644 (file)
index fcd79d2..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-// 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.
-
-function M=%r_i_st(varargin)
-    M=generic_i_st(varargin(:))
-endfunction
diff --git a/scilab/modules/overloading/macros/%s_i_st.sci b/scilab/modules/overloading/macros/%s_i_st.sci
deleted file mode 100644 (file)
index eaf1f75..0000000
+++ /dev/null
@@ -1,108 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2010 - INRIA - Serge Steer <serge.steer@inria.fr>
-// Copyright (C) 2018 - Samuel GOUGEON
-//
-// 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 out=%s_i_st(varargin)
-
-    // - Modified by Vincent COUVERT (16/08/2004) so that insertion of an empty matrix
-    //   is understood as an element deletion
-    //   Only one non-colon index can be used
-    // - Modified by Serge Steer INRIA (04/05/2010) to fix problems in element
-    //   deletion part
-    // varargin: (1)=i, (2)=j, (3)=value, (4)=st  st(i,j)=value
-
-    if size(varargin)>=3 & isempty(varargin($-1)) & ..
-        and(type(varargin(1))<>[10 15]) then
-        // st(i,:)=[] or st(:,j)=[] or st(i)=[] or st(:,j,:,:)=[]
-        //remove the substruct
-        out=varargin($);
-        dims=size(out)
-
-        // Make the dimensions and the indices fit
-        Ndims=size(dims,"*")
-        nindex=size(varargin)-2
-        if nindex>Ndims then
-            //index in excess must be equal to 1 or to :
-            for k=Ndims+1:nindex
-                i=varargin(k)
-                if size(i,"*")>1|(i<>1&i<>eye()) then
-                    msg = _("%s: A null assignment can have only one non-colon index.\n")
-                    error(msprintf(msg, "%s_i_st"));
-                end
-            end
-            nindex=Ndims
-        elseif nindex<Ndims then
-            //collapse dimensions in excess
-            dims=[dims(1:nindex-1) prod(dims(nindex:$))]
-            Ndims=nindex;
-            if size(dims,"*")==1 then dims=[dims 1],end
-        end
-
-        // Check the compatibility of the index (at most one index cannot span
-        // all the elements ot the associated struct dimension)
-        cj=[];
-        for k=1:nindex
-            ind=varargin(k)
-            if type(ind)==2 then // polynomial (like $)
-                ind = horner(ind,dims(k));
-            elseif typeof(ind)=="implicitlist"
-                if ind(1)==1 & ind(2)==1 & ind(3)==$
-                    ind = eye()
-                else
-                    a = horner([ind(1) ind(2) ind(3)],dims(k));
-                    execstr("ind=a(1):a(2):a(3)");
-                end
-            end
-            if or(size(ind)<>[-1 -1]) then
-                ind=floor(ind);
-                //check if index is valid
-                if ~isreal(ind)|or(ind<=0) then
-                    msg = _("%s: Invalid index\n");
-                    error(msprintf(msg, "%s_i_st"))
-                end
-                //remove indices that exceed the associated struct dimension
-                ind(ind>dims(k))=[];
-                //compute the complement with respect to the associated dimension of st
-                ind=setdiff(1:dims(k),ind)
-                if ind<>[]&cj==[] then
-                    cj=ind
-                    loc=k,
-                else
-                    msg = _("%s: A null assignment can have only one non-colon index.\n")
-                    error(msprintf(msg, "%s_i_st"));
-                end
-            end
-        end
-
-        // Generate the result
-        if cj==[] then  //st(:,:)=[]  --> empty struct
-            Fout=getfield(1,out)
-            Fout=Fout(3:$)
-            for f=Fout
-                out(f)=list()
-            end
-        else
-            //replace st(:,j,:,:)=[] by st=st(:,cj,:,:) where cj is the
-            //complement of j with respect to the associated dimension of st
-            varargin(loc)=cj
-            out=out(varargin(1:Ndims))
-        end
-
-    elseif size(varargin)==3 & type(varargin(1))==10 then // out.i=in
-        i=varargin(1);
-        in=varargin(2);
-        out=varargin(3);
-        out=generic_i_st(i,in,out)
-    else
-        error(msprintf(_("%s: Not yet implemented.\n"),"%s_i_st"));
-    end
-endfunction
diff --git a/scilab/modules/overloading/macros/%s_n_st.sci b/scilab/modules/overloading/macros/%s_n_st.sci
deleted file mode 100644 (file)
index 07a7208..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) INRIA, Serge Steer
-//
-// 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 r=%s_n_st(a,b)
-    // implements r=a~=b
-    // for a a  matrix of floating point numbers and b= struct
-    r=%t
-endfunction
diff --git a/scilab/modules/overloading/macros/%s_o_st.sci b/scilab/modules/overloading/macros/%s_o_st.sci
deleted file mode 100644 (file)
index bfed218..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) INRIA, Serge Steer
-//
-// 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 r=%s_o_st(a,b)
-    // implements r=a==b
-    // for a a  matrix of floating point numbers and b= struct
-    r=%f
-endfunction
diff --git a/scilab/modules/overloading/macros/%sp_i_st.sci b/scilab/modules/overloading/macros/%sp_i_st.sci
deleted file mode 100644 (file)
index 462df2a..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-// 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.
-
-function out=%sp_i_st(i,in,out)
-    out=generic_i_st(i,in,out)
-endfunction
diff --git a/scilab/modules/overloading/macros/%spb_i_st.sci b/scilab/modules/overloading/macros/%spb_i_st.sci
deleted file mode 100644 (file)
index 64a6a8f..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-// 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.
-
-function out=%spb_i_st(i,in,out)
-    out=generic_i_st(i,in,out)
-endfunction
diff --git a/scilab/modules/overloading/macros/%st_6.sci b/scilab/modules/overloading/macros/%st_6.sci
deleted file mode 100644 (file)
index d04fa71..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) INRIA - F.Delebcque , Serge Steer
-//
-// 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 s=%st_6(varargin)
-
-    // called in the context of complex struct insertion
-    // to realize partial extraction
-
-    nind=size(varargin)-1; //the number of indexes
-    s=varargin($); // the struct
-    if size(varargin)==2 & type(varargin(1))==10 then  //X.b extraction assumed
-        f=getfield(1,s);
-        if or(varargin(1)==f(3:$)) then //field exists
-            // perform standard field extraction
-            s=%st_e(varargin(:));
-        else //field does not exist
-            // return empty struct
-            //s=mlist(['st','dims'],int32([0 0]))
-            // return empty matrix
-            s=[]
-        end
-
-    else //X(i,j,k) extraction assumed
-        //check if indexes are in the dimension bounds
-        dims=s.dims
-        if size(dims,"*")<nind then dims($:nind)=1;end
-        if size(dims,"*")>nind then dims=[dims(1:nind-1) prod(dims(nind:$))];end
-
-        indmax=ones(1,nind);
-        for k=1:nind,indmax(k)=max(varargin(k));end
-
-        if and(indmax<=dims) then //Yes
-            // perform standard sub-matrix extraction
-            s=%st_e(varargin(:));
-        else // i,j,k out of bounds
-            f=getfield(1,s);f=f(3:$);
-            if f==[] then
-                // the original struct has no field return an empty struct
-                s.dims=int32([0 0]);
-            else
-                // return a 1x1 struct with fields set to []
-                for k=1:size(f,"*"),s=setfield(k+2,[],s);end
-                s.dims=int32([1 1]);
-            end
-        end
-    end
-endfunction
-
diff --git a/scilab/modules/overloading/macros/%st_e.sci b/scilab/modules/overloading/macros/%st_e.sci
deleted file mode 100644 (file)
index b1c9fc3..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-// 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.
-
-function s=%st_e(varargin)
-    //extraction from struct
-    w=varargin($);
-    if type(varargin(1))==4 then
-        varargin(1)=find(varargin(1)); // Bug #7244
-    end
-    if type(varargin(1))==15  //x(i,j,k).f or x.f(i,j,k)
-        index=varargin($-1);
-        if type(index($))==10 then  //x(i,j,k).f
-            f=index($);
-            //ijk=list2vec(index(1));
-            [indx,I]=convertindex(double(w.dims),index(1)(:));
-            // I<->ijk
-            all_fields=getfield(1,w);all_fields=all_fields(3:$);
-            fieldnum=find(f==all_fields);
-            if fieldnum==[] then error(msprintf(gettext("%s: Invalid field name.\n"),"%st_e")); end
-            good_list=getfield(2+fieldnum,w);
-            if size(I,"*")==1 then
-                s=good_list(I)  //list(good_list(I)) ?
-            else
-                s=list();
-                for kk=1:size(I,"*")
-                s(kk)=good_list(I(kk));end
-            end
-            return;
-        else //x.f(i,j,k)
-            f=index(1);
-            li=w(f);
-            [indx,I]=convertindex(double(w.dims),index($)(:));
-            s=li(I);
-            return;
-        end
-    end
-
-    if type(varargin(1))==10 then
-        //field  x.f
-        fields=getfield(1,w);nu=find(fields(3:$)==varargin(1));
-        if nu==[] then
-            error(msprintf(gettext("%s: Wrong value for input argument #%d: not a valid field name.\n"),"%st_e",1));return;
-        end
-        s=getfield(nu+2,w);
-        if prod(getfield(2,w))==1 then s=s(1);end
-        return;
-    end
-
-    //substruct x(i,j,k...)
-    nind=size(varargin)-1
-
-    dims1=double(w.dims)
-    if nind<size(dims1,"*") then
-        //reduce the dimension according to the number of indexes
-        dims1=[dims1(1:nind-1) prod(dims1(nind:$))]
-        if size(dims1,"*")==1 then dims1=[dims1 1],end
-    end
-    //get the "linear" vector of indexes
-    [indx,I]=convertindex(dims1,varargin(1:$-1));
-    dims=zeros(1,nind)
-
-    //computing dimensions of the result
-    //following loop should be merged in the convertindex code
-    for kk=1:nind
-        ik=varargin(kk)
-
-        if or(type(ik)==[2 129]) then
-            ik=horner(ik,dims1(kk))
-        end
-        if type(ik)==4 then
-            dims(kk)=max(find(ik))
-        elseif size(ik,1)~=-1 then
-            dims(kk)=size(ik,"*")
-        else
-            dims(kk)=dims1(kk)
-        end
-    end
-
-    while  dims<>[]&dims($)==1 then dims($)=[],end
-    select size(dims,"*")
-    case 0 then
-        dims=[1,1]
-    case 1 then
-        dims=[dims,1]
-    else
-        dims=matrix(dims,1,-1)
-    end
-    s=mlist(getfield(1,w),int32(dims));
-    //s=mlist(getfield(1,w),int32(indx));
-    sz=size(getfield(1,w),"*");
-    for k=3:sz
-        ww=getfield(k,w);
-        if type(ww)~=15 then ww=list(ww);end
-        //S(2,3).f1=12  -> k=3;I=6;ww(I)=12;s=mlist(["st","dims","f1"],int32([1;1]));
-        if prod(dims)==1 then
-            s=setfield(k,ww(I),s);
-        elseif prod(dims)>1 then
-            s=setfield(k,list(ww(I)),s);
-        end
-    end
-endfunction
diff --git a/scilab/modules/overloading/macros/%st_i_b.sci b/scilab/modules/overloading/macros/%st_i_b.sci
deleted file mode 100644 (file)
index 2f2f8b5..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-// 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.
-
-function M=%st_i_b(varargin)
-    M=st_i_generic(varargin(:))
-endfunction
diff --git a/scilab/modules/overloading/macros/%st_i_c.sci b/scilab/modules/overloading/macros/%st_i_c.sci
deleted file mode 100644 (file)
index ac989d0..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-// 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.
-
-function M=%st_i_c(varargin)
-    M=st_i_generic(varargin(:))
-endfunction
diff --git a/scilab/modules/overloading/macros/%st_i_fptr.sci b/scilab/modules/overloading/macros/%st_i_fptr.sci
deleted file mode 100644 (file)
index 5deefd4..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-// 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.
-
-function M=%st_i_fptr(varargin)
-    M=st_i_generic(varargin(:))
-endfunction
diff --git a/scilab/modules/overloading/macros/%st_i_h.sci b/scilab/modules/overloading/macros/%st_i_h.sci
deleted file mode 100644 (file)
index 23c18be..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-// 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.
-
-function M=%st_i_h(varargin)
-    M=generic_i_h(varargin(1),varargin(2),varargin(3))
-endfunction
diff --git a/scilab/modules/overloading/macros/%st_i_i.sci b/scilab/modules/overloading/macros/%st_i_i.sci
deleted file mode 100644 (file)
index 7649dee..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-// 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.
-
-function M=%st_i_i(varargin)
-    M=st_i_generic(varargin(:))
-endfunction
diff --git a/scilab/modules/overloading/macros/%st_i_ip.sci b/scilab/modules/overloading/macros/%st_i_ip.sci
deleted file mode 100644 (file)
index 069f0b4..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-// 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.
-
-function M=%st_i_ip(varargin)
-    M=st_i_generic(varargin(:))
-endfunction
diff --git a/scilab/modules/overloading/macros/%st_i_lss.sci b/scilab/modules/overloading/macros/%st_i_lss.sci
deleted file mode 100644 (file)
index eefd0b2..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-// 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.
-
-function M=%st_i_lss(varargin)
-    M=st_i_generic(varargin(:))
-endfunction
diff --git a/scilab/modules/overloading/macros/%st_i_msp.sci b/scilab/modules/overloading/macros/%st_i_msp.sci
deleted file mode 100644 (file)
index 49e64b8..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-// 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.
-
-function M=%st_i_msp(varargin)
-    M=st_i_generic(varargin(:))
-endfunction
diff --git a/scilab/modules/overloading/macros/%st_i_p.sci b/scilab/modules/overloading/macros/%st_i_p.sci
deleted file mode 100644 (file)
index 9dfc0cf..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-// 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.
-
-function M=%st_i_p(varargin)
-    M=st_i_generic(varargin(:))
-endfunction
diff --git a/scilab/modules/overloading/macros/%st_i_r.sci b/scilab/modules/overloading/macros/%st_i_r.sci
deleted file mode 100644 (file)
index 343fd62..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-// 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.
-
-function M=%st_i_r(varargin)
-    M=st_i_generic(varargin(:))
-endfunction
diff --git a/scilab/modules/overloading/macros/%st_i_s.sci b/scilab/modules/overloading/macros/%st_i_s.sci
deleted file mode 100644 (file)
index 13a0b01..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-// 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.
-
-function M=%st_i_s(varargin)
-    M=st_i_generic(varargin(:))
-endfunction
diff --git a/scilab/modules/overloading/macros/%st_i_sp.sci b/scilab/modules/overloading/macros/%st_i_sp.sci
deleted file mode 100644 (file)
index ed3de8e..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-// 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.
-
-function M=%st_i_sp(varargin)
-    M=st_i_generic(varargin(:))
-endfunction
diff --git a/scilab/modules/overloading/macros/%st_i_spb.sci b/scilab/modules/overloading/macros/%st_i_spb.sci
deleted file mode 100644 (file)
index 226e6fd..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-// 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.
-
-function M=%st_i_spb(varargin)
-    M=st_i_generic(varargin(:))
-endfunction
diff --git a/scilab/modules/overloading/macros/%st_i_st.sci b/scilab/modules/overloading/macros/%st_i_st.sci
deleted file mode 100644 (file)
index ab236a8..0000000
+++ /dev/null
@@ -1,152 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) INRIA - F. Delebcque , Serge Steer
-//
-// 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 M=%st_i_st(varargin)
-
-    //insert the struct varargin($-1) into the struct varargin($)
-    //at position varargin(1), varargin(2),varargin(3),...
-    //insert the struct varargin($-1) as the field varargin(1)
-    //of the struct varargin($)
-
-    [lhs,rhs]=argn(0)
-    M=varargin($)
-    N=varargin($-1)//inserted matrix
-    dims=double(matrix(M.dims,1,-1));
-
-    if type(varargin(1))==10 //addind a new field
-        flds=getfield(1,M);flds=[flds,varargin(1)];
-        M=setfield(1,flds,M);M=setfield($+1,N,M);
-        if and(dims==[0 0]) then M.dims=int32([1 1]),end
-    else   //Subscripted assignment between structures
-        //build resulting struct fields
-        FM=getfield(1,M);FM=FM(3:$);nFM=size(FM,"*")
-        FN=getfield(1,N);FN=FN(3:$);nFN=size(FN,"*")
-        FR=FM;for f=FN, if and(f<>FM) then FR=[FR,f],end,end
-
-        Nfields=size(FR,"*")
-        //computing the dimension of the result
-        nd=size(dims,"*")
-
-        olddims=dims
-
-        reduced_index=%f
-        if rhs-2>nd then  //more indices than M number of dims
-            dims(nd+1:rhs-2)=1;
-        elseif rhs-2<nd  then //less indices than M number of dims
-            dims=[dims(1:rhs-3) prod(dims(rhs-2:$))]
-            if size(find(dims>1),"*")>1 then reduced_index=%t,end
-        end
-        //convert N-dimensional indexes to 1-D and extend dims if necessary
-        [Ndims,I]=convertindex(list(dims,double(matrix(N.dims,1,-1))),varargin(1:$-2));Ndims=matrix(Ndims,1,-1)
-        if reduced_index & or(Ndims<>dims)  then
-            error(msprintf(_("%s: Invalid index.\n"), "%st_i_ste"))
-        end
-        if or(Ndims>dims) then
-            //extend the destination matrix
-            I1=0
-            for k=size(Ndims,"*"):-1:1
-                ik1=(1:dims(k))';
-                if ik1<>[] then
-                    if Ndims(k)>1 then
-                        if size(I1,"*")>1 then
-                            I1=(Ndims(k)*I1).*.ones(ik1)+ones(I1).*.(ik1-1);
-                        else
-                            I1=Ndims(k)*I1+ik1-1;
-                        end
-                    else
-                        I1=Ndims(k)*I1+ik1-1;
-                    end
-                end
-            end
-            v1=list();for k=1:prod(Ndims),v1(k)=[];end
-            // create the resulting matrix
-            R=mlist(["st","dims",matrix(FR,1,-1)],int32(Ndims));
-            for k=1:size(FR,"*"),R=setfield(2+k,v1,R),end
-            // populate it with M entries
-            for k=1:nFM
-                v2=v1;
-                kf=find(FR==FM(k));
-                w=getfield(k+2,M);
-                if type(w)<>15 then w=list(w),end
-                if type(v2)<>15 then v2=list(v2);end
-                for i=1:size(I1,"*"),
-                    if w<>list() then
-                        v2(I1(i)+1)=w(i);
-                    else
-                        v2(I1(i)+1)=[];
-                    end
-                end
-                R=setfield(kf+2,v2,R);
-            end
-        else //the dimension agree
-            R=M
-            //does the fields agree?
-            if or(FR<>FM) then //no
-                //add new fields
-                R=setfield(1,["st","dims",FR],R)
-                v1=list();for k=1:prod(Ndims),v1(k)=[];end
-                for k=nFM+1:size(FR,"*")
-                    R=setfield($+1,v1,R)
-                end
-            end
-        end
-
-        //insert N entries into result
-        for k=1:nFN
-            kf=find(FR==FN(k));
-            v2=getfield(kf+2,R);
-            w=getfield(k+2,N);
-            if type(w)<>15 then w=list(w),end
-            if type(v2)<>15 then v2=list(v2);end
-            for i=1:size(I,"*"),
-                if w<>list() then
-                    if size(w)==1 then
-                        v2(I(i))=w(1);
-                    else
-                        v2(I(i))=w(i);
-                    end
-                else
-                    v2(I(i))=[];
-                end
-            end
-            if length(v2)==1 then v2=v2(1);end
-            R=setfield(kf+2,v2,R);
-        end
-
-        //remove trailing unitary dimensions
-        if reduced_index then
-            Ndims=olddims
-        else
-            while  Ndims($)==1 then Ndims($)=[],end
-            select size(Ndims,"*")
-            case 0 then
-                Ndims=[1,1]
-            case 1 then
-                k=find(olddims<>1&olddims<>0)
-                if k==[] // M was a scalar
-                    if mtlb_mode() then
-                        Ndims=[1,Ndims]
-                    else
-                        Ndims=[Ndims,1]
-                    end
-                else // M was a vector
-                    olddims(k)=Ndims
-                    Ndims=olddims;
-                end
-            else
-                Ndims=matrix(Ndims,1,-1)
-            end
-        end
-        R.dims=int32(Ndims)
-        M=R
-    end
-endfunction
diff --git a/scilab/modules/overloading/macros/%st_n_c.sci b/scilab/modules/overloading/macros/%st_n_c.sci
deleted file mode 100644 (file)
index 4c935cb..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) INRIA, Serge Steer
-//
-// 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 r=%st_n_c(a,b)
-    // implements r=a~=b
-    // for a a struct and b a matrix of strings
-    r=%t
-endfunction
diff --git a/scilab/modules/overloading/macros/%st_n_l.sci b/scilab/modules/overloading/macros/%st_n_l.sci
deleted file mode 100644 (file)
index 2fb61b4..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) INRIA, Serge Steer
-//
-// 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 r=%st_n_l(a,b)
-    // implements r=a~=b
-    // for a a struct and b a list
-    r=%t
-endfunction
diff --git a/scilab/modules/overloading/macros/%st_n_mc.sci b/scilab/modules/overloading/macros/%st_n_mc.sci
deleted file mode 100644 (file)
index 9aae915..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) INRIA, Serge Steer
-//
-// 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 r=%st_n_mc(a,b)
-    // implements r=a~=b
-    // for a a struct and b a function
-    r=%t
-endfunction
diff --git a/scilab/modules/overloading/macros/%st_n_p.sci b/scilab/modules/overloading/macros/%st_n_p.sci
deleted file mode 100644 (file)
index 6e6272a..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) INRIA, Serge Steer
-//
-// 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 r=%st_n_p(a,b)
-    // implements r=a~=b
-    // for a a struct and b a matrix of polynomials
-    r=%t
-endfunction
diff --git a/scilab/modules/overloading/macros/%st_n_s.sci b/scilab/modules/overloading/macros/%st_n_s.sci
deleted file mode 100644 (file)
index 29c9bcc..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) INRIA, Serge Steer
-//
-// 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 r=%st_n_s(a,b)
-    // implements r=a~=b
-    // for a a struct and b a matrix of floting point numbers
-    r=%t
-endfunction
diff --git a/scilab/modules/overloading/macros/%st_o_c.sci b/scilab/modules/overloading/macros/%st_o_c.sci
deleted file mode 100644 (file)
index 6b5ecd9..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) INRIA, Serge Steer
-//
-// 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 r=%st_o_c(a,b)
-    // implements r=a==b
-    // for a a struct and b a matrix of strings
-    r=%f
-endfunction
diff --git a/scilab/modules/overloading/macros/%st_o_l.sci b/scilab/modules/overloading/macros/%st_o_l.sci
deleted file mode 100644 (file)
index 020d035..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) INRIA, Serge Steer
-//
-// 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 r=%st_o_l(a,b)
-    // implements r=a==b
-    // for a a struct and b a list
-    r=%f
-endfunction
diff --git a/scilab/modules/overloading/macros/%st_o_mc.sci b/scilab/modules/overloading/macros/%st_o_mc.sci
deleted file mode 100644 (file)
index 5ef883c..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) INRIA, Serge Steer
-//
-// 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 r=%st_o_mc(a,b)
-    // implements r=a==b
-    // for a a struct and b a function
-    r=%f
-endfunction
diff --git a/scilab/modules/overloading/macros/%st_o_p.sci b/scilab/modules/overloading/macros/%st_o_p.sci
deleted file mode 100644 (file)
index 43228e5..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) INRIA, Serge Steer
-//
-// 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 r=%st_o_p(a,b)
-    // implements r=a==b
-    // for a a struct and b a matrix of polynomials
-    r=%f
-endfunction
diff --git a/scilab/modules/overloading/macros/%st_o_s.sci b/scilab/modules/overloading/macros/%st_o_s.sci
deleted file mode 100644 (file)
index 3a88be9..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) INRIA, Serge Steer
-//
-// 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 r=%st_o_s(a,b)
-    // implements r=a==b
-    // for a a struct and b a matrix of floting point numbers
-    r=%f
-endfunction
index 7cc1080..060b073 100644 (file)
@@ -1,4 +1,4 @@
-8// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
 // Copyright (C) INRIA
 // Copyright (C) 2010 - DIGITEO - Vincent COUVERT <vincent.couvert@scilab.org>
 // Copyright (C) 2012 - 2016 - Scilab Enterprises
diff --git a/scilab/modules/overloading/macros/%st_string.sci b/scilab/modules/overloading/macros/%st_string.sci
deleted file mode 100644 (file)
index e429d0f..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-// 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.
-
-function t=%st_string(s)
-    f=getfield(1,s)
-    ll=lines()
-    t=[]
-    for k=3:size(f,"*")
-        var=f(k)
-        value=s(var)
-        tp=typeof(value)
-        if tp=="ce" then
-            t=[t;%ce_string(value)]
-        elseif tp=="st" then
-            t=[t;%st_string(value)]
-        else
-            str=sci2exp(value,ll(1))
-            txt="   "+var+": "
-            if size(str,"*")==1 then
-                txt=txt+str
-            else
-                tp=typeof(value)
-                txt=txt+"{"+strcat(string(size(value)),"x")+" "+tp+"}"
-            end
-            t=[t;txt]
-        end
-    end
-endfunction
diff --git a/scilab/modules/overloading/macros/%zpk_i_st.sci b/scilab/modules/overloading/macros/%zpk_i_st.sci
deleted file mode 100644 (file)
index d32548d..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C)  2016 - INRIA - Serge Steer
-//
-// This file is licensed under the terms of the GNU GPL v2.0,
-// pursuant to article 5.3.4 of the CeCILL v.2.1.
-// For more information, see the COPYING file which you should have received
-// along with this program.
-function r=%zpk_i_st(varargin)
-    r=generic_i_st(varargin(:))
-endfunction
index 0093a18..1e2056a 100644 (file)
@@ -1,7 +1,7 @@
 // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
 // Copyright (C) INRIA - S. Steer, F. Delebecque, V. Couvert
-//
 // Copyright (C) 2012 - 2016 - Scilab Enterprises
+// Copyright (C) 2020 - Samuel GOUGEON
 //
 // 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.
@@ -12,6 +12,7 @@
 
 function  M=createstruct(index,N)
     // Create a struct with field pointed by index equal to N
+    // createstruct(list(indices,fieldname),N)  => M(indices).fieldname = N
 
     mtlbMode = oldEmptyBehaviour("query")=="off"
 
@@ -28,84 +29,59 @@ function  M=createstruct(index,N)
                 if type(index(1))==1 then
                     // X(p).f = y  -> index=list(p,f)
                     I=index(1)
+                    nmax = max(I)
                     if mtlbMode then
-                        Dims=[1 max(I)]
+                        Dims=[1 nmax]
                     else
-                        Dims=[max(I) 1]
+                        Dims=[nmax 1]
                     end
-                    nmax=prod(Dims);
                     if nmax==1 then
-                        M=mlist(["st","dims",index(2)],int32(Dims),N);
+                        M = struct(index(2), N);
                     else
-                        M=mlist(["st","dims",index(2)],int32(Dims));
-                        //initialize the structure with empty fields
-                        Li=list();for kl=1:nmax, Li(kl)=[];end
-                        //set fields pointed to by index(1) to N
-                        for kl=1:size(I,"*"), Li(I(kl))=N;end
-                        M=setfield(3,Li,M);
+                        M = cell(Dims(1),Dims(2))
+                        M{I} = N
+                        M = struct(index(2), M);
                     end
                     return;
                     // First index is a list of numerical values
                 elseif type(index(1))==15
                     // X(p,q[,...]).f=z -> index=list(list(p,q[,...]),f)
-                    I=index(1)
-                    Ndims = size(I) //the number of dimensions
-
-                    //compute the struct dimensions from max indices values
-                    Dims=[];for kDims=1:Ndims, Dims=[Dims,max(I(kDims)) ];end
-
-                    //initialize the structure with empty fields
-                    Li=list();for kl=1:prod(Dims),Li(kl)=[];end
-
-                    //set fields pointed to by I to N
-                    I1=sub2ind(Dims,I(:)) // build one dimensional index equivalent to I
-                    for kl=1:size(I1,"*"), Li(I1(kl))=N;end
-
-                    M=mlist(["st","dims",index(2)],int32(Dims),Li);
+                    I = index(1)
+                    M{I(:)} = N
+                    M = struct(index(2), M)
                     return;
                     // First index is also a fieldname
                 else
                     // X.f.g=y -> index=list(f,g)
-                    M=mlist(["st","dims",index(1)],int32([1,1]),...
-                    mlist(["st","dims",index(2)],int32([1,1]),N));
-                    return;
+                    M = struct(index(1), struct(index(2), N))
+                    return
                 end
 
                 // Second index is a fieldname
             else
                 // X.f(p[,q,...])=y : index=list(f,list(p[,q,...]))
-
-                if typeof(N)=="st" then // When recursive call of createstruct
-                    if type(index(2))==15 then // index=list(f,list(p,q[,...]))
-                        Dims=list2vec(index(2))'
-                    else // index=list(f,p)
-                        if mtlbMode then
-                            Dims=[1 index(2)]
-                        else
-                            Dims=[index(2) 1]
-                        end
-                    end
-                    kmax=prod(Dims)
-                    z=list()
-                    for kl=1:kmax
-                        z(kl)=[]
+                if type(index(1)) <> 10 then
+                    msg = _("%s: Argument #1(1): string expected.\n")
+                    error(msprintf(msg, "createstruct"))
+                end
+                clear M
+                if typeof(N)=="st" then
+                    for f = fieldnames(N)'
+                        M(index(2)(:))(f) = N(f)
                     end
-                    z(kmax)=getfield(3,N)
-                    z=mlist(getfield(1,N),int32(Dims),z);
                 else
-                    z(index(2)(:))=N;
+                    M(index(2)(:)) = N
                 end
-                if type(index(1))<>10 then pause,end
-                M=mlist(["st","dims",index(1)],int32([1,1]),z);
-                return;
+                M = struct(index(1), M)
+                return
             end
 
             // Any number of indexes <> 2
         else
             // Last index is a fieldname -> init struct
             if type(index($))==10 then
-                M=mlist(["st","dims",index($)],int32([1,1]),N);
-                index($)=null();
+                M = struct(index($), N)
+                index($) = null();
                 // Last index is a numerical value or a list of numerical values
             elseif type(index($))==1 | type(index($))==15 then
 
@@ -123,21 +99,20 @@ function  M=createstruct(index,N)
                         end
                         kmax=prod(Dims)
                         if kmax==1 then
-                            M=N
+                            M = N
                         else
-                            z=list()
-                            for kl=1:kmax
-                                z(kl)=[]
-                            end
-                            z(kmax)=getfield(3,N)
-                            M=mlist(getfield(1,N),int32(Dims),z);
+                            M = cell(Dims)
+                            f = fieldnames(N)(1)
+                            M($,$) = N(f)
+                            M = struct(f, M)
                         end
                     else
-                        M(index($)(:))=N;
+                        M(index($)(:)) = N;
                     end
                     index($)=null()
-                    // More than one index value
+
                 else
+                    // More than one index value
                     if typeof(N)=="st" then
                         if type(index($))==15 then
                             Dims=list2vec(index($))'
@@ -148,19 +123,16 @@ function  M=createstruct(index,N)
                                 Dims=[index($) 1]
                             end
                         end
-                        kmax=prod(Dims)
-                        z=list()
-                        for kl=1:kmax
-                            z(kl)=[]
-                        end
-                        z(kmax)=getfield(3,N)
-                        z=mlist(getfield(1,N),int32(Dims),z);
+                        z = cell(Dims)
+                        f = fieldnames(N)(1)
+                        z($) = N(f)
+                        z = struct(f, z)
                     else
                         z(index($)(:))=N;
                     end
-                    M=mlist(["st","dims",index($-1)],int32([1,1]),z);
-                    index($)=null()
-                    index($)=null()
+                    M = struct(index($-1), z)
+                    index($) = null()
+                    index($) = null()
                 end
             else
                 // This case should not happen (unknown kind of index)
@@ -174,7 +146,7 @@ function  M=createstruct(index,N)
         end
     else
         if type(index)==10 then
-            M=mlist(["st","dims",index($)],int32([1,1]),N);
+            M = struct(index($), N)
         else
             error(msprintf(_("%s: Not implemented.\n"),"createstruct"));
         end
diff --git a/scilab/modules/overloading/macros/st_i_generic.sci b/scilab/modules/overloading/macros/st_i_generic.sci
deleted file mode 100644 (file)
index 68384b6..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-// 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.
-
-function M = st_i_generic(varargin)
-    [lhs,rhs]=argn(0)
-    M=varargin(rhs)
-    N=varargin(rhs-1)//inserted matrix
-    index=varargin(1) //
-    if M==[] then M=struct(),M(index)=N;return;end
-    if rhs==3 & (type(index)==10 | type(index)==15) then
-        if type(index)==15 then
-            M=struct()
-            M(index)=N
-        else
-            M=createstruct(index,N)
-        end
-    else
-        error(msprintf(_("%s: Incorrect assignment.\n"), "st_i_generic"));
-    end
-
-endfunction