From e99608a59243936dfe2e5f3aaa81411df3847f18 Mon Sep 17 00:00:00 2001
From: Sunil Shetye
Date: Tue, 10 Jul 2018 10:51:41 +0530
Subject: allow expression in lterm

---
 js/Sinks/AFFICH_m.js        |  2 +-
 js/Sinks/AFFICH_m.pickle    | 16 +++++++--------
 js/Sinks/CANIMXY.js         |  2 +-
 js/Sinks/CANIMXY.pickle     | 24 +++++++++++------------
 js/Sinks/CANIMXY3D.js       |  2 +-
 js/Sinks/CANIMXY3D.pickle   | 48 ++++++++++++++++++++++-----------------------
 js/Sinks/CEVENTSCOPE.js     |  2 +-
 js/Sinks/CEVENTSCOPE.pickle | 22 ++++++++++-----------
 js/Sinks/CMSCOPE.js         |  2 +-
 js/Sinks/CMSCOPE.pickle     | 22 ++++++++++-----------
 js/Sinks/CSCOPE.js          |  2 +-
 js/Sinks/CSCOPE.pickle      | 24 +++++++++++------------
 js/Sinks/CSCOPXY.js         |  2 +-
 js/Sinks/CSCOPXY.pickle     | 30 ++++++++++++++--------------
 js/Sinks/CSCOPXY3D.js       |  2 +-
 js/Sinks/CSCOPXY3D.pickle   | 44 ++++++++++++++++++++---------------------
 js/Sinks/TOWS_c.js          |  2 +-
 js/Sinks/TOWS_c.pickle      | 20 +++++++++----------
 18 files changed, 134 insertions(+), 134 deletions(-)

(limited to 'js/Sinks')

