fix assignment to list

24 files changed, 217 insertions, 217 deletions

diff --git a/js/Electrical/CCS.js b/js/Electrical/CCS.js
index 694226ca..a1c63058 100644
--- a/js/Electrical/CCS.js
+++ b/js/Electrical/CCS.js
@@ -1,43 +1,43 @@
 /* autogenerated from "macros/Electrical/CCS.sci" */
 function CCS() {
     CCS.prototype.define = function CCS() {
-        ModelName = "CCS";
-        PrametersValue = [];
-        ParametersName = [];
+        var ModelName = "CCS";
+        var PrametersValue = [];
+        var ParametersName = [];
         this.model = scicos_model();
-        Typein = [];
-        Typeout = [];
-        MI = [];
-        MO = [];
-        P = [[2,50,1,0],[70,98,2,0],[70,2,-2,0]];
-        PortName = [["Iin"],["p"],["n"]];
+        var Typein = [];
+        var Typeout = [];
+        var MI = [];
+        var MO = [];
+        var P = [[2,50,1,0],[70,98,2,0],[70,2,-2,0]];
+        var PortName = [["Iin"],["p"],["n"]];
         for (i=1;i<=size(P,"r");i+=1) {
             if (P[i-1][3-1]==1) {
-                Typein = [[Typein],["E"]];
-                MI = [[MI],[PortName[i-1]]];
+                var Typein = [[Typein],["E"]];
+                var MI = [[MI],[PortName[i-1]]];
             }
             if (P[i-1][3-1]==2) {
-                Typein = [[Typein],["I"]];
-                MI = [[MI],[PortName[i-1]]];
+                var Typein = [[Typein],["I"]];
+                var MI = [[MI],[PortName[i-1]]];
             }
             if (P[i-1][3-1]==-1) {
-                Typeout = [[Typeout],["E"]];
-                MO = [[MO],[PortName[i-1]]];
+                var Typeout = [[Typeout],["E"]];
+                var MO = [[MO],[PortName[i-1]]];
             }
             if (P[i-1][3-1]==-2) {
-                Typeout = [[Typeout],["I"]];
-                MO = [[MO],[PortName[i-1]]];
+                var Typeout = [[Typeout],["I"]];
+                var MO = [[MO],[PortName[i-1]]];
             }
         }
         this.model = scicos_model();
-        mo = modelica();
+        var mo = modelica();
         this.model.sim = new ScilabString([ModelName]);
         mo.inputs = MI;
         mo.outputs = MO;
         this.model.rpar = PrametersValue;
         mo.parameters = list(ParametersName,PrametersValue,zeros(ParametersName));
-        exprs = [];
-        gr_i = [];
+        var exprs = [];
+        var gr_i = [];
         this.model.blocktype = new ScilabString(["c"]);
         this.model.dep_ut = [false,true];
         mo.model = ModelName;
@@ -59,8 +59,8 @@ function CCS() {
     }
     CCS.prototype.set = function CCS() {
         this.x = arg1;
-        graphics = arg1.graphics;
-        exprs = graphics.exprs;
+        var graphics = arg1.graphics;
+        var exprs = graphics.exprs;
         this.model = arg1.model;
         this.x = arg1;
         return new BasicBlock(this.x);
diff --git a/js/Electrical/CVS.js b/js/Electrical/CVS.js
index aa3b3e1d..82338529 100644
--- a/js/Electrical/CVS.js
+++ b/js/Electrical/CVS.js
@@ -1,43 +1,43 @@
 /* autogenerated from "macros/Electrical/CVS.sci" */
 function CVS() {
     CVS.prototype.define = function CVS() {
-        ModelName = "CVS";
-        PrametersValue = [];
-        ParametersName = [];
+        var ModelName = "CVS";
+        var PrametersValue = [];
+        var ParametersName = [];
         this.model = scicos_model();
-        Typein = [];
-        Typeout = [];
-        MI = [];
-        MO = [];
-        P = [[2,50,1,0],[70,98,2,0],[70,2,-2,0]];
-        PortName = [["vin"],["p"],["n"]];
+        var Typein = [];
+        var Typeout = [];
+        var MI = [];
+        var MO = [];
+        var P = [[2,50,1,0],[70,98,2,0],[70,2,-2,0]];
+        var PortName = [["vin"],["p"],["n"]];
         for (i=1;i<=size(P,"r");i+=1) {
             if (P[i-1][3-1]==1) {
-                Typein = [[Typein],["E"]];
-                MI = [[MI],[PortName[i-1]]];
+                var Typein = [[Typein],["E"]];
+                var MI = [[MI],[PortName[i-1]]];
             }
             if (P[i-1][3-1]==2) {
-                Typein = [[Typein],["I"]];
-                MI = [[MI],[PortName[i-1]]];
+                var Typein = [[Typein],["I"]];
+                var MI = [[MI],[PortName[i-1]]];
             }
             if (P[i-1][3-1]==-1) {
-                Typeout = [[Typeout],["E"]];
-                MO = [[MO],[PortName[i-1]]];
+                var Typeout = [[Typeout],["E"]];
+                var MO = [[MO],[PortName[i-1]]];
             }
             if (P[i-1][3-1]==-2) {
-                Typeout = [[Typeout],["I"]];
-                MO = [[MO],[PortName[i-1]]];
+                var Typeout = [[Typeout],["I"]];
+                var MO = [[MO],[PortName[i-1]]];
             }
         }
         this.model = scicos_model();
-        mo = modelica();
+        var mo = modelica();
         this.model.sim = new ScilabString([ModelName]);
         mo.inputs = MI;
         mo.outputs = MO;
         this.model.rpar = PrametersValue;
         mo.parameters = list(ParametersName,PrametersValue,zeros(ParametersName));
-        exprs = [];
-        gr_i = [];
+        var exprs = [];
+        var gr_i = [];
         this.model.blocktype = new ScilabString(["c"]);
         this.model.dep_ut = [false,true];
         mo.model = ModelName;
@@ -59,8 +59,8 @@ function CVS() {
     }
     CVS.prototype.set = function CVS() {
         this.x = arg1;
-        graphics = arg1.graphics;
-        exprs = graphics.exprs;
+        var graphics = arg1.graphics;
+        var exprs = graphics.exprs;
         this.model = arg1.model;
         this.x = arg1;
         return new BasicBlock(this.x);
diff --git a/js/Electrical/Capacitor.js b/js/Electrical/Capacitor.js
index 49409fff..0bb18356 100644
--- a/js/Electrical/Capacitor.js
+++ b/js/Electrical/Capacitor.js
@@ -8,7 +8,7 @@ function Capacitor() {
         this.model.sim = new ScilabString(["Capacitor"]);
         this.model.blocktype = new ScilabString(["c"]);
         this.model.dep_ut = [true,false];
-        mo = modelica();
+        var mo = modelica();
         mo.model = "Capacitor";
         mo.inputs = "p";
         mo.outputs = "n";
@@ -16,8 +16,8 @@ function Capacitor() {
         this.model.equations = new ScilabDouble([mo]);
         this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]);
         this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]);
-        exprs = string([[this.C],[this.v]]);
-        gr_i = [];
+        var exprs = string([[this.C],[this.v]]);
+        var gr_i = [];
         this.x = standard_define([2,1.1],this.model,exprs,list(gr_i,0));
         this.x.graphics.in_implicit = ["I"];
         this.x.graphics.out_implicit = ["I"];
@@ -37,8 +37,8 @@ function Capacitor() {
         this.C = parseFloat(arguments[0]["C"])
         this.v = parseFloat(arguments[0]["v"])
         this.x = arg1;
-        graphics = arg1.graphics;
-        exprs = graphics.exprs;
+        var graphics = arg1.graphics;
+        var exprs = graphics.exprs;
         this.model = arg1.model;
         while (true) {
             [ok,this.C,this.v,exprs] = scicos_getvalue("Set Capacitor block parameter",["C (F)","Initial Voltage"],list("vec",1,"vec",1),exprs);
diff --git a/js/Electrical/ConstantVoltage.js b/js/Electrical/ConstantVoltage.js
index b38412a4..86527aec 100644
--- a/js/Electrical/ConstantVoltage.js
+++ b/js/Electrical/ConstantVoltage.js
@@ -9,14 +9,14 @@ function ConstantVoltage() {
         this.model.sim = new ScilabString(["ConstantVoltage"]);
         this.model.blocktype = new ScilabString(["c"]);
         this.model.dep_ut = [false,false];
-        mo = modelica();
+        var mo = modelica();
         mo.model = "ConstantVoltage";
         mo.inputs = "p";
         mo.outputs = "n";
         mo.parameters = list("V",list(this.V));
         this.model.equations = new ScilabDouble([mo]);
-        exprs = string(this.V);
-        gr_i = [];
+        var exprs = string(this.V);
+        var gr_i = [];
         this.x = standard_define([1.5,1.1],this.model,exprs,list(gr_i,0));
         this.x.graphics.in_implicit = ["I"];
         this.x.graphics.out_implicit = ["I"];
@@ -33,8 +33,8 @@ function ConstantVoltage() {
     ConstantVoltage.prototype.set = function ConstantVoltage() {
         this.V = parseFloat(arguments[0]["V"])
         this.x = arg1;
-        graphics = arg1.graphics;
-        exprs = graphics.exprs;
+        var graphics = arg1.graphics;
+        var exprs = graphics.exprs;
         this.model = arg1.model;
         while (true) {
             [ok,this.V,exprs] = scicos_getvalue("Set ConstantVoltage block parameter","V (volt)",list("vec",1),exprs);
diff --git a/js/Electrical/CurrentSensor.js b/js/Electrical/CurrentSensor.js
index b95e8505..a0be489a 100644
--- a/js/Electrical/CurrentSensor.js
+++ b/js/Electrical/CurrentSensor.js
@@ -7,13 +7,13 @@ function CurrentSensor() {
         this.model.sim = new ScilabString(["CurrentSensor"]);
         this.model.blocktype = new ScilabString(["c"]);
         this.model.dep_ut = [true,false];
-        mo = modelica();
+        var mo = modelica();
         mo.model = "CurrentSensor";
         mo.inputs = "p";
         mo.outputs = [["n"],["i"]];
         this.model.equations = new ScilabDouble([mo]);
-        exprs = [];
-        gr_i = [];
+        var exprs = [];
+        var gr_i = [];
         this.x = standard_define([2,2],this.model,exprs,list(gr_i,0));
         this.x.graphics.in_implicit = ["I"];
         this.x.graphics.out_implicit = [["I"],["E"]];
diff --git a/js/Electrical/Diode.js b/js/Electrical/Diode.js
index db1b958e..df2e5f8b 100644
--- a/js/Electrical/Diode.js
+++ b/js/Electrical/Diode.js
@@ -12,14 +12,14 @@ function Diode() {
         this.model.sim = new ScilabString(["Diode"]);
         this.model.blocktype = new ScilabString(["c"]);
         this.model.dep_ut = [true,false];
-        mo = modelica();
+        var mo = modelica();
         mo.model = "Diode";
         mo.inputs = "p";
         mo.outputs = "n";
         mo.parameters = list(["Ids","Vt","Maxexp","R"],list(this.Ids,this.Vt,this.Maxexp,this.R));
         this.model.equations = new ScilabDouble([mo]);
-        exprs = string([[this.Ids],[this.Vt],[this.Maxexp],[this.R]]);
-        gr_i = [];
+        var exprs = string([[this.Ids],[this.Vt],[this.Maxexp],[this.R]]);
+        var gr_i = [];
         this.x = standard_define([2,1],this.model,exprs,list(gr_i,0));
         this.x.graphics.in_implicit = ["I"];
         this.x.graphics.out_implicit = ["I"];
@@ -43,8 +43,8 @@ function Diode() {
         this.Maxexp = parseFloat(arguments[0]["Maxexp"])
         this.R = parseFloat(arguments[0]["R"])
         this.x = arg1;
-        graphics = arg1.graphics;
-        exprs = graphics.exprs;
+        var graphics = arg1.graphics;
+        var exprs = graphics.exprs;
         this.model = arg1.model;
         while (true) {
             [ok,this.Ids,this.Vt,this.Maxexp,this.R,exprs] = scicos_getvalue("Set Diode block parameter",["Saturation cuurent (A)","Voltage equivalent to temperature (Volt)","Max exponent for linear continuation","R (ohm)"],list("vec",1,"vec",1,"vec",1,"vec",1),exprs);
diff --git a/js/Electrical/Ground.js b/js/Electrical/Ground.js
index 867c9a7a..9d796b5c 100644
--- a/js/Electrical/Ground.js
+++ b/js/Electrical/Ground.js
@@ -7,12 +7,12 @@ function Ground() {
         this.model.sim = new ScilabString(["Ground"]);
         this.model.blocktype = new ScilabString(["c"]);
         this.model.dep_ut = [true,false];
-        mo = modelica();
+        var mo = modelica();
         mo.model = "Ground";
         mo.inputs = "p";
         this.model.equations = new ScilabDouble([mo]);
-        exprs = "";
-        gr_i = [];
+        var exprs = "";
+        var gr_i = [];
         this.x = standard_define([1,1],this.model,exprs,list(gr_i,0));
         this.x.graphics.in_implicit = ["I"];
         this.x.graphics.out_implicit = ["I"];
diff --git a/js/Electrical/Gyrator.js b/js/Electrical/Gyrator.js
index 044faa10..b048b411 100644
--- a/js/Electrical/Gyrator.js
+++ b/js/Electrical/Gyrator.js
@@ -1,43 +1,43 @@
 /* autogenerated from "macros/Electrical/Gyrator.sci" */
 function Gyrator() {
     Gyrator.prototype.define = function Gyrator() {
-        ModelName = "Gyrator";
-        PrametersValue = [[1],[1]];
-        ParametersName = [["G1"],["G2"]];
+        var ModelName = "Gyrator";
+        var PrametersValue = [[1],[1]];
+        var ParametersName = [["G1"],["G2"]];
         this.model = scicos_model();
-        Typein = [];
-        Typeout = [];
-        MI = [];
-        MO = [];
-        P = [[2.5,90,2,0],[2.5,10,2,0],[97.5,90,-2,0],[97.5,10,-2,0]];
-        PortName = [["p1"],["n1"],["p2"],["n2"]];
+        var Typein = [];
+        var Typeout = [];
+        var MI = [];
+        var MO = [];
+        var P = [[2.5,90,2,0],[2.5,10,2,0],[97.5,90,-2,0],[97.5,10,-2,0]];
+        var PortName = [["p1"],["n1"],["p2"],["n2"]];
         for (i=1;i<=size(P,"r");i+=1) {
             if (P[i-1][3-1]==1) {
-                Typein = [[Typein],["E"]];
-                MI = [[MI],[PortName[i-1]]];
+                var Typein = [[Typein],["E"]];
+                var MI = [[MI],[PortName[i-1]]];
             }
             if (P[i-1][3-1]==2) {
-                Typein = [[Typein],["I"]];
-                MI = [[MI],[PortName[i-1]]];
+                var Typein = [[Typein],["I"]];
+                var MI = [[MI],[PortName[i-1]]];
             }
             if (P[i-1][3-1]==-1) {
-                Typeout = [[Typeout],["E"]];
-                MO = [[MO],[PortName[i-1]]];
+                var Typeout = [[Typeout],["E"]];
+                var MO = [[MO],[PortName[i-1]]];
             }
             if (P[i-1][3-1]==-2) {
-                Typeout = [[Typeout],["I"]];
-                MO = [[MO],[PortName[i-1]]];
+                var Typeout = [[Typeout],["I"]];
+                var MO = [[MO],[PortName[i-1]]];
             }
         }
         this.model = scicos_model();
-        mo = modelica();
+        var mo = modelica();
         this.model.sim = new ScilabString([ModelName]);
         mo.inputs = MI;
         mo.outputs = MO;
         this.model.rpar = new ScilabDouble(PrametersValue);
         mo.parameters = list(ParametersName,PrametersValue,zeros(ParametersName));
-        exprs = [["1"],["1"]];
-        gr_i = [];
+        var exprs = [["1"],["1"]];
+        var gr_i = [];
         this.model.blocktype = new ScilabString(["c"]);
         this.model.dep_ut = [false,true];
         mo.model = ModelName;
@@ -63,11 +63,11 @@ function Gyrator() {
         this.G1 = arguments[0]["G1"]
         this.G2 = arguments[0]["G2"]
         this.x = arg1;
-        graphics = arg1.graphics;
-        exprs = graphics.exprs;
+        var graphics = arg1.graphics;
+        var exprs = graphics.exprs;
         this.model = arg1.model;
         this.x = arg1;
-        exprs = this.x.graphics.exprs;
+        var exprs = this.x.graphics.exprs;
         while (true) {
             [ok,this.G1,this.G2,exprs] = scicos_getvalue([["Set Gyrator block parameters:"],[""],["G1: Gyration conductance"],["G2: Gyration conductance"]],["G1","G2"],list("vec",1,"vec",1),exprs);
             if (!ok) {
diff --git a/js/Electrical/IdealTransformer.js b/js/Electrical/IdealTransformer.js
index 134085ce..3bdbff02 100644
--- a/js/Electrical/IdealTransformer.js
+++ b/js/Electrical/IdealTransformer.js
@@ -1,43 +1,43 @@
 /* autogenerated from "macros/Electrical/IdealTransformer.sci" */
 function IdealTransformer() {
     IdealTransformer.prototype.define = function IdealTransformer() {
-        ModelName = "IdealTransformer";
-        PrametersValue = [1];
-        ParametersName = ["N"];
+        var ModelName = "IdealTransformer";
+        var PrametersValue = [1];
+        var ParametersName = ["N"];
         this.model = scicos_model();
-        Typein = [];
-        Typeout = [];
-        MI = [];
-        MO = [];
-        P = [[2.5,90,2,0],[2.5,10,2,0],[97.5,90,-2,0],[97.5,10,-2,0]];
-        PortName = [["p1"],["n1"],["p2"],["n2"]];
+        var Typein = [];
+        var Typeout = [];
+        var MI = [];
+        var MO = [];
+        var P = [[2.5,90,2,0],[2.5,10,2,0],[97.5,90,-2,0],[97.5,10,-2,0]];
+        var PortName = [["p1"],["n1"],["p2"],["n2"]];
         for (i=1;i<=size(P,"r");i+=1) {
             if (P[i-1][3-1]==1) {
-                Typein = [[Typein],["E"]];
-                MI = [[MI],[PortName[i-1]]];
+                var Typein = [[Typein],["E"]];
+                var MI = [[MI],[PortName[i-1]]];
             }
             if (P[i-1][3-1]==2) {
-                Typein = [[Typein],["I"]];
-                MI = [[MI],[PortName[i-1]]];
+                var Typein = [[Typein],["I"]];
+                var MI = [[MI],[PortName[i-1]]];
             }
             if (P[i-1][3-1]==-1) {
-                Typeout = [[Typeout],["E"]];
-                MO = [[MO],[PortName[i-1]]];
+                var Typeout = [[Typeout],["E"]];
+                var MO = [[MO],[PortName[i-1]]];
             }
             if (P[i-1][3-1]==-2) {
-                Typeout = [[Typeout],["I"]];
-                MO = [[MO],[PortName[i-1]]];
+                var Typeout = [[Typeout],["I"]];
+                var MO = [[MO],[PortName[i-1]]];
             }
         }
         this.model = scicos_model();
-        mo = modelica();
+        var mo = modelica();
         this.model.sim = new ScilabString([ModelName]);
         mo.inputs = MI;
         mo.outputs = MO;
         this.model.rpar = PrametersValue;
         mo.parameters = list(ParametersName,PrametersValue,zeros(ParametersName));
-        exprs = ["1"];
-        gr_i = [];
+        var exprs = ["1"];
+        var gr_i = [];
         this.model.blocktype = new ScilabString(["c"]);
         this.model.dep_ut = [false,true];
         mo.model = ModelName;
@@ -61,11 +61,11 @@ function IdealTransformer() {
     IdealTransformer.prototype.set = function IdealTransformer() {
         this.N = arguments[0]["N"]
         this.x = arg1;
-        graphics = arg1.graphics;
-        exprs = graphics.exprs;
+        var graphics = arg1.graphics;
+        var exprs = graphics.exprs;
         this.model = arg1.model;
         this.x = arg1;
-        exprs = this.x.graphics.exprs;
+        var exprs = this.x.graphics.exprs;
         while (true) {
             [ok,this.N,exprs] = scicos_getvalue([["Set Transformer block parameters:"],[""],["N:"+" Turn ratio (N1/N2)"]],["N"],list("vec",1),exprs);
             if (!ok) {
diff --git a/js/Electrical/Inductor.js b/js/Electrical/Inductor.js
index 034abf89..46c3b201 100644
--- a/js/Electrical/Inductor.js
+++ b/js/Electrical/Inductor.js
@@ -9,14 +9,14 @@ function Inductor() {
         this.model.sim = new ScilabString(["Inductor"]);
         this.model.blocktype = new ScilabString(["c"]);
         this.model.dep_ut = [true,false];
-        mo = modelica();
+        var mo = modelica();
         mo.model = "Inductor";
         mo.inputs = "p";
         mo.outputs = "n";
         mo.parameters = list("L",list(this.L));
         this.model.equations = new ScilabDouble([mo]);
-        exprs = string(this.L);
-        gr_i = [];
+        var exprs = string(this.L);
+        var gr_i = [];
         this.x = standard_define([2,0.9],this.model,exprs,list(gr_i,0));
         this.x.graphics.in_implicit = ["I"];
         this.x.graphics.out_implicit = ["I"];
@@ -33,8 +33,8 @@ function Inductor() {
     Inductor.prototype.set = function Inductor() {
         this.L = parseFloat(arguments[0]["L"])
         this.x = arg1;
-        graphics = arg1.graphics;
-        exprs = graphics.exprs;
+        var graphics = arg1.graphics;
+        var exprs = graphics.exprs;
         this.model = arg1.model;
         while (true) {
             [ok,this.L,exprs] = scicos_getvalue("Set Inductor block parameter","L (H)",list("vec",1),exprs);
diff --git a/js/Electrical/MOTOR.js b/js/Electrical/MOTOR.js
index 952bb049..0c8b03ea 100644
--- a/js/Electrical/MOTOR.js
+++ b/js/Electrical/MOTOR.js
@@ -7,8 +7,8 @@ function MOTOR() {
         this.model.sim = new ScilabString(["motor"]);
         this.model.blocktype = new ScilabString(["c"]);
         this.model.dep_ut = [true,false];
-        gr_i = [];
-        exprs = "";
+        var gr_i = [];
+        var exprs = "";
         this.x = standard_define([2,2],this.model,exprs,gr_i);
         this.x.graphics.out_implicit = [["I"],["I"]];
         this.x.graphics.in_implicit = ["I"];
diff --git a/js/Electrical/NMOS.js b/js/Electrical/NMOS.js
index 3bcaa14d..c80a5c08 100644
--- a/js/Electrical/NMOS.js
+++ b/js/Electrical/NMOS.js
@@ -14,7 +14,7 @@ function NMOS() {
         this.model.sim = new ScilabString(["NMOS"]);
         this.model.blocktype = new ScilabString(["c"]);
         this.model.dep_ut = [true,false];
-        mo = modelica();
+        var mo = modelica();
         mo.model = "NMOS";
         mo.outputs = [["D"],["B"],["S"]];
         mo.inputs = "G";
@@ -22,8 +22,8 @@ function NMOS() {
         this.model.equations = new ScilabDouble([mo]);
         this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]);
         this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]);
-        exprs = [[string(this.W)],[string(this.L)],[string(this.Beta)],[string(this.Vt)],[string(this.K2)],[string(this.K5)],[string(this.dW)],[string(this.dL)],[string(this.RDS)]];
-        gr_i = [];
+        var exprs = [[string(this.W)],[string(this.L)],[string(this.Beta)],[string(this.Vt)],[string(this.K2)],[string(this.K5)],[string(this.dW)],[string(this.dL)],[string(this.RDS)]];
+        var gr_i = [];
         this.x = standard_define([2,2],this.model,exprs,gr_i);
         this.x.graphics.in_implicit = ["I"];
         this.x.graphics.out_implicit = [["I"],["I"],["I"]];
@@ -57,8 +57,8 @@ function NMOS() {
         this.dL = parseFloat(arguments[0]["dL"])
         this.RDS = parseFloat(arguments[0]["RDS"])
         this.x = arg1;
-        graphics = arg1.graphics;
-        exprs = graphics.exprs;
+        var graphics = arg1.graphics;
+        var exprs = graphics.exprs;
         this.model = arg1.model;
         while (true) {
             [ok,this.W,this.L,this.Beta,this.Vt,this.K2,this.K5,this.dW,this.dL,this.RDS,exprs] = scicos_getvalue("Set NMOS Transistor block parameters",["Width [m]","Length [m]","Transconductance parameter [A/(V*V)]","Zero bias threshold voltage [V]","Bulk threshold parameter","Reduction of pinch-off region","Narrowing of channel [m]","Shortening of channel [m]","Drain-Source-Resistance [Ohm]"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs);
diff --git a/js/Electrical/NPN.js b/js/Electrical/NPN.js
index 6f6d2bb6..392f5285 100644
--- a/js/Electrical/NPN.js
+++ b/js/Electrical/NPN.js
@@ -1,43 +1,43 @@
 /* autogenerated from "macros/Electrical/NPN.sci" */
 function NPN() {
     NPN.prototype.define = function NPN() {
-        ModelName = "NPN";
-        PrametersValue = [[50],[0.1],[0],[0.02],[1.200e-10],[5.000e-09],[1.000e-12],[4.000e-13],[5.000e-13],[0.8],[0.4],[0.8],[0.333],[1.000e-15],[1.000e-15],[0.02585],[40]];
-        ParametersName = [["Bf"],["Br"],["Is"],["Vak"],["Tauf"],["Taur"],["Ccs"],["Cje"],["Cjc"],["Phie"],["Me"],["Phic"],["Mc"],["Gbc"],["Gbe"],["Vt"],["EMinMax"]];
+        var ModelName = "NPN";
+        var PrametersValue = [[50],[0.1],[0],[0.02],[1.200e-10],[5.000e-09],[1.000e-12],[4.000e-13],[5.000e-13],[0.8],[0.4],[0.8],[0.333],[1.000e-15],[1.000e-15],[0.02585],[40]];
+        var ParametersName = [["Bf"],["Br"],["Is"],["Vak"],["Tauf"],["Taur"],["Ccs"],["Cje"],["Cjc"],["Phie"],["Me"],["Phic"],["Mc"],["Gbc"],["Gbe"],["Vt"],["EMinMax"]];
         this.model = scicos_model();
-        Typein = [];
-        Typeout = [];
-        MI = [];
-        MO = [];
-        P = [[100,90,-2,0],[0,50,2,0],[100,10,-2,0]];
-        PortName = [["C"],["B"],["E"]];
+        var Typein = [];
+        var Typeout = [];
+        var MI = [];
+        var MO = [];
+        var P = [[100,90,-2,0],[0,50,2,0],[100,10,-2,0]];
+        var PortName = [["C"],["B"],["E"]];
         for (i=1;i<=size(P,"r");i+=1) {
             if (P[i-1][3-1]==1) {
-                Typein = [[Typein],["E"]];
-                MI = [[MI],[PortName[i-1]]];
+                var Typein = [[Typein],["E"]];
+                var MI = [[MI],[PortName[i-1]]];
             }
             if (P[i-1][3-1]==2) {
-                Typein = [[Typein],["I"]];
-                MI = [[MI],[PortName[i-1]]];
+                var Typein = [[Typein],["I"]];
+                var MI = [[MI],[PortName[i-1]]];
             }
             if (P[i-1][3-1]==-1) {
-                Typeout = [[Typeout],["E"]];
-                MO = [[MO],[PortName[i-1]]];
+                var Typeout = [[Typeout],["E"]];
+                var MO = [[MO],[PortName[i-1]]];
             }
             if (P[i-1][3-1]==-2) {
-                Typeout = [[Typeout],["I"]];
-                MO = [[MO],[PortName[i-1]]];
+                var Typeout = [[Typeout],["I"]];
+                var MO = [[MO],[PortName[i-1]]];
             }
         }
         this.model = scicos_model();
-        mo = modelica();
+        var mo = modelica();
         this.model.sim = new ScilabString([ModelName]);
         mo.inputs = MI;
         mo.outputs = MO;
         this.model.rpar = new ScilabDouble(PrametersValue);
         mo.parameters = list(ParametersName,PrametersValue,zeros(ParametersName));
-        exprs = [["50"],["0.1"],["1.e-16"],["0.02"],["0.12e-9"],["5e-9"],["1e-12"],["0.4e-12"],["0.5e-12"],["0.8"],["0.4"],["0.8"],["0.333"],["1e-15"],["1e-15"],["0.02585"],["40"]];
-        gr_i = [];
+        var exprs = [["50"],["0.1"],["1.e-16"],["0.02"],["0.12e-9"],["5e-9"],["1e-12"],["0.4e-12"],["0.5e-12"],["0.8"],["0.4"],["0.8"],["0.333"],["1e-15"],["1e-15"],["0.02585"],["40"]];
+        var gr_i = [];
         this.model.blocktype = new ScilabString(["c"]);
         this.model.dep_ut = [false,true];
         mo.model = ModelName;
@@ -93,11 +93,11 @@ function NPN() {
         this.Vt = arguments[0]["Vt"]
         this.EMinMax = arguments[0]["EMinMax"]
         this.x = arg1;
-        graphics = arg1.graphics;
-        exprs = graphics.exprs;
+        var graphics = arg1.graphics;
+        var exprs = graphics.exprs;
         this.model = arg1.model;
         this.x = arg1;
-        exprs = this.x.graphics.exprs;
+        var exprs = this.x.graphics.exprs;
         while (true) {
             [ok,this.Bf,this.Br,this.Is,this.Vak,this.Tauf,this.Taur,this.Ccs,this.Cje,this.Cjc,this.Phie,this.Me,this.Phic,this.Mc,this.Gbc,this.Gbe,this.Vt,this.EMinMax,exprs] = scicos_getvalue([["Set NPN block parameters:"],[""]],["Bf  : Forward beta","Br  : Reverse beta","Is  : Transport saturation current","Vak : Early voltage (inverse), 1/Volt","Tauf: Ideal forward transit time","Taur: Ideal reverse transit time","Ccs : Collector-substrat(ground) cap.","Cje : Base-emitter zero bias depletion cap.","Cjc : Base-coll. zero bias depletion cap.","Phie: Base-emitter diffusion voltage","Me  : Base-emitter gradation exponent","Phic: Base-collector diffusion voltage","Mc  : Base-collector gradation exponent","Gbc : Base-collector conductance","Gbe : Base-emitter conductance","Vt  : Voltage equivalent of temperature","EMinmax: if x > EMinMax, the exp(x) is linearized"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs);
             if (!ok) {
diff --git a/js/Electrical/OpAmp.js b/js/Electrical/OpAmp.js
index b1b1222a..387cd7b4 100644
--- a/js/Electrical/OpAmp.js
+++ b/js/Electrical/OpAmp.js
@@ -1,13 +1,13 @@
 /* autogenerated from "macros/Electrical/OpAmp.sci" */
 function OpAmp() {
     OpAmp.prototype.define = function OpAmp() {
-        S = [];
-        Z = [];
+        var S = [];
+        var Z = [];
         this.model = scicos_model();
         this.model.sim = new ScilabString(["OpAmp"]);
         this.model.blocktype = new ScilabString(["c"]);
         this.model.dep_ut = [true,false];
-        mo = modelica();
+        var mo = modelica();
         mo.model = this.model.sim;
         mo.inputs = [["in_p"],["in_n"]];
         mo.outputs = ["out"];
@@ -16,8 +16,8 @@ function OpAmp() {
         this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]);
         this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]);
         this.model.rpar = Z;
-        exprs = string(Z);
-        gr_i = [];
+        var exprs = string(Z);
+        var gr_i = [];
         this.x = standard_define([3,5],this.model,exprs,gr_i);
         this.x.graphics.in_implicit = [["I"],["I"]];
         this.x.graphics.out_implicit = ["I"];
@@ -39,8 +39,8 @@ function OpAmp() {
         this.SatH = arguments[0]["SatH"]
         this.SatL = arguments[0]["SatL"]
         this.x = arg1;
-        graphics = arg1.graphics;
-        exprs = graphics.exprs;
+        var graphics = arg1.graphics;
+        var exprs = graphics.exprs;
         this.model = arg1.model;
         while (false) {
             [ok,this.OLGain,this.SatH,this.SatL,exprs] = scicos_getvalue("Set the Operational Amplifier parameters",["Open Loop Gain","Positive saturation voltage","Negative saturation voltage"],list("vec",1,"vec",1,"vec",1),exprs);
diff --git a/js/Electrical/PMOS.js b/js/Electrical/PMOS.js
index e9c629a6..ade7e825 100644
--- a/js/Electrical/PMOS.js
+++ b/js/Electrical/PMOS.js
@@ -14,7 +14,7 @@ function PMOS() {
         this.model.sim = new ScilabString(["PMOS"]);
         this.model.blocktype = new ScilabString(["c"]);
         this.model.dep_ut = [true,false];
-        mo = modelica();
+        var mo = modelica();
         mo.model = "PMOS";
         mo.outputs = [["D"],["B"],["S"]];
         mo.inputs = "G";
@@ -22,8 +22,8 @@ function PMOS() {
         this.model.equations = new ScilabDouble([mo]);
         this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]);
         this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]);
-        exprs = [[string(this.W)],[string(this.L)],[string(this.Beta)],[string(this.Vt)],[string(this.K2)],[string(this.K5)],[string(this.dW)],[string(this.dL)],[string(this.RDS)]];
-        gr_i = [];
+        var exprs = [[string(this.W)],[string(this.L)],[string(this.Beta)],[string(this.Vt)],[string(this.K2)],[string(this.K5)],[string(this.dW)],[string(this.dL)],[string(this.RDS)]];
+        var gr_i = [];
         this.x = standard_define([2,2],this.model,exprs,gr_i);
         this.x.graphics.in_implicit = ["I"];
         this.x.graphics.out_implicit = [["I"],["I"],["I"]];
@@ -57,8 +57,8 @@ function PMOS() {
         this.dL = parseFloat(arguments[0]["dL"])
         this.RDS = parseFloat(arguments[0]["RDS"])
         this.x = arg1;
-        graphics = arg1.graphics;
-        exprs = graphics.exprs;
+        var graphics = arg1.graphics;
+        var exprs = graphics.exprs;
         this.model = arg1.model;
         while (true) {
             [ok,this.W,this.L,this.Beta,this.Vt,this.K2,this.K5,this.dW,this.dL,this.RDS,exprs] = scicos_getvalue("Set PMOS Transistor parameters",["Width [m]","Length [m]","Transconductance parameter [A/(V*V)]","Zero bias threshold voltage [V]","Bulk threshold parameter","Reduction of pinch-off region","Narrowing of channel [m]","Shortening of channel [m]","Drain-Source-Resistance [Ohm]"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs);
diff --git a/js/Electrical/PNP.js b/js/Electrical/PNP.js
index 1fe8176c..a64de188 100644
--- a/js/Electrical/PNP.js
+++ b/js/Electrical/PNP.js
@@ -1,43 +1,43 @@
 /* autogenerated from "macros/Electrical/PNP.sci" */
 function PNP() {
     PNP.prototype.define = function PNP() {
-        ModelName = "PNP";
-        PrametersValue = [[50],[0.1],[0],[0.02],[1.200e-10],[5.000e-09],[1.000e-12],[4.000e-13],[5.000e-13],[0.8],[0.4],[0.8],[0.333],[1.000e-15],[1.000e-15],[0.02585],[40]];
-        ParametersName = [["Bf"],["Br"],["Is"],["Vak"],["Tauf"],["Taur"],["Ccs"],["Cje"],["Cjc"],["Phie"],["Me"],["Phic"],["Mc"],["Gbc"],["Gbe"],["Vt"],["EMinMax"]];
+        var ModelName = "PNP";
+        var PrametersValue = [[50],[0.1],[0],[0.02],[1.200e-10],[5.000e-09],[1.000e-12],[4.000e-13],[5.000e-13],[0.8],[0.4],[0.8],[0.333],[1.000e-15],[1.000e-15],[0.02585],[40]];
+        var ParametersName = [["Bf"],["Br"],["Is"],["Vak"],["Tauf"],["Taur"],["Ccs"],["Cje"],["Cjc"],["Phie"],["Me"],["Phic"],["Mc"],["Gbc"],["Gbe"],["Vt"],["EMinMax"]];
         this.model = scicos_model();
-        Typein = [];
-        Typeout = [];
-        MI = [];
-        MO = [];
-        P = [[100,90,-2,0],[0,50,2,0],[100,10,-2,0]];
-        PortName = [["C"],["B"],["E"]];
+        var Typein = [];
+        var Typeout = [];
+        var MI = [];
+        var MO = [];
+        var P = [[100,90,-2,0],[0,50,2,0],[100,10,-2,0]];
+        var PortName = [["C"],["B"],["E"]];
         for (i=1;i<=size(P,"r");i+=1) {
             if (P[i-1][3-1]==1) {
-                Typein = [[Typein],["E"]];
-                MI = [[MI],[PortName[i-1]]];
+                var Typein = [[Typein],["E"]];
+                var MI = [[MI],[PortName[i-1]]];
             }
             if (P[i-1][3-1]==2) {
-                Typein = [[Typein],["I"]];
-                MI = [[MI],[PortName[i-1]]];
+                var Typein = [[Typein],["I"]];
+                var MI = [[MI],[PortName[i-1]]];
             }
             if (P[i-1][3-1]==-1) {
-                Typeout = [[Typeout],["E"]];
-                MO = [[MO],[PortName[i-1]]];
+                var Typeout = [[Typeout],["E"]];
+                var MO = [[MO],[PortName[i-1]]];
             }
             if (P[i-1][3-1]==-2) {
-                Typeout = [[Typeout],["I"]];
-                MO = [[MO],[PortName[i-1]]];
+                var Typeout = [[Typeout],["I"]];
+                var MO = [[MO],[PortName[i-1]]];
             }
         }
         this.model = scicos_model();
-        mo = modelica();
+        var mo = modelica();
         this.model.sim = new ScilabString([ModelName]);
         mo.inputs = MI;
         mo.outputs = MO;
         this.model.rpar = new ScilabDouble(PrametersValue);
         mo.parameters = list(ParametersName,PrametersValue,zeros(ParametersName));
-        exprs = [["50"],["0.1"],["1.e-16"],["0.02"],["0.12e-9"],["5e-9"],["1e-12"],["0.4e-12"],["0.5e-12"],["0.8"],["0.4"],["0.8"],["0.333"],["1e-15"],["1e-15"],["0.02585"],["40"]];
-        gr_i = [];
+        var exprs = [["50"],["0.1"],["1.e-16"],["0.02"],["0.12e-9"],["5e-9"],["1e-12"],["0.4e-12"],["0.5e-12"],["0.8"],["0.4"],["0.8"],["0.333"],["1e-15"],["1e-15"],["0.02585"],["40"]];
+        var gr_i = [];
         this.model.blocktype = new ScilabString(["c"]);
         this.model.dep_ut = [false,true];
         mo.model = ModelName;
@@ -93,11 +93,11 @@ function PNP() {
         this.Vt = arguments[0]["Vt"]
         this.EMinMax = arguments[0]["EMinMax"]
         this.x = arg1;
-        graphics = arg1.graphics;
-        exprs = graphics.exprs;
+        var graphics = arg1.graphics;
+        var exprs = graphics.exprs;
         this.model = arg1.model;
         this.x = arg1;
-        exprs = this.x.graphics.exprs;
+        var exprs = this.x.graphics.exprs;
         while (true) {
             [ok,this.Bf,this.Br,this.Is,this.Vak,this.Tauf,this.Taur,this.Ccs,this.Cje,this.Cjc,this.Phie,this.Me,this.Phic,this.Mc,this.Gbc,this.Gbe,this.Vt,this.EMinMax,exprs] = scicos_getvalue([["Set PNP block parameters:"],[""]],["Bf  : Forward beta","Br  : Reverse beta","Is  : Transport saturation current","Vak : Early voltage (inverse), 1/Volt","Tauf: Ideal forward transit time","Taur: Ideal reverse transit time","Ccs : Collector-substrat(ground) cap.","Cje : Base-emitter zero bias depletion cap.","Cjc : Base-coll. zero bias depletion cap.","Phie: Base-emitter diffusion voltage","Me  : Base-emitter gradation exponent","Phic: Base-collector diffusion voltage","Mc  : Base-collector gradation exponent","Gbc : Base-collector conductance","Gbe : Base-emitter conductance","Vt  : Voltage equivalent of temperature","EMinMax: if x > EMinMax, the exp(x) function is linearized"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs);
             if (!ok) {
diff --git a/js/Electrical/PotentialSensor.js b/js/Electrical/PotentialSensor.js
index 42757248..46db78fb 100644
--- a/js/Electrical/PotentialSensor.js
+++ b/js/Electrical/PotentialSensor.js
@@ -8,12 +8,12 @@ function PotentialSensor() {
         this.model.sim = new ScilabString(["PotentialSensor"]);
         this.model.blocktype = new ScilabString(["c"]);
         this.model.dep_ut = [true,false];
-        mo = modelica();
+        var mo = modelica();
         mo.model = "PotentialSensor";
         mo.inputs = "p";
         mo.outputs = ["v"];
         this.model.equations = new ScilabDouble([mo]);
-        gr_i = [];
+        var gr_i = [];
         this.x = standard_define([2,2],this.model,"",list(gr_i,0));
         this.x.graphics.in_implicit = ["I"];
         this.x.graphics.out_implicit = ["E"];
diff --git a/js/Electrical/Resistor.js b/js/Electrical/Resistor.js
index efec6abd..d0c91ba5 100644
--- a/js/Electrical/Resistor.js
+++ b/js/Electrical/Resistor.js
@@ -7,7 +7,7 @@ function Resistor() {
         this.model.sim = new ScilabString(["resistor"]);
         this.model.blocktype = new ScilabString(["c"]);
         this.model.dep_ut = [true,false];
-        mo = modelica();
+        var mo = modelica();
         mo.model = "Resistor";
         mo.inputs = "p";
         mo.outputs = "n";
@@ -15,8 +15,8 @@ function Resistor() {
         this.model.equations = new ScilabDouble([mo]);
         this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]);
         this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]);
-        exprs = string(this.R);
-        gr_i = [];
+        var exprs = string(this.R);
+        var gr_i = [];
         this.x = standard_define([2,1],this.model,exprs,list(gr_i,0));
         this.x.graphics.in_implicit = ["I"];
         this.x.graphics.out_implicit = ["I"];
@@ -33,8 +33,8 @@ function Resistor() {
     Resistor.prototype.set = function Resistor() {
         this.R = parseFloat(arguments[0]["R"])
         this.x = arg1;
-        graphics = arg1.graphics;
-        exprs = graphics.exprs;
+        var graphics = arg1.graphics;
+        var exprs = graphics.exprs;
         this.model = arg1.model;
         while (true) {
             [ok,this.R,exprs] = scicos_getvalue("Set Resistor block parameter","R (ohm)",list("vec",1),exprs);
diff --git a/js/Electrical/SineVoltage.js b/js/Electrical/SineVoltage.js
index 6906c803..7db61627 100644
--- a/js/Electrical/SineVoltage.js
+++ b/js/Electrical/SineVoltage.js
@@ -13,14 +13,14 @@ function SineVoltage() {
         this.model.sim = new ScilabString(["SineVoltage"]);
         this.model.blocktype = new ScilabString(["c"]);
         this.model.dep_ut = [true,false];
-        mo = modelica();
+        var mo = modelica();
         mo.model = "SineVoltage";
         mo.inputs = "p";
         mo.outputs = "n";
         mo.parameters = list([["V"],["phase"],["freqHz"],["offset"],["startTime"]],list(this.V,this.ph,this.frq,this.offset,this.start));
         this.model.equations = new ScilabDouble([mo]);
-        exprs = [[string(this.V)],[string(this.ph)],[string(this.frq)],[string(this.offset)],[string(this.start)]];
-        gr_i = [];
+        var exprs = [[string(this.V)],[string(this.ph)],[string(this.frq)],[string(this.offset)],[string(this.start)]];
+        var gr_i = [];
         this.x = standard_define([2,2],this.model,exprs,gr_i);
         this.x.graphics.in_implicit = ["I"];
         this.x.graphics.out_implicit = ["I"];
@@ -46,8 +46,8 @@ function SineVoltage() {
         this.offset = parseFloat(arguments[0]["offset"])
         this.start = parseFloat(arguments[0]["start"])
         this.x = arg1;
-        graphics = arg1.graphics;
-        exprs = graphics.exprs;
+        var graphics = arg1.graphics;
+        var exprs = graphics.exprs;
         this.model = arg1.model;
         while (true) {
             [ok,this.V,this.ph,this.frq,this.offset,this.start,exprs] = scicos_getvalue("Set voltage source parameter",["Amplitude (Volt)","phase (rad)","Frequency (Hz)","Voltageoffset (V)","Timeoffset (s)"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs);
diff --git a/js/Electrical/Switch.js b/js/Electrical/Switch.js
index be1ff9fd..57211e6b 100644
--- a/js/Electrical/Switch.js
+++ b/js/Electrical/Switch.js
@@ -4,12 +4,12 @@ function Switch() {
         this.model = scicos_model();
         this.Ron = 0.01;
         this.Roff = 1e5;
-        S = [["Ron"],["Roff"]];
-        Z = eval(S);
+        var S = [["Ron"],["Roff"]];
+        var Z = eval(S);
         this.model.sim = new ScilabString(["Switch"]);
         this.model.blocktype = new ScilabString(["c"]);
         this.model.dep_ut = [true,false];
-        mo = modelica();
+        var mo = modelica();
         mo.model = this.model.sim;
         mo.inputs = [["p"],["inp"]];
         mo.outputs = "n";
@@ -18,8 +18,8 @@ function Switch() {
         this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]);
         this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]);
         this.model.rpar = new ScilabDouble([Z]);
-        exprs = string(Z);
-        gr_i = [];
+        var exprs = string(Z);
+        var gr_i = [];
         this.x = standard_define([2,2],this.model,exprs,list(gr_i,0));
         this.x.graphics.in_implicit = [["I"],["E"]];
         this.x.graphics.out_implicit = ["I"];
@@ -39,8 +39,8 @@ function Switch() {
         this.Ron = parseFloat(arguments[0]["Ron"])
         this.Roff = parseFloat(arguments[0]["Roff"])
         this.x = arg1;
-        graphics = arg1.graphics;
-        exprs = graphics.exprs;
+        var graphics = arg1.graphics;
+        var exprs = graphics.exprs;
         this.model = arg1.model;
         while (true) {
             [ok,this.Ron,this.Roff,exprs] = scicos_getvalue("Set non-ideal electrical switch parameters",["Resistance in On state (Ohm)","Resistance in Off state (Ohm)"],list("vec",1,"vec",1),exprs);
diff --git a/js/Electrical/VVsourceAC.js b/js/Electrical/VVsourceAC.js
index 3faab62a..22a7553b 100644
--- a/js/Electrical/VVsourceAC.js
+++ b/js/Electrical/VVsourceAC.js
@@ -4,20 +4,20 @@ function VVsourceAC() {
         this.model = scicos_model();
         this.model.in1 = new ScilabDouble([1],[1]);
         this.model.out = [1];
-        VA = 220;
+        var VA = 220;
         this.FR = 50;
         this.model.rpar = [this.FR];
         this.model.sim = new ScilabString(["VVsourceAC"]);
         this.model.blocktype = new ScilabString(["c"]);
         this.model.dep_ut = [true,false];
-        mo = modelica();
+        var mo = modelica();
         mo.model = "VVsourceAC";
         mo.inputs = ["p","VA"];
         mo.outputs = "n";
         mo.parameters = list(["f"],list(this.FR));
         this.model.equations = new ScilabDouble([mo]);
-        exprs = [string(this.FR)];
-        gr_i = [];
+        var exprs = [string(this.FR)];
+        var gr_i = [];
         this.x = standard_define([2,2],this.model,exprs,list(gr_i,0));
         this.x.graphics.in_implicit = ["I","E"];
         this.x.graphics.out_implicit = ["I"];
@@ -35,8 +35,8 @@ function VVsourceAC() {
     VVsourceAC.prototype.set = function VVsourceAC() {
         this.FR = parseFloat(arguments[0]["FR"])
         this.x = arg1;
-        graphics = arg1.graphics;
-        exprs = graphics.exprs;
+        var graphics = arg1.graphics;
+        var exprs = graphics.exprs;
         this.model = arg1.model;
         while (true) {
             [ok,this.FR,exprs] = scicos_getvalue("Set voltage source parameter",["Frequency (Hz)"],list("vec",-1),exprs);
diff --git a/js/Electrical/VariableResistor.js b/js/Electrical/VariableResistor.js
index 6bf1e3b8..608b7d95 100644
--- a/js/Electrical/VariableResistor.js
+++ b/js/Electrical/VariableResistor.js
@@ -5,15 +5,15 @@ function VariableResistor() {
         this.model.sim = new ScilabString(["VariableResistor"]);
         this.model.blocktype = new ScilabString(["c"]);
         this.model.dep_ut = [true,false];
-        mo = modelica();
+        var mo = modelica();
         mo.model = "VariableResistor";
         mo.inputs = ["p","R"];
         mo.outputs = "n";
         this.model.equations = new ScilabDouble([mo]);
         this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]);
         this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]);
-        exprs = [];
-        gr_i = [];
+        var exprs = [];
+        var gr_i = [];
         this.x = standard_define([2,2],this.model,exprs,list(gr_i,0));
         this.x.graphics.in_implicit = ["I","E"];
         this.x.graphics.out_implicit = ["I"];
diff --git a/js/Electrical/VoltageSensor.js b/js/Electrical/VoltageSensor.js
index b234f79a..0c9fc13d 100644
--- a/js/Electrical/VoltageSensor.js
+++ b/js/Electrical/VoltageSensor.js
@@ -7,13 +7,13 @@ function VoltageSensor() {
         this.model.sim = new ScilabString(["VoltageSensor"]);
         this.model.blocktype = new ScilabString(["c"]);
         this.model.dep_ut = [true,false];
-        mo = modelica();
+        var mo = modelica();
         mo.model = "VoltageSensor";
         mo.inputs = "p";
         mo.outputs = [["n"],["v"]];
         this.model.equations = new ScilabDouble([mo]);
-        exprs = [];
-        gr_i = [];
+        var exprs = [];
+        var gr_i = [];
         this.x = standard_define([2,2],this.model,exprs,list(gr_i,0));
         this.x.graphics.in_implicit = ["I"];
         this.x.graphics.out_implicit = [["I"],["E"]];
diff --git a/js/Electrical/VsourceAC.js b/js/Electrical/VsourceAC.js
index 6c975081..cde9cd20 100644
--- a/js/Electrical/VsourceAC.js
+++ b/js/Electrical/VsourceAC.js
@@ -10,14 +10,14 @@ function VsourceAC() {
         this.model.sim = new ScilabString(["VsourceAC"]);
         this.model.blocktype = new ScilabString(["c"]);
         this.model.dep_ut = [true,false];
-        mo = modelica();
+        var mo = modelica();
         mo.model = "VsourceAC";
         mo.inputs = "p";
         mo.outputs = "n";
         mo.parameters = list([["VA"],["f"]],list(this.VA,this.FR));
         this.model.equations = new ScilabDouble([mo]);
-        exprs = [[string(this.VA)],[string(this.FR)]];
-        gr_i = [];
+        var exprs = [[string(this.VA)],[string(this.FR)]];
+        var gr_i = [];
         this.x = standard_define([2,2],this.model,exprs,list(gr_i,0));
         this.x.graphics.in_implicit = ["I"];
         this.x.graphics.out_implicit = ["I"];
@@ -37,8 +37,8 @@ function VsourceAC() {
         this.VA = parseFloat(arguments[0]["VA"])
         this.FR = parseFloat(arguments[0]["FR"])
         this.x = arg1;
-        graphics = arg1.graphics;
-        exprs = graphics.exprs;
+        var graphics = arg1.graphics;
+        var exprs = graphics.exprs;
         this.model = arg1.model;
         while (true) {
             [ok,this.VA,this.FR,exprs] = scicos_getvalue("Set voltage source parameter",["Amplitude (Volt)","Frequency (Hz)"],list("vec",-1,"vec",-1),exprs);