handle list separately

11 files changed, 282 insertions, 282 deletions

diff --git a/js/IntegerOp/BITCLEAR.js b/js/IntegerOp/BITCLEAR.js
index 715efd0a..fdf24c73 100644
--- a/js/IntegerOp/BITCLEAR.js
+++ b/js/IntegerOp/BITCLEAR.js
@@ -2,14 +2,14 @@
 function BITCLEAR() {
     BITCLEAR.prototype.define = function BITCLEAR() {
         this.model = scicos_model();
-        this.model.sim = list("bit_clear_32",4);
+        this.model.sim = list(new ScilabString("bit_clear_32"),new ScilabDouble(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.opar = list(new ScilabDouble(int32(0)));
         this.model.blocktype = new ScilabString("c");
         this.model.dep_ut = [true,false];
         exprs = [[sci2exp(3)],[sci2exp(0)]];
@@ -51,7 +51,7 @@ function BITCLEAR() {
                     this.bit = uint32(this.bit);
                     n = (2^32-1)-2^this.bit;
                     n = uint32(n);
-                    this.model.sim = list("bit_clear_32",4);
+                    this.model.sim = list(new ScilabString("bit_clear_32"),new ScilabDouble(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);
-                    this.model.sim = list("bit_clear_16",4);
+                    this.model.sim = list(new ScilabString("bit_clear_16"),new ScilabDouble(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);
-                    this.model.sim = list("bit_clear_8",4);
+                    this.model.sim = list(new ScilabString("bit_clear_8"),new ScilabDouble(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]"));
@@ -85,7 +85,7 @@ function BITCLEAR() {
             }
             if (ok) {
                 graphics.exprs = exprs;
-                this.model.opar = list(n);
+                this.model.opar = list(new ScilabDouble(n));
                 this.x.graphics = graphics;
                 this.x.model = this.model;
                 break;
diff --git a/js/IntegerOp/BITSET.js b/js/IntegerOp/BITSET.js
index 01591724..84ced0bb 100644
--- a/js/IntegerOp/BITSET.js
+++ b/js/IntegerOp/BITSET.js
@@ -2,14 +2,14 @@
 function BITSET() {
     BITSET.prototype.define = function BITSET() {
         this.model = scicos_model();
-        this.model.sim = list("bit_set_32",4);
+        this.model.sim = list(new ScilabString("bit_set_32"),new ScilabDouble(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.opar = list(new ScilabDouble(uint32(0)));
         this.model.blocktype = new ScilabString("c");
         this.model.dep_ut = [true,false];
         exprs = [[sci2exp(3)],[sci2exp(0)]];
@@ -52,7 +52,7 @@ function BITSET() {
                 this.bit = uint32(this.bit);
                 n = 2^this.bit;
                 n = uint32(n);
-                this.model.sim = list("bit_set_32",4);
+                this.model.sim = list(new ScilabString("bit_set_32"),new ScilabDouble(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);
-                this.model.sim = list("bit_set_16",4);
+                this.model.sim = list(new ScilabString("bit_set_16"),new ScilabDouble(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);
-                this.model.sim = list("bit_set_8",4);
+                this.model.sim = list(new ScilabString("bit_set_8"),new ScilabDouble(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;
@@ -83,7 +83,7 @@ function BITSET() {
             }
             if (ok) {
                 graphics.exprs = exprs;
-                this.model.opar = list(n);
+                this.model.opar = list(new ScilabDouble(n));
                 this.x.graphics = graphics;
                 this.x.model = this.model;
                 break;
diff --git a/js/IntegerOp/CONVERT.js b/js/IntegerOp/CONVERT.js
index 79db9513..b6a29de9 100644
--- a/js/IntegerOp/CONVERT.js
+++ b/js/IntegerOp/CONVERT.js
@@ -3,7 +3,7 @@ function CONVERT() {
     CONVERT.prototype.define = function CONVERT() {
         sgn = 2;
         this.model = scicos_model();
-        this.model.sim = list("convert",4);
+        this.model.sim = list(new ScilabString("convert"),new ScilabDouble(4));
         this.model.in1 = new ScilabDouble(-1);
         this.model.out = new ScilabDouble(-1);
         this.model.in2 = new ScilabDouble(-2);
@@ -59,7 +59,7 @@ 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;
             }
-            this.model.sim = list("convert",4);
+            this.model.sim = list(new ScilabString("convert"),new ScilabDouble(4));
             if ((this.it==this.ot)) {
                 this.model.ipar = new ScilabDouble(1);
             } else {
diff --git a/js/IntegerOp/EXTRACTBITS.js b/js/IntegerOp/EXTRACTBITS.js
index ee87859f..74a7c6c0 100644
--- a/js/IntegerOp/EXTRACTBITS.js
+++ b/js/IntegerOp/EXTRACTBITS.js
@@ -3,7 +3,7 @@ function EXTRACTBITS() {
     EXTRACTBITS.prototype.define = function EXTRACTBITS() {
         numb = [];
         this.model = scicos_model();
-        this.model.sim = list("extract_bit_32_UH0",4);
+        this.model.sim = list(new ScilabString("extract_bit_32_UH0"),new ScilabDouble(4));
         this.model.in1 = new ScilabDouble(1);
         this.model.in2 = new ScilabDouble(1);
         this.model.out = new ScilabDouble(1);
@@ -87,41 +87,41 @@ function EXTRACTBITS() {
                     case 1:
                         switch (this.scal) {
                         case 0:
-                            this.model.sim = list("extract_bit_32_UH0",4);
+                            this.model.sim = list(new ScilabString("extract_bit_32_UH0"),new ScilabDouble(4));
                         case 1:
                             switch (this.Datatype) {
                             case 3:
-                                this.model.sim = list("extract_bit_32_UH1",4);
+                                this.model.sim = list(new ScilabString("extract_bit_32_UH1"),new ScilabDouble(4));
                             case 6:
-                                this.model.sim = list("extract_bit_u32_UH1",4);
+                                this.model.sim = list(new ScilabString("extract_bit_u32_UH1"),new ScilabDouble(4));
                             }
                         }
                     case 2:
-                        this.model.sim = list("extract_bit_32_LH",4);
+                        this.model.sim = list(new ScilabString("extract_bit_32_LH"),new ScilabDouble(4));
                     case 3:
                         switch (this.scal) {
                         case 0:
-                            this.model.sim = list("extract_bit_32_MSB0",4);
+                            this.model.sim = list(new ScilabString("extract_bit_32_MSB0"),new ScilabDouble(4));
                         case 1:
                             switch (this.Datatype) {
                             case 3:
-                                this.model.sim = list("extract_bit_32_MSB1",4);
+                                this.model.sim = list(new ScilabString("extract_bit_32_MSB1"),new ScilabDouble(4));
                             case 6:
-                                this.model.sim = list("extract_bit_u32_MSB1",4);
+                                this.model.sim = list(new ScilabString("extract_bit_u32_MSB1"),new ScilabDouble(4));
                             }
                         }
                     case 4:
-                        this.model.sim = list("extract_bit_32_LSB",4);
+                        this.model.sim = list(new ScilabString("extract_bit_32_LSB"),new ScilabDouble(4));
                     case 5:
                         switch (this.scal) {
                         case 0:
-                            this.model.sim = list("extract_bit_32_RB0",4);
+                            this.model.sim = list(new ScilabString("extract_bit_32_RB0"),new ScilabDouble(4));
                         case 1:
                             switch (this.Datatype) {
                             case 3:
-                                this.model.sim = list("extract_bit_32_RB1",4);
+                                this.model.sim = list(new ScilabString("extract_bit_32_RB1"),new ScilabDouble(4));
                             case 6:
-                                this.model.sim = list("extract_bit_u32_RB1",4);
+                                this.model.sim = list(new ScilabString("extract_bit_u32_RB1"),new ScilabDouble(4));
                             }
                         }
                     }
@@ -134,41 +134,41 @@ function EXTRACTBITS() {
                     case 1:
                         switch (this.scal) {
                         case 0:
-                            this.model.sim = list("extract_bit_16_UH0",4);
+                            this.model.sim = list(new ScilabString("extract_bit_16_UH0"),new ScilabDouble(4));
                         case 1:
                             switch (this.Datatype) {
                             case 4:
-                                this.model.sim = list("extract_bit_16_UH1",4);
+                                this.model.sim = list(new ScilabString("extract_bit_16_UH1"),new ScilabDouble(4));
                             case 7:
-                                this.model.sim = list("extract_bit_u16_UH1",4);
+                                this.model.sim = list(new ScilabString("extract_bit_u16_UH1"),new ScilabDouble(4));
                             }
                         }
                     case 2:
-                        this.model.sim = list("extract_bit_16_LH",4);
+                        this.model.sim = list(new ScilabString("extract_bit_16_LH"),new ScilabDouble(4));
                     case 3:
                         switch (this.scal) {
                         case 0:
-                            this.model.sim = list("extract_bit_16_MSB0",4);
+                            this.model.sim = list(new ScilabString("extract_bit_16_MSB0"),new ScilabDouble(4));
                         case 1:
                             switch (this.Datatype) {
                             case 4:
-                                this.model.sim = list("extract_bit_16_MSB1",4);
+                                this.model.sim = list(new ScilabString("extract_bit_16_MSB1"),new ScilabDouble(4));
                             case 7:
-                                this.model.sim = list("extract_bit_u16_MSB1",4);
+                                this.model.sim = list(new ScilabString("extract_bit_u16_MSB1"),new ScilabDouble(4));
                             }
                         }
                     case 4:
-                        this.model.sim = list("extract_bit_16_LSB",4);
+                        this.model.sim = list(new ScilabString("extract_bit_16_LSB"),new ScilabDouble(4));
                     case 5:
                         switch (this.scal) {
                         case 0:
-                            this.model.sim = list("extract_bit_16_RB0",4);
+                            this.model.sim = list(new ScilabString("extract_bit_16_RB0"),new ScilabDouble(4));
                         case 1:
                             switch (this.Datatype) {
                             case 4:
-                                this.model.sim = list("extract_bit_16_RB1",4);
+                                this.model.sim = list(new ScilabString("extract_bit_16_RB1"),new ScilabDouble(4));
                             case 7:
-                                this.model.sim = list("extract_bit_u16_RB1",4);
+                                this.model.sim = list(new ScilabString("extract_bit_u16_RB1"),new ScilabDouble(4));
                             }
                         }
                     }
@@ -181,41 +181,41 @@ function EXTRACTBITS() {
                     case 1:
                         switch (this.scal) {
                         case 0:
-                            this.model.sim = list("extract_bit_8_UH0",4);
+                            this.model.sim = list(new ScilabString("extract_bit_8_UH0"),new ScilabDouble(4));
                         case 1:
                             switch (this.Datatype) {
                             case 5:
-                                this.model.sim = list("extract_bit_8_UH1",4);
+                                this.model.sim = list(new ScilabString("extract_bit_8_UH1"),new ScilabDouble(4));
                             case 8:
-                                this.model.sim = list("extract_bit_u8_UH1",4);
+                                this.model.sim = list(new ScilabString("extract_bit_u8_UH1"),new ScilabDouble(4));
                             }
                         }
                     case 2:
-                        this.model.sim = list("extract_bit_8_LH",4);
+                        this.model.sim = list(new ScilabString("extract_bit_8_LH"),new ScilabDouble(4));
                     case 3:
                         switch (this.scal) {
                         case 0:
-                            this.model.sim = list("extract_bit_8_MSB0",4);
+                            this.model.sim = list(new ScilabString("extract_bit_8_MSB0"),new ScilabDouble(4));
                         case 1:
                             switch (this.Datatype) {
                             case 5:
-                                this.model.sim = list("extract_bit_8_MSB1",4);
+                                this.model.sim = list(new ScilabString("extract_bit_8_MSB1"),new ScilabDouble(4));
                             case 8:
-                                this.model.sim = list("extract_bit_u8_MSB1",4);
+                                this.model.sim = list(new ScilabString("extract_bit_u8_MSB1"),new ScilabDouble(4));
                             }
                         }
                     case 4:
-                        this.model.sim = list("extract_bit_8_LSB",4);
+                        this.model.sim = list(new ScilabString("extract_bit_8_LSB"),new ScilabDouble(4));
                     case 5:
                         switch (this.scal) {
                         case 0:
-                            this.model.sim = list("extract_bit_8_RB0",4);
+                            this.model.sim = list(new ScilabString("extract_bit_8_RB0"),new ScilabDouble(4));
                         case 1:
                             switch (this.Datatype) {
                             case 5:
-                                this.model.sim = list("extract_bit_8_RB1",4);
+                                this.model.sim = list(new ScilabString("extract_bit_8_RB1"),new ScilabDouble(4));
                             case 8:
-                                this.model.sim = list("extract_bit_u8_RB1",4);
+                                this.model.sim = list(new ScilabString("extract_bit_u8_RB1"),new ScilabDouble(4));
                             }
                         }
                     }
diff --git a/js/IntegerOp/INTMUL.js b/js/IntegerOp/INTMUL.js
index a5174c26..e3328f4a 100644
--- a/js/IntegerOp/INTMUL.js
+++ b/js/IntegerOp/INTMUL.js
@@ -3,7 +3,7 @@ function INTMUL() {
     INTMUL.prototype.define = function INTMUL() {
         sgn = 0;
         this.model = scicos_model();
-        this.model.sim = list("matmul_i32",4);
+        this.model.sim = list(new ScilabString("matmul_i32"),new ScilabDouble(4));
         this.model.in1 = [[-1],[-2]];
         this.model.out = new ScilabDouble(-1);
         this.model.in2 = [[-2],[-3]];
@@ -48,51 +48,51 @@ function INTMUL() {
                 ok = false;
             } else if (this.Datatype==3) {
                 if (this.np==0) {
-                    this.model.sim = list("matmul_i32n",4);
+                    this.model.sim = list(new ScilabString("matmul_i32n"),new ScilabDouble(4));
                 } else if (this.np==1) {
-                    this.model.sim = list("matmul_i32s",4);
+                    this.model.sim = list(new ScilabString("matmul_i32s"),new ScilabDouble(4));
                 } else {
-                    this.model.sim = list("matmul_i32e",4);
+                    this.model.sim = list(new ScilabString("matmul_i32e"),new ScilabDouble(4));
                 }
             } else if (this.Datatype==4) {
                 if (this.np==0) {
-                    this.model.sim = list("matmul_i16n",4);
+                    this.model.sim = list(new ScilabString("matmul_i16n"),new ScilabDouble(4));
                 } else if (this.np==1) {
-                    this.model.sim = list("matmul_i16s",4);
+                    this.model.sim = list(new ScilabString("matmul_i16s"),new ScilabDouble(4));
                 } else {
-                    this.model.sim = list("matmul_i16e",4);
+                    this.model.sim = list(new ScilabString("matmul_i16e"),new ScilabDouble(4));
                 }
             } else if (this.Datatype==5) {
                 if (this.np==0) {
-                    this.model.sim = list("matmul_i8n",4);
+                    this.model.sim = list(new ScilabString("matmul_i8n"),new ScilabDouble(4));
                 } else if (this.np==1) {
-                    this.model.sim = list("matmul_i8s",4);
+                    this.model.sim = list(new ScilabString("matmul_i8s"),new ScilabDouble(4));
                 } else {
-                    this.model.sim = list("matmul_i8e",4);
+                    this.model.sim = list(new ScilabString("matmul_i8e"),new ScilabDouble(4));
                 }
             } else if (this.Datatype==6) {
                 if (this.np==0) {
-                    this.model.sim = list("matmul_ui32n",4);
+                    this.model.sim = list(new ScilabString("matmul_ui32n"),new ScilabDouble(4));
                 } else if (this.np==1) {
-                    this.model.sim = list("matmul_ui32s",4);
+                    this.model.sim = list(new ScilabString("matmul_ui32s"),new ScilabDouble(4));
                 } else {
-                    this.model.sim = list("matmul_ui32e",4);
+                    this.model.sim = list(new ScilabString("matmul_ui32e"),new ScilabDouble(4));
                 }
             } else if (this.Datatype==7) {
                 if (this.np==0) {
-                    this.model.sim = list("matmul_ui16n",4);
+                    this.model.sim = list(new ScilabString("matmul_ui16n"),new ScilabDouble(4));
                 } else if (this.np==1) {
-                    this.model.sim = list("matmul_ui16s",4);
+                    this.model.sim = list(new ScilabString("matmul_ui16s"),new ScilabDouble(4));
                 } else {
-                    this.model.sim = list("matmul_ui16e",4);
+                    this.model.sim = list(new ScilabString("matmul_ui16e"),new ScilabDouble(4));
                 }
             } else if (this.Datatype==8) {
                 if (this.np==0) {
-                    this.model.sim = list("matmul_ui8n",4);
+                    this.model.sim = list(new ScilabString("matmul_ui8n"),new ScilabDouble(4));
                 } else if (this.np==1) {
-                    this.model.sim = list("matmul_ui8s",4);
+                    this.model.sim = list(new ScilabString("matmul_ui8s"),new ScilabDouble(4));
                 } else {
-                    this.model.sim = list("matmul_ui8e",4);
+                    this.model.sim = list(new ScilabString("matmul_ui8e"),new ScilabDouble(4));
                 }
             } else {
                 block_parameter_error(msprintf("Wrong value for \'%s\' parameter: %d.","Data Type",ot),msprintf("Must be in the interval %s.","[3, 8]"));
diff --git a/js/IntegerOp/JKFLIPFLOP.js b/js/IntegerOp/JKFLIPFLOP.js
index b855e347..91ed0354 100644
--- a/js/IntegerOp/JKFLIPFLOP.js
+++ b/js/IntegerOp/JKFLIPFLOP.js
@@ -83,7 +83,7 @@ function JKFLIPFLOP() {
             }
             if (ok) {
                 xx.graphics.exprs[1-1] = this.exprs0;
-                this.model.odstate[('1', 'double')] = new ScilabDouble(this.init);
+                this.model.odstate[1] = 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 13898da4..25ffe935 100644
--- a/js/IntegerOp/JKFLIPFLOP.pickle
+++ b/js/IntegerOp/JKFLIPFLOP.pickle
@@ -13,201 +13,201 @@ p5
 atp6
 Rp7
 .(dp0
-S'xx.model'
+S'model.odstate[1]'
 p1
-S'object'
+S'double'
 p2
-sS'model.sim'
+sS'xx.model'
 p3
-S'string'
+S'object'
 p4
-sS'arg1'
+sS'model.sim'
 p5
-g2
-sS'scs_m_1.objs[6-1]'
+S'string'
 p6
-S'double'
+sS'arg1'
 p7
-sS'scs_m_1.objs[3-1]'
+g4
+sS'scs_m_1.objs[6-1]'
 p8
-g7
-sS'xx.graphics'
+g2
+sS'scs_m_1.objs[3-1]'
 p9
 g2
-sS'model.out'
+sS'xx.graphics'
 p10
-S'matrix'
+g4
+sS'model.out'
 p11
-sS'xx'
+S'matrix'
 p12
-g2
-sS'o'
+sS'xx'
 p13
-g2
-sS'scs_m_1.objs[7-1]'
+g4
+sS'o'
 p14
-g7
-sS'xx.graphics.exprs[1-1]'
+g4
+sS'scs_m_1.objs[7-1]'
 p15
-NsS'scs_m.objs[20-1]'
+g2
+sS'xx.graphics.exprs[1-1]'
 p16
-g7
-sS'scs_m.objs[2-1]'
+NsS'scs_m.objs[20-1]'
 p17
-g7
-sS'scs_m.objs[5-1]'
+g2
+sS'scs_m.objs[2-1]'
 p18
-g7
-sS'scs_m.objs[10-1]'
+g2
+sS'scs_m.objs[5-1]'
 p19
-g7
-sS'scs_m'
+g2
+sS'scs_m.objs[10-1]'
 p20
-g7
-sS'model.in1'
+g2
+sS'scs_m'
 p21
-g11
-sS'scs_m.objs[19-1]'
+g2
+sS'model.in1'
 p22
-g7
-sS'scs_m.objs[1-1]'
+g12
+sS'scs_m.objs[19-1]'
 p23
-g7
-sS'scs_m.objs[18-1]'
+g2
+sS'scs_m.objs[1-1]'
 p24
-g7
-sS'model.dep_ut'
+g2
+sS'scs_m.objs[18-1]'
 p25
-S'vector'
+g2
+sS'model.dep_ut'
 p26
-sS'newpar[size(newpar)+1-1]'
+S'vector'
 p27
-g7
-sS'init'
+sS'newpar[size(newpar)+1-1]'
 p28
-g7
-sS'scs_m_1'
+g2
+sS'init'
 p29
-g7
-sS'scs_m.objs[9-1]'
+g2
+sS'scs_m_1'
 p30
-g7
-sS'scs_m_1.objs[2-1]'
+g2
+sS'scs_m.objs[22-1]'
 p31
-g7
-sS'init_old'
+g2
+sS'scs_m_1.objs[2-1]'
 p32
-g7
-sS'scs_m.objs[13-1]'
+g2
+sS'init_old'
 p33
-g7
-sS'model.firing'
+g2
+sS'scs_m.objs[13-1]'
 p34
-S'boolean'
+g2
+sS'model.firing'
 p35
-sS'newpar'
+S'boolean'
 p36
-S'list'
+sS'newpar'
 p37
-sS'model.in2'
+S'list'
 p38
-g11
-sS'scs_m.objs[6-1]'
+sS'model.in2'
 p39
-g7
-sS'scs_m_1.objs[4-1]'
+g12
+sS'scs_m.objs[6-1]'
 p40
-g7
-sS'model.out2'
+g2
+sS'scs_m.objs[9-1]'
 p41
-g11
-sS'model.intyp'
+g2
+sS'model.out2'
 p42
-g26
-sS'model.rpar'
+g12
+sS'model.intyp'
 p43
-g7
-sS'scs_m.objs[3-1]'
+g27
+sS'model.rpar'
 p44
-g7
-sS"model.odstate[('1', 'double')]"
+g2
+sS'scs_m.objs[3-1]'
 p45
-g7
-sS'scs_m.objs[16-1]'
+g2
+sS'scs_m_1.objs[4-1]'
 p46
-g7
-sS'scs_m.objs[11-1]'
+g2
+sS'scs_m.objs[16-1]'
 p47
-g7
-sS'scs_m.objs[14-1]'
+g2
+sS'scs_m.objs[11-1]'
 p48
-g7
-sS'scs_m.objs[17-1]'
+g2
+sS'scs_m.objs[14-1]'
 p49
-g7
-sS'scs_m_1.objs[5-1]'
+g2
+sS'scs_m.objs[17-1]'
 p50
-g7
-sS'path'
+g2
+sS'scs_m_1.objs[5-1]'
 p51
-NsS'scs_m.objs[4-1]'
+g2
+sS'path'
 p52
-g7
-sS'scs_m.objs[7-1]'
+NsS'scs_m.objs[4-1]'
 p53
-g7
-sS'typ'
+g2
+sS'scs_m.objs[7-1]'
 p54
-g37
-sS'model.outtyp'
+g2
+sS'typ'
 p55
-g26
-sS'needcompile'
+g38
+sS'model.outtyp'
 p56
-g7
-sS'arg1.model'
+g27
+sS'needcompile'
 p57
 g2
-sS'model.blocktype'
+sS'arg1.model'
 p58
 g4
-sS'scs_m.objs[8-1]'
+sS'model.blocktype'
 p59
-g7
-sS'scs_m.objs[15-1]'
+g6
+sS'scs_m.objs[8-1]'
 p60
-g7
-sS'scs_m.objs[21-1]'
+g2
+sS'scs_m.objs[15-1]'
 p61
-g7
-sS'scs_m.objs[22-1]'
+g2
+sS'scs_m.objs[21-1]'
 p62
-g7
+g2
 sS'scs_m_1.objs[1-1]'
 p63
-g7
+g2
 sS'arg1.model.rpar.objs[path-1]'
 p64
-g2
+g4
 sS'exprs'
 p65
-g7
+g2
 sS'gr_i'
 p66
-g26
+g27
 sS'scs_m.objs[12-1]'
 p67
-g7
+g2
 sS'y'
 p68
-g7
+g2
 sS'x'
 p69
-g7
+g2
 sS'model'
 p70
-g2
+g4
 sS'arg1.model.rpar'
 p71
-g2
+g4
 s.
\ No newline at end of file
diff --git a/js/IntegerOp/LOGIC.js b/js/IntegerOp/LOGIC.js
index bd8d7406..4e1e2c01 100644
--- a/js/IntegerOp/LOGIC.js
+++ b/js/IntegerOp/LOGIC.js
@@ -3,7 +3,7 @@ function LOGIC() {
     LOGIC.prototype.define = function LOGIC() {
         this.mat = [[0],[0],[0],[1]];
         this.model = scicos_model();
-        this.model.sim = list("logic",4);
+        this.model.sim = list(new ScilabString("logic"),new ScilabDouble(4));
         this.model.in1 = [[1],[1]];
         this.model.in2 = [[1],[1]];
         this.model.out = new ScilabDouble(1);
@@ -11,7 +11,7 @@ function LOGIC() {
         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.opar = list(new ScilabDouble(int8(this.mat)));
         this.model.blocktype = new ScilabString("c");
         this.model.firing = new ScilabBoolean(false);
         this.model.dep_ut = [true,false];
@@ -65,7 +65,7 @@ function LOGIC() {
             if (ok) {
                 graphics.exprs = exprs;
                 this.mat = int8(this.mat);
-                this.model.opar = list(this.mat);
+                this.model.opar = list(new ScilabDouble(this.mat));
                 this.x.graphics = graphics;
                 this.x.model = this.model;
                 break;
diff --git a/js/IntegerOp/SHIFT.js b/js/IntegerOp/SHIFT.js
index a3ac6a6e..b223a951 100644
--- a/js/IntegerOp/SHIFT.js
+++ b/js/IntegerOp/SHIFT.js
@@ -4,7 +4,7 @@ function SHIFT() {
         sgn = [[0],[0]];
         OPER = 0;
         this.model = scicos_model();
-        this.model.sim = list("shift_32_LA",4);
+        this.model.sim = list(new ScilabString("shift_32_LA"),new ScilabDouble(4));
         this.model.in1 = new ScilabDouble(-1);
         this.model.out = new ScilabDouble(-1);
         this.model.in2 = new ScilabDouble(-2);
@@ -54,63 +54,63 @@ function SHIFT() {
                 if (this.nb>0) {
                     switch (this.np) {
                     case 0:
-                        this.model.sim = list("shift_32_LA",4);
+                        this.model.sim = list(new ScilabString("shift_32_LA"),new ScilabDouble(4));
                     case 1:
-                        this.model.sim = list("shift_32_LC",4);
+                        this.model.sim = list(new ScilabString("shift_32_LC"),new ScilabDouble(4));
                     }
                 } else if (this.nb<0) {
                     switch (this.np) {
                     case 0:
                         switch (this.Datatype) {
                         case 3:
-                            this.model.sim = list("shift_32_RA",4);
+                            this.model.sim = list(new ScilabString("shift_32_RA"),new ScilabDouble(4));
                         case 6:
-                            this.model.sim = list("shift_u32_RA",4);
+                            this.model.sim = list(new ScilabString("shift_u32_RA"),new ScilabDouble(4));
                         }
                     case 1:
-                        this.model.sim = list("shift_32_RC",4);
+                        this.model.sim = list(new ScilabString("shift_32_RC"),new ScilabDouble(4));
                     }
                 }
             } else if ((this.Datatype==4||this.Datatype==7)) {
                 if (this.nb>0) {
                     switch (this.np) {
                     case 0:
-                        this.model.sim = list("shift_16_LA",4);
+                        this.model.sim = list(new ScilabString("shift_16_LA"),new ScilabDouble(4));
                     case 1:
-                        this.model.sim = list("shift_16_LC",4);
+                        this.model.sim = list(new ScilabString("shift_16_LC"),new ScilabDouble(4));
                     }
                 } else if (this.nb<0) {
                     switch (this.np) {
                     case 0:
                         switch (this.Datatype) {
                         case 4:
-                            this.model.sim = list("shift_16_RA",4);
+                            this.model.sim = list(new ScilabString("shift_16_RA"),new ScilabDouble(4));
                         case 7:
-                            this.model.sim = list("shift_u16_RA",4);
+                            this.model.sim = list(new ScilabString("shift_u16_RA"),new ScilabDouble(4));
                         }
                     case 1:
-                        this.model.sim = list("shift_16_RC",4);
+                        this.model.sim = list(new ScilabString("shift_16_RC"),new ScilabDouble(4));
                     }
                 }
             } else if ((this.Datatype==5||this.Datatype==8)) {
                 if (this.nb>0) {
                     switch (this.np) {
                     case 0:
-                        this.model.sim = list("shift_8_LA",4);
+                        this.model.sim = list(new ScilabString("shift_8_LA"),new ScilabDouble(4));
                     case 1:
-                        this.model.sim = list("shift_8_LC",4);
+                        this.model.sim = list(new ScilabString("shift_8_LC"),new ScilabDouble(4));
                     }
                 } else if (this.nb<0) {
                     switch (this.np) {
                     case 0:
                         switch (this.Datatype) {
                         case 5:
-                            this.model.sim = list("shift_8_RA",4);
+                            this.model.sim = list(new ScilabString("shift_8_RA"),new ScilabDouble(4));
                         case 8:
-                            this.model.sim = list("shift_u8_RA",4);
+                            this.model.sim = list(new ScilabString("shift_u8_RA"),new ScilabDouble(4));
                         }
                     case 1:
-                        this.model.sim = list("shift_8_RC",4);
+                        this.model.sim = list(new ScilabString("shift_8_RC"),new ScilabDouble(4));
                     }
                 }
             } else {
diff --git a/js/IntegerOp/SRFLIPFLOP.js b/js/IntegerOp/SRFLIPFLOP.js
index 354f75f6..712c5b72 100644
--- a/js/IntegerOp/SRFLIPFLOP.js
+++ b/js/IntegerOp/SRFLIPFLOP.js
@@ -67,7 +67,7 @@ function SRFLIPFLOP() {
             }
             if (ok) {
                 xx.graphics.exprs[1-1] = this.exprs0;
-                this.model.odstate[('1', 'double')] = new ScilabDouble(this.init);
+                this.model.odstate[1] = 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 e240cb2d..ceaa93a4 100644
--- a/js/IntegerOp/SRFLIPFLOP.pickle
+++ b/js/IntegerOp/SRFLIPFLOP.pickle
@@ -13,152 +13,152 @@ p5
 atp6
 Rp7
 .(dp0
-S'xx.model'
+S'model.odstate[1]'
 p1
-S'object'
+S'double'
 p2
-sS'model.sim'
+sS'xx.model'
 p3
-S'string'
+S'object'
 p4
-sS'arg1'
+sS'model.sim'
 p5
-g2
-sS'xx.graphics'
+S'string'
 p6
-g2
-sS'model.out'
+sS'arg1'
 p7
-S'matrix'
+g4
+sS'xx.graphics'
 p8
-sS'xx'
+g4
+sS'model.out'
 p9
-g2
-sS'o'
+S'matrix'
 p10
-g2
-sS'xx.graphics.exprs[1-1]'
+sS'xx'
 p11
-NsS'scs_m.objs[2-1]'
+g4
+sS'o'
 p12
-S'double'
+g4
+sS'xx.graphics.exprs[1-1]'
 p13
-sS'scs_m.objs[5-1]'
+NsS'scs_m.objs[2-1]'
 p14
-g13
-sS'scs_m.objs[10-1]'
+g2
+sS'scs_m.objs[5-1]'
 p15
-g13
-sS'scs_m'
+g2
+sS'scs_m.objs[10-1]'
 p16
-g13
-sS'model.in1'
+g2
+sS'scs_m'
 p17
-g8
-sS'scs_m.objs[1-1]'
+g2
+sS'model.in1'
 p18
-g13
-sS'model.dep_ut'
+g10
+sS'scs_m.objs[1-1]'
 p19
-S'vector'
+g2
+sS'model.dep_ut'
 p20
-sS'newpar[size(newpar)+1-1]'
+S'vector'
 p21
-NsS'init'
+sS'newpar[size(newpar)+1-1]'
 p22
-g13
-sS'scs_m.objs[12-1]'
+NsS'init'
 p23
-g13
-sS'init_old'
+g2
+sS'scs_m.objs[12-1]'
 p24
-g13
-sS'scs_m.objs[13-1]'
+g2
+sS'init_old'
 p25
-g13
-sS'newpar'
+g2
+sS'scs_m.objs[13-1]'
 p26
-S'list'
+g2
+sS'newpar'
 p27
-sS'model.in2'
+S'list'
 p28
-g8
-sS'scs_m.objs[6-1]'
+sS'model.in2'
 p29
-g13
-sS'scs_m.objs[9-1]'
+g10
+sS'scs_m.objs[6-1]'
 p30
-g13
-sS'model.out2'
+g2
+sS'scs_m.objs[9-1]'
 p31
-g8
-sS'model.intyp'
+g2
+sS'model.out2'
 p32
-g20
-sS'model.rpar'
+g10
+sS'model.intyp'
 p33
-g13
-sS'scs_m.objs[3-1]'
+g21
+sS'model.rpar'
 p34
-g13
-sS"model.odstate[('1', 'double')]"
+g2
+sS'scs_m.objs[3-1]'
 p35
-g13
-sS'scs_m.objs[11-1]'
+g2
+sS'model.outtyp'
 p36
-g13
-sS'scs_m.objs[14-1]'
+g21
+sS'scs_m.objs[11-1]'
 p37
-g13
-sS'path'
+g2
+sS'scs_m.objs[14-1]'
 p38
-NsS'scs_m.objs[4-1]'
+g2
+sS'path'
 p39
-g13
-sS'scs_m.objs[7-1]'
+NsS'scs_m.objs[4-1]'
 p40
-g13
-sS'typ'
+g2
+sS'scs_m.objs[7-1]'
 p41
-g27
-sS'model.outtyp'
+g2
+sS'typ'
 p42
-g20
+g28
 sS'needcompile'
 p43
-g13
+g2
 sS'arg1.model'
 p44
-g2
+g4
 sS'model.blocktype'
 p45
-g4
+g6
 sS'scs_m.objs[8-1]'
 p46
-g13
+g2
 sS'arg1.model.rpar.objs[path-1]'
 p47
-g2
+g4
 sS'exprs'
 p48
-g13
+g2
 sS'gr_i'
 p49
-g20
+g21
 sS'model.firing'
 p50
 S'boolean'
 p51
 sS'y'
 p52
-g13
+g2
 sS'x'
 p53
-g13
+g2
 sS'model'
 p54
-g2
+g4
 sS'arg1.model.rpar'
 p55
-g2
+g4
 s.
\ No newline at end of file