diff options
author | Sunil Shetye | 2018-08-24 11:46:02 +0530 |
---|---|---|
committer | Sunil Shetye | 2018-08-27 16:43:40 +0530 |
commit | 3386d0d537a498adce65f313aacb7ca4a147a4d2 (patch) | |
tree | dc8b98c70c10cec2c9f3f37b5858e1afd6554698 /js/IntegerOp | |
parent | 9fee9bd7e5e356e872c7a539d4a6cfa89cae593c (diff) | |
download | sci2js-3386d0d537a498adce65f313aacb7ca4a147a4d2.tar.gz sci2js-3386d0d537a498adce65f313aacb7ca4a147a4d2.tar.bz2 sci2js-3386d0d537a498adce65f313aacb7ca4a147a4d2.zip |
remove exprs and gr_i from default global list
Diffstat (limited to 'js/IntegerOp')
-rw-r--r-- | js/IntegerOp/BITCLEAR.js | 10 | ||||
-rw-r--r-- | js/IntegerOp/BITCLEAR.pickle | 16 | ||||
-rw-r--r-- | js/IntegerOp/BITSET.js | 10 | ||||
-rw-r--r-- | js/IntegerOp/BITSET.pickle | 16 | ||||
-rw-r--r-- | js/IntegerOp/CONVERT.js | 10 | ||||
-rw-r--r-- | js/IntegerOp/CONVERT.pickle | 18 | ||||
-rw-r--r-- | js/IntegerOp/DFLIPFLOP.js | 4 | ||||
-rw-r--r-- | js/IntegerOp/DFLIPFLOP.pickle | 10 | ||||
-rw-r--r-- | js/IntegerOp/DLATCH.js | 4 | ||||
-rw-r--r-- | js/IntegerOp/DLATCH.pickle | 10 | ||||
-rw-r--r-- | js/IntegerOp/EXTRACTBITS.js | 10 | ||||
-rw-r--r-- | js/IntegerOp/EXTRACTBITS.pickle | 16 | ||||
-rw-r--r-- | js/IntegerOp/INTMUL.js | 10 | ||||
-rw-r--r-- | js/IntegerOp/INTMUL.pickle | 16 | ||||
-rw-r--r-- | js/IntegerOp/JKFLIPFLOP.js | 6 | ||||
-rw-r--r-- | js/IntegerOp/JKFLIPFLOP.pickle | 14 | ||||
-rw-r--r-- | js/IntegerOp/LOGIC.js | 10 | ||||
-rw-r--r-- | js/IntegerOp/LOGIC.pickle | 16 | ||||
-rw-r--r-- | js/IntegerOp/SHIFT.js | 10 | ||||
-rw-r--r-- | js/IntegerOp/SHIFT.pickle | 16 | ||||
-rw-r--r-- | js/IntegerOp/SRFLIPFLOP.js | 6 | ||||
-rw-r--r-- | js/IntegerOp/SRFLIPFLOP.pickle | 14 |
22 files changed, 104 insertions, 148 deletions
diff --git a/js/IntegerOp/BITCLEAR.js b/js/IntegerOp/BITCLEAR.js index fe9272b7..bd741b62 100644 --- a/js/IntegerOp/BITCLEAR.js +++ b/js/IntegerOp/BITCLEAR.js @@ -12,9 +12,9 @@ function BITCLEAR() { this.model.opar = list(new ScilabDouble([int32(0)])); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[sci2exp(3)],[sci2exp(0)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BITCLEAR\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[sci2exp(3)],[sci2exp(0)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BITCLEAR\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } BITCLEAR.prototype.details = function BITCLEAR() { @@ -28,7 +28,7 @@ function BITCLEAR() { return options; } BITCLEAR.prototype.set = function BITCLEAR() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.Datatype = arguments[0]["Datatype"]; @@ -84,7 +84,7 @@ function BITCLEAR() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.opar = list(new ScilabDouble([n])); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/IntegerOp/BITCLEAR.pickle b/js/IntegerOp/BITCLEAR.pickle index b1c039db..299da3e6 100644 --- a/js/IntegerOp/BITCLEAR.pickle +++ b/js/IntegerOp/BITCLEAR.pickle @@ -4,20 +4,16 @@ p0 ((lp1 S'Datatype' p2 -aS'exprs' +aS'x' p3 -aS'gr_i' +aS'model' p4 -aS'graphics' +aS'bit' p5 -aS'x' +aS'graphics' p6 -aS'model' -p7 -aS'bit' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'arg1' p1 diff --git a/js/IntegerOp/BITSET.js b/js/IntegerOp/BITSET.js index 1c081016..dac0cb40 100644 --- a/js/IntegerOp/BITSET.js +++ b/js/IntegerOp/BITSET.js @@ -12,9 +12,9 @@ function BITSET() { this.model.opar = list(new ScilabDouble([uint32(0)])); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[sci2exp(3)],[sci2exp(0)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BITSET\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[sci2exp(3)],[sci2exp(0)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BITSET\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } BITSET.prototype.details = function BITSET() { @@ -28,7 +28,7 @@ function BITSET() { return options; } BITSET.prototype.set = function BITSET() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.Datatype = arguments[0]["Datatype"]; @@ -82,7 +82,7 @@ function BITSET() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.opar = list(new ScilabDouble([n])); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/IntegerOp/BITSET.pickle b/js/IntegerOp/BITSET.pickle index b1c039db..299da3e6 100644 --- a/js/IntegerOp/BITSET.pickle +++ b/js/IntegerOp/BITSET.pickle @@ -4,20 +4,16 @@ p0 ((lp1 S'Datatype' p2 -aS'exprs' +aS'x' p3 -aS'gr_i' +aS'model' p4 -aS'graphics' +aS'bit' p5 -aS'x' +aS'graphics' p6 -aS'model' -p7 -aS'bit' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'arg1' p1 diff --git a/js/IntegerOp/CONVERT.js b/js/IntegerOp/CONVERT.js index 7be0270c..6df2a9c6 100644 --- a/js/IntegerOp/CONVERT.js +++ b/js/IntegerOp/CONVERT.js @@ -14,9 +14,9 @@ function CONVERT() { this.model.ipar = new ScilabDouble([sgn]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[sci2exp(1)],[sci2exp(3)],[sci2exp(0)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONVERT\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[sci2exp(1)],[sci2exp(3)],[sci2exp(0)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONVERT\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } CONVERT.prototype.details = function CONVERT() { @@ -31,7 +31,7 @@ function CONVERT() { return options; } CONVERT.prototype.set = function CONVERT() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.it = parseFloat(arguments[0]["it"]); @@ -371,7 +371,7 @@ function CONVERT() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; diff --git a/js/IntegerOp/CONVERT.pickle b/js/IntegerOp/CONVERT.pickle index 094416c8..5f9f7acc 100644 --- a/js/IntegerOp/CONVERT.pickle +++ b/js/IntegerOp/CONVERT.pickle @@ -4,22 +4,18 @@ p0 ((lp1 S'it' p2 -aS'exprs' -p3 -aS'gr_i' -p4 aS'graphics' -p5 +p3 aS'np' -p6 +p4 aS'x' -p7 +p5 aS'model' -p8 +p6 aS'ot' -p9 -atp10 -Rp11 +p7 +atp8 +Rp9 .(dp0 S'arg1' p1 diff --git a/js/IntegerOp/DFLIPFLOP.js b/js/IntegerOp/DFLIPFLOP.js index 33c1721b..059eb07d 100644 --- a/js/IntegerOp/DFLIPFLOP.js +++ b/js/IntegerOp/DFLIPFLOP.js @@ -88,8 +88,8 @@ function DFLIPFLOP() { this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabBoolean([true,false]); this.model.rpar = new ScilabDouble([scs_m]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DFLIPFLOP\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabDouble([]),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DFLIPFLOP\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabDouble([]),gr_i); return new BasicBlock(this.x); } DFLIPFLOP.prototype.details = function DFLIPFLOP() { diff --git a/js/IntegerOp/DFLIPFLOP.pickle b/js/IntegerOp/DFLIPFLOP.pickle index 77edf88d..c14101fa 100644 --- a/js/IntegerOp/DFLIPFLOP.pickle +++ b/js/IntegerOp/DFLIPFLOP.pickle @@ -6,14 +6,10 @@ S'x' p2 aS'model' p3 -aS'gr_i' -p4 -aS'exprs' -p5 aS'graphics' -p6 -atp7 -Rp8 +p4 +atp5 +Rp6 .(dp0 S'scs_m_1.objs[9-1]' p1 diff --git a/js/IntegerOp/DLATCH.js b/js/IntegerOp/DLATCH.js index 2f7a70d9..b089a1c4 100644 --- a/js/IntegerOp/DLATCH.js +++ b/js/IntegerOp/DLATCH.js @@ -33,8 +33,8 @@ function DLATCH() { this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabBoolean([true,false]); this.model.rpar = new ScilabDouble([scs_m]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLATCH\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabDouble([]),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLATCH\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabDouble([]),gr_i); return new BasicBlock(this.x); } DLATCH.prototype.details = function DLATCH() { diff --git a/js/IntegerOp/DLATCH.pickle b/js/IntegerOp/DLATCH.pickle index 6f7b6171..960f59fd 100644 --- a/js/IntegerOp/DLATCH.pickle +++ b/js/IntegerOp/DLATCH.pickle @@ -6,14 +6,10 @@ S'x' p2 aS'model' p3 -aS'gr_i' -p4 -aS'exprs' -p5 aS'graphics' -p6 -atp7 -Rp8 +p4 +atp5 +Rp6 .(dp0 S'model.sim' p1 diff --git a/js/IntegerOp/EXTRACTBITS.js b/js/IntegerOp/EXTRACTBITS.js index 01d38289..e3bb01e4 100644 --- a/js/IntegerOp/EXTRACTBITS.js +++ b/js/IntegerOp/EXTRACTBITS.js @@ -13,9 +13,9 @@ function EXTRACTBITS() { this.model.ipar = new ScilabDouble([0,numb]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[sci2exp(3)],[sci2exp(1)],[sci2exp(0)],[sci2exp(0)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTRACTBITS\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[sci2exp(3)],[sci2exp(1)],[sci2exp(0)],[sci2exp(0)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTRACTBITS\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } EXTRACTBITS.prototype.details = function EXTRACTBITS() { @@ -31,7 +31,7 @@ function EXTRACTBITS() { return options; } EXTRACTBITS.prototype.set = function EXTRACTBITS() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.Datatype = arguments[0]["Datatype"]; @@ -231,7 +231,7 @@ function EXTRACTBITS() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.ipar = new ScilabDouble([int(this.bit.slice())],[int(numb.slice())]); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/IntegerOp/EXTRACTBITS.pickle b/js/IntegerOp/EXTRACTBITS.pickle index be93e054..47125fd4 100644 --- a/js/IntegerOp/EXTRACTBITS.pickle +++ b/js/IntegerOp/EXTRACTBITS.pickle @@ -8,20 +8,16 @@ aS'Datatype' p3 aS'rule' p4 -aS'exprs' -p5 -aS'gr_i' -p6 aS'graphics' -p7 +p5 aS'x' -p8 +p6 aS'model' -p9 +p7 aS'bit' -p10 -atp11 -Rp12 +p8 +atp9 +Rp10 .(dp0 S'numb' p1 diff --git a/js/IntegerOp/INTMUL.js b/js/IntegerOp/INTMUL.js index 448639c2..826e4ea2 100644 --- a/js/IntegerOp/INTMUL.js +++ b/js/IntegerOp/INTMUL.js @@ -14,9 +14,9 @@ function INTMUL() { this.model.ipar = new ScilabDouble([sgn]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[sci2exp(3)],[sci2exp(0)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTMUL\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[sci2exp(3)],[sci2exp(0)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTMUL\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } INTMUL.prototype.details = function INTMUL() { @@ -30,7 +30,7 @@ function INTMUL() { return options; } INTMUL.prototype.set = function INTMUL() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.Datatype = arguments[0]["Datatype"]; @@ -105,7 +105,7 @@ function INTMUL() { } if (ok) { this.model.ipar = new ScilabDouble([this.np]); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; diff --git a/js/IntegerOp/INTMUL.pickle b/js/IntegerOp/INTMUL.pickle index 1ead3178..2972f496 100644 --- a/js/IntegerOp/INTMUL.pickle +++ b/js/IntegerOp/INTMUL.pickle @@ -4,20 +4,16 @@ p0 ((lp1 S'Datatype' p2 -aS'exprs' +aS'x' p3 -aS'gr_i' +aS'model' p4 -aS'graphics' -p5 aS'np' +p5 +aS'graphics' p6 -aS'x' -p7 -aS'model' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'arg1' p1 diff --git a/js/IntegerOp/JKFLIPFLOP.js b/js/IntegerOp/JKFLIPFLOP.js index 2b4aaead..60bc1c12 100644 --- a/js/IntegerOp/JKFLIPFLOP.js +++ b/js/IntegerOp/JKFLIPFLOP.js @@ -44,8 +44,8 @@ function JKFLIPFLOP() { this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabBoolean([true,false]); this.model.rpar = new ScilabDouble([scs_m]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"JKFLIPFLOP\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabDouble([]),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"JKFLIPFLOP\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabDouble([]),gr_i); return new BasicBlock(this.x); } JKFLIPFLOP.prototype.details = function JKFLIPFLOP() { @@ -64,7 +64,7 @@ function JKFLIPFLOP() { } } var newpar = list(); - this.exprs = xx.graphics.exprs[1-1]; + var exprs = xx.graphics.exprs[1-1]; this.model = xx.model; var init_old = this.model.odstate[1-1]; while (true) { diff --git a/js/IntegerOp/JKFLIPFLOP.pickle b/js/IntegerOp/JKFLIPFLOP.pickle index e65a481f..657cb309 100644 --- a/js/IntegerOp/JKFLIPFLOP.pickle +++ b/js/IntegerOp/JKFLIPFLOP.pickle @@ -4,20 +4,16 @@ p0 ((lp1 S'exprs0' p2 -aS'exprs' +aS'x' p3 -aS'init' +aS'model' p4 -aS'gr_i' +aS'init' p5 aS'graphics' p6 -aS'x' -p7 -aS'model' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'xx.model' p1 diff --git a/js/IntegerOp/LOGIC.js b/js/IntegerOp/LOGIC.js index cba94d18..eaba81ed 100644 --- a/js/IntegerOp/LOGIC.js +++ b/js/IntegerOp/LOGIC.js @@ -15,9 +15,9 @@ function LOGIC() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[sci2exp(this.mat)],[sci2exp(0)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOGIC\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[sci2exp(this.mat)],[sci2exp(0)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOGIC\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } LOGIC.prototype.details = function LOGIC() { @@ -31,7 +31,7 @@ function LOGIC() { return options; } LOGIC.prototype.set = function LOGIC() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.mat = inverse(arguments[0]["mat"]); @@ -63,7 +63,7 @@ function LOGIC() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.mat = int8(this.mat); this.model.opar = list(new ScilabDouble([this.mat])); this.x.graphics = this.graphics; diff --git a/js/IntegerOp/LOGIC.pickle b/js/IntegerOp/LOGIC.pickle index 59a29827..53b62f5f 100644 --- a/js/IntegerOp/LOGIC.pickle +++ b/js/IntegerOp/LOGIC.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'herit' +S'x' p2 -aS'mat' +aS'model' p3 -aS'exprs' +aS'herit' p4 -aS'gr_i' +aS'mat' p5 aS'graphics' p6 -aS'x' -p7 -aS'model' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'arg1' p1 diff --git a/js/IntegerOp/SHIFT.js b/js/IntegerOp/SHIFT.js index 25eead3c..3a1f1b92 100644 --- a/js/IntegerOp/SHIFT.js +++ b/js/IntegerOp/SHIFT.js @@ -15,9 +15,9 @@ function SHIFT() { this.model.ipar = new ScilabDouble(sgn); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[sci2exp(3)],[sci2exp(0)],[sci2exp(0)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SHIFT\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[sci2exp(3)],[sci2exp(0)],[sci2exp(0)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SHIFT\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } SHIFT.prototype.details = function SHIFT() { @@ -32,7 +32,7 @@ function SHIFT() { return options; } SHIFT.prototype.set = function SHIFT() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.Datatype = arguments[0]["Datatype"]; @@ -122,7 +122,7 @@ function SHIFT() { } if (ok) { this.model.ipar = new ScilabDouble([this.nb]); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; diff --git a/js/IntegerOp/SHIFT.pickle b/js/IntegerOp/SHIFT.pickle index 61e6ba3a..93e31c3f 100644 --- a/js/IntegerOp/SHIFT.pickle +++ b/js/IntegerOp/SHIFT.pickle @@ -6,20 +6,16 @@ S'Datatype' p2 aS'nb' p3 -aS'exprs' -p4 -aS'gr_i' -p5 aS'graphics' -p6 +p4 aS'np' -p7 +p5 aS'x' -p8 +p6 aS'model' -p9 -atp10 -Rp11 +p7 +atp8 +Rp9 .(dp0 S'OPER' p1 diff --git a/js/IntegerOp/SRFLIPFLOP.js b/js/IntegerOp/SRFLIPFLOP.js index 60c00675..6db198f2 100644 --- a/js/IntegerOp/SRFLIPFLOP.js +++ b/js/IntegerOp/SRFLIPFLOP.js @@ -28,8 +28,8 @@ function SRFLIPFLOP() { this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabBoolean([true,false]); this.model.rpar = new ScilabDouble([scs_m]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SRFLIPFLOP\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabDouble([]),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SRFLIPFLOP\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabDouble([]),gr_i); return new BasicBlock(this.x); } SRFLIPFLOP.prototype.details = function SRFLIPFLOP() { @@ -48,7 +48,7 @@ function SRFLIPFLOP() { } } var newpar = list(); - this.exprs = xx.graphics.exprs[1-1]; + var exprs = xx.graphics.exprs[1-1]; this.model = xx.model; var init_old = this.model.odstate[1-1]; while (true) { diff --git a/js/IntegerOp/SRFLIPFLOP.pickle b/js/IntegerOp/SRFLIPFLOP.pickle index a7f8d534..a4f8d716 100644 --- a/js/IntegerOp/SRFLIPFLOP.pickle +++ b/js/IntegerOp/SRFLIPFLOP.pickle @@ -4,20 +4,16 @@ p0 ((lp1 S'exprs0' p2 -aS'exprs' +aS'x' p3 -aS'init' +aS'model' p4 -aS'gr_i' +aS'init' p5 aS'graphics' p6 -aS'x' -p7 -aS'model' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'xx.model' p1 |