1 files changed, 32 insertions, 29 deletions

diff --git a/js/Sources/RFILE_f.js b/js/Sources/RFILE_f.js
index f157f3d6..d16da3a0 100644
--- a/js/Sources/RFILE_f.js
+++ b/js/Sources/RFILE_f.js
@@ -1,17 +1,17 @@
 /* autogenerated from "macros/Sources/RFILE_f.sci" */
 function RFILE_f() {
     RFILE_f.prototype.define = function RFILE_f() {
-        out = 1;
-        nout = sum(out);
-        frmt = "(7(e10.3,1x))";
-        fname = "foo";
-        lunit = 0;
+        var out = 1;
+        var nout = sum(out);
+        var frmt = "(7(e10.3,1x))";
+        var fname = "foo";
+        var lunit = 0;
         this.N = 2;
-        rpar = [];
-        tmask = 0;
+        var rpar = [];
+        var tmask = 0;
         this.outmask = 1;
-        ipar = [[length(fname)],[length(frmt)],[0],[this.N],[this._str2code[fname-1]],[this._str2code[frmt-1]],[tmask],[this.outmask]];
-        dstate = [[1],[1],[lunit],[zeros((nout)*this.N,1)]];
+        var ipar = [[length(fname)],[length(frmt)],[0],[this.N],[this._str2code[fname-1]],[this._str2code[frmt-1]],[tmask],[this.outmask]];
+        var dstate = [[1],[1],[lunit],[zeros((nout)*this.N,1)]];
         this.model = scicos_model();
         this.model.sim = new ScilabString(["readf"]);
         this.model.out = new ScilabDouble([nout]);
@@ -20,8 +20,8 @@ function RFILE_f() {
         this.model.ipar = new ScilabDouble([length(fname)],[length(frmt)],[0],[this.N],[this._str2code[fname-1]],[this._str2code[frmt-1]],[tmask],[this.outmask]);
         this.model.blocktype = new ScilabString(["d"]);
         this.model.dep_ut = [false,false];
-        exprs = [[sci2exp([])],[sci2exp(this.outmask)],[fname],[frmt],[string(this.N)],[sci2exp(out)]];
-        gr_i = [];
+        var exprs = [[sci2exp([])],[sci2exp(this.outmask)],[fname],[frmt],[string(this.N)],[sci2exp(out)]];
+        var gr_i = [];
         this.x = standard_define([3,2],this.model,exprs,gr_i);
         return new BasicBlock(this.x);
     }
@@ -45,18 +45,18 @@ function RFILE_f() {
         this.frmt1 = parseFloat(arguments[0]["frmt1"])
         this.N = parseFloat(arguments[0]["N"])
         this.x = arg1;
-        graphics = arg1.graphics;
-        exprs = graphics.exprs;
+        var graphics = arg1.graphics;
+        var exprs = graphics.exprs;
         this.model = arg1.model;
-        dstate = this.model.dstate;
-        ipar = this.model.ipar;
-        ievt = ipar[3-1];
+        var dstate = this.model.dstate;
+        var ipar = this.model.ipar;
+        var ievt = ipar[3-1];
         this.N = ipar[4-1];
-        imask = 5+ipar[1-1]+ipar[2-1];
-        tmask = ipar[imask-1];
-        lunit = dstate[3-1];
-        fname = exprs[3-1];
-        frmt = exprs[4-1];
+        var imask = 5+ipar[1-1]+ipar[2-1];
+        var tmask = ipar[imask-1];
+        var lunit = dstate[3-1];
+        var fname = exprs[3-1];
+        var frmt = exprs[4-1];
         if (size(exprs,"*")>5) {
             exprs[6-1] = [];
         }
@@ -67,7 +67,7 @@ function RFILE_f() {
             }
             this.fname1 = pathconvert(stripblanks(this.fname1),false,true);
             this.frmt1 = stripblanks(this.frmt1);
-            nout = size(this.outmask,"*");
+            var nout = size(this.outmask,"*");
             if (prod(size(this.tmask1))>1) {
                 block_parameter_error(msprintf("Wrong value for \'%s\' parameter: %s.","Time Record Selection",strcat(string(this.tmask1.slice())," ")),"Empty matrix or scalar expected.");
             } else if (this.tmask1!=[]&&this.tmask1<1) {
@@ -90,23 +90,26 @@ function RFILE_f() {
                 block_parameter_error(msprintf("Wrong value for \'%s\' parameter: %s","Outputs Record Selection",strcat(string(this.outmask.slice())," ")),"Strictly positive indexes expected.");
             } else {
                 if (this.tmask1==[]) {
-                    ievt = 0;
-                    cout = [];
+                    var ievt = 0;
+                    var cout = [];
                     this.tmask1 = 0;
                 } else {
-                    ievt = 1;
-                    cout = 1;
+                    var ievt = 1;
+                    var cout = 1;
                 }
-                [this.model,graphics,ok] = check_io(this.model,graphics,[],nout,1,cout);
+                var tmpvar0 = check_io(this.model,graphics,[],nout,1,cout)
+                this.model = tmpvar0[0]
+                var graphics = tmpvar0[1]
+                var ok = tmpvar0[2];
                 if (ok) {
                     if (ievt==0) {
                         this.model.firing = [];
                     } else {
                         this.model.firing = new ScilabDouble([0]);
                     }
-                    ipar = [[length(this.fname1)],[length(this.frmt1)],[ievt],[this.N],[this._str2code[this.fname1-1]],[this._str2code[this.frmt1-1]],[this.tmask1],[this.outmask.slice()]];
+                    var ipar = [[length(this.fname1)],[length(this.frmt1)],[ievt],[this.N],[this._str2code[this.fname1-1]],[this._str2code[this.frmt1-1]],[this.tmask1],[this.outmask.slice()]];
                     if (prod(size(dstate))!=(nout+ievt)*this.N+3) {
-                        dstate = [[-1],[-1],[lunit],[zeros((nout+ievt)*this.N,1)]];
+                        var dstate = [[-1],[-1],[lunit],[zeros((nout+ievt)*this.N,1)]];
                     }
                     this.model.dstate = new ScilabDouble(dstate);
                     this.model.ipar = new ScilabDouble(ipar);