diff options
author | Sunil Shetye | 2018-07-13 23:47:42 +0530 |
---|---|---|
committer | Sunil Shetye | 2018-07-15 07:11:58 +0530 |
commit | 884d1b369dec2654d46c2dab31d2ae85b0be01ba (patch) | |
tree | 07284f0a65cca09fd7811c9592c33f17b4d0f8ad /js/Events | |
parent | 6ee02952c836bb31e9b51783e6a16724fba64637 (diff) | |
download | sci2js-884d1b369dec2654d46c2dab31d2ae85b0be01ba.tar.gz sci2js-884d1b369dec2654d46c2dab31d2ae85b0be01ba.tar.bz2 sci2js-884d1b369dec2654d46c2dab31d2ae85b0be01ba.zip |
support for new standard_define
Diffstat (limited to 'js/Events')
30 files changed, 30 insertions, 44 deletions
diff --git a/js/Events/ANDLOG_f.js b/js/Events/ANDLOG_f.js index 447c5063..cf51bb95 100644 --- a/js/Events/ANDLOG_f.js +++ b/js/Events/ANDLOG_f.js @@ -9,7 +9,7 @@ function ANDLOG_f() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([false,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ANDLOG_f\",sz(1),sz(2));"]); - this.x = standard_define([3,3],this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([3,3]),this.model,[],this.gr_i); return new BasicBlock(this.x); } ANDLOG_f.prototype.details = function ANDLOG_f() { diff --git a/js/Events/ANDLOG_f.pickle b/js/Events/ANDLOG_f.pickle index a0fc71ec..fdfefb34 100644 --- a/js/Events/ANDLOG_f.pickle +++ b/js/Events/ANDLOG_f.pickle @@ -42,8 +42,7 @@ p11 g7 sS'x' p12 -g9 -sS'model' +NsS'model' p13 S'object' p14 diff --git a/js/Events/CLKSOMV_f.js b/js/Events/CLKSOMV_f.js index 2535c6ff..87658adc 100644 --- a/js/Events/CLKSOMV_f.js +++ b/js/Events/CLKSOMV_f.js @@ -9,7 +9,7 @@ function CLKSOMV_f() { this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabDouble([false,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKSOMV_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,[],this.gr_i); return new BasicBlock(this.x); } CLKSOMV_f.prototype.details = function CLKSOMV_f() { diff --git a/js/Events/CLKSOMV_f.pickle b/js/Events/CLKSOMV_f.pickle index 809d645f..4f194448 100644 --- a/js/Events/CLKSOMV_f.pickle +++ b/js/Events/CLKSOMV_f.pickle @@ -45,8 +45,7 @@ p12 g9 sS'x' p13 -g4 -sS'model' +NsS'model' p14 S'object' p15 diff --git a/js/Events/CLKSOM_f.js b/js/Events/CLKSOM_f.js index 766a2f00..a6846cb5 100644 --- a/js/Events/CLKSOM_f.js +++ b/js/Events/CLKSOM_f.js @@ -9,7 +9,7 @@ function CLKSOM_f() { this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabDouble([false,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKSOM_f\",sz(1),sz(2));"]); - this.x = standard_define([1,1]/1.2,this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,[],this.gr_i); return new BasicBlock(this.x); } CLKSOM_f.prototype.details = function CLKSOM_f() { diff --git a/js/Events/CLKSOM_f.pickle b/js/Events/CLKSOM_f.pickle index 809d645f..4f194448 100644 --- a/js/Events/CLKSOM_f.pickle +++ b/js/Events/CLKSOM_f.pickle @@ -45,8 +45,7 @@ p12 g9 sS'x' p13 -g4 -sS'model' +NsS'model' p14 S'object' p15 diff --git a/js/Events/CLKSPLIT_f.js b/js/Events/CLKSPLIT_f.js index 8611e847..5914708d 100644 --- a/js/Events/CLKSPLIT_f.js +++ b/js/Events/CLKSPLIT_f.js @@ -8,7 +8,7 @@ function CLKSPLIT_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([false,false,false]); this.model.dep_ut = new ScilabDouble([false,false]); - this.x = standard_define([1,1]/3,this.model,[],[]); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,[],[]); return new BasicBlock(this.x); } CLKSPLIT_f.prototype.details = function CLKSPLIT_f() { diff --git a/js/Events/CLKSPLIT_f.pickle b/js/Events/CLKSPLIT_f.pickle index 5ae4b378..fc3b9c64 100644 --- a/js/Events/CLKSPLIT_f.pickle +++ b/js/Events/CLKSPLIT_f.pickle @@ -39,8 +39,7 @@ p10 g7 sS'x' p11 -g9 -sS'model' +NsS'model' p12 S'object' p13 diff --git a/js/Events/END_c.js b/js/Events/END_c.js index 98c39318..c2d17e73 100644 --- a/js/Events/END_c.js +++ b/js/Events/END_c.js @@ -11,7 +11,7 @@ function END_c() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = string(this.tf); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"END_c\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } END_c.prototype.details = function END_c() { diff --git a/js/Events/END_c.pickle b/js/Events/END_c.pickle index c21c176c..6dde99ec 100644 --- a/js/Events/END_c.pickle +++ b/js/Events/END_c.pickle @@ -61,8 +61,7 @@ p18 g11 sS'x' p19 -g4 -sS'model' +NsS'model' p20 g7 sS'typ' diff --git a/js/Events/EVTDLY_c.js b/js/Events/EVTDLY_c.js index 871a83f4..4d1ac134 100644 --- a/js/Events/EVTDLY_c.js +++ b/js/Events/EVTDLY_c.js @@ -13,7 +13,7 @@ function EVTDLY_c() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = [[string(this.dt)],[sci2exp(this.ff)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTDLY_c\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } EVTDLY_c.prototype.details = function EVTDLY_c() { diff --git a/js/Events/EVTDLY_c.pickle b/js/Events/EVTDLY_c.pickle index 55521043..05b5a38c 100644 --- a/js/Events/EVTDLY_c.pickle +++ b/js/Events/EVTDLY_c.pickle @@ -70,8 +70,7 @@ p21 g17 sS'x' p22 -g4 -sS'model' +NsS'model' p23 g9 sS'typ' diff --git a/js/Events/EVTDLY_f.js b/js/Events/EVTDLY_f.js index 21dce7f6..e170b269 100644 --- a/js/Events/EVTDLY_f.js +++ b/js/Events/EVTDLY_f.js @@ -13,7 +13,7 @@ function EVTDLY_f() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = [[string(this.dt)],[sci2exp(this.ff)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTDLY_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } EVTDLY_f.prototype.details = function EVTDLY_f() { diff --git a/js/Events/EVTDLY_f.pickle b/js/Events/EVTDLY_f.pickle index 21700f9b..2b1cdf63 100644 --- a/js/Events/EVTDLY_f.pickle +++ b/js/Events/EVTDLY_f.pickle @@ -70,8 +70,7 @@ p21 g17 sS'x' p22 -g4 -sS'model' +NsS'model' p23 g9 sS'typ' diff --git a/js/Events/EVTGEN_f.js b/js/Events/EVTGEN_f.js index 7080757c..00dd9f20 100644 --- a/js/Events/EVTGEN_f.js +++ b/js/Events/EVTGEN_f.js @@ -10,7 +10,7 @@ function EVTGEN_f() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = string(this.tt); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTGEN_f\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } EVTGEN_f.prototype.details = function EVTGEN_f() { diff --git a/js/Events/EVTGEN_f.pickle b/js/Events/EVTGEN_f.pickle index ce268c69..df0c32d3 100644 --- a/js/Events/EVTGEN_f.pickle +++ b/js/Events/EVTGEN_f.pickle @@ -61,8 +61,7 @@ p17 g12 sS'x' p18 -g4 -sS'model' +NsS'model' p19 g7 sS'typ' diff --git a/js/Events/EVTVARDLY.js b/js/Events/EVTVARDLY.js index 364b4be4..b37945aa 100644 --- a/js/Events/EVTVARDLY.js +++ b/js/Events/EVTVARDLY.js @@ -12,7 +12,7 @@ function EVTVARDLY() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = string(this.model.firing); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTVARDLY\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } EVTVARDLY.prototype.details = function EVTVARDLY() { diff --git a/js/Events/EVTVARDLY.pickle b/js/Events/EVTVARDLY.pickle index 388357c2..b6833454 100644 --- a/js/Events/EVTVARDLY.pickle +++ b/js/Events/EVTVARDLY.pickle @@ -61,8 +61,7 @@ p18 g11 sS'x' p19 -g4 -sS'model' +NsS'model' p20 g7 sS'typ' diff --git a/js/Events/HALT_f.js b/js/Events/HALT_f.js index f1b8662b..1a991818 100644 --- a/js/Events/HALT_f.js +++ b/js/Events/HALT_f.js @@ -11,7 +11,7 @@ function HALT_f() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = string(this.n); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"HALT_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } HALT_f.prototype.details = function HALT_f() { diff --git a/js/Events/HALT_f.pickle b/js/Events/HALT_f.pickle index d52d6b00..7f346c16 100644 --- a/js/Events/HALT_f.pickle +++ b/js/Events/HALT_f.pickle @@ -60,8 +60,7 @@ p17 g11 sS'x' p18 -g4 -sS'model' +NsS'model' p19 g7 sS'model.ipar' diff --git a/js/Events/IFTHEL_f.js b/js/Events/IFTHEL_f.js index 952bbe7e..19ad6ce3 100644 --- a/js/Events/IFTHEL_f.js +++ b/js/Events/IFTHEL_f.js @@ -15,7 +15,7 @@ function IFTHEL_f() { this.model.nzcross = new ScilabDouble([1]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"IFTHEL_f\",sz(1),sz(2));"]); this.exprs = [[string(this.model.in)],[string(this.model.nmode)]]; - this.x = standard_define([3,3],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,3]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } IFTHEL_f.prototype.details = function IFTHEL_f() { diff --git a/js/Events/IFTHEL_f.pickle b/js/Events/IFTHEL_f.pickle index b9315ab4..24cd316f 100644 --- a/js/Events/IFTHEL_f.pickle +++ b/js/Events/IFTHEL_f.pickle @@ -98,8 +98,7 @@ p30 g6 sS'x' p31 -g8 -sS'model' +NsS'model' p32 g2 s.
\ No newline at end of file diff --git a/js/Events/MFCLCK_f.js b/js/Events/MFCLCK_f.js index 89a580df..5500683b 100644 --- a/js/Events/MFCLCK_f.js +++ b/js/Events/MFCLCK_f.js @@ -15,7 +15,7 @@ function MFCLCK_f() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = [[string(this.dt)],[string(this.nn)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MFCLCK_f\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } MFCLCK_f.prototype.details = function MFCLCK_f() { diff --git a/js/Events/MFCLCK_f.pickle b/js/Events/MFCLCK_f.pickle index 6ecf6b05..cabc0c72 100644 --- a/js/Events/MFCLCK_f.pickle +++ b/js/Events/MFCLCK_f.pickle @@ -90,8 +90,7 @@ p27 g12 sS'x' p28 -g2 -sS'model' +NsS'model' p29 g4 s.
\ No newline at end of file diff --git a/js/Events/M_freq.js b/js/Events/M_freq.js index e3a33535..31498c81 100644 --- a/js/Events/M_freq.js +++ b/js/Events/M_freq.js @@ -12,7 +12,7 @@ function M_freq() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = [[sci2exp([[1],[2]])],[sci2exp([[0],[0]])]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"M_freq\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } M_freq.prototype.details = function M_freq() { diff --git a/js/Events/M_freq.pickle b/js/Events/M_freq.pickle index 5ef62ea6..bda14450 100644 --- a/js/Events/M_freq.pickle +++ b/js/Events/M_freq.pickle @@ -105,8 +105,7 @@ p32 g13 sS'x' p33 -g8 -sS'model' +NsS'model' p34 g2 sS'ot' diff --git a/js/Events/VirtualCLK0.js b/js/Events/VirtualCLK0.js index 85cc3d75..1457a521 100644 --- a/js/Events/VirtualCLK0.js +++ b/js/Events/VirtualCLK0.js @@ -10,7 +10,7 @@ function VirtualCLK0() { this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = []; - this.x = standard_define([2,2],this.model,this.exprs," "); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs," "); return new BasicBlock(this.x); } VirtualCLK0.prototype.details = function VirtualCLK0() { diff --git a/js/Events/VirtualCLK0.pickle b/js/Events/VirtualCLK0.pickle index 11feecbd..d35c048d 100644 --- a/js/Events/VirtualCLK0.pickle +++ b/js/Events/VirtualCLK0.pickle @@ -38,8 +38,7 @@ p9 g5 sS'x' p10 -g8 -sS'model' +NsS'model' p11 S'object' p12 diff --git a/js/Events/freq_div.js b/js/Events/freq_div.js index 01cc316e..a4e0e47c 100644 --- a/js/Events/freq_div.js +++ b/js/Events/freq_div.js @@ -104,7 +104,7 @@ function freq_div() { this.model.evtout = new ScilabDouble([1]); this.model.rpar = scs_m_1; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"freq_div\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,[],this.gr_i); return new BasicBlock(this.x); } freq_div.prototype.details = function freq_div() { diff --git a/js/Events/freq_div.pickle b/js/Events/freq_div.pickle index 35055817..9b2944e4 100644 --- a/js/Events/freq_div.pickle +++ b/js/Events/freq_div.pickle @@ -188,7 +188,7 @@ p62 g4 sS'x' p63 -g4 +g8 sS'model' p64 g8 |