Refactor representation of character category in PDT.
This commit is contained in:
@@ -12,23 +12,19 @@ namespace Cryville.Common.Pdt {
|
||||
/// Interpreter for Property Definition Tree (PDT) file format.
|
||||
/// </summary>
|
||||
public partial class PdtInterpreter {
|
||||
/// <summary>
|
||||
/// The character category map.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// <list type="bullet">
|
||||
/// <item><term><c>0x0001</c></term><description>White Space</description></item>
|
||||
/// <item><term><c>0x0010</c></term><description>Identifier</description></item>
|
||||
/// <item><term><c>0x0020</c></term><description>Identifier Begin</description></item>
|
||||
/// <item><term><c>0x0040</c></term><description>Digit</description></item>
|
||||
/// <item><term><c>0x0080</c></term><description>Operator</description></item>
|
||||
/// <item><term><c>0x0100</c></term><description>String</description></item>
|
||||
/// <item><term><c>0x0200</c></term><description>Opening Bracket</description></item>
|
||||
/// <item><term><c>0x0400</c></term><description>Closing Bracket</description></item>
|
||||
/// <item><term><c>0x0800</c></term><description>End of Expression</description></item>
|
||||
/// <item><term><c>0x1000</c></term><description>End of Key</description></item>
|
||||
/// </list>
|
||||
/// </remarks>
|
||||
[Flags]
|
||||
protected enum CharCategory {
|
||||
WhiteSpace = 0x0001,
|
||||
Identifier = 0x0010,
|
||||
IdentifierBegin = 0x0020,
|
||||
Digit = 0x0040,
|
||||
Operator = 0x0080,
|
||||
StringDelimiter = 0x0100,
|
||||
OpeningBracket = 0x0200,
|
||||
ClosingBracket = 0x0400,
|
||||
EndOfExpression = 0x0800,
|
||||
EndOfKey = 0x1000,
|
||||
}
|
||||
static readonly int[] cm = new int[] {
|
||||
// 0 1 2 3 4 5 6 7 8 9 A B C D E F
|
||||
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000,
|
||||
@@ -78,14 +74,14 @@ namespace Cryville.Common.Pdt {
|
||||
/// The category of the character.
|
||||
/// </summary>
|
||||
/// <exception cref="IndexOutOfRangeException">The end of the source string is reached.</exception>
|
||||
protected int ct { get { return cm[cc]; } }
|
||||
protected CharCategory ct { get { return (CharCategory)cm[cc]; } }
|
||||
/// <summary>
|
||||
/// Reads a token until a character of type <paramref name="flag" /> is met.
|
||||
/// </summary>
|
||||
/// <param name="flag">The type filter.</param>
|
||||
/// <returns>A token from the current position (inclusive) to the next character of type <paramref name="flag" /> (exclusive).</returns>
|
||||
/// <exception cref="IndexOutOfRangeException">No character of type <paramref name="flag" /> is met.</exception>
|
||||
protected string tokenb(int flag) {
|
||||
protected string tokenb(CharCategory flag) {
|
||||
int sp = Position;
|
||||
while ((ct & flag) == 0) Position++;
|
||||
return Source.Substring(sp, Position - sp);
|
||||
@@ -96,7 +92,7 @@ namespace Cryville.Common.Pdt {
|
||||
/// <param name="flag">The type filter.</param>
|
||||
/// <returns>A token from the current position (inclusive) to the next character that is not of type <paramref name="flag" /> (exclusive).</returns>
|
||||
/// <exception cref="IndexOutOfRangeException">No character that is not of type <paramref name="flag" /> is met.</exception>
|
||||
protected string tokenw(int flag) {
|
||||
protected string tokenw(CharCategory flag) {
|
||||
int sp = Position;
|
||||
while ((ct & flag) != 0) Position++;
|
||||
return Source.Substring(sp, Position - sp);
|
||||
@@ -106,7 +102,7 @@ namespace Cryville.Common.Pdt {
|
||||
/// </summary>
|
||||
/// <exception cref="IndexOutOfRangeException">The end of the source string is reached.</exception>
|
||||
protected void ws() {
|
||||
while ((ct & 0x0001) != 0) Position++;
|
||||
while ((ct & CharCategory.WhiteSpace) != 0) Position++;
|
||||
}
|
||||
#pragma warning restore IDE1006
|
||||
|
||||
@@ -126,8 +122,8 @@ namespace Cryville.Common.Pdt {
|
||||
/// <returns>An identifier.</returns>
|
||||
/// <exception cref="IndexOutOfRangeException">The end of the source string is reached.</exception>
|
||||
protected string GetIdentifier() {
|
||||
if ((ct & 0x0020) == 0) return "";
|
||||
return tokenw(0x0010);
|
||||
if ((ct & CharCategory.IdentifierBegin) == 0) return "";
|
||||
return tokenw(CharCategory.Identifier);
|
||||
}
|
||||
/// <summary>
|
||||
/// Reads a number.
|
||||
@@ -135,7 +131,7 @@ namespace Cryville.Common.Pdt {
|
||||
/// <returns>A number.</returns>
|
||||
/// <exception cref="IndexOutOfRangeException">The end of the source string is reached.</exception>
|
||||
protected string GetNumber() {
|
||||
return tokenw(0x0040);
|
||||
return tokenw(CharCategory.Digit);
|
||||
}
|
||||
/// <summary>
|
||||
/// Reads a string.
|
||||
@@ -295,7 +291,7 @@ namespace Cryville.Common.Pdt {
|
||||
/// </summary>
|
||||
/// <returns>The interpreted key.</returns>
|
||||
protected virtual object InterpretKey(Type type) {
|
||||
return tokenb(0x1000).Trim();
|
||||
return tokenb(CharCategory.EndOfKey).Trim();
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
|
Reference in New Issue
Block a user