support arg1 parsing

26 files changed, 871 insertions, 921 deletions

diff --git a/js/Branching/CLKFROM.pickle b/js/Branching/CLKFROM.pickle
index c675788f..016c3c50 100644
--- a/js/Branching/CLKFROM.pickle
+++ b/js/Branching/CLKFROM.pickle
@@ -31,44 +31,42 @@ sS'x.graphics'
 p7
 S'object'
 p8
-sS'arg1'
-p9
-g8
 sS'graphics.exprs'
-p10
+p9
 NsS'model.dep_ut'
-p11
+p10
 S'vector_boolean'
-p12
+p11
 sS'exprs'
-p13
+p12
 g4
 sS'x.model'
-p14
+p13
 g8
 sS'graphics'
-p15
+p14
 g8
 sS'y'
-p16
+p15
 g2
 sS'x'
+p16
+S'vector'
 p17
-NsS'model'
+sS'model'
 p18
 g8
 sS'typ'
 p19
-S'vector'
-p20
+g17
 sS'model.opar'
-p21
+p20
 S'list'
-p22
+p21
 sS'model.firing'
-p23
+p22
 g2
 sS'x.graphics.id'
-p24
+p23
 g4
 s.
\ No newline at end of file
diff --git a/js/Branching/CLKGOTO.pickle b/js/Branching/CLKGOTO.pickle
index 27b37db4..f5648c00 100644
--- a/js/Branching/CLKGOTO.pickle
+++ b/js/Branching/CLKGOTO.pickle
@@ -27,25 +27,23 @@ sS'ok'
 p5
 S'boolean'
 p6
-sS'model.evtin'
+sS'model.blocktype'
 p7
-g2
+g4
 sS'x.graphics'
 p8
 S'object'
 p9
-sS'arg1'
+sS'model.evtin'
 p10
-g9
-sS'tagvis'
-p11
 g2
-sS'x.graphics.id'
-p12
-g4
 sS'model.dep_ut'
-p13
+p11
 S'vector_boolean'
+p12
+sS'model.opar'
+p13
+S'list'
 p14
 sS'exprs'
 p15
@@ -64,24 +62,24 @@ p20
 g2
 sS'x'
 p21
-NsS'model'
+S'vector'
 p22
-g9
-sS'model.ipar'
+sS'tagvis'
 p23
 g2
-sS'typ'
+sS'model.ipar'
 p24
-S'vector'
+g2
+sS'typ'
 p25
-sS'model.opar'
+g22
+sS'model'
 p26
-S'list'
-p27
+g9
 sS'model.firing'
-p28
+p27
 g2
-sS'model.blocktype'
-p29
+sS'x.graphics.id'
+p28
 g4
 s.
