simplify term array list

1 files changed, 6 insertions, 13 deletions

diff --git a/sci2jsyacc.py b/sci2jsyacc.py
index 7eca9a39..2e6ee4c5 100755
--- a/sci2jsyacc.py
+++ b/sci2jsyacc.py
@@ -276,12 +276,13 @@ def p_ltermarraylist_var(p):
 def p_termarraylist_termarraylist_semicolon_expression(p):
     '''termarraylist : termarraylist SEMICOLON expression
                      | termarraylist COMMA expression
-                     | termarraylist SPACE expression
-                     | expression SEMICOLON expression
-                     | expression COMMA expression
-                     | expression SPACE expression'''
+                     | termarraylist SPACE expression'''
     p[0] = str(p[1]) + ',' + str(p[3])
 
+def p_termarraylist_expression(p):
+    'termarraylist : expression'
+    p[0] = str(p[1])
+
 # end define termarraylist
 
 # define list
@@ -310,14 +311,6 @@ def p_expression_termarraylist(p):
                   | OPENSQBRACKET termarraylist SPACE CLOSESQBRACKET'''
     p[0] = '[' + str(p[2]) + ']'
 
-def p_expression_sqbracket_addition_term_sqbracket(p):
-    'expression : OPENSQBRACKET ADDITION term CLOSESQBRACKET'
-    p[0] = str(p[1]) + str(p[2]) + str(p[3]) + str(p[4])
-
-def p_expression_sqbracket_term_sqbracket(p):
-    'expression : OPENSQBRACKET term CLOSESQBRACKET'
-    p[0] = str(p[1]) + str(p[2]) + str(p[3])
-
 # []
 def p_expression_empty(p):
     'expression : OPENSQBRACKET CLOSESQBRACKET'
@@ -358,7 +351,7 @@ def p_expression_expression_logical_expression(p):
     p[0] = str(p[1]) + o + str(p[3])
 
 def p_expression_addition_term(p):
-    'expression : ADDITION term %prec UNARYADDITION'
+    'expression : ADDITION expression %prec UNARYADDITION'
     p[0] = str(p[1]) + str(p[2])
 
 def p_expression_not_expression(p):