summaryrefslogtreecommitdiff
path: root/js/Sources
diff options
context:
space:
mode:
authorSunil Shetye2018-07-09 17:07:46 +0530
committerSunil Shetye2018-07-10 11:24:53 +0530
commitf19304a4fe99556c5ddc35024c818d00ffe7e23a (patch)
treef795b52492d1962f66c2f84f575ce5074b0668a8 /js/Sources
parentcbc375d9bc42bc29eeb919a020dfbf15921d3cf0 (diff)
downloadsci2js-f19304a4fe99556c5ddc35024c818d00ffe7e23a.tar.gz
sci2js-f19304a4fe99556c5ddc35024c818d00ffe7e23a.tar.bz2
sci2js-f19304a4fe99556c5ddc35024c818d00ffe7e23a.zip
handle list separately
Diffstat (limited to 'js/Sources')
-rw-r--r--js/Sources/CONST.js2
-rw-r--r--js/Sources/CONST_f.js2
-rw-r--r--js/Sources/CONST_m.js4
-rw-r--r--js/Sources/Counter.js2
-rw-r--r--js/Sources/FROMWS_c.js2
-rw-r--r--js/Sources/Ground_g.js2
-rw-r--r--js/Sources/Modulo_Count.js2
-rw-r--r--js/Sources/RAMP.js2
-rw-r--r--js/Sources/RAND_m.js4
-rw-r--r--js/Sources/READAU_f.js2
-rw-r--r--js/Sources/READC_f.js2
-rw-r--r--js/Sources/STEP.js2
-rw-r--r--js/Sources/TKSCALE.js2
13 files changed, 15 insertions, 15 deletions
diff --git a/js/Sources/CONST.js b/js/Sources/CONST.js
index af405b98..2c9dae8a 100644
--- a/js/Sources/CONST.js
+++ b/js/Sources/CONST.js
@@ -3,7 +3,7 @@ function CONST() {
CONST.prototype.define = function CONST() {
this.C = 1;
this.model = scicos_model();
- this.model.sim = list("cstblk4",4);
+ this.model.sim = list(new ScilabString("cstblk4"),new ScilabDouble(4));
this.model.in1 = [];
this.model.out = new ScilabDouble(1);
this.model.rpar = new ScilabDouble(this.C);
diff --git a/js/Sources/CONST_f.js b/js/Sources/CONST_f.js
index edc52303..e5182263 100644
--- a/js/Sources/CONST_f.js
+++ b/js/Sources/CONST_f.js
@@ -3,7 +3,7 @@ function CONST_f() {
CONST_f.prototype.define = function CONST_f() {
this.C = 1;
this.model = scicos_model();
- this.model.sim = list("cstblk",1);
+ this.model.sim = list(new ScilabString("cstblk"),new ScilabDouble(1));
this.model.in1 = [];
this.model.out = new ScilabDouble(1);
this.model.rpar = new ScilabDouble(this.C);
diff --git a/js/Sources/CONST_m.js b/js/Sources/CONST_m.js
index 5fea4537..4d03f8ea 100644
--- a/js/Sources/CONST_m.js
+++ b/js/Sources/CONST_m.js
@@ -3,7 +3,7 @@ function CONST_m() {
CONST_m.prototype.define = function CONST_m() {
this.C = [1];
this.model = scicos_model();
- this.model.sim = list("cstblk4",4);
+ this.model.sim = list(new ScilabString("cstblk4"),new ScilabDouble(4));
this.model.in1 = [];
this.model.out = new ScilabDouble(size(this.C,1));
this.model.in2 = [];
@@ -40,7 +40,7 @@ function CONST_m() {
if (find(nout==0)!=[]) {
block_parameter_error(msprintf("Wrong size for \'%s\' parameter","Constant Value"),"Constant value must have at least one element.");
} else {
- this.model.sim = list("cstblk4_m",4);
+ this.model.sim = list(new ScilabString("cstblk4_m"),new ScilabDouble(4));
this.model.opar = list(this.C);
if ((this.type[this.C-1]==1)) {
if (isreal(this.C)) {
diff --git a/js/Sources/Counter.js b/js/Sources/Counter.js
index 4053bfb2..0d62bd5a 100644
--- a/js/Sources/Counter.js
+++ b/js/Sources/Counter.js
@@ -5,7 +5,7 @@ function Counter() {
this.maxim = 2;
this.rule = 1;
this.model = scicos_model();
- this.model.sim = list("counter",4);
+ this.model.sim = list(new ScilabString("counter"),new ScilabDouble(4));
this.model.evtin = new ScilabDouble(1);
this.model.out = new ScilabDouble(1);
this.model.out2 = new ScilabDouble(1);
diff --git a/js/Sources/FROMWS_c.js b/js/Sources/FROMWS_c.js
index 4b058495..c5ca8be4 100644
--- a/js/Sources/FROMWS_c.js
+++ b/js/Sources/FROMWS_c.js
@@ -6,7 +6,7 @@ function FROMWS_c() {
this.ZC = 1;
this.OutEnd = 0;
this.model = scicos_model();
- this.model.sim = list("fromws_c",4);
+ this.model.sim = list(new ScilabString("fromws_c"),new ScilabDouble(4));
this.model.out = new ScilabDouble(-1);
this.model.out2 = new ScilabDouble(-2);
this.model.outtyp = new ScilabDouble(-1);
diff --git a/js/Sources/Ground_g.js b/js/Sources/Ground_g.js
index 37887703..13967102 100644
--- a/js/Sources/Ground_g.js
+++ b/js/Sources/Ground_g.js
@@ -3,7 +3,7 @@ function Ground_g() {
Ground_g.prototype.define = function Ground_g() {
C = [0];
this.model = scicos_model();
- this.model.sim = list("cstblk4_m",4);
+ this.model.sim = list(new ScilabString("cstblk4_m"),new ScilabDouble(4));
this.model.in1 = [];
this.model.out = new ScilabDouble(1);
this.model.in2 = [];
diff --git a/js/Sources/Modulo_Count.js b/js/Sources/Modulo_Count.js
index fa1eb183..a01089c5 100644
--- a/js/Sources/Modulo_Count.js
+++ b/js/Sources/Modulo_Count.js
@@ -4,7 +4,7 @@ function Modulo_Count() {
this.ini_c = 0;
this.base = 3;
this.model = scicos_model();
- this.model.sim = list("modulo_count",4);
+ this.model.sim = list(new ScilabString("modulo_count"),new ScilabDouble(4));
this.model.evtin = new ScilabDouble(1);
this.model.out = new ScilabDouble(1);
this.model.dstate = new ScilabDouble(this.ini_c);
diff --git a/js/Sources/RAMP.js b/js/Sources/RAMP.js
index e3ad460e..a6fc7582 100644
--- a/js/Sources/RAMP.js
+++ b/js/Sources/RAMP.js
@@ -6,7 +6,7 @@ function RAMP() {
this.stt = 0;
rpar = [[this.slope],[this.stt],[this.iout]];
this.model = scicos_model();
- this.model.sim = list("ramp",4);
+ this.model.sim = list(new ScilabString("ramp"),new ScilabDouble(4));
this.model.in1 = [];
this.model.out = new ScilabDouble(1);
this.model.rpar = rpar;
diff --git a/js/Sources/RAND_m.js b/js/Sources/RAND_m.js
index d8fc327c..cd4c8808 100644
--- a/js/Sources/RAND_m.js
+++ b/js/Sources/RAND_m.js
@@ -8,7 +8,7 @@ function RAND_m() {
function_name = "rndblk_m";
funtyp = 4;
this.model = scicos_model();
- this.model.sim = list(function_name,funtyp);
+ this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp));
this.model.in1 = [];
this.model.in2 = [];
this.model.intyp = [];
@@ -81,7 +81,7 @@ function RAND_m() {
if (ok) {
[model,graphics,ok] = set_io(this.model,graphics,list([],[]),list(out,ot),1,[]);
if (ok) {
- this.model.sim = list(function_name,4);
+ this.model.sim = list(new ScilabString(function_name),new ScilabDouble(4));
graphics.exprs = exprs;
this.model.ipar = new ScilabDouble(this.flag);
this.x.graphics = graphics;
diff --git a/js/Sources/READAU_f.js b/js/Sources/READAU_f.js
index 9a3996f2..77627c37 100644
--- a/js/Sources/READAU_f.js
+++ b/js/Sources/READAU_f.js
@@ -13,7 +13,7 @@ function READAU_f() {
ievt = 0;
nout = size(outmask,"*");
this.model = scicos_model();
- this.model.sim = list("readau",2);
+ this.model.sim = list(new ScilabString("readau"),new ScilabDouble(2));
this.model.out = new ScilabDouble(nout);
this.model.evtin = new ScilabDouble(1);
this.model.dstate = [[1],[1],[lunit],[zeros(this.N*M,1)]];
diff --git a/js/Sources/READC_f.js b/js/Sources/READC_f.js
index 5084d60e..9e456d2b 100644
--- a/js/Sources/READC_f.js
+++ b/js/Sources/READC_f.js
@@ -15,7 +15,7 @@ function READC_f() {
nout = size(this.outmask,"*");
ipar = [[length(fname)],[this._str2code[frmt-1]],[ievt],[this.N],[this.M],[this.swap],[this.offset],[this._str2code[fname-1]],[tmask],[this.outmask]];
this.model = scicos_model();
- this.model.sim = list("readc",2);
+ this.model.sim = list(new ScilabString("readc"),new ScilabDouble(2));
this.model.out = new ScilabDouble(nout);
this.model.evtin = new ScilabDouble(1);
this.model.evtout = [];
diff --git a/js/Sources/STEP.js b/js/Sources/STEP.js
index af7fb2cc..3672850d 100644
--- a/js/Sources/STEP.js
+++ b/js/Sources/STEP.js
@@ -3,7 +3,7 @@ function STEP() {
STEP.prototype.define = function STEP() {
rpar = [[0],[1]];
this.model = scicos_model();
- this.model.sim = list("step_func",4);
+ this.model.sim = list(new ScilabString("step_func"),new ScilabDouble(4));
this.model.evtin = new ScilabDouble(1);
this.model.evtout = new ScilabDouble(1);
this.model.out = new ScilabDouble(1);
diff --git a/js/Sources/TKSCALE.js b/js/Sources/TKSCALE.js
index 4f31582a..23270b87 100644
--- a/js/Sources/TKSCALE.js
+++ b/js/Sources/TKSCALE.js
@@ -5,7 +5,7 @@ function TKSCALE() {
this.b = 10;
this.f = 1;
this.model = scicos_model();
- this.model.sim = list("tkscaleblk",5);
+ this.model.sim = list(new ScilabString("tkscaleblk"),new ScilabDouble(5));
this.model.out = new ScilabDouble(1);
this.model.evtin = new ScilabDouble(1);
this.model.rpar = [[this.a],[this.b],[this.f]];