summaryrefslogtreecommitdiff
path: root/src/context.cc
diff options
context:
space:
mode:
authorMarius Kintel <marius@kintel.net>2012-01-25 02:11:12 (GMT)
committerMarius Kintel <marius@kintel.net>2012-01-25 02:11:12 (GMT)
commiteff1f7f8c91cee34c584a89c5d09e401c609f93e (patch)
tree543ae3bd3587dd3a97fbaa660ad9aaceb5a3823f /src/context.cc
parent16c05eb533f94799a80f5b98c01e952e1cfe337b (diff)
Ported printutils away from Qt
Diffstat (limited to 'src/context.cc')
-rw-r--r--src/context.cc16
1 files changed, 9 insertions, 7 deletions
diff --git a/src/context.cc b/src/context.cc
index 8d7b903..b9e685c 100644
--- a/src/context.cc
+++ b/src/context.cc
@@ -101,10 +101,12 @@ void Context::set_variable(const std::string &name, const Value &value)
void Context::set_constant(const std::string &name, const Value &value)
{
- if (this->constants.find(name) != this->constants.end())
- PRINTF("WARNING: Attempt to modify constant '%s'.",name.c_str());
- else
+ if (this->constants.find(name) != this->constants.end()) {
+ PRINTB("WARNING: Attempt to modify constant '%s'.", name);
+ }
+ else {
this->constants[name] = value;
+ }
}
Value Context::lookup_variable(const std::string &name, bool silent) const
@@ -124,7 +126,7 @@ Value Context::lookup_variable(const std::string &name, bool silent) const
if (this->parent)
return this->parent->lookup_variable(name, silent);
if (!silent)
- PRINTF("WARNING: Ignoring unknown variable '%s'.", name.c_str());
+ PRINTB("WARNING: Ignoring unknown variable '%s'.", name);
return Value();
}
@@ -144,7 +146,7 @@ Value Context::evaluate_function(const std::string &name,
}
if (this->parent)
return this->parent->evaluate_function(name, argnames, argvalues);
- PRINTF("WARNING: Ignoring unknown function '%s'.", name.c_str());
+ PRINTB("WARNING: Ignoring unknown function '%s'.", name);
return Value();
}
@@ -154,7 +156,7 @@ AbstractNode *Context::evaluate_module(const ModuleInstantiation &inst) const
AbstractModule *m = this->modules_p->find(inst.name())->second;
std::string replacement = Builtins::instance()->isDeprecated(inst.name());
if (!replacement.empty()) {
- PRINTF("DEPRECATED: The %s() module will be removed in future releases. Use %s() instead.", inst.name().c_str(), replacement.c_str());
+ PRINTB("DEPRECATED: The %s() module will be removed in future releases. Use %s() instead.", inst.name() % replacement);
}
return m->evaluate(this, &inst);
}
@@ -167,7 +169,7 @@ AbstractNode *Context::evaluate_module(const ModuleInstantiation &inst) const
}
}
if (this->parent) return this->parent->evaluate_module(inst);
- PRINTF("WARNING: Ignoring unknown module '%s'.", inst.name().c_str());
+ PRINTB("WARNING: Ignoring unknown module '%s'.", inst.name());
return NULL;
}
contact: Jan Huwald // Impressum