Updated parse-utils and converted dllexer to an infinite lookahead lexer

diff --git a/deps/parse-utils b/deps/parse-utils
index 79c2158045f26a4a30be6e57652268b39cbf8777..818c00c412d9ef34d211d1282977f180f41293b8 160000 (submodule)
--- a/deps/parse-utils
+++ b/deps/parse-utils
@@ -1 +1 @@
-Subproject commit 79c2158045f26a4a30be6e57652268b39cbf8777
+Subproject commit 818c00c412d9ef34d211d1282977f180f41293b8

diff --git a/source/dllexer/dllexer.cpp b/source/dllexer/dllexer.cpp
index 52587be0ca2890c6248c6f883f42e74f67edb106..71bfe304bb12e851eb1d5af3ae289e237e465802 100644 (file)
--- a/source/dllexer/dllexer.cpp
+++ b/source/dllexer/dllexer.cpp
@@ -20,46 +20,46 @@ SingleCharMatch_T Single_Character_Matches[ NUM_SINGLE_CHAR_MATCHES ] = {
     { '%', MACRO },
 };
 
-DLLexer::DLLexer(std::istream& in) : ILexer(in)
+DLLexer::DLLexer(std::istream& in) : LLNLexer(in)
 {
 }
 
 bool DLLexer::isWhiteSpace(void)
 {
-    return (current == ' ') ||
-           (current == '\t') ||
-           (current == '\r') ||
-           (current == '\n');
+    return (lookahead(1) == ' ') ||
+           (lookahead(1) == '\t') ||
+           (lookahead(1) == '\r') ||
+           (lookahead(1) == '\n');
 }
 
 bool DLLexer::isLetter(void)
 {
-    return  ((current >= 'a') && (current <= 'z')) ||
-            ((current >= 'A') && (current <= 'Z'));
+    return  ((lookahead(1) >= 'a') && (lookahead(1) <= 'z')) ||
+            ((lookahead(1) >= 'A') && (lookahead(1) <= 'Z'));
 }
 
 bool DLLexer::isDigit(void)
 {
-    return ((current >= '0') && (current <= '9'));
+    return ((lookahead(1) >= '0') && (lookahead(1) <= '9'));
 }
 
 bool DLLexer::isOperator(void)
 {
-    return (   (current == '=')
-            || (current == '!')
-            || (current == '<')
-            || (current == '>')
-            || (current == '|')
-            || (current == '&')
-            || (current == ':')
-            || (current == '@'));
+    return (   (lookahead(1) == '=')
+            || (lookahead(1) == '!')
+            || (lookahead(1) == '<')
+            || (lookahead(1) == '>')
+            || (lookahead(1) == '|')
+            || (lookahead(1) == '&')
+            || (lookahead(1) == ':')
+            || (lookahead(1) == '@'));
 }
 
 bool DLLexer::isStringChar(void)
 {
-    return (    (current != '"')
-             && (current != '\r')
-             && (current != '\n'));
+    return (    (lookahead(1) != '"')
+             && (lookahead(1) != '\r')
+             && (lookahead(1) != '\n'));
 }
 
 Token DLLexer::next(void)
@@ -71,7 +71,7 @@ Token DLLexer::next(void)
         {
             WS();
         }
-        else if(current == '#')
+        else if(lookahead(1) == '#')
         {
             COMMENT();
         }
@@ -87,19 +87,19 @@ Token DLLexer::next(void)
         {
             Number(ret,false);
         }
-        else if(current == '\'')
+        else if(lookahead(1) == '\'')
         {
             Char(ret);
         }
-        else if(current == '"')
+        else if(lookahead(1) == '"')
         {
             String(ret);
         }
-        else if(current == '$')
+        else if(lookahead(1) == '$')
         {
             Symbol(ret);
         }
-        else if(current == '-')
+        else if(lookahead(1) == '-')
         {
             consume();
             if(isDigit())
@@ -135,8 +135,8 @@ void DLLexer::COMMENT(void)
     {
         consume();
     }
-    while(   (current != '\n')
-          && (current != EOF));
+    while(   (lookahead(1) != '\n')
+          && (lookahead(1) != EOF));
 
 }
 
