dayly work

diff --git a/rplcore/rplcontainer.cpp b/rplcore/rplcontainer.cpp
index 2dbd97680ca27f082a7085da834d35d0c5ea6ef2..c05b7bf7e360794819f0c6b7e8916498e7e445ec 100644 (file)
--- a/rplcore/rplcontainer.cpp
+++ b/rplcore/rplcontainer.cpp
@@ -123,7 +123,7 @@ void RplContainer::addInt(int value) {
         *ptr++ = '-';
         value = - value;
     }
-    snprintf(ptr, sizeof buffer - 1, "%x ", value);
+    qsnprintf(ptr, sizeof buffer - 1, "%x ", value);
     m_data.append(buffer);
 }
 /**
@@ -134,7 +134,7 @@ void RplContainer::addInt(int value) {
 void RplContainer::addInt(qint64 value) {
     addType(TAG_INT);
     char buffer[128];
-    snprintf(buffer, sizeof buffer, "%llx ", value);
+    qsnprintf(buffer, sizeof buffer, "%llx ", value);
     m_data.append(buffer);
 }
 
@@ -184,10 +184,10 @@ const QByteArray& RplContainer::getData() {
     if(m_typeList.length() != 0) {
         char buffer[128];
         // RPL&1 0a b5[2]cis: !12
-        snprintf(buffer, sizeof buffer, "%x[%d]%s:", (unsigned int) m_data.length(),
+        qsnprintf(buffer, sizeof buffer, "%x[%d]%s:", (unsigned int) m_data.length(),
                  m_countBags, m_typeList.data());
         char header[128+8];
-        snprintf(header, sizeof header, "%s%02x%s", MAGIC_1,
+        qsnprintf(header, sizeof header, "%s%02x%s", MAGIC_1,
                  (unsigned int) strlen(buffer), buffer);
         m_data.insert(0, header);
     }

diff --git a/rplcore/rplexception.cpp b/rplcore/rplexception.cpp
index c6528f62b27b0a7458451ef74324d9fc86dd4b5b..fac935f43f9292abc49937acbaf04feb4b6bc154 100644 (file)
--- a/rplcore/rplexception.cpp
+++ b/rplcore/rplexception.cpp
@@ -67,7 +67,7 @@ RplException::RplException(const char* format, ...) :
     char buffer[64000];
     va_list ap;
     va_start(ap, format);
-    vsnprintf(buffer, sizeof buffer, format, ap);
+    qvsnprintf(buffer, sizeof buffer, format, ap);
     va_end(ap);
     m_message = buffer;
 }
@@ -93,7 +93,7 @@ RplException::RplException(RplLoggerLevel level, int location,
     char buffer[64000];
     va_list ap;
     va_start(ap, format);
-    vsnprintf(buffer, sizeof buffer, format, ap);
+    qvsnprintf(buffer, sizeof buffer, format, ap);
     va_end(ap);
     m_message = buffer;
     if(logger == NULL)
@@ -138,7 +138,7 @@ RplRangeException::RplRangeException(RplLoggerLevel level, int location,
     char buffer[64000];
     if(message == NULL)
         message = "value outside limits";
-    snprintf(buffer, sizeof buffer, "%s: %lu [%lu, %lu]",
+    qsnprintf(buffer, sizeof buffer, "%s: %lu [%lu, %lu]",
              message == NULL ? "" : message,
              current, lbound, ubound);
     if(logger == NULL)
@@ -187,7 +187,7 @@ RplInvalidDataException::RplInvalidDataException(RplLoggerLevel level,
     size_t ix;
     char* ptr = buffer + strlen(buffer);
     for(ix = 0; ix < dataSize; ix++) {
-        snprintf(ptr, sizeof(buffer) - (ptr - buffer) - 1, "%02x ",
+        qsnprintf(ptr, sizeof(buffer) - (ptr - buffer) - 1, "%02x ",
                  ((unsigned char*) data)[ix]);
         ptr += strlen(ptr);
     }

diff --git a/rplcore/rpllogger.cpp b/rplcore/rpllogger.cpp
index b201c2777f129eafae7a82ecf8d8c1fc9ed8ceea..84f20f737c73a92e83b827b98f6744ffe01137be 100644 (file)
--- a/rplcore/rpllogger.cpp
+++ b/rplcore/rpllogger.cpp
@@ -311,7 +311,7 @@ bool RplLogger::logv(RplLoggerLevel level, int location, const char* format,
     char buffer[64000];
     va_list ap;
     va_start(ap, format);
-    vsnprintf(buffer, sizeof buffer, format, ap);
+    qvsnprintf(buffer, sizeof buffer, format, ap);
     va_end(ap);
     return log(level, location, buffer);
 }
@@ -330,7 +330,7 @@ bool RplLogger::logv(RplLoggerLevel level, int location,
     char buffer[64000];
     va_list ap;
     va_start(ap, format);
-    vsnprintf(buffer, sizeof buffer, format, ap);
+    qvsnprintf(buffer, sizeof buffer, format, ap);
     va_end(ap);
     return log(level, location, buffer);
 }
@@ -347,7 +347,7 @@ bool RplLogger::logv(RplLoggerLevel level, int location,
 bool RplLogger::log(RplLoggerLevel level, int location, const char* format,
                     va_list& varlist) {
     char buffer[64000];
-    vsnprintf(buffer, sizeof buffer, format, varlist);
+    qvsnprintf(buffer, sizeof buffer, format, varlist);
     return log(level, location, buffer);
 }
 
@@ -361,7 +361,7 @@ QByteArray RplLogger::buildStdPrefix(RplLoggerLevel level, int location) {
     time_t now = time(NULL);
     struct tm* now2 = localtime(&now);
     char buffer[64];
-    snprintf(buffer, sizeof buffer, "%c%d.%02d.%02d %02d:%02d:%02d (%d): ",
+    qsnprintf(buffer, sizeof buffer, "%c%d.%02d.%02d %02d:%02d:%02d (%d): ",
              getPrefixOfLevel(level),
              now2->tm_year + 1900,
              now2->tm_mon + 1,
@@ -546,7 +546,7 @@ void RplFileAppender::open() {
     if(m_fp != NULL)
         fclose(m_fp);
     char fullName[512];
-    snprintf(fullName, sizeof fullName, "%s.%03d.log", m_prefix.data(),
+    qsnprintf(fullName, sizeof fullName, "%s.%03d.log", m_prefix.data(),
              ++m_currentNo);
     m_fp = fopen(fullName, "a");
     if(m_fp == NULL)

diff --git a/rplcore/rplstring.cpp b/rplcore/rplstring.cpp
index a9c4b83cb879c0c7050043d3fcf353f9a7d8c01a..635658c38da17a62dc31e2333d5565abf5713125 100644 (file)
--- a/rplcore/rplstring.cpp
+++ b/rplcore/rplstring.cpp
@@ -135,7 +135,7 @@ QByteArray RplString::hexDump(uint8_t* data, int length, int bytesPerLine) {
     char buffer[16];
     for(int lineNo = 0; lineNo < fullLines; lineNo++) {
         for(col = 0; col < bytesPerLine; col++) {
-            snprintf(buffer, sizeof buffer, "%02x ", data[ixData + col]);
+            qsnprintf(buffer, sizeof buffer, "%02x ", data[ixData + col]);
             rc.append(buffer);
         }
         rc.append(' ');
@@ -150,7 +150,7 @@ QByteArray RplString::hexDump(uint8_t* data, int length, int bytesPerLine) {
     int restBytes = length - ixData;
     if(restBytes > 0) {
         for(col = 0; col < restBytes; col++) {
-            snprintf(buffer, sizeof buffer, "%02x ", data[ixData + col]);
+            qsnprintf(buffer, sizeof buffer, "%02x ", data[ixData + col]);
             rc.append(buffer);
         }
         for(col = restBytes; col < bytesPerLine; col++) {
@@ -267,7 +267,7 @@ QByteArray RplString::toCString(const char* source, int maxLength){
             default:
             {
                 char buffer[5];
-                snprintf(buffer, sizeof buffer, "\\x%02x",
+                qsnprintf(buffer, sizeof buffer, "\\x%02x",
                          ((unsigned int) cc) % 0xff);
                 rc += buffer;
                 break;
@@ -286,7 +286,7 @@ QByteArray RplString::toCString(const char* source, int maxLength){
  */
 QByteArray RplString::toNumber(int value, const char* format) {
     char buffer[128];
-    snprintf(buffer, sizeof buffer, format, value);
+    qsnprintf(buffer, sizeof buffer, format, value);
     return QByteArray(buffer);
 }
 

