diff --git a/src/ir/IntegerVariable.cpp b/src/ir/IntegerVariable.cpp index f98ff8861..0e6e2a4fe 100644 --- a/src/ir/IntegerVariable.cpp +++ b/src/ir/IntegerVariable.cpp @@ -46,7 +46,7 @@ std::shared_ptr IntegerVariable::getUppe // Build a string representation of the variable. std::string IntegerVariable::toString() const { std::stringstream result; - result << "int_" << this->getName() << ": [" << lowerBound->toString() << ".." << upperBound->toString() << "]"; + result << this->getName() << ": [" << lowerBound->toString() << ".." << upperBound->toString() << "]"; if (this->getInitialValue() != nullptr) { result << " init " + this->getInitialValue()->toString(); } diff --git a/src/ir/Module.cpp b/src/ir/Module.cpp index 6bb8aa1aa..80aa288c3 100644 --- a/src/ir/Module.cpp +++ b/src/ir/Module.cpp @@ -32,16 +32,11 @@ Module::Module(std::string moduleName, : moduleName(moduleName), booleanVariables(booleanVariables), integerVariables(integerVariables), booleanVariablesToIndexMap(booleanVariableToIndexMap), integerVariablesToIndexMap(integerVariableToIndexMap), commands(commands), actions(), actionsToCommandIndexMap() { - std::cout << "Created module " << this << ":" << std::endl << this->toString() << std::endl; this->collectActions(); } Module::Module(const Module& module, const std::string& moduleName, const std::map& renaming, std::shared_ptr adder) : moduleName(moduleName) { - std::cout << "Renaming module " << module.moduleName << " to " << moduleName << " with " << renaming.size() << " renamings:" << std::endl; - for (auto it: renaming) { - std::cout << "\t" << it.first << " -> " << it.second << std::endl; - } this->booleanVariables.reserve(module.booleanVariables.size()); for (BooleanVariable it: module.booleanVariables) { if (renaming.count(it.getName()) > 0) { diff --git a/src/ir/Variable.cpp b/src/ir/Variable.cpp index 1d762b4b4..4edc93b2f 100644 --- a/src/ir/Variable.cpp +++ b/src/ir/Variable.cpp @@ -27,7 +27,6 @@ Variable::Variable(uint_fast64_t index, std::string variableName, std::shared_pt Variable::Variable(const Variable& var, const std::string& newName, const std::map& renaming, const std::map& bools, const std::map& ints) : Variable(var.index, newName, var.initialValue->clone(renaming, bools, ints)) { - std::cout << "Cloning Variable " << var.variableName << " to " << newName << std::endl; } // Return the name of the variable. diff --git a/src/ir/expressions/VariableExpression.h b/src/ir/expressions/VariableExpression.h index d0fc4cf30..f7811e3e4 100644 --- a/src/ir/expressions/VariableExpression.h +++ b/src/ir/expressions/VariableExpression.h @@ -26,7 +26,6 @@ public: std::shared_ptr upperBound = std::shared_ptr(nullptr)) : BaseExpression(type), index(index), variableName(variableName), lowerBound(lowerBound), upperBound(upperBound) { - std::cerr << "VariableExpression " << this->variableName << std::endl; } virtual ~VariableExpression() { @@ -55,9 +54,7 @@ public: } virtual std::string toString() const { - std::stringstream result; - result << variableName << "(" << this->index << ")"; - return result.str(); + return this->variableName; } virtual std::string dump(std::string prefix) const { diff --git a/src/parser/PrismParser/VariableState.h b/src/parser/PrismParser/VariableState.h index 58a716fd1..e6c99d9ab 100644 --- a/src/parser/PrismParser/VariableState.h +++ b/src/parser/PrismParser/VariableState.h @@ -135,7 +135,6 @@ public: } void prepareForSecondRun() { - std::cerr << "starting second run" << std::endl; integerConstants_.clear(); booleanConstants_.clear(); doubleConstants_.clear();