@@ -145,10 +145,10 @@ void DLLexer::Id(Token& tok)
     ostringstream oss;
     do
     {
-        oss << current;
+        oss << lookahead(1);
         consume();
     }
-    while(isLetter() || isDigit() || current == '_');
+    while(isLetter() || isDigit() || lookahead(1) == '_');
     tok = Token(ID, oss.str(), line, column);
 }
 
@@ -160,16 +160,16 @@ void DLLexer::Number(Token& tok, bool isNegative)
     oss << FloatingPoint(isNegative);
 
     // Get teh exponent if we have one
-    if ( current == 'e')
+    if ( lookahead(1) == 'e')
     {
         // consume the 'e'
-        oss << current;
+        oss << lookahead(1);
         consume();
 
-        if(current == '-')
+        if(lookahead(1) == '-')
         {
             // Capture the sign
-            oss << current;
+            oss << lookahead(1);
             consume();
         }
 
@@ -178,7 +178,7 @@ void DLLexer::Number(Token& tok, bool isNegative)
             // Capture the integer part
             do
             {
-                oss << current;
+                oss << lookahead(1);
                 consume();
             }
             while(isDigit());
@@ -204,13 +204,13 @@ std::string DLLexer::FloatingPoint(bool isNegative)
     // Capture the integer part
     do
     {
-        oss << current;
+        oss << lookahead(1);
         consume();
     }
     while(isDigit());
 
     // Capture the decimal point if we have one
-    if(current == '.')
+    if(lookahead(1) == '.')
     {
         Decimal(oss);
     }
@@ -220,7 +220,7 @@ std::string DLLexer::FloatingPoint(bool isNegative)
 
 void DLLexer::Decimal(std::ostringstream& oss)
 {
-    oss << current;
+    oss << lookahead(1);
     consume();
 
     if(!isDigit())
@@ -232,7 +232,7 @@ void DLLexer::Decimal(std::ostringstream& oss)
 
     do
     {
-        oss << current;
+        oss << lookahead(1);
         consume();
     }
     while ( isDigit() );
@@ -243,13 +243,13 @@ void DLLexer::Char(Token& tok)
     ostringstream oss;
 
     match('\'');
-    if(current == '\\')
+    if(lookahead(1) == '\\')
     {
         oss << EscapeSequence();
     }
     else
     {
-        oss << current;
+        oss << lookahead(1);
         consume();
     }
     match('\'');
@@ -263,13 +263,13 @@ void DLLexer::String(Token& tok)
     match('"');
     while( isStringChar() )
     {
-        if(current == '\\')
+        if(lookahead(1) == '\\')
         {
             oss << EscapeSequence();
         }
         else
         {
-            oss << current;
+            oss << lookahead(1);
             consume();
         }
     }
@@ -283,10 +283,10 @@ void DLLexer::Symbol(Token& tok)
     match('$');
     do
     {
-        oss << current;
+        oss << lookahead(1);
         consume();
     }
-    while(isLetter() || isDigit() || current == '_');
+    while(isLetter() || isDigit() || lookahead(1) == '_');
     tok = Token( SYMBOL, oss.str(), line, column );
 }
 
@@ -294,7 +294,7 @@ void DLLexer::SingleCharOp(Token& tok)
 {
     for(int i = 0; i < NUM_SINGLE_CHAR_MATCHES; i++)
     {
-        if(current == Single_Character_Matches[i].match)
+        if(lookahead(1) == Single_Character_Matches[i].match)
         {
             consume();
             tok = Token( Single_Character_Matches[i].type, line, column );
@@ -313,13 +313,13 @@ void DLLexer::SingleCharOp(Token& tok)
 void DLLexer::MultiCharOp(Token& tok)
 {
     // save the current token so we can refer back to it
-    char last = current;
+    char last = lookahead(1);
     // remove the current token from the buffer so we cna see the next
     consume();
 
     if(last == '=')
     {
-        if(current == '=')
+        if(lookahead(1) == '=')
         {
             consume();
             tok = Token(EQ, line, column);
@@ -331,7 +331,7 @@ void DLLexer::MultiCharOp(Token& tok)
     }
     else if(last == '!')
     {
-        if(current == '=')
+        if(lookahead(1) == '=')
         {
             consume();
             tok = Token(NE, line, column);
@@ -343,7 +343,7 @@ void DLLexer::MultiCharOp(Token& tok)
     }
     else if(last == '<')
     {
-        if(current == '=')
+        if(lookahead(1) == '=')
         {
             consume();
             tok = Token(LTE, line, column);
@@ -355,7 +355,7 @@ void DLLexer::MultiCharOp(Token& tok)
     }
     else if(last == '>')
     {
-        if(current == '=')
+        if(lookahead(1) == '=')
         {
             consume();
             tok = Token(GTE, line, column);
@@ -367,7 +367,7 @@ void DLLexer::MultiCharOp(Token& tok)
     }
     else if(last == '|')
     {
-        if(current == '|')
+        if(lookahead(1) == '|')
         {
             consume();
             tok = Token(OR, line, column);
@@ -377,14 +377,14 @@ void DLLexer::MultiCharOp(Token& tok)
             tok = Token(PIPE, line, column);
         }
     }
-    else if((last == '&') && (current == '&'))
+    else if((last == '&') && (lookahead(1) == '&'))
     {
         consume();
         tok = Token(AND, line, column);
     }
     else if(last == ':')
     {
-        if(current == '=')
+        if(lookahead(1) == '=')
         {
             consume();
             tok = Token(DEFN, line, column);
@@ -396,7 +396,7 @@ void DLLexer::MultiCharOp(Token& tok)
     }
     else if(last == '@')
     {
-        if(current == '=')
+        if(lookahead(1) == '=')
         {
             consume();
             tok = Token(IMPORT, line, column);
@@ -418,20 +418,20 @@ std::string DLLexer::EscapeSequence()
 {
     ostringstream oss;
 
-    oss << current;
+    oss << lookahead(1);
     consume();
 
-    if ( current == 'x' )
+    if ( lookahead(1) == 'x' )
     {
-        oss << current;
+        oss << lookahead(1);
         consume();
         for(int i = 0; i < 2; i++)
         {
-            if ( ((current >= '0') || (current <= '9')) ||
-                 ((current >= 'a') || (current <= 'f')) ||
-                 ((current >= 'A') || (current <= 'F')))
+            if ( ((lookahead(1) >= '0') || (lookahead(1) <= '9')) ||
+                 ((lookahead(1) >= 'a') || (lookahead(1) <= 'f')) ||
+                 ((lookahead(1) >= 'A') || (lookahead(1) <= 'F')))
             {
-                oss << current;
+                oss << lookahead(1);
                 consume();
             }
             else
@@ -444,7 +444,7 @@ std::string DLLexer::EscapeSequence()
     }
     else
     {
-        oss << current;
+        oss << lookahead(1);
         consume();
     }
     return oss.str();

diff --git a/source/dllexer/dllexer.h b/source/dllexer/dllexer.h
index cc4c99ffe1104fd78ce89790f7462b6ff7a8a4cb..636f36cde1126002f6d01e702b28d255d01061ef 100644 (file)
--- a/source/dllexer/dllexer.h
+++ b/source/dllexer/dllexer.h
@@ -1,7 +1,7 @@
 #ifndef DLLEXER_H
 #define DLLEXER_H
 
-#include "ilexer.h"
+#include "llnlexer.h"
 #include <sstream>
 
 typedef enum TokenTypes
@@ -63,7 +63,7 @@ typedef struct {
     eTokenTypes type;
 } SingleCharMatch_T;
 
-class DLLexer : public ILexer {
+class DLLexer : public LLNLexer {
     public:
         DLLexer(std::istream& in);
         bool isWhiteSpace(void);

diff --git a/source/dlparser/dlparser.cpp b/source/dlparser/dlparser.cpp
index 8d92bc71eb9a44ef70ecadbe1155462620cdfedf..fb35b954e54fe7b4c411749ec2e0b7e8f54f48b6 100644 (file)
--- a/source/dlparser/dlparser.cpp
+++ b/source/dlparser/dlparser.cpp
@@ -221,6 +221,7 @@ AST* DLParser::Expression(void)
     {
         ret = AssignExpr();
     }
+
     return ret;
 }