fix var when assigning

27 files changed, 618 insertions, 621 deletions

diff --git a/js/MatrixOp/CUMSUM.pickle b/js/MatrixOp/CUMSUM.pickle
index 08d0e9a0..6646e7f5 100644
--- a/js/MatrixOp/CUMSUM.pickle
+++ b/js/MatrixOp/CUMSUM.pickle
@@ -60,66 +60,66 @@ sS'function_name'
 p18
 S'string'
 p19
-sS'this.x'
-p20
-g7
 sS'model.sim'
-p21
+p20
 g2
 sS'model.evtout'
-p22
+p21
 g2
 sS'arg1.graphics'
-p23
+p22
 g4
 sS'model.out2'
-p24
+p23
 g7
 sS'in1'
-p25
+p24
 g2
 sS'model.rpar'
-p26
+p25
 g2
 sS'model.outtyp'
-p27
+p26
 g7
 sS'model.state'
-p28
+p27
 g2
 sS'graphics.exprs'
-p29
+p28
 NsS'model.ipar'
-p30
+p29
 g2
 sS'typ'
-p31
+p30
 g2
 sS'[model,graphics,ok]'
-p32
+p31
 g7
 sS'arg1.model'
-p33
+p32
 g4
 sS'label[9-1]'
-p34
+p33
 g2
 sS'ok'
-p35
+p34
 S'boolean'
-p36
+p35
 sS'model.blocktype'
-p37
+p36
 g19
 sS'model.dep_ut'
-p38
+p37
 g2
 sS'gr_i'
-p39
+p38
 g2
 sS'y'
-p40
+p39
 g2
+sS'x'
+p40
+g7
 sS'model'
 p41
 g4
