diff options
| -rw-r--r-- | js/Events/M_freq.js | 2 | ||||
| -rwxr-xr-x | sci2jslex.py | 2 | ||||
| -rwxr-xr-x | sci2jsyacc.py | 8 |
3 files changed, 9 insertions, 3 deletions
diff --git a/js/Events/M_freq.js b/js/Events/M_freq.js index 484128cb..95eb0c32 100644 --- a/js/Events/M_freq.js +++ b/js/Events/M_freq.js @@ -1,4 +1,4 @@ -Syntax error in input LexToken(MULTIPLICATION,'*',1,2005) +Syntax error in input LexToken(NUMBER,'40',1,2184) Syntax error in input LexToken(VAR,'fr',1,2909) /* autogenerated from "macros/Events/M_freq.sci" */ None diff --git a/sci2jslex.py b/sci2jslex.py index 473a44ba..eca88059 100755 --- a/sci2jslex.py +++ b/sci2jslex.py @@ -154,7 +154,7 @@ def t_DOT(t): return t def t_MULTIPLICATION(t): - r'[*/^\\]' + r'\*\*|[*/^\\]' global afterarray afterarray = False return t diff --git a/sci2jsyacc.py b/sci2jsyacc.py index 1ba1d84b..cff7a331 100755 --- a/sci2jsyacc.py +++ b/sci2jsyacc.py @@ -335,7 +335,13 @@ def p_expression_term_transpose(p): def p_expression_expression_multiplication_expression(p): 'expression : expression MULTIPLICATION expression' - p[0] = str(p[1]) + str(p[2]) + str(p[3]) + if p[2] == '**': + op = '^' + elif p[2] == '\\': + op = '\\' + else: + op = p[2] + p[0] = str(p[1]) + op + str(p[3]) def p_expression_expression_addition_expression(p): 'expression : expression ADDITION expression' |