mahalex/MParser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Lex string literals with escaped quotes

Browse Source
This commit is contained in:
Alexander Luzgarev 2018-03-31 22:31:29 +02:00
parent 8acea8e90e
commit 65f4ce2786
2 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Lexer.Tests/MLexerShould.cs
View File

@ -215,5 +215,15 @@ namespace Parser.Tests
Assert.AreEqual(TokenKind.StringLiteral, tokens[0].Kind); Assert.AreEqual(TokenKind.StringLiteral, tokens[0].Kind);
Assert.AreEqual("just a string", tokens[0].PureToken.Value); Assert.AreEqual("just a string", tokens[0].PureToken.Value);
} }
[Test]
public void ParseStringLiteralWithEscapedQuotes()
{
var sut = CreateLexer("'just a ''string'''");
var tokens = sut.ParseAll();
Assert.AreEqual(2, tokens.Count);
Assert.AreEqual(TokenKind.StringLiteral, tokens[0].Kind);
Assert.AreEqual("just a 'string'", tokens[0].PureToken.Value);
}
} }
} }

21
Lexer/MLexer.cs
View File

@ -306,11 +306,24 @@ namespace Lexer
private PureToken ContinueParsingStringLiteral() private PureToken ContinueParsingStringLiteral()
{ {
Window.ConsumeChar(); Window.ConsumeChar();
var pieces = new List<string>();
var n = 0; var n = 0;
while (true) { while (true) {
if (Window.PeekChar(n) == '\'') if (Window.PeekChar(n) == '\'')
{ {
break; if (Window.PeekChar(n + 1) == '\'')
{
var piece = Window.GetAndConsumeChars(n);
pieces.Add(piece);
Window.ConsumeChar();
Window.ConsumeChar();
pieces.Add("'");
n = -1;
}
else
{
break;
}
} }
if (IsEolOrEof(Window.PeekChar(n))) if (IsEolOrEof(Window.PeekChar(n)))
{ {
@ -319,9 +332,11 @@ namespace Lexer
n++; n++;
} }
var literal = Window.GetAndConsumeChars(n); var lastPiece = Window.GetAndConsumeChars(n);
pieces.Add(lastPiece);
var total = string.Join("", pieces);
Window.ConsumeChar(); Window.ConsumeChar();
return PureTokenFactory.CreateStringLiteral(literal); return PureTokenFactory.CreateStringLiteral(total);
} }
private PureToken ContinueParsingDoubleQuotedStringLiteral() private PureToken ContinueParsingDoubleQuotedStringLiteral()