diff options
Diffstat (limited to 'js/Branching')
53 files changed, 448 insertions, 310 deletions
diff --git a/js/Branching/CLKFROM.js b/js/Branching/CLKFROM.js index ab278050..a43ecbc0 100644 --- a/js/Branching/CLKFROM.js +++ b/js/Branching/CLKFROM.js @@ -8,8 +8,8 @@ function CLKFROM() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabDouble([false,false]); - var exprs = "A"; - this.x = standard_define([2,1],this.model,exprs," "); + this.exprs = "A"; + this.x = standard_define([2,1],this.model,this.exprs," "); this.x.graphics.id = "From"; return new BasicBlock(this.x); } @@ -23,12 +23,13 @@ function CLKFROM() { } CLKFROM.prototype.set = function CLKFROM() { this.tag = arguments[0]["tag"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; while (true) { - [ok,this.tag,exprs] = scicos_getvalue("Set block parameters","Tag",list("str",-1),exprs); + [ok,this.tag,this.exprs] = scicos_getvalue("Set block parameters","Tag",list("str",-1),this.exprs); if (!ok) { break; } @@ -39,7 +40,7 @@ function CLKFROM() { this.model.opar = list(new ScilabDouble([this.tag])); this.model.evtout = new ScilabDouble([1]); this.model.firing = new ScilabDouble([-1]); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; diff --git a/js/Branching/CLKFROM.pickle b/js/Branching/CLKFROM.pickle index c97cb78c..e7091f3f 100644 --- a/js/Branching/CLKFROM.pickle +++ b/js/Branching/CLKFROM.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'gr_i' p2 -aS'model' +aS'exprs' p3 aS'tag' p4 aS'graphics' p5 -atp6 -Rp7 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'needcompile' p1 diff --git a/js/Branching/CLKGOTO.js b/js/Branching/CLKGOTO.js index 237992ae..cc21a9a0 100644 --- a/js/Branching/CLKGOTO.js +++ b/js/Branching/CLKGOTO.js @@ -9,8 +9,8 @@ function CLKGOTO() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabDouble([false,false]); - var exprs = [["A"],[sci2exp(1)]]; - this.x = standard_define([2,1],this.model,exprs," "); + this.exprs = [["A"],[sci2exp(1)]]; + this.x = standard_define([2,1],this.model,this.exprs," "); this.x.graphics.id = "Goto"; return new BasicBlock(this.x); } @@ -27,12 +27,13 @@ function CLKGOTO() { CLKGOTO.prototype.set = function CLKGOTO() { this.tag = arguments[0]["tag"] this.tagvis = parseFloat(arguments[0]["tagvis"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; while (true) { - [ok,this.tag,this.tagvis,exprs] = scicos_getvalue("Set block parameters",["Tag","Tag Visibility (1=Local 2=Scoped 3=Global)"],list("str",-1,"vec",1),exprs); + [ok,this.tag,this.tagvis,this.exprs] = scicos_getvalue("Set block parameters",["Tag","Tag Visibility (1=Local 2=Scoped 3=Global)"],list("str",-1,"vec",1),this.exprs); if (!ok) { break; } @@ -50,7 +51,7 @@ function CLKGOTO() { this.model.ipar = new ScilabDouble([this.tagvis]); this.model.evtin = new ScilabDouble([1]); this.model.firing = new ScilabDouble([-1]); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; diff --git a/js/Branching/CLKGOTO.pickle b/js/Branching/CLKGOTO.pickle index 8c0d2129..ce176940 100644 --- a/js/Branching/CLKGOTO.pickle +++ b/js/Branching/CLKGOTO.pickle @@ -2,18 +2,22 @@ c__builtin__ set p0 ((lp1 -S'x' +S'tagvis' p2 -aS'model' +aS'gr_i' p3 -aS'tag' +aS'exprs' p4 -aS'tagvis' +aS'tag' p5 aS'graphics' p6 -atp7 -Rp8 +aS'x' +p7 +aS'model' +p8 +atp9 +Rp10 .(dp0 S'needcompile' p1 diff --git a/js/Branching/CLKGotoTagVisibility.js b/js/Branching/CLKGotoTagVisibility.js index 10dd1d16..4ab4da7c 100644 --- a/js/Branching/CLKGotoTagVisibility.js +++ b/js/Branching/CLKGotoTagVisibility.js @@ -14,9 +14,9 @@ function CLKGotoTagVisibility() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabDouble([false,false]); - var exprs = "A"; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKGotoTagVisibility\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + 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); return new BasicBlock(this.x); } CLKGotoTagVisibility.prototype.details = function CLKGotoTagVisibility() { @@ -30,12 +30,13 @@ function CLKGotoTagVisibility() { } CLKGotoTagVisibility.prototype.set = function CLKGotoTagVisibility() { this.tag = arguments[0]["tag"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.tag,exprs] = scicos_getvalue("Set parameters",["GotoTag"],list("str",-1),exprs); + [ok,this.tag,this.exprs] = scicos_getvalue("Set parameters",["GotoTag"],list("str",-1),this.exprs); if (!ok) { break; } @@ -44,7 +45,7 @@ function CLKGotoTagVisibility() { var needcompile = 4; var y = needcompile; } - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.opar = list(new ScilabDouble([this.tag])); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Branching/CLKGotoTagVisibility.pickle b/js/Branching/CLKGotoTagVisibility.pickle index a7889058..918f1bf7 100644 --- a/js/Branching/CLKGotoTagVisibility.pickle +++ b/js/Branching/CLKGotoTagVisibility.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'gr_i' p2 -aS'model' +aS'exprs' p3 aS'tag' p4 aS'graphics' p5 -atp6 -Rp7 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'arg1' p1 diff --git a/js/Branching/DEMUX.js b/js/Branching/DEMUX.js index 61137fad..ed544002 100644 --- a/js/Branching/DEMUX.js +++ b/js/Branching/DEMUX.js @@ -10,9 +10,9 @@ function DEMUX() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); - var exprs = string(this.out); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DEMUX\",sz(1),sz(2));"]); - this.x = standard_define([.5,2],this.model,exprs,gr_i); + 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); return new BasicBlock(this.x); } DEMUX.prototype.details = function DEMUX() { @@ -26,12 +26,13 @@ function DEMUX() { } DEMUX.prototype.set = function DEMUX() { this.out = parseFloat(arguments[0]["out"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.out,exprs] = scicos_getvalue("Set DEMUX block parameters",["number of output ports or vector of sizes"],list("intvec",-1),exprs); + [ok,this.out,this.exprs] = scicos_getvalue("Set DEMUX block parameters",["number of output ports or vector of sizes"],list("intvec",-1),this.exprs); if (!ok) { break; } @@ -65,7 +66,7 @@ function DEMUX() { } } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.ipar = new ScilabDouble([this.out]); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Branching/DEMUX.pickle b/js/Branching/DEMUX.pickle index 82c8d94b..a3fa5b85 100644 --- a/js/Branching/DEMUX.pickle +++ b/js/Branching/DEMUX.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'exprs' p2 -aS'model' +aS'gr_i' p3 -aS'out' -p4 aS'graphics' +p4 +aS'x' p5 -atp6 -Rp7 +aS'model' +p6 +aS'out' +p7 +atp8 +Rp9 .(dp0 S'model.sim' p1 diff --git a/js/Branching/DEMUX_f.js b/js/Branching/DEMUX_f.js index 1d7808ad..94182b06 100644 --- a/js/Branching/DEMUX_f.js +++ b/js/Branching/DEMUX_f.js @@ -10,9 +10,9 @@ function DEMUX_f() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); - var exprs = string(this.out); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DEMUX_f\",sz(1),sz(2));"]); - this.x = standard_define([.5,2],this.model,exprs,gr_i); + 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); return new BasicBlock(this.x); } DEMUX_f.prototype.details = function DEMUX_f() { @@ -26,12 +26,13 @@ function DEMUX_f() { } DEMUX_f.prototype.set = function DEMUX_f() { this.out = parseFloat(arguments[0]["out"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.out,exprs] = scicos_getvalue("Set DEMUX block parameters",["number of output ports or vector of sizes"],list("vec",-1),exprs); + [ok,this.out,this.exprs] = scicos_getvalue("Set DEMUX block parameters",["number of output ports or vector of sizes"],list("vec",-1),this.exprs); if (!ok) { break; } @@ -65,7 +66,7 @@ function DEMUX_f() { } } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.ipar = new ScilabDouble([this.out]); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Branching/DEMUX_f.pickle b/js/Branching/DEMUX_f.pickle index 82c8d94b..a3fa5b85 100644 --- a/js/Branching/DEMUX_f.pickle +++ b/js/Branching/DEMUX_f.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'exprs' p2 -aS'model' +aS'gr_i' p3 -aS'out' -p4 aS'graphics' +p4 +aS'x' p5 -atp6 -Rp7 +aS'model' +p6 +aS'out' +p7 +atp8 +Rp9 .(dp0 S'model.sim' p1 diff --git a/js/Branching/ESELECT_f.js b/js/Branching/ESELECT_f.js index b543617b..7c45d10a 100644 --- a/js/Branching/ESELECT_f.js +++ b/js/Branching/ESELECT_f.js @@ -14,9 +14,9 @@ function ESELECT_f() { this.model.dep_ut = new ScilabDouble([true,false]); this.model.nmode = new ScilabDouble([0]); this.model.nzcross = new ScilabDouble([0]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ESELECT_f\",sz(1),sz(2));"]); - var exprs = [[string(this.out)],[string(1)],[string(this.model.nmode)]]; - this.x = standard_define([4,2],this.model,exprs,gr_i); + 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); return new BasicBlock(this.x); } ESELECT_f.prototype.details = function ESELECT_f() { @@ -34,18 +34,19 @@ function ESELECT_f() { this.out = parseFloat(arguments[0]["out"]) this.inh = parseFloat(arguments[0]["inh"]) this.nmod = parseFloat(arguments[0]["nmod"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; - if (size(exprs,"*")==1) { - exprs[2-1] = string(1); + this.exprs = this.graphics.exprs; + if (size(this.exprs,"*")==1) { + this.exprs[2-1] = string(1); } - if (size(exprs,"*")==2) { - exprs[3-1] = string(0); + if (size(this.exprs,"*")==2) { + this.exprs[3-1] = string(0); } this.model = arg1.model; while (true) { - [ok,this.out,this.inh,this.nmod,exprs] = scicos_getvalue("Set ESELECT block parameters",["number of output event ports","Inherit (1: no, 0: yes)","zero-crossing (0: no, 1: yes)"],list("vec",1,"vec",1,"vec",1),exprs); + [ok,this.out,this.inh,this.nmod,this.exprs] = scicos_getvalue("Set ESELECT block parameters",["number of output event ports","Inherit (1: no, 0: yes)","zero-crossing (0: no, 1: yes)"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -66,7 +67,7 @@ function ESELECT_f() { this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.evtout = new ScilabDouble([ones(this.out,1)]); this.model.firing = new ScilabDouble([-ones(this.out,1)]); this.x.graphics = this.graphics; diff --git a/js/Branching/ESELECT_f.pickle b/js/Branching/ESELECT_f.pickle index 9775491c..9e105914 100644 --- a/js/Branching/ESELECT_f.pickle +++ b/js/Branching/ESELECT_f.pickle @@ -4,18 +4,22 @@ p0 ((lp1 S'nmod' p2 -aS'inh' +aS'exprs' p3 -aS'graphics' +aS'gr_i' p4 -aS'x' +aS'inh' p5 -aS'model' +aS'graphics' p6 -aS'out' +aS'x' p7 -atp8 -Rp9 +aS'model' +p8 +aS'out' +p9 +atp10 +Rp11 .(dp0 S'arg1' p1 diff --git a/js/Branching/EXTRACTOR.js b/js/Branching/EXTRACTOR.js index a4b49e1d..8134914a 100644 --- a/js/Branching/EXTRACTOR.js +++ b/js/Branching/EXTRACTOR.js @@ -9,9 +9,9 @@ function EXTRACTOR() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); this.model.ipar = new ScilabDouble([this.ind]); - var exprs = [sci2exp(this.ind)]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTRACTOR\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,exprs,gr_i); + 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); return new BasicBlock(this.x); } EXTRACTOR.prototype.details = function EXTRACTOR() { @@ -25,12 +25,13 @@ function EXTRACTOR() { } EXTRACTOR.prototype.set = function EXTRACTOR() { this.ind = parseFloat(arguments[0]["ind"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.ind,exprs] = scicos_getvalue("Set block parameters",["indices to extract"],list("vec",-1),exprs); + [ok,this.ind,this.exprs] = scicos_getvalue("Set block parameters",["indices to extract"],list("vec",-1),this.exprs); if (!ok) { break; } @@ -42,7 +43,7 @@ function EXTRACTOR() { var ok = tmpvar0[2]; if (ok) { this.model.ipar = new ScilabDouble(this.ind); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; diff --git a/js/Branching/EXTRACTOR.pickle b/js/Branching/EXTRACTOR.pickle index e8893247..8e0402fe 100644 --- a/js/Branching/EXTRACTOR.pickle +++ b/js/Branching/EXTRACTOR.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'ind' +S'exprs' p2 -aS'x' +aS'gr_i' p3 -aS'model' -p4 aS'graphics' +p4 +aS'ind' p5 -atp6 -Rp7 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'model.sim' p1 diff --git a/js/Branching/FROM.js b/js/Branching/FROM.js index 3b9260bb..9c13d8c9 100644 --- a/js/Branching/FROM.js +++ b/js/Branching/FROM.js @@ -13,9 +13,9 @@ function FROM() { this.model.opar = list(new ScilabString(["A"])); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,false]); - var exprs = ["A"]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROM\",sz(1),sz(2));"]); - this.x = standard_define([2,1],this.model,exprs,gr_i); + 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.graphics.id = "From"; return new BasicBlock(this.x); } @@ -30,12 +30,13 @@ function FROM() { } FROM.prototype.set = function FROM() { this.tag = arguments[0]["tag"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.tag,exprs] = scicos_getvalue("Set parameters",["Tag"],list("str",-1),exprs); + [ok,this.tag,this.exprs] = scicos_getvalue("Set parameters",["Tag"],list("str",-1),this.exprs); if (!ok) { break; } @@ -44,7 +45,7 @@ function FROM() { var needcompile = 4; var y = needcompile; } - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.opar = list(new ScilabDouble([this.tag])); this.x.model = this.model; this.x.graphics = this.graphics; diff --git a/js/Branching/FROM.pickle b/js/Branching/FROM.pickle index a791941b..b1d966d0 100644 --- a/js/Branching/FROM.pickle +++ b/js/Branching/FROM.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'gr_i' p2 -aS'model' +aS'exprs' p3 aS'tag' p4 aS'graphics' p5 -atp6 -Rp7 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'arg1' p1 diff --git a/js/Branching/FROMMO.js b/js/Branching/FROMMO.js index d7f417e4..207c71da 100644 --- a/js/Branching/FROMMO.js +++ b/js/Branching/FROMMO.js @@ -16,9 +16,9 @@ function FROMMO() { var mo = modelica(); mo.model = "frommo"; mo.outputs = "n"; - var exprs = ["A"]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROMMO\",sz(1),sz(2));"]); - this.x = standard_define([2,1],this.model,exprs,gr_i); + 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.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); } @@ -33,12 +33,13 @@ function FROMMO() { } FROMMO.prototype.set = function FROMMO() { this.tag = arguments[0]["tag"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.tag,exprs] = scicos_getvalue("Set parameters",["Tag"],list("str",-1),exprs); + [ok,this.tag,this.exprs] = scicos_getvalue("Set parameters",["Tag"],list("str",-1),this.exprs); if (!ok) { break; } @@ -47,7 +48,7 @@ function FROMMO() { var needcompile = 4; var y = needcompile; } - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.opar = list(new ScilabDouble([this.tag])); this.x.model = this.model; this.x.graphics = this.graphics; diff --git a/js/Branching/FROMMO.pickle b/js/Branching/FROMMO.pickle index a3976214..7b6b2992 100644 --- a/js/Branching/FROMMO.pickle +++ b/js/Branching/FROMMO.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'gr_i' p2 -aS'model' +aS'exprs' p3 aS'tag' p4 aS'graphics' p5 -atp6 -Rp7 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'arg1' p1 diff --git a/js/Branching/GOTO.js b/js/Branching/GOTO.js index e3532daf..690af30a 100644 --- a/js/Branching/GOTO.js +++ b/js/Branching/GOTO.js @@ -13,9 +13,9 @@ function GOTO() { this.model.opar = list(new ScilabString(["A"])); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,false]); - var exprs = [["A"],[sci2exp(1)]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GOTO\",sz(1),sz(2));"]); - this.x = standard_define([2,1],this.model,exprs,gr_i); + 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.graphics.id = "Goto"; return new BasicBlock(this.x); } @@ -32,12 +32,13 @@ function GOTO() { GOTO.prototype.set = function GOTO() { this.tag = arguments[0]["tag"] this.tagvis = parseFloat(arguments[0]["tagvis"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.tag,this.tagvis,exprs] = scicos_getvalue("Set parameters",["Tag","Tag Visibility(1=Local 2=scoped 3= global)"],list("str",-1,"vec",1),exprs); + [ok,this.tag,this.tagvis,this.exprs] = scicos_getvalue("Set parameters",["Tag","Tag Visibility(1=Local 2=scoped 3= global)"],list("str",-1,"vec",1),this.exprs); if (!ok) { break; } @@ -51,7 +52,7 @@ function GOTO() { var needcompile = 4; var y = needcompile; } - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.opar = list(new ScilabDouble([this.tag])); this.model.ipar = new ScilabDouble([this.tagvis]); this.x.model = this.model; diff --git a/js/Branching/GOTO.pickle b/js/Branching/GOTO.pickle index 06f62621..3de9759d 100644 --- a/js/Branching/GOTO.pickle +++ b/js/Branching/GOTO.pickle @@ -2,18 +2,22 @@ c__builtin__ set p0 ((lp1 -S'x' +S'tagvis' p2 -aS'model' +aS'gr_i' p3 -aS'tag' +aS'exprs' p4 -aS'tagvis' +aS'tag' p5 aS'graphics' p6 -atp7 -Rp8 +aS'x' +p7 +aS'model' +p8 +atp9 +Rp10 .(dp0 S'tagvis' p1 diff --git a/js/Branching/GOTOMO.js b/js/Branching/GOTOMO.js index 55b26401..bb2f2c05 100644 --- a/js/Branching/GOTOMO.js +++ b/js/Branching/GOTOMO.js @@ -16,9 +16,9 @@ function GOTOMO() { var mo = modelica(); mo.model = "gotomo"; mo.inputs = "p"; - var exprs = [["A"],[sci2exp(1)]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GOTOMO\",sz(1),sz(2));"]); - this.x = standard_define([2,1],this.model,exprs,gr_i); + 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.graphics.in_implicit = ["I"]; return new BasicBlock(this.x); } @@ -35,12 +35,13 @@ function GOTOMO() { GOTOMO.prototype.set = function GOTOMO() { this.tag = arguments[0]["tag"] this.tagvis = parseFloat(arguments[0]["tagvis"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.tag,this.tagvis,exprs] = scicos_getvalue("Set parameters",["Tag","Tag Visibility(1=Local 2=scoped 3= global)"],list("str",-1,"vec",1),exprs); + [ok,this.tag,this.tagvis,this.exprs] = scicos_getvalue("Set parameters",["Tag","Tag Visibility(1=Local 2=scoped 3= global)"],list("str",-1,"vec",1),this.exprs); if (!ok) { break; } @@ -54,7 +55,7 @@ function GOTOMO() { var needcompile = 4; var y = needcompile; } - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.opar = list(new ScilabDouble([this.tag])); this.model.ipar = new ScilabDouble([this.tagvis]); this.x.model = this.model; diff --git a/js/Branching/GOTOMO.pickle b/js/Branching/GOTOMO.pickle index aaf02f69..bf20ace2 100644 --- a/js/Branching/GOTOMO.pickle +++ b/js/Branching/GOTOMO.pickle @@ -2,18 +2,22 @@ c__builtin__ set p0 ((lp1 -S'x' +S'tagvis' p2 -aS'model' +aS'gr_i' p3 -aS'tag' +aS'exprs' p4 -aS'tagvis' +aS'tag' p5 aS'graphics' p6 -atp7 -Rp8 +aS'x' +p7 +aS'model' +p8 +atp9 +Rp10 .(dp0 S'tagvis' p1 diff --git a/js/Branching/GotoTagVisibility.js b/js/Branching/GotoTagVisibility.js index 3a3fc93f..1d4f0f29 100644 --- a/js/Branching/GotoTagVisibility.js +++ b/js/Branching/GotoTagVisibility.js @@ -14,9 +14,9 @@ function GotoTagVisibility() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabDouble([false,false]); - var exprs = "A"; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GotoTagVisibility\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + 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); return new BasicBlock(this.x); } GotoTagVisibility.prototype.details = function GotoTagVisibility() { @@ -30,12 +30,13 @@ function GotoTagVisibility() { } GotoTagVisibility.prototype.set = function GotoTagVisibility() { this.tag = arguments[0]["tag"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.tag,exprs] = scicos_getvalue("Set parameters",["GotoTag"],list("str",-1),exprs); + [ok,this.tag,this.exprs] = scicos_getvalue("Set parameters",["GotoTag"],list("str",-1),this.exprs); if (!ok) { break; } @@ -44,7 +45,7 @@ function GotoTagVisibility() { var needcompile = 4; var y = needcompile; } - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.opar = list(new ScilabDouble([this.tag])); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Branching/GotoTagVisibility.pickle b/js/Branching/GotoTagVisibility.pickle index a7889058..918f1bf7 100644 --- a/js/Branching/GotoTagVisibility.pickle +++ b/js/Branching/GotoTagVisibility.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'gr_i' p2 -aS'model' +aS'exprs' p3 aS'tag' p4 aS'graphics' p5 -atp6 -Rp7 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'arg1' p1 diff --git a/js/Branching/GotoTagVisibilityMO.js b/js/Branching/GotoTagVisibilityMO.js index 57cd648a..91c817fd 100644 --- a/js/Branching/GotoTagVisibilityMO.js +++ b/js/Branching/GotoTagVisibilityMO.js @@ -14,9 +14,9 @@ function GotoTagVisibilityMO() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabDouble([false,false]); - var exprs = "A"; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GotoTagVisibilityMO\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + 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); return new BasicBlock(this.x); } GotoTagVisibilityMO.prototype.details = function GotoTagVisibilityMO() { @@ -30,12 +30,13 @@ function GotoTagVisibilityMO() { } GotoTagVisibilityMO.prototype.set = function GotoTagVisibilityMO() { this.tag = arguments[0]["tag"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.tag,exprs] = scicos_getvalue("Set parameters",["GotoTag"],list("str",-1),exprs); + [ok,this.tag,this.exprs] = scicos_getvalue("Set parameters",["GotoTag"],list("str",-1),this.exprs); if (!ok) { break; } @@ -44,7 +45,7 @@ function GotoTagVisibilityMO() { var needcompile = 4; var y = needcompile; } - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.opar = list(new ScilabDouble([this.tag])); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Branching/GotoTagVisibilityMO.pickle b/js/Branching/GotoTagVisibilityMO.pickle index a7889058..918f1bf7 100644 --- a/js/Branching/GotoTagVisibilityMO.pickle +++ b/js/Branching/GotoTagVisibilityMO.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'gr_i' p2 -aS'model' +aS'exprs' p3 aS'tag' p4 aS'graphics' p5 -atp6 -Rp7 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'arg1' p1 diff --git a/js/Branching/ISELECT_f.js b/js/Branching/ISELECT_f.js index 5b3297ec..7c3992fc 100644 --- a/js/Branching/ISELECT_f.js +++ b/js/Branching/ISELECT_f.js @@ -12,9 +12,9 @@ function ISELECT_f() { this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var exprs = [[string(this.nout)],[string(this.z0+1)]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ISELECT_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + 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); return new BasicBlock(this.x); } ISELECT_f.prototype.details = function ISELECT_f() { @@ -30,12 +30,13 @@ function ISELECT_f() { ISELECT_f.prototype.set = function ISELECT_f() { this.nout = parseFloat(arguments[0]["nout"]) this.z0 = parseFloat(arguments[0]["z0"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.nout,this.z0,exprs] = scicos_getvalue("Set parameters",["number of outputs","initial connected output"],list("vec",1,"vec",1),exprs); + [ok,this.nout,this.z0,this.exprs] = scicos_getvalue("Set parameters",["number of outputs","initial connected output"],list("vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -47,7 +48,7 @@ function ISELECT_f() { this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.dstate = new ScilabDouble([this.z0-1]); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Branching/ISELECT_f.pickle b/js/Branching/ISELECT_f.pickle index b64cb2f9..cf5ae1e1 100644 --- a/js/Branching/ISELECT_f.pickle +++ b/js/Branching/ISELECT_f.pickle @@ -2,18 +2,22 @@ c__builtin__ set p0 ((lp1 -S'x' +S'exprs' p2 -aS'model' +aS'gr_i' p3 -aS'z0' +aS'graphics' p4 -aS'nout' +aS'x' p5 -aS'graphics' +aS'model' p6 -atp7 -Rp8 +aS'z0' +p7 +aS'nout' +p8 +atp9 +Rp10 .(dp0 S'model.sim' p1 diff --git a/js/Branching/ISELECT_m.js b/js/Branching/ISELECT_m.js index 46c9cbc5..dc34ae2f 100644 --- a/js/Branching/ISELECT_m.js +++ b/js/Branching/ISELECT_m.js @@ -20,9 +20,9 @@ function ISELECT_m() { this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var exprs = [[sci2exp(1)],[sci2exp(this.nout)],[sci2exp(this.z0)]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ISELECT_m\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,exprs,gr_i); + 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); return new BasicBlock(this.x); } ISELECT_m.prototype.details = function ISELECT_m() { @@ -40,12 +40,13 @@ function ISELECT_m() { this.typ = inverse(arguments[0]["typ"]) this.nout = parseFloat(arguments[0]["nout"]) this.z0 = parseFloat(arguments[0]["z0"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.typ,this.nout,this.z0,exprs] = scicos_getvalue("Set parameters",["Datatype(1= real double 2=Complex 3=int32 ...)","number of outputs","initial connected output"],list("vec",1,"vec",1,"vec",1),exprs); + [ok,this.typ,this.nout,this.z0,this.exprs] = scicos_getvalue("Set parameters",["Datatype(1= real double 2=Complex 3=int32 ...)","number of outputs","initial connected output"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -65,7 +66,7 @@ function ISELECT_m() { this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.dstate = new ScilabDouble([this.z0]); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Branching/ISELECT_m.pickle b/js/Branching/ISELECT_m.pickle index e4aa840a..afc20fa3 100644 --- a/js/Branching/ISELECT_m.pickle +++ b/js/Branching/ISELECT_m.pickle @@ -2,20 +2,24 @@ c__builtin__ set p0 ((lp1 -S'typ' +S'z0' p2 -aS'graphics' +aS'exprs' p3 -aS'x' +aS'gr_i' p4 -aS'model' +aS'graphics' p5 -aS'z0' +aS'x' p6 -aS'nout' +aS'model' p7 -atp8 -Rp9 +aS'typ' +p8 +aS'nout' +p9 +atp10 +Rp11 .(dp0 S'model.dstate' p1 diff --git a/js/Branching/MUX.js b/js/Branching/MUX.js index 33cf91bb..710b3825 100644 --- a/js/Branching/MUX.js +++ b/js/Branching/MUX.js @@ -9,9 +9,9 @@ function MUX() { this.model.ipar = new ScilabDouble([this.in1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var exprs = string(this.in1); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MUX\",sz(1),sz(2));"]); - this.x = standard_define([.5,2],this.model,exprs,gr_i); + 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); return new BasicBlock(this.x); } MUX.prototype.details = function MUX() { @@ -24,12 +24,13 @@ function MUX() { } MUX.prototype.set = function MUX() { this.in1 = parseFloat(arguments[0]["in1"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.in1,exprs] = scicos_getvalue("Set MUX block parameters","number of input ports or vector of sizes",list("intvec",-1),exprs); + [ok,this.in1,this.exprs] = scicos_getvalue("Set MUX block parameters","number of input ports or vector of sizes",list("intvec",-1),this.exprs); if (!ok) { break; } @@ -63,7 +64,7 @@ function MUX() { } } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.ipar = new ScilabDouble([this.in1]); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Branching/MUX.pickle b/js/Branching/MUX.pickle index bc3a11ca..68f561c9 100644 --- a/js/Branching/MUX.pickle +++ b/js/Branching/MUX.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'in1' p2 -aS'model' +aS'exprs' p3 -aS'in1' +aS'gr_i' p4 aS'graphics' p5 -atp6 -Rp7 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'model.sim' p1 diff --git a/js/Branching/MUX_f.js b/js/Branching/MUX_f.js index 4c88c94e..094c051e 100644 --- a/js/Branching/MUX_f.js +++ b/js/Branching/MUX_f.js @@ -9,9 +9,9 @@ function MUX_f() { this.model.ipar = new ScilabDouble([this.in1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var exprs = string(this.in1); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MUX_f\",sz(1),sz(2));"]); - this.x = standard_define([0.5,2],this.model,exprs,gr_i); + 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); return new BasicBlock(this.x); } MUX_f.prototype.details = function MUX_f() { @@ -24,12 +24,13 @@ function MUX_f() { } MUX_f.prototype.set = function MUX_f() { this.in1 = parseFloat(arguments[0]["in1"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.in1,exprs] = scicos_getvalue("Set MUX block parameters","number of input ports or vector of sizes",list("vec",-1),exprs); + [ok,this.in1,this.exprs] = scicos_getvalue("Set MUX block parameters","number of input ports or vector of sizes",list("vec",-1),this.exprs); if (!ok) { break; } @@ -63,7 +64,7 @@ function MUX_f() { } } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.ipar = new ScilabDouble([this.in1]); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Branching/MUX_f.pickle b/js/Branching/MUX_f.pickle index bc3a11ca..68f561c9 100644 --- a/js/Branching/MUX_f.pickle +++ b/js/Branching/MUX_f.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'in1' p2 -aS'model' +aS'exprs' p3 -aS'in1' +aS'gr_i' p4 aS'graphics' p5 -atp6 -Rp7 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'model.sim' p1 diff --git a/js/Branching/M_SWITCH.js b/js/Branching/M_SWITCH.js index bf0ed7fe..cf144eff 100644 --- a/js/Branching/M_SWITCH.js +++ b/js/Branching/M_SWITCH.js @@ -11,9 +11,9 @@ function M_SWITCH() { this.model.ipar = new ScilabDouble(ipar); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var exprs = [[string(this.nin)],[string(ipar)]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"M_SWITCH\",sz(1),sz(2));"]); - this.x = standard_define([2.5,2],this.model,exprs,gr_i); + 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); return new BasicBlock(this.x); } M_SWITCH.prototype.details = function M_SWITCH() { @@ -31,12 +31,13 @@ function M_SWITCH() { this.nin = parseFloat(arguments[0]["nin"]) this.base = parseFloat(arguments[0]["base"]) this.rule = arguments[0]["rule"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.nin,this.base,this.rule,exprs] = scicos_getvalue("Set parameters",["number of inputs","zero base indexing (0), otherwise 1","rounding rule: int (0), round (1), ceil (2), floor (3)"],list("vec",1,"vec",1,"vec",1),exprs); + [ok,this.nin,this.base,this.rule,this.exprs] = scicos_getvalue("Set parameters",["number of inputs","zero base indexing (0), otherwise 1","rounding rule: int (0), round (1), ceil (2), floor (3)"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -65,7 +66,7 @@ function M_SWITCH() { this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.ipar = new ScilabDouble([this.base],[this.rule]); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Branching/M_SWITCH.pickle b/js/Branching/M_SWITCH.pickle index b2f42465..6a8b359c 100644 --- a/js/Branching/M_SWITCH.pickle +++ b/js/Branching/M_SWITCH.pickle @@ -6,16 +6,20 @@ S'nin' p2 aS'rule' p3 -aS'base' +aS'exprs' p4 -aS'graphics' +aS'gr_i' p5 -aS'x' +aS'base' p6 -aS'model' +aS'graphics' p7 -atp8 -Rp9 +aS'x' +p8 +aS'model' +p9 +atp10 +Rp11 .(dp0 S'arg1' p1 diff --git a/js/Branching/NRMSOM_f.js b/js/Branching/NRMSOM_f.js index bec18258..ea15f6b7 100644 --- a/js/Branching/NRMSOM_f.js +++ b/js/Branching/NRMSOM_f.js @@ -9,9 +9,9 @@ function NRMSOM_f() { this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var exprs = [string(this.nin)]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"NRMSOM_f\",sz(1),sz(2));"]); - this.x = standard_define([.2,2],this.model,exprs,gr_i); + 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); return new BasicBlock(this.x); } NRMSOM_f.prototype.details = function NRMSOM_f() { @@ -25,12 +25,13 @@ function NRMSOM_f() { } NRMSOM_f.prototype.set = function NRMSOM_f() { this.nin = parseFloat(arguments[0]["nin"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.nin,exprs] = scicos_getvalue("Set parameters",["number of inputs"],list("vec",1),exprs); + [ok,this.nin,this.exprs] = scicos_getvalue("Set parameters",["number of inputs"],list("vec",1),this.exprs); if (!ok) { break; } @@ -39,7 +40,7 @@ function NRMSOM_f() { this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; diff --git a/js/Branching/NRMSOM_f.pickle b/js/Branching/NRMSOM_f.pickle index 95b68196..27340c37 100644 --- a/js/Branching/NRMSOM_f.pickle +++ b/js/Branching/NRMSOM_f.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'nin' p2 -aS'model' +aS'exprs' p3 -aS'nin' +aS'gr_i' p4 aS'graphics' p5 -atp6 -Rp7 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'model.sim' p1 diff --git a/js/Branching/RELAY_f.js b/js/Branching/RELAY_f.js index 1a4e0d43..1745376c 100644 --- a/js/Branching/RELAY_f.js +++ b/js/Branching/RELAY_f.js @@ -13,9 +13,9 @@ function RELAY_f() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,true]); - var exprs = [[string(this.nin)],[string(i0+1)]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RELAY_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + 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); return new BasicBlock(this.x); } RELAY_f.prototype.details = function RELAY_f() { @@ -31,13 +31,14 @@ function RELAY_f() { RELAY_f.prototype.set = function RELAY_f() { this.nin = parseFloat(arguments[0]["nin"]) this.z0 = arguments[0]["z0"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; var ipar = this.model.ipar; while (true) { - [ok,this.nin,this.z0,exprs] = scicos_getvalue("Set parameters",["number of inputs","initial connected input"],list("vec",1,"vec",1),exprs); + [ok,this.nin,this.z0,this.exprs] = scicos_getvalue("Set parameters",["number of inputs","initial connected input"],list("vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -49,7 +50,7 @@ function RELAY_f() { this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.dstate = new ScilabString([this.z0-1]); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Branching/RELAY_f.pickle b/js/Branching/RELAY_f.pickle index cb090d13..9700e89e 100644 --- a/js/Branching/RELAY_f.pickle +++ b/js/Branching/RELAY_f.pickle @@ -2,18 +2,22 @@ c__builtin__ set p0 ((lp1 -S'x' +S'nin' p2 -aS'model' +aS'exprs' p3 -aS'z0' +aS'gr_i' p4 -aS'nin' -p5 aS'graphics' +p5 +aS'x' p6 -atp7 -Rp8 +aS'model' +p7 +aS'z0' +p8 +atp9 +Rp10 .(dp0 S'model.dstate' p1 diff --git a/js/Branching/SCALAR2VECTOR.js b/js/Branching/SCALAR2VECTOR.js index bdedbfce..18895dd4 100644 --- a/js/Branching/SCALAR2VECTOR.js +++ b/js/Branching/SCALAR2VECTOR.js @@ -8,9 +8,9 @@ function SCALAR2VECTOR() { this.model.in1 = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var exprs = [string([this.nout])]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SCALAR2VECTOR\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,exprs,gr_i); + 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); return new BasicBlock(this.x); } SCALAR2VECTOR.prototype.details = function SCALAR2VECTOR() { @@ -24,12 +24,13 @@ function SCALAR2VECTOR() { } SCALAR2VECTOR.prototype.set = function SCALAR2VECTOR() { this.nout = parseFloat(arguments[0]["nout"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.nout,exprs] = scicos_getvalue("Set block parameters",["size of output (-1: if don\'t know)"],list("vec",1),exprs); + [ok,this.nout,this.exprs] = scicos_getvalue("Set block parameters",["size of output (-1: if don\'t know)"],list("vec",1),this.exprs); if (!ok) { break; } @@ -45,7 +46,7 @@ function SCALAR2VECTOR() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; diff --git a/js/Branching/SCALAR2VECTOR.pickle b/js/Branching/SCALAR2VECTOR.pickle index ed70c2af..ed60d5ef 100644 --- a/js/Branching/SCALAR2VECTOR.pickle +++ b/js/Branching/SCALAR2VECTOR.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'exprs' p2 -aS'model' +aS'gr_i' p3 -aS'nout' -p4 aS'graphics' +p4 +aS'x' p5 -atp6 -Rp7 +aS'model' +p6 +aS'nout' +p7 +atp8 +Rp9 .(dp0 S'model.sim' p1 diff --git a/js/Branching/SELECT_f.js b/js/Branching/SELECT_f.js index 1946c662..3f5ca888 100644 --- a/js/Branching/SELECT_f.js +++ b/js/Branching/SELECT_f.js @@ -12,9 +12,9 @@ function SELECT_f() { this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var exprs = [[string(this.nin)],[string(this.z0+1)]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SELECT_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + 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); return new BasicBlock(this.x); } SELECT_f.prototype.details = function SELECT_f() { @@ -30,12 +30,13 @@ function SELECT_f() { SELECT_f.prototype.set = function SELECT_f() { this.nin = parseFloat(arguments[0]["nin"]) this.z0 = parseFloat(arguments[0]["z0"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.nin,this.z0,exprs] = scicos_getvalue("Set parameters",["number of inputs","initial connected input"],list("vec",1,"vec",1),exprs); + [ok,this.nin,this.z0,this.exprs] = scicos_getvalue("Set parameters",["number of inputs","initial connected input"],list("vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -47,7 +48,7 @@ function SELECT_f() { this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.dstate = new ScilabDouble([this.z0-1]); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Branching/SELECT_f.pickle b/js/Branching/SELECT_f.pickle index 33b87e7a..79e3c230 100644 --- a/js/Branching/SELECT_f.pickle +++ b/js/Branching/SELECT_f.pickle @@ -2,18 +2,22 @@ c__builtin__ set p0 ((lp1 -S'x' +S'nin' p2 -aS'model' +aS'exprs' p3 -aS'z0' +aS'gr_i' p4 -aS'nin' -p5 aS'graphics' +p5 +aS'x' p6 -atp7 -Rp8 +aS'model' +p7 +aS'z0' +p8 +atp9 +Rp10 .(dp0 S'model.sim' p1 diff --git a/js/Branching/SELECT_m.js b/js/Branching/SELECT_m.js index 4642dad9..b8a5bd74 100644 --- a/js/Branching/SELECT_m.js +++ b/js/Branching/SELECT_m.js @@ -20,9 +20,9 @@ function SELECT_m() { this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var exprs = [[sci2exp(1)],[sci2exp(this.nin)],[sci2exp(this.z0)]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SELECT_m\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,exprs,gr_i); + 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); return new BasicBlock(this.x); } SELECT_m.prototype.details = function SELECT_m() { @@ -40,12 +40,13 @@ function SELECT_m() { this.typ = inverse(arguments[0]["typ"]) this.nin = parseFloat(arguments[0]["nin"]) this.z0 = parseFloat(arguments[0]["z0"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.typ,this.nin,this.z0,exprs] = scicos_getvalue("Set parameters",["Datatype(1= real double 2=Complex 3=int32 ..)","number of inputs","initial connected input"],list("vec",1,"vec",1,"vec",1),exprs); + [ok,this.typ,this.nin,this.z0,this.exprs] = scicos_getvalue("Set parameters",["Datatype(1= real double 2=Complex 3=int32 ..)","number of inputs","initial connected input"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -65,7 +66,7 @@ function SELECT_m() { this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.dstate = new ScilabDouble([this.z0]); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Branching/SELECT_m.pickle b/js/Branching/SELECT_m.pickle index f9c2cfa9..c8879d34 100644 --- a/js/Branching/SELECT_m.pickle +++ b/js/Branching/SELECT_m.pickle @@ -4,18 +4,22 @@ p0 ((lp1 S'nin' p2 -aS'typ' +aS'z0' p3 -aS'graphics' +aS'exprs' p4 -aS'x' +aS'gr_i' p5 -aS'model' +aS'graphics' p6 -aS'z0' +aS'x' p7 -atp8 -Rp9 +aS'model' +p8 +aS'typ' +p9 +atp10 +Rp11 .(dp0 S'model.dstate' p1 diff --git a/js/Branching/SELF_SWITCH.pickle b/js/Branching/SELF_SWITCH.pickle index df5cf582..f7d79ec6 100644 --- a/js/Branching/SELF_SWITCH.pickle +++ b/js/Branching/SELF_SWITCH.pickle @@ -2,12 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'stateOpen' p2 -aS'stateOpen' +aS'exprs' p3 -atp4 -Rp5 +aS'gr_i' +p4 +aS'graphics' +p5 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'diagram.objs[1-1]' p1 diff --git a/js/Branching/SWITCH2.js b/js/Branching/SWITCH2.js index 738579b3..88f40bb9 100644 --- a/js/Branching/SWITCH2.js +++ b/js/Branching/SWITCH2.js @@ -15,9 +15,9 @@ function SWITCH2() { this.model.nmode = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var exprs = [[string(ipar)],[string(rpar)],[string(this.nzz)]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SWITCH2\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + 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); return new BasicBlock(this.x); } SWITCH2.prototype.details = function SWITCH2() { @@ -35,12 +35,13 @@ function SWITCH2() { this.rule = parseFloat(arguments[0]["rule"]) this.thra = arguments[0]["thra"] this.nzz = parseFloat(arguments[0]["nzz"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.rule,this.thra,this.nzz,exprs] = scicos_getvalue("Set parameters",["pass first input if: u2>=a (0), u2>a (1), u2~=a (2)","threshold a","use zero crossing: yes (1), no (0)"],list("vec",1,"vec",1,"vec",1),exprs); + [ok,this.rule,this.thra,this.nzz,this.exprs] = scicos_getvalue("Set parameters",["pass first input if: u2>=a (0), u2>a (1), u2~=a (2)","threshold a","use zero crossing: yes (1), no (0)"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -51,7 +52,7 @@ function SWITCH2() { if ((this.rule>2)) { this.rule = 2; } - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.ipar = new ScilabDouble([this.rule]); this.model.rpar = new ScilabDouble([this.thra]); if (this.nzz!=0) { diff --git a/js/Branching/SWITCH2.pickle b/js/Branching/SWITCH2.pickle index c7e23169..3b8a12e8 100644 --- a/js/Branching/SWITCH2.pickle +++ b/js/Branching/SWITCH2.pickle @@ -8,14 +8,18 @@ aS'rule' p3 aS'thra' p4 -aS'graphics' +aS'exprs' p5 -aS'x' +aS'gr_i' p6 -aS'model' +aS'graphics' p7 -atp8 -Rp9 +aS'x' +p8 +aS'model' +p9 +atp10 +Rp11 .(dp0 S'arg1' p1 diff --git a/js/Branching/SWITCH2_m.js b/js/Branching/SWITCH2_m.js index a3a2c7fc..b7ea3784 100644 --- a/js/Branching/SWITCH2_m.js +++ b/js/Branching/SWITCH2_m.js @@ -18,9 +18,9 @@ function SWITCH2_m() { this.model.nmode = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var exprs = [[sci2exp(1)],[string(ipar)],[string(rpar)],[string(this.nzz)]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SWITCH2_m\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + 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); return new BasicBlock(this.x); } SWITCH2_m.prototype.details = function SWITCH2_m() { @@ -40,12 +40,13 @@ function SWITCH2_m() { this.rule = parseFloat(arguments[0]["rule"]) this.thra = arguments[0]["thra"] this.nzz = parseFloat(arguments[0]["nzz"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.ot,this.rule,this.thra,this.nzz,exprs] = scicos_getvalue("Set parameters",["Datatype (1=real double 2=complex 3=int32 ...)","pass first input if: u2>=a (0), u2>a (1), u2~=a (2)","threshold a","use zero crossing: yes (1), no (0)"],list("vec",1,"vec",1,"vec",1,"vec",1),exprs); + [ok,this.ot,this.rule,this.thra,this.nzz,this.exprs] = scicos_getvalue("Set parameters",["Datatype (1=real double 2=complex 3=int32 ...)","pass first input if: u2>=a (0), u2>a (1), u2~=a (2)","threshold a","use zero crossing: yes (1), no (0)"],list("vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -56,7 +57,7 @@ function SWITCH2_m() { if ((this.rule>2)) { this.rule = 2; } - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.ipar = new ScilabDouble([this.rule]); this.model.rpar = new ScilabDouble([this.thra]); if (this.nzz!=0) { diff --git a/js/Branching/SWITCH2_m.pickle b/js/Branching/SWITCH2_m.pickle index b798f56f..733fcd2c 100644 --- a/js/Branching/SWITCH2_m.pickle +++ b/js/Branching/SWITCH2_m.pickle @@ -8,16 +8,20 @@ aS'rule' p3 aS'thra' p4 -aS'graphics' +aS'exprs' p5 -aS'x' +aS'gr_i' p6 -aS'model' +aS'graphics' p7 -aS'ot' +aS'x' p8 -atp9 -Rp10 +aS'model' +p9 +aS'ot' +p10 +atp11 +Rp12 .(dp0 S'arg1' p1 diff --git a/js/Branching/SWITCH_f.js b/js/Branching/SWITCH_f.js index 8ca9c036..bf9b0bd8 100644 --- a/js/Branching/SWITCH_f.js +++ b/js/Branching/SWITCH_f.js @@ -12,9 +12,9 @@ function SWITCH_f() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,true]); - var exprs = [[string(this.nin)],[string(i0+1)]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SWITCH_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + 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); return new BasicBlock(this.x); } SWITCH_f.prototype.details = function SWITCH_f() { @@ -30,13 +30,14 @@ function SWITCH_f() { SWITCH_f.prototype.set = function SWITCH_f() { this.nin = parseFloat(arguments[0]["nin"]) this.z0 = arguments[0]["z0"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; var ipar = this.model.ipar; while (true) { - [ok,this.nin,this.z0,exprs] = scicos_getvalue("Set switch parameters",["number of inputs","connected input"],list("vec",1,"vec",1),exprs); + [ok,this.nin,this.z0,this.exprs] = scicos_getvalue("Set switch parameters",["number of inputs","connected input"],list("vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -48,7 +49,7 @@ function SWITCH_f() { this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.ipar = new ScilabString([this.z0-1]); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Branching/SWITCH_f.pickle b/js/Branching/SWITCH_f.pickle index bd0fe2a2..8b909059 100644 --- a/js/Branching/SWITCH_f.pickle +++ b/js/Branching/SWITCH_f.pickle @@ -2,18 +2,22 @@ c__builtin__ set p0 ((lp1 -S'x' +S'nin' p2 -aS'model' +aS'exprs' p3 -aS'z0' +aS'gr_i' p4 -aS'nin' -p5 aS'graphics' +p5 +aS'x' p6 -atp7 -Rp8 +aS'model' +p7 +aS'z0' +p8 +atp9 +Rp10 .(dp0 S'arg1' p1 |