diff options
Diffstat (limited to 'js/Branching')
52 files changed, 52 insertions, 78 deletions
diff --git a/js/Branching/CLKFROM.js b/js/Branching/CLKFROM.js index eee27067..3775c0b9 100644 --- a/js/Branching/CLKFROM.js +++ b/js/Branching/CLKFROM.js @@ -9,7 +9,7 @@ function CLKFROM() { this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = "A"; - this.x = standard_define([2,1],this.model,this.exprs," "); + this.x = new standard_define(new ScilabDouble([2,1]),this.model,this.exprs," "); this.x.graphics.id = "From"; return new BasicBlock(this.x); } diff --git a/js/Branching/CLKFROM.pickle b/js/Branching/CLKFROM.pickle index e7091f3f..75776b33 100644 --- a/js/Branching/CLKFROM.pickle +++ b/js/Branching/CLKFROM.pickle @@ -58,8 +58,7 @@ p16 g2 sS'x' p17 -g2 -sS'model' +NsS'model' p18 g8 sS'typ' diff --git a/js/Branching/CLKGOTO.js b/js/Branching/CLKGOTO.js index d6305f03..c5fad0c4 100644 --- a/js/Branching/CLKGOTO.js +++ b/js/Branching/CLKGOTO.js @@ -10,7 +10,7 @@ function CLKGOTO() { this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = [["A"],[sci2exp(1)]]; - this.x = standard_define([2,1],this.model,this.exprs," "); + this.x = new standard_define(new ScilabDouble([2,1]),this.model,this.exprs," "); this.x.graphics.id = "Goto"; return new BasicBlock(this.x); } diff --git a/js/Branching/CLKGOTO.pickle b/js/Branching/CLKGOTO.pickle index ce176940..f6501445 100644 --- a/js/Branching/CLKGOTO.pickle +++ b/js/Branching/CLKGOTO.pickle @@ -68,8 +68,7 @@ p20 g2 sS'x' p21 -g2 -sS'model' +NsS'model' p22 g9 sS'model.ipar' diff --git a/js/Branching/CLKGotoTagVisibility.js b/js/Branching/CLKGotoTagVisibility.js index cc46d52d..c28ac482 100644 --- a/js/Branching/CLKGotoTagVisibility.js +++ b/js/Branching/CLKGotoTagVisibility.js @@ -16,7 +16,7 @@ function CLKGotoTagVisibility() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = "A"; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKGotoTagVisibility\",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); } CLKGotoTagVisibility.prototype.details = function CLKGotoTagVisibility() { diff --git a/js/Branching/CLKGotoTagVisibility.pickle b/js/Branching/CLKGotoTagVisibility.pickle index e383d22b..5e227bec 100644 --- a/js/Branching/CLKGotoTagVisibility.pickle +++ b/js/Branching/CLKGotoTagVisibility.pickle @@ -90,8 +90,7 @@ p28 g9 sS'x' p29 -g9 -sS'model' +NsS'model' p30 g2 s.
\ No newline at end of file diff --git a/js/Branching/DEMUX.js b/js/Branching/DEMUX.js index c4866c99..9d311dd6 100644 --- a/js/Branching/DEMUX.js +++ b/js/Branching/DEMUX.js @@ -12,7 +12,7 @@ function DEMUX() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = string(this.out); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DEMUX\",sz(1),sz(2));"]); - this.x = standard_define([.5,2],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([.5,2]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } DEMUX.prototype.details = function DEMUX() { diff --git a/js/Branching/DEMUX.pickle b/js/Branching/DEMUX.pickle index c684bb7b..1ea8e3a7 100644 --- a/js/Branching/DEMUX.pickle +++ b/js/Branching/DEMUX.pickle @@ -68,8 +68,7 @@ p21 g4 sS'x' p22 -g14 -sS'model' +NsS'model' p23 g10 sS'model.ipar' diff --git a/js/Branching/DEMUX_f.js b/js/Branching/DEMUX_f.js index d25f36d4..9202d190 100644 --- a/js/Branching/DEMUX_f.js +++ b/js/Branching/DEMUX_f.js @@ -12,7 +12,7 @@ function DEMUX_f() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = string(this.out); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DEMUX_f\",sz(1),sz(2));"]); - this.x = standard_define([.5,2],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([.5,2]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } DEMUX_f.prototype.details = function DEMUX_f() { diff --git a/js/Branching/DEMUX_f.pickle b/js/Branching/DEMUX_f.pickle index c684bb7b..1ea8e3a7 100644 --- a/js/Branching/DEMUX_f.pickle +++ b/js/Branching/DEMUX_f.pickle @@ -68,8 +68,7 @@ p21 g4 sS'x' p22 -g14 -sS'model' +NsS'model' p23 g10 sS'model.ipar' diff --git a/js/Branching/ESELECT_f.js b/js/Branching/ESELECT_f.js index 60d88fe9..54588d0e 100644 --- a/js/Branching/ESELECT_f.js +++ b/js/Branching/ESELECT_f.js @@ -16,7 +16,7 @@ function ESELECT_f() { this.model.nzcross = new ScilabDouble([0]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ESELECT_f\",sz(1),sz(2));"]); this.exprs = [[string(this.out)],[string(1)],[string(this.model.nmode)]]; - this.x = standard_define([4,2],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } ESELECT_f.prototype.details = function ESELECT_f() { diff --git a/js/Branching/ESELECT_f.pickle b/js/Branching/ESELECT_f.pickle index 2e30dbad..347553e3 100644 --- a/js/Branching/ESELECT_f.pickle +++ b/js/Branching/ESELECT_f.pickle @@ -102,8 +102,7 @@ p31 g8 sS'x' p32 -g6 -sS'model' +NsS'model' p33 g2 s.
\ No newline at end of file diff --git a/js/Branching/EXTRACTOR.js b/js/Branching/EXTRACTOR.js index 7dcc7136..b8d25027 100644 --- a/js/Branching/EXTRACTOR.js +++ b/js/Branching/EXTRACTOR.js @@ -11,7 +11,7 @@ function EXTRACTOR() { this.model.ipar = new ScilabDouble([this.ind]); this.exprs = [sci2exp(this.ind)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTRACTOR\",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); } EXTRACTOR.prototype.details = function EXTRACTOR() { diff --git a/js/Branching/EXTRACTOR.pickle b/js/Branching/EXTRACTOR.pickle index 3e7ca0b1..d54d0fb3 100644 --- a/js/Branching/EXTRACTOR.pickle +++ b/js/Branching/EXTRACTOR.pickle @@ -64,8 +64,7 @@ p19 g13 sS'x' p20 -g4 -sS'model' +NsS'model' p21 g8 sS'model.ipar' diff --git a/js/Branching/FROM.js b/js/Branching/FROM.js index 01d9188f..658831b1 100644 --- a/js/Branching/FROM.js +++ b/js/Branching/FROM.js @@ -15,7 +15,7 @@ function FROM() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = ["A"]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROM\",sz(1),sz(2));"]); - this.x = standard_define([2,1],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,1]),this.model,this.exprs,this.gr_i); this.x.graphics.id = "From"; return new BasicBlock(this.x); } diff --git a/js/Branching/FROM.pickle b/js/Branching/FROM.pickle index 9ddcfaaf..679be93c 100644 --- a/js/Branching/FROM.pickle +++ b/js/Branching/FROM.pickle @@ -89,8 +89,7 @@ p27 g6 sS'x' p28 -g6 -sS'model' +NsS'model' p29 g2 s.
\ No newline at end of file diff --git a/js/Branching/FROMMO.js b/js/Branching/FROMMO.js index b46464b5..15f0066f 100644 --- a/js/Branching/FROMMO.js +++ b/js/Branching/FROMMO.js @@ -18,7 +18,7 @@ function FROMMO() { mo.outputs = "n"; this.exprs = ["A"]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROMMO\",sz(1),sz(2));"]); - this.x = standard_define([2,1],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,1]),this.model,this.exprs,this.gr_i); this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); } diff --git a/js/Branching/FROMMO.pickle b/js/Branching/FROMMO.pickle index 87838f88..28322662 100644 --- a/js/Branching/FROMMO.pickle +++ b/js/Branching/FROMMO.pickle @@ -98,8 +98,7 @@ p30 g8 sS'x' p31 -g8 -sS'model' +NsS'model' p32 g2 s.
\ No newline at end of file diff --git a/js/Branching/GOTO.js b/js/Branching/GOTO.js index e3ed8c22..d83ec85d 100644 --- a/js/Branching/GOTO.js +++ b/js/Branching/GOTO.js @@ -15,7 +15,7 @@ function GOTO() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = [["A"],[sci2exp(1)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GOTO\",sz(1),sz(2));"]); - this.x = standard_define([2,1],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,1]),this.model,this.exprs,this.gr_i); this.x.graphics.id = "Goto"; return new BasicBlock(this.x); } diff --git a/js/Branching/GOTO.pickle b/js/Branching/GOTO.pickle index 3b5c4c09..7ba2a3c3 100644 --- a/js/Branching/GOTO.pickle +++ b/js/Branching/GOTO.pickle @@ -98,8 +98,7 @@ p31 g2 sS'x' p32 -g2 -sS'model' +NsS'model' p33 g5 s.
\ No newline at end of file diff --git a/js/Branching/GOTOMO.js b/js/Branching/GOTOMO.js index 81c8ec38..a2b2d18c 100644 --- a/js/Branching/GOTOMO.js +++ b/js/Branching/GOTOMO.js @@ -18,7 +18,7 @@ function GOTOMO() { mo.inputs = "p"; this.exprs = [["A"],[sci2exp(1)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GOTOMO\",sz(1),sz(2));"]); - this.x = standard_define([2,1],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,1]),this.model,this.exprs,this.gr_i); this.x.graphics.in_implicit = ["I"]; return new BasicBlock(this.x); } diff --git a/js/Branching/GOTOMO.pickle b/js/Branching/GOTOMO.pickle index 6d754d8b..cc8af0d9 100644 --- a/js/Branching/GOTOMO.pickle +++ b/js/Branching/GOTOMO.pickle @@ -107,8 +107,7 @@ p34 g2 sS'x' p35 -g2 -sS'model' +NsS'model' p36 g5 s.
\ No newline at end of file diff --git a/js/Branching/GotoTagVisibility.js b/js/Branching/GotoTagVisibility.js index f92bd228..dc5fbfa0 100644 --- a/js/Branching/GotoTagVisibility.js +++ b/js/Branching/GotoTagVisibility.js @@ -16,7 +16,7 @@ function GotoTagVisibility() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = "A"; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GotoTagVisibility\",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); } GotoTagVisibility.prototype.details = function GotoTagVisibility() { diff --git a/js/Branching/GotoTagVisibility.pickle b/js/Branching/GotoTagVisibility.pickle index e383d22b..5e227bec 100644 --- a/js/Branching/GotoTagVisibility.pickle +++ b/js/Branching/GotoTagVisibility.pickle @@ -90,8 +90,7 @@ p28 g9 sS'x' p29 -g9 -sS'model' +NsS'model' p30 g2 s.
\ No newline at end of file diff --git a/js/Branching/GotoTagVisibilityMO.js b/js/Branching/GotoTagVisibilityMO.js index 6fff7ad2..e2fc5b73 100644 --- a/js/Branching/GotoTagVisibilityMO.js +++ b/js/Branching/GotoTagVisibilityMO.js @@ -16,7 +16,7 @@ function GotoTagVisibilityMO() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = "A"; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GotoTagVisibilityMO\",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); } GotoTagVisibilityMO.prototype.details = function GotoTagVisibilityMO() { diff --git a/js/Branching/GotoTagVisibilityMO.pickle b/js/Branching/GotoTagVisibilityMO.pickle index e383d22b..5e227bec 100644 --- a/js/Branching/GotoTagVisibilityMO.pickle +++ b/js/Branching/GotoTagVisibilityMO.pickle @@ -90,8 +90,7 @@ p28 g9 sS'x' p29 -g9 -sS'model' +NsS'model' p30 g2 s.
\ No newline at end of file diff --git a/js/Branching/ISELECT_f.js b/js/Branching/ISELECT_f.js index 89fe6233..9ad6e505 100644 --- a/js/Branching/ISELECT_f.js +++ b/js/Branching/ISELECT_f.js @@ -14,7 +14,7 @@ function ISELECT_f() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [[string(this.nout)],[string(this.z0+1)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ISELECT_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); } ISELECT_f.prototype.details = function ISELECT_f() { diff --git a/js/Branching/ISELECT_f.pickle b/js/Branching/ISELECT_f.pickle index 88aca371..ed8bf469 100644 --- a/js/Branching/ISELECT_f.pickle +++ b/js/Branching/ISELECT_f.pickle @@ -73,8 +73,7 @@ p22 g13 sS'x' p23 -g6 -sS'model' +NsS'model' p24 g9 sS'typ' diff --git a/js/Branching/ISELECT_m.js b/js/Branching/ISELECT_m.js index a396c439..d31861e2 100644 --- a/js/Branching/ISELECT_m.js +++ b/js/Branching/ISELECT_m.js @@ -22,7 +22,7 @@ function ISELECT_m() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [[sci2exp(1)],[sci2exp(this.nout)],[sci2exp(this.z0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ISELECT_m\",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); } ISELECT_m.prototype.details = function ISELECT_m() { diff --git a/js/Branching/ISELECT_m.pickle b/js/Branching/ISELECT_m.pickle index 2dd402c1..2fd47018 100644 --- a/js/Branching/ISELECT_m.pickle +++ b/js/Branching/ISELECT_m.pickle @@ -118,8 +118,7 @@ p37 g7 sS'x' p38 -g2 -sS'model' +NsS'model' p39 g4 sS'ot' diff --git a/js/Branching/MUX.js b/js/Branching/MUX.js index 96a34c93..ece52555 100644 --- a/js/Branching/MUX.js +++ b/js/Branching/MUX.js @@ -11,7 +11,7 @@ function MUX() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = string(this.in1); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MUX\",sz(1),sz(2));"]); - this.x = standard_define([.5,2],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([.5,2]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } MUX.prototype.details = function MUX() { diff --git a/js/Branching/MUX.pickle b/js/Branching/MUX.pickle index 5a8f8e63..b8a51212 100644 --- a/js/Branching/MUX.pickle +++ b/js/Branching/MUX.pickle @@ -68,8 +68,7 @@ p21 g15 sS'x' p22 -g4 -sS'model' +NsS'model' p23 g10 sS'model.ipar' diff --git a/js/Branching/MUX_f.js b/js/Branching/MUX_f.js index 838956f7..52bb4318 100644 --- a/js/Branching/MUX_f.js +++ b/js/Branching/MUX_f.js @@ -11,7 +11,7 @@ function MUX_f() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = string(this.in1); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MUX_f\",sz(1),sz(2));"]); - this.x = standard_define([0.5,2],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([0.5,2]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } MUX_f.prototype.details = function MUX_f() { diff --git a/js/Branching/MUX_f.pickle b/js/Branching/MUX_f.pickle index 5a8f8e63..b8a51212 100644 --- a/js/Branching/MUX_f.pickle +++ b/js/Branching/MUX_f.pickle @@ -68,8 +68,7 @@ p21 g15 sS'x' p22 -g4 -sS'model' +NsS'model' p23 g10 sS'model.ipar' diff --git a/js/Branching/M_SWITCH.js b/js/Branching/M_SWITCH.js index 3859b45f..1e9ceb39 100644 --- a/js/Branching/M_SWITCH.js +++ b/js/Branching/M_SWITCH.js @@ -13,7 +13,7 @@ function M_SWITCH() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [[string(this.nin)],[string(ipar)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"M_SWITCH\",sz(1),sz(2));"]); - this.x = standard_define([2.5,2],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2.5,2]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } M_SWITCH.prototype.details = function M_SWITCH() { diff --git a/js/Branching/M_SWITCH.pickle b/js/Branching/M_SWITCH.pickle index 7abc48ad..46a2872c 100644 --- a/js/Branching/M_SWITCH.pickle +++ b/js/Branching/M_SWITCH.pickle @@ -93,8 +93,7 @@ p28 g10 sS'x' p29 -g8 -sS'model' +NsS'model' p30 g2 sS'ot' diff --git a/js/Branching/NRMSOM_f.js b/js/Branching/NRMSOM_f.js index 0f4cb761..8c56f5d1 100644 --- a/js/Branching/NRMSOM_f.js +++ b/js/Branching/NRMSOM_f.js @@ -11,7 +11,7 @@ function NRMSOM_f() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [string(this.nin)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"NRMSOM_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); } NRMSOM_f.prototype.details = function NRMSOM_f() { diff --git a/js/Branching/NRMSOM_f.pickle b/js/Branching/NRMSOM_f.pickle index 0c0604b9..e0d55699 100644 --- a/js/Branching/NRMSOM_f.pickle +++ b/js/Branching/NRMSOM_f.pickle @@ -67,8 +67,7 @@ p20 g14 sS'x' p21 -g4 -sS'model' +NsS'model' p22 g8 sS'typ' diff --git a/js/Branching/RELAY_f.js b/js/Branching/RELAY_f.js index 8ddda3f3..0e348a7c 100644 --- a/js/Branching/RELAY_f.js +++ b/js/Branching/RELAY_f.js @@ -15,7 +15,7 @@ function RELAY_f() { this.model.dep_ut = new ScilabDouble([true,true]); this.exprs = [[string(this.nin)],[string(i0+1)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RELAY_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); } RELAY_f.prototype.details = function RELAY_f() { diff --git a/js/Branching/RELAY_f.pickle b/js/Branching/RELAY_f.pickle index 72cd5255..9103134c 100644 --- a/js/Branching/RELAY_f.pickle +++ b/js/Branching/RELAY_f.pickle @@ -88,8 +88,7 @@ p27 g11 sS'x' p28 -g2 -sS'model' +NsS'model' p29 g4 s.
\ No newline at end of file diff --git a/js/Branching/SCALAR2VECTOR.js b/js/Branching/SCALAR2VECTOR.js index 90de2156..a78d2fdc 100644 --- a/js/Branching/SCALAR2VECTOR.js +++ b/js/Branching/SCALAR2VECTOR.js @@ -10,7 +10,7 @@ function SCALAR2VECTOR() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [string([this.nout])]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SCALAR2VECTOR\",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); } SCALAR2VECTOR.prototype.details = function SCALAR2VECTOR() { diff --git a/js/Branching/SCALAR2VECTOR.pickle b/js/Branching/SCALAR2VECTOR.pickle index 79885755..95f52eb3 100644 --- a/js/Branching/SCALAR2VECTOR.pickle +++ b/js/Branching/SCALAR2VECTOR.pickle @@ -65,8 +65,7 @@ p20 g14 sS'x' p21 -g4 -sS'model' +NsS'model' p22 g10 sS'typ' diff --git a/js/Branching/SELECT_f.js b/js/Branching/SELECT_f.js index 09e4a5ce..ec241d1a 100644 --- a/js/Branching/SELECT_f.js +++ b/js/Branching/SELECT_f.js @@ -14,7 +14,7 @@ function SELECT_f() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [[string(this.nin)],[string(this.z0+1)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SELECT_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); } SELECT_f.prototype.details = function SELECT_f() { diff --git a/js/Branching/SELECT_f.pickle b/js/Branching/SELECT_f.pickle index 1de760dd..00b654cc 100644 --- a/js/Branching/SELECT_f.pickle +++ b/js/Branching/SELECT_f.pickle @@ -75,8 +75,7 @@ p22 g15 sS'x' p23 -g4 -sS'model' +NsS'model' p24 g8 sS'typ' diff --git a/js/Branching/SELECT_m.js b/js/Branching/SELECT_m.js index 6d89c729..ad79cc27 100644 --- a/js/Branching/SELECT_m.js +++ b/js/Branching/SELECT_m.js @@ -22,7 +22,7 @@ function SELECT_m() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [[sci2exp(1)],[sci2exp(this.nin)],[sci2exp(this.z0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SELECT_m\",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); } SELECT_m.prototype.details = function SELECT_m() { diff --git a/js/Branching/SELECT_m.pickle b/js/Branching/SELECT_m.pickle index eb420b3f..f4d96d76 100644 --- a/js/Branching/SELECT_m.pickle +++ b/js/Branching/SELECT_m.pickle @@ -121,8 +121,7 @@ p38 g11 sS'x' p39 -g2 -sS'model' +NsS'model' p40 g4 sS'ot' diff --git a/js/Branching/SWITCH2.js b/js/Branching/SWITCH2.js index 1660f2c7..dc97fdbc 100644 --- a/js/Branching/SWITCH2.js +++ b/js/Branching/SWITCH2.js @@ -17,7 +17,7 @@ function SWITCH2() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [[string(ipar)],[string(rpar)],[string(this.nzz)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SWITCH2\",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); } SWITCH2.prototype.details = function SWITCH2() { diff --git a/js/Branching/SWITCH2.pickle b/js/Branching/SWITCH2.pickle index cc082b2a..34ad8f7d 100644 --- a/js/Branching/SWITCH2.pickle +++ b/js/Branching/SWITCH2.pickle @@ -96,8 +96,7 @@ p29 g8 sS'x' p30 -g5 -sS'model' +NsS'model' p31 g2 s.
\ No newline at end of file diff --git a/js/Branching/SWITCH2_m.js b/js/Branching/SWITCH2_m.js index ee598779..211b8a1a 100644 --- a/js/Branching/SWITCH2_m.js +++ b/js/Branching/SWITCH2_m.js @@ -20,7 +20,7 @@ function SWITCH2_m() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [[sci2exp(1)],[string(ipar)],[string(rpar)],[string(this.nzz)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SWITCH2_m\",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); } SWITCH2_m.prototype.details = function SWITCH2_m() { diff --git a/js/Branching/SWITCH2_m.pickle b/js/Branching/SWITCH2_m.pickle index 3e82ebb1..9bdd61dc 100644 --- a/js/Branching/SWITCH2_m.pickle +++ b/js/Branching/SWITCH2_m.pickle @@ -123,8 +123,7 @@ p38 g8 sS'x' p39 -g5 -sS'model' +NsS'model' p40 g2 sS'it[1-1]' diff --git a/js/Branching/SWITCH_f.js b/js/Branching/SWITCH_f.js index e427833b..151ec1a6 100644 --- a/js/Branching/SWITCH_f.js +++ b/js/Branching/SWITCH_f.js @@ -14,7 +14,7 @@ function SWITCH_f() { this.model.dep_ut = new ScilabDouble([true,true]); this.exprs = [[string(this.nin)],[string(i0+1)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SWITCH_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); } SWITCH_f.prototype.details = function SWITCH_f() { diff --git a/js/Branching/SWITCH_f.pickle b/js/Branching/SWITCH_f.pickle index a3d7a1eb..c9faffa8 100644 --- a/js/Branching/SWITCH_f.pickle +++ b/js/Branching/SWITCH_f.pickle @@ -85,8 +85,7 @@ p26 g9 sS'x' p27 -g6 -sS'model' +NsS'model' p28 g2 s.
\ No newline at end of file |