include in in modelvar

1 files changed, 4 insertions, 10 deletions

diff --git a/sci2jsyacc.py b/sci2jsyacc.py
index cde74dfa..8e98e78d 100755
--- a/sci2jsyacc.py
+++ b/sci2jsyacc.py
@@ -517,6 +517,10 @@ def p_modelvar_var(p):
     'modelvar : VAR'
     p[0] = '%s' % (p[1])
 
+def p_modelvar_in(p):
+    'modelvar : IN'
+    p[0] = '%s1' % (p[1])
+
 def p_modelvar_modelvar_expression(p):
     'modelvar : modelvar OPENBRACKET expression CLOSEBRACKET'
     p[0] = '%s[%s]' % (p[1], p[3][0])
@@ -573,16 +577,6 @@ def p_modelexpression_expression(p):
     'modelexpression : expression'
     p[0] = p[1]
 
-def p_model_in_assignment_expression(p):
-    'assignment : MODEL DOT IN ASSIGNMENT expression'
-    var = 'this.%s.%s1' % (p[1], p[3])
-    vartype = MODEL_MAP.get(p[5][1], 'ScilabDouble')
-    if vartype != '':
-        p[0] = '%*s%s = new %s([%s])' % (INDENT_LEVEL * INDENT_SIZE, ' ', var, vartype, p[5][0])
-    else:
-        p[0] = '%*s%s = %s' % (INDENT_LEVEL * INDENT_SIZE, ' ', var, p[5][0])
-    add_var_vartype(var, p[5][1])
-
 def p_getvalueassignment_getvalue_arguments(p):
     'getvalueassignment : lterm ASSIGNMENT SCICOS_GETVALUE OPENBRACKET getvaluearguments CLOSEBRACKET'
     p[0] = '%*s%s = %s(%s)' % (INDENT_LEVEL * INDENT_SIZE, ' ', p[1], p[3], p[5])