Compare commits
No commits in common. "52d5320899d303627bc63a3cbe3bd3b28b15f723" and "17981347f4e60aaf90b95ee49facdab2ce1cbbc9" have entirely different histories.
52d5320899
...
17981347f4
@ -1,83 +0,0 @@
|
||||
using System.Collections;
|
||||
|
||||
namespace ParadoxSaveParser.Lib;
|
||||
|
||||
/// <summary>
|
||||
/// Enumerator wrapper that stores <c>N/2</c> items before and <c>N/2-1</c> after <c>Current</c> item.
|
||||
/// </summary>
|
||||
/// <code language="cs">
|
||||
/// IEnumerator<int> Enumerator()
|
||||
/// {
|
||||
/// for(int i = 0; i < 6; i++)
|
||||
/// yield return i;
|
||||
/// }
|
||||
///
|
||||
/// var en = Enumerator();
|
||||
/// var bufen = new BufferedEnumerator<int>(en, 5);
|
||||
///
|
||||
/// while(bufen.MoveNext())
|
||||
/// {
|
||||
/// var cur = bufen.Current;
|
||||
/// for (var prev = cur.List?.First; prev != cur; prev = prev?.Next)
|
||||
/// Console.Write($"{prev?.Value} ");
|
||||
///
|
||||
/// Console.Write($"| {cur.Value} |");
|
||||
///
|
||||
/// for (var next = cur.Next; next != null; next = next.Next)
|
||||
/// Console.Write($" {next.Value}");
|
||||
/// Console.WriteLine();
|
||||
/// }
|
||||
/// </code>
|
||||
/// Output:
|
||||
/// <code>
|
||||
/// | 0 | 1 2 3 4
|
||||
/// 0 | 1 | 2 3 4
|
||||
/// 0 1 | 2 | 3 4
|
||||
/// 1 2 | 3 | 4 5
|
||||
/// 2 3 | 4 | 5
|
||||
/// 3 4 | 5 |
|
||||
/// </code>
|
||||
public class BufferedEnumerator<T> : IEnumerator<LinkedListNode<T>>
|
||||
{
|
||||
private IEnumerator<T> _enumerator;
|
||||
private int _bufferSize;
|
||||
LinkedList<T> _llist = new();
|
||||
private LinkedListNode<T>? _currentNode;
|
||||
private int _currentNodeIndex = -1;
|
||||
|
||||
public BufferedEnumerator(IEnumerator<T> enumerator, int bufferSize)
|
||||
{
|
||||
_enumerator = enumerator;
|
||||
_bufferSize = bufferSize;
|
||||
}
|
||||
|
||||
public bool MoveNext()
|
||||
{
|
||||
if(_currentNodeIndex >= _bufferSize / 2)
|
||||
_llist.RemoveFirst();
|
||||
|
||||
while (_llist.Count < _bufferSize && _enumerator.MoveNext())
|
||||
{
|
||||
_llist.AddLast(_enumerator.Current);
|
||||
}
|
||||
if (_llist.Count == 0)
|
||||
return false;
|
||||
|
||||
_currentNodeIndex++;
|
||||
_currentNode = _currentNode == null ? _llist.First : _currentNode.Next;
|
||||
return _currentNode != null;
|
||||
}
|
||||
|
||||
public void Reset()
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public LinkedListNode<T> Current => _currentNode!;
|
||||
|
||||
object IEnumerator.Current => Current;
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
}
|
||||
}
|
||||
@ -8,11 +8,11 @@ namespace ParadoxSaveParser.Lib;
|
||||
public class Parser
|
||||
{
|
||||
protected Stream _saveFile;
|
||||
private BufferedEnumerator<Token> _tokens;
|
||||
private List<Token> _tokens = new(4_194_304);
|
||||
private int _tokenIndex;
|
||||
|
||||
public Parser(Stream savefile)
|
||||
{
|
||||
_tokens = new BufferedEnumerator<Token>(Lex(), 5);
|
||||
_saveFile = savefile;
|
||||
}
|
||||
|
||||
@ -27,9 +27,9 @@ public class Parser
|
||||
|
||||
protected struct Token
|
||||
{
|
||||
public required TokenType type;
|
||||
public required short column;
|
||||
public required int line;
|
||||
public TokenType type;
|
||||
public short column;
|
||||
public int line;
|
||||
public string? value;
|
||||
|
||||
public override string ToString()
|
||||
@ -60,8 +60,10 @@ public class Parser
|
||||
}
|
||||
}
|
||||
|
||||
protected IEnumerator<Token> Lex()
|
||||
protected void Lex()
|
||||
{
|
||||
_tokens.Clear();
|
||||
|
||||
string expectedHeader = "EU4txt";
|
||||
byte[] headBytes = new byte[expectedHeader.Length];
|
||||
_saveFile.ReadExactly(headBytes);
|
||||
@ -74,31 +76,23 @@ public class Parser
|
||||
int column = 0;
|
||||
bool isQuoteOpen = false;
|
||||
bool isStrInQuotes = false;
|
||||
Token strToken = new()
|
||||
{
|
||||
type = TokenType.Invalid,
|
||||
column = -1,
|
||||
line = -1
|
||||
};
|
||||
|
||||
bool TryCompleteStringToken()
|
||||
void CompleteStringToken()
|
||||
{
|
||||
if (isQuoteOpen)
|
||||
return false;
|
||||
return;
|
||||
// strings in quotes can be empty
|
||||
if (!isStrInQuotes && (str.Length <= 0 || str[0] == '#'))
|
||||
return false;
|
||||
|
||||
strToken = new Token
|
||||
return;
|
||||
_tokens.Add(new Token
|
||||
{
|
||||
type = TokenType.StringOrNumber,
|
||||
column = (short)(column - str.Length),
|
||||
line = line,
|
||||
value = str.ToString()
|
||||
};
|
||||
});
|
||||
str.Clear();
|
||||
isStrInQuotes = false;
|
||||
return true;
|
||||
}
|
||||
|
||||
while (_saveFile.CanRead)
|
||||
@ -108,9 +102,8 @@ public class Parser
|
||||
switch (c)
|
||||
{
|
||||
case -1:
|
||||
if(TryCompleteStringToken())
|
||||
yield return strToken;
|
||||
yield break;
|
||||
CompleteStringToken();
|
||||
return;
|
||||
case '\"':
|
||||
isQuoteOpen = !isQuoteOpen;
|
||||
isStrInQuotes = true;
|
||||
@ -118,41 +111,36 @@ public class Parser
|
||||
case ' ':
|
||||
case '\t':
|
||||
case '\r':
|
||||
if(TryCompleteStringToken())
|
||||
yield return strToken;
|
||||
CompleteStringToken();
|
||||
break;
|
||||
case '\n':
|
||||
if(TryCompleteStringToken())
|
||||
yield return strToken;
|
||||
CompleteStringToken();
|
||||
line++;
|
||||
column = 0;
|
||||
break;
|
||||
case '=':
|
||||
if(TryCompleteStringToken())
|
||||
yield return strToken;
|
||||
yield return new Token
|
||||
CompleteStringToken();
|
||||
_tokens.Add(new Token
|
||||
{
|
||||
type = TokenType.Equals,
|
||||
line = line, column = (short)column
|
||||
};
|
||||
});
|
||||
break;
|
||||
case '{':
|
||||
if(TryCompleteStringToken())
|
||||
yield return strToken;
|
||||
yield return new Token
|
||||
CompleteStringToken();
|
||||
_tokens.Add(new Token
|
||||
{
|
||||
type = TokenType.BracketOpen,
|
||||
line = line, column = (short)column
|
||||
};
|
||||
});
|
||||
break;
|
||||
case '}':
|
||||
if(TryCompleteStringToken())
|
||||
yield return strToken;
|
||||
yield return new Token
|
||||
CompleteStringToken();
|
||||
_tokens.Add(new Token
|
||||
{
|
||||
type = TokenType.BracketClose,
|
||||
line = line, column = (short)column
|
||||
};
|
||||
});
|
||||
break;
|
||||
default:
|
||||
// Skip control characters, which are invisible and causing frontend bugs.
|
||||
@ -166,16 +154,15 @@ public class Parser
|
||||
|
||||
protected class UnexpectedTokenException : Exception
|
||||
{
|
||||
public UnexpectedTokenException(Token token) :
|
||||
base($"Unexpected token: {token}")
|
||||
public UnexpectedTokenException(Token token, int tokenIndex) :
|
||||
base($"Unexpected token at index {tokenIndex}: {token}")
|
||||
{}
|
||||
}
|
||||
|
||||
|
||||
// doesn't move next
|
||||
private object? ParseValue()
|
||||
{
|
||||
Token tok = _tokens.Current.Value;
|
||||
Token tok = _tokens[_tokenIndex++];
|
||||
switch (tok.type)
|
||||
{
|
||||
case TokenType.StringOrNumber:
|
||||
@ -193,29 +180,25 @@ public class Parser
|
||||
case TokenType.BracketClose:
|
||||
return null;
|
||||
default:
|
||||
throw new UnexpectedTokenException(tok);
|
||||
throw new UnexpectedTokenException(tok, _tokenIndex - 1);
|
||||
}
|
||||
}
|
||||
|
||||
// doesn't move next
|
||||
private object ParseListOrDict()
|
||||
{
|
||||
var first = _tokens.Current.Next;
|
||||
var second = _tokens.Current.Next?.Next;
|
||||
if (first?.Value.type == TokenType.StringOrNumber && second?.Value.type == TokenType.Equals)
|
||||
Token first = _tokens[_tokenIndex];
|
||||
Token second = _tokens[_tokenIndex + 1];
|
||||
if (first.type == TokenType.StringOrNumber && second.type == TokenType.Equals)
|
||||
return ParseDict();
|
||||
|
||||
return ParseList();
|
||||
}
|
||||
|
||||
// moves next
|
||||
private List<object> ParseList()
|
||||
{
|
||||
List<object> list = new();
|
||||
while(true)
|
||||
{
|
||||
if(!_tokens.MoveNext())
|
||||
throw new Exception("Unexpected end of file");
|
||||
object? value = ParseValue();
|
||||
if (value == null)
|
||||
break;
|
||||
@ -225,14 +208,13 @@ public class Parser
|
||||
}
|
||||
|
||||
|
||||
// moves next
|
||||
private Dictionary<string, List<object>> ParseDict()
|
||||
{
|
||||
Dictionary<string, List<object>> dict = new();
|
||||
// root is a dict without closing bracket, so this method must check _tokenIndex < _tokens.Count
|
||||
while (_tokens.MoveNext())
|
||||
while (_tokenIndex < _tokens.Count)
|
||||
{
|
||||
Token tok = _tokens.Current.Value;
|
||||
Token tok = _tokens[_tokenIndex++];
|
||||
// end of dictionary
|
||||
if (tok.type == TokenType.BracketClose)
|
||||
break;
|
||||
@ -244,9 +226,9 @@ public class Parser
|
||||
if (tok.type == TokenType.BracketOpen)
|
||||
{
|
||||
int bracketBalance = 1;
|
||||
while (bracketBalance != 0 && _tokens.MoveNext())
|
||||
while (bracketBalance != 0)
|
||||
{
|
||||
tok = _tokens.Current.Value;
|
||||
tok = _tokens[_tokenIndex++];
|
||||
if (tok.type == TokenType.BracketOpen)
|
||||
bracketBalance++;
|
||||
else if (tok.type == TokenType.BracketClose)
|
||||
@ -257,29 +239,24 @@ public class Parser
|
||||
}
|
||||
|
||||
if(tok.type != TokenType.StringOrNumber)
|
||||
throw new UnexpectedTokenException(tok);
|
||||
throw new UnexpectedTokenException(tok, _tokenIndex - 1);
|
||||
|
||||
string key = tok.value!;
|
||||
|
||||
// next token should be `=` or `{`
|
||||
if(!_tokens.MoveNext())
|
||||
throw new UnexpectedTokenException(tok);
|
||||
tok = _tokens.Current.Value;
|
||||
if (tok.type == TokenType.Equals)
|
||||
tok = _tokens[_tokenIndex++];
|
||||
if (tok.type == TokenType.BracketOpen)
|
||||
{
|
||||
// skip `=`
|
||||
if (!_tokens.MoveNext())
|
||||
throw new UnexpectedTokenException(tok);
|
||||
}
|
||||
// Saves may contain object definition without `=`.
|
||||
// Saves may contain key-value definition without `=`.
|
||||
// Example: `map_area_data{` instead of `map_area_data = {`
|
||||
else if (tok.type != TokenType.BracketOpen)
|
||||
throw new UnexpectedTokenException(tok);
|
||||
_tokenIndex--;
|
||||
}
|
||||
else if(tok.type != TokenType.Equals)
|
||||
throw new UnexpectedTokenException(tok, _tokenIndex - 1);
|
||||
|
||||
|
||||
object? value = ParseValue();
|
||||
if (value == null)
|
||||
throw new UnexpectedTokenException(_tokens.Current.Value);
|
||||
|
||||
throw new UnexpectedTokenException(_tokens[_tokenIndex - 1], _tokenIndex - 1);
|
||||
if(!dict.TryGetValue(key, out List<object>? list))
|
||||
{
|
||||
list = new List<object>();
|
||||
@ -293,9 +270,12 @@ public class Parser
|
||||
|
||||
public Dictionary<string, List<object>> Parse()
|
||||
{
|
||||
var root = ParseDict();
|
||||
if (root.Count == 0)
|
||||
Lex();
|
||||
if (_tokens.Count == 0)
|
||||
throw new Exception("Save file is empty");
|
||||
|
||||
_tokenIndex = 0;
|
||||
var root = ParseDict();
|
||||
return root;
|
||||
}
|
||||
}
|
||||
@ -156,6 +156,7 @@ public class Program
|
||||
_app.Logger.Log(LogLevel.Error, "ParseSaveEU4 Error: {errorMesage}", errorMesage);
|
||||
}
|
||||
|
||||
GC.Collect();
|
||||
await httpContext.Response.WriteAsJsonAsync(meta);
|
||||
}
|
||||
}
|
||||
@ -7,7 +7,6 @@ EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionFolder", "SolutionFolder", "{F1D312F1-0620-4E35-8D78-9A2808CDE12C}"
|
||||
ProjectSection(SolutionItems) = preProject
|
||||
.gitignore = .gitignore
|
||||
TODO.txt = TODO.txt
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Global
|
||||
|
||||
Loading…
Reference in New Issue
Block a user