diff --git a/js/Sinks/AFFICH_m.js b/js/Sinks/AFFICH_m.js
index 67033419..d2aea4e3 100644
--- a/js/Sinks/AFFICH_m.js
+++ b/js/Sinks/AFFICH_m.js
@@ -83,7 +83,7 @@ function AFFICH_m() {
                 message([["Some specified values are inconsistent:"],[" "],[mess]]);
             }
             if (ok) {
-                [model,graphics,ok] = set_io(this.model,graphics,list(this.in1,1),list(),ones(1-this.herit,1),[]);
+                [this.model,graphics,ok] = set_io(this.model,graphics,list(this.in1,1),list(),ones(1-this.herit,1),[]);
             }
             if (ok) {
                 this.model.ipar = [[this.font],[this.fontsize],[this.colr],[this.nt],[this.nd],[this.in1[1-1][1-1]]];
diff --git a/js/Sinks/AFFICH_m.pickle b/js/Sinks/AFFICH_m.pickle
index 86e3b62f..c9b00e5d 100644
--- a/js/Sinks/AFFICH_m.pickle
+++ b/js/Sinks/AFFICH_m.pickle
@@ -76,23 +76,23 @@ p21
 sS'mess'
 p22
 g2
-sS'in1'
+sS'[this.model,graphics,ok]'
 p23
+g7
+sS'in1'
+p24
 g17
 sS'fontsize'
-p24
+p25
 g7
 sS'graphics.exprs'
-p25
-NsS'model.ipar'
 p26
+NsS'model.ipar'
+p27
 g2
 sS'typ'
-p27
-g17
-sS'[model,graphics,ok]'
 p28
-g7
+g17
 sS'ok'
 p29
 S'boolean'
diff --git a/js/Sinks/CANIMXY.js b/js/Sinks/CANIMXY.js
index 758842f7..75344310 100644
--- a/js/Sinks/CANIMXY.js
+++ b/js/Sinks/CANIMXY.js
@@ -106,7 +106,7 @@ function CANIMXY() {
             } else {
                 in1 = this.nbr_curves*ones(2,1);
                 in2 = ones(2,1);
-                [model,graphics,ok] = set_io(this.model,graphics,list([in1,in2],ones(2,1)),list(),ones(1,1),[]);
+                [this.model,graphics,ok] = set_io(this.model,graphics,list([in1,in2],ones(2,1)),list(),ones(1,1),[]);
                 if (this.wpos==[]) {
                     this.wpos = [[-1],[-1]];
                 }
diff --git a/js/Sinks/CANIMXY.pickle b/js/Sinks/CANIMXY.pickle
index a88b9b7e..75a79f02 100644
--- a/js/Sinks/CANIMXY.pickle
+++ b/js/Sinks/CANIMXY.pickle
@@ -98,37 +98,37 @@ g2
 sS'mess'
 p26
 g4
-sS'in1'
+sS'[this.model,graphics,ok]'
 p27
-S'string'
+g2
+sS'in1'
 p28
-sS'in2'
+S'string'
 p29
+sS'in2'
+p30
 g2
 sS'N'
-p30
+p31
 g2
 sS'model.rpar'
-p31
+p32
 g4
 sS'graphics.exprs'
-p32
-NsS'model.ipar'
 p33
+NsS'model.ipar'
+p34
 g4
 sS'typ'
-p34
-g22
-sS'[model,graphics,ok]'
 p35
-g2
+g22
 sS'ok'
 p36
 S'boolean'
 p37
 sS'model.blocktype'
 p38
-g28
+g29
 sS'model.dep_ut'
 p39
 g22
diff --git a/js/Sinks/CANIMXY3D.js b/js/Sinks/CANIMXY3D.js
index b110986b..ad6e0d19 100644
--- a/js/Sinks/CANIMXY3D.js
+++ b/js/Sinks/CANIMXY3D.js
@@ -122,7 +122,7 @@ function CANIMXY3D() {
             } else {
                 in1 = this.nbr_curves*ones(3,1);
                 in2 = ones(3,1);
-                [model,graphics,ok] = set_io(this.model,graphics,list([in1,in2],ones(3,1)),list(),ones(1,1),[]);
+                [this.model,graphics,ok] = set_io(this.model,graphics,list([in1,in2],ones(3,1)),list(),ones(1,1),[]);
                 if (this.wpos==[]) {
                     this.wpos = [[-1],[-1]];
                 }
diff --git a/js/Sinks/CANIMXY3D.pickle b/js/Sinks/CANIMXY3D.pickle
index cf6ff376..f5875b67 100644
--- a/js/Sinks/CANIMXY3D.pickle
+++ b/js/Sinks/CANIMXY3D.pickle
@@ -78,75 +78,75 @@ p17
 sS'model.evtin'
 p18
 g17
-sS'model.firing'
+sS'vec_x'
 p19
-S'vector'
+g2
+sS'model.firing'
 p20
-sS'model.sim'
+S'vector'
 p21
-S'list'
+sS'model.sim'
 p22
-sS'mess'
+S'list'
 p23
-g2
-sS'vec_x'
+sS'mess'
 p24
 g2
-sS'vec_y'
+sS'[this.model,graphics,ok]'
 p25
+g17
+sS'vec_y'
+p26
 g2
 sS'in1'
-p26
-S'string'
 p27
-sS'in2'
+S'string'
 p28
+sS'in2'
+p29
 g17
 sS'N'
-p29
+p30
 g17
 sS'size_siz'
-p30
+p31
 g17
 sS'model.rpar'
-p31
+p32
 g2
 sS'graphics.exprs'
-p32
-NsS'model.ipar'
 p33
+NsS'model.ipar'
+p34
 g2
 sS'typ'
-p34
-g20
-sS'[model,graphics,ok]'
 p35
-g17
+g21
 sS'ok'
 p36
 S'boolean'
 p37
 sS'model.blocktype'
 p38
-g27
+g28
 sS'param3ds'
 p39
 g2
 sS'model.dep_ut'
 p40
-g20
+g21
 sS'exprs'
 p41
 g2
 sS'gr_i'
 p42
-g20
+g21
 sS'ipar'
 p43
 g2
 sS'y'
 p44
-g20
+g21
 sS'x'
 p45
 g17
diff --git a/js/Sinks/CEVENTSCOPE.js b/js/Sinks/CEVENTSCOPE.js
index 1f612e6a..55a8493d 100644
--- a/js/Sinks/CEVENTSCOPE.js
+++ b/js/Sinks/CEVENTSCOPE.js
@@ -78,7 +78,7 @@ function CEVENTSCOPE() {
                 ok = false;
             }
             if (ok) {
-                [model,graphics,ok] = set_io(this.model,graphics,list(),list(),ones(this.nclock,1),[]);
+                [this.model,graphics,ok] = set_io(this.model,graphics,list(),list(),ones(this.nclock,1),[]);
             } else {
                 message([["Some specified values are inconsistent:"],[" "],[mess]]);
             }
diff --git a/js/Sinks/CEVENTSCOPE.pickle b/js/Sinks/CEVENTSCOPE.pickle
index 5ca6d286..972e83a8 100644
--- a/js/Sinks/CEVENTSCOPE.pickle
+++ b/js/Sinks/CEVENTSCOPE.pickle
@@ -61,23 +61,23 @@ p16
 sS'mess'
 p17
 g2
-sS'model.rpar'
+sS'[this.model,graphics,ok]'
 p18
 g12
-sS'wdim'
+sS'model.rpar'
 p19
+g12
+sS'wdim'
+p20
 g2
 sS'model.ipar'
-p20
+p21
 g2
 sS'typ'
-p21
-S'vector'
 p22
-sS'nclock'
+S'vector'
 p23
-g12
-sS'[model,graphics,ok]'
+sS'nclock'
 p24
 g12
 sS'ok'
@@ -90,19 +90,19 @@ S'string'
 p28
 sS'model.dep_ut'
 p29
-g22
+g23
 sS'exprs'
 p30
 g2
 sS'gr_i'
 p31
-g22
+g23
 sS'ipar'
 p32
 g2
 sS'y'
 p33
-g22
+g23
 sS'x'
 p34
 g12
diff --git a/js/Sinks/CMSCOPE.js b/js/Sinks/CMSCOPE.js
index 9d0db26d..be339e2c 100644
--- a/js/Sinks/CMSCOPE.js
+++ b/js/Sinks/CMSCOPE.js
@@ -121,7 +121,7 @@ function CMSCOPE() {
                 this.in1 = this.in1.slice();
                 a = size(this.in1,1);
                 in2 = ones(a,1);
-                [model,graphics,ok] = set_io(this.model,graphics,list([this.in1,in2],ones(a,1)),list(),ones(1-this.heritance,1),[]);
+                [this.model,graphics,ok] = set_io(this.model,graphics,list([this.in1,in2],ones(a,1)),list(),ones(1-this.heritance,1),[]);
             }
             if (ok) {
                 if (this.wpos==[]) {
diff --git a/js/Sinks/CMSCOPE.pickle b/js/Sinks/CMSCOPE.pickle
index 60bd2fc1..9849db15 100644
--- a/js/Sinks/CMSCOPE.pickle
+++ b/js/Sinks/CMSCOPE.pickle
@@ -98,34 +98,34 @@ p26
 sS'mess'
 p27
 g2
-sS'in1'
+sS'[this.model,graphics,ok]'
 p28
+g21
+sS'in1'
+p29
 g2
 sS'in2'
-p29
+p30
 g21
 sS'N'
-p30
+p31
 g21
 sS'yy'
-p31
+p32
 g2
 sS'model.rpar'
-p32
+p33
 g2
 sS'wdim'
-p33
+p34
 g2
 sS'model.ipar'
-p34
+p35
 g2
 sS'typ'
-p35
+p36
 g4
 sS'a'
-p36
-g21
-sS'[model,graphics,ok]'
 p37
 g21
 sS'ok'
diff --git a/js/Sinks/CSCOPE.js b/js/Sinks/CSCOPE.js
index 3c69cbed..97579a07 100644
--- a/js/Sinks/CSCOPE.js
+++ b/js/Sinks/CSCOPE.js
@@ -94,7 +94,7 @@ function CSCOPE() {
                 message([["Some specified values are inconsistent:"],[" "],[mess]]);
             }
             if (ok) {
-                [model,graphics,ok] = set_io(this.model,graphics,list([-1,1],1),list(),ones(1-this.heritance,1),[]);
+                [this.model,graphics,ok] = set_io(this.model,graphics,list([-1,1],1),list(),ones(1-this.heritance,1),[]);
             }
             if (ok) {
                 if (this.wpos==[]) {
diff --git a/js/Sinks/CSCOPE.pickle b/js/Sinks/CSCOPE.pickle
index eaf9e114..e7fe344b 100644
--- a/js/Sinks/CSCOPE.pickle
+++ b/js/Sinks/CSCOPE.pickle
@@ -83,28 +83,28 @@ p21
 sS'mess'
 p22
 g2
-sS'model.in1'
+sS'[this.model,graphics,ok]'
 p23
 g10
-sS'model.rpar'
+sS'model.in1'
 p24
+g10
+sS'model.rpar'
+p25
 g2
 sS'N'
-p25
+p26
 g10
 sS'wdim'
-p26
+p27
 g2
 sS'model.ipar'
-p27
+p28
 g2
 sS'typ'
-p28
-S'vector'
 p29
-sS'[model,graphics,ok]'
+S'vector'
 p30
-g10
 sS'ok'
 p31
 S'boolean'
@@ -115,19 +115,19 @@ S'string'
 p34
 sS'model.dep_ut'
 p35
-g29
+g30
 sS'exprs'
 p36
 g2
 sS'gr_i'
 p37
-g29
+g30
 sS'ipar'
 p38
 g2
 sS'y'
 p39
-g29
+g30
 sS'x'
 p40
 g10
diff --git a/js/Sinks/CSCOPXY.js b/js/Sinks/CSCOPXY.js
index a5c63ce1..9364bf98 100644
--- a/js/Sinks/CSCOPXY.js
+++ b/js/Sinks/CSCOPXY.js
@@ -105,7 +105,7 @@ function CSCOPXY() {
             } else {
                 in1 = this.nbr_curves*ones(2,1);
                 in2 = ones(2,1);
-                [model,graphics,ok] = set_io(this.model,graphics,list([in1,in2],ones(2,1)),list(),ones(1,1),[]);
+                [this.model,graphics,ok] = set_io(this.model,graphics,list([in1,in2],ones(2,1)),list(),ones(1,1),[]);
                 if (this.wpos==[]) {
                     this.wpos = [[-1],[-1]];
                 }
diff --git a/js/Sinks/CSCOPXY.pickle b/js/Sinks/CSCOPXY.pickle
index 7ce87c07..462dabd2 100644
--- a/js/Sinks/CSCOPXY.pickle
+++ b/js/Sinks/CSCOPXY.pickle
@@ -94,53 +94,53 @@ g2
 sS'mess'
 p24
 g4
-sS'in1'
+sS'[this.model,graphics,ok]'
 p25
-S'string'
+g2
+sS'in1'
 p26
-sS'in2'
+S'string'
 p27
+sS'in2'
+p28
 g2
 sS'N'
-p28
+p29
 g2
 sS'model.rpar'
-p29
+p30
 g4
 sS'graphics.exprs'
-p30
-NsS'model.ipar'
 p31
+NsS'model.ipar'
+p32
 g4
 sS'typ'
-p32
-S'vector'
 p33
-sS'[model,graphics,ok]'
+S'vector'
 p34
-g2
 sS'ok'
 p35
 S'boolean'
 p36
 sS'model.blocktype'
 p37
-g26
+g27
 sS'model.dep_ut'
 p38
-g33
+g34
 sS'exprs'
 p39
 g4
 sS'gr_i'
 p40
-g33
+g34
 sS'ipar'
 p41
 g4
 sS'y'
 p42
-g33
+g34
 sS'x'
 p43
 g2
diff --git a/js/Sinks/CSCOPXY3D.js b/js/Sinks/CSCOPXY3D.js
index 80210a6a..7d0c7383 100644
--- a/js/Sinks/CSCOPXY3D.js
+++ b/js/Sinks/CSCOPXY3D.js
@@ -115,7 +115,7 @@ function CSCOPXY3D() {
             if (ok) {
                 in1 = this.nbr_curves*ones(3,1);
                 in2 = ones(3,1);
-                [model,graphics,ok] = set_io(this.model,graphics,list([in1,in2],ones(3,1)),list(),ones(1,1),[]);
+                [this.model,graphics,ok] = set_io(this.model,graphics,list([in1,in2],ones(3,1)),list(),ones(1,1),[]);
                 if (this.wpos==[]) {
                     this.wpos = [[-1],[-1]];
                 }
diff --git a/js/Sinks/CSCOPXY3D.pickle b/js/Sinks/CSCOPXY3D.pickle
index 9a994034..e0b15b28 100644
--- a/js/Sinks/CSCOPXY3D.pickle
+++ b/js/Sinks/CSCOPXY3D.pickle
@@ -78,72 +78,72 @@ p17
 sS'model.evtin'
 p18
 g17
-sS'model.sim'
+sS'vec_x'
 p19
-S'list'
+g2
+sS'model.sim'
 p20
-sS'mess'
+S'list'
 p21
-g2
-sS'vec_x'
+sS'mess'
 p22
 g2
-sS'vec_y'
+sS'[this.model,graphics,ok]'
 p23
+g17
+sS'vec_y'
+p24
 g2
 sS'in1'
-p24
-S'string'
 p25
-sS'in2'
+S'string'
 p26
+sS'in2'
+p27
 g17
 sS'N'
-p27
+p28
 g17
 sS'size_siz'
-p28
+p29
 g17
 sS'model.rpar'
-p29
+p30
 g2
 sS'graphics.exprs'
-p30
-NsS'model.ipar'
 p31
+NsS'model.ipar'
+p32
 g2
 sS'typ'
-p32
-S'vector'
 p33
-sS'[model,graphics,ok]'
+S'vector'
 p34
-g17
 sS'ok'
 p35
 S'boolean'
 p36
 sS'model.blocktype'
 p37
-g25
+g26
 sS'param3ds'
 p38
 g2
 sS'model.dep_ut'
 p39
-g33
+g34
 sS'exprs'
 p40
 g2
 sS'gr_i'
 p41
-g33
+g34
 sS'ipar'
 p42
 g2
 sS'y'
 p43
-g33
+g34
 sS'x'
 p44
 g17
diff --git a/js/Sinks/TOWS_c.js b/js/Sinks/TOWS_c.js
index 64909f1f..7adc6837 100644
--- a/js/Sinks/TOWS_c.js
+++ b/js/Sinks/TOWS_c.js
@@ -59,7 +59,7 @@ function TOWS_c() {
             }
             execstr("if type("+this.varnam+") <> 17 | or(fieldnames("+this.varnam+") <> [\"values\"; \"time\"]) then"+" message([\"Protected variable name.\"; \"Please choose another variable name.\"]);"+" ok = %f;"+" end","errcatch");
             if (ok) {
-                [model,graphics,ok] = set_io(this.model,graphics,list([-1,-2],-1),list(),ones(1-this.herit,1),[]);
+                [this.model,graphics,ok] = set_io(this.model,graphics,list([-1,-2],-1),list(),ones(1-this.herit,1),[]);
                 if (this.herit==1) {
                     this.model.blocktype = new ScilabString(["x"]);
                 } else {
diff --git a/js/Sinks/TOWS_c.pickle b/js/Sinks/TOWS_c.pickle
index 2a83b55e..7f443569 100644
--- a/js/Sinks/TOWS_c.pickle
+++ b/js/Sinks/TOWS_c.pickle
@@ -72,24 +72,24 @@ p21
 sS'model.evtout'
 p22
 g8
-sS'model.intyp'
+sS'[this.model,graphics,ok]'
 p23
 g5
-sS'model.rpar'
+sS'model.intyp'
 p24
+g5
+sS'model.rpar'
+p25
 g8
 sS'graphics.exprs'
-p25
-NsS'model.ipar'
 p26
-S'matrix'
+NsS'model.ipar'
 p27
-sS'typ'
+S'matrix'
 p28
-g8
-sS'[model,graphics,ok]'
+sS'typ'
 p29
-g5
+g8
 sS'ok'
 p30
 S'boolean'
@@ -102,7 +102,7 @@ p33
 g8
 sS'exprs'
 p34
-g27
+g28
 sS'r'
 p35
 g31
-- 
cgit