Added "ar" prefix for issue #12

soarlab · Jul 24, 2016 · ef45a21 · ef45a21
1 parent 82aa7c2
commit ef45a21
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/src/frontend/function_transforms/func_map.py b/src/frontend/function_transforms/func_map.py
@@ -1,5 +1,17 @@
 def strip_arc(f):
-    if f[:3] == "arc":
-        return "a" + f[3:]
+    d = {"arccos"  : "acos",
+         "arcos"   : "acos",
+         "arcsin"  : "asin",
+         "arsin"   : "asin",
+         "arctan"  : "atan",
+         "artan"   : "atan",
+         "arccosh" : "acosh",
+         "arcosh"  : "acosh",
+         "arcsinh" : "asinh",
+         "arsinh"  : "asinh",
+         "arctanh" : "atanh",
+         "artanh"  : "atanh"}
+    if f in d.keys():
+        return d[f]
     return f
 
diff --git a/src/frontend/function_transforms/function_to_lexed.py b/src/frontend/function_transforms/function_to_lexed.py
@@ -54,9 +54,11 @@
 t_BINOP = "({})".format(")|(".join(BINOPS))
 
 UNIOPS  = {"abs", "cos", "exp", "log", "sin", "tan", "sqrt",
-           "arccos", "arcsin", "arctan", "acos", "asin", "atan",
+           "arccos", "arcsin", "arctan", "arcos", "arsin", "artan",
+           "acos", "asin", "atan",
            "sinh", "cosh", "tanh",
-           "arccosh", "arcsinh", "arctanh", "acosh", "asinh", "atanh"}
+           "arccosh", "arcsinh", "arctanh", "arcosh", "arsinh", "artanh",
+           "acosh", "asinh", "atanh"}
 
 t_UNIOP = "({})".format(")|(".join(UNIOPS))