From a340cd118ef1765d14df62f8291d2f2c0c2361de Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Thu, 2 Sep 2010 12:50:37 +0200
Subject: [PATCH] Get rid of the numeric literals.
---
src/plugins/cpptools/cppmodelmanager.cpp | 3 +++
src/shared/cplusplus/Control.cpp | 5 +++++
src/shared/cplusplus/Control.h | 2 ++
src/shared/cplusplus/LiteralTable.h | 11 +++++++++++
4 files changed, 21 insertions(+)
diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp
index faf1650a025..d1415bb281b 100644
--- a/src/plugins/cpptools/cppmodelmanager.cpp
+++ b/src/plugins/cpptools/cppmodelmanager.cpp
@@ -287,6 +287,9 @@ public:
_doc->check(_mode);
_doc->releaseTranslationUnit();
+ if (_mode == Document::FastCheck)
+ _doc->control()->squeeze();
+
if (_modelManager)
_modelManager->emitDocumentUpdated(_doc); // ### TODO: compress
}
diff --git a/src/shared/cplusplus/Control.cpp b/src/shared/cplusplus/Control.cpp
index 14e302a0399..647b17ce357 100644
--- a/src/shared/cplusplus/Control.cpp
+++ b/src/shared/cplusplus/Control.cpp
@@ -754,3 +754,8 @@ bool Control::hasSymbol(Symbol *symbol) const
{
return std::find(d->symbols.begin(), d->symbols.end(), symbol) != d->symbols.end();
}
+
+void Control::squeeze()
+{
+ d->numericLiterals.reset();
+}
diff --git a/src/shared/cplusplus/Control.h b/src/shared/cplusplus/Control.h
index 78839fb1e5d..69c6dceae6a 100644
--- a/src/shared/cplusplus/Control.h
+++ b/src/shared/cplusplus/Control.h
@@ -211,6 +211,8 @@ public:
bool hasSymbol(Symbol *symbol) const;
+ void squeeze();
+
private:
class Data;
friend class Data;
diff --git a/src/shared/cplusplus/LiteralTable.h b/src/shared/cplusplus/LiteralTable.h
index 80ada26e51a..1c85c6f13a0 100644
--- a/src/shared/cplusplus/LiteralTable.h
+++ b/src/shared/cplusplus/LiteralTable.h
@@ -73,6 +73,11 @@ public:
{ }
~LiteralTable()
+ {
+ reset();
+ }
+
+ void reset()
{
if (_literals) {
_Literal **lastLiteral = _literals + _literalCount + 1;
@@ -82,6 +87,12 @@ public:
}
if (_buckets)
std::free(_buckets);
+
+ _literals = 0;
+ _buckets = 0;
+ _allocatedLiterals = 0;
+ _literalCount = -1;
+ _allocatedBuckets = 0;
}
bool empty() const
--
GitLab