diff options
272 files changed, 1092 insertions, 6 deletions
diff --git a/combined.js b/combined.js index c88be688..d8b4a370 100644 --- a/combined.js +++ b/combined.js @@ -11,6 +11,7 @@ function CLKFROM() { exprs = "A"; this.x = standard_define([2,1],model,exprs," "); this.x.graphics.id = "From"; + return new BasicBlock(this.x); } CLKFROM.prototype.details = function CLKFROM() { return this.x; @@ -40,6 +41,7 @@ function CLKFROM() { break; } needcompile=resume(needcompile) + return new BasicBlock(this.x); } } /* autogenerated from "macros/Branching/CLKGOTO.sci" */ @@ -56,6 +58,7 @@ function CLKGOTO() { exprs = [["A"],[sci2exp(1)]]; this.x = standard_define([2,1],model,exprs," "); this.x.graphics.id = "Goto"; + return new BasicBlock(this.x); } CLKGOTO.prototype.details = function CLKGOTO() { return this.x; @@ -93,6 +96,7 @@ function CLKGOTO() { } } needcompile=resume(needcompile) + return new BasicBlock(this.x); } } /* autogenerated from "macros/Branching/CLKGotoTagVisibility.sci" */ @@ -114,6 +118,7 @@ function CLKGotoTagVisibility() { exprs = "A"; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } CLKGotoTagVisibility.prototype.details = function CLKGotoTagVisibility() { return this.x; @@ -143,6 +148,7 @@ function CLKGotoTagVisibility() { } } needcompile=resume(needcompile) + return new BasicBlock(this.x); } } /* autogenerated from "macros/Branching/DEMUX.sci" */ @@ -160,6 +166,7 @@ function DEMUX() { exprs = string(out); gr_i = []; this.x = standard_define([.5,2],model,exprs,gr_i); + return new BasicBlock(this.x); } DEMUX.prototype.details = function DEMUX() { return this.x; @@ -207,6 +214,7 @@ function DEMUX() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Branching/DEMUX_f.sci" */ @@ -224,6 +232,7 @@ function DEMUX_f() { exprs = string(out); gr_i = []; this.x = standard_define([.5,2],model,exprs,gr_i); + return new BasicBlock(this.x); } DEMUX_f.prototype.details = function DEMUX_f() { return this.x; @@ -271,6 +280,7 @@ function DEMUX_f() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Branching/ESELECT_f.sci" */ @@ -292,6 +302,7 @@ function ESELECT_f() { gr_i = []; exprs = [[string(out)],[string(1)],[string(model.nmode)]]; this.x = standard_define([4,2],model,exprs,gr_i); + return new BasicBlock(this.x); } ESELECT_f.prototype.details = function ESELECT_f() { return this.x; @@ -339,6 +350,7 @@ function ESELECT_f() { } } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Branching/EXTRACTOR.sci" */ @@ -355,6 +367,7 @@ function EXTRACTOR() { exprs = [sci2exp(ind)]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } EXTRACTOR.prototype.details = function EXTRACTOR() { return this.x; @@ -382,6 +395,7 @@ function EXTRACTOR() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Branching/FROM.sci" */ @@ -403,6 +417,7 @@ function FROM() { gr_i = []; this.x = standard_define([2,1],model,exprs,gr_i); this.x.graphics.id = "From"; + return new BasicBlock(this.x); } FROM.prototype.details = function FROM() { return this.x; @@ -432,6 +447,7 @@ function FROM() { } } needcompile=resume(needcompile) + return new BasicBlock(this.x); } } /* autogenerated from "macros/Branching/FROMMO.sci" */ @@ -456,6 +472,7 @@ function FROMMO() { gr_i = []; this.x = standard_define([2,1],model,exprs,gr_i); this.x.graphics.out_implicit = ["I"]; + return new BasicBlock(this.x); } FROMMO.prototype.details = function FROMMO() { return this.x; @@ -485,6 +502,7 @@ function FROMMO() { } } needcompile=resume(needcompile) + return new BasicBlock(this.x); } } /* autogenerated from "macros/Branching/GOTO.sci" */ @@ -506,6 +524,7 @@ function GOTO() { gr_i = []; this.x = standard_define([2,1],model,exprs,gr_i); this.x.graphics.id = "Goto"; + return new BasicBlock(this.x); } GOTO.prototype.details = function GOTO() { return this.x; @@ -542,6 +561,7 @@ function GOTO() { } } needcompile=resume(needcompile) + return new BasicBlock(this.x); } } /* autogenerated from "macros/Branching/GOTOMO.sci" */ @@ -566,6 +586,7 @@ function GOTOMO() { gr_i = []; this.x = standard_define([2,1],model,exprs,gr_i); this.x.graphics.in_implicit = ["I"]; + return new BasicBlock(this.x); } GOTOMO.prototype.details = function GOTOMO() { return this.x; @@ -602,6 +623,7 @@ function GOTOMO() { } } needcompile=resume(needcompile) + return new BasicBlock(this.x); } } /* autogenerated from "macros/Branching/GotoTagVisibility.sci" */ @@ -623,6 +645,7 @@ function GotoTagVisibility() { exprs = "A"; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } GotoTagVisibility.prototype.details = function GotoTagVisibility() { return this.x; @@ -652,6 +675,7 @@ function GotoTagVisibility() { } } needcompile=resume(needcompile) + return new BasicBlock(this.x); } } /* autogenerated from "macros/Branching/GotoTagVisibilityMO.sci" */ @@ -673,6 +697,7 @@ function GotoTagVisibilityMO() { exprs = "A"; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } GotoTagVisibilityMO.prototype.details = function GotoTagVisibilityMO() { return this.x; @@ -702,6 +727,7 @@ function GotoTagVisibilityMO() { } } needcompile=resume(needcompile) + return new BasicBlock(this.x); } } /* autogenerated from "macros/Branching/ISELECT_f.sci" */ @@ -721,6 +747,7 @@ function ISELECT_f() { exprs = [[string(nout)],[string(z0+1)]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } ISELECT_f.prototype.details = function ISELECT_f() { return this.x; @@ -750,6 +777,7 @@ function ISELECT_f() { } } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Branching/ISELECT_m.sci" */ @@ -777,6 +805,7 @@ function ISELECT_m() { exprs = [[sci2exp(1)],[sci2exp(nout)],[sci2exp(z0)]]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } ISELECT_m.prototype.details = function ISELECT_m() { return this.x; @@ -815,6 +844,7 @@ function ISELECT_m() { } } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Branching/MUX.sci" */ @@ -831,6 +861,7 @@ function MUX() { exprs = string(in1); gr_i = []; this.x = standard_define([.5,2],model,exprs,gr_i); + return new BasicBlock(this.x); } MUX.prototype.details = function MUX() { return this.x; @@ -878,6 +909,7 @@ function MUX() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Branching/MUX_f.sci" */ @@ -894,6 +926,7 @@ function MUX_f() { exprs = string(in1); gr_i = []; this.x = standard_define([0.5,2],model,exprs,gr_i); + return new BasicBlock(this.x); } MUX_f.prototype.details = function MUX_f() { return this.x; @@ -941,6 +974,7 @@ function MUX_f() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Branching/M_SWITCH.sci" */ @@ -959,6 +993,7 @@ function M_SWITCH() { exprs = [[string(nin)],[string(ipar)]]; gr_i = []; this.x = standard_define([2.5,2],model,exprs,gr_i); + return new BasicBlock(this.x); } M_SWITCH.prototype.details = function M_SWITCH() { return this.x; @@ -1005,6 +1040,7 @@ function M_SWITCH() { } } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Branching/NRMSOM_f.sci" */ @@ -1021,6 +1057,7 @@ function NRMSOM_f() { exprs = [string(nin)]; gr_i = []; this.x = standard_define([.2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } NRMSOM_f.prototype.details = function NRMSOM_f() { return this.x; @@ -1045,6 +1082,7 @@ function NRMSOM_f() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Branching/RELAY_f.sci" */ @@ -1065,6 +1103,7 @@ function RELAY_f() { exprs = [[string(nin)],[string(i0+1)]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } RELAY_f.prototype.details = function RELAY_f() { return this.x; @@ -1095,6 +1134,7 @@ function RELAY_f() { } } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Branching/SCALAR2VECTOR.sci" */ @@ -1110,6 +1150,7 @@ function SCALAR2VECTOR() { exprs = [string([nout])]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } SCALAR2VECTOR.prototype.details = function SCALAR2VECTOR() { return this.x; @@ -1141,6 +1182,7 @@ function SCALAR2VECTOR() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Branching/SELECT_f.sci" */ @@ -1160,6 +1202,7 @@ function SELECT_f() { exprs = [[string(nin)],[string(z0+1)]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } SELECT_f.prototype.details = function SELECT_f() { return this.x; @@ -1189,6 +1232,7 @@ function SELECT_f() { } } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Branching/SELECT_m.sci" */ @@ -1216,6 +1260,7 @@ function SELECT_m() { exprs = [[sci2exp(1)],[sci2exp(nin)],[sci2exp(z0)]]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } SELECT_m.prototype.details = function SELECT_m() { return this.x; @@ -1254,6 +1299,7 @@ function SELECT_m() { } } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Branching/SWITCH2.sci" */ @@ -1276,6 +1322,7 @@ function SWITCH2() { exprs = [[string(ipar)],[string(rpar)],[string(nzz)]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } SWITCH2.prototype.details = function SWITCH2() { return this.x; @@ -1313,6 +1360,7 @@ function SWITCH2() { this.x.model = model; break; } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Branching/SWITCH2_m.sci" */ @@ -1338,6 +1386,7 @@ function SWITCH2_m() { exprs = [[sci2exp(1)],[string(ipar)],[string(rpar)],[string(nzz)]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } SWITCH2_m.prototype.details = function SWITCH2_m() { return this.x; @@ -1389,6 +1438,7 @@ function SWITCH2_m() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Branching/SWITCH_f.sci" */ @@ -1408,6 +1458,7 @@ function SWITCH_f() { exprs = [[string(nin)],[string(i0+1)]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } SWITCH_f.prototype.details = function SWITCH_f() { return this.x; @@ -1438,6 +1489,7 @@ function SWITCH_f() { } } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Electrical/CCS.sci" */ @@ -1489,6 +1541,7 @@ function CCS() { this.x = standard_define([2.1,3],model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; + return new BasicBlock(this.x); } CCS.prototype.details = function CCS() { return this.x; @@ -1501,6 +1554,7 @@ function CCS() { exprs = graphics.exprs; model = arg1.model; this.x = arg1; + return new BasicBlock(this.x); } } /* autogenerated from "macros/Electrical/CVS.sci" */ @@ -1552,6 +1606,7 @@ function CVS() { this.x = standard_define([2.1,3],model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; + return new BasicBlock(this.x); } CVS.prototype.details = function CVS() { return this.x; @@ -1564,6 +1619,7 @@ function CVS() { exprs = graphics.exprs; model = arg1.model; this.x = arg1; + return new BasicBlock(this.x); } } /* autogenerated from "macros/Electrical/Capacitor.sci" */ @@ -1589,6 +1645,7 @@ function Capacitor() { this.x = standard_define([2,1.1],model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; + return new BasicBlock(this.x); } Capacitor.prototype.details = function Capacitor() { return this.x; @@ -1612,6 +1669,7 @@ function Capacitor() { this.x.model = model; break; } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Electrical/ConstantVoltage.sci" */ @@ -1636,6 +1694,7 @@ function ConstantVoltage() { this.x = standard_define([1.5,1.1],model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; + return new BasicBlock(this.x); } ConstantVoltage.prototype.details = function ConstantVoltage() { return this.x; @@ -1659,6 +1718,7 @@ function ConstantVoltage() { this.x.model = model; break; } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Electrical/CurrentSensor.sci" */ @@ -1680,6 +1740,7 @@ function CurrentSensor() { this.x = standard_define([2,2],model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = [["I"],["E"]]; + return new BasicBlock(this.x); } CurrentSensor.prototype.details = function CurrentSensor() { return this.x; @@ -1688,6 +1749,7 @@ function CurrentSensor() { } CurrentSensor.prototype.set = function CurrentSensor() { this.x = arg1; + return new BasicBlock(this.x); } } /* autogenerated from "macros/Electrical/Diode.sci" */ @@ -1715,6 +1777,7 @@ function Diode() { this.x = standard_define([2,1],model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; + return new BasicBlock(this.x); } Diode.prototype.details = function Diode() { return this.x; @@ -1738,6 +1801,7 @@ function Diode() { this.x.model = model; break; } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Electrical/Ground.sci" */ @@ -1758,6 +1822,7 @@ function Ground() { this.x = standard_define([1,1],model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; + return new BasicBlock(this.x); } Ground.prototype.details = function Ground() { return this.x; @@ -1766,6 +1831,7 @@ function Ground() { } Ground.prototype.set = function Ground() { this.x = arg1; + return new BasicBlock(this.x); } } /* autogenerated from "macros/Electrical/Gyrator.sci" */ @@ -1817,6 +1883,7 @@ function Gyrator() { this.x = standard_define([2,2],model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; + return new BasicBlock(this.x); } Gyrator.prototype.details = function Gyrator() { return this.x; @@ -1839,6 +1906,7 @@ function Gyrator() { this.x.graphics.exprs = exprs; break; } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Electrical/IdealTransformer.sci" */ @@ -1890,6 +1958,7 @@ function IdealTransformer() { this.x = standard_define([2,2],model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; + return new BasicBlock(this.x); } IdealTransformer.prototype.details = function IdealTransformer() { return this.x; @@ -1912,6 +1981,7 @@ function IdealTransformer() { this.x.graphics.exprs = exprs; break; } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Electrical/Inductor.sci" */ @@ -1936,6 +2006,7 @@ function Inductor() { this.x = standard_define([2,0.9],model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; + return new BasicBlock(this.x); } Inductor.prototype.details = function Inductor() { return this.x; @@ -1959,6 +2030,7 @@ function Inductor() { this.x.model = model; break; } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Electrical/MOTOR.sci" */ @@ -1975,6 +2047,7 @@ function MOTOR() { this.x = standard_define([2,2],model,exprs,gr_i); this.x.graphics.out_implicit = [["I"],["I"]]; this.x.graphics.in_implicit = ["I"]; + return new BasicBlock(this.x); } MOTOR.prototype.details = function MOTOR() { return this.x; @@ -1983,6 +2056,7 @@ function MOTOR() { } MOTOR.prototype.set = function MOTOR() { this.x = arg1; + return new BasicBlock(this.x); } } /* autogenerated from "macros/Electrical/NMOS.sci" */ @@ -2014,6 +2088,7 @@ function NMOS() { this.x = standard_define([2,2],model,exprs,gr_i); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = [["I"],["I"],["I"]]; + return new BasicBlock(this.x); } NMOS.prototype.details = function NMOS() { return this.x; @@ -2036,6 +2111,7 @@ function NMOS() { this.x.model = model; break; } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Electrical/NPN.sci" */ @@ -2087,6 +2163,7 @@ function NPN() { this.x = standard_define([2,2],model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; + return new BasicBlock(this.x); } NPN.prototype.details = function NPN() { return this.x; @@ -2109,6 +2186,7 @@ function NPN() { this.x.graphics.exprs = exprs; break; } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Electrical/OpAmp.sci" */ @@ -2134,6 +2212,7 @@ function OpAmp() { this.x = standard_define([3,5],model,exprs,gr_i); this.x.graphics.in_implicit = [["I"],["I"]]; this.x.graphics.out_implicit = ["I"]; + return new BasicBlock(this.x); } OpAmp.prototype.details = function OpAmp() { return this.x; @@ -2156,6 +2235,7 @@ function OpAmp() { this.x.model = model; break; } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Electrical/PMOS.sci" */ @@ -2187,6 +2267,7 @@ function PMOS() { this.x = standard_define([2,2],model,exprs,gr_i); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = [["I"],["I"],["I"]]; + return new BasicBlock(this.x); } PMOS.prototype.details = function PMOS() { return this.x; @@ -2209,6 +2290,7 @@ function PMOS() { this.x.model = model; break; } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Electrical/PNP.sci" */ @@ -2260,6 +2342,7 @@ function PNP() { this.x = standard_define([2,2],model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; + return new BasicBlock(this.x); } PNP.prototype.details = function PNP() { return this.x; @@ -2282,6 +2365,7 @@ function PNP() { this.x.graphics.exprs = exprs; break; } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Electrical/PotentialSensor.sci" */ @@ -2303,6 +2387,7 @@ function PotentialSensor() { this.x = standard_define([2,2],model,"",list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["E"]; + return new BasicBlock(this.x); } PotentialSensor.prototype.details = function PotentialSensor() { return this.x; @@ -2311,6 +2396,7 @@ function PotentialSensor() { } PotentialSensor.prototype.set = function PotentialSensor() { this.x = arg1; + return new BasicBlock(this.x); } } /* autogenerated from "macros/Electrical/Resistor.sci" */ @@ -2335,6 +2421,7 @@ function Resistor() { this.x = standard_define([2,1],model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; + return new BasicBlock(this.x); } Resistor.prototype.details = function Resistor() { return this.x; @@ -2358,6 +2445,7 @@ function Resistor() { this.x.model = model; break; } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Electrical/SineVoltage.sci" */ @@ -2386,6 +2474,7 @@ function SineVoltage() { this.x = standard_define([2,2],model,exprs,gr_i); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; + return new BasicBlock(this.x); } SineVoltage.prototype.details = function SineVoltage() { return this.x; @@ -2409,6 +2498,7 @@ function SineVoltage() { this.x.model = model; break; } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Electrical/Switch.sci" */ @@ -2436,6 +2526,7 @@ function Switch() { this.x = standard_define([2,2],model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = [["I"],["E"]]; this.x.graphics.out_implicit = ["I"]; + return new BasicBlock(this.x); } Switch.prototype.details = function Switch() { return this.x; @@ -2458,6 +2549,7 @@ function Switch() { this.x.model = model; break; } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Electrical/VVsourceAC.sci" */ @@ -2483,6 +2575,7 @@ function VVsourceAC() { this.x = standard_define([2,2],model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I","E"]; this.x.graphics.out_implicit = ["I"]; + return new BasicBlock(this.x); } VVsourceAC.prototype.details = function VVsourceAC() { return this.x; @@ -2506,6 +2599,7 @@ function VVsourceAC() { this.x.model = model; break; } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Electrical/VariableResistor.sci" */ @@ -2527,6 +2621,7 @@ function VariableResistor() { this.x = standard_define([2,2],model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I","E"]; this.x.graphics.out_implicit = ["I"]; + return new BasicBlock(this.x); } VariableResistor.prototype.details = function VariableResistor() { return this.x; @@ -2535,6 +2630,7 @@ function VariableResistor() { } VariableResistor.prototype.set = function VariableResistor() { this.x = arg1; + return new BasicBlock(this.x); } } /* autogenerated from "macros/Electrical/VoltageSensor.sci" */ @@ -2556,6 +2652,7 @@ function VoltageSensor() { this.x = standard_define([2,2],model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = [["I"],["E"]]; + return new BasicBlock(this.x); } VoltageSensor.prototype.details = function VoltageSensor() { return this.x; @@ -2564,6 +2661,7 @@ function VoltageSensor() { } VoltageSensor.prototype.set = function VoltageSensor() { this.x = arg1; + return new BasicBlock(this.x); } } /* autogenerated from "macros/Electrical/VsourceAC.sci" */ @@ -2589,6 +2687,7 @@ function VsourceAC() { this.x = standard_define([2,2],model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; + return new BasicBlock(this.x); } VsourceAC.prototype.details = function VsourceAC() { return this.x; @@ -2612,6 +2711,7 @@ function VsourceAC() { this.x.model = model; break; } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Events/ANDBLK.sci" */ @@ -2681,6 +2781,7 @@ function ANDBLK() { this.x.model.firing = false; this.x.model.dep_ut = [false,false]; this.x.model.rpar = diagram; + return new BasicBlock(this.x); } ANDBLK.prototype.details = function ANDBLK() { return this.x; @@ -2689,6 +2790,7 @@ function ANDBLK() { } ANDBLK.prototype.set = function ANDBLK() { this.x = arg1; + return new BasicBlock(this.x); } } /* autogenerated from "macros/Events/ANDLOG_f.sci" */ @@ -2703,6 +2805,7 @@ function ANDLOG_f() { model.dep_ut = [false,false]; gr_i = []; this.x = standard_define([3,3],model,[],gr_i); + return new BasicBlock(this.x); } ANDLOG_f.prototype.details = function ANDLOG_f() { return this.x; @@ -2711,6 +2814,7 @@ function ANDLOG_f() { } ANDLOG_f.prototype.set = function ANDLOG_f() { this.x = arg1; + return new BasicBlock(this.x); } } /* autogenerated from "macros/Events/CLKSOMV_f.sci" */ @@ -2725,6 +2829,7 @@ function CLKSOMV_f() { model.dep_ut = [false,false]; gr_i = []; this.x = standard_define([2,2],model,[],gr_i); + return new BasicBlock(this.x); } CLKSOMV_f.prototype.details = function CLKSOMV_f() { return this.x; @@ -2733,6 +2838,7 @@ function CLKSOMV_f() { } CLKSOMV_f.prototype.set = function CLKSOMV_f() { this.x = arg1; + return new BasicBlock(this.x); } } /* autogenerated from "macros/Events/CLKSOM_f.sci" */ @@ -2747,6 +2853,7 @@ function CLKSOM_f() { model.dep_ut = [false,false]; gr_i = []; this.x = standard_define([1,1]/1.2,model,[],gr_i); + return new BasicBlock(this.x); } CLKSOM_f.prototype.details = function CLKSOM_f() { return this.x; @@ -2755,6 +2862,7 @@ function CLKSOM_f() { } CLKSOM_f.prototype.set = function CLKSOM_f() { this.x = arg1; + return new BasicBlock(this.x); } } /* autogenerated from "macros/Events/CLKSPLIT_f.sci" */ @@ -2768,6 +2876,7 @@ function CLKSPLIT_f() { model.firing = [false,false,false]; model.dep_ut = [false,false]; this.x = standard_define([1,1]/3,model,[],[]); + return new BasicBlock(this.x); } CLKSPLIT_f.prototype.details = function CLKSPLIT_f() { return this.x; @@ -2776,6 +2885,7 @@ function CLKSPLIT_f() { } CLKSPLIT_f.prototype.set = function CLKSPLIT_f() { this.x = arg1; + return new BasicBlock(this.x); } } /* autogenerated from "macros/Events/END_c.sci" */ @@ -2792,6 +2902,7 @@ function END_c() { exprs = string(tf); gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } END_c.prototype.details = function END_c() { return this.x; @@ -2816,6 +2927,7 @@ function END_c() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Events/EVTDLY_c.sci" */ @@ -2834,6 +2946,7 @@ function EVTDLY_c() { exprs = [[string(dt)],[sci2exp(ff)]]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } EVTDLY_c.prototype.details = function EVTDLY_c() { return this.x; @@ -2863,6 +2976,7 @@ function EVTDLY_c() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Events/EVTDLY_f.sci" */ @@ -2881,6 +2995,7 @@ function EVTDLY_f() { exprs = [[string(dt)],[sci2exp(ff)]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } EVTDLY_f.prototype.details = function EVTDLY_f() { return this.x; @@ -2910,6 +3025,7 @@ function EVTDLY_f() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Events/EVTGEN_f.sci" */ @@ -2925,6 +3041,7 @@ function EVTGEN_f() { exprs = string(tt); gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } EVTGEN_f.prototype.details = function EVTGEN_f() { return this.x; @@ -2949,6 +3066,7 @@ function EVTGEN_f() { this.x.model = model; break; } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Events/EVTVARDLY.sci" */ @@ -2966,6 +3084,7 @@ function EVTVARDLY() { exprs = string(model.firing); gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } EVTVARDLY.prototype.details = function EVTVARDLY() { return this.x; @@ -2988,6 +3107,7 @@ function EVTVARDLY() { this.x.model = model; break; } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Events/HALT_f.sci" */ @@ -3004,6 +3124,7 @@ function HALT_f() { exprs = string(n); gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } HALT_f.prototype.details = function HALT_f() { return this.x; @@ -3028,6 +3149,7 @@ function HALT_f() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Events/IFTHEL_f.sci" */ @@ -3048,6 +3170,7 @@ function IFTHEL_f() { gr_i = []; exprs = [[string(model.in1)],[string(model.nmode)]]; this.x = standard_define([3,3],model,exprs,gr_i); + return new BasicBlock(this.x); } IFTHEL_f.prototype.details = function IFTHEL_f() { return this.x; @@ -3089,6 +3212,7 @@ function IFTHEL_f() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Events/MCLOCK_f.sci" */ @@ -3160,6 +3284,7 @@ function MCLOCK_f() { this.x.model.blocktype = "h"; this.x.model.rpar = diagram; this.x.graphics.peout = [[0],[0]]; + return new BasicBlock(this.x); } MCLOCK_f.prototype.details = function MCLOCK_f() { return this.x; @@ -3185,6 +3310,7 @@ function MCLOCK_f() { this.x = arg1; y = 0; typ = newpar; + return new BasicBlock(this.x); } } /* autogenerated from "macros/Events/MFCLCK_f.sci" */ @@ -3205,6 +3331,7 @@ function MFCLCK_f() { exprs = [[string(dt)],[string(nn)]]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } MFCLCK_f.prototype.details = function MFCLCK_f() { return this.x; @@ -3227,6 +3354,7 @@ function MFCLCK_f() { this.x.graphics = graphics; this.x.model = model; } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Events/M_freq.sci" */ @@ -3244,6 +3372,7 @@ function M_freq() { exprs = [[sci2exp([[1],[2]])],[sci2exp([[0],[0]])]]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } M_freq.prototype.details = function M_freq() { return this.x; @@ -3291,6 +3420,7 @@ function M_freq() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Events/VirtualCLK0.sci" */ @@ -3306,6 +3436,7 @@ function VirtualCLK0() { model.dep_ut = [false,false]; exprs = []; this.x = standard_define([2,2],model,exprs," "); + return new BasicBlock(this.x); } VirtualCLK0.prototype.details = function VirtualCLK0() { return this.x; @@ -3314,6 +3445,7 @@ function VirtualCLK0() { } VirtualCLK0.prototype.set = function VirtualCLK0() { this.x = arg1; + return new BasicBlock(this.x); } } /* autogenerated from "macros/Events/freq_div.sci" */ @@ -3423,6 +3555,7 @@ function freq_div() { model.rpar = scs_m_1; gr_i = []; this.x = standard_define([3,2],model,[],gr_i); + return new BasicBlock(this.x); } freq_div.prototype.details = function freq_div() { return this.x; @@ -3513,6 +3646,7 @@ function freq_div() { } this.x = arg1; typ = newpar; + return new BasicBlock(this.x); } } /* autogenerated from "macros/Hydraulics/Bache.sci" */ @@ -3549,6 +3683,7 @@ function Bache() { this.x = standard_define([2,2],model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = [["I"],["I"]]; this.x.graphics.out_implicit = [["I"],["I"],["E"]]; + return new BasicBlock(this.x); } Bache.prototype.details = function Bache() { return this.x; @@ -3572,6 +3707,7 @@ function Bache() { this.x.model = model; break; } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Hydraulics/Flowmeter.sci" */ @@ -3623,6 +3759,7 @@ function Flowmeter() { this.x = standard_define([2,2],model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; + return new BasicBlock(this.x); } Flowmeter.prototype.details = function Flowmeter() { return this.x; @@ -3645,6 +3782,7 @@ function Flowmeter() { this.x.graphics.exprs = exprs; break; } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Hydraulics/PerteDP.sci" */ @@ -3676,6 +3814,7 @@ function PerteDP() { this.x = standard_define([2,1],model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; + return new BasicBlock(this.x); } PerteDP.prototype.details = function PerteDP() { return this.x; @@ -3699,6 +3838,7 @@ function PerteDP() { this.x.model = model; break; } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Hydraulics/PuitsP.sci" */ @@ -3723,6 +3863,7 @@ function PuitsP() { gr_i = []; this.x = standard_define([2.5,2],model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; + return new BasicBlock(this.x); } PuitsP.prototype.details = function PuitsP() { return this.x; @@ -3746,6 +3887,7 @@ function PuitsP() { this.x.model = model; break; } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Hydraulics/SourceP.sci" */ @@ -3772,6 +3914,7 @@ function SourceP() { gr_i = []; this.x = standard_define([2.5,2],model,exprs,list(gr_i,0)); this.x.graphics.out_implicit = ["I"]; + return new BasicBlock(this.x); } SourceP.prototype.details = function SourceP() { return this.x; @@ -3795,6 +3938,7 @@ function SourceP() { this.x.model = model; break; } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Hydraulics/VanneReglante.sci" */ @@ -3822,6 +3966,7 @@ function VanneReglante() { this.x = standard_define([2,2],model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = [["I"],["E"]]; this.x.graphics.out_implicit = ["I"]; + return new BasicBlock(this.x); } VanneReglante.prototype.details = function VanneReglante() { return this.x; @@ -3845,6 +3990,7 @@ function VanneReglante() { this.x.model = model; break; } + return new BasicBlock(this.x); } } /* autogenerated from "macros/IntegerOp/BITCLEAR.sci" */ @@ -3864,6 +4010,7 @@ function BITCLEAR() { exprs = [[sci2exp(3)],[sci2exp(0)]]; gr_i = []; this.x = standard_define([4,2],model,exprs,gr_i); + return new BasicBlock(this.x); } BITCLEAR.prototype.details = function BITCLEAR() { return this.x; @@ -3932,6 +4079,7 @@ function BITCLEAR() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/IntegerOp/BITSET.sci" */ @@ -3951,6 +4099,7 @@ function BITSET() { exprs = [[sci2exp(3)],[sci2exp(0)]]; gr_i = []; this.x = standard_define([4,2],model,exprs,gr_i); + return new BasicBlock(this.x); } BITSET.prototype.details = function BITSET() { return this.x; @@ -4017,6 +4166,7 @@ function BITSET() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/IntegerOp/CONVERT.sci" */ @@ -4038,6 +4188,7 @@ function CONVERT() { exprs = [[sci2exp(1)],[sci2exp(3)],[sci2exp(0)]]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } CONVERT.prototype.details = function CONVERT() { return this.x; @@ -4388,6 +4539,7 @@ function CONVERT() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/IntegerOp/DFLIPFLOP.sci" */ @@ -4482,6 +4634,7 @@ function DFLIPFLOP() { model.rpar = scs_m; gr_i = []; this.x = standard_define([2,3],model,[],gr_i); + return new BasicBlock(this.x); } DFLIPFLOP.prototype.details = function DFLIPFLOP() { return this.x; @@ -4490,6 +4643,7 @@ function DFLIPFLOP() { } DFLIPFLOP.prototype.set = function DFLIPFLOP() { this.x = arg1; + return new BasicBlock(this.x); } } /* autogenerated from "macros/IntegerOp/DLATCH.sci" */ @@ -4529,6 +4683,7 @@ function DLATCH() { model.rpar = scs_m; gr_i = []; this.x = standard_define([2,3],model,[],gr_i); + return new BasicBlock(this.x); } DLATCH.prototype.details = function DLATCH() { return this.x; @@ -4537,6 +4692,7 @@ function DLATCH() { } DLATCH.prototype.set = function DLATCH() { this.x = arg1; + return new BasicBlock(this.x); } } /* autogenerated from "macros/IntegerOp/EXTRACTBITS.sci" */ @@ -4557,6 +4713,7 @@ function EXTRACTBITS() { exprs = [[sci2exp(3)],[sci2exp(1)],[sci2exp(0)],[sci2exp(0)]]; gr_i = []; this.x = standard_define([4,2],model,exprs,gr_i); + return new BasicBlock(this.x); } EXTRACTBITS.prototype.details = function EXTRACTBITS() { return this.x; @@ -4767,6 +4924,7 @@ function EXTRACTBITS() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/IntegerOp/INTMUL.sci" */ @@ -4788,6 +4946,7 @@ function INTMUL() { exprs = [[sci2exp(3)],[sci2exp(0)]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } INTMUL.prototype.details = function INTMUL() { return this.x; @@ -4874,6 +5033,7 @@ function INTMUL() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/IntegerOp/JKFLIPFLOP.sci" */ @@ -4924,6 +5084,7 @@ function JKFLIPFLOP() { model.rpar = scs_m; gr_i = []; this.x = standard_define([2,3],model,[],gr_i); + return new BasicBlock(this.x); } JKFLIPFLOP.prototype.details = function JKFLIPFLOP() { return this.x; @@ -4969,6 +5130,7 @@ function JKFLIPFLOP() { this.x = arg1; y = needcompile; typ = newpar; + return new BasicBlock(this.x); } } /* autogenerated from "macros/IntegerOp/LOGIC.sci" */ @@ -4991,6 +5153,7 @@ function LOGIC() { exprs = [[sci2exp(mat)],[sci2exp(0)]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } LOGIC.prototype.details = function LOGIC() { return this.x; @@ -5036,6 +5199,7 @@ function LOGIC() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/IntegerOp/SHIFT.sci" */ @@ -5058,6 +5222,7 @@ function SHIFT() { exprs = [[sci2exp(3)],[sci2exp(0)],[sci2exp(0)]]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } SHIFT.prototype.details = function SHIFT() { return this.x; @@ -5158,6 +5323,7 @@ function SHIFT() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/IntegerOp/SRFLIPFLOP.sci" */ @@ -5192,6 +5358,7 @@ function SRFLIPFLOP() { model.rpar = scs_m; gr_i = []; this.x = standard_define([2,3],model,[],gr_i); + return new BasicBlock(this.x); } SRFLIPFLOP.prototype.details = function SRFLIPFLOP() { return this.x; @@ -5237,6 +5404,7 @@ function SRFLIPFLOP() { this.x = arg1; y = needcompile; typ = newpar; + return new BasicBlock(this.x); } } /* autogenerated from "macros/Linear/BIGSOM_f.sci" */ @@ -5253,6 +5421,7 @@ function BIGSOM_f() { exprs = sci2exp(sgn); gr_i = []; this.x = standard_define([2,3],model,exprs,gr_i); + return new BasicBlock(this.x); } BIGSOM_f.prototype.details = function BIGSOM_f() { return this.x; @@ -5279,6 +5448,7 @@ function BIGSOM_f() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Linear/CLINDUMMY_f.sci" */ @@ -5293,6 +5463,7 @@ function CLINDUMMY_f() { model.dep_ut = [false,true]; gr_i = []; this.x = standard_define([3,2],model,[],gr_i); + return new BasicBlock(this.x); } CLINDUMMY_f.prototype.details = function CLINDUMMY_f() { return this.x; @@ -5301,6 +5472,7 @@ function CLINDUMMY_f() { } CLINDUMMY_f.prototype.set = function CLINDUMMY_f() { this.x = arg1; + return new BasicBlock(this.x); } } /* autogenerated from "macros/Linear/CLR.sci" */ @@ -5322,6 +5494,7 @@ function CLR() { model.dep_ut = [false,true]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } CLR.prototype.details = function CLR() { return this.x; @@ -5375,6 +5548,7 @@ function CLR() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Linear/CLR_f.sci" */ @@ -5396,6 +5570,7 @@ function CLR_f() { model.dep_ut = [false,true]; gr_i = []; this.x = standard_define([2.5,2.5],model,exprs,gr_i); + return new BasicBlock(this.x); } CLR_f.prototype.details = function CLR_f() { return this.x; @@ -5449,6 +5624,7 @@ function CLR_f() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Linear/CLSS.sci" */ @@ -5472,6 +5648,7 @@ function CLSS() { exprs = [[strcat(sci2exp(A))],[strcat(sci2exp(B))],[strcat(sci2exp(C))],[strcat(sci2exp(D))],[strcat(sci2exp(x0))]]; gr_i = []; this.x = standard_define([4,2],model,exprs,gr_i); + return new BasicBlock(this.x); } CLSS.prototype.details = function CLSS() { return this.x; @@ -5537,6 +5714,7 @@ function CLSS() { } } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Linear/CLSS_f.sci" */ @@ -5560,6 +5738,7 @@ function CLSS_f() { exprs = [[strcat(sci2exp(A))],[strcat(sci2exp(B))],[strcat(sci2exp(C))],[strcat(sci2exp(D))],[strcat(sci2exp(x0))]]; gr_i = []; this.x = standard_define([4,2],model,exprs,gr_i); + return new BasicBlock(this.x); } CLSS_f.prototype.details = function CLSS_f() { return this.x; @@ -5615,6 +5794,7 @@ function CLSS_f() { } } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Linear/DELAYV_f.sci" */ @@ -5638,6 +5818,7 @@ function DELAYV_f() { exprs = [[string(nin)],[strcat(string(z0.slice(1-1,$-1)),";")],[string(T)]]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } DELAYV_f.prototype.details = function DELAYV_f() { return this.x; @@ -5678,6 +5859,7 @@ function DELAYV_f() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Linear/DELAY_f.sci" */ @@ -5745,6 +5927,7 @@ function DELAY_f() { this.x.graphics.in_style = ""; this.x.graphics.out_implicit = ["E"]; this.x.graphics.out_style = ""; + return new BasicBlock(this.x); } DELAY_f.prototype.details = function DELAY_f() { return this.x; @@ -5807,6 +5990,7 @@ function DELAY_f() { needcompile = 0; y = needcompile; typ = newpar; + return new BasicBlock(this.x); } } /* autogenerated from "macros/Linear/DERIV.sci" */ @@ -5821,6 +6005,7 @@ function DERIV() { exprs = []; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } DERIV.prototype.details = function DERIV() { return this.x; @@ -5829,6 +6014,7 @@ function DERIV() { } DERIV.prototype.set = function DERIV() { this.x = arg1; + return new BasicBlock(this.x); } } /* autogenerated from "macros/Linear/DIFF_c.sci" */ @@ -5845,6 +6031,7 @@ function DIFF_c() { exprs = [[strcat(sci2exp(x0[1-1]))],[strcat(sci2exp(x0[2-1]))]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } DIFF_c.prototype.details = function DIFF_c() { return this.x; @@ -5885,6 +6072,7 @@ function DIFF_c() { } } this.x.model.firing = []; + return new BasicBlock(this.x); } } /* autogenerated from "macros/Linear/DLR.sci" */ @@ -5907,6 +6095,7 @@ function DLR() { model.dep_ut = [false,false]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } DLR.prototype.details = function DLR() { return this.x; @@ -5958,6 +6147,7 @@ function DLR() { } } this.x.model.firing = []; + return new BasicBlock(this.x); } } /* autogenerated from "macros/Linear/DLR_f.sci" */ @@ -5980,6 +6170,7 @@ function DLR_f() { model.dep_ut = [false,false]; gr_i = []; this.x = standard_define([2.5,2.5],model,exprs,gr_i); + return new BasicBlock(this.x); } DLR_f.prototype.details = function DLR_f() { return this.x; @@ -6031,6 +6222,7 @@ function DLR_f() { } } this.x.model.firing = []; + return new BasicBlock(this.x); } } /* autogenerated from "macros/Linear/DLSS.sci" */ @@ -6053,6 +6245,7 @@ function DLSS() { exprs = [[strcat(sci2exp(A))],[strcat(sci2exp(B))],[strcat(sci2exp(C))],[strcat(sci2exp(D))],[strcat(sci2exp(x0))]]; gr_i = []; this.x = standard_define([4,2],model,exprs,gr_i); + return new BasicBlock(this.x); } DLSS.prototype.details = function DLSS() { return this.x; @@ -6118,6 +6311,7 @@ function DLSS() { } } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Linear/DLSS_f.sci" */ @@ -6140,6 +6334,7 @@ function DLSS_f() { exprs = [[strcat(sci2exp(A))],[strcat(sci2exp(B))],[strcat(sci2exp(C))],[strcat(sci2exp(D))],[strcat(sci2exp(x0))]]; gr_i = []; this.x = standard_define([4,2],model,exprs,gr_i); + return new BasicBlock(this.x); } DLSS_f.prototype.details = function DLSS_f() { return this.x; @@ -6195,6 +6390,7 @@ function DLSS_f() { } } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Linear/DOLLAR.sci" */ @@ -6214,6 +6410,7 @@ function DOLLAR() { model.dep_ut = [false,false]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } DOLLAR.prototype.details = function DOLLAR() { return this.x; @@ -6286,6 +6483,7 @@ function DOLLAR() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Linear/DOLLAR_f.sci" */ @@ -6305,6 +6503,7 @@ function DOLLAR_f() { model.dep_ut = [false,false]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } DOLLAR_f.prototype.details = function DOLLAR_f() { return this.x; @@ -6342,6 +6541,7 @@ function DOLLAR_f() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Linear/DOLLAR_m.sci" */ @@ -6361,6 +6561,7 @@ function DOLLAR_m() { model.dep_ut = [false,false]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } DOLLAR_m.prototype.details = function DOLLAR_m() { return this.x; @@ -6433,6 +6634,7 @@ function DOLLAR_m() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Linear/GAINBLK.sci" */ @@ -6455,6 +6657,7 @@ function GAINBLK() { exprs = [strcat(sci2exp(gain))]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } GAINBLK.prototype.details = function GAINBLK() { return this.x; @@ -6581,6 +6784,7 @@ function GAINBLK() { } } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Linear/GAINBLK_f.sci" */ @@ -6599,6 +6803,7 @@ function GAINBLK_f() { exprs = [strcat(sci2exp(gain))]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } GAINBLK_f.prototype.details = function GAINBLK_f() { return this.x; @@ -6629,6 +6834,7 @@ function GAINBLK_f() { } } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Linear/GAIN_f.sci" */ @@ -6647,6 +6853,7 @@ function GAIN_f() { exprs = [[strcat(sci2exp(gain))],[strcat(sci2exp(in1))],[strcat(sci2exp(out))]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } GAIN_f.prototype.details = function GAIN_f() { return this.x; @@ -6677,6 +6884,7 @@ function GAIN_f() { } } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Linear/INTEGRAL.sci" */ @@ -6697,6 +6905,7 @@ function INTEGRAL() { gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); this.x.graphics.id = "1/s"; + return new BasicBlock(this.x); } INTEGRAL.prototype.details = function INTEGRAL() { return this.x; @@ -6758,6 +6967,7 @@ function INTEGRAL() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Linear/INTEGRAL_f.sci" */ @@ -6774,6 +6984,7 @@ function INTEGRAL_f() { exprs = strcat(sci2exp(x0)); gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } INTEGRAL_f.prototype.details = function INTEGRAL_f() { return this.x; @@ -6797,6 +7008,7 @@ function INTEGRAL_f() { break; } this.x.model.firing = []; + return new BasicBlock(this.x); } } /* autogenerated from "macros/Linear/INTEGRAL_m.sci" */ @@ -6818,6 +7030,7 @@ function INTEGRAL_m() { exprs = string([[0],[0],[0],[maxp],[minp]]); gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } INTEGRAL_m.prototype.details = function INTEGRAL_m() { return this.x; @@ -6921,6 +7134,7 @@ function INTEGRAL_m() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Linear/PID.sci" */ @@ -6962,6 +7176,7 @@ function PID() { model.rpar = scs_m; gr_i = []; this.x = standard_define([2,2],model,[],gr_i); + return new BasicBlock(this.x); } PID.prototype.details = function PID() { return this.x; @@ -7038,6 +7253,7 @@ function PID() { this.x = arg1; y = max(y,needcompile); typ = newpar; + return new BasicBlock(this.x); } } /* autogenerated from "macros/Linear/REGISTER.sci" */ @@ -7055,6 +7271,7 @@ function REGISTER() { exprs = strcat(string(z0),";"); gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } REGISTER.prototype.details = function REGISTER() { return this.x; @@ -7120,6 +7337,7 @@ function REGISTER() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Linear/REGISTER_f.sci" */ @@ -7137,6 +7355,7 @@ function REGISTER_f() { exprs = strcat(string(z0),";"); gr_i = []; this.x = standard_define([2.5,2.5],model,exprs,gr_i); + return new BasicBlock(this.x); } REGISTER_f.prototype.details = function REGISTER_f() { return this.x; @@ -7165,6 +7384,7 @@ function REGISTER_f() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Linear/SAMPHOLD.sci" */ @@ -7180,6 +7400,7 @@ function SAMPHOLD() { model.dep_ut = [true,false]; gr_i = []; this.x = standard_define([2,2],model," ",gr_i); + return new BasicBlock(this.x); } SAMPHOLD.prototype.details = function SAMPHOLD() { return this.x; @@ -7189,6 +7410,7 @@ function SAMPHOLD() { SAMPHOLD.prototype.set = function SAMPHOLD() { this.x = arg1; this.x.model.firing = []; + return new BasicBlock(this.x); } } /* autogenerated from "macros/Linear/SAMPHOLD_m.sci" */ @@ -7208,6 +7430,7 @@ function SAMPHOLD_m() { label = [sci2exp(1)]; gr_i = []; this.x = standard_define([2,2],model,label,gr_i); + return new BasicBlock(this.x); } SAMPHOLD_m.prototype.details = function SAMPHOLD_m() { return this.x; @@ -7241,6 +7464,7 @@ function SAMPHOLD_m() { } } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Linear/SAMPLEHOLD_f.sci" */ @@ -7256,6 +7480,7 @@ function SAMPLEHOLD_f() { model.dep_ut = [true,false]; gr_i = []; this.x = standard_define([2,2],model," ",gr_i); + return new BasicBlock(this.x); } SAMPLEHOLD_f.prototype.details = function SAMPLEHOLD_f() { return this.x; @@ -7265,6 +7490,7 @@ function SAMPLEHOLD_f() { SAMPLEHOLD_f.prototype.set = function SAMPLEHOLD_f() { this.x = arg1; this.x.model.firing = []; + return new BasicBlock(this.x); } } /* autogenerated from "macros/Linear/SOM_f.sci" */ @@ -7281,6 +7507,7 @@ function SOM_f() { exprs = [[sci2exp(1)],[sci2exp(sgn)]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } SOM_f.prototype.details = function SOM_f() { return this.x; @@ -7306,6 +7533,7 @@ function SOM_f() { str = [["This sum block is obsolete","parameters cannot be modified. Please replace it with new sum block"],["and gain blocks in the linear palette"," ","Input ports are located at up, side and down positions.","Current gains are:"]]; str = [[str],[(part(labs.slice(),1,7)+exprs.slice())]]; message(str); + return new BasicBlock(this.x); } } /* autogenerated from "macros/Linear/SUMMATION.sci" */ @@ -7324,6 +7552,7 @@ function SUMMATION() { exprs = sci2exp(sgn); gr_i = []; this.x = standard_define([2,3],model,exprs,gr_i); + return new BasicBlock(this.x); } SUMMATION.prototype.details = function SUMMATION() { return this.x; @@ -7444,6 +7673,7 @@ function SUMMATION() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Linear/SUM_f.sci" */ @@ -7458,6 +7688,7 @@ function SUM_f() { gr_i = []; exprs = []; this.x = standard_define([1,1],model,exprs,gr_i); + return new BasicBlock(this.x); } SUM_f.prototype.details = function SUM_f() { return this.x; @@ -7466,6 +7697,7 @@ function SUM_f() { } SUM_f.prototype.set = function SUM_f() { this.x = arg1; + return new BasicBlock(this.x); } } /* autogenerated from "macros/Linear/TCLSS.sci" */ @@ -7491,6 +7723,7 @@ function TCLSS() { exprs = [[strcat(sci2exp(A))],[strcat(sci2exp(B))],[strcat(sci2exp(C))],[strcat(sci2exp(D))],[strcat(sci2exp(x0))]]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } TCLSS.prototype.details = function TCLSS() { return this.x; @@ -7551,6 +7784,7 @@ function TCLSS() { } } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Linear/TCLSS_f.sci" */ @@ -7576,6 +7810,7 @@ function TCLSS_f() { exprs = [[strcat(sci2exp(A))],[strcat(sci2exp(B))],[strcat(sci2exp(C))],[strcat(sci2exp(D))],[strcat(sci2exp(x0))]]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } TCLSS_f.prototype.details = function TCLSS_f() { return this.x; @@ -7636,6 +7871,7 @@ function TCLSS_f() { } } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Linear/TIME_DELAY.sci" */ @@ -7656,6 +7892,7 @@ function TIME_DELAY() { exprs = [[string(T)],[string(init)],[string(N)]]; gr_i = []; this.x = standard_define([3.5,2],model,exprs,gr_i); + return new BasicBlock(this.x); } TIME_DELAY.prototype.details = function TIME_DELAY() { return this.x; @@ -7694,6 +7931,7 @@ function TIME_DELAY() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Linear/VARIABLE_DELAY.sci" */ @@ -7714,6 +7952,7 @@ function VARIABLE_DELAY() { exprs = [[string(T)],[string(init)],[string(N)]]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } VARIABLE_DELAY.prototype.details = function VARIABLE_DELAY() { return this.x; @@ -7751,6 +7990,7 @@ function VARIABLE_DELAY() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/MatrixOp/CUMSUM.sci" */ @@ -7778,6 +8018,7 @@ function CUMSUM() { label = [[sci2exp(1)],[sci2exp(0)]]; gr_i = []; this.x = standard_define([3,2],model,label,gr_i); + return new BasicBlock(this.x); } CUMSUM.prototype.details = function CUMSUM() { return this.x; @@ -7846,6 +8087,7 @@ function CUMSUM() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/MatrixOp/EXTRACT.sci" */ @@ -7873,6 +8115,7 @@ function EXTRACT() { label = [[sci2exp(1)],[sci2exp([1])],[sci2exp([1])]]; gr_i = []; this.x = standard_define([3,2],model,label,gr_i); + return new BasicBlock(this.x); } EXTRACT.prototype.details = function EXTRACT() { return this.x; @@ -7939,6 +8182,7 @@ function EXTRACT() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/MatrixOp/EXTTRI.sci" */ @@ -7966,6 +8210,7 @@ function EXTTRI() { label = [[sci2exp(1)],[sci2exp(1)]]; gr_i = []; this.x = standard_define([3,2],model,label,gr_i); + return new BasicBlock(this.x); } EXTTRI.prototype.details = function EXTTRI() { return this.x; @@ -8031,6 +8276,7 @@ function EXTTRI() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/MatrixOp/MATBKSL.sci" */ @@ -8058,6 +8304,7 @@ function MATBKSL() { label = [sci2exp(1)]; gr_i = []; this.x = standard_define([2,2],model,label,gr_i); + return new BasicBlock(this.x); } MATBKSL.prototype.details = function MATBKSL() { return this.x; @@ -8103,6 +8350,7 @@ function MATBKSL() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/MatrixOp/MATCATH.sci" */ @@ -8130,6 +8378,7 @@ function MATCATH() { label = [sci2exp(2)]; gr_i = []; this.x = standard_define([2,3],model,label,gr_i); + return new BasicBlock(this.x); } MATCATH.prototype.details = function MATCATH() { return this.x; @@ -8165,6 +8414,7 @@ function MATCATH() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/MatrixOp/MATCATV.sci" */ @@ -8193,6 +8443,7 @@ function MATCATV() { label = [sci2exp(2)]; gr_i = []; this.x = standard_define([2,3],model,label,gr_i); + return new BasicBlock(this.x); } MATCATV.prototype.details = function MATCATV() { return this.x; @@ -8228,6 +8479,7 @@ function MATCATV() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/MatrixOp/MATDET.sci" */ @@ -8255,6 +8507,7 @@ function MATDET() { label = [sci2exp(1)]; gr_i = []; this.x = standard_define([2,2],model,label,gr_i); + return new BasicBlock(this.x); } MATDET.prototype.details = function MATDET() { return this.x; @@ -8300,6 +8553,7 @@ function MATDET() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/MatrixOp/MATDIAG.sci" */ @@ -8327,6 +8581,7 @@ function MATDIAG() { label = [sci2exp(1)]; gr_i = []; this.x = standard_define([2,2],model,label,gr_i); + return new BasicBlock(this.x); } MATDIAG.prototype.details = function MATDIAG() { return this.x; @@ -8372,6 +8627,7 @@ function MATDIAG() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/MatrixOp/MATDIV.sci" */ @@ -8399,6 +8655,7 @@ function MATDIV() { label = [sci2exp(1)]; gr_i = []; this.x = standard_define([2,2],model,label,gr_i); + return new BasicBlock(this.x); } MATDIV.prototype.details = function MATDIV() { return this.x; @@ -8444,6 +8701,7 @@ function MATDIV() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/MatrixOp/MATEIG.sci" */ @@ -8471,6 +8729,7 @@ function MATEIG() { label = [[sci2exp(1)],[sci2exp(1)]]; gr_i = []; this.x = standard_define([2,2],model,label,gr_i); + return new BasicBlock(this.x); } MATEIG.prototype.details = function MATEIG() { return this.x; @@ -8537,6 +8796,7 @@ function MATEIG() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/MatrixOp/MATEXPM.sci" */ @@ -8564,6 +8824,7 @@ function MATEXPM() { label = [sci2exp(1)]; gr_i = []; this.x = standard_define([2,2],model,label,gr_i); + return new BasicBlock(this.x); } MATEXPM.prototype.details = function MATEXPM() { return this.x; @@ -8609,6 +8870,7 @@ function MATEXPM() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/MatrixOp/MATINV.sci" */ @@ -8636,6 +8898,7 @@ function MATINV() { label = [sci2exp(1)]; gr_i = []; this.x = standard_define([2,2],model,label,gr_i); + return new BasicBlock(this.x); } MATINV.prototype.details = function MATINV() { return this.x; @@ -8681,6 +8944,7 @@ function MATINV() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/MatrixOp/MATLU.sci" */ @@ -8708,6 +8972,7 @@ function MATLU() { label = sci2exp(1); gr_i = []; this.x = standard_define([2,2],model,label,gr_i); + return new BasicBlock(this.x); } MATLU.prototype.details = function MATLU() { return this.x; @@ -8751,6 +9016,7 @@ function MATLU() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/MatrixOp/MATMAGPHI.sci" */ @@ -8778,6 +9044,7 @@ function MATMAGPHI() { label = [sci2exp(1)]; gr_i = []; this.x = standard_define([3,2],model,label,gr_i); + return new BasicBlock(this.x); } MATMAGPHI.prototype.details = function MATMAGPHI() { return this.x; @@ -8827,6 +9094,7 @@ function MATMAGPHI() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/MatrixOp/MATMUL.sci" */ @@ -8843,6 +9111,7 @@ function MATMUL() { label = [sci2exp(model.ipar)]; gr_i = []; this.x = standard_define([3,2],model,label,gr_i); + return new BasicBlock(this.x); } MATMUL.prototype.details = function MATMUL() { return this.x; @@ -8979,6 +9248,7 @@ function MATMUL() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/MatrixOp/MATPINV.sci" */ @@ -9006,6 +9276,7 @@ function MATPINV() { label = [sci2exp(1)]; gr_i = []; this.x = standard_define([2,2],model,label,gr_i); + return new BasicBlock(this.x); } MATPINV.prototype.details = function MATPINV() { return this.x; @@ -9051,6 +9322,7 @@ function MATPINV() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/MatrixOp/MATRESH.sci" */ @@ -9078,6 +9350,7 @@ function MATRESH() { label = [[sci2exp(1)],[sci2exp([1,1])],[sci2exp([1,1])]]; gr_i = []; this.x = standard_define([3,2],model,label,gr_i); + return new BasicBlock(this.x); } MATRESH.prototype.details = function MATRESH() { return this.x; @@ -9148,6 +9421,7 @@ function MATRESH() { } } needcompile=resume(needcompile) + return new BasicBlock(this.x); } } /* autogenerated from "macros/MatrixOp/MATSING.sci" */ @@ -9175,6 +9449,7 @@ function MATSING() { label = [[sci2exp(1)],[sci2exp(1)]]; gr_i = []; this.x = standard_define([2,2],model,label,gr_i); + return new BasicBlock(this.x); } MATSING.prototype.details = function MATSING() { return this.x; @@ -9244,6 +9519,7 @@ function MATSING() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/MatrixOp/MATSUM.sci" */ @@ -9271,6 +9547,7 @@ function MATSUM() { label = [[sci2exp(1)],[sci2exp(0)]]; gr_i = []; this.x = standard_define([3,2],model,label,gr_i); + return new BasicBlock(this.x); } MATSUM.prototype.details = function MATSUM() { return this.x; @@ -9341,6 +9618,7 @@ function MATSUM() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/MatrixOp/MATTRAN.sci" */ @@ -9356,6 +9634,7 @@ function MATTRAN() { label = [sci2exp(1)]; gr_i = []; this.x = standard_define([3,2],model,label,gr_i); + return new BasicBlock(this.x); } MATTRAN.prototype.details = function MATTRAN() { return this.x; @@ -9405,6 +9684,7 @@ function MATTRAN() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/MatrixOp/MATZCONJ.sci" */ @@ -9432,6 +9712,7 @@ function MATZCONJ() { label = []; gr_i = []; this.x = standard_define([2,2],model,label,gr_i); + return new BasicBlock(this.x); } MATZCONJ.prototype.details = function MATZCONJ() { return this.x; @@ -9440,6 +9721,7 @@ function MATZCONJ() { } MATZCONJ.prototype.set = function MATZCONJ() { this.x = arg1; + return new BasicBlock(this.x); } } /* autogenerated from "macros/MatrixOp/MATZREIM.sci" */ @@ -9467,6 +9749,7 @@ function MATZREIM() { label = sci2exp(1); gr_i = []; this.x = standard_define([3,2],model,label,gr_i); + return new BasicBlock(this.x); } MATZREIM.prototype.details = function MATZREIM() { return this.x; @@ -9516,6 +9799,7 @@ function MATZREIM() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/MatrixOp/RICC.sci" */ @@ -9543,6 +9827,7 @@ function RICC() { label = [[sci2exp(1)],[sci2exp(1)]]; gr_i = []; this.x = standard_define([2,2],model,label,gr_i); + return new BasicBlock(this.x); } RICC.prototype.details = function RICC() { return this.x; @@ -9577,6 +9862,7 @@ function RICC() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/MatrixOp/ROOTCOEF.sci" */ @@ -9604,6 +9890,7 @@ function ROOTCOEF() { label = [[sci2exp(1)],[sci2exp(1)]]; gr_i = []; this.x = standard_define([3,2],model,label,gr_i); + return new BasicBlock(this.x); } ROOTCOEF.prototype.details = function ROOTCOEF() { return this.x; @@ -9649,6 +9936,7 @@ function ROOTCOEF() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/MatrixOp/SQRT.sci" */ @@ -9666,6 +9954,7 @@ function SQRT() { label = [sci2exp(1)]; gr_i = []; this.x = standard_define([2,2],model,label,gr_i); + return new BasicBlock(this.x); } SQRT.prototype.details = function SQRT() { return this.x; @@ -9706,6 +9995,7 @@ function SQRT() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/MatrixOp/SUBMAT.sci" */ @@ -9733,6 +10023,7 @@ function SUBMAT() { label = [[sci2exp(1)],[sci2exp(1)],[sci2exp(1)],[sci2exp(1)],[sci2exp(1)]]; gr_i = []; this.x = standard_define([2.5,2],model,label,gr_i); + return new BasicBlock(this.x); } SUBMAT.prototype.details = function SUBMAT() { return this.x; @@ -9799,6 +10090,7 @@ function SUBMAT() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Misc/AUTOMAT.sci" */ @@ -9828,6 +10120,7 @@ function AUTOMAT() { model.rpar = rpar; gr_i = []; this.x = standard_define([4,2],model,exprs,gr_i); + return new BasicBlock(this.x); } AUTOMAT.prototype.details = function AUTOMAT() { return this.x; @@ -9934,6 +10227,7 @@ function AUTOMAT() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Misc/BACKLASH.sci" */ @@ -9950,6 +10244,7 @@ function BACKLASH() { model.dep_ut = [true,false]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } BACKLASH.prototype.details = function BACKLASH() { return this.x; @@ -9982,6 +10277,7 @@ function BACKLASH() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Misc/BOUNCE.sci" */ @@ -10022,6 +10318,7 @@ function BOUNCE() { exprs = [[strcat(sci2exp(rpar1))],[strcat(sci2exp(rpar2))],[strcat(sci2exp(walls))],[strcat(sci2exp(this.x))],[strcat(sci2exp(xd))],[strcat(sci2exp(y))],[strcat(sci2exp(yd))]]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } BOUNCE.prototype.details = function BOUNCE() { return this.x; @@ -10090,6 +10387,7 @@ function BOUNCE() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Misc/BOUNCEXY.sci" */ @@ -10127,6 +10425,7 @@ function BOUNCEXY() { exprs = [[strcat(sci2exp(clrs))],[strcat(sci2exp(siz))],[strcat(sci2exp(win))],[strcat(sci2exp(1))],[strcat(sci2exp(xmin))],[strcat(sci2exp(xmax))],[strcat(sci2exp(ymin))],[strcat(sci2exp(ymax))]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } BOUNCEXY.prototype.details = function BOUNCEXY() { return this.x; @@ -10184,6 +10483,7 @@ function BOUNCEXY() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Misc/BPLATFORM.sci" */ @@ -10207,6 +10507,7 @@ function BPLATFORM() { exprs = string(model.rpar); gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } BPLATFORM.prototype.details = function BPLATFORM() { return this.x; @@ -10248,6 +10549,7 @@ function BPLATFORM() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Misc/CBLOCK.sci" */ @@ -10282,6 +10584,7 @@ function CBLOCK() { label = list(transpose([funam,"n",sci2exp(in1),sci2exp(out),sci2exp(clkin),sci2exp(clkout),sci2exp(x0),sci2exp(0),sci2exp(z0),sci2exp(rpar),sci2exp(ipar),sci2exp(auto),"y","n"]),[]); gr_i = []; this.x = standard_define([4,2],model,label,gr_i); + return new BasicBlock(this.x); } CBLOCK.prototype.details = function CBLOCK() { return this.x; @@ -10377,6 +10680,7 @@ function CBLOCK() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Misc/CBLOCK4.sci" */ @@ -10395,6 +10699,7 @@ function CBLOCK4() { label = list([[funam],["n"],[sci2exp([model.in1,model.in2])],[sci2exp(model.intyp)],[sci2exp([model.out,model.out2])],[sci2exp(model.outtyp)],[sci2exp(model.evtin)],[sci2exp(model.evtout)],[sci2exp(model.state)],[sci2exp(model.dstate)],[sci2exp(model.odstate)],[sci2exp(model.rpar)],[sci2exp(model.ipar)],[sci2exp(model.opar)],[sci2exp(model.nmode)],[sci2exp(model.nzcross)],[sci2exp(model.firing)],["y"],["n"]],[]); gr_i = []; this.x = standard_define([4,2],model,label,gr_i); + return new BasicBlock(this.x); } CBLOCK4.prototype.details = function CBLOCK4() { return this.x; @@ -10488,6 +10793,7 @@ function CBLOCK4() { } } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Misc/CONSTRAINT2_c.sci" */ @@ -10507,6 +10813,7 @@ function CONSTRAINT2_c() { exprs = list(strcat(sci2exp(x0)),strcat(sci2exp(xd0)),strcat(sci2exp(id))); gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } CONSTRAINT2_c.prototype.details = function CONSTRAINT2_c() { return this.x; @@ -10561,6 +10868,7 @@ function CONSTRAINT2_c() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Misc/CONSTRAINT_c.sci" */ @@ -10578,6 +10886,7 @@ function CONSTRAINT_c() { exprs = "0"; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } CONSTRAINT_c.prototype.details = function CONSTRAINT_c() { return this.x; @@ -10612,6 +10921,7 @@ function CONSTRAINT_c() { } } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Misc/DEADBAND.sci" */ @@ -10632,6 +10942,7 @@ function DEADBAND() { exprs = [[string(maxp)],[string(minp)],[string(model.nmode)]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } DEADBAND.prototype.details = function DEADBAND() { return this.x; @@ -10666,6 +10977,7 @@ function DEADBAND() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Misc/DEBUG.sci" */ @@ -10677,6 +10989,7 @@ function DEBUG() { exprs = list("","xcos_debug_gui(flag,block);"); gr_i = []; this.x = standard_define([8,2],model,exprs,gr_i); + return new BasicBlock(this.x); } DEBUG.prototype.details = function DEBUG() { return this.x; @@ -10715,12 +11028,14 @@ function DEBUG() { graphics.exprs = exprs; this.x.graphics = graphics; } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Misc/DEBUG_SCICOS.sci" */ function DEBUG_SCICOS() { DEBUG_SCICOS.prototype.define = function DEBUG_SCICOS() { this.x = DEBUG("define"); + return new BasicBlock(this.x); } DEBUG_SCICOS.prototype.details = function DEBUG_SCICOS() { return this.x; @@ -10730,6 +11045,7 @@ function DEBUG_SCICOS() { DEBUG_SCICOS.prototype.set = function DEBUG_SCICOS() { arg1.gui = "DEBUG"; [this.x,y,typ] = DEBUG("set",arg1); + return new BasicBlock(this.x); } } /* autogenerated from "macros/Misc/DIFF_f.sci" */ @@ -10746,6 +11062,7 @@ function DIFF_f() { exprs = [[strcat(sci2exp(x0[1-1]))],[strcat(sci2exp(x0[2-1]))]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } DIFF_f.prototype.details = function DIFF_f() { return this.x; @@ -10769,11 +11086,13 @@ function DIFF_f() { break; } this.x.model.firing = []; + return new BasicBlock(this.x); } } /* autogenerated from "macros/Misc/DSUPER.sci" */ function DSUPER() { DSUPER.prototype.define = function DSUPER() { + return new BasicBlock(this.x); } DSUPER.prototype.details = function DSUPER() { return this.x; @@ -10821,6 +11140,7 @@ function DSUPER() { } else { this.x = arg1; } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Misc/EDGETRIGGER.sci" */ @@ -10839,6 +11159,7 @@ function EDGETRIGGER() { exprs = [string(edge)]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } EDGETRIGGER.prototype.details = function EDGETRIGGER() { return this.x; @@ -10861,6 +11182,7 @@ function EDGETRIGGER() { this.x.model = model; break; } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Misc/EDGE_TRIGGER.sci" */ @@ -10944,6 +11266,7 @@ function EDGE_TRIGGER() { model.rpar = scs_m_1; gr_i = []; this.x = standard_define([3,2],model,[],gr_i); + return new BasicBlock(this.x); } EDGE_TRIGGER.prototype.details = function EDGE_TRIGGER() { return this.x; @@ -11018,6 +11341,7 @@ function EDGE_TRIGGER() { } this.x = arg1; typ = newpar; + return new BasicBlock(this.x); } } /* autogenerated from "macros/Misc/ENDBLK.sci" */ @@ -11029,6 +11353,7 @@ function ENDBLK() { model = scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()); gr_i = []; this.x = standard_define([2,2],model,[],gr_i); + return new BasicBlock(this.x); } ENDBLK.prototype.details = function ENDBLK() { return this.x; @@ -11103,6 +11428,7 @@ function ENDBLK() { } this.x = arg1; typ = newpar; + return new BasicBlock(this.x); } } /* autogenerated from "macros/Misc/Extract_Activation.sci" */ @@ -11191,6 +11517,7 @@ function Extract_Activation() { model.rpar = scs_m_1; gr_i = []; this.x = standard_define([3,2],model,[],gr_i); + return new BasicBlock(this.x); } Extract_Activation.prototype.details = function Extract_Activation() { return this.x; @@ -11199,6 +11526,7 @@ function Extract_Activation() { } Extract_Activation.prototype.set = function Extract_Activation() { this.x = arg1; + return new BasicBlock(this.x); } } /* autogenerated from "macros/Misc/HYSTHERESIS.sci" */ @@ -11220,6 +11548,7 @@ function HYSTHERESIS() { exprs = [[string(rpar)],[string(sign(nzz))]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } HYSTHERESIS.prototype.details = function HYSTHERESIS() { return this.x; @@ -11250,6 +11579,7 @@ function HYSTHERESIS() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Misc/IMPSPLIT_f.sci" */ @@ -11267,6 +11597,7 @@ function IMPSPLIT_f() { this.x = standard_define([1,1]/3,model,[],[]); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I","I"]; + return new BasicBlock(this.x); } IMPSPLIT_f.prototype.details = function IMPSPLIT_f() { return this.x; @@ -11275,6 +11606,7 @@ function IMPSPLIT_f() { } IMPSPLIT_f.prototype.set = function IMPSPLIT_f() { this.x = arg1; + return new BasicBlock(this.x); } } /* autogenerated from "macros/Misc/LOGICAL_OP.sci" */ @@ -11293,6 +11625,7 @@ function LOGICAL_OP() { exprs = [[string(nin)],[string(ipar)]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } LOGICAL_OP.prototype.details = function LOGICAL_OP() { return this.x; @@ -11388,6 +11721,7 @@ function LOGICAL_OP() { } } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Misc/MBLOCK.sci" */ @@ -11422,6 +11756,7 @@ function MBLOCK() { this.x = standard_define([3,2],model,exprs,gr_i); this.x.graphics.in_implicit = this.intype; this.x.graphics.out_implicit = this.outtype; + return new BasicBlock(this.x); } MBLOCK.prototype.details = function MBLOCK() { return this.x; @@ -11662,6 +11997,7 @@ function MBLOCK() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Misc/MEMORY_f.sci" */ @@ -11681,6 +12017,7 @@ function MEMORY_f() { model.dep_ut = [false,false]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } MEMORY_f.prototype.details = function MEMORY_f() { return this.x; @@ -11719,6 +12056,7 @@ function MEMORY_f() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Misc/MPBLOCK.sci" */ @@ -11753,6 +12091,7 @@ function MPBLOCK() { this.x = standard_define([3,2],model,exprs,gr_i); this.x.graphics.in_implicit = this.intype; this.x.graphics.out_implicit = this.outtype; + return new BasicBlock(this.x); } MPBLOCK.prototype.details = function MPBLOCK() { return this.x; @@ -11985,6 +12324,7 @@ function MPBLOCK() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Misc/PAL_f.sci" */ @@ -12002,6 +12342,7 @@ function PAL_f() { gr_i = []; this.x = standard_define([2,2],model,[],gr_i); this.x.graphics.id = scs.props.title[1-1]; + return new BasicBlock(this.x); } PAL_f.prototype.details = function PAL_f() { return this.x; @@ -12016,6 +12357,7 @@ function PAL_f() { y = []; typ = []; %exit=resume(false) + return new BasicBlock(this.x); } } /* autogenerated from "macros/Misc/PENDULUM_ANIM.sci" */ @@ -12039,6 +12381,7 @@ function PENDULUM_ANIM() { exprs = string(model.rpar); gr_i = []; this.x = standard_define([3,3],model,exprs,gr_i); + return new BasicBlock(this.x); } PENDULUM_ANIM.prototype.details = function PENDULUM_ANIM() { return this.x; @@ -12080,6 +12423,7 @@ function PENDULUM_ANIM() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Misc/RATELIMITER.sci" */ @@ -12098,6 +12442,7 @@ function RATELIMITER() { exprs = [[string(maxp)],[string(minp)]]; gr_i = []; this.x = standard_define([3.5,2],model,exprs,gr_i); + return new BasicBlock(this.x); } RATELIMITER.prototype.details = function RATELIMITER() { return this.x; @@ -12125,6 +12470,7 @@ function RATELIMITER() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Misc/RELATIONALOP.sci" */ @@ -12143,6 +12489,7 @@ function RELATIONALOP() { gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); this.x.graphics.style = ["fontSize=13;fontStyle=1;displayedLabel="+label]; + return new BasicBlock(this.x); } RELATIONALOP.prototype.details = function RELATIONALOP() { return this.x; @@ -12219,6 +12566,7 @@ function RELATIONALOP() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Misc/SPLIT_f.sci" */ @@ -12231,6 +12579,7 @@ function SPLIT_f() { model.blocktype = "c"; model.dep_ut = [true,false]; this.x = standard_define([1,1]/3,model,[],[]); + return new BasicBlock(this.x); } SPLIT_f.prototype.details = function SPLIT_f() { return this.x; @@ -12239,6 +12588,7 @@ function SPLIT_f() { } SPLIT_f.prototype.set = function SPLIT_f() { this.x = arg1; + return new BasicBlock(this.x); } } /* autogenerated from "macros/Misc/SUPER_f.sci" */ @@ -12263,6 +12613,7 @@ function SUPER_f() { model.dep_ut = [false,false]; gr_i = []; this.x = standard_define([2,2],model,[],gr_i); + return new BasicBlock(this.x); } SUPER_f.prototype.details = function SUPER_f() { return this.x; @@ -12271,6 +12622,7 @@ function SUPER_f() { } SUPER_f.prototype.set = function SUPER_f() { xcos(arg1.model.rpar); + return new BasicBlock(this.x); } } /* autogenerated from "macros/Misc/TEXT_f.sci" */ @@ -12288,6 +12640,7 @@ function TEXT_f() { graphics.sz = [2,1]; graphics.exprs = exprs; this.x = mlist(["Text","graphics","model","void","gui"],graphics,model," ","TEXT_f"); + return new BasicBlock(this.x); } TEXT_f.prototype.details = function TEXT_f() { return this.x; @@ -12338,6 +12691,7 @@ function TEXT_f() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Misc/c_block.sci" */ @@ -12369,6 +12723,7 @@ function c_block() { label = list([[sci2exp(in1)],[sci2exp(out)],[strcat(sci2exp(rpar))],[funam]],list([])); gr_i = []; this.x = standard_define([3,2],model,label,gr_i); + return new BasicBlock(this.x); } c_block.prototype.details = function c_block() { return this.x; @@ -12413,6 +12768,7 @@ function c_block() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Misc/fortran_block.sci" */ @@ -12435,6 +12791,7 @@ function fortran_block() { label = list([[sci2exp(model.in1)],[sci2exp(model.out)],[strcat(sci2exp(model.rpar))],[funam]],list([])); gr_i = []; this.x = standard_define([4,2],model,label,gr_i); + return new BasicBlock(this.x); } fortran_block.prototype.details = function fortran_block() { return this.x; @@ -12479,6 +12836,7 @@ function fortran_block() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Misc/func_block.sci" */ @@ -12493,6 +12851,7 @@ function func_block() { exprs = "v=sin(u);y=u*v"; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } func_block.prototype.details = function func_block() { return this.x; @@ -12512,6 +12871,7 @@ function func_block() { this.x.model = model; this.x.graphics = graphics; } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Misc/generic_block.sci" */ @@ -12535,6 +12895,7 @@ function generic_block() { label = [[function_name],[sci2exp(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"]]; gr_i = []; this.x = standard_define([2,2],model,label,gr_i); + return new BasicBlock(this.x); } generic_block.prototype.details = function generic_block() { return this.x; @@ -12610,6 +12971,7 @@ function generic_block() { } } needcompile=resume(needcompile) + return new BasicBlock(this.x); } } /* autogenerated from "macros/Misc/generic_block2.sci" */ @@ -12633,6 +12995,7 @@ function generic_block2() { label = [[function_name],[sci2exp(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.nmode)],[sci2exp(model.nzcross)],[sci2exp(model.firing)],["y"],["n"]]; gr_i = []; this.x = standard_define([2,2],model,label,gr_i); + return new BasicBlock(this.x); } generic_block2.prototype.details = function generic_block2() { return this.x; @@ -12710,6 +13073,7 @@ function generic_block2() { } } needcompile=resume(needcompile) + return new BasicBlock(this.x); } } /* autogenerated from "macros/Misc/generic_block3.sci" */ @@ -12729,6 +13093,7 @@ function generic_block3() { label = [[function_name],[sci2exp(funtyp)],[sci2exp([model.in1,model.in2])],[sci2exp(model.intyp)],[sci2exp([model.out,model.out2]),sci2exp(model.outtyp)],[sci2exp(model.evtin)],[sci2exp(model.evtout)],[sci2exp(model.state)],[sci2exp(model.dstate)],[sci2exp(model.odstate)],[sci2exp(model.rpar)],[sci2exp(model.ipar)],[sci2exp(model.opar)],[sci2exp(model.nmode)],[sci2exp(model.nzcross)],[sci2exp(model.firing)],["y"],["n"]]; gr_i = []; this.x = standard_define([4,2],model,label,gr_i); + return new BasicBlock(this.x); } generic_block3.prototype.details = function generic_block3() { return this.x; @@ -12814,6 +13179,7 @@ function generic_block3() { } } needcompile=resume(needcompile) + return new BasicBlock(this.x); } } /* autogenerated from "macros/Misc/scifunc_block.sci" */ @@ -12845,6 +13211,7 @@ function scifunc_block() { exprs = list([[sci2exp(in1)],[sci2exp(out)],[sci2exp(clkin)],[sci2exp(clkout)],[strcat(sci2exp(x0))],[strcat(sci2exp(z0))],[strcat(sci2exp(rpar))],[sci2exp(auto)]],list("y1=sin(u1)"," "," ","y1=sin(u1)"," "," "," ")); gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } scifunc_block.prototype.details = function scifunc_block() { return this.x; @@ -12907,6 +13274,7 @@ function scifunc_block() { } } needcompile=resume(needcompile) + return new BasicBlock(this.x); } } /* autogenerated from "macros/Misc/scifunc_block_m.sci" */ @@ -12943,6 +13311,7 @@ function scifunc_block_m() { exprs = list([[sci2exp([in1,in1])],[sci2exp([out,out])],[sci2exp(clkin)],[sci2exp(clkout)],[strcat(sci2exp(x0))],[strcat(sci2exp(z0))],[strcat(sci2exp(rpar))],[sci2exp(auto)],[sci2exp(0)]],list("y1=sin(u1)"," "," ","y1=sin(u1)"," "," "," ")); gr_i = []; this.x = standard_define([4,2],model,exprs,gr_i); + return new BasicBlock(this.x); } scifunc_block_m.prototype.details = function scifunc_block_m() { return this.x; @@ -13002,6 +13371,7 @@ function scifunc_block_m() { } } needcompile=resume(needcompile) + return new BasicBlock(this.x); } } /* autogenerated from "macros/NonLinear/ABSBLK_f.sci" */ @@ -13015,6 +13385,7 @@ function ABSBLK_f() { model.dep_ut = [true,false]; gr_i = []; this.x = standard_define([2,2],model,[],gr_i); + return new BasicBlock(this.x); } ABSBLK_f.prototype.details = function ABSBLK_f() { return this.x; @@ -13023,6 +13394,7 @@ function ABSBLK_f() { } ABSBLK_f.prototype.set = function ABSBLK_f() { this.x = arg1; + return new BasicBlock(this.x); } } /* autogenerated from "macros/NonLinear/ABS_VALUE.sci" */ @@ -13040,6 +13412,7 @@ function ABS_VALUE() { exprs = [string([1])]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } ABS_VALUE.prototype.details = function ABS_VALUE() { return this.x; @@ -13070,6 +13443,7 @@ function ABS_VALUE() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/NonLinear/COSBLK_f.sci" */ @@ -13084,6 +13458,7 @@ function COSBLK_f() { model.dep_ut = [true,false]; gr_i = []; this.x = standard_define([2,2],model,[],gr_i); + return new BasicBlock(this.x); } COSBLK_f.prototype.details = function COSBLK_f() { return this.x; @@ -13092,6 +13467,7 @@ function COSBLK_f() { } COSBLK_f.prototype.set = function COSBLK_f() { this.x = arg1; + return new BasicBlock(this.x); } } /* autogenerated from "macros/NonLinear/DLRADAPT_f.sci" */ @@ -13117,6 +13493,7 @@ function DLRADAPT_f() { exprs = [[sci2exp(p)],[sci2exp(rn)],[sci2exp(rd,0)],[sci2exp(g)],[sci2exp(last_u)],[sci2exp(last_y)]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } DLRADAPT_f.prototype.details = function DLRADAPT_f() { return this.x; @@ -13151,6 +13528,7 @@ function DLRADAPT_f() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/NonLinear/EXPBLK_f.sci" */ @@ -13168,6 +13546,7 @@ function EXPBLK_f() { exprs = ["%e"]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } EXPBLK_f.prototype.details = function EXPBLK_f() { return this.x; @@ -13197,6 +13576,7 @@ function EXPBLK_f() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/NonLinear/EXPBLK_m.sci" */ @@ -13218,6 +13598,7 @@ function EXPBLK_m() { exprs = ["%e"]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } EXPBLK_m.prototype.details = function EXPBLK_m() { return this.x; @@ -13247,6 +13628,7 @@ function EXPBLK_m() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/NonLinear/FSV_f.sci" */ @@ -13262,6 +13644,7 @@ function FSV_f() { exprs = " "; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } FSV_f.prototype.details = function FSV_f() { return this.x; @@ -13270,6 +13653,7 @@ function FSV_f() { } FSV_f.prototype.set = function FSV_f() { this.x = arg1; + return new BasicBlock(this.x); } } /* autogenerated from "macros/NonLinear/INTRP2BLK_f.sci" */ @@ -13289,6 +13673,7 @@ function INTRP2BLK_f() { exprs = [[strcat(sci2exp(a))],[strcat(sci2exp(b))],[strcat(sci2exp(c,0))]]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } INTRP2BLK_f.prototype.details = function INTRP2BLK_f() { return this.x; @@ -13320,6 +13705,7 @@ function INTRP2BLK_f() { } } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/NonLinear/INTRPLBLK_f.sci" */ @@ -13337,6 +13723,7 @@ function INTRPLBLK_f() { exprs = [[strcat(sci2exp(a))],[strcat(sci2exp(b))]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } INTRPLBLK_f.prototype.details = function INTRPLBLK_f() { return this.x; @@ -13367,6 +13754,7 @@ function INTRPLBLK_f() { } } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/NonLinear/INVBLK.sci" */ @@ -13382,6 +13770,7 @@ function INVBLK() { exprs = " "; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } INVBLK.prototype.details = function INVBLK() { return this.x; @@ -13390,6 +13779,7 @@ function INVBLK() { } INVBLK.prototype.set = function INVBLK() { this.x = arg1; + return new BasicBlock(this.x); } } /* autogenerated from "macros/NonLinear/INVBLK_f.sci" */ @@ -13405,6 +13795,7 @@ function INVBLK_f() { exprs = " "; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } INVBLK_f.prototype.details = function INVBLK_f() { return this.x; @@ -13413,6 +13804,7 @@ function INVBLK_f() { } INVBLK_f.prototype.set = function INVBLK_f() { this.x = arg1; + return new BasicBlock(this.x); } } /* autogenerated from "macros/NonLinear/LOGBLK_f.sci" */ @@ -13430,6 +13822,7 @@ function LOGBLK_f() { exprs = "%e"; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } LOGBLK_f.prototype.details = function LOGBLK_f() { return this.x; @@ -13461,6 +13854,7 @@ function LOGBLK_f() { } } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/NonLinear/LOOKUP2D.sci" */ @@ -13484,6 +13878,7 @@ function LOOKUP2D() { exprs = list(strcat(sci2exp(xx)),strcat(sci2exp(yy)),strcat(sci2exp(zz)),sci2exp(Method),Graf); gr_i = []; this.x = standard_define([2.5,2],model,exprs,gr_i); + return new BasicBlock(this.x); } LOOKUP2D.prototype.details = function LOOKUP2D() { return this.x; @@ -13560,6 +13955,7 @@ function LOOKUP2D() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/NonLinear/LOOKUP_f.sci" */ @@ -13574,6 +13970,7 @@ function LOOKUP_f() { model.dep_ut = [true,false]; gr_i = []; this.x = standard_define([2,2],model,[],gr_i); + return new BasicBlock(this.x); } LOOKUP_f.prototype.details = function LOOKUP_f() { return this.x; @@ -13611,6 +14008,7 @@ function LOOKUP_f() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/NonLinear/MAXMIN.sci" */ @@ -13627,6 +14025,7 @@ function MAXMIN() { gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); this.x.graphics.style = "MAXMIN;displayedLabel=MAX"; + return new BasicBlock(this.x); } MAXMIN.prototype.details = function MAXMIN() { return this.x; @@ -13680,6 +14079,7 @@ function MAXMIN() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/NonLinear/MAX_f.sci" */ @@ -13696,6 +14096,7 @@ function MAX_f() { exprs = " "; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } MAX_f.prototype.details = function MAX_f() { return this.x; @@ -13704,6 +14105,7 @@ function MAX_f() { } MAX_f.prototype.set = function MAX_f() { this.x = arg1; + return new BasicBlock(this.x); } } /* autogenerated from "macros/NonLinear/MIN_f.sci" */ @@ -13720,6 +14122,7 @@ function MIN_f() { exprs = sci2exp(in1); gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } MIN_f.prototype.details = function MIN_f() { return this.x; @@ -13728,6 +14131,7 @@ function MIN_f() { } MIN_f.prototype.set = function MIN_f() { this.x = arg1; + return new BasicBlock(this.x); } } /* autogenerated from "macros/NonLinear/POWBLK_f.sci" */ @@ -13745,6 +14149,7 @@ function POWBLK_f() { exprs = string(a); gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } POWBLK_f.prototype.details = function POWBLK_f() { return this.x; @@ -13777,6 +14182,7 @@ function POWBLK_f() { this.x.model = model; break; } + return new BasicBlock(this.x); } } /* autogenerated from "macros/NonLinear/PRODUCT.sci" */ @@ -13793,6 +14199,7 @@ function PRODUCT() { exprs = sci2exp(sgn); gr_i = []; this.x = standard_define([2,3],model,exprs,gr_i); + return new BasicBlock(this.x); } PRODUCT.prototype.details = function PRODUCT() { return this.x; @@ -13843,6 +14250,7 @@ function PRODUCT() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/NonLinear/PROD_f.sci" */ @@ -13855,6 +14263,7 @@ function PROD_f() { model.blocktype = "c"; model.dep_ut = [true,false]; this.x = standard_define([1,1],model,[],[]); + return new BasicBlock(this.x); } PROD_f.prototype.details = function PROD_f() { return this.x; @@ -13863,6 +14272,7 @@ function PROD_f() { } PROD_f.prototype.set = function PROD_f() { this.x = arg1; + return new BasicBlock(this.x); } } /* autogenerated from "macros/NonLinear/QUANT_f.sci" */ @@ -13881,6 +14291,7 @@ function QUANT_f() { exprs = [[string(pas)],[string(meth)]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } QUANT_f.prototype.details = function QUANT_f() { return this.x; @@ -13919,6 +14330,7 @@ function QUANT_f() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/NonLinear/SATURATION.sci" */ @@ -13939,6 +14351,7 @@ function SATURATION() { exprs = [[string(maxp)],[string(minp)],[string(model.nmode)]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } SATURATION.prototype.details = function SATURATION() { return this.x; @@ -13973,6 +14386,7 @@ function SATURATION() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/NonLinear/SAT_f.sci" */ @@ -13993,6 +14407,7 @@ function SAT_f() { exprs = [[string(minp)],[string(maxp)],[string(slope)]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } SAT_f.prototype.details = function SAT_f() { return this.x; @@ -14023,6 +14438,7 @@ function SAT_f() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/NonLinear/SIGNUM.sci" */ @@ -14040,6 +14456,7 @@ function SIGNUM() { exprs = [string([1])]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } SIGNUM.prototype.details = function SIGNUM() { return this.x; @@ -14070,6 +14487,7 @@ function SIGNUM() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/NonLinear/SINBLK_f.sci" */ @@ -14084,6 +14502,7 @@ function SINBLK_f() { exprs = " "; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } SINBLK_f.prototype.details = function SINBLK_f() { return this.x; @@ -14092,6 +14511,7 @@ function SINBLK_f() { } SINBLK_f.prototype.set = function SINBLK_f() { this.x = arg1; + return new BasicBlock(this.x); } } /* autogenerated from "macros/NonLinear/TANBLK_f.sci" */ @@ -14107,6 +14527,7 @@ function TANBLK_f() { exprs = sci2exp(in1); gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } TANBLK_f.prototype.details = function TANBLK_f() { return this.x; @@ -14116,6 +14537,7 @@ function TANBLK_f() { TANBLK_f.prototype.set = function TANBLK_f() { this.x = arg1; this.x.model.firing = []; + return new BasicBlock(this.x); } } /* autogenerated from "macros/NonLinear/TrigFun.sci" */ @@ -14130,6 +14552,7 @@ function TrigFun() { exprs = "sin"; gr_i = []; this.x = standard_define([4,2],model,exprs,gr_i); + return new BasicBlock(this.x); } TrigFun.prototype.details = function TrigFun() { return this.x; @@ -14158,6 +14581,7 @@ function TrigFun() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/PDE/PDE.sci" */ @@ -14174,6 +14598,7 @@ function PDE() { label = list(params_pde,[],""); gr_i = []; this.x = standard_define([3,3],model,label,gr_i); + return new BasicBlock(this.x); } PDE.prototype.details = function PDE() { return this.x; @@ -14291,6 +14716,7 @@ function PDE() { this.x.model = model; break; } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Sinks/AFFICH_m.sci" */ @@ -14316,6 +14742,7 @@ function AFFICH_m() { exprs = [[sci2exp([model.in1,model.in2])],[string(font)],[string(fontsize)],[string(colr)],[string(nt)],[string(nd)],[string(0)]]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } AFFICH_m.prototype.details = function AFFICH_m() { return this.x; @@ -14372,6 +14799,7 @@ function AFFICH_m() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Sinks/BARXY.sci" */ @@ -14395,6 +14823,7 @@ function BARXY() { this.x.graphics.in_implicit = ["E","E"]; this.x.graphics.out_implicit = []; this.x.graphics.exprs = [["-15"],["15"],["-15"],["15"],["1"]]; + return new BasicBlock(this.x); } BARXY.prototype.details = function BARXY() { return this.x; @@ -14435,6 +14864,7 @@ function BARXY() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Sinks/CANIMXY.sci" */ @@ -14465,6 +14895,7 @@ function CANIMXY() { exprs = [[string(nbr_curves)],[string(clrs)],[string(siz)],[string(win)],["[]"],["[]"],[string(xmin)],[string(xmax)],[string(ymin)],[string(ymax)],[string(N)]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } CANIMXY.prototype.details = function CANIMXY() { return this.x; @@ -14536,6 +14967,7 @@ function CANIMXY() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Sinks/CANIMXY3D.sci" */ @@ -14566,6 +14998,7 @@ function CANIMXY3D() { exprs = [[string(nbr_curves)],[strcat(string(clrs)," ")],[strcat(string(siz)," ")],[string(win)],["[]"],["[]"],[strcat(string(vec_x)," ")],[strcat(string(vec_y)," ")],[strcat(string(vec_z)," ")],[strcat(string(param3ds)," ")],[string(N)]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } CANIMXY3D.prototype.details = function CANIMXY3D() { return this.x; @@ -14654,6 +15087,7 @@ function CANIMXY3D() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Sinks/CEVENTSCOPE.sci" */ @@ -14675,6 +15109,7 @@ function CEVENTSCOPE() { exprs = [[sci2exp(nclock)],[strcat(sci2exp(clrs[nclock-1])," ")],[string(win)],[sci2exp([])],[sci2exp(wdim)],[string(per)]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } CEVENTSCOPE.prototype.details = function CEVENTSCOPE() { return this.x; @@ -14741,6 +15176,7 @@ function CEVENTSCOPE() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Sinks/CFSCOPE.sci" */ @@ -14764,6 +15200,7 @@ function CFSCOPE() { exprs = [[strcat(string(clrs)," ")],[string(win)],[sci2exp([])],[sci2exp(wdim)],[string(ymin)],[string(ymax)],[string(per)],[string(N)],[string([1])]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } CFSCOPE.prototype.details = function CFSCOPE() { return this.x; @@ -14837,6 +15274,7 @@ function CFSCOPE() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Sinks/CLKOUTV_f.sci" */ @@ -14852,6 +15290,7 @@ function CLKOUTV_f() { model.dep_ut = [false,false]; exprs = string(prt); this.x = standard_define([1,1],model,exprs," "); + return new BasicBlock(this.x); } CLKOUTV_f.prototype.details = function CLKOUTV_f() { return this.x; @@ -14880,6 +15319,7 @@ function CLKOUTV_f() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Sinks/CLKOUT_f.sci" */ @@ -14895,6 +15335,7 @@ function CLKOUT_f() { model.dep_ut = [false,false]; exprs = string(prt); this.x = standard_define([1,1],model,exprs," "); + return new BasicBlock(this.x); } CLKOUT_f.prototype.details = function CLKOUT_f() { return this.x; @@ -14925,6 +15366,7 @@ function CLKOUT_f() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Sinks/CMAT3D.sci" */ @@ -14951,6 +15393,7 @@ function CMAT3D() { exprs = [[strcat(string(this.x)," ")],[strcat(string(y)," ")],[string("jetcolormap(25)")],[string(cmin)],[string(cmax)]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } CMAT3D.prototype.details = function CMAT3D() { return this.x; @@ -14992,6 +15435,7 @@ function CMAT3D() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Sinks/CMATVIEW.sci" */ @@ -15016,6 +15460,7 @@ function CMATVIEW() { exprs = [[string("jetcolormap(25)")],[string(cmin)],[string(cmax)]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } CMATVIEW.prototype.details = function CMATVIEW() { return this.x; @@ -15055,6 +15500,7 @@ function CMATVIEW() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Sinks/CMSCOPE.sci" */ @@ -15084,6 +15530,7 @@ function CMSCOPE() { exprs = [[strcat(string(in1)," ")],[strcat(string(clrs)," ")],[string(win)],[sci2exp([])],[sci2exp([])],[strcat(string(ymin)," ")],[strcat(string(ymax)," ")],[strcat(string(per)," ")],[string(N)],[string(0)],[emptystr()]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } CMSCOPE.prototype.details = function CMSCOPE() { return this.x; @@ -15182,6 +15629,7 @@ function CMSCOPE() { } } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Sinks/CSCOPE.sci" */ @@ -15207,6 +15655,7 @@ function CSCOPE() { exprs = [[strcat(string(clrs)," ")],[string(win)],[sci2exp([])],[sci2exp(wdim)],[string(ymin)],[string(ymax)],[string(per)],[string(N)],[transpose(string(0))],[emptystr()]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } CSCOPE.prototype.details = function CSCOPE() { return this.x; @@ -15278,6 +15727,7 @@ function CSCOPE() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Sinks/CSCOPXY.sci" */ @@ -15307,6 +15757,7 @@ function CSCOPXY() { exprs = [[string(nbr_curves)],[sci2exp(clrs)],[sci2exp(siz)],[string(win)],[sci2exp([])],[sci2exp(wdim)],[string(xmin)],[string(xmax)],[string(ymin)],[string(ymax)],[string(N)]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } CSCOPXY.prototype.details = function CSCOPXY() { return this.x; @@ -15378,6 +15829,7 @@ function CSCOPXY() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Sinks/CSCOPXY3D.sci" */ @@ -15407,6 +15859,7 @@ function CSCOPXY3D() { exprs = [[string(nbr_curves)],[strcat(string(clrs)," ")],[strcat(string(siz)," ")],[string(win)],[sci2exp([])],[sci2exp(wdim)],[strcat(string(vec_x)," ")],[strcat(string(vec_y)," ")],[strcat(string(vec_z)," ")],[strcat(string(param3ds)," ")],[string(N)]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } CSCOPXY3D.prototype.details = function CSCOPXY3D() { return this.x; @@ -15491,6 +15944,7 @@ function CSCOPXY3D() { message(mess); } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Sinks/OUTIMPL_f.sci" */ @@ -15512,6 +15966,7 @@ function OUTIMPL_f() { gr_i = []; this.x = standard_define([1,1],model,exprs,gr_i); this.x.graphics.in_implicit = ["I"]; + return new BasicBlock(this.x); } OUTIMPL_f.prototype.details = function OUTIMPL_f() { return this.x; @@ -15546,6 +16001,7 @@ function OUTIMPL_f() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Sinks/OUT_f.sci" */ @@ -15564,6 +16020,7 @@ function OUT_f() { exprs = string(prt); gr_i = []; this.x = standard_define([1,1],model,exprs,gr_i); + return new BasicBlock(this.x); } OUT_f.prototype.details = function OUT_f() { return this.x; @@ -15594,6 +16051,7 @@ function OUT_f() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Sinks/TOWS_c.sci" */ @@ -15619,6 +16077,7 @@ function TOWS_c() { gr_i = []; exprs = [[string(nz)],[string(varnam)],[string(herit)]]; this.x = standard_define([4,2],model,exprs,gr_i); + return new BasicBlock(this.x); } TOWS_c.prototype.details = function TOWS_c() { return this.x; @@ -15660,6 +16119,7 @@ function TOWS_c() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Sinks/TRASH_f.sci" */ @@ -15675,6 +16135,7 @@ function TRASH_f() { exprs = " "; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } TRASH_f.prototype.details = function TRASH_f() { return this.x; @@ -15683,6 +16144,7 @@ function TRASH_f() { } TRASH_f.prototype.set = function TRASH_f() { this.x = arg1; + return new BasicBlock(this.x); } } /* autogenerated from "macros/Sinks/WFILE_f.sci" */ @@ -15705,6 +16167,7 @@ function WFILE_f() { exprs = [[sci2exp(in1)],[fname],[frmt],[string(N)]]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } WFILE_f.prototype.details = function WFILE_f() { return this.x; @@ -15774,6 +16237,7 @@ function WFILE_f() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Sinks/WRITEAU_f.sci" */ @@ -15797,6 +16261,7 @@ function WRITEAU_f() { exprs = [string(N),string(swap)]; gr_i = []; this.x = standard_define([4,2],model,exprs,gr_i); + return new BasicBlock(this.x); } WRITEAU_f.prototype.details = function WRITEAU_f() { return this.x; @@ -15844,6 +16309,7 @@ function WRITEAU_f() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Sinks/WRITEC_f.sci" */ @@ -15867,6 +16333,7 @@ function WRITEC_f() { exprs = [[sci2exp(in1)],[fname],[frmt],[string(N),string(swap)]]; gr_i = []; this.x = standard_define([4,2],model,exprs,gr_i); + return new BasicBlock(this.x); } WRITEC_f.prototype.details = function WRITEC_f() { return this.x; @@ -15935,6 +16402,7 @@ function WRITEC_f() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Sources/CLKINV_f.sci" */ @@ -15951,6 +16419,7 @@ function CLKINV_f() { exprs = string(prt); gr_i = []; this.x = standard_define([1,1],model,exprs,gr_i); + return new BasicBlock(this.x); } CLKINV_f.prototype.details = function CLKINV_f() { return this.x; @@ -15981,6 +16450,7 @@ function CLKINV_f() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Sources/CLKIN_f.sci" */ @@ -15996,6 +16466,7 @@ function CLKIN_f() { model.dep_ut = [false,false]; exprs = string(prt); this.x = standard_define([1,1],model,exprs," "); + return new BasicBlock(this.x); } CLKIN_f.prototype.details = function CLKIN_f() { return this.x; @@ -16026,6 +16497,7 @@ function CLKIN_f() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Sources/CLOCK_c.sci" */ @@ -16070,6 +16542,7 @@ function CLOCK_c() { this.x.model.firing = false; this.x.model.dep_ut = [false,false]; this.x.model.rpar = diagram; + return new BasicBlock(this.x); } CLOCK_c.prototype.details = function CLOCK_c() { return this.x; @@ -16120,6 +16593,7 @@ function CLOCK_c() { this.x = arg1; y = needcompile; typ = newpar; + return new BasicBlock(this.x); } } /* autogenerated from "macros/Sources/CLOCK_f.sci" */ @@ -16164,6 +16638,7 @@ function CLOCK_f() { this.x.model.firing = false; this.x.model.dep_ut = [false,false]; this.x.model.rpar = diagram; + return new BasicBlock(this.x); } CLOCK_f.prototype.details = function CLOCK_f() { return this.x; @@ -16214,6 +16689,7 @@ function CLOCK_f() { this.x = arg1; y = needcompile; typ = newpar; + return new BasicBlock(this.x); } } /* autogenerated from "macros/Sources/CONST.sci" */ @@ -16230,6 +16706,7 @@ function CONST() { exprs = strcat(sci2exp(C)); gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } CONST.prototype.details = function CONST() { return this.x; @@ -16261,6 +16738,7 @@ function CONST() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Sources/CONST_f.sci" */ @@ -16277,6 +16755,7 @@ function CONST_f() { exprs = strcat(sci2exp(C)); gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } CONST_f.prototype.details = function CONST_f() { return this.x; @@ -16305,6 +16784,7 @@ function CONST_f() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Sources/CONST_m.sci" */ @@ -16324,6 +16804,7 @@ function CONST_m() { exprs = sci2exp(C); gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } CONST_m.prototype.details = function CONST_m() { return this.x; @@ -16378,6 +16859,7 @@ function CONST_m() { } } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Sources/CURV_f.sci" */ @@ -16399,6 +16881,7 @@ function CURV_f() { model.dep_ut = [false,true]; gr_i = []; this.x = standard_define([2,2],model,[],gr_i); + return new BasicBlock(this.x); } CURV_f.prototype.details = function CURV_f() { return this.x; @@ -16442,6 +16925,7 @@ function CURV_f() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Sources/Counter.sci" */ @@ -16462,6 +16946,7 @@ function Counter() { exprs = [[string(minim)],[string(maxim)],[string(rule)]]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } Counter.prototype.details = function Counter() { return this.x; @@ -16493,6 +16978,7 @@ function Counter() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Sources/FROMWSB.sci" */ @@ -16506,6 +16992,7 @@ function FROMWSB() { model = scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()); gr_i = []; this.x = standard_define([5,2],model,[],gr_i); + return new BasicBlock(this.x); } FROMWSB.prototype.details = function FROMWSB() { return this.x; @@ -16580,6 +17067,7 @@ function FROMWSB() { } this.x = arg1; typ = newpar; + return new BasicBlock(this.x); } } /* autogenerated from "macros/Sources/FROMWS_c.sci" */ @@ -16603,6 +17091,7 @@ function FROMWS_c() { gr_i = []; exprs = [[string(varnam)],[string(Method)],[string(ZC)],[string(OutEnd)]]; this.x = standard_define([3.5,2],model,exprs,gr_i); + return new BasicBlock(this.x); } FROMWS_c.prototype.details = function FROMWS_c() { return this.x; @@ -16648,6 +17137,7 @@ function FROMWS_c() { } } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Sources/GENSIN_f.sci" */ @@ -16666,6 +17156,7 @@ function GENSIN_f() { exprs = [[string(rpar[1-1])],[string(rpar[2-1])],[string(rpar[3-1])]]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } GENSIN_f.prototype.details = function GENSIN_f() { return this.x; @@ -16697,6 +17188,7 @@ function GENSIN_f() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Sources/GENSQR_f.sci" */ @@ -16715,6 +17207,7 @@ function GENSQR_f() { exprs = string(Amplitude); gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } GENSQR_f.prototype.details = function GENSQR_f() { return this.x; @@ -16742,6 +17235,7 @@ function GENSQR_f() { this.x.model = model; break; } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Sources/GEN_SQR.sci" */ @@ -16794,6 +17288,7 @@ function GEN_SQR() { exprs = [sci2exp(Amin),sci2exp(Amax),sci2exp(rule),sci2exp(F)]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } GEN_SQR.prototype.details = function GEN_SQR() { return this.x; @@ -16834,6 +17329,7 @@ function GEN_SQR() { ok = false; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Sources/Ground_g.sci" */ @@ -16854,6 +17350,7 @@ function Ground_g() { exprs = []; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } Ground_g.prototype.details = function Ground_g() { return this.x; @@ -16862,6 +17359,7 @@ function Ground_g() { } Ground_g.prototype.set = function Ground_g() { this.x = arg1; + return new BasicBlock(this.x); } } /* autogenerated from "macros/Sources/INIMPL_f.sci" */ @@ -16883,6 +17381,7 @@ function INIMPL_f() { gr_i = []; this.x = standard_define([1,1],model,exprs,gr_i); this.x.graphics.out_implicit = ["I"]; + return new BasicBlock(this.x); } INIMPL_f.prototype.details = function INIMPL_f() { return this.x; @@ -16917,6 +17416,7 @@ function INIMPL_f() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Sources/IN_f.sci" */ @@ -16934,6 +17434,7 @@ function IN_f() { exprs = sci2exp(prt); gr_i = []; this.x = standard_define([1,1],model,exprs,gr_i); + return new BasicBlock(this.x); } IN_f.prototype.details = function IN_f() { return this.x; @@ -16979,6 +17480,7 @@ function IN_f() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Sources/Modulo_Count.sci" */ @@ -16997,6 +17499,7 @@ function Modulo_Count() { exprs = [[string(ini_c)],[string(base)]]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } Modulo_Count.prototype.details = function Modulo_Count() { return this.x; @@ -17028,6 +17531,7 @@ function Modulo_Count() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Sources/PULSE_SC.sci" */ @@ -17075,6 +17579,7 @@ function PULSE_SC() { exprs = [sci2exp(E),sci2exp(W),sci2exp(F),sci2exp(A)]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } PULSE_SC.prototype.details = function PULSE_SC() { return this.x; @@ -17117,6 +17622,7 @@ function PULSE_SC() { ok = false; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Sources/RAMP.sci" */ @@ -17138,6 +17644,7 @@ function RAMP() { exprs = [string(rpar)]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } RAMP.prototype.details = function RAMP() { return this.x; @@ -17164,6 +17671,7 @@ function RAMP() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Sources/RAND_f.sci" */ @@ -17186,6 +17694,7 @@ function RAND_f() { exprs = [[string(flag)],[sci2exp(a.slice())],[sci2exp(b.slice())],[string(model.dstate[1-1])]]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } RAND_f.prototype.details = function RAND_f() { return this.x; @@ -17222,6 +17731,7 @@ function RAND_f() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Sources/RAND_m.sci" */ @@ -17253,6 +17763,7 @@ function RAND_m() { exprs = [[sci2exp(1)],[string(flag)],[sci2exp([a])],[sci2exp([b])],[sci2exp([model.dstate[1-1],int(rand()*(10^7-1))])]]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } RAND_m.prototype.details = function RAND_m() { return this.x; @@ -17303,6 +17814,7 @@ function RAND_m() { } } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Sources/READAU_f.sci" */ @@ -17330,6 +17842,7 @@ function READAU_f() { exprs = [[fname],[string(N)],[string(swap)]]; gr_i = []; this.x = standard_define([5,2],model,exprs,gr_i); + return new BasicBlock(this.x); } READAU_f.prototype.details = function READAU_f() { return this.x; @@ -17387,6 +17900,7 @@ function READAU_f() { } } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Sources/READC_f.sci" */ @@ -17418,6 +17932,7 @@ function READC_f() { exprs = [["[]"],[sci2exp(outmask)],[fname],[frmt],[string(M)],[string(N)],[string(offset)],[string(swap)]]; gr_i = []; this.x = standard_define([4,2],model,exprs,gr_i); + return new BasicBlock(this.x); } READC_f.prototype.details = function READC_f() { return this.x; @@ -17505,6 +18020,7 @@ function READC_f() { } } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Sources/RFILE_f.sci" */ @@ -17532,6 +18048,7 @@ function RFILE_f() { exprs = [[sci2exp([])],[sci2exp(outmask)],[fname],[frmt],[string(N)],[sci2exp(out)]]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } RFILE_f.prototype.details = function RFILE_f() { return this.x; @@ -17612,6 +18129,7 @@ function RFILE_f() { } } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Sources/SAWTOOTH_f.sci" */ @@ -17627,6 +18145,7 @@ function SAWTOOTH_f() { exprs = " "; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } SAWTOOTH_f.prototype.details = function SAWTOOTH_f() { return this.x; @@ -17635,6 +18154,7 @@ function SAWTOOTH_f() { } SAWTOOTH_f.prototype.set = function SAWTOOTH_f() { this.x = arg1; + return new BasicBlock(this.x); } } /* autogenerated from "macros/Sources/STEP.sci" */ @@ -17655,6 +18175,7 @@ function STEP() { exprs = [[string(1)],[string(rpar)]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } STEP.prototype.details = function STEP() { return this.x; @@ -17702,6 +18223,7 @@ function STEP() { break; } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Sources/STEP_FUNCTION.sci" */ @@ -17755,6 +18277,7 @@ function STEP_FUNCTION() { model.rpar = scs_m_1; gr_i = []; this.x = standard_define([2,2],model,[],gr_i); + return new BasicBlock(this.x); } STEP_FUNCTION.prototype.details = function STEP_FUNCTION() { return this.x; @@ -17825,6 +18348,7 @@ function STEP_FUNCTION() { this.x = arg1; y = needcompile; typ = newpar; + return new BasicBlock(this.x); } } /* autogenerated from "macros/Sources/SampleCLK.sci" */ @@ -17839,6 +18363,7 @@ function SampleCLK() { model.dep_ut = [false,false]; exprs = [[sci2exp(1)],[sci2exp(0)]]; this.x = standard_define([2,2],model,exprs," "); + return new BasicBlock(this.x); } SampleCLK.prototype.details = function SampleCLK() { return this.x; @@ -17878,6 +18403,7 @@ function SampleCLK() { } } needcompile=resume(needcompile) + return new BasicBlock(this.x); } } /* autogenerated from "macros/Sources/Sigbuilder.sci" */ @@ -17895,6 +18421,7 @@ function Sigbuilder() { model = scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=1,evtin=[],evtout=1,state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()); gr_i = []; this.x = standard_define([3,2],model,[],gr_i); + return new BasicBlock(this.x); } Sigbuilder.prototype.details = function Sigbuilder() { return this.x; @@ -17970,6 +18497,7 @@ function Sigbuilder() { } this.x = arg1; typ = newpar; + return new BasicBlock(this.x); } } /* autogenerated from "macros/Sources/TIME_f.sci" */ @@ -17982,6 +18510,7 @@ function TIME_f() { model.dep_ut = [false,true]; gr_i = []; this.x = standard_define([2,2],model,[],gr_i); + return new BasicBlock(this.x); } TIME_f.prototype.details = function TIME_f() { return this.x; @@ -17990,6 +18519,7 @@ function TIME_f() { } TIME_f.prototype.set = function TIME_f() { this.x = arg1; + return new BasicBlock(this.x); } } /* autogenerated from "macros/Sources/TKSCALE.sci" */ @@ -18008,6 +18538,7 @@ function TKSCALE() { exprs = [[sci2exp(a)],[sci2exp(b)],[sci2exp(f)]]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } TKSCALE.prototype.details = function TKSCALE() { return this.x; @@ -18026,6 +18557,7 @@ function TKSCALE() { this.x.graphics = graphics; this.x.model = model; } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Threshold/GENERAL_f.sci" */ @@ -18046,6 +18578,7 @@ function GENERAL_f() { exprs = [[strcat(sci2exp(in1))],[strcat(sci2exp(out))]]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } GENERAL_f.prototype.details = function GENERAL_f() { return this.x; @@ -18086,6 +18619,7 @@ function GENERAL_f() { } } } + return new BasicBlock(this.x); } } /* autogenerated from "macros/Threshold/NEGTOPOS_f.sci" */ @@ -18102,6 +18636,7 @@ function NEGTOPOS_f() { model.dep_ut = [true,false]; gr_i = []; this.x = standard_define([2,2],model,[],gr_i); + return new BasicBlock(this.x); } NEGTOPOS_f.prototype.details = function NEGTOPOS_f() { return this.x; @@ -18111,6 +18646,7 @@ function NEGTOPOS_f() { NEGTOPOS_f.prototype.set = function NEGTOPOS_f() { this.x = arg1; this.x.model.firing = -1; + return new BasicBlock(this.x); } } /* autogenerated from "macros/Threshold/POSTONEG_f.sci" */ @@ -18128,6 +18664,7 @@ function POSTONEG_f() { model.firing = [-1]; gr_i = []; this.x = standard_define([2,2],model,[],gr_i); + return new BasicBlock(this.x); } POSTONEG_f.prototype.details = function POSTONEG_f() { return this.x; @@ -18137,6 +18674,7 @@ function POSTONEG_f() { POSTONEG_f.prototype.set = function POSTONEG_f() { this.x = arg1; this.x.model.firing = [-1]; + return new BasicBlock(this.x); } } /* autogenerated from "macros/Threshold/ZCROSS_f.sci" */ @@ -18156,6 +18694,7 @@ function ZCROSS_f() { exprs = strcat(sci2exp(in1)); gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } ZCROSS_f.prototype.details = function ZCROSS_f() { return this.x; @@ -18190,6 +18729,7 @@ function ZCROSS_f() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Branching/CLKFROM.js b/js/Branching/CLKFROM.js index 168cf14d..ec4053c5 100644 --- a/js/Branching/CLKFROM.js +++ b/js/Branching/CLKFROM.js @@ -11,6 +11,7 @@ function CLKFROM() { exprs = "A"; this.x = standard_define([2,1],model,exprs," "); this.x.graphics.id = "From"; + return new BasicBlock(this.x); } CLKFROM.prototype.details = function CLKFROM() { return this.x; @@ -40,5 +41,6 @@ function CLKFROM() { break; } needcompile=resume(needcompile) + return new BasicBlock(this.x); } } diff --git a/js/Branching/CLKGOTO.js b/js/Branching/CLKGOTO.js index 79bce050..6a058dff 100644 --- a/js/Branching/CLKGOTO.js +++ b/js/Branching/CLKGOTO.js @@ -12,6 +12,7 @@ function CLKGOTO() { exprs = [["A"],[sci2exp(1)]]; this.x = standard_define([2,1],model,exprs," "); this.x.graphics.id = "Goto"; + return new BasicBlock(this.x); } CLKGOTO.prototype.details = function CLKGOTO() { return this.x; @@ -49,5 +50,6 @@ function CLKGOTO() { } } needcompile=resume(needcompile) + return new BasicBlock(this.x); } } diff --git a/js/Branching/CLKGotoTagVisibility.js b/js/Branching/CLKGotoTagVisibility.js index d9fcb9de..dbcb0514 100644 --- a/js/Branching/CLKGotoTagVisibility.js +++ b/js/Branching/CLKGotoTagVisibility.js @@ -17,6 +17,7 @@ function CLKGotoTagVisibility() { exprs = "A"; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } CLKGotoTagVisibility.prototype.details = function CLKGotoTagVisibility() { return this.x; @@ -46,5 +47,6 @@ function CLKGotoTagVisibility() { } } needcompile=resume(needcompile) + return new BasicBlock(this.x); } } diff --git a/js/Branching/DEMUX.js b/js/Branching/DEMUX.js index 1245ea5b..6f9fc546 100644 --- a/js/Branching/DEMUX.js +++ b/js/Branching/DEMUX.js @@ -13,6 +13,7 @@ function DEMUX() { exprs = string(out); gr_i = []; this.x = standard_define([.5,2],model,exprs,gr_i); + return new BasicBlock(this.x); } DEMUX.prototype.details = function DEMUX() { return this.x; @@ -60,5 +61,6 @@ function DEMUX() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Branching/DEMUX_f.js b/js/Branching/DEMUX_f.js index 77c36dfd..3092c9ae 100644 --- a/js/Branching/DEMUX_f.js +++ b/js/Branching/DEMUX_f.js @@ -13,6 +13,7 @@ function DEMUX_f() { exprs = string(out); gr_i = []; this.x = standard_define([.5,2],model,exprs,gr_i); + return new BasicBlock(this.x); } DEMUX_f.prototype.details = function DEMUX_f() { return this.x; @@ -60,5 +61,6 @@ function DEMUX_f() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Branching/ESELECT_f.js b/js/Branching/ESELECT_f.js index ccfb0fe2..09fc13c5 100644 --- a/js/Branching/ESELECT_f.js +++ b/js/Branching/ESELECT_f.js @@ -17,6 +17,7 @@ function ESELECT_f() { gr_i = []; exprs = [[string(out)],[string(1)],[string(model.nmode)]]; this.x = standard_define([4,2],model,exprs,gr_i); + return new BasicBlock(this.x); } ESELECT_f.prototype.details = function ESELECT_f() { return this.x; @@ -64,5 +65,6 @@ function ESELECT_f() { } } } + return new BasicBlock(this.x); } } diff --git a/js/Branching/EXTRACTOR.js b/js/Branching/EXTRACTOR.js index ed4a336f..7df96459 100644 --- a/js/Branching/EXTRACTOR.js +++ b/js/Branching/EXTRACTOR.js @@ -12,6 +12,7 @@ function EXTRACTOR() { exprs = [sci2exp(ind)]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } EXTRACTOR.prototype.details = function EXTRACTOR() { return this.x; @@ -39,5 +40,6 @@ function EXTRACTOR() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Branching/FROM.js b/js/Branching/FROM.js index 1f582691..716fc793 100644 --- a/js/Branching/FROM.js +++ b/js/Branching/FROM.js @@ -17,6 +17,7 @@ function FROM() { gr_i = []; this.x = standard_define([2,1],model,exprs,gr_i); this.x.graphics.id = "From"; + return new BasicBlock(this.x); } FROM.prototype.details = function FROM() { return this.x; @@ -46,5 +47,6 @@ function FROM() { } } needcompile=resume(needcompile) + return new BasicBlock(this.x); } } diff --git a/js/Branching/FROMMO.js b/js/Branching/FROMMO.js index ac7ed5aa..bbf770a3 100644 --- a/js/Branching/FROMMO.js +++ b/js/Branching/FROMMO.js @@ -20,6 +20,7 @@ function FROMMO() { gr_i = []; this.x = standard_define([2,1],model,exprs,gr_i); this.x.graphics.out_implicit = ["I"]; + return new BasicBlock(this.x); } FROMMO.prototype.details = function FROMMO() { return this.x; @@ -49,5 +50,6 @@ function FROMMO() { } } needcompile=resume(needcompile) + return new BasicBlock(this.x); } } diff --git a/js/Branching/GOTO.js b/js/Branching/GOTO.js index c7355935..7c2de99e 100644 --- a/js/Branching/GOTO.js +++ b/js/Branching/GOTO.js @@ -17,6 +17,7 @@ function GOTO() { gr_i = []; this.x = standard_define([2,1],model,exprs,gr_i); this.x.graphics.id = "Goto"; + return new BasicBlock(this.x); } GOTO.prototype.details = function GOTO() { return this.x; @@ -53,5 +54,6 @@ function GOTO() { } } needcompile=resume(needcompile) + return new BasicBlock(this.x); } } diff --git a/js/Branching/GOTOMO.js b/js/Branching/GOTOMO.js index 1ed448ab..76e1d633 100644 --- a/js/Branching/GOTOMO.js +++ b/js/Branching/GOTOMO.js @@ -20,6 +20,7 @@ function GOTOMO() { gr_i = []; this.x = standard_define([2,1],model,exprs,gr_i); this.x.graphics.in_implicit = ["I"]; + return new BasicBlock(this.x); } GOTOMO.prototype.details = function GOTOMO() { return this.x; @@ -56,5 +57,6 @@ function GOTOMO() { } } needcompile=resume(needcompile) + return new BasicBlock(this.x); } } diff --git a/js/Branching/GotoTagVisibility.js b/js/Branching/GotoTagVisibility.js index 7553f37f..44a3386a 100644 --- a/js/Branching/GotoTagVisibility.js +++ b/js/Branching/GotoTagVisibility.js @@ -17,6 +17,7 @@ function GotoTagVisibility() { exprs = "A"; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } GotoTagVisibility.prototype.details = function GotoTagVisibility() { return this.x; @@ -46,5 +47,6 @@ function GotoTagVisibility() { } } needcompile=resume(needcompile) + return new BasicBlock(this.x); } } diff --git a/js/Branching/GotoTagVisibilityMO.js b/js/Branching/GotoTagVisibilityMO.js index 03c26ad6..51cacc0c 100644 --- a/js/Branching/GotoTagVisibilityMO.js +++ b/js/Branching/GotoTagVisibilityMO.js @@ -17,6 +17,7 @@ function GotoTagVisibilityMO() { exprs = "A"; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } GotoTagVisibilityMO.prototype.details = function GotoTagVisibilityMO() { return this.x; @@ -46,5 +47,6 @@ function GotoTagVisibilityMO() { } } needcompile=resume(needcompile) + return new BasicBlock(this.x); } } diff --git a/js/Branching/ISELECT_f.js b/js/Branching/ISELECT_f.js index 0a1789d5..3352c1d5 100644 --- a/js/Branching/ISELECT_f.js +++ b/js/Branching/ISELECT_f.js @@ -15,6 +15,7 @@ function ISELECT_f() { exprs = [[string(nout)],[string(z0+1)]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } ISELECT_f.prototype.details = function ISELECT_f() { return this.x; @@ -44,5 +45,6 @@ function ISELECT_f() { } } } + return new BasicBlock(this.x); } } diff --git a/js/Branching/ISELECT_m.js b/js/Branching/ISELECT_m.js index 20e063a5..2d9555f0 100644 --- a/js/Branching/ISELECT_m.js +++ b/js/Branching/ISELECT_m.js @@ -23,6 +23,7 @@ function ISELECT_m() { exprs = [[sci2exp(1)],[sci2exp(nout)],[sci2exp(z0)]]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } ISELECT_m.prototype.details = function ISELECT_m() { return this.x; @@ -61,5 +62,6 @@ function ISELECT_m() { } } } + return new BasicBlock(this.x); } } diff --git a/js/Branching/MUX.js b/js/Branching/MUX.js index c1ac2f32..c0cdd611 100644 --- a/js/Branching/MUX.js +++ b/js/Branching/MUX.js @@ -12,6 +12,7 @@ function MUX() { exprs = string(in1); gr_i = []; this.x = standard_define([.5,2],model,exprs,gr_i); + return new BasicBlock(this.x); } MUX.prototype.details = function MUX() { return this.x; @@ -59,5 +60,6 @@ function MUX() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Branching/MUX_f.js b/js/Branching/MUX_f.js index 13cf8462..66384c50 100644 --- a/js/Branching/MUX_f.js +++ b/js/Branching/MUX_f.js @@ -12,6 +12,7 @@ function MUX_f() { exprs = string(in1); gr_i = []; this.x = standard_define([0.5,2],model,exprs,gr_i); + return new BasicBlock(this.x); } MUX_f.prototype.details = function MUX_f() { return this.x; @@ -59,5 +60,6 @@ function MUX_f() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Branching/M_SWITCH.js b/js/Branching/M_SWITCH.js index 80d0d0ca..827d71cc 100644 --- a/js/Branching/M_SWITCH.js +++ b/js/Branching/M_SWITCH.js @@ -14,6 +14,7 @@ function M_SWITCH() { exprs = [[string(nin)],[string(ipar)]]; gr_i = []; this.x = standard_define([2.5,2],model,exprs,gr_i); + return new BasicBlock(this.x); } M_SWITCH.prototype.details = function M_SWITCH() { return this.x; @@ -60,5 +61,6 @@ function M_SWITCH() { } } } + return new BasicBlock(this.x); } } diff --git a/js/Branching/NRMSOM_f.js b/js/Branching/NRMSOM_f.js index 726320a9..a00aab56 100644 --- a/js/Branching/NRMSOM_f.js +++ b/js/Branching/NRMSOM_f.js @@ -12,6 +12,7 @@ function NRMSOM_f() { exprs = [string(nin)]; gr_i = []; this.x = standard_define([.2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } NRMSOM_f.prototype.details = function NRMSOM_f() { return this.x; @@ -36,5 +37,6 @@ function NRMSOM_f() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Branching/RELAY_f.js b/js/Branching/RELAY_f.js index 71b2d9e7..91977b51 100644 --- a/js/Branching/RELAY_f.js +++ b/js/Branching/RELAY_f.js @@ -16,6 +16,7 @@ function RELAY_f() { exprs = [[string(nin)],[string(i0+1)]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } RELAY_f.prototype.details = function RELAY_f() { return this.x; @@ -46,5 +47,6 @@ function RELAY_f() { } } } + return new BasicBlock(this.x); } } diff --git a/js/Branching/SCALAR2VECTOR.js b/js/Branching/SCALAR2VECTOR.js index a1f50ede..e849edef 100644 --- a/js/Branching/SCALAR2VECTOR.js +++ b/js/Branching/SCALAR2VECTOR.js @@ -11,6 +11,7 @@ function SCALAR2VECTOR() { exprs = [string([nout])]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } SCALAR2VECTOR.prototype.details = function SCALAR2VECTOR() { return this.x; @@ -42,5 +43,6 @@ function SCALAR2VECTOR() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Branching/SELECT_f.js b/js/Branching/SELECT_f.js index de1fa1fa..b949158c 100644 --- a/js/Branching/SELECT_f.js +++ b/js/Branching/SELECT_f.js @@ -15,6 +15,7 @@ function SELECT_f() { exprs = [[string(nin)],[string(z0+1)]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } SELECT_f.prototype.details = function SELECT_f() { return this.x; @@ -44,5 +45,6 @@ function SELECT_f() { } } } + return new BasicBlock(this.x); } } diff --git a/js/Branching/SELECT_m.js b/js/Branching/SELECT_m.js index 856e759a..c91c2eeb 100644 --- a/js/Branching/SELECT_m.js +++ b/js/Branching/SELECT_m.js @@ -23,6 +23,7 @@ function SELECT_m() { exprs = [[sci2exp(1)],[sci2exp(nin)],[sci2exp(z0)]]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } SELECT_m.prototype.details = function SELECT_m() { return this.x; @@ -61,5 +62,6 @@ function SELECT_m() { } } } + return new BasicBlock(this.x); } } diff --git a/js/Branching/SWITCH2.js b/js/Branching/SWITCH2.js index e4e050c8..1c8a4fb8 100644 --- a/js/Branching/SWITCH2.js +++ b/js/Branching/SWITCH2.js @@ -18,6 +18,7 @@ function SWITCH2() { exprs = [[string(ipar)],[string(rpar)],[string(nzz)]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } SWITCH2.prototype.details = function SWITCH2() { return this.x; @@ -55,5 +56,6 @@ function SWITCH2() { this.x.model = model; break; } + return new BasicBlock(this.x); } } diff --git a/js/Branching/SWITCH2_m.js b/js/Branching/SWITCH2_m.js index 29643871..04dfaa1c 100644 --- a/js/Branching/SWITCH2_m.js +++ b/js/Branching/SWITCH2_m.js @@ -21,6 +21,7 @@ function SWITCH2_m() { exprs = [[sci2exp(1)],[string(ipar)],[string(rpar)],[string(nzz)]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } SWITCH2_m.prototype.details = function SWITCH2_m() { return this.x; @@ -72,5 +73,6 @@ function SWITCH2_m() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Branching/SWITCH_f.js b/js/Branching/SWITCH_f.js index 397de35c..4d1d8ff8 100644 --- a/js/Branching/SWITCH_f.js +++ b/js/Branching/SWITCH_f.js @@ -15,6 +15,7 @@ function SWITCH_f() { exprs = [[string(nin)],[string(i0+1)]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } SWITCH_f.prototype.details = function SWITCH_f() { return this.x; @@ -45,5 +46,6 @@ function SWITCH_f() { } } } + return new BasicBlock(this.x); } } diff --git a/js/Electrical/CCS.js b/js/Electrical/CCS.js index 37468aff..7617d008 100644 --- a/js/Electrical/CCS.js +++ b/js/Electrical/CCS.js @@ -47,6 +47,7 @@ function CCS() { this.x = standard_define([2.1,3],model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; + return new BasicBlock(this.x); } CCS.prototype.details = function CCS() { return this.x; @@ -59,5 +60,6 @@ function CCS() { exprs = graphics.exprs; model = arg1.model; this.x = arg1; + return new BasicBlock(this.x); } } diff --git a/js/Electrical/CVS.js b/js/Electrical/CVS.js index 14967c72..c78c81f5 100644 --- a/js/Electrical/CVS.js +++ b/js/Electrical/CVS.js @@ -47,6 +47,7 @@ function CVS() { this.x = standard_define([2.1,3],model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; + return new BasicBlock(this.x); } CVS.prototype.details = function CVS() { return this.x; @@ -59,5 +60,6 @@ function CVS() { exprs = graphics.exprs; model = arg1.model; this.x = arg1; + return new BasicBlock(this.x); } } diff --git a/js/Electrical/Capacitor.js b/js/Electrical/Capacitor.js index ea76cb96..6d2dd4ab 100644 --- a/js/Electrical/Capacitor.js +++ b/js/Electrical/Capacitor.js @@ -21,6 +21,7 @@ function Capacitor() { this.x = standard_define([2,1.1],model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; + return new BasicBlock(this.x); } Capacitor.prototype.details = function Capacitor() { return this.x; @@ -44,5 +45,6 @@ function Capacitor() { this.x.model = model; break; } + return new BasicBlock(this.x); } } diff --git a/js/Electrical/ConstantVoltage.js b/js/Electrical/ConstantVoltage.js index b01c4f44..43a2c0b6 100644 --- a/js/Electrical/ConstantVoltage.js +++ b/js/Electrical/ConstantVoltage.js @@ -20,6 +20,7 @@ function ConstantVoltage() { this.x = standard_define([1.5,1.1],model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; + return new BasicBlock(this.x); } ConstantVoltage.prototype.details = function ConstantVoltage() { return this.x; @@ -43,5 +44,6 @@ function ConstantVoltage() { this.x.model = model; break; } + return new BasicBlock(this.x); } } diff --git a/js/Electrical/CurrentSensor.js b/js/Electrical/CurrentSensor.js index 1cf2a40c..3e14a6ee 100644 --- a/js/Electrical/CurrentSensor.js +++ b/js/Electrical/CurrentSensor.js @@ -17,6 +17,7 @@ function CurrentSensor() { this.x = standard_define([2,2],model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = [["I"],["E"]]; + return new BasicBlock(this.x); } CurrentSensor.prototype.details = function CurrentSensor() { return this.x; @@ -25,5 +26,6 @@ function CurrentSensor() { } CurrentSensor.prototype.set = function CurrentSensor() { this.x = arg1; + return new BasicBlock(this.x); } } diff --git a/js/Electrical/Diode.js b/js/Electrical/Diode.js index 846dbafc..6e0c8417 100644 --- a/js/Electrical/Diode.js +++ b/js/Electrical/Diode.js @@ -23,6 +23,7 @@ function Diode() { this.x = standard_define([2,1],model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; + return new BasicBlock(this.x); } Diode.prototype.details = function Diode() { return this.x; @@ -46,5 +47,6 @@ function Diode() { this.x.model = model; break; } + return new BasicBlock(this.x); } } diff --git a/js/Electrical/Ground.js b/js/Electrical/Ground.js index 789de6c8..69ab7bc0 100644 --- a/js/Electrical/Ground.js +++ b/js/Electrical/Ground.js @@ -16,6 +16,7 @@ function Ground() { this.x = standard_define([1,1],model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; + return new BasicBlock(this.x); } Ground.prototype.details = function Ground() { return this.x; @@ -24,5 +25,6 @@ function Ground() { } Ground.prototype.set = function Ground() { this.x = arg1; + return new BasicBlock(this.x); } } diff --git a/js/Electrical/Gyrator.js b/js/Electrical/Gyrator.js index 5c6371fb..c1da0455 100644 --- a/js/Electrical/Gyrator.js +++ b/js/Electrical/Gyrator.js @@ -47,6 +47,7 @@ function Gyrator() { this.x = standard_define([2,2],model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; + return new BasicBlock(this.x); } Gyrator.prototype.details = function Gyrator() { return this.x; @@ -69,5 +70,6 @@ function Gyrator() { this.x.graphics.exprs = exprs; break; } + return new BasicBlock(this.x); } } diff --git a/js/Electrical/IdealTransformer.js b/js/Electrical/IdealTransformer.js index b24da82d..35559b0a 100644 --- a/js/Electrical/IdealTransformer.js +++ b/js/Electrical/IdealTransformer.js @@ -47,6 +47,7 @@ function IdealTransformer() { this.x = standard_define([2,2],model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; + return new BasicBlock(this.x); } IdealTransformer.prototype.details = function IdealTransformer() { return this.x; @@ -69,5 +70,6 @@ function IdealTransformer() { this.x.graphics.exprs = exprs; break; } + return new BasicBlock(this.x); } } diff --git a/js/Electrical/Inductor.js b/js/Electrical/Inductor.js index 915a8d35..24523d52 100644 --- a/js/Electrical/Inductor.js +++ b/js/Electrical/Inductor.js @@ -20,6 +20,7 @@ function Inductor() { this.x = standard_define([2,0.9],model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; + return new BasicBlock(this.x); } Inductor.prototype.details = function Inductor() { return this.x; @@ -43,5 +44,6 @@ function Inductor() { this.x.model = model; break; } + return new BasicBlock(this.x); } } diff --git a/js/Electrical/MOTOR.js b/js/Electrical/MOTOR.js index f6612689..a8c1d4c2 100644 --- a/js/Electrical/MOTOR.js +++ b/js/Electrical/MOTOR.js @@ -12,6 +12,7 @@ function MOTOR() { this.x = standard_define([2,2],model,exprs,gr_i); this.x.graphics.out_implicit = [["I"],["I"]]; this.x.graphics.in_implicit = ["I"]; + return new BasicBlock(this.x); } MOTOR.prototype.details = function MOTOR() { return this.x; @@ -20,5 +21,6 @@ function MOTOR() { } MOTOR.prototype.set = function MOTOR() { this.x = arg1; + return new BasicBlock(this.x); } } diff --git a/js/Electrical/NMOS.js b/js/Electrical/NMOS.js index 932f4ac4..0a8d1738 100644 --- a/js/Electrical/NMOS.js +++ b/js/Electrical/NMOS.js @@ -27,6 +27,7 @@ function NMOS() { this.x = standard_define([2,2],model,exprs,gr_i); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = [["I"],["I"],["I"]]; + return new BasicBlock(this.x); } NMOS.prototype.details = function NMOS() { return this.x; @@ -49,5 +50,6 @@ function NMOS() { this.x.model = model; break; } + return new BasicBlock(this.x); } } diff --git a/js/Electrical/NPN.js b/js/Electrical/NPN.js index 93484238..c82ac606 100644 --- a/js/Electrical/NPN.js +++ b/js/Electrical/NPN.js @@ -47,6 +47,7 @@ function NPN() { this.x = standard_define([2,2],model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; + return new BasicBlock(this.x); } NPN.prototype.details = function NPN() { return this.x; @@ -69,5 +70,6 @@ function NPN() { this.x.graphics.exprs = exprs; break; } + return new BasicBlock(this.x); } } diff --git a/js/Electrical/OpAmp.js b/js/Electrical/OpAmp.js index ceaa3228..4123f4f8 100644 --- a/js/Electrical/OpAmp.js +++ b/js/Electrical/OpAmp.js @@ -21,6 +21,7 @@ function OpAmp() { this.x = standard_define([3,5],model,exprs,gr_i); this.x.graphics.in_implicit = [["I"],["I"]]; this.x.graphics.out_implicit = ["I"]; + return new BasicBlock(this.x); } OpAmp.prototype.details = function OpAmp() { return this.x; @@ -43,5 +44,6 @@ function OpAmp() { this.x.model = model; break; } + return new BasicBlock(this.x); } } diff --git a/js/Electrical/PMOS.js b/js/Electrical/PMOS.js index 4a314521..cd2ba37e 100644 --- a/js/Electrical/PMOS.js +++ b/js/Electrical/PMOS.js @@ -27,6 +27,7 @@ function PMOS() { this.x = standard_define([2,2],model,exprs,gr_i); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = [["I"],["I"],["I"]]; + return new BasicBlock(this.x); } PMOS.prototype.details = function PMOS() { return this.x; @@ -49,5 +50,6 @@ function PMOS() { this.x.model = model; break; } + return new BasicBlock(this.x); } } diff --git a/js/Electrical/PNP.js b/js/Electrical/PNP.js index bd3fcad3..418bbf9c 100644 --- a/js/Electrical/PNP.js +++ b/js/Electrical/PNP.js @@ -47,6 +47,7 @@ function PNP() { this.x = standard_define([2,2],model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; + return new BasicBlock(this.x); } PNP.prototype.details = function PNP() { return this.x; @@ -69,5 +70,6 @@ function PNP() { this.x.graphics.exprs = exprs; break; } + return new BasicBlock(this.x); } } diff --git a/js/Electrical/PotentialSensor.js b/js/Electrical/PotentialSensor.js index 036090ad..b2a6dc22 100644 --- a/js/Electrical/PotentialSensor.js +++ b/js/Electrical/PotentialSensor.js @@ -17,6 +17,7 @@ function PotentialSensor() { this.x = standard_define([2,2],model,"",list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["E"]; + return new BasicBlock(this.x); } PotentialSensor.prototype.details = function PotentialSensor() { return this.x; @@ -25,5 +26,6 @@ function PotentialSensor() { } PotentialSensor.prototype.set = function PotentialSensor() { this.x = arg1; + return new BasicBlock(this.x); } } diff --git a/js/Electrical/Resistor.js b/js/Electrical/Resistor.js index c7d1de80..fdc0f662 100644 --- a/js/Electrical/Resistor.js +++ b/js/Electrical/Resistor.js @@ -20,6 +20,7 @@ function Resistor() { this.x = standard_define([2,1],model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; + return new BasicBlock(this.x); } Resistor.prototype.details = function Resistor() { return this.x; @@ -43,5 +44,6 @@ function Resistor() { this.x.model = model; break; } + return new BasicBlock(this.x); } } diff --git a/js/Electrical/SineVoltage.js b/js/Electrical/SineVoltage.js index 3cab0ebd..0d7a554a 100644 --- a/js/Electrical/SineVoltage.js +++ b/js/Electrical/SineVoltage.js @@ -24,6 +24,7 @@ function SineVoltage() { this.x = standard_define([2,2],model,exprs,gr_i); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; + return new BasicBlock(this.x); } SineVoltage.prototype.details = function SineVoltage() { return this.x; @@ -47,5 +48,6 @@ function SineVoltage() { this.x.model = model; break; } + return new BasicBlock(this.x); } } diff --git a/js/Electrical/Switch.js b/js/Electrical/Switch.js index 0fce8536..d3c8d95b 100644 --- a/js/Electrical/Switch.js +++ b/js/Electrical/Switch.js @@ -23,6 +23,7 @@ function Switch() { this.x = standard_define([2,2],model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = [["I"],["E"]]; this.x.graphics.out_implicit = ["I"]; + return new BasicBlock(this.x); } Switch.prototype.details = function Switch() { return this.x; @@ -45,5 +46,6 @@ function Switch() { this.x.model = model; break; } + return new BasicBlock(this.x); } } diff --git a/js/Electrical/VVsourceAC.js b/js/Electrical/VVsourceAC.js index 4b707ec4..e87ac43d 100644 --- a/js/Electrical/VVsourceAC.js +++ b/js/Electrical/VVsourceAC.js @@ -21,6 +21,7 @@ function VVsourceAC() { this.x = standard_define([2,2],model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I","E"]; this.x.graphics.out_implicit = ["I"]; + return new BasicBlock(this.x); } VVsourceAC.prototype.details = function VVsourceAC() { return this.x; @@ -44,5 +45,6 @@ function VVsourceAC() { this.x.model = model; break; } + return new BasicBlock(this.x); } } diff --git a/js/Electrical/VariableResistor.js b/js/Electrical/VariableResistor.js index 0eb5c9ce..f9011e10 100644 --- a/js/Electrical/VariableResistor.js +++ b/js/Electrical/VariableResistor.js @@ -17,6 +17,7 @@ function VariableResistor() { this.x = standard_define([2,2],model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I","E"]; this.x.graphics.out_implicit = ["I"]; + return new BasicBlock(this.x); } VariableResistor.prototype.details = function VariableResistor() { return this.x; @@ -25,5 +26,6 @@ function VariableResistor() { } VariableResistor.prototype.set = function VariableResistor() { this.x = arg1; + return new BasicBlock(this.x); } } diff --git a/js/Electrical/VoltageSensor.js b/js/Electrical/VoltageSensor.js index ea912b49..e3369b94 100644 --- a/js/Electrical/VoltageSensor.js +++ b/js/Electrical/VoltageSensor.js @@ -17,6 +17,7 @@ function VoltageSensor() { this.x = standard_define([2,2],model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = [["I"],["E"]]; + return new BasicBlock(this.x); } VoltageSensor.prototype.details = function VoltageSensor() { return this.x; @@ -25,5 +26,6 @@ function VoltageSensor() { } VoltageSensor.prototype.set = function VoltageSensor() { this.x = arg1; + return new BasicBlock(this.x); } } diff --git a/js/Electrical/VsourceAC.js b/js/Electrical/VsourceAC.js index 5b1dd0fe..8a2464c5 100644 --- a/js/Electrical/VsourceAC.js +++ b/js/Electrical/VsourceAC.js @@ -21,6 +21,7 @@ function VsourceAC() { this.x = standard_define([2,2],model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; + return new BasicBlock(this.x); } VsourceAC.prototype.details = function VsourceAC() { return this.x; @@ -44,5 +45,6 @@ function VsourceAC() { this.x.model = model; break; } + return new BasicBlock(this.x); } } diff --git a/js/Events/ANDBLK.js b/js/Events/ANDBLK.js index ef00fcfa..440702c1 100644 --- a/js/Events/ANDBLK.js +++ b/js/Events/ANDBLK.js @@ -65,6 +65,7 @@ function ANDBLK() { this.x.model.firing = false; this.x.model.dep_ut = [false,false]; this.x.model.rpar = diagram; + return new BasicBlock(this.x); } ANDBLK.prototype.details = function ANDBLK() { return this.x; @@ -73,5 +74,6 @@ function ANDBLK() { } ANDBLK.prototype.set = function ANDBLK() { this.x = arg1; + return new BasicBlock(this.x); } } diff --git a/js/Events/ANDLOG_f.js b/js/Events/ANDLOG_f.js index 17acfade..3c7e4366 100644 --- a/js/Events/ANDLOG_f.js +++ b/js/Events/ANDLOG_f.js @@ -10,6 +10,7 @@ function ANDLOG_f() { model.dep_ut = [false,false]; gr_i = []; this.x = standard_define([3,3],model,[],gr_i); + return new BasicBlock(this.x); } ANDLOG_f.prototype.details = function ANDLOG_f() { return this.x; @@ -18,5 +19,6 @@ function ANDLOG_f() { } ANDLOG_f.prototype.set = function ANDLOG_f() { this.x = arg1; + return new BasicBlock(this.x); } } diff --git a/js/Events/CLKSOMV_f.js b/js/Events/CLKSOMV_f.js index b9489ab8..58fd04e9 100644 --- a/js/Events/CLKSOMV_f.js +++ b/js/Events/CLKSOMV_f.js @@ -10,6 +10,7 @@ function CLKSOMV_f() { model.dep_ut = [false,false]; gr_i = []; this.x = standard_define([2,2],model,[],gr_i); + return new BasicBlock(this.x); } CLKSOMV_f.prototype.details = function CLKSOMV_f() { return this.x; @@ -18,5 +19,6 @@ function CLKSOMV_f() { } CLKSOMV_f.prototype.set = function CLKSOMV_f() { this.x = arg1; + return new BasicBlock(this.x); } } diff --git a/js/Events/CLKSOM_f.js b/js/Events/CLKSOM_f.js index 45f5aa6d..432fa19a 100644 --- a/js/Events/CLKSOM_f.js +++ b/js/Events/CLKSOM_f.js @@ -10,6 +10,7 @@ function CLKSOM_f() { model.dep_ut = [false,false]; gr_i = []; this.x = standard_define([1,1]/1.2,model,[],gr_i); + return new BasicBlock(this.x); } CLKSOM_f.prototype.details = function CLKSOM_f() { return this.x; @@ -18,5 +19,6 @@ function CLKSOM_f() { } CLKSOM_f.prototype.set = function CLKSOM_f() { this.x = arg1; + return new BasicBlock(this.x); } } diff --git a/js/Events/CLKSPLIT_f.js b/js/Events/CLKSPLIT_f.js index c3792fc2..bc85c84b 100644 --- a/js/Events/CLKSPLIT_f.js +++ b/js/Events/CLKSPLIT_f.js @@ -9,6 +9,7 @@ function CLKSPLIT_f() { model.firing = [false,false,false]; model.dep_ut = [false,false]; this.x = standard_define([1,1]/3,model,[],[]); + return new BasicBlock(this.x); } CLKSPLIT_f.prototype.details = function CLKSPLIT_f() { return this.x; @@ -17,5 +18,6 @@ function CLKSPLIT_f() { } CLKSPLIT_f.prototype.set = function CLKSPLIT_f() { this.x = arg1; + return new BasicBlock(this.x); } } diff --git a/js/Events/END_c.js b/js/Events/END_c.js index c385c9aa..26041f2a 100644 --- a/js/Events/END_c.js +++ b/js/Events/END_c.js @@ -12,6 +12,7 @@ function END_c() { exprs = string(tf); gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } END_c.prototype.details = function END_c() { return this.x; @@ -36,5 +37,6 @@ function END_c() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Events/EVTDLY_c.js b/js/Events/EVTDLY_c.js index 2946d381..1fae97ea 100644 --- a/js/Events/EVTDLY_c.js +++ b/js/Events/EVTDLY_c.js @@ -14,6 +14,7 @@ function EVTDLY_c() { exprs = [[string(dt)],[sci2exp(ff)]]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } EVTDLY_c.prototype.details = function EVTDLY_c() { return this.x; @@ -43,5 +44,6 @@ function EVTDLY_c() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Events/EVTDLY_f.js b/js/Events/EVTDLY_f.js index 48180c10..010d429b 100644 --- a/js/Events/EVTDLY_f.js +++ b/js/Events/EVTDLY_f.js @@ -14,6 +14,7 @@ function EVTDLY_f() { exprs = [[string(dt)],[sci2exp(ff)]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } EVTDLY_f.prototype.details = function EVTDLY_f() { return this.x; @@ -43,5 +44,6 @@ function EVTDLY_f() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Events/EVTGEN_f.js b/js/Events/EVTGEN_f.js index f2966e46..804c5a0c 100644 --- a/js/Events/EVTGEN_f.js +++ b/js/Events/EVTGEN_f.js @@ -11,6 +11,7 @@ function EVTGEN_f() { exprs = string(tt); gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } EVTGEN_f.prototype.details = function EVTGEN_f() { return this.x; @@ -35,5 +36,6 @@ function EVTGEN_f() { this.x.model = model; break; } + return new BasicBlock(this.x); } } diff --git a/js/Events/EVTVARDLY.js b/js/Events/EVTVARDLY.js index ac96bcd5..57e9cc92 100644 --- a/js/Events/EVTVARDLY.js +++ b/js/Events/EVTVARDLY.js @@ -13,6 +13,7 @@ function EVTVARDLY() { exprs = string(model.firing); gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } EVTVARDLY.prototype.details = function EVTVARDLY() { return this.x; @@ -35,5 +36,6 @@ function EVTVARDLY() { this.x.model = model; break; } + return new BasicBlock(this.x); } } diff --git a/js/Events/HALT_f.js b/js/Events/HALT_f.js index 897b61c0..408678a0 100644 --- a/js/Events/HALT_f.js +++ b/js/Events/HALT_f.js @@ -12,6 +12,7 @@ function HALT_f() { exprs = string(n); gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } HALT_f.prototype.details = function HALT_f() { return this.x; @@ -36,5 +37,6 @@ function HALT_f() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Events/IFTHEL_f.js b/js/Events/IFTHEL_f.js index a3ea4b20..5dd2d712 100644 --- a/js/Events/IFTHEL_f.js +++ b/js/Events/IFTHEL_f.js @@ -16,6 +16,7 @@ function IFTHEL_f() { gr_i = []; exprs = [[string(model.in1)],[string(model.nmode)]]; this.x = standard_define([3,3],model,exprs,gr_i); + return new BasicBlock(this.x); } IFTHEL_f.prototype.details = function IFTHEL_f() { return this.x; @@ -57,5 +58,6 @@ function IFTHEL_f() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Events/MCLOCK_f.js b/js/Events/MCLOCK_f.js index e0beef45..48fff47b 100644 --- a/js/Events/MCLOCK_f.js +++ b/js/Events/MCLOCK_f.js @@ -67,6 +67,7 @@ function MCLOCK_f() { this.x.model.blocktype = "h"; this.x.model.rpar = diagram; this.x.graphics.peout = [[0],[0]]; + return new BasicBlock(this.x); } MCLOCK_f.prototype.details = function MCLOCK_f() { return this.x; @@ -92,5 +93,6 @@ function MCLOCK_f() { this.x = arg1; y = 0; typ = newpar; + return new BasicBlock(this.x); } } diff --git a/js/Events/MFCLCK_f.js b/js/Events/MFCLCK_f.js index 1dbc294f..517bf43c 100644 --- a/js/Events/MFCLCK_f.js +++ b/js/Events/MFCLCK_f.js @@ -16,6 +16,7 @@ function MFCLCK_f() { exprs = [[string(dt)],[string(nn)]]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } MFCLCK_f.prototype.details = function MFCLCK_f() { return this.x; @@ -38,5 +39,6 @@ function MFCLCK_f() { this.x.graphics = graphics; this.x.model = model; } + return new BasicBlock(this.x); } } diff --git a/js/Events/M_freq.js b/js/Events/M_freq.js index ac3d3246..9b42b389 100644 --- a/js/Events/M_freq.js +++ b/js/Events/M_freq.js @@ -13,6 +13,7 @@ function M_freq() { exprs = [[sci2exp([[1],[2]])],[sci2exp([[0],[0]])]]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } M_freq.prototype.details = function M_freq() { return this.x; @@ -60,5 +61,6 @@ function M_freq() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Events/VirtualCLK0.js b/js/Events/VirtualCLK0.js index f4cf1f54..6ceb82fa 100644 --- a/js/Events/VirtualCLK0.js +++ b/js/Events/VirtualCLK0.js @@ -11,6 +11,7 @@ function VirtualCLK0() { model.dep_ut = [false,false]; exprs = []; this.x = standard_define([2,2],model,exprs," "); + return new BasicBlock(this.x); } VirtualCLK0.prototype.details = function VirtualCLK0() { return this.x; @@ -19,5 +20,6 @@ function VirtualCLK0() { } VirtualCLK0.prototype.set = function VirtualCLK0() { this.x = arg1; + return new BasicBlock(this.x); } } diff --git a/js/Events/freq_div.js b/js/Events/freq_div.js index d3a993b4..6fcb6958 100644 --- a/js/Events/freq_div.js +++ b/js/Events/freq_div.js @@ -105,6 +105,7 @@ function freq_div() { model.rpar = scs_m_1; gr_i = []; this.x = standard_define([3,2],model,[],gr_i); + return new BasicBlock(this.x); } freq_div.prototype.details = function freq_div() { return this.x; @@ -195,5 +196,6 @@ function freq_div() { } this.x = arg1; typ = newpar; + return new BasicBlock(this.x); } } diff --git a/js/Hydraulics/Bache.js b/js/Hydraulics/Bache.js index 9a0d0a11..08fa3a32 100644 --- a/js/Hydraulics/Bache.js +++ b/js/Hydraulics/Bache.js @@ -32,6 +32,7 @@ function Bache() { this.x = standard_define([2,2],model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = [["I"],["I"]]; this.x.graphics.out_implicit = [["I"],["I"],["E"]]; + return new BasicBlock(this.x); } Bache.prototype.details = function Bache() { return this.x; @@ -55,5 +56,6 @@ function Bache() { this.x.model = model; break; } + return new BasicBlock(this.x); } } diff --git a/js/Hydraulics/Flowmeter.js b/js/Hydraulics/Flowmeter.js index d236c8a7..dbe576ae 100644 --- a/js/Hydraulics/Flowmeter.js +++ b/js/Hydraulics/Flowmeter.js @@ -47,6 +47,7 @@ function Flowmeter() { this.x = standard_define([2,2],model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; + return new BasicBlock(this.x); } Flowmeter.prototype.details = function Flowmeter() { return this.x; @@ -69,5 +70,6 @@ function Flowmeter() { this.x.graphics.exprs = exprs; break; } + return new BasicBlock(this.x); } } diff --git a/js/Hydraulics/PerteDP.js b/js/Hydraulics/PerteDP.js index f424272b..63244eac 100644 --- a/js/Hydraulics/PerteDP.js +++ b/js/Hydraulics/PerteDP.js @@ -27,6 +27,7 @@ function PerteDP() { this.x = standard_define([2,1],model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; + return new BasicBlock(this.x); } PerteDP.prototype.details = function PerteDP() { return this.x; @@ -50,5 +51,6 @@ function PerteDP() { this.x.model = model; break; } + return new BasicBlock(this.x); } } diff --git a/js/Hydraulics/PuitsP.js b/js/Hydraulics/PuitsP.js index a6efc486..5d71f566 100644 --- a/js/Hydraulics/PuitsP.js +++ b/js/Hydraulics/PuitsP.js @@ -20,6 +20,7 @@ function PuitsP() { gr_i = []; this.x = standard_define([2.5,2],model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; + return new BasicBlock(this.x); } PuitsP.prototype.details = function PuitsP() { return this.x; @@ -43,5 +44,6 @@ function PuitsP() { this.x.model = model; break; } + return new BasicBlock(this.x); } } diff --git a/js/Hydraulics/SourceP.js b/js/Hydraulics/SourceP.js index 504f1e52..29e06507 100644 --- a/js/Hydraulics/SourceP.js +++ b/js/Hydraulics/SourceP.js @@ -22,6 +22,7 @@ function SourceP() { gr_i = []; this.x = standard_define([2.5,2],model,exprs,list(gr_i,0)); this.x.graphics.out_implicit = ["I"]; + return new BasicBlock(this.x); } SourceP.prototype.details = function SourceP() { return this.x; @@ -45,5 +46,6 @@ function SourceP() { this.x.model = model; break; } + return new BasicBlock(this.x); } } diff --git a/js/Hydraulics/VanneReglante.js b/js/Hydraulics/VanneReglante.js index e3f32a7f..6a2b11d3 100644 --- a/js/Hydraulics/VanneReglante.js +++ b/js/Hydraulics/VanneReglante.js @@ -23,6 +23,7 @@ function VanneReglante() { this.x = standard_define([2,2],model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = [["I"],["E"]]; this.x.graphics.out_implicit = ["I"]; + return new BasicBlock(this.x); } VanneReglante.prototype.details = function VanneReglante() { return this.x; @@ -46,5 +47,6 @@ function VanneReglante() { this.x.model = model; break; } + return new BasicBlock(this.x); } } diff --git a/js/IntegerOp/BITCLEAR.js b/js/IntegerOp/BITCLEAR.js index 69a6c8e9..4cb78029 100644 --- a/js/IntegerOp/BITCLEAR.js +++ b/js/IntegerOp/BITCLEAR.js @@ -15,6 +15,7 @@ function BITCLEAR() { exprs = [[sci2exp(3)],[sci2exp(0)]]; gr_i = []; this.x = standard_define([4,2],model,exprs,gr_i); + return new BasicBlock(this.x); } BITCLEAR.prototype.details = function BITCLEAR() { return this.x; @@ -83,5 +84,6 @@ function BITCLEAR() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/IntegerOp/BITSET.js b/js/IntegerOp/BITSET.js index b214103d..21e6d076 100644 --- a/js/IntegerOp/BITSET.js +++ b/js/IntegerOp/BITSET.js @@ -15,6 +15,7 @@ function BITSET() { exprs = [[sci2exp(3)],[sci2exp(0)]]; gr_i = []; this.x = standard_define([4,2],model,exprs,gr_i); + return new BasicBlock(this.x); } BITSET.prototype.details = function BITSET() { return this.x; @@ -81,5 +82,6 @@ function BITSET() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/IntegerOp/CONVERT.js b/js/IntegerOp/CONVERT.js index 7686794e..cf2d120b 100644 --- a/js/IntegerOp/CONVERT.js +++ b/js/IntegerOp/CONVERT.js @@ -17,6 +17,7 @@ function CONVERT() { exprs = [[sci2exp(1)],[sci2exp(3)],[sci2exp(0)]]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } CONVERT.prototype.details = function CONVERT() { return this.x; @@ -367,5 +368,6 @@ function CONVERT() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/IntegerOp/DFLIPFLOP.js b/js/IntegerOp/DFLIPFLOP.js index 5a703f00..944bddc4 100644 --- a/js/IntegerOp/DFLIPFLOP.js +++ b/js/IntegerOp/DFLIPFLOP.js @@ -90,6 +90,7 @@ function DFLIPFLOP() { model.rpar = scs_m; gr_i = []; this.x = standard_define([2,3],model,[],gr_i); + return new BasicBlock(this.x); } DFLIPFLOP.prototype.details = function DFLIPFLOP() { return this.x; @@ -98,5 +99,6 @@ function DFLIPFLOP() { } DFLIPFLOP.prototype.set = function DFLIPFLOP() { this.x = arg1; + return new BasicBlock(this.x); } } diff --git a/js/IntegerOp/DLATCH.js b/js/IntegerOp/DLATCH.js index 174cfa92..130e2534 100644 --- a/js/IntegerOp/DLATCH.js +++ b/js/IntegerOp/DLATCH.js @@ -35,6 +35,7 @@ function DLATCH() { model.rpar = scs_m; gr_i = []; this.x = standard_define([2,3],model,[],gr_i); + return new BasicBlock(this.x); } DLATCH.prototype.details = function DLATCH() { return this.x; @@ -43,5 +44,6 @@ function DLATCH() { } DLATCH.prototype.set = function DLATCH() { this.x = arg1; + return new BasicBlock(this.x); } } diff --git a/js/IntegerOp/EXTRACTBITS.js b/js/IntegerOp/EXTRACTBITS.js index c8cc060a..8f376b2d 100644 --- a/js/IntegerOp/EXTRACTBITS.js +++ b/js/IntegerOp/EXTRACTBITS.js @@ -16,6 +16,7 @@ function EXTRACTBITS() { exprs = [[sci2exp(3)],[sci2exp(1)],[sci2exp(0)],[sci2exp(0)]]; gr_i = []; this.x = standard_define([4,2],model,exprs,gr_i); + return new BasicBlock(this.x); } EXTRACTBITS.prototype.details = function EXTRACTBITS() { return this.x; @@ -226,5 +227,6 @@ function EXTRACTBITS() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/IntegerOp/INTMUL.js b/js/IntegerOp/INTMUL.js index 95065dac..c67e5c5e 100644 --- a/js/IntegerOp/INTMUL.js +++ b/js/IntegerOp/INTMUL.js @@ -17,6 +17,7 @@ function INTMUL() { exprs = [[sci2exp(3)],[sci2exp(0)]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } INTMUL.prototype.details = function INTMUL() { return this.x; @@ -103,5 +104,6 @@ function INTMUL() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/IntegerOp/JKFLIPFLOP.js b/js/IntegerOp/JKFLIPFLOP.js index 3ee2ab1f..17aa3c0d 100644 --- a/js/IntegerOp/JKFLIPFLOP.js +++ b/js/IntegerOp/JKFLIPFLOP.js @@ -46,6 +46,7 @@ function JKFLIPFLOP() { model.rpar = scs_m; gr_i = []; this.x = standard_define([2,3],model,[],gr_i); + return new BasicBlock(this.x); } JKFLIPFLOP.prototype.details = function JKFLIPFLOP() { return this.x; @@ -91,5 +92,6 @@ function JKFLIPFLOP() { this.x = arg1; y = needcompile; typ = newpar; + return new BasicBlock(this.x); } } diff --git a/js/IntegerOp/LOGIC.js b/js/IntegerOp/LOGIC.js index d4ebdf7c..3a4dceef 100644 --- a/js/IntegerOp/LOGIC.js +++ b/js/IntegerOp/LOGIC.js @@ -18,6 +18,7 @@ function LOGIC() { exprs = [[sci2exp(mat)],[sci2exp(0)]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } LOGIC.prototype.details = function LOGIC() { return this.x; @@ -63,5 +64,6 @@ function LOGIC() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/IntegerOp/SHIFT.js b/js/IntegerOp/SHIFT.js index 55af03ed..d1360f21 100644 --- a/js/IntegerOp/SHIFT.js +++ b/js/IntegerOp/SHIFT.js @@ -18,6 +18,7 @@ function SHIFT() { exprs = [[sci2exp(3)],[sci2exp(0)],[sci2exp(0)]]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } SHIFT.prototype.details = function SHIFT() { return this.x; @@ -118,5 +119,6 @@ function SHIFT() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/IntegerOp/SRFLIPFLOP.js b/js/IntegerOp/SRFLIPFLOP.js index d5db4b00..eb57ffe8 100644 --- a/js/IntegerOp/SRFLIPFLOP.js +++ b/js/IntegerOp/SRFLIPFLOP.js @@ -30,6 +30,7 @@ function SRFLIPFLOP() { model.rpar = scs_m; gr_i = []; this.x = standard_define([2,3],model,[],gr_i); + return new BasicBlock(this.x); } SRFLIPFLOP.prototype.details = function SRFLIPFLOP() { return this.x; @@ -75,5 +76,6 @@ function SRFLIPFLOP() { this.x = arg1; y = needcompile; typ = newpar; + return new BasicBlock(this.x); } } diff --git a/js/Linear/BIGSOM_f.js b/js/Linear/BIGSOM_f.js index 4376e478..096e388b 100644 --- a/js/Linear/BIGSOM_f.js +++ b/js/Linear/BIGSOM_f.js @@ -12,6 +12,7 @@ function BIGSOM_f() { exprs = sci2exp(sgn); gr_i = []; this.x = standard_define([2,3],model,exprs,gr_i); + return new BasicBlock(this.x); } BIGSOM_f.prototype.details = function BIGSOM_f() { return this.x; @@ -38,5 +39,6 @@ function BIGSOM_f() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Linear/CLINDUMMY_f.js b/js/Linear/CLINDUMMY_f.js index 448f7ffd..fafdb58d 100644 --- a/js/Linear/CLINDUMMY_f.js +++ b/js/Linear/CLINDUMMY_f.js @@ -10,6 +10,7 @@ function CLINDUMMY_f() { model.dep_ut = [false,true]; gr_i = []; this.x = standard_define([3,2],model,[],gr_i); + return new BasicBlock(this.x); } CLINDUMMY_f.prototype.details = function CLINDUMMY_f() { return this.x; @@ -18,5 +19,6 @@ function CLINDUMMY_f() { } CLINDUMMY_f.prototype.set = function CLINDUMMY_f() { this.x = arg1; + return new BasicBlock(this.x); } } diff --git a/js/Linear/CLR.js b/js/Linear/CLR.js index 0b3439e8..3d97e275 100644 --- a/js/Linear/CLR.js +++ b/js/Linear/CLR.js @@ -17,6 +17,7 @@ function CLR() { model.dep_ut = [false,true]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } CLR.prototype.details = function CLR() { return this.x; @@ -70,5 +71,6 @@ function CLR() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Linear/CLR_f.js b/js/Linear/CLR_f.js index 72bd2aaa..d9b963d0 100644 --- a/js/Linear/CLR_f.js +++ b/js/Linear/CLR_f.js @@ -17,6 +17,7 @@ function CLR_f() { model.dep_ut = [false,true]; gr_i = []; this.x = standard_define([2.5,2.5],model,exprs,gr_i); + return new BasicBlock(this.x); } CLR_f.prototype.details = function CLR_f() { return this.x; @@ -70,5 +71,6 @@ function CLR_f() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Linear/CLSS.js b/js/Linear/CLSS.js index 94d9bd4a..86279506 100644 --- a/js/Linear/CLSS.js +++ b/js/Linear/CLSS.js @@ -19,6 +19,7 @@ function CLSS() { exprs = [[strcat(sci2exp(A))],[strcat(sci2exp(B))],[strcat(sci2exp(C))],[strcat(sci2exp(D))],[strcat(sci2exp(x0))]]; gr_i = []; this.x = standard_define([4,2],model,exprs,gr_i); + return new BasicBlock(this.x); } CLSS.prototype.details = function CLSS() { return this.x; @@ -84,5 +85,6 @@ function CLSS() { } } } + return new BasicBlock(this.x); } } diff --git a/js/Linear/CLSS_f.js b/js/Linear/CLSS_f.js index d4c2976a..e30c06fa 100644 --- a/js/Linear/CLSS_f.js +++ b/js/Linear/CLSS_f.js @@ -19,6 +19,7 @@ function CLSS_f() { exprs = [[strcat(sci2exp(A))],[strcat(sci2exp(B))],[strcat(sci2exp(C))],[strcat(sci2exp(D))],[strcat(sci2exp(x0))]]; gr_i = []; this.x = standard_define([4,2],model,exprs,gr_i); + return new BasicBlock(this.x); } CLSS_f.prototype.details = function CLSS_f() { return this.x; @@ -74,5 +75,6 @@ function CLSS_f() { } } } + return new BasicBlock(this.x); } } diff --git a/js/Linear/DELAYV_f.js b/js/Linear/DELAYV_f.js index 44603e1d..622d60b2 100644 --- a/js/Linear/DELAYV_f.js +++ b/js/Linear/DELAYV_f.js @@ -19,6 +19,7 @@ function DELAYV_f() { exprs = [[string(nin)],[strcat(string(z0.slice(1-1,$-1)),";")],[string(T)]]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } DELAYV_f.prototype.details = function DELAYV_f() { return this.x; @@ -59,5 +60,6 @@ function DELAYV_f() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Linear/DELAY_f.js b/js/Linear/DELAY_f.js index 0a2a2f83..fb07b5bf 100644 --- a/js/Linear/DELAY_f.js +++ b/js/Linear/DELAY_f.js @@ -63,6 +63,7 @@ function DELAY_f() { this.x.graphics.in_style = ""; this.x.graphics.out_implicit = ["E"]; this.x.graphics.out_style = ""; + return new BasicBlock(this.x); } DELAY_f.prototype.details = function DELAY_f() { return this.x; @@ -125,5 +126,6 @@ function DELAY_f() { needcompile = 0; y = needcompile; typ = newpar; + return new BasicBlock(this.x); } } diff --git a/js/Linear/DERIV.js b/js/Linear/DERIV.js index d8b77628..700141a1 100644 --- a/js/Linear/DERIV.js +++ b/js/Linear/DERIV.js @@ -10,6 +10,7 @@ function DERIV() { exprs = []; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } DERIV.prototype.details = function DERIV() { return this.x; @@ -18,5 +19,6 @@ function DERIV() { } DERIV.prototype.set = function DERIV() { this.x = arg1; + return new BasicBlock(this.x); } } diff --git a/js/Linear/DIFF_c.js b/js/Linear/DIFF_c.js index 191e9282..42abb23c 100644 --- a/js/Linear/DIFF_c.js +++ b/js/Linear/DIFF_c.js @@ -12,6 +12,7 @@ function DIFF_c() { exprs = [[strcat(sci2exp(x0[1-1]))],[strcat(sci2exp(x0[2-1]))]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } DIFF_c.prototype.details = function DIFF_c() { return this.x; @@ -52,5 +53,6 @@ function DIFF_c() { } } this.x.model.firing = []; + return new BasicBlock(this.x); } } diff --git a/js/Linear/DLR.js b/js/Linear/DLR.js index 39d11022..2b06bb91 100644 --- a/js/Linear/DLR.js +++ b/js/Linear/DLR.js @@ -18,6 +18,7 @@ function DLR() { model.dep_ut = [false,false]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } DLR.prototype.details = function DLR() { return this.x; @@ -69,5 +70,6 @@ function DLR() { } } this.x.model.firing = []; + return new BasicBlock(this.x); } } diff --git a/js/Linear/DLR_f.js b/js/Linear/DLR_f.js index 0bc0dc73..93e2925a 100644 --- a/js/Linear/DLR_f.js +++ b/js/Linear/DLR_f.js @@ -18,6 +18,7 @@ function DLR_f() { model.dep_ut = [false,false]; gr_i = []; this.x = standard_define([2.5,2.5],model,exprs,gr_i); + return new BasicBlock(this.x); } DLR_f.prototype.details = function DLR_f() { return this.x; @@ -69,5 +70,6 @@ function DLR_f() { } } this.x.model.firing = []; + return new BasicBlock(this.x); } } diff --git a/js/Linear/DLSS.js b/js/Linear/DLSS.js index 56fa6f74..a8d79e8e 100644 --- a/js/Linear/DLSS.js +++ b/js/Linear/DLSS.js @@ -18,6 +18,7 @@ function DLSS() { exprs = [[strcat(sci2exp(A))],[strcat(sci2exp(B))],[strcat(sci2exp(C))],[strcat(sci2exp(D))],[strcat(sci2exp(x0))]]; gr_i = []; this.x = standard_define([4,2],model,exprs,gr_i); + return new BasicBlock(this.x); } DLSS.prototype.details = function DLSS() { return this.x; @@ -83,5 +84,6 @@ function DLSS() { } } } + return new BasicBlock(this.x); } } diff --git a/js/Linear/DLSS_f.js b/js/Linear/DLSS_f.js index c444ce87..5f138020 100644 --- a/js/Linear/DLSS_f.js +++ b/js/Linear/DLSS_f.js @@ -18,6 +18,7 @@ function DLSS_f() { exprs = [[strcat(sci2exp(A))],[strcat(sci2exp(B))],[strcat(sci2exp(C))],[strcat(sci2exp(D))],[strcat(sci2exp(x0))]]; gr_i = []; this.x = standard_define([4,2],model,exprs,gr_i); + return new BasicBlock(this.x); } DLSS_f.prototype.details = function DLSS_f() { return this.x; @@ -73,5 +74,6 @@ function DLSS_f() { } } } + return new BasicBlock(this.x); } } diff --git a/js/Linear/DOLLAR.js b/js/Linear/DOLLAR.js index b4413a70..f5b2186c 100644 --- a/js/Linear/DOLLAR.js +++ b/js/Linear/DOLLAR.js @@ -15,6 +15,7 @@ function DOLLAR() { model.dep_ut = [false,false]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } DOLLAR.prototype.details = function DOLLAR() { return this.x; @@ -87,5 +88,6 @@ function DOLLAR() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Linear/DOLLAR_f.js b/js/Linear/DOLLAR_f.js index fb853821..bdb02f50 100644 --- a/js/Linear/DOLLAR_f.js +++ b/js/Linear/DOLLAR_f.js @@ -15,6 +15,7 @@ function DOLLAR_f() { model.dep_ut = [false,false]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } DOLLAR_f.prototype.details = function DOLLAR_f() { return this.x; @@ -52,5 +53,6 @@ function DOLLAR_f() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Linear/DOLLAR_m.js b/js/Linear/DOLLAR_m.js index 4cd2dfdf..4593731b 100644 --- a/js/Linear/DOLLAR_m.js +++ b/js/Linear/DOLLAR_m.js @@ -15,6 +15,7 @@ function DOLLAR_m() { model.dep_ut = [false,false]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } DOLLAR_m.prototype.details = function DOLLAR_m() { return this.x; @@ -87,5 +88,6 @@ function DOLLAR_m() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Linear/GAINBLK.js b/js/Linear/GAINBLK.js index edab742b..54f2883e 100644 --- a/js/Linear/GAINBLK.js +++ b/js/Linear/GAINBLK.js @@ -18,6 +18,7 @@ function GAINBLK() { exprs = [strcat(sci2exp(gain))]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } GAINBLK.prototype.details = function GAINBLK() { return this.x; @@ -144,5 +145,6 @@ function GAINBLK() { } } } + return new BasicBlock(this.x); } } diff --git a/js/Linear/GAINBLK_f.js b/js/Linear/GAINBLK_f.js index 7c574416..cad23a75 100644 --- a/js/Linear/GAINBLK_f.js +++ b/js/Linear/GAINBLK_f.js @@ -14,6 +14,7 @@ function GAINBLK_f() { exprs = [strcat(sci2exp(gain))]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } GAINBLK_f.prototype.details = function GAINBLK_f() { return this.x; @@ -44,5 +45,6 @@ function GAINBLK_f() { } } } + return new BasicBlock(this.x); } } diff --git a/js/Linear/GAIN_f.js b/js/Linear/GAIN_f.js index 4af1dce9..5188382b 100644 --- a/js/Linear/GAIN_f.js +++ b/js/Linear/GAIN_f.js @@ -14,6 +14,7 @@ function GAIN_f() { exprs = [[strcat(sci2exp(gain))],[strcat(sci2exp(in1))],[strcat(sci2exp(out))]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } GAIN_f.prototype.details = function GAIN_f() { return this.x; @@ -44,5 +45,6 @@ function GAIN_f() { } } } + return new BasicBlock(this.x); } } diff --git a/js/Linear/INTEGRAL.js b/js/Linear/INTEGRAL.js index 4184d619..12b96030 100644 --- a/js/Linear/INTEGRAL.js +++ b/js/Linear/INTEGRAL.js @@ -16,6 +16,7 @@ function INTEGRAL() { gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); this.x.graphics.id = "1/s"; + return new BasicBlock(this.x); } INTEGRAL.prototype.details = function INTEGRAL() { return this.x; @@ -77,5 +78,6 @@ function INTEGRAL() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Linear/INTEGRAL_f.js b/js/Linear/INTEGRAL_f.js index 8867b09b..4f62850c 100644 --- a/js/Linear/INTEGRAL_f.js +++ b/js/Linear/INTEGRAL_f.js @@ -12,6 +12,7 @@ function INTEGRAL_f() { exprs = strcat(sci2exp(x0)); gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } INTEGRAL_f.prototype.details = function INTEGRAL_f() { return this.x; @@ -35,5 +36,6 @@ function INTEGRAL_f() { break; } this.x.model.firing = []; + return new BasicBlock(this.x); } } diff --git a/js/Linear/INTEGRAL_m.js b/js/Linear/INTEGRAL_m.js index f5e0b140..a065917a 100644 --- a/js/Linear/INTEGRAL_m.js +++ b/js/Linear/INTEGRAL_m.js @@ -17,6 +17,7 @@ function INTEGRAL_m() { exprs = string([[0],[0],[0],[maxp],[minp]]); gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } INTEGRAL_m.prototype.details = function INTEGRAL_m() { return this.x; @@ -120,5 +121,6 @@ function INTEGRAL_m() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Linear/PID.js b/js/Linear/PID.js index a1d4d8cd..d4590682 100644 --- a/js/Linear/PID.js +++ b/js/Linear/PID.js @@ -37,6 +37,7 @@ function PID() { model.rpar = scs_m; gr_i = []; this.x = standard_define([2,2],model,[],gr_i); + return new BasicBlock(this.x); } PID.prototype.details = function PID() { return this.x; @@ -113,5 +114,6 @@ function PID() { this.x = arg1; y = max(y,needcompile); typ = newpar; + return new BasicBlock(this.x); } } diff --git a/js/Linear/REGISTER.js b/js/Linear/REGISTER.js index cc57e75d..2dac88e7 100644 --- a/js/Linear/REGISTER.js +++ b/js/Linear/REGISTER.js @@ -13,6 +13,7 @@ function REGISTER() { exprs = strcat(string(z0),";"); gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } REGISTER.prototype.details = function REGISTER() { return this.x; @@ -78,5 +79,6 @@ function REGISTER() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Linear/REGISTER_f.js b/js/Linear/REGISTER_f.js index f7d1a3f9..9297f41b 100644 --- a/js/Linear/REGISTER_f.js +++ b/js/Linear/REGISTER_f.js @@ -13,6 +13,7 @@ function REGISTER_f() { exprs = strcat(string(z0),";"); gr_i = []; this.x = standard_define([2.5,2.5],model,exprs,gr_i); + return new BasicBlock(this.x); } REGISTER_f.prototype.details = function REGISTER_f() { return this.x; @@ -41,5 +42,6 @@ function REGISTER_f() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Linear/SAMPHOLD.js b/js/Linear/SAMPHOLD.js index 1df8635a..6f7957f0 100644 --- a/js/Linear/SAMPHOLD.js +++ b/js/Linear/SAMPHOLD.js @@ -11,6 +11,7 @@ function SAMPHOLD() { model.dep_ut = [true,false]; gr_i = []; this.x = standard_define([2,2],model," ",gr_i); + return new BasicBlock(this.x); } SAMPHOLD.prototype.details = function SAMPHOLD() { return this.x; @@ -20,5 +21,6 @@ function SAMPHOLD() { SAMPHOLD.prototype.set = function SAMPHOLD() { this.x = arg1; this.x.model.firing = []; + return new BasicBlock(this.x); } } diff --git a/js/Linear/SAMPHOLD_m.js b/js/Linear/SAMPHOLD_m.js index c661ad7e..7b2c360e 100644 --- a/js/Linear/SAMPHOLD_m.js +++ b/js/Linear/SAMPHOLD_m.js @@ -15,6 +15,7 @@ function SAMPHOLD_m() { label = [sci2exp(1)]; gr_i = []; this.x = standard_define([2,2],model,label,gr_i); + return new BasicBlock(this.x); } SAMPHOLD_m.prototype.details = function SAMPHOLD_m() { return this.x; @@ -48,5 +49,6 @@ function SAMPHOLD_m() { } } } + return new BasicBlock(this.x); } } diff --git a/js/Linear/SAMPLEHOLD_f.js b/js/Linear/SAMPLEHOLD_f.js index 916f2834..9ad513d1 100644 --- a/js/Linear/SAMPLEHOLD_f.js +++ b/js/Linear/SAMPLEHOLD_f.js @@ -11,6 +11,7 @@ function SAMPLEHOLD_f() { model.dep_ut = [true,false]; gr_i = []; this.x = standard_define([2,2],model," ",gr_i); + return new BasicBlock(this.x); } SAMPLEHOLD_f.prototype.details = function SAMPLEHOLD_f() { return this.x; @@ -20,5 +21,6 @@ function SAMPLEHOLD_f() { SAMPLEHOLD_f.prototype.set = function SAMPLEHOLD_f() { this.x = arg1; this.x.model.firing = []; + return new BasicBlock(this.x); } } diff --git a/js/Linear/SOM_f.js b/js/Linear/SOM_f.js index 0e4cedcc..1efd0e09 100644 --- a/js/Linear/SOM_f.js +++ b/js/Linear/SOM_f.js @@ -12,6 +12,7 @@ function SOM_f() { exprs = [[sci2exp(1)],[sci2exp(sgn)]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } SOM_f.prototype.details = function SOM_f() { return this.x; @@ -37,5 +38,6 @@ function SOM_f() { str = [["This sum block is obsolete","parameters cannot be modified. Please replace it with new sum block"],["and gain blocks in the linear palette"," ","Input ports are located at up, side and down positions.","Current gains are:"]]; str = [[str],[(part(labs.slice(),1,7)+exprs.slice())]]; message(str); + return new BasicBlock(this.x); } } diff --git a/js/Linear/SUMMATION.js b/js/Linear/SUMMATION.js index 4b5481ec..1b2a2efb 100644 --- a/js/Linear/SUMMATION.js +++ b/js/Linear/SUMMATION.js @@ -14,6 +14,7 @@ function SUMMATION() { exprs = sci2exp(sgn); gr_i = []; this.x = standard_define([2,3],model,exprs,gr_i); + return new BasicBlock(this.x); } SUMMATION.prototype.details = function SUMMATION() { return this.x; @@ -134,5 +135,6 @@ function SUMMATION() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Linear/SUM_f.js b/js/Linear/SUM_f.js index a9f25a10..edff7191 100644 --- a/js/Linear/SUM_f.js +++ b/js/Linear/SUM_f.js @@ -10,6 +10,7 @@ function SUM_f() { gr_i = []; exprs = []; this.x = standard_define([1,1],model,exprs,gr_i); + return new BasicBlock(this.x); } SUM_f.prototype.details = function SUM_f() { return this.x; @@ -18,5 +19,6 @@ function SUM_f() { } SUM_f.prototype.set = function SUM_f() { this.x = arg1; + return new BasicBlock(this.x); } } diff --git a/js/Linear/TCLSS.js b/js/Linear/TCLSS.js index e6a19aa3..4d7dfc72 100644 --- a/js/Linear/TCLSS.js +++ b/js/Linear/TCLSS.js @@ -21,6 +21,7 @@ function TCLSS() { exprs = [[strcat(sci2exp(A))],[strcat(sci2exp(B))],[strcat(sci2exp(C))],[strcat(sci2exp(D))],[strcat(sci2exp(x0))]]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } TCLSS.prototype.details = function TCLSS() { return this.x; @@ -81,5 +82,6 @@ function TCLSS() { } } } + return new BasicBlock(this.x); } } diff --git a/js/Linear/TCLSS_f.js b/js/Linear/TCLSS_f.js index fd5483b1..95a6d6bb 100644 --- a/js/Linear/TCLSS_f.js +++ b/js/Linear/TCLSS_f.js @@ -21,6 +21,7 @@ function TCLSS_f() { exprs = [[strcat(sci2exp(A))],[strcat(sci2exp(B))],[strcat(sci2exp(C))],[strcat(sci2exp(D))],[strcat(sci2exp(x0))]]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } TCLSS_f.prototype.details = function TCLSS_f() { return this.x; @@ -81,5 +82,6 @@ function TCLSS_f() { } } } + return new BasicBlock(this.x); } } diff --git a/js/Linear/TIME_DELAY.js b/js/Linear/TIME_DELAY.js index 8834f518..d90a39e1 100644 --- a/js/Linear/TIME_DELAY.js +++ b/js/Linear/TIME_DELAY.js @@ -16,6 +16,7 @@ function TIME_DELAY() { exprs = [[string(T)],[string(init)],[string(N)]]; gr_i = []; this.x = standard_define([3.5,2],model,exprs,gr_i); + return new BasicBlock(this.x); } TIME_DELAY.prototype.details = function TIME_DELAY() { return this.x; @@ -54,5 +55,6 @@ function TIME_DELAY() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Linear/VARIABLE_DELAY.js b/js/Linear/VARIABLE_DELAY.js index f1607678..047aa265 100644 --- a/js/Linear/VARIABLE_DELAY.js +++ b/js/Linear/VARIABLE_DELAY.js @@ -16,6 +16,7 @@ function VARIABLE_DELAY() { exprs = [[string(T)],[string(init)],[string(N)]]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } VARIABLE_DELAY.prototype.details = function VARIABLE_DELAY() { return this.x; @@ -53,5 +54,6 @@ function VARIABLE_DELAY() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/MatrixOp/CUMSUM.js b/js/MatrixOp/CUMSUM.js index 362ece2f..b2bcb38e 100644 --- a/js/MatrixOp/CUMSUM.js +++ b/js/MatrixOp/CUMSUM.js @@ -23,6 +23,7 @@ function CUMSUM() { label = [[sci2exp(1)],[sci2exp(0)]]; gr_i = []; this.x = standard_define([3,2],model,label,gr_i); + return new BasicBlock(this.x); } CUMSUM.prototype.details = function CUMSUM() { return this.x; @@ -91,5 +92,6 @@ function CUMSUM() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/MatrixOp/EXTRACT.js b/js/MatrixOp/EXTRACT.js index 4afd5810..73b1f888 100644 --- a/js/MatrixOp/EXTRACT.js +++ b/js/MatrixOp/EXTRACT.js @@ -23,6 +23,7 @@ function EXTRACT() { label = [[sci2exp(1)],[sci2exp([1])],[sci2exp([1])]]; gr_i = []; this.x = standard_define([3,2],model,label,gr_i); + return new BasicBlock(this.x); } EXTRACT.prototype.details = function EXTRACT() { return this.x; @@ -89,5 +90,6 @@ function EXTRACT() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/MatrixOp/EXTTRI.js b/js/MatrixOp/EXTTRI.js index 5ebaaf18..00eafa27 100644 --- a/js/MatrixOp/EXTTRI.js +++ b/js/MatrixOp/EXTTRI.js @@ -23,6 +23,7 @@ function EXTTRI() { label = [[sci2exp(1)],[sci2exp(1)]]; gr_i = []; this.x = standard_define([3,2],model,label,gr_i); + return new BasicBlock(this.x); } EXTTRI.prototype.details = function EXTTRI() { return this.x; @@ -88,5 +89,6 @@ function EXTTRI() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/MatrixOp/MATBKSL.js b/js/MatrixOp/MATBKSL.js index 06235455..f956a990 100644 --- a/js/MatrixOp/MATBKSL.js +++ b/js/MatrixOp/MATBKSL.js @@ -23,6 +23,7 @@ function MATBKSL() { label = [sci2exp(1)]; gr_i = []; this.x = standard_define([2,2],model,label,gr_i); + return new BasicBlock(this.x); } MATBKSL.prototype.details = function MATBKSL() { return this.x; @@ -68,5 +69,6 @@ function MATBKSL() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/MatrixOp/MATCATH.js b/js/MatrixOp/MATCATH.js index f365bb52..b1d626d8 100644 --- a/js/MatrixOp/MATCATH.js +++ b/js/MatrixOp/MATCATH.js @@ -23,6 +23,7 @@ function MATCATH() { label = [sci2exp(2)]; gr_i = []; this.x = standard_define([2,3],model,label,gr_i); + return new BasicBlock(this.x); } MATCATH.prototype.details = function MATCATH() { return this.x; @@ -58,5 +59,6 @@ function MATCATH() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/MatrixOp/MATCATV.js b/js/MatrixOp/MATCATV.js index 7e011ea2..d635fb4f 100644 --- a/js/MatrixOp/MATCATV.js +++ b/js/MatrixOp/MATCATV.js @@ -24,6 +24,7 @@ function MATCATV() { label = [sci2exp(2)]; gr_i = []; this.x = standard_define([2,3],model,label,gr_i); + return new BasicBlock(this.x); } MATCATV.prototype.details = function MATCATV() { return this.x; @@ -59,5 +60,6 @@ function MATCATV() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/MatrixOp/MATDET.js b/js/MatrixOp/MATDET.js index 176268ce..fc12d549 100644 --- a/js/MatrixOp/MATDET.js +++ b/js/MatrixOp/MATDET.js @@ -23,6 +23,7 @@ function MATDET() { label = [sci2exp(1)]; gr_i = []; this.x = standard_define([2,2],model,label,gr_i); + return new BasicBlock(this.x); } MATDET.prototype.details = function MATDET() { return this.x; @@ -68,5 +69,6 @@ function MATDET() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/MatrixOp/MATDIAG.js b/js/MatrixOp/MATDIAG.js index 8f76bb54..fae53116 100644 --- a/js/MatrixOp/MATDIAG.js +++ b/js/MatrixOp/MATDIAG.js @@ -23,6 +23,7 @@ function MATDIAG() { label = [sci2exp(1)]; gr_i = []; this.x = standard_define([2,2],model,label,gr_i); + return new BasicBlock(this.x); } MATDIAG.prototype.details = function MATDIAG() { return this.x; @@ -68,5 +69,6 @@ function MATDIAG() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/MatrixOp/MATDIV.js b/js/MatrixOp/MATDIV.js index 64a39f47..38f01397 100644 --- a/js/MatrixOp/MATDIV.js +++ b/js/MatrixOp/MATDIV.js @@ -23,6 +23,7 @@ function MATDIV() { label = [sci2exp(1)]; gr_i = []; this.x = standard_define([2,2],model,label,gr_i); + return new BasicBlock(this.x); } MATDIV.prototype.details = function MATDIV() { return this.x; @@ -68,5 +69,6 @@ function MATDIV() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/MatrixOp/MATEIG.js b/js/MatrixOp/MATEIG.js index 5cda9f2a..4fa713d0 100644 --- a/js/MatrixOp/MATEIG.js +++ b/js/MatrixOp/MATEIG.js @@ -23,6 +23,7 @@ function MATEIG() { label = [[sci2exp(1)],[sci2exp(1)]]; gr_i = []; this.x = standard_define([2,2],model,label,gr_i); + return new BasicBlock(this.x); } MATEIG.prototype.details = function MATEIG() { return this.x; @@ -89,5 +90,6 @@ function MATEIG() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/MatrixOp/MATEXPM.js b/js/MatrixOp/MATEXPM.js index 0c9e22ef..5053663d 100644 --- a/js/MatrixOp/MATEXPM.js +++ b/js/MatrixOp/MATEXPM.js @@ -23,6 +23,7 @@ function MATEXPM() { label = [sci2exp(1)]; gr_i = []; this.x = standard_define([2,2],model,label,gr_i); + return new BasicBlock(this.x); } MATEXPM.prototype.details = function MATEXPM() { return this.x; @@ -68,5 +69,6 @@ function MATEXPM() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/MatrixOp/MATINV.js b/js/MatrixOp/MATINV.js index f260f75b..b495de7d 100644 --- a/js/MatrixOp/MATINV.js +++ b/js/MatrixOp/MATINV.js @@ -23,6 +23,7 @@ function MATINV() { label = [sci2exp(1)]; gr_i = []; this.x = standard_define([2,2],model,label,gr_i); + return new BasicBlock(this.x); } MATINV.prototype.details = function MATINV() { return this.x; @@ -68,5 +69,6 @@ function MATINV() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/MatrixOp/MATLU.js b/js/MatrixOp/MATLU.js index 24f53803..51c5af6a 100644 --- a/js/MatrixOp/MATLU.js +++ b/js/MatrixOp/MATLU.js @@ -23,6 +23,7 @@ function MATLU() { label = sci2exp(1); gr_i = []; this.x = standard_define([2,2],model,label,gr_i); + return new BasicBlock(this.x); } MATLU.prototype.details = function MATLU() { return this.x; @@ -66,5 +67,6 @@ function MATLU() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/MatrixOp/MATMAGPHI.js b/js/MatrixOp/MATMAGPHI.js index 4716d263..3047ca48 100644 --- a/js/MatrixOp/MATMAGPHI.js +++ b/js/MatrixOp/MATMAGPHI.js @@ -23,6 +23,7 @@ function MATMAGPHI() { label = [sci2exp(1)]; gr_i = []; this.x = standard_define([3,2],model,label,gr_i); + return new BasicBlock(this.x); } MATMAGPHI.prototype.details = function MATMAGPHI() { return this.x; @@ -72,5 +73,6 @@ function MATMAGPHI() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/MatrixOp/MATMUL.js b/js/MatrixOp/MATMUL.js index 0d8657b1..e3f1dd0b 100644 --- a/js/MatrixOp/MATMUL.js +++ b/js/MatrixOp/MATMUL.js @@ -12,6 +12,7 @@ function MATMUL() { label = [sci2exp(model.ipar)]; gr_i = []; this.x = standard_define([3,2],model,label,gr_i); + return new BasicBlock(this.x); } MATMUL.prototype.details = function MATMUL() { return this.x; @@ -148,5 +149,6 @@ function MATMUL() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/MatrixOp/MATPINV.js b/js/MatrixOp/MATPINV.js index 467ea072..e21a49dc 100644 --- a/js/MatrixOp/MATPINV.js +++ b/js/MatrixOp/MATPINV.js @@ -23,6 +23,7 @@ function MATPINV() { label = [sci2exp(1)]; gr_i = []; this.x = standard_define([2,2],model,label,gr_i); + return new BasicBlock(this.x); } MATPINV.prototype.details = function MATPINV() { return this.x; @@ -68,5 +69,6 @@ function MATPINV() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/MatrixOp/MATRESH.js b/js/MatrixOp/MATRESH.js index a20293de..b2e357a2 100644 --- a/js/MatrixOp/MATRESH.js +++ b/js/MatrixOp/MATRESH.js @@ -23,6 +23,7 @@ function MATRESH() { label = [[sci2exp(1)],[sci2exp([1,1])],[sci2exp([1,1])]]; gr_i = []; this.x = standard_define([3,2],model,label,gr_i); + return new BasicBlock(this.x); } MATRESH.prototype.details = function MATRESH() { return this.x; @@ -93,5 +94,6 @@ function MATRESH() { } } needcompile=resume(needcompile) + return new BasicBlock(this.x); } } diff --git a/js/MatrixOp/MATSING.js b/js/MatrixOp/MATSING.js index cd5daad6..aefdb157 100644 --- a/js/MatrixOp/MATSING.js +++ b/js/MatrixOp/MATSING.js @@ -23,6 +23,7 @@ function MATSING() { label = [[sci2exp(1)],[sci2exp(1)]]; gr_i = []; this.x = standard_define([2,2],model,label,gr_i); + return new BasicBlock(this.x); } MATSING.prototype.details = function MATSING() { return this.x; @@ -92,5 +93,6 @@ function MATSING() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/MatrixOp/MATSUM.js b/js/MatrixOp/MATSUM.js index 894c5a97..dee13795 100644 --- a/js/MatrixOp/MATSUM.js +++ b/js/MatrixOp/MATSUM.js @@ -23,6 +23,7 @@ function MATSUM() { label = [[sci2exp(1)],[sci2exp(0)]]; gr_i = []; this.x = standard_define([3,2],model,label,gr_i); + return new BasicBlock(this.x); } MATSUM.prototype.details = function MATSUM() { return this.x; @@ -93,5 +94,6 @@ function MATSUM() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/MatrixOp/MATTRAN.js b/js/MatrixOp/MATTRAN.js index 4cef2ada..3baaa628 100644 --- a/js/MatrixOp/MATTRAN.js +++ b/js/MatrixOp/MATTRAN.js @@ -11,6 +11,7 @@ function MATTRAN() { label = [sci2exp(1)]; gr_i = []; this.x = standard_define([3,2],model,label,gr_i); + return new BasicBlock(this.x); } MATTRAN.prototype.details = function MATTRAN() { return this.x; @@ -60,5 +61,6 @@ function MATTRAN() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/MatrixOp/MATZCONJ.js b/js/MatrixOp/MATZCONJ.js index 382a025c..438500e2 100644 --- a/js/MatrixOp/MATZCONJ.js +++ b/js/MatrixOp/MATZCONJ.js @@ -23,6 +23,7 @@ function MATZCONJ() { label = []; gr_i = []; this.x = standard_define([2,2],model,label,gr_i); + return new BasicBlock(this.x); } MATZCONJ.prototype.details = function MATZCONJ() { return this.x; @@ -31,5 +32,6 @@ function MATZCONJ() { } MATZCONJ.prototype.set = function MATZCONJ() { this.x = arg1; + return new BasicBlock(this.x); } } diff --git a/js/MatrixOp/MATZREIM.js b/js/MatrixOp/MATZREIM.js index f332d237..a2f7ea3b 100644 --- a/js/MatrixOp/MATZREIM.js +++ b/js/MatrixOp/MATZREIM.js @@ -23,6 +23,7 @@ function MATZREIM() { label = sci2exp(1); gr_i = []; this.x = standard_define([3,2],model,label,gr_i); + return new BasicBlock(this.x); } MATZREIM.prototype.details = function MATZREIM() { return this.x; @@ -72,5 +73,6 @@ function MATZREIM() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/MatrixOp/RICC.js b/js/MatrixOp/RICC.js index 037c41eb..44e698eb 100644 --- a/js/MatrixOp/RICC.js +++ b/js/MatrixOp/RICC.js @@ -23,6 +23,7 @@ function RICC() { label = [[sci2exp(1)],[sci2exp(1)]]; gr_i = []; this.x = standard_define([2,2],model,label,gr_i); + return new BasicBlock(this.x); } RICC.prototype.details = function RICC() { return this.x; @@ -57,5 +58,6 @@ function RICC() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/MatrixOp/ROOTCOEF.js b/js/MatrixOp/ROOTCOEF.js index 8e968567..7f17176d 100644 --- a/js/MatrixOp/ROOTCOEF.js +++ b/js/MatrixOp/ROOTCOEF.js @@ -23,6 +23,7 @@ function ROOTCOEF() { label = [[sci2exp(1)],[sci2exp(1)]]; gr_i = []; this.x = standard_define([3,2],model,label,gr_i); + return new BasicBlock(this.x); } ROOTCOEF.prototype.details = function ROOTCOEF() { return this.x; @@ -68,5 +69,6 @@ function ROOTCOEF() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/MatrixOp/SQRT.js b/js/MatrixOp/SQRT.js index f686b27a..4dba0fcd 100644 --- a/js/MatrixOp/SQRT.js +++ b/js/MatrixOp/SQRT.js @@ -13,6 +13,7 @@ function SQRT() { label = [sci2exp(1)]; gr_i = []; this.x = standard_define([2,2],model,label,gr_i); + return new BasicBlock(this.x); } SQRT.prototype.details = function SQRT() { return this.x; @@ -53,5 +54,6 @@ function SQRT() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/MatrixOp/SUBMAT.js b/js/MatrixOp/SUBMAT.js index a797b764..9f9dcc68 100644 --- a/js/MatrixOp/SUBMAT.js +++ b/js/MatrixOp/SUBMAT.js @@ -23,6 +23,7 @@ function SUBMAT() { label = [[sci2exp(1)],[sci2exp(1)],[sci2exp(1)],[sci2exp(1)],[sci2exp(1)]]; gr_i = []; this.x = standard_define([2.5,2],model,label,gr_i); + return new BasicBlock(this.x); } SUBMAT.prototype.details = function SUBMAT() { return this.x; @@ -89,5 +90,6 @@ function SUBMAT() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Misc/AUTOMAT.js b/js/Misc/AUTOMAT.js index 42d505f6..c2f59ffb 100644 --- a/js/Misc/AUTOMAT.js +++ b/js/Misc/AUTOMAT.js @@ -25,6 +25,7 @@ function AUTOMAT() { model.rpar = rpar; gr_i = []; this.x = standard_define([4,2],model,exprs,gr_i); + return new BasicBlock(this.x); } AUTOMAT.prototype.details = function AUTOMAT() { return this.x; @@ -131,5 +132,6 @@ function AUTOMAT() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Misc/BACKLASH.js b/js/Misc/BACKLASH.js index 38897766..3f3b3c3d 100644 --- a/js/Misc/BACKLASH.js +++ b/js/Misc/BACKLASH.js @@ -12,6 +12,7 @@ function BACKLASH() { model.dep_ut = [true,false]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } BACKLASH.prototype.details = function BACKLASH() { return this.x; @@ -44,5 +45,6 @@ function BACKLASH() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Misc/BOUNCE.js b/js/Misc/BOUNCE.js index 1689f888..a9558881 100644 --- a/js/Misc/BOUNCE.js +++ b/js/Misc/BOUNCE.js @@ -36,6 +36,7 @@ function BOUNCE() { exprs = [[strcat(sci2exp(rpar1))],[strcat(sci2exp(rpar2))],[strcat(sci2exp(walls))],[strcat(sci2exp(this.x))],[strcat(sci2exp(xd))],[strcat(sci2exp(y))],[strcat(sci2exp(yd))]]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } BOUNCE.prototype.details = function BOUNCE() { return this.x; @@ -104,5 +105,6 @@ function BOUNCE() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Misc/BOUNCEXY.js b/js/Misc/BOUNCEXY.js index 22e71214..694adf68 100644 --- a/js/Misc/BOUNCEXY.js +++ b/js/Misc/BOUNCEXY.js @@ -33,6 +33,7 @@ function BOUNCEXY() { exprs = [[strcat(sci2exp(clrs))],[strcat(sci2exp(siz))],[strcat(sci2exp(win))],[strcat(sci2exp(1))],[strcat(sci2exp(xmin))],[strcat(sci2exp(xmax))],[strcat(sci2exp(ymin))],[strcat(sci2exp(ymax))]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } BOUNCEXY.prototype.details = function BOUNCEXY() { return this.x; @@ -90,5 +91,6 @@ function BOUNCEXY() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Misc/BPLATFORM.js b/js/Misc/BPLATFORM.js index c2798629..ec1ad3a7 100644 --- a/js/Misc/BPLATFORM.js +++ b/js/Misc/BPLATFORM.js @@ -19,6 +19,7 @@ function BPLATFORM() { exprs = string(model.rpar); gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } BPLATFORM.prototype.details = function BPLATFORM() { return this.x; @@ -60,5 +61,6 @@ function BPLATFORM() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Misc/CBLOCK.js b/js/Misc/CBLOCK.js index d119c0bb..79830868 100644 --- a/js/Misc/CBLOCK.js +++ b/js/Misc/CBLOCK.js @@ -30,6 +30,7 @@ function CBLOCK() { label = list(transpose([funam,"n",sci2exp(in1),sci2exp(out),sci2exp(clkin),sci2exp(clkout),sci2exp(x0),sci2exp(0),sci2exp(z0),sci2exp(rpar),sci2exp(ipar),sci2exp(auto),"y","n"]),[]); gr_i = []; this.x = standard_define([4,2],model,label,gr_i); + return new BasicBlock(this.x); } CBLOCK.prototype.details = function CBLOCK() { return this.x; @@ -125,5 +126,6 @@ function CBLOCK() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Misc/CBLOCK4.js b/js/Misc/CBLOCK4.js index aa5861a4..f0d39733 100644 --- a/js/Misc/CBLOCK4.js +++ b/js/Misc/CBLOCK4.js @@ -14,6 +14,7 @@ function CBLOCK4() { label = list([[funam],["n"],[sci2exp([model.in1,model.in2])],[sci2exp(model.intyp)],[sci2exp([model.out,model.out2])],[sci2exp(model.outtyp)],[sci2exp(model.evtin)],[sci2exp(model.evtout)],[sci2exp(model.state)],[sci2exp(model.dstate)],[sci2exp(model.odstate)],[sci2exp(model.rpar)],[sci2exp(model.ipar)],[sci2exp(model.opar)],[sci2exp(model.nmode)],[sci2exp(model.nzcross)],[sci2exp(model.firing)],["y"],["n"]],[]); gr_i = []; this.x = standard_define([4,2],model,label,gr_i); + return new BasicBlock(this.x); } CBLOCK4.prototype.details = function CBLOCK4() { return this.x; @@ -107,5 +108,6 @@ function CBLOCK4() { } } } + return new BasicBlock(this.x); } } diff --git a/js/Misc/CONSTRAINT2_c.js b/js/Misc/CONSTRAINT2_c.js index 50012f65..bf52312c 100644 --- a/js/Misc/CONSTRAINT2_c.js +++ b/js/Misc/CONSTRAINT2_c.js @@ -15,6 +15,7 @@ function CONSTRAINT2_c() { exprs = list(strcat(sci2exp(x0)),strcat(sci2exp(xd0)),strcat(sci2exp(id))); gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } CONSTRAINT2_c.prototype.details = function CONSTRAINT2_c() { return this.x; @@ -69,5 +70,6 @@ function CONSTRAINT2_c() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Misc/CONSTRAINT_c.js b/js/Misc/CONSTRAINT_c.js index eba60cb5..33b9a1d5 100644 --- a/js/Misc/CONSTRAINT_c.js +++ b/js/Misc/CONSTRAINT_c.js @@ -13,6 +13,7 @@ function CONSTRAINT_c() { exprs = "0"; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } CONSTRAINT_c.prototype.details = function CONSTRAINT_c() { return this.x; @@ -47,5 +48,6 @@ function CONSTRAINT_c() { } } } + return new BasicBlock(this.x); } } diff --git a/js/Misc/DEADBAND.js b/js/Misc/DEADBAND.js index 45f7ee9d..f1a0f417 100644 --- a/js/Misc/DEADBAND.js +++ b/js/Misc/DEADBAND.js @@ -16,6 +16,7 @@ function DEADBAND() { exprs = [[string(maxp)],[string(minp)],[string(model.nmode)]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } DEADBAND.prototype.details = function DEADBAND() { return this.x; @@ -50,5 +51,6 @@ function DEADBAND() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Misc/DEBUG.js b/js/Misc/DEBUG.js index 7c29a588..70f7ce11 100644 --- a/js/Misc/DEBUG.js +++ b/js/Misc/DEBUG.js @@ -7,6 +7,7 @@ function DEBUG() { exprs = list("","xcos_debug_gui(flag,block);"); gr_i = []; this.x = standard_define([8,2],model,exprs,gr_i); + return new BasicBlock(this.x); } DEBUG.prototype.details = function DEBUG() { return this.x; @@ -45,5 +46,6 @@ function DEBUG() { graphics.exprs = exprs; this.x.graphics = graphics; } + return new BasicBlock(this.x); } } diff --git a/js/Misc/DEBUG_SCICOS.js b/js/Misc/DEBUG_SCICOS.js index b6ecb6ac..48e93ccc 100644 --- a/js/Misc/DEBUG_SCICOS.js +++ b/js/Misc/DEBUG_SCICOS.js @@ -2,6 +2,7 @@ function DEBUG_SCICOS() { DEBUG_SCICOS.prototype.define = function DEBUG_SCICOS() { this.x = DEBUG("define"); + return new BasicBlock(this.x); } DEBUG_SCICOS.prototype.details = function DEBUG_SCICOS() { return this.x; @@ -11,5 +12,6 @@ function DEBUG_SCICOS() { DEBUG_SCICOS.prototype.set = function DEBUG_SCICOS() { arg1.gui = "DEBUG"; [this.x,y,typ] = DEBUG("set",arg1); + return new BasicBlock(this.x); } } diff --git a/js/Misc/DIFF_f.js b/js/Misc/DIFF_f.js index 2378c548..9e374115 100644 --- a/js/Misc/DIFF_f.js +++ b/js/Misc/DIFF_f.js @@ -12,6 +12,7 @@ function DIFF_f() { exprs = [[strcat(sci2exp(x0[1-1]))],[strcat(sci2exp(x0[2-1]))]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } DIFF_f.prototype.details = function DIFF_f() { return this.x; @@ -35,5 +36,6 @@ function DIFF_f() { break; } this.x.model.firing = []; + return new BasicBlock(this.x); } } diff --git a/js/Misc/DSUPER.js b/js/Misc/DSUPER.js index 4e8f079f..67b98d9d 100644 --- a/js/Misc/DSUPER.js +++ b/js/Misc/DSUPER.js @@ -1,6 +1,7 @@ /* autogenerated from "macros/Misc/DSUPER.sci" */ function DSUPER() { DSUPER.prototype.define = function DSUPER() { + return new BasicBlock(this.x); } DSUPER.prototype.details = function DSUPER() { return this.x; @@ -48,5 +49,6 @@ function DSUPER() { } else { this.x = arg1; } + return new BasicBlock(this.x); } } diff --git a/js/Misc/EDGETRIGGER.js b/js/Misc/EDGETRIGGER.js index a91acc88..5cffb67e 100644 --- a/js/Misc/EDGETRIGGER.js +++ b/js/Misc/EDGETRIGGER.js @@ -14,6 +14,7 @@ function EDGETRIGGER() { exprs = [string(edge)]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } EDGETRIGGER.prototype.details = function EDGETRIGGER() { return this.x; @@ -36,5 +37,6 @@ function EDGETRIGGER() { this.x.model = model; break; } + return new BasicBlock(this.x); } } diff --git a/js/Misc/EDGE_TRIGGER.js b/js/Misc/EDGE_TRIGGER.js index efd03837..f0aeb9ff 100644 --- a/js/Misc/EDGE_TRIGGER.js +++ b/js/Misc/EDGE_TRIGGER.js @@ -79,6 +79,7 @@ function EDGE_TRIGGER() { model.rpar = scs_m_1; gr_i = []; this.x = standard_define([3,2],model,[],gr_i); + return new BasicBlock(this.x); } EDGE_TRIGGER.prototype.details = function EDGE_TRIGGER() { return this.x; @@ -153,5 +154,6 @@ function EDGE_TRIGGER() { } this.x = arg1; typ = newpar; + return new BasicBlock(this.x); } } diff --git a/js/Misc/ENDBLK.js b/js/Misc/ENDBLK.js index ad60a07f..384c2020 100644 --- a/js/Misc/ENDBLK.js +++ b/js/Misc/ENDBLK.js @@ -7,6 +7,7 @@ function ENDBLK() { model = scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()); gr_i = []; this.x = standard_define([2,2],model,[],gr_i); + return new BasicBlock(this.x); } ENDBLK.prototype.details = function ENDBLK() { return this.x; @@ -81,5 +82,6 @@ function ENDBLK() { } this.x = arg1; typ = newpar; + return new BasicBlock(this.x); } } diff --git a/js/Misc/Extract_Activation.js b/js/Misc/Extract_Activation.js index cfd50124..fcb729d6 100644 --- a/js/Misc/Extract_Activation.js +++ b/js/Misc/Extract_Activation.js @@ -84,6 +84,7 @@ function Extract_Activation() { model.rpar = scs_m_1; gr_i = []; this.x = standard_define([3,2],model,[],gr_i); + return new BasicBlock(this.x); } Extract_Activation.prototype.details = function Extract_Activation() { return this.x; @@ -92,5 +93,6 @@ function Extract_Activation() { } Extract_Activation.prototype.set = function Extract_Activation() { this.x = arg1; + return new BasicBlock(this.x); } } diff --git a/js/Misc/HYSTHERESIS.js b/js/Misc/HYSTHERESIS.js index 143022ac..da9e1b60 100644 --- a/js/Misc/HYSTHERESIS.js +++ b/js/Misc/HYSTHERESIS.js @@ -17,6 +17,7 @@ function HYSTHERESIS() { exprs = [[string(rpar)],[string(sign(nzz))]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } HYSTHERESIS.prototype.details = function HYSTHERESIS() { return this.x; @@ -47,5 +48,6 @@ function HYSTHERESIS() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Misc/IMPSPLIT_f.js b/js/Misc/IMPSPLIT_f.js index 13d25e0b..ddbc3450 100644 --- a/js/Misc/IMPSPLIT_f.js +++ b/js/Misc/IMPSPLIT_f.js @@ -13,6 +13,7 @@ function IMPSPLIT_f() { this.x = standard_define([1,1]/3,model,[],[]); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I","I"]; + return new BasicBlock(this.x); } IMPSPLIT_f.prototype.details = function IMPSPLIT_f() { return this.x; @@ -21,5 +22,6 @@ function IMPSPLIT_f() { } IMPSPLIT_f.prototype.set = function IMPSPLIT_f() { this.x = arg1; + return new BasicBlock(this.x); } } diff --git a/js/Misc/LOGICAL_OP.js b/js/Misc/LOGICAL_OP.js index 66ddcac6..6d875b4c 100644 --- a/js/Misc/LOGICAL_OP.js +++ b/js/Misc/LOGICAL_OP.js @@ -14,6 +14,7 @@ function LOGICAL_OP() { exprs = [[string(nin)],[string(ipar)]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } LOGICAL_OP.prototype.details = function LOGICAL_OP() { return this.x; @@ -109,5 +110,6 @@ function LOGICAL_OP() { } } } + return new BasicBlock(this.x); } } diff --git a/js/Misc/MBLOCK.js b/js/Misc/MBLOCK.js index 2b478a8a..bf6d83e4 100644 --- a/js/Misc/MBLOCK.js +++ b/js/Misc/MBLOCK.js @@ -30,6 +30,7 @@ function MBLOCK() { this.x = standard_define([3,2],model,exprs,gr_i); this.x.graphics.in_implicit = this.intype; this.x.graphics.out_implicit = this.outtype; + return new BasicBlock(this.x); } MBLOCK.prototype.details = function MBLOCK() { return this.x; @@ -270,5 +271,6 @@ function MBLOCK() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Misc/MEMORY_f.js b/js/Misc/MEMORY_f.js index cb8c1333..46528ac6 100644 --- a/js/Misc/MEMORY_f.js +++ b/js/Misc/MEMORY_f.js @@ -15,6 +15,7 @@ function MEMORY_f() { model.dep_ut = [false,false]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } MEMORY_f.prototype.details = function MEMORY_f() { return this.x; @@ -53,5 +54,6 @@ function MEMORY_f() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Misc/MPBLOCK.js b/js/Misc/MPBLOCK.js index f13fed08..911a19d7 100644 --- a/js/Misc/MPBLOCK.js +++ b/js/Misc/MPBLOCK.js @@ -30,6 +30,7 @@ function MPBLOCK() { this.x = standard_define([3,2],model,exprs,gr_i); this.x.graphics.in_implicit = this.intype; this.x.graphics.out_implicit = this.outtype; + return new BasicBlock(this.x); } MPBLOCK.prototype.details = function MPBLOCK() { return this.x; @@ -262,5 +263,6 @@ function MPBLOCK() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Misc/PAL_f.js b/js/Misc/PAL_f.js index 05c7ef2f..ed6fbf21 100644 --- a/js/Misc/PAL_f.js +++ b/js/Misc/PAL_f.js @@ -13,6 +13,7 @@ function PAL_f() { gr_i = []; this.x = standard_define([2,2],model,[],gr_i); this.x.graphics.id = scs.props.title[1-1]; + return new BasicBlock(this.x); } PAL_f.prototype.details = function PAL_f() { return this.x; @@ -27,5 +28,6 @@ function PAL_f() { y = []; typ = []; %exit=resume(false) + return new BasicBlock(this.x); } } diff --git a/js/Misc/PENDULUM_ANIM.js b/js/Misc/PENDULUM_ANIM.js index cebe2d42..5aa97023 100644 --- a/js/Misc/PENDULUM_ANIM.js +++ b/js/Misc/PENDULUM_ANIM.js @@ -19,6 +19,7 @@ function PENDULUM_ANIM() { exprs = string(model.rpar); gr_i = []; this.x = standard_define([3,3],model,exprs,gr_i); + return new BasicBlock(this.x); } PENDULUM_ANIM.prototype.details = function PENDULUM_ANIM() { return this.x; @@ -60,5 +61,6 @@ function PENDULUM_ANIM() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Misc/RATELIMITER.js b/js/Misc/RATELIMITER.js index 4a516d69..5ec433ea 100644 --- a/js/Misc/RATELIMITER.js +++ b/js/Misc/RATELIMITER.js @@ -14,6 +14,7 @@ function RATELIMITER() { exprs = [[string(maxp)],[string(minp)]]; gr_i = []; this.x = standard_define([3.5,2],model,exprs,gr_i); + return new BasicBlock(this.x); } RATELIMITER.prototype.details = function RATELIMITER() { return this.x; @@ -41,5 +42,6 @@ function RATELIMITER() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Misc/RELATIONALOP.js b/js/Misc/RELATIONALOP.js index b78bd2a7..fd096070 100644 --- a/js/Misc/RELATIONALOP.js +++ b/js/Misc/RELATIONALOP.js @@ -14,6 +14,7 @@ function RELATIONALOP() { gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); this.x.graphics.style = ["fontSize=13;fontStyle=1;displayedLabel="+label]; + return new BasicBlock(this.x); } RELATIONALOP.prototype.details = function RELATIONALOP() { return this.x; @@ -90,5 +91,6 @@ function RELATIONALOP() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Misc/SPLIT_f.js b/js/Misc/SPLIT_f.js index da1266e6..ba8449cc 100644 --- a/js/Misc/SPLIT_f.js +++ b/js/Misc/SPLIT_f.js @@ -8,6 +8,7 @@ function SPLIT_f() { model.blocktype = "c"; model.dep_ut = [true,false]; this.x = standard_define([1,1]/3,model,[],[]); + return new BasicBlock(this.x); } SPLIT_f.prototype.details = function SPLIT_f() { return this.x; @@ -16,5 +17,6 @@ function SPLIT_f() { } SPLIT_f.prototype.set = function SPLIT_f() { this.x = arg1; + return new BasicBlock(this.x); } } diff --git a/js/Misc/SUPER_f.js b/js/Misc/SUPER_f.js index 38122ec1..658ee514 100644 --- a/js/Misc/SUPER_f.js +++ b/js/Misc/SUPER_f.js @@ -20,6 +20,7 @@ function SUPER_f() { model.dep_ut = [false,false]; gr_i = []; this.x = standard_define([2,2],model,[],gr_i); + return new BasicBlock(this.x); } SUPER_f.prototype.details = function SUPER_f() { return this.x; @@ -28,5 +29,6 @@ function SUPER_f() { } SUPER_f.prototype.set = function SUPER_f() { xcos(arg1.model.rpar); + return new BasicBlock(this.x); } } diff --git a/js/Misc/TEXT_f.js b/js/Misc/TEXT_f.js index ed29625a..0b8d4b9c 100644 --- a/js/Misc/TEXT_f.js +++ b/js/Misc/TEXT_f.js @@ -13,6 +13,7 @@ function TEXT_f() { graphics.sz = [2,1]; graphics.exprs = exprs; this.x = mlist(["Text","graphics","model","void","gui"],graphics,model," ","TEXT_f"); + return new BasicBlock(this.x); } TEXT_f.prototype.details = function TEXT_f() { return this.x; @@ -63,5 +64,6 @@ function TEXT_f() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Misc/c_block.js b/js/Misc/c_block.js index 2748ac98..77e2cb6d 100644 --- a/js/Misc/c_block.js +++ b/js/Misc/c_block.js @@ -27,6 +27,7 @@ function c_block() { label = list([[sci2exp(in1)],[sci2exp(out)],[strcat(sci2exp(rpar))],[funam]],list([])); gr_i = []; this.x = standard_define([3,2],model,label,gr_i); + return new BasicBlock(this.x); } c_block.prototype.details = function c_block() { return this.x; @@ -71,5 +72,6 @@ function c_block() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Misc/fortran_block.js b/js/Misc/fortran_block.js index b403b16e..7cd0df3e 100644 --- a/js/Misc/fortran_block.js +++ b/js/Misc/fortran_block.js @@ -18,6 +18,7 @@ function fortran_block() { label = list([[sci2exp(model.in1)],[sci2exp(model.out)],[strcat(sci2exp(model.rpar))],[funam]],list([])); gr_i = []; this.x = standard_define([4,2],model,label,gr_i); + return new BasicBlock(this.x); } fortran_block.prototype.details = function fortran_block() { return this.x; @@ -62,5 +63,6 @@ function fortran_block() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Misc/func_block.js b/js/Misc/func_block.js index d8083f99..f66d74a6 100644 --- a/js/Misc/func_block.js +++ b/js/Misc/func_block.js @@ -10,6 +10,7 @@ function func_block() { exprs = "v=sin(u);y=u*v"; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } func_block.prototype.details = function func_block() { return this.x; @@ -29,5 +30,6 @@ function func_block() { this.x.model = model; this.x.graphics = graphics; } + return new BasicBlock(this.x); } } diff --git a/js/Misc/generic_block.js b/js/Misc/generic_block.js index 4b0fea72..9ec5cd22 100644 --- a/js/Misc/generic_block.js +++ b/js/Misc/generic_block.js @@ -19,6 +19,7 @@ function generic_block() { label = [[function_name],[sci2exp(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"]]; gr_i = []; this.x = standard_define([2,2],model,label,gr_i); + return new BasicBlock(this.x); } generic_block.prototype.details = function generic_block() { return this.x; @@ -94,5 +95,6 @@ function generic_block() { } } needcompile=resume(needcompile) + return new BasicBlock(this.x); } } diff --git a/js/Misc/generic_block2.js b/js/Misc/generic_block2.js index c42f797b..7eb9f7f5 100644 --- a/js/Misc/generic_block2.js +++ b/js/Misc/generic_block2.js @@ -19,6 +19,7 @@ function generic_block2() { label = [[function_name],[sci2exp(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.nmode)],[sci2exp(model.nzcross)],[sci2exp(model.firing)],["y"],["n"]]; gr_i = []; this.x = standard_define([2,2],model,label,gr_i); + return new BasicBlock(this.x); } generic_block2.prototype.details = function generic_block2() { return this.x; @@ -96,5 +97,6 @@ function generic_block2() { } } needcompile=resume(needcompile) + return new BasicBlock(this.x); } } diff --git a/js/Misc/generic_block3.js b/js/Misc/generic_block3.js index 179c1613..2b94d741 100644 --- a/js/Misc/generic_block3.js +++ b/js/Misc/generic_block3.js @@ -15,6 +15,7 @@ function generic_block3() { label = [[function_name],[sci2exp(funtyp)],[sci2exp([model.in1,model.in2])],[sci2exp(model.intyp)],[sci2exp([model.out,model.out2]),sci2exp(model.outtyp)],[sci2exp(model.evtin)],[sci2exp(model.evtout)],[sci2exp(model.state)],[sci2exp(model.dstate)],[sci2exp(model.odstate)],[sci2exp(model.rpar)],[sci2exp(model.ipar)],[sci2exp(model.opar)],[sci2exp(model.nmode)],[sci2exp(model.nzcross)],[sci2exp(model.firing)],["y"],["n"]]; gr_i = []; this.x = standard_define([4,2],model,label,gr_i); + return new BasicBlock(this.x); } generic_block3.prototype.details = function generic_block3() { return this.x; @@ -100,5 +101,6 @@ function generic_block3() { } } needcompile=resume(needcompile) + return new BasicBlock(this.x); } } diff --git a/js/Misc/scifunc_block.js b/js/Misc/scifunc_block.js index c491639d..50a5eb63 100644 --- a/js/Misc/scifunc_block.js +++ b/js/Misc/scifunc_block.js @@ -27,6 +27,7 @@ function scifunc_block() { exprs = list([[sci2exp(in1)],[sci2exp(out)],[sci2exp(clkin)],[sci2exp(clkout)],[strcat(sci2exp(x0))],[strcat(sci2exp(z0))],[strcat(sci2exp(rpar))],[sci2exp(auto)]],list("y1=sin(u1)"," "," ","y1=sin(u1)"," "," "," ")); gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } scifunc_block.prototype.details = function scifunc_block() { return this.x; @@ -89,5 +90,6 @@ function scifunc_block() { } } needcompile=resume(needcompile) + return new BasicBlock(this.x); } } diff --git a/js/Misc/scifunc_block_m.js b/js/Misc/scifunc_block_m.js index 7571eac0..8e338ba6 100644 --- a/js/Misc/scifunc_block_m.js +++ b/js/Misc/scifunc_block_m.js @@ -32,6 +32,7 @@ function scifunc_block_m() { exprs = list([[sci2exp([in1,in1])],[sci2exp([out,out])],[sci2exp(clkin)],[sci2exp(clkout)],[strcat(sci2exp(x0))],[strcat(sci2exp(z0))],[strcat(sci2exp(rpar))],[sci2exp(auto)],[sci2exp(0)]],list("y1=sin(u1)"," "," ","y1=sin(u1)"," "," "," ")); gr_i = []; this.x = standard_define([4,2],model,exprs,gr_i); + return new BasicBlock(this.x); } scifunc_block_m.prototype.details = function scifunc_block_m() { return this.x; @@ -91,5 +92,6 @@ function scifunc_block_m() { } } needcompile=resume(needcompile) + return new BasicBlock(this.x); } } diff --git a/js/NonLinear/ABSBLK_f.js b/js/NonLinear/ABSBLK_f.js index 7ab1aff9..a33ee869 100644 --- a/js/NonLinear/ABSBLK_f.js +++ b/js/NonLinear/ABSBLK_f.js @@ -9,6 +9,7 @@ function ABSBLK_f() { model.dep_ut = [true,false]; gr_i = []; this.x = standard_define([2,2],model,[],gr_i); + return new BasicBlock(this.x); } ABSBLK_f.prototype.details = function ABSBLK_f() { return this.x; @@ -17,5 +18,6 @@ function ABSBLK_f() { } ABSBLK_f.prototype.set = function ABSBLK_f() { this.x = arg1; + return new BasicBlock(this.x); } } diff --git a/js/NonLinear/ABS_VALUE.js b/js/NonLinear/ABS_VALUE.js index 9d5074eb..06525a67 100644 --- a/js/NonLinear/ABS_VALUE.js +++ b/js/NonLinear/ABS_VALUE.js @@ -13,6 +13,7 @@ function ABS_VALUE() { exprs = [string([1])]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } ABS_VALUE.prototype.details = function ABS_VALUE() { return this.x; @@ -43,5 +44,6 @@ function ABS_VALUE() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/NonLinear/COSBLK_f.js b/js/NonLinear/COSBLK_f.js index 5420afd1..f39985a3 100644 --- a/js/NonLinear/COSBLK_f.js +++ b/js/NonLinear/COSBLK_f.js @@ -10,6 +10,7 @@ function COSBLK_f() { model.dep_ut = [true,false]; gr_i = []; this.x = standard_define([2,2],model,[],gr_i); + return new BasicBlock(this.x); } COSBLK_f.prototype.details = function COSBLK_f() { return this.x; @@ -18,5 +19,6 @@ function COSBLK_f() { } COSBLK_f.prototype.set = function COSBLK_f() { this.x = arg1; + return new BasicBlock(this.x); } } diff --git a/js/NonLinear/DLRADAPT_f.js b/js/NonLinear/DLRADAPT_f.js index e985a696..a93eee91 100644 --- a/js/NonLinear/DLRADAPT_f.js +++ b/js/NonLinear/DLRADAPT_f.js @@ -21,6 +21,7 @@ function DLRADAPT_f() { exprs = [[sci2exp(p)],[sci2exp(rn)],[sci2exp(rd,0)],[sci2exp(g)],[sci2exp(last_u)],[sci2exp(last_y)]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } DLRADAPT_f.prototype.details = function DLRADAPT_f() { return this.x; @@ -55,5 +56,6 @@ function DLRADAPT_f() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/NonLinear/EXPBLK_f.js b/js/NonLinear/EXPBLK_f.js index 05b21300..8dbfaf1f 100644 --- a/js/NonLinear/EXPBLK_f.js +++ b/js/NonLinear/EXPBLK_f.js @@ -13,6 +13,7 @@ function EXPBLK_f() { exprs = ["%e"]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } EXPBLK_f.prototype.details = function EXPBLK_f() { return this.x; @@ -42,5 +43,6 @@ function EXPBLK_f() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/NonLinear/EXPBLK_m.js b/js/NonLinear/EXPBLK_m.js index 1731a333..275d3563 100644 --- a/js/NonLinear/EXPBLK_m.js +++ b/js/NonLinear/EXPBLK_m.js @@ -17,6 +17,7 @@ function EXPBLK_m() { exprs = ["%e"]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } EXPBLK_m.prototype.details = function EXPBLK_m() { return this.x; @@ -46,5 +47,6 @@ function EXPBLK_m() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/NonLinear/FSV_f.js b/js/NonLinear/FSV_f.js index eedc7cf2..2754cca1 100644 --- a/js/NonLinear/FSV_f.js +++ b/js/NonLinear/FSV_f.js @@ -11,6 +11,7 @@ function FSV_f() { exprs = " "; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } FSV_f.prototype.details = function FSV_f() { return this.x; @@ -19,5 +20,6 @@ function FSV_f() { } FSV_f.prototype.set = function FSV_f() { this.x = arg1; + return new BasicBlock(this.x); } } diff --git a/js/NonLinear/INTRP2BLK_f.js b/js/NonLinear/INTRP2BLK_f.js index 34a642be..6d1b5bf2 100644 --- a/js/NonLinear/INTRP2BLK_f.js +++ b/js/NonLinear/INTRP2BLK_f.js @@ -15,6 +15,7 @@ function INTRP2BLK_f() { exprs = [[strcat(sci2exp(a))],[strcat(sci2exp(b))],[strcat(sci2exp(c,0))]]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } INTRP2BLK_f.prototype.details = function INTRP2BLK_f() { return this.x; @@ -46,5 +47,6 @@ function INTRP2BLK_f() { } } } + return new BasicBlock(this.x); } } diff --git a/js/NonLinear/INTRPLBLK_f.js b/js/NonLinear/INTRPLBLK_f.js index 6ff946f6..28ce39b3 100644 --- a/js/NonLinear/INTRPLBLK_f.js +++ b/js/NonLinear/INTRPLBLK_f.js @@ -13,6 +13,7 @@ function INTRPLBLK_f() { exprs = [[strcat(sci2exp(a))],[strcat(sci2exp(b))]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } INTRPLBLK_f.prototype.details = function INTRPLBLK_f() { return this.x; @@ -43,5 +44,6 @@ function INTRPLBLK_f() { } } } + return new BasicBlock(this.x); } } diff --git a/js/NonLinear/INVBLK.js b/js/NonLinear/INVBLK.js index 2d359c7b..8c6911f1 100644 --- a/js/NonLinear/INVBLK.js +++ b/js/NonLinear/INVBLK.js @@ -11,6 +11,7 @@ function INVBLK() { exprs = " "; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } INVBLK.prototype.details = function INVBLK() { return this.x; @@ -19,5 +20,6 @@ function INVBLK() { } INVBLK.prototype.set = function INVBLK() { this.x = arg1; + return new BasicBlock(this.x); } } diff --git a/js/NonLinear/INVBLK_f.js b/js/NonLinear/INVBLK_f.js index db0136bf..4a4facc4 100644 --- a/js/NonLinear/INVBLK_f.js +++ b/js/NonLinear/INVBLK_f.js @@ -11,6 +11,7 @@ function INVBLK_f() { exprs = " "; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } INVBLK_f.prototype.details = function INVBLK_f() { return this.x; @@ -19,5 +20,6 @@ function INVBLK_f() { } INVBLK_f.prototype.set = function INVBLK_f() { this.x = arg1; + return new BasicBlock(this.x); } } diff --git a/js/NonLinear/LOGBLK_f.js b/js/NonLinear/LOGBLK_f.js index 00f01aa1..3cd0de2f 100644 --- a/js/NonLinear/LOGBLK_f.js +++ b/js/NonLinear/LOGBLK_f.js @@ -13,6 +13,7 @@ function LOGBLK_f() { exprs = "%e"; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } LOGBLK_f.prototype.details = function LOGBLK_f() { return this.x; @@ -44,5 +45,6 @@ function LOGBLK_f() { } } } + return new BasicBlock(this.x); } } diff --git a/js/NonLinear/LOOKUP2D.js b/js/NonLinear/LOOKUP2D.js index 1c70c61a..9a741929 100644 --- a/js/NonLinear/LOOKUP2D.js +++ b/js/NonLinear/LOOKUP2D.js @@ -19,6 +19,7 @@ function LOOKUP2D() { exprs = list(strcat(sci2exp(xx)),strcat(sci2exp(yy)),strcat(sci2exp(zz)),sci2exp(Method),Graf); gr_i = []; this.x = standard_define([2.5,2],model,exprs,gr_i); + return new BasicBlock(this.x); } LOOKUP2D.prototype.details = function LOOKUP2D() { return this.x; @@ -95,5 +96,6 @@ function LOOKUP2D() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/NonLinear/LOOKUP_f.js b/js/NonLinear/LOOKUP_f.js index 335d06fc..0698e536 100644 --- a/js/NonLinear/LOOKUP_f.js +++ b/js/NonLinear/LOOKUP_f.js @@ -10,6 +10,7 @@ function LOOKUP_f() { model.dep_ut = [true,false]; gr_i = []; this.x = standard_define([2,2],model,[],gr_i); + return new BasicBlock(this.x); } LOOKUP_f.prototype.details = function LOOKUP_f() { return this.x; @@ -47,5 +48,6 @@ function LOOKUP_f() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/NonLinear/MAXMIN.js b/js/NonLinear/MAXMIN.js index b6726e22..b2121ccd 100644 --- a/js/NonLinear/MAXMIN.js +++ b/js/NonLinear/MAXMIN.js @@ -12,6 +12,7 @@ function MAXMIN() { gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); this.x.graphics.style = "MAXMIN;displayedLabel=MAX"; + return new BasicBlock(this.x); } MAXMIN.prototype.details = function MAXMIN() { return this.x; @@ -65,5 +66,6 @@ function MAXMIN() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/NonLinear/MAX_f.js b/js/NonLinear/MAX_f.js index e3640328..33aff00e 100644 --- a/js/NonLinear/MAX_f.js +++ b/js/NonLinear/MAX_f.js @@ -12,6 +12,7 @@ function MAX_f() { exprs = " "; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } MAX_f.prototype.details = function MAX_f() { return this.x; @@ -20,5 +21,6 @@ function MAX_f() { } MAX_f.prototype.set = function MAX_f() { this.x = arg1; + return new BasicBlock(this.x); } } diff --git a/js/NonLinear/MIN_f.js b/js/NonLinear/MIN_f.js index 18f5d484..98de0f89 100644 --- a/js/NonLinear/MIN_f.js +++ b/js/NonLinear/MIN_f.js @@ -12,6 +12,7 @@ function MIN_f() { exprs = sci2exp(in1); gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } MIN_f.prototype.details = function MIN_f() { return this.x; @@ -20,5 +21,6 @@ function MIN_f() { } MIN_f.prototype.set = function MIN_f() { this.x = arg1; + return new BasicBlock(this.x); } } diff --git a/js/NonLinear/POWBLK_f.js b/js/NonLinear/POWBLK_f.js index 1714dfa1..3b06a6e8 100644 --- a/js/NonLinear/POWBLK_f.js +++ b/js/NonLinear/POWBLK_f.js @@ -13,6 +13,7 @@ function POWBLK_f() { exprs = string(a); gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } POWBLK_f.prototype.details = function POWBLK_f() { return this.x; @@ -45,5 +46,6 @@ function POWBLK_f() { this.x.model = model; break; } + return new BasicBlock(this.x); } } diff --git a/js/NonLinear/PRODUCT.js b/js/NonLinear/PRODUCT.js index e6449743..6236adad 100644 --- a/js/NonLinear/PRODUCT.js +++ b/js/NonLinear/PRODUCT.js @@ -12,6 +12,7 @@ function PRODUCT() { exprs = sci2exp(sgn); gr_i = []; this.x = standard_define([2,3],model,exprs,gr_i); + return new BasicBlock(this.x); } PRODUCT.prototype.details = function PRODUCT() { return this.x; @@ -62,5 +63,6 @@ function PRODUCT() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/NonLinear/PROD_f.js b/js/NonLinear/PROD_f.js index af76e144..1f705174 100644 --- a/js/NonLinear/PROD_f.js +++ b/js/NonLinear/PROD_f.js @@ -8,6 +8,7 @@ function PROD_f() { model.blocktype = "c"; model.dep_ut = [true,false]; this.x = standard_define([1,1],model,[],[]); + return new BasicBlock(this.x); } PROD_f.prototype.details = function PROD_f() { return this.x; @@ -16,5 +17,6 @@ function PROD_f() { } PROD_f.prototype.set = function PROD_f() { this.x = arg1; + return new BasicBlock(this.x); } } diff --git a/js/NonLinear/QUANT_f.js b/js/NonLinear/QUANT_f.js index d54077a6..b22f4cc2 100644 --- a/js/NonLinear/QUANT_f.js +++ b/js/NonLinear/QUANT_f.js @@ -14,6 +14,7 @@ function QUANT_f() { exprs = [[string(pas)],[string(meth)]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } QUANT_f.prototype.details = function QUANT_f() { return this.x; @@ -52,5 +53,6 @@ function QUANT_f() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/NonLinear/SATURATION.js b/js/NonLinear/SATURATION.js index d435baa6..e760e47d 100644 --- a/js/NonLinear/SATURATION.js +++ b/js/NonLinear/SATURATION.js @@ -16,6 +16,7 @@ function SATURATION() { exprs = [[string(maxp)],[string(minp)],[string(model.nmode)]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } SATURATION.prototype.details = function SATURATION() { return this.x; @@ -50,5 +51,6 @@ function SATURATION() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/NonLinear/SAT_f.js b/js/NonLinear/SAT_f.js index 6686e659..8b87bf2b 100644 --- a/js/NonLinear/SAT_f.js +++ b/js/NonLinear/SAT_f.js @@ -16,6 +16,7 @@ function SAT_f() { exprs = [[string(minp)],[string(maxp)],[string(slope)]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } SAT_f.prototype.details = function SAT_f() { return this.x; @@ -46,5 +47,6 @@ function SAT_f() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/NonLinear/SIGNUM.js b/js/NonLinear/SIGNUM.js index e5cf8b00..cf4dbfa7 100644 --- a/js/NonLinear/SIGNUM.js +++ b/js/NonLinear/SIGNUM.js @@ -13,6 +13,7 @@ function SIGNUM() { exprs = [string([1])]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } SIGNUM.prototype.details = function SIGNUM() { return this.x; @@ -43,5 +44,6 @@ function SIGNUM() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/NonLinear/SINBLK_f.js b/js/NonLinear/SINBLK_f.js index f71f9ab2..73837f3b 100644 --- a/js/NonLinear/SINBLK_f.js +++ b/js/NonLinear/SINBLK_f.js @@ -10,6 +10,7 @@ function SINBLK_f() { exprs = " "; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } SINBLK_f.prototype.details = function SINBLK_f() { return this.x; @@ -18,5 +19,6 @@ function SINBLK_f() { } SINBLK_f.prototype.set = function SINBLK_f() { this.x = arg1; + return new BasicBlock(this.x); } } diff --git a/js/NonLinear/TANBLK_f.js b/js/NonLinear/TANBLK_f.js index c92309d8..0e8294b5 100644 --- a/js/NonLinear/TANBLK_f.js +++ b/js/NonLinear/TANBLK_f.js @@ -11,6 +11,7 @@ function TANBLK_f() { exprs = sci2exp(in1); gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } TANBLK_f.prototype.details = function TANBLK_f() { return this.x; @@ -20,5 +21,6 @@ function TANBLK_f() { TANBLK_f.prototype.set = function TANBLK_f() { this.x = arg1; this.x.model.firing = []; + return new BasicBlock(this.x); } } diff --git a/js/NonLinear/TrigFun.js b/js/NonLinear/TrigFun.js index ef058d3e..e7a622a0 100644 --- a/js/NonLinear/TrigFun.js +++ b/js/NonLinear/TrigFun.js @@ -10,6 +10,7 @@ function TrigFun() { exprs = "sin"; gr_i = []; this.x = standard_define([4,2],model,exprs,gr_i); + return new BasicBlock(this.x); } TrigFun.prototype.details = function TrigFun() { return this.x; @@ -38,5 +39,6 @@ function TrigFun() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/PDE/PDE.js b/js/PDE/PDE.js index 0f1dd160..dfba5807 100644 --- a/js/PDE/PDE.js +++ b/js/PDE/PDE.js @@ -12,6 +12,7 @@ function PDE() { label = list(params_pde,[],""); gr_i = []; this.x = standard_define([3,3],model,label,gr_i); + return new BasicBlock(this.x); } PDE.prototype.details = function PDE() { return this.x; @@ -129,5 +130,6 @@ function PDE() { this.x.model = model; break; } + return new BasicBlock(this.x); } } diff --git a/js/Sinks/AFFICH_m.js b/js/Sinks/AFFICH_m.js index ac794b2f..509db8be 100644 --- a/js/Sinks/AFFICH_m.js +++ b/js/Sinks/AFFICH_m.js @@ -21,6 +21,7 @@ function AFFICH_m() { exprs = [[sci2exp([model.in1,model.in2])],[string(font)],[string(fontsize)],[string(colr)],[string(nt)],[string(nd)],[string(0)]]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } AFFICH_m.prototype.details = function AFFICH_m() { return this.x; @@ -77,5 +78,6 @@ function AFFICH_m() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Sinks/BARXY.js b/js/Sinks/BARXY.js index e1845489..4ef60a20 100644 --- a/js/Sinks/BARXY.js +++ b/js/Sinks/BARXY.js @@ -19,6 +19,7 @@ function BARXY() { this.x.graphics.in_implicit = ["E","E"]; this.x.graphics.out_implicit = []; this.x.graphics.exprs = [["-15"],["15"],["-15"],["15"],["1"]]; + return new BasicBlock(this.x); } BARXY.prototype.details = function BARXY() { return this.x; @@ -59,5 +60,6 @@ function BARXY() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Sinks/CANIMXY.js b/js/Sinks/CANIMXY.js index 7f58c8a9..9313c826 100644 --- a/js/Sinks/CANIMXY.js +++ b/js/Sinks/CANIMXY.js @@ -26,6 +26,7 @@ function CANIMXY() { exprs = [[string(nbr_curves)],[string(clrs)],[string(siz)],[string(win)],["[]"],["[]"],[string(xmin)],[string(xmax)],[string(ymin)],[string(ymax)],[string(N)]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } CANIMXY.prototype.details = function CANIMXY() { return this.x; @@ -97,5 +98,6 @@ function CANIMXY() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Sinks/CANIMXY3D.js b/js/Sinks/CANIMXY3D.js index 7b70e142..d382af70 100644 --- a/js/Sinks/CANIMXY3D.js +++ b/js/Sinks/CANIMXY3D.js @@ -26,6 +26,7 @@ function CANIMXY3D() { exprs = [[string(nbr_curves)],[strcat(string(clrs)," ")],[strcat(string(siz)," ")],[string(win)],["[]"],["[]"],[strcat(string(vec_x)," ")],[strcat(string(vec_y)," ")],[strcat(string(vec_z)," ")],[strcat(string(param3ds)," ")],[string(N)]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } CANIMXY3D.prototype.details = function CANIMXY3D() { return this.x; @@ -114,5 +115,6 @@ function CANIMXY3D() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Sinks/CEVENTSCOPE.js b/js/Sinks/CEVENTSCOPE.js index 712c76aa..91f4758d 100644 --- a/js/Sinks/CEVENTSCOPE.js +++ b/js/Sinks/CEVENTSCOPE.js @@ -17,6 +17,7 @@ function CEVENTSCOPE() { exprs = [[sci2exp(nclock)],[strcat(sci2exp(clrs[nclock-1])," ")],[string(win)],[sci2exp([])],[sci2exp(wdim)],[string(per)]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } CEVENTSCOPE.prototype.details = function CEVENTSCOPE() { return this.x; @@ -83,5 +84,6 @@ function CEVENTSCOPE() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Sinks/CFSCOPE.js b/js/Sinks/CFSCOPE.js index 4d000c69..9a11f6eb 100644 --- a/js/Sinks/CFSCOPE.js +++ b/js/Sinks/CFSCOPE.js @@ -19,6 +19,7 @@ function CFSCOPE() { exprs = [[strcat(string(clrs)," ")],[string(win)],[sci2exp([])],[sci2exp(wdim)],[string(ymin)],[string(ymax)],[string(per)],[string(N)],[string([1])]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } CFSCOPE.prototype.details = function CFSCOPE() { return this.x; @@ -92,5 +93,6 @@ function CFSCOPE() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Sinks/CLKOUTV_f.js b/js/Sinks/CLKOUTV_f.js index c53d274d..1f703fd2 100644 --- a/js/Sinks/CLKOUTV_f.js +++ b/js/Sinks/CLKOUTV_f.js @@ -11,6 +11,7 @@ function CLKOUTV_f() { model.dep_ut = [false,false]; exprs = string(prt); this.x = standard_define([1,1],model,exprs," "); + return new BasicBlock(this.x); } CLKOUTV_f.prototype.details = function CLKOUTV_f() { return this.x; @@ -39,5 +40,6 @@ function CLKOUTV_f() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Sinks/CLKOUT_f.js b/js/Sinks/CLKOUT_f.js index 5ff1d994..a26f8d6b 100644 --- a/js/Sinks/CLKOUT_f.js +++ b/js/Sinks/CLKOUT_f.js @@ -11,6 +11,7 @@ function CLKOUT_f() { model.dep_ut = [false,false]; exprs = string(prt); this.x = standard_define([1,1],model,exprs," "); + return new BasicBlock(this.x); } CLKOUT_f.prototype.details = function CLKOUT_f() { return this.x; @@ -41,5 +42,6 @@ function CLKOUT_f() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Sinks/CMAT3D.js b/js/Sinks/CMAT3D.js index a29a7e7a..6c89a28f 100644 --- a/js/Sinks/CMAT3D.js +++ b/js/Sinks/CMAT3D.js @@ -22,6 +22,7 @@ function CMAT3D() { exprs = [[strcat(string(this.x)," ")],[strcat(string(y)," ")],[string("jetcolormap(25)")],[string(cmin)],[string(cmax)]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } CMAT3D.prototype.details = function CMAT3D() { return this.x; @@ -63,5 +64,6 @@ function CMAT3D() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Sinks/CMATVIEW.js b/js/Sinks/CMATVIEW.js index d472334e..338b249b 100644 --- a/js/Sinks/CMATVIEW.js +++ b/js/Sinks/CMATVIEW.js @@ -20,6 +20,7 @@ function CMATVIEW() { exprs = [[string("jetcolormap(25)")],[string(cmin)],[string(cmax)]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } CMATVIEW.prototype.details = function CMATVIEW() { return this.x; @@ -59,5 +60,6 @@ function CMATVIEW() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Sinks/CMSCOPE.js b/js/Sinks/CMSCOPE.js index f8b69469..2b210dcf 100644 --- a/js/Sinks/CMSCOPE.js +++ b/js/Sinks/CMSCOPE.js @@ -25,6 +25,7 @@ function CMSCOPE() { exprs = [[strcat(string(in1)," ")],[strcat(string(clrs)," ")],[string(win)],[sci2exp([])],[sci2exp([])],[strcat(string(ymin)," ")],[strcat(string(ymax)," ")],[strcat(string(per)," ")],[string(N)],[string(0)],[emptystr()]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } CMSCOPE.prototype.details = function CMSCOPE() { return this.x; @@ -123,5 +124,6 @@ function CMSCOPE() { } } } + return new BasicBlock(this.x); } } diff --git a/js/Sinks/CSCOPE.js b/js/Sinks/CSCOPE.js index 666b07a6..f0b1699e 100644 --- a/js/Sinks/CSCOPE.js +++ b/js/Sinks/CSCOPE.js @@ -21,6 +21,7 @@ function CSCOPE() { exprs = [[strcat(string(clrs)," ")],[string(win)],[sci2exp([])],[sci2exp(wdim)],[string(ymin)],[string(ymax)],[string(per)],[string(N)],[transpose(string(0))],[emptystr()]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } CSCOPE.prototype.details = function CSCOPE() { return this.x; @@ -92,5 +93,6 @@ function CSCOPE() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Sinks/CSCOPXY.js b/js/Sinks/CSCOPXY.js index f06a4980..769fe395 100644 --- a/js/Sinks/CSCOPXY.js +++ b/js/Sinks/CSCOPXY.js @@ -25,6 +25,7 @@ function CSCOPXY() { exprs = [[string(nbr_curves)],[sci2exp(clrs)],[sci2exp(siz)],[string(win)],[sci2exp([])],[sci2exp(wdim)],[string(xmin)],[string(xmax)],[string(ymin)],[string(ymax)],[string(N)]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } CSCOPXY.prototype.details = function CSCOPXY() { return this.x; @@ -96,5 +97,6 @@ function CSCOPXY() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Sinks/CSCOPXY3D.js b/js/Sinks/CSCOPXY3D.js index b2751f5c..6a08003e 100644 --- a/js/Sinks/CSCOPXY3D.js +++ b/js/Sinks/CSCOPXY3D.js @@ -25,6 +25,7 @@ function CSCOPXY3D() { exprs = [[string(nbr_curves)],[strcat(string(clrs)," ")],[strcat(string(siz)," ")],[string(win)],[sci2exp([])],[sci2exp(wdim)],[strcat(string(vec_x)," ")],[strcat(string(vec_y)," ")],[strcat(string(vec_z)," ")],[strcat(string(param3ds)," ")],[string(N)]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } CSCOPXY3D.prototype.details = function CSCOPXY3D() { return this.x; @@ -109,5 +110,6 @@ function CSCOPXY3D() { message(mess); } } + return new BasicBlock(this.x); } } diff --git a/js/Sinks/OUTIMPL_f.js b/js/Sinks/OUTIMPL_f.js index c77851b6..fb003f2c 100644 --- a/js/Sinks/OUTIMPL_f.js +++ b/js/Sinks/OUTIMPL_f.js @@ -17,6 +17,7 @@ function OUTIMPL_f() { gr_i = []; this.x = standard_define([1,1],model,exprs,gr_i); this.x.graphics.in_implicit = ["I"]; + return new BasicBlock(this.x); } OUTIMPL_f.prototype.details = function OUTIMPL_f() { return this.x; @@ -51,5 +52,6 @@ function OUTIMPL_f() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Sinks/OUT_f.js b/js/Sinks/OUT_f.js index e339d285..7a5ef710 100644 --- a/js/Sinks/OUT_f.js +++ b/js/Sinks/OUT_f.js @@ -14,6 +14,7 @@ function OUT_f() { exprs = string(prt); gr_i = []; this.x = standard_define([1,1],model,exprs,gr_i); + return new BasicBlock(this.x); } OUT_f.prototype.details = function OUT_f() { return this.x; @@ -44,5 +45,6 @@ function OUT_f() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Sinks/TOWS_c.js b/js/Sinks/TOWS_c.js index feaf8354..790c2021 100644 --- a/js/Sinks/TOWS_c.js +++ b/js/Sinks/TOWS_c.js @@ -21,6 +21,7 @@ function TOWS_c() { gr_i = []; exprs = [[string(nz)],[string(varnam)],[string(herit)]]; this.x = standard_define([4,2],model,exprs,gr_i); + return new BasicBlock(this.x); } TOWS_c.prototype.details = function TOWS_c() { return this.x; @@ -62,5 +63,6 @@ function TOWS_c() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Sinks/TRASH_f.js b/js/Sinks/TRASH_f.js index 08d08d47..45f077eb 100644 --- a/js/Sinks/TRASH_f.js +++ b/js/Sinks/TRASH_f.js @@ -11,6 +11,7 @@ function TRASH_f() { exprs = " "; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } TRASH_f.prototype.details = function TRASH_f() { return this.x; @@ -19,5 +20,6 @@ function TRASH_f() { } TRASH_f.prototype.set = function TRASH_f() { this.x = arg1; + return new BasicBlock(this.x); } } diff --git a/js/Sinks/WFILE_f.js b/js/Sinks/WFILE_f.js index b1b5a5b9..05259e11 100644 --- a/js/Sinks/WFILE_f.js +++ b/js/Sinks/WFILE_f.js @@ -18,6 +18,7 @@ function WFILE_f() { exprs = [[sci2exp(in1)],[fname],[frmt],[string(N)]]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } WFILE_f.prototype.details = function WFILE_f() { return this.x; @@ -87,5 +88,6 @@ function WFILE_f() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Sinks/WRITEAU_f.js b/js/Sinks/WRITEAU_f.js index 40833663..3adafd3e 100644 --- a/js/Sinks/WRITEAU_f.js +++ b/js/Sinks/WRITEAU_f.js @@ -19,6 +19,7 @@ function WRITEAU_f() { exprs = [string(N),string(swap)]; gr_i = []; this.x = standard_define([4,2],model,exprs,gr_i); + return new BasicBlock(this.x); } WRITEAU_f.prototype.details = function WRITEAU_f() { return this.x; @@ -66,5 +67,6 @@ function WRITEAU_f() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Sinks/WRITEC_f.js b/js/Sinks/WRITEC_f.js index 20e8e20c..0b61f273 100644 --- a/js/Sinks/WRITEC_f.js +++ b/js/Sinks/WRITEC_f.js @@ -19,6 +19,7 @@ function WRITEC_f() { exprs = [[sci2exp(in1)],[fname],[frmt],[string(N),string(swap)]]; gr_i = []; this.x = standard_define([4,2],model,exprs,gr_i); + return new BasicBlock(this.x); } WRITEC_f.prototype.details = function WRITEC_f() { return this.x; @@ -87,5 +88,6 @@ function WRITEC_f() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Sources/CLKINV_f.js b/js/Sources/CLKINV_f.js index 9eb73a81..5d68df08 100644 --- a/js/Sources/CLKINV_f.js +++ b/js/Sources/CLKINV_f.js @@ -12,6 +12,7 @@ function CLKINV_f() { exprs = string(prt); gr_i = []; this.x = standard_define([1,1],model,exprs,gr_i); + return new BasicBlock(this.x); } CLKINV_f.prototype.details = function CLKINV_f() { return this.x; @@ -42,5 +43,6 @@ function CLKINV_f() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Sources/CLKIN_f.js b/js/Sources/CLKIN_f.js index f8cf6735..0e8f5f83 100644 --- a/js/Sources/CLKIN_f.js +++ b/js/Sources/CLKIN_f.js @@ -11,6 +11,7 @@ function CLKIN_f() { model.dep_ut = [false,false]; exprs = string(prt); this.x = standard_define([1,1],model,exprs," "); + return new BasicBlock(this.x); } CLKIN_f.prototype.details = function CLKIN_f() { return this.x; @@ -41,5 +42,6 @@ function CLKIN_f() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Sources/CLOCK_c.js b/js/Sources/CLOCK_c.js index aac88f72..dde29deb 100644 --- a/js/Sources/CLOCK_c.js +++ b/js/Sources/CLOCK_c.js @@ -40,6 +40,7 @@ function CLOCK_c() { this.x.model.firing = false; this.x.model.dep_ut = [false,false]; this.x.model.rpar = diagram; + return new BasicBlock(this.x); } CLOCK_c.prototype.details = function CLOCK_c() { return this.x; @@ -90,5 +91,6 @@ function CLOCK_c() { this.x = arg1; y = needcompile; typ = newpar; + return new BasicBlock(this.x); } } diff --git a/js/Sources/CLOCK_f.js b/js/Sources/CLOCK_f.js index ddfcd81b..97b65820 100644 --- a/js/Sources/CLOCK_f.js +++ b/js/Sources/CLOCK_f.js @@ -40,6 +40,7 @@ function CLOCK_f() { this.x.model.firing = false; this.x.model.dep_ut = [false,false]; this.x.model.rpar = diagram; + return new BasicBlock(this.x); } CLOCK_f.prototype.details = function CLOCK_f() { return this.x; @@ -90,5 +91,6 @@ function CLOCK_f() { this.x = arg1; y = needcompile; typ = newpar; + return new BasicBlock(this.x); } } diff --git a/js/Sources/CONST.js b/js/Sources/CONST.js index 509e6271..35f02d3a 100644 --- a/js/Sources/CONST.js +++ b/js/Sources/CONST.js @@ -12,6 +12,7 @@ function CONST() { exprs = strcat(sci2exp(C)); gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } CONST.prototype.details = function CONST() { return this.x; @@ -43,5 +44,6 @@ function CONST() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Sources/CONST_f.js b/js/Sources/CONST_f.js index 8753b046..0030dc8f 100644 --- a/js/Sources/CONST_f.js +++ b/js/Sources/CONST_f.js @@ -12,6 +12,7 @@ function CONST_f() { exprs = strcat(sci2exp(C)); gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } CONST_f.prototype.details = function CONST_f() { return this.x; @@ -40,5 +41,6 @@ function CONST_f() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Sources/CONST_m.js b/js/Sources/CONST_m.js index ac1e84ce..8a0bf6a1 100644 --- a/js/Sources/CONST_m.js +++ b/js/Sources/CONST_m.js @@ -15,6 +15,7 @@ function CONST_m() { exprs = sci2exp(C); gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } CONST_m.prototype.details = function CONST_m() { return this.x; @@ -69,5 +70,6 @@ function CONST_m() { } } } + return new BasicBlock(this.x); } } diff --git a/js/Sources/CURV_f.js b/js/Sources/CURV_f.js index cd6199a9..a12186e0 100644 --- a/js/Sources/CURV_f.js +++ b/js/Sources/CURV_f.js @@ -17,6 +17,7 @@ function CURV_f() { model.dep_ut = [false,true]; gr_i = []; this.x = standard_define([2,2],model,[],gr_i); + return new BasicBlock(this.x); } CURV_f.prototype.details = function CURV_f() { return this.x; @@ -60,5 +61,6 @@ function CURV_f() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Sources/Counter.js b/js/Sources/Counter.js index 5e768e00..3cd43ab3 100644 --- a/js/Sources/Counter.js +++ b/js/Sources/Counter.js @@ -16,6 +16,7 @@ function Counter() { exprs = [[string(minim)],[string(maxim)],[string(rule)]]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } Counter.prototype.details = function Counter() { return this.x; @@ -47,5 +48,6 @@ function Counter() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Sources/FROMWSB.js b/js/Sources/FROMWSB.js index e47d854c..7f2a3088 100644 --- a/js/Sources/FROMWSB.js +++ b/js/Sources/FROMWSB.js @@ -9,6 +9,7 @@ function FROMWSB() { model = scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()); gr_i = []; this.x = standard_define([5,2],model,[],gr_i); + return new BasicBlock(this.x); } FROMWSB.prototype.details = function FROMWSB() { return this.x; @@ -83,5 +84,6 @@ function FROMWSB() { } this.x = arg1; typ = newpar; + return new BasicBlock(this.x); } } diff --git a/js/Sources/FROMWS_c.js b/js/Sources/FROMWS_c.js index 1b5fa3f0..89e1212c 100644 --- a/js/Sources/FROMWS_c.js +++ b/js/Sources/FROMWS_c.js @@ -19,6 +19,7 @@ function FROMWS_c() { gr_i = []; exprs = [[string(varnam)],[string(Method)],[string(ZC)],[string(OutEnd)]]; this.x = standard_define([3.5,2],model,exprs,gr_i); + return new BasicBlock(this.x); } FROMWS_c.prototype.details = function FROMWS_c() { return this.x; @@ -64,5 +65,6 @@ function FROMWS_c() { } } } + return new BasicBlock(this.x); } } diff --git a/js/Sources/GENSIN_f.js b/js/Sources/GENSIN_f.js index 801a5a30..ff5f9ec4 100644 --- a/js/Sources/GENSIN_f.js +++ b/js/Sources/GENSIN_f.js @@ -14,6 +14,7 @@ function GENSIN_f() { exprs = [[string(rpar[1-1])],[string(rpar[2-1])],[string(rpar[3-1])]]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } GENSIN_f.prototype.details = function GENSIN_f() { return this.x; @@ -45,5 +46,6 @@ function GENSIN_f() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Sources/GENSQR_f.js b/js/Sources/GENSQR_f.js index c052eba7..5c32c444 100644 --- a/js/Sources/GENSQR_f.js +++ b/js/Sources/GENSQR_f.js @@ -14,6 +14,7 @@ function GENSQR_f() { exprs = string(Amplitude); gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } GENSQR_f.prototype.details = function GENSQR_f() { return this.x; @@ -41,5 +42,6 @@ function GENSQR_f() { this.x.model = model; break; } + return new BasicBlock(this.x); } } diff --git a/js/Sources/GEN_SQR.js b/js/Sources/GEN_SQR.js index 4565cb48..ef910eed 100644 --- a/js/Sources/GEN_SQR.js +++ b/js/Sources/GEN_SQR.js @@ -48,6 +48,7 @@ function GEN_SQR() { exprs = [sci2exp(Amin),sci2exp(Amax),sci2exp(rule),sci2exp(F)]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } GEN_SQR.prototype.details = function GEN_SQR() { return this.x; @@ -88,5 +89,6 @@ function GEN_SQR() { ok = false; } } + return new BasicBlock(this.x); } } diff --git a/js/Sources/Ground_g.js b/js/Sources/Ground_g.js index f70f4de8..896029af 100644 --- a/js/Sources/Ground_g.js +++ b/js/Sources/Ground_g.js @@ -16,6 +16,7 @@ function Ground_g() { exprs = []; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } Ground_g.prototype.details = function Ground_g() { return this.x; @@ -24,5 +25,6 @@ function Ground_g() { } Ground_g.prototype.set = function Ground_g() { this.x = arg1; + return new BasicBlock(this.x); } } diff --git a/js/Sources/INIMPL_f.js b/js/Sources/INIMPL_f.js index 39a8fc91..3b67b166 100644 --- a/js/Sources/INIMPL_f.js +++ b/js/Sources/INIMPL_f.js @@ -17,6 +17,7 @@ function INIMPL_f() { gr_i = []; this.x = standard_define([1,1],model,exprs,gr_i); this.x.graphics.out_implicit = ["I"]; + return new BasicBlock(this.x); } INIMPL_f.prototype.details = function INIMPL_f() { return this.x; @@ -51,5 +52,6 @@ function INIMPL_f() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Sources/IN_f.js b/js/Sources/IN_f.js index b5d4fc06..d6ea593f 100644 --- a/js/Sources/IN_f.js +++ b/js/Sources/IN_f.js @@ -13,6 +13,7 @@ function IN_f() { exprs = sci2exp(prt); gr_i = []; this.x = standard_define([1,1],model,exprs,gr_i); + return new BasicBlock(this.x); } IN_f.prototype.details = function IN_f() { return this.x; @@ -58,5 +59,6 @@ function IN_f() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Sources/Modulo_Count.js b/js/Sources/Modulo_Count.js index c10e7f51..8fc07b39 100644 --- a/js/Sources/Modulo_Count.js +++ b/js/Sources/Modulo_Count.js @@ -14,6 +14,7 @@ function Modulo_Count() { exprs = [[string(ini_c)],[string(base)]]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } Modulo_Count.prototype.details = function Modulo_Count() { return this.x; @@ -45,5 +46,6 @@ function Modulo_Count() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Sources/PULSE_SC.js b/js/Sources/PULSE_SC.js index 51ca49a5..acac3f81 100644 --- a/js/Sources/PULSE_SC.js +++ b/js/Sources/PULSE_SC.js @@ -43,6 +43,7 @@ function PULSE_SC() { exprs = [sci2exp(E),sci2exp(W),sci2exp(F),sci2exp(A)]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } PULSE_SC.prototype.details = function PULSE_SC() { return this.x; @@ -85,5 +86,6 @@ function PULSE_SC() { ok = false; } } + return new BasicBlock(this.x); } } diff --git a/js/Sources/RAMP.js b/js/Sources/RAMP.js index 7453d2d0..ef936b69 100644 --- a/js/Sources/RAMP.js +++ b/js/Sources/RAMP.js @@ -17,6 +17,7 @@ function RAMP() { exprs = [string(rpar)]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } RAMP.prototype.details = function RAMP() { return this.x; @@ -43,5 +44,6 @@ function RAMP() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Sources/RAND_f.js b/js/Sources/RAND_f.js index 901c2e9d..9af2134d 100644 --- a/js/Sources/RAND_f.js +++ b/js/Sources/RAND_f.js @@ -18,6 +18,7 @@ function RAND_f() { exprs = [[string(flag)],[sci2exp(a.slice())],[sci2exp(b.slice())],[string(model.dstate[1-1])]]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } RAND_f.prototype.details = function RAND_f() { return this.x; @@ -54,5 +55,6 @@ function RAND_f() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Sources/RAND_m.js b/js/Sources/RAND_m.js index 5c6a35fd..d3c62d7e 100644 --- a/js/Sources/RAND_m.js +++ b/js/Sources/RAND_m.js @@ -27,6 +27,7 @@ function RAND_m() { exprs = [[sci2exp(1)],[string(flag)],[sci2exp([a])],[sci2exp([b])],[sci2exp([model.dstate[1-1],int(rand()*(10^7-1))])]]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } RAND_m.prototype.details = function RAND_m() { return this.x; @@ -77,5 +78,6 @@ function RAND_m() { } } } + return new BasicBlock(this.x); } } diff --git a/js/Sources/READAU_f.js b/js/Sources/READAU_f.js index 009a3b0e..e7f87a08 100644 --- a/js/Sources/READAU_f.js +++ b/js/Sources/READAU_f.js @@ -23,6 +23,7 @@ function READAU_f() { exprs = [[fname],[string(N)],[string(swap)]]; gr_i = []; this.x = standard_define([5,2],model,exprs,gr_i); + return new BasicBlock(this.x); } READAU_f.prototype.details = function READAU_f() { return this.x; @@ -80,5 +81,6 @@ function READAU_f() { } } } + return new BasicBlock(this.x); } } diff --git a/js/Sources/READC_f.js b/js/Sources/READC_f.js index 7e6bc5e1..74589dfa 100644 --- a/js/Sources/READC_f.js +++ b/js/Sources/READC_f.js @@ -27,6 +27,7 @@ function READC_f() { exprs = [["[]"],[sci2exp(outmask)],[fname],[frmt],[string(M)],[string(N)],[string(offset)],[string(swap)]]; gr_i = []; this.x = standard_define([4,2],model,exprs,gr_i); + return new BasicBlock(this.x); } READC_f.prototype.details = function READC_f() { return this.x; @@ -114,5 +115,6 @@ function READC_f() { } } } + return new BasicBlock(this.x); } } diff --git a/js/Sources/RFILE_f.js b/js/Sources/RFILE_f.js index 3038948d..dc0b6a87 100644 --- a/js/Sources/RFILE_f.js +++ b/js/Sources/RFILE_f.js @@ -23,6 +23,7 @@ function RFILE_f() { exprs = [[sci2exp([])],[sci2exp(outmask)],[fname],[frmt],[string(N)],[sci2exp(out)]]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } RFILE_f.prototype.details = function RFILE_f() { return this.x; @@ -103,5 +104,6 @@ function RFILE_f() { } } } + return new BasicBlock(this.x); } } diff --git a/js/Sources/SAWTOOTH_f.js b/js/Sources/SAWTOOTH_f.js index 40ab391a..fbfe62dc 100644 --- a/js/Sources/SAWTOOTH_f.js +++ b/js/Sources/SAWTOOTH_f.js @@ -11,6 +11,7 @@ function SAWTOOTH_f() { exprs = " "; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } SAWTOOTH_f.prototype.details = function SAWTOOTH_f() { return this.x; @@ -19,5 +20,6 @@ function SAWTOOTH_f() { } SAWTOOTH_f.prototype.set = function SAWTOOTH_f() { this.x = arg1; + return new BasicBlock(this.x); } } diff --git a/js/Sources/STEP.js b/js/Sources/STEP.js index e2f455e6..997ee61e 100644 --- a/js/Sources/STEP.js +++ b/js/Sources/STEP.js @@ -16,6 +16,7 @@ function STEP() { exprs = [[string(1)],[string(rpar)]]; gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } STEP.prototype.details = function STEP() { return this.x; @@ -63,5 +64,6 @@ function STEP() { break; } } + return new BasicBlock(this.x); } } diff --git a/js/Sources/STEP_FUNCTION.js b/js/Sources/STEP_FUNCTION.js index 9b2fe9f8..1c28e304 100644 --- a/js/Sources/STEP_FUNCTION.js +++ b/js/Sources/STEP_FUNCTION.js @@ -49,6 +49,7 @@ function STEP_FUNCTION() { model.rpar = scs_m_1; gr_i = []; this.x = standard_define([2,2],model,[],gr_i); + return new BasicBlock(this.x); } STEP_FUNCTION.prototype.details = function STEP_FUNCTION() { return this.x; @@ -119,5 +120,6 @@ function STEP_FUNCTION() { this.x = arg1; y = needcompile; typ = newpar; + return new BasicBlock(this.x); } } diff --git a/js/Sources/SampleCLK.js b/js/Sources/SampleCLK.js index 72175267..672acc54 100644 --- a/js/Sources/SampleCLK.js +++ b/js/Sources/SampleCLK.js @@ -10,6 +10,7 @@ function SampleCLK() { model.dep_ut = [false,false]; exprs = [[sci2exp(1)],[sci2exp(0)]]; this.x = standard_define([2,2],model,exprs," "); + return new BasicBlock(this.x); } SampleCLK.prototype.details = function SampleCLK() { return this.x; @@ -49,5 +50,6 @@ function SampleCLK() { } } needcompile=resume(needcompile) + return new BasicBlock(this.x); } } diff --git a/js/Sources/Sigbuilder.js b/js/Sources/Sigbuilder.js index f27189ff..14a9f768 100644 --- a/js/Sources/Sigbuilder.js +++ b/js/Sources/Sigbuilder.js @@ -13,6 +13,7 @@ function Sigbuilder() { model = scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=1,evtin=[],evtout=1,state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()); gr_i = []; this.x = standard_define([3,2],model,[],gr_i); + return new BasicBlock(this.x); } Sigbuilder.prototype.details = function Sigbuilder() { return this.x; @@ -88,5 +89,6 @@ function Sigbuilder() { } this.x = arg1; typ = newpar; + return new BasicBlock(this.x); } } diff --git a/js/Sources/TIME_f.js b/js/Sources/TIME_f.js index 2c9f1ced..16793af5 100644 --- a/js/Sources/TIME_f.js +++ b/js/Sources/TIME_f.js @@ -8,6 +8,7 @@ function TIME_f() { model.dep_ut = [false,true]; gr_i = []; this.x = standard_define([2,2],model,[],gr_i); + return new BasicBlock(this.x); } TIME_f.prototype.details = function TIME_f() { return this.x; @@ -16,5 +17,6 @@ function TIME_f() { } TIME_f.prototype.set = function TIME_f() { this.x = arg1; + return new BasicBlock(this.x); } } diff --git a/js/Sources/TKSCALE.js b/js/Sources/TKSCALE.js index 6e4b9522..00866c29 100644 --- a/js/Sources/TKSCALE.js +++ b/js/Sources/TKSCALE.js @@ -14,6 +14,7 @@ function TKSCALE() { exprs = [[sci2exp(a)],[sci2exp(b)],[sci2exp(f)]]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } TKSCALE.prototype.details = function TKSCALE() { return this.x; @@ -32,5 +33,6 @@ function TKSCALE() { this.x.graphics = graphics; this.x.model = model; } + return new BasicBlock(this.x); } } diff --git a/js/Threshold/GENERAL_f.js b/js/Threshold/GENERAL_f.js index 7a98c8ef..4129d175 100644 --- a/js/Threshold/GENERAL_f.js +++ b/js/Threshold/GENERAL_f.js @@ -16,6 +16,7 @@ function GENERAL_f() { exprs = [[strcat(sci2exp(in1))],[strcat(sci2exp(out))]]; gr_i = []; this.x = standard_define([3,2],model,exprs,gr_i); + return new BasicBlock(this.x); } GENERAL_f.prototype.details = function GENERAL_f() { return this.x; @@ -56,5 +57,6 @@ function GENERAL_f() { } } } + return new BasicBlock(this.x); } } diff --git a/js/Threshold/NEGTOPOS_f.js b/js/Threshold/NEGTOPOS_f.js index 5c9b4ae1..f9135d94 100644 --- a/js/Threshold/NEGTOPOS_f.js +++ b/js/Threshold/NEGTOPOS_f.js @@ -12,6 +12,7 @@ function NEGTOPOS_f() { model.dep_ut = [true,false]; gr_i = []; this.x = standard_define([2,2],model,[],gr_i); + return new BasicBlock(this.x); } NEGTOPOS_f.prototype.details = function NEGTOPOS_f() { return this.x; @@ -21,5 +22,6 @@ function NEGTOPOS_f() { NEGTOPOS_f.prototype.set = function NEGTOPOS_f() { this.x = arg1; this.x.model.firing = -1; + return new BasicBlock(this.x); } } diff --git a/js/Threshold/POSTONEG_f.js b/js/Threshold/POSTONEG_f.js index d5d94a39..842f5c6a 100644 --- a/js/Threshold/POSTONEG_f.js +++ b/js/Threshold/POSTONEG_f.js @@ -13,6 +13,7 @@ function POSTONEG_f() { model.firing = [-1]; gr_i = []; this.x = standard_define([2,2],model,[],gr_i); + return new BasicBlock(this.x); } POSTONEG_f.prototype.details = function POSTONEG_f() { return this.x; @@ -22,5 +23,6 @@ function POSTONEG_f() { POSTONEG_f.prototype.set = function POSTONEG_f() { this.x = arg1; this.x.model.firing = [-1]; + return new BasicBlock(this.x); } } diff --git a/js/Threshold/ZCROSS_f.js b/js/Threshold/ZCROSS_f.js index a8934ea9..7cd1ed03 100644 --- a/js/Threshold/ZCROSS_f.js +++ b/js/Threshold/ZCROSS_f.js @@ -15,6 +15,7 @@ function ZCROSS_f() { exprs = strcat(sci2exp(in1)); gr_i = []; this.x = standard_define([2,2],model,exprs,gr_i); + return new BasicBlock(this.x); } ZCROSS_f.prototype.details = function ZCROSS_f() { return this.x; @@ -49,5 +50,6 @@ function ZCROSS_f() { break; } } + return new BasicBlock(this.x); } } diff --git a/sci2jsyacc.py b/sci2jsyacc.py index c3ee9df9..a6bbda49 100755 --- a/sci2jsyacc.py +++ b/sci2jsyacc.py @@ -60,15 +60,16 @@ def p_jobfunctionblock_jobfunctionstatement_statementblock_endfunction(p): fname = '%s' % (p[1]) indent = '%*s' % (INDENT_LEVEL * INDENT_SIZE, ' ') INDENT_LEVEL += 1 + blocktype = getblocktype(fname) jdefine = JOB_BLOCKS['"define"'] if '"define"' in JOB_BLOCKS else '' - jdefine = '%s%s.prototype.define = function %s() {\n%s%s}\n' % (indent, fname, fname, jdefine, indent) + jdefine = '%s%s.prototype.define = function %s() {\n%s%*sreturn new %s(this.x);\n%s}\n' % (indent, fname, fname, jdefine, INDENT_LEVEL * INDENT_SIZE, ' ', blocktype, indent) jdetails = JOB_BLOCKS['"details"'] if '"details"' in JOB_BLOCKS else '' jdetails = '%s%s.prototype.details = function %s() {\n%s%*sreturn this.x;\n%s}\n' % (indent, fname, fname, jdetails, INDENT_LEVEL * INDENT_SIZE, ' ', indent) jget = JOB_BLOCKS['"get"'] if '"get"' in JOB_BLOCKS else '' jget = '%s%s.prototype.get = function %s() {\n%s%s}\n' % (indent, fname, fname, jget, indent) jset = JOB_BLOCKS['"set"'] if '"set"' in JOB_BLOCKS else '' - jset = '%s%s.prototype.set = function %s() {\n%s%s}\n' % (indent, fname, fname, jset, indent) + jset = '%s%s.prototype.set = function %s() {\n%s%*sreturn new %s(this.x);\n%s}\n' % (indent, fname, fname, jset, INDENT_LEVEL * INDENT_SIZE, ' ', blocktype, indent) INDENT_LEVEL -= 1 p[0] = 'function %s() {\n%s%s%s%s}' % (fname, jdefine, jdetails, jget, jset) @@ -321,8 +322,7 @@ def p_selectjobstatement_select(p): def p_casestatement_case(p): '''casestatement : CASE expression THEN EOL - | CASE expression EOL - | CASE expression THEN COMMA''' + | CASE expression EOL''' global INDENT_LEVEL INDENT_LEVEL -= 1 p[0] = '%*scase %s:\n' % (INDENT_LEVEL * INDENT_SIZE, ' ', p[2]) @@ -330,8 +330,7 @@ def p_casestatement_case(p): def p_casejobstatement_case(p): '''casejobstatement : CASE expression THEN EOL - | CASE expression EOL - | CASE expression THEN COMMA''' + | CASE expression EOL''' LOCAL_VARS.clear() LOCAL_VARS.update(FUNCTION_VARS) p[0] = '%s' % (p[2]) @@ -826,9 +825,16 @@ def p_term_string(p): # end define term +BLOCK_TYPE = { +} + def p_error(p): print("Syntax error in input", p) +def getblocktype(module): + '''return a block type for a module''' + return BLOCK_TYPE.get(module, 'BasicBlock') + def processfile(filename, picklefilename, passnumber): '''convert a sci file to a js file''' |