From 5929c9088b6d5dcd23e8bbf9abdc5c9b4a49df1f Mon Sep 17 00:00:00 2001
From: Sunil Shetye
Date: Mon, 16 Jul 2018 15:29:15 +0530
Subject: treat third argument of standard_define as model expression

---
 js/Events/ANDLOG_f.js    | 2 +-
 js/Events/CLKSOMV_f.js   | 2 +-
 js/Events/CLKSOM_f.js    | 2 +-
 js/Events/CLKSPLIT_f.js  | 2 +-
 js/Events/END_c.js       | 2 +-
 js/Events/EVTDLY_c.js    | 2 +-
 js/Events/EVTDLY_f.js    | 2 +-
 js/Events/EVTGEN_f.js    | 2 +-
 js/Events/EVTVARDLY.js   | 2 +-
 js/Events/HALT_f.js      | 2 +-
 js/Events/IFTHEL_f.js    | 2 +-
 js/Events/MFCLCK_f.js    | 2 +-
 js/Events/M_freq.js      | 2 +-
 js/Events/VirtualCLK0.js | 2 +-
 js/Events/freq_div.js    | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'js/Events')

diff --git a/js/Events/ANDLOG_f.js b/js/Events/ANDLOG_f.js
index 6673fc62..127795ca 100644
--- a/js/Events/ANDLOG_f.js
+++ b/js/Events/ANDLOG_f.js
@@ -9,7 +9,7 @@ function ANDLOG_f() {
         this.model.firing = new ScilabDouble([]);
         this.model.dep_ut = new ScilabBoolean([false,false]);
         this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ANDLOG_f\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([3,3]),this.model,[],this.gr_i);
+        this.x = new standard_define(new ScilabDouble([3,3]),this.model,new ScilabDouble([]),this.gr_i);
         return new BasicBlock(this.x);
     }
     ANDLOG_f.prototype.details = function ANDLOG_f() {
diff --git a/js/Events/CLKSOMV_f.js b/js/Events/CLKSOMV_f.js
index 86479052..a4c2d797 100644
--- a/js/Events/CLKSOMV_f.js
+++ b/js/Events/CLKSOMV_f.js
@@ -9,7 +9,7 @@ function CLKSOMV_f() {
         this.model.firing = new ScilabDouble([-1]);
         this.model.dep_ut = new ScilabBoolean([false,false]);
         this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKSOMV_f\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([2,2]),this.model,[],this.gr_i);
+        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),this.gr_i);
         return new BasicBlock(this.x);
     }
     CLKSOMV_f.prototype.details = function CLKSOMV_f() {
diff --git a/js/Events/CLKSOM_f.js b/js/Events/CLKSOM_f.js
index f1961cbc..b0e8c31c 100644
--- a/js/Events/CLKSOM_f.js
+++ b/js/Events/CLKSOM_f.js
@@ -9,7 +9,7 @@ function CLKSOM_f() {
         this.model.firing = new ScilabDouble([-1]);
         this.model.dep_ut = new ScilabBoolean([false,false]);
         this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKSOM_f\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([1,1]),this.model,[],this.gr_i);
+        this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabDouble([]),this.gr_i);
         return new BasicBlock(this.x);
     }
     CLKSOM_f.prototype.details = function CLKSOM_f() {
diff --git a/js/Events/CLKSPLIT_f.js b/js/Events/CLKSPLIT_f.js
index 87ce8b0d..6b55e089 100644
--- a/js/Events/CLKSPLIT_f.js
+++ b/js/Events/CLKSPLIT_f.js
@@ -8,7 +8,7 @@ function CLKSPLIT_f() {
         this.model.blocktype = new ScilabString(["d"]);
         this.model.firing = new ScilabBoolean([false,false,false]);
         this.model.dep_ut = new ScilabBoolean([false,false]);
-        this.x = new standard_define(new ScilabDouble([1,1]),this.model,[],[]);
+        this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabDouble([]),[]);
         return new BasicBlock(this.x);
     }
     CLKSPLIT_f.prototype.details = function CLKSPLIT_f() {
diff --git a/js/Events/END_c.js b/js/Events/END_c.js
index 455cc875..d1c5817a 100644
--- a/js/Events/END_c.js
+++ b/js/Events/END_c.js
@@ -11,7 +11,7 @@ function END_c() {
         this.model.dep_ut = new ScilabBoolean([false,false]);
         this.exprs = string(this.tf);
         this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"END_c\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i);
+        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i);
         return new BasicBlock(this.x);
     }
     END_c.prototype.details = function END_c() {
diff --git a/js/Events/EVTDLY_c.js b/js/Events/EVTDLY_c.js
index 98e5f88b..0abb9bca 100644
--- a/js/Events/EVTDLY_c.js
+++ b/js/Events/EVTDLY_c.js
@@ -13,7 +13,7 @@ function EVTDLY_c() {
         this.model.dep_ut = new ScilabBoolean([false,false]);
         this.exprs = [[string(this.dt)],[sci2exp(this.ff)]];
         this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTDLY_c\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i);
+        this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i);
         return new BasicBlock(this.x);
     }
     EVTDLY_c.prototype.details = function EVTDLY_c() {
diff --git a/js/Events/EVTDLY_f.js b/js/Events/EVTDLY_f.js
index 0933ae9c..cd9c607b 100644
--- a/js/Events/EVTDLY_f.js
+++ b/js/Events/EVTDLY_f.js
@@ -13,7 +13,7 @@ function EVTDLY_f() {
         this.model.dep_ut = new ScilabBoolean([false,false]);
         this.exprs = [[string(this.dt)],[sci2exp(this.ff)]];
         this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTDLY_f\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i);
+        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i);
         return new BasicBlock(this.x);
     }
     EVTDLY_f.prototype.details = function EVTDLY_f() {
diff --git a/js/Events/EVTGEN_f.js b/js/Events/EVTGEN_f.js
index 9b8ad9c9..5c835346 100644
--- a/js/Events/EVTGEN_f.js
+++ b/js/Events/EVTGEN_f.js
@@ -10,7 +10,7 @@ function EVTGEN_f() {
         this.model.dep_ut = new ScilabBoolean([false,false]);
         this.exprs = string(this.tt);
         this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTGEN_f\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i);
+        this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString([this.exprs]),this.gr_i);
         return new BasicBlock(this.x);
     }
     EVTGEN_f.prototype.details = function EVTGEN_f() {
diff --git a/js/Events/EVTVARDLY.js b/js/Events/EVTVARDLY.js
index cf5b553a..4732544f 100644
--- a/js/Events/EVTVARDLY.js
+++ b/js/Events/EVTVARDLY.js
@@ -12,7 +12,7 @@ function EVTVARDLY() {
         this.model.dep_ut = new ScilabBoolean([true,false]);
         this.exprs = string(this.model.firing);
         this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTVARDLY\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i);
+        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i);
         return new BasicBlock(this.x);
     }
     EVTVARDLY.prototype.details = function EVTVARDLY() {
diff --git a/js/Events/HALT_f.js b/js/Events/HALT_f.js
index 7d5fd5c3..e0ab69c9 100644
--- a/js/Events/HALT_f.js
+++ b/js/Events/HALT_f.js
@@ -11,7 +11,7 @@ function HALT_f() {
         this.model.dep_ut = new ScilabBoolean([false,false]);
         this.exprs = string(this.n);
         this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"HALT_f\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i);
+        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i);
         return new BasicBlock(this.x);
     }
     HALT_f.prototype.details = function HALT_f() {
diff --git a/js/Events/IFTHEL_f.js b/js/Events/IFTHEL_f.js
index 7ec78219..9a805282 100644
--- a/js/Events/IFTHEL_f.js
+++ b/js/Events/IFTHEL_f.js
@@ -15,7 +15,7 @@ function IFTHEL_f() {
         this.model.nzcross = new ScilabDouble([1]);
         this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"IFTHEL_f\",sz(1),sz(2));"]);
         this.exprs = [[string(this.model.in)],[string(this.model.nmode)]];
