Rename the Rhs() function to Rhs_tlist(). Rhs is a commonly used variable
Pierre Marechal [Wed, 30 Jan 2008 07:58:42 +0000 (07:58 +0000)]
157 files changed:
scilab/modules/m2sci/macros/kernel/Rhs_tlist.sci [moved from scilab/modules/m2sci/macros/kernel/Rhs.sci with 92% similarity]
scilab/modules/m2sci/macros/kernel/convert2double.sci
scilab/modules/m2sci/macros/kernel/get_unknown.sci
scilab/modules/m2sci/macros/kernel/m2sci.sci
scilab/modules/m2sci/macros/percent/%02sci.sci
scilab/modules/m2sci/macros/percent/%e2sci.sci
scilab/modules/m2sci/macros/percent/%i2sci.sci
scilab/modules/m2sci/macros/percent/%i2sci_c.sci
scilab/modules/m2sci/macros/percent/%i2sci_g.sci
scilab/modules/m2sci/macros/percent/%i2sci_r.sci
scilab/modules/m2sci/macros/percent/%i2sci_s.sci
scilab/modules/m2sci/macros/percent/%t2sci.sci
scilab/modules/m2sci/macros/sci_files/sci_abs.sci
scilab/modules/m2sci/macros/sci_files/sci_acos.sci
scilab/modules/m2sci/macros/sci_files/sci_acosh.sci
scilab/modules/m2sci/macros/sci_files/sci_acot.sci
scilab/modules/m2sci/macros/sci_files/sci_acoth.sci
scilab/modules/m2sci/macros/sci_files/sci_acsc.sci
scilab/modules/m2sci/macros/sci_files/sci_acsch.sci
scilab/modules/m2sci/macros/sci_files/sci_all.sci
scilab/modules/m2sci/macros/sci_files/sci_any.sci
scilab/modules/m2sci/macros/sci_files/sci_asec.sci
scilab/modules/m2sci/macros/sci_files/sci_asech.sci
scilab/modules/m2sci/macros/sci_files/sci_asin.sci
scilab/modules/m2sci/macros/sci_files/sci_asinh.sci
scilab/modules/m2sci/macros/sci_files/sci_atan.sci
scilab/modules/m2sci/macros/sci_files/sci_atan2.sci
scilab/modules/m2sci/macros/sci_files/sci_atanh.sci
scilab/modules/m2sci/macros/sci_files/sci_axis.sci
scilab/modules/m2sci/macros/sci_files/sci_balance.sci
scilab/modules/m2sci/macros/sci_files/sci_ceil.sci
scilab/modules/m2sci/macros/sci_files/sci_cellstr.sci
scilab/modules/m2sci/macros/sci_files/sci_chol.sci
scilab/modules/m2sci/macros/sci_files/sci_conj.sci
scilab/modules/m2sci/macros/sci_files/sci_cos.sci
scilab/modules/m2sci/macros/sci_files/sci_cosh.sci
scilab/modules/m2sci/macros/sci_files/sci_cot.sci
scilab/modules/m2sci/macros/sci_files/sci_coth.sci
scilab/modules/m2sci/macros/sci_files/sci_cumprod.sci
scilab/modules/m2sci/macros/sci_files/sci_cumsum.sci
scilab/modules/m2sci/macros/sci_files/sci_det.sci
scilab/modules/m2sci/macros/sci_files/sci_diag.sci
scilab/modules/m2sci/macros/sci_files/sci_diff.sci
scilab/modules/m2sci/macros/sci_files/sci_doc.sci
scilab/modules/m2sci/macros/sci_files/sci_double.sci
scilab/modules/m2sci/macros/sci_files/sci_echo.sci
scilab/modules/m2sci/macros/sci_files/sci_eig.sci
scilab/modules/m2sci/macros/sci_files/sci_erf.sci
scilab/modules/m2sci/macros/sci_files/sci_erfc.sci
scilab/modules/m2sci/macros/sci_files/sci_erfcx.sci
scilab/modules/m2sci/macros/sci_files/sci_eval.sci
scilab/modules/m2sci/macros/sci_files/sci_exp.sci
scilab/modules/m2sci/macros/sci_files/sci_expm.sci
scilab/modules/m2sci/macros/sci_files/sci_eye.sci
scilab/modules/m2sci/macros/sci_files/sci_factorial.sci
scilab/modules/m2sci/macros/sci_files/sci_false.sci
scilab/modules/m2sci/macros/sci_files/sci_feval.sci
scilab/modules/m2sci/macros/sci_files/sci_fft.sci
scilab/modules/m2sci/macros/sci_files/sci_fft2.sci
scilab/modules/m2sci/macros/sci_files/sci_fgets.sci
scilab/modules/m2sci/macros/sci_files/sci_fileparts.sci
scilab/modules/m2sci/macros/sci_files/sci_find.sci
scilab/modules/m2sci/macros/sci_files/sci_fix.sci
scilab/modules/m2sci/macros/sci_files/sci_floor.sci
scilab/modules/m2sci/macros/sci_files/sci_format.sci
scilab/modules/m2sci/macros/sci_files/sci_frewind.sci
scilab/modules/m2sci/macros/sci_files/sci_fseek.sci
scilab/modules/m2sci/macros/sci_files/sci_full.sci
scilab/modules/m2sci/macros/sci_files/sci_gamma.sci
scilab/modules/m2sci/macros/sci_files/sci_gammaln.sci
scilab/modules/m2sci/macros/sci_files/sci_graymon.sci
scilab/modules/m2sci/macros/sci_files/sci_grid.sci
scilab/modules/m2sci/macros/sci_files/sci_hankel.sci
scilab/modules/m2sci/macros/sci_files/sci_help.sci
scilab/modules/m2sci/macros/sci_files/sci_hess.sci
scilab/modules/m2sci/macros/sci_files/sci_hold.sci
scilab/modules/m2sci/macros/sci_files/sci_ifft.sci
scilab/modules/m2sci/macros/sci_files/sci_imag.sci
scilab/modules/m2sci/macros/sci_files/sci_int16.sci
scilab/modules/m2sci/macros/sci_files/sci_int32.sci
scilab/modules/m2sci/macros/sci_files/sci_int8.sci
scilab/modules/m2sci/macros/sci_files/sci_inv.sci
scilab/modules/m2sci/macros/sci_files/sci_isa.sci
scilab/modules/m2sci/macros/sci_files/sci_iscell.sci
scilab/modules/m2sci/macros/sci_files/sci_ischar.sci
scilab/modules/m2sci/macros/sci_files/sci_isfield.sci
scilab/modules/m2sci/macros/sci_files/sci_isfinite.sci
scilab/modules/m2sci/macros/sci_files/sci_ishandle.sci
scilab/modules/m2sci/macros/sci_files/sci_ishold.sci
scilab/modules/m2sci/macros/sci_files/sci_isinf.sci
scilab/modules/m2sci/macros/sci_files/sci_isinteger.sci
scilab/modules/m2sci/macros/sci_files/sci_islogical.sci
scilab/modules/m2sci/macros/sci_files/sci_isnan.sci
scilab/modules/m2sci/macros/sci_files/sci_isnumeric.sci
scilab/modules/m2sci/macros/sci_files/sci_isreal.sci
scilab/modules/m2sci/macros/sci_files/sci_isscalar.sci
scilab/modules/m2sci/macros/sci_files/sci_isspace.sci
scilab/modules/m2sci/macros/sci_files/sci_issparse.sci
scilab/modules/m2sci/macros/sci_files/sci_isstr.sci
scilab/modules/m2sci/macros/sci_files/sci_isstruct.sci
scilab/modules/m2sci/macros/sci_files/sci_isvector.sci
scilab/modules/m2sci/macros/sci_files/sci_length.sci
scilab/modules/m2sci/macros/sci_files/sci_linspace.sci
scilab/modules/m2sci/macros/sci_files/sci_load.sci
scilab/modules/m2sci/macros/sci_files/sci_log.sci
scilab/modules/m2sci/macros/sci_files/sci_log10.sci
scilab/modules/m2sci/macros/sci_files/sci_log2.sci
scilab/modules/m2sci/macros/sci_files/sci_logm.sci
scilab/modules/m2sci/macros/sci_files/sci_lower.sci
scilab/modules/m2sci/macros/sci_files/sci_lu.sci
scilab/modules/m2sci/macros/sci_files/sci_max.sci
scilab/modules/m2sci/macros/sci_files/sci_mean.sci
scilab/modules/m2sci/macros/sci_files/sci_median.sci
scilab/modules/m2sci/macros/sci_files/sci_meshgrid.sci
scilab/modules/m2sci/macros/sci_files/sci_min.sci
scilab/modules/m2sci/macros/sci_files/sci_mod.sci
scilab/modules/m2sci/macros/sci_files/sci_more.sci
scilab/modules/m2sci/macros/sci_files/sci_nargin.sci
scilab/modules/m2sci/macros/sci_files/sci_nargout.sci
scilab/modules/m2sci/macros/sci_files/sci_ndims.sci
scilab/modules/m2sci/macros/sci_files/sci_norm.sci
scilab/modules/m2sci/macros/sci_files/sci_num2str.sci
scilab/modules/m2sci/macros/sci_files/sci_ones.sci
scilab/modules/m2sci/macros/sci_files/sci_pause.sci
scilab/modules/m2sci/macros/sci_files/sci_perms.sci
scilab/modules/m2sci/macros/sci_files/sci_prod.sci
scilab/modules/m2sci/macros/sci_files/sci_qr.sci
scilab/modules/m2sci/macros/sci_files/sci_rand.sci
scilab/modules/m2sci/macros/sci_files/sci_randn.sci
scilab/modules/m2sci/macros/sci_files/sci_rcond.sci
scilab/modules/m2sci/macros/sci_files/sci_real.sci
scilab/modules/m2sci/macros/sci_files/sci_rem.sci
scilab/modules/m2sci/macros/sci_files/sci_repmat.sci
scilab/modules/m2sci/macros/sci_files/sci_round.sci
scilab/modules/m2sci/macros/sci_files/sci_save.sci
scilab/modules/m2sci/macros/sci_files/sci_schur.sci
scilab/modules/m2sci/macros/sci_files/sci_sign.sci
scilab/modules/m2sci/macros/sci_files/sci_sin.sci
scilab/modules/m2sci/macros/sci_files/sci_sinh.sci
scilab/modules/m2sci/macros/sci_files/sci_size.sci
scilab/modules/m2sci/macros/sci_files/sci_sort.sci
scilab/modules/m2sci/macros/sci_files/sci_sparse.sci
scilab/modules/m2sci/macros/sci_files/sci_sqrt.sci
scilab/modules/m2sci/macros/sci_files/sci_strcmpi.sci
scilab/modules/m2sci/macros/sci_files/sci_sum.sci
scilab/modules/m2sci/macros/sci_files/sci_svd.sci
scilab/modules/m2sci/macros/sci_files/sci_tan.sci
scilab/modules/m2sci/macros/sci_files/sci_tanh.sci
scilab/modules/m2sci/macros/sci_files/sci_toeplitz.sci
scilab/modules/m2sci/macros/sci_files/sci_tril.sci
scilab/modules/m2sci/macros/sci_files/sci_triu.sci
scilab/modules/m2sci/macros/sci_files/sci_true.sci
scilab/modules/m2sci/macros/sci_files/sci_uint16.sci
scilab/modules/m2sci/macros/sci_files/sci_uint32.sci
scilab/modules/m2sci/macros/sci_files/sci_uint8.sci
scilab/modules/m2sci/macros/sci_files/sci_upper.sci
scilab/modules/m2sci/macros/sci_files/sci_zeros.sci

@@ -1,4 +1,4 @@
-function rhs_tlist=Rhs(varargin)
+function rhs_tlist=Rhs_tlist(varargin)
 // Copyright INRIA
 // Create a new rhs tlist
 
index f71bb6e..85511b2 100644 (file)
@@ -17,15 +17,15 @@ else
   if A.vtype==String then
     lhslist=list();
     lhslist($+1)=Variable("ans",Infer(A.dims,Type(Double,Real)))
-    dble=Funcall("asciimat",1,Rhs(A),lhslist)
+    dble=Funcall("asciimat",1,Rhs_tlist(A),lhslist)
   elseif A.vtype==Boolean then
     lhslist=list();
     lhslist($+1)=Variable("ans",Infer(A.dims,Type(Double,Real)))
-    dble=Funcall("bool2s",1,Rhs(A),lhslist)
+    dble=Funcall("bool2s",1,Rhs_tlist(A),lhslist)
   elseif A.vtype==Unknown then
     lhslist=list();
     lhslist($+1)=Variable("ans",Infer(A.dims,Type(Double,Unknown)))
-    dble=Funcall("mtlb_double",1,Rhs(A),lhslist)
+    dble=Funcall("mtlb_double",1,Rhs_tlist(A),lhslist)
   else
     error(msprintf(gettext("%s is not yet implemented."),string(A.vtype)))
   end
index 470a1c4..d3cbc88 100644 (file)
@@ -13,11 +13,11 @@ function [sci_equiv]=get_unknown(varname,lhslist)
 if or(varname==not_yet_converted()) then
   set_infos(msprintf(gettext("Matlab function %s not yet converted."),varname),2)
   tmpvar=Variable(varname,Infer())
-  sci_equiv=Funcall("mtlb",1,Rhs(tmpvar),lhslist)
+  sci_equiv=Funcall("mtlb",1,Rhs_tlist(tmpvar),lhslist)
 else
   // Other cases: I am not able to determine what is nam
   set_infos(msprintf(gettext("mtlb(%s) can be replaced by %s() or %s whether %s is an M-file or not."),varname,varname,varname,varname),1)
   tmpvar=Variable(varname,Infer())
-  sci_equiv=Funcall("mtlb",1,Rhs(tmpvar),lhslist)
+  sci_equiv=Funcall("mtlb",1,Rhs_tlist(tmpvar),lhslist)
 end
 endfunction
index f04c19b..07cd260 100644 (file)
@@ -182,7 +182,7 @@ if batch then
       "function [tree] = sci_"+fnam+"(tree)"
       msprintf(gettext("// Generated by M2SCI\n// Conversion function for Matlab %s\n// Input: tree = Matlab funcall tree\n// Ouput: tree = Scilab equivalent for tree"),fnam)
       ""
