update some return types

61 files changed, 222 insertions, 215 deletions

diff --git a/js/Branching/DEMUX.pickle b/js/Branching/DEMUX.pickle
index c677bac8..d1d8f41f 100644
--- a/js/Branching/DEMUX.pickle
+++ b/js/Branching/DEMUX.pickle
@@ -46,7 +46,7 @@ p14
 g8
 sS'[this.model,graphics,ok]'
 p15
-g8
+g13
 sS'graphics.exprs'
 p16
 NsS'model.ipar'
diff --git a/js/Branching/DEMUX_f.pickle b/js/Branching/DEMUX_f.pickle
index c677bac8..d1d8f41f 100644
--- a/js/Branching/DEMUX_f.pickle
+++ b/js/Branching/DEMUX_f.pickle
@@ -46,7 +46,7 @@ p14
 g8
 sS'[this.model,graphics,ok]'
 p15
-g8
+g13
 sS'graphics.exprs'
 p16
 NsS'model.ipar'
diff --git a/js/Branching/ESELECT_f.pickle b/js/Branching/ESELECT_f.pickle
index d1c81601..1e92bdca 100644
--- a/js/Branching/ESELECT_f.pickle
+++ b/js/Branching/ESELECT_f.pickle
@@ -69,7 +69,7 @@ p21
 g6
 sS'[this.model,graphics,ok]'
 p22
-g6
+g20
 sS'model.nmode'
 p23
 g6
diff --git a/js/Branching/EXTRACTOR.pickle b/js/Branching/EXTRACTOR.pickle
index 9be76d9e..26a63660 100644
--- a/js/Branching/EXTRACTOR.pickle
+++ b/js/Branching/EXTRACTOR.pickle
@@ -32,7 +32,7 @@ p9
 g8
 sS'[this.model,graphics,ok]'
 p10
-g4
+g2
 sS'graphics.exprs'
 p11
 NsS'x.model'
diff --git a/js/Branching/ISELECT_f.pickle b/js/Branching/ISELECT_f.pickle
index 06398aa7..948a2c26 100644
--- a/js/Branching/ISELECT_f.pickle
+++ b/js/Branching/ISELECT_f.pickle
@@ -52,7 +52,7 @@ S'list'
 p16
 sS'[this.model,graphics,ok]'
 p17
-g2
+g16
 sS'graphics.exprs'
 p18
 NsS'z0'
diff --git a/js/Branching/MUX.pickle b/js/Branching/MUX.pickle
index 5d0e28dd..e4cd0711 100644
--- a/js/Branching/MUX.pickle
+++ b/js/Branching/MUX.pickle
@@ -36,16 +36,16 @@ p11
 g10
 sS'[this.model,graphics,ok]'
 p12
-S'double'
-p13
+g2
 sS'graphics.exprs'
-p14
+p13
 NsS'in1'
+p14
+S'double'
 p15
-g13
 sS'model.out'
 p16
-g13
+g15
 sS'exprs'
 p17
 g8
@@ -65,17 +65,17 @@ p22
 g4
 sS'x'
 p23
-g13
+g15
 sS'model'
 p24
 g10
 sS'model.ipar'
 p25
-g13
+g15
 sS'typ'
 p26
 g4
 sS'nout'
 p27
-g13
+g15
 s.
\ No newline at end of file
diff --git a/js/Branching/MUX_f.pickle b/js/Branching/MUX_f.pickle
index 5d0e28dd..e4cd0711 100644
--- a/js/Branching/MUX_f.pickle
+++ b/js/Branching/MUX_f.pickle
@@ -36,16 +36,16 @@ p11
 g10
 sS'[this.model,graphics,ok]'
 p12
-S'double'
-p13
+g2
 sS'graphics.exprs'
-p14
+p13
 NsS'in1'
+p14
+S'double'
 p15
-g13
 sS'model.out'
 p16
-g13
+g15
 sS'exprs'
 p17
 g8
@@ -65,17 +65,17 @@ p22
 g4
 sS'x'
 p23
-g13
+g15
 sS'model'
 p24
 g10
 sS'model.ipar'
 p25
-g13
+g15
 sS'typ'
 p26
 g4
 sS'nout'
 p27
-g13
+g15
 s.
\ No newline at end of file
diff --git a/js/Branching/NRMSOM_f.pickle b/js/Branching/NRMSOM_f.pickle
index 6d5e890b..a36e67ea 100644
--- a/js/Branching/NRMSOM_f.pickle
+++ b/js/Branching/NRMSOM_f.pickle
@@ -35,40 +35,41 @@ p10
 g9
 sS'[this.model,graphics,ok]'
 p11
