parser : minor fixes

symengine · Feb 10, 2016 · d50b439 · d50b439
1 parent 0c64af9
commit d50b439
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/symengine/parser.cpp b/symengine/parser.cpp
@@ -9,6 +9,7 @@
 #include <symengine/functions.h>
 #include <symengine/constants.h>
 #include <symengine/visitor.h>
+#include <symengine/parser.h>
 #include <vector>
 #include <stack>
 #include <map>
@@ -22,12 +23,12 @@ class ExpressionParser {
 
     // OPERATORS and op_precedence used internally, for parsing
     std::set<char> OPERATORS = {'-', '+', '*', '/', '^', '(', ')', ','};
-    std::map<char, int> op_precedence = {
+    std::map<char, const int> op_precedence = {
         {')', 0}, {',', 0}, {'-', 1},  {'+', 1},
         {'*', 3}, {'/', 4}, {'^', 5}
     };
     // symengine supported constants
-    std::map<std::string, RCP<const Basic> > constants = {
+    std::map<const std::string, const RCP<const Basic> > constants = {
 
         {"e", E}, {"E", E}, {"EulerGamma", EulerGamma}, {"pi", pi}, {"I", I}
     };
@@ -44,8 +45,8 @@ class ExpressionParser {
     double_arg_func double_casted_zeta = zeta;
 
     // maps string to corresponding single argument function
-    std::map<   std::string,
-                std::function<RCP<const Basic>(const RCP<const Basic>&)>
+    std::map<   const std::string,
+                const std::function<RCP<const Basic>(const RCP<const Basic>&)>
             >   single_arg_functions = {
 
         {"", [](const RCP<const Basic>& x){return x;}},
@@ -68,8 +69,8 @@ class ExpressionParser {
     };
 
     // maps string to corresponding double argument function
-    std::map<   std::string,
-                std::function<RCP<const Basic>(const RCP<const Basic>&, const RCP<const Basic>&)>
+    std::map<   const std::string,
+                const std::function<RCP<const Basic>(const RCP<const Basic>&, const RCP<const Basic>&)>
             >   double_arg_functions = {
 
         {"pow", pow}, {"beta", beta}, {"log", double_casted_log}, {"zeta", double_casted_zeta},
@@ -324,4 +325,9 @@ class ExpressionParser {
     }
 };
 
+RCP<const Basic> parse(const std::string& s) {
+    ExpressionParser p;
+    return p.parse_expr(s);
+}
+
 } // SymEngine
diff --git a/symengine/parser.h b/symengine/parser.h
@@ -3,14 +3,10 @@
 
 #include <symengine/basic.h>
 #include <symengine/dict.h>
-#include <symengine/parser.cpp>
 
 namespace SymEngine {
 
-inline RCP<const Basic> parse(std::string& s) {
-	ExpressionParser p;
-	return p.parse_expr(s);
-}
+RCP<const Basic> parse(const std::string& s);
 
 } // SymEngine