remove exprs and gr_i from default global list

53 files changed, 285 insertions, 393 deletions

diff --git a/js/Branching/CLKFROM.js b/js/Branching/CLKFROM.js
index 11e79e17..017fff42 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 ScilabBoolean([false,false]);
-        this.exprs = "A";
-        this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabString([this.exprs])," ");
+        var exprs = "A";
+        this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabString([exprs])," ");
         this.x.graphics.id = "From";
         return new BasicBlock(this.x);
     }
@@ -23,7 +23,7 @@ function CLKFROM() {
         return options;
     }
     CLKFROM.prototype.set = function CLKFROM() {
-        this.exprs = this.graphics.exprs;
+        var exprs = this.graphics.exprs;
         while (true) {
             var ok = true;
             this.tag = arguments[0]["tag"];
@@ -37,7 +37,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([this.exprs]);
+            this.graphics.exprs = new ScilabDouble([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 03b08283..c675788f 100644
--- a/js/Branching/CLKFROM.pickle
+++ b/js/Branching/CLKFROM.pickle
@@ -2,20 +2,16 @@ c__builtin__
 set
 p0
 ((lp1
-S'gr_i'
+S'x'
 p2
-aS'exprs'
+aS'model'
 p3
 aS'tag'
 p4
 aS'graphics'
 p5
-aS'x'
-p6
-aS'model'
-p7
-atp8
-Rp9
+atp6
+Rp7
 .(dp0
 S'needcompile'
 p1
diff --git a/js/Branching/CLKGOTO.js b/js/Branching/CLKGOTO.js
index e336116e..77cb9d81 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 ScilabBoolean([false,false]);
-        this.exprs = [["A"],[sci2exp(1)]];
-        this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabDouble(this.exprs)," ");
+        var exprs = [["A"],[sci2exp(1)]];
+        this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabDouble(exprs)," ");
         this.x.graphics.id = "Goto";
         return new BasicBlock(this.x);
     }
@@ -25,7 +25,7 @@ function CLKGOTO() {
         return options;
     }
     CLKGOTO.prototype.set = function CLKGOTO() {
-        this.exprs = this.graphics.exprs;
+        var exprs = this.graphics.exprs;
         while (true) {
             var ok = true;
             this.tag = arguments[0]["tag"];
@@ -48,7 +48,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([this.exprs]);
+                this.graphics.exprs = new ScilabDouble([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 1d8387b8..27b37db4 100644
--- a/js/Branching/CLKGOTO.pickle
+++ b/js/Branching/CLKGOTO.pickle
@@ -2,22 +2,18 @@ c__builtin__
 set
 p0
 ((lp1
-S'tagvis'
+S'x'
 p2
-aS'gr_i'
+aS'model'
 p3
-aS'exprs'
-p4
 aS'tag'
+p4
+aS'tagvis'
 p5
 aS'graphics'
 p6
-aS'x'
-p7
-aS'model'
-p8
-atp9
-Rp10
+atp7
+Rp8
 .(dp0
 S'needcompile'
 p1
diff --git a/js/Branching/CLKGotoTagVisibility.js b/js/Branching/CLKGotoTagVisibility.js
index 910ba6bb..8060884f 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 ScilabBoolean([false,false]);
-        this.exprs = "A";
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKGotoTagVisibility\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i);
+        var exprs = "A";
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKGotoTagVisibility\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([exprs]),gr_i);
         return new BasicBlock(this.x);
     }
     CLKGotoTagVisibility.prototype.details = function CLKGotoTagVisibility() {
@@ -29,7 +29,7 @@ function CLKGotoTagVisibility() {
         return options;
     }
     CLKGotoTagVisibility.prototype.set = function CLKGotoTagVisibility() {
-        this.exprs = this.graphics.exprs;
+        var exprs = this.graphics.exprs;
         while (true) {
             var ok = true;
             this.tag = arguments[0]["tag"];
@@ -41,7 +41,7 @@ function CLKGotoTagVisibility() {
                     var needcompile = 4;
                     var y = needcompile;
                 }
-                this.graphics.exprs = new ScilabDouble([this.exprs]);
+                this.graphics.exprs = new ScilabDouble([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 8a8a7330..9a033bf0 100644
--- a/js/Branching/CLKGotoTagVisibility.pickle
+++ b/js/Branching/CLKGotoTagVisibility.pickle
@@ -2,20 +2,16 @@ c__builtin__
 set
 p0
 ((lp1
-S'gr_i'
+S'x'
 p2
-aS'exprs'
+aS'model'
 p3
 aS'tag'
 p4
 aS'graphics'
 p5
-aS'x'
-p6
-aS'model'
-p7
-atp8
-Rp9
+atp6
+Rp7
 .(dp0
 S'arg1'
 p1
diff --git a/js/Branching/DEMUX.js b/js/Branching/DEMUX.js
index 6d1b4fc7..5b2875a2 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 ScilabBoolean([true,false]);
-        this.exprs = string(this.out);
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DEMUX\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([.5,2]),this.model,new ScilabString([this.exprs]),this.gr_i);
+        var exprs = string(this.out);
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DEMUX\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([.5,2]),this.model,new ScilabString([exprs]),gr_i);
         return new BasicBlock(this.x);
     }
     DEMUX.prototype.details = function DEMUX() {
@@ -25,7 +25,7 @@ function DEMUX() {
         return options;
     }
     DEMUX.prototype.set = function DEMUX() {
-        this.exprs = this.graphics.exprs;
+        var exprs = this.graphics.exprs;
         while (true) {
             var ok = true;
             this.out = parseFloat(arguments[0]["out"]);
@@ -64,7 +64,7 @@ function DEMUX() {
                 }
             }
             if (ok) {
-                this.graphics.exprs = new ScilabDouble([this.exprs]);
+                this.graphics.exprs = new ScilabDouble([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 544bab46..f74e7d0c 100644
--- a/js/Branching/DEMUX.pickle
+++ b/js/Branching/DEMUX.pickle
@@ -2,20 +2,16 @@ c__builtin__
 set
 p0
 ((lp1
-S'exprs'
+S'x'
 p2
-aS'gr_i'
+aS'model'
 p3
-aS'graphics'
+aS'out'
 p4
-aS'x'
+aS'graphics'
 p5
-aS'model'
-p6
-aS'out'
-p7
-atp8
-Rp9
+atp6
+Rp7
 .(dp0
 S'model.sim'
 p1
diff --git a/js/Branching/DEMUX_f.js b/js/Branching/DEMUX_f.js
index 4c63f26d..e4ac576e 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 ScilabBoolean([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 = new standard_define(new ScilabDouble([.5,2]),this.model,new ScilabString([this.exprs]),this.gr_i);
+        var exprs = string(this.out);
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DEMUX_f\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([.5,2]),this.model,new ScilabString([exprs]),gr_i);
         return new BasicBlock(this.x);
     }
     DEMUX_f.prototype.details = function DEMUX_f() {
@@ -25,7 +25,7 @@ function DEMUX_f() {
         return options;
     }
     DEMUX_f.prototype.set = function DEMUX_f() {
-        this.exprs = this.graphics.exprs;
+        var exprs = this.graphics.exprs;
         while (true) {
             var ok = true;
             this.out = parseFloat(arguments[0]["out"]);
@@ -64,7 +64,7 @@ function DEMUX_f() {
                 }
             }
             if (ok) {
-                this.graphics.exprs = new ScilabDouble([this.exprs]);
+                this.graphics.exprs = new ScilabDouble([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 544bab46..f74e7d0c 100644
--- a/js/Branching/DEMUX_f.pickle
+++ b/js/Branching/DEMUX_f.pickle
@@ -2,20 +2,16 @@ c__builtin__
 set
 p0
 ((lp1
-S'exprs'
+S'x'
 p2
-aS'gr_i'
+aS'model'
 p3
-aS'graphics'
+aS'out'
 p4
-aS'x'
+aS'graphics'
 p5
-aS'model'
-p6
-aS'out'
-p7
-atp8
-Rp9
+atp6
+Rp7
 .(dp0
 S'model.sim'
 p1
diff --git a/js/Branching/ESELECT_f.js b/js/Branching/ESELECT_f.js
index 094fa043..b3ae4889 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 ScilabBoolean([true,false]);
         this.model.nmode = new ScilabDouble([0]);
         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 = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i);
+        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 = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(exprs),gr_i);
         return new BasicBlock(this.x);
     }
     ESELECT_f.prototype.details = function ESELECT_f() {
@@ -31,12 +31,12 @@ function ESELECT_f() {
         return options;
     }
     ESELECT_f.prototype.set = function ESELECT_f() {
-        this.exprs = this.graphics.exprs;
-        if (size(this.exprs,"*")==1) {
-            this.exprs[2-1] = string(1);
+        var exprs = this.graphics.exprs;
+        if (size(exprs,"*")==1) {
+            exprs[2-1] = string(1);
         }
-        if (size(this.exprs,"*")==2) {
-            this.exprs[3-1] = string(0);
+        if (size(exprs,"*")==2) {
+            exprs[3-1] = string(0);
         }
         while (true) {
             var ok = true;
@@ -64,7 +64,7 @@ function ESELECT_f() {
                 this.graphics = tmpvar0[1];
                 var ok = tmpvar0[2];
                 if (ok) {
-                    this.graphics.exprs = new ScilabDouble([this.exprs]);
+                    this.graphics.exprs = new ScilabDouble([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 56a802e6..3c046923 100644
--- a/js/Branching/ESELECT_f.pickle
+++ b/js/Branching/ESELECT_f.pickle
@@ -4,22 +4,18 @@ p0
 ((lp1
 S'nmod'
 p2
-aS'exprs'
-p3
-aS'gr_i'
-p4
 aS'inh'
-p5
+p3
 aS'graphics'
-p6
+p4
 aS'x'
-p7
+p5
 aS'model'
-p8
+p6
 aS'out'
-p9
-atp10
-Rp11
+p7
+atp8
+Rp9
 .(dp0
 S'arg1'
 p1
diff --git a/js/Branching/EXTRACTOR.js b/js/Branching/EXTRACTOR.js
index 8cc0aa26..072f316b 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 ScilabBoolean([true,false]);
         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 = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString(this.exprs),this.gr_i);
+        var exprs = [sci2exp(this.ind)];
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTRACTOR\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString(exprs),gr_i);
         return new BasicBlock(this.x);
     }
     EXTRACTOR.prototype.details = function EXTRACTOR() {
@@ -24,7 +24,7 @@ function EXTRACTOR() {
         return options;
     }
     EXTRACTOR.prototype.set = function EXTRACTOR() {
-        this.exprs = this.graphics.exprs;
+        var exprs = this.graphics.exprs;
         while (true) {
             var ok = true;
             this.ind = parseFloat(arguments[0]["ind"]);
@@ -39,7 +39,7 @@ function EXTRACTOR() {
             var ok = tmpvar0[2];
             if (ok) {
                 this.model.ipar = new ScilabDouble(this.ind);
-                this.graphics.exprs = new ScilabDouble([this.exprs]);
+                this.graphics.exprs = new ScilabDouble([exprs]);
                 this.x.graphics = this.graphics;
                 this.x.model = this.model;
                 break;
diff --git a/js/Branching/EXTRACTOR.pickle b/js/Branching/EXTRACTOR.pickle
index c334c07e..9d413f74 100644
--- a/js/Branching/EXTRACTOR.pickle
+++ b/js/Branching/EXTRACTOR.pickle
@@ -2,20 +2,16 @@ c__builtin__
 set
 p0
 ((lp1
-S'exprs'
+S'ind'
 p2
-aS'gr_i'
+aS'x'
 p3
-aS'graphics'
+aS'model'
 p4
-aS'ind'
+aS'graphics'
 p5
-aS'x'
-p6
-aS'model'
-p7
-atp8
-Rp9
+atp6
+Rp7
 .(dp0
 S'model.sim'
 p1
diff --git a/js/Branching/FROM.js b/js/Branching/FROM.js
index fe6f8630..956f778e 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 ScilabBoolean([false,false]);
-        this.exprs = ["A"];
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROM\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabString(this.exprs),this.gr_i);
+        var exprs = ["A"];
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROM\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabString(exprs),gr_i);
         this.x.graphics.id = "From";
         return new BasicBlock(this.x);
     }
@@ -29,7 +29,7 @@ function FROM() {
         return options;
     }
     FROM.prototype.set = function FROM() {
-        this.exprs = this.graphics.exprs;
+        var exprs = this.graphics.exprs;
         while (true) {
             var ok = true;
             this.tag = arguments[0]["tag"];
@@ -41,7 +41,7 @@ function FROM() {
                     var needcompile = 4;
                     var y = needcompile;
                 }
-                this.graphics.exprs = new ScilabDouble([this.exprs]);
+                this.graphics.exprs = new ScilabDouble([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 b73c9110..81f960b8 100644
--- a/js/Branching/FROM.pickle
+++ b/js/Branching/FROM.pickle
@@ -2,20 +2,16 @@ c__builtin__
 set
 p0
 ((lp1
-S'gr_i'
+S'x'
 p2
-aS'exprs'
+aS'model'
 p3
 aS'tag'
 p4
 aS'graphics'
 p5
-aS'x'
-p6
-aS'model'
-p7
-atp8
-Rp9
+atp6
+Rp7
 .(dp0
 S'arg1'
 p1
diff --git a/js/Branching/FROMMO.js b/js/Branching/FROMMO.js
index 7f5f526d..e4dc0406 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";
-        this.exprs = ["A"];
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROMMO\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabString(this.exprs),this.gr_i);
+        var exprs = ["A"];
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROMMO\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabString(exprs),gr_i);
         this.x.graphics.out_implicit = ["I"];
         return new BasicBlock(this.x);
     }
@@ -32,7 +32,7 @@ function FROMMO() {
         return options;
     }
     FROMMO.prototype.set = function FROMMO() {
-        this.exprs = this.graphics.exprs;
+        var exprs = this.graphics.exprs;
         while (true) {
             var ok = true;
             this.tag = arguments[0]["tag"];
@@ -44,7 +44,7 @@ function FROMMO() {
                     var needcompile = 4;
                     var y = needcompile;
                 }
-                this.graphics.exprs = new ScilabDouble([this.exprs]);
+                this.graphics.exprs = new ScilabDouble([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 1b5e3af9..b2aa3ba6 100644
--- a/js/Branching/FROMMO.pickle
+++ b/js/Branching/FROMMO.pickle
@@ -2,20 +2,16 @@ c__builtin__
 set
 p0
 ((lp1
-S'gr_i'
+S'x'
 p2
-aS'exprs'
+aS'model'
 p3
 aS'tag'
 p4
 aS'graphics'
 p5
-aS'x'
-p6
-aS'model'
-p7
-atp8
-Rp9
+atp6
+Rp7
 .(dp0
 S'arg1'
 p1
diff --git a/js/Branching/GOTO.js b/js/Branching/GOTO.js
index 8d660d2f..fc85e462 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 ScilabBoolean([false,false]);
-        this.exprs = [["A"],[sci2exp(1)]];
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GOTO\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabDouble(this.exprs),this.gr_i);
+        var exprs = [["A"],[sci2exp(1)]];
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GOTO\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabDouble(exprs),gr_i);
         this.x.graphics.id = "Goto";
         return new BasicBlock(this.x);
     }
@@ -30,7 +30,7 @@ function GOTO() {
         return options;
     }
     GOTO.prototype.set = function GOTO() {
-        this.exprs = this.graphics.exprs;
+        var exprs = this.graphics.exprs;
         while (true) {
             var ok = true;
             this.tag = arguments[0]["tag"];
@@ -49,7 +49,7 @@ function GOTO() {
                     var needcompile = 4;
                     var y = needcompile;
                 }
-                this.graphics.exprs = new ScilabDouble([this.exprs]);
+                this.graphics.exprs = new ScilabDouble([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 6e20e181..c8813078 100644
--- a/js/Branching/GOTO.pickle
+++ b/js/Branching/GOTO.pickle
@@ -2,22 +2,18 @@ c__builtin__
 set
 p0
 ((lp1
-S'tagvis'
+S'x'
 p2
-aS'gr_i'
+aS'model'
 p3
-aS'exprs'
-p4
 aS'tag'
+p4
+aS'tagvis'
 p5
 aS'graphics'
 p6
-aS'x'
-p7
-aS'model'
-p8
-atp9
-Rp10
+atp7
+Rp8
 .(dp0
 S'tagvis'
 p1
diff --git a/js/Branching/GOTOMO.js b/js/Branching/GOTOMO.js
index 349cc175..61e8134b 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";
-        this.exprs = [["A"],[sci2exp(1)]];
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GOTOMO\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabDouble(this.exprs),this.gr_i);
+        var exprs = [["A"],[sci2exp(1)]];
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GOTOMO\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabDouble(exprs),gr_i);
         this.x.graphics.in_implicit = ["I"];
         return new BasicBlock(this.x);
     }
@@ -33,7 +33,7 @@ function GOTOMO() {
         return options;
     }
     GOTOMO.prototype.set = function GOTOMO() {
-        this.exprs = this.graphics.exprs;
+        var exprs = this.graphics.exprs;
         while (true) {
             var ok = true;
             this.tag = arguments[0]["tag"];
@@ -52,7 +52,7 @@ function GOTOMO() {
                     var needcompile = 4;
                     var y = needcompile;
                 }
-                this.graphics.exprs = new ScilabDouble([this.exprs]);
+                this.graphics.exprs = new ScilabDouble([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 2d9330a6..04657ea7 100644
--- a/js/Branching/GOTOMO.pickle
+++ b/js/Branching/GOTOMO.pickle
@@ -2,22 +2,18 @@ c__builtin__
 set
 p0
 ((lp1
-S'tagvis'
+S'x'
 p2
-aS'gr_i'
+aS'model'
 p3
-aS'exprs'
-p4
 aS'tag'
+p4
+aS'tagvis'
 p5
 aS'graphics'
 p6
-aS'x'
-p7
-aS'model'
-p8
-atp9
-Rp10
+atp7
+Rp8
 .(dp0
 S'tagvis'
 p1
diff --git a/js/Branching/GotoTagVisibility.js b/js/Branching/GotoTagVisibility.js
index dbfe9478..42d55824 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 ScilabBoolean([false,false]);
-        this.exprs = "A";
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GotoTagVisibility\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i);
+        var exprs = "A";
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GotoTagVisibility\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([exprs]),gr_i);
         return new BasicBlock(this.x);
     }
     GotoTagVisibility.prototype.details = function GotoTagVisibility() {
@@ -29,7 +29,7 @@ function GotoTagVisibility() {
         return options;
     }
     GotoTagVisibility.prototype.set = function GotoTagVisibility() {
-        this.exprs = this.graphics.exprs;
+        var exprs = this.graphics.exprs;
         while (true) {
             var ok = true;
             this.tag = arguments[0]["tag"];
@@ -41,7 +41,7 @@ function GotoTagVisibility() {
                     var needcompile = 4;
                     var y = needcompile;
                 }
-                this.graphics.exprs = new ScilabDouble([this.exprs]);
+                this.graphics.exprs = new ScilabDouble([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 8a8a7330..9a033bf0 100644
--- a/js/Branching/GotoTagVisibility.pickle
+++ b/js/Branching/GotoTagVisibility.pickle
@@ -2,20 +2,16 @@ c__builtin__
 set
 p0
 ((lp1
-S'gr_i'
+S'x'
 p2
-aS'exprs'
+aS'model'
 p3
 aS'tag'
 p4
 aS'graphics'
 p5
-aS'x'
-p6
-aS'model'
-p7
-atp8
-Rp9
+atp6
+Rp7
 .(dp0
 S'arg1'
 p1
diff --git a/js/Branching/GotoTagVisibilityMO.js b/js/Branching/GotoTagVisibilityMO.js
index a3c72751..76183059 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 ScilabBoolean([false,false]);
-        this.exprs = "A";
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GotoTagVisibilityMO\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i);
+        var exprs = "A";
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GotoTagVisibilityMO\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([exprs]),gr_i);
         return new BasicBlock(this.x);
     }
     GotoTagVisibilityMO.prototype.details = function GotoTagVisibilityMO() {
@@ -29,7 +29,7 @@ function GotoTagVisibilityMO() {
         return options;
     }
     GotoTagVisibilityMO.prototype.set = function GotoTagVisibilityMO() {
-        this.exprs = this.graphics.exprs;
+        var exprs = this.graphics.exprs;
         while (true) {
             var ok = true;
             this.tag = arguments[0]["tag"];
@@ -41,7 +41,7 @@ function GotoTagVisibilityMO() {
                     var needcompile = 4;
                     var y = needcompile;
                 }
-                this.graphics.exprs = new ScilabDouble([this.exprs]);
+                this.graphics.exprs = new ScilabDouble([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 8a8a7330..9a033bf0 100644
--- a/js/Branching/GotoTagVisibilityMO.pickle
+++ b/js/Branching/GotoTagVisibilityMO.pickle
@@ -2,20 +2,16 @@ c__builtin__
 set
 p0
 ((lp1
-S'gr_i'
+S'x'
 p2
-aS'exprs'
+aS'model'
 p3
 aS'tag'
 p4
 aS'graphics'
 p5
-aS'x'
-p6
-aS'model'
-p7
-atp8
-Rp9
+atp6
+Rp7
 .(dp0
 S'arg1'
 p1
diff --git a/js/Branching/ISELECT_f.js b/js/Branching/ISELECT_f.js
index 72914649..a60340e8 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 ScilabBoolean([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 = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i);
+        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 = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),gr_i);
         return new BasicBlock(this.x);
     }
     ISELECT_f.prototype.details = function ISELECT_f() {
@@ -28,7 +28,7 @@ function ISELECT_f() {
         return options;
     }
     ISELECT_f.prototype.set = function ISELECT_f() {
-        this.exprs = this.graphics.exprs;
+        var exprs = this.graphics.exprs;
         while (true) {
             var ok = true;
             this.nout = parseFloat(arguments[0]["nout"]);
@@ -45,7 +45,7 @@ function ISELECT_f() {
                 this.graphics = tmpvar0[1];
                 var ok = tmpvar0[2];
                 if (ok) {
-                    this.graphics.exprs = new ScilabDouble([this.exprs]);
+                    this.graphics.exprs = new ScilabDouble([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 3a73aad5..c2d03a0e 100644
--- a/js/Branching/ISELECT_f.pickle
+++ b/js/Branching/ISELECT_f.pickle
@@ -2,22 +2,18 @@ c__builtin__
 set
 p0
 ((lp1
-S'exprs'
+S'x'
 p2
-aS'gr_i'
+aS'model'
 p3
-aS'graphics'
+aS'z0'
 p4
-aS'x'
+aS'nout'
 p5
-aS'model'
+aS'graphics'
 p6
-aS'z0'
-p7
-aS'nout'
-p8
-atp9
-Rp10
+atp7
+Rp8
 .(dp0
 S'model.sim'
 p1
diff --git a/js/Branching/ISELECT_m.js b/js/Branching/ISELECT_m.js
index db7bb056..da6ac5b0 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 ScilabBoolean([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 = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i);
+        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 = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(exprs),gr_i);
         return new BasicBlock(this.x);
     }
     ISELECT_m.prototype.details = function ISELECT_m() {
@@ -37,7 +37,7 @@ function ISELECT_m() {
         return options;
     }
     ISELECT_m.prototype.set = function ISELECT_m() {
-        this.exprs = this.graphics.exprs;
+        var exprs = this.graphics.exprs;
         while (true) {
             var ok = true;
             this.typ = inverse(arguments[0]["typ"]);
@@ -64,7 +64,7 @@ function ISELECT_m() {
                     this.graphics = tmpvar0[1];
                     var ok = tmpvar0[2];
                     if (ok) {
-                        this.graphics.exprs = new ScilabDouble([this.exprs]);
+                        this.graphics.exprs = new ScilabDouble([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 696cb0db..cca6bf9f 100644
--- a/js/Branching/ISELECT_m.pickle
+++ b/js/Branching/ISELECT_m.pickle
@@ -2,24 +2,20 @@ c__builtin__
 set
 p0
 ((lp1
-S'z0'
+S'typ'
 p2
-aS'exprs'
+aS'graphics'
 p3
-aS'gr_i'
+aS'x'
 p4
-aS'graphics'
+aS'model'
 p5
-aS'x'
+aS'z0'
 p6
-aS'model'
-p7
-aS'typ'
-p8
 aS'nout'
-p9
-atp10
-Rp11
+p7
+atp8
+Rp9
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/Branching/MUX.js b/js/Branching/MUX.js
index 2aab447c..68a38789 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 ScilabBoolean([true,false]);
-        this.exprs = string(this.in1);
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MUX\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([.5,2]),this.model,new ScilabString([this.exprs]),this.gr_i);
+        var exprs = string(this.in1);
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MUX\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([.5,2]),this.model,new ScilabString([exprs]),gr_i);
         return new BasicBlock(this.x);
     }
     MUX.prototype.details = function MUX() {
@@ -24,7 +24,7 @@ function MUX() {
         return options;
     }
     MUX.prototype.set = function MUX() {
-        this.exprs = this.graphics.exprs;
+        var exprs = this.graphics.exprs;
         while (true) {
             var ok = true;
             this.in1 = parseFloat(arguments[0]["in1"]);
@@ -63,7 +63,7 @@ function MUX() {
                 }
             }
             if (ok) {
-                this.graphics.exprs = new ScilabDouble([this.exprs]);
+                this.graphics.exprs = new ScilabDouble([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 e89840ef..66905226 100644
--- a/js/Branching/MUX.pickle
+++ b/js/Branching/MUX.pickle
@@ -2,20 +2,16 @@ c__builtin__
 set
 p0
 ((lp1
-S'in1'
+S'x'
 p2
-aS'exprs'
+aS'model'
 p3
-aS'gr_i'
+aS'in1'
 p4
 aS'graphics'
 p5
-aS'x'
-p6
-aS'model'
-p7
-atp8
-Rp9
+atp6
+Rp7
 .(dp0
 S'model.sim'
 p1
diff --git a/js/Branching/MUX_f.js b/js/Branching/MUX_f.js
index 2a474040..8cdc3ca4 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 ScilabBoolean([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 = new standard_define(new ScilabDouble([0.5,2]),this.model,new ScilabString([this.exprs]),this.gr_i);
+        var exprs = string(this.in1);
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MUX_f\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([0.5,2]),this.model,new ScilabString([exprs]),gr_i);
         return new BasicBlock(this.x);
     }
     MUX_f.prototype.details = function MUX_f() {
@@ -24,7 +24,7 @@ function MUX_f() {
         return options;
     }
     MUX_f.prototype.set = function MUX_f() {
-        this.exprs = this.graphics.exprs;
+        var exprs = this.graphics.exprs;
         while (true) {
             var ok = true;
             this.in1 = parseFloat(arguments[0]["in1"]);
@@ -63,7 +63,7 @@ function MUX_f() {
                 }
             }
             if (ok) {
-                this.graphics.exprs = new ScilabDouble([this.exprs]);
+                this.graphics.exprs = new ScilabDouble([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 e89840ef..66905226 100644
--- a/js/Branching/MUX_f.pickle
+++ b/js/Branching/MUX_f.pickle
@@ -2,20 +2,16 @@ c__builtin__
 set
 p0
 ((lp1
-S'in1'
+S'x'
 p2
-aS'exprs'
+aS'model'
 p3
-aS'gr_i'
+aS'in1'
 p4
 aS'graphics'
 p5
-aS'x'
-p6
-aS'model'
-p7
-atp8
-Rp9
+atp6
+Rp7
 .(dp0
 S'model.sim'
 p1
diff --git a/js/Branching/M_SWITCH.js b/js/Branching/M_SWITCH.js
index c27ece64..a782d0a9 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 ScilabBoolean([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 = new standard_define(new ScilabDouble([2.5,2]),this.model,new ScilabDouble(this.exprs),this.gr_i);
+        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 = new standard_define(new ScilabDouble([2.5,2]),this.model,new ScilabDouble(exprs),gr_i);
         return new BasicBlock(this.x);
     }
     M_SWITCH.prototype.details = function M_SWITCH() {
@@ -28,7 +28,7 @@ function M_SWITCH() {
         return options;
     }
     M_SWITCH.prototype.set = function M_SWITCH() {
-        this.exprs = this.graphics.exprs;
+        var exprs = this.graphics.exprs;
         while (true) {
             var ok = true;
             this.nin = parseFloat(arguments[0]["nin"]);
@@ -65,7 +65,7 @@ function M_SWITCH() {
                 this.graphics = tmpvar0[1];
                 var ok = tmpvar0[2];
                 if (ok) {
-                    this.graphics.exprs = new ScilabDouble([this.exprs]);
+                    this.graphics.exprs = new ScilabDouble([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 9cfd3442..befba602 100644
--- a/js/Branching/M_SWITCH.pickle
+++ b/js/Branching/M_SWITCH.pickle
@@ -6,20 +6,16 @@ S'nin'
 p2
 aS'rule'
 p3
-aS'exprs'
-p4
-aS'gr_i'
-p5
 aS'base'
-p6
+p4
 aS'graphics'
-p7
+p5
 aS'x'
-p8
+p6
 aS'model'
-p9
-atp10
-Rp11
+p7
+atp8
+Rp9
 .(dp0
 S'arg1'
 p1
diff --git a/js/Branching/NRMSOM_f.js b/js/Branching/NRMSOM_f.js
index 71d1f67a..31bb7df9 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 ScilabBoolean([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 = new standard_define(new ScilabDouble([.2,2]),this.model,new ScilabString(this.exprs),this.gr_i);
+        var exprs = [string(this.nin)];
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"NRMSOM_f\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([.2,2]),this.model,new ScilabString(exprs),gr_i);
         return new BasicBlock(this.x);
     }
     NRMSOM_f.prototype.details = function NRMSOM_f() {
@@ -24,7 +24,7 @@ function NRMSOM_f() {
         return options;
     }
     NRMSOM_f.prototype.set = function NRMSOM_f() {
-        this.exprs = this.graphics.exprs;
+        var exprs = this.graphics.exprs;
         while (true) {
             var ok = true;
             this.nin = parseFloat(arguments[0]["nin"]);
@@ -36,7 +36,7 @@ function NRMSOM_f() {
             this.graphics = tmpvar0[1];
             var ok = tmpvar0[2];
             if (ok) {
-                this.graphics.exprs = new ScilabDouble([this.exprs]);
+                this.graphics.exprs = new ScilabDouble([exprs]);
                 this.x.graphics = this.graphics;
                 this.x.model = this.model;
                 break;
diff --git a/js/Branching/NRMSOM_f.pickle b/js/Branching/NRMSOM_f.pickle
index 8e2598f6..fc145ca0 100644
--- a/js/Branching/NRMSOM_f.pickle
+++ b/js/Branching/NRMSOM_f.pickle
@@ -2,20 +2,16 @@ c__builtin__
 set
 p0
 ((lp1
-S'nin'
+S'x'
 p2
-aS'exprs'
+aS'model'
 p3
-aS'gr_i'
+aS'nin'
 p4
 aS'graphics'
 p5
-aS'x'
-p6
-aS'model'
-p7
-atp8
-Rp9
+atp6
+Rp7
 .(dp0
 S'model.sim'
 p1
diff --git a/js/Branching/RELAY_f.js b/js/Branching/RELAY_f.js
index 801316cf..37c42f29 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 ScilabBoolean([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 = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i);
+        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 = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),gr_i);
         return new BasicBlock(this.x);
     }
     RELAY_f.prototype.details = function RELAY_f() {
@@ -29,7 +29,7 @@ function RELAY_f() {
         return options;
     }
     RELAY_f.prototype.set = function RELAY_f() {
-        this.exprs = this.graphics.exprs;
+        var exprs = this.graphics.exprs;
         var ipar = this.model.ipar;
         while (true) {
             var ok = true;
@@ -47,7 +47,7 @@ function RELAY_f() {
                 this.graphics = tmpvar0[1];
                 var ok = tmpvar0[2];
                 if (ok) {
-                    this.graphics.exprs = new ScilabDouble([this.exprs]);
+                    this.graphics.exprs = new ScilabDouble([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 ef5f9ec9..b006c1ff 100644
--- a/js/Branching/RELAY_f.pickle
+++ b/js/Branching/RELAY_f.pickle
@@ -2,22 +2,18 @@ c__builtin__
 set
 p0
 ((lp1
-S'nin'
+S'x'
 p2
-aS'exprs'
+aS'model'
 p3
-aS'gr_i'
+aS'z0'
 p4
-aS'graphics'
+aS'nin'
 p5
-aS'x'
+aS'graphics'
 p6
-aS'model'
-p7
-aS'z0'
-p8
-atp9
-Rp10
+atp7
+Rp8
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/Branching/SCALAR2VECTOR.js b/js/Branching/SCALAR2VECTOR.js
index d43edce8..e4394a24 100644
--- a/js/Branching/SCALAR2VECTOR.js
+++ b/js/Branching/SCALAR2VECTOR.js
@@ -8,9 +8,9 @@ function SCALAR2VECTOR() {
         this.model.in = new ScilabDouble([1]);
         this.model.blocktype = new ScilabString(["c"]);
         this.model.dep_ut = new ScilabBoolean([true,false]);
-        this.exprs = [string([this.nout])];
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SCALAR2VECTOR\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString(this.exprs),this.gr_i);
+        var exprs = [string([this.nout])];
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SCALAR2VECTOR\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString(exprs),gr_i);
         return new BasicBlock(this.x);
     }
     SCALAR2VECTOR.prototype.details = function SCALAR2VECTOR() {
@@ -23,7 +23,7 @@ function SCALAR2VECTOR() {
         return options;
     }
     SCALAR2VECTOR.prototype.set = function SCALAR2VECTOR() {
-        this.exprs = this.graphics.exprs;
+        var exprs = this.graphics.exprs;
         while (true) {
             var ok = true;
             this.nout = parseFloat(arguments[0]["nout"]);
@@ -43,7 +43,7 @@ function SCALAR2VECTOR() {
                 var ok = tmpvar0[2];
             }
             if (ok) {
-                this.graphics.exprs = new ScilabDouble([this.exprs]);
+                this.graphics.exprs = new ScilabDouble([exprs]);
                 this.x.graphics = this.graphics;
                 this.x.model = this.model;
                 break;
diff --git a/js/Branching/SCALAR2VECTOR.pickle b/js/Branching/SCALAR2VECTOR.pickle
index 5d98b24d..93cbcbb1 100644
--- a/js/Branching/SCALAR2VECTOR.pickle
+++ b/js/Branching/SCALAR2VECTOR.pickle
@@ -2,20 +2,16 @@ c__builtin__
 set
 p0
 ((lp1
-S'exprs'
+S'x'
 p2
-aS'gr_i'
+aS'model'
 p3
-aS'graphics'
+aS'nout'
 p4
-aS'x'
+aS'graphics'
 p5
-aS'model'
-p6
-aS'nout'
-p7
-atp8
-Rp9
+atp6
+Rp7
 .(dp0
 S'model.sim'
 p1
diff --git a/js/Branching/SELECT_f.js b/js/Branching/SELECT_f.js
index e411d498..202df7e4 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 ScilabBoolean([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 = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i);
+        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 = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),gr_i);
         return new BasicBlock(this.x);
     }
     SELECT_f.prototype.details = function SELECT_f() {
@@ -28,7 +28,7 @@ function SELECT_f() {
         return options;
     }
     SELECT_f.prototype.set = function SELECT_f() {
-        this.exprs = this.graphics.exprs;
+        var exprs = this.graphics.exprs;
         while (true) {
             var ok = true;
             this.nin = parseFloat(arguments[0]["nin"]);
@@ -45,7 +45,7 @@ function SELECT_f() {
                 this.graphics = tmpvar0[1];
                 var ok = tmpvar0[2];
                 if (ok) {
-                    this.graphics.exprs = new ScilabDouble([this.exprs]);
+                    this.graphics.exprs = new ScilabDouble([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 b09ecfbf..50df12a5 100644
--- a/js/Branching/SELECT_f.pickle
+++ b/js/Branching/SELECT_f.pickle
@@ -2,22 +2,18 @@ c__builtin__
 set
 p0
 ((lp1
-S'nin'
+S'x'
 p2
-aS'exprs'
+aS'model'
 p3
-aS'gr_i'
+aS'z0'
 p4
-aS'graphics'
+aS'nin'
 p5
-aS'x'
+aS'graphics'
 p6
-aS'model'
-p7
-aS'z0'
-p8
-atp9
-Rp10
+atp7
+Rp8
 .(dp0
 S'model.sim'
 p1
diff --git a/js/Branching/SELECT_m.js b/js/Branching/SELECT_m.js
index df649088..bf017884 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 ScilabBoolean([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 = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i);
+        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 = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(exprs),gr_i);
         return new BasicBlock(this.x);
     }
     SELECT_m.prototype.details = function SELECT_m() {
@@ -37,7 +37,7 @@ function SELECT_m() {
         return options;
     }
     SELECT_m.prototype.set = function SELECT_m() {
-        this.exprs = this.graphics.exprs;
+        var exprs = this.graphics.exprs;
         while (true) {
             var ok = true;
             this.typ = inverse(arguments[0]["typ"]);
@@ -64,7 +64,7 @@ function SELECT_m() {
                     this.graphics = tmpvar0[1];
                     var ok = tmpvar0[2];
                     if (ok) {
-                        this.graphics.exprs = new ScilabDouble([this.exprs]);
+                        this.graphics.exprs = new ScilabDouble([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 e4d06d0c..2599284e 100644
--- a/js/Branching/SELECT_m.pickle
+++ b/js/Branching/SELECT_m.pickle
@@ -4,22 +4,18 @@ p0
 ((lp1
 S'nin'
 p2
-aS'z0'
+aS'typ'
 p3
-aS'exprs'
+aS'graphics'
 p4
-aS'gr_i'
+aS'x'
 p5
-aS'graphics'
+aS'model'
 p6
-aS'x'
+aS'z0'
 p7
-aS'model'
-p8
-aS'typ'
-p9
-atp10
-Rp11
+atp8
+Rp9
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/Branching/SELF_SWITCH.pickle b/js/Branching/SELF_SWITCH.pickle
index 5ec17e33..10fb8415 100644
--- a/js/Branching/SELF_SWITCH.pickle
+++ b/js/Branching/SELF_SWITCH.pickle
@@ -2,20 +2,16 @@ c__builtin__
 set
 p0
 ((lp1
-S'stateOpen'
+S'x'
 p2
-aS'exprs'
+aS'model'
 p3
-aS'gr_i'
+aS'stateOpen'
 p4
 aS'graphics'
 p5
-aS'x'
-p6
-aS'model'
-p7
-atp8
-Rp9
+atp6
+Rp7
 .(dp0
 S'diagram.objs[1-1]'
 p1
diff --git a/js/Branching/SWITCH2.js b/js/Branching/SWITCH2.js
index bdd18b4a..afa83e4c 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 ScilabBoolean([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 = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i);
+        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 = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),gr_i);
         return new BasicBlock(this.x);
     }
     SWITCH2.prototype.details = function SWITCH2() {
@@ -32,7 +32,7 @@ function SWITCH2() {
         return options;
     }
     SWITCH2.prototype.set = function SWITCH2() {
-        this.exprs = this.graphics.exprs;
+        var exprs = this.graphics.exprs;
         while (true) {
             var ok = true;
             this.rule = parseFloat(arguments[0]["rule"]);
@@ -48,7 +48,7 @@ function SWITCH2() {
             if ((this.rule>2)) {
                 this.rule = 2;
             }
-            this.graphics.exprs = new ScilabDouble([this.exprs]);
+            this.graphics.exprs = new ScilabDouble([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 4f8888b6..e221f43d 100644
--- a/js/Branching/SWITCH2.pickle
+++ b/js/Branching/SWITCH2.pickle
@@ -8,18 +8,14 @@ aS'rule'
 p3
 aS'thra'
 p4
-aS'exprs'
-p5
-aS'gr_i'
-p6
 aS'graphics'
-p7
+p5
 aS'x'
-p8
+p6
 aS'model'
-p9
-atp10
-Rp11
+p7
+atp8
+Rp9
 .(dp0
 S'arg1'
 p1
diff --git a/js/Branching/SWITCH2_m.js b/js/Branching/SWITCH2_m.js
index cade952d..5f8aca10 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 ScilabBoolean([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 = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i);
+        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 = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),gr_i);
         return new BasicBlock(this.x);
     }
     SWITCH2_m.prototype.details = function SWITCH2_m() {
@@ -36,7 +36,7 @@ function SWITCH2_m() {
         return options;
     }
     SWITCH2_m.prototype.set = function SWITCH2_m() {
-        this.exprs = this.graphics.exprs;
+        var exprs = this.graphics.exprs;
         while (true) {
             var ok = true;
             this.ot = arguments[0]["ot"];
@@ -53,7 +53,7 @@ function SWITCH2_m() {
             if ((this.rule>2)) {
                 this.rule = 2;
             }
-            this.graphics.exprs = new ScilabDouble([this.exprs]);
+            this.graphics.exprs = new ScilabDouble([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 686b6898..7beb95f0 100644
--- a/js/Branching/SWITCH2_m.pickle
+++ b/js/Branching/SWITCH2_m.pickle
@@ -8,20 +8,16 @@ aS'rule'
 p3
 aS'thra'
 p4
-aS'exprs'
-p5
-aS'gr_i'
-p6
 aS'graphics'
-p7
+p5
 aS'x'
-p8
+p6
 aS'model'
-p9
+p7
 aS'ot'
-p10
-atp11
-Rp12
+p8
+atp9
+Rp10
 .(dp0
 S'arg1'
 p1
diff --git a/js/Branching/SWITCH_f.js b/js/Branching/SWITCH_f.js
index fd7a2526..654afc01 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 ScilabBoolean([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 = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i);
+        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 = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),gr_i);
         return new BasicBlock(this.x);
     }
     SWITCH_f.prototype.details = function SWITCH_f() {
@@ -28,7 +28,7 @@ function SWITCH_f() {
         return options;
     }
     SWITCH_f.prototype.set = function SWITCH_f() {
-        this.exprs = this.graphics.exprs;
+        var exprs = this.graphics.exprs;
         var ipar = this.model.ipar;
         while (true) {
             var ok = true;
@@ -46,7 +46,7 @@ function SWITCH_f() {
                 this.graphics = tmpvar0[1];
                 var ok = tmpvar0[2];
                 if (ok) {
-                    this.graphics.exprs = new ScilabDouble([this.exprs]);
+                    this.graphics.exprs = new ScilabDouble([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 e9f05526..506bf9f1 100644
--- a/js/Branching/SWITCH_f.pickle
+++ b/js/Branching/SWITCH_f.pickle
@@ -2,22 +2,18 @@ c__builtin__
 set
 p0
 ((lp1
-S'nin'
+S'x'
 p2
-aS'exprs'
+aS'model'
 p3
-aS'gr_i'
+aS'z0'
 p4
-aS'graphics'
+aS'nin'
 p5
-aS'x'
+aS'graphics'
 p6
-aS'model'
-p7
-aS'z0'
-p8
-atp9
-Rp10
+atp7
+Rp8
 .(dp0
 S'arg1'
 p1