Merge pull request #70 from ASP1234/master

Implemet CBLOCK BLock

2 files changed, 65 insertions, 21 deletions

diff --git a/data_structures_correct/CBLOCK.js b/data_structures_correct/CBLOCK.js
new file mode 100644
index 0000000..5acb078
--- /dev/null
+++ b/data_structures_correct/CBLOCK.js
@@ -0,0 +1,44 @@
+function CBLOCK() {
+
+    CBLOCK.prototype.define = function CBLOCK() {
+        this.in1 = 1;
+        this.out = 1;
+        this.clkin = [];
+        this.clkout = [];
+        this.x0 = [];
+        this.z0 = [];
+        this.typ = "c";
+        this.auto = [];
+        this.rpar = [];
+        this.ipar = [];
+        this.funam = "toto";
+        this.ng = 0;
+
+        var model = scicos_model();
+        model.sim = list(new ScilabString([" "]), new ScilabDouble([2004]));
+        model.in = new ScilabDouble([this.in1]);
+        model.out = new ScilabDouble([this.out]);
+        model.evtin = new ScilabDouble();
+        model.evtout = new ScilabDouble();
+        model.state = new ScilabDouble();
+        model.dstate = new ScilabDouble();
+        model.rpar = new ScilabDouble();
+        model.ipar = new ScilabDouble();
+        model.blocktype = new ScilabString([this.typ]);
+        model.firing = new ScilabDouble();
+        model.dep_ut = new ScilabBoolean([true, false]);
+        model.nzcross = new ScilabDouble([this.ng]);
+
+        var label = list(new ScilabString([this.funam], ["n"], [sci2exp(this.in1)], [sci2exp(this.out)], [sci2exp(this.clkin)], [sci2exp(this.clkout)], [sci2exp(this.x0)], [sci2exp(0)], [sci2exp(this.z0)], [sci2exp(this.rpar)], [sci2exp(this.ipar)], [sci2exp(this.auto)], ["y"], ["n"]), new ScilabDouble());
+
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CBLOCK\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([4, 2]), model, label, gr_i);
+        return new BasicBlock(this.x)
+    }
+
+
+    CBLOCK.prototype.details = function CBLOCK() {
+
+        return this.x;
+    }
+}
diff --git a/data_structures_correct/CLR.js b/data_structures_correct/CLR.js
index 3841a1a..24d4380 100644
--- a/data_structures_correct/CLR.js
+++ b/data_structures_correct/CLR.js
@@ -1,25 +1,25 @@
-function CLR () {
-    
+function CLR() {
+
     CLR.prototype.define = function CLR() {
-    	this.x0 = 0;
-    	this.A = -1;
-    	this.B = 1;
-    	this.C = 1;
-    	this.D = 0;
-    
-    	var model = scicos_model();
-    	model.sim=list(new ScilabString(["csslti4"]),new ScilabDouble([4]));
-    	model.in = new ScilabDouble([1]);
-    	model.out = new ScilabDouble([1]);
-    	model.state=new ScilabDouble([this.x0]);
-    	model.rpar = new ScilabDouble([this.A],[this.B],[this.C],[this.D]);
-    	model.blocktype = new ScilabString(["c"]);
-    	model.dep_ut = new ScilabBoolean([false,true]);
-    
-    	var exprs = new ScilabString(["1"],["1+s"]);
-    	var gr_i = [];
-    	this.x=new standard_define(new ScilabDouble([3,2]),model,exprs,gr_i);
-    	return new BasicBlock(this.x);
+        this.x0 = 0;
+        this.A = -1;
+        this.B = 1;
+        this.C = 1;
+        this.D = 0;
+
+        var model = scicos_model();
+        model.sim = list(new ScilabString(["csslti4"]), new ScilabDouble([4]));
+        model.in = new ScilabDouble([1]);
+        model.out = new ScilabDouble([1]);
+        model.state = new ScilabDouble([this.x0]);
+        model.rpar = new ScilabDouble([this.A], [this.B], [this.C], [this.D]);
+        model.blocktype = new ScilabString(["c"]);
+        model.dep_ut = new ScilabBoolean([false, true]);
+
+        var exprs = new ScilabString(["1"], ["1+s"]);
+        var gr_i = [];
+        this.x = new standard_define(new ScilabDouble([3, 2]), model, exprs, gr_i);
+        return new BasicBlock(this.x);
     }
     CLR.prototype.details = function CLR() {
         return this.x;