-g6
-sS'graphics.exprs'
+S'list'
 p12
-NsS'in1'
+sS'graphics.exprs'
 p13
+NsS'in1'
+p14
 g4
 sS'model.out'
-p14
+p15
 g6
 sS'exprs'
-p15
-S'vector'
 p16
-sS'x.model'
+S'vector'
 p17
-NsS'gr_i'
+sS'x.model'
 p18
-g16
-sS'model.dep_ut'
+NsS'gr_i'
 p19
-g16
-sS'graphics'
+g17
+sS'model.dep_ut'
 p20
+g17
+sS'graphics'
+p21
 g9
 sS'y'
-p21
-g16
-sS'x'
 p22
+g17
+sS'x'
+p23
 g6
 sS'model'
-p23
+p24
 g9
 sS'typ'
-p24
-g16
+p25
+g17
 s.
\ No newline at end of file
diff --git a/js/Branching/RELAY_f.pickle b/js/Branching/RELAY_f.pickle
index ad561191..fdcdc500 100644
--- a/js/Branching/RELAY_f.pickle
+++ b/js/Branching/RELAY_f.pickle
@@ -56,7 +56,7 @@ p17
 g2
 sS'[this.model,graphics,ok]'
 p18
-g2
+g15
 sS'in1'
 p19
 g9
diff --git a/js/Branching/SCALAR2VECTOR.pickle b/js/Branching/SCALAR2VECTOR.pickle
index 60e23e74..9cfd21be 100644
--- a/js/Branching/SCALAR2VECTOR.pickle
+++ b/js/Branching/SCALAR2VECTOR.pickle
@@ -36,7 +36,7 @@ p11
 g10
 sS'[this.model,graphics,ok]'
 p12
-g4
+g2
 sS'graphics.exprs'
 p13
 NsS'model.in1'
diff --git a/js/Branching/SELECT_f.pickle b/js/Branching/SELECT_f.pickle
index a7a1fa4b..3e105200 100644
--- a/js/Branching/SELECT_f.pickle
+++ b/js/Branching/SELECT_f.pickle
@@ -52,7 +52,7 @@ p16
 g2
 sS'[this.model,graphics,ok]'
 p17
-g2
+g15
 sS'in1'
 p18
 g9
diff --git a/js/Branching/SWITCH_f.pickle b/js/Branching/SWITCH_f.pickle
index 941bb77c..241bf0da 100644
--- a/js/Branching/SWITCH_f.pickle
+++ b/js/Branching/SWITCH_f.pickle
@@ -50,7 +50,7 @@ p15
 g6
 sS'[this.model,graphics,ok]'
 p16
-g6
+g13
 sS'in1'
 p17
 g8
diff --git a/js/Events/IFTHEL_f.pickle b/js/Events/IFTHEL_f.pickle
index 4425c76f..db2380f6 100644
--- a/js/Events/IFTHEL_f.pickle
+++ b/js/Events/IFTHEL_f.pickle
@@ -65,7 +65,7 @@ S'matrix'
 p21
 sS'[this.model,graphics,ok]'
 p22
-g6
+g19
 sS'model.nmode'
 p23
 g6
diff --git a/js/Linear/BIGSOM_f.pickle b/js/Linear/BIGSOM_f.pickle
index d2bee77c..d2fb8c99 100644
--- a/js/Linear/BIGSOM_f.pickle
+++ b/js/Linear/BIGSOM_f.pickle
@@ -35,19 +35,19 @@ p10
 g9
 sS'[this.model,graphics,ok]'
 p11
-S'double'
-p12
+g4
 sS'graphics.exprs'
-p13
+p12
 NsS'in1'
+p13
+S'double'
 p14
-g12
 sS'model.rpar'
 p15
 g2
 sS'exprs'
 p16
-g12
+g7
 sS'x.model'
 p17
 NsS'gr_i'
@@ -65,7 +65,7 @@ p22
 g19
 sS'x'
 p23
-g12
+g14
 sS'model'
 p24
 g9
@@ -74,5 +74,5 @@ p25
 g19
 sS'model.out'
 p26
-g12
+g14
 s.
\ No newline at end of file
diff --git a/js/Linear/CLSS.pickle b/js/Linear/CLSS.pickle
index 5da008f5..4f321577 100644
--- a/js/Linear/CLSS.pickle
+++ b/js/Linear/CLSS.pickle
@@ -67,7 +67,7 @@ p18
 g8
 sS'[this.model,graphics,ok]'
 p19
-g8
+g15
 sS'in1'
 p20
 g8