\ No newline at end of file
diff --git a/js/Branching/CLKGotoTagVisibility.pickle b/js/Branching/CLKGotoTagVisibility.pickle
index 9a033bf0..4937fa7f 100644
--- a/js/Branching/CLKGotoTagVisibility.pickle
+++ b/js/Branching/CLKGotoTagVisibility.pickle
@@ -13,81 +13,79 @@ p5
 atp6
 Rp7
 .(dp0
-S'arg1'
+S'graphics'
 p1
 S'object'
 p2
-sS'graphics'
-p3
-g2
 sS'x.model'
-p4
+p3
 g2
 sS'model.out'
-p5
+p4
 S'vector'
-p6
+p5
 sS'model.in2'
-p7
-g6
+p6
+g5
 sS'model.intyp'
-p8
+p7
 S'double'
-p9
+p8
 sS'x.graphics'
-p10
+p9
 g2
 sS'model.evtin'
-p11
-g6
+p10
+g5
 sS'model.firing'
-p12
+p11
 S'boolean'
-p13
+p12
 sS'model.sim'
-p14
+p13
 S'string'
-p15
+p14
 sS'model.out2'
-p16
-g6
+p15
+g5
 sS'y'
-p17
-g9
+p16
+g8
 sS'model.in'
-p18
-g6
+p17
+g5
 sS'graphics.exprs'
-p19
+p18
 NsS'typ'
-p20
-g6
+p19
+g5
 sS'model.opar'
-p21
+p20
 S'list'
-p22
+p21
 sS'needcompile'
-p23
-g9
+p22
+g8
 sS'model.blocktype'
-p24
-g15
+p23
+g14
 sS'model.dep_ut'
-p25
+p24
 S'vector_boolean'
-p26
+p25
 sS'exprs'
-p27
-g15
+p26
+g14
 sS'gr_i'
-p28
-g6
+p27
+g5
 sS'model.outtyp'
-p29
-g9
+p28
+g8
 sS'x'
+p29
+g5
+sS'model'
 p30
-NsS'model'
-p31
 g2
 s.
\ No newline at end of file
diff --git a/js/Branching/DEMUX.pickle b/js/Branching/DEMUX.pickle
index f74e7d0c..3c5d580d 100644
--- a/js/Branching/DEMUX.pickle
+++ b/js/Branching/DEMUX.pickle
@@ -33,51 +33,49 @@ sS'x.graphics'
 p9
 S'object'
 p10
-sS'arg1'
-p11
-g10
 sS'graphics.exprs'
-p12
+p11
 NsS'nin'
-p13
+p12
 S'double'
-p14
+p13
 sS'model.dep_ut'
-p15
+p14
 S'vector_boolean'
-p16
+p15
 sS'exprs'
-p17
+p16
 g8
 sS'x.model'
-p18
+p17
 NsS'gr_i'
-p19
+p18
 g4
 sS'model.in'
-p20
-g14
+p19
+g13
 sS'graphics'
-p21
+p20
 g10
 sS'y'
-p22
+p21
 g4
 sS'x'
+p22
+g4
+sS'model'
 p23
-NsS'model'
-p24
 g10
 sS'model.ipar'
-p25
-g14
+p24
+g13
 sS'typ'
-p26
+p25
 g4
 sS'model.firing'
-p27
+p26
 g4
 sS'out'
-p28
-g14
+p27
+g13
 s.
\ No newline at end of file
diff --git a/js/Branching/DEMUX_f.pickle b/js/Branching/DEMUX_f.pickle
index f74e7d0c..3c5d580d 100644
--- a/js/Branching/DEMUX_f.pickle
+++ b/js/Branching/DEMUX_f.pickle
@@ -33,51 +33,49 @@ sS'x.graphics'
 p9
 S'object'
 p10
-sS'arg1'
-p11
-g10
 sS'graphics.exprs'
-p12
+p11
 NsS'nin'
-p13
+p12
 S'double'
-p14
+p13
 sS'model.dep_ut'
-p15
+p14
 S'vector_boolean'
-p16
+p15
 sS'exprs'
-p17
+p16
 g8
 sS'x.model'
-p18
+p17
 NsS'gr_i'
-p19
+p18
 g4
 sS'model.in'
-p20
-g14
+p19
+g13
 sS'graphics'
-p21
+p20
 g10
 sS'y'
-p22
+p21
 g4
 sS'x'
+p22
+g4
+sS'model'
 p23
-NsS'model'
-p24
 g10
 sS'model.ipar'
-p25
-g14
+p24
+g13
 sS'typ'
-p26
+p25
 g4
 sS'model.firing'
-p27
+p26
 g4
 sS'out'
-p28
-g14
+p27
+g13
 s.
\ No newline at end of file
diff --git a/js/Branching/ESELECT_f.pickle b/js/Branching/ESELECT_f.pickle
index 3c046923..567fd9cc 100644
--- a/js/Branching/ESELECT_f.pickle
+++ b/js/Branching/ESELECT_f.pickle
@@ -17,89 +17,87 @@ p7
 atp8
 Rp9
 .(dp0
-S'arg1'
+S'graphics'
 p1
 S'object'
 p2
-sS'graphics'
-p3
-g2
 sS'x.model'
-p4
+p3
 NsS'inh'
-p5
+p4
 S'double'
-p6
+p5
 sS'model.dep_ut'
-p7
+p6
 S'vector_boolean'
-p8
+p7
 sS'out'
-p9
-g6
+p8
+g5
 sS'model.in2'
-p10
-g6
+p9
+g5
 sS'model.intyp'
-p11
-g6
+p10
+g5
 sS'x.graphics'
-p12
+p11
 g2
 sS'typ'
-p13
+p12
 S'vector'
-p14
+p13
 sS'model.evtin'
-p15
-g6
+p14
+g5
 sS'exprs[2-1]'
-p16
+p15
 S'string'
-p17
+p16
 sS'model.firing'
-p18
-g6
+p17
+g5
 sS'model.sim'
-p19
+p18
 S'list'
-p20
+p19
 sS'model.evtout'
-p21
-g6
+p20
+g5
 sS'model.nmode'
-p22
-g6
+p21
+g5
 sS'exprs[3-1]'
-p23
-g17
+p22
+g16
 sS'model.in'
-p24
-g6
+p23
+g5
 sS'graphics.exprs'
-p25
+p24
 NsS'model.nzcross'
-p26
-g6
+p25
+g5
 sS'model.blocktype'
-p27
-g17
+p26
+g16
 sS'nmod'
-p28
-g6
+p27
+g5
 sS'exprs'
-p29
+p28
 S'matrix'
-p30
+p29
 sS'gr_i'
-p31
-g14
+p30
+g13
 sS'y'
-p32
-g14
+p31
+g13
 sS'x'
+p32
+g13
+sS'model'
 p33
-NsS'model'
-p34
 g2
 s.
\ No newline at end of file
diff --git a/js/Branching/EXTRACTOR.pickle b/js/Branching/EXTRACTOR.pickle
index 9d413f74..d89bad73 100644
--- a/js/Branching/EXTRACTOR.pickle
+++ b/js/Branching/EXTRACTOR.pickle
@@ -25,50 +25,48 @@ sS'model.blocktype'
 p5
 S'string'
 p6
-sS'x.graphics'
+sS'exprs'
 p7
-S'object'
+S'vector_string'
 p8
-sS'arg1'
-p9
-g8
 sS'graphics.exprs'
+p9
+NsS'model.dep_ut'
 p10
-NsS'x.model'
+S'vector_boolean'
 p11
-NsS'model.dep_ut'
+sS'ind'
 p12
-S'vector_boolean'
+g4
+sS'x.model'
 p13
-sS'exprs'
+NsS'gr_i'
 p14
-S'vector_string'
+S'vector'
 p15
-sS'ind'
+sS'model.in'
 p16
 g4
-sS'gr_i'
+sS'graphics'
 p17
-S'vector'
+S'object'
 p18
-sS'model.in'
+sS'y'
 p19
-g4
-sS'graphics'
+g15
+sS'x'
 p20
-g8
-sS'y'
+g15
+sS'model'
 p21
 g18
-sS'x'
-p22
-NsS'model'
-p23
-g8
 sS'model.ipar'
-p24
+p22
 g4
 sS'typ'
-p25
+p23
+g15
+sS'x.graphics'
+p24
 g18
 s.
\ No newline at end of file
diff --git a/js/Branching/FROM.pickle b/js/Branching/FROM.pickle
index 81f960b8..ac3789e9 100644
--- a/js/Branching/FROM.pickle
+++ b/js/Branching/FROM.pickle
@@ -13,81 +13,79 @@ p5
 atp6
 Rp7
 .(dp0
-S'arg1'
+S'graphics'
 p1
 S'object'
 p2
-sS'graphics'
-p3
-g2
 sS'x.model'
-p4
+p3
 g2
 sS'model.out'
-p5
+p4
 S'double'
-p6
+p5
 sS'model.in2'
-p7
+p6
 S'vector'
-p8
+p7
 sS'model.intyp'
-p9
-g6
+p8
+g5
 sS'x.graphics'
-p10
+p9
 g2
 sS'model.sim'
-p11
+p10
 S'string'
-p12
+p11
 sS'model.out2'
-p13
-g6
+p12
+g5
 sS'y'
-p14
-g6
+p13
+g5
 sS'model.in'
-p15
-g8
+p14
+g7
 sS'graphics.exprs'
-p16
+p15
 NsS'model.ipar'
-p17
-g8
+p16
+g7
 sS'typ'
-p18
-g8
+p17
+g7
 sS'model.opar'
-p19
+p18
 S'list'
-p20
+p19
 sS'x.graphics.id'
-p21
-g12
+p20
+g11
 sS'needcompile'
-p22
-g6
+p21
+g5
 sS'model.blocktype'
-p23
-g12
+p22
+g11
 sS'model.dep_ut'
-p24
+p23
 S'vector_boolean'
-p25
+p24
 sS'exprs'
-p26
+p25
 S'vector_string'
-p27
+p26
 sS'gr_i'
-p28
-g8
+p27
+g7
 sS'model.outtyp'
-p29
-g6
+p28
+g5
 sS'x'
+p29
+g7
+sS'model'
 p30
-NsS'model'
-p31
 g2
 s.
\ No newline at end of file
diff --git a/js/Branching/FROMMO.pickle b/js/Branching/FROMMO.pickle
index b2aa3ba6..e9e5674f 100644
--- a/js/Branching/FROMMO.pickle
+++ b/js/Branching/FROMMO.pickle
@@ -13,90 +13,88 @@ p5
 atp6
 Rp7
 .(dp0
-S'arg1'
+S'graphics'
 p1
 S'object'
 p2
-sS'graphics'
-p3
-g2
 sS'mo.model'
-p4
+p3
 S'string'
-p5
+p4
 sS'x.model'
-p6
+p5
 g2
 sS'model.out'
-p7
+p6
 S'double'
-p8
+p7
 sS'model.in2'
-p9
+p8
 S'vector'
-p10
+p9
 sS'model.intyp'
-p11
-g8
+p10
+g7
 sS'x.graphics'
-p12
+p11
 g2
 sS'model.sim'
-p13
-g5
+p12
+g4
 sS'mo.outputs'
-p14
-g5
+p13
+g4
 sS'model.out2'
-p15
-g8
+p14
+g7
 sS'x.graphics.out_implicit'
-p16
+p15
 S'vector_string'
-p17
+p16
 sS'y'
-p18
-g8
+p17
+g7
 sS'model.in'
-p19
-g10
+p18
+g9
 sS'graphics.exprs'
-p20
+p19
 NsS'model.ipar'
-p21
-g10
+p20
+g9
 sS'typ'
-p22
-g10
+p21
+g9
 sS'model.opar'
-p23
+p22
 S'list'
-p24
+p23
 sS'needcompile'
-p25
-g8
+p24
+g7
 sS'model.blocktype'
-p26
-g5
+p25
+g4
 sS'mo'
-p27
-g8
+p26
+g7
 sS'model.dep_ut'
-p28
+p27
 S'vector_boolean'
-p29
+p28
 sS'exprs'
-p30
-g17
+p29
+g16
 sS'gr_i'
-p31
-g10
+p30
+g9
 sS'model.outtyp'
-p32
-g8
+p31
+g7
 sS'x'
+p32
+g9
+sS'model'
 p33
-NsS'model'
-p34
 g2
 s.
\ No newline at end of file
diff --git a/js/Branching/GOTO.pickle b/js/Branching/GOTO.pickle
index c8813078..6b4087db 100644
--- a/js/Branching/GOTO.pickle
+++ b/js/Branching/GOTO.pickle
@@ -19,83 +19,82 @@ S'tagvis'
 p1
 S'double'
 p2
-sS'arg1'
+sS'graphics'
 p3
-NsS'graphics'
-p4
 S'object'
-p5
+p4
 sS'x.model'
-p6
-g5
+p5
+g4
 sS'model.out'
-p7
+p6
 S'vector'
-p8
+p7
 sS'model.in2'
-p9
+p8
 g2
 sS'model.intyp'
-p10
+p9
 g2
 sS'x.graphics'
-p11
-g5
+p10
+g4
 sS'model.sim'
-p12
+p11
 S'string'
-p13
+p12
 sS'model.out2'
-p14
-g8
+p13
+g7
 sS'y'
-p15
+p14
 g2
 sS'model.in'
-p16
+p15
 g2
 sS'graphics.exprs'
-p17
+p16
 NsS'model.ipar'
-p18
+p17
 g2
 sS'typ'
-p19
-g8
+p18
+g7
 sS'model.opar'
-p20
+p19
 S'list'
-p21
+p20
 sS'x.graphics.id'
-p22
-g13
+p21
+g12
 sS'needcompile'
-p23
+p22
 g2
 sS'ok'
-p24
+p23
 S'boolean'
-p25
+p24
 sS'model.blocktype'
-p26
-g13
+p25
+g12
 sS'model.dep_ut'
-p27
+p26
 S'vector_boolean'
-p28
+p27
 sS'exprs'
-p29
+p28
 S'matrix'
-p30
+p29
 sS'gr_i'
-p31
-g8
+p30
+g7
 sS'model.outtyp'
-p32
+p31
 g2
 sS'x'
+p32
+g7
+sS'model'
 p33
-NsS'model'
-p34
-g5
+g4
 s.
\ No newline at end of file
diff --git a/js/Branching/GOTOMO.pickle b/js/Branching/GOTOMO.pickle
index 04657ea7..eed0d8f5 100644
--- a/js/Branching/GOTOMO.pickle
+++ b/js/Branching/GOTOMO.pickle
@@ -19,93 +19,92 @@ S'tagvis'
 p1
 S'double'
 p2
-sS'arg1'
+sS'graphics'
 p3
-NsS'graphics'
-p4
 S'object'
-p5
+p4
 sS'mo.model'
-p6
+p5
 S'string'
-p7
+p6
 sS'x.model'
-p8
-g5
+p7
+g4
 sS'model.out'
-p9
+p8
 S'vector'
-p10
+p9
 sS'model.in2'
-p11
+p10
 g2
 sS'model.intyp'
-p12
-g10
+p11
+g9
 sS'x.graphics'
-p13
-g5
+p12
+g4
 sS'mo.inputs'
-p14
-g7
+p13
+g6
 sS'x.graphics.in_implicit'
-p15
+p14
 S'vector_string'
-p16
+p15
 sS'model.sim'
-p17
-g7
+p16
+g6
 sS'model.out2'
-p18
-g10
+p17
+g9
 sS'y'
-p19
+p18
 g2
 sS'model.in'
-p20
+p19
 g2
 sS'graphics.exprs'
-p21
+p20
 NsS'model.ipar'
-p22
+p21
 g2
 sS'typ'
-p23
-g10
+p22
+g9
 sS'model.opar'
-p24
+p23
 S'list'
-p25
+p24
 sS'needcompile'
-p26
+p25
 g2
 sS'ok'
-p27
+p26
 S'boolean'
-p28
+p27
 sS'model.blocktype'
-p29
-g7
+p28
+g6
 sS'mo'
-p30
+p29
 g2
 sS'model.dep_ut'
-p31
+p30
 S'vector_boolean'
-p32
+p31
 sS'exprs'
-p33
+p32
 S'matrix'
-p34
+p33
 sS'gr_i'
-p35
-g10
+p34
+g9
 sS'model.outtyp'
-p36
+p35
 g2
 sS'x'
+p36
+g9
+sS'model'
 p37
-NsS'model'
-p38
-g5
+g4
 s.
\ No newline at end of file
diff --git a/js/Branching/GotoTagVisibility.pickle b/js/Branching/GotoTagVisibility.pickle
index 9a033bf0..4937fa7f 100644
--- a/js/Branching/GotoTagVisibility.pickle
+++ b/js/Branching/GotoTagVisibility.pickle
@@ -13,81 +13,79 @@ p5
 atp6
 Rp7
 .(dp0
-S'arg1'
+S'graphics'
 p1
 S'object'
 p2
-sS'graphics'
-p3
-g2
 sS'x.model'
-p4
+p3
 g2
 sS'model.out'
-p5
+p4
 S'vector'
-p6
+p5
 sS'model.in2'
-p7
-g6
+p6
+g5
 sS'model.intyp'
-p8
+p7
 S'double'
-p9
+p8
 sS'x.graphics'
-p10
+p9
 g2
 sS'model.evtin'
-p11
-g6
+p10
+g5
 sS'model.firing'
-p12
+p11
 S'boolean'
-p13
+p12
 sS'model.sim'
-p14
+p13
 S'string'
-p15
+p14
 sS'model.out2'
-p16
-g6
+p15
+g5
 sS'y'
-p17
-g9
+p16
+g8
 sS'model.in'
-p18
-g6
+p17
+g5
 sS'graphics.exprs'
-p19
+p18
 NsS'typ'
-p20
-g6
+p19
+g5
 sS'model.opar'
-p21
+p20
 S'list'
-p22
+p21
 sS'needcompile'
-p23
-g9
+p22
+g8
 sS'model.blocktype'
-p24
-g15
+p23
+g14
 sS'model.dep_ut'
-p25
+p24
 S'vector_boolean'
-p26
+p25
 sS'exprs'
-p27
-g15
+p26
+g14
 sS'gr_i'
-p28
-g6
+p27
+g5
 sS'model.outtyp'
-p29
-g9
+p28
+g8
 sS'x'
+p29
+g5
+sS'model'
 p30
-NsS'model'
-p31
 g2
 s.
\ No newline at end of file
diff --git a/js/Branching/GotoTagVisibilityMO.pickle b/js/Branching/GotoTagVisibilityMO.pickle
index 9a033bf0..4937fa7f 100644
--- a/js/Branching/GotoTagVisibilityMO.pickle
+++ b/js/Branching/GotoTagVisibilityMO.pickle
@@ -13,81 +13,79 @@ p5
 atp6
 Rp7
 .(dp0
-S'arg1'
+S'graphics'
 p1
 S'object'
 p2
-sS'graphics'
-p3
-g2
 sS'x.model'
-p4
+p3
 g2
 sS'model.out'
-p5
+p4
 S'vector'
-p6
+p5
 sS'model.in2'
-p7
-g6
+p6
+g5
 sS'model.intyp'
-p8
+p7
 S'double'
-p9
+p8
 sS'x.graphics'
-p10
+p9
 g2
 sS'model.evtin'
-p11
-g6
+p10
+g5
 sS'model.firing'
-p12
+p11
 S'boolean'
-p13
+p12
 sS'model.sim'
-p14
+p13
 S'string'
-p15
+p14
 sS'model.out2'
-p16
-g6
+p15
+g5
 sS'y'
-p17
-g9
+p16
+g8
 sS'model.in'
-p18
-g6
+p17
+g5
 sS'graphics.exprs'
-p19
+p18
 NsS'typ'
-p20
-g6
+p19
+g5
 sS'model.opar'
-p21
+p20
 S'list'
-p22
+p21
 sS'needcompile'
-p23
-g9
+p22
+g8
 sS'model.blocktype'
-p24
-g15
+p23
+g14
 sS'model.dep_ut'
-p25
+p24
 S'vector_boolean'
-p26
+p25
 sS'exprs'
-p27
-g15
+p26
+g14
 sS'gr_i'
-p28
-g6
+p27
+g5
 sS'model.outtyp'
-p29
-g9
+p28
+g8
 sS'x'
+p29
+g5
+sS'model'
 p30
-NsS'model'
-p31
 g2
 s.
\ No newline at end of file
diff --git a/js/Branching/ISELECT_f.pickle b/js/Branching/ISELECT_f.pickle
index c2d03a0e..da61abc0 100644
--- a/js/Branching/ISELECT_f.pickle
+++ b/js/Branching/ISELECT_f.pickle
@@ -34,12 +34,13 @@ sS'x.graphics'
 p8
 S'object'
 p9
-sS'arg1'
+sS'z0'
 p10
-g9
-sS'graphics.exprs'
+g6
+sS'graphics'
 p11
-NsS'model.dep_ut'
+g9
+sS'model.dep_ut'
 p12
 S'vector_boolean'
 p13
@@ -56,30 +57,27 @@ NsS'gr_i'
 p18
 S'vector'
 p19
-sS'z0'
+sS'model.in'
 p20
 g6
-sS'model.in'
+sS'graphics.exprs'
 p21
-g6
-sS'graphics'
+NsS'y'
 p22
-g9
-sS'y'
-p23
 g19
 sS'x'
+p23
+g19
+sS'model'
 p24
-NsS'model'
-p25
 g9
 sS'typ'
-p26
+p25
 g19
 sS'nout'
-p27
+p26
 g6
 sS'out'
-p28
+p27
 g4
 s.
\ No newline at end of file
diff --git a/js/Branching/ISELECT_m.pickle b/js/Branching/ISELECT_m.pickle
index cca6bf9f..92f080d0 100644
--- a/js/Branching/ISELECT_m.pickle
+++ b/js/Branching/ISELECT_m.pickle
@@ -21,107 +21,105 @@ S'model.dstate'
 p1
 S'double'
 p2
-sS'arg1'
+sS'graphics'
 p3
 S'object'
 p4
-sS'graphics'
-p5
-g4
 sS'it'
-p6
+p5
 S'vector'
-p7
+p6
 sS'x.model'
-p8
+p7
 NsS'model.out'
-p9
+p8
 S'matrix'
-p10
+p9
 sS'out'
-p11
-g7
+p10
+g6
 sS'model.in2'
-p12
+p11
 g2
 sS'model.intyp'
-p13
+p12
 g2
 sS'x.graphics'
-p14
+p13
 g4
 sS'typ'
-p15
-g7
+p14
+g6
 sS'model.evtin'
-p16
+p15
 g2
 sS'model.firing'
-p17
-g7
+p16
+g6
 sS'model.sim'
-p18
+p17
 S'list'
-p19
+p18
 sS'model.evtout'
-p20
-g7
+p19
+g6
 sS'model.out2'
-p21
-g10
+p20
+g9
 sS'in1'
-p22
-g7
+p21
+g6
 sS'model.rpar'
-p23
-g7
+p22
+g6
 sS'model.outtyp'
-p24
+p23
 g2
 sS'model.state'
-p25
-g7
+p24
+g6
 sS'model.in'
-p26
+p25
 g2
 sS'graphics.exprs'
-p27
+p26
 NsS'model.ipar'
-p28
-g7
+p27
+g6
 sS'z0'
-p29
+p28
 g2
 sS'ok'
-p30
+p29
 S'boolean'
-p31
+p30
 sS'model.blocktype'
-p32
+p31
 S'string'
-p33
+p32
 sS'model.dep_ut'
-p34
+p33
 S'vector_boolean'
-p35
+p34
 sS'exprs'
-p36
-g10
+p35
+g9
 sS'gr_i'
-p37
-g7
+p36
+g6
 sS'y'
-p38
-g7
+p37
+g6
 sS'x'
+p38
+g6
+sS'model'
 p39
-NsS'model'
-p40
 g4
 sS'ot'
-p41
-g33
+p40
+g32
 sS'nout'
-p42
+p41
 g2
 s.
\ No newline at end of file
diff --git a/js/Branching/MUX.pickle b/js/Branching/MUX.pickle
index 66905226..101416ce 100644
--- a/js/Branching/MUX.pickle
+++ b/js/Branching/MUX.pickle
@@ -33,48 +33,46 @@ sS'x.graphics'
 p9
 S'object'
 p10
-sS'arg1'
-p11
-g10
 sS'graphics.exprs'
-p12
+p11
 NsS'in1'
-p13
+p12
 g4
 sS'model.dep_ut'
-p14
+p13
 S'vector_boolean'
-p15
+p14
 sS'exprs'
-p16
+p15
 g8
 sS'x.model'
-p17
+p16
 NsS'gr_i'
-p18
+p17
 S'vector'
-p19
+p18
 sS'model.in'
-p20
-g19
+p19
+g18
 sS'graphics'
-p21
+p20
 g10
 sS'y'
-p22
-g19
+p21
+g18
 sS'x'
+p22
+g18
+sS'model'
 p23
-NsS'model'
-p24
 g10
 sS'model.ipar'
-p25
+p24
 g4
 sS'typ'
-p26
-g19
+p25
+g18
 sS'nout'
-p27
+p26
 g4
 s.
\ No newline at end of file
diff --git a/js/Branching/MUX_f.pickle b/js/Branching/MUX_f.pickle
index 66905226..101416ce 100644
--- a/js/Branching/MUX_f.pickle
+++ b/js/Branching/MUX_f.pickle
@@ -33,48 +33,46 @@ sS'x.graphics'
 p9
 S'object'
 p10
-sS'arg1'
-p11
-g10
 sS'graphics.exprs'
-p12
+p11
 NsS'in1'
-p13
+p12
 g4
 sS'model.dep_ut'
-p14
+p13
 S'vector_boolean'
-p15
+p14
 sS'exprs'
-p16
+p15
 g8
 sS'x.model'
-p17
+p16
 NsS'gr_i'
-p18
+p17
 S'vector'
-p19
+p18
 sS'model.in'
-p20
-g19
+p19
+g18
 sS'graphics'
-p21
+p20
 g10
 sS'y'
-p22
-g19
+p21
+g18
 sS'x'
+p22
+g18
+sS'model'
 p23
-NsS'model'
-p24
 g10
 sS'model.ipar'
-p25
+p24
 g4
 sS'typ'
-p26
-g19
+p25
+g18
 sS'nout'
-p27
+p26
 g4
 s.
\ No newline at end of file
diff --git a/js/Branching/M_SWITCH.pickle b/js/Branching/M_SWITCH.pickle
index befba602..27ec2591 100644
--- a/js/Branching/M_SWITCH.pickle
+++ b/js/Branching/M_SWITCH.pickle
@@ -17,83 +17,81 @@ p7
 atp8
 Rp9
 .(dp0
-S'arg1'
+S'graphics'
 p1
 S'object'
 p2
-sS'graphics'
-p3
-g2
 sS'it'
-p4
+p3
 S'matrix'
-p5
+p4
 sS'x.model'
-p6
+p5
 NsS'model.out'
-p7
+p6
 S'double'
-p8
+p7
 sS'out'
-p9
+p8
 S'vector'
-p10
+p9
 sS'x.graphics'
-p11
+p10
 g2
 sS'model.sim'
-p12
+p11
 S'list'
-p13
+p12
 sS'nin'
-p14
-g8
+p13
+g7
 sS'in1'
-p15
-g5
+p14
+g4
 sS'in2'
-p16
-g5
+p15
+g4
 sS'base'
-p17
-g8
+p16
+g7
 sS'model.in'
-p18
-g5
+p17
+g4
 sS'graphics.exprs'
-p19
+p18
 NsS'model.ipar'
-p20
-g5
+p19
+g4
 sS'typ'
-p21
-g10
+p20
+g9
 sS'model.blocktype'
-p22
+p21
 S'string'
-p23
+p22
 sS'model.dep_ut'
-p24
+p23
 S'vector_boolean'
-p25
+p24
 sS'exprs'
-p26
-g5
+p25
+g4
 sS'gr_i'
-p27
-g10
+p26
+g9
 sS'ipar'
-p28
-g5
+p27
+g4
 sS'y'
-p29
-g10
+p28
+g9
 sS'x'
+p29
+g9
+sS'model'
 p30
-NsS'model'
-p31
 g2
 sS'ot'
-p32
-g8
+p31
+g7
 s.
\ No newline at end of file
diff --git a/js/Branching/NRMSOM_f.pickle b/js/Branching/NRMSOM_f.pickle
index fc145ca0..257095bd 100644
--- a/js/Branching/NRMSOM_f.pickle
+++ b/js/Branching/NRMSOM_f.pickle
@@ -31,44 +31,42 @@ sS'x.graphics'
 p7
 S'object'
 p8
-sS'arg1'
+sS'graphics'
 p9
 g8
-sS'graphics.exprs'
+sS'in1'
 p10
-NsS'in1'
-p11
 S'matrix'
-p12
+p11
 sS'model.dep_ut'
-p13
+p12
 S'vector_boolean'
-p14
+p13
 sS'exprs'
-p15
+p14
 S'vector_string'
-p16
+p15
 sS'x.model'
-p17
+p16
 NsS'gr_i'
-p18
+p17
 S'vector'
-p19
+p18
 sS'model.in'
+p19
+g11
+sS'graphics.exprs'
 p20
-g12
-sS'graphics'
+NsS'y'
 p21
-g8
-sS'y'
-p22
-g19
+g18
 sS'x'
+p22
+g18
+sS'model'
 p23
-NsS'model'
-p24
 g8
 sS'typ'
-p25
-g19
+p24
+g18
 s.
\ No newline at end of file
diff --git a/js/Branching/RELAY_f.pickle b/js/Branching/RELAY_f.pickle
index b006c1ff..df865898 100644
--- a/js/Branching/RELAY_f.pickle
+++ b/js/Branching/RELAY_f.pickle
@@ -19,73 +19,71 @@ S'model.dstate'
 p1
 S'double'
 p2
-sS'arg1'
+sS'graphics'
 p3
 S'object'
 p4
-sS'graphics'
-p5
-g4
 sS'x.model'
-p6
+p5
 g4
 sS'model.out'
-p7
+p6
 g2
 sS'x.graphics'
-p8
+p7
 g4
 sS'model.evtin'
-p9
+p8
 g2
 sS'model.firing'
-p10
+p9
 S'vector'
-p11
+p10
 sS'model.sim'
-p12
+p11
 S'list'
-p13
+p12
 sS'nin'
-p14
+p13
 g2
 sS'i0'
-p15
+p14
 g2
 sS'in1'
-p16
+p15
 S'matrix'
-p17
+p16
 sS'model.in'
-p18
-g17
+p17
+g16
 sS'graphics.exprs'
-p19
+p18
 NsS'typ'
-p20
-g11
+p19
+g10
 sS'model.blocktype'
-p21
+p20
 S'string'
-p22
+p21
 sS'model.dep_ut'
-p23
+p22
 S'vector_boolean'
-p24
+p23
 sS'exprs'
-p25
-g17
+p24
+g16
 sS'gr_i'
-p26
-g11
+p25
+g10
 sS'ipar'
-p27
+p26
 NsS'y'
-p28
-g11
+p27
+g10
 sS'x'
+p28
+g10
+sS'model'
 p29
-NsS'model'
-p30
 g4
 s.
\ No newline at end of file
diff --git a/js/Branching/SCALAR2VECTOR.pickle b/js/Branching/SCALAR2VECTOR.pickle
index 93cbcbb1..0581323c 100644
--- a/js/Branching/SCALAR2VECTOR.pickle
+++ b/js/Branching/SCALAR2VECTOR.pickle
@@ -33,43 +33,41 @@ sS'x.graphics'
 p9
 S'object'
 p10
-sS'arg1'
-p11
-g10
 sS'graphics.exprs'
-p12
+p11
 NsS'model.dep_ut'
-p13
+p12
 S'vector_boolean'
-p14
+p13
 sS'exprs'
-p15
+p14
 S'vector_string'
-p16
+p15
 sS'x.model'
-p17
+p16
 NsS'gr_i'
-p18
+p17
 S'vector'
-p19
+p18
 sS'model.in'
-p20
+p19
 g4
 sS'graphics'
-p21
+p20
 g10
 sS'y'
-p22
-g19
+p21
+g18
 sS'x'
+p22
+g18
+sS'model'
 p23
-NsS'model'
-p24
 g10
 sS'typ'
-p25
-g19
+p24
+g18
 sS'nout'
-p26
+p25
 g4
 s.
\ No newline at end of file
diff --git a/js/Branching/SELECT_f.pickle b/js/Branching/SELECT_f.pickle
index 50df12a5..03bd4497 100644
--- a/js/Branching/SELECT_f.pickle
+++ b/js/Branching/SELECT_f.pickle
@@ -33,12 +33,13 @@ sS'x.graphics'
 p7
 S'object'
 p8
-sS'arg1'
+sS'z0'
 p9
-g8
-sS'graphics.exprs'
+g4
+sS'graphics'
 p10
-NsS'nin'
+g8
+sS'nin'
 p11
 g4
 sS'in1'
@@ -58,28 +59,25 @@ NsS'gr_i'
 p18
 S'vector'
 p19
-sS'z0'
-p20
-g4
 sS'model.in'
-p21
+p20
 g13
-sS'graphics'
+sS'graphics.exprs'
+p21
+NsS'y'
 p22
-g8
-sS'y'
-p23
 g19
 sS'x'
+p23
+g19
+sS'model'
 p24
-NsS'model'
-p25
 g8
 sS'typ'
-p26
+p25
 g19
 sS'model.blocktype'
-p27
+p26
 S'string'
-p28
+p27
 s.
\ No newline at end of file
diff --git a/js/Branching/SELECT_m.pickle b/js/Branching/SELECT_m.pickle
index 2599284e..07ebfe68 100644
--- a/js/Branching/SELECT_m.pickle
+++ b/js/Branching/SELECT_m.pickle
@@ -21,107 +21,105 @@ S'model.dstate'
 p1
 S'double'
 p2
-sS'arg1'
+sS'graphics'
 p3
 S'object'
 p4
-sS'graphics'
-p5
-g4
 sS'it'
-p6
+p5
 S'string'
-p7
+p6
 sS'x.model'
-p8
+p7
 NsS'model.out'
-p9
+p8
 g2
 sS'out'
-p10
+p9
 S'vector'
-p11
+p10
 sS'model.in2'
-p12
+p11
 S'matrix'
-p13
+p12
 sS'model.intyp'
-p14
+p13
 g2
 sS'x.graphics'
-p15
+p14
 g4
 sS'typ'
-p16
-g11
+p15
+g10
 sS'model.evtin'
-p17
+p16
 g2
 sS'model.firing'
-p18
-g11
+p17
+g10
 sS'model.sim'
-p19
+p18
 S'list'
-p20
+p19
 sS'model.evtout'
-p21
-g11
+p20
+g10
 sS'nin'
-p22
+p21
 g2
 sS'model.out2'
-p23
+p22
 g2
 sS'in1'
-p24
-g11
+p23
+g10
 sS'model.rpar'
-p25
-g11
+p24
+g10
 sS'model.outtyp'
-p26
+p25
 g2
 sS'model.state'
-p27
-g11
+p26
+g10
 sS'model.in'
-p28
-g13
+p27
+g12
 sS'graphics.exprs'
-p29
+p28
 NsS'model.ipar'
-p30
-g11
+p29
+g10
 sS'z0'
-p31
+p30
 g2
 sS'ok'
-p32
+p31
 S'boolean'
-p33
+p32
 sS'model.blocktype'
-p34
-g7
+p33
+g6
 sS'model.dep_ut'
-p35
+p34
 S'vector_boolean'
-p36
+p35
 sS'exprs'
-p37
-g13
+p36
+g12
 sS'gr_i'
-p38
-g11
+p37
+g10
 sS'y'
-p39
-g11
+p38
+g10
 sS'x'
+p39
+g10
+sS'model'
 p40
-NsS'model'
-p41
 g4
 sS'ot'
-p42
-g11
+p41
+g10
 s.
\ No newline at end of file
diff --git a/js/Branching/SWITCH2.pickle b/js/Branching/SWITCH2.pickle
index e221f43d..26316f0f 100644
--- a/js/Branching/SWITCH2.pickle
+++ b/js/Branching/SWITCH2.pickle
@@ -17,83 +17,81 @@ p7
 atp8
 Rp9
 .(dp0
-S'arg1'
+S'graphics'
 p1
 S'object'
 p2
-sS'graphics'
-p3
-g2
 sS'rpar'
-p4
+p3
 S'double'
-p5
+p4
 sS'x.model'
-p6
+p5
 NsS'model.dep_ut'
-p7
+p6
 S'vector_boolean'
-p8
+p7
 sS'model.out'
-p9
-g5
+p8
+g4
 sS'x.graphics'
-p10
+p9
 g2
 sS'typ'
-p11
+p10
 S'vector'
-p12
+p11
 sS'model.sim'
-p13
+p12
 S'list'
-p14
+p13
 sS'model.nmode'
-p15
-g5
+p14
+g4
 sS'model.rpar'
-p16
-g5
+p15
+g4
 sS'in1'
-p17
+p16
 S'matrix'
-p18
+p17
 sS'model.in'
-p19
-g18
+p18
+g17
 sS'graphics.exprs'
-p20
+p19
 NsS'model.ipar'
-p21
-g12
+p20
+g11
 sS'model.nzcross'
-p22
-g5
+p21
+g4
 sS'model.blocktype'
-p23
+p22
 S'string'
-p24
+p23
 sS'nzz'
-p25
-g5
+p24
+g4
 sS'rule'
-p26
-g5
+p25
+g4
 sS'exprs'
-p27
-g18
+p26
+g17
 sS'gr_i'
-p28
-g12
+p27
+g11
 sS'ipar'
-p29
-g12
+p28
+g11
 sS'y'
-p30
-g12
+p29
+g11
 sS'x'
+p30
+g11
+sS'model'
 p31
-NsS'model'
-p32
 g2
 s.
\ No newline at end of file
diff --git a/js/Branching/SWITCH2_m.pickle b/js/Branching/SWITCH2_m.pickle
index 7beb95f0..922e6aa8 100644
--- a/js/Branching/SWITCH2_m.pickle
+++ b/js/Branching/SWITCH2_m.pickle
@@ -19,110 +19,108 @@ p8
 atp9
 Rp10
 .(dp0
-S'arg1'
+S'graphics'
 p1
 S'object'
 p2
-sS'graphics'
-p3
-g2
 sS'rpar'
-p4
+p3
 S'double'
-p5
+p4
 sS'x.model'
-p6
+p5
 g2
 sS'model.dep_ut'
-p7
+p6
 S'vector_boolean'
-p8
+p7
 sS'model.out'
-p9
-g5
+p8
+g4
 sS'it[3-1]'
-p10
+p9
 NsS'out'
-p11
+p10
 S'vector'
-p12
+p11
 sS'model.in2'
-p13
+p12
 S'matrix'
-p14
+p13
 sS'model.intyp'
-p15
-g5
+p14
+g4
 sS'x.graphics'
-p16
+p15
 g2
 sS'it[2-1]'
-p17
-g5
+p16
+g4
 sS'typ'
-p18
-g12
+p17
+g11
 sS'model.sim'
-p19
+p18
 S'list'
-p20
+p19
 sS'model.out2'
-p21
-g5
+p20
+g4
 sS'model.nmode'
-p22
-g5
+p21
+g4
 sS'model.rpar'
-p23
-g5
+p22
+g4
 sS'in1'
-p24
-g12
+p23
+g11
 sS'model.outtyp'
-p25
-g5
+p24
+g4
 sS'model.in'
-p26
-g14
+p25
+g13
 sS'graphics.exprs'
-p27
+p26
 NsS'model.ipar'
-p28
-g12
+p27
+g11
 sS'model.nzcross'
-p29
-g5
+p28
+g4
 sS'ok'
-p30
+p29
 S'boolean'
-p31
+p30
 sS'model.blocktype'
-p32
+p31
 S'string'
-p33
+p32
 sS'nzz'
-p34
-g5
+p33
+g4
 sS'rule'
-p35
-g5
+p34
+g4
 sS'exprs'
-p36
-g14
+p35
+g13
 sS'gr_i'
-p37
-g12
+p36
+g11
 sS'ipar'
-p38
-g12
+p37
+g11
 sS'y'
-p39
-g12
+p38
+g11
 sS'x'
+p39
+g11
+sS'model'
 p40
-NsS'model'
-p41
 g2
 sS'it[1-1]'
-p42
+p41
 Ns.
\ No newline at end of file
diff --git a/js/Branching/SWITCH_f.pickle b/js/Branching/SWITCH_f.pickle
index 506bf9f1..ab7e34b2 100644
--- a/js/Branching/SWITCH_f.pickle
+++ b/js/Branching/SWITCH_f.pickle
@@ -15,74 +15,72 @@ p6
 atp7
 Rp8
 .(dp0
-S'arg1'
+S'model.sim'
 p1
-S'object'
+S'list'
 p2
-sS'graphics'
+sS'model.out'
 p3
-g2
-sS'x.model'
+S'double'
 p4
-g2
-sS'model.out'
+sS'nin'
 p5
-S'double'
+g4
+sS'model.in'
 p6
-sS'x.graphics'
+S'matrix'
 p7
-g2
-sS'model.firing'
+sS'x.graphics'
 p8
-S'vector'
+S'object'
 p9
-sS'model.sim'
+sS'i0'
 p10
-S'list'
+g4
+sS'graphics.exprs'
 p11
-sS'nin'
+NsS'in1'
 p12
-g6
-sS'i0'
+g7
+sS'model.dep_ut'
 p13
-g6
-sS'in1'
+S'vector_boolean'
 p14
-S'matrix'
+sS'exprs'
 p15
-sS'model.in'
+g7
+sS'x.model'
 p16
-g15
-sS'graphics.exprs'
+g9
+sS'gr_i'
 p17
-NsS'model.ipar'
+S'vector'
 p18
-g6
-sS'typ'
+sS'ipar'
 p19
-g9
-sS'model.blocktype'
+NsS'graphics'
 p20
-S'string'
+g9
+sS'y'
 p21
-sS'model.dep_ut'
+g18
+sS'x'
 p22
-S'vector_boolean'
+g18
+sS'model'
 p23
-sS'exprs'
+g9
+sS'model.ipar'
 p24
-g15
-sS'gr_i'
+g4
+sS'typ'
 p25
-g9
-sS'ipar'
+g18
+sS'model.firing'
 p26
-NsS'y'
+g18
+sS'model.blocktype'
 p27
-g9
-sS'x'
+S'string'
 p28
-NsS'model'
-p29
-g2
 s.
\ No newline at end of file