1 files changed, 4 insertions, 25 deletions
diff --git a/sci2jsyacc.py b/sci2jsyacc.py
index 9d9f81f7..202650ef 100755
--- a/sci2jsyacc.py
+++ b/sci2jsyacc.py
@@ -559,11 +559,8 @@ def p_modelvar_modelvar_var(p):
     p[0] = '%s.%s' % (p[1], p[3])
 
 def p_modelvar_var(p):
-    'modelvar : VAR'
-    p[0] = '%s' % (p[1])
-
-def p_modelvar_in(p):
-    'modelvar : IN'
+    '''modelvar : VAR
+                | IN'''
     p[0] = '%s' % (p[1])
 
 def p_modelvar_modelvar_expression(p):
@@ -1053,14 +1050,11 @@ def p_lterm_ltermarraylist(p):
 
 def p_lterm_lterm_dot_var(p):
     '''lterm : lterm DOT VAR
+             | lterm DOT IN
              | lterm DOT GRAPHICS
              | lterm DOT MODEL'''
     p[0] = '%s.%s' % (p[1], p[3])
 
-def p_lterm_lterm_dot_in(p):
-    'lterm : lterm DOT IN'
-    p[0] = '%s.%s' % (p[1], p[3])
-
 def p_lterm_var(p):
     'lterm : VAR'
     var = p[1]
@@ -1272,6 +1266,7 @@ def p_term_termvar(p):
 # A.B
 def p_termvar_termvar_dot_var(p):
     '''termvar : termvar DOT VAR
+               | termvar DOT IN
                | termvar DOT GRAPHICS
                | termvar DOT MODEL'''
     var = p[1][0]
@@ -1288,22 +1283,6 @@ def p_termvar_termvar_dot_var(p):
     vartype = VAR_TYPES[basevar] if basevar in VAR_TYPES else None
     p[0] = (var, vartype)
 
-def p_termvar_termvar_dot_in(p):
-    'termvar : termvar DOT IN'
-    var = p[1][0]
-    if var[:5] == 'this.':
-        basevar = var[5:]
-    else:
-        basevar = var
-    add_object_var(basevar)
-    var = '%s.%s' % (var, p[3])
-    if var[:5] == 'this.':
-        basevar = var[5:]
-    else:
-        basevar = var
-    vartype = VAR_TYPES[basevar] if basevar in VAR_TYPES else None
-    p[0] = (var, vartype)
-
 # A
 def p_termvar_var(p):
     '''termvar : VAR