summaryrefslogtreecommitdiff
path: root/js/Misc/scifunc_block.js
diff options
context:
space:
mode:
authorSunil Shetye2018-07-11 13:05:13 +0530
committerSunil Shetye2018-07-11 15:21:08 +0530
commit079d0b4a3ec15a4d7d2644484d116df9d1c694bb (patch)
tree785ed59b5b238203a9e91f3e323da59d1083d86e /js/Misc/scifunc_block.js
parent0e9bc36f45fa1bb598c6ebb0febc1989439a8d98 (diff)
downloadsci2js-079d0b4a3ec15a4d7d2644484d116df9d1c694bb.tar.gz
sci2js-079d0b4a3ec15a4d7d2644484d116df9d1c694bb.tar.bz2
sci2js-079d0b4a3ec15a4d7d2644484d116df9d1c694bb.zip
fix assignment to list
Diffstat (limited to 'js/Misc/scifunc_block.js')
-rw-r--r--js/Misc/scifunc_block.js50
1 files changed, 28 insertions, 22 deletions
diff --git a/js/Misc/scifunc_block.js b/js/Misc/scifunc_block.js
index 83c45670..80f6abb0 100644
--- a/js/Misc/scifunc_block.js
+++ b/js/Misc/scifunc_block.js
@@ -1,14 +1,14 @@
/* autogenerated from "macros/Misc/scifunc_block.sci" */
function scifunc_block() {
scifunc_block.prototype.define = function scifunc_block() {
- in1 = 1;
- out = 1;
- clkin = [];
- clkout = [];
- x0 = [];
- z0 = [];
- typ = "c";
- auto = [];
+ var in1 = 1;
+ var out = 1;
+ var clkin = [];
+ var clkout = [];
+ var x0 = [];
+ var z0 = [];
+ var typ = "c";
+ var auto = [];
this.rpar = [];
this.model = scicos_model();
this.model.sim = list(new ScilabString(["scifunc"]), new ScilabDouble([3]));
@@ -24,8 +24,8 @@ function scifunc_block() {
this.model.blocktype = new ScilabString([typ]);
this.model.firing = auto;
this.model.dep_ut = [true,false];
- exprs = list([[sci2exp(in1)],[sci2exp(out)],[sci2exp(clkin)],[sci2exp(clkout)],[strcat(sci2exp(x0))],[strcat(sci2exp(z0))],[strcat(sci2exp(this.rpar))],[sci2exp(auto)]],list("y1=sin(u1)"," "," ","y1=sin(u1)"," "," "," "));
- gr_i = [];
+ var exprs = list([[sci2exp(in1)],[sci2exp(out)],[sci2exp(clkin)],[sci2exp(clkout)],[strcat(sci2exp(x0))],[strcat(sci2exp(z0))],[strcat(sci2exp(this.rpar))],[sci2exp(auto)]],list("y1=sin(u1)"," "," ","y1=sin(u1)"," "," "," "));
+ var gr_i = [];
this.x = standard_define([2,2],this.model,exprs,gr_i);
return new BasicBlock(this.x);
}
@@ -57,11 +57,11 @@ function scifunc_block() {
this.auto0 = arguments[0]["auto0"]
this.deptime = arguments[0]["deptime"]
this.lab = arguments[0]["lab"]
- needcompile = 0;
+ var needcompile = 0;
this.x = arg1;
this.model = arg1.model;
- graphics = arg1.graphics;
- exprs = graphics.exprs;
+ var graphics = arg1.graphics;
+ var exprs = graphics.exprs;
if (size(exprs[1-1],"*")==8) {
exprs[1-1][9-1] = "0";
}
@@ -74,23 +74,29 @@ function scifunc_block() {
this.xx = this.xx.slice();
this.z = this.z.slice();
this.rpar = this.rpar.slice();
- nrp = prod(size(this.rpar));
+ var nrp = prod(size(this.rpar));
this.i = int(this.i.slice());
- ni = size(this.i,1);
+ var ni = size(this.i,1);
this.o = int(this.o.slice());
- no = size(this.o,1);
+ var no = size(this.o,1);
this.ci = int(this.ci.slice());
- nci = size(this.ci,1);
+ var nci = size(this.ci,1);
this.co = int(this.co.slice());
- nco = size(this.co,1);
- [ok,tt,dep_ut] = genfunc1(exprs[2-1],this.i,this.o,nci,nco,size(this.xx,1),size(this.z,1),nrp,"c");
+ var nco = size(this.co,1);
+ var tmpvar0 = genfunc1(exprs[2-1],this.i,this.o,nci,nco,size(this.xx,1),size(this.z,1),nrp,"c")
+ var ok = tmpvar0[0]
+ var tt = tmpvar0[1]
+ var dep_ut = tmpvar0[2];
dep_ut[2-1] = (1==this.deptime);
if (!ok) {
break;
}
- [this.model,graphics,ok] = check_io(this.model,graphics,this.i,this.o,this.ci,this.co);
+ var tmpvar1 = check_io(this.model,graphics,this.i,this.o,this.ci,this.co)
+ this.model = tmpvar1[0]
+ var graphics = tmpvar1[1]
+ var ok = tmpvar1[2];
if (ok) {
- auto = this.auto0;
+ var auto = this.auto0;
this.model.state = this.xx;
this.model.dstate = this.z;
this.model.rpar = this.rpar;
@@ -99,7 +105,7 @@ function scifunc_block() {
this.model.ipar = new ScilabDouble([0]);
}
if (or(this.model.opar!=tt)) {
- needcompile = 4;
+ var needcompile = 4;
}
this.model.opar = new ScilabDouble([tt]);
this.model.firing = new ScilabDouble([auto]);