diff options
-rw-r--r-- | combined.js | 44 | ||||
-rw-r--r-- | js/NonLinear/LOOKUP_c.js | 2 | ||||
-rw-r--r-- | js/Sinks/CLKOUTV_f.js | 43 | ||||
-rw-r--r-- | js/Sources/CURVE_c.js | 2 | ||||
-rw-r--r-- | js/Threshold/GENERAL_f.js | 2 | ||||
-rwxr-xr-x | sci2jsyacc.py | 5 |
6 files changed, 92 insertions, 6 deletions
diff --git a/combined.js b/combined.js index 690976c7..05aa334b 100644 --- a/combined.js +++ b/combined.js @@ -3872,6 +3872,48 @@ x.graphics.in_implicit=["I"]; OUTIMPL_f.prototype.details = function OUTIMPL_f() { } } +/* autogenerated from "macros/Sinks/CLKOUTV_f.sci" */ +function CLKOUTV_f() { +CLKOUTV_f.prototype.get = function CLKOUTV_f() { +} +CLKOUTV_f.prototype.set = function CLKOUTV_f() { +x=arg1; +graphics=arg1.graphics; +model=arg1.model; +exprs=graphics.exprs; +while (true) { +[ok,prt,exprs]=scicos_getvalue([msprintf(gettext("Set %s block parameters"),"CLKOUTV_f")," ",gettext("Event output port")],gettext("Port number"),list("vec",1),exprs); +if (!ok) { +break +} +prt=int(prt); +if (prt<=0) { +block_parameter_error(msprintf(gettext("Wrong value for \'Port Number\' parameter: %d."),prt),gettext("Strictly positive integer expected.")); +} else { +model.ipar=prt; +model.evtin=1; +graphics.exprs=exprs; +x.graphics=graphics; +x.model=model; +break +} +} +} +CLKOUTV_f.prototype.define = function CLKOUTV_f() { +prt=1; +model=scicos_model(); +model.sim="output"; +model.evtin=1; +model.ipar=prt; +model.blocktype="d"; +model.firing=[]; +model.dep_ut=[None,None]; +exprs=string(prt); +x=standard_define([1,1],model,exprs," "); +} +CLKOUTV_f.prototype.details = function CLKOUTV_f() { +} +} /* autogenerated from "macros/Sinks/CFSCOPE.sci" */ function CFSCOPE() { CFSCOPE.prototype.get = function CFSCOPE() { @@ -14729,4 +14771,4 @@ INVBLK_f.prototype.details = function INVBLK_f() { } } -/* made from 236/274 files */ +/* made from 237/274 files */ diff --git a/js/NonLinear/LOOKUP_c.js b/js/NonLinear/LOOKUP_c.js index ea12952b..f605ba50 100644 --- a/js/NonLinear/LOOKUP_c.js +++ b/js/NonLinear/LOOKUP_c.js @@ -1,4 +1,4 @@ -Syntax error in input LexToken(COMMA,',',1,3808) +Syntax error in input LexToken(COMMA,',',1,3923) 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/CLKOUTV_f.js b/js/Sinks/CLKOUTV_f.js index 15cb1919..a9ab9144 100644 --- a/js/Sinks/CLKOUTV_f.js +++ b/js/Sinks/CLKOUTV_f.js @@ -1,3 +1,42 @@ -Syntax error in input LexToken(COMMA,',',1,2017) /* autogenerated from "macros/Sinks/CLKOUTV_f.sci" */ -None +function CLKOUTV_f() { +CLKOUTV_f.prototype.get = function CLKOUTV_f() { +} +CLKOUTV_f.prototype.set = function CLKOUTV_f() { +x=arg1; +graphics=arg1.graphics; +model=arg1.model; +exprs=graphics.exprs; +while (true) { +[ok,prt,exprs]=scicos_getvalue([msprintf(gettext("Set %s block parameters"),"CLKOUTV_f")," ",gettext("Event output port")],gettext("Port number"),list("vec",1),exprs); +if (!ok) { +break +} +prt=int(prt); +if (prt<=0) { +block_parameter_error(msprintf(gettext("Wrong value for \'Port Number\' parameter: %d."),prt),gettext("Strictly positive integer expected.")); +} else { +model.ipar=prt; +model.evtin=1; +graphics.exprs=exprs; +x.graphics=graphics; +x.model=model; +break +} +} +} +CLKOUTV_f.prototype.define = function CLKOUTV_f() { +prt=1; +model=scicos_model(); +model.sim="output"; +model.evtin=1; +model.ipar=prt; +model.blocktype="d"; +model.firing=[]; +model.dep_ut=[None,None]; +exprs=string(prt); +x=standard_define([1,1],model,exprs," "); +} +CLKOUTV_f.prototype.details = function CLKOUTV_f() { +} +} diff --git a/js/Sources/CURVE_c.js b/js/Sources/CURVE_c.js index f48c2832..acabe630 100644 --- a/js/Sources/CURVE_c.js +++ b/js/Sources/CURVE_c.js @@ -1,4 +1,4 @@ -Syntax error in input LexToken(COMMA,',',1,3703) +Syntax error in input LexToken(COMMA,',',1,3818) 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) diff --git a/js/Threshold/GENERAL_f.js b/js/Threshold/GENERAL_f.js index cf90a0d9..2c1d9d68 100644 --- a/js/Threshold/GENERAL_f.js +++ b/js/Threshold/GENERAL_f.js @@ -1,3 +1,3 @@ -Syntax error in input LexToken(COMMA,',',1,1848) +Syntax error in input LexToken(COLON,':',1,1849) /* autogenerated from "macros/Threshold/GENERAL_f.sci" */ None diff --git a/sci2jsyacc.py b/sci2jsyacc.py index 59f0b3c2..d033b959 100755 --- a/sci2jsyacc.py +++ b/sci2jsyacc.py @@ -475,6 +475,11 @@ def p_term_full_slice(p): 'term : termvar OPENBRACKET COLON CLOSEBRACKET' p[0] = p[1] + '.slice()' +# B(:,1) +def p_term_full_slice_expression(p): + 'term : termvar OPENBRACKET COLON COMMA expression CLOSEBRACKET' + p[0] = p[1] + '.slice()[' + str(p[5]) + '-1]' + # B($-2) # C('function parameter') def p_term_index(p): |