support ScilabBoolean, ScilabDouble, ScilabString

22 files changed, 484 insertions, 462 deletions

diff --git a/js/IntegerOp/BITCLEAR.js b/js/IntegerOp/BITCLEAR.js
index a854f731..715efd0a 100644
--- a/js/IntegerOp/BITCLEAR.js
+++ b/js/IntegerOp/BITCLEAR.js
@@ -1,20 +1,20 @@
 /* autogenerated from "macros/IntegerOp/BITCLEAR.sci" */
 function BITCLEAR() {
     BITCLEAR.prototype.define = function BITCLEAR() {
-        model = scicos_model();
-        model.sim = list("bit_clear_32",4);
-        model.in1 = 1;
-        model.in2 = 1;
-        model.out = 1;
-        model.out2 = 1;
-        model.intyp = 3;
-        model.outtyp = 3;
-        model.opar = list(int32(0));
-        model.blocktype = "c";
-        model.dep_ut = [true,false];
+        this.model = scicos_model();
+        this.model.sim = list("bit_clear_32",4);
+        this.model.in1 = new ScilabDouble(1);
+        this.model.in2 = new ScilabDouble(1);
+        this.model.out = new ScilabDouble(1);
+        this.model.out2 = new ScilabDouble(1);
+        this.model.intyp = new ScilabDouble(3);
+        this.model.outtyp = new ScilabDouble(3);
+        this.model.opar = list(int32(0));
+        this.model.blocktype = new ScilabString("c");
+        this.model.dep_ut = [true,false];
         exprs = [[sci2exp(3)],[sci2exp(0)]];
         gr_i = [];
-        this.x = standard_define([4,2],model,exprs,gr_i);
+        this.x = standard_define([4,2],this.model,exprs,gr_i);
         return new BasicBlock(this.x);
     }
     BITCLEAR.prototype.details = function BITCLEAR() {
@@ -33,13 +33,13 @@ function BITCLEAR() {
         this.x = arg1;
         graphics = arg1.graphics;
         exprs = graphics.exprs;
-        model = arg1.model;
+        this.model = arg1.model;
         while (true) {
             [ok,this.Datatype,this.bit,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","BITCLEAR")],[" "],["Clear a bit"],[" "]],[msprintf("Data Type %s","(3:int32, 4:int16, 5:int8, ...)"),"Index of Bit (0 is least significant)"],list("vec",1,"vec",1),exprs);
             if (!ok) {
                 break;
             }
-            in1 = [model.in1,model.in2];
+            in1 = [this.model.in1,this.model.in2];
             if (floor(this.bit)!=this.bit) {
                 block_parameter_error(msprintf("Wrong type for \'%s\' parameter: %5.1f.","Index of Bit",this.bit),"Must be integer.");
                 ok = false;
@@ -51,7 +51,7 @@ function BITCLEAR() {
                     this.bit = uint32(this.bit);
                     n = (2^32-1)-2^this.bit;
                     n = uint32(n);
-                    model.sim = list("bit_clear_32",4);
+                    this.model.sim = list("bit_clear_32",4);
                 }
             } else if ((this.Datatype==4)||(this.Datatype==7)) {
                 if (this.bit>15||this.bit<0) {
@@ -61,7 +61,7 @@ function BITCLEAR() {
                     this.bit = uint16(this.bit);
                     n = (2^16-1)-2^this.bit;
                     n = uint16(n);
-                    model.sim = list("bit_clear_16",4);
+                    this.model.sim = list("bit_clear_16",4);
                 }
             } else if ((this.Datatype==5)||(this.Datatype==8)) {
                 if (this.bit>7||this.bit<0) {
@@ -71,7 +71,7 @@ function BITCLEAR() {
                     this.bit = uint8(this.bit);
                     n = (2^8-1)-2^this.bit;
                     n = uint8(n);
-                    model.sim = list("bit_clear_8",4);
+                    this.model.sim = list("bit_clear_8",4);
                 }
             } else {
                 block_parameter_error(msprintf("Wrong value for \'%s\' parameter: %d.","Data Type",this.Datatype),msprintf("Must be in the interval %s.","[3, 8]"));
@@ -81,13 +81,13 @@ function BITCLEAR() {
                 it = this.Datatype;
                 ot = this.Datatype;
                 out = [1,1];
-                [model,graphics,ok] = set_io(model,graphics,list(in1,it),list(out,ot),[],[]);
+                [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]);
             }
             if (ok) {
                 graphics.exprs = exprs;
-                model.opar = list(n);
+                this.model.opar = list(n);
                 this.x.graphics = graphics;
-                this.x.model = model;
+                this.x.model = this.model;
                 break;
             }
         }
diff --git a/js/IntegerOp/BITCLEAR.pickle b/js/IntegerOp/BITCLEAR.pickle
index f19d284e..e6db28df 100644
--- a/js/IntegerOp/BITCLEAR.pickle
+++ b/js/IntegerOp/BITCLEAR.pickle
@@ -6,10 +6,12 @@ S'Datatype'
 p2
 aS'x'
 p3
-aS'bit'
+aS'model'
 p4
-atp5
-Rp6
+aS'bit'
+p5
+atp6
+Rp7
 .(dp0
 S'arg1'
 p1
diff --git a/js/IntegerOp/BITSET.js b/js/IntegerOp/BITSET.js
index ff9b5a7a..01591724 100644
--- a/js/IntegerOp/BITSET.js
+++ b/js/IntegerOp/BITSET.js
@@ -1,20 +1,20 @@
 /* autogenerated from "macros/IntegerOp/BITSET.sci" */
 function BITSET() {
     BITSET.prototype.define = function BITSET() {
-        model = scicos_model();
-        model.sim = list("bit_set_32",4);
-        model.in1 = 1;
-        model.in2 = 1;
-        model.out = 1;
-        model.out2 = 1;
-        model.intyp = 3;
-        model.outtyp = 3;
-        model.opar = list(uint32(0));
-        model.blocktype = "c";
-        model.dep_ut = [true,false];
+        this.model = scicos_model();
+        this.model.sim = list("bit_set_32",4);
+        this.model.in1 = new ScilabDouble(1);
+        this.model.in2 = new ScilabDouble(1);
+        this.model.out = new ScilabDouble(1);
+        this.model.out2 = new ScilabDouble(1);
+        this.model.intyp = new ScilabDouble(3);
+        this.model.outtyp = new ScilabDouble(3);
+        this.model.opar = list(uint32(0));
+        this.model.blocktype = new ScilabString("c");
+        this.model.dep_ut = [true,false];
         exprs = [[sci2exp(3)],[sci2exp(0)]];
         gr_i = [];
-        this.x = standard_define([4,2],model,exprs,gr_i);
+        this.x = standard_define([4,2],this.model,exprs,gr_i);
         return new BasicBlock(this.x);
     }
     BITSET.prototype.details = function BITSET() {
@@ -33,13 +33,13 @@ function BITSET() {
         this.x = arg1;
         graphics = arg1.graphics;
         exprs = graphics.exprs;
-        model = arg1.model;
+        this.model = arg1.model;
         while (true) {
             [ok,this.Datatype,this.bit,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","BITSET")],[" "],["Set a bit"],[" "]],[msprintf("Data Type %s","(3:int32, 4:int16, 5:int8, ...)"),"Index of Bit (0 is least significant)"],list("vec",1,"vec",1),exprs);
             if (!ok) {
                 break;
             }
-            in1 = [model.in1,model.in2];
+            in1 = [this.model.in1,this.model.in2];
             if (floor(this.bit)!=this.bit) {
                 block_parameter_error(msprintf("Wrong type for \'%s\' parameter: %5.1f.","Index of Bit",this.bit),"Must be integer.");
                 ok = false;
@@ -52,7 +52,7 @@ function BITSET() {
                 this.bit = uint32(this.bit);
                 n = 2^this.bit;
                 n = uint32(n);
-                model.sim = list("bit_set_32",4);
+                this.model.sim = list("bit_set_32",4);
             } else if ((this.Datatype==4)||(this.Datatype==7)) {
                 if (this.bit>15||this.bit<0) {
                     block_parameter_error(msprintf("Wrong value for \'%s\' parameter: %d.","Index of Bit",this.bit),msprintf("Must be in the interval %s.","[0, 15]"));
@@ -61,7 +61,7 @@ function BITSET() {
                 this.bit = uint16(this.bit);
                 n = 2^this.bit;
                 n = uint16(n);
-                model.sim = list("bit_set_16",4);
+                this.model.sim = list("bit_set_16",4);
             } else if ((this.Datatype==5)||(this.Datatype==8)) {
                 if (this.bit>7||this.bit<0) {
                     block_parameter_error(msprintf("Wrong value for \'%s\' parameter: %d.","Index of Bit",this.bit),msprintf("Must be in the interval %s.","[0, 7]"));
@@ -70,7 +70,7 @@ function BITSET() {
                 this.bit = uint8(this.bit);
                 n = 2^this.bit;
                 n = uint8(n);
-                model.sim = list("bit_set_8",4);
+                this.model.sim = list("bit_set_8",4);
             } else {
                 block_parameter_error(msprintf("Wrong value for \'%s\' parameter: %d.","Data Type",this.Datatype),msprintf("Must be in the interval %s.","[3, 8]"));
                 ok = false;
@@ -79,13 +79,13 @@ function BITSET() {
                 it = this.Datatype;
                 ot = this.Datatype;
                 out = [1,1];
-                [model,graphics,ok] = set_io(model,graphics,list(in1,it),list(out,ot),[],[]);
+                [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]);
             }
             if (ok) {
                 graphics.exprs = exprs;
-                model.opar = list(n);
+                this.model.opar = list(n);
                 this.x.graphics = graphics;
-                this.x.model = model;
+                this.x.model = this.model;
                 break;
             }
         }
diff --git a/js/IntegerOp/BITSET.pickle b/js/IntegerOp/BITSET.pickle
index f19d284e..e6db28df 100644
--- a/js/IntegerOp/BITSET.pickle
+++ b/js/IntegerOp/BITSET.pickle
@@ -6,10 +6,12 @@ S'Datatype'
 p2
 aS'x'
 p3
-aS'bit'
+aS'model'
 p4
-atp5
-Rp6
+aS'bit'
+p5
+atp6
+Rp7
 .(dp0
 S'arg1'
 p1
diff --git a/js/IntegerOp/CONVERT.js b/js/IntegerOp/CONVERT.js
index 22a27d4d..79db9513 100644
--- a/js/IntegerOp/CONVERT.js
+++ b/js/IntegerOp/CONVERT.js
@@ -2,21 +2,21 @@
 function CONVERT() {
     CONVERT.prototype.define = function CONVERT() {
         sgn = 2;
-        model = scicos_model();
-        model.sim = list("convert",4);
-        model.in1 = -1;
-        model.out = -1;
-        model.in2 = -2;
-        model.out2 = -2;
-        model.intyp = 1;
-        model.outtyp = 3;
-        model.rpar = [];
-        model.ipar = sgn;
-        model.blocktype = "c";
-        model.dep_ut = [true,false];
+        this.model = scicos_model();
+        this.model.sim = list("convert",4);
+        this.model.in1 = new ScilabDouble(-1);
+        this.model.out = new ScilabDouble(-1);
+        this.model.in2 = new ScilabDouble(-2);
+        this.model.out2 = new ScilabDouble(-2);
+        this.model.intyp = new ScilabDouble(1);
+        this.model.outtyp = new ScilabDouble(3);
+        this.model.rpar = [];
+        this.model.ipar = new ScilabDouble(sgn);
+        this.model.blocktype = new ScilabString("c");
+        this.model.dep_ut = [true,false];
         exprs = [[sci2exp(1)],[sci2exp(3)],[sci2exp(0)]];
         gr_i = [];
-        this.x = standard_define([3,2],model,exprs,gr_i);
+        this.x = standard_define([3,2],this.model,exprs,gr_i);
         return new BasicBlock(this.x);
     }
     CONVERT.prototype.details = function CONVERT() {
@@ -36,7 +36,7 @@ function CONVERT() {
         this.np = arguments[0]["np"]
         this.x = arg1;
         graphics = arg1.graphics;
-        model = arg1.model;
+        this.model = arg1.model;
         exprs = graphics.exprs;
         while (true) {
             [ok,this.it,this.ot,this.np,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","CONVERT")],[" "],["Type conversion"],[" "]],["Input Type (1:double, 3:int32, 4:int16, 5:int8, ...)","Output Type (1:double, 3:int32, 4:int16, 5:int8, ...)","Do on Overflow (0:Nothing, 1:Saturate, 2:Error)"],list("vec",1,"vec",1,"vec",1),exprs);
@@ -59,321 +59,321 @@ function CONVERT() {
                 block_parameter_error(msprintf("Wrong value for \'%s\' parameter: %d.","Output Type",this.ot),msprintf("Must be in the interval %s.","[1, 8]"));
                 ok = false;
             }
-            model.sim = list("convert",4);
+            this.model.sim = list("convert",4);
             if ((this.it==this.ot)) {
-                model.ipar = 1;
+                this.model.ipar = new ScilabDouble(1);
             } else {
                 if ((this.np==0)) {
                     if ((this.it==1)) {
                         if ((this.ot==3)) {
-                            model.ipar = 2;
+                            this.model.ipar = new ScilabDouble(2);
                         } else if ((this.ot==4)) {
-                            model.ipar = 3;
+                            this.model.ipar = new ScilabDouble(3);
                         } else if ((this.ot==5)) {
-                            model.ipar = 4;
+                            this.model.ipar = new ScilabDouble(4);
                         } else if ((this.ot==6)) {
-                            model.ipar = 5;
+                            this.model.ipar = new ScilabDouble(5);
                         } else if ((this.ot==7)) {
-                            model.ipar = 6;
+                            this.model.ipar = new ScilabDouble(6);
                         } else if ((this.ot==8)) {
-                            model.ipar = 7;
+                            this.model.ipar = new ScilabDouble(7);
                         }
                     } else if ((this.it==3)) {
                         if ((this.ot==1)) {
-                            model.ipar = 8;
+                            this.model.ipar = new ScilabDouble(8);
                         } else if ((this.ot==4)) {
-                            model.ipar = 9;
+                            this.model.ipar = new ScilabDouble(9);
                         } else if ((this.ot==5)) {
-                            model.ipar = 10;
+                            this.model.ipar = new ScilabDouble(10);
                         } else if ((this.ot==6)) {
-                            model.ipar = 1;
+                            this.model.ipar = new ScilabDouble(1);
                         } else if ((this.ot==7)) {
-                            model.ipar = 11;
+                            this.model.ipar = new ScilabDouble(11);
                         } else if ((this.ot==8)) {
-                            model.ipar = 12;
+                            this.model.ipar = new ScilabDouble(12);
                         }
                     } else if ((this.it==4)) {
                         if ((this.ot==1)) {
-                            model.ipar = 13;
+                            this.model.ipar = new ScilabDouble(13);
                         } else if ((this.ot==3)) {
-                            model.ipar = 14;
+                            this.model.ipar = new ScilabDouble(14);
                         } else if ((this.ot==5)) {
-                            model.ipar = 15;
+                            this.model.ipar = new ScilabDouble(15);
                         } else if ((this.ot==6)) {
-                            model.ipar = 16;
+                            this.model.ipar = new ScilabDouble(16);
                         } else if ((this.ot==7)) {
-                            model.ipar = 1;
+                            this.model.ipar = new ScilabDouble(1);
                         } else if ((this.ot==8)) {
-                            model.ipar = 17;
+                            this.model.ipar = new ScilabDouble(17);
                         }
                     } else if ((this.it==5)) {
                         if ((this.ot==1)) {
-                            model.ipar = 18;
+                            this.model.ipar = new ScilabDouble(18);
                         } else if ((this.ot==3)) {
-                            model.ipar = 19;
+                            this.model.ipar = new ScilabDouble(19);
                         } else if ((this.ot==4)) {
-                            model.ipar = 20;
+                            this.model.ipar = new ScilabDouble(20);
                         } else if ((this.ot==6)) {
-                            model.ipar = 21;
+                            this.model.ipar = new ScilabDouble(21);
                         } else if ((this.ot==7)) {
-                            model.ipar = 22;
+                            this.model.ipar = new ScilabDouble(22);
                         } else if ((this.ot==8)) {
-                            model.ipar = 1;
+                            this.model.ipar = new ScilabDouble(1);
                         }
                     } else if ((this.it==6)) {
                         if ((this.ot==1)) {
-                            model.ipar = 23;
+                            this.model.ipar = new ScilabDouble(23);
                         } else if ((this.ot==3)) {
-                            model.ipar = 1;
+                            this.model.ipar = new ScilabDouble(1);
                         } else if ((this.ot==4)) {
-                            model.ipar = 24;
+                            this.model.ipar = new ScilabDouble(24);
                         } else if ((this.ot==5)) {
-                            model.ipar = 25;
+                            this.model.ipar = new ScilabDouble(25);
                         } else if ((this.ot==7)) {
-                            model.ipar = 26;
+                            this.model.ipar = new ScilabDouble(26);
                         } else if ((this.ot==8)) {
-                            model.ipar = 27;
+                            this.model.ipar = new ScilabDouble(27);
                         }
                     } else if ((this.it==7)) {
                         if ((this.ot==1)) {
-                            model.ipar = 28;
+                            this.model.ipar = new ScilabDouble(28);
                         } else if ((this.ot==3)) {
-                            model.ipar = 29;
+                            this.model.ipar = new ScilabDouble(29);
                         } else if ((this.ot==4)) {
-                            model.ipar = 1;
+                            this.model.ipar = new ScilabDouble(1);
                         } else if ((this.ot==5)) {
-                            model.ipar = 30;
+                            this.model.ipar = new ScilabDouble(30);
                         } else if ((this.ot==6)) {
-                            model.ipar = 31;
+                            this.model.ipar = new ScilabDouble(31);
                         } else if ((this.ot==8)) {
-                            model.ipar = 32;
+                            this.model.ipar = new ScilabDouble(32);
                         }
                     } else if ((this.it==8)) {
                         if ((this.ot==1)) {
-                            model.ipar = 33;
+                            this.model.ipar = new ScilabDouble(33);
                         } else if ((this.ot==3)) {
-                            model.ipar = 34;
+                            this.model.ipar = new ScilabDouble(34);
                         } else if ((this.ot==4)) {
-                            model.ipar = 35;
+                            this.model.ipar = new ScilabDouble(35);
                         } else if ((this.ot==5)) {
-                            model.ipar = 1;
+                            this.model.ipar = new ScilabDouble(1);
                         } else if ((this.ot==6)) {
-                            model.ipar = 36;
+                            this.model.ipar = new ScilabDouble(36);
                         } else if ((this.ot==7)) {
-                            model.ipar = 37;
+                            this.model.ipar = new ScilabDouble(37);
                         }
                     }
                 } else if ((this.np==1)) {
                     if ((this.it==1)) {
                         if ((this.ot==3)) {
-                            model.ipar = 38;
+                            this.model.ipar = new ScilabDouble(38);
                         } else if ((this.ot==4)) {
-                            model.ipar = 39;
+                            this.model.ipar = new ScilabDouble(39);
                         } else if ((this.ot==5)) {
-                            model.ipar = 40;
+                            this.model.ipar = new ScilabDouble(40);
                         } else if ((this.ot==6)) {
-                            model.ipar = 41;
+                            this.model.ipar = new ScilabDouble(41);
                         } else if ((this.ot==7)) {
-                            model.ipar = 42;
+                            this.model.ipar = new ScilabDouble(42);
                         } else if ((this.ot==8)) {
-                            model.ipar = 43;
+                            this.model.ipar = new ScilabDouble(43);
                         }
                     } else if ((this.it==3)) {
                         if ((this.ot==1)) {
-                            model.ipar = 8;
+                            this.model.ipar = new ScilabDouble(8);
                         } else if ((this.ot==4)) {
-                            model.ipar = 44;
+                            this.model.ipar = new ScilabDouble(44);
                         } else if ((this.ot==5)) {
-                            model.ipar = 45;
+                            this.model.ipar = new ScilabDouble(45);
                         } else if ((this.ot==6)) {
-                            model.ipar = 46;
+                            this.model.ipar = new ScilabDouble(46);
                         } else if ((this.ot==7)) {
-                            model.ipar = 47;
+                            this.model.ipar = new ScilabDouble(47);
                         } else if ((this.ot==8)) {
-                            model.ipar = 48;
+                            this.model.ipar = new ScilabDouble(48);
                         }
                     } else if ((this.it==4)) {
                         if ((this.ot==1)) {
-                            model.ipar = 13;
+                            this.model.ipar = new ScilabDouble(13);
                         } else if ((this.ot==3)) {
-                            model.ipar = 14;
+                            this.model.ipar = new ScilabDouble(14);
                         } else if ((this.ot==5)) {
-                            model.ipar = 49;
+                            this.model.ipar = new ScilabDouble(49);
                         } else if ((this.ot==6)) {
-                            model.ipar = 50;
+                            this.model.ipar = new ScilabDouble(50);
                         } else if ((this.ot==7)) {
-                            model.ipar = 51;
+                            this.model.ipar = new ScilabDouble(51);
                         } else if ((this.ot==8)) {
-                            model.ipar = 52;
+                            this.model.ipar = new ScilabDouble(52);
                         }
                     } else if ((this.it==5)) {
                         if ((this.ot==1)) {
-                            model.ipar = 18;
+                            this.model.ipar = new ScilabDouble(18);
                         } else if ((this.ot==3)) {
-                            model.ipar = 19;
+                            this.model.ipar = new ScilabDouble(19);
                         } else if ((this.ot==4)) {
-                            model.ipar = 20;
+                            this.model.ipar = new ScilabDouble(20);
                         } else if ((this.ot==6)) {
-                            model.ipar = 53;
+                            this.model.ipar = new ScilabDouble(53);
                         } else if ((this.ot==7)) {
-                            model.ipar = 54;
+                            this.model.ipar = new ScilabDouble(54);
                         } else if ((this.ot==8)) {
-                            model.ipar = 55;
+                            this.model.ipar = new ScilabDouble(55);
                         }
                     } else if ((this.it==6)) {
                         if ((this.ot==1)) {
-                            model.ipar = 23;
+                            this.model.ipar = new ScilabDouble(23);
                         } else if ((this.ot==3)) {
-                            model.ipar = 56;
+                            this.model.ipar = new ScilabDouble(56);
                         } else if ((this.ot==4)) {
-                            model.ipar = 57;
+                            this.model.ipar = new ScilabDouble(57);
                         } else if ((this.ot==5)) {
-                            model.ipar = 58;
+                            this.model.ipar = new ScilabDouble(58);
                         } else if ((this.ot==7)) {
-                            model.ipar = 59;
+                            this.model.ipar = new ScilabDouble(59);
                         } else if ((this.ot==8)) {
-                            model.ipar = 60;
+                            this.model.ipar = new ScilabDouble(60);
                         }
                     } else if ((this.it==7)) {
                         if ((this.ot==1)) {
-                            model.ipar = 28;
+                            this.model.ipar = new ScilabDouble(28);
                         } else if ((this.ot==3)) {
-                            model.ipar = 29;
+                            this.model.ipar = new ScilabDouble(29);
                         } else if ((this.ot==4)) {
-                            model.ipar = 61;
+                            this.model.ipar = new ScilabDouble(61);
                         } else if ((this.ot==5)) {
-                            model.ipar = 62;
+                            this.model.ipar = new ScilabDouble(62);
                         } else if ((this.ot==6)) {
-                            model.ipar = 31;
+                            this.model.ipar = new ScilabDouble(31);
                         } else if ((this.ot==8)) {
-                            model.ipar = 63;
+                            this.model.ipar = new ScilabDouble(63);
                         }
                     } else if ((this.it==8)) {
                         if ((this.ot==1)) {
-                            model.ipar = 33;
+                            this.model.ipar = new ScilabDouble(33);
                         } else if ((this.ot==3)) {
-                            model.ipar = 34;
+                            this.model.ipar = new ScilabDouble(34);
                         } else if ((this.ot==4)) {
-                            model.ipar = 35;
+                            this.model.ipar = new ScilabDouble(35);
                         } else if ((this.ot==5)) {
-                            model.ipar = 64;
+                            this.model.ipar = new ScilabDouble(64);
                         } else if ((this.ot==6)) {
-                            model.ipar = 36;
+                            this.model.ipar = new ScilabDouble(36);
                         } else if ((this.ot==7)) {
-                            model.ipar = 37;
+                            this.model.ipar = new ScilabDouble(37);
                         }
                     }
                 } else if ((this.np==2)) {
                     if ((this.it==1)) {
                         if ((this.ot==3)) {
-                            model.ipar = 65;
+                            this.model.ipar = new ScilabDouble(65);
                         } else if ((this.ot==4)) {
-                            model.ipar = 66;
+                            this.model.ipar = new ScilabDouble(66);
                         } else if ((this.ot==5)) {
-                            model.ipar = 67;
+                            this.model.ipar = new ScilabDouble(67);
                         } else if ((this.ot==6)) {
-                            model.ipar = 68;
+                            this.model.ipar = new ScilabDouble(68);
                         } else if ((this.ot==7)) {
-                            model.ipar = 69;
+                            this.model.ipar = new ScilabDouble(69);
                         } else if ((this.ot==8)) {
-                            model.ipar = 70;
+                            this.model.ipar = new ScilabDouble(70);
                         }
                     } else if ((this.it==3)) {
                         if ((this.ot==1)) {
-                            model.ipar = 8;
+                            this.model.ipar = new ScilabDouble(8);
                         } else if ((this.ot==4)) {
-                            model.ipar = 71;
+                            this.model.ipar = new ScilabDouble(71);
                         } else if ((this.ot==5)) {
-                            model.ipar = 72;
+                            this.model.ipar = new ScilabDouble(72);
                         } else if ((this.ot==6)) {
-                            model.ipar = 73;
+                            this.model.ipar = new ScilabDouble(73);
                         } else if ((this.ot==7)) {
-                            model.ipar = 74;
+                            this.model.ipar = new ScilabDouble(74);
                         } else if ((this.ot==8)) {
-                            model.ipar = 75;
+                            this.model.ipar = new ScilabDouble(75);
                         }
                     } else if ((this.it==4)) {
                         if ((this.ot==1)) {
-                            model.ipar = 13;
+                            this.model.ipar = new ScilabDouble(13);
                         } else if ((this.ot==3)) {
-                            model.ipar = 14;
+                            this.model.ipar = new ScilabDouble(14);
                         } else if ((this.ot==5)) {
-                            model.ipar = 76;
+                            this.model.ipar = new ScilabDouble(76);
                         } else if ((this.ot==6)) {
-                            model.ipar = 77;
+                            this.model.ipar = new ScilabDouble(77);
                         } else if ((this.ot==7)) {
-                            model.ipar = 78;
+                            this.model.ipar = new ScilabDouble(78);
                         } else if ((this.ot==8)) {
-                            model.ipar = 79;
+                            this.model.ipar = new ScilabDouble(79);
                         }
                     } else if ((this.it==5)) {
                         if ((this.ot==1)) {
-                            model.ipar = 18;
+                            this.model.ipar = new ScilabDouble(18);
                         } else if ((this.ot==3)) {
-                            model.ipar = 19;
+                            this.model.ipar = new ScilabDouble(19);
                         } else if ((this.ot==4)) {
-                            model.ipar = 20;
+                            this.model.ipar = new ScilabDouble(20);
                         } else if ((this.ot==6)) {
-                            model.ipar = 80;
+                            this.model.ipar = new ScilabDouble(80);
                         } else if ((this.ot==7)) {
-                            model.ipar = 81;
+                            this.model.ipar = new ScilabDouble(81);
                         } else if ((this.ot==8)) {
-                            model.ipar = 82;
+                            this.model.ipar = new ScilabDouble(82);
                         }
                     } else if ((this.it==6)) {
                         if ((this.ot==1)) {
-                            model.ipar = 23;
+                            this.model.ipar = new ScilabDouble(23);
                         } else if ((this.ot==3)) {
-                            model.ipar = 83;
+                            this.model.ipar = new ScilabDouble(83);
                         } else if ((this.ot==4)) {
-                            model.ipar = 84;
+                            this.model.ipar = new ScilabDouble(84);
                         } else if ((this.ot==5)) {
-                            model.ipar = 85;
+                            this.model.ipar = new ScilabDouble(85);
                         } else if ((this.ot==7)) {
-                            model.ipar = 86;
+                            this.model.ipar = new ScilabDouble(86);
                         } else if ((this.ot==8)) {
-                            model.ipar = 87;
+                            this.model.ipar = new ScilabDouble(87);
                         }
                     } else if ((this.it==7)) {
                         if ((this.ot==1)) {
-                            model.ipar = 28;
+                            this.model.ipar = new ScilabDouble(28);
                         } else if ((this.ot==3)) {
-                            model.ipar = 29;
+                            this.model.ipar = new ScilabDouble(29);
                         } else if ((this.ot==4)) {
-                            model.ipar = 88;
+                            this.model.ipar = new ScilabDouble(88);
                         } else if ((this.ot==5)) {
-                            model.ipar = 89;
+                            this.model.ipar = new ScilabDouble(89);
                         } else if ((this.ot==6)) {
-                            model.ipar = 31;
+                            this.model.ipar = new ScilabDouble(31);
                         } else if ((this.ot==8)) {
-                            model.ipar = 90;
+                            this.model.ipar = new ScilabDouble(90);
                         }
                     } else if ((this.it==8)) {
                         if ((this.ot==1)) {
-                            model.ipar = 33;
+                            this.model.ipar = new ScilabDouble(33);
                         } else if ((this.ot==3)) {
-                            model.ipar = 34;
+                            this.model.ipar = new ScilabDouble(34);
                         } else if ((this.ot==4)) {
-                            model.ipar = 35;
+                            this.model.ipar = new ScilabDouble(35);
                         } else if ((this.ot==5)) {
-                            model.ipar = 91;
+                            this.model.ipar = new ScilabDouble(91);
                         } else if ((this.ot==6)) {
-                            model.ipar = 36;
+                            this.model.ipar = new ScilabDouble(36);
                         } else if ((this.ot==7)) {
-                            model.ipar = 37;
+                            this.model.ipar = new ScilabDouble(37);
                         }
                     }
                 }
             }
-            in1 = [model.in1,model.in2];
-            out = [model.out,model.out2];
+            in1 = [this.model.in1,this.model.in2];
+            out = [this.model.out,this.model.out2];
             if (ok) {
-                [model,graphics,ok] = set_io(model,graphics,list(in1,this.it),list(out,this.ot),[],[]);
+                [model,graphics,ok] = set_io(this.model,graphics,list(in1,this.it),list(out,this.ot),[],[]);
             }
             if (ok) {
                 graphics.exprs = exprs;
                 this.x.graphics = graphics;
-                this.x.model = model;
+                this.x.model = this.model;
                 break;
             }
         }
diff --git a/js/IntegerOp/CONVERT.pickle b/js/IntegerOp/CONVERT.pickle
index d341b99c..d6c96c75 100644
--- a/js/IntegerOp/CONVERT.pickle
+++ b/js/IntegerOp/CONVERT.pickle
@@ -6,12 +6,14 @@ S'np'
 p2
 aS'x'
 p3
-aS'ot'
+aS'model'
 p4
-aS'it'
+aS'ot'
 p5
-atp6
-Rp7
+aS'it'
+p6
+atp7
+Rp8
 .(dp0
 S'arg1'
 p1
diff --git a/js/IntegerOp/DFLIPFLOP.js b/js/IntegerOp/DFLIPFLOP.js
index 4504f55d..b8c6a7a5 100644
--- a/js/IntegerOp/DFLIPFLOP.js
+++ b/js/IntegerOp/DFLIPFLOP.js
@@ -76,20 +76,20 @@ function DFLIPFLOP() {
         scs_m.objs[42-1] = scicos_link(xx=[[253.72572],[253.72156]],yy=[[309.29537],[305.95927]],id="drawlink",thick=[0,0],ct=[5,-1],from=[41,1,0],to=[4,1,1]);
         scs_m.objs[43-1] = scicos_link(xx=[[253.72572],[312.19705],[312.19705]],yy=[[309.29537],[309.29537],[299.28749]],id="drawlink",thick=[0,0],ct=[5,-1],from=[41,2,0],to=[32,1,1]);
         scs_m.objs[44-1] = scicos_link(xx=[[279.98293],[279.98293],[325.53038],[325.53038]],yy=[[372.50232],[315.89455],[315.89455],[299.28749]],id="drawlink",thick=[0,0],ct=[5,-1],from=[2,2,0],to=[32,2,1]);
-        model = scicos_model();
-        model.sim = "csuper";
-        model.in1 = [[1],[1],[1]];
-        model.in2 = [[1],[1],[1]];
-        model.out = [[1],[1]];
-        model.out2 = [[1],[1]];
-        model.intyp = [5,1,1];
-        model.outtyp = [5,5];
-        model.blocktype = "h";
-        model.firing = false;
-        model.dep_ut = [true,false];
-        model.rpar = scs_m;
+        this.model = scicos_model();
+        this.model.sim = new ScilabString("csuper");
+        this.model.in1 = [[1],[1],[1]];
+        this.model.in2 = [[1],[1],[1]];
+        this.model.out = [[1],[1]];
+        this.model.out2 = [[1],[1]];
+        this.model.intyp = [5,1,1];
+        this.model.outtyp = [5,5];
+        this.model.blocktype = new ScilabString("h");
+        this.model.firing = new ScilabBoolean(false);
+        this.model.dep_ut = [true,false];
+        this.model.rpar = new ScilabDouble(scs_m);
         gr_i = [];
-        this.x = standard_define([2,3],model,[],gr_i);
+        this.x = standard_define([2,3],this.model,[],gr_i);
         return new BasicBlock(this.x);
     }
     DFLIPFLOP.prototype.details = function DFLIPFLOP() {
diff --git a/js/IntegerOp/DFLIPFLOP.pickle b/js/IntegerOp/DFLIPFLOP.pickle
index 11601ed1..f92835f1 100644
--- a/js/IntegerOp/DFLIPFLOP.pickle
+++ b/js/IntegerOp/DFLIPFLOP.pickle
@@ -4,8 +4,10 @@ p0
 ((lp1
 S'x'
 p2
-atp3
-Rp4
+aS'model'
+p3
+atp4
+Rp5
 .(dp0
 S'scs_m_1.objs[9-1]'
 p1
diff --git a/js/IntegerOp/DLATCH.js b/js/IntegerOp/DLATCH.js
index 2ee55465..43c4d012 100644
--- a/js/IntegerOp/DLATCH.js
+++ b/js/IntegerOp/DLATCH.js
@@ -21,20 +21,20 @@ function DLATCH() {
         scs_m.objs[17-1] = scicos_link(xx=[[386.03841],[406.03841]],yy=[[329.46812],[329.46812]],id="drawlink",thick=[0,0],ct=[1,1],from=[8,1,0],to=[16,1,1]);
         scs_m.objs[18-1] = scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[325.09603,270.83282],sz=[20,20],flip=true,theta=0,exprs="1",pin=19,pout=[],pein=[],peout=[],gr_i=list(" ",8),id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
         scs_m.objs[19-1] = scicos_link(xx=[[305.09603],[325.09603]],yy=[[280.83282],[280.83282]],id="drawlink",thick=[0,0],ct=[1,1],from=[10,2,0],to=[18,1,1]);
-        model = scicos_model();
-        model.sim = "csuper";
-        model.in1 = [[1],[1]];
-        model.in2 = [[1],[1]];
-        model.out = [[1],[1]];
-        model.out2 = [[1],[1]];
-        model.intyp = [5,-1];
-        model.outtyp = [5,5];
-        model.blocktype = "h";
-        model.firing = false;
-        model.dep_ut = [true,false];
-        model.rpar = scs_m;
+        this.model = scicos_model();
+        this.model.sim = new ScilabString("csuper");
+        this.model.in1 = [[1],[1]];
+        this.model.in2 = [[1],[1]];
+        this.model.out = [[1],[1]];
+        this.model.out2 = [[1],[1]];
+        this.model.intyp = [5,-1];
+        this.model.outtyp = [5,5];
+        this.model.blocktype = new ScilabString("h");
+        this.model.firing = new ScilabBoolean(false);
+        this.model.dep_ut = [true,false];
+        this.model.rpar = new ScilabDouble(scs_m);
         gr_i = [];
-        this.x = standard_define([2,3],model,[],gr_i);
+        this.x = standard_define([2,3],this.model,[],gr_i);
         return new BasicBlock(this.x);
     }
     DLATCH.prototype.details = function DLATCH() {
diff --git a/js/IntegerOp/DLATCH.pickle b/js/IntegerOp/DLATCH.pickle
index 17f74656..06eaaaef 100644
--- a/js/IntegerOp/DLATCH.pickle
+++ b/js/IntegerOp/DLATCH.pickle
@@ -4,8 +4,10 @@ p0
 ((lp1
 S'x'
 p2
-atp3
-Rp4
+aS'model'
+p3
+atp4
+Rp5
 .(dp0
 S'model.sim'
 p1
diff --git a/js/IntegerOp/EXTRACTBITS.js b/js/IntegerOp/EXTRACTBITS.js
index 34680bbe..ee87859f 100644
--- a/js/IntegerOp/EXTRACTBITS.js
+++ b/js/IntegerOp/EXTRACTBITS.js
@@ -2,20 +2,20 @@
 function EXTRACTBITS() {
     EXTRACTBITS.prototype.define = function EXTRACTBITS() {
         numb = [];
-        model = scicos_model();
-        model.sim = list("extract_bit_32_UH0",4);
-        model.in1 = 1;
-        model.in2 = 1;
-        model.out = 1;
-        model.out2 = 1;
-        model.intyp = 3;
-        model.outtyp = 3;
-        model.ipar = [0,numb];
-        model.blocktype = "c";
-        model.dep_ut = [true,false];
+        this.model = scicos_model();
+        this.model.sim = list("extract_bit_32_UH0",4);
+        this.model.in1 = new ScilabDouble(1);
+        this.model.in2 = new ScilabDouble(1);
+        this.model.out = new ScilabDouble(1);
+        this.model.out2 = new ScilabDouble(1);
+        this.model.intyp = new ScilabDouble(3);
+        this.model.outtyp = new ScilabDouble(3);
+        this.model.ipar = [0,numb];
+        this.model.blocktype = new ScilabString("c");
+        this.model.dep_ut = [true,false];
         exprs = [[sci2exp(3)],[sci2exp(1)],[sci2exp(0)],[sci2exp(0)]];
         gr_i = [];
-        this.x = standard_define([4,2],model,exprs,gr_i);
+        this.x = standard_define([4,2],this.model,exprs,gr_i);
         return new BasicBlock(this.x);
     }
     EXTRACTBITS.prototype.details = function EXTRACTBITS() {
@@ -38,7 +38,7 @@ function EXTRACTBITS() {
         this.x = arg1;
         graphics = arg1.graphics;
         exprs = graphics.exprs;
-        model = arg1.model;
+        this.model = arg1.model;
         while (true) {
             [ok,this.Datatype,this.rule,this.bit,this.scal,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","EXTRACTBITS")],[" "],["Bits Extraction"],[" "],["&nbsp;- Bits to Extract:"],["&nbsp;&nbsp;&nbsp;&nbsp;1 Upper Half"],["&nbsp;&nbsp;&nbsp;&nbsp;2 Lower Half"],["&nbsp;&nbsp;&nbsp;&nbsp;3 Range from MSB"],["&nbsp;&nbsp;&nbsp;&nbsp;4 Range to LSB"],["&nbsp;&nbsp;&nbsp;&nbsp;5 Range of Bits"],["&nbsp;- Number of Bits or Index of bit : Index 0 is LSB"],["&nbsp;&nbsp;&nbsp;&nbsp;If \'Bits to Extract\' is set to \'Range of bits\': [Start, End]"],[" "]],[msprintf("Data Type %s","(3:int32, 4:int16, 5:int8, ...)"),"Bits to extract","Number of Bits or Index of Bit","Treat Bit Field as an Integer (0:No, 1:Yes)"],list("vec",1,"vec",1,"vec",-1,"vec",1),exprs);
             if (!ok) {
@@ -52,7 +52,7 @@ function EXTRACTBITS() {
                 block_parameter_error(msprintf("Wrong value for \'%s\' parameter: %d.","Treat Bit Field as an Integer",this.scal),msprintf("Must be in the interval %s.","[0, 1]"));
                 ok = false;
             } else {
-                in1 = [model.in1,model.in2];
+                in1 = [this.model.in1,this.model.in2];
                 this.bit = int(this.bit);
                 this.rule = int(this.rule);
                 if ((this.rule==3)||(this.rule==4)) {
@@ -87,41 +87,41 @@ function EXTRACTBITS() {
                     case 1:
                         switch (this.scal) {
                         case 0:
-                            model.sim = list("extract_bit_32_UH0",4);
+                            this.model.sim = list("extract_bit_32_UH0",4);
                         case 1:
                             switch (this.Datatype) {
                             case 3:
-                                model.sim = list("extract_bit_32_UH1",4);
+                                this.model.sim = list("extract_bit_32_UH1",4);
                             case 6:
-                                model.sim = list("extract_bit_u32_UH1",4);
+                                this.model.sim = list("extract_bit_u32_UH1",4);
                             }
                         }
                     case 2:
-                        model.sim = list("extract_bit_32_LH",4);
+                        this.model.sim = list("extract_bit_32_LH",4);
                     case 3:
                         switch (this.scal) {
                         case 0:
-                            model.sim = list("extract_bit_32_MSB0",4);
+                            this.model.sim = list("extract_bit_32_MSB0",4);
                         case 1:
                             switch (this.Datatype) {
                             case 3:
-                                model.sim = list("extract_bit_32_MSB1",4);
+                                this.model.sim = list("extract_bit_32_MSB1",4);
                             case 6:
-                                model.sim = list("extract_bit_u32_MSB1",4);
+                                this.model.sim = list("extract_bit_u32_MSB1",4);
                             }
                         }
                     case 4:
-                        model.sim = list("extract_bit_32_LSB",4);
+                        this.model.sim = list("extract_bit_32_LSB",4);
                     case 5:
                         switch (this.scal) {
                         case 0:
-                            model.sim = list("extract_bit_32_RB0",4);
+                            this.model.sim = list("extract_bit_32_RB0",4);
                         case 1:
                             switch (this.Datatype) {
                             case 3:
-                                model.sim = list("extract_bit_32_RB1",4);
+                                this.model.sim = list("extract_bit_32_RB1",4);
                             case 6:
-                                model.sim = list("extract_bit_u32_RB1",4);
+                                this.model.sim = list("extract_bit_u32_RB1",4);
                             }
                         }
                     }
@@ -134,41 +134,41 @@ function EXTRACTBITS() {
                     case 1:
                         switch (this.scal) {
                         case 0:
-                            model.sim = list("extract_bit_16_UH0",4);
+                            this.model.sim = list("extract_bit_16_UH0",4);
                         case 1:
                             switch (this.Datatype) {
                             case 4:
-                                model.sim = list("extract_bit_16_UH1",4);
+                                this.model.sim = list("extract_bit_16_UH1",4);
                             case 7:
-                                model.sim = list("extract_bit_u16_UH1",4);
+                                this.model.sim = list("extract_bit_u16_UH1",4);
                             }
                         }
                     case 2:
-                        model.sim = list("extract_bit_16_LH",4);
+                        this.model.sim = list("extract_bit_16_LH",4);
                     case 3:
                         switch (this.scal) {
                         case 0:
-                            model.sim = list("extract_bit_16_MSB0",4);
+                            this.model.sim = list("extract_bit_16_MSB0",4);
                         case 1:
                             switch (this.Datatype) {
                             case 4:
-                                model.sim = list("extract_bit_16_MSB1",4);
+                                this.model.sim = list("extract_bit_16_MSB1",4);
                             case 7:
-                                model.sim = list("extract_bit_u16_MSB1",4);
+                                this.model.sim = list("extract_bit_u16_MSB1",4);
                             }
                         }
                     case 4:
-                        model.sim = list("extract_bit_16_LSB",4);
+                        this.model.sim = list("extract_bit_16_LSB",4);
                     case 5:
                         switch (this.scal) {
                         case 0:
-                            model.sim = list("extract_bit_16_RB0",4);
+                            this.model.sim = list("extract_bit_16_RB0",4);
                         case 1:
                             switch (this.Datatype) {
                             case 4:
-                                model.sim = list("extract_bit_16_RB1",4);
+                                this.model.sim = list("extract_bit_16_RB1",4);
                             case 7:
-                                model.sim = list("extract_bit_u16_RB1",4);
+                                this.model.sim = list("extract_bit_u16_RB1",4);
                             }
                         }
                     }
@@ -181,41 +181,41 @@ function EXTRACTBITS() {
                     case 1:
                         switch (this.scal) {
                         case 0:
-                            model.sim = list("extract_bit_8_UH0",4);
+                            this.model.sim = list("extract_bit_8_UH0",4);
                         case 1:
                             switch (this.Datatype) {
                             case 5:
-                                model.sim = list("extract_bit_8_UH1",4);
+                                this.model.sim = list("extract_bit_8_UH1",4);
                             case 8:
-                                model.sim = list("extract_bit_u8_UH1",4);
+                                this.model.sim = list("extract_bit_u8_UH1",4);
                             }
                         }
                     case 2:
-                        model.sim = list("extract_bit_8_LH",4);
+                        this.model.sim = list("extract_bit_8_LH",4);
                     case 3:
                         switch (this.scal) {
                         case 0:
-                            model.sim = list("extract_bit_8_MSB0",4);
+                            this.model.sim = list("extract_bit_8_MSB0",4);
                         case 1:
                             switch (this.Datatype) {
                             case 5:
-                                model.sim = list("extract_bit_8_MSB1",4);
+                                this.model.sim = list("extract_bit_8_MSB1",4);
                             case 8:
-                                model.sim = list("extract_bit_u8_MSB1",4);
+                                this.model.sim = list("extract_bit_u8_MSB1",4);
                             }
                         }
                     case 4:
-                        model.sim = list("extract_bit_8_LSB",4);
+                        this.model.sim = list("extract_bit_8_LSB",4);
                     case 5:
                         switch (this.scal) {
                         case 0:
-                            model.sim = list("extract_bit_8_RB0",4);
+                            this.model.sim = list("extract_bit_8_RB0",4);
                         case 1:
                             switch (this.Datatype) {
                             case 5:
-                                model.sim = list("extract_bit_8_RB1",4);
+                                this.model.sim = list("extract_bit_8_RB1",4);
                             case 8:
-                                model.sim = list("extract_bit_u8_RB1",4);
+                                this.model.sim = list("extract_bit_u8_RB1",4);
                             }
                         }
                     }
@@ -228,13 +228,13 @@ function EXTRACTBITS() {
                 it = this.Datatype;
                 ot = this.Datatype;
                 out = [1,1];
-                [model,graphics,ok] = set_io(model,graphics,list(in1,it),list(out,ot),[],[]);
+                [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]);
             }
             if (ok) {
                 graphics.exprs = exprs;
-                model.ipar = [[int(this.bit.slice())],[int(numb.slice())]];
+                this.model.ipar = [[int(this.bit.slice())],[int(numb.slice())]];
                 this.x.graphics = graphics;
-                this.x.model = model;
+                this.x.model = this.model;
                 break;
             }
         }
diff --git a/js/IntegerOp/EXTRACTBITS.pickle b/js/IntegerOp/EXTRACTBITS.pickle
index a1d56c93..774cc6d6 100644
--- a/js/IntegerOp/EXTRACTBITS.pickle
+++ b/js/IntegerOp/EXTRACTBITS.pickle
@@ -2,18 +2,20 @@ c__builtin__
 set
 p0
 ((lp1
-S'Datatype'
+S'scal'
 p2
-aS'x'
+aS'Datatype'
 p3
-aS'bit'
+aS'rule'
 p4
-aS'scal'
+aS'x'
 p5
-aS'rule'
+aS'model'
 p6
-atp7
-Rp8
+aS'bit'
+p7
+atp8
+Rp9
 .(dp0
 S'arg1'
 p1
diff --git a/js/IntegerOp/INTMUL.js b/js/IntegerOp/INTMUL.js
index baf80d47..a5174c26 100644
--- a/js/IntegerOp/INTMUL.js
+++ b/js/IntegerOp/INTMUL.js
@@ -2,21 +2,21 @@
 function INTMUL() {
     INTMUL.prototype.define = function INTMUL() {
         sgn = 0;
-        model = scicos_model();
-        model.sim = list("matmul_i32",4);
-        model.in1 = [[-1],[-2]];
-        model.out = -1;
-        model.in2 = [[-2],[-3]];
-        model.out2 = -3;
-        model.intyp = [3,3];
-        model.outtyp = 3;
-        model.rpar = [];
-        model.ipar = sgn;
-        model.blocktype = "c";
-        model.dep_ut = [true,false];
+        this.model = scicos_model();
+        this.model.sim = list("matmul_i32",4);
+        this.model.in1 = [[-1],[-2]];
+        this.model.out = new ScilabDouble(-1);
+        this.model.in2 = [[-2],[-3]];
+        this.model.out2 = new ScilabDouble(-3);
+        this.model.intyp = [3,3];
+        this.model.outtyp = new ScilabDouble(3);
+        this.model.rpar = [];
+        this.model.ipar = new ScilabDouble(sgn);
+        this.model.blocktype = new ScilabString("c");
+        this.model.dep_ut = [true,false];
         exprs = [[sci2exp(3)],[sci2exp(0)]];
         gr_i = [];
-        this.x = standard_define([2,2],model,exprs,gr_i);
+        this.x = standard_define([2,2],this.model,exprs,gr_i);
         return new BasicBlock(this.x);
     }
     INTMUL.prototype.details = function INTMUL() {
@@ -34,7 +34,7 @@ function INTMUL() {
         this.np = arguments[0]["np"]
         this.x = arg1;
         graphics = arg1.graphics;
-        model = arg1.model;
+        this.model = arg1.model;
         exprs = graphics.exprs;
         while (true) {
             [ok,this.Datatype,this.np,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","INTMUL")],[" "],["Integer matrix multiplication"],[" "]],[msprintf("Data Type %s","(3:int32, 4:int16, 5:int8, ...)"),"Do on Overflow (0:Nothing, 1:Saturate, 2:Error)"],list("vec",1,"vec",1),exprs);
@@ -48,66 +48,66 @@ function INTMUL() {
                 ok = false;
             } else if (this.Datatype==3) {
                 if (this.np==0) {
-                    model.sim = list("matmul_i32n",4);
+                    this.model.sim = list("matmul_i32n",4);
                 } else if (this.np==1) {
-                    model.sim = list("matmul_i32s",4);
+                    this.model.sim = list("matmul_i32s",4);
                 } else {
-                    model.sim = list("matmul_i32e",4);
+                    this.model.sim = list("matmul_i32e",4);
                 }
             } else if (this.Datatype==4) {
                 if (this.np==0) {
-                    model.sim = list("matmul_i16n",4);
+                    this.model.sim = list("matmul_i16n",4);
                 } else if (this.np==1) {
-                    model.sim = list("matmul_i16s",4);
+                    this.model.sim = list("matmul_i16s",4);
                 } else {
-                    model.sim = list("matmul_i16e",4);
+                    this.model.sim = list("matmul_i16e",4);
                 }
             } else if (this.Datatype==5) {
                 if (this.np==0) {
-                    model.sim = list("matmul_i8n",4);
+                    this.model.sim = list("matmul_i8n",4);
                 } else if (this.np==1) {
-                    model.sim = list("matmul_i8s",4);
+                    this.model.sim = list("matmul_i8s",4);
                 } else {
-                    model.sim = list("matmul_i8e",4);
+                    this.model.sim = list("matmul_i8e",4);
                 }
             } else if (this.Datatype==6) {
                 if (this.np==0) {
-                    model.sim = list("matmul_ui32n",4);
+                    this.model.sim = list("matmul_ui32n",4);
                 } else if (this.np==1) {
-                    model.sim = list("matmul_ui32s",4);
+                    this.model.sim = list("matmul_ui32s",4);
                 } else {
-                    model.sim = list("matmul_ui32e",4);
+                    this.model.sim = list("matmul_ui32e",4);
                 }
             } else if (this.Datatype==7) {
                 if (this.np==0) {
-                    model.sim = list("matmul_ui16n",4);
+                    this.model.sim = list("matmul_ui16n",4);
                 } else if (this.np==1) {
-                    model.sim = list("matmul_ui16s",4);
+                    this.model.sim = list("matmul_ui16s",4);
                 } else {
-                    model.sim = list("matmul_ui16e",4);
+                    this.model.sim = list("matmul_ui16e",4);
                 }
             } else if (this.Datatype==8) {
                 if (this.np==0) {
-                    model.sim = list("matmul_ui8n",4);
+                    this.model.sim = list("matmul_ui8n",4);
                 } else if (this.np==1) {
-                    model.sim = list("matmul_ui8s",4);
+                    this.model.sim = list("matmul_ui8s",4);
                 } else {
-                    model.sim = list("matmul_ui8e",4);
+                    this.model.sim = list("matmul_ui8e",4);
                 }
             } else {
                 block_parameter_error(msprintf("Wrong value for \'%s\' parameter: %d.","Data Type",ot),msprintf("Must be in the interval %s.","[3, 8]"));
                 ok = false;
             }
-            in1 = [model.in1,model.in2];
-            out = [model.out,model.out2];
+            in1 = [this.model.in1,this.model.in2];
+            out = [this.model.out,this.model.out2];
             if (ok) {
-                [model,graphics,ok] = set_io(model,graphics,list(in1,it),list(out,ot),[],[]);
+                [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]);
             }
             if (ok) {
-                model.ipar = this.np;
+                this.model.ipar = new ScilabDouble(this.np);
                 graphics.exprs = exprs;
                 this.x.graphics = graphics;
-                this.x.model = model;
+                this.x.model = this.model;
                 break;
             }
         }
diff --git a/js/IntegerOp/INTMUL.pickle b/js/IntegerOp/INTMUL.pickle
index 3b7d4302..d88ed7ab 100644
--- a/js/IntegerOp/INTMUL.pickle
+++ b/js/IntegerOp/INTMUL.pickle
@@ -6,10 +6,12 @@ S'Datatype'
 p2
 aS'x'
 p3
-aS'np'
+aS'model'
 p4
-atp5
-Rp6
+aS'np'
+p5
+atp6
+Rp7
 .(dp0
 S'arg1'
 p1
diff --git a/js/IntegerOp/JKFLIPFLOP.js b/js/IntegerOp/JKFLIPFLOP.js
index 5f5e59ef..b855e347 100644
--- a/js/IntegerOp/JKFLIPFLOP.js
+++ b/js/IntegerOp/JKFLIPFLOP.js
@@ -32,20 +32,20 @@ function JKFLIPFLOP() {
         scs_m.objs[20-1] = scicos_link(xx=[[368.82793],[388.82793]],yy=[[243.45067],[243.45067]],id="drawlink",thick=[0,0],ct=[1,1],from=[6,2,0],to=[19,1,1]);
         scs_m.objs[21-1] = scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[466.2036,169.25363],sz=[20,20],flip=true,theta=0,exprs="2",pin=22,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="c",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
         scs_m.objs[22-1] = scicos_link(xx=[[446.2036],[466.2036]],yy=[[179.25363],[179.25363]],id="drawlink",thick=[0,0],ct=[1,1],from=[9,1,0],to=[21,1,1]);
-        model = scicos_model();
-        model.sim = "csuper";
-        model.in1 = [[1],[1],[1]];
-        model.in2 = [[1],[1],[1]];
-        model.out = [[1],[1]];
-        model.out2 = [[1],[1]];
-        model.intyp = [5,1,5];
-        model.outtyp = [5,5];
-        model.blocktype = "h";
-        model.firing = false;
-        model.dep_ut = [true,false];
-        model.rpar = scs_m;
+        this.model = scicos_model();
+        this.model.sim = new ScilabString("csuper");
+        this.model.in1 = [[1],[1],[1]];
+        this.model.in2 = [[1],[1],[1]];
+        this.model.out = [[1],[1]];
+        this.model.out2 = [[1],[1]];
+        this.model.intyp = [5,1,5];
+        this.model.outtyp = [5,5];
+        this.model.blocktype = new ScilabString("h");
+        this.model.firing = new ScilabBoolean(false);
+        this.model.dep_ut = [true,false];
+        this.model.rpar = new ScilabDouble(scs_m);
         gr_i = [];
-        this.x = standard_define([2,3],model,[],gr_i);
+        this.x = standard_define([2,3],this.model,[],gr_i);
         return new BasicBlock(this.x);
     }
     JKFLIPFLOP.prototype.details = function JKFLIPFLOP() {
@@ -69,8 +69,8 @@ function JKFLIPFLOP() {
         newpar = list();
         xx = arg1.model.rpar.objs[path-1];
         exprs = xx.graphics.exprs[1-1];
-        model = xx.model;
-        init_old = model.odstate[1-1];
+        this.model = xx.model;
+        init_old = this.model.odstate[1-1];
         while (true) {
             [ok,this.init,this.exprs0] = scicos_getvalue([[msprintf("Set %s block parameters","JKFLIPFLOP")],[" "],["JK flip-flop"],[" "],["The \'Initial Value\' must be 0 or 1 of type int8"],["&nbsp;- Negative values are considered as int8(0)"],["&nbsp;- Positive values are considered as int8(1)"],[" "]],"Initial Value",list("vec",1),exprs);
             if (!ok) {
@@ -83,8 +83,8 @@ function JKFLIPFLOP() {
             }
             if (ok) {
                 xx.graphics.exprs[1-1] = this.exprs0;
-                model.odstate[1-1] = this.init;
-                xx.model = model;
+                this.model.odstate[('1', 'double')] = new ScilabDouble(this.init);
+                xx.model = this.model;
                 arg1.model.rpar.objs[path-1] = xx;
                 break;
             }
diff --git a/js/IntegerOp/JKFLIPFLOP.pickle b/js/IntegerOp/JKFLIPFLOP.pickle
index eb4fda69..63f7c4d7 100644
--- a/js/IntegerOp/JKFLIPFLOP.pickle
+++ b/js/IntegerOp/JKFLIPFLOP.pickle
@@ -4,12 +4,14 @@ p0
 ((lp1
 S'x'
 p2
-aS'init'
+aS'model'
 p3
-aS'exprs0'
+aS'init'
 p4
-atp5
-Rp6
+aS'exprs0'
+p5
+atp6
+Rp7
 .(dp0
 S'xx.model'
 p1
@@ -87,7 +89,7 @@ g7
 sS'scs_m_1'
 p29
 g7
-sS'scs_m.objs[22-1]'
+sS'scs_m.objs[9-1]'
 p30
 g7
 sS'scs_m_1.objs[2-1]'
@@ -112,72 +114,72 @@ g11
 sS'scs_m.objs[6-1]'
 p38
 g7
-sS'scs_m.objs[9-1]'
+sS'scs_m_1.objs[4-1]'
 p39
 g7
-sS'model.odstate[1-1]'
-p40
-g7
 sS'model.out2'
-p41
+p40
 g11
 sS'model.intyp'
-p42
+p41
 g26
 sS'model.rpar'
-p43
+p42
 g7
 sS'scs_m.objs[3-1]'
-p44
+p43
 g7
-sS'scs_m_1.objs[4-1]'
-p45
+sS"model.odstate[('1', 'double')]"
+p44
 g7
 sS'scs_m.objs[16-1]'
-p46
+p45
 g7
 sS'scs_m.objs[11-1]'
-p47
+p46
 g7
 sS'scs_m.objs[14-1]'
-p48
+p47
 g7
 sS'scs_m.objs[17-1]'
-p49
+p48
 g7
 sS'scs_m_1.objs[5-1]'
-p50
+p49
 g7
 sS'path'
-p51
+p50
 NsS'scs_m.objs[4-1]'
-p52
+p51
 g7
 sS'scs_m.objs[7-1]'
-p53
+p52
 g7
 sS'typ'
-p54
+p53
 g26
 sS'model.outtyp'
-p55
+p54
 g26
 sS'needcompile'
-p56
+p55
 g7
 sS'arg1.model'
-p57
+p56
 g2
 sS'model.blocktype'
-p58
+p57
 g4
 sS'scs_m.objs[8-1]'
-p59
+p58
 g7
 sS'scs_m.objs[15-1]'
-p60
+p59
 g7
 sS'scs_m.objs[21-1]'
+p60
+g7
+sS'scs_m.objs[22-1]'
 p61
 g7
 sS'scs_m_1.objs[1-1]'
diff --git a/js/IntegerOp/LOGIC.js b/js/IntegerOp/LOGIC.js
index 9316c3bf..bd8d7406 100644
--- a/js/IntegerOp/LOGIC.js
+++ b/js/IntegerOp/LOGIC.js
@@ -2,22 +2,22 @@
 function LOGIC() {
     LOGIC.prototype.define = function LOGIC() {
         this.mat = [[0],[0],[0],[1]];
-        model = scicos_model();
-        model.sim = list("logic",4);
-        model.in1 = [[1],[1]];
-        model.in2 = [[1],[1]];
-        model.out = 1;
-        model.out2 = 1;
-        model.evtin = 1;
-        model.intyp = [5,5];
-        model.outtyp = 5;
-        model.opar = list(int8(this.mat));
-        model.blocktype = "c";
-        model.firing = false;
-        model.dep_ut = [true,false];
+        this.model = scicos_model();
+        this.model.sim = list("logic",4);
+        this.model.in1 = [[1],[1]];
+        this.model.in2 = [[1],[1]];
+        this.model.out = new ScilabDouble(1);
+        this.model.out2 = new ScilabDouble(1);
+        this.model.evtin = new ScilabDouble(1);
+        this.model.intyp = [5,5];
+        this.model.outtyp = new ScilabDouble(5);
+        this.model.opar = list(int8(this.mat));
+        this.model.blocktype = new ScilabString("c");
+        this.model.firing = new ScilabBoolean(false);
+        this.model.dep_ut = [true,false];
         exprs = [[sci2exp(this.mat)],[sci2exp(0)]];
         gr_i = [];
-        this.x = standard_define([2,2],model,exprs,gr_i);
+        this.x = standard_define([2,2],this.model,exprs,gr_i);
         return new BasicBlock(this.x);
     }
     LOGIC.prototype.details = function LOGIC() {
@@ -36,7 +36,7 @@ function LOGIC() {
         this.x = arg1;
         graphics = arg1.graphics;
         exprs = graphics.exprs;
-        model = arg1.model;
+        this.model = arg1.model;
         while (true) {
             [ok,this.mat,this.herit,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","LOGIC")],[" "],["Combinatorial logic"],[" "],["&nbsp; Rows of the matrix are the output values"],["&nbsp; Number of rows must be a power of two."],["&nbsp; Number of columns gives the number of outputs."],[" "]],["Truth Table (matrix of outputs)","Accepts Inherited Events (0:No, 1:Yes)"],list("mat",[-1,-2],"vec",1),exprs);
             if (!ok) {
@@ -60,14 +60,14 @@ function LOGIC() {
                 out = [ones(nout,1),ones(nout,1)];
                 it = 5*ones(1,nin);
                 ot = 5*ones(1,nout);
-                [model,graphics,ok] = set_io(model,graphics,list(in1,it),list(out,ot),ones(1-this.herit,1),[]);
+                [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),ones(1-this.herit,1),[]);
             }
             if (ok) {
                 graphics.exprs = exprs;
                 this.mat = int8(this.mat);
-                model.opar = list(this.mat);
+                this.model.opar = list(this.mat);
                 this.x.graphics = graphics;
-                this.x.model = model;
+                this.x.model = this.model;
                 break;
             }
         }
diff --git a/js/IntegerOp/LOGIC.pickle b/js/IntegerOp/LOGIC.pickle
index 90e666b6..693abb46 100644
--- a/js/IntegerOp/LOGIC.pickle
+++ b/js/IntegerOp/LOGIC.pickle
@@ -4,12 +4,14 @@ p0
 ((lp1
 S'x'
 p2
-aS'herit'
+aS'model'
 p3
-aS'mat'
+aS'herit'
 p4
-atp5
-Rp6
+aS'mat'
+p5
+atp6
+Rp7
 .(dp0
 S'arg1'
 p1
diff --git a/js/IntegerOp/SHIFT.js b/js/IntegerOp/SHIFT.js
index fa5fae76..a3ac6a6e 100644
--- a/js/IntegerOp/SHIFT.js
+++ b/js/IntegerOp/SHIFT.js
@@ -3,21 +3,21 @@ function SHIFT() {
     SHIFT.prototype.define = function SHIFT() {
         sgn = [[0],[0]];
         OPER = 0;
-        model = scicos_model();
-        model.sim = list("shift_32_LA",4);
-        model.in1 = -1;
-        model.out = -1;
-        model.in2 = -2;
-        model.out2 = -2;
-        model.intyp = 3;
-        model.outtyp = 3;
-        model.rpar = [];
-        model.ipar = sgn;
-        model.blocktype = "c";
-        model.dep_ut = [true,false];
+        this.model = scicos_model();
+        this.model.sim = list("shift_32_LA",4);
+        this.model.in1 = new ScilabDouble(-1);
+        this.model.out = new ScilabDouble(-1);
+        this.model.in2 = new ScilabDouble(-2);
+        this.model.out2 = new ScilabDouble(-2);
+        this.model.intyp = new ScilabDouble(3);
+        this.model.outtyp = new ScilabDouble(3);
+        this.model.rpar = [];
+        this.model.ipar = sgn;
+        this.model.blocktype = new ScilabString("c");
+        this.model.dep_ut = [true,false];
         exprs = [[sci2exp(3)],[sci2exp(0)],[sci2exp(0)]];
         gr_i = [];
-        this.x = standard_define([3,2],model,exprs,gr_i);
+        this.x = standard_define([3,2],this.model,exprs,gr_i);
         return new BasicBlock(this.x);
     }
     SHIFT.prototype.details = function SHIFT() {
@@ -37,7 +37,7 @@ function SHIFT() {
         this.np = arguments[0]["np"]
         this.x = arg1;
         graphics = arg1.graphics;
-        model = arg1.model;
+        this.model = arg1.model;
         exprs = graphics.exprs;
         while (true) {
             [ok,this.Datatype,this.nb,this.np,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","SHIFT")],[" "],["Shift/Rotates bits"]],[msprintf("Data Type %s","(3:int32, 4:int16, 5:int8, ...)"),"Number of Bits to Shift Left (Negative number to shift right)","Shift Type (0:Arithmetic, 1:Circular)"],list("vec",1,"vec",1,"vec",1),exprs);
@@ -54,63 +54,63 @@ function SHIFT() {
                 if (this.nb>0) {
                     switch (this.np) {
                     case 0:
-                        model.sim = list("shift_32_LA",4);
+                        this.model.sim = list("shift_32_LA",4);
                     case 1:
-                        model.sim = list("shift_32_LC",4);
+                        this.model.sim = list("shift_32_LC",4);
                     }
                 } else if (this.nb<0) {
                     switch (this.np) {
                     case 0:
                         switch (this.Datatype) {
                         case 3:
-                            model.sim = list("shift_32_RA",4);
+                            this.model.sim = list("shift_32_RA",4);
                         case 6:
-                            model.sim = list("shift_u32_RA",4);
+                            this.model.sim = list("shift_u32_RA",4);
                         }
                     case 1:
-                        model.sim = list("shift_32_RC",4);
+                        this.model.sim = list("shift_32_RC",4);
                     }
                 }
             } else if ((this.Datatype==4||this.Datatype==7)) {
                 if (this.nb>0) {
                     switch (this.np) {
                     case 0:
-                        model.sim = list("shift_16_LA",4);
+                        this.model.sim = list("shift_16_LA",4);
                     case 1:
-                        model.sim = list("shift_16_LC",4);
+                        this.model.sim = list("shift_16_LC",4);
                     }
                 } else if (this.nb<0) {
                     switch (this.np) {
                     case 0:
                         switch (this.Datatype) {
                         case 4:
-                            model.sim = list("shift_16_RA",4);
+                            this.model.sim = list("shift_16_RA",4);
                         case 7:
-                            model.sim = list("shift_u16_RA",4);
+                            this.model.sim = list("shift_u16_RA",4);
                         }
                     case 1:
-                        model.sim = list("shift_16_RC",4);
+                        this.model.sim = list("shift_16_RC",4);
                     }
                 }
             } else if ((this.Datatype==5||this.Datatype==8)) {
                 if (this.nb>0) {
                     switch (this.np) {
                     case 0:
-                        model.sim = list("shift_8_LA",4);
+                        this.model.sim = list("shift_8_LA",4);
                     case 1:
-                        model.sim = list("shift_8_LC",4);
+                        this.model.sim = list("shift_8_LC",4);
                     }
                 } else if (this.nb<0) {
                     switch (this.np) {
                     case 0:
                         switch (this.Datatype) {
                         case 5:
-                            model.sim = list("shift_8_RA",4);
+                            this.model.sim = list("shift_8_RA",4);
                         case 8:
-                            model.sim = list("shift_u8_RA",4);
+                            this.model.sim = list("shift_u8_RA",4);
                         }
                     case 1:
-                        model.sim = list("shift_8_RC",4);
+                        this.model.sim = list("shift_8_RC",4);
                     }
                 }
             } else {
@@ -118,13 +118,13 @@ function SHIFT() {
                 ok = false;
             }
             if (ok) {
-                [model,graphics,ok] = set_io(model,graphics,list([-1,-2],it),list([-1,-2],ot),[],[]);
+                [model,graphics,ok] = set_io(this.model,graphics,list([-1,-2],it),list([-1,-2],ot),[],[]);
             }
             if (ok) {
-                model.ipar = this.nb;
+                this.model.ipar = new ScilabDouble(this.nb);
                 graphics.exprs = exprs;
                 this.x.graphics = graphics;
-                this.x.model = model;
+                this.x.model = this.model;
                 break;
             }
         }
diff --git a/js/IntegerOp/SHIFT.pickle b/js/IntegerOp/SHIFT.pickle
index fca9045b..5c46c422 100644
--- a/js/IntegerOp/SHIFT.pickle
+++ b/js/IntegerOp/SHIFT.pickle
@@ -6,12 +6,14 @@ S'Datatype'
 p2
 aS'x'
 p3
-aS'nb'
+aS'model'
 p4
 aS'np'
 p5
-atp6
-Rp7
+aS'nb'
+p6
+atp7
+Rp8
 .(dp0
 S'OPER'
 p1
diff --git a/js/IntegerOp/SRFLIPFLOP.js b/js/IntegerOp/SRFLIPFLOP.js
index 9a05ad70..354f75f6 100644
--- a/js/IntegerOp/SRFLIPFLOP.js
+++ b/js/IntegerOp/SRFLIPFLOP.js
@@ -16,20 +16,20 @@ function SRFLIPFLOP() {
         scs_m.objs[12-1] = scicos_link(xx=[[269.93257],[289.93257]],yy=[[211.45067],[211.45067]],id="drawlink",thick=[0,0],ct=[1,1],from=[11,1,0],to=[1,3,1]);
         scs_m.objs[13-1] = scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[383.03733,238.584],sz=[20,20],flip=true,theta=0,exprs="1",pin=14,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
         scs_m.objs[14-1] = scicos_link(xx=[[363.03733],[383.03733]],yy=[[248.584],[248.584]],id="drawlink",thick=[0,0],ct=[1,1],from=[5,2,0],to=[13,1,1]);
-        model = scicos_model();
-        model.sim = "csuper";
-        model.in1 = [[1],[1]];
-        model.in2 = [[1],[1]];
-        model.out = [[1],[1]];
-        model.out2 = [[1],[1]];
-        model.intyp = [5,5];
-        model.outtyp = [5,5];
-        model.blocktype = "h";
-        model.firing = false;
-        model.dep_ut = [true,false];
-        model.rpar = scs_m;
+        this.model = scicos_model();
+        this.model.sim = new ScilabString("csuper");
+        this.model.in1 = [[1],[1]];
+        this.model.in2 = [[1],[1]];
+        this.model.out = [[1],[1]];
+        this.model.out2 = [[1],[1]];
+        this.model.intyp = [5,5];
+        this.model.outtyp = [5,5];
+        this.model.blocktype = new ScilabString("h");
+        this.model.firing = new ScilabBoolean(false);
+        this.model.dep_ut = [true,false];
+        this.model.rpar = new ScilabDouble(scs_m);
         gr_i = [];
-        this.x = standard_define([2,3],model,[],gr_i);
+        this.x = standard_define([2,3],this.model,[],gr_i);
         return new BasicBlock(this.x);
     }
     SRFLIPFLOP.prototype.details = function SRFLIPFLOP() {
@@ -53,8 +53,8 @@ function SRFLIPFLOP() {
         newpar = list();
         xx = arg1.model.rpar.objs[path-1];
         exprs = xx.graphics.exprs[1-1];
-        model = xx.model;
-        init_old = model.odstate[1-1];
+        this.model = xx.model;
+        init_old = this.model.odstate[1-1];
         while (true) {
             [ok,this.init,this.exprs0] = scicos_getvalue([[msprintf("Set %s block parameters","SRFLIPFLOP")],[" "],["SR flip-flop"],[" "],["The \'Initial Value\' must be 0 or 1 of type int8"],["&nbsp;- Negative values are considered as int8(0)"],["&nbsp;- Positive values are considered as int8(1)"],[" "]],"Initial Value",list("vec",1),exprs);
             if (!ok) {
@@ -67,8 +67,8 @@ function SRFLIPFLOP() {
             }
             if (ok) {
                 xx.graphics.exprs[1-1] = this.exprs0;
-                model.odstate[1-1] = this.init;
-                xx.model = model;
+                this.model.odstate[('1', 'double')] = new ScilabDouble(this.init);
+                xx.model = this.model;
                 arg1.model.rpar.objs[path-1] = xx;
                 break;
             }
diff --git a/js/IntegerOp/SRFLIPFLOP.pickle b/js/IntegerOp/SRFLIPFLOP.pickle
index 32690c22..5cc1e7d8 100644
--- a/js/IntegerOp/SRFLIPFLOP.pickle
+++ b/js/IntegerOp/SRFLIPFLOP.pickle
@@ -4,12 +4,14 @@ p0
 ((lp1
 S'x'
 p2
-aS'init'
+aS'model'
 p3
-aS'exprs0'
+aS'init'
 p4
-atp5
-Rp6
+aS'exprs0'
+p5
+atp6
+Rp7
 .(dp0
 S'xx.model'
 p1
@@ -86,39 +88,39 @@ g13
 sS'scs_m.objs[9-1]'
 p29
 g13
-sS'model.odstate[1-1]'
-p30
-g13
 sS'model.out2'
-p31
+p30
 g8
 sS'model.intyp'
-p32
+p31
 g20
 sS'model.rpar'
-p33
+p32
 g13
 sS'scs_m.objs[3-1]'
+p33
+g13
+sS"model.odstate[('1', 'double')]"
 p34
 g13
-sS'model.outtyp'
-p35
-g20
 sS'scs_m.objs[11-1]'
-p36
+p35
 g13
 sS'scs_m.objs[14-1]'
-p37
+p36
 g13
 sS'path'
-p38
+p37
 NsS'scs_m.objs[4-1]'
-p39
+p38
 g13
 sS'scs_m.objs[7-1]'
-p40
+p39
 g13
 sS'typ'
+p40
+g20
+sS'model.outtyp'
 p41
 g20
 sS'needcompile'