remove exprs and gr_i from default global list

52 files changed, 232 insertions, 336 deletions

diff --git a/js/MatrixOp/CUMSUM.js b/js/MatrixOp/CUMSUM.js
index 7a3d634a..9654da9c 100644
--- a/js/MatrixOp/CUMSUM.js
+++ b/js/MatrixOp/CUMSUM.js
@@ -21,8 +21,8 @@ function CUMSUM() {
         this.model.firing = new ScilabDouble([]);
         this.model.dep_ut = new ScilabBoolean([true,false]);
         var label = [[sci2exp(1)],[sci2exp(0)]];
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CUMSUM\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(label),this.gr_i);
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CUMSUM\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(label),gr_i);
         return new BasicBlock(this.x);
     }
     CUMSUM.prototype.details = function CUMSUM() {
diff --git a/js/MatrixOp/CUMSUM.pickle b/js/MatrixOp/CUMSUM.pickle
index 70090100..f19c81c9 100644
--- a/js/MatrixOp/CUMSUM.pickle
+++ b/js/MatrixOp/CUMSUM.pickle
@@ -4,22 +4,18 @@ p0
 ((lp1
 S'lab'
 p2
-aS'exprs'
-p3
-aS'gr_i'
-p4
 aS'graphics'
-p5
+p3
 aS'x'
-p6
+p4
 aS'model'
-p7
+p5
 aS'typ'
-p8
+p6
 aS'decomptyp'
-p9
-atp10
-Rp11
+p7
+atp8
+Rp9
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/MatrixOp/EXTRACT.js b/js/MatrixOp/EXTRACT.js
index 31b97eff..c3edb683 100644
--- a/js/MatrixOp/EXTRACT.js
+++ b/js/MatrixOp/EXTRACT.js
@@ -21,8 +21,8 @@ function EXTRACT() {
         this.model.firing = new ScilabDouble([]);
         this.model.dep_ut = new ScilabBoolean([true,false]);
         var label = [[sci2exp(1)],[sci2exp([1])],[sci2exp([1])]];
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTRACT\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(label),this.gr_i);
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTRACT\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(label),gr_i);
         return new BasicBlock(this.x);
     }
     EXTRACT.prototype.details = function EXTRACT() {
@@ -90,7 +90,7 @@ function EXTRACT() {
             var out = [ma,mb];
             var funtyp = 4;
             if (ok) {
-                var label = this.exprs;
+                var label = exprs;
                 var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]);
                 this.model = tmpvar0[0];
                 this.graphics = tmpvar0[1];
diff --git a/js/MatrixOp/EXTRACT.pickle b/js/MatrixOp/EXTRACT.pickle
index a255e41f..da378f82 100644
--- a/js/MatrixOp/EXTRACT.pickle
+++ b/js/MatrixOp/EXTRACT.pickle
@@ -6,20 +6,16 @@ S'a'
 p2
 aS'b'
 p3
-aS'exprs'
-p4
-aS'gr_i'
-p5
 aS'graphics'
-p6
+p4
 aS'x'
-p7
+p5
 aS'model'
-p8
+p6
 aS'typ'
-p9
-atp10
-Rp11
+p7
+atp8
+Rp9
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/MatrixOp/EXTTRI.js b/js/MatrixOp/EXTTRI.js
index d4d77d97..5b0e3c1b 100644
--- a/js/MatrixOp/EXTTRI.js
+++ b/js/MatrixOp/EXTTRI.js
@@ -21,8 +21,8 @@ function EXTTRI() {
         this.model.firing = new ScilabDouble([]);
         this.model.dep_ut = new ScilabBoolean([true,false]);
         var label = [[sci2exp(1)],[sci2exp(1)]];
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTTRI\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(label),this.gr_i);
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTTRI\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(label),gr_i);
         return new BasicBlock(this.x);
     }
     EXTTRI.prototype.details = function EXTTRI() {
diff --git a/js/MatrixOp/EXTTRI.pickle b/js/MatrixOp/EXTTRI.pickle
index 70090100..f19c81c9 100644
--- a/js/MatrixOp/EXTTRI.pickle
+++ b/js/MatrixOp/EXTTRI.pickle
@@ -4,22 +4,18 @@ p0
 ((lp1
 S'lab'
 p2
-aS'exprs'
-p3
-aS'gr_i'
-p4
 aS'graphics'
-p5
+p3
 aS'x'
-p6
+p4
 aS'model'
-p7
+p5
 aS'typ'
-p8
+p6
 aS'decomptyp'
-p9
-atp10
-Rp11
+p7
+atp8
+Rp9
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/MatrixOp/MATBKSL.js b/js/MatrixOp/MATBKSL.js
index f1608eba..d89eb6d0 100644
--- a/js/MatrixOp/MATBKSL.js
+++ b/js/MatrixOp/MATBKSL.js
@@ -21,8 +21,8 @@ function MATBKSL() {
         this.model.firing = new ScilabDouble([]);
         this.model.dep_ut = new ScilabBoolean([true,false]);
         var label = [sci2exp(1)];
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATBKSL\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),this.gr_i);
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATBKSL\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),gr_i);
         return new BasicBlock(this.x);
     }
     MATBKSL.prototype.details = function MATBKSL() {
@@ -62,7 +62,7 @@ function MATBKSL() {
             var out = [this.model.out,this.model.out2];
             var funtyp = 4;
             if (ok) {
-                var label = this.exprs;
+                var label = exprs;
                 var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]);
                 this.model = tmpvar0[0];
                 this.graphics = tmpvar0[1];
diff --git a/js/MatrixOp/MATBKSL.pickle b/js/MatrixOp/MATBKSL.pickle
index 8f0081ab..d6160ceb 100644
--- a/js/MatrixOp/MATBKSL.pickle
+++ b/js/MatrixOp/MATBKSL.pickle
@@ -2,20 +2,16 @@ c__builtin__
 set
 p0
 ((lp1
-S'exprs'
+S'x'
 p2
-aS'gr_i'
+aS'model'
 p3
-aS'graphics'
+aS'typ'
 p4
-aS'x'
+aS'graphics'
 p5
-aS'model'
-p6
-aS'typ'
-p7
-atp8
-Rp9
+atp6
+Rp7
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/MatrixOp/MATCATH.js b/js/MatrixOp/MATCATH.js
index 55112b29..d876e23c 100644
--- a/js/MatrixOp/MATCATH.js
+++ b/js/MatrixOp/MATCATH.js
@@ -21,8 +21,8 @@ function MATCATH() {
         this.model.firing = new ScilabDouble([]);
         this.model.dep_ut = new ScilabBoolean([true,false]);
         var label = [sci2exp(2)];
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATCATH\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabString(label),this.gr_i);
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATCATH\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabString(label),gr_i);
         return new BasicBlock(this.x);
     }
     MATCATH.prototype.details = function MATCATH() {
diff --git a/js/MatrixOp/MATCATH.pickle b/js/MatrixOp/MATCATH.pickle
index 4bd900cc..068b089c 100644
--- a/js/MatrixOp/MATCATH.pickle
+++ b/js/MatrixOp/MATCATH.pickle
@@ -2,22 +2,18 @@ c__builtin__
 set
 p0
 ((lp1
-S'nin'
+S'x'
 p2
-aS'lab'
+aS'model'
 p3
-aS'exprs'
+aS'nin'
 p4
-aS'gr_i'
+aS'lab'
 p5
 aS'graphics'
 p6
-aS'x'
-p7
-aS'model'
-p8
-atp9
-Rp10
+atp7
+Rp8
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/MatrixOp/MATCATV.js b/js/MatrixOp/MATCATV.js
index 05ce4e0e..67909b7e 100644
--- a/js/MatrixOp/MATCATV.js
+++ b/js/MatrixOp/MATCATV.js
@@ -22,8 +22,8 @@ function MATCATV() {
         this.model.firing = new ScilabDouble([]);
         this.model.dep_ut = new ScilabBoolean([true,false]);
         var label = [sci2exp(2)];
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATCATV\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabString(label),this.gr_i);
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATCATV\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabString(label),gr_i);
         return new BasicBlock(this.x);
     }
     MATCATV.prototype.details = function MATCATV() {
diff --git a/js/MatrixOp/MATCATV.pickle b/js/MatrixOp/MATCATV.pickle
index fe6d469a..d8deaec0 100644
--- a/js/MatrixOp/MATCATV.pickle
+++ b/js/MatrixOp/MATCATV.pickle
@@ -2,22 +2,18 @@ c__builtin__
 set
 p0
 ((lp1
-S'nin'
+S'x'
 p2
-aS'lab'
+aS'model'
 p3
-aS'exprs'
+aS'nin'
 p4
-aS'gr_i'
+aS'lab'
 p5
 aS'graphics'
 p6
-aS'x'
-p7
-aS'model'
-p8
-atp9
-Rp10
+atp7
+Rp8
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/MatrixOp/MATDET.js b/js/MatrixOp/MATDET.js
index f8959160..9ecae713 100644
--- a/js/MatrixOp/MATDET.js
+++ b/js/MatrixOp/MATDET.js
@@ -21,8 +21,8 @@ function MATDET() {
         this.model.firing = new ScilabDouble([]);
         this.model.dep_ut = new ScilabBoolean([true,false]);
         var label = [sci2exp(1)];
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATDET\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),this.gr_i);
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATDET\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),gr_i);
         return new BasicBlock(this.x);
     }
     MATDET.prototype.details = function MATDET() {
@@ -62,7 +62,7 @@ function MATDET() {
             var out = [this.model.out,this.model.out2];
             var funtyp = 4;
             if (ok) {
-                var label = this.exprs;
+                var label = exprs;
                 var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]);
                 this.model = tmpvar0[0];
                 this.graphics = tmpvar0[1];
diff --git a/js/MatrixOp/MATDET.pickle b/js/MatrixOp/MATDET.pickle
index 7f950c5b..890da531 100644
--- a/js/MatrixOp/MATDET.pickle
+++ b/js/MatrixOp/MATDET.pickle
@@ -2,20 +2,16 @@ c__builtin__
 set
 p0
 ((lp1
-S'exprs'
+S'x'
 p2
-aS'gr_i'
+aS'model'
 p3
-aS'graphics'
+aS'typ'
 p4
-aS'x'
+aS'graphics'
 p5
-aS'model'
-p6
-aS'typ'
-p7
-atp8
-Rp9
+atp6
+Rp7
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/MatrixOp/MATDIAG.js b/js/MatrixOp/MATDIAG.js
index 0b8f6b7b..08d84275 100644
--- a/js/MatrixOp/MATDIAG.js
+++ b/js/MatrixOp/MATDIAG.js
@@ -21,8 +21,8 @@ function MATDIAG() {
         this.model.firing = new ScilabDouble([]);
         this.model.dep_ut = new ScilabBoolean([true,false]);
         var label = [sci2exp(1)];
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATDIAG\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),this.gr_i);
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATDIAG\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),gr_i);
         return new BasicBlock(this.x);
     }
     MATDIAG.prototype.details = function MATDIAG() {
@@ -62,7 +62,7 @@ function MATDIAG() {
             var out = [this.model.out,this.model.out2];
             var funtyp = 4;
             if (ok) {
-                var label = this.exprs;
+                var label = exprs;
                 var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]);
                 this.model = tmpvar0[0];
                 this.graphics = tmpvar0[1];
diff --git a/js/MatrixOp/MATDIAG.pickle b/js/MatrixOp/MATDIAG.pickle
index 7f950c5b..890da531 100644
--- a/js/MatrixOp/MATDIAG.pickle
+++ b/js/MatrixOp/MATDIAG.pickle
@@ -2,20 +2,16 @@ c__builtin__
 set
 p0
 ((lp1
-S'exprs'
+S'x'
 p2
-aS'gr_i'
+aS'model'
 p3
-aS'graphics'
+aS'typ'
 p4
-aS'x'
+aS'graphics'
 p5
-aS'model'
-p6
-aS'typ'
-p7
-atp8
-Rp9
+atp6
+Rp7
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/MatrixOp/MATDIV.js b/js/MatrixOp/MATDIV.js
index 7148a63d..3bb45159 100644
--- a/js/MatrixOp/MATDIV.js
+++ b/js/MatrixOp/MATDIV.js
@@ -21,8 +21,8 @@ function MATDIV() {
         this.model.firing = new ScilabDouble([]);
         this.model.dep_ut = new ScilabBoolean([true,false]);
         var label = [sci2exp(1)];
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATDIV\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),this.gr_i);
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATDIV\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),gr_i);
         return new BasicBlock(this.x);
     }
     MATDIV.prototype.details = function MATDIV() {
@@ -62,7 +62,7 @@ function MATDIV() {
             var out = [this.model.out,this.model.out2];
             var funtyp = 4;
             if (ok) {
-                var label = this.exprs;
+                var label = exprs;
                 var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]);
                 this.model = tmpvar0[0];
                 this.graphics = tmpvar0[1];
diff --git a/js/MatrixOp/MATDIV.pickle b/js/MatrixOp/MATDIV.pickle
index 8f0081ab..d6160ceb 100644
--- a/js/MatrixOp/MATDIV.pickle
+++ b/js/MatrixOp/MATDIV.pickle
@@ -2,20 +2,16 @@ c__builtin__
 set
 p0
 ((lp1
-S'exprs'
+S'x'
 p2
-aS'gr_i'
+aS'model'
 p3
-aS'graphics'
+aS'typ'
 p4
-aS'x'
+aS'graphics'
 p5
-aS'model'
-p6
-aS'typ'
-p7
-atp8
-Rp9
+atp6
+Rp7
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/MatrixOp/MATEIG.js b/js/MatrixOp/MATEIG.js
index de5ac8f8..466ef853 100644
--- a/js/MatrixOp/MATEIG.js
+++ b/js/MatrixOp/MATEIG.js
@@ -21,8 +21,8 @@ function MATEIG() {
         this.model.firing = new ScilabDouble([]);
         this.model.dep_ut = new ScilabBoolean([true,false]);
         var label = [[sci2exp(1)],[sci2exp(1)]];
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATEIG\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(label),this.gr_i);
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATEIG\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(label),gr_i);
         return new BasicBlock(this.x);
     }
     MATEIG.prototype.details = function MATEIG() {
diff --git a/js/MatrixOp/MATEIG.pickle b/js/MatrixOp/MATEIG.pickle
index 480fe405..3e10a26a 100644
--- a/js/MatrixOp/MATEIG.pickle
+++ b/js/MatrixOp/MATEIG.pickle
@@ -4,22 +4,18 @@ p0
 ((lp1
 S'lab'
 p2
-aS'exprs'
-p3
-aS'gr_i'
-p4
 aS'graphics'
-p5
+p3
 aS'x'
-p6
+p4
 aS'model'
-p7
+p5
 aS'typ'
-p8
+p6
 aS'decomptyp'
-p9
-atp10
-Rp11
+p7
+atp8
+Rp9
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/MatrixOp/MATEXPM.js b/js/MatrixOp/MATEXPM.js
index b304bd0d..017796e2 100644
--- a/js/MatrixOp/MATEXPM.js
+++ b/js/MatrixOp/MATEXPM.js
@@ -21,8 +21,8 @@ function MATEXPM() {
         this.model.firing = new ScilabDouble([]);
         this.model.dep_ut = new ScilabBoolean([true,false]);
         var label = [sci2exp(1)];
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATEXPM\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),this.gr_i);
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATEXPM\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),gr_i);
         return new BasicBlock(this.x);
     }
     MATEXPM.prototype.details = function MATEXPM() {
@@ -62,7 +62,7 @@ function MATEXPM() {
             var out = [this.model.out,this.model.out2];
             var funtyp = 4;
             if (ok) {
-                var label = this.exprs;
+                var label = exprs;
                 var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]);
                 this.model = tmpvar0[0];
                 this.graphics = tmpvar0[1];
diff --git a/js/MatrixOp/MATEXPM.pickle b/js/MatrixOp/MATEXPM.pickle
index 7f950c5b..890da531 100644
--- a/js/MatrixOp/MATEXPM.pickle
+++ b/js/MatrixOp/MATEXPM.pickle
@@ -2,20 +2,16 @@ c__builtin__
 set
 p0
 ((lp1
-S'exprs'
+S'x'
 p2
-aS'gr_i'
+aS'model'
 p3
-aS'graphics'
+aS'typ'
 p4
-aS'x'
+aS'graphics'
 p5
-aS'model'
-p6
-aS'typ'
-p7
-atp8
-Rp9
+atp6
+Rp7
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/MatrixOp/MATINV.js b/js/MatrixOp/MATINV.js
index 277f14ca..254adea9 100644
--- a/js/MatrixOp/MATINV.js
+++ b/js/MatrixOp/MATINV.js
@@ -21,8 +21,8 @@ function MATINV() {
         this.model.firing = new ScilabDouble([]);
         this.model.dep_ut = new ScilabBoolean([true,false]);
         var label = [sci2exp(1)];
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATINV\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),this.gr_i);
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATINV\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),gr_i);
         return new BasicBlock(this.x);
     }
     MATINV.prototype.details = function MATINV() {
@@ -62,7 +62,7 @@ function MATINV() {
             var out = [this.model.out,this.model.out2];
             var funtyp = 4;
             if (ok) {
-                var label = this.exprs;
+                var label = exprs;
                 var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]);
                 this.model = tmpvar0[0];
                 this.graphics = tmpvar0[1];
diff --git a/js/MatrixOp/MATINV.pickle b/js/MatrixOp/MATINV.pickle
index 7f950c5b..890da531 100644
--- a/js/MatrixOp/MATINV.pickle
+++ b/js/MatrixOp/MATINV.pickle
@@ -2,20 +2,16 @@ c__builtin__
 set
 p0
 ((lp1
-S'exprs'
+S'x'
 p2
-aS'gr_i'
+aS'model'
 p3
-aS'graphics'
+aS'typ'
 p4
-aS'x'
+aS'graphics'
 p5
-aS'model'
-p6
-aS'typ'
-p7
-atp8
-Rp9
+atp6
+Rp7
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/MatrixOp/MATLU.js b/js/MatrixOp/MATLU.js
index ee1fe41d..060423da 100644
--- a/js/MatrixOp/MATLU.js
+++ b/js/MatrixOp/MATLU.js
@@ -21,8 +21,8 @@ function MATLU() {
         this.model.firing = new ScilabDouble([]);
         this.model.dep_ut = new ScilabBoolean([true,false]);
         var label = sci2exp(1);
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATLU\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([label]),this.gr_i);
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATLU\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([label]),gr_i);
         return new BasicBlock(this.x);
     }
     MATLU.prototype.details = function MATLU() {
diff --git a/js/MatrixOp/MATLU.pickle b/js/MatrixOp/MATLU.pickle
index c3b97374..5a0336fa 100644
--- a/js/MatrixOp/MATLU.pickle
+++ b/js/MatrixOp/MATLU.pickle
@@ -2,22 +2,18 @@ c__builtin__
 set
 p0
 ((lp1
-S'lab'
+S'x'
 p2
-aS'exprs'
+aS'model'
 p3
-aS'gr_i'
+aS'typ'
 p4
-aS'graphics'
+aS'lab'
 p5
-aS'x'
+aS'graphics'
 p6
-aS'model'
-p7
-aS'typ'
-p8
-atp9
-Rp10
+atp7
+Rp8
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/MatrixOp/MATMAGPHI.js b/js/MatrixOp/MATMAGPHI.js
index c3b97dee..6f0affc5 100644
--- a/js/MatrixOp/MATMAGPHI.js
+++ b/js/MatrixOp/MATMAGPHI.js
@@ -21,8 +21,8 @@ function MATMAGPHI() {
         this.model.firing = new ScilabDouble([]);
         this.model.dep_ut = new ScilabBoolean([true,false]);
         var label = [sci2exp(1)];
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATMAGPHI\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString(label),this.gr_i);
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATMAGPHI\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString(label),gr_i);
         return new BasicBlock(this.x);
     }
     MATMAGPHI.prototype.details = function MATMAGPHI() {
diff --git a/js/MatrixOp/MATMAGPHI.pickle b/js/MatrixOp/MATMAGPHI.pickle
index 349daa3a..0c3d145e 100644
--- a/js/MatrixOp/MATMAGPHI.pickle
+++ b/js/MatrixOp/MATMAGPHI.pickle
@@ -2,22 +2,18 @@ c__builtin__
 set
 p0
 ((lp1
-S'lab'
+S'x'
 p2
-aS'exprs'
+aS'model'
 p3
-aS'gr_i'
+aS'lab'
 p4
-aS'graphics'
+aS'decomptyp'
 p5
-aS'x'
+aS'graphics'
 p6
-aS'model'
-p7
-aS'decomptyp'
-p8
-atp9
-Rp10
+atp7
+Rp8
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/MatrixOp/MATMUL.js b/js/MatrixOp/MATMUL.js
index 1766bd00..6546d7a0 100644
--- a/js/MatrixOp/MATMUL.js
+++ b/js/MatrixOp/MATMUL.js
@@ -10,8 +10,8 @@ function MATMUL() {
         this.model.dep_ut = new ScilabBoolean([true,false]);
         this.model.ipar = new ScilabDouble([1]);
         var label = [sci2exp(this.model.ipar)];
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATMUL\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString(label),this.gr_i);
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATMUL\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString(label),gr_i);
         return new BasicBlock(this.x);
     }
     MATMUL.prototype.details = function MATMUL() {
@@ -152,7 +152,7 @@ function MATMUL() {
             this.graphics = tmpvar0[1];
             var ok = tmpvar0[2];
             if (ok) {
-                var label = this.exprs;
+                var label = exprs;
                 this.model.ipar = new ScilabDouble([this.rule]);
                 this.model.rpar = new ScilabDouble([kmin],[kmax]);
                 this.graphics.exprs = new ScilabDouble([label]);
diff --git a/js/MatrixOp/MATMUL.pickle b/js/MatrixOp/MATMUL.pickle
index 13121ca7..ec887713 100644
--- a/js/MatrixOp/MATMUL.pickle
+++ b/js/MatrixOp/MATMUL.pickle
@@ -6,20 +6,16 @@ S'dtype'
 p2
 aS'rule'
 p3
-aS'exprs'
-p4
-aS'gr_i'
-p5
 aS'graphics'
-p6
+p4
 aS'np'
-p7
+p5
 aS'x'
-p8
+p6
 aS'model'
-p9
-atp10
-Rp11
+p7
+atp8
+Rp9
 .(dp0
 S'arg1'
 p1
diff --git a/js/MatrixOp/MATPINV.js b/js/MatrixOp/MATPINV.js
index 9caab8a1..3ef26d08 100644
--- a/js/MatrixOp/MATPINV.js
+++ b/js/MatrixOp/MATPINV.js
@@ -21,8 +21,8 @@ function MATPINV() {
         this.model.firing = new ScilabDouble([]);
         this.model.dep_ut = new ScilabBoolean([true,false]);
         var label = [sci2exp(1)];
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATPINV\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),this.gr_i);
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATPINV\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),gr_i);
         return new BasicBlock(this.x);
     }
     MATPINV.prototype.details = function MATPINV() {
@@ -62,7 +62,7 @@ function MATPINV() {
             var out = [this.model.out,this.model.out2];
             var funtyp = 4;
             if (ok) {
-                var label = this.exprs;
+                var label = exprs;
                 var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]);
                 this.model = tmpvar0[0];
                 this.graphics = tmpvar0[1];
diff --git a/js/MatrixOp/MATPINV.pickle b/js/MatrixOp/MATPINV.pickle
index 7f950c5b..890da531 100644
--- a/js/MatrixOp/MATPINV.pickle
+++ b/js/MatrixOp/MATPINV.pickle
@@ -2,20 +2,16 @@ c__builtin__
 set
 p0
 ((lp1
-S'exprs'
+S'x'
 p2
-aS'gr_i'
+aS'model'
 p3
-aS'graphics'
+aS'typ'
 p4
-aS'x'
+aS'graphics'
 p5
-aS'model'
-p6
-aS'typ'
-p7
-atp8
-Rp9
+atp6
+Rp7
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/MatrixOp/MATRESH.js b/js/MatrixOp/MATRESH.js
index 9e43baf7..5a95d422 100644
--- a/js/MatrixOp/MATRESH.js
+++ b/js/MatrixOp/MATRESH.js
@@ -21,8 +21,8 @@ function MATRESH() {
         this.model.firing = new ScilabDouble([]);
         this.model.dep_ut = new ScilabBoolean([true,false]);
         var label = [[sci2exp(1)],[sci2exp([1,1])],[sci2exp([1,1])]];
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATRESH\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(label),this.gr_i);
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATRESH\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(label),gr_i);
         return new BasicBlock(this.x);
     }
     MATRESH.prototype.details = function MATRESH() {
diff --git a/js/MatrixOp/MATRESH.pickle b/js/MatrixOp/MATRESH.pickle
index 726570e8..bfab0438 100644
--- a/js/MatrixOp/MATRESH.pickle
+++ b/js/MatrixOp/MATRESH.pickle
@@ -2,26 +2,22 @@ c__builtin__
 set
 p0
 ((lp1
-S'l1'
+S'graphics'
 p2
 aS'lab'
 p3
-aS'exprs'
+aS'l1'
 p4
-aS'gr_i'
-p5
-aS'graphics'
-p6
 aS'x'
-p7
+p5
 aS'model'
-p8
+p6
 aS'typ'
-p9
+p7
 aS'out'
-p10
-atp11
-Rp12
+p8
+atp9
+Rp10
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/MatrixOp/MATSING.js b/js/MatrixOp/MATSING.js
index ca9e64c0..e2ea33f1 100644
--- a/js/MatrixOp/MATSING.js
+++ b/js/MatrixOp/MATSING.js
@@ -21,8 +21,8 @@ function MATSING() {
         this.model.firing = new ScilabDouble([]);
         this.model.dep_ut = new ScilabBoolean([true,false]);
         var label = [[sci2exp(1)],[sci2exp(1)]];
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATSING\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(label),this.gr_i);
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATSING\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(label),gr_i);
         return new BasicBlock(this.x);
     }
     MATSING.prototype.details = function MATSING() {
diff --git a/js/MatrixOp/MATSING.pickle b/js/MatrixOp/MATSING.pickle
index 480fe405..3e10a26a 100644
--- a/js/MatrixOp/MATSING.pickle
+++ b/js/MatrixOp/MATSING.pickle
@@ -4,22 +4,18 @@ p0
 ((lp1
 S'lab'
 p2
-aS'exprs'
-p3
-aS'gr_i'
-p4
 aS'graphics'
-p5
+p3
 aS'x'
-p6
+p4
 aS'model'
-p7
+p5
 aS'typ'
-p8
+p6
 aS'decomptyp'
-p9
-atp10
-Rp11
+p7
+atp8
+Rp9
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/MatrixOp/MATSUM.js b/js/MatrixOp/MATSUM.js
index 3af2e47d..3036d6af 100644
--- a/js/MatrixOp/MATSUM.js
+++ b/js/MatrixOp/MATSUM.js
@@ -21,8 +21,8 @@ function MATSUM() {
         this.model.firing = new ScilabDouble([]);
         this.model.dep_ut = new ScilabBoolean([true,false]);
         var label = [[sci2exp(1)],[sci2exp(0)]];
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATSUM\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(label),this.gr_i);
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATSUM\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(label),gr_i);
         return new BasicBlock(this.x);
     }
     MATSUM.prototype.details = function MATSUM() {
diff --git a/js/MatrixOp/MATSUM.pickle b/js/MatrixOp/MATSUM.pickle
index 70090100..f19c81c9 100644
--- a/js/MatrixOp/MATSUM.pickle
+++ b/js/MatrixOp/MATSUM.pickle
@@ -4,22 +4,18 @@ p0
 ((lp1
 S'lab'
 p2
-aS'exprs'
-p3
-aS'gr_i'
-p4
 aS'graphics'
-p5
+p3
 aS'x'
-p6
+p4
 aS'model'
-p7
+p5
 aS'typ'
-p8
+p6
 aS'decomptyp'
-p9
-atp10
-Rp11
+p7
+atp8
+Rp9
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/MatrixOp/MATTRAN.js b/js/MatrixOp/MATTRAN.js
index b9603d9c..92472204 100644
--- a/js/MatrixOp/MATTRAN.js
+++ b/js/MatrixOp/MATTRAN.js
@@ -9,8 +9,8 @@ function MATTRAN() {
         this.model.out2 = new ScilabDouble([-1]);
         this.model.dep_ut = new ScilabBoolean([true,false]);
         var label = [sci2exp(1)];
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATTRAN\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString(label),this.gr_i);
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATTRAN\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString(label),gr_i);
         return new BasicBlock(this.x);
     }
     MATTRAN.prototype.details = function MATTRAN() {
@@ -56,7 +56,7 @@ function MATTRAN() {
             var out = [this.model.out,this.model.out2];
             var funtyp = 4;
             if (ok) {
-                var label = this.exprs;
+                var label = exprs;
                 var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]);
                 this.model = tmpvar0[0];
                 this.graphics = tmpvar0[1];
diff --git a/js/MatrixOp/MATTRAN.pickle b/js/MatrixOp/MATTRAN.pickle
index d1a9c67e..1fa943b2 100644
--- a/js/MatrixOp/MATTRAN.pickle
+++ b/js/MatrixOp/MATTRAN.pickle
@@ -2,22 +2,18 @@ c__builtin__
 set
 p0
 ((lp1
-S'rule'
+S'x'
 p2
-aS'exprs'
+aS'model'
 p3
-aS'gr_i'
+aS'typ'
 p4
-aS'graphics'
+aS'rule'
 p5
-aS'x'
+aS'graphics'
 p6
-aS'model'
-p7
-aS'typ'
-p8
-atp9
-Rp10
+atp7
+Rp8
 .(dp0
 S'arg1'
 p1
diff --git a/js/MatrixOp/MATZCONJ.js b/js/MatrixOp/MATZCONJ.js
index 12728a13..0a565ca9 100644
--- a/js/MatrixOp/MATZCONJ.js
+++ b/js/MatrixOp/MATZCONJ.js
@@ -21,8 +21,8 @@ function MATZCONJ() {
         this.model.firing = new ScilabDouble([]);
         this.model.dep_ut = new ScilabBoolean([true,false]);
         var label = [];
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATZCONJ\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(label),this.gr_i);
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATZCONJ\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(label),gr_i);
         return new BasicBlock(this.x);
     }
     MATZCONJ.prototype.details = function MATZCONJ() {
diff --git a/js/MatrixOp/MATZCONJ.pickle b/js/MatrixOp/MATZCONJ.pickle
index 93781b9f..566ecfbf 100644
--- a/js/MatrixOp/MATZCONJ.pickle
+++ b/js/MatrixOp/MATZCONJ.pickle
@@ -6,14 +6,10 @@ S'x'
 p2
 aS'model'
 p3
-aS'gr_i'
-p4
-aS'exprs'
-p5
 aS'graphics'
-p6
-atp7
-Rp8
+p4
+atp5
+Rp6
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/MatrixOp/MATZREIM.js b/js/MatrixOp/MATZREIM.js
index a96c36d8..d9af3dce 100644
--- a/js/MatrixOp/MATZREIM.js
+++ b/js/MatrixOp/MATZREIM.js
@@ -21,8 +21,8 @@ function MATZREIM() {
         this.model.firing = new ScilabDouble([]);
         this.model.dep_ut = new ScilabBoolean([true,false]);
         var label = sci2exp(1);
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATZREIM\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString([label]),this.gr_i);
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATZREIM\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString([label]),gr_i);
         return new BasicBlock(this.x);
     }
     MATZREIM.prototype.details = function MATZREIM() {
diff --git a/js/MatrixOp/MATZREIM.pickle b/js/MatrixOp/MATZREIM.pickle
index 4f289b33..27ed69f0 100644
--- a/js/MatrixOp/MATZREIM.pickle
+++ b/js/MatrixOp/MATZREIM.pickle
@@ -2,22 +2,18 @@ c__builtin__
 set
 p0
 ((lp1
-S'lab'
+S'x'
 p2
-aS'exprs'
+aS'model'
 p3
-aS'gr_i'
+aS'lab'
 p4
-aS'graphics'
+aS'decomptyp'
 p5
-aS'x'
+aS'graphics'
 p6
-aS'model'
-p7
-aS'decomptyp'
-p8
-atp9
-Rp10
+atp7
+Rp8
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/MatrixOp/RICC.js b/js/MatrixOp/RICC.js
index 45e4ddb9..434970f8 100644
--- a/js/MatrixOp/RICC.js
+++ b/js/MatrixOp/RICC.js
@@ -21,8 +21,8 @@ function RICC() {
         this.model.firing = new ScilabDouble([]);
         this.model.dep_ut = new ScilabBoolean([true,false]);
         var label = [[sci2exp(1)],[sci2exp(1)]];
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RICC\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(label),this.gr_i);
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RICC\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(label),gr_i);
         return new BasicBlock(this.x);
     }
     RICC.prototype.details = function RICC() {
@@ -51,7 +51,7 @@ function RICC() {
             var out = [this.model.out,this.model.out2];
             var it = [1,1,1];
             var ot = 1;
-            var label = this.exprs;
+            var label = exprs;
             var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]);
             this.model = tmpvar0[0];
             this.graphics = tmpvar0[1];
diff --git a/js/MatrixOp/RICC.pickle b/js/MatrixOp/RICC.pickle
index 41b5c094..7f123ded 100644
--- a/js/MatrixOp/RICC.pickle
+++ b/js/MatrixOp/RICC.pickle
@@ -2,22 +2,18 @@ c__builtin__
 set
 p0
 ((lp1
-S'tpe'
+S'x'
 p2
-aS'exprs'
+aS'model'
 p3
-aS'gr_i'
+aS'mod'
 p4
-aS'graphics'
+aS'tpe'
 p5
-aS'x'
+aS'graphics'
 p6
-aS'model'
-p7
-aS'mod'
-p8
-atp9
-Rp10
+atp7
+Rp8
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/MatrixOp/ROOTCOEF.js b/js/MatrixOp/ROOTCOEF.js
index db5a7a8a..453b075b 100644
--- a/js/MatrixOp/ROOTCOEF.js
+++ b/js/MatrixOp/ROOTCOEF.js
@@ -21,8 +21,8 @@ function ROOTCOEF() {
         this.model.firing = new ScilabDouble([]);
         this.model.dep_ut = new ScilabBoolean([true,false]);
         var label = [[sci2exp(1)],[sci2exp(1)]];
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ROOTCOEF\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(label),this.gr_i);
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ROOTCOEF\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(label),gr_i);
         return new BasicBlock(this.x);
     }
     ROOTCOEF.prototype.details = function ROOTCOEF() {
@@ -64,7 +64,7 @@ function ROOTCOEF() {
             var out = [this.inp+1,this.model.out2];
             var funtyp = 4;
             if (ok) {
-                var label = this.exprs;
+                var label = exprs;
                 var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]);
                 this.model = tmpvar0[0];
                 this.graphics = tmpvar0[1];
diff --git a/js/MatrixOp/ROOTCOEF.pickle b/js/MatrixOp/ROOTCOEF.pickle
index f930a815..83a0494e 100644
--- a/js/MatrixOp/ROOTCOEF.pickle
+++ b/js/MatrixOp/ROOTCOEF.pickle
@@ -2,22 +2,18 @@ c__builtin__
 set
 p0
 ((lp1
-S'inp'
+S'x'
 p2
-aS'exprs'
+aS'model'
 p3
-aS'gr_i'
+aS'typ'
 p4
-aS'graphics'
+aS'inp'
 p5
-aS'x'
+aS'graphics'
 p6
-aS'model'
-p7
-aS'typ'
-p8
-atp9
-Rp10
+atp7
+Rp8
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/MatrixOp/SQRT.js b/js/MatrixOp/SQRT.js
index dfe08a5b..2053045f 100644
--- a/js/MatrixOp/SQRT.js
+++ b/js/MatrixOp/SQRT.js
@@ -11,8 +11,8 @@ function SQRT() {
         this.model.out2 = new ScilabDouble([-2]);
         this.model.dep_ut = new ScilabBoolean([true,false]);
         var label = [sci2exp(1)];
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SQRT\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),this.gr_i);
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SQRT\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),gr_i);
         return new BasicBlock(this.x);
     }
     SQRT.prototype.details = function SQRT() {
@@ -47,7 +47,7 @@ function SQRT() {
             var out = [this.model.out,this.model.out2];
             var funtyp = 4;
             if (ok) {
-                var label = this.exprs;
+                var label = exprs;
                 var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]);
                 this.model = tmpvar0[0];
                 this.graphics = tmpvar0[1];
diff --git a/js/MatrixOp/SQRT.pickle b/js/MatrixOp/SQRT.pickle
index 6db85eec..b0a3ef9c 100644
--- a/js/MatrixOp/SQRT.pickle
+++ b/js/MatrixOp/SQRT.pickle
@@ -2,20 +2,16 @@ c__builtin__
 set
 p0
 ((lp1
-S'exprs'
+S'x'
 p2
-aS'gr_i'
+aS'model'
 p3
-aS'graphics'
+aS'typ'
 p4
-aS'x'
+aS'graphics'
 p5
-aS'model'
-p6
-aS'typ'
-p7
-atp8
-Rp9
+atp6
+Rp7
 .(dp0
 S'arg1'
 p1
diff --git a/js/MatrixOp/SUBMAT.js b/js/MatrixOp/SUBMAT.js
index 118c8b9f..39700035 100644
--- a/js/MatrixOp/SUBMAT.js
+++ b/js/MatrixOp/SUBMAT.js
@@ -21,8 +21,8 @@ function SUBMAT() {
         this.model.firing = new ScilabDouble([]);
         this.model.dep_ut = new ScilabBoolean([true,false]);
         var label = [[sci2exp(1)],[sci2exp(1)],[sci2exp(1)],[sci2exp(1)],[sci2exp(1)]];
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUBMAT\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([2.5,2]),this.model,new ScilabDouble(label),this.gr_i);
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUBMAT\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([2.5,2]),this.model,new ScilabDouble(label),gr_i);
         return new BasicBlock(this.x);
     }
     SUBMAT.prototype.details = function SUBMAT() {
@@ -97,7 +97,7 @@ function SUBMAT() {
             var in1 = [this.inp[1-1],this.inp[2-1]];
             var out = [(this.b-this.a)+1,(this.d-this.c)+1];
             var funtyp = 4;
-            var label = this.exprs;
+            var label = exprs;
             if (ok) {
                 var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]);
                 this.model = tmpvar0[0];
diff --git a/js/MatrixOp/SUBMAT.pickle b/js/MatrixOp/SUBMAT.pickle
index f4755cc8..3255b4a3 100644
--- a/js/MatrixOp/SUBMAT.pickle
+++ b/js/MatrixOp/SUBMAT.pickle
@@ -12,20 +12,16 @@ aS'd'
 p5
 aS'inp'
 p6
-aS'exprs'
-p7
-aS'gr_i'
-p8
 aS'graphics'
-p9
+p7
 aS'x'
-p10
+p8
 aS'model'
-p11
+p9
 aS'typ'
-p12
-atp13
-Rp14
+p10
+atp11
+Rp12
 .(dp0
 S'model.dstate'
 p1