support a(index:index,index) syntax

11 files changed, 18 insertions, 18 deletions

diff --git a/js/IntegerOp/EXTRACTBITS.js b/js/IntegerOp/EXTRACTBITS.js
index cfceb49a..35b709c3 100644
--- a/js/IntegerOp/EXTRACTBITS.js
+++ b/js/IntegerOp/EXTRACTBITS.js
@@ -34,11 +34,11 @@ numb=bit;
 if ((size(bit,"*")!=2)) {
 block_parameter_error(msprintf(gettext("Wrong size for \'%s\' parameter: %s."),gettext("Number of Bits or Index of Bit"),bitstr),gettext("Must have this form: [Start, End]."));
 ok=false;
-} else if (bit(1)>bit(2)) {
+} else if (bit[1-1]>bit[2-1]) {
 block_parameter_error(msprintf(gettext("Wrong values for \'%s\' parameter: %s."),gettext("Number of Bits or Index of Bit"),bitstr),msprintf(gettext("\'Start\' must be less than \'End\'.")));
 ok=false;
 } else {
-numb=bit(2)-bit(1);
+numb=bit[2-1]-bit[1-1];
 }
 } else {
 bit=0;
diff --git a/js/Linear/DELAYV_f.js b/js/Linear/DELAYV_f.js
index 759e0191..4ff3177c 100644
--- a/js/Linear/DELAYV_f.js
+++ b/js/Linear/DELAYV_f.js
@@ -10,7 +10,7 @@ model=arg1.model;
 nin=model.in1(1);
 z0=model.dstate;
 zz0=z0.slice(1-1,$-1);
-told=z0($);
+told=z0[$-1];
 while (true) {
 [ok,nin,zz0,T,exprs]=scicos_getvalue("Set delay parameters",["Number of inputs","Register initial condition","Max delay"],list("vec",1,"vec",-1,"vec",1),exprs);
 if (!ok) {
diff --git a/js/Linear/DIFF_c.js b/js/Linear/DIFF_c.js
index b15404fc..bb7cb98a 100644
--- a/js/Linear/DIFF_c.js
+++ b/js/Linear/DIFF_c.js
@@ -46,7 +46,7 @@ model.out=1;
 model.state=x0;
 model.blocktype="c";
 model.dep_ut=[false,true];
-exprs=[strcat(sci2exp(x0(1))),strcat(sci2exp(x0(2)))];
+exprs=[strcat(sci2exp(x0[1-1])),strcat(sci2exp(x0[2-1]))];
 gr_i=[];
 x=standard_define([2,2],model,exprs,gr_i);
 }
diff --git a/js/MatrixOp/EXTRACT.js b/js/MatrixOp/EXTRACT.js
index 47322575..31fa8a3c 100644
--- a/js/MatrixOp/EXTRACT.js
+++ b/js/MatrixOp/EXTRACT.js
@@ -36,13 +36,13 @@ message("empty field");
 ok=false;
 }
 for (i=1;i<=ma;i+=1) {
-if ((a(i)<=0)) {
+if ((a[i-1]<=0)) {
 message("invalid index");
 ok=false;
 }
 }
 for (j=1;j<=mb;j+=1) {
-if ((b(j)<=0)) {
+if ((b[j-1]<=0)) {
 message("invalid index");
 ok=false;
 }
diff --git a/js/Misc/AUTOMAT.js b/js/Misc/AUTOMAT.js
index cd27f093..735e3581 100644
--- a/js/Misc/AUTOMAT.js
+++ b/js/Misc/AUTOMAT.js
@@ -1,3 +1,3 @@
-Syntax error in input LexToken(COLON,':',1,3221)
+Syntax error in input LexToken(ASSIGNMENT,'=',1,3935)
 /* autogenerated from "macros/Misc/AUTOMAT.sci" */
 None
diff --git a/js/Misc/BOUNCE.js b/js/Misc/BOUNCE.js
index 7bf7f4bb..10d40f76 100644
--- a/js/Misc/BOUNCE.js
+++ b/js/Misc/BOUNCE.js
@@ -24,11 +24,11 @@ rpar1=rpar1.slice();
 rpar2=rpar2.slice();
 n=size(xt,"*");
 walls=walls.slice();
-if (walls(1)>walls(2)) {
-walls=walls([2,1]);
+if (walls[1-1]>walls[2-1]) {
+walls=walls[[2,1]-1];
 }
-if (walls(3)>walls(3)) {
-walls=walls([3,4]);
+if (walls[3-1]>walls[3-1]) {
+walls=walls[[3,4]-1];
 }
 if (n!=size(y,"*")||n!=size(rpar1,"*")||n!=size(rpar2,"*")||n!=size(xd,"*")||n!=size(yd,"*")) {
 message("All vectors must have equal size");
diff --git a/js/Misc/CONSTRAINT2_c.js b/js/Misc/CONSTRAINT2_c.js
index a96b98b8..1b46dd38 100644
--- a/js/Misc/CONSTRAINT2_c.js
+++ b/js/Misc/CONSTRAINT2_c.js
@@ -29,12 +29,12 @@ ask_again=true;
 }
 if ((!ask_again)) {
 for (i=1;i<=N;i+=1) {
-if (!((id(i)==0)||(id(i)==1))) {
+if (!((id[i-1]==0)||(id[i-1]==1))) {
 ask_again=true;
 x_message(["Id(i) must be either","0 when x\'(i) is not present in the feedback","1: when x\'(i) is present in the feedback"]);
 break
 }
-if ((id(i)==0)) {
+if ((id[i-1]==0)) {
 id[i-1]=-1;
 }
 }
diff --git a/js/Misc/DIFF_f.js b/js/Misc/DIFF_f.js
index 4f49b4d9..796b3fa3 100644
--- a/js/Misc/DIFF_f.js
+++ b/js/Misc/DIFF_f.js
@@ -29,7 +29,7 @@ model.out=1;
 model.state=x0;
 model.blocktype="c";
 model.dep_ut=[false,true];
-exprs=[strcat(sci2exp(x0(1))),strcat(sci2exp(x0(2)))];
+exprs=[strcat(sci2exp(x0[1-1])),strcat(sci2exp(x0[2-1]))];
 gr_i=[];
 x=standard_define([2,2],model,exprs,gr_i);
 }
diff --git a/js/NonLinear/LOOKUP_c.js b/js/NonLinear/LOOKUP_c.js
index f605ba50..bb8013ae 100644
--- a/js/NonLinear/LOOKUP_c.js
+++ b/js/NonLinear/LOOKUP_c.js
@@ -1,4 +1,4 @@
-Syntax error in input LexToken(COMMA,',',1,3923)
+Syntax error in input LexToken(ASSIGNMENT,'=',1,4886)
 Syntax error in input LexToken(VAR,'ixy',1,6905)
 Syntax error in input LexToken(VAR,'a',1,25832)
 Syntax error in input LexToken(VAR,'a',1,27066)
diff --git a/js/Sinks/CEVENTSCOPE.js b/js/Sinks/CEVENTSCOPE.js
index 1d7fea48..84277e7b 100644
--- a/js/Sinks/CEVENTSCOPE.js
+++ b/js/Sinks/CEVENTSCOPE.js
@@ -74,10 +74,10 @@ model=scicos_model();
 model.sim=list("cevscpe",4);
 model.evtin=1;
 model.rpar=per;
-model.ipar=[win,1,clrs(nclock),wpos.slice(),wdim.slice()];
+model.ipar=[win,1,clrs[nclock-1],wpos.slice(),wdim.slice()];
 model.blocktype="d";
 model.dep_ut=[false,false];
-exprs=[sci2exp(nclock),strcat(sci2exp(clrs(nclock))," "),string(win),sci2exp([]),sci2exp(wdim),string(per)];
+exprs=[sci2exp(nclock),strcat(sci2exp(clrs[nclock-1])," "),string(win),sci2exp([]),sci2exp(wdim),string(per)];
 gr_i=[];
 x=standard_define([2,2],model,exprs,gr_i);
 }
diff --git a/js/Sources/CURVE_c.js b/js/Sources/CURVE_c.js
index acabe630..c406b761 100644
--- a/js/Sources/CURVE_c.js
+++ b/js/Sources/CURVE_c.js
@@ -1,4 +1,4 @@
-Syntax error in input LexToken(COMMA,',',1,3818)
+Syntax error in input LexToken(ASSIGNMENT,'=',1,4752)
 Syntax error in input LexToken(VAR,'ixy',1,6611)
 Syntax error in input LexToken(VAR,'a',1,25132)
 Syntax error in input LexToken(VAR,'a',1,26313)