support ScilabBoolean, ScilabDouble, ScilabString

1 files changed, 25 insertions, 25 deletions

diff --git a/js/Misc/generic_block.js b/js/Misc/generic_block.js
index 5325cc7e..a7cf464a 100644
--- a/js/Misc/generic_block.js
+++ b/js/Misc/generic_block.js
@@ -1,24 +1,24 @@
 /* autogenerated from "macros/Misc/generic_block.sci" */
 function generic_block() {
     generic_block.prototype.define = function generic_block() {
-        model = scicos_model();
+        this.model = scicos_model();
         this.function_name = "sinblk";
         this.funtyp = 1;
-        model.sim = list(this.function_name,this.funtyp);
-        model.in1 = 1;
-        model.out = 1;
-        model.evtin = [];
-        model.evtout = [];
-        model.state = [];
-        model.dstate = [];
-        model.rpar = [];
-        model.ipar = [];
-        model.blocktype = "c";
-        model.firing = [];
-        model.dep_ut = [true,false];
-        label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp(model.in1)],[sci2exp(model.out)],[sci2exp(model.evtin)],[sci2exp(model.evtout)],[sci2exp(model.state)],[sci2exp(model.dstate)],[sci2exp(model.rpar)],[sci2exp(model.ipar)],[sci2exp(model.firing)],["y"],["n"]];
+        this.model.sim = list(this.function_name,this.funtyp);
+        this.model.in1 = new ScilabDouble(1);
+        this.model.out = new ScilabDouble(1);
+        this.model.evtin = [];
+        this.model.evtout = [];
+        this.model.state = [];
+        this.model.dstate = [];
+        this.model.rpar = [];
+        this.model.ipar = [];
+        this.model.blocktype = new ScilabString("c");
+        this.model.firing = [];
+        this.model.dep_ut = [true,false];
+        label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp(this.model.in1)],[sci2exp(this.model.out)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.firing)],["y"],["n"]];
         gr_i = [];
-        this.x = standard_define([2,2],model,label,gr_i);
+        this.x = standard_define([2,2],this.model,label,gr_i);
         return new BasicBlock(this.x);
     }
     generic_block.prototype.details = function generic_block() {
@@ -58,7 +58,7 @@ function generic_block() {
         this.dept = parseBoolean(arguments[0]["dept"])
         this.lab = arguments[0]["lab"]
         this.x = arg1;
-        model = arg1.model;
+        this.model = arg1.model;
         graphics = arg1.graphics;
         label = graphics.exprs;
         if (size(label,"*")==14) {
@@ -104,20 +104,20 @@ function generic_block() {
             }
             dep_ut = [this.depu,this.dept];
             if (ok) {
-                [model,graphics,ok] = check_io(model,graphics,this.i,this.o,this.ci,this.co);
+                [model,graphics,ok] = check_io(this.model,graphics,this.i,this.o,this.ci,this.co);
             }
             if (ok) {
                 if (this.funtyp==3) {
                     needcompile = 4;
                 }
-                model.sim = list(this.function_name,this.funtyp);
-                model.state = this.xx;
-                model.dstate = this.z;
-                model.rpar = this.rpar;
-                model.ipar = this.ipar;
-                model.firing = this.auto0;
-                model.dep_ut = dep_ut;
-                arg1.model = model;
+                this.model.sim = list(this.function_name,this.funtyp);
+                this.model.state = this.xx;
+                this.model.dstate = this.z;
+                this.model.rpar = this.rpar;
+                this.model.ipar = new ScilabDouble(this.ipar);
+                this.model.firing = new ScilabDouble(this.auto0);
+                this.model.dep_ut = dep_ut;
+                arg1.model = this.model;
                 graphics.exprs = label;
                 arg1.graphics = graphics;
                 this.x = arg1;