VAR/VAR.ExpressionEvaluator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tokenizer: Identifiers inside '[' and ']'

Browse Source
This commit is contained in:
Valeriano A.R.
2019-12-02 15:51:43 +01:00
parent 2dc0ed7ba3
commit 213bb424f7
2 changed files with 43 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
VAR.ExpressionEvaluator.Tests/TokenizerTests.cs
View File

@@ -1,5 +1,5 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;
using System.IO;
using System.IO;
using Microsoft.VisualStudio.TestTools.UnitTesting;
namespace VAR.ExpressionEvaluator.Tests
{
@@ -92,7 +92,7 @@ namespace VAR.ExpressionEvaluator.Tests
[TestMethod()]
public void Tokenizer__Identifiers()
{
var testString = "null true false _$variable1 $variable2";
var testString = "null true false _$variable1 $variable2 [;{}#]";
var t = new Tokenizer(new StringReader(testString));
// "null"
@@ -120,6 +120,11 @@ namespace VAR.ExpressionEvaluator.Tests
Assert.AreEqual(t.Text, "$variable2");
t.NextToken();
// ";{}#"
Assert.AreEqual(t.Token, Token.Identifier);
Assert.AreEqual(t.Text, ";{}#");
t.NextToken();
Assert.AreEqual(t.Token, Token.EOF);
}

35
VAR.ExpressionEvaluator/Tokenizer.cs
View File

@@ -181,6 +181,41 @@ namespace VAR.ExpressionEvaluator
if (_currentChar == '\0') { break; }
}
_text = sb.ToString();
_currentToken = Token.Identifier;
}
else if (_currentChar == '[')
{
char stringEndsWith = ']';
NextChar();
StringBuilder sbString = new StringBuilder();
while (_currentChar != stringEndsWith && _currentChar != '\0')
{
if (_currentChar != '\\')
{
sbString.Append(_currentChar);
}
else
{
NextChar();
if (_currentChar == stringEndsWith)
{
sbString.Append(stringEndsWith);
}
else
{
// FIXME: Other escaped characters
sbString.Append(_currentChar);
}
}
NextChar();
}
NextChar();
_text = sbString.ToString();
_currentToken = Token.Identifier;
}
if (_currentToken == Token.Identifier)
{
string textLowercase = _text.ToLower();
if (textLowercase == "and")
{