diff --git a/js/MatrixOp/EXTRACT.js b/js/MatrixOp/EXTRACT.js
index ca7cd974..973e75c0 100644
--- a/js/MatrixOp/EXTRACT.js
+++ b/js/MatrixOp/EXTRACT.js
@@ -38,8 +38,8 @@ function EXTRACT() {
     }
     EXTRACT.prototype.set = function EXTRACT() {
         this.typ = inverse((arguments[0]["typ"]))
-        this.a = parseFloat((arguments[0]["a"]))
-        this.b = parseFloat((arguments[0]["b"]))
+        this.a = inverse((arguments[0]["a"]))
+        this.b = inverse((arguments[0]["b"]))
         this.x = arg1;
         graphics = arg1.graphics;
         label = graphics.exprs;
diff --git a/js/MatrixOp/EXTRACT.pickle b/js/MatrixOp/EXTRACT.pickle
index b46af2fd..632d3a55 100644
--- a/js/MatrixOp/EXTRACT.pickle
+++ b/js/MatrixOp/EXTRACT.pickle
@@ -33,105 +33,105 @@ g7
 sS'funtyp'
 p9
 g7
-sS'this.a'
-p10
-g2
 sS'model.out'
-p11
+p10
 g7
 sS'out'
-p12
+p11
 g2
 sS'model.in2'
-p13
+p12
 g7
 sS'model.in1'
-p14
+p13
 g7
 sS'label'
-p15
+p14
 S'matrix'
-p16
+p15
 sS'model.evtin'
-p17
+p16
 g2
 sS'model.firing'
-p18
+p17
 g2
 sS'function_name'
-p19
+p18
 S'string'
-p20
-sS'this.x'
-p21
-g7
+p19
 sS'model.sim'
-p22
+p20
 g2
 sS'model.evtout'
-p23
+p21
 g2
 sS'arg1.graphics'
-p24
+p22
 g4
 sS'model.out2'
-p25
+p23
 g7
 sS'in1'
-p26
+p24
 g2
 sS'model.rpar'
-p27
+p25
 g2
 sS'model.outtyp'
-p28
+p26
 g7
+sS'b'
+p27
+g2
 sS'model.state'
-p29
+p28
 g2
 sS'graphics'
-p30
+p29
 g4
 sS'ma'
-p31
+p30
 g7
-sS'this.b'
-p32
-g2
 sS'model.ipar'
-p33
+p31
 g2
 sS'typ'
-p34
+p32
+g2
+sS'a'
+p33
 g2
 sS'[model,graphics,ok]'
-p35
+p34
 g7
 sS'arg1.model'
-p36
+p35
 g4
 sS'label[9-1]'
-p37
+p36
 g2
 sS'ok'
-p38
+p37
 S'boolean'
-p39
+p38
 sS'model.blocktype'
-p40
-g20
+p39
+g19
 sS'mb'
-p41
+p40
 g7
 sS'model.dep_ut'
-p42
+p41
 g2
 sS'gr_i'
-p43
+p42
 g2
 sS'y'
-p44
+p43
 g2
+sS'x'
+p44
+g7
 sS'model'
 p45
 g4
diff --git a/js/MatrixOp/EXTTRI.pickle b/js/MatrixOp/EXTTRI.pickle
index 08d0e9a0..6646e7f5 100644
--- a/js/MatrixOp/EXTTRI.pickle
+++ b/js/MatrixOp/EXTTRI.pickle
@@ -60,66 +60,66 @@ sS'function_name'
 p18
 S'string'
 p19
-sS'this.x'
-p20
-g7
 sS'model.sim'
-p21
+p20
 g2
 sS'model.evtout'
-p22
+p21
 g2
 sS'arg1.graphics'
-p23
+p22
 g4
 sS'model.out2'
-p24
+p23
 g7
 sS'in1'
-p25
+p24
 g2
 sS'model.rpar'
-p26
+p25
 g2
 sS'model.outtyp'
-p27
+p26
 g7
 sS'model.state'
-p28
+p27
 g2
 sS'graphics.exprs'
-p29
+p28
 NsS'model.ipar'
-p30
+p29
 g2
 sS'typ'
-p31
+p30
 g2
 sS'[model,graphics,ok]'
-p32
+p31
 g7
 sS'arg1.model'
-p33
+p32
 g4
 sS'label[9-1]'
-p34
+p33
 g2
 sS'ok'
-p35
+p34
 S'boolean'
-p36
+p35
 sS'model.blocktype'
-p37
+p36
 g19
 sS'model.dep_ut'
-p38
+p37
 g2
 sS'gr_i'
-p39
+p38
 g2
 sS'y'
-p40
+p39
 g2
+sS'x'
+p40
+g7
 sS'model'
 p41
 g4
diff --git a/js/MatrixOp/MATBKSL.pickle b/js/MatrixOp/MATBKSL.pickle
index d425a7a1..e72e5ed5 100644
--- a/js/MatrixOp/MATBKSL.pickle
+++ b/js/MatrixOp/MATBKSL.pickle
@@ -56,66 +56,66 @@ sS'function_name'
 p18
 S'string'
 p19
-sS'this.x'
-p20
-g9
 sS'model.sim'
-p21
+p20
 g2
 sS'model.evtout'
-p22
+p21
 g2
 sS'arg1.graphics'
-p23
+p22
 g4
 sS'model.out2'
-p24
+p23
 g9
 sS'in1'
-p25
+p24
 g2
 sS'model.rpar'
-p26
+p25
 g2
 sS'model.outtyp'
-p27
+p26
 g9
 sS'model.state'
-p28
+p27
 g2
 sS'graphics.exprs'
-p29
+p28
 NsS'model.ipar'
-p30
+p29
 g2
 sS'typ'
-p31
+p30
 g2
 sS'[model,graphics,ok]'
-p32
+p31
 g9
 sS'arg1.model'
-p33
+p32
 g4
 sS'label[9-1]'
-p34
+p33
 g2
 sS'ok'
-p35
+p34
 S'boolean'
-p36
+p35
 sS'model.blocktype'
-p37
+p36
 g19
 sS'model.dep_ut'
-p38
+p37
 g2
 sS'gr_i'
-p39
+p38
 g2
 sS'y'
-p40
+p39
 g2
+sS'x'
+p40
+g9
 sS'model'
 p41
 g4
diff --git a/js/MatrixOp/MATCATH.pickle b/js/MatrixOp/MATCATH.pickle
index ed2e32fa..f646b261 100644
--- a/js/MatrixOp/MATCATH.pickle
+++ b/js/MatrixOp/MATCATH.pickle
@@ -55,61 +55,61 @@ sS'function_name'
 p17
 S'string'
 p18
-sS'this.x'
-p19
-g7
 sS'model.sim'
-p20
+p19
 g2
 sS'model.evtout'
-p21
+p20
 g2
 sS'arg1.graphics'
-p22
+p21
 g4
 sS'model.out2'
-p23
+p22
 g7
 sS'in1'
-p24
+p23
 g2
 sS'model.rpar'
-p25
+p24
 g2
 sS'model.in1'
-p26
+p25
 g12
 sS'model.outtyp'
-p27
+p26
 g7
 sS'model.state'
-p28
+p27
 g2
 sS'graphics.exprs'
-p29
+p28
 NsS'model.ipar'
-p30
+p29
 g2
 sS'typ'
-p31
+p30
 g2
 sS'[model,graphics,ok]'
-p32
+p31
 g7
 sS'arg1.model'
-p33
+p32
 NsS'model.blocktype'
-p34
+p33
 g18
 sS'model.dep_ut'
-p35
+p34
 g2
 sS'gr_i'
-p36
+p35
 g2
 sS'y'
-p37
+p36
 g2
+sS'x'
+p37
+g7
 sS'model'
 p38
 g4
diff --git a/js/MatrixOp/MATCATV.pickle b/js/MatrixOp/MATCATV.pickle
index 42c3e017..dfc3dbb8 100644
--- a/js/MatrixOp/MATCATV.pickle
+++ b/js/MatrixOp/MATCATV.pickle
@@ -55,64 +55,64 @@ sS'function_name'
 p17
 S'string'
 p18
-sS'this.x'
-p19
-g7
 sS'model.sim'
-p20
+p19
 g2
 sS'model.evtout'
-p21
+p20
 g2
 sS'arg1.graphics'
-p22
+p21
 g4
 sS'model.out2'
-p23
+p22
 g7
 sS'in1'
-p24
+p23
 g2
 sS'model.rpar'
-p25
+p24
 g2
 sS'model.in1'
-p26
+p25
 g12
 sS'model.outtyp'
-p27
+p26
 g7
 sS'model.state'
-p28
+p27
 g2
 sS'graphics.exprs'
-p29
+p28
 NsS'model.ipar'
-p30
+p29
 g2
 sS'typ'
-p31
+p30
 g2
 sS'[model,graphics,ok]'
-p32
+p31
 g7
 sS'arg1.model'
-p33
+p32
 NsS'model.blocktype'
-p34
+p33
 g18
 sS'model.dep_ut'
-p35
+p34
 g2
 sS'gr_i'
-p36
+p35
 g2
 sS'l1'
-p37
+p36
 g12
 sS'y'
-p38
+p37
 g2
+sS'x'
+p38
+g7
 sS'model'
 p39
 g4
diff --git a/js/MatrixOp/MATDET.pickle b/js/MatrixOp/MATDET.pickle
index 8c879e7c..bd912c03 100644
--- a/js/MatrixOp/MATDET.pickle
+++ b/js/MatrixOp/MATDET.pickle
@@ -55,66 +55,66 @@ sS'function_name'
 p17
 S'string'
 p18
-sS'this.x'
-p19
-g7
 sS'model.sim'
-p20
+p19
 g2
 sS'model.evtout'
-p21
+p20
 g2
 sS'arg1.graphics'
-p22
+p21
 g4
 sS'model.out2'
-p23
+p22
 g7
 sS'in1'
-p24
+p23
 g2
 sS'model.rpar'
-p25
+p24
 g2
 sS'model.outtyp'
-p26
+p25
 g7
 sS'model.state'
-p27
+p26
 g2
 sS'graphics.exprs'
-p28
+p27
 NsS'model.ipar'
-p29
+p28
 g2
 sS'typ'
-p30
+p29
 g2
 sS'[model,graphics,ok]'
-p31
+p30
 g7
 sS'arg1.model'
-p32
+p31
 g4
 sS'label[9-1]'
-p33
+p32
 g2
 sS'ok'
-p34
+p33
 S'boolean'
-p35
+p34
 sS'model.blocktype'
-p36
+p35
 g18
 sS'model.dep_ut'
-p37
+p36
 g2
 sS'gr_i'
-p38
+p37
 g2
 sS'y'
-p39
+p38
 g2
+sS'x'
+p39
+g7
 sS'model'
 p40
 g4
diff --git a/js/MatrixOp/MATDIAG.pickle b/js/MatrixOp/MATDIAG.pickle
index 8c879e7c..bd912c03 100644
--- a/js/MatrixOp/MATDIAG.pickle
+++ b/js/MatrixOp/MATDIAG.pickle
@@ -55,66 +55,66 @@ sS'function_name'
 p17
 S'string'
 p18
-sS'this.x'
-p19
-g7
 sS'model.sim'
-p20
+p19
 g2
 sS'model.evtout'
-p21
+p20
 g2
 sS'arg1.graphics'
-p22
+p21
 g4
 sS'model.out2'
-p23
+p22
 g7
 sS'in1'
-p24
+p23
 g2
 sS'model.rpar'
-p25
+p24
 g2
 sS'model.outtyp'
-p26
+p25
 g7
 sS'model.state'
-p27
+p26
 g2
 sS'graphics.exprs'
-p28
+p27
 NsS'model.ipar'
-p29
+p28
 g2
 sS'typ'
-p30
+p29
 g2
 sS'[model,graphics,ok]'
-p31
+p30
 g7
 sS'arg1.model'
-p32
+p31
 g4
 sS'label[9-1]'
-p33
+p32
 g2
 sS'ok'
-p34
+p33
 S'boolean'
-p35
+p34
 sS'model.blocktype'
-p36
+p35
 g18
 sS'model.dep_ut'
-p37
+p36
 g2
 sS'gr_i'
-p38
+p37
 g2
 sS'y'
-p39
+p38
 g2
+sS'x'
+p39
+g7
 sS'model'
 p40
 g4
diff --git a/js/MatrixOp/MATDIV.pickle b/js/MatrixOp/MATDIV.pickle
index d425a7a1..e72e5ed5 100644
--- a/js/MatrixOp/MATDIV.pickle
+++ b/js/MatrixOp/MATDIV.pickle
@@ -56,66 +56,66 @@ sS'function_name'
 p18
 S'string'
 p19
-sS'this.x'
-p20
-g9
 sS'model.sim'
-p21
+p20
 g2
 sS'model.evtout'
-p22
+p21
 g2
 sS'arg1.graphics'
-p23
+p22
 g4
 sS'model.out2'
-p24
+p23
 g9
 sS'in1'
-p25
+p24
 g2
 sS'model.rpar'
-p26
+p25
 g2
 sS'model.outtyp'
-p27
+p26
 g9
 sS'model.state'
-p28
+p27
 g2
 sS'graphics.exprs'
-p29
+p28
 NsS'model.ipar'
-p30
+p29
 g2
 sS'typ'
-p31
+p30
 g2
 sS'[model,graphics,ok]'
-p32
+p31
 g9
 sS'arg1.model'
-p33
+p32
 g4
 sS'label[9-1]'
-p34
+p33
 g2
 sS'ok'
-p35
+p34
 S'boolean'
-p36
+p35
 sS'model.blocktype'
-p37
+p36
 g19
 sS'model.dep_ut'
-p38
+p37
 g2
 sS'gr_i'
-p39
+p38
 g2
 sS'y'
-p40
+p39
 g2
+sS'x'
+p40
+g9
 sS'model'
 p41
 g4
diff --git a/js/MatrixOp/MATEIG.pickle b/js/MatrixOp/MATEIG.pickle
index 3abd2718..1f8a0e90 100644
--- a/js/MatrixOp/MATEIG.pickle
+++ b/js/MatrixOp/MATEIG.pickle
@@ -60,65 +60,65 @@ sS'function_name'
 p18
 S'string'
 p19
-sS'this.x'
-p20
-g7
 sS'model.sim'
-p21
+p20
 g2
 sS'model.evtout'
-p22
+p21
 g2
 sS'arg1.graphics'
-p23
+p22
 g4
 sS'model.out2'
-p24
+p23
 g7
 sS'in1'
-p25
+p24
 g2
 sS'model.rpar'
-p26
+p25
 g2
 sS'model.outtyp'
-p27
+p26
 g7
 sS'model.state'
-p28
+p27
 g2
 sS'graphics.exprs'
-p29
+p28
 NsS'model.ipar'
-p30
+p29
 g2
 sS'typ'
-p31
+p30
 g2
 sS'[model,graphics,ok]'
-p32
+p31
 g7
 sS'arg1.model'
-p33
+p32
 NsS'label[9-1]'
-p34
+p33
 g2
 sS'ok'
-p35
+p34
 S'boolean'
-p36
+p35
 sS'model.blocktype'
-p37
+p36
 g19
 sS'model.dep_ut'
-p38
+p37
 g2
 sS'gr_i'
-p39
+p38
 g2
 sS'y'
-p40
+p39
 g2
+sS'x'
+p40
+g7
 sS'model'
 p41
 g4
diff --git a/js/MatrixOp/MATEXPM.pickle b/js/MatrixOp/MATEXPM.pickle
index 8c879e7c..bd912c03 100644
--- a/js/MatrixOp/MATEXPM.pickle
+++ b/js/MatrixOp/MATEXPM.pickle
@@ -55,66 +55,66 @@ sS'function_name'
 p17
 S'string'
 p18
-sS'this.x'
-p19
-g7
 sS'model.sim'
-p20
+p19
 g2
 sS'model.evtout'
-p21
+p20
 g2
 sS'arg1.graphics'
-p22
+p21
 g4
 sS'model.out2'
-p23
+p22
 g7
 sS'in1'
-p24
+p23
 g2
 sS'model.rpar'
-p25
+p24
 g2
 sS'model.outtyp'
-p26
+p25
 g7
 sS'model.state'
-p27
+p26
 g2
 sS'graphics.exprs'
-p28
+p27
 NsS'model.ipar'
-p29
+p28
 g2
 sS'typ'
-p30
+p29
 g2
 sS'[model,graphics,ok]'
-p31
+p30
 g7
 sS'arg1.model'
-p32
+p31
 g4
 sS'label[9-1]'
-p33
+p32
 g2
 sS'ok'
-p34
+p33
 S'boolean'
-p35
+p34
 sS'model.blocktype'
-p36
+p35
 g18
 sS'model.dep_ut'
-p37
+p36
 g2
 sS'gr_i'
-p38
+p37
 g2
 sS'y'
-p39
+p38
 g2
+sS'x'
+p39
+g7
 sS'model'
 p40
 g4
diff --git a/js/MatrixOp/MATINV.pickle b/js/MatrixOp/MATINV.pickle
index 8c879e7c..bd912c03 100644
--- a/js/MatrixOp/MATINV.pickle
+++ b/js/MatrixOp/MATINV.pickle
@@ -55,66 +55,66 @@ sS'function_name'
 p17
 S'string'
 p18
-sS'this.x'
-p19
-g7
 sS'model.sim'
-p20
+p19
 g2
 sS'model.evtout'
-p21
+p20
 g2
 sS'arg1.graphics'
-p22
+p21
 g4
 sS'model.out2'
-p23
+p22
 g7
 sS'in1'
-p24
+p23
 g2
 sS'model.rpar'
-p25
+p24
 g2
 sS'model.outtyp'
-p26
+p25
 g7
 sS'model.state'
-p27
+p26
 g2
 sS'graphics.exprs'
-p28
+p27
 NsS'model.ipar'
-p29
+p28
 g2
 sS'typ'
-p30
+p29
 g2
 sS'[model,graphics,ok]'
-p31
+p30
 g7
 sS'arg1.model'
-p32
+p31
 g4
 sS'label[9-1]'
-p33
+p32
 g2
 sS'ok'
-p34
+p33
 S'boolean'
-p35
+p34
 sS'model.blocktype'
-p36
+p35
 g18
 sS'model.dep_ut'
-p37
+p36
 g2
 sS'gr_i'
-p38
+p37
 g2
 sS'y'
-p39
+p38
 g2
+sS'x'
+p39
+g7
 sS'model'
 p40
 g4
diff --git a/js/MatrixOp/MATLU.pickle b/js/MatrixOp/MATLU.pickle
index 426c4cbc..fb806027 100644
--- a/js/MatrixOp/MATLU.pickle
+++ b/js/MatrixOp/MATLU.pickle
@@ -26,12 +26,12 @@ sS'it'
 p6
 S'double'
 p7
-sS'funtyp'
+sS'x.model'
 p8
-g7
-sS'this.x.model'
-p9
 g4
+sS'funtyp'
+p9
+g7
 sS'model.out'
 p10
 S'matrix'
@@ -42,9 +42,9 @@ g7
 sS'model.in1'
 p13
 g7
-sS'typ'
+sS'x.graphics'
 p14
-g2
+g4
 sS'label'
 p15
 g7
@@ -58,60 +58,60 @@ sS'function_name'
 p18
 S'string'
 p19
-sS'this.x'
-p20
-g7
 sS'model.sim'
-p21
+p20
 g2
 sS'model.evtout'
-p22
+p21
 g2
 sS'model.out2'
-p23
+p22
 g11
 sS'model.intyp'
-p24
+p23
 g7
 sS'model.rpar'
-p25
+p24
 g2
 sS'model.outtyp'
-p26
+p25
 g2
 sS'model.state'
-p27
+p26
 g2
 sS'graphics.exprs'
-p28
+p27
 NsS'model.ipar'
+p28
+g2
+sS'typ'
 p29
 g2
-sS'this.x.graphics'
-p30
-g4
 sS'[model,graphics,ok]'
-p31
+p30
 g7
 sS'label[9-1]'
-p32
+p31
 g2
 sS'ok'
-p33
+p32
 S'boolean'
-p34
+p33
 sS'model.blocktype'
-p35
+p34
 g19
 sS'model.dep_ut'
-p36
+p35
 g2
 sS'gr_i'
-p37
+p36
 g2
 sS'y'
-p38
+p37
 g2
+sS'x'
+p38
+g7
 sS'model'
 p39
 g4
diff --git a/js/MatrixOp/MATMAGPHI.pickle b/js/MatrixOp/MATMAGPHI.pickle
index fc934bfc..88eb46d5 100644
--- a/js/MatrixOp/MATMAGPHI.pickle
+++ b/js/MatrixOp/MATMAGPHI.pickle
@@ -58,65 +58,65 @@ sS'function_name'
 p18
 S'string'
 p19
-sS'this.x'
-p20
-g8
 sS'model.sim'
-p21
+p20
 g2
 sS'model.evtout'
-p22
+p21
 g2
 sS'arg1.graphics'
-p23
+p22
 g4
 sS'model.out2'
-p24
+p23
 g11
 sS'in1'
-p25
+p24
 g11
 sS'model.rpar'
-p26
+p25
 g2
 sS'model.outtyp'
-p27
+p26
 g2
 sS'model.state'
-p28
+p27
 g2
 sS'graphics.exprs'
-p29
+p28
 NsS'model.ipar'
-p30
+p29
 g2
 sS'typ'
-p31
+p30
 g2
 sS'[model,graphics,ok]'
-p32
+p31
 g8
 sS'arg1.model'
-p33
+p32
 NsS'label[9-1]'
-p34
+p33
 g2
 sS'ok'
-p35
+p34
 S'boolean'
-p36
+p35
 sS'model.blocktype'
-p37
+p36
 g19
 sS'model.dep_ut'
-p38
+p37
 g2
 sS'gr_i'
-p39
+p38
 g2
 sS'y'
-p40
+p39
 g2
+sS'x'
+p40
+g8
 sS'model'
 p41
 g4
diff --git a/js/MatrixOp/MATMUL.pickle b/js/MatrixOp/MATMUL.pickle
index c4d37466..ca58fcfb 100644
--- a/js/MatrixOp/MATMUL.pickle
+++ b/js/MatrixOp/MATMUL.pickle
@@ -13,33 +13,33 @@ p5
 atp6
 Rp7
 .(dp0
-S'this.np'
+S'arg1'
 p1
-S'double'
+S'object'
 p2
-sS'arg1'
+sS'graphics.exprs'
 p3
-S'object'
+NsS'it'
 p4
-sS'graphics.exprs'
+S'string'
 p5
-NsS'it'
+sS'x.model'
 p6
-S'string'
+g2
+sS'model.dep_ut'
 p7
-sS'this.x.model'
+S'vector'
 p8
-g4
 sS'model.out'
 p9
-g2
-sS'label[3-1]'
+S'double'
 p10
-g2
-sS'out'
+sS'label[3-1]'
 p11
-S'vector'
+g10
+sS'out'
 p12
+g8
 sS'model.in2'
 p13
 S'matrix'
@@ -47,27 +47,27 @@ p14
 sS'model.in1'
 p15
 g14
-sS'this.x.graphics'
+sS'x.graphics'
 p16
-g4
+g2
 sS'kmin'
 p17
-g2
+g10
 sS'label'
 p18
-g12
-sS'this.x'
+g8
+sS'np'
 p19
-g2
+g10
 sS'model.sim'
 p20
-g12
+g8
 sS'label[2-1]'
 p21
-g2
+g10
 sS'model.out2'
 p22
-g2
+g10
 sS'in1'
 p23
 g14
@@ -76,47 +76,44 @@ p24
 g14
 sS'kmax'
 p25
-g2
+g10
 sS'graphics'
 p26
-g4
+g2
 sS'model.ipar'
 p27
-g2
+g10
 sS'typ'
 p28
-g12
+g8
 sS'[model,graphics,ok]'
 p29
-g2
+g10
 sS'ot'
 p30
 NsS'ok'
 p31
 S'boolean'
 p32
-sS'model.dep_ut'
+sS'rule'
 p33
-g12
-sS'this.rule'
-p34
-g2
+g10
 sS'gr_i'
-p35
-g12
+p34
+g8
 sS'TABMIN'
-p36
+p35
 g14
 sS'y'
-p37
-g12
+p36
+g8
 sS'x'
-p38
-g4
+p37
+g10
 sS'model'
-p39
-g4
+p38
+g2
 sS'TABMAX'
-p40
+p39
 g14
 s.
\ No newline at end of file
diff --git a/js/MatrixOp/MATPINV.pickle b/js/MatrixOp/MATPINV.pickle
index 8c879e7c..bd912c03 100644
--- a/js/MatrixOp/MATPINV.pickle
+++ b/js/MatrixOp/MATPINV.pickle
@@ -55,66 +55,66 @@ sS'function_name'
 p17
 S'string'
 p18
-sS'this.x'
-p19
-g7
 sS'model.sim'
-p20
+p19
 g2
 sS'model.evtout'
-p21
+p20
 g2
 sS'arg1.graphics'
-p22
+p21
 g4
 sS'model.out2'
-p23
+p22
 g7
 sS'in1'
-p24
+p23
 g2
 sS'model.rpar'
-p25
+p24
 g2
 sS'model.outtyp'
-p26
+p25
 g7
 sS'model.state'
-p27
+p26
 g2
 sS'graphics.exprs'
-p28
+p27
 NsS'model.ipar'
-p29
+p28
 g2
 sS'typ'
-p30
+p29
 g2
 sS'[model,graphics,ok]'
-p31
+p30
 g7
 sS'arg1.model'
-p32
+p31
 g4
 sS'label[9-1]'
-p33
+p32
 g2
 sS'ok'
-p34
+p33
 S'boolean'
-p35
+p34
 sS'model.blocktype'
-p36
+p35
 g18
 sS'model.dep_ut'
-p37
+p36
 g2
 sS'gr_i'
-p38
+p37
 g2
 sS'y'
-p39
+p38
 g2
+sS'x'
+p39
+g7
 sS'model'
 p40
 g4
diff --git a/js/MatrixOp/MATRESH.pickle b/js/MatrixOp/MATRESH.pickle
index b9ca7483..02b5b27a 100644
--- a/js/MatrixOp/MATRESH.pickle
+++ b/js/MatrixOp/MATRESH.pickle
@@ -56,68 +56,68 @@ sS'function_name'
 p16
 S'string'
 p17
-sS'this.x'
-p18
-g7
 sS'model.sim'
-p19
+p18
 g2
 sS'model.evtout'
-p20
+p19
 g2
 sS'nin'
-p21
+p20
 g7
 sS'arg1.graphics'
-p22
+p21
 g4
 sS'model.out2'
-p23
+p22
 g7
 sS'model.intyp'
-p24
+p23
 g7
 sS'model.rpar'
-p25
+p24
 g2
 sS'model.outtyp'
-p26
+p25
 g7
 sS'model.state'
-p27
+p26
 g2
 sS'graphics.exprs'
-p28
+p27
 NsS'model.ipar'
-p29
+p28
 g2
 sS'typ'
-p30
+p29
 g2
 sS'[model,graphics,ok]'
-p31
+p30
 g7
 sS'arg1.model'
-p32
+p31
 NsS'label[9-1]'
-p33
+p32
 g2
 sS'ok'
-p34
+p33
 S'boolean'
-p35
+p34
 sS'model.blocktype'
-p36
+p35
 g17
 sS'model.dep_ut'
-p37
+p36
 g2
 sS'gr_i'
-p38
+p37
 g2
 sS'y'
-p39
+p38
 g2
+sS'x'
+p39
+g7
 sS'model'
 p40
 g4
diff --git a/js/MatrixOp/MATSING.pickle b/js/MatrixOp/MATSING.pickle
index 3abd2718..1f8a0e90 100644
--- a/js/MatrixOp/MATSING.pickle
+++ b/js/MatrixOp/MATSING.pickle
@@ -60,65 +60,65 @@ sS'function_name'
 p18
 S'string'
 p19
-sS'this.x'
-p20
-g7
 sS'model.sim'
-p21
+p20
 g2
 sS'model.evtout'
-p22
+p21
 g2
 sS'arg1.graphics'
-p23
+p22
 g4
 sS'model.out2'
-p24
+p23
 g7
 sS'in1'
-p25
+p24
 g2
 sS'model.rpar'
-p26
+p25
 g2
 sS'model.outtyp'
-p27
+p26
 g7
 sS'model.state'
-p28
+p27
 g2
 sS'graphics.exprs'
-p29
+p28
 NsS'model.ipar'
-p30
+p29
 g2
 sS'typ'
-p31
+p30
 g2
 sS'[model,graphics,ok]'
-p32
+p31
 g7
 sS'arg1.model'
-p33
+p32
 NsS'label[9-1]'
-p34
+p33
 g2
 sS'ok'
-p35
+p34
 S'boolean'
-p36
+p35
 sS'model.blocktype'
-p37
+p36
 g19
 sS'model.dep_ut'
-p38
+p37
 g2
 sS'gr_i'
-p39
+p38
 g2
 sS'y'
-p40
+p39
 g2
+sS'x'
+p40
+g7
 sS'model'
 p41
 g4
diff --git a/js/MatrixOp/MATSUM.pickle b/js/MatrixOp/MATSUM.pickle
index 08d0e9a0..6646e7f5 100644
--- a/js/MatrixOp/MATSUM.pickle
+++ b/js/MatrixOp/MATSUM.pickle
@@ -60,66 +60,66 @@ sS'function_name'
 p18
 S'string'
 p19
-sS'this.x'
-p20
-g7
 sS'model.sim'
-p21
+p20
 g2
 sS'model.evtout'
-p22
+p21
 g2
 sS'arg1.graphics'
-p23
+p22
 g4
 sS'model.out2'
-p24
+p23
 g7
 sS'in1'
-p25
+p24
 g2
 sS'model.rpar'
-p26
+p25
 g2
 sS'model.outtyp'
-p27
+p26
 g7
 sS'model.state'
-p28
+p27
 g2
 sS'graphics.exprs'
-p29
+p28
 NsS'model.ipar'
-p30
+p29
 g2
 sS'typ'
-p31
+p30
 g2
 sS'[model,graphics,ok]'
-p32
+p31
 g7
 sS'arg1.model'
-p33
+p32
 g4
 sS'label[9-1]'
-p34
+p33
 g2
 sS'ok'
-p35
+p34
 S'boolean'
-p36
+p35
 sS'model.blocktype'
-p37
+p36
 g19
 sS'model.dep_ut'
-p38
+p37
 g2
 sS'gr_i'
-p39
+p38
 g2
 sS'y'
-p40
+p39
 g2
+sS'x'
+p40
+g7
 sS'model'
 p41
 g4
diff --git a/js/MatrixOp/MATTRAN.pickle b/js/MatrixOp/MATTRAN.pickle
index 2c04abe4..59d34284 100644
--- a/js/MatrixOp/MATTRAN.pickle
+++ b/js/MatrixOp/MATTRAN.pickle
@@ -45,48 +45,48 @@ sS'function_name'
 p13
 S'string'
 p14
-sS'this.x'
-p15
-g5
 sS'model.sim'
-p16
+p15
 g9
 sS'arg1.graphics'
-p17
+p16
 g2
 sS'label[2-1]'
-p18
+p17
 g5
 sS'model.out2'
-p19
+p18
 g5
 sS'in1'
-p20
+p19
 g9
 sS'graphics.exprs'
-p21
+p20
 NsS'typ'
-p22
+p21
 g9
 sS'[model,graphics,ok]'
-p23
+p22
 g5
 sS'arg1.model'
-p24
+p23
 g2
 sS'ok'
-p25
+p24
 S'boolean'
-p26
+p25
 sS'model.dep_ut'
-p27
+p26
 g9
 sS'gr_i'
-p28
+p27
 g9
 sS'y'
-p29
+p28
 g9
+sS'x'
+p29
+g5
 sS'model'
 p30
 g2
diff --git a/js/MatrixOp/MATZCONJ.pickle b/js/MatrixOp/MATZCONJ.pickle
index 32dc9a2f..7f173bfa 100644
--- a/js/MatrixOp/MATZCONJ.pickle
+++ b/js/MatrixOp/MATZCONJ.pickle
@@ -37,48 +37,48 @@ sS'function_name'
 p11
 S'string'
 p12
-sS'this.x'
-p13
-g4
 sS'model.sim'
-p14
+p13
 g2
 sS'model.evtout'
-p15
+p14
 g2
 sS'model.out2'
-p16
+p15
 g4
 sS'model.intyp'
-p17
+p16
 g4
 sS'model.rpar'
-p18
+p17
 g2
 sS'model.outtyp'
-p19
+p18
 g4
 sS'model.state'
-p20
+p19
 g2
 sS'model.ipar'
-p21
+p20
 g2
 sS'typ'
-p22
+p21
 g2
 sS'model.blocktype'
-p23
+p22
 g12
 sS'model.dep_ut'
-p24
+p23
 g2
 sS'gr_i'
-p25
+p24
 g2
 sS'y'
-p26
+p25
 g2
+sS'x'
+p26
+g4
 sS'model'
 p27
 S'object'
diff --git a/js/MatrixOp/MATZREIM.pickle b/js/MatrixOp/MATZREIM.pickle
index a554109a..7d5c8ddc 100644
--- a/js/MatrixOp/MATZREIM.pickle
+++ b/js/MatrixOp/MATZREIM.pickle
@@ -58,65 +58,65 @@ sS'function_name'
 p18
 S'string'
 p19
-sS'this.x'
-p20
-g8
 sS'model.sim'
-p21
+p20
 g2
 sS'model.evtout'
-p22
+p21
 g2
 sS'arg1.graphics'
-p23
+p22
 g4
 sS'model.out2'
-p24
+p23
 g11
 sS'in1'
-p25
+p24
 g11
 sS'model.rpar'
-p26
+p25
 g2
 sS'model.outtyp'
-p27
+p26
 g2
 sS'model.state'
-p28
+p27
 g2
 sS'graphics.exprs'
-p29
+p28
 NsS'model.ipar'
-p30
+p29
 g2
 sS'typ'
-p31
+p30
 g2
 sS'[model,graphics,ok]'
-p32
+p31
 g8
 sS'arg1.model'
-p33
+p32
 NsS'label[9-1]'
-p34
+p33
 g2
 sS'ok'
-p35
+p34
 S'boolean'
-p36
+p35
 sS'model.blocktype'
-p37
+p36
 g19
 sS'model.dep_ut'
-p38
+p37
 g2
 sS'gr_i'
-p39
+p38
 g2
 sS'y'
-p40
+p39
 g2
+sS'x'
+p40
+g8
 sS'model'
 p41
 g4
diff --git a/js/MatrixOp/RICC.pickle b/js/MatrixOp/RICC.pickle
index ad6ba9d2..3ab8d419 100644
--- a/js/MatrixOp/RICC.pickle
+++ b/js/MatrixOp/RICC.pickle
@@ -58,62 +58,62 @@ sS'function_name'
 p18
 S'string'
 p19
-sS'this.x'
-p20
-g9
 sS'model.sim'
-p21
+p20
 g2
 sS'model.evtout'
-p22
+p21
 g2
 sS'arg1.graphics'
-p23
+p22
 g4
 sS'model.out2'
-p24
+p23
 g9
 sS'in1'
-p25
+p24
 g2
 sS'model.rpar'
-p26
+p25
 g2
 sS'model.outtyp'
-p27
+p26
 g9
 sS'model.state'
-p28
+p27
 g2
 sS'graphics.exprs'
-p29
+p28
 NsS'model.ipar'
-p30
+p29
 g13
 sS'typ'
-p31
+p30
 g2
 sS'[model,graphics,ok]'
-p32
+p31
 g9
 sS'arg1.model'
-p33
+p32
 g4
 sS'label[9-1]'
-p34
+p33
 g2
 sS'model.blocktype'
-p35
+p34
 g19
 sS'model.dep_ut'
-p36
+p35
 g2
 sS'gr_i'
-p37
+p36
 g2
 sS'y'
-p38
+p37
 g2
+sS'x'
+p38
+g9
 sS'model'
 p39
 g4
diff --git a/js/MatrixOp/ROOTCOEF.pickle b/js/MatrixOp/ROOTCOEF.pickle
index 3820c808..49151f65 100644
--- a/js/MatrixOp/ROOTCOEF.pickle
+++ b/js/MatrixOp/ROOTCOEF.pickle
@@ -58,66 +58,66 @@ sS'function_name'
 p18
 S'string'
 p19
-sS'this.x'
-p20
-g7
 sS'model.sim'
-p21
+p20
 g2
 sS'model.evtout'
-p22
+p21
 g2
 sS'arg1.graphics'
-p23
+p22
 g4
 sS'model.out2'
-p24
+p23
 g7
 sS'in1'
-p25
+p24
 g2
 sS'model.rpar'
-p26
+p25
 g2
 sS'model.outtyp'
-p27
+p26
 g7
 sS'model.state'
-p28
+p27
 g2
 sS'graphics.exprs'
-p29
+p28
 NsS'model.ipar'
-p30
+p29
 g2
 sS'typ'
-p31
+p30
 g2
 sS'[model,graphics,ok]'
-p32
+p31
 g7
 sS'arg1.model'
-p33
+p32
 g4
 sS'label[9-1]'
-p34
+p33
 g2
 sS'ok'
-p35
+p34
 S'boolean'
-p36
+p35
 sS'model.blocktype'
-p37
+p36
 g19
 sS'model.dep_ut'
-p38
+p37
 g2
 sS'gr_i'
-p39
+p38
 g2
 sS'y'
-p40
+p39
 g2
+sS'x'
+p40
+g7
 sS'model'
 p41
 g4
diff --git a/js/MatrixOp/SQRT.pickle b/js/MatrixOp/SQRT.pickle
index b207d4ae..887aa198 100644
--- a/js/MatrixOp/SQRT.pickle
+++ b/js/MatrixOp/SQRT.pickle
@@ -46,48 +46,48 @@ sS'function_name'
 p14
 S'string'
 p15
-sS'this.x'
-p16
-g7
 sS'model.sim'
-p17
+p16
 g5
 sS'arg1.graphics'
-p18
+p17
 g2
 sS'model.out2'
-p19
+p18
 g7
 sS'in1'
-p20
+p19
 g5
 sS'model.outtyp'
-p21
+p20
 g7
 sS'graphics.exprs'
-p22
+p21
 NsS'typ'
-p23
+p22
 g5
 sS'[model,graphics,ok]'
-p24
+p23
 g7
 sS'arg1.model'
-p25
+p24
 g2
 sS'ok'
-p26
+p25
 S'boolean'
-p27
+p26
 sS'model.dep_ut'
-p28
+p27
 g5
 sS'gr_i'
-p29
+p28
 g5
 sS'y'
-p30
+p29
 g5
+sS'x'
+p30
+g7
 sS'model'
 p31
 g2
diff --git a/js/MatrixOp/SUBMAT.pickle b/js/MatrixOp/SUBMAT.pickle
index 58c7bf66..8af6ffcd 100644
--- a/js/MatrixOp/SUBMAT.pickle
+++ b/js/MatrixOp/SUBMAT.pickle
@@ -66,65 +66,65 @@ sS'function_name'
 p18
 S'string'
 p19
-sS'this.x'
-p20
-g7
 sS'model.sim'
-p21
+p20
 g2
 sS'model.evtout'
-p22
+p21
 g2
 sS'arg1.graphics'
-p23
+p22
 g4
 sS'model.out2'
-p24
+p23
 g7
 sS'in1'
-p25
+p24
 g2
 sS'model.rpar'
-p26
+p25
 g2
 sS'model.outtyp'
-p27
+p26
 g7
 sS'model.state'
-p28
+p27
 g2
 sS'graphics.exprs'
-p29
+p28
 NsS'model.ipar'
-p30
+p29
 g15
 sS'typ'
-p31
+p30
 g2
 sS'label[6-1]'
-p32
+p31
 g7
 sS'[model,graphics,ok]'
-p33
+p32
 g7
 sS'arg1.model'
-p34
+p33
 NsS'ok'
-p35
+p34
 S'boolean'
-p36
+p35
 sS'model.blocktype'
-p37
+p36
 g19
 sS'model.dep_ut'
-p38
+p37
 g2
 sS'gr_i'
-p39
+p38
 g2
 sS'y'
-p40
+p39
 g2
+sS'x'
+p40
+g7
 sS'model'
 p41
 g4