From 7b0bf23e7d94df8f3406f5f64926b1131041ba35 Mon Sep 17 00:00:00 2001 From: Sunil Shetye Date: Wed, 20 Jun 2018 16:56:14 +0530 Subject: substitute some of the predefined variables --- js/Misc/DSUPER.js | 6 +++--- js/Misc/EXPRESSION.js | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'js/Misc') diff --git a/js/Misc/DSUPER.js b/js/Misc/DSUPER.js index 90eca99e..88f4a8e8 100644 --- a/js/Misc/DSUPER.js +++ b/js/Misc/DSUPER.js @@ -24,7 +24,7 @@ x=arg1; return; } context=[arg1.model.rpar.props.context]; -[%scicos_context,ierr]=script2var(context,%scicos_context); +[PREVAR_scicos_context,ierr]=script2var(context,PREVAR_scicos_context); if (ierr!=0) { x=arg1; return; @@ -34,11 +34,11 @@ for (i=2;i<=size(exprs0,1);i+=1) { tt=tt+",scicos_context."+exprs0(i); } ss=graphics.exprs(2)(3); -scicos_context=%scicos_context; +scicos_context=PREVAR_scicos_context; execstr("[ok,"+tt+",exprs]=scicos_getvalue(btitre,bitems,ss,exprs)"); if (ok) { x=arg1; -%scicos_context=scicos_context; +PREVAR_scicos_context=scicos_context; sblock=x.model.rpar; [sblock,%w,needcompile2,ok]=do_eval(sblock,list(),scicos_context); y=max(2,needcompile,needcompile2); diff --git a/js/Misc/EXPRESSION.js b/js/Misc/EXPRESSION.js index b25fbcb1..2495ad49 100644 --- a/js/Misc/EXPRESSION.js +++ b/js/Misc/EXPRESSION.js @@ -1,5 +1,4 @@ -Syntax error in input LexToken(PREVAR,'%scicos_context',1,1696) -Syntax error in input LexToken(PREVAR,'%foo',1,4175) -Syntax error in input LexToken(PREVAR,'%foo',1,4610) +Syntax error in input LexToken(FUNCTION,'function',1,4122) +Syntax error in input LexToken(VAR,'PREVAR_foo',1,4610) /* autogenerated from "macros/Misc/EXPRESSION.sci" */ None -- cgit