-      "tree=Funcall(""exec"",1,Rhs(tree.name),tree.lhs)"
+      "tree=Funcall(""exec"",1,Rhs_tlist(tree.name),tree.lhs)"
       ]
 else
   trad=[
index 6adc76c..6203dde 100644 (file)
@@ -11,7 +11,7 @@ A = getoperands(tree)
 
 // Scilab and Matlab transposition do not work in the same way for strings
 if or(A.vtype==[String,Unknown]) then
-  tree=Funcall("mtlb_0",1,Rhs(A),tree.out)
+  tree=Funcall("mtlb_0",1,Rhs_tlist(A),tree.out)
   tree.lhs(1).dims=list(A.dims(2),A.dims(1))
   tree.lhs(1).type=A.type
 else
index 2d45d15..1bceae5 100644 (file)
@@ -68,7 +68,7 @@ if rhs==1 then
     end
     error(msprintf(gettext("recursive extraction from a variable %s of type %s."),var.name,string(var.vtype)))
   elseif var.vtype==String then // Character string extraction
-    tree=Funcall("part",1,Rhs(var,ind),tree.out)
+    tree=Funcall("part",1,Rhs_tlist(var,ind),tree.out)
     if is_a_scalar(ind) then
       tree.lhs(1).dims=list(1,1)
     else
@@ -77,7 +77,7 @@ if rhs==1 then
     tree.lhs(1).type=var.type
   else // Extraction x(i)
     if var.vtype==Unknown then // Unknown type -> can be String
-      tree=Funcall("mtlb_e",1,Rhs(var,ind),tree.out)
+      tree=Funcall("mtlb_e",1,Rhs_tlist(var,ind),tree.out)
       tree.lhs(1).dims=list(Unknown,Unknown)
       tree.lhs(1).type=var.type
     else
@@ -114,7 +114,7 @@ if rhs==1 then
        tree.out(1).dims=list(Unknown,1)
        tree.out(1).type=var.type
       else // at leat one dimension unknown
-       tree=Funcall("mtlb_e",1,Rhs(var,ind),tree.out)
+       tree=Funcall("mtlb_e",1,Rhs_tlist(var,ind),tree.out)
        tree.lhs(1).dims=list(Unknown,Unknown)
        tree.lhs(1).type=var.type
       end
@@ -150,7 +150,7 @@ else
   if var.vtype==String then // extraction in strings
     if rhs==2 then
       rhsarg=Operation("ext",list(var,tree.operands(2)),list())
-      tree=Funcall("part",1,Rhs(rhsarg,tree.operands(3)),tree.out)
+      tree=Funcall("part",1,Rhs_tlist(rhsarg,tree.operands(3)),tree.out)
       tree.lhs(1).dims=list(dims(1:2))
       tree.lhs(1).type=var.type
     else
index 91c3070..4790aa9 100644 (file)
@@ -57,7 +57,7 @@ if rhs==1 then
     if bval then
       varslist(index).infer.dims=allunknown(to.dims)
     end
-    insert(Equal(list(to),Funcall("mtlb_is",1,Rhs(to,from,ind),list(to))),1)
+    insert(Equal(list(to),Funcall("mtlb_is",1,Rhs_tlist(to,from,ind),list(to))),1)
   // --- Insertion with just one index ---
   elseif type(ind)<>15 then
     if ind.vtype==String then
@@ -146,7 +146,7 @@ else
     if bval then
       varslist(index).infer.dims=allunknown(to.dims)
     end
-    insert(Equal(list(to),Funcall("mtlb_is",1,Rhs(to,from,tree.operands(2),tree.operands(3)),list(to))),1)
+    insert(Equal(list(to),Funcall("mtlb_is",1,Rhs_tlist(to,from,tree.operands(2),tree.operands(3)),list(to))),1)
   else
     tree.out(1).dims=list()
     for k=1:lstsize(tree.operands)-2
@@ -167,12 +167,12 @@ else
    if is_empty(to) then
       // a(k,:)=b with a==[] is converted by a(1,1:length(b))=b
       if lstsize(tree.operands)-2 == 2 & typeof(tree.operands($-1))=="cste" & tree.operands($-1).value==":" then
-       length_funcall=Funcall("length",1,Rhs(tree.operands($)),list())
+       length_funcall=Funcall("length",1,Rhs_tlist(tree.operands($)),list())
        tree.operands($-1)=Operation(":",list(Cste(1),length_funcall),list())
       end
       // a(:,k)=b with a==[] is converted by a(1:length(b),1)=b
       if lstsize(tree.operands)-2 == 2 & typeof(tree.operands($-2))=="cste" & tree.operands($-2).value==":" then
-       length_funcall=Funcall("length",1,Rhs(tree.operands($)),list())
+       length_funcall=Funcall("length",1,Rhs_tlist(tree.operands($)),list())
        tree.operands($-2)=Operation(":",list(Cste(1),length_funcall),list())
       end
     end
index 2b25b3e..122a060 100644 (file)
@@ -12,7 +12,7 @@ ind=tree.operands(2)
 if from.dims(1)==1 & from.dims(2)==1 then // Insert a scalar
 elseif from.dims(2)==1 then // Insert a row vector
 elseif from.dims(1)<>Unknown & from.dims(2)<>Unknown then // Insert a matrix with known sizes
-  tree.operands($)=Funcall("matrix",1,Rhs(from,1,Operation("-",list(Cste(1)),list())))
+  tree.operands($)=Funcall("matrix",1,Rhs_tlist(from,1,Operation("-",list(Cste(1)),list())))
 else
   if ~isdefinedvar(from) then
     w=gettempvar()
index 19b707f..cea4884 100644 (file)
@@ -9,7 +9,7 @@ from=tree.operands($)
 to=tree.operands(1)
 ind=tree.operands(2)
 
-newtree=Funcall("mtlb_i",1,Rhs(to,ind,from),list(to))
+newtree=Funcall("mtlb_i",1,Rhs_tlist(to,ind,from),list(to))
 insert(Equal(list(to),newtree))
 tree=list()
 endfunction
index 76f008d..f1e5e6f 100644 (file)
@@ -12,7 +12,7 @@ ind=tree.operands(2)
 if from.dims(1)==1 & from.dims(2)==1 then // Insert a scalar
 elseif from.dims(1)==1 then // Insert a row vector
 elseif from.dims(1)<>Unknown & from.dims(2)<>Unknown then // Insert a matrix with known sizes
-  tree.operands($)=Funcall("matrix",1,Rhs(from,1,Operation("-",list(Cste(1)),list())))
+  tree.operands($)=Funcall("matrix",1,Rhs_tlist(from,1,Operation("-",list(Cste(1)),list())))
 else
   if ~isdefinedvar(from) then
     w=gettempvar()
index 4807d7c..723b7b7 100644 (file)
@@ -11,7 +11,7 @@ ind=tree.operands(2)
 
 tree.operands(2)=list(Cste(1),ind)
 if ~is_a_scalar(from) & from.dims(1)<>1 then
-  tree.operands($)=Funcall("matrix",1,Rhs(from,1,Operation("-",list(Cste(1)),list())),list())
+  tree.operands($)=Funcall("matrix",1,Rhs_tlist(from,1,Operation("-",list(Cste(1)),list())),list())
 end
 
 // Data inference
index 2f3fd50..77cf45f 100644 (file)
@@ -14,7 +14,7 @@ tree.out(1).type=A.type
 
 // Scilab and Matlab transposition do not work in the same way for strings
 if or(A.vtype==[String,Unknown]) then
-  tree=Funcall("mtlb_t",1,Rhs(A),tree.out)
+  tree=Funcall("mtlb_t",1,Rhs_tlist(A),tree.out)
 end
   
 endfunction
index 977fdc1..a036015 100644 (file)
@@ -9,7 +9,7 @@ function [tree]=sci_abs(tree)
 
 A=getrhs(tree)
 A=convert2double(A)
-tree.rhs=Rhs(A)
+tree.rhs=Rhs_tlist(A)
 
 tree.lhs(1).dims=A.dims
 tree.lhs(1).type=Type(Double,Real)
index c890a1c..40ae608 100644 (file)
@@ -9,7 +9,7 @@ function [tree]=sci_acos(tree)
 
 A=getrhs(tree)
 A=convert2double(A)
-tree.rhs=Rhs(A)
+tree.rhs=Rhs_tlist(A)
 
 tree.lhs(1).dims=A.dims
 tree.lhs(1).type=Type(Double,Unknown)
index 1c1b8f0..6817980 100644 (file)
@@ -11,7 +11,7 @@ tree.name="acosh"
 
 A=getrhs(tree)
 A=convert2double(A)
-tree.rhs=Rhs(A)
+tree.rhs=Rhs_tlist(A)
 
 tree.lhs(1).dims=A.dims
 tree.lhs(1).type=A.type
index 2aefdfa..fdfa30c 100644 (file)
@@ -11,7 +11,7 @@ X=getrhs(tree)
 
 tree.name="atan"
 Op=Operation("./",list(Cste(1),X),list())
-tree.rhs=Rhs(Op)
+tree.rhs=Rhs_tlist(Op)
 
 tree.lhs(1).dims=X.dims
 tree.lhs(1).type=X.type
index 5cf24e8..f957331 100644 (file)
@@ -13,7 +13,7 @@ set_infos(msprintf(gettext("If %s is outside [-1,1]\n   complex part of output o
 
 tree.name="atanh"
 Op=Operation("./",list(Cste(1),X),list())
-tree.rhs=Rhs(Op)
+tree.rhs=Rhs_tlist(Op)
 
 tree.lhs(1).dims=X.dims
 // Property unknown because result can be complex for real input
index a590a23..5a69b22 100644 (file)
@@ -11,7 +11,7 @@ X=getrhs(tree)
 
 tree.name="asin"
 Op=Operation("./",list(Cste(1),X),list())
-tree.rhs=Rhs(Op)
+tree.rhs=Rhs_tlist(Op)
 
 tree.lhs(1).dims=X.dims
 tree.lhs(1).type=Type(Double,Unknown)
index b0ab3b3..4e5385d 100644 (file)
@@ -11,7 +11,7 @@ X=getrhs(tree)
 
 tree.name="asinh"
 Op=Operation("./",list(Cste(1),X),list())
-tree.rhs=Rhs(Op)
+tree.rhs=Rhs_tlist(Op)
 
 tree.lhs(1).dims=X.dims
 tree.lhs(1).type=X.type
index 480509d..31b3909 100644 (file)
@@ -18,20 +18,20 @@ if rhs==1 then
   A = convert2double(A)
   
   if is_complex(A) then
-    A = Funcall("abs",1,Rhs(A),list(Variable("",A.infer)))
+    A = Funcall("abs",1,Rhs_tlist(A),list(Variable("",A.infer)))
   elseif ~is_real(A) then
-    newA = Funcall("abs",1,Rhs(A),list(Variable("",A.infer)))
+    newA = Funcall("abs",1,Rhs_tlist(A),list(Variable("",A.infer)))
     repl_poss(newA,A,A,gettext("is Real."))
     A=newA
   end
-  tree.rhs=Rhs(A)
+  tree.rhs=Rhs_tlist(A)
   
   // if A is not a multidimensional array
   if size(A.dims)==2 then
     if is_a_vector(A) then
       tree.lhs(1).dims=list(1,1)
     elseif not_a_vector(A) then
-      tree.rhs=Rhs(A,1)
+      tree.rhs=Rhs_tlist(A,1)
       tree.lhs(1).dims=list(1,A.dims(2))
     else
       tree.name="mtlb_all"
@@ -41,12 +41,12 @@ if rhs==1 then
   else
     dim = first_non_singleton(A)
     if dim<>Unknown then
-      tree.rhs=Rhs(A,dim)
+      tree.rhs=Rhs_tlist(A,dim)
       tree.lhs(1).dims=A.dims
       tree.lhs(1).dims(dim)=1
     else
       newrhs=Funcall("firstnonsingleton",1,list(A),list())
-      tree.rhs=Rhs(A,newrhs)
+      tree.rhs=Rhs_tlist(A,newrhs)
       tree.lhs(1).dims=allunknown(A.dims)
     end
   end
@@ -60,13 +60,13 @@ else
   A = convert2double(A)
   
   if is_complex(A) then
-    A = Funcall("abs",1,Rhs(A),list(Variable("",A.infer)))
+    A = Funcall("abs",1,Rhs_tlist(A),list(Variable("",A.infer)))
   elseif ~is_real(A) then
-    newA = Funcall("abs",1,Rhs(A),list(Variable("",A.infer)))
+    newA = Funcall("abs",1,Rhs_tlist(A),list(Variable("",A.infer)))
     repl_poss(newA,A,A,gettext("is Real."))
     A=newA
   end
-  tree.rhs=Rhs(A,dim)
+  tree.rhs=Rhs_tlist(A,dim)
   
   if typeof(dim)=="cste" then
     if dim.value<=size(A.dims) then
index 6da87f5..a177f6b 100644 (file)
@@ -18,20 +18,20 @@ if rhs==1 then
   A = convert2double(A)
   
   if is_complex(A) then
-    A = Funcall("abs",1,Rhs(A),list(Variable("",A.infer)))
+    A = Funcall("abs",1,Rhs_tlist(A),list(Variable("",A.infer)))
   elseif ~is_real(A) then
-    newA = Funcall("abs",1,Rhs(A),list(Variable("",A.infer)))
+    newA = Funcall("abs",1,Rhs_tlist(A),list(Variable("",A.infer)))
     repl_poss(newA,A,A,gettext("is Real."))
     A=newA
   end
-  tree.rhs=Rhs(A)
+  tree.rhs=Rhs_tlist(A)
   
   // if A is not a multidimensional array
   if size(A.dims)==2 then
     if is_a_vector(A) then
       tree.lhs(1).dims=list(1,1)
     elseif not_a_vector(A) then
-      tree.rhs=Rhs(A,1)
+      tree.rhs=Rhs_tlist(A,1)
       tree.lhs(1).dims=list(1,A.dims(2))
     else
       tree.name="mtlb_any"
@@ -41,12 +41,12 @@ if rhs==1 then
   else
     dim = first_non_singleton(A)
     if dim<>Unknown then
-      tree.rhs=Rhs(A,dim)
+      tree.rhs=Rhs_tlist(A,dim)
       tree.lhs(1).dims=A.dims
       tree.lhs(1).dims(dim)=1
     else
       newrhs=Funcall("firstnonsingleton",1,list(A),list())
-      tree.rhs=Rhs(A,newrhs)
+      tree.rhs=Rhs_tlist(A,newrhs)
       tree.lhs(1).dims=allunknown(A.dims)
     end
   end
@@ -60,13 +60,13 @@ else
   A = convert2double(A)
   
   if is_complex(A) then
-    A = Funcall("abs",1,Rhs(A),list(Variable("",A.infer)))
+    A = Funcall("abs",1,Rhs_tlist(A),list(Variable("",A.infer)))
   elseif ~is_real(A) then
-    newA = Funcall("abs",1,Rhs(A),list(Variable("",A.infer)))
+    newA = Funcall("abs",1,Rhs_tlist(A),list(Variable("",A.infer)))
     repl_poss(newA,A,A,gettext("is Real."))
     A=newA
   end
-  tree.rhs=Rhs(A,dim)
+  tree.rhs=Rhs_tlist(A,dim)
   
   if typeof(dim)=="cste" then
     if dim.value<=size(A.dims) then
index 88fbbea..e4de691 100644 (file)
@@ -11,7 +11,7 @@ X=getrhs(tree)
 
 tree.name="acos"
 Op=Operation("./",list(Cste(1),X),list())
-tree.rhs=Rhs(Op)
+tree.rhs=Rhs_tlist(Op)
 
 tree.lhs(1).dims=X.dims
 tree.lhs(1).type=Type(Double,Unknown)
index 70c60fe..94dd4de 100644 (file)
@@ -11,7 +11,7 @@ X=getrhs(tree)
 
 tree.name="acosh"
 Op=Operation("./",list(Cste(1),X),list())
-tree.rhs=Rhs(Op)
+tree.rhs=Rhs_tlist(Op)
 
 tree.lhs(1).dims=X.dims
 tree.lhs(1).type=Type(Double,Unknown)
index f4610e7..e241511 100644 (file)
@@ -9,7 +9,7 @@ function [tree]=sci_asin(tree)
 
 A=getrhs(tree)
 A=convert2double(A)
-tree.rhs=Rhs(A)
+tree.rhs=Rhs_tlist(A)
 
 set_infos(msprintf(gettext("If %s is outside [-1,1]\n   complex part of output of %s will be the opposite of Matlab one."),expression2code(A),expression2code(tree)),2)
   
index b63bca8..af8b59c 100644 (file)
@@ -11,7 +11,7 @@ tree.name="asinh"
 
 A=getrhs(tree)
 A=convert2double(A)
-tree.rhs=Rhs(A)
+tree.rhs=Rhs_tlist(A)
 
 tree.lhs(1).dims=A.dims
 tree.lhs(1).type=A.type
index c8a44f4..1bfe28b 100644 (file)
@@ -11,7 +11,7 @@ tree.name="atan"
 
 A=getrhs(tree)
 A=convert2double(A)
-tree.rhs=Rhs(A)
+tree.rhs=Rhs_tlist(A)
 
 tree.lhs(1).dims=A.dims
 tree.lhs(1).type=A.type
index dda05a4..cfb877a 100644 (file)
@@ -10,7 +10,7 @@ function [tree]=sci_atan2(tree)
 [Y,X]=getrhs(tree)
 //Y=convert2double(Y)
 //X=convert2double(X)
-tree.rhs=Rhs(Y,X)
+tree.rhs=Rhs_tlist(Y,X)
 
 // Scilab atan() does not work with complex
 if is_complex(Y) then
index 2f36971..e578c3a 100644 (file)
@@ -9,7 +9,7 @@ function [tree]=sci_atanh(tree)
 
 A=getrhs(tree)
 A=convert2double(A)
-tree.rhs=Rhs(A)
+tree.rhs=Rhs_tlist(A)
 
 set_infos(msprintf(gettext("If %s is outside [-1,1]\n   complex part of output of %s will be the opposite of Matlab one."),expression2code(A),expression2code(tree)),2)
   
index ccafb47..1c30f4f 100644 (file)
@@ -17,7 +17,7 @@ if rhs>0 then
       // axis([xmin xmax ymin ymax zmin zmax])
       if or(tree.rhs(krhs).dims(2)==[4,6]) then
        mat=Funcall("matrix",1,list(tree.rhs(krhs),Cste(2),Cste(-1)),list())
-       tree=Funcall("set",1,Rhs(a,"data_bounds",mat),tree.lhs)
+       tree=Funcall("set",1,Rhs_tlist(a,"data_bounds",mat),tree.lhs)
        
       // axis([xmin xmax ymin ymax zmin zmax cmin cmax]) 
       elseif tree.rhs(krhs).dims(2)==8 then
@@ -34,15 +34,15 @@ if rhs>0 then
        
        // axis auto
        if tree.rhs(krhs).value=="auto" then
-         tree=Funcall("set",1,Rhs(a,"auto_scale","on"),tree.lhs)
+         tree=Funcall("set",1,Rhs_tlist(a,"auto_scale","on"),tree.lhs)
          
          // axis manual
        elseif tree.rhs(krhs).value=="manual" then
-         tree=Funcall("set",1,Rhs(a,"auto_scale","off"),tree.lhs)
+         tree=Funcall("set",1,Rhs_tlist(a,"auto_scale","off"),tree.lhs)
          
          // axis tight
        elseif tree.rhs(krhs).value=="tight" then
-         tree=Funcall("set",1,Rhs(a,"tight_limits","on"),tree.lhs)
+         tree=Funcall("set",1,Rhs_tlist(a,"tight_limits","on"),tree.lhs)
          
          // axis fill
        elseif tree.rhs(krhs).value=="fill" then
@@ -51,16 +51,16 @@ if rhs>0 then
          // axis ij
        elseif tree.rhs(krhs).value=="ij" then
          mat=Operation("cc",list(Cste(180),Cste(270)),list())
-         tree=Funcall("set",1,Rhs(a,"rotation_angles",mat),tree.lhs)
+         tree=Funcall("set",1,Rhs_tlist(a,"rotation_angles",mat),tree.lhs)
          
          // axis xy
        elseif tree.rhs(krhs).value=="xy" then
          mat=Operation("cc",list(Cste(0),Cste(270)),list())
-         tree=Funcall("set",1,Rhs(a,"rotation_angles",mat),tree.lhs)
+         tree=Funcall("set",1,Rhs_tlist(a,"rotation_angles",mat),tree.lhs)
          
          // axis equal
        elseif tree.rhs(krhs).value=="equal" then
-         tree=Funcall("set",1,Rhs(a,"isoview","on"),tree.lhs)
+         tree=Funcall("set",1,Rhs_tlist(a,"isoview","on"),tree.lhs)
          
          // axis image
        elseif tree.rhs(krhs).value=="image" then
@@ -69,11 +69,11 @@ if rhs>0 then
          // axis square
        elseif tree.rhs(krhs).value=="square" then
          set_infos(gettext("cube_scaling only used in 3d mode."),2);
-         tree=Funcall("set",1,Rhs(a,"cube_scaling","on"),tree.lhs)
+         tree=Funcall("set",1,Rhs_tlist(a,"cube_scaling","on"),tree.lhs)
          
          // axis vis3d
        elseif tree.rhs(krhs).value=="vis3d" then
-         tree=Funcall("set",1,Rhs(a,"view","3d"),tree.lhs)
+         tree=Funcall("set",1,Rhs_tlist(a,"view","3d"),tree.lhs)
          
          // axis normal
        elseif tree.rhs(krhs).value=="normal" then
@@ -81,11 +81,11 @@ if rhs>0 then
          
          // axis on
        elseif tree.rhs(krhs).value=="on" then
-         tree=Funcall("set",1,Rhs(a,"axes_visible","on"),tree.lhs)
+         tree=Funcall("set",1,Rhs_tlist(a,"axes_visible","on"),tree.lhs)
          
          // axis off
        elseif tree.rhs(krhs).value=="off" then
-         tree=Funcall("set",1,Rhs(a,"axes_visible","off"),tree.lhs)
+         tree=Funcall("set",1,Rhs_tlist(a,"axes_visible","off"),tree.lhs)
          
        // [mode,visibility,direction] = axis('state')
         elseif tree.rhs(krhs).value=="state" then
@@ -112,7 +112,7 @@ if rhs>0 then
   end
 // v = axis
 else
-  tree=Funcall("set",1,Rhs(a,"data_bounds"),tree.lhs)
+  tree=Funcall("set",1,Rhs_tlist(a,"data_bounds"),tree.lhs)
   tree.lhs(1).dims=list(2,Unknown)
   tree.lhs(1).type=Type(Double,Real)
 end
index 279d989..fb7cfac 100644 (file)
@@ -10,7 +10,7 @@ A = getrhs(tree)
 
 // %c_balance and %b_balance are not defined
 A=convert2double(A)
-tree.rhs=Rhs(A)
+tree.rhs=Rhs_tlist(A)
 
 tree.name="balanc"
 
index 4cc0e4e..2d818a7 100644 (file)
@@ -9,7 +9,7 @@ function [tree]=sci_ceil(tree)
 
 A=getrhs(tree)
 A=convert2double(A)
-tree.rhs=Rhs(A)
+tree.rhs=Rhs_tlist(A)
 
 tree.lhs(1).dims=A.dims
 if is_real(A) then
index db2c9d2..3f9ee6d 100644 (file)
@@ -7,7 +7,7 @@ function  [tree]=sci_cellstr(tree)
 // F.B
 
 A=getrhs(tree)
-tree.rhs=Rhs(A)
+tree.rhs=Rhs_tlist(A)
 Aknowndim=%t // Aknowndim is a boolean, true if all dimennsions of A are known
 tree.lhs(1).dims=list()
 for i=1:size(A.dims) 
index c4ceb94..d060a1d 100644 (file)
@@ -16,7 +16,7 @@ end
 
 // %c_chol and %b_chol are not defined
 X=convert2double(X)
-tree.rhs=Rhs(X)
+tree.rhs=Rhs_tlist(X)
 
 // R = chol(X)
 if lhs==1 then
index 8fc42d6..138e27d 100644 (file)
@@ -11,7 +11,7 @@ tree.name="conj"
 
 A=getrhs(tree)
 A=convert2double(A)
-tree.rhs=Rhs(A)
+tree.rhs=Rhs_tlist(A)
 
 tree.lhs(1).dims=A.dims
 tree.lhs(1).type=A.type
index bc6a3ac..799f619 100644 (file)
@@ -9,7 +9,7 @@ function [tree]=sci_cos(tree)
 
 A=getrhs(tree)
 A=convert2double(A)
-tree.rhs=Rhs(A)
+tree.rhs=Rhs_tlist(A)
 
 tree.lhs(1).dims=A.dims
 tree.lhs(1).type=Type(Double,Real)
index 8d3abe5..5296570 100644 (file)
@@ -9,7 +9,7 @@ function [tree]=sci_cosh(tree)
 
 A=getrhs(tree)
 A=convert2double(A)
-tree.rhs=Rhs(A)
+tree.rhs=Rhs_tlist(A)
 
 tree.lhs(1).dims=A.dims
 tree.lhs(1).type=Type(Double,Real)
index d721cbf..2980793 100644 (file)
@@ -11,7 +11,7 @@ tree.name="cotg"
 
 A=getrhs(tree)
 A=convert2double(A)
-tree.rhs=Rhs(A)
+tree.rhs=Rhs_tlist(A)
 
 tree.lhs(1).dims=A.dims
 tree.lhs(1).type=A.type
index e1ca3e1..aa3eb52 100644 (file)
@@ -11,7 +11,7 @@ tree.name="coth"
 
 A=getrhs(tree)
 A=convert2double(A)
-tree.rhs=Rhs(A)
+tree.rhs=Rhs_tlist(A)
 
 tree.lhs(1).dims=A.dims
 tree.lhs(1).type=A.type
index f73a8eb..2f407a5 100644 (file)
@@ -14,16 +14,16 @@ if rhs==1 then
 
   // Because %b_cumprod and %C_cumprod are not defined
   A = convert2double(A)
-  tree.rhs=Rhs(A)
+  tree.rhs=Rhs_tlist(A)
   
   dim=first_non_singleton(A)
 
   tree.lhs(1).dims=A.dims
   
   if dim>0 then
-    tree.rhs=Rhs(A,dim)
+    tree.rhs=Rhs_tlist(A,dim)
   elseif dim==-1 then
-    tree.rhs=Rhs(A,Funcall("firstnonsingleton",1,list(A),list()))
+    tree.rhs=Rhs_tlist(A,Funcall("firstnonsingleton",1,list(A),list()))
   end
   if is_real(A) then
     tree.lhs(1).type=Type(Double,Real)
@@ -37,7 +37,7 @@ else
   // Because %b_cumprod and %C_cumprod are not defined
   A=convert2double(A)
   dim=convert2double(dim)
-  tree.rhs=Rhs(A,dim)
+  tree.rhs=Rhs_tlist(A,dim)
   
   if typeof(dim)=="cste" then
     if dim.value>size(A.dims) then
index da563ca..c59e8ae 100644 (file)
@@ -14,16 +14,16 @@ if rhs==1 then
 
   // Because %b_cumsum and %C_cumsum are not defined
   A = convert2double(A)
-  tree.rhs=Rhs(A)
+  tree.rhs=Rhs_tlist(A)
   
   dim=first_non_singleton(A)
 
   tree.lhs(1).dims=A.dims
   
   if dim>0 then
-    tree.rhs=Rhs(A,dim)
+    tree.rhs=Rhs_tlist(A,dim)
   elseif dim==-1 then
-    tree.rhs=Rhs(A,Funcall("firstnonsingleton",1,list(A),list()))
+    tree.rhs=Rhs_tlist(A,Funcall("firstnonsingleton",1,list(A),list()))
   end
   if is_real(A) then
     tree.lhs(1).type=Type(Double,Real)
@@ -37,7 +37,7 @@ else
   // Because %b_cumsum and %C_cumsum are not defined
   A=convert2double(A)
   dim=convert2double(dim)
-  tree.rhs=Rhs(A,dim)
+  tree.rhs=Rhs_tlist(A,dim)
   
   if typeof(dim)=="cste" then
     if dim.value>size(A.dims) then
index 736f6ca..2d7a4e5 100644 (file)
@@ -10,7 +10,7 @@ X = getrhs(tree)
 
 // %c_det and %b_det are not defined
 X = convert2double(X)
-tree.rhs=Rhs(X)
+tree.rhs=Rhs_tlist(X)
 
 tree.lhs(1).dims=list(1,1)
 tree.lhs(1).type=X.type
index 264d031..ab84475 100644 (file)
@@ -12,7 +12,7 @@ if rhs==2 then
   [A,k] = getrhs(tree)
   // In Scilab k must be a real or complex matrix
   k = convert2double(k)
-  tree.rhs=Rhs(A,k)
+  tree.rhs=Rhs_tlist(A,k)
 
   // Compute dims to for inference
   if typeof(k)=="cste" then
@@ -37,7 +37,7 @@ if rhs==2 then
     tree.lhs(1).type=A.type
   else
     if A.vtype==Boolean then
-      tree.rhs=Rhs(Funcall("bool2s",1,list(A),list()),k)
+      tree.rhs=Rhs_tlist(Funcall("bool2s",1,list(A),list()),k)
       tree.lhs(1).type=Type(Boolean,Real)
     else
       tree.lhs(1).type=A.type
@@ -72,7 +72,7 @@ else
     tree.lhs(1).type=A.type
   else
     if A.vtype==Boolean then
-      tree.rhs=Rhs(Funcall("bool2s",1,list(A),list()))
+      tree.rhs=Rhs_tlist(Funcall("bool2s",1,list(A),list()))
       tree.lhs(1).type=Type(Boolean,Real)
     else
       tree.lhs(1).type=A.type
index c6c66f6..aef326a 100644 (file)
@@ -14,7 +14,7 @@ if rhs==1 then
   X=getrhs(tree)
   // %c_diff and %b_diff are not defined in Scilab
   X=convert2double(X)
-  tree.rhs=Rhs(X)
+  tree.rhs=Rhs_tlist(X)
   
   dim = first_non_singleton(X)
   
@@ -22,13 +22,13 @@ if rhs==1 then
     // All output dims are unknown
     tree.lhs(1).dims=allunknown(X.dims)
     // First non singleton dimension will be computed at execution
-    tree.rhs=Rhs(X,1,Funcall("firstnonsingleton",1,list(X),list()))
+    tree.rhs=Rhs_tlist(X,1,Funcall("firstnonsingleton",1,list(X),list()))
   else
     tree.lhs(1).dims=X.dims
     if dim==0 then
-      tree.rhs=Rhs(X)
+      tree.rhs=Rhs_tlist(X)
     else
-      tree.rhs=Rhs(X,1,dim)
+      tree.rhs=Rhs_tlist(X,1,dim)
       tree.lhs(1).dims(dim)=max(X.dims(dim)-1,-1)
     end
   end
@@ -38,7 +38,7 @@ elseif rhs==2 then
   [X,n] = getrhs(tree);
   X = convert2double(X)
   n = convert2double(n)
-  tree.rhs=Rhs(X,n)
+  tree.rhs=Rhs_tlist(X,n)
   
   if ~is_a_vector(X) then
     tree.name="mtlb_diff"
@@ -52,7 +52,7 @@ else
   X = convert2double(X)
   n = convert2double(n)
   dim = convert2double(dim)
-  tree.rhs=Rhs(X,n,dim)
+  tree.rhs=Rhs_tlist(X,n,dim)
   
   tree.lhs(1).dims=allunknown(X.dims)
   tree.lhs(1).type=Type(Double,Unknown)
index a653036..423a418 100644 (file)
@@ -14,7 +14,7 @@ else
   if k<>[] & min(k)<>2 then // help toolbox/
     no_equiv(expression2code(tree));
   elseif topic.value=="syntax" then
-    tree.rhs=Rhs("names")
+    tree.rhs=Rhs_tlist("names")
   else
     // Nothing to do
   end
index d9f5a12..faa6cd1 100644 (file)
@@ -11,7 +11,7 @@ tree.name="double"
 
 A=getrhs(tree)
 A=convert2double(A)
-tree.rhs=Rhs(A)
+tree.rhs=Rhs_tlist(A)
 
 tree.lhs(1).dims=A.dims
 tree.lhs(1).type=A.type
index df630d6..c66d6c0 100644 (file)
@@ -12,17 +12,17 @@ if rhs<=0 then
   // mode(abs(mode()-1))
   tree.name="mode"
   sub=Operation("-",list(tree,Cste(1)),list())
-  abs_funcall=Funcall("abs",1,Rhs(sub),list())
-  tree.rhs=Rhs(abs_funcall)
+  abs_funcall=Funcall("abs",1,Rhs_tlist(sub),list())
+  tree.rhs=Rhs_tlist(abs_funcall)
 // echo on or echo off
 elseif rhs==1 then
   if typeof(tree.rhs(1))=="cste" then
     if tree.rhs(1).value=="on" then
       tree.name="mode"
-      tree.rhs=Rhs(1);
+      tree.rhs=Rhs_tlist(1);
     elseif tree.rhs(1).value=="off" then
       tree.name="mode"
-      tree.rhs=Rhs(0);
+      tree.rhs=Rhs_tlist(0);
     else
       no_equiv(expression2code(tree))
     end
index 175f26a..b1028a6 100644 (file)
@@ -13,7 +13,7 @@ if rhs==1 then
   // Because %c_spec and %b_spec are not defined
   A = getrhs(tree)
   A = convert2double(A)
-  tree.rhs=Rhs(A)
+  tree.rhs=Rhs_tlist(A)
 
   // d = eig(A)
   if lhs==1 then
@@ -36,7 +36,7 @@ elseif rhs==2 then
   // 'nobalance'
   if B.vtype==String then
     no_equiv(gettext("''nobalance'' option, IGNORED."))
-    tree.rhs=Rhs(tree.rhs(1))
+    tree.rhs=Rhs_tlist(tree.rhs(1))
     if lhs==1 then
       tree.name="spec"
       tree.lhs(1).dims=list(A.dims(1),1)
@@ -44,7 +44,7 @@ elseif rhs==2 then
     else
       tree.rhs(1)=Operation("+",list(tree.rhs(1),Variable("%i",Infer()),list()))
       rhs2=Operation("+",list(Cste(1),Variable("%eps",Infer()),list()))
-      tree.rhs=Rhs(tree.rhs(1),rhs2)
+      tree.rhs=Rhs_tlist(tree.rhs(1),rhs2)
       tree.name="bdiag"
       tree.lhs(1).dims=list(A.dims(1),A.dims(1))
       tree.lhs(1).type=Type(Double,Unknown)
index 2170424..8223dd5 100644 (file)
@@ -9,7 +9,7 @@ function [tree]=sci_erf(tree)
 
 A=getrhs(tree)
 A=convert2double(A)
-tree.rhs=Rhs(A)
+tree.rhs=Rhs_tlist(A)
 
 tree.lhs(1).dims=A.dims
 tree.lhs(1).type=Type(Double,Real)
index 550ff40..a0ad11e 100644 (file)
@@ -9,7 +9,7 @@ function [tree]=sci_erfc(tree)
 
 A=getrhs(tree)
 A=convert2double(A)
-tree.rhs=Rhs(A)
+tree.rhs=Rhs_tlist(A)
 
 tree.lhs(1).dims=A.dims
 tree.lhs(1).type=Type(Double,Real)
index 627fc1d..c24c72a 100644 (file)
@@ -9,7 +9,7 @@ function [tree]=sci_erfcx(tree)
 
 A=getrhs(tree)
 A=convert2double(A)
-tree.rhs=Rhs(A)
+tree.rhs=Rhs_tlist(A)
 
 tree.lhs(1).dims=A.dims
 tree.lhs(1).type=Type(Double,Real)
index 5b77985..9fa5eb4 100644 (file)
@@ -25,9 +25,9 @@ else
   end
   LHS="["+strcat(LHS,",")+"]"
   if typeof(tree.rhs(1))=="cste" then
-    tree.rhs=Rhs(LHS+" = "+tree.rhs(1).value)
+    tree.rhs=Rhs_tlist(LHS+" = "+tree.rhs(1).value)
   else
-    tree.rhs=Rhs(LHS+" = "+expression2code(tree.rhs(1)))
+    tree.rhs=Rhs_tlist(LHS+" = "+expression2code(tree.rhs(1)))
   end
   tree.lhs=list(Variable("ans",Infer()))
 end
index 21cb2de..e5bc5b7 100644 (file)
@@ -11,7 +11,7 @@ tree.name="exp"
 
 A=getrhs(tree)
 A=convert2double(A)
-tree.rhs=Rhs(A)
+tree.rhs=Rhs_tlist(A)
 
 tree.lhs(1).dims=A.dims
 tree.lhs(1).type=A.type
index fcbf8da..ecc284a 100644 (file)
@@ -11,7 +11,7 @@ tree.name="expm"
 
 A=getrhs(tree)
 A=convert2double(A)
-tree.rhs=Rhs(A)
+tree.rhs=Rhs_tlist(A)
 
 tree.lhs(1).dims=A.dims
 tree.lhs(1).type=A.type
index 5d09409..fafa9d1 100644 (file)
@@ -19,7 +19,7 @@ if rhs==-1 then
   elseif tree.name=="rand" then
     // Nothing changed
   elseif tree.name=="randn" then
-    tree.rhs=Rhs(1,1,"normal")
+    tree.rhs=Rhs_tlist(1,1,"normal")
     tree.lhs(1).dims=list(1,1)
     tree.lhs(1).type=Type(Double,Real)
   elseif tree.name=="false" then
@@ -38,7 +38,7 @@ if rhs==0 then
   elseif tree.name=="rand" then
     // Nothing changed
   elseif tree.name=="randn" then
-    tree.rhs=Rhs(1,1,"normal")
+    tree.rhs=Rhs_tlist(1,1,"normal")
     tree.lhs(1).dims=list(1,1)
     tree.lhs(1).type=Type(Double,Real)
   elseif tree.name=="false" then
@@ -54,20 +54,20 @@ if tree.name=="randn" |tree.name=="rand" then
   if tree.rhs(1).vtype==String then // State
     if rhs==1 then // Get the state
       if tree.name=="rand" then
-       onescall=Funcall("ones",1,Rhs(35,1),list())
-       randcall=Funcall("rand",1,Rhs("seed"),list())
+       onescall=Funcall("ones",1,Rhs_tlist(35,1),list())
+       randcall=Funcall("rand",1,Rhs_tlist("seed"),list())
        tree=Operation("*",list(onescall,randcall),tree.lhs)
        tree.out(1).dims=list(35,1)
        tree.out(1).type=Type(Double,Real)
       else
-       onescall=Funcall("ones",1,Rhs(2,1),list())
-       randcall=Funcall("rand",1,Rhs("seed"),list())
+       onescall=Funcall("ones",1,Rhs_tlist(2,1),list())
+       randcall=Funcall("rand",1,Rhs_tlist("seed"),list())
        tree=Operation("*",list(onescall,randcall),tree.lhs)
        tree.out(1).dims=list(2,1)
        tree.out(1).type=Type(Double,Real)
       end
     else // Set the state
-      tree=Funcall("rand",1,Rhs("seed",tree.rhs(2)),tree.lhs)
+      tree=Funcall("rand",1,Rhs_tlist("seed",tree.rhs(2)),tree.lhs)
       tree.lhs(1).dims=list(0,0)
       tree.lhs(1).type=Type(Unknown,Unknown)
     end
@@ -95,7 +95,7 @@ if rhs==1 then
       dim=Unknown
     end
     
-    tree=Funcall("eye",1,Rhs(n,n,opt),tree.lhs)
+    tree=Funcall("eye",1,Rhs_tlist(n,n,opt),tree.lhs)
     tree.lhs(1).dims=list(dim,dim)
     tree.lhs(1).type=Type(Double,Real)
   // eye([n1,n2,...])
index f17a314..f626516 100644 (file)
@@ -7,7 +7,7 @@ function [tree]=sci_factorial(tree)
 // F.B.
 
 A=getrhs(tree)
-tree.rhs=Rhs(A)
+tree.rhs=Rhs_tlist(A)
 
 tree.lhs(1).dims=A.dims
 tree.lhs(1).type=Type(Double,Real)
index 087d4e4..ff80e54 100644 (file)
@@ -19,7 +19,7 @@ if rhs==-1 then
   elseif tree.name=="rand" then
     // Nothing changed
   elseif tree.name=="randn" then
-    tree.rhs=Rhs(1,1,"normal")
+    tree.rhs=Rhs_tlist(1,1,"normal")
     tree.lhs(1).dims=list(1,1)
     tree.lhs(1).type=Type(Double,Real)
   elseif tree.name=="false" then
@@ -38,7 +38,7 @@ if rhs==0 then
   elseif tree.name=="rand" then
     // Nothing changed
   elseif tree.name=="randn" then
-    tree.rhs=Rhs(1,1,"normal")
+    tree.rhs=Rhs_tlist(1,1,"normal")
     tree.lhs(1).dims=list(1,1)
     tree.lhs(1).type=Type(Double,Real)
   elseif tree.name=="false" then
@@ -54,20 +54,20 @@ if tree.name=="randn" |tree.name=="rand" then
   if tree.rhs(1).vtype==String then // State
     if rhs==1 then // Get the state
       if tree.name=="rand" then
-       onescall=Funcall("ones",1,Rhs(35,1),list())
-       randcall=Funcall("rand",1,Rhs("seed"),list())
+       onescall=Funcall("ones",1,Rhs_tlist(35,1),list())
+       randcall=Funcall("rand",1,Rhs_tlist("seed"),list())
        tree=Operation("*",list(onescall,randcall),tree.lhs)
        tree.out(1).dims=list(35,1)
        tree.out(1).type=Type(Double,Real)
       else
-       onescall=Funcall("ones",1,Rhs(2,1),list())
-       randcall=Funcall("rand",1,Rhs("seed"),list())
+       onescall=Funcall("ones",1,Rhs_tlist(2,1),list())
+       randcall=Funcall("rand",1,Rhs_tlist("seed"),list())
        tree=Operation("*",list(onescall,randcall),tree.lhs)
        tree.out(1).dims=list(2,1)
        tree.out(1).type=Type(Double,Real)
       end
     else // Set the state
-      tree=Funcall("rand",1,Rhs("seed",tree.rhs(2)),tree.lhs)
+      tree=Funcall("rand",1,Rhs_tlist("seed",tree.rhs(2)),tree.lhs)
       tree.lhs(1).dims=list(0,0)
       tree.lhs(1).type=Type(Unknown,Unknown)
     end
@@ -95,7 +95,7 @@ if rhs==1 then
       dim=Unknown
     end
     
-    tree=Funcall("zeros",1,Rhs(n,n,opt),tree.lhs)
+    tree=Funcall("zeros",1,Rhs_tlist(n,n,opt),tree.lhs)
     tree.lhs(1).dims=list(dim,dim)
     tree.lhs(1).type=Type(Double,Real)
   // false([n1,n2,...])
index f85d5c0..dfa3b97 100644 (file)
@@ -37,7 +37,7 @@ else
   end
   LHS=LHS+"]"
 
-  tree.rhs=Rhs(Operation("+",list(Cste(LHS+" = "),RHS),list()))
+  tree.rhs=Rhs_tlist(Operation("+",list(Cste(LHS+" = "),RHS),list()))
   
   tree.lhs=list(Variable("ans",Infer()))
 end
index 9f2d7d8..479f933 100644 (file)
@@ -12,24 +12,24 @@ if rhs==1 then
   X = getrhs(tree)
   // %c_fft and %b_fft are not defined
   X = convert2double(X)
-  tree.rhs=Rhs(X,-1)
+  tree.rhs=Rhs_tlist(X,-1)
   
   if size(X.dims)==2 then
     if is_a_scalar(X) | is_a_vector(X) then
-      tree.rhs=Rhs(X,-1)
+      tree.rhs=Rhs_tlist(X,-1)
     elseif not_a_vector(X) then
       if X.dims(2)<>Unknown then
-       tree.rhs=Rhs(X,-1,X.dims(1),1)
+       tree.rhs=Rhs_tlist(X,-1,X.dims(1),1)
       else
        tmp=Funcall("size",1,list(X,1),list())
-       tree.rhs=Rhs(X,-1,tmp,1)
+       tree.rhs=Rhs_tlist(X,-1,tmp,1)
       end
     else
       tree.name="mtlb_fft"
-      tree.rhs=Rhs(X)
+      tree.rhs=Rhs_tlist(X)
     end
   else
-    tree.rhs=Rhs(X,-1,Funcall("firstnonsingleton",1,list(X,"num"),list()),1)
+    tree.rhs=Rhs_tlist(X,-1,Funcall("firstnonsingleton",1,list(X,"num"),list()),1)
   end
   tree.lhs(1).dims=X.dims
   tree.lhs(1).type=Type(Double,Unknown)
@@ -39,7 +39,7 @@ elseif rhs==2 then
   [X,n] = getrhs(tree)
   X = convert2double(X)
   n = convert2double(n)
-  tree.rhs=Rhs(X,n)
+  tree.rhs=Rhs_tlist(X,n)
   
   tree.name="mtlb_fft"
   if is_empty(X) 
@@ -54,7 +54,7 @@ elseif rhs==3 then
   X = convert2double(X)
   n = convert2double(n)
   dim = convert2double(dim)
-  tree.rhs=Rhs(X,n,dim)
+  tree.rhs=Rhs_tlist(X,n,dim)
   
   tree.name="mtlb_fft"
   
index ca266a2..c8ced71 100644 (file)
@@ -11,7 +11,7 @@ if rhs == 1 then
   X = getrhs(tree)
   // %c_fft2 and %b_fft2 are not defined
   X = convert2double(X)
-  tree.rhs=Rhs(X)
+  tree.rhs=Rhs_tlist(X)
   
   tree.lhs(1).dims=X.dims
   tree.lhs(1).type=Type(Double,Unknown)
@@ -22,7 +22,7 @@ elseif rhs == 3 then
   X = convert2double(X)
   m = convert2double(m)
   n = convert2double(n)
-  tree.rhs=Rhs(X,m,n)
+  tree.rhs=Rhs_tlist(X,m,n)
   
   tree.lhs(1).type=Type(Double,Unknown)
   
index 1dad612..f132e22 100644 (file)
@@ -9,7 +9,7 @@ function [tree]=sci_fgets(tree)
 
 if rhs==2 then
   tree.name="mgetstr"
-  tree.rhs=Rhs(tree.rhs(2),tree.rhs(1))
+  tree.rhs=Rhs_tlist(tree.rhs(2),tree.rhs(1))
   if typeof(tree.rhs(1))=="cste" then
     tree.lhs(1).dims=list(1,tree.rhs(1).value)
   else
index d205372..cdb90c5 100644 (file)
@@ -12,7 +12,7 @@ for klhs=1:lhs
 end
 
 // Add trailing / or \ to path
-pathconvert_funcall=Funcall("pathconvert",1,Rhs("/"),list())
+pathconvert_funcall=Funcall("pathconvert",1,Rhs_tlist("/"),list())
 if lhs==1 then
   tree=Operation("+",list(tree,pathconvert_funcall),tree.lhs)
 else
index dac4ca9..14b59b7 100644 (file)
@@ -11,7 +11,7 @@ x = getrhs(tree)
 
 // Because %c_find is not defined
 x = convert2double(x)
-tree.rhs=Rhs(x)
+tree.rhs=Rhs_tlist(x)
 
 // k = find(x)
 if lhs==1 then
@@ -22,10 +22,10 @@ if lhs==1 then
     repl_poss(newx,x,x,gettext("is Real."));
     x=newx
   end
-  tree.rhs=Rhs(x)
+  tree.rhs=Rhs_tlist(x)
     
   tree1=Operation("''",list(tree),tree.lhs)
-  tree2=Funcall("matrix",1,Rhs(tree,-1,1),tree.lhs)
+  tree2=Funcall("matrix",1,Rhs_tlist(tree,-1,1),tree.lhs)
   
   tree.lhs(1).type=Type(Double,Real)
 
@@ -51,7 +51,7 @@ elseif lhs==2 then
     repl_poss(newx,x,x,gettext("is Real."));
     x=newx
   end
-  tree.rhs=Rhs(x)
+  tree.rhs=Rhs_tlist(x)
 
   tree.lhs(1).type=Type(Double,Real)
   tree.lhs(2).type=Type(Double,Real)
index eb0486f..7cbffcf 100644 (file)
@@ -9,7 +9,7 @@ function [tree]=sci_fix(tree)
 
 A=getrhs(tree)
 A=convert2double(A)
-tree.rhs=Rhs(A)
+tree.rhs=Rhs_tlist(A)
 
 tree.lhs(1).dims=A.dims
 if is_real(A) then
index cc39153..0ae102d 100644 (file)
@@ -9,7 +9,7 @@ function [tree]=sci_floor(tree)
 
 A=getrhs(tree)
 A=convert2double(A)
-tree.rhs=Rhs(A)
+tree.rhs=Rhs_tlist(A)
 
 tree.lhs(1).dims=A.dims
 if is_real(A) then
index e2816a9..bf9fbd8 100644 (file)
@@ -61,11 +61,11 @@ elseif ratf|loose|compact|bank|hex then
   no_equiv("format "+f.value)
 else
   if rhs1==1 then
-    tree.rhs=Rhs(d+1)
+    tree.rhs=Rhs_tlist(d+1)
   elseif rhs1==2 then
-    tree.rhs=Rhs(fp,d+1)
+    tree.rhs=Rhs_tlist(fp,d+1)
   else
-    tree.rhs=Rhs("v",6)
+    tree.rhs=Rhs_tlist("v",6)
   end
 end
 endfunction
index 566591c..71c5af6 100644 (file)
@@ -7,6 +7,6 @@ function [tree]=sci_frewind(tree)
 // V.C.
 
 tree.name="mseek"
-tree.rhs=Rhs(0,tree.rhs(1))
+tree.rhs=Rhs_tlist(0,tree.rhs(1))
 
 endfunction
index 1ce8263..9422bcd 100644 (file)
@@ -40,7 +40,7 @@ else
 end
 
 tree.name="mseek"
-tree.rhs=Rhs(offset,fid,flag)
+tree.rhs=Rhs_tlist(offset,fid,flag)
 
 tree.lhs(1).dims=list(1,1)
 tree.lhs(1).type=Type(Double,Real)
index 325836b..af0a69e 100644 (file)
@@ -15,7 +15,7 @@ if S.vtype==String then
   tree.lhs(1).type=S.type
 elseif S.vtype==Boolean then
   S = convert2double(S)
-  tree.rhs=Rhs(S)
+  tree.rhs=Rhs_tlist(S)
   tree.lhs(1).dims=S.dims
   tree.lhs(1).type=Type(Boolean,Real)
 elseif S.vtype==Double then
index 1ec4d58..03f2fd2 100644 (file)
@@ -9,7 +9,7 @@ function [tree]=sci_gamma(tree)
 
 A=getrhs(tree)
 A=convert2double(A)
-tree.rhs=Rhs(A)
+tree.rhs=Rhs_tlist(A)
 
 tree.lhs(1).dims=A.dims
 tree.lhs(1).type=Type(Double,Real)
index d45af2e..ac62b7c 100644 (file)
@@ -9,7 +9,7 @@ function [tree]=sci_gammaln(tree)
 
 A=getrhs(tree)
 A=convert2double(A)
-tree.rhs=Rhs(A)
+tree.rhs=Rhs_tlist(A)
 
 tree.lhs(1).dims=A.dims
 tree.lhs(1).type=Type(Double,Real)
index 3be15b6..51294f7 100644 (file)
@@ -13,10 +13,10 @@ tree.name="set"
 rc=Operation("rc",list(Cste(0.75),Cste(0.5)),list());
 rc=Operation("rc",list(rc,Cste(0.25)),list());
 transp=Operation("''",list(rc),list())
-ones_funcall=Funcall("ones",1,Rhs(1,3),list())
+ones_funcall=Funcall("ones",1,Rhs_tlist(1,3),list())
 mult=Operation("*",list(transp,ones_funcall),list())
 
 gdf_funcall=Funcall("gdf",1,list(),list())
 
-tree.rhs=Rhs(gdf_funcall,"color_map",mult);
+tree.rhs=Rhs_tlist(gdf_funcall,"color_map",mult);
 endfunction
index c27bd3c..fb965f0 100644 (file)
@@ -19,10 +19,10 @@ elseif rhs==1 then
   if typeof(opt)=="cste" then
     if opt.value=="on" then
       tree.name="set";
-      tree.rhs=Rhs(ax,"grid",on);
+      tree.rhs=Rhs_tlist(ax,"grid",on);
     elseif opt.value=="off" then
       tree.name="set";
-      tree.rhs=Rhs(ax,"grid",off);
+      tree.rhs=Rhs_tlist(ax,"grid",off);
     else
       set_infos(gettext("No minor grid in Scilab."),2);
       tree.name="mtlb_grid";
index 52c1ac8..941b2ba 100644 (file)
@@ -22,14 +22,14 @@ if rhs==1 then
   end
   
   n=gettempvar()
-  insert(Equal(list(n),Funcall("size",1,Rhs(c,"*"),list())));
+  insert(Equal(list(n),Funcall("size",1,Rhs_tlist(c,"*"),list())));
   
   if is_a_scalar(tree.rhs(1)) then
     v=c
   else
     // v=[matrix(c,1,-1),zeros(1,n)]
-    matrix_funcall=Funcall("matrix",1,Rhs(c,1,-1),list())
-    zeros_funcall=Funcall("zeros",1,Rhs(1,n),list())
+    matrix_funcall=Funcall("matrix",1,Rhs_tlist(c,1,-1),list())
+    zeros_funcall=Funcall("zeros",1,Rhs_tlist(1,n),list())
     v=Operation("rc",list(matrix_funcall,zeros_funcall),list())
   end
 
@@ -46,7 +46,7 @@ if rhs==1 then
   tree.lhs(1).dims=list(dim,dim)
   tree.lhs(1).type=tree.rhs(1).type
 
-  tree.rhs=Rhs(n,n,v);
+  tree.rhs=Rhs_tlist(n,n,v);
 // H = hankel(c,r)
 else
   // %c_hank and %b_hank are not defined
@@ -73,15 +73,15 @@ else
 
   m=gettempvar();
   n=gettempvar();
-  insert(Equal(list(m),Funcall("size",1,Rhs(c,"*"),list())));
-  insert(Equal(list(n),Funcall("size",1,Rhs(r,"*"),list())));
+  insert(Equal(list(m),Funcall("size",1,Rhs_tlist(c,"*"),list())));
+  insert(Equal(list(n),Funcall("size",1,Rhs_tlist(r,"*"),list())));
   
   
   // v=[matrix(c,1,-1),matrix(r(2:$),1,-1)]
-  cmatrix_funcall=Funcall("matrix",1,Rhs(c,1,-1),list())
+  cmatrix_funcall=Funcall("matrix",1,Rhs_tlist(c,1,-1),list())
   imp=Operation(":",list(Cste(2),Cste("$")),list())
   ext=Operation("ext",list(r,imp),list())
-  rmatrix_funcall=Funcall("matrix",1,Rhs(ext,1,-1),list())
+  rmatrix_funcall=Funcall("matrix",1,Rhs_tlist(ext,1,-1),list())
   v=Operation("rc",list(cmatrix_funcall,rmatrix_funcall),list())
 
   dim1=1
@@ -106,6 +106,6 @@ else
   tree.lhs(1).dims=list(dim1,dim2)
   tree.lhs(1).type=tree.rhs(1).type
   
-  tree.rhs=Rhs(m,n,v);
+  tree.rhs=Rhs_tlist(m,n,v);
 end
 endfunction
index 8ce1730..b78cea8 100644 (file)
@@ -14,7 +14,7 @@ else
   if k<>[] & min(k)<>2 then // help toolbox/
     no_equiv(expression2code(tree));
   elseif topic.value=="syntax" then
-    tree.rhs=Rhs("names")
+    tree.rhs=Rhs_tlist("names")
   else
     // Nothing to do
   end
index d16222e..4534b55 100644 (file)
@@ -8,7 +8,7 @@ function [tree]=sci_hess(tree)
 
 A = getrhs(tree)
 A = convert2double(A)
-tree.rhs=Rhs(A)
+tree.rhs=Rhs_tlist(A)
 
 // H = hess(A)
 if lhs==1 then
index 4166819..99f9aaa 100644 (file)
@@ -16,12 +16,12 @@ else
       // set(gca(),'auto_clear','off')
       gca_funcall=Funcall("gca",1,list(),list())
       tree.name="set"
-      tree.rhs=Rhs(gca_funcall,Cste("auto_clear"),Cste("off"))
+      tree.rhs=Rhs_tlist(gca_funcall,Cste("auto_clear"),Cste("off"))
     elseif opt.value=="off" then
       // set(gca(),'auto_clear','on')
       gca_funcall=Funcall("gca",1,list(),list())
       tree.name="set"
-      tree.rhs=Rhs(gca_funcall,Cste("auto_clear"),Cste("on"))
+      tree.rhs=Rhs_tlist(gca_funcall,Cste("auto_clear"),Cste("on"))
     else
       no_equivalent(msprintf(gettext("%s option."),opt.value))
     end
index e3f3cb4..4639d65 100644 (file)
@@ -14,24 +14,24 @@ if rhs==1 then
   X = getrhs(tree)
   // %c_ifft and %b_ifft are not defined
   X = convert2double(X)
-  tree.rhs=Rhs(X,1)
+  tree.rhs=Rhs_tlist(X,1)
   
   if size(X.dims)==2 then
     if is_a_scalar(X) | is_a_vector(X) then
-      tree.rhs=Rhs(X,1)
+      tree.rhs=Rhs_tlist(X,1)
     elseif not_a_vector(X) then
       if X.dims(2)<>Unknown then
-       tree.rhs=Rhs(X,1,X.dims(1),1)
+       tree.rhs=Rhs_tlist(X,1,X.dims(1),1)
       else
        tmp=Funcall("size",1,list(X,1),list())
-       tree.rhs=Rhs(X,1,tmp,1)
+       tree.rhs=Rhs_tlist(X,1,tmp,1)
       end
     else
       tree.name="mtlb_ifft"
-      tree.rhs=Rhs(X)
+      tree.rhs=Rhs_tlist(X)
     end
   else
-    tree.rhs=Rhs(X,1,Funcall("firstnonsingleton",1,list(X,"num"),list()),1)
+    tree.rhs=Rhs_tlist(X,1,Funcall("firstnonsingleton",1,list(X,"num"),list()),1)
   end
   tree.lhs(1).dims=X.dims
   tree.lhs(1).type=Type(Double,Unknown)
@@ -41,7 +41,7 @@ elseif rhs==2 then
   [X,n] = getrhs(tree)
   X = convert2double(X)
   n = convert2double(n)
-  tree.rhs=Rhs(X,n)
+  tree.rhs=Rhs_tlist(X,n)
   
   tree.name="mtlb_ifft"
   
@@ -58,7 +58,7 @@ elseif rhs==3 then
   X = convert2double(X)
   n = convert2double(n)
   dim = convert2double(dim)
-  tree.rhs=Rhs(X,n,dim)
+  tree.rhs=Rhs_tlist(X,n,dim)
   
   tree.name="mtlb_ifft"
   
index 89f8dad..030409e 100644 (file)
@@ -9,7 +9,7 @@ function [tree]=sci_imag(tree)
 
 A=getrhs(tree)
 A=convert2double(A)
-tree.rhs=Rhs(A)
+tree.rhs=Rhs_tlist(A)
 
 tree.lhs(1).dims=A.dims
 tree.lhs(1).type=Type(Double,Real)
index f9eb5ee..a67e183 100644 (file)
@@ -20,7 +20,7 @@ end
 
 x = convert2double(x)
 
-tree.rhs=Rhs(x)
+tree.rhs=Rhs_tlist(x)
 
 if is_complex(x) then
   set_infos(msprintf(gettext("Scilab %s() does not work with Complex values: %s() call IGNORED."),"int16","int16"),2);
index 71b4d98..bb33fd5 100644 (file)
@@ -20,7 +20,7 @@ end
 
 x = convert2double(x)
 
-tree.rhs=Rhs(x)
+tree.rhs=Rhs_tlist(x)
 
 if is_complex(x) then
   set_infos(msprintf(gettext("Scilab %s() does not work with Complex values: %s() call IGNORED."),"int32","int32"),2);
index 8ae0247..8a5cd48 100644 (file)
@@ -20,7 +20,7 @@ end
 
 x = convert2double(x)
 
-tree.rhs=Rhs(x)
+tree.rhs=Rhs_tlist(x)
 
 if is_complex(x) then
   set_infos(msprintf(gettext("Scilab %s() does not work with Complex values: %s() call IGNORED."),"int8","int8"),2);
index 03b8c39..e73a787 100644 (file)
@@ -11,7 +11,7 @@ tree.name="inv"
 
 A=getrhs(tree)
 A=convert2double(A)
-tree.rhs=Rhs(A)
+tree.rhs=Rhs_tlist(A)
 
 tree.lhs(1).dims=A.dims
 tree.lhs(1).type=A.type
index f1b23ff..9c514b7 100644 (file)
@@ -10,8 +10,8 @@ function [tree]=sci_isa(tree)
 
 if typeof(class)=="cste" then
   
-  typetree=Funcall("type",1,Rhs(OBJ),list())
-  typeoftree=Funcall("typeof",1,Rhs(OBJ),list())
+  typetree=Funcall("type",1,Rhs_tlist(OBJ),list())
+  typeoftree=Funcall("typeof",1,Rhs_tlist(OBJ),list())
   
   select class.value
   case "logical"
index 4dc3282..ab79bcf 100644 (file)
@@ -7,7 +7,7 @@ function [tree]=sci_iscell(tree)
 // V.C.
 
 A = getrhs(tree)
-A=Funcall("typeof",1,Rhs(A),list())
+A=Funcall("typeof",1,Rhs_tlist(A),list())
 tree=Operation("==",list(A,Cste("ce")),tree.lhs)
 
 tree.out(1).dims=list(1,1)
index 402952a..bd38941 100644 (file)
@@ -7,7 +7,7 @@ function [tree]=sci_ischar(tree)
 // V.C.
 
 A = getrhs(tree)
-A=Funcall("type",1,Rhs(A),list())
+A=Funcall("type",1,Rhs_tlist(A),list())
 tree=Operation("==",list(A,Cste(10)),tree.lhs)
 
 tree.out(1).dims=list(1,1)
index 6c20f75..6298b4a 100644 (file)
@@ -17,13 +17,13 @@ elseif st.vtype==Unknown then
 else
   // allf=getfield(1,st);tf=or(allf(3:$)==f);
   allf=gettempvar()
-  insert(Equal(list(allf),Funcall("getfield",1,Rhs(1,st),list())))
+  insert(Equal(list(allf),Funcall("getfield",1,Rhs_tlist(1,st),list())))
   
   imp=Operation(":",list(Cste(3),Cste("$")),list())
   ext=Operation("ext",list(allf,imp),list())
   eq=Operation("==",list(ext,f),list())
   
-  tree=Funcall("or",1,Rhs(eq),tree.lhs)
+  tree=Funcall("or",1,Rhs_tlist(eq),tree.lhs)
   tree.lhs(1).dims=list(1,1)
   tree.lhs(1).type=Type(Boolean,Real)  
 end
index 8950e0a..c53f293 100644 (file)
@@ -9,7 +9,7 @@ function [tree]=sci_isfinite(tree)
 // %c_isfinite and %b_isfinite are not defined in Scilab
 A = getrhs(tree)
 A = convert2double(A)
-tree.rhs=Rhs(A)
+tree.rhs=Rhs_tlist(A)
 
 tree=Funcall("abs",1,list(A),tree.lhs)
 tree=Operation("<",list(tree,Cste(%inf)),tree.lhs)
index d2c08a6..e89b35c 100644 (file)
@@ -7,7 +7,7 @@ function [tree]=sci_ishandle(tree)
 // V.C.
 
 A = getrhs(tree)
-A=Funcall("type",1,Rhs(A),list())
+A=Funcall("type",1,Rhs_tlist(A),list())
 tree=Operation("==",list(A,Cste(9)),tree.lhs)
 
 tree.out(1).dims=list(1,1)
index a0c2efe..abe2602 100644 (file)
@@ -7,7 +7,7 @@ function [tree]=sci_ishold(tree)
 // V.C.
 
 gca_funcall=Funcall("gca",1,list(),list())
-get_funcall=Funcall("get",1,Rhs(gca_funcall,"auto_clear"),list())
+get_funcall=Funcall("get",1,Rhs_tlist(gca_funcall,"auto_clear"),list())
 tree=Operation("==",list(get_funcall,Cste("off")),tree.lhs)
 
 tree.out(1).dims=list(1,1)
index 354d811..a5b9d47 100644 (file)
@@ -9,7 +9,7 @@ function [tree]=sci_isinf(tree)
 // %c_isinf and %b_isinf are not defined in Scilab
 A = getrhs(tree)
 A = convert2double(A)
-tree.rhs=Rhs(A)
+tree.rhs=Rhs_tlist(A)
 
 tree.lhs(1).dims=A.dims
 tree.lhs(1).type=Type(Boolean,Real)
index 42d08b7..b743175 100644 (file)
@@ -7,7 +7,7 @@ function [tree]=sci_isinteger(tree)
 // V.C.
 
 A = getrhs(tree)
-A=Funcall("type",1,Rhs(A),list())
+A=Funcall("type",1,Rhs_tlist(A),list())
 tree=Operation("==",list(A,Cste(8)),tree.lhs)
 
 tree.out(1).dims=list(1,1)
index b85193b..a0750fa 100644 (file)
@@ -7,7 +7,7 @@ function [tree]=sci_islogical(tree)
 // V.C.
 
 A = getrhs(tree)
-A=Funcall("type",1,Rhs(A),list())
+A=Funcall("type",1,Rhs_tlist(A),list())
 mat=Operation("rc",list(Cste(4),Cste(6)),list())
 tree=Operation("==",list(A,mat),tree.lhs)
 tree=Funcall("or",1,list(tree),tree.out)
index 6161efe..192774e 100644 (file)
@@ -9,7 +9,7 @@ function [tree]=sci_isnan(tree)
 // %c_isnan and %b_isnan are not defined in Scilab
 A = getrhs(tree)
 A = convert2double(A)
-tree.rhs=Rhs(A)
+tree.rhs=Rhs_tlist(A)
 
 tree.lhs(1).dims=A.dims
 tree.lhs(1).type=Type(Boolean,Real)
index 22f38b8..82aa806 100644 (file)
@@ -11,7 +11,7 @@ rc15=Operation("rc",list(Cste(1),Cste(5)),list())
 rc158=Operation("rc",list(rc15,Cste(8)),list())
 type_funcall=Funcall("type",1,list(tree.rhs(1)),list())
 eq=Operation("==",list(type_funcall,rc158),list())
-tree=Funcall("or",1,Rhs(eq),tree.lhs)
+tree=Funcall("or",1,Rhs_tlist(eq),tree.lhs)
 
 tree.lhs(1).dims=list(1,1)
 tree.lhs(1).type=Type(Boolean,Real)
index 660b041..fdb7159 100644 (file)
@@ -9,10 +9,10 @@ function [tree]=sci_isreal(tree)
 // %c_isreal and %b_isreal are not defined in Scilab
 A = getrhs(tree)
 A = convert2double(A)
-tree.rhs=Rhs(A)
+tree.rhs=Rhs_tlist(A)
 
 // eps set to 0
-tree.rhs=Rhs(A,0)
+tree.rhs=Rhs_tlist(A,0)
 
 tree.lhs(1).dims=list(1,1)
 tree.lhs(1).type=Type(Boolean,Real)
index b167dbf..464199b 100644 (file)
@@ -7,7 +7,7 @@ function [tree]=sci_isscalar(tree)
 // V.C.
 
 lgth_funcall=Funcall("length",1,tree.rhs,list())
-sum_funcall=Funcall("sum",1,Rhs(lgth_funcall),list())
+sum_funcall=Funcall("sum",1,Rhs_tlist(lgth_funcall),list())
 tree=Operation("==",list(sum_funcall,Cste(1)),tree.lhs)
 
 tree.out(1).dims=list(1,1)
index 7139242..17d8266 100644 (file)
@@ -10,7 +10,7 @@ function [tree]=sci_isspace(tree)
 A = getrhs(tree)
 
 if A.vtype==String then
-  A = Funcall("asciimat",1,Rhs(A),list(Variable("",A.infer)))
+  A = Funcall("asciimat",1,Rhs_tlist(A),list(Variable("",A.infer)))
   tree = Operation("==",list(A,Cste(32)),tree.lhs)
   tree.out(1).dims=A.dims
   tree.out(1).type=Type(Boolean,Real)
index 873aeb8..c9849f4 100644 (file)
@@ -7,7 +7,7 @@ function [tree]=sci_issparse(tree)
 // V.C.
 
 A = getrhs(tree)
-A=Funcall("type",1,Rhs(A),list())
+A=Funcall("type",1,Rhs_tlist(A),list())
 mat=Operation("rc",list(Cste(5),Cste(6)),list())
 tree=Operation("==",list(A,mat),tree.lhs)
 tree=Funcall("or",1,list(tree),tree.out)
index b6e9fa6..79a68f2 100644 (file)
@@ -7,7 +7,7 @@ function [tree]=sci_isstr(tree)
 // V.C.
 
 A = getrhs(tree)
-A=Funcall("type",1,Rhs(A),list())
+A=Funcall("type",1,Rhs_tlist(A),list())
 tree=Operation("==",list(A,Cste(10)),tree.lhs)
 
 tree.out(1).dims=list(1,1)
index e97863b..44d9259 100644 (file)
@@ -7,7 +7,7 @@ function [tree]=sci_isstruct(tree)
 // V.C.
 
 A = getrhs(tree)
-A=Funcall("typeof",1,Rhs(A),list())
+A=Funcall("typeof",1,Rhs_tlist(A),list())
 tree=Operation("==",list(A,Cste("st")),tree.lhs)
 
 tree.out(1).dims=list(1,1)
index 0625aed..118360c 100644 (file)
@@ -10,8 +10,8 @@ if or(tree.rhs(1).vtype==[String,Unknown]) then
   tree.rhs(1)=convert2double(tree.rhs(1))
 end
 
-rowsize=Funcall("size",1,Rhs(tree.rhs(1),1),list())
-colsize=Funcall("size",1,Rhs(tree.rhs(1),2),list())
+rowsize=Funcall("size",1,Rhs_tlist(tree.rhs(1),1),list())
+colsize=Funcall("size",1,Rhs_tlist(tree.rhs(1),2),list())
 
 rowsizeeq=Operation("==",list(rowsize,Cste(1)),list())
 colsizeeq=Operation("==",list(colsize,Cste(1)),list())
index 56324cc..d32fa06 100644 (file)
@@ -14,10 +14,10 @@ if or(X.vtype==[String,Unknown]) then
 end
 
 if is_a_vector(X) then
-  tree=Funcall("size",1,Rhs(X,"*"),tree.lhs)
+  tree=Funcall("size",1,Rhs_tlist(X,"*"),tree.lhs)
 else
   tree.name="size"
-  tree=Funcall("max",1,Rhs(tree),tree.lhs)
+  tree=Funcall("max",1,Rhs_tlist(tree),tree.lhs)
 end
 tree.lhs(1).dims=list(1,1)
 tree.lhs(1).type=Type(Double,Real)
index dd6c9ab..ade86d6 100644 (file)
@@ -24,12 +24,12 @@ end
 
 // y = linspace(A,B)
 if rhs==2 then
-  tree.rhs=Rhs(A,B)
+  tree.rhs=Rhs_tlist(A,B)
   tree.lhs(1).dims=list(1,100);
 else
 // y = linspace(A,B,n)
   n=tree.rhs(3)
-  tree.rhs=Rhs(A,B,n)
+  tree.rhs=Rhs_tlist(A,B,n)
   if typeof(n)=="cste" then
     if isempty(n.value) then
       tree.lhs(1).dims=list(1,1)
index e8d9bc1..3929efe 100644 (file)
@@ -11,7 +11,7 @@ tree.name="loadmatfile"
 // If no rhs, then load all environnement
 if rhs<=0 then
   tree.name="loadmatfile"
-  tree.rhs=Rhs("scilab.mat")
+  tree.rhs=Rhs_tlist("scilab.mat")
   return
 end
 
index 3e46961..b7a1d4b 100644 (file)
@@ -11,7 +11,7 @@ tree.name="log"
 
 A=getrhs(tree)
 A=convert2double(A)
-tree.rhs=Rhs(A)
+tree.rhs=Rhs_tlist(A)
 
 tree.lhs(1).dims=A.dims
 tree.lhs(1).type=A.type
index d39390c..49d2c58 100644 (file)
@@ -11,7 +11,7 @@ tree.name="log10"
 
 A=getrhs(tree)
 A=convert2double(A)
-tree.rhs=Rhs(A)
+tree.rhs=Rhs_tlist(A)
 
 tree.lhs(1).dims=A.dims
 tree.lhs(1).type=A.type
index 48f0562..e30fd9d 100644 (file)
@@ -9,7 +9,7 @@ function [tree]=sci_log2(tree)
 // %c_log2/%c_frexp and %b_log2/%b_frexp are not defined in Scilab
 X = getrhs(tree)
 X = convert2double(X)
-tree.rhs=Rhs(X)
+tree.rhs=Rhs_tlist(X)
 
 // Y = log2(X)
 if lhs==1 then
@@ -23,7 +23,7 @@ else
     repl_poss(newX,X,X,gettext("is Real."));
     X=newX
   end
-  tree.rhs=Rhs(X)
+  tree.rhs=Rhs_tlist(X)
   tree.name="frexp"
   tree.lhs(1).dims=X.dims
   tree.lhs(1).type=Type(Double,Real)
index f0ba9e8..7478840 100644 (file)
@@ -8,7 +8,7 @@ function [tree]=sci_logm(tree)
 // F.B
 
 A=getrhs(tree)
-tree.rhs=Rhs(A)
+tree.rhs=Rhs_tlist(A)
 
 tree.lhs(1).dims=A.dims
 tree.lhs(1).type=Type(Double,Unknown)
index 1cc321b..dfb8c5f 100644 (file)
@@ -12,7 +12,7 @@ opt=part("lower",1)
 A = getrhs(tree)
 if A.vtype==String then
   tree.name="convstr"
-  tree.rhs=Rhs(A,opt)
+  tree.rhs=Rhs_tlist(A,opt)
   tree.lhs(1).dims=A.dims
   tree.lhs(1).type=A.type
 elseif A.vtype==Unknown then
index 17f45e7..7ee54a2 100644 (file)
@@ -10,7 +10,7 @@ function [tree]=sci_lu(tree)
 if rhs==1 then
   X = getrhs(tree)
   X = convert2double(X)
-  tree.rhs=Rhs(X)
+  tree.rhs=Rhs_tlist(X)
   // Y = lu(X)
   if lhs==1 then
     if tree.lhs(1).name=="ans" then
index ddaf6b8..9edbe2b 100644 (file)
@@ -16,7 +16,7 @@ if rhs==1 then
     vtype=Unknown // If A is a scalar then Matlab return Double type value else a Boolean type value
   end
   A = convert2double(A)
-  tree.rhs = Rhs(A)
+  tree.rhs = Rhs_tlist(A)
   dim = first_non_singleton(A)
 
   if dim==-1 then
@@ -25,20 +25,20 @@ if rhs==1 then
     tmp=gettempvar()
     insert(Equal(list(tmp),A))
     // First non singleton dimension will be computed at execution
-    tree.rhs=Rhs(tmp,Funcall("firstnonsingleton",1,list(tmp),list()))
+    tree.rhs=Rhs_tlist(tmp,Funcall("firstnonsingleton",1,list(tmp),list()))
   else
     tree.lhs(1).dims=A.dims
     if dim==0 then
-      tree.rhs=Rhs(A)
+      tree.rhs=Rhs_tlist(A)
       tree.lhs(1).dims=list(1,1)
     elseif dim==1 then
-      tree.rhs=Rhs(A,"r")
+      tree.rhs=Rhs_tlist(A,"r")
       tree.lhs(1).dims(dim)=1
     elseif dim==2 then
-      tree.rhs=Rhs(A,"c")
+      tree.rhs=Rhs_tlist(A,"c")
       tree.lhs(1).dims(dim)=1
     else
-      tree.rhs=Rhs(A,dim)
+      tree.rhs=Rhs_tlist(A,dim)
       tree.lhs(1).dims(dim)=1
     end
   end
@@ -71,7 +71,7 @@ elseif rhs==2 then
   end
   A=convert2double(A)
   B=convert2double(B)
-  tree.rhs=Rhs(A,B)
+  tree.rhs=Rhs_tlist(A,B)
 
   if is_real(A) & is_real(B) then 
     if not_empty(A) & not_empty(B) then
@@ -97,7 +97,7 @@ else
     vtype=Unknown
   end
   A=convert2double(A)
-  tree.rhs=Rhs(A)
+  tree.rhs=Rhs_tlist(A)
 
   // C = max(A,[],dim) or [C,I] = max(A,[],dim)
   if or(lhs==[1,2]) then
@@ -105,11 +105,11 @@ else
       tree.lhs(1).type=Type(Double,Real)
       if typeof(dim)=="cste" then
        if dim.value==1 then
-         tree.rhs=Rhs(A,"r")
+         tree.rhs=Rhs_tlist(A,"r")
          tree.lhs(1).dims=A.dims
          tree.lhs(1).dims(1)=Unknown // 0 or 1
        elseif dim.value==2 then
-         tree.rhs=Rhs(A,"c")
+         tree.rhs=Rhs_tlist(A,"c")
          tree.lhs(1).dims=A.dims
          tree.lhs(1).dims(2)=Unknown // 0 or 1
        elseif dim.value<=size(A.dims) then
@@ -118,20 +118,20 @@ else
        else
          // Scilab max() does not work when dim  is greater than number of dims of A
          tree.name="mtlb_max"
-         tree.rhs=Rhs(A,tmp,dim)
+         tree.rhs=Rhs_tlist(A,tmp,dim)
          tree.lhs(1).dims=A.dims
        end
       else
        // If dim is 1 it can be replaced by 'r'
        // If dim is 2 it can be replaced by 'c'
        tree.name="mtlb_max"
-       tree.rhs=Rhs(A,tmp,dim)
+       tree.rhs=Rhs_tlist(A,tmp,dim)
        tree.lhs(1).dims=allunknown(A.dims)
       end
     else
       // A can be complex....
       tree.name="mtlb_max"
-      tree.rhs=Rhs(A,tmp,dim)
+      tree.rhs=Rhs_tlist(A,tmp,dim)
       tree.lhs(1).dims=allunknown(A.dims)
       tree.lhs(1).type=Type(Double,Unknown)
     end
index 5426022..d70c46c 100644 (file)
@@ -14,7 +14,7 @@ if rhs==1 then
 
   // Because %b_mean and %C_mean are not defined
   A = convert2double(A)
-  tree.rhs=Rhs(A,"m")
+  tree.rhs=Rhs_tlist(A,"m")
   
   if is_real(A) then
     tree.lhs(1).type=Type(Double,Real)
@@ -45,7 +45,7 @@ else
   // Because %b_mean and %C_mean are not defined
   A=convert2double(A)
   dim=convert2double(dim)
-  tree.rhs=Rhs(A,dim)
+  tree.rhs=Rhs_tlist(A,dim)
   
   
   if typeof(dim)=="cste" then
index 2174701..382a915 100644 (file)
@@ -13,7 +13,7 @@ if rhs==1 then
 
   // Because %b_median and %C_median are not defined
   A = convert2double(A)
-  tree.rhs=Rhs(A,"m")
+  tree.rhs=Rhs_tlist(A,"m")
   
   if is_real(A) then
     tree.lhs(1).type=Type(Double,Real)
@@ -44,7 +44,7 @@ else
   // Because %b_median and %C_median are not defined
   A=convert2double(A)
   dim=convert2double(dim)
-  tree.rhs=Rhs(A,dim)
+  tree.rhs=Rhs_tlist(A,dim)
   
   if typeof(dim)=="cste" then
     if dim.value>size(A.dims) then
index d34c367..14a3ceb 100644 (file)
@@ -9,12 +9,12 @@ function [tree]=sci_meshgrid(tree)
 if rhs==1
   A=getrhs(tree);
   A=convert2double(A);
-  tree.rhs=Rhs(A);
+  tree.rhs=Rhs_tlist(A);
 elseif rhs==2
   [A,B]=getrhs(tree);
   A=convert2double(A);
   B=convert2double(B);
-  tree.rhs=Rhs(A,B);
+  tree.rhs=Rhs_tlist(A,B);
 end
 
 if lhs==1
index b63e75d..c0e30d5 100644 (file)
@@ -16,7 +16,7 @@ if rhs==1 then
     vtype=Unknown // If A is a scalar then Matlab return Double type value else a Boolean type value
   end
   A = convert2double(A)
-  tree.rhs = Rhs(A)
+  tree.rhs = Rhs_tlist(A)
   dim = first_non_singleton(A)
 
   if dim==-1 then
@@ -25,20 +25,20 @@ if rhs==1 then
     tmp=gettempvar()
     insert(Equal(list(tmp),A))
     // First non singleton dimension will be computed at execution
-    tree.rhs=Rhs(tmp,Funcall("firstnonsingleton",1,list(tmp),list()))
+    tree.rhs=Rhs_tlist(tmp,Funcall("firstnonsingleton",1,list(tmp),list()))
   else
     tree.lhs(1).dims=A.dims
     if dim==0 then
-      tree.rhs=Rhs(A)
+      tree.rhs=Rhs_tlist(A)
       tree.lhs(1).dims=list(1,1)
     elseif dim==1 then
-      tree.rhs=Rhs(A,"r")
+      tree.rhs=Rhs_tlist(A,"r")
       tree.lhs(1).dims(dim)=1
     elseif dim==2 then
-      tree.rhs=Rhs(A,"c")
+      tree.rhs=Rhs_tlist(A,"c")
       tree.lhs(1).dims(dim)=1
     else
-      tree.rhs=Rhs(A,dim)
+      tree.rhs=Rhs_tlist(A,dim)
       tree.lhs(1).dims(dim)=1
     end
   end
@@ -71,7 +71,7 @@ elseif rhs==2 then
   end
   A=convert2double(A)
   B=convert2double(B)
-  tree.rhs=Rhs(A,B)
+  tree.rhs=Rhs_tlist(A,B)
 
   if is_real(A) & is_real(B) then 
     if not_empty(A) & not_empty(B) then
@@ -97,7 +97,7 @@ else
     vtype=Unknown
   end
   A=convert2double(A)
-  tree.rhs=Rhs(A)
+  tree.rhs=Rhs_tlist(A)
 
   // C = min(A,[],dim) or [C,I] = min(A,[],dim)
   if or(lhs==[1,2]) then
@@ -105,11 +105,11 @@ else
       tree.lhs(1).type=Type(Double,Real)
       if typeof(dim)=="cste" then
        if dim.value==1 then
-         tree.rhs=Rhs(A,"r")
+         tree.rhs=Rhs_tlist(A,"r")
          tree.lhs(1).dims=A.dims
          tree.lhs(1).dims(1)=Unknown // 0 or 1
        elseif dim.value==2 then
-         tree.rhs=Rhs(A,"c")
+         tree.rhs=Rhs_tlist(A,"c")
          tree.lhs(1).dims=A.dims
          tree.lhs(1).dims(2)=Unknown // 0 or 1
        elseif dim.value<=size(A.dims) then
@@ -118,20 +118,20 @@ else
        else
          // Scilab min() does not work when dim  is greater than number of dims of A
          tree.name="mtlb_min"
-         tree.rhs=Rhs(A,tmp,dim)
+         tree.rhs=Rhs_tlist(A,tmp,dim)
          tree.lhs(1).dims=A.dims
        end
       else
        // If dim is 1 it can be replaced by 'r'
        // If dim is 2 it can be replaced by 'c'
        tree.name="mtlb_min"
-       tree.rhs=Rhs(A,tmp,dim)
+       tree.rhs=Rhs_tlist(A,tmp,dim)
        tree.lhs(1).dims=allunknown(A.dims)
       end
     else
       // A can be complex....
       tree.name="mtlb_min"
-      tree.rhs=Rhs(A,tmp,dim)
+      tree.rhs=Rhs_tlist(A,tmp,dim)
       tree.lhs(1).dims=allunknown(A.dims)
       tree.lhs(1).type=Type(Double,Unknown)
     end
index 52af882..9b14fea 100644 (file)
@@ -10,7 +10,7 @@ function [tree]=sci_mod(tree)
 [X,Y] = getrhs(tree)
 X = convert2double(X)
 Y = convert2double(Y)
-tree.rhs=Rhs(X,Y)
+tree.rhs=Rhs_tlist(X,Y)
 
 tree.name="pmodulo"
 
index 8ae373d..6030044 100644 (file)
@@ -11,9 +11,9 @@ opt=getrhs(tree)
 tree.name="lines"
 if typeof(opt)=="cste" then
   if opt.value=="off" then
-    tree.rhs=Rhs(0)
+    tree.rhs=Rhs_tlist(0)
   elseif opt.value=="on" then
-    tree.rhs=Rhs(60)
+    tree.rhs=Rhs_tlist(60)
   else
     // Nothing to do
   end
index b8889e0..148e012 100644 (file)
@@ -20,9 +20,9 @@ else // Number of arguments of M-file
   end
   set_infos(msprintf(gettext("%s considered to be a Scilab macro."),rhs2code(tree.rhs)),2);
   evstrtree=Funcall("evstr",1,tree.rhs,list())
-  macrovartree=Funcall("macrovar",1,Rhs(evstrtree),list())
-  getfieldtree=Funcall("getfield",1,Rhs(fieldnb,macrovartree),list())
-  tree=Funcall("size",1,Rhs(getfieldtree,"*"),tree.lhs)
+  macrovartree=Funcall("macrovar",1,Rhs_tlist(evstrtree),list())
+  getfieldtree=Funcall("getfield",1,Rhs_tlist(fieldnb,macrovartree),list())
+  tree=Funcall("size",1,Rhs_tlist(getfieldtree,"*"),tree.lhs)
   tree.lhs(1).dims=list(1,1)
   tree.lhs(1).type=Type(Double,Real)
 end
index df025b0..8350fea 100644 (file)
@@ -20,9 +20,9 @@ else // Number of arguments of M-file
   end
   set_infos(msprintf(gettext("%s considered to be a Scilab macro."),rhs2code(tree.rhs)),2);
   evstrtree=Funcall("evstr",1,tree.rhs,list())
-  macrovartree=Funcall("macrovar",1,Rhs(evstrtree),list())
-  getfieldtree=Funcall("getfield",1,Rhs(fieldnb,macrovartree),list())
-  tree=Funcall("size",1,Rhs(getfieldtree,"*"),tree.lhs)
+  macrovartree=Funcall("macrovar",1,Rhs_tlist(evstrtree),list())
+  getfieldtree=Funcall("getfield",1,Rhs_tlist(fieldnb,macrovartree),list())
+  tree=Funcall("size",1,Rhs_tlist(getfieldtree,"*"),tree.lhs)
   tree.lhs(1).dims=list(1,1)
   tree.lhs(1).type=Type(Double,Real)
 end
index 9a96ddf..55efa66 100644 (file)
@@ -14,7 +14,7 @@ if or(A.vtype==[String,Unknown]) then
 end
 
 tree.name="size"
-tree=Funcall("size",1,Rhs(tree,"*"),tree.lhs)
+tree=Funcall("size",1,Rhs_tlist(tree,"*"),tree.lhs)
 
 tree.lhs(1).dims=list(1,1)
 tree.lhs(1).type=Type(Double,Real)
index a67b829..888ff82 100644 (file)
@@ -11,12 +11,12 @@ function [tree]=sci_norm(tree)
 if rhs==1 then
   A = getrhs(tree)
   A = convert2double(A)
-  tree.rhs=Rhs(A)
+  tree.rhs=Rhs_tlist(A)
 // n = norm(A,p)
 else
   [A,p] = getrhs(tree)
   A = convert2double(A)
-  tree.rhs=Rhs(A,p)
+  tree.rhs=Rhs_tlist(A,p)
 end
 
 tree.lhs(1).dims=list(1,1)
index eeb5b69..a6b12bb 100644 (file)
@@ -12,7 +12,7 @@ if rhs==1 then
 else
   if tree.rhs(2).vtype==String then
     tree.name="msprintf"
-    tree.rhs=Rhs(tree.rhs(2),tree.rhs(1))
+    tree.rhs=Rhs_tlist(tree.rhs(2),tree.rhs(1))
   elseif tree.rhs(2).vtype<>Unknown then
     no_equiv(expression2code(tree))
     set_infos(gettext("See msprintf for solutions."),1);
index c2d1d41..2ffb116 100644 (file)
@@ -19,7 +19,7 @@ if rhs==-1 then
   elseif tree.name=="rand" then
     // Nothing changed
   elseif tree.name=="randn" then
-    tree.rhs=Rhs(1,1,"normal")
+    tree.rhs=Rhs_tlist(1,1,"normal")
     tree.lhs(1).dims=list(1,1)
     tree.lhs(1).type=Type(Double,Real)
   elseif tree.name=="false" then
@@ -38,7 +38,7 @@ if rhs==0 then
   elseif tree.name=="rand" then
     // Nothing changed
   elseif tree.name=="randn" then
-    tree.rhs=Rhs(1,1,"normal")
+    tree.rhs=Rhs_tlist(1,1,"normal")
     tree.lhs(1).dims=list(1,1)
     tree.lhs(1).type=Type(Double,Real)
   elseif tree.name=="false" then
@@ -54,20 +54,20 @@ if tree.name=="randn" |tree.name=="rand" then
   if tree.rhs(1).vtype==String then // State
     if rhs==1 then // Get the state
       if tree.name=="rand" then
-       onescall=Funcall("ones",1,Rhs(35,1),list())
-       randcall=Funcall("rand",1,Rhs("seed"),list())
+       onescall=Funcall("ones",1,Rhs_tlist(35,1),list())
+       randcall=Funcall("rand",1,Rhs_tlist("seed"),list())
        tree=Operation("*",list(onescall,randcall),tree.lhs)
        tree.out(1).dims=list(35,1)
        tree.out(1).type=Type(Double,Real)
       else
-       onescall=Funcall("ones",1,Rhs(2,1),list())
-       randcall=Funcall("rand",1,Rhs("seed"),list())
+       onescall=Funcall("ones",1,Rhs_tlist(2,1),list())
+       randcall=Funcall("rand",1,Rhs_tlist("seed"),list())
        tree=Operation("*",list(onescall,randcall),tree.lhs)
        tree.out(1).dims=list(2,1)
        tree.out(1).type=Type(Double,Real)
       end
     else // Set the state
-      tree=Funcall("rand",1,Rhs("seed",tree.rhs(2)),tree.lhs)
+      tree=Funcall("rand",1,Rhs_tlist("seed",tree.rhs(2)),tree.lhs)
       tree.lhs(1).dims=list(0,0)
       tree.lhs(1).type=Type(Unknown,Unknown)
     end
@@ -95,7 +95,7 @@ if rhs==1 then
       dim=Unknown
     end
     
-    tree=Funcall("ones",1,Rhs(n,n,opt),tree.lhs)
+    tree=Funcall("ones",1,Rhs_tlist(n,n,opt),tree.lhs)
     tree.lhs(1).dims=list(dim,dim)
     tree.lhs(1).type=Type(Double,Real)
   // ones([n1,n2,...])
index 2d5a41a..a83fc97 100644 (file)
@@ -13,7 +13,7 @@ else
   if n.vtype==String then // pause on/off
     no_equiv(expression2code(tree));
   else
-    tree.rhs=Rhs(Operation("*",list(Cste(1000),n),list()))
+    tree.rhs=Rhs_tlist(Operation("*",list(Cste(1000),n),list()))
     tree.name="xpause"
   end
 end
index 838b4a7..98e5d85 100644 (file)
@@ -7,7 +7,7 @@ function [tree]=sci_perms(tree)
 // F.Belahcene.
 
 A=getrhs(tree)
-tree.rhs=Rhs(A)
+tree.rhs=Rhs_tlist(A)
 
 if (type(tree.rhs(1).dims(1))==1 & tree.rhs(1).dims(1)==1) & (type(tree.rhs(1).dims(2))==1 & tree.rhs(1).dims(2)<>-1) then
        tree.lhs(1).dims(1)=prod(1:tree.rhs(1).dims(2))
index 609ca29..9f276b8 100644 (file)
@@ -14,7 +14,7 @@ if rhs==1 then
 
   // Because %b_prod and %C_prod are not defined
   A = convert2double(A)
-  tree.rhs=Rhs(A)
+  tree.rhs=Rhs_tlist(A)
   
   if is_real(A) then
     tree.lhs(1).type=Type(Double,Real)
@@ -26,15 +26,15 @@ if rhs==1 then
     tree.lhs(1).dims=list(1,1)
   elseif not_a_vector(A) then
     tree.lhs(1).dims=list(1,A.dims(2))
-    tree.rhs=Rhs(A,1)
+    tree.rhs=Rhs_tlist(A,1)
   elseif not_empty(A) then
     dim = first_non_singleton(A)
     if dim>0 then
-      tree.rhs=Rhs(A,dim)
+      tree.rhs=Rhs_tlist(A,dim)
       tree.lhs(1).dims=A.dims
       tree.lhs(1).dims(dim)=1
     else
-      tree.rhs=Rhs(A,Funcall("firstnonsingleton",1,list(A),list()))
+      tree.rhs=Rhs_tlist(A,Funcall("firstnonsingleton",1,list(A),list()))
       tree.lhs(1).dims=allunknown(A.dims)
     end
   else
@@ -49,7 +49,7 @@ else
   // Because %b_prod and %C_prod are not defined
   A=convert2double(A)
   dim=convert2double(dim)
-  tree.rhs=Rhs(A,dim)
+  tree.rhs=Rhs_tlist(A,dim)
   
   
   if typeof(dim)=="cste" then
index a06ac89..9a190a6 100644 (file)
@@ -11,7 +11,7 @@ function [tree]=sci_qr(tree)
 if rhs==1 then
   A = getrhs(tree)
   A = convert2double(A)
-  tree.rhs=Rhs(A)
+  tree.rhs=Rhs_tlist(A)
   if is_real(A) then
     prop=Real
   else
@@ -43,7 +43,7 @@ if rhs==1 then
 else
   [A,B] = getrhs(tree)
   A = convert2double(A)
-  tree.rhs=Rhs(A,B)
+  tree.rhs=Rhs_tlist(A,B)
   if is_real(A) then
     prop=Real
   else
@@ -58,7 +58,7 @@ else
     end
   // [Q,R] = qr(A,0)
   elseif lhs==2 then
-    tree.rhs=Rhs(A,"e")
+    tree.rhs=Rhs_tlist(A,"e")
     tree.lhs(1).dims=list(Unknown,Unknown)
     tree.lhs(1).type=A.type
     tree.lhs(2).dims=list(Unknown,Unknown)
index 503c8f4..642038e 100644 (file)
@@ -19,7 +19,7 @@ if rhs==-1 then
   elseif tree.name=="rand" then
     // Nothing changed
   elseif tree.name=="randn" then
-    tree.rhs=Rhs(1,1,"normal")
+    tree.rhs=Rhs_tlist(1,1,"normal")
     tree.lhs(1).dims=list(1,1)
     tree.lhs(1).type=Type(Double,Real)
   elseif tree.name=="false" then
@@ -38,7 +38,7 @@ if rhs==0 then
   elseif tree.name=="rand" then
     // Nothing changed
   elseif tree.name=="randn" then
-    tree.rhs=Rhs(1,1,"normal")
+    tree.rhs=Rhs_tlist(1,1,"normal")
     tree.lhs(1).dims=list(1,1)
     tree.lhs(1).type=Type(Double,Real)
   elseif tree.name=="false" then
@@ -54,20 +54,20 @@ if tree.name=="randn" |tree.name=="rand" then
   if tree.rhs(1).vtype==String then // State
     if rhs==1 then // Get the state
       if tree.name=="rand" then
-       onescall=Funcall("ones",1,Rhs(35,1),list())
-       randcall=Funcall("rand",1,Rhs("seed"),list())
+       onescall=Funcall("ones",1,Rhs_tlist(35,1),list())
+       randcall=Funcall("rand",1,Rhs_tlist("seed"),list())
        tree=Operation("*",list(onescall,randcall),tree.lhs)
        tree.out(1).dims=list(35,1)
        tree.out(1).type=Type(Double,Real)
       else
-       onescall=Funcall("ones",1,Rhs(2,1),list())
-       randcall=Funcall("rand",1,Rhs("seed"),list())
+       onescall=Funcall("ones",1,Rhs_tlist(2,1),list())
+       randcall=Funcall("rand",1,Rhs_tlist("seed"),list())
        tree=Operation("*",list(onescall,randcall),tree.lhs)
        tree.out(1).dims=list(2,1)
        tree.out(1).type=Type(Double,Real)
       end
     else // Set the state
-      tree=Funcall("rand",1,Rhs("seed",tree.rhs(2)),tree.lhs)
+      tree=Funcall("rand",1,Rhs_tlist("seed",tree.rhs(2)),tree.lhs)
       tree.lhs(1).dims=list(0,0)
       tree.lhs(1).type=Type(Unknown,Unknown)
     end
@@ -95,7 +95,7 @@ if rhs==1 then
       dim=Unknown
     end
     
-    tree=Funcall("rand",1,Rhs(n,n,opt),tree.lhs)
+    tree=Funcall("rand",1,Rhs_tlist(n,n,opt),tree.lhs)
     tree.lhs(1).dims=list(dim,dim)
     tree.lhs(1).type=Type(Double,Real)
   // rand([n1,n2,...])
index 80f8a2d..4d346c3 100644 (file)
@@ -19,7 +19,7 @@ if rhs==-1 then
   elseif tree.name=="rand" then
     // Nothing changed
   elseif tree.name=="randn" then
-    tree.rhs=Rhs(1,1,"normal")
+    tree.rhs=Rhs_tlist(1,1,"normal")
     tree.lhs(1).dims=list(1,1)
     tree.lhs(1).type=Type(Double,Real)
   elseif tree.name=="false" then
@@ -38,7 +38,7 @@ if rhs==0 then
   elseif tree.name=="rand" then
     // Nothing changed
   elseif tree.name=="randn" then
-    tree.rhs=Rhs(1,1,"normal")
+    tree.rhs=Rhs_tlist(1,1,"normal")
     tree.lhs(1).dims=list(1,1)
     tree.lhs(1).type=Type(Double,Real)
   elseif tree.name=="false" then
@@ -54,20 +54,20 @@ if tree.name=="randn" |tree.name=="rand" then
   if tree.rhs(1).vtype==String then // State
     if rhs==1 then // Get the state
       if tree.name=="rand" then
-       onescall=Funcall("ones",1,Rhs(35,1),list())
-       randcall=Funcall("rand",1,Rhs("seed"),list())
+       onescall=Funcall("ones",1,Rhs_tlist(35,1),list())
+       randcall=Funcall("rand",1,Rhs_tlist("seed"),list())
        tree=Operation("*",list(onescall,randcall),tree.lhs)
        tree.out(1).dims=list(35,1)
        tree.out(1).type=Type(Double,Real)
       else
-       onescall=Funcall("ones",1,Rhs(2,1),list())
-       randcall=Funcall("rand",1,Rhs("seed"),list())
+       onescall=Funcall("ones",1,Rhs_tlist(2,1),list())
+       randcall=Funcall("rand",1,Rhs_tlist("seed"),list())
        tree=Operation("*",list(onescall,randcall),tree.lhs)
        tree.out(1).dims=list(2,1)
        tree.out(1).type=Type(Double,Real)
       end
     else // Set the state
-      tree=Funcall("rand",1,Rhs("seed",tree.rhs(2)),tree.lhs)
+      tree=Funcall("rand",1,Rhs_tlist("seed",tree.rhs(2)),tree.lhs)
       tree.lhs(1).dims=list(0,0)
       tree.lhs(1).type=Type(Unknown,Unknown)
     end
@@ -95,7 +95,7 @@ if rhs==1 then
       dim=Unknown
     end
     
-    tree=Funcall("rand",1,Rhs(n,n,opt),tree.lhs)
+    tree=Funcall("rand",1,Rhs_tlist(n,n,opt),tree.lhs)
     tree.lhs(1).dims=list(dim,dim)
     tree.lhs(1).type=Type(Double,Real)
   // randn([n1,n2,...])
index 82cc954..9507916 100644 (file)
@@ -9,7 +9,7 @@ function [tree]=sci_rcond(tree)
 
 A = getrhs(tree)
 A = convert2double(A)
-tree.rhs=Rhs(A)
+tree.rhs=Rhs_tlist(A)
 
 // If A can be an empty matrix...
 if ~not_empty(A) then
index f8a714e..52b235f 100644 (file)
@@ -9,7 +9,7 @@ function [tree]=sci_real(tree)
 
 A=getrhs(tree)
 A=convert2double(A)
-tree.rhs=Rhs(A)
+tree.rhs=Rhs_tlist(A)
 
 tree.lhs(1).dims=A.dims
 tree.lhs(1).type=Type(Double,Real)
index 0e82dc9..b8b054d 100644 (file)
@@ -10,7 +10,7 @@ function [tree]=sci_rem(tree)
 [X,Y] = getrhs(tree)
 X = convert2double(X)
 Y = convert2double(Y)
-tree.rhs=Rhs(X,Y)
+tree.rhs=Rhs_tlist(X,Y)
 
 // X./Y
 drd=Operation("./",tree.rhs,list())
index af65c68..6b83461 100644 (file)
@@ -110,7 +110,7 @@ else
   elseif A.vtype==String then
     A=convert2double(A)
   end
-  tree.rhs=Rhs(m,n)
+  tree.rhs=Rhs_tlist(m,n)
   tree.name="ones";
   tree=Operation(".*.",list(tree,A),tree.lhs)
 
index d2b74ff..3f9db52 100644 (file)
@@ -9,7 +9,7 @@ function [tree]=sci_round(tree)
 
 A=getrhs(tree)
 A=convert2double(A)
-tree.rhs=Rhs(A)
+tree.rhs=Rhs_tlist(A)
 
 tree.lhs(1).dims=A.dims
 if is_real(A) then
index c1c590c..10bee56 100644 (file)
@@ -10,7 +10,7 @@ tree.name="savematfile"
 
 // If no rhs, save Scilab environnement
 if rhs<=0 then
-  tree.rhs=Rhs("scilab.mat")
+  tree.rhs=Rhs_tlist("scilab.mat")
   return
 end
 
index 4797540..5297160 100644 (file)
@@ -9,7 +9,7 @@ function [tree]=sci_schur(tree)
 A = getrhs(tree)
 // %c_schur and %b_schur are not defined
 A = convert2double(A)
-tree.rhs=Rhs(A)
+tree.rhs=Rhs_tlist(A)
 
 tree.lhs(1).dims=A.dims
 tree.lhs(1).type=A.type
index 1e7bd4a..245686e 100644 (file)
@@ -11,7 +11,7 @@ tree.name="sign"
 
 A=getrhs(tree)
 A=convert2double(A)
-tree.rhs=Rhs(A)
+tree.rhs=Rhs_tlist(A)
 
 tree.lhs(1).dims=A.dims
 tree.lhs(1).type=A.type
index 5b2306a..70295f7 100644 (file)
@@ -11,7 +11,7 @@ tree.name="sin"
 
 A=getrhs(tree)
 A=convert2double(A)
-tree.rhs=Rhs(A)
+tree.rhs=Rhs_tlist(A)
 
 tree.lhs(1).dims=A.dims
 tree.lhs(1).type=A.type
index 38f3555..6894b87 100644 (file)
@@ -11,7 +11,7 @@ tree.name="sinh"
 
 A=getrhs(tree)
 A=convert2double(A)
-tree.rhs=Rhs(A)
+tree.rhs=Rhs_tlist(A)
 
 tree.lhs(1).dims=A.dims
 tree.lhs(1).type=A.type
index 13f0cf8..8d7b3a8 100644 (file)
@@ -17,7 +17,7 @@ if rhs==2 then
   if or(X.vtype==[String,Unknown]) then
     X = convert2double(X)
   end
-  tree.rhs=Rhs(X,dim)
+  tree.rhs=Rhs_tlist(X,dim)
   
   // Matlab can work with dim > size(size(X),2) but not Scilab
   if typeof(dim)=="cste" then
@@ -40,7 +40,7 @@ else
   if or(X.vtype==[String,Unknown]) then
     X = convert2double(X)
   end
-  tree.rhs=Rhs(X)
+  tree.rhs=Rhs_tlist(X)
   
   // d1 = size(X)
   if lhs==1 then
index ca3bb88..b785262 100644 (file)
@@ -19,20 +19,20 @@ if rhs==1 then
   elseif A.vtype==Boolean then
     tree.name="gsort"
     if is_a_vector(A) then
-      A = Funcall("bool2s",1,Rhs(A),list())
-      tree.rhs=Rhs(A,"g","i")
+      A = Funcall("bool2s",1,Rhs_tlist(A),list())
+      tree.rhs=Rhs_tlist(A,"g","i")
     elseif not_a_vector(A) then
-      A = Funcall("bool2s",1,Rhs(A),list())
-      tree.rhs=Rhs(A,"r","i")
+      A = Funcall("bool2s",1,Rhs_tlist(A),list())
+      tree.rhs=Rhs_tlist(A,"r","i")
     else
       tree.name="mtlb_sort"
     end
   else
     tree.name="gsort"
     if is_a_vector(A) then
-      tree.rhs=Rhs(A,"g","i")
+      tree.rhs=Rhs_tlist(A,"g","i")
     elseif not_a_vector(A) then
-      tree.rhs=Rhs(A,"r","i")
+      tree.rhs=Rhs_tlist(A,"r","i")
     else
       tree.name="mtlb_sort"
     end
@@ -46,7 +46,7 @@ if rhs==1 then
 elseif rhs==2
   [A,dim] = getrhs(tree)
   dim = convert2double(dim)
-  tree.rhs=Rhs(A,dim)
+  tree.rhs=Rhs_tlist(A,dim)
   
   tree.lhs(1).dims=A.dims
   tree.lhs(1).type=A.type
@@ -70,10 +70,10 @@ elseif rhs==2
     if or(A.vtype==[String,Unknown]) then
       name="mtlb_sort"
     elseif A.vtype==Boolean then
-      A = Funcall("bool2s",1,Rhs(A),list())
-      tree.rhs=Rhs(A,dim,"i")
+      A = Funcall("bool2s",1,Rhs_tlist(A),list())
+      tree.rhs=Rhs_tlist(A,dim,"i")
     else
-      tree.rhs=Rhs(A,dim,"i")
+      tree.rhs=Rhs_tlist(A,dim,"i")
     end
     tree.name=name
     
@@ -85,7 +85,7 @@ elseif rhs==2
 elseif rhs==3 
   [A,dim,txt] = getrhs(tree)
   dim = convert2double(dim)
-  tree.rhs=Rhs(A,dim,txt)
+  tree.rhs=Rhs_tlist(A,dim,txt)
 
   tree.lhs(1).dims=A.dims
   tree.lhs(1).type=A.type
@@ -108,14 +108,14 @@ elseif rhs==3
     if or(A.vtype==[String,Unknown]) then
       name="mtlb_sort"
     elseif A.vtype==Boolean then
-      A = Funcall("bool2s",1,Rhs(A),list())
+      A = Funcall("bool2s",1,Rhs_tlist(A),list())
       tree.rhs(1)=A
     end
     
     if txt.vtype==String & txt.value=="ascend"
-      tree.rhs=Rhs(A,dim,"i")
+      tree.rhs=Rhs_tlist(A,dim,"i")
     elseif txt.vtype==String & txt.value=="descend"
-      tree.rhs=Rhs(A,dim,"d")
+      tree.rhs=Rhs_tlist(A,dim,"d")
     else
       name="mtlb_sort" 
     end        
index 53bba3f..573298b 100644 (file)
@@ -17,7 +17,7 @@ if rhs==1 then
   A = getrhs(tree)
   // %c_sparse and %b_sparse are not defined
   A = convert2double(A)
-  tree.rhs=Rhs(A)
+  tree.rhs=Rhs_tlist(A)
   
   tree.lhs(1).dims=A.dims
   tree.lhs(1).type=Type(Sparse,A.property)
@@ -28,7 +28,7 @@ elseif rhs==2 then
   // %c_sparse and %b_sparse are not defined
   m = convert2double(m)
   n = convert2double(n)
-  tree.rhs=Rhs([],[],Operation("rc",list(m,n),list()))
+  tree.rhs=Rhs_tlist([],[],Operation("rc",list(m,n),list()))
   
   dims=list(Unknown,Unknown)
   if typeof(m)=="cste" then
@@ -47,7 +47,7 @@ elseif rhs==3 then
   i = convert2double(i)
   j = convert2double(j)
   s = convert2double(s)
-  tree.rhs=Rhs(i,j,s)
+  tree.rhs=Rhs_tlist(i,j,s)
   
   // Matlab tolerates length(i)<>length(j)...
   if size(i.dims)<>size(j.dims) | size(i.dims)<>size(s.dims) then
@@ -55,9 +55,9 @@ elseif rhs==3 then
   end
   
   if i.dims(2)==1 & j.dims(2)==1 then
-    tree.rhs=Rhs(Operation("rc",list(i,j),list()),s)
+    tree.rhs=Rhs_tlist(Operation("rc",list(i,j),list()),s)
   elseif typeof(i)=="variable" & typeof(j)=="variable" then
-    tree.rhs=Rhs(Operation("rc",list(Operation("ext",list(i,Cste(":")),list()),Operation("ext",list(j,Cste(":")),list())),list()),s)
+    tree.rhs=Rhs_tlist(Operation("rc",list(Operation("ext",list(i,Cste(":")),list()),Operation("ext",list(j,Cste(":")),list())),list()),s)
   else
     if typeof(i)<>"variable" then
       V1=gettempvar(1)
@@ -71,7 +71,7 @@ elseif rhs==3 then
     else
       V2=j
     end
-    tree.rhs=Rhs(Operation("rc",list(Operation("ext",list(V1,Cste(":")),list()),Operation("ext",list(V2,Cste(":")),list())),list()),s)
+    tree.rhs=Rhs_tlist(Operation("rc",list(Operation("ext",list(V1,Cste(":")),list()),Operation("ext",list(V2,Cste(":")),list())),list()),s)
   end
   tree.lhs(1).dims=list(Unknown,Unknown)
   tree.lhs(1).type=Type(Sparse,s.property)
@@ -87,14 +87,14 @@ elseif rhs==5 then
   m = convert2double(m)
   n = convert2double(n)
 
-  tree.rhs=Rhs(i,j,s,m,n)
+  tree.rhs=Rhs_tlist(i,j,s,m,n)
 
   if i.dims(2)==1 & j.dims(2)=="1" then
-    tree.rhs=Rhs(Operation("rc",list(i,j),list()),s)
+    tree.rhs=Rhs_tlist(Operation("rc",list(i,j),list()),s)
   elseif typeof(i)=="variable" & typeof(j)=="variable" then
     rhs1=Operation("rc",list(Operation("ext",list(i,Cste(":")),list()),Operation("ext",list(j,Cste(":")),list())),list())
     rhs3=Operation("rc",list(m,n),list())
-    tree.rhs=Rhs(rhs1,s,rhs3)
+    tree.rhs=Rhs_tlist(rhs1,s,rhs3)
   else
     if typeof(i)<>"variable" then
       V1=gettempvar(1)
@@ -110,7 +110,7 @@ elseif rhs==5 then
     end
     rhs1=Operation("rc",list(Operation("ext",list(V1,Cste(":")),list()),Operation("ext",list(V2,Cste(":")),list())),list())
     rhs3=Operation("rc",list(m,n),list())
-    tree.rhs=Rhs(rhs1,s,rhs3)
+    tree.rhs=Rhs_tlist(rhs1,s,rhs3)
   end
   tree.lhs(1).dims=list(Unknown,Unknown)
   tree.lhs(1).type=Type(Sparse,s.property)
index 88a6bcb..72d4867 100644 (file)
@@ -11,7 +11,7 @@ tree.name="sqrt"
 
 A=getrhs(tree)
 A=convert2double(A)
-tree.rhs=Rhs(A)
+tree.rhs=Rhs_tlist(A)
 
 tree.lhs(1).dims=A.dims
 tree.lhs(1).type=A.type
index 5c972af..c98bcc6 100644 (file)
@@ -10,8 +10,8 @@ function [tree]=sci_strcmpi(tree)
 [A,B] = getrhs(tree)
 
 if A.vtype==String & B.vtype==String then
-  A = Funcall("convstr",1,Rhs(A),list())
-  B = Funcall("convstr",1,Rhs(B),list())
+  A = Funcall("convstr",1,Rhs_tlist(A),list())
+  B = Funcall("convstr",1,Rhs_tlist(B),list())
   tree = Operation("==",list(A,B),tree.lhs)
   tree.out(1).dims=list(1,1)
   tree.out(1).type=Type(Boolean,Real)
index 05effad..6417997 100644 (file)
@@ -14,7 +14,7 @@ if rhs==1 then
 
   // Because %b_sum and %C_sum are not defined
   A = convert2double(A)
-  tree.rhs=Rhs(A)
+  tree.rhs=Rhs_tlist(A)
   
   if is_real(A) then
     tree.lhs(1).type=Type(Double,Real)
@@ -26,15 +26,15 @@ if rhs==1 then
     tree.lhs(1).dims=list(1,1)
   elseif not_a_vector(A) then
     tree.lhs(1).dims=list(1,A.dims(2))
-    tree.rhs=Rhs(A,1)
+    tree.rhs=Rhs_tlist(A,1)
   elseif not_empty(A) then
     dim = first_non_singleton(A)
     if dim>0 then
-      tree.rhs=Rhs(A,dim)
+      tree.rhs=Rhs_tlist(A,dim)
       tree.lhs(1).dims=A.dims
       tree.lhs(1).dims(dim)=1
     else
-      tree.rhs=Rhs(A,Funcall("firstnonsingleton",1,list(A),list()))
+      tree.rhs=Rhs_tlist(A,Funcall("firstnonsingleton",1,list(A),list()))
       tree.lhs(1).dims=allunknown(A.dims)
     end
   else
@@ -49,7 +49,7 @@ else
   // Because %b_sum and %C_sum are not defined
   A=convert2double(A)
   dim=convert2double(dim)
-  tree.rhs=Rhs(A,dim)
+  tree.rhs=Rhs_tlist(A,dim)
   
   
   if typeof(dim)=="cste" then
index f46f9ea..0e80fcb 100644 (file)
@@ -10,12 +10,12 @@ function [tree]=sci_svd(tree)
 if rhs==1 then
   A = getrhs(tree)
   A = convert2double(A)
-  tree.rhs=Rhs(A)
+  tree.rhs=Rhs_tlist(A)
 // svd(A,0)
 else
   A = getrhs(tree)
   A = convert2double(A)
-  tree.rhs=Rhs(A,"e")
+  tree.rhs=Rhs_tlist(A,"e")
 end
 
 tree.lhs(1).dims=list(Unknown,1)
index 7342bc1..90069bd 100644 (file)
@@ -11,7 +11,7 @@ tree.name="tan"
 
 A=getrhs(tree)
 A=convert2double(A)
-tree.rhs=Rhs(A)
+tree.rhs=Rhs_tlist(A)
 
 tree.lhs(1).dims=A.dims
 tree.lhs(1).type=A.type
index c81ed0f..583a483 100644 (file)
@@ -11,7 +11,7 @@ tree.name="tanh"
 
 A=getrhs(tree)
 A=convert2double(A)
-tree.rhs=Rhs(A)
+tree.rhs=Rhs_tlist(A)
 
 tree.lhs(1).dims=A.dims
 tree.lhs(1).type=A.type
index 9c3d0ac..a5f6eb5 100644 (file)
@@ -19,7 +19,7 @@ if rhs==1 then
 // T = toeplitz(c,r)
 else
   [c,r]=getrhs(tree)
-  tree.rhs=Rhs(convert2double(c),convert2double(r))
+  tree.rhs=Rhs_tlist(convert2double(c),convert2double(r))
   tree.name="mtlb_toeplitz"
   if c.property==Complex | r.property==Complex then
     tree.lhs(1).type=Type(Double,Complex)
index 395bc55..1bbd807 100644 (file)
@@ -21,7 +21,7 @@ if rhs==2 then
     repl_poss(newk,k,k,gettext("is Real."));
     k=newk
   end
-  tree.rhs=Rhs(X,k)
+  tree.rhs=Rhs_tlist(X,k)
 // L = tril(X)
 else
   X = getrhs(tree)
@@ -32,7 +32,7 @@ if or(X.vtype==[String,Unknown]) then
   tree.name="mtlb_tril"
 else
   if X.vtype==Boolean then
-    X=Funcall("bool2s",1,Rhs(X),list(Variable("",X.infer)))
+    X=Funcall("bool2s",1,Rhs_tlist(X),list(Variable("",X.infer)))
     tree.rhs(1)=X
   end
 end
index ee4c4fe..9a8f929 100644 (file)
@@ -21,7 +21,7 @@ if rhs==2 then
     repl_poss(newk,k,k,gettext("is Real."));
     k=newk
   end
-  tree.rhs=Rhs(X,k)
+  tree.rhs=Rhs_tlist(X,k)
 // L = triu(X)
 else
   X = getrhs(tree)
@@ -32,7 +32,7 @@ if or(X.vtype==[String,Unknown]) then
   tree.name="mtlb_triu"
 else
   if X.vtype==Boolean then
-    X=Funcall("bool2s",1,Rhs(X),list(Variable("",X.infer)))
+    X=Funcall("bool2s",1,Rhs_tlist(X),list(Variable("",X.infer)))
     tree.rhs(1)=X
   end
 end
index 6232d40..e9409db 100644 (file)
@@ -19,7 +19,7 @@ if rhs==-1 then
   elseif tree.name=="rand" then
     // Nothing changed
   elseif tree.name=="randn" then
-    tree.rhs=Rhs(1,1,"normal")
+    tree.rhs=Rhs_tlist(1,1,"normal")
     tree.lhs(1).dims=list(1,1)
     tree.lhs(1).type=Type(Double,Real)
   elseif tree.name=="false" then
@@ -38,7 +38,7 @@ if rhs==0 then
   elseif tree.name=="rand" then
     // Nothing changed
   elseif tree.name=="randn" then
-    tree.rhs=Rhs(1,1,"normal")
+    tree.rhs=Rhs_tlist(1,1,"normal")
     tree.lhs(1).dims=list(1,1)
     tree.lhs(1).type=Type(Double,Real)
   elseif tree.name=="false" then
@@ -54,20 +54,20 @@ if tree.name=="randn" |tree.name=="rand" then
   if tree.rhs(1).vtype==String then // State
     if rhs==1 then // Get the state
       if tree.name=="rand" then
-       onescall=Funcall("ones",1,Rhs(35,1),list())
-       randcall=Funcall("rand",1,Rhs("seed"),list())
+       onescall=Funcall("ones",1,Rhs_tlist(35,1),list())
+       randcall=Funcall("rand",1,Rhs_tlist("seed"),list())
        tree=Operation("*",list(onescall,randcall),tree.lhs)
        tree.out(1).dims=list(35,1)
        tree.out(1).type=Type(Double,Real)
       else
-       onescall=Funcall("ones",1,Rhs(2,1),list())
-       randcall=Funcall("rand",1,Rhs("seed"),list())
+       onescall=Funcall("ones",1,Rhs_tlist(2,1),list())
+       randcall=Funcall("rand",1,Rhs_tlist("seed"),list())
        tree=Operation("*",list(onescall,randcall),tree.lhs)
        tree.out(1).dims=list(2,1)
        tree.out(1).type=Type(Double,Real)
       end
     else // Set the state
-      tree=Funcall("rand",1,Rhs("seed",tree.rhs(2)),tree.lhs)
+      tree=Funcall("rand",1,Rhs_tlist("seed",tree.rhs(2)),tree.lhs)
       tree.lhs(1).dims=list(0,0)
       tree.lhs(1).type=Type(Unknown,Unknown)
     end
@@ -95,7 +95,7 @@ if rhs==1 then
       dim=Unknown
     end
     
-    tree=Funcall("ones",1,Rhs(n,n,opt),tree.lhs)
+    tree=Funcall("ones",1,Rhs_tlist(n,n,opt),tree.lhs)
     tree.lhs(1).dims=list(dim,dim)
     tree.lhs(1).type=Type(Double,Real)
   // true([n1,n2,...])
index 2202044..e63756f 100644 (file)
@@ -20,7 +20,7 @@ end
 
 x = convert2double(x)
 
-tree.rhs=Rhs(x)
+tree.rhs=Rhs_tlist(x)
 
 if is_complex(x) then
   set_infos(msprintf(gettext("Scilab %s() does not work with Complex values: %s() call IGNORED."),"uint16","uint16"),2);
index d08d92b..bc2dab7 100644 (file)
@@ -20,7 +20,7 @@ end
 
 x = convert2double(x)
 
-tree.rhs=Rhs(x)
+tree.rhs=Rhs_tlist(x)
 
 if is_complex(x) then
   set_infos(msprintf(gettext("Scilab %s() does not work with Complex values: %s() call IGNORED."),"uint32","uint32"),2);
index f22eb7c..0b88af3 100644 (file)
@@ -20,7 +20,7 @@ end
 
 x = convert2double(x)
 
-tree.rhs=Rhs(x)
+tree.rhs=Rhs_tlist(x)
 
 if is_complex(x) then
   set_infos(msprintf(gettext("Scilab %s() does not work with Complex values: %s() call IGNORED."),"uint8","uint8"),2);
index 68c4157..8155e96 100644 (file)
@@ -12,7 +12,7 @@ opt=part("upper",1)
 A = getrhs(tree)
 if A.vtype==String then
   tree.name="convstr"
-  tree.rhs=Rhs(A,opt)
+  tree.rhs=Rhs_tlist(A,opt)
   tree.lhs(1).dims=A.dims
   tree.lhs(1).type=A.type
 elseif A.vtype==Unknown then
index a3ab29b..fc7e2ab 100644 (file)
@@ -19,7 +19,7 @@ if rhs==-1 then
   elseif tree.name=="rand" then
     // Nothing changed
   elseif tree.name=="randn" then
-    tree.rhs=Rhs(1,1,"normal")
+    tree.rhs=Rhs_tlist(1,1,"normal")
     tree.lhs(1).dims=list(1,1)
     tree.lhs(1).type=Type(Double,Real)
   elseif tree.name=="false" then
@@ -38,7 +38,7 @@ if rhs==0 then
   elseif tree.name=="rand" then
     // Nothing changed
   elseif tree.name=="randn" then
-    tree.rhs=Rhs(1,1,"normal")
+    tree.rhs=Rhs_tlist(1,1,"normal")
     tree.lhs(1).dims=list(1,1)
     tree.lhs(1).type=Type(Double,Real)
   elseif tree.name=="false" then
@@ -54,20 +54,20 @@ if tree.name=="randn" |tree.name=="rand" then
   if tree.rhs(1).vtype==String then // State
     if rhs==1 then // Get the state
       if tree.name=="rand" then
-       onescall=Funcall("ones",1,Rhs(35,1),list())
-       randcall=Funcall("rand",1,Rhs("seed"),list())
+       onescall=Funcall("ones",1,Rhs_tlist(35,1),list())
+       randcall=Funcall("rand",1,Rhs_tlist("seed"),list())
        tree=Operation("*",list(onescall,randcall),tree.lhs)
        tree.out(1).dims=list(35,1)
        tree.out(1).type=Type(Double,Real)
       else
-       onescall=Funcall("ones",1,Rhs(2,1),list())
-       randcall=Funcall("rand",1,Rhs("seed"),list())
+       onescall=Funcall("ones",1,Rhs_tlist(2,1),list())
+       randcall=Funcall("rand",1,Rhs_tlist("seed"),list())
        tree=Operation("*",list(onescall,randcall),tree.lhs)
        tree.out(1).dims=list(2,1)
        tree.out(1).type=Type(Double,Real)
       end
     else // Set the state
-      tree=Funcall("rand",1,Rhs("seed",tree.rhs(2)),tree.lhs)
+      tree=Funcall("rand",1,Rhs_tlist("seed",tree.rhs(2)),tree.lhs)
       tree.lhs(1).dims=list(0,0)
       tree.lhs(1).type=Type(Unknown,Unknown)
     end
@@ -95,7 +95,7 @@ if rhs==1 then
       dim=Unknown
     end
     
-    tree=Funcall("zeros",1,Rhs(n,n,opt),tree.lhs)
+    tree=Funcall("zeros",1,Rhs_tlist(n,n,opt),tree.lhs)
     tree.lhs(1).dims=list(dim,dim)
     tree.lhs(1).type=Type(Double,Real)
   // zeros([n1,n2,...])