summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--combined.js40
-rw-r--r--js/Branching/CLKFROM.js2
-rw-r--r--js/Branching/CLKGOTO.js2
-rw-r--r--js/Branching/CLKGotoTagVisibility.js2
-rw-r--r--js/Branching/FROM.js2
-rw-r--r--js/Branching/FROMMO.js2
-rw-r--r--js/Branching/GOTO.js2
-rw-r--r--js/Branching/GOTOMO.js2
-rw-r--r--js/Branching/GotoTagVisibility.js2
-rw-r--r--js/Branching/GotoTagVisibilityMO.js2
-rw-r--r--js/MatrixOp/MATRESH.js2
-rw-r--r--js/Misc/EDGE_TRIGGER.js2
-rw-r--r--js/Misc/EDGE_TRIGGER.pickle8
-rw-r--r--js/Misc/PAL_f.js2
-rw-r--r--js/Misc/generic_block.js2
-rw-r--r--js/Misc/generic_block2.js2
-rw-r--r--js/Misc/generic_block3.js2
-rw-r--r--js/Misc/scifunc_block.js2
-rw-r--r--js/Misc/scifunc_block_m.js2
-rw-r--r--js/Sources/CLOCK_c.js2
-rw-r--r--js/Sources/CLOCK_c.pickle10
-rw-r--r--js/Sources/STEP_FUNCTION.js2
-rw-r--r--js/Sources/STEP_FUNCTION.pickle8
-rw-r--r--js/Sources/SampleCLK.js2
-rwxr-xr-xsci2jslex.py4
-rwxr-xr-xsci2jsyacc.py2
26 files changed, 55 insertions, 57 deletions
diff --git a/combined.js b/combined.js
index d1ba7933..3ec3ed41 100644
--- a/combined.js
+++ b/combined.js
@@ -40,7 +40,7 @@ function CLKFROM() {
this.x.model = model;
break;
}
- needcompile=resume(needcompile)
+ needcompile = resume(needcompile)
return new BasicBlock(this.x);
}
}
@@ -95,7 +95,7 @@ function CLKGOTO() {
break;
}
}
- needcompile=resume(needcompile)
+ needcompile = resume(needcompile)
return new BasicBlock(this.x);
}
}
@@ -147,7 +147,7 @@ function CLKGotoTagVisibility() {
break;
}
}
- needcompile=resume(needcompile)
+ needcompile = resume(needcompile)
return new BasicBlock(this.x);
}
}
@@ -446,7 +446,7 @@ function FROM() {
break;
}
}
- needcompile=resume(needcompile)
+ needcompile = resume(needcompile)
return new BasicBlock(this.x);
}
}
@@ -501,7 +501,7 @@ function FROMMO() {
break;
}
}
- needcompile=resume(needcompile)
+ needcompile = resume(needcompile)
return new BasicBlock(this.x);
}
}
@@ -560,7 +560,7 @@ function GOTO() {
break;
}
}
- needcompile=resume(needcompile)
+ needcompile = resume(needcompile)
return new BasicBlock(this.x);
}
}
@@ -622,7 +622,7 @@ function GOTOMO() {
break;
}
}
- needcompile=resume(needcompile)
+ needcompile = resume(needcompile)
return new BasicBlock(this.x);
}
}
@@ -674,7 +674,7 @@ function GotoTagVisibility() {
break;
}
}
- needcompile=resume(needcompile)
+ needcompile = resume(needcompile)
return new BasicBlock(this.x);
}
}
@@ -726,7 +726,7 @@ function GotoTagVisibilityMO() {
break;
}
}
- needcompile=resume(needcompile)
+ needcompile = resume(needcompile)
return new BasicBlock(this.x);
}
}
@@ -9420,7 +9420,7 @@ function MATRESH() {
break;
}
}
- needcompile=resume(needcompile)
+ needcompile = resume(needcompile)
return new BasicBlock(this.x);
}
}
@@ -11189,7 +11189,7 @@ function EDGETRIGGER() {
function EDGE_TRIGGER() {
EDGE_TRIGGER.prototype.define = function EDGE_TRIGGER() {
scs_m_1 = scicos_diagram();
- scs_m_1.objs[1-1] = this.EDGETRIGGER["define"-1];
+ scs_m_1.objs[1-1] = EDGETRIGGER("define");
scs_m_1.objs[2-1] = IFTHEL_f("define");
scs_m_1.objs[3-1] = IN_f("define");
scs_m_1.objs[4-1] = CLKOUTV_f("define");
@@ -12356,7 +12356,7 @@ function PAL_f() {
this.x = arg1;
y = [];
typ = [];
- %exit=resume(false)
+ %exit = resume(false)
return new BasicBlock(this.x);
}
}
@@ -12970,7 +12970,7 @@ function generic_block() {
break;
}
}
- needcompile=resume(needcompile)
+ needcompile = resume(needcompile)
return new BasicBlock(this.x);
}
}
@@ -13072,7 +13072,7 @@ function generic_block2() {
break;
}
}
- needcompile=resume(needcompile)
+ needcompile = resume(needcompile)
return new BasicBlock(this.x);
}
}
@@ -13178,7 +13178,7 @@ function generic_block3() {
break;
}
}
- needcompile=resume(needcompile)
+ needcompile = resume(needcompile)
return new BasicBlock(this.x);
}
}
@@ -13273,7 +13273,7 @@ function scifunc_block() {
break;
}
}
- needcompile=resume(needcompile)
+ needcompile = resume(needcompile)
return new BasicBlock(this.x);
}
}
@@ -13370,7 +13370,7 @@ function scifunc_block_m() {
break;
}
}
- needcompile=resume(needcompile)
+ needcompile = resume(needcompile)
return new BasicBlock(this.x);
}
}
@@ -16503,7 +16503,7 @@ function CLKIN_f() {
/* autogenerated from "macros/Sources/CLOCK_c.sci" */
function CLOCK_c() {
CLOCK_c.prototype.define = function CLOCK_c() {
- evtdly = this.EVTDLY_c["define"-1];
+ evtdly = EVTDLY_c("define");
evtdly.graphics.orig = [320,232];
evtdly.graphics.sz = [40,40];
evtdly.graphics.flip = true;
@@ -18230,7 +18230,7 @@ function STEP() {
function STEP_FUNCTION() {
STEP_FUNCTION.prototype.define = function STEP_FUNCTION() {
scs_m_1 = scicos_diagram();
- scs_m_1.objs[1-1] = this.STEP["define"-1];
+ scs_m_1.objs[1-1] = STEP("define");
scs_m_1.objs[2-1] = OUT_f("define");
scs_m_1.objs[3-1] = scicos_link();
scs_m_1.objs[4-1] = scicos_link();
@@ -18402,7 +18402,7 @@ function SampleCLK() {
break;
}
}
- needcompile=resume(needcompile)
+ needcompile = resume(needcompile)
return new BasicBlock(this.x);
}
}
diff --git a/js/Branching/CLKFROM.js b/js/Branching/CLKFROM.js
index b49997ff..34b03f28 100644
--- a/js/Branching/CLKFROM.js
+++ b/js/Branching/CLKFROM.js
@@ -40,7 +40,7 @@ function CLKFROM() {
this.x.model = model;
break;
}
- needcompile=resume(needcompile)
+ needcompile = resume(needcompile)
return new BasicBlock(this.x);
}
}
diff --git a/js/Branching/CLKGOTO.js b/js/Branching/CLKGOTO.js
index d01fd341..33e54e24 100644
--- a/js/Branching/CLKGOTO.js
+++ b/js/Branching/CLKGOTO.js
@@ -49,7 +49,7 @@ function CLKGOTO() {
break;
}
}
- needcompile=resume(needcompile)
+ needcompile = resume(needcompile)
return new BasicBlock(this.x);
}
}
diff --git a/js/Branching/CLKGotoTagVisibility.js b/js/Branching/CLKGotoTagVisibility.js
index 5c73f47a..bb7a5819 100644
--- a/js/Branching/CLKGotoTagVisibility.js
+++ b/js/Branching/CLKGotoTagVisibility.js
@@ -46,7 +46,7 @@ function CLKGotoTagVisibility() {
break;
}
}
- needcompile=resume(needcompile)
+ needcompile = resume(needcompile)
return new BasicBlock(this.x);
}
}
diff --git a/js/Branching/FROM.js b/js/Branching/FROM.js
index 2fd6c169..8a83a721 100644
--- a/js/Branching/FROM.js
+++ b/js/Branching/FROM.js
@@ -46,7 +46,7 @@ function FROM() {
break;
}
}
- needcompile=resume(needcompile)
+ needcompile = resume(needcompile)
return new BasicBlock(this.x);
}
}
diff --git a/js/Branching/FROMMO.js b/js/Branching/FROMMO.js
index 0848ff5b..cebe0d9b 100644
--- a/js/Branching/FROMMO.js
+++ b/js/Branching/FROMMO.js
@@ -49,7 +49,7 @@ function FROMMO() {
break;
}
}
- needcompile=resume(needcompile)
+ needcompile = resume(needcompile)
return new BasicBlock(this.x);
}
}
diff --git a/js/Branching/GOTO.js b/js/Branching/GOTO.js
index 52abc035..e58a98e5 100644
--- a/js/Branching/GOTO.js
+++ b/js/Branching/GOTO.js
@@ -53,7 +53,7 @@ function GOTO() {
break;
}
}
- needcompile=resume(needcompile)
+ needcompile = resume(needcompile)
return new BasicBlock(this.x);
}
}
diff --git a/js/Branching/GOTOMO.js b/js/Branching/GOTOMO.js
index b4d615bf..14036abb 100644
--- a/js/Branching/GOTOMO.js
+++ b/js/Branching/GOTOMO.js
@@ -56,7 +56,7 @@ function GOTOMO() {
break;
}
}
- needcompile=resume(needcompile)
+ needcompile = resume(needcompile)
return new BasicBlock(this.x);
}
}
diff --git a/js/Branching/GotoTagVisibility.js b/js/Branching/GotoTagVisibility.js
index d0713180..0f514bc2 100644
--- a/js/Branching/GotoTagVisibility.js
+++ b/js/Branching/GotoTagVisibility.js
@@ -46,7 +46,7 @@ function GotoTagVisibility() {
break;
}
}
- needcompile=resume(needcompile)
+ needcompile = resume(needcompile)
return new BasicBlock(this.x);
}
}
diff --git a/js/Branching/GotoTagVisibilityMO.js b/js/Branching/GotoTagVisibilityMO.js
index 5e5c3555..f2131e56 100644
--- a/js/Branching/GotoTagVisibilityMO.js
+++ b/js/Branching/GotoTagVisibilityMO.js
@@ -46,7 +46,7 @@ function GotoTagVisibilityMO() {
break;
}
}
- needcompile=resume(needcompile)
+ needcompile = resume(needcompile)
return new BasicBlock(this.x);
}
}
diff --git a/js/MatrixOp/MATRESH.js b/js/MatrixOp/MATRESH.js
index ef21b5f9..dbd65c59 100644
--- a/js/MatrixOp/MATRESH.js
+++ b/js/MatrixOp/MATRESH.js
@@ -93,7 +93,7 @@ function MATRESH() {
break;
}
}
- needcompile=resume(needcompile)
+ needcompile = resume(needcompile)
return new BasicBlock(this.x);
}
}
diff --git a/js/Misc/EDGE_TRIGGER.js b/js/Misc/EDGE_TRIGGER.js
index f0aeb9ff..ad159da5 100644
--- a/js/Misc/EDGE_TRIGGER.js
+++ b/js/Misc/EDGE_TRIGGER.js
@@ -2,7 +2,7 @@
function EDGE_TRIGGER() {
EDGE_TRIGGER.prototype.define = function EDGE_TRIGGER() {
scs_m_1 = scicos_diagram();
- scs_m_1.objs[1-1] = this.EDGETRIGGER["define"-1];
+ scs_m_1.objs[1-1] = EDGETRIGGER("define");
scs_m_1.objs[2-1] = IFTHEL_f("define");
scs_m_1.objs[3-1] = IN_f("define");
scs_m_1.objs[4-1] = CLKOUTV_f("define");
diff --git a/js/Misc/EDGE_TRIGGER.pickle b/js/Misc/EDGE_TRIGGER.pickle
index 6b285a05..a010fd54 100644
--- a/js/Misc/EDGE_TRIGGER.pickle
+++ b/js/Misc/EDGE_TRIGGER.pickle
@@ -4,10 +4,8 @@ p0
((lp1
S'x'
p2
-aS'EDGETRIGGER'
-p3
aS'xxn'
-p4
-atp5
-Rp6
+p3
+atp4
+Rp5
. \ No newline at end of file
diff --git a/js/Misc/PAL_f.js b/js/Misc/PAL_f.js
index ed6fbf21..f325c8c6 100644
--- a/js/Misc/PAL_f.js
+++ b/js/Misc/PAL_f.js
@@ -27,7 +27,7 @@ function PAL_f() {
this.x = arg1;
y = [];
typ = [];
- %exit=resume(false)
+ %exit = resume(false)
return new BasicBlock(this.x);
}
}
diff --git a/js/Misc/generic_block.js b/js/Misc/generic_block.js
index 230ee9d1..844b46ed 100644
--- a/js/Misc/generic_block.js
+++ b/js/Misc/generic_block.js
@@ -94,7 +94,7 @@ function generic_block() {
break;
}
}
- needcompile=resume(needcompile)
+ needcompile = resume(needcompile)
return new BasicBlock(this.x);
}
}
diff --git a/js/Misc/generic_block2.js b/js/Misc/generic_block2.js
index e6372a3b..ca8081c5 100644
--- a/js/Misc/generic_block2.js
+++ b/js/Misc/generic_block2.js
@@ -96,7 +96,7 @@ function generic_block2() {
break;
}
}
- needcompile=resume(needcompile)
+ needcompile = resume(needcompile)
return new BasicBlock(this.x);
}
}
diff --git a/js/Misc/generic_block3.js b/js/Misc/generic_block3.js
index 899e8c49..61a2ba68 100644
--- a/js/Misc/generic_block3.js
+++ b/js/Misc/generic_block3.js
@@ -100,7 +100,7 @@ function generic_block3() {
break;
}
}
- needcompile=resume(needcompile)
+ needcompile = resume(needcompile)
return new BasicBlock(this.x);
}
}
diff --git a/js/Misc/scifunc_block.js b/js/Misc/scifunc_block.js
index ff014084..9fbd8782 100644
--- a/js/Misc/scifunc_block.js
+++ b/js/Misc/scifunc_block.js
@@ -89,7 +89,7 @@ function scifunc_block() {
break;
}
}
- needcompile=resume(needcompile)
+ 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 8268975d..861b1936 100644
--- a/js/Misc/scifunc_block_m.js
+++ b/js/Misc/scifunc_block_m.js
@@ -91,7 +91,7 @@ function scifunc_block_m() {
break;
}
}
- needcompile=resume(needcompile)
+ needcompile = resume(needcompile)
return new BasicBlock(this.x);
}
}
diff --git a/js/Sources/CLOCK_c.js b/js/Sources/CLOCK_c.js
index 5dd8d867..5ca837b0 100644
--- a/js/Sources/CLOCK_c.js
+++ b/js/Sources/CLOCK_c.js
@@ -1,7 +1,7 @@
/* autogenerated from "macros/Sources/CLOCK_c.sci" */
function CLOCK_c() {
CLOCK_c.prototype.define = function CLOCK_c() {
- evtdly = this.EVTDLY_c["define"-1];
+ evtdly = EVTDLY_c("define");
evtdly.graphics.orig = [320,232];
evtdly.graphics.sz = [40,40];
evtdly.graphics.flip = true;
diff --git a/js/Sources/CLOCK_c.pickle b/js/Sources/CLOCK_c.pickle
index ecce30af..5cf559c5 100644
--- a/js/Sources/CLOCK_c.pickle
+++ b/js/Sources/CLOCK_c.pickle
@@ -6,12 +6,10 @@ S'x'
p2
aS'dt'
p3
-aS'EVTDLY_c'
-p4
aS'exprs0'
-p5
+p4
aS't0'
-p6
-atp7
-Rp8
+p5
+atp6
+Rp7
. \ No newline at end of file
diff --git a/js/Sources/STEP_FUNCTION.js b/js/Sources/STEP_FUNCTION.js
index 1c28e304..a255a1fc 100644
--- a/js/Sources/STEP_FUNCTION.js
+++ b/js/Sources/STEP_FUNCTION.js
@@ -2,7 +2,7 @@
function STEP_FUNCTION() {
STEP_FUNCTION.prototype.define = function STEP_FUNCTION() {
scs_m_1 = scicos_diagram();
- scs_m_1.objs[1-1] = this.STEP["define"-1];
+ scs_m_1.objs[1-1] = STEP("define");
scs_m_1.objs[2-1] = OUT_f("define");
scs_m_1.objs[3-1] = scicos_link();
scs_m_1.objs[4-1] = scicos_link();
diff --git a/js/Sources/STEP_FUNCTION.pickle b/js/Sources/STEP_FUNCTION.pickle
index 85e1e424..a010fd54 100644
--- a/js/Sources/STEP_FUNCTION.pickle
+++ b/js/Sources/STEP_FUNCTION.pickle
@@ -4,10 +4,8 @@ p0
((lp1
S'x'
p2
-aS'STEP'
-p3
aS'xxn'
-p4
-atp5
-Rp6
+p3
+atp4
+Rp5
. \ No newline at end of file
diff --git a/js/Sources/SampleCLK.js b/js/Sources/SampleCLK.js
index 741b0d59..514c8bf2 100644
--- a/js/Sources/SampleCLK.js
+++ b/js/Sources/SampleCLK.js
@@ -49,7 +49,7 @@ function SampleCLK() {
break;
}
}
- needcompile=resume(needcompile)
+ needcompile = resume(needcompile)
return new BasicBlock(this.x);
}
}
diff --git a/sci2jslex.py b/sci2jslex.py
index 7539573e..cab8188a 100755
--- a/sci2jslex.py
+++ b/sci2jslex.py
@@ -71,8 +71,11 @@ FUNCTION_NAMES = {
'CLKSOM_f',
'CLKSOMV_f',
'CLKSPLIT_f',
+ 'CONST_m',
'DEBUG',
'Do_Spline',
+ 'EDGETRIGGER',
+ 'EVTDLY_c',
'EVTDLY_f',
'FORTR',
'IFTHEL_f',
@@ -85,6 +88,7 @@ FUNCTION_NAMES = {
'REGISTER_f',
'ReadExcel',
'ReadFromFile',
+ 'STEP',
'SWITCH_f',
'SaveToFile',
'abs',
diff --git a/sci2jsyacc.py b/sci2jsyacc.py
index 2a94c32c..d88f2baf 100755
--- a/sci2jsyacc.py
+++ b/sci2jsyacc.py
@@ -118,7 +118,7 @@ def p_statement_functionblock(p):
def p_statement_resume(p):
'statement : lterm ASSIGNMENT RESUME OPENBRACKET expression CLOSEBRACKET EOL'
- p[0] = '%*s%s%s%s(%s)\n' % (INDENT_LEVEL * INDENT_SIZE, ' ', p[1], p[2], p[3], p[5])
+ p[0] = '%*s%s = %s(%s)\n' % (INDENT_LEVEL * INDENT_SIZE, ' ', p[1], p[3], p[5])
def p_statement_where(p):
'statement : lterm ASSIGNMENT WHERE OPENBRACKET CLOSEBRACKET EOL'
generated by cgit (git 2.34.1) at 2025-03-13 07:06:25 +0000