diff --git a/js/Linear/CLSS_f.pickle b/js/Linear/CLSS_f.pickle
index bedf22d9..09fdffb3 100644
--- a/js/Linear/CLSS_f.pickle
+++ b/js/Linear/CLSS_f.pickle
@@ -68,7 +68,7 @@ p19
 g10
 sS'[this.model,graphics,ok]'
 p20
-g10
+g16
 sS'in1'
 p21
 g10
diff --git a/js/Linear/DELAYV_f.pickle b/js/Linear/DELAYV_f.pickle
index 64735027..e6e095e1 100644
--- a/js/Linear/DELAYV_f.pickle
+++ b/js/Linear/DELAYV_f.pickle
@@ -67,7 +67,7 @@ p20
 g2
 sS'[this.model,graphics,ok]'
 p21
-g2
+g18
 sS'model.rpar'
 p22
 g2
diff --git a/js/Linear/DLSS.pickle b/js/Linear/DLSS.pickle
index ba90542f..52fc31ec 100644
--- a/js/Linear/DLSS.pickle
+++ b/js/Linear/DLSS.pickle
@@ -74,7 +74,7 @@ p21
 g10
 sS'[this.model,graphics,ok]'
 p22
-g10
+g18
 sS'in1'
 p23
 g2
diff --git a/js/Linear/DLSS_f.pickle b/js/Linear/DLSS_f.pickle
index 33a94865..cd25ebe9 100644
--- a/js/Linear/DLSS_f.pickle
+++ b/js/Linear/DLSS_f.pickle
@@ -74,7 +74,7 @@ p21
 g11
 sS'[this.model,graphics,ok]'
 p22
-g11
+g18
 sS'in1'
 p23
 g2
diff --git a/js/Linear/DOLLAR_f.pickle b/js/Linear/DOLLAR_f.pickle
index 367e72b0..223b5a69 100644
--- a/js/Linear/DOLLAR_f.pickle
+++ b/js/Linear/DOLLAR_f.pickle
@@ -54,37 +54,38 @@ p16
 g15
 sS'[this.model,graphics,ok]'
 p17
-g2
-sS'in1'
+S'list'
 p18
+sS'in1'
+p19
 g2
 sS'graphics.exprs'
-p19
-NsS'typ'
 p20
+NsS'typ'
+p21
 g10
 sS'model.blocktype'
-p21
+p22
 g15
 sS'model.dep_ut'
-p22
+p23
 g10
 sS'exprs'
-p23
+p24
 g15
 sS'gr_i'
-p24
+p25
 g10
 sS'y'
-p25
+p26
 g10
 sS'x'
-p26
+p27
 g2
 sS'model'
-p27
+p28
 g4
 sS'z'
-p28
+p29
 g2
 s.
\ No newline at end of file
diff --git a/js/Linear/GAINBLK_f.pickle b/js/Linear/GAINBLK_f.pickle
index 8ffb67bc..8a166c85 100644
--- a/js/Linear/GAINBLK_f.pickle
+++ b/js/Linear/GAINBLK_f.pickle
@@ -42,41 +42,42 @@ p12
 g6
 sS'[this.model,graphics,ok]'
 p13
-g6
-sS'in1'
+S'list'
 p14
+sS'in1'
+p15
 g6
 sS'model.rpar'
-p15
+p16
 g6
 sS'gain'
-p16
+p17
 g6
 sS'graphics.exprs'
-p17
-NsS'typ'
 p18
-S'vector'
+NsS'typ'
 p19
-sS'model.blocktype'
+S'vector'
 p20
+sS'model.blocktype'
+p21
 g11
 sS'model.dep_ut'
-p21
-g19
-sS'exprs'
 p22
-g19
-sS'gr_i'
+g20
+sS'exprs'
 p23
-g19
-sS'y'
+g20
+sS'gr_i'
 p24
-g19
-sS'x'
+g20
+sS'y'
 p25
+g20
+sS'x'
+p26
 g6
 sS'model'
-p26
+p27
 g2
 s.
\ No newline at end of file
diff --git a/js/Linear/GAIN_f.pickle b/js/Linear/GAIN_f.pickle
index 323c5bfd..d35d1dd8 100644
--- a/js/Linear/GAIN_f.pickle
+++ b/js/Linear/GAIN_f.pickle
@@ -42,42 +42,43 @@ p12
 g6
 sS'[this.model,graphics,ok]'
 p13
-g6
-sS'in1'
+S'list'
 p14
+sS'in1'
+p15
 g6
 sS'model.rpar'
-p15
+p16
 g6
 sS'gain'
-p16
+p17
 g6
 sS'graphics.exprs'
