Start with config object types, for git dependencies

1 files changed, 93 insertions, 5 deletions

diff --git a/src/Conf.cpp b/src/Conf.cpp
index e8af27a..93ec6e7 100644
--- a/src/Conf.cpp
+++ b/src/Conf.cpp
@@ -25,6 +25,8 @@ namespace sibs
         IDENTIFIER,
         OPEN_BRACKET,
         CLOSING_BRACKET,
+        OPEN_BRACE,
+        CLOSING_BRACE,
         EQUALS,
         STRING,
         COMMA
@@ -39,6 +41,8 @@ namespace sibs
             case Token::IDENTIFIER:         return "identifier";
             case Token::OPEN_BRACKET:       return "[";
             case Token::CLOSING_BRACKET:    return "]";
+            case Token::OPEN_BRACE:         return "{";
+            case Token::CLOSING_BRACE:      return "}";
             case Token::EQUALS:             return "=";
             case Token::STRING:             return "string";
             case Token::COMMA:              return ",";
@@ -50,7 +54,6 @@ namespace sibs
     {
     public:
         Tokenizer(const char *_code) :
-            currentToken(Token::NONE),
             code((char*)_code)
         {
 
@@ -90,6 +93,16 @@ namespace sibs
                 ++code;
                 return Token::CLOSING_BRACKET;
             }
+            else if(c == '{')
+            {
+                ++code;
+                return Token::OPEN_BRACE;
+            }
+            else if(c == '}')
+            {
+                ++code;
+                return Token::CLOSING_BRACE;
+            }
             else if(c == '=')
             {
                 ++code;
@@ -172,9 +185,7 @@ namespace sibs
             return isAlpha(c) || isDigit(c) || c == '_' || c == '-' || c == '.';
         }
     private:
-        Token currentToken;
         u8string code;
-
         union
         {
             StringView identifier;
@@ -276,6 +287,10 @@ namespace sibs
             {
                 parseConfigFieldRhsList(fieldName);
             }
+            else if(token == Token::OPEN_BRACE)
+            {
+                parseConfigFieldRhsObject(fieldName);
+            }
             else
             {
                 string errMsg = "Expected string on right-hand side of field '";
@@ -288,14 +303,24 @@ namespace sibs
 
         void parseConfigFieldRhsList(const StringView &fieldName)
         {
+            vector<StringView> values;
             Token token = tokenizer.nextToken();
-            if (token == Token::CLOSING_BRACKET) return;
+            if (token == Token::CLOSING_BRACKET)
+            {
+                callback->processField(fieldName, values);
+                return;
+            }
 
-            vector<StringView> values;
             while (true)
             {
                 if (token == Token::STRING)
                     values.push_back(tokenizer.getString());
+                else
+                {
+                    string errMsg = "Expected list to contain string, got: ";
+                    errMsg += getTokenName(token);
+                    throw ParserException(errMsg);
+                }
 
                 token = tokenizer.nextToken();
                 if (token == Token::COMMA)
@@ -317,6 +342,69 @@ namespace sibs
 
             callback->processField(fieldName, values);
         }
+        
+        void parseConfigFieldRhsObject(const StringView &fieldName)
+        {
+            unordered_map<string, StringView> fields;
+            Token token = tokenizer.nextToken();
+            if (token == Token::CLOSING_BRACE)
+            {
+                callback->processField(fieldName, fields);
+                return;
+            }
+
+            while (true)
+            {
+                if (token == Token::IDENTIFIER)
+                {
+                    StringView objectKey = tokenizer.getIdentifier();
+                    token = tokenizer.nextToken();
+                    if(token == Token::EQUALS)
+                    {
+                        token = tokenizer.nextToken();
+                        if (token == Token::STRING)
+                            fields[string(objectKey.data, objectKey.size)] = tokenizer.getString();
+                        else
+                        {
+                            string errMsg = "Expected object field value to be a string, got: ";
+                            errMsg += getTokenName(token);
+                            throw ParserException(errMsg);
+                        }
+                    }
+                    else
+                    {
+                        string errMsg = "Expected object key to be followed by '=', got: ";
+                        errMsg += getTokenName(token);
+                        throw ParserException(errMsg);
+                    }
+                }
+                else
+                {
+                    string errMsg = "Expected object to contain key, got: ";
+                    errMsg += getTokenName(token);
+                    throw ParserException(errMsg);
+                }
+
+                token = tokenizer.nextToken();
+                if (token == Token::COMMA)
+                {
+                    token = tokenizer.nextToken();
+                    continue;
+                }
+                else if (token == Token::CLOSING_BRACE)
+                {
+                    break;
+                }
+                else
+                {
+                    string errMsg = "Expected object field to be followed by '}' or ',', got: ";
+                    errMsg += getTokenName(token);
+                    throw ParserException(errMsg);
+                }
+            }
+
+            callback->processField(fieldName, fields);
+        }
 
         void parseConfigObject()
         {