Make it possible to parse an empty list (#43)

KSP-RO · Jul 3, 2024 · 3dc1427 · 3dc1427
1 parent 26c7c08
commit 3dc1427
Showing 1 changed file with 33 additions and 19 deletions.
diff --git a/source/ContractConfigurator/ExpressionParser/ExpressionParser.cs b/source/ContractConfigurator/ExpressionParser/ExpressionParser.cs
@@ -530,33 +530,47 @@ public virtual TResult ParseList<TResult>()
             try
             {
                 List<T> values = new List<T>();
-                values.Add(ParseStatement<T>());
 
-                Token token = null;
-                while (token == null)
+                string savedExpression = expression;
+
+                Token token = ParseToken();
+                if (token == null)
                 {
-                    token = ParseToken();
-                    if (token == null)
-                    {
-                        throw new ArgumentException("Expected ',' or ']', got end of statement.");
-                    }
+                    throw new ArgumentException("Unexpected end of statement while parsing list.");
+                }
 
-                    switch (token.tokenType)
+                if (token.tokenType != TokenType.LIST_END)
+                {
+                    expression = savedExpression;
+
+                    values.Add(ParseStatement<T>());
+
+                    token = null;
+                    while (token == null)
                     {
-                        case TokenType.COMMA:
-                            values.Add(ParseStatement<T>());
-                            token = null;
-                            break;
-                        case TokenType.LIST_END:
-                            break;
-                        default:
-                            expression = token.sval + expression;
-                            throw new ArgumentException(StringBuilderCache.Format("Unexpected value: {0}", token.sval));
+                        token = ParseToken();
+                        if (token == null)
+                        {
+                            throw new ArgumentException("Expected ',' or ']', got end of statement.");
+                        }
+
+                        switch (token.tokenType)
+                        {
+                            case TokenType.COMMA:
+                                values.Add(ParseStatement<T>());
+                                token = null;
+                                break;
+                            case TokenType.LIST_END:
+                                break;
+                            default:
+                                expression = token.sval + expression;
+                                throw new ArgumentException(StringBuilderCache.Format("Unexpected value: {0}", token.sval));
+                        }
                     }
                 }
 
                 // See what's next to parse
-                string savedExpression = expression;
+                savedExpression = expression;
                 token = ParseToken();
                 ExpressionParser<List<T>> parser = GetParser<List<T>>(this);
                 if (token == null)