summaryrefslogtreecommitdiffstats
path: root/scilab/modules/scicos
diff options
context:
space:
mode:
authorAllan CORNET <allan.cornet@scilab.org>2010-04-08 08:13:34 +0200
committerAllan CORNET <allan.cornet@scilab.org>2010-04-08 08:13:34 +0200
commit956d7e67111d000788a72ac4a9666e2508579f73 (patch)
tree9dd96874d1a71fefdb14772a582505e0186ae676 /scilab/modules/scicos
parent089233341db4f1b2edf4a9ee13c2098e0056f90f (diff)
downloadscilab-956d7e67111d000788a72ac4a9666e2508579f73.zip
scilab-956d7e67111d000788a72ac4a9666e2508579f73.tar.gz
bug 6645
Change-Id: Ic5b73ea8d1ca1461e7cd8d73b0ace6920e41fc73
Diffstat (limited to 'scilab/modules/scicos')
-rw-r--r--scilab/modules/scicos/macros/scicos_scicos/xml2cos.sci8
1 files changed, 0 insertions, 8 deletions
diff --git a/scilab/modules/scicos/macros/scicos_scicos/xml2cos.sci b/scilab/modules/scicos/macros/scicos_scicos/xml2cos.sci
index 1940dc5..78cc58b 100644
--- a/scilab/modules/scicos/macros/scicos_scicos/xml2cos.sci
+++ b/scilab/modules/scicos/macros/scicos_scicos/xml2cos.sci
@@ -52,7 +52,6 @@ function [scs_m,atomicflg]=xml2cos(xmlfilename,typ)
52 ttyp=tokens(typ(2),'''') 52 ttyp=tokens(typ(2),'''')
53 //disp(ttyp(2)); 53 //disp(ttyp(2));
54 if ttyp(2)=='context' then 54 if ttyp(2)=='context' then
55 //t=readc_(unit);
56 t=read_new_line(txt); 55 t=read_new_line(txt);
57 cntxt=cos_subst(t); 56 cntxt=cos_subst(t);
58 scs_m.props.context=evstr(cntxt); 57 scs_m.props.context=evstr(cntxt);
@@ -121,7 +120,6 @@ endfunction
121 120
122function scs_m=load_par(symbol,id1,id2) 121function scs_m=load_par(symbol,id1,id2)
123 scs_m=scs_m;global txtline 122 scs_m=scs_m;global txtline
124 //t=readc_(unit);
125 t=read_new_line(txt); 123 t=read_new_line(txt);
126 typ=tokens(t); 124 typ=tokens(t);
127 while typ(1)<>symbol do 125 while typ(1)<>symbol do
@@ -141,12 +139,10 @@ function scs_m=load_par(symbol,id1,id2)
141 scs_m1=xml2cos(xmlfilename,typ) 139 scs_m1=xml2cos(xmlfilename,typ)
142 execstr('scs_m.'+id2+'.'+id1+'('''+ttyp(2)+''')='+sci2exp(scs_m1,0)); 140 execstr('scs_m.'+id2+'.'+id1+'('''+ttyp(2)+''')='+sci2exp(scs_m1,0));
143 else 141 else
144 //t=readc_(unit);
145 t=read_new_line(txt); 142 t=read_new_line(txt);
146 execstr('scs_m.'+id2+'.'+id1+'('''+ttyp(2)+''')='+cos_subst(t)); 143 execstr('scs_m.'+id2+'.'+id1+'('''+ttyp(2)+''')='+cos_subst(t));
147 end 144 end
148 elseif ttyp(2)=='gr_i' then 145 elseif ttyp(2)=='gr_i' then
149 //t=readc_(unit);
150 t=read_new_line(txt); 146 t=read_new_line(txt);
151 execstr('scs_m.'+id2+'.'+id1+'('''+ttyp(2)+''')='+cos_subst(t)); 147 execstr('scs_m.'+id2+'.'+id1+'('''+ttyp(2)+''')='+cos_subst(t));
152 elseif ttyp(2)=='exprs' then 148 elseif ttyp(2)=='exprs' then
@@ -175,11 +171,9 @@ function scs_m=load_par(symbol,id1,id2)
175 //disp(tttyp(2)); 171 //disp(tttyp(2));
176 execstr('scs_m.'+id2+'.'+id1+'('''+ttyp(2)+''')='+cos_subst(tttyp(2))) 172 execstr('scs_m.'+id2+'.'+id1+'('''+ttyp(2)+''')='+cos_subst(tttyp(2)))
177 end 173 end
178 //t=readc_(unit);
179 t=read_new_line(txt); 174 t=read_new_line(txt);
180 typ=tokens(t); 175 typ=tokens(t);
181 if or(typ==['</graphics>','</model>']) then 176 if or(typ==['</graphics>','</model>']) then
182 //t=readc_(unit);
183 t=read_new_line(txt); 177 t=read_new_line(txt);
184 typ=tokens(t); 178 typ=tokens(t);
185 end 179 end
@@ -210,7 +204,6 @@ function scs_m=treat_blocks(symbol,typ)
210 else 204 else
211 execstr('scs_m.objs('+numb+')=scicos_text();'); 205 execstr('scs_m.objs('+numb+')=scicos_text();');
212 end 206 end
213 //t=readc_(unit);
214 t=read_new_line(txt); 207 t=read_new_line(txt);
215 typ=tokens(t); 208 typ=tokens(t);
216 while typ(1)<>symbol do 209 while typ(1)<>symbol do
@@ -229,7 +222,6 @@ function scs_m=treat_blocks(symbol,typ)
229 //tttyp=tokens(typ(3),'''') 222 //tttyp=tokens(typ(3),'''')
230 execstr('scs_m.objs('+numb+').'+ttyp(2)+'='+cos_subst(tttyp(2))) 223 execstr('scs_m.objs('+numb+').'+ttyp(2)+'='+cos_subst(tttyp(2)))
231 end 224 end
232 //t=readc_(unit);
233 t=read_new_line(txt); 225 t=read_new_line(txt);
234 typ=tokens(t); 226 typ=tokens(t);
235 end 227 end