-p17
-NsS'typ'
 p18
-S'vector'
+NsS'typ'
 p19
-sS'model.blocktype'
+S'vector'
 p20
+sS'model.blocktype'
+p21
 g11
 sS'model.dep_ut'
-p21
-g19
-sS'exprs'
 p22
-S'matrix'
+g20
+sS'exprs'
 p23
-sS'gr_i'
+S'matrix'
 p24
-g19
-sS'y'
+sS'gr_i'
 p25
-g19
-sS'x'
+g20
+sS'y'
 p26
+g20
+sS'x'
+p27
 g6
 sS'model'
-p27
+p28
 g2
 s.
\ No newline at end of file
diff --git a/js/Linear/INTEGRAL.pickle b/js/Linear/INTEGRAL.pickle
index 42d59c14..c42e86ab 100644
--- a/js/Linear/INTEGRAL.pickle
+++ b/js/Linear/INTEGRAL.pickle
@@ -57,7 +57,7 @@ S'list'
 p15
 sS'[this.model,graphics,ok]'
 p16
-g4
+g15
 sS'model.nmode'
 p17
 g4
diff --git a/js/Linear/SUMMATION.pickle b/js/Linear/SUMMATION.pickle
index 30d2e08d..6a1a82b2 100644
--- a/js/Linear/SUMMATION.pickle
+++ b/js/Linear/SUMMATION.pickle
@@ -88,7 +88,7 @@ p29
 g25
 sS'exprs'
 p30
-g10
+g5
 sS'gr_i'
 p31
 g25
diff --git a/js/Linear/TCLSS.pickle b/js/Linear/TCLSS.pickle
index d48ebccf..64147209 100644
--- a/js/Linear/TCLSS.pickle
+++ b/js/Linear/TCLSS.pickle
@@ -74,7 +74,7 @@ p21
 g10
 sS'[this.model,graphics,ok]'
 p22
-g10
+g18
 sS'in1'
 p23
 g10
diff --git a/js/Linear/TCLSS_f.pickle b/js/Linear/TCLSS_f.pickle
index d48ebccf..64147209 100644
--- a/js/Linear/TCLSS_f.pickle
+++ b/js/Linear/TCLSS_f.pickle
@@ -74,7 +74,7 @@ p21
 g10
 sS'[this.model,graphics,ok]'
 p22
-g10
+g18
 sS'in1'
 p23
 g10
diff --git a/js/Linear/TIME_DELAY.pickle b/js/Linear/TIME_DELAY.pickle
index 20e74cf1..79702cf9 100644
--- a/js/Linear/TIME_DELAY.pickle
+++ b/js/Linear/TIME_DELAY.pickle
@@ -48,7 +48,7 @@ p13
 g6
 sS'[this.model,graphics,ok]'
 p14
-g6
+g12
 sS'model.rpar'
 p15
 g8
diff --git a/js/Linear/VARIABLE_DELAY.pickle b/js/Linear/VARIABLE_DELAY.pickle
index 3a7e576e..a46b1460 100644
--- a/js/Linear/VARIABLE_DELAY.pickle
+++ b/js/Linear/VARIABLE_DELAY.pickle
@@ -48,7 +48,7 @@ p13
 g6
 sS'[this.model,graphics,ok]'
 p14
-g6
+g12
 sS'model.rpar'
 p15
 S'vector'
diff --git a/js/MatrixOp/MATLU.pickle b/js/MatrixOp/MATLU.pickle
index 85dd387e..83b8081a 100644
--- a/js/MatrixOp/MATLU.pickle
+++ b/js/MatrixOp/MATLU.pickle
@@ -49,17 +49,17 @@ p14
 g4
 sS'label'
 p15
-g7
-sS'model.evtin'
+S'string'
 p16
+sS'model.evtin'
+p17
 g2
 sS'model.firing'
-p17
+p18
 g2
 sS'function_name'
-p18
-S'string'
 p19
+g16
 sS'model.sim'
 p20
 S'list'
@@ -102,7 +102,7 @@ S'boolean'
 p34
 sS'model.blocktype'
 p35
-g19
+g16
 sS'model.dep_ut'
 p36
 g2
diff --git a/js/MatrixOp/MATMUL.pickle b/js/MatrixOp/MATMUL.pickle
index f7fd7b67..dcc42c69 100644
--- a/js/MatrixOp/MATMUL.pickle
+++ b/js/MatrixOp/MATMUL.pickle
@@ -38,7 +38,7 @@ S'double'
 p10
 sS'label[3-1]'
 p11
-g10
+g5
 sS'out'
 p12
 g8
