#include "Variables.h"
#include "support/LRegex.h"
-void Variables::set(string const &var, string const &val)
+
+void Variables::set(string const & var, string const & val)
{
- Vars::const_iterator cit = vars_.find(var);
- if (cit != vars_.end())
- vars_.erase(var);
- vars_[var] = val;;
+ // We want to use const_iterator (Lgb)
+ Vars::iterator cit = vars_.find(var);
+ if (cit != vars_.end())
+ vars_.erase(var);
+ vars_[var] = val;;
}
-string Variables::get(string const &var) const
+string const Variables::get(string const & var) const
{
Vars::const_iterator cit = vars_.find(var);
if (cit != vars_.end())
return string();
}
+
bool Variables::isset(string const & var) const
{
Vars::const_iterator cit = vars_.find(var);
return (cit != vars_.end());
}
-string Variables::expand(string str) const
+
+string const Variables::expand(string const & s) const
{
+ string str(s);
LRegex reg("\\$\\{\\(.*\\)\\}");
if (!reg.exact_match(str))