Fixed strings starting with @ still being parsed

addons/python/src/python.cpp

@@ -222,6 +222,9 @@ bool printPyList(PyObject* arr) {
 void PythonRewardEnvironment::configure(Configuration &config)
 {
   reward_function_str_ = config["reward"].str();
+  if (!reward_function_str_.empty() && reward_function_str_[0] == '@')
+    reward_function_str_ = reward_function_str_.substr(1);
+
   env_ = (Environment*)config["environment"].ptr();
 
   Py_Initialize();

base/include/grl/parser.h

@@ -60,6 +60,10 @@ ASTNodePtr parseExpression(const std::string &str);
 
 inline std::string evaluateExpression(const std::string &str)
 {
+  // Expressions starting with @ are not evaluated.
+  if (!str.empty() && str[0] == '@')
+    return str;
+
   ASTNodePtr ast = parseExpression(str);
   return ast->evaluate();
 }

base/src/configurable.cpp

@@ -390,13 +390,12 @@ std::string ParameterConfigurator::localize(const std::string &id, const Configu
 
 std::string ParameterConfigurator::str() const
 {
+  // Expressions starting with @ are not evaluated.
+  if (!value_.empty() && value_[0] == '@')
+    return value_;
+
   std::string v = value_, id, expv;
 
-  // Expressions starting with @ are not evaluated. For literal
-  // @ at the beginning of an expression, use @@.
-  if (!value_.empty() && v[0] == '@')
-    return value_.substr(1);
-
   // Resolve references
   for (size_t ii=0; ii < v.size(); ++ii)
   {
@@ -466,6 +465,10 @@ ParameterConfigurator *ParameterConfigurator::instantiate(Configurator *parent)
   if (!parent)
     parent = parent_;
 
+  // Expressions starting with @ are not evaluated.
+  if (!value_.empty() && value_[0] == '@')
+    return new ParameterConfigurator(element_, value_, parent);
+
   std::string v = value_, id, expv;
 
   // Make references local