@@ -70,7 +70,7 @@ S'list'
 p22
 sS'label[2-1]'
 p23
-g10
+g5
 sS'model.out2'
 p24
 g10
diff --git a/js/MatrixOp/MATTRAN.pickle b/js/MatrixOp/MATTRAN.pickle
index 924ff553..d37f5da1 100644
--- a/js/MatrixOp/MATTRAN.pickle
+++ b/js/MatrixOp/MATTRAN.pickle
@@ -59,7 +59,7 @@ p18
 g2
 sS'label[2-1]'
 p19
-g5
+g15
 sS'model.out2'
 p20
 g5
diff --git a/js/MatrixOp/MATZREIM.pickle b/js/MatrixOp/MATZREIM.pickle
index da48cdb1..7611abb3 100644
--- a/js/MatrixOp/MATZREIM.pickle
+++ b/js/MatrixOp/MATZREIM.pickle
@@ -49,17 +49,17 @@ p14
 g8
 sS'label'
 p15
-g8
-sS'model.evtin'
+S'string'
 p16
+sS'model.evtin'
+p17
 g2
 sS'model.firing'
-p17
+p18
 g2
 sS'function_name'
-p18
-S'string'
 p19
+g16
 sS'model.sim'
 p20
 S'list'
@@ -107,7 +107,7 @@ S'boolean'
 p36
 sS'model.blocktype'
 p37
-g19
+g16
 sS'model.dep_ut'
 p38
 g2
diff --git a/js/MatrixOp/SUBMAT.pickle b/js/MatrixOp/SUBMAT.pickle
index a1b8771c..aba790d7 100644
--- a/js/MatrixOp/SUBMAT.pickle
+++ b/js/MatrixOp/SUBMAT.pickle
@@ -106,7 +106,7 @@ p32
 g2
 sS'label[6-1]'
 p33
-g7
+g19
 sS'arg1.model'
 p34
 NsS'ok'
diff --git a/js/Misc/AUTOMAT.pickle b/js/Misc/AUTOMAT.pickle
index 71efa914..c7fee995 100644
--- a/js/Misc/AUTOMAT.pickle
+++ b/js/Misc/AUTOMAT.pickle
@@ -142,7 +142,7 @@ p46
 g12
 sS'[this.model,graphics,this.ok]'
 p47
-g2
+g30
 sS'x.graphics'
 p48
 g4
diff --git a/js/Misc/BOUNCE.pickle b/js/Misc/BOUNCE.pickle
index f4654542..f718671d 100644
--- a/js/Misc/BOUNCE.pickle
+++ b/js/Misc/BOUNCE.pickle
@@ -72,7 +72,7 @@ p19
 g13
 sS'[this.model,graphics,ok]'
 p20
-g13
+g18
 sS'yd'
 p21
 g5
diff --git a/js/Misc/CBLOCK.pickle b/js/Misc/CBLOCK.pickle
index c55e2a3a..104370ff 100644
--- a/js/Misc/CBLOCK.pickle
+++ b/js/Misc/CBLOCK.pickle
@@ -141,7 +141,7 @@ p37
 g8
 sS'[this.model,graphics,ok]'
 p38
-g2
+g25
 sS'in1'
 p39
 g2
diff --git a/js/Misc/CONSTRAINT_c.pickle b/js/Misc/CONSTRAINT_c.pickle
index b9a1caca..50efed9b 100644
--- a/js/Misc/CONSTRAINT_c.pickle
+++ b/js/Misc/CONSTRAINT_c.pickle
@@ -32,7 +32,7 @@ p9
 g8
 sS'[this.model,graphics,ok]'
 p10
-g4
+g2
 sS'graphics.exprs'
 p11
 NsS'model.in1'
diff --git a/js/Misc/EXPRESSION.pickle b/js/Misc/EXPRESSION.pickle
index d7c7385a..621cebb9 100644
--- a/js/Misc/EXPRESSION.pickle
+++ b/js/Misc/EXPRESSION.pickle
@@ -80,7 +80,7 @@ S'list'
 p24
 sS'[this.model,graphics,ok]'
 p25
-g10
+g24
 sS'in1'
 p26
 g15
diff --git a/js/Misc/MEMORY_f.pickle b/js/Misc/MEMORY_f.pickle
index 409f298f..c40ec1e8 100644
--- a/js/Misc/MEMORY_f.pickle
+++ b/js/Misc/MEMORY_f.pickle
@@ -50,46 +50,47 @@ S'string'
 p14
 sS'[this.model,graphics,ok]'
 p15
-g2
-sS'in1'
+S'list'
 p16
+sS'in1'
+p17
 g2
 sS'model.rpar'
