summaryrefslogtreecommitdiffstats
path: root/scilab
diff options
context:
space:
mode:
authorVincent COUVERT <vincent.couvert@scilab.org>2010-03-12 15:50:03 +0100
committerVincent COUVERT <vincent.couvert@scilab.org>2010-03-12 15:50:03 +0100
commit0a7c5f5f7d2e29c448fcd38a130d6a9a0ba40452 (patch)
tree2ab38c2565724cca3ba8a11a66f3c55214606549 /scilab
parenta2bf978d511ac3a47f4ce3b8dbce883dee52195f (diff)
downloadscilab-0a7c5f5f7d2e29c448fcd38a130d6a9a0ba40452.zip
scilab-0a7c5f5f7d2e29c448fcd38a130d6a9a0ba40452.tar.gz
No more works with complex second and third inputs
Diffstat (limited to 'scilab')
-rw-r--r--scilab/modules/compatibility_functions/macros/mtlb_repmat.sci7
-rw-r--r--scilab/modules/m2sci/macros/sci_files/sci_repmat.sci21
2 files changed, 0 insertions, 28 deletions
diff --git a/scilab/modules/compatibility_functions/macros/mtlb_repmat.sci b/scilab/modules/compatibility_functions/macros/mtlb_repmat.sci
index d3ad8dd..e067bc6 100644
--- a/scilab/modules/compatibility_functions/macros/mtlb_repmat.sci
+++ b/scilab/modules/compatibility_functions/macros/mtlb_repmat.sci
@@ -16,10 +16,6 @@ if type(M)==10 then
16 M=asciimat(M) 16 M=asciimat(M)
17end 17end
18 18
19if ~isreal(m) then
20 m=real(m)
21end
22
23if or(type(M)==[4,6]) then 19if or(type(M)==[4,6]) then
24 M=bool2s(M) 20 M=bool2s(M)
25end 21end
@@ -39,9 +35,6 @@ if rhs==2 & size(m,"*")<>1 then
39 repm=ones(tmp(1:$)).*.M 35 repm=ones(tmp(1:$)).*.M
40// repmat(M,m,n) 36// repmat(M,m,n)
41else 37else
42 if ~isreal(n) then
43 n=real(n)
44 end
45 if or(type(n)==[4,6]) then 38 if or(type(n)==[4,6]) then
46 n=bool2s(n) 39 n=bool2s(n)
47 end 40 end
diff --git a/scilab/modules/m2sci/macros/sci_files/sci_repmat.sci b/scilab/modules/m2sci/macros/sci_files/sci_repmat.sci
index 3df8019..62c09dd 100644
--- a/scilab/modules/m2sci/macros/sci_files/sci_repmat.sci
+++ b/scilab/modules/m2sci/macros/sci_files/sci_repmat.sci
@@ -17,13 +17,6 @@ function [tree]=sci_repmat(tree)
17// repmat(A,m) 17// repmat(A,m)
18if rhs==2 then 18if rhs==2 then
19 [A,m] = getrhs(tree) 19 [A,m] = getrhs(tree)
20 if is_complex(m) then
21 m=Funcall("real",1,list(m),list(Variable("",m.infer)))
22 elseif ~is_real(m) then
23 newm=Funcall("real",1,list(m),list(Variable("",m.infer)))
24 repl_poss(newm,m,m,gettext("is Real."));
25 m=newm
26 end
27 vtype=A.vtype 20 vtype=A.vtype
28 if A.vtype==Unknown then 21 if A.vtype==Unknown then
29 tree.name="mtlb_repmat" 22 tree.name="mtlb_repmat"
@@ -87,20 +80,6 @@ if rhs==2 then
87// repmat(A,m,n) 80// repmat(A,m,n)
88else 81else
89 [A,m,n] = getrhs(tree) 82 [A,m,n] = getrhs(tree)
90 if is_complex(m) then
91 m=Funcall("real",1,list(m),list(Variable("",m.infer)))
92 elseif ~is_real(m) then
93 newm=Funcall("real",1,list(m),list(Variable("",m.infer)))
94 repl_poss(newm,m,m,gettext("is Real."));
95 m=newm
96 end
97 if is_complex(n) then
98 n=Funcall("real",1,list(n),list(Variable("",n.infer)))
99 elseif ~is_real(n) then
100 newn=Funcall("real",1,list(n),list(Variable("",n.infer)))
101 repl_poss(newn,n,n,gettext("is Real."));
102 n=newn
103 end
104 vtype=A.vtype 83 vtype=A.vtype
105 if A.vtype==Unknown then 84 if A.vtype==Unknown then
106 tree.name="mtlb_repmat" 85 tree.name="mtlb_repmat"