-        this.x = new standard_define(new ScilabDouble([3,3]),this.model,this.exprs,this.gr_i);
+        this.x = new standard_define(new ScilabDouble([3,3]),this.model,new ScilabDouble(this.exprs),this.gr_i);
         return new BasicBlock(this.x);
     }
     IFTHEL_f.prototype.details = function IFTHEL_f() {
diff --git a/js/Events/MFCLCK_f.js b/js/Events/MFCLCK_f.js
index 74eb8405..72992ea3 100644
--- a/js/Events/MFCLCK_f.js
+++ b/js/Events/MFCLCK_f.js
@@ -15,7 +15,7 @@ function MFCLCK_f() {
         this.model.dep_ut = new ScilabBoolean([false,false]);
         this.exprs = [[string(this.dt)],[string(this.nn)]];
         this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MFCLCK_f\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i);
+        this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i);
         return new BasicBlock(this.x);
     }
     MFCLCK_f.prototype.details = function MFCLCK_f() {
diff --git a/js/Events/M_freq.js b/js/Events/M_freq.js
index 255e34a0..1b3ee90b 100644
--- a/js/Events/M_freq.js
+++ b/js/Events/M_freq.js
@@ -12,7 +12,7 @@ function M_freq() {
         this.model.dep_ut = new ScilabBoolean([false,false]);
         this.exprs = [[sci2exp([[1],[2]])],[sci2exp([[0],[0]])]];
         this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"M_freq\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i);
+        this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i);
         return new BasicBlock(this.x);
     }
     M_freq.prototype.details = function M_freq() {
diff --git a/js/Events/VirtualCLK0.js b/js/Events/VirtualCLK0.js
index 6beb5115..dc7c6dad 100644
--- a/js/Events/VirtualCLK0.js
+++ b/js/Events/VirtualCLK0.js
@@ -10,7 +10,7 @@ function VirtualCLK0() {
         this.model.firing = new ScilabDouble([-1]);
         this.model.dep_ut = new ScilabBoolean([false,false]);
         this.exprs = [];
-        this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs," ");
+        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs)," ");
         return new BasicBlock(this.x);
     }
     VirtualCLK0.prototype.details = function VirtualCLK0() {
diff --git a/js/Events/freq_div.js b/js/Events/freq_div.js
index 17094d5d..faa29011 100644
--- a/js/Events/freq_div.js
+++ b/js/Events/freq_div.js
@@ -104,7 +104,7 @@ function freq_div() {
         this.model.evtout = new ScilabDouble([1]);
         this.model.rpar = scs_m_1;
         this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"freq_div\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([3,2]),this.model,[],this.gr_i);
+        this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble([]),this.gr_i);
         return new BasicBlock(this.x);
     }
     freq_div.prototype.details = function freq_div() {
-- 
cgit