-p17
+p18
 g2
 sS'graphics.exprs'
-p18
-NsS'typ'
 p19
-S'vector'
+NsS'typ'
 p20
-sS'ok'
+S'vector'
 p21
-S'boolean'
+sS'ok'
 p22
-sS'model.blocktype'
+S'boolean'
 p23
+sS'model.blocktype'
+p24
 g14
 sS'model.dep_ut'
-p24
-g20
-sS'exprs'
 p25
-S'matrix'
+g21
+sS'exprs'
 p26
-sS'gr_i'
+S'matrix'
 p27
-g20
-sS'y'
+sS'gr_i'
 p28
-g20
-sS'x'
+g21
+sS'y'
 p29
+g21
+sS'x'
+p30
 g2
 sS'model'
-p30
+p31
 g4
 sS'z'
-p31
+p32
 g2
 s.
\ No newline at end of file
diff --git a/js/Misc/c_block.pickle b/js/Misc/c_block.pickle
index a07a6553..84c7c67e 100644
--- a/js/Misc/c_block.pickle
+++ b/js/Misc/c_block.pickle
@@ -102,7 +102,7 @@ p31
 g3
 sS'[this.model,graphics,ok]'
 p32
-g9
+g22
 sS'in1'
 p33
 g9
diff --git a/js/Misc/fortran_block.pickle b/js/Misc/fortran_block.pickle
index 532ee457..9a7877f6 100644
--- a/js/Misc/fortran_block.pickle
+++ b/js/Misc/fortran_block.pickle
@@ -87,7 +87,7 @@ p26
 g3
 sS'[this.model,graphics,ok]'
 p27
-g13
+g19
 sS'model.rpar'
 p28
 g3
diff --git a/js/Misc/generic_block.pickle b/js/Misc/generic_block.pickle
index fa54565c..d1f4eab6 100644
--- a/js/Misc/generic_block.pickle
+++ b/js/Misc/generic_block.pickle
@@ -98,7 +98,7 @@ p24
 g5
 sS'[this.model,graphics,ok]'
 p25
-g2
+g22
 sS'model.rpar'
 p26
 g8
diff --git a/js/Misc/generic_block2.pickle b/js/Misc/generic_block2.pickle
index 70e8d610..3acdefcd 100644
--- a/js/Misc/generic_block2.pickle
+++ b/js/Misc/generic_block2.pickle
@@ -104,7 +104,7 @@ p25
 g5
 sS'[this.model,graphics,ok]'
 p26
-g2
+g23
 sS'model.nmode'
 p27
 NsS'model.rpar'
diff --git a/js/Misc/scifunc_block.pickle b/js/Misc/scifunc_block.pickle
index 06dc21d7..8aa4565d 100644
--- a/js/Misc/scifunc_block.pickle
+++ b/js/Misc/scifunc_block.pickle
@@ -113,7 +113,7 @@ S'string'
 p32
 sS'[this.model,graphics,ok]'
 p33
-g3
+g28
 sS'in1'
 p34
 g3
diff --git a/js/NonLinear/LOOKUP2D.pickle b/js/NonLinear/LOOKUP2D.pickle
index 18665e69..2938eeb7 100644
--- a/js/NonLinear/LOOKUP2D.pickle
+++ b/js/NonLinear/LOOKUP2D.pickle
@@ -69,16 +69,16 @@ p19
 g2
 sS'exprs[4-1]'
 p20
-g2
-sS'gh2'
+S'string'
 p21
+sS'gh2'
+p22
 g2
 sS'gh.figure_id'
-p22
-NsS'METHOD'
 p23
-S'string'
+NsS'METHOD'
 p24
+g21
 sS'model.sim'
 p25
 S'list'
@@ -94,7 +94,7 @@ p29
 g11
 sS'exprs[5-1]'
 p30
-g24
+g21
 sS'graphics'
 p31
 g5
@@ -106,10 +106,10 @@ p33
 g11
 sS'Graf'
 p34
-g24
+g21
 sS'model.blocktype'
 p35
-g24
+g21
 sS'ok'
 p36
 g7
@@ -148,5 +148,5 @@ p48
 g5
 sS'graf'
 p49
-g24
+g21
 s.
\ No newline at end of file
diff --git a/js/NonLinear/LOOKUP_c.pickle b/js/NonLinear/LOOKUP_c.pickle
index 663b14a8..3a8b8975 100644
--- a/js/NonLinear/LOOKUP_c.pickle
+++ b/js/NonLinear/LOOKUP_c.pickle
@@ -148,7 +148,7 @@ p44
 g14
 sS'exprs[1-1]'
 p45
