2 files changed, 14 insertions, 14 deletions
diff --git a/sci2jslex.py b/sci2jslex.py
index 9dd6a73b..249775bd 100755
--- a/sci2jslex.py
+++ b/sci2jslex.py
@@ -233,7 +233,7 @@ BOOLEAN_FUNCTION_NAMES = {
 DOUBLE_FUNCTION_NAMES = {
 }
 
-MATRIX_DOUBLE_FUNCTION_NAMES = {
+MATRIX_FUNCTION_NAMES = {
 }
 
 NULL_FUNCTION_NAMES = {
@@ -245,7 +245,7 @@ OBJECT_FUNCTION_NAMES = {
 STRING_FUNCTION_NAMES = {
 }
 
-VECTOR_DOUBLE_FUNCTION_NAMES = {
+VECTOR_FUNCTION_NAMES = {
 }
 
 OBJECTS = {
@@ -281,7 +281,7 @@ tokens = [
     'FUNCTIONNAME',
     'LASTINDEX',
     'LOGICAL',
-    'MATRIX_DOUBLE_FUNCTIONNAME',
+    'MATRIX_FUNCTIONNAME',
     'MULTIPLICATION',
     'NOT',
     'NULL_FUNCTIONNAME',
@@ -296,7 +296,7 @@ tokens = [
     'STRING_FUNCTIONNAME',
     'TRANSPOSE',
     'VAR',
-    'VECTOR_DOUBLE_FUNCTIONNAME',
+    'VECTOR_FUNCTIONNAME',
 ] + list(SYNTAX_TOKENS.values()) + list(set(PREDEFINED_VARIABLES.values())) + list(OBJECTS.values()) + list(JOBTYPES.values())
 
 states = (
@@ -376,16 +376,16 @@ def t_VAR(t):
             vartype = 'BOOLEAN_FUNCTIONNAME'
         elif t.value in DOUBLE_FUNCTION_NAMES:
             vartype = 'DOUBLE_FUNCTIONNAME'
-        elif t.value in MATRIX_DOUBLE_FUNCTION_NAMES:
-            vartype = 'MATRIX_DOUBLE_FUNCTIONNAME'
+        elif t.value in MATRIX_FUNCTION_NAMES:
+            vartype = 'MATRIX_FUNCTIONNAME'
         elif t.value in NULL_FUNCTION_NAMES:
             vartype = 'NULL_FUNCTIONNAME'
         elif t.value in OBJECT_FUNCTION_NAMES:
             vartype = 'OBJECT_FUNCTIONNAME'
         elif t.value in STRING_FUNCTION_NAMES:
             vartype = 'STRING_FUNCTIONNAME'
-        elif t.value in VECTOR_DOUBLE_FUNCTION_NAMES:
-            vartype = 'VECTOR_DOUBLE_FUNCTIONNAME'
+        elif t.value in VECTOR_FUNCTION_NAMES:
+            vartype = 'VECTOR_FUNCTIONNAME'
         elif t.value in FUNCTION_NAMES:
             vartype = 'FUNCTIONNAME'
         else:
diff --git a/sci2jsyacc.py b/sci2jsyacc.py
index a0abc27c..52efc3e8 100755
--- a/sci2jsyacc.py
+++ b/sci2jsyacc.py
@@ -31,11 +31,11 @@ precedence = (
 
 BOOLEAN_TYPE = 'boolean'
 DOUBLE_TYPE = 'double'
-MATRIX_DOUBLE_TYPE = 'matrix_double'
+MATRIX_TYPE = 'matrix'
 NULL_TYPE = 'null'
 OBJECT_TYPE = 'object'
 STRING_TYPE = 'string'
-VECTOR_DOUBLE_TYPE = 'vector_double'
+VECTOR_TYPE = 'vector'
 
 start = 'functionblocks'
 
@@ -1082,8 +1082,8 @@ def add_boolean_var(var):
 def add_double_var(var):
     add_var_vartype(var, DOUBLE_TYPE)
 
-def add_matrix_double_var(var):
-    add_var_vartype(var, MATRIX_DOUBLE_TYPE)
+def add_matrix_var(var):
+    add_var_vartype(var, MATRIX_TYPE)
 
 def add_null_var(var):
     add_var_vartype(var, NULL_TYPE)
@@ -1094,8 +1094,8 @@ def add_object_var(var):
 def add_string_var(var):
     add_var_vartype(var, STRING_TYPE)
 
-def add_vector_double_var(var):
-    add_var_vartype(var, VECTOR_DOUBLE_TYPE)
+def add_vector_var(var):
+    add_var_vartype(var, VECTOR_TYPE)
 
 def dump_vars(picklefilename):
     with open(picklefilename, 'w') as cfile: