From 7cebed738258758745e6b04d6d20bae368775d57 Mon Sep 17 00:00:00 2001 From: Maciej Suminski Date: Fri, 4 Dec 2015 11:38:19 +0100 Subject: [PATCH] vhdlpp: Disabled evaluation for ExpTime. It was always evaluated to a value expressed in femtoseconds, which not always might be the case. --- vhdlpp/expression.h | 4 ++-- vhdlpp/expression_evaluate.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vhdlpp/expression.h b/vhdlpp/expression.h index d570d3cee..eb83474df 100644 --- a/vhdlpp/expression.h +++ b/vhdlpp/expression.h @@ -891,8 +891,8 @@ class ExpTime : public Expression { int elaborate_expr(Entity*ent, ScopeBase*scope, const VType*ltype); void write_to_stream(std::ostream&) const; int emit(ostream&out, Entity*ent, ScopeBase*scope); - bool evaluate(ScopeBase*scope, int64_t&val) const; - bool evaluate(Entity*ent, ScopeBase*scope, int64_t&val) const; + //bool evaluate(ScopeBase*scope, int64_t&val) const; + //bool evaluate(Entity*ent, ScopeBase*scope, int64_t&val) const; void dump(ostream&out, int indent = 0) const; private: diff --git a/vhdlpp/expression_evaluate.cc b/vhdlpp/expression_evaluate.cc index 77ceeff52..0d7ef1634 100644 --- a/vhdlpp/expression_evaluate.cc +++ b/vhdlpp/expression_evaluate.cc @@ -252,7 +252,7 @@ bool ExpShift::evaluate(ScopeBase*scope, int64_t&val) const return true; } -bool ExpTime::evaluate(ScopeBase*, int64_t&val) const +/*bool ExpTime::evaluate(ScopeBase*, int64_t&val) const { double v = to_fs(); @@ -269,4 +269,4 @@ bool ExpTime::evaluate(ScopeBase*, int64_t&val) const bool ExpTime::evaluate(Entity*, ScopeBase*, int64_t&val) const { return evaluate(NULL, val); -} +}*/