dayly work

diff --git a/rplexpr/rplasclasses.cpp b/rplexpr/rplasclasses.cpp
index 0dc027349b38b2ad02ddf4cea0aea68d190e04ef..10b6638a02f873d4ed52aec3fe2a923172249c6a 100644 (file)
--- a/rplexpr/rplasclasses.cpp
+++ b/rplexpr/rplasclasses.cpp
@@ -129,13 +129,31 @@ void RplSymbolSpace::startScope(RplASScope& scope)
 void RplSymbolSpace::finishScope(RplASScope& scope)
 {
     // in methods/classes not needed:
-    for (ix = scope.m_varNoAtStart; ix < m_listOfVars.size(); ix++){
+    for (int ix = scope.m_varNoAtStart; ix < m_listOfVars.size(); ix++){
         const QString& name = m_listOfVars[ix]->name();
         if (m_variables.contains(name))
             m_variables.remove(name);
     }
 }
 
+/**
+ * @brief Search a variable in the symbol space.
+ *
+ * @param name  variable to find
+ *
+ * @return      NULL: not found<br>
+ *              otherwise: the variable
+ */
+RplASVarDefinition* RplSymbolSpace::findVariable(const QString& name) const
+{
+    RplASVarDefinition* rc = NULL;
+    if (m_variables.contains(name))
+        rc = m_variables[name];
+    else if (m_parent != NULL)
+        rc = m_parent->findVariable(name);
+    return rc;
+}
+
 /**
  * @brief Search the class in the symbol space hierarchy.
  *
@@ -944,7 +962,15 @@ void RplVariable::setType(RplASClass* type)
 {
     m_type = type;
 }
-
+/**
+ * @brief Returns the name of the variable.
+ *
+ * @return  the name
+ */
+const QString& RplVariable::name() const
+{
+    return m_name;
+}
 
 /** @class RplVariable rplastree.hpp "rplexpr/rplastree.hpp"
  *

diff --git a/rplexpr/rplasclasses.hpp b/rplexpr/rplasclasses.hpp
index e47dbbbce75ea342dbe7566b66dca02ff6909d2f..834186761c764ddbbd423908128c852fc3eb190a 100644 (file)
--- a/rplexpr/rplasclasses.hpp
+++ b/rplexpr/rplasclasses.hpp
@@ -19,6 +19,7 @@ public:
 
     RplASClass* type() const;
     void setType(RplASClass* type);
+    const QString& name() const;
 
 protected:
     QString m_name;
@@ -30,8 +31,6 @@ protected:
 
 class RplASScope
 {
-public:
-    RplASScope();
 public:
     int m_varNoAtStart;
 };
@@ -63,14 +62,14 @@ public:
 public:
     void startScope(RplASScope& scope);
     void finishScope(RplASScope& scope);
-    RplVariable* findVariable(const QString& name) const;
+    RplASVarDefinition* findVariable(const QString& name) const;
     RplASClass* findClass(const QString& name) const;
     RplASMethod* findMethod(const QString& name) const;
     void dump(RplWriter& writer, int indent, const char* header = NULL);
     const QString& name() const;
     RplASItem* body() const;
     void setBody(RplASItem* body);
-    RplASItem* addVariable(RplASVarDefinition* variable);
+    RplASItem* addVariable(RplASVarDefinition* variable, int& varNo);
     RplASItem* addMethod(RplASMethod* method);
     RplASUserClass* addClass(RplASUserClass* clazz);
     RplSymbolSpace* parent() const;

diff --git a/rplexpr/rplastree.cpp b/rplexpr/rplastree.cpp
index e596e990b8820d7b959dcdc13ede97b2f2c995d5..41e10e9754ddced3ef08bc2e64dca2bec99acc5c 100644 (file)
--- a/rplexpr/rplastree.cpp
+++ b/rplexpr/rplastree.cpp
@@ -2120,7 +2120,7 @@ RplByteStorage& RplASTree::store()
  * @return      true: the module is new<br>
  *              false: the module is yet known
  */
-bool RplASTree::startModule(const QString& name)
+bool RplASTree::startModule(RplSourceUnitName name)
 {
     bool rc = m_modules.contains(name);
     if (! rc){
@@ -2151,12 +2151,12 @@ RplSymbolSpace* RplASTree::findmodule(const QString& name)
  * @brief Handles the end of a module.
  * @param name  the module's name
  */
-void RplASTree::finishModule(const QString& name)
+void RplASTree::finishModule(RplSourceUnitName name)
 {
     RplSymbolSpace* top = m_symbolSpaces.at(m_symbolSpaces.size() - 1);
     if (top->name() != name)
         throw RplException("RplASTree::finishModule(): module is not top: %s",
-                           name.toUtf8().constData());
+                           name);
     else {
         m_symbolSpaces.removeLast();
         // "global" is always the bottom:

diff --git a/rplexpr/rplastree.hpp b/rplexpr/rplastree.hpp
index 5ab5a9395dde35a8a105f1c5d6a3204c4f0b6e4b..0d2816b9f215e31599fedd5bacc2a5dc462d13a9 100644 (file)
--- a/rplexpr/rplastree.hpp
+++ b/rplexpr/rplastree.hpp
@@ -657,8 +657,8 @@ public:
     RplASTree();
     ~RplASTree();
 public:
-    bool startModule(const QString& name);
-    void finishModule(const QString& name);
+    bool startModule(RplSourceUnitName name);
+    void finishModule(RplSourceUnitName name);
     RplSymbolSpace* startClassOrMethod(const QString& name,
         RplSymbolSpace::SymbolSpaceType type);
     void finishClassOrMethod(const QString& name);

diff --git a/rplexpr/rpllexer.cpp b/rplexpr/rpllexer.cpp
index bbfed458d9c5fac5139c11d1736b9154c2c48d15..183fde530db038d58cfd1ff1019b54ddd952d370 100644 (file)
--- a/rplexpr/rpllexer.cpp
+++ b/rplexpr/rpllexer.cpp
@@ -1052,7 +1052,7 @@ RplToken* RplLexer::nextNonSpaceToken()
  *
  * @param unit  the new source unit
  */
-void RplLexer::startUnit(const QString& unit)
+void RplLexer::startUnit(RplSourceUnitName unit)
 {
     m_source->startUnit(unit, *m_currentPosition);
 }

diff --git a/rplexpr/rpllexer.hpp b/rplexpr/rpllexer.hpp
index 68a419968beeeae760ea99cc17f1775ae0efaf10..cfc8b8bbcaa977e16c8cc8b2321866255e8eb446 100644 (file)
--- a/rplexpr/rpllexer.hpp
+++ b/rplexpr/rpllexer.hpp
@@ -176,7 +176,7 @@ public:
     RplToken* nextNonSpaceToken();
     size_t maxTokenLength() const;
     void setMaxTokenLength(size_t maxTokenLength);
-    void startUnit(const QString& unit);
+    void startUnit(RplSourceUnitName unit);
     RplSource* source();
     int prioOfOp(int op) const;
     const QByteArray& nameOfOp(int op) const;

diff --git a/rplexpr/rplmfparser.cpp b/rplexpr/rplmfparser.cpp
index f057e3cc1d00841d2d3be24d91a03f210f549bc9..653daffd47a611398916c4c9ef658fdd228d0a51 100644 (file)
--- a/rplexpr/rplmfparser.cpp
+++ b/rplexpr/rplmfparser.cpp
@@ -503,14 +503,14 @@ RplASItem* RplMFParser::buildVarOrField(const QString& name,
     RplASItem* rc = NULL;
     if (parent == NULL){
         RplSymbolSpace* space = m_tree.currentSpace();
-        RplVariable* var = space->findVariable(name);
+        RplASVarDefinition* var = space->findVariable(var->name());
         RplASClass* clazz = NULL;
         if (var != NULL)
-            clazz = var->type();
-        RplASNamedValue* var = new RplASNamedValue(clazz, space,
+            clazz = var->datatype();
+        RplASNamedValue* var2 = new RplASNamedValue(clazz, space,
                                                    name, RplASNamedValue::A_NONE);
-        var->setPosition(position);
-        rc = var;
+        var2->setPosition(position);
+        rc = var2;
     } else {
         RplASField* field = new RplASField(name);
         field->setPosition(position);
@@ -1191,7 +1191,7 @@ void RplMFParser::parseImport()
  *
  * @param name  the name of the module (without path)
  */
-RplASItem* RplMFParser::parseModule(const QString& name)
+RplASItem* RplMFParser::parseModule(RplSourceUnitName name)
 {
     m_tree.startModule(name);
     // parse until EOF:
@@ -1206,14 +1206,14 @@ void RplMFParser::parse()
 {
     RplSource* source = m_lexer.source();
     RplSourceUnit* mainModule = source->currentReader()->currentSourceUnit();
-    QString mainModuleName = mainModule->name();
+    RplSourceUnitName mainModuleName = mainModule->name();
     try {
         RplASItem* body = parseModule(mainModuleName);
         RplSymbolSpace* module = m_tree.findmodule(mainModuleName);
         if (module != NULL)
             module->setBody(body);
     } catch(RplParserStop exc){
-        printf("compiling stopped: %s\n", exc.reason());
+        printf("compiling aborted: %s\n", exc.reason());
     }
 }
 

diff --git a/rplexpr/rplmfparser.hpp b/rplexpr/rplmfparser.hpp
index 3be8e31bb4bd89d39db65465cd29dd169f84c879..44df6e178d36c0e1cf7a93c60641e528c14a5e01 100644 (file)
--- a/rplexpr/rplmfparser.hpp
+++ b/rplexpr/rplmfparser.hpp
@@ -78,7 +78,7 @@ public:
     void parseMethod();
     void parseClass();
     void parseImport();
-    RplASItem* parseModule(const QString& name);
+    RplASItem* parseModule(RplSourceUnitName name);
     void parse();
     RplASItem*parseExprStatement(bool eatSemicolon = true);
     RplASItem*parseList();

diff --git a/rplexpr/rplparser.cpp b/rplexpr/rplparser.cpp
index 3f81c4531751f4cdbc5b99cff13bcefe467946c2..815c63cd5a5c3e73c7aa605c20eb86f0a5894774 100644 (file)
--- a/rplexpr/rplparser.cpp
+++ b/rplexpr/rplparser.cpp
@@ -105,7 +105,7 @@ void RplParser::addSimpleMessage(LevelTag prefix, int location,
     char buffer[2048];
     QString msg;
     snprintf(buffer, sizeof buffer, "%c%04d %s:%d-%d: ", prefix, location,
-             position->sourceUnit()->name().toUtf8().constData(),
+             position->sourceUnit()->name(),
              position->lineNo(), position->column());
     int used = strlen(buffer);
     int length = strlen(message);

diff --git a/rplexpr/rplsource.cpp b/rplexpr/rplsource.cpp
index a542bead9346c9c222a1f90575b990f76ba3169c..3c1e35951197afc57bd204f212beb116551919dd 100644 (file)
--- a/rplexpr/rplsource.cpp
+++ b/rplexpr/rplsource.cpp
@@ -42,7 +42,7 @@
  * @param name      name of the unit
  * @param reader    the reader which can read the unit
  */
-RplSourceUnit::RplSourceUnit(const QString& name, RplReader* reader) :
+RplSourceUnit::RplSourceUnit(RplSourceUnitName name, RplReader* reader) :
     m_name(name),
     m_lineNo(0),
     m_reader(reader) {
@@ -58,8 +58,8 @@ RplSourceUnit::~RplSourceUnit() {
  * @brief Returns the name.
  * @return  the name
  */
-const QString& RplSourceUnit::name() const {
-    return m_name;
+RplSourceUnitName RplSourceUnit::name() const {
+    return m_name.constData();
 }
 
 /**
@@ -156,12 +156,10 @@ void*RplSourcePosition::operator new(size_t, void* buffer)
  */
 QString RplSourcePosition::toString() const
 {
-    QString rc;
-    if (m_sourceUnit != NULL)
-        rc = m_sourceUnit->name();
-    QTextStream stream(&rc);
-    stream << ":" << m_lineNo << ":" << m_column << ": ";
-    return rc;
+    char buffer[512];
+    utf8(buffer, sizeof buffer);
+
+    return QString(buffer);
 }
 
 /**
@@ -173,8 +171,8 @@ QString RplSourcePosition::toString() const
  */
 char* RplSourcePosition::utf8(char buffer[], size_t bufferSize) const
 {
-    QByteArray module = m_sourceUnit->name().toUtf8();
-    snprintf(buffer, bufferSize, "%s:%d:%d", module.constData(),
+    snprintf(buffer, bufferSize, "%s:%d:%d",
+             m_sourceUnit == NULL ? "" : m_sourceUnit->name(),
              m_lineNo, m_column);
     return buffer;
 }
@@ -269,7 +267,7 @@ RplReader::~RplReader()
  */
 void RplReader::clear()
 {
-    QMap<QString, RplSourceUnit*>::iterator it;
+    UnitMap::iterator it;
     for(it = m_units.begin(); it != m_units.end(); it++) {
         RplStringSourceUnit* unit = (RplStringSourceUnit*)(*it);
         delete unit;
@@ -301,7 +299,7 @@ RplSourceUnit* RplReader::currentSourceUnit() const {
  *
  * @param sourceUnit     the name of the new source unit
  */
-bool RplReader::setCurrentSourceUnit(const QString& sourceUnit) {
+bool RplReader::setCurrentSourceUnit(RplSourceUnitName sourceUnit) {
     bool rc = m_units.contains(sourceUnit);
     if(rc) {
         m_currentSourceUnit = m_units.value(sourceUnit);
@@ -392,7 +390,7 @@ void RplSource::destroy()
  * @param unit      unit to find
  * @return          a permanently valid unit name
  */
-const char* RplSource::permanentUnitName(const char* unit) {
+RplSourceUnitName RplSource::permanentUnitName(RplSourceUnitName unit) {
     return unit;
 }
 
@@ -444,7 +442,7 @@ void RplSource::addSourceUnit(RplSourceUnit* unit) {
  * @param caller    the position of the include
  *
  */
-bool RplSource::startUnit(const QString& unit,
+bool RplSource::startUnit(RplSourceUnitName unit,
                           const RplSourcePosition& caller) {
     m_sourcePositionStack.push_back(&caller);
     RplReader* reader = NULL;
@@ -566,8 +564,8 @@ const RplSourcePosition* RplSource::caller() const
  * @param content   content of the unit
  * @param reader    the parent
  */
-RplStringSourceUnit::RplStringSourceUnit(const QString& name,
-        const QString& content, RplStringReader* reader) :
+RplStringSourceUnit::RplStringSourceUnit(RplSourceUnitName name,
+        const RplSourceUnitContent& content, RplStringReader* reader) :
     RplSourceUnit(name, reader),
     m_currentPosition(0),
     m_content(content) {
@@ -602,7 +600,7 @@ void RplStringSourceUnit::setCurrentPosition(int currentPosition) {
  *
  * @return  the content
  */
-const QString& RplStringSourceUnit::content() const {
+const RplSourceUnitContent& RplStringSourceUnit::content() const {
     return m_content;
 }
 
@@ -637,7 +635,7 @@ RplStringReader::~RplStringReader() {
  *              otherwise: an instance of a sub class of
  *              <code>RplSourceUnit</code>
  */
-RplSourceUnit* RplStringReader::openSourceUnit(const QString& unit) {
+RplSourceUnit* RplStringReader::openSourceUnit(RplSourceUnitName unit) {
     RplSourceUnit* rc = NULL;
     if(setCurrentSourceUnit(unit)) {
         rc = m_currentSourceUnit;
@@ -656,7 +654,7 @@ RplSourceUnit* RplStringReader::openSourceUnit(const QString& unit) {
  * @return          false: no more input available<br>
  *                  true: success
  */
-bool RplStringReader::nextLine(int maxSize, QString& buffer,
+bool RplStringReader::nextLine(int maxSize, RplSourceUnitContent& buffer,
                                      bool& hasMore) {
     bool rc = m_currentSourceUnit != NULL;
     if (rc){
@@ -677,11 +675,11 @@ bool RplStringReader::nextLine(int maxSize, QString& buffer,
  * @return          false: no more input available<br>
  *                  true: success
  */
-bool RplStringReader::fillBuffer(int maxSize, QString& buffer,
+bool RplStringReader::fillBuffer(int maxSize, RplSourceUnitContent& buffer,
                                        bool& hasMore) {
     RplStringSourceUnit* unit  = (RplStringSourceUnit*) m_currentSourceUnit;
     int start = unit->currentPosition();
-    const QString& content = unit->content();
+    const RplSourceUnitContent& content = unit->content();
     int end = content.indexOf("\n", start);
     hasMore = false;
     if(end < 0) {
@@ -708,11 +706,11 @@ bool RplStringReader::fillBuffer(int maxSize, QString& buffer,
  * @param name      name of the medium
  * @param content
  */
-void RplStringReader::addSource(const QString& name,
-                                      const QString& content) {
+void RplStringReader::addSource(RplSourceUnitName name,
+                                      const RplSourceUnitContent& content) {
     // Deletion in the destructor of the base class RplReader
     RplStringSourceUnit* unit = new RplStringSourceUnit(name, content, this);
-    m_units.insert(m_units.begin(), name, unit);
+    m_units.insert(m_units.begin(), unit->name(), unit);
     m_currentSourceUnit = unit;
 }
 
@@ -722,7 +720,7 @@ void RplStringReader::addSource(const QString& name,
  * @param name      name of the source unit
  * @param content   new content
  */
-void RplStringReader::replaceSource(const QString& name, const QString& content)
+void RplStringReader::replaceSource(RplSourceUnitName name, const RplSourceUnitContent& content)
 {
     if (m_units.contains(name)){
         RplStringSourceUnit* unit = dynamic_cast<RplStringSourceUnit*>(m_units[name]);
@@ -737,26 +735,29 @@ void RplStringReader::replaceSource(const QString& name, const QString& content)
  * This is the mostly used implementation of the RplSourceUnit/RplReader.
  */
 
-/**
- * @brief Constructor.
- *
- * @param file      name of the directory
- * @param reader    the parent
- */
-RplFileSourceUnit::RplFileSourceUnit(const QDir& file,
+
+RplFileSourceUnit::RplFileSourceUnit(RplSourceUnitName filename,
                                      RplFileReader* reader) :
-    RplSourceUnit(file.absolutePath(), reader),
+    RplSourceUnit(filename, reader),
     m_currentPosition(0),
-    m_file(file.absolutePath()),
-    m_textStream(&m_file),
+    m_fp(fopen(filename, "r")),
+    m_textStream(m_fp, QIODevice::ReadOnly),
     m_line()
 {
 }
 
+
 /**
  * @brief Destructor.
  */
-RplFileSourceUnit::~RplFileSourceUnit() {
+RplFileSourceUnit::~RplFileSourceUnit()
+{
+    fclose(m_fp);
+}
+
+bool RplFileSourceUnit::isOpen() const
+{
+    return m_fp != NULL;
 }
 /** @class RplFileReader rplsource.hpp "rplexpr/rplsource.hpp"
  *
@@ -769,7 +770,8 @@ RplFileSourceUnit::~RplFileSourceUnit() {
  * @brief Constructor.
  */
 RplFileReader::RplFileReader(RplSource& source) :
-    RplReader(source) {
+    RplReader(source)
+{
 }
 
 /**
@@ -786,11 +788,11 @@ RplFileReader::~RplFileReader() {
  *              otherwise: an instance of a sub class of
  *              <code>RplSourceUnit</code>
  */
-RplSourceUnit* RplFileReader::openSourceUnit(const QString& unit) {
+RplSourceUnit* RplFileReader::openSourceUnit(RplSourceUnitName unit) {
     RplSourceUnit* rc = NULL;
     if(m_units.contains(unit)) {
         rc = *m_units.find(unit);
-        m_currentUnit = (RplFileSourceUnit*) rc;
+        m_currentSourceUnit = static_cast<RplFileSourceUnit*>(rc);
     }
     return rc;
 }
@@ -805,11 +807,14 @@ RplSourceUnit* RplFileReader::openSourceUnit(const QString& unit) {
  * @return          false: no more input available<br>
  *                  true: success
  */
-bool RplFileReader::nextLine(int maxSize, QString& buffer,
+bool RplFileReader::nextLine(int maxSize, RplSourceUnitContent& buffer,
                                    bool& hasMore) {
-    RplFileSourceUnit* unit  = (RplFileSourceUnit*) m_currentUnit;
+    RplFileSourceUnit* unit  = static_cast<RplFileSourceUnit*>
+            (m_currentSourceUnit);
     bool rc = ! unit->m_textStream.atEnd();
-    if(rc) {
+    if(! rc) {
+        m_source.popSourceUnit(this);
+    } else {
         unit->m_line = unit->m_textStream.readLine();
         rc = fillBuffer(maxSize, buffer, hasMore);
     }
@@ -827,11 +832,11 @@ bool RplFileReader::nextLine(int maxSize, QString& buffer,
  * @return          false: no more input available<br>
  *                  true: success
  */
-bool RplFileReader::fillBuffer(int maxSize, QString& buffer,
+bool RplFileReader::fillBuffer(int maxSize, RplSourceUnitContent& buffer,
                                      bool& hasMore) {
-    RplFileSourceUnit* unit  = (RplFileSourceUnit*) m_currentUnit;
+    RplFileSourceUnit* unit  = static_cast<RplFileSourceUnit*>(m_currentSourceUnit);
     int start = unit->m_currentPosition;
-    const QString& content = unit->m_line;
+    const RplSourceUnitContent& content = unit->m_line;
     int size = content.size() - start;
     if(size > maxSize)
         size = maxSize;
@@ -846,11 +851,11 @@ bool RplFileReader::fillBuffer(int maxSize, QString& buffer,
  *
  * @param dirEntry  the file
  */
-void RplFileReader::addSource(const QDir& dirEntry) {
-    QString name = dirEntry.absolutePath();
+void RplFileReader::addSource(RplSourceUnitName filename) {
     // Deleting in ~RplSourceUnit():
-    RplFileSourceUnit* unit = new RplFileSourceUnit(dirEntry, this);
-    m_units.insert(m_units.begin(), name, unit);
+    RplFileSourceUnit* unit = new RplFileSourceUnit(filename, this);
+    m_units.insert(m_units.begin(), unit->name(), unit);
+    m_currentSourceUnit = unit;
 }
 
 

diff --git a/rplexpr/rplsource.hpp b/rplexpr/rplsource.hpp
index 8284b2d94f373f02a22eb829f6ed5a9c68134c03..f0f95a5fbee6ef23691ced5de924738d7ab8bd4d 100644 (file)
--- a/rplexpr/rplsource.hpp
+++ b/rplexpr/rplsource.hpp
@@ -10,21 +10,26 @@
 #ifndef RPLSOURCE_HPP
 #define RPLSOURCE_HPP
 
+// type of buffer names and filenames. Codec: UTF-8
+typedef const char* RplSourceUnitName;
+
+typedef QString RplSourceUnitContent;
+
 class RplSource;
 class RplReader;
 
 class RplSourceUnit {
 public:
-    RplSourceUnit(const QString& name, RplReader* reader);
+    RplSourceUnit(const char* name, RplReader* reader);
     virtual ~RplSourceUnit();
 public:
-    const QString& name() const;
+    const char* name() const;
     int lineNo() const;
     void setLineNo(int lineNo);
     RplReader* reader() const;
 
 protected:
-    QString m_name;
+    QByteArray m_name;
     int m_lineNo;
     RplReader* m_reader;
 };
@@ -59,6 +64,8 @@ private:
 };
 
 class RplReader {
+public:
+    typedef QMap<RplSourceUnitName, RplSourceUnit*> UnitMap;
 public:
     RplReader(RplSource& source);
     ~RplReader();
@@ -72,7 +79,7 @@ public:
      *              for the source. This is normally a sub class of
      *              <code>RplSourceUnit</code>
      */
-    virtual RplSourceUnit* openSourceUnit(const QString& unit) = 0;
+    virtual RplSourceUnit* openSourceUnit(const char* unit) = 0;
     /**
      * @brief Reads the first part of the next line into a given buffer.
      *
@@ -84,7 +91,8 @@ public:
      * @return          true: the read was successful<br>
      *                  false: no more input is available
      */
-    virtual bool nextLine(int maxSize, QString& buffer, bool& hasMore) = 0;
+    virtual bool nextLine(int maxSize, RplSourceUnitContent& buffer,
+                          bool& hasMore) = 0;
     /**
      * @brief Reads the next part of the current line into a given buffer.
      *
@@ -94,19 +102,20 @@ public:
      * @return          true: the read was successful<br>
      *                  false: no more input is available
      */
-    virtual bool fillBuffer(int maxSize, QString& buffer, bool& hasMore) = 0;
+    virtual bool fillBuffer(int maxSize, RplSourceUnitContent& buffer,
+                            bool& hasMore) = 0;
 public:
     virtual void clear();
     RplSource& source();
     RplSourceUnit* currentSourceUnit() const;
-    bool setCurrentSourceUnit(const QString& currentSourceUnit);
+    bool setCurrentSourceUnit(RplSourceUnitName currentSourceUnit);
 protected:
     void removeSourceUnit();
 
 protected:
     RplSourceUnit* m_currentSourceUnit;
     /// name -> source
-    QMap<QString, RplSourceUnit*> m_units;
+    UnitMap m_units;
     RplSource& m_source;
 };
 
@@ -132,7 +141,7 @@ public:
     QStack<const RplSourcePosition*> sourcePositionStack() const;
     QStack<RplSourceUnit*>& sourceUnitStack();
 
-    bool startUnit(const QString& unit, const RplSourcePosition& caller);
+    bool startUnit(const char* unit, const RplSourcePosition& caller);
     void pushSourceUnit(RplSourceUnit* unit);
     RplSourceUnit* popSourceUnit(RplReader* reader);
     RplReader* currentReader();
@@ -159,17 +168,18 @@ class RplStringReader;
 class RplStringSourceUnit : public RplSourceUnit {
     friend class RplStringReader;
 public:
-    RplStringSourceUnit(const QString& name,
-                        const QString& content, RplStringReader* reader);
+    RplStringSourceUnit(RplSourceUnitName name,
+                        const RplSourceUnitContent& content,
+                        RplStringReader* reader);
     virtual ~RplStringSourceUnit();
 public:
     int currentPosition() const;
     void setCurrentPosition(int currentPosition);
-    const QString& content() const;
+    const RplSourceUnitContent& content() const;
 
 private:
     int m_currentPosition;
-    QString m_content;
+    RplSourceUnitContent m_content;
 };
 
 class RplStringReader : public RplReader{
@@ -178,12 +188,14 @@ public:
     virtual ~RplStringReader();
     // RplReader interface
 public:
-    virtual RplSourceUnit* openSourceUnit(const QString& unit);
-    virtual bool nextLine(int maxSize, QString& buffer, bool& hasMore);
-    virtual bool fillBuffer(int maxSize, QString& buffer, bool& hasMore);
+    virtual RplSourceUnit* openSourceUnit(RplSourceUnitName unit);
+    virtual bool nextLine(int maxSize, RplSourceUnitContent& buffer,
+                          bool& hasMore);
+    virtual bool fillBuffer(int maxSize, RplSourceUnitContent& buffer,
+                            bool& hasMore);
 public:
-    void addSource(const QString& name, const QString& content);
-    void replaceSource(const QString& name, const QString& content);
+    void addSource(RplSourceUnitName name, const RplSourceUnitContent& content);
+    void replaceSource(RplSourceUnitName name, const RplSourceUnitContent& content);
 };
 
 class RplFileReader;
@@ -191,13 +203,15 @@ class RplFileReader;
 class RplFileSourceUnit : public RplSourceUnit {
     friend class RplFileReader;
 public:
-    RplFileSourceUnit(const QDir& dir, RplFileReader* reader);
+    RplFileSourceUnit(RplSourceUnitName filename, RplFileReader* reader);
     virtual ~RplFileSourceUnit();
+public:
+    bool isOpen() const;
 private:
     int m_currentPosition;
-    QFile m_file;
+    FILE* m_fp;
     QTextStream m_textStream;
-    QString m_line;
+    RplSourceUnitContent m_line;
 };
 
 class RplFileReader : public RplReader{
@@ -206,15 +220,13 @@ public:
     virtual ~RplFileReader();
     // RplReader interface
 public:
-    virtual RplSourceUnit* openSourceUnit(const QString& unit);
-    virtual bool nextLine(int maxSize, QString& buffer, bool& hasMore);
-    virtual bool fillBuffer(int maxSize, QString& buffer, bool& hasMore);
+    virtual RplSourceUnit* openSourceUnit(RplSourceUnitName unit);
+    virtual bool nextLine(int maxSize, RplSourceUnitContent& buffer,
+                          bool& hasMore);
+    virtual bool fillBuffer(int maxSize, RplSourceUnitContent& buffer,
+                            bool& hasMore);
 public:
-    void addSource(const QDir& dirEntry);
-private:
-    /// name -> source
-    QMap<QString, RplFileSourceUnit*> m_units;
-    RplFileSourceUnit* m_currentUnit;
+    void addSource(RplSourceUnitName filename);
 };
 
 

diff --git a/unittests/main.cpp b/unittests/main.cpp
index b7676aa95d3817826c4f7aebd297c1c93308c86c..cda0fae833369f37ce543a92d123edcb04be3eab 100644 (file)
--- a/unittests/main.cpp
+++ b/unittests/main.cpp
@@ -27,8 +27,11 @@ void testCore(){
 }
 
 void testExpr(){
+    extern void testRplBenchmark();
+    testRplBenchmark();
+
     extern void testRplVM();
-    testRplVM();
+    //testRplVM();
 
     extern void testRplMFParser();
     testRplMFParser();

diff --git a/unittests/rplastree_test.cpp b/unittests/rplastree_test.cpp
index e660b3f09c42213e72fca971132bf1d7053340c4..614a3335a86c1263890e63114f7cd1a945801017 100644 (file)
--- a/unittests/rplastree_test.cpp
+++ b/unittests/rplastree_test.cpp
@@ -20,12 +20,14 @@ private:
     RplSource m_source;
     RplStringReader m_reader;
     RplStringSourceUnit m_unit;
+    RplASTree m_tree;
 public:
     TestRplASTree() :
         RplTest("RplASTree"),
         m_source(),
         m_reader(m_source),
-        m_unit("<main>", "", &m_reader)
+        m_unit("<main>", "", &m_reader),
+        m_tree()
     {}
 public:
     void testRplASException() {
@@ -78,7 +80,8 @@ public:
         //checkE("Jonny", *value.asString());
     }
     void testRplASNamedValue(){
-        RplASNamedValue value("gugo");
+        RplASNamedValue value(NULL, m_tree.symbolSpaces()[0], "gugo",
+                RplASNamedValue::A_GLOBAL);
         checkE("gugo", value.name());
     }
     void testRplASCondition(){

diff --git a/unittests/rplbench.cpp b/unittests/rplbench.cpp
new file mode 100644 (file)
index 0000000..86b6674
--- /dev/null
+++ b/unittests/rplbench.cpp
@@ -0,0 +1,61 @@
+/*
+ * Licence:
+ * You can use and modify this file without any restriction.
+ * There is no warranty.
+ * You also can use the licence from http://www.wtfpl.net/.
+ * The original sources can be found on https://github.com/republib.
+*/
+
+/** @file
+ * @brief Unit test of the abstract syntax tree.
+ */
+
+
+#include "rplcore/rplcore.hpp"
+#include "rplexpr/rplexpr.hpp"
+#include "rplcore/rpltest.hpp"
+
+class TestRplBenchmark : public RplTest{
+private:
+    const char* m_filename;
+    RplSource m_source;
+    RplFileReader m_reader;
+    RplASTree m_tree;
+public:
+    TestRplBenchmark() :
+        RplTest("RplBenchmark"),
+        m_filename("/home/ws/qt/rplqt/bench/mfbench.mf"),
+        m_source(),
+        m_reader(m_source),
+        m_tree()
+    {
+        m_source.addReader(&m_reader);
+        m_reader.addSource(m_filename);
+    }
+public:
+    void benchmark() {
+        time_t start = time(NULL);
+        RplMFParser parser(m_source, m_tree);
+        parser.parse();
+        time_t end = time(NULL);
+        printf("compilation: %d sec\n", int(end - start));
+    }
+    virtual void doIt() {
+        try{
+            RplFileSourceUnit* unit = dynamic_cast<RplFileSourceUnit*>
+                    (m_reader.currentSourceUnit());
+            if (unit != NULL && ! unit->isOpen())
+                throw RplException("file not found: %s", m_filename);
+            benchmark();
+        } catch(RplException ex){
+            printf("%s\n", ex.getMessage().constData());
+        }
+    }
+};
+void testRplBenchmark() {
+    TestRplBenchmark test;
+    test.run();
+}
+
+
+

diff --git a/unittests/rplsource_test.cpp b/unittests/rplsource_test.cpp
index 40cc89218ce2fc15660d12328669367087518450..23aef3033adec3296429f134ca8a11867c51162f 100644 (file)
--- a/unittests/rplsource_test.cpp
+++ b/unittests/rplsource_test.cpp
@@ -34,7 +34,7 @@ protected:
     void testRplStringSourceUnit(){
         RplStringReader reader(m_source);
         QString content("a=1;\nveeeeeeeeery looooooooooooooong\n");
-        RplStringSourceUnit unit(QString("test"), content, &reader);
+        RplStringSourceUnit unit("test", content, &reader);
         unit.setLineNo(144);
         checkE(144, unit.lineNo());
         checkE("test", unit.name());

diff --git a/unittests/unittests.pro b/unittests/unittests.pro
index 285f0e13e3711a31eb3f399f5d170187a4040877..6728c2769a6666e0228ba3f594026a3c57a4d4b3 100644 (file)
--- a/unittests/unittests.pro
+++ b/unittests/unittests.pro
@@ -42,5 +42,6 @@ SOURCES += main.cpp \
     rplmfparser_test.cpp \
     rplvm_test.cpp \
     rplbytestorage_test.cpp \
-    rplwriter_test.cpp
+    rplwriter_test.cpp \
+    rplbench.cpp