-g14
+g10
 sS'[nx,mx]'
 p46
 g14
@@ -327,7 +327,7 @@ p104
 g10
 sS'exprs[4-1]'
 p105
-g14
+g10
 sS'model.evtout'
 p106
 g2
diff --git a/js/NonLinear/MAXMIN.pickle b/js/NonLinear/MAXMIN.pickle
index 9ea92f76..9d62f4c2 100644
--- a/js/NonLinear/MAXMIN.pickle
+++ b/js/NonLinear/MAXMIN.pickle
@@ -54,7 +54,7 @@ S'list'
 p16
 sS'[this.model,graphics,ok]'
 p17
-g6
+g16
 sS'model.nmode'
 p18
 g6
diff --git a/js/NonLinear/MIN_f.pickle b/js/NonLinear/MIN_f.pickle
index 56aba182..c5fee5b1 100644
--- a/js/NonLinear/MIN_f.pickle
+++ b/js/NonLinear/MIN_f.pickle
@@ -26,7 +26,7 @@ p7
 g2
 sS'exprs'
 p8
-g4
+g2
 sS'in1'
 p9
 g4
diff --git a/js/NonLinear/PRODUCT.pickle b/js/NonLinear/PRODUCT.pickle
index 829508f6..9367a9b3 100644
--- a/js/NonLinear/PRODUCT.pickle
+++ b/js/NonLinear/PRODUCT.pickle
@@ -40,7 +40,7 @@ S'list'
 p12
 sS'[this.model,graphics,ok]'
 p13
-g8
+g12
 sS'in1'
 p14
 g8
@@ -66,7 +66,7 @@ p23
 g18
 sS'exprs'
 p24
-g8
+g22
 sS'gr_i'
 p25
 g18
diff --git a/js/NonLinear/TANBLK_f.pickle b/js/NonLinear/TANBLK_f.pickle
index 1758e0ab..ae1d7e81 100644
--- a/js/NonLinear/TANBLK_f.pickle
+++ b/js/NonLinear/TANBLK_f.pickle
@@ -26,7 +26,7 @@ S'vector'
 p7
 sS'exprs'
 p8
-g4
+g2
 sS'in1'
 p9
 g4
diff --git a/js/PDE/PDE.pickle b/js/PDE/PDE.pickle
index c0ddc1ce..827369c7 100644
--- a/js/PDE/PDE.pickle
+++ b/js/PDE/PDE.pickle
@@ -81,7 +81,7 @@ p25
 g23
 sS'[this.model,graphics,ok]'
 p26
-g2
+g23
 sS'model.state'
 p27
 g2
diff --git a/js/Sources/CONST_m.pickle b/js/Sources/CONST_m.pickle
index 08066956..2b3f2d42 100644
--- a/js/Sources/CONST_m.pickle
+++ b/js/Sources/CONST_m.pickle
@@ -73,7 +73,7 @@ p24
 g8
 sS'exprs'
 p25
-g6
+g23
 sS'gr_i'
 p26
 g8
diff --git a/js/Sources/CURVE_c.pickle b/js/Sources/CURVE_c.pickle
index 73ddc8f5..e6108432 100644
--- a/js/Sources/CURVE_c.pickle
+++ b/js/Sources/CURVE_c.pickle
@@ -143,7 +143,7 @@ p41
 g9
 sS'exprs[1-1]'
 p42
-g9
+g11
 sS'[nx,mx]'
 p43
 g9
diff --git a/js/Sources/GENSIN_f.pickle b/js/Sources/GENSIN_f.pickle
index df4eda8e..4afed481 100644
--- a/js/Sources/GENSIN_f.pickle
+++ b/js/Sources/GENSIN_f.pickle
@@ -45,44 +45,45 @@ S'string'
 p13
 sS'[this.model,graphics,ok]'
 p14
-g8
-sS'model.out2'
+S'list'
 p15
+sS'model.out2'
+p16
 g8
 sS'model.rpar'
-p16
+p17
 g5
 sS'model.outtyp'
-p17
+p18
 g8
 sS'graphics.exprs'
-p18
-NsS'typ'
 p19
+NsS'typ'
+p20
 g10
 sS'ok'
-p20
-S'boolean'
 p21
-sS'model.blocktype'
+S'boolean'
 p22
+sS'model.blocktype'
+p23
 g13
 sS'model.dep_ut'
-p23
+p24
 g10
 sS'exprs'
-p24
+p25
 g5
 sS'gr_i'
-p25
+p26
 g10
 sS'y'
-p26
+p27
 g10
 sS'x'
-p27
+p28
 g8
 sS'model'
