diff options
| author | Sunil Shetye | 2018-08-27 14:38:26 +0530 |
|---|---|---|
| committer | Sunil Shetye | 2018-08-27 16:43:40 +0530 |
| commit | 8e6c876e5582928ab6909cf0f3529a97f622520d (patch) | |
| tree | 3ce13a7e3552486771d147aec6973ff45a6024a5 | |
| parent | 5cffbe3aa309e242255b96fe954688c6f1380811 (diff) | |
| download | sci2js-8e6c876e5582928ab6909cf0f3529a97f622520d.tar.gz sci2js-8e6c876e5582928ab6909cf0f3529a97f622520d.tar.bz2 sci2js-8e6c876e5582928ab6909cf0f3529a97f622520d.zip | |
ignore first and last variable by index, not value
58 files changed, 411 insertions, 579 deletions
diff --git a/combined.js b/combined.js index 5440e974..cb22558b 100644 --- a/combined.js +++ b/combined.js @@ -5933,7 +5933,6 @@ function JKFLIPFLOP() { while (true) { var ok = true; this.init = parseFloat(arguments[0]["init"]); - this.exprs0 = arguments[0]["exprs0"]; if (!ok) { break; } @@ -5943,7 +5942,7 @@ function JKFLIPFLOP() { this.init = int8(1); } if (ok) { - xx.graphics.exprs[1-1] = this.exprs0; + xx.graphics.exprs[1-1] = exprs0; this.model.odstate[1-1] = new ScilabDouble([this.init]); xx.model = this.model; break; @@ -6236,7 +6235,6 @@ function SRFLIPFLOP() { while (true) { var ok = true; this.init = parseFloat(arguments[0]["init"]); - this.exprs0 = arguments[0]["exprs0"]; if (!ok) { break; } @@ -6246,7 +6244,7 @@ function SRFLIPFLOP() { this.init = int8(1); } if (ok) { - xx.graphics.exprs[1-1] = this.exprs0; + xx.graphics.exprs[1-1] = exprs0; this.model.odstate[1-1] = new ScilabDouble([this.init]); xx.model = this.model; break; @@ -8409,16 +8407,15 @@ function PID() { this.p = arguments[0]["p"]; this.i = arguments[0]["i"]; this.d = arguments[0]["d"]; - this.exprs0 = arguments[0]["exprs0"]; if (!ok) { break; } if (ok) { - xx1.graphics.exprs = this.exprs0[1-1]; + xx1.graphics.exprs = exprs0[1-1]; xx1.model.rpar = this.p; - xx2.graphics.exprs = this.exprs0[2-1]; + xx2.graphics.exprs = exprs0[2-1]; xx2.model.rpar = this.i; - xx3.graphics.exprs = this.exprs0[3-1]; + xx3.graphics.exprs = exprs0[3-1]; xx3.model.rpar = this.d; break; } @@ -9351,11 +9348,10 @@ function CUMSUM() { var ok = true; this.typ = inverse(arguments[0]["typ"]); this.decomptyp = arguments[0]["decomptyp"]; - this.lab = arguments[0]["lab"]; if (!ok) { break; } - var label = this.lab; + var label = lab; if ((this.typ==1)) { if ((this.decomptyp==0)) { var function_name = "cumsum_m"; @@ -9569,11 +9565,10 @@ function EXTTRI() { var ok = true; this.typ = inverse(arguments[0]["typ"]); this.decomptyp = arguments[0]["decomptyp"]; - this.lab = arguments[0]["lab"]; if (!ok) { break; } - var label = this.lab; + var label = lab; if ((this.typ==1)) { if ((this.decomptyp==1)) { var function_name = "exttril"; @@ -9754,11 +9749,10 @@ function MATCATH() { while (true) { var ok = true; this.nin = arguments[0]["nin"]; - this.lab = arguments[0]["lab"]; if (!ok) { break; } - var label = this.lab; + var label = lab; var in1 = [-1*(ones(this.nin,1)),-(transpose([2:this.nin+1]))]; var out = [-1,0]; var it = -1*(ones(this.nin,1)); @@ -9826,11 +9820,10 @@ function MATCATV() { while (true) { var ok = true; this.nin = arguments[0]["nin"]; - this.lab = arguments[0]["lab"]; if (!ok) { break; } - var label = this.lab; + var label = lab; var in1 = [-(transpose([2:this.nin+1])),-ones(this.nin,1)]; var it = -ones(this.nin,1); var ot = -1; @@ -10142,11 +10135,10 @@ function MATEIG() { var ok = true; this.typ = inverse(arguments[0]["typ"]); this.decomptyp = arguments[0]["decomptyp"]; - this.lab = arguments[0]["lab"]; if (!ok) { break; } - var label = this.lab; + var label = lab; if ((this.typ==1)) { if ((this.decomptyp==1)) { var function_name = "mat_vps"; @@ -10409,7 +10401,6 @@ function MATLU() { while (true) { var ok = true; this.typ = inverse(arguments[0]["typ"]); - this.lab = arguments[0]["lab"]; if (!ok) { break; } @@ -10435,7 +10426,7 @@ function MATLU() { if (ok) { var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.graphics.exprs = new ScilabDouble([this.lab]); + this.graphics.exprs = new ScilabDouble([lab]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -10492,11 +10483,10 @@ function MATMAGPHI() { while (true) { var ok = true; this.decomptyp = arguments[0]["decomptyp"]; - this.lab = arguments[0]["lab"]; if (!ok) { break; } - var label = this.lab; + var label = lab; if ((this.decomptyp==1)) { var function_name = "matz_abs"; var in1 = [-1,-2]; @@ -10833,7 +10823,6 @@ function MATRESH() { this.typ = inverse(arguments[0]["typ"]); this.l1 = arguments[0]["l1"]; this.out = arguments[0]["out"]; - this.lab = arguments[0]["lab"]; if (!ok) { break; } @@ -10880,7 +10869,7 @@ function MATRESH() { var ok = false; } if (ok) { - var label = this.lab; + var label = lab; var tmpvar0 = set_io(this.model,this.graphics,list(this.l1,it),list(this.out,ot),[],[]); this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; @@ -10947,11 +10936,10 @@ function MATSING() { var ok = true; this.typ = inverse(arguments[0]["typ"]); this.decomptyp = arguments[0]["decomptyp"]; - this.lab = arguments[0]["lab"]; if (!ok) { break; } - var label = this.lab; + var label = lab; if ((this.typ==1)) { if ((this.decomptyp==1)) { var function_name = "mat_sing"; @@ -11057,11 +11045,10 @@ function MATSUM() { var ok = true; this.typ = inverse(arguments[0]["typ"]); this.decomptyp = arguments[0]["decomptyp"]; - this.lab = arguments[0]["lab"]; if (!ok) { break; } - var label = this.lab; + var label = lab; if ((this.typ==1)) { if ((this.decomptyp==0)) { var function_name = "mat_sum"; @@ -11282,11 +11269,10 @@ function MATZREIM() { while (true) { var ok = true; this.decomptyp = arguments[0]["decomptyp"]; - this.lab = arguments[0]["lab"]; if (!ok) { break; } - var label = this.lab; + var label = lab; if ((this.decomptyp==1)) { var function_name = "matz_reim"; var in1 = [-1,-2]; @@ -12278,11 +12264,10 @@ function CBLOCK() { this.auto0 = arguments[0]["auto0"]; this.depu = parseBoolean(arguments[0]["depu"]); this.dept = parseBoolean(arguments[0]["dept"]); - this.lab = arguments[0]["lab"]; if (!ok) { break; } - label[1-1] = this.lab; + label[1-1] = lab; var funam = stripblanks(this.function_name); this.xx = this.xx.slice(); this.z = this.z.slice(); @@ -12443,11 +12428,10 @@ function CBLOCK4() { this.auto0 = arguments[0]["auto0"]; this.depu = parseBoolean(arguments[0]["depu"]); this.dept = parseBoolean(arguments[0]["dept"]); - this.lab = arguments[0]["lab"]; if (!ok) { break; } - label[1-1] = this.lab; + label[1-1] = lab; var funam = stripblanks(this.function_name); this.xx = this.xx.slice(); this.z = this.z.slice(); @@ -13632,7 +13616,7 @@ function MBLOCK() { } var exprs = tlist(["MBLOCK","in","intype","out","outtype","param","paramv","pprop","nameF","funtxt"],exprs[1-1][1-1],exprs[1-1][2-1],exprs[1-1][3-1],exprs[1-1][4-1],exprs[1-1][5-1],paramv,sci2exp(this.pprop.slice()),exprs[1-1][7-1],exprs[2-1]); } - this.lab_1 = list(exprs.in,exprs.intype,exprs.out,exprs.outtype,exprs.param,exprs.pprop,exprs.nameF); + var lab_1 = list(exprs.in,exprs.intype,exprs.out,exprs.outtype,exprs.param,exprs.pprop,exprs.nameF); var lab_2 = exprs.paramv; while (true) { var ok = true; @@ -13643,7 +13627,6 @@ function MBLOCK() { this.Tparam = arguments[0]["Tparam"]; this.pprop = inverse(arguments[0]["pprop"]); this.Tfunam = arguments[0]["Tfunam"]; - this.lab_1 = arguments[0]["lab_1"]; if (!ok) { break; } @@ -13839,11 +13822,11 @@ function MBLOCK() { this.model.rpar = new ScilabDouble([this.model.rpar],[paramv[i-1].slice()]); } this.model.sim[1-1] = new ScilabDouble([this.funam]); - exprs.in = this.lab_1[1-1]; - exprs.intype = this.lab_1[2-1]; - exprs.out = this.lab_1[3-1]; - exprs.outtype = this.lab_1[4-1]; - exprs.param = this.lab_1[5-1]; + exprs.in = lab_1[1-1]; + exprs.intype = lab_1[2-1]; + exprs.out = lab_1[3-1]; + exprs.outtype = lab_1[4-1]; + exprs.param = lab_1[5-1]; exprs.paramv = list(); if (Tparam_sz!=0) { if (this.type[lab_2-1]==15) { @@ -13856,8 +13839,8 @@ function MBLOCK() { } } } - exprs.pprop = this.lab_1[6-1]; - exprs.nameF = this.lab_1[7-1]; + exprs.pprop = lab_1[6-1]; + exprs.nameF = lab_1[7-1]; exprs.funtxt = tt; this.x.model = this.model; this.graphics.gr_i[1-1][1-1] = new ScilabString(["txt=[\'Modelica\';\' "+nameF+" \'];"]); @@ -14716,14 +14699,13 @@ function c_block() { this.o = parseFloat(arguments[0]["o"]); this.rpar = inverse(arguments[0]["rpar"]); this.funam = arguments[0]["funam"]; - this.lab = arguments[0]["lab"]; if (!ok) { break; } if (this.funam==" ") { break; } - label[1-1] = this.lab; + label[1-1] = lab; this.rpar = this.rpar.slice(); this.i = int(this.i.slice()); var ni = size(this.i,1); @@ -14802,14 +14784,13 @@ function fortran_block() { this.o = parseFloat(arguments[0]["o"]); this.rpar = inverse(arguments[0]["rpar"]); this.funam = arguments[0]["funam"]; - this.lab = arguments[0]["lab"]; if (!ok) { break; } if (this.funam==" ") { break; } - label[1-1] = this.lab; + label[1-1] = lab; this.rpar = this.rpar.slice(); this.i = int(this.i.slice()); var ni = size(this.i,1); @@ -14950,11 +14931,10 @@ function generic_block() { this.auto0 = arguments[0]["auto0"]; this.depu = parseBoolean(arguments[0]["depu"]); this.dept = parseBoolean(arguments[0]["dept"]); - this.lab = arguments[0]["lab"]; if (!ok) { break; } - var label = this.lab; + var label = lab; this.function_name = stripblanks(this.function_name); this.xx = this.xx.slice(); this.z = this.z.slice(); @@ -15087,11 +15067,10 @@ function generic_block2() { this.auto0 = arguments[0]["auto0"]; this.depu = parseBoolean(arguments[0]["depu"]); this.dept = parseBoolean(arguments[0]["dept"]); - this.lab = arguments[0]["lab"]; if (!ok) { break; } - var label = this.lab; + var label = lab; this.function_name = stripblanks(this.function_name); this.xx = this.xx.slice(); this.z = this.z.slice(); @@ -15230,11 +15209,10 @@ function generic_block3() { this.auto0 = arguments[0]["auto0"]; this.depu = parseBoolean(arguments[0]["depu"]); this.dept = parseBoolean(arguments[0]["dept"]); - this.lab = arguments[0]["lab"]; if (!ok) { break; } - var label = this.lab; + var label = lab; this.function_name = stripblanks(this.function_name); this.xx = this.xx.slice(); this.z = this.z.slice(); @@ -15376,11 +15354,10 @@ function scifunc_block() { this.rpar = inverse(arguments[0]["rpar"]); this.auto0 = arguments[0]["auto0"]; this.deptime = arguments[0]["deptime"]; - this.lab = arguments[0]["lab"]; if (!ok) { break; } - exprs[1-1] = this.lab; + exprs[1-1] = lab; this.xx = this.xx.slice(); this.z = this.z.slice(); this.rpar = this.rpar.slice(); @@ -15502,11 +15479,10 @@ function scifunc_block_m() { this.rpar = inverse(arguments[0]["rpar"]); this.auto0 = arguments[0]["auto0"]; this.deptime = arguments[0]["deptime"]; - this.lab = arguments[0]["lab"]; if (!ok) { break; } - exprs[1-1] = this.lab; + exprs[1-1] = lab; this.xx = this.xx.slice(); this.z = this.z.slice(); this.rpar = this.rpar.slice(); @@ -17191,7 +17167,7 @@ function PDE() { } PDE.prototype.get = function PDE() { var options = { - okk:["New block\'s name :",this.okk], + rdnom:["New block\'s name :",this.rdnom], } return options; } @@ -17276,19 +17252,17 @@ function PDE() { var params_pde = tmpvar1[32]; } } - this.okk = false; + var okk = false; this.rdnom = "PDE"; var ok1 = true; while (true) { - var ok = true; - this.okk = parseBoolean(arguments[0]["okk"]); + var okk = true; this.rdnom = arguments[0]["rdnom"]; - this.lab = arguments[0]["lab"]; - if (this.okk==false) { + if (okk==false) { var ok1 = false; return; } - label[3-1] = this.lab; + label[3-1] = lab; this.rdnom = stripblanks(this.rdnom); if (this.rdnom==emptystr()) { var ok1 = false; @@ -19672,7 +19646,6 @@ function CLOCK_c() { var ok = true; this.dt = arguments[0]["dt"]; this.t0 = arguments[0]["t0"]; - this.exprs0 = arguments[0]["exprs0"]; if (!ok) { break; } @@ -19681,7 +19654,7 @@ function CLOCK_c() { var ok = false; } if (ok) { - xx.graphics.exprs = this.exprs0; + xx.graphics.exprs = exprs0; this.model.rpar = new ScilabDouble([this.dt],[this.t0]); this.model.firing = new ScilabDouble([this.t0]); xx.model = this.model; @@ -19775,7 +19748,6 @@ function CLOCK_f() { var ok = true; this.dt = arguments[0]["dt"]; this.t0 = arguments[0]["t0"]; - this.exprs0 = arguments[0]["exprs0"]; if (!ok) { break; } @@ -19785,14 +19757,14 @@ function CLOCK_f() { var ok = false; } if (ok) { - xx.graphics.exprs = this.exprs0; + xx.graphics.exprs = exprs0; this.model.rpar = new ScilabDouble([this.dt]); this.model.firing = new ScilabDouble([this.t0]); xx.model = this.model; break; } } - if (!and([t0_old,dt_old]==[this.t0,this.dt])||!and(this.exprs0==exprs)) { + if (!and([t0_old,dt_old]==[this.t0,this.dt])||!and(exprs0==exprs)) { newpar[size(newpar)+1-1] = path; } if (t0_old!=this.t0) { diff --git a/js/IntegerOp/JKFLIPFLOP.js b/js/IntegerOp/JKFLIPFLOP.js index e6907cc5..3d22f43c 100644 --- a/js/IntegerOp/JKFLIPFLOP.js +++ b/js/IntegerOp/JKFLIPFLOP.js @@ -70,7 +70,6 @@ function JKFLIPFLOP() { while (true) { var ok = true; this.init = parseFloat(arguments[0]["init"]); - this.exprs0 = arguments[0]["exprs0"]; if (!ok) { break; } @@ -80,7 +79,7 @@ function JKFLIPFLOP() { this.init = int8(1); } if (ok) { - xx.graphics.exprs[1-1] = this.exprs0; + xx.graphics.exprs[1-1] = exprs0; this.model.odstate[1-1] = new ScilabDouble([this.init]); xx.model = this.model; break; diff --git a/js/IntegerOp/JKFLIPFLOP.pickle b/js/IntegerOp/JKFLIPFLOP.pickle index 657cb309..0af24303 100644 --- a/js/IntegerOp/JKFLIPFLOP.pickle +++ b/js/IntegerOp/JKFLIPFLOP.pickle @@ -2,18 +2,16 @@ c__builtin__ set p0 ((lp1 -S'exprs0' +S'x' p2 -aS'x' -p3 aS'model' -p4 +p3 aS'init' -p5 +p4 aS'graphics' -p6 -atp7 -Rp8 +p5 +atp6 +Rp7 .(dp0 S'xx.model' p1 diff --git a/js/IntegerOp/SRFLIPFLOP.js b/js/IntegerOp/SRFLIPFLOP.js index 5b694318..ace36bd6 100644 --- a/js/IntegerOp/SRFLIPFLOP.js +++ b/js/IntegerOp/SRFLIPFLOP.js @@ -54,7 +54,6 @@ function SRFLIPFLOP() { while (true) { var ok = true; this.init = parseFloat(arguments[0]["init"]); - this.exprs0 = arguments[0]["exprs0"]; if (!ok) { break; } @@ -64,7 +63,7 @@ function SRFLIPFLOP() { this.init = int8(1); } if (ok) { - xx.graphics.exprs[1-1] = this.exprs0; + xx.graphics.exprs[1-1] = exprs0; this.model.odstate[1-1] = new ScilabDouble([this.init]); xx.model = this.model; break; diff --git a/js/IntegerOp/SRFLIPFLOP.pickle b/js/IntegerOp/SRFLIPFLOP.pickle index a4f8d716..6c6e5481 100644 --- a/js/IntegerOp/SRFLIPFLOP.pickle +++ b/js/IntegerOp/SRFLIPFLOP.pickle @@ -2,18 +2,16 @@ c__builtin__ set p0 ((lp1 -S'exprs0' +S'x' p2 -aS'x' -p3 aS'model' -p4 +p3 aS'init' -p5 +p4 aS'graphics' -p6 -atp7 -Rp8 +p5 +atp6 +Rp7 .(dp0 S'xx.model' p1 diff --git a/js/Linear/PID.js b/js/Linear/PID.js index 176b777f..46ab9ee4 100644 --- a/js/Linear/PID.js +++ b/js/Linear/PID.js @@ -90,16 +90,15 @@ function PID() { this.p = arguments[0]["p"]; this.i = arguments[0]["i"]; this.d = arguments[0]["d"]; - this.exprs0 = arguments[0]["exprs0"]; if (!ok) { break; } if (ok) { - xx1.graphics.exprs = this.exprs0[1-1]; + xx1.graphics.exprs = exprs0[1-1]; xx1.model.rpar = this.p; - xx2.graphics.exprs = this.exprs0[2-1]; + xx2.graphics.exprs = exprs0[2-1]; xx2.model.rpar = this.i; - xx3.graphics.exprs = this.exprs0[3-1]; + xx3.graphics.exprs = exprs0[3-1]; xx3.model.rpar = this.d; break; } diff --git a/js/Linear/PID.pickle b/js/Linear/PID.pickle index d392dd2d..1a7360b6 100644 --- a/js/Linear/PID.pickle +++ b/js/Linear/PID.pickle @@ -6,18 +6,16 @@ S'd' p2 aS'i' p3 -aS'exprs0' -p4 aS'p' -p5 +p4 aS'graphics' -p6 +p5 aS'x' -p7 +p6 aS'model' -p8 -atp9 -Rp10 +p7 +atp8 +Rp9 .(dp0 S'xx3' p1 diff --git a/js/MatrixOp/CUMSUM.js b/js/MatrixOp/CUMSUM.js index 03ec50e1..78226e6f 100644 --- a/js/MatrixOp/CUMSUM.js +++ b/js/MatrixOp/CUMSUM.js @@ -44,11 +44,10 @@ function CUMSUM() { var ok = true; this.typ = inverse(arguments[0]["typ"]); this.decomptyp = arguments[0]["decomptyp"]; - this.lab = arguments[0]["lab"]; if (!ok) { break; } - var label = this.lab; + var label = lab; if ((this.typ==1)) { if ((this.decomptyp==0)) { var function_name = "cumsum_m"; diff --git a/js/MatrixOp/CUMSUM.pickle b/js/MatrixOp/CUMSUM.pickle index f19c81c9..4712cd50 100644 --- a/js/MatrixOp/CUMSUM.pickle +++ b/js/MatrixOp/CUMSUM.pickle @@ -2,20 +2,18 @@ c__builtin__ set p0 ((lp1 -S'lab' +S'x' p2 -aS'graphics' +aS'model' p3 -aS'x' +aS'typ' p4 -aS'model' +aS'decomptyp' p5 -aS'typ' +aS'graphics' p6 -aS'decomptyp' -p7 -atp8 -Rp9 +atp7 +Rp8 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/EXTTRI.js b/js/MatrixOp/EXTTRI.js index df24f063..85a819d0 100644 --- a/js/MatrixOp/EXTTRI.js +++ b/js/MatrixOp/EXTTRI.js @@ -44,11 +44,10 @@ function EXTTRI() { var ok = true; this.typ = inverse(arguments[0]["typ"]); this.decomptyp = arguments[0]["decomptyp"]; - this.lab = arguments[0]["lab"]; if (!ok) { break; } - var label = this.lab; + var label = lab; if ((this.typ==1)) { if ((this.decomptyp==1)) { var function_name = "exttril"; diff --git a/js/MatrixOp/EXTTRI.pickle b/js/MatrixOp/EXTTRI.pickle index f19c81c9..4712cd50 100644 --- a/js/MatrixOp/EXTTRI.pickle +++ b/js/MatrixOp/EXTTRI.pickle @@ -2,20 +2,18 @@ c__builtin__ set p0 ((lp1 -S'lab' +S'x' p2 -aS'graphics' +aS'model' p3 -aS'x' +aS'typ' p4 -aS'model' +aS'decomptyp' p5 -aS'typ' +aS'graphics' p6 -aS'decomptyp' -p7 -atp8 -Rp9 +atp7 +Rp8 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATCATH.js b/js/MatrixOp/MATCATH.js index 55a27301..3507a94e 100644 --- a/js/MatrixOp/MATCATH.js +++ b/js/MatrixOp/MATCATH.js @@ -42,11 +42,10 @@ function MATCATH() { while (true) { var ok = true; this.nin = arguments[0]["nin"]; - this.lab = arguments[0]["lab"]; if (!ok) { break; } - var label = this.lab; + var label = lab; var in1 = [-1*(ones(this.nin,1)),-(transpose([2:this.nin+1]))]; var out = [-1,0]; var it = -1*(ones(this.nin,1)); diff --git a/js/MatrixOp/MATCATH.pickle b/js/MatrixOp/MATCATH.pickle index 068b089c..7dc7758b 100644 --- a/js/MatrixOp/MATCATH.pickle +++ b/js/MatrixOp/MATCATH.pickle @@ -8,12 +8,10 @@ aS'model' p3 aS'nin' p4 -aS'lab' -p5 aS'graphics' -p6 -atp7 -Rp8 +p5 +atp6 +Rp7 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATCATV.js b/js/MatrixOp/MATCATV.js index 522372e5..df60f3c2 100644 --- a/js/MatrixOp/MATCATV.js +++ b/js/MatrixOp/MATCATV.js @@ -43,11 +43,10 @@ function MATCATV() { while (true) { var ok = true; this.nin = arguments[0]["nin"]; - this.lab = arguments[0]["lab"]; if (!ok) { break; } - var label = this.lab; + var label = lab; var in1 = [-(transpose([2:this.nin+1])),-ones(this.nin,1)]; var it = -ones(this.nin,1); var ot = -1; diff --git a/js/MatrixOp/MATCATV.pickle b/js/MatrixOp/MATCATV.pickle index d8deaec0..96900b28 100644 --- a/js/MatrixOp/MATCATV.pickle +++ b/js/MatrixOp/MATCATV.pickle @@ -8,12 +8,10 @@ aS'model' p3 aS'nin' p4 -aS'lab' -p5 aS'graphics' -p6 -atp7 -Rp8 +p5 +atp6 +Rp7 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATEIG.js b/js/MatrixOp/MATEIG.js index 7c6d68d7..87b8452b 100644 --- a/js/MatrixOp/MATEIG.js +++ b/js/MatrixOp/MATEIG.js @@ -44,11 +44,10 @@ function MATEIG() { var ok = true; this.typ = inverse(arguments[0]["typ"]); this.decomptyp = arguments[0]["decomptyp"]; - this.lab = arguments[0]["lab"]; if (!ok) { break; } - var label = this.lab; + var label = lab; if ((this.typ==1)) { if ((this.decomptyp==1)) { var function_name = "mat_vps"; diff --git a/js/MatrixOp/MATEIG.pickle b/js/MatrixOp/MATEIG.pickle index 3e10a26a..6f234289 100644 --- a/js/MatrixOp/MATEIG.pickle +++ b/js/MatrixOp/MATEIG.pickle @@ -2,20 +2,18 @@ c__builtin__ set p0 ((lp1 -S'lab' +S'x' p2 -aS'graphics' +aS'model' p3 -aS'x' +aS'typ' p4 -aS'model' +aS'decomptyp' p5 -aS'typ' +aS'graphics' p6 -aS'decomptyp' -p7 -atp8 -Rp9 +atp7 +Rp8 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATLU.js b/js/MatrixOp/MATLU.js index 8088fb82..95f1fde6 100644 --- a/js/MatrixOp/MATLU.js +++ b/js/MatrixOp/MATLU.js @@ -42,7 +42,6 @@ function MATLU() { while (true) { var ok = true; this.typ = inverse(arguments[0]["typ"]); - this.lab = arguments[0]["lab"]; if (!ok) { break; } @@ -68,7 +67,7 @@ function MATLU() { if (ok) { var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.graphics.exprs = new ScilabDouble([this.lab]); + this.graphics.exprs = new ScilabDouble([lab]); this.x.graphics = this.graphics; this.x.model = this.model; break; diff --git a/js/MatrixOp/MATLU.pickle b/js/MatrixOp/MATLU.pickle index 5a0336fa..1a809c0f 100644 --- a/js/MatrixOp/MATLU.pickle +++ b/js/MatrixOp/MATLU.pickle @@ -8,12 +8,10 @@ aS'model' p3 aS'typ' p4 -aS'lab' -p5 aS'graphics' -p6 -atp7 -Rp8 +p5 +atp6 +Rp7 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATMAGPHI.js b/js/MatrixOp/MATMAGPHI.js index a854f312..b512cfad 100644 --- a/js/MatrixOp/MATMAGPHI.js +++ b/js/MatrixOp/MATMAGPHI.js @@ -42,11 +42,10 @@ function MATMAGPHI() { while (true) { var ok = true; this.decomptyp = arguments[0]["decomptyp"]; - this.lab = arguments[0]["lab"]; if (!ok) { break; } - var label = this.lab; + var label = lab; if ((this.decomptyp==1)) { var function_name = "matz_abs"; var in1 = [-1,-2]; diff --git a/js/MatrixOp/MATMAGPHI.pickle b/js/MatrixOp/MATMAGPHI.pickle index 0c3d145e..d422de93 100644 --- a/js/MatrixOp/MATMAGPHI.pickle +++ b/js/MatrixOp/MATMAGPHI.pickle @@ -6,14 +6,12 @@ S'x' p2 aS'model' p3 -aS'lab' -p4 aS'decomptyp' -p5 +p4 aS'graphics' -p6 -atp7 -Rp8 +p5 +atp6 +Rp7 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATRESH.js b/js/MatrixOp/MATRESH.js index 74c9e6ce..b6360c47 100644 --- a/js/MatrixOp/MATRESH.js +++ b/js/MatrixOp/MATRESH.js @@ -46,7 +46,6 @@ function MATRESH() { this.typ = inverse(arguments[0]["typ"]); this.l1 = arguments[0]["l1"]; this.out = arguments[0]["out"]; - this.lab = arguments[0]["lab"]; if (!ok) { break; } @@ -93,7 +92,7 @@ function MATRESH() { var ok = false; } if (ok) { - var label = this.lab; + var label = lab; var tmpvar0 = set_io(this.model,this.graphics,list(this.l1,it),list(this.out,ot),[],[]); this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; diff --git a/js/MatrixOp/MATRESH.pickle b/js/MatrixOp/MATRESH.pickle index bfab0438..2ed9e410 100644 --- a/js/MatrixOp/MATRESH.pickle +++ b/js/MatrixOp/MATRESH.pickle @@ -4,20 +4,18 @@ p0 ((lp1 S'graphics' p2 -aS'lab' -p3 aS'l1' -p4 +p3 aS'x' -p5 +p4 aS'model' -p6 +p5 aS'typ' -p7 +p6 aS'out' -p8 -atp9 -Rp10 +p7 +atp8 +Rp9 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATSING.js b/js/MatrixOp/MATSING.js index 5b33e0e7..4ea35388 100644 --- a/js/MatrixOp/MATSING.js +++ b/js/MatrixOp/MATSING.js @@ -44,11 +44,10 @@ function MATSING() { var ok = true; this.typ = inverse(arguments[0]["typ"]); this.decomptyp = arguments[0]["decomptyp"]; - this.lab = arguments[0]["lab"]; if (!ok) { break; } - var label = this.lab; + var label = lab; if ((this.typ==1)) { if ((this.decomptyp==1)) { var function_name = "mat_sing"; diff --git a/js/MatrixOp/MATSING.pickle b/js/MatrixOp/MATSING.pickle index 3e10a26a..6f234289 100644 --- a/js/MatrixOp/MATSING.pickle +++ b/js/MatrixOp/MATSING.pickle @@ -2,20 +2,18 @@ c__builtin__ set p0 ((lp1 -S'lab' +S'x' p2 -aS'graphics' +aS'model' p3 -aS'x' +aS'typ' p4 -aS'model' +aS'decomptyp' p5 -aS'typ' +aS'graphics' p6 -aS'decomptyp' -p7 -atp8 -Rp9 +atp7 +Rp8 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATSUM.js b/js/MatrixOp/MATSUM.js index efa7a21f..8a48fd1f 100644 --- a/js/MatrixOp/MATSUM.js +++ b/js/MatrixOp/MATSUM.js @@ -44,11 +44,10 @@ function MATSUM() { var ok = true; this.typ = inverse(arguments[0]["typ"]); this.decomptyp = arguments[0]["decomptyp"]; - this.lab = arguments[0]["lab"]; if (!ok) { break; } - var label = this.lab; + var label = lab; if ((this.typ==1)) { if ((this.decomptyp==0)) { var function_name = "mat_sum"; diff --git a/js/MatrixOp/MATSUM.pickle b/js/MatrixOp/MATSUM.pickle index f19c81c9..4712cd50 100644 --- a/js/MatrixOp/MATSUM.pickle +++ b/js/MatrixOp/MATSUM.pickle @@ -2,20 +2,18 @@ c__builtin__ set p0 ((lp1 -S'lab' +S'x' p2 -aS'graphics' +aS'model' p3 -aS'x' +aS'typ' p4 -aS'model' +aS'decomptyp' p5 -aS'typ' +aS'graphics' p6 -aS'decomptyp' -p7 -atp8 -Rp9 +atp7 +Rp8 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATZREIM.js b/js/MatrixOp/MATZREIM.js index 3a9bdb58..1bd5c35d 100644 --- a/js/MatrixOp/MATZREIM.js +++ b/js/MatrixOp/MATZREIM.js @@ -42,11 +42,10 @@ function MATZREIM() { while (true) { var ok = true; this.decomptyp = arguments[0]["decomptyp"]; - this.lab = arguments[0]["lab"]; if (!ok) { break; } - var label = this.lab; + var label = lab; if ((this.decomptyp==1)) { var function_name = "matz_reim"; var in1 = [-1,-2]; diff --git a/js/MatrixOp/MATZREIM.pickle b/js/MatrixOp/MATZREIM.pickle index 27ed69f0..9f7c8561 100644 --- a/js/MatrixOp/MATZREIM.pickle +++ b/js/MatrixOp/MATZREIM.pickle @@ -6,14 +6,12 @@ S'x' p2 aS'model' p3 -aS'lab' -p4 aS'decomptyp' -p5 +p4 aS'graphics' -p6 -atp7 -Rp8 +p5 +atp6 +Rp7 .(dp0 S'model.dstate' p1 diff --git a/js/Misc/CBLOCK.js b/js/Misc/CBLOCK.js index 9bd6992a..c2f8ee2a 100644 --- a/js/Misc/CBLOCK.js +++ b/js/Misc/CBLOCK.js @@ -72,11 +72,10 @@ function CBLOCK() { this.auto0 = arguments[0]["auto0"]; this.depu = parseBoolean(arguments[0]["depu"]); this.dept = parseBoolean(arguments[0]["dept"]); - this.lab = arguments[0]["lab"]; if (!ok) { break; } - label[1-1] = this.lab; + label[1-1] = lab; var funam = stripblanks(this.function_name); this.xx = this.xx.slice(); this.z = this.z.slice(); diff --git a/js/Misc/CBLOCK.pickle b/js/Misc/CBLOCK.pickle index 7fb5b3f6..1b044560 100644 --- a/js/Misc/CBLOCK.pickle +++ b/js/Misc/CBLOCK.pickle @@ -24,22 +24,20 @@ aS'xx' p11 aS'rpar' p12 -aS'lab' -p13 aS'ipar' -p14 +p13 aS'graphics' -p15 +p14 aS'x' -p16 +p15 aS'model' -p17 +p16 aS'z' -p18 +p17 aS'function_name' -p19 -atp20 -Rp21 +p18 +atp19 +Rp20 .(dp0 S'ci' p1 diff --git a/js/Misc/CBLOCK4.js b/js/Misc/CBLOCK4.js index 19dc8fa3..0809b51a 100644 --- a/js/Misc/CBLOCK4.js +++ b/js/Misc/CBLOCK4.js @@ -66,11 +66,10 @@ function CBLOCK4() { this.auto0 = arguments[0]["auto0"]; this.depu = parseBoolean(arguments[0]["depu"]); this.dept = parseBoolean(arguments[0]["dept"]); - this.lab = arguments[0]["lab"]; if (!ok) { break; } - label[1-1] = this.lab; + label[1-1] = lab; var funam = stripblanks(this.function_name); this.xx = this.xx.slice(); this.z = this.z.slice(); diff --git a/js/Misc/CBLOCK4.pickle b/js/Misc/CBLOCK4.pickle index e96df717..c64be475 100644 --- a/js/Misc/CBLOCK4.pickle +++ b/js/Misc/CBLOCK4.pickle @@ -18,38 +18,36 @@ aS'function_name' p8 aS'in1' p9 -aS'lab' -p10 aS'it' -p11 +p10 aS'graphics' -p12 +p11 aS'nmode' -p13 +p12 aS'z' -p14 +p13 aS'xx' -p15 +p14 aS'nzcr' -p16 +p15 aS'depu' -p17 +p16 aS'dept' -p18 +p17 aS'opar' -p19 +p18 aS'oz' -p20 +p19 aS'ipar' -p21 +p20 aS'x' -p22 +p21 aS'model' -p23 +p22 aS'ot' -p24 -atp25 -Rp26 +p23 +atp24 +Rp25 .(dp0 S'model.odstate' p1 diff --git a/js/Misc/MBLOCK.js b/js/Misc/MBLOCK.js index f0550d85..d47ae31f 100644 --- a/js/Misc/MBLOCK.js +++ b/js/Misc/MBLOCK.js @@ -58,7 +58,7 @@ function MBLOCK() { } var exprs = tlist(["MBLOCK","in","intype","out","outtype","param","paramv","pprop","nameF","funtxt"],exprs[1-1][1-1],exprs[1-1][2-1],exprs[1-1][3-1],exprs[1-1][4-1],exprs[1-1][5-1],paramv,sci2exp(this.pprop.slice()),exprs[1-1][7-1],exprs[2-1]); } - this.lab_1 = list(exprs.in,exprs.intype,exprs.out,exprs.outtype,exprs.param,exprs.pprop,exprs.nameF); + var lab_1 = list(exprs.in,exprs.intype,exprs.out,exprs.outtype,exprs.param,exprs.pprop,exprs.nameF); var lab_2 = exprs.paramv; while (true) { var ok = true; @@ -69,7 +69,6 @@ function MBLOCK() { this.Tparam = arguments[0]["Tparam"]; this.pprop = inverse(arguments[0]["pprop"]); this.Tfunam = arguments[0]["Tfunam"]; - this.lab_1 = arguments[0]["lab_1"]; if (!ok) { break; } @@ -265,11 +264,11 @@ function MBLOCK() { this.model.rpar = new ScilabDouble([this.model.rpar],[paramv[i-1].slice()]); } this.model.sim[1-1] = new ScilabDouble([this.funam]); - exprs.in = this.lab_1[1-1]; - exprs.intype = this.lab_1[2-1]; - exprs.out = this.lab_1[3-1]; - exprs.outtype = this.lab_1[4-1]; - exprs.param = this.lab_1[5-1]; + exprs.in = lab_1[1-1]; + exprs.intype = lab_1[2-1]; + exprs.out = lab_1[3-1]; + exprs.outtype = lab_1[4-1]; + exprs.param = lab_1[5-1]; exprs.paramv = list(); if (Tparam_sz!=0) { if (this.type[lab_2-1]==15) { @@ -282,8 +281,8 @@ function MBLOCK() { } } } - exprs.pprop = this.lab_1[6-1]; - exprs.nameF = this.lab_1[7-1]; + exprs.pprop = lab_1[6-1]; + exprs.nameF = lab_1[7-1]; exprs.funtxt = tt; this.x.model = this.model; this.graphics.gr_i[1-1][1-1] = new ScilabString(["txt=[\'Modelica\';\' "+nameF+" \'];"]); diff --git a/js/Misc/MBLOCK.pickle b/js/Misc/MBLOCK.pickle index 8c1cc41c..6f7bc938 100644 --- a/js/Misc/MBLOCK.pickle +++ b/js/Misc/MBLOCK.pickle @@ -4,40 +4,38 @@ p0 ((lp1 S'Touttype' p2 -aS'lab_1' -p3 aS'Tparam' -p4 +p3 aS'intype' -p5 +p4 aS'in1' -p6 +p5 aS'Tin' -p7 +p6 aS'outtype' -p8 +p7 aS'Tout' -p9 +p8 aS'pprop' -p10 +p9 aS'graphics' -p11 +p10 aS'funam' -p12 +p11 aS'x' -p13 +p12 aS'model' -p14 +p13 aS'out' -p15 +p14 aS'type' -p16 +p15 aS'Tintype' -p17 +p16 aS'Tfunam' -p18 -atp19 -Rp20 +p17 +atp18 +Rp19 .(dp0 S'rhs_txt' p1 diff --git a/js/Misc/c_block.js b/js/Misc/c_block.js index 97ce52d1..18d41122 100644 --- a/js/Misc/c_block.js +++ b/js/Misc/c_block.js @@ -49,14 +49,13 @@ function c_block() { this.o = parseFloat(arguments[0]["o"]); this.rpar = inverse(arguments[0]["rpar"]); this.funam = arguments[0]["funam"]; - this.lab = arguments[0]["lab"]; if (!ok) { break; } if (this.funam==" ") { break; } - label[1-1] = this.lab; + label[1-1] = lab; this.rpar = this.rpar.slice(); this.i = int(this.i.slice()); var ni = size(this.i,1); diff --git a/js/Misc/c_block.pickle b/js/Misc/c_block.pickle index 6d9ad356..a1000e9e 100644 --- a/js/Misc/c_block.pickle +++ b/js/Misc/c_block.pickle @@ -8,18 +8,16 @@ aS'o' p3 aS'rpar' p4 -aS'lab' -p5 aS'graphics' -p6 +p5 aS'funam' -p7 +p6 aS'x' -p8 +p7 aS'model' -p9 -atp10 -Rp11 +p8 +atp9 +Rp10 .(dp0 S'label[1-1]' p1 diff --git a/js/Misc/fortran_block.js b/js/Misc/fortran_block.js index 38be4adc..4b6be5db 100644 --- a/js/Misc/fortran_block.js +++ b/js/Misc/fortran_block.js @@ -40,14 +40,13 @@ function fortran_block() { this.o = parseFloat(arguments[0]["o"]); this.rpar = inverse(arguments[0]["rpar"]); this.funam = arguments[0]["funam"]; - this.lab = arguments[0]["lab"]; if (!ok) { break; } if (this.funam==" ") { break; } - label[1-1] = this.lab; + label[1-1] = lab; this.rpar = this.rpar.slice(); this.i = int(this.i.slice()); var ni = size(this.i,1); diff --git a/js/Misc/fortran_block.pickle b/js/Misc/fortran_block.pickle index 291369ef..c60970bb 100644 --- a/js/Misc/fortran_block.pickle +++ b/js/Misc/fortran_block.pickle @@ -8,18 +8,16 @@ aS'o' p3 aS'rpar' p4 -aS'lab' -p5 aS'graphics' -p6 +p5 aS'funam' -p7 +p6 aS'x' -p8 +p7 aS'model' -p9 -atp10 -Rp11 +p8 +atp9 +Rp10 .(dp0 S'label[1-1]' p1 diff --git a/js/Misc/generic_block.js b/js/Misc/generic_block.js index 01ccc1b0..84c6ae5e 100644 --- a/js/Misc/generic_block.js +++ b/js/Misc/generic_block.js @@ -62,11 +62,10 @@ function generic_block() { this.auto0 = arguments[0]["auto0"]; this.depu = parseBoolean(arguments[0]["depu"]); this.dept = parseBoolean(arguments[0]["dept"]); - this.lab = arguments[0]["lab"]; if (!ok) { break; } - var label = this.lab; + var label = lab; this.function_name = stripblanks(this.function_name); this.xx = this.xx.slice(); this.z = this.z.slice(); diff --git a/js/Misc/generic_block.pickle b/js/Misc/generic_block.pickle index c26a1290..a4b8edaa 100644 --- a/js/Misc/generic_block.pickle +++ b/js/Misc/generic_block.pickle @@ -22,22 +22,20 @@ aS'xx' p10 aS'funtyp' p11 -aS'lab' -p12 aS'ipar' -p13 +p12 aS'graphics' -p14 +p13 aS'x' -p15 +p14 aS'model' -p16 +p15 aS'z' -p17 +p16 aS'function_name' -p18 -atp19 -Rp20 +p17 +atp18 +Rp19 .(dp0 S'ci' p1 diff --git a/js/Misc/generic_block2.js b/js/Misc/generic_block2.js index 463f15cf..1f79af44 100644 --- a/js/Misc/generic_block2.js +++ b/js/Misc/generic_block2.js @@ -66,11 +66,10 @@ function generic_block2() { this.auto0 = arguments[0]["auto0"]; this.depu = parseBoolean(arguments[0]["depu"]); this.dept = parseBoolean(arguments[0]["dept"]); - this.lab = arguments[0]["lab"]; if (!ok) { break; } - var label = this.lab; + var label = lab; this.function_name = stripblanks(this.function_name); this.xx = this.xx.slice(); this.z = this.z.slice(); diff --git a/js/Misc/generic_block2.pickle b/js/Misc/generic_block2.pickle index 8023e025..ad3ee78a 100644 --- a/js/Misc/generic_block2.pickle +++ b/js/Misc/generic_block2.pickle @@ -24,24 +24,22 @@ aS'nzcr' p11 aS'funtyp' p12 -aS'lab' -p13 aS'ipar' -p14 +p13 aS'graphics' -p15 +p14 aS'x' -p16 +p15 aS'model' -p17 +p16 aS'z' -p18 +p17 aS'nmode' -p19 +p18 aS'function_name' -p20 -atp21 -Rp22 +p19 +atp20 +Rp21 .(dp0 S'ci' p1 diff --git a/js/Misc/generic_block3.js b/js/Misc/generic_block3.js index 55cdf65f..be27368c 100644 --- a/js/Misc/generic_block3.js +++ b/js/Misc/generic_block3.js @@ -70,11 +70,10 @@ function generic_block3() { this.auto0 = arguments[0]["auto0"]; this.depu = parseBoolean(arguments[0]["depu"]); this.dept = parseBoolean(arguments[0]["dept"]); - this.lab = arguments[0]["lab"]; if (!ok) { break; } - var label = this.lab; + var label = lab; this.function_name = stripblanks(this.function_name); this.xx = this.xx.slice(); this.z = this.z.slice(); diff --git a/js/Misc/generic_block3.pickle b/js/Misc/generic_block3.pickle index 9a802844..994993fa 100644 --- a/js/Misc/generic_block3.pickle +++ b/js/Misc/generic_block3.pickle @@ -22,36 +22,34 @@ aS'function_name' p10 aS'in1' p11 -aS'lab' -p12 aS'graphics' -p13 +p12 aS'nmode' -p14 +p13 aS'z' -p15 +p14 aS'xx' -p16 +p15 aS'nzcr' -p17 +p16 aS'depu' -p18 +p17 aS'dept' -p19 +p18 aS'opar' -p20 +p19 aS'oz' -p21 +p20 aS'ipar' -p22 +p21 aS'x' -p23 +p22 aS'model' -p24 +p23 aS'ot' -p25 -atp26 -Rp27 +p24 +atp25 +Rp26 .(dp0 S'model.odstate' p1 diff --git a/js/Misc/scifunc_block.js b/js/Misc/scifunc_block.js index 9da74f19..9f843979 100644 --- a/js/Misc/scifunc_block.js +++ b/js/Misc/scifunc_block.js @@ -63,11 +63,10 @@ function scifunc_block() { this.rpar = inverse(arguments[0]["rpar"]); this.auto0 = arguments[0]["auto0"]; this.deptime = arguments[0]["deptime"]; - this.lab = arguments[0]["lab"]; if (!ok) { break; } - exprs[1-1] = this.lab; + exprs[1-1] = lab; this.xx = this.xx.slice(); this.z = this.z.slice(); this.rpar = this.rpar.slice(); diff --git a/js/Misc/scifunc_block.pickle b/js/Misc/scifunc_block.pickle index 4a6e19c2..95ffe5db 100644 --- a/js/Misc/scifunc_block.pickle +++ b/js/Misc/scifunc_block.pickle @@ -18,18 +18,16 @@ aS'rpar' p8 aS'xx' p9 -aS'lab' -p10 aS'graphics' -p11 +p10 aS'x' -p12 +p11 aS'model' -p13 +p12 aS'z' -p14 -atp15 -Rp16 +p13 +atp14 +Rp15 .(dp0 S'exprs[1-1]' p1 diff --git a/js/Misc/scifunc_block_m.js b/js/Misc/scifunc_block_m.js index e4954df0..2df3f544 100644 --- a/js/Misc/scifunc_block_m.js +++ b/js/Misc/scifunc_block_m.js @@ -65,11 +65,10 @@ function scifunc_block_m() { this.rpar = inverse(arguments[0]["rpar"]); this.auto0 = arguments[0]["auto0"]; this.deptime = arguments[0]["deptime"]; - this.lab = arguments[0]["lab"]; if (!ok) { break; } - exprs[1-1] = this.lab; + exprs[1-1] = lab; this.xx = this.xx.slice(); this.z = this.z.slice(); this.rpar = this.rpar.slice(); diff --git a/js/Misc/scifunc_block_m.pickle b/js/Misc/scifunc_block_m.pickle index 87763930..48775162 100644 --- a/js/Misc/scifunc_block_m.pickle +++ b/js/Misc/scifunc_block_m.pickle @@ -18,18 +18,16 @@ aS'rpar' p8 aS'xx' p9 -aS'lab' -p10 aS'graphics' -p11 +p10 aS'x' -p12 +p11 aS'model' -p13 +p12 aS'z' -p14 -atp15 -Rp16 +p13 +atp14 +Rp15 .(dp0 S'exprs[1-1]' p1 diff --git a/js/NonLinear/LOOKUP_c.pickle b/js/NonLinear/LOOKUP_c.pickle index a1390816..e8e76e91 100644 --- a/js/NonLinear/LOOKUP_c.pickle +++ b/js/NonLinear/LOOKUP_c.pickle @@ -6,146 +6,118 @@ S'mean4' p2 aS'ymn1' p3 -aS'inrpar' -p4 aS'extrapo' +p4 +aS'offset' p5 -aS'graphics' -p6 aS'Pd3' +p6 +aS'inrpar' p7 -aS'Sawt1_exprs2' +aS'xx' p8 -aS'random_n_exprs2' +aS'xy' p9 -aS'xx' +aS'Tp3' p10 -aS'xy' +aS'iparin' p11 -aS'Tp3' +aS'xmn1' p12 -aS'iparin' +aS'np4' p13 -aS'xmn1' +aS'np5' p14 -aS'np4' +aS'Amp3' p15 -aS'np5' +aS'curwin' p16 -aS'Amp3' +aS'sAmp' p17 -aS'curwin' +aS'np1' p18 -aS'sAmp' +aS'Method' p19 -aS'np1' +aS'xt' p20 -aS'Method' +aS'sample5' p21 -aS'xt' +aS'graphics' p22 -aS'sample5' +aS'xa' p23 -aS'Pulse_exprs2' +aS'sAmp2' p24 aS'Cx' p25 -aS'filen' +aS'iipar' p26 -aS'xa' +aS'filen' p27 -aS'random_u_exprs2' +aS'sdelay' p28 -aS'sAmp2' +aS'ixy' p29 -aS'zok' +aS'seed4' p30 -aS'offset' +aS'seed5' p31 -aS'yt' +aS'Amp' p32 -aS'sdelay' +aS'var4' p33 -aS'ixy' +aS'Bias3' p34 -aS'seed4' +aS'Cformat' p35 -aS'seed5' +aS'xls_open' p36 -aS'Sawt2_exprs2' +aS'xmx1' p37 -aS'Amp' +aS'inipar' p38 -aS'sok' +aS'xls_read' p39 -aS'var4' +aS'sTp' p40 -aS'ymx1' +aS'argn' p41 -aS'Cformat' +aS'wp' p42 -aS'ya' +aS'phase' p43 -aS'Bias3' +aS'min5' p44 -aS'xls_open' +aS'yy' p45 -aS'myans' -p46 -aS'xmx1' -p47 -aS'inipar' -p48 -aS'xls_read' -p49 -aS'sTp' -p50 -aS'Sin_exprs2' -p51 -aS'argn' -p52 -aS'wp' -p53 -aS'phase' -p54 -aS'iipar' -p55 -aS'min5' -p56 -aS'mok' -p57 aS'Pw3' -p58 +p46 aS'sheetN' -p59 +p47 aS'xgetmouse' -p60 +p48 aS'max5' -p61 +p49 aS'rparin' -p62 +p50 aS'sample4' -p63 -aS'Cy' -p64 +p51 aS'sTp2' -p65 -aS'yy' -p66 +p52 aS'x' -p67 +p53 aS'model' -p68 +p54 aS'ORDER2' -p69 +p55 aS'irpar' -p70 +p56 aS'graf' -p71 +p57 aS'xye' -p72 -atp73 -Rp74 +p58 +atp59 +Rp60 .(dp0 S'mean4' p1 diff --git a/js/PDE/PDE.js b/js/PDE/PDE.js index 73067ed8..308dfa40 100644 --- a/js/PDE/PDE.js +++ b/js/PDE/PDE.js @@ -19,7 +19,7 @@ function PDE() { } PDE.prototype.get = function PDE() { var options = { - okk:["New block\'s name :",this.okk], + rdnom:["New block\'s name :",this.rdnom], } return options; } @@ -104,19 +104,17 @@ function PDE() { var params_pde = tmpvar1[32]; } } - this.okk = false; + var okk = false; this.rdnom = "PDE"; var ok1 = true; while (true) { - var ok = true; - this.okk = parseBoolean(arguments[0]["okk"]); + var okk = true; this.rdnom = arguments[0]["rdnom"]; - this.lab = arguments[0]["lab"]; - if (this.okk==false) { + if (okk==false) { var ok1 = false; return; } - label[3-1] = this.lab; + label[3-1] = lab; this.rdnom = stripblanks(this.rdnom); if (this.rdnom==emptystr()) { var ok1 = false; diff --git a/js/PDE/PDE.pickle b/js/PDE/PDE.pickle index 3c750d90..5d35faf7 100644 --- a/js/PDE/PDE.pickle +++ b/js/PDE/PDE.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'okk' +S'x' p2 -aS'lab' +aS'model' p3 -aS'graphics' +aS'rdnom' p4 -aS'x' +aS'graphics' p5 -aS'model' -p6 -aS'rdnom' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'params_pde' p1 diff --git a/js/Sources/CLOCK_c.js b/js/Sources/CLOCK_c.js index 2c7afa61..38e720c0 100644 --- a/js/Sources/CLOCK_c.js +++ b/js/Sources/CLOCK_c.js @@ -68,7 +68,6 @@ function CLOCK_c() { var ok = true; this.dt = arguments[0]["dt"]; this.t0 = arguments[0]["t0"]; - this.exprs0 = arguments[0]["exprs0"]; if (!ok) { break; } @@ -77,7 +76,7 @@ function CLOCK_c() { var ok = false; } if (ok) { - xx.graphics.exprs = this.exprs0; + xx.graphics.exprs = exprs0; this.model.rpar = new ScilabDouble([this.dt],[this.t0]); this.model.firing = new ScilabDouble([this.t0]); xx.model = this.model; diff --git a/js/Sources/CLOCK_c.pickle b/js/Sources/CLOCK_c.pickle index 229102f8..24f37441 100644 --- a/js/Sources/CLOCK_c.pickle +++ b/js/Sources/CLOCK_c.pickle @@ -2,20 +2,18 @@ c__builtin__ set p0 ((lp1 -S'exprs0' +S'x' p2 -aS't0' +aS'model' p3 -aS'graphics' +aS'dt' p4 -aS'x' +aS't0' p5 -aS'model' +aS'graphics' p6 -aS'dt' -p7 -atp8 -Rp9 +atp7 +Rp8 .(dp0 S'diagram.objs[1-1]' p1 diff --git a/js/Sources/CLOCK_f.js b/js/Sources/CLOCK_f.js index 2a1a0c13..2423b114 100644 --- a/js/Sources/CLOCK_f.js +++ b/js/Sources/CLOCK_f.js @@ -68,7 +68,6 @@ function CLOCK_f() { var ok = true; this.dt = arguments[0]["dt"]; this.t0 = arguments[0]["t0"]; - this.exprs0 = arguments[0]["exprs0"]; if (!ok) { break; } @@ -78,14 +77,14 @@ function CLOCK_f() { var ok = false; } if (ok) { - xx.graphics.exprs = this.exprs0; + xx.graphics.exprs = exprs0; this.model.rpar = new ScilabDouble([this.dt]); this.model.firing = new ScilabDouble([this.t0]); xx.model = this.model; break; } } - if (!and([t0_old,dt_old]==[this.t0,this.dt])||!and(this.exprs0==exprs)) { + if (!and([t0_old,dt_old]==[this.t0,this.dt])||!and(exprs0==exprs)) { newpar[size(newpar)+1-1] = path; } if (t0_old!=this.t0) { diff --git a/js/Sources/CLOCK_f.pickle b/js/Sources/CLOCK_f.pickle index c213a912..3d511cab 100644 --- a/js/Sources/CLOCK_f.pickle +++ b/js/Sources/CLOCK_f.pickle @@ -2,20 +2,18 @@ c__builtin__ set p0 ((lp1 -S'exprs0' +S'x' p2 -aS't0' +aS'model' p3 -aS'graphics' +aS'dt' p4 -aS'x' +aS't0' p5 -aS'model' +aS'graphics' p6 -aS'dt' -p7 -atp8 -Rp9 +atp7 +Rp8 .(dp0 S'diagram.objs[1-1]' p1 diff --git a/js/Sources/CURVE_c.pickle b/js/Sources/CURVE_c.pickle index 2280a785..f95c8324 100644 --- a/js/Sources/CURVE_c.pickle +++ b/js/Sources/CURVE_c.pickle @@ -6,146 +6,118 @@ S'mean4' p2 aS'ymn1' p3 -aS'inrpar' +aS'offset' p4 -aS'sok' +aS'Pd3' p5 -aS'graphics' +aS'inrpar' p6 -aS'Pd3' +aS'xx' p7 -aS'Sawt1_exprs2' +aS'xy' p8 -aS'random_n_exprs2' +aS'Tp3' p9 -aS'xx' +aS'iparin' p10 -aS'xy' +aS'xmn1' p11 -aS'Tp3' +aS'np4' p12 -aS'iparin' +aS'np5' p13 -aS'xmn1' +aS'Amp3' p14 -aS'np4' +aS'curwin' p15 -aS'np5' +aS'sAmp' p16 -aS'Amp3' +aS'np1' p17 -aS'curwin' +aS'Method' p18 -aS'sAmp' +aS'xt' p19 -aS'np1' +aS'sample5' p20 -aS'Method' +aS'graphics' p21 -aS'xt' +aS'xa' p22 -aS'sample5' +aS'sAmp2' p23 -aS'Pulse_exprs2' -p24 aS'Cx' +p24 +aS'iipar' p25 aS'filen' p26 -aS'xa' +aS'sdelay' p27 -aS'random_u_exprs2' +aS'ixy' p28 -aS'sAmp2' +aS'seed4' p29 -aS'zok' +aS'seed5' p30 -aS'offset' +aS'Amp' p31 -aS'yt' +aS'PeriodicOption' p32 -aS'sdelay' +aS'var4' p33 -aS'ixy' +aS'Bias3' p34 -aS'seed4' +aS'Cformat' p35 -aS'seed5' +aS'xls_open' p36 -aS'Sawt2_exprs2' +aS'xmx1' p37 -aS'Amp' +aS'inipar' p38 -aS'PeriodicOption' +aS'xls_read' p39 -aS'var4' +aS'sTp' p40 -aS'ymx1' +aS'argn' p41 -aS'Cformat' +aS'wp' p42 -aS'ya' +aS'phase' p43 -aS'Bias3' +aS'min5' p44 -aS'xls_open' +aS'yy' p45 -aS'myans' -p46 -aS'xmx1' -p47 -aS'inipar' -p48 -aS'xls_read' -p49 -aS'sTp' -p50 -aS'Sin_exprs2' -p51 -aS'argn' -p52 -aS'wp' -p53 -aS'phase' -p54 -aS'iipar' -p55 -aS'min5' -p56 -aS'mok' -p57 aS'Pw3' -p58 +p46 aS'sheetN' -p59 +p47 aS'xgetmouse' -p60 +p48 aS'max5' -p61 +p49 aS'rparin' -p62 +p50 aS'sample4' -p63 -aS'Cy' -p64 +p51 aS'sTp2' -p65 -aS'yy' -p66 +p52 aS'x' -p67 +p53 aS'model' -p68 +p54 aS'ORDER2' -p69 +p55 aS'irpar' -p70 +p56 aS'graf' -p71 +p57 aS'xye' -p72 -atp73 -Rp74 +p58 +atp59 +Rp60 .(dp0 S'mean4' p1 diff --git a/sci2jsyacc.py b/sci2jsyacc.py index c36e099d..6fb6960e 100755 --- a/sci2jsyacc.py +++ b/sci2jsyacc.py @@ -565,13 +565,11 @@ def p_lterm_assignment_expression(p): VARCOUNT += 1 var = var[1:-1] ltermvars = var.split(',') - idx = 0 - for var in ltermvars: + for idx, var in enumerate(ltermvars): prefix = '' if var in LOCAL_VARS and '.' not in var: prefix = 'var ' p[0] += '%*s%s%s = %s[%d];\n' % (INDENT_LEVEL * INDENT_SIZE, ' ', prefix, var, tmpvar, idx) - idx += 1 else: prefix = '' value = p[3][0] @@ -694,37 +692,39 @@ def p_modelexpression_expression(p): def p_getvalueassignment_getvalue_arguments(p): 'getvalueassignment : lterm ASSIGNMENT SCICOS_GETVALUE OPENBRACKET getvaluearguments CLOSEBRACKET EOL' global OPTIONS_BLOCK - var = 'ok' - add_local_var(var) - p[0] = '%*svar %s = true;\n' % (INDENT_LEVEL * INDENT_SIZE, ' ', print_var(var)) lterm = p[1] if lterm[0] == '[': lterm = lterm[1:-1] ltermvars = lterm.split(',') - idx = 0 - for var in ltermvars: + lastidx = len(ltermvars) - 2 + for idx, var in enumerate(ltermvars, -1): if var[:5] == 'this.': basevar = var[5:] else: basevar = var - if basevar in ('ok', 'exprs'): - continue - add_global_var(basevar, force=True) + if idx in (-1, lastidx): + add_local_var(basevar) + else: + add_global_var(basevar, force=True) var = print_var(basevar) - vartype = get_var_vartype(basevar, STRING_TYPE) - parsefunction = PARSE_MAP.get(vartype, '') - if parsefunction != '': - parsecall = '%s(arguments[%d][\"%s\"])' % (parsefunction, 0, basevar) + if idx == -1: + p[0] = '%*svar %s = true;\n' % (INDENT_LEVEL * INDENT_SIZE, ' ', var) + elif idx == len(ltermvars) - 2: + pass else: - parsecall = 'arguments[%d][\"%s\"]' % (0, basevar) - p[0] += "%*s%s = %s;\n" % (INDENT_LEVEL * INDENT_SIZE, ' ', var, parsecall) - if idx < len(LABELS): - if vartype == MATRIX_TYPE: - showvar = var + '.toString().replace(/,/g," ")' + vartype = get_var_vartype(basevar, STRING_TYPE) + parsefunction = PARSE_MAP.get(vartype, '') + if parsefunction != '': + parsecall = '%s(arguments[%d][\"%s\"])' % (parsefunction, 0, basevar) else: - showvar = var - OPTIONS_BLOCK += '%*s%s:[%s,%s],\n' % (INDENT_LEVEL * INDENT_SIZE, ' ', basevar, LABELS[idx], showvar) - idx += 1 + parsecall = 'arguments[%d][\"%s\"]' % (0, basevar) + p[0] += "%*s%s = %s;\n" % (INDENT_LEVEL * INDENT_SIZE, ' ', var, parsecall) + if idx < len(LABELS): + if vartype == MATRIX_TYPE: + showvar = var + '.toString().replace(/,/g," ")' + else: + showvar = var + OPTIONS_BLOCK += '%*s%s:[%s,%s],\n' % (INDENT_LEVEL * INDENT_SIZE, ' ', basevar, LABELS[idx], showvar) def p_getvaluearguments_arg1_arg2_arg3_arg4(p): 'getvaluearguments : getvaluearg1 COMMA getvaluearg2 COMMA getvaluearg3 COMMA getvaluearg4' |