diff --git a/rplcore/rpltest.cpp b/rplcore/rpltest.cpp
index 249efa628a42419df32bba771ebc1a793ac753f0..ea31b61c32406c255a98b452932b1da2687e89cb 100644 (file)
--- a/rplcore/rpltest.cpp
+++ b/rplcore/rpltest.cpp
@@ -358,12 +358,12 @@ bool RplTest::assertEqualFiles(const char* expected, const char* current,
     QByteArray currentContent = RplString::read(current, true);
     if (expectedContent.isEmpty()){
         char buffer[512];
-        snprintf(buffer, sizeof buffer, "%s has no content. Does it exist?",
+        qsnprintf(buffer, sizeof buffer, "%s has no content. Does it exist?",
                  expected);
         error(buffer);
     } else if (currentContent.isEmpty()){
         char buffer[512];
-        snprintf(buffer, sizeof buffer, "%s has no content. Does it exist?",
+        qsnprintf(buffer, sizeof buffer, "%s has no content. Does it exist?",
                  current);
         error(buffer);
     } else {

diff --git a/rplcore/rplwriter.cpp b/rplcore/rplwriter.cpp
index 3ec9ead2b652b742cdc21cf3fef53223b267729b..53e018b3bf9af21e97a05bc0737b5f9ea6adbec1 100644 (file)
--- a/rplcore/rplwriter.cpp
+++ b/rplcore/rplwriter.cpp
@@ -84,7 +84,7 @@ void RplWriter::formatLine(const char* format, ...)
     char buffer[64000];
     va_list ap;
     va_start(ap, format);
-    vsnprintf(buffer, sizeof buffer, format, ap);
+    qvsnprintf(buffer, sizeof buffer, format, ap);
     va_end(ap);
     writeLine(buffer);
 }
@@ -98,7 +98,7 @@ void RplWriter::formatLine(const char* format, ...)
 void RplWriter::write(va_list ap, const char* format)
 {
     char buffer[64000];
-    vsnprintf(buffer, sizeof buffer, format, ap);
+    qvsnprintf(buffer, sizeof buffer, format, ap);
     write(buffer);
 }
 
@@ -128,7 +128,7 @@ void RplWriter::formatIndented(int indent, const char* format, ...)
     char buffer[64000];
     va_list ap;
     va_start(ap, format);
-    vsnprintf(buffer, sizeof buffer, format, ap);
+    qvsnprintf(buffer, sizeof buffer, format, ap);
     va_end(ap);
     writeLine(buffer);
 }

diff --git a/rplexpr/rplasclasses.cpp b/rplexpr/rplasclasses.cpp
index 10b6638a02f873d4ed52aec3fe2a923172249c6a..c234568c5eaf6b85399bcb1b807b27f22e9da395 100644 (file)
--- a/rplexpr/rplasclasses.cpp
+++ b/rplexpr/rplasclasses.cpp
@@ -126,11 +126,15 @@ void RplSymbolSpace::startScope(RplASScope& scope)
  *
  * @param scope     the status of the scope at start.
  */
-void RplSymbolSpace::finishScope(RplASScope& scope)
+void RplSymbolSpace::finishScope(int endOfScope, RplASScope& scope)
 {
     // in methods/classes not needed:
-    for (int ix = scope.m_varNoAtStart; ix < m_listOfVars.size(); ix++){
-        const QString& name = m_listOfVars[ix]->name();
+    int ix = scope.m_varNoAtStart - scope.m_builtInVars;
+    int last = m_listOfVars.size();
+    for (; ix < last; ix++){
+        RplASVarDefinition* var = m_listOfVars[ix];
+        var->setEndOfScope(endOfScope);
+        const QString& name = var->name();
         if (m_variables.contains(name))
             m_variables.remove(name);
     }
@@ -234,18 +238,11 @@ void RplSymbolSpace::dump(RplWriter& writer, int indent, const char* header)
         }
     }
 
-    if (m_variables.size() > 0){
+    if (m_listOfVars.size() > 0){
         writer.writeIndented(indent, "== Variables:");
-        sorted.clear();
-        sorted.reserve(m_variables.size());
-        VariableMap::iterator it5;
-        for (it5 = m_variables.begin(); it5 != m_variables.end(); it5++){
-           sorted.append(it5.key());
-        }
-        qSort(sorted.begin(), sorted.end(), qLess<QString>());
         QList<QString>::iterator it6;
-        for (it6 = sorted.begin(); it6 != sorted.end(); it6++){
-            RplASVarDefinition* var = m_variables[*it6];
+        for (int ix = 0; ix < m_listOfVars.size(); ix++){
+            RplASVarDefinition* var = m_listOfVars[ix];
             var->dump(writer, indent);
         }
     }

diff --git a/rplexpr/rplasclasses.hpp b/rplexpr/rplasclasses.hpp
index 834186761c764ddbbd423908128c852fc3eb190a..72c20386a6aa41b874ddd102ea4498c97df39300 100644 (file)
--- a/rplexpr/rplasclasses.hpp
+++ b/rplexpr/rplasclasses.hpp
@@ -32,6 +32,7 @@ protected:
 class RplASScope
 {
 public:
+    int m_builtInVars;
     int m_varNoAtStart;
 };
 
@@ -61,7 +62,7 @@ public:
     virtual ~RplSymbolSpace();
 public:
     void startScope(RplASScope& scope);
-    void finishScope(RplASScope& scope);
+    void finishScope(int endOfScope, RplASScope& scope);
     RplASVarDefinition* findVariable(const QString& name) const;
     RplASClass* findClass(const QString& name) const;
     RplASMethod* findMethod(const QString& name) const;

diff --git a/rplexpr/rplastree.cpp b/rplexpr/rplastree.cpp
index 41e10e9754ddced3ef08bc2e64dca2bec99acc5c..a34a0d3ed70a87b9094bc6f0233af377333084a1 100644 (file)
--- a/rplexpr/rplastree.cpp
+++ b/rplexpr/rplastree.cpp
@@ -87,7 +87,7 @@ void RplASException::build(const RplSourcePosition* position,
     char buffer[64000];
     if (position != NULL)
         m_message = position->toString().toUtf8();
-    vsnprintf(buffer, sizeof buffer, format, varList);
+    qvsnprintf(buffer, sizeof buffer, format, varList);
     m_message += buffer;
 }
 
@@ -522,12 +522,12 @@ void RplASItem::error(RplLogger* logger, int location, const char* format, ...)
 {
     char buffer[1024];
     int halfBufferSize = (sizeof buffer) / 2;
-    snprintf(buffer, halfBufferSize, "id: %d [%s]:", m_id,
+    qsnprintf(buffer, halfBufferSize, "id: %d [%s]:", m_id,
                  positionStr(buffer + halfBufferSize, halfBufferSize));
     int length = strlen(buffer);
     va_list ap;
     va_start(ap, format);
-    vsnprintf(buffer + length, (sizeof buffer) - length, format, ap);
+    qvsnprintf(buffer + length, (sizeof buffer) - length, format, ap);
     va_end(ap);
     logger->log(LOG_ERROR, location, buffer);
 }
@@ -883,7 +883,7 @@ RplASNamedValue::RplASNamedValue(RplASClass* dataType,RplSymbolSpace* space,
     m_attributes(attributes),
     m_dataType(dataType),
     m_symbolSpace(space),
-    m_variableNo(0)
+    m_variableNo(-1)
 {
 }
 
@@ -1022,7 +1022,8 @@ void RplASIndexedValue::dump(RplWriter& writer, int indent)
  */
 RplASVarDefinition::RplASVarDefinition() :
     RplASNode3(AST_VAR_DEFINITION),
-    RplASStatement()
+    RplASStatement(),
+    m_endOfScope(0)
 {
     m_flags |= NF_STATEMENT;
 }
@@ -1037,13 +1038,19 @@ void RplASVarDefinition::dump(RplWriter& writer, int indent)
 {
     RplASNamedValue* namedValue = dynamic_cast<RplASNamedValue*>(m_child2);
     QByteArray name = namedValue->name().toUtf8();
+    char endOfScope[32];
+    endOfScope[0] = '\0';
+    if (m_endOfScope > 0)
+        qsnprintf(endOfScope, sizeof endOfScope, "-%d:0", m_endOfScope);
     char buffer[256];
-    writer.formatIndented(indent, "varDef %s id: %d namedValue: %d value: %d succ: %d %s",
+    writer.formatIndented(indent, "varDef %s %s id: %d namedValue: %d value: %d succ: %d %s%s",
+            namedValue == NULL || namedValue->dataType() == NULL
+                          ? "?" : namedValue->dataType()->name().toUtf8().constData(),
             name.constData(), m_id,
             m_child2 == NULL ? 0 : m_child2->id(),
             m_child3 == NULL ? 0 : m_child3->id(),
             m_child == NULL ? 0 : m_child->id(),
-            positionStr(buffer, sizeof buffer));
+            positionStr(buffer, sizeof buffer), endOfScope);
     if (m_child2 != NULL)
         m_child2->dump(writer, indent + 1);
     if (m_child3 != NULL)
@@ -1073,6 +1080,28 @@ RplASClass* RplASVarDefinition::datatype() const
     RplASClass* rc = namedValue->dataType();
     return rc;
 }
+/**
+ * @brief Returns the column of the scope end.
+ *
+ * 0 means end of method or end of class
+ *
+ * @return 0 or the column of the scope end
+ */
+int RplASVarDefinition::endOfScope() const
+{
+    return m_endOfScope;
+}
+
+/**
+ * @brief Sets the column of the scope end.
+ *
+ * @param endOfScope    the column of the scope end
+ */
+void RplASVarDefinition::setEndOfScope(int endOfScope)
+{
+    m_endOfScope = endOfScope;
+}
+
 
 /**
  * @brief Executes the statement.
@@ -1749,7 +1778,7 @@ void RplASIf::dump(RplWriter& writer, int indent)
  *
  * @param variable      NULL or the iterator variable
  */
-RplASForIterated::RplASForIterated(RplASNamedValue* variable) :
+RplASForIterated::RplASForIterated(RplASVarDefinition* variable) :
     RplASNode4(AST_ITERATED_FOR),
     RplASStatement()
 {
@@ -1812,7 +1841,7 @@ void RplASForIterated::dump(RplWriter& writer, int indent)
  *
  * @param variable      NULL or the counter variable
  */
-RplASForCounted::RplASForCounted(RplASNamedValue* variable) :
+RplASForCounted::RplASForCounted(RplASVarDefinition* variable) :
     RplASNode6(AST_ITERATED_FOR),
     RplASStatement()
 {

diff --git a/rplexpr/rplastree.hpp b/rplexpr/rplastree.hpp
index 0d2816b9f215e31599fedd5bacc2a5dc462d13a9..24d54eacf0dc394a744ce632dd59d34e3ec474ba 100644 (file)
--- a/rplexpr/rplastree.hpp
+++ b/rplexpr/rplastree.hpp
@@ -359,6 +359,14 @@ public:
     void dump(RplWriter& writer, int indent);
     const QString& name() const;
     RplASClass* datatype() const;
+    int endOfScope() const;
+    void setEndOfScope(int endOfScope);
+
+private:
+    /// the column of the blockend containing the definition.
+    /// if 0: end is end of method or end of class
+    /// Note: the source unit is stored in <code>RplASItem::m_sourcePosition</code>
+    int m_endOfScope;
 };
 
 class RplASExprStatement : public RplASNode2, public RplASStatement
@@ -478,7 +486,7 @@ public:
 class RplASForIterated : public RplASNode4, public RplASStatement
 {
 public:
-    RplASForIterated(RplASNamedValue* variable);
+    RplASForIterated(RplASVarDefinition* variable);
 public:
     virtual void execute(RplVMThread& thread);
     virtual void dump(RplWriter& writer, int indent);
@@ -487,7 +495,7 @@ public:
 class RplASForCounted : public RplASNode6, public RplASStatement
 {
 public:
-    RplASForCounted(RplASNamedValue* variable);
+    RplASForCounted(RplASVarDefinition* variable);
 public:
     virtual void execute(RplVMThread& thread);
     virtual void dump(RplWriter& writer, int indent);

diff --git a/rplexpr/rpllexer.cpp b/rplexpr/rpllexer.cpp
index 183fde530db038d58cfd1ff1019b54ddd952d370..7899fc8244afc89bdb3bdbba1f1d91e8909a5b08 100644 (file)
--- a/rplexpr/rpllexer.cpp
+++ b/rplexpr/rpllexer.cpp
@@ -17,7 +17,6 @@
 
 #define CHAR_INFO_SIZE (int(sizeof m_charInfo / sizeof m_charInfo[0]))
 
-RplLexer* RplLexer::m_active = NULL;
 
 /** @class RplToken rpllexer.hpp "rplexpr/rpllexer.hpp"
  *
@@ -40,7 +39,7 @@ RplLexException::RplLexException(const RplSourcePosition& position,
     m_message = position.toString().toUtf8();
     va_list ap;
     va_start(ap, format);
-    vsnprintf(buffer, sizeof buffer, format, ap);
+    qvsnprintf(buffer, sizeof buffer, format, ap);
     va_end(ap);
     m_message += buffer;
 }
@@ -241,6 +240,106 @@ bool RplToken::isCapitalizedId() const
     return rc;
 }
 
+/**
+ * @brief Returns the description of the current token.
+ *
+ * @return a description of the instance
+ */
+QByteArray RplToken::dump() const
+{
+    QByteArray rc;
+    rc = nameOfType(m_tokenType);
+    rc.append(": ").append(this->asUtf8());
+    return rc;
+}
+QByteArray RplToken::asUtf8() const
+{
+    char buffer[4096];
+    buffer[0] = '\0';
+
+    switch(m_tokenType){
+    case TOKEN_UNDEF:
+        break;
+    case TOKEN_STRING:
+        qsnprintf(buffer, sizeof buffer, "'%.*s'", int(sizeof buffer) - 1,
+                 m_printableString.toUtf8().constData());
+        break;
+    case TOKEN_NUMBER:
+        qsnprintf(buffer, sizeof buffer, "%lld", m_value.m_integer);
+        break;
+    case TOKEN_REAL:
+        qsnprintf(buffer, sizeof buffer, "%f", m_value.m_real);
+        break;
+    case TOKEN_KEYWORD:
+    case TOKEN_OPERATOR:
+        qsnprintf(buffer, sizeof buffer, "%lld", (int) m_value.m_id);
+        break;
+    case TOKEN_ID:
+        qsnprintf(buffer, sizeof buffer, "'%.*s'", int(sizeof buffer) - 1,
+                 m_string.toUtf8().constData());
+        break;
+    case TOKEN_COMMENT_REST_OF_LINE:
+    case TOKEN_COMMENT_START:
+    case TOKEN_COMMENT_END:
+    case TOKEN_SPACE:
+    case TOKEN_END_OF_SOURCE:
+    default:
+        break;
+    }
+    return buffer;
+}
+/**
+ * @brief Returns then name of a token type.
+ * @param   type  the type to convert
+ * @return  the token type name
+ */
+const char* RplToken::nameOfType(RplTokenType type)
+{
+    const char* rc = "?";
+
+    switch(type){
+    case TOKEN_UNDEF:
+        rc = "undef";
+        break;
+    case TOKEN_STRING:
+        rc = "String";
+        break;
+    case TOKEN_NUMBER:
+        rc = "Number";
+        break;
+    case TOKEN_REAL:
+        rc = "Real";
+        break;
+    case TOKEN_KEYWORD:
+        rc = "Keyword";
+        break;
+    case TOKEN_OPERATOR:
+        rc = "Operator";
+        break;
+    case TOKEN_ID:
+        rc = "Id";
+        break;
+    case TOKEN_COMMENT_REST_OF_LINE:
+        rc = "Comment-1-line";
+        break;
+    case TOKEN_COMMENT_START:
+        rc = "Comment-m-line";
+        break;
+    case TOKEN_COMMENT_END:
+        rc = "end of comment";
+        break;
+    case TOKEN_SPACE:
+        rc = "space";
+        break;
+    case TOKEN_END_OF_SOURCE:
+        rc = "end of source";
+        break;
+    default:
+        break;
+    }
+    return rc;
+}
+
 
 /** @class RplLexer rpllexer.hpp "rplexpr/rpllexer.hpp"
  *
@@ -372,6 +471,9 @@ RplLexer::RplLexer(RplSource* source,
     m_storageFlags(storageFlags),
     // m_prioOfOp
     // m_assocOfOp
+    #if defined (RPL_LEXER_TRACE)
+    m_trace(true),
+    #endif
     m_opNames()
 {
     memset(m_prioOfOp, 0, sizeof m_prioOfOp);
@@ -385,16 +487,12 @@ RplLexer::RplLexer(RplSource* source,
     charClassToCharInfo(restCharsId, CC_REST_ID, m_charInfo);
     initializeComments(comments);
     m_input.reserve(m_maxTokenLength*2);
-    if (m_active == NULL)
-        m_active = this;
 }
 /**
  * @brief Destructor.
  */
 RplLexer::~RplLexer()
 {
-    if (m_active == this)
-        m_active = NULL;
 }
 
 /**
@@ -826,6 +924,17 @@ void RplLexer::scanComment()
     m_input.remove(0, length);
     m_currentCol += length;
 }
+#if defined (RPL_LEXER_TRACE)
+bool RplLexer::trace() const
+{
+    return m_trace;
+}
+
+void RplLexer::setTrace(bool trace)
+{
+    m_trace = trace;
+}
+#endif
 /**
  * @brief Returns the last read token.
  *
@@ -952,6 +1061,15 @@ RplToken* RplLexer::nextToken()
                 "unknown lexical symbol: %s", symbol.toUtf8().constData());
         }
     }
+#if defined (RPL_LEXER_TRACE)
+    if (m_trace){
+        char buffer[256];
+        printf("token: %s pos: %s\n", m_currentToken->dump().constData(),
+               m_currentPosition->utf8(buffer, sizeof buffer));
+        if (strcmp(buffer, "<test>:2:6") == 0)
+            buffer[0] = 0;
+    }
+#endif
     return rc;
 }
 /**
@@ -964,6 +1082,16 @@ void RplLexer::undoLastToken()
     m_waitingToken = m_currentToken;
     m_currentToken = m_currentToken == &m_token1 ? &m_token2 : &m_token1;
     m_waitingPosition1 = m_currentPosition;
+#if defined (RPL_LEXER_TRACE)
+    if (m_trace){
+        char buffer[256];
+        printf("undo last token: waiting-token:  %s pos: %s\n",
+               m_waitingToken->dump().constData(),
+               m_waitingPosition1->utf8(buffer, sizeof buffer));
+        if (strcmp(buffer, "<test>:2:6") == 0)
+            buffer[0] = 0;
+    }
+#endif
 }
 
 /**

diff --git a/rplexpr/rpllexer.hpp b/rplexpr/rpllexer.hpp
index cfc8b8bbcaa977e16c8cc8b2321866255e8eb446..4fc0ce2d3840b476f003734b72946f1e2e1c65e5 100644 (file)
--- a/rplexpr/rpllexer.hpp
+++ b/rplexpr/rpllexer.hpp
@@ -55,6 +55,9 @@ public:
     bool isKeyword(int expected, int alternative = 0) const;
     void clear();
     bool isCapitalizedId() const;
+    QByteArray dump() const;
+    static const char* nameOfType(RplTokenType type);
+    QByteArray asUtf8() const;
 protected:
     RplTokenType m_tokenType;
     QString m_string;
@@ -183,6 +186,8 @@ public:
     bool isRightAssociative(int op) const;
     const RplSourcePosition* currentPosition() const;
     RplToken* currentToken() const;
+    bool trace() const;
+    void setTrace(bool trace);
 
 private:
     void prepareOperators(const char* operators, const char* rightAssociatives);
@@ -231,8 +236,10 @@ protected:
     char m_prioOfOp[128];
     char m_assocOfOp[128];
     QList<QByteArray> m_opNames;
-public:
-    static RplLexer* m_active;
+//#define RPL_LEXER_TRACE
+#if defined (RPL_LEXER_TRACE)
+    bool m_trace;
+#endif
 };
 
 

diff --git a/rplexpr/rplmfparser.cpp b/rplexpr/rplmfparser.cpp
index 653daffd47a611398916c4c9ef658fdd228d0a51..b3aa969fb3b8cee1b08e5296d6bdb78bc69ff553 100644 (file)
--- a/rplexpr/rplmfparser.cpp
+++ b/rplexpr/rplmfparser.cpp
@@ -157,6 +157,23 @@ RplASItem* RplMFParser::parseRepeat()
     return rc;
 }
 
+/**
+ * @brief Creates a variable definition for a builtin variable.
+ * @param var   the basic variable data
+ * @return
+ */
+RplASVarDefinition* RplMFParser::buildVarDef(RplASNamedValue* var)
+{
+    RplASVarDefinition* rc = new RplASVarDefinition();
+    rc->setPosition(var->position());
+    rc->setChild2(var);
+    RplSymbolSpace* symbols = m_tree.currentSpace();
+    int varNo;
+    symbols->addVariable(rc, varNo);
+    var->setVariableNo(varNo);
+    return rc;
+}
+
 /**
  * @brief Parses a for statement.
  *
@@ -171,6 +188,7 @@ RplASItem* RplMFParser::parseRepeat()
  */
 RplASItem* RplMFParser::parseFor()
 {
+    int builtinVars = 1;
     RplASNode2* rc = NULL;
     const RplSourcePosition* startPosition = m_lexer.currentPosition();
     RplToken* token = m_lexer.nextNonSpaceToken();
@@ -183,14 +201,26 @@ RplASItem* RplMFParser::parseFor()
         token = m_lexer.nextNonSpaceToken();
     }
     if (token->isKeyword(K_IN)){
-        RplASForIterated* node = new RplASForIterated(var);
+        RplASVarDefinition* varDef = buildVarDef(var);
+        RplASForIterated* node = new RplASForIterated(varDef);
         rc = node;
         node->setPosition(startPosition);
         node->setChild3(var);
         RplASItem* iterable = parseExpr(0);
         node->setChild4(iterable);
     } else {
-        RplASForCounted* node = new RplASForCounted(var);
+        if (var == NULL){
+            char name[32];
+            // Build a unique name inside the scope:
+            qsnprintf(name, sizeof name, "$%d_%d", startPosition->lineNo(),
+                      startPosition->column());
+            var = new RplASNamedValue(RplASInteger::m_instance,
+                                      m_tree.currentSpace(), name,
+                                      RplASNamedValue::A_LOOP);
+            var->setPosition(startPosition);
+        }
+        RplASVarDefinition* varDef = buildVarDef(var);
+        RplASForCounted* node = new RplASForCounted(varDef);
         rc = node;
         node->setPosition(startPosition);
         node->setChild3(var);
@@ -207,7 +237,7 @@ RplASItem* RplMFParser::parseFor()
     }
     if (! m_lexer.currentToken()->isKeyword(K_DO))
         syntaxError(L_PARSE_FOR_NO_TO, "'to' expected");
-    rc->setChild2(parseBody(K_OD));
+    rc->setChild2(parseBody(K_OD, K_UNDEF, builtinVars));
     m_lexer.nextNonSpaceToken();
     return rc;
 }
@@ -503,7 +533,7 @@ RplASItem* RplMFParser::buildVarOrField(const QString& name,
     RplASItem* rc = NULL;
     if (parent == NULL){
         RplSymbolSpace* space = m_tree.currentSpace();
-        RplASVarDefinition* var = space->findVariable(var->name());
+        RplASVarDefinition* var = space->findVariable(name);
         RplASClass* clazz = NULL;
         if (var != NULL)
             clazz = var->datatype();
@@ -642,6 +672,8 @@ RplASItem* RplMFParser::parseOperand(int level, RplASItem* parent)
     case TOKEN_ID:
     {
         QString name = token->toString();
+        if (name == "a")
+            name = "a";
         token = m_lexer.nextNonSpaceToken();
         startPosition = m_lexer.currentPosition();
         if (token->tokenType() != TOKEN_OPERATOR){
@@ -920,12 +952,11 @@ RplASItem* RplMFParser::parseLocalVar(){
  *
  * @param keywordStop   the first possible keyword which finishes the stm. list
  * @param keywordStop2  the 2nd possible keyword which finishes the statements
- * @param opStop        the first possible delimiting operator
- * @param opStop2       the 2nd possible delimiting operator
+ * @param builtinVars   number of variables valid only in this body
  * @return              the first element of the statement list
  */
 RplASItem* RplMFParser::parseBody(Keyword keywordStop, Keyword keywordStop2,
-        Operator opStop, Operator opStop2)
+                                  int builtinVars)
 {
     RplToken* token = m_lexer.nextNonSpaceToken();
     RplASItem* item = NULL;
@@ -933,6 +964,7 @@ RplASItem* RplMFParser::parseBody(Keyword keywordStop, Keyword keywordStop2,
     RplASNode1* lastStatement = NULL;
     RplASScope scope;
     m_tree.currentSpace()->startScope(scope);
+    scope.m_builtInVars = builtinVars;
     bool again = true;
     const RplSourcePosition* lastPos = NULL;
     do {
@@ -947,11 +979,6 @@ RplASItem* RplMFParser::parseBody(Keyword keywordStop, Keyword keywordStop2,
             switch(token->tokenType())
             {
             case TOKEN_OPERATOR:
-                if (opStop != O_UNDEF && token->isOperator(opStop, opStop2)){
-                    again = false;
-                    break;
-                }
-                // fall through
             case TOKEN_STRING:
             case TOKEN_NUMBER:
             case TOKEN_REAL:
@@ -1019,10 +1046,8 @@ RplASItem* RplMFParser::parseBody(Keyword keywordStop, Keyword keywordStop2,
                     error(L_PARSE_BODY_WRONG_ITEM, "wrong item type: %d",
                           item == NULL ? 0 : item->nodeType());
                 token = m_lexer.currentToken();
-                if ((keywordStop != K_UNDEF
+                if (keywordStop != K_UNDEF
                             && token->isKeyword(keywordStop, keywordStop2))
-                        || (opStop != O_UNDEF
-                            && token->isOperator(opStop, opStop2)))
                     again = false;
             }
         } catch(RplSyntaxError exc){
@@ -1053,8 +1078,10 @@ RplASItem* RplMFParser::parseBody(Keyword keywordStop, Keyword keywordStop2,
         }
     } while(again);
 
-    if (keywordStop != K_ENDF && keywordStop != K_ENDC)
-        m_tree.currentSpace()->finishScope(scope);
+    if (keywordStop != K_ENDF && keywordStop != K_ENDC
+            && keywordStop != K_UNDEF)
+        m_tree.currentSpace()->finishScope(m_lexer.currentPosition()->lineNo(),
+                                           scope);
     return body;
 }
 

diff --git a/rplexpr/rplmfparser.hpp b/rplexpr/rplmfparser.hpp
index 44df6e178d36c0e1cf7a93c60641e528c14a5e01..36b4532bd0661964eead6a8181b0c4709fc740dd 100644 (file)
--- a/rplexpr/rplmfparser.hpp
+++ b/rplexpr/rplmfparser.hpp
@@ -74,7 +74,7 @@ public:
     RplASItem* parseVarDefinition(RplASNamedValue::Attributes attribute);
     RplASItem* parseExpr(int depth);
     RplASItem* parseBody(Keyword keywordStop, Keyword keywordStop2 = K_UNDEF,
-                         Operator opStop = O_UNDEF, Operator opStop2 = O_UNDEF);
+                         int builtinVars = 0);
     void parseMethod();
     void parseClass();
     void parseImport();
@@ -94,6 +94,7 @@ protected:
                                RplASItem* parent);
     RplASExprStatement*parseParameterList();
     RplASItem* parseLocalVar();
+    RplASVarDefinition* buildVarDef(RplASNamedValue* var);
 protected:
     static RplASBinaryOp::BinOperator convertBinaryOp(int op);
     static RplASUnaryOp::UnaryOp convertUnaryOp(int op);

diff --git a/rplexpr/rplparser.cpp b/rplexpr/rplparser.cpp
index 815c63cd5a5c3e73c7aa605c20eb86f0a5894774..81b101175c26ce39b61750ec5019f064c12f8939 100644 (file)
--- a/rplexpr/rplparser.cpp
+++ b/rplexpr/rplparser.cpp
@@ -104,7 +104,7 @@ void RplParser::addSimpleMessage(LevelTag prefix, int location,
                                  const char* message){
     char buffer[2048];
     QString msg;
-    snprintf(buffer, sizeof buffer, "%c%04d %s:%d-%d: ", prefix, location,
+    qsnprintf(buffer, sizeof buffer, "%c%04d %s:%d-%d: ", prefix, location,
              position->sourceUnit()->name(),
              position->lineNo(), position->column());
     int used = strlen(buffer);
@@ -129,7 +129,7 @@ void RplParser::addMessage(LevelTag prefix, int location,
                            const RplSourcePosition* position,
                            const char* format, va_list varList){
     char buffer[2048];
-    vsnprintf(buffer, sizeof buffer, format, varList);
+    qvsnprintf(buffer, sizeof buffer, format, varList);
     addSimpleMessage(prefix, location, position, buffer);
 }
 
@@ -169,7 +169,7 @@ void RplParser::syntaxError(int location, const char* message,
 {
     char buffer[256];
     char buffer2[512];
-    snprintf(buffer2, sizeof buffer2,
+    qsnprintf(buffer2, sizeof buffer2,
             "The starting symbol %s is located here. Missing point: %s",
             symbol, m_lexer.currentPosition()->utf8(buffer, sizeof buffer));
 

diff --git a/rplexpr/rplsource.cpp b/rplexpr/rplsource.cpp
index 3c1e35951197afc57bd204f212beb116551919dd..3711899e5decea01c58cdd12cf968d79c09e88a7 100644 (file)
--- a/rplexpr/rplsource.cpp
+++ b/rplexpr/rplsource.cpp
@@ -171,7 +171,7 @@ QString RplSourcePosition::toString() const
  */
 char* RplSourcePosition::utf8(char buffer[], size_t bufferSize) const
 {
-    snprintf(buffer, bufferSize, "%s:%d:%d",
+    qsnprintf(buffer, bufferSize, "%s:%d:%d",
              m_sourceUnit == NULL ? "" : m_sourceUnit->name(),
              m_lineNo, m_column);
     return buffer;

diff --git a/rplexpr/rplvm.cpp b/rplexpr/rplvm.cpp
index 2c681af37925faeeaf4b52fde047110b6897bdfe..873d3e4f285dc62bf2109c5d14233370cc57aedd 100644 (file)
--- a/rplexpr/rplvm.cpp
+++ b/rplexpr/rplvm.cpp
@@ -47,7 +47,7 @@ RplVmException::RplVmException(const char* format, ...) :
     char buffer[16000];
     va_list ap;
     va_start(ap, format);
-    vsnprintf(buffer, sizeof buffer, format, ap);
+    qvsnprintf(buffer, sizeof buffer, format, ap);
     va_end(ap);
     m_message = buffer;
 }

diff --git a/rplmath/rplmatrix.cpp b/rplmath/rplmatrix.cpp
index fe268b087f3fc3e8ac9ddcb380cb9a4bf875c9cf..872af7bf207f6109cc404cc362e279ff94f37972 100644 (file)
--- a/rplmath/rplmatrix.cpp
+++ b/rplmath/rplmatrix.cpp
@@ -25,7 +25,7 @@ RplMatrixException::RplMatrixException(const RplMatrix& RplMatrix,
 
        va_list args;
        va_start(args, format);
-       vsnprintf(buffer, sizeof buffer, format, args);
+       qvsnprintf(buffer, sizeof buffer, format, args);
        va_end(args);
        m_message += buffer;
 }
@@ -347,13 +347,13 @@ QByteArray RplMatrix::toString(const char* prefix, const char* format,
        char buffer[128];
        Tuple2 minMaxi(minMax());
     QByteArray rc;
-       snprintf(buffer, sizeof buffer, format, minMaxi.m_value1);
+       qsnprintf(buffer, sizeof buffer, format, minMaxi.m_value1);
        int length = strlen(buffer);
-       snprintf(buffer, sizeof buffer, format, minMaxi.m_value2);
+       qsnprintf(buffer, sizeof buffer, format, minMaxi.m_value2);
        int length2 = strlen(buffer);
        if (length < length2)
                length = length2;
-       snprintf(buffer, sizeof buffer, format,
+       qsnprintf(buffer, sizeof buffer, format,
                        (minMaxi.m_value1 + minMaxi.m_value2) / 2);
        length2 = strlen(buffer);
        if (length < length2)
@@ -367,7 +367,7 @@ QByteArray RplMatrix::toString(const char* prefix, const char* format,
        rc += "[";
        for (int row = 0; row < m_rows; row++){
         for (int col = 0; col < m_cols; col++){
-                       snprintf(buffer, sizeof buffer, format, m_values[m_cols*row + col]);
+                       qsnprintf(buffer, sizeof buffer, format, m_values[m_cols*row + col]);
                        rc += buffer;
                        rc += colSeparator;
                }

diff --git a/test/rplmfparser/defTest.txt b/test/rplmfparser/defTest.txt
deleted file mode 100644 (file)
index e8826b3..0000000
--- a/test/rplmfparser/defTest.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Int i = 3; const lazy Str s = 'Hi'; const List l;
-= <test> (module) parent: $global
-== Variables:
-varDef i id: 2 namedValue: 1 value: 3 succ: 5 <test>:1:4
-       namedValue i id: 1 attr: 0x0 <test>:1:4
-       const id: 3 value: 3 <test>:1:8
-varDef l id: 8 namedValue: 7 value: 0 succ: 0 <test>:1:47
-       namedValue l id: 7 attr: 0x2 <test>:1:47
-varDef s id: 5 namedValue: 4 value: 6 succ: 8 <test>:1:26
-       namedValue s id: 4 attr: 0x12 <test>:1:26
-       const id: 6 value: 'Hi' <test>:1:30
-== Body:
-varDef i id: 2 namedValue: 1 value: 3 succ: 5 <test>:1:4
-       namedValue i id: 1 attr: 0x0 <test>:1:4
-       const id: 3 value: 3 <test>:1:8
-varDef s id: 5 namedValue: 4 value: 6 succ: 8 <test>:1:26
-       namedValue s id: 4 attr: 0x12 <test>:1:26
-       const id: 6 value: 'Hi' <test>:1:30
-varDef l id: 8 namedValue: 7 value: 0 succ: 0 <test>:1:47
-       namedValue l id: 7 attr: 0x2 <test>:1:47

diff --git a/test/rplmfparser/forC1.txt b/test/rplmfparser/forC1.txt
index 5a5517a57bde5c70a07eca8ce153fe8951797789..73215c337fe2d13abc303f96d2ed286141842ea5 100644 (file)
--- a/test/rplmfparser/forC1.txt
+++ b/test/rplmfparser/forC1.txt
@@ -4,18 +4,20 @@ a += 1;
 od
 = <test> (module) parent: $global
 == Variables:
-varDef a id: 2 namedValue: 1 value: 0 succ: 4 <test>:1:4
+varDef Int a id: 2 namedValue: 1 value: 0 succ: 5 <test>:1:4
        namedValue a id: 1 attr: 0x0 <test>:1:4
+varDef Int b id: 4 namedValue: 3 value: 0 succ: 0 <test>:2:4-3:0
+       namedValue b id: 3 attr: 0x40 <test>:2:4
 == Body:
-varDef a id: 2 namedValue: 1 value: 0 succ: 4 <test>:1:4
+varDef Int a id: 2 namedValue: 1 value: 0 succ: 5 <test>:1:4
        namedValue a id: 1 attr: 0x0 <test>:1:4
-forC id: 4 var: 3 from: 5 to: 6 step: 7 body: 12 succ: 0 <test>:1:7
-       namedValue b id: 3 attr: 0x0 <test>:2:4
-       const id: 5 value: 10 <test>:2:11
-       const id: 6 value: 1 <test>:2:17
-       Unary 7 op: - (2) expr: 8 <test>:2:24
-               const id: 8 value: 2 <test>:2:25
-       Expr id: 12 expr: 10 succ: 0 <test>:3:2
-               BinOp id: 10 op: += (2) left: 9 right: 11 <test>:3:2
-                       namedValue a id: 9 attr: 0x0 <test>:3:2
-                       const id: 11 value: 1 <test>:3:5
+forC id: 5 var: 3 from: 6 to: 7 step: 8 body: 13 succ: 0 <test>:1:7
+       namedValue b id: 3 attr: 0x40 <test>:2:4
+       const id: 6 value: 10 <test>:2:11
+       const id: 7 value: 1 <test>:2:17
+       Unary 8 op: - (2) expr: 9 <test>:2:24
+               const id: 9 value: 2 <test>:2:25
+       Expr id: 13 expr: 11 succ: 0 <test>:3:2
+               BinOp id: 11 op: += (2) left: 10 right: 12 <test>:3:2
+                       namedValue a id: 10 attr: 0x0 <test>:3:2
+                       const id: 12 value: 1 <test>:3:5

diff --git a/test/rplmfparser/forC2.txt b/test/rplmfparser/forC2.txt
index 4db7cf79fe25101f90431c44f872998980617f2e..008df5afabda22ec2550f0688b0d1749ff38d410 100644 (file)
--- a/test/rplmfparser/forC2.txt
+++ b/test/rplmfparser/forC2.txt
@@ -1,14 +1,17 @@
 Int a; for to 10 do a += 1 od
 = <test> (module) parent: $global
 == Variables:
-varDef a id: 2 namedValue: 1 value: 0 succ: 3 <test>:1:4
+varDef Int a id: 2 namedValue: 1 value: 0 succ: 5 <test>:1:4
        namedValue a id: 1 attr: 0x0 <test>:1:4
+varDef Int $1_7 id: 4 namedValue: 3 value: 0 succ: 0 <test>:1:7-1:0
+       namedValue $1_7 id: 3 attr: 0x40 <test>:1:7
 == Body:
-varDef a id: 2 namedValue: 1 value: 0 succ: 3 <test>:1:4
+varDef Int a id: 2 namedValue: 1 value: 0 succ: 5 <test>:1:4
        namedValue a id: 1 attr: 0x0 <test>:1:4
-forC id: 3 var: 0 from: 0 to: 4 step: 0 body: 8 succ: 0 <test>:1:7
-       const id: 4 value: 10 <test>:1:14
-       Expr id: 8 expr: 6 succ: 0 <test>:1:22
-               BinOp id: 6 op: += (2) left: 5 right: 7 <test>:1:22
-                       namedValue a id: 5 attr: 0x0 <test>:1:22
-                       const id: 7 value: 1 <test>:1:25
+forC id: 5 var: 3 from: 0 to: 6 step: 0 body: 10 succ: 0 <test>:1:7
+       namedValue $1_7 id: 3 attr: 0x40 <test>:1:7
+       const id: 6 value: 10 <test>:1:14
+       Expr id: 10 expr: 8 succ: 0 <test>:1:22
+               BinOp id: 8 op: += (2) left: 7 right: 9 <test>:1:22
+                       namedValue a id: 7 attr: 0x0 <test>:1:22
+                       const id: 9 value: 1 <test>:1:25

diff --git a/test/rplmfparser/forIt1.txt b/test/rplmfparser/forIt1.txt
index 66071deaac977deec6a2d55fc98464d8ae2ad637..297f1c2c29c9647dac783ffe139d8122e8e88970 100644 (file)
--- a/test/rplmfparser/forIt1.txt
+++ b/test/rplmfparser/forIt1.txt
@@ -4,15 +4,17 @@ a += 1;
 od
 = <test> (module) parent: $global
 == Variables:
-varDef a id: 2 namedValue: 1 value: 0 succ: 4 <test>:1:4
+varDef Map a id: 2 namedValue: 1 value: 0 succ: 5 <test>:1:4
        namedValue a id: 1 attr: 0x0 <test>:1:4
+varDef Int x id: 4 namedValue: 3 value: 0 succ: 0 <test>:2:4-3:0
+       namedValue x id: 3 attr: 0x40 <test>:2:4
 == Body:
-varDef a id: 2 namedValue: 1 value: 0 succ: 4 <test>:1:4
+varDef Map a id: 2 namedValue: 1 value: 0 succ: 5 <test>:1:4
        namedValue a id: 1 attr: 0x0 <test>:1:4
-forIt id: 4 var: 3 set: 5 body: 9 succ: 0 <test>:1:7
-       namedValue x id: 3 attr: 0x0 <test>:2:4
-       namedValue a id: 5 attr: 0x0 <test>:2:11
-       Expr id: 9 expr: 7 succ: 0 <test>:3:2
-               BinOp id: 7 op: += (2) left: 6 right: 8 <test>:3:2
-                       namedValue a id: 6 attr: 0x0 <test>:3:2
-                       const id: 8 value: 1 <test>:3:5
+forIt id: 5 var: 3 set: 6 body: 10 succ: 0 <test>:1:7
+       namedValue x id: 3 attr: 0x40 <test>:2:4
+       namedValue a id: 6 attr: 0x0 <test>:2:11
+       Expr id: 10 expr: 8 succ: 0 <test>:3:2
+               BinOp id: 8 op: += (2) left: 7 right: 9 <test>:3:2
+                       namedValue a id: 7 attr: 0x0 <test>:3:2
+                       const id: 9 value: 1 <test>:3:5

diff --git a/test/rplmfparser/list1.txt b/test/rplmfparser/list1.txt
index 9c0026e7cc4df4cc24b98533a46efd09dfbee13b..c326ad062c73aa8ed9b0a85c552514f4af32bbe9 100644 (file)
--- a/test/rplmfparser/list1.txt
+++ b/test/rplmfparser/list1.txt
@@ -1,12 +1,12 @@
 List b = [];
 = <test> (module) parent: $global
 == Variables:
-varDef b id: 2 namedValue: 1 value: 3 succ: 0 <test>:1:5
+varDef List b id: 2 namedValue: 1 value: 3 succ: 0 <test>:1:5
        namedValue b id: 1 attr: 0x0 <test>:1:5
        listConst id: 3 <test>:1:9
                []
 == Body:
-varDef b id: 2 namedValue: 1 value: 3 succ: 0 <test>:1:5
+varDef List b id: 2 namedValue: 1 value: 3 succ: 0 <test>:1:5
        namedValue b id: 1 attr: 0x0 <test>:1:5
        listConst id: 3 <test>:1:9
                []

diff --git a/test/rplmfparser/list2.txt b/test/rplmfparser/list2.txt
index 1f2deead218f84824e81291fe0533e7828214311..828ceddebcd9e5937427c10daf9ae223b60c9d03 100644 (file)
--- a/test/rplmfparser/list2.txt
+++ b/test/rplmfparser/list2.txt
@@ -1,20 +1,20 @@
 List a = [2+3, 3.14, 7, 'hi', a]; List b = [];
 = <test> (module) parent: $global
 == Variables:
-varDef a id: 2 namedValue: 1 value: 3 succ: 11 <test>:1:5
+varDef List a id: 2 namedValue: 1 value: 3 succ: 11 <test>:1:5
        namedValue a id: 1 attr: 0x0 <test>:1:5
        listConst id: 3 <test>:1:9
                [<formula 7>,3.140000,7,'hi',<formula 9>]
-varDef b id: 11 namedValue: 10 value: 12 succ: 0 <test>:1:39
+varDef List b id: 11 namedValue: 10 value: 12 succ: 0 <test>:1:39
        namedValue b id: 10 attr: 0x0 <test>:1:39
        listConst id: 12 <test>:1:43
                []
 == Body:
-varDef a id: 2 namedValue: 1 value: 3 succ: 11 <test>:1:5
+varDef List a id: 2 namedValue: 1 value: 3 succ: 11 <test>:1:5
        namedValue a id: 1 attr: 0x0 <test>:1:5
        listConst id: 3 <test>:1:9
                [<formula 7>,3.140000,7,'hi',<formula 9>]
-varDef b id: 11 namedValue: 10 value: 12 succ: 0 <test>:1:39
+varDef List b id: 11 namedValue: 10 value: 12 succ: 0 <test>:1:39
        namedValue b id: 10 attr: 0x0 <test>:1:39
        listConst id: 12 <test>:1:43
                []

diff --git a/test/rplmfparser/map1.txt b/test/rplmfparser/map1.txt
index 1e51ff7a284df230359c1ecfeebdbb17d53d2891..f140c85259b74e282c202676ef6847643a991a10 100644 (file)
--- a/test/rplmfparser/map1.txt
+++ b/test/rplmfparser/map1.txt
@@ -1,12 +1,12 @@
 Map a = {};
 = <test> (module) parent: $global
 == Variables:
-varDef a id: 2 namedValue: 1 value: 3 succ: 0 <test>:1:4
+varDef Map a id: 2 namedValue: 1 value: 3 succ: 0 <test>:1:4
        namedValue a id: 1 attr: 0x0 <test>:1:4
        mapConst id: 3 <test>:1:8
        {}
 == Body:
-varDef a id: 2 namedValue: 1 value: 3 succ: 0 <test>:1:4
+varDef Map a id: 2 namedValue: 1 value: 3 succ: 0 <test>:1:4
        namedValue a id: 1 attr: 0x0 <test>:1:4
        mapConst id: 3 <test>:1:8
        {}

diff --git a/test/rplmfparser/map2.txt b/test/rplmfparser/map2.txt
index 35c785289f2974ecf3bbdb8da9034b962a525d11..fd4ae67d7d76dbdc001bed9e8e1e62bcef82904b 100644 (file)
--- a/test/rplmfparser/map2.txt
+++ b/test/rplmfparser/map2.txt
@@ -2,20 +2,20 @@ Map a = {'a': 2+3,'bcd':3.14,'ccc':7, 'hi':'world'};
 Map b = {};
 = <test> (module) parent: $global
 == Variables:
-varDef a id: 2 namedValue: 1 value: 3 succ: 11 <test>:1:4
+varDef Map a id: 2 namedValue: 1 value: 3 succ: 11 <test>:1:4
        namedValue a id: 1 attr: 0x0 <test>:1:4
        mapConst id: 3 <test>:1:8
        {'a':<formula 7>,'bcd':3.140000,'ccc':7,'hi':<formula 9>}
-varDef b id: 11 namedValue: 10 value: 12 succ: 0 <test>:2:4
+varDef Map b id: 11 namedValue: 10 value: 12 succ: 0 <test>:2:4
        namedValue b id: 10 attr: 0x0 <test>:2:4
        mapConst id: 12 <test>:2:8
        {}
 == Body:
-varDef a id: 2 namedValue: 1 value: 3 succ: 11 <test>:1:4
+varDef Map a id: 2 namedValue: 1 value: 3 succ: 11 <test>:1:4
        namedValue a id: 1 attr: 0x0 <test>:1:4
        mapConst id: 3 <test>:1:8
        {'a':<formula 7>,'bcd':3.140000,'ccc':7,'hi':<formula 9>}
-varDef b id: 11 namedValue: 10 value: 12 succ: 0 <test>:2:4
+varDef Map b id: 11 namedValue: 10 value: 12 succ: 0 <test>:2:4
        namedValue b id: 10 attr: 0x0 <test>:2:4
        mapConst id: 12 <test>:2:8
        {}

diff --git a/test/rplmfparser/meth2.txt b/test/rplmfparser/meth2.txt
index cca30a2c71b2b5b8c1ba620f83946868d31d16fc..bd20165df5024c687d5eaf901a1b845e998ff208 100644 (file)
--- a/test/rplmfparser/meth2.txt
+++ b/test/rplmfparser/meth2.txt
@@ -5,9 +5,9 @@ rc endf
 == Methods:
 Method <NoneType> fac() id: 1 parent: <test> args: 4 body: 6 <test>:0:55
        Expr id: 4 expr: 3 succ: 0 
-               varDef n id: 3 namedValue: 2 value: 0 succ: 0 <test>:1:23
+               varDef Int n id: 3 namedValue: 2 value: 0 succ: 0 <test>:1:23
                        namedValue n id: 2 attr: 0x22 <test>:1:23
-       varDef rc id: 6 namedValue: 5 value: 0 succ: 7 <test>:2:4
+       varDef Int rc id: 6 namedValue: 5 value: 0 succ: 7 <test>:2:4
                namedValue rc id: 5 attr: 0x0 <test>:2:4
        If id: 7 condition: 9 then: 14 else: 24 succ: 26<test>:2:8
                BinOp id: 9 op: <= (34) left: 8 right: 10 <test>:2:14
@@ -31,7 +31,7 @@ Method <NoneType> fac() id: 1 parent: <test> args: 4 body: 6 <test>:0:55
                namedValue rc id: 25 attr: 0x0 <test>:3:3
        = <test>.fac (method) parent: <test>
        == Variables:
-       varDef n id: 3 namedValue: 2 value: 0 succ: 0 <test>:1:23
+       varDef Int n id: 3 namedValue: 2 value: 0 succ: 0 <test>:1:23
                namedValue n id: 2 attr: 0x22 <test>:1:23
-       varDef rc id: 6 namedValue: 5 value: 0 succ: 7 <test>:2:4
+       varDef Int rc id: 6 namedValue: 5 value: 0 succ: 7 <test>:2:4
                namedValue rc id: 5 attr: 0x0 <test>:2:4

diff --git a/test/rplmfparser/meth3.txt b/test/rplmfparser/meth3.txt
index f3fe793653fd7272549b49a886a995e63a82f767..0808991220214ad75d0211169c4a583d260c0f79 100644 (file)
--- a/test/rplmfparser/meth3.txt
+++ b/test/rplmfparser/meth3.txt
@@ -10,7 +10,7 @@ endf
 == Methods:
 Method <NoneType> max() id: 21 parent: <test> args: 24 body: 40 <test>:5:5
        Expr id: 24 expr: 23 succ: 27 
-               varDef a id: 23 namedValue: 22 value: 0 succ: 0 <test>:6:23
+               varDef Int a id: 23 namedValue: 22 value: 0 succ: 0 <test>:6:23
                        namedValue a id: 22 attr: 0x22 <test>:6:23
        Expr id: 40 expr: 31 succ: 0 <test>:7:3
                call max Id: 31 args: 33 parent: 0 succ: 0 <test>:7:3
@@ -24,9 +24,9 @@ Method <NoneType> max() id: 21 parent: <test> args: 24 body: 40 <test>:5:5
                                                namedValue c id: 37 attr: 0x0 <test>:7:15
        = <test>.max (method) parent: <test>
        == Variables:
-       varDef a id: 23 namedValue: 22 value: 0 succ: 0 <test>:6:23
+       varDef Int a id: 23 namedValue: 22 value: 0 succ: 0 <test>:6:23
                namedValue a id: 22 attr: 0x22 <test>:6:23
-       varDef b id: 26 namedValue: 25 value: 0 succ: 0 <test>:6:30
+       varDef Int b id: 26 namedValue: 25 value: 0 succ: 0 <test>:6:30
                namedValue b id: 25 attr: 0x20 <test>:6:30
-       varDef c id: 29 namedValue: 28 value: 0 succ: 0 <test>:6:37
+       varDef Int c id: 29 namedValue: 28 value: 0 succ: 0 <test>:6:37
                namedValue c id: 28 attr: 0x20 <test>:6:37

diff --git a/test/rplmfparser/meth4.txt b/test/rplmfparser/meth4.txt
index 3414ab6a1f9841962181eacb9f02b44a55905f1a..9d237c5b71db728ec07b15f6b382edd282f234bb 100644 (file)
--- a/test/rplmfparser/meth4.txt
+++ b/test/rplmfparser/meth4.txt
@@ -10,7 +10,7 @@ endf
 == Methods:
 Method <NoneType> max() id: 1 parent: <test> args: 4 body: 40 <test>:0:4
        Expr id: 4 expr: 3 succ: 7 
-               varDef a id: 3 namedValue: 2 value: 0 succ: 0 <test>:1:23
+               varDef Int a id: 3 namedValue: 2 value: 0 succ: 0 <test>:1:23
                        namedValue a id: 2 attr: 0x22 <test>:1:23
        Expr id: 40 expr: 31 succ: 0 <test>:7:3
                call max Id: 31 args: 33 parent: 0 succ: 0 <test>:7:3
@@ -26,9 +26,9 @@ Method <NoneType> max() id: 1 parent: <test> args: 4 body: 40 <test>:0:4
        == Methods:
        Method <NoneType> max() id: 11 parent: <test>.max args: 14 body: 19 <test>:1:41
                Expr id: 14 expr: 13 succ: 17 
-                       varDef a id: 13 namedValue: 12 value: 0 succ: 0 <test>:2:17
+                       varDef Int a id: 13 namedValue: 12 value: 0 succ: 0 <test>:2:17
                                namedValue a id: 12 attr: 0x20 <test>:2:17
-               varDef rc id: 19 namedValue: 18 value: 20 succ: 21 <test>:3:5
+               varDef Int rc id: 19 namedValue: 18 value: 20 succ: 21 <test>:3:5
                        namedValue rc id: 18 attr: 0x0 <test>:3:5
                        namedValue a id: 20 attr: 0x0 <test>:3:11
                If id: 21 condition: 23 then: 28 else: 0 succ: 30<test>:3:13
@@ -43,17 +43,17 @@ Method <NoneType> max() id: 1 parent: <test> args: 4 body: 40 <test>:0:4
                        namedValue rc id: 29 attr: 0x0 <test>:5:3
                = <test>.max.max (method) parent: <test>.max
                == Variables:
-               varDef a id: 13 namedValue: 12 value: 0 succ: 0 <test>:2:17
+               varDef Int a id: 13 namedValue: 12 value: 0 succ: 0 <test>:2:17
                        namedValue a id: 12 attr: 0x20 <test>:2:17
-               varDef b id: 16 namedValue: 15 value: 0 succ: 0 <test>:2:24
+               varDef Int b id: 16 namedValue: 15 value: 0 succ: 0 <test>:2:24
                        namedValue b id: 15 attr: 0x20 <test>:2:24
-               varDef rc id: 19 namedValue: 18 value: 20 succ: 21 <test>:3:5
+               varDef Int rc id: 19 namedValue: 18 value: 20 succ: 21 <test>:3:5
                        namedValue rc id: 18 attr: 0x0 <test>:3:5
                        namedValue a id: 20 attr: 0x0 <test>:3:11
        == Variables:
-       varDef a id: 3 namedValue: 2 value: 0 succ: 0 <test>:1:23
+       varDef Int a id: 3 namedValue: 2 value: 0 succ: 0 <test>:1:23
                namedValue a id: 2 attr: 0x22 <test>:1:23
-       varDef b id: 6 namedValue: 5 value: 0 succ: 0 <test>:1:30
+       varDef Int b id: 6 namedValue: 5 value: 0 succ: 0 <test>:1:30
                namedValue b id: 5 attr: 0x20 <test>:1:30
-       varDef c id: 9 namedValue: 8 value: 0 succ: 0 <test>:1:37
+       varDef Int c id: 9 namedValue: 8 value: 0 succ: 0 <test>:1:37
                namedValue c id: 8 attr: 0x20 <test>:1:37

diff --git a/test/rplmfparser/opTest1.txt b/test/rplmfparser/opTest1.txt
index 91b1fc319192253a8a277a494161ad90286a9519..d34ba9f121314ca9ee374df908677319132a19f0 100644 (file)
--- a/test/rplmfparser/opTest1.txt
+++ b/test/rplmfparser/opTest1.txt
@@ -6,17 +6,17 @@ a--*++b**(8-3);
 a=b=(a+(b-2)*3)
 = <test> (module) parent: $global
 == Variables:
-varDef a id: 2 namedValue: 1 value: 3 succ: 5 <test>:1:4
+varDef Int a id: 2 namedValue: 1 value: 3 succ: 5 <test>:1:4
        namedValue a id: 1 attr: 0x0 <test>:1:4
        const id: 3 value: 1 <test>:1:8
-varDef b id: 5 namedValue: 4 value: 6 succ: 9 <test>:2:4
+varDef Int b id: 5 namedValue: 4 value: 6 succ: 9 <test>:2:4
        namedValue b id: 4 attr: 0x0 <test>:2:4
        const id: 6 value: 100 <test>:2:8
 == Body:
-varDef a id: 2 namedValue: 1 value: 3 succ: 5 <test>:1:4
+varDef Int a id: 2 namedValue: 1 value: 3 succ: 5 <test>:1:4
        namedValue a id: 1 attr: 0x0 <test>:1:4
        const id: 3 value: 1 <test>:1:8
-varDef b id: 5 namedValue: 4 value: 6 succ: 9 <test>:2:4
+varDef Int b id: 5 namedValue: 4 value: 6 succ: 9 <test>:2:4
        namedValue b id: 4 attr: 0x0 <test>:2:4
        const id: 6 value: 100 <test>:2:8
 Expr id: 9 expr: 7 succ: 12 <test>:2:13

diff --git a/test/rplmfparser/repeatTest.txt b/test/rplmfparser/repeatTest.txt
index cf15252ded3e7a403960b23e541ae1ee343ec95b..b23a54a474994669f4fc2fa46dfd0e2a066aa4fb 100644 (file)
--- a/test/rplmfparser/repeatTest.txt
+++ b/test/rplmfparser/repeatTest.txt
@@ -4,10 +4,10 @@ a++;
 until a != 2 * 3;
 = <test> (module) parent: $global
 == Variables:
-varDef a id: 2 namedValue: 1 value: 0 succ: 3 <test>:1:4
+varDef Int a id: 2 namedValue: 1 value: 0 succ: 3 <test>:1:4
        namedValue a id: 1 attr: 0x0 <test>:1:4
 == Body:
-varDef a id: 2 namedValue: 1 value: 0 succ: 3 <test>:1:4
+varDef Int a id: 2 namedValue: 1 value: 0 succ: 3 <test>:1:4
        namedValue a id: 1 attr: 0x0 <test>:1:4
 repeat id: 3 condition: 8 body: 6 succ: 0 <test>:1:7
        BinOp id: 8 op: != (33) left: 7 right: 10 <test>:4:8

diff --git a/test/rplmfparser/varDefTest.txt b/test/rplmfparser/varDefTest.txt
new file mode 100644 (file)
index 0000000..2d9cafd
--- /dev/null
+++ b/test/rplmfparser/varDefTest.txt
@@ -0,0 +1,22 @@
+const lazy Str s = 'Hi';
+const List l;
+Int i = 3;
+= <test> (module) parent: $global
+== Variables:
+varDef Str s id: 2 namedValue: 1 value: 3 succ: 5 <test>:1:15
+       namedValue s id: 1 attr: 0x12 <test>:1:15
+       const id: 3 value: 'Hi' <test>:1:19
+varDef List l id: 5 namedValue: 4 value: 0 succ: 7 <test>:2:11
+       namedValue l id: 4 attr: 0x2 <test>:2:11
+varDef Int i id: 7 namedValue: 6 value: 8 succ: 0 <test>:3:4
+       namedValue i id: 6 attr: 0x0 <test>:3:4
+       const id: 8 value: 3 <test>:3:8
+== Body:
+varDef Str s id: 2 namedValue: 1 value: 3 succ: 5 <test>:1:15
+       namedValue s id: 1 attr: 0x12 <test>:1:15
+       const id: 3 value: 'Hi' <test>:1:19
+varDef List l id: 5 namedValue: 4 value: 0 succ: 7 <test>:2:11
+       namedValue l id: 4 attr: 0x2 <test>:2:11
+varDef Int i id: 7 namedValue: 6 value: 8 succ: 0 <test>:3:4
+       namedValue i id: 6 attr: 0x0 <test>:3:4
+       const id: 8 value: 3 <test>:3:8

diff --git a/test/rplmfparser/whileTest.txt b/test/rplmfparser/whileTest.txt
index 64c22dc1925e7c8a4f9528b5555826935eb4a634..981d612596736848f450063a0436dbaba967a3c0 100644 (file)
--- a/test/rplmfparser/whileTest.txt
+++ b/test/rplmfparser/whileTest.txt
@@ -4,11 +4,11 @@ while 3 < 5 do
 od
 = <test> (module) parent: $global
 == Variables:
-varDef a id: 2 namedValue: 1 value: 3 succ: 4 <test>:1:4
+varDef Int a id: 2 namedValue: 1 value: 3 succ: 4 <test>:1:4
        namedValue a id: 1 attr: 0x0 <test>:1:4
        const id: 3 value: 20 <test>:1:8
 == Body:
-varDef a id: 2 namedValue: 1 value: 3 succ: 4 <test>:1:4
+varDef Int a id: 2 namedValue: 1 value: 3 succ: 4 <test>:1:4
        namedValue a id: 1 attr: 0x0 <test>:1:4
        const id: 3 value: 20 <test>:1:8
 while id: 4 condition: 6 body: 11 succ: 0 <test>:1:12

diff --git a/unittests/main.cpp b/unittests/main.cpp
index cda0fae833369f37ce543a92d123edcb04be3eab..f72f9d3efa91758ec7339b8f62f2e911e0620751 100644 (file)
--- a/unittests/main.cpp
+++ b/unittests/main.cpp
@@ -31,7 +31,7 @@ void testExpr(){
     testRplBenchmark();
 
     extern void testRplVM();
-    //testRplVM();
+    testRplVM();
 
     extern void testRplMFParser();
     testRplMFParser();

diff --git a/unittests/rplmfparser_test.cpp b/unittests/rplmfparser_test.cpp
index c2841b850670f1b85c689e5b80c394fed6a26e3b..6ecc5eda4ac34c2c1ae6f60f56285b4fae8acb92 100644 (file)
--- a/unittests/rplmfparser_test.cpp
+++ b/unittests/rplmfparser_test.cpp
@@ -61,11 +61,11 @@ public:
         checkAST("baseTest.txt", __LINE__);
     }
 
-    void defTest(){
-        setSource("Int i = 3; const lazy Str s = 'Hi'; const List l;");
+    void varDefTest(){
+        setSource("const lazy Str s = 'Hi';\nconst List l;\nInt i = 3;");
         RplMFParser parser(m_source, m_tree);
         parser.parse();
-        checkAST("defTest.txt", __LINE__);
+        checkAST("varDefTest.txt", __LINE__);
     }
 
     void ifTest(){
@@ -176,6 +176,10 @@ public:
         checkAST("meth4.txt", __LINE__);
     }
     virtual void doIt(void) {
+        varDefTest();
+        repeatTest();
+        baseTest();
+        whileTest();
         methodTest();
         fieldTest();
         methodCallTest();
@@ -184,11 +188,6 @@ public:
         forCTest();
         listTest();
         opTest();
-        ifTest();
-        whileTest();
-        repeatTest();
-        defTest();
-        baseTest();
     }
 };
 void testRplMFParser() {

diff --git a/unittests/rplsource_test.cpp b/unittests/rplsource_test.cpp
index 23aef3033adec3296429f134ca8a11867c51162f..ecc05fc96c343fd64a6d40df78483a2ca1cc75c2 100644 (file)
--- a/unittests/rplsource_test.cpp
+++ b/unittests/rplsource_test.cpp
@@ -78,6 +78,7 @@ protected:
         reader.addSource("source1", m_content1_1 + m_content1_2);
         reader.addSource("source2", m_content2);
         RplSourceUnit* unit = reader.openSourceUnit("source1");
+        checkNN(unit);
         checkE("source1", unit->name());
         checkE(0, unit->lineNo());
         checkOne(6, reader);