-p28
+p29
 g2
 s.
\ No newline at end of file
diff --git a/js/Sources/IN_f.pickle b/js/Sources/IN_f.pickle
index 4bfdc5a8..8040ac6e 100644
--- a/js/Sources/IN_f.pickle
+++ b/js/Sources/IN_f.pickle
@@ -67,7 +67,7 @@ p22
 g10
 sS'exprs'
 p23
-g5
+g12
 sS'gr_i'
 p24
 g10
diff --git a/js/Sources/READAU_f.pickle b/js/Sources/READAU_f.pickle
index f8221ee6..efecccb8 100644
--- a/js/Sources/READAU_f.pickle
+++ b/js/Sources/READAU_f.pickle
@@ -79,7 +79,7 @@ S'list'
 p24
 sS'[this.model,graphics,ok]'
 p25
-g12
+g24
 sS'M'
 p26
 g12
diff --git a/js/Sources/READC_f.pickle b/js/Sources/READC_f.pickle
index db1450ac..59baf645 100644
--- a/js/Sources/READC_f.pickle
+++ b/js/Sources/READC_f.pickle
@@ -105,7 +105,7 @@ p29
 g2
 sS'[this.model,graphics,ok]'
 p30
-g2
+g27
 sS'fmts'
 p31
 g10
diff --git a/js/Sources/RFILE_f.pickle b/js/Sources/RFILE_f.pickle
index 15cd3698..b4b40e64 100644
--- a/js/Sources/RFILE_f.pickle
+++ b/js/Sources/RFILE_f.pickle
@@ -87,56 +87,57 @@ p25
 g13
 sS'[this.model,graphics,ok]'
 p26
-g2
-sS'N'
+S'list'
 p27
+sS'N'
+p28
 g2
 sS'graphics'
-p28
+p29
 g9
 sS'model.ipar'
-p29
+p30
 g4
 sS'typ'
-p30
+p31
 g13
 sS'imask'
-p31
+p32
 g2
 sS'model.blocktype'
-p32
+p33
 g7
 sS'outmask'
-p33
+p34
 g2
 sS'frmt1'
-p34
+p35
 g2
 sS'fname1'
-p35
+p36
 g2
 sS'exprs'
-p36
+p37
 g4
 sS'gr_i'
-p37
+p38
 g13
 sS'ievt'
-p38
+p39
 g2
 sS'ipar'
-p39
+p40
 g4
 sS'y'
-p40
+p41
 g13
 sS'x'
-p41
+p42
 g2
 sS'model'
-p42
+p43
 g9
 sS'nout'
-p43
+p44
 g2
 s.
\ No newline at end of file
diff --git a/js/Sources/STEP.pickle b/js/Sources/STEP.pickle
index de429ad0..88072f2e 100644
--- a/js/Sources/STEP.pickle
+++ b/js/Sources/STEP.pickle
@@ -50,7 +50,7 @@ p14
 g8
 sS'[this.model,graphics,ok]'
 p15
-g8
+g13
 sS'model.out2'
 p16
 g8
diff --git a/js/Threshold/GENERAL_f.pickle b/js/Threshold/GENERAL_f.pickle
index d8de13a3..7f2734e7 100644
--- a/js/Threshold/GENERAL_f.pickle
+++ b/js/Threshold/GENERAL_f.pickle
@@ -66,7 +66,7 @@ p21
 g8
 sS'[this.model,graphics,ok]'
 p22
-g8
+g18
 sS'in1'
 p23
 g8
diff --git a/sci2jslex.py b/sci2jslex.py
index 33ba6052..08ac358d 100755
--- a/sci2jslex.py
+++ b/sci2jslex.py
@@ -86,7 +86,6 @@ DOUBLE_FUNCTION_NAMES = {
     'and',
     'atan',
     'block_parameter_error',
-    'check_io',
     'cleandata',
     'compile_expr',
     'compiler_expression',
@@ -160,7 +159,6 @@ DOUBLE_FUNCTION_NAMES = {
     'real',
     'save',
     'scf',
-    'sci2exp',
     'scicos',
     'scicos_block',
     'scicos_debug',
@@ -213,6 +211,7 @@ DOUBLE_FUNCTION_NAMES = {
 
 LIST_TYPE = 'list'
 LIST_FUNCTION_NAMES = {
+    'check_io',
 }
 
 MATRIX_TYPE = 'matrix'
@@ -253,6 +252,7 @@ SCICOS_BLOCKS = {
 
 STRING_TYPE = 'string'
 STRING_FUNCTION_NAMES = {
+    'sci2exp',
 }
 
 VECTOR_TYPE = 'vector'