Skip to content

Make leading/trailing tokens array immutable #393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dlang-bot merged 1 commit into from
Apr 29, 2020
Merged

Make leading/trailing tokens array immutable #393

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 23 additions & 5 deletions src/dparse/lexer.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,9 @@ mixin template TokenTriviaFields()
*
* Contains: `comment`, `whitespace`, `specialTokenSequence`
*/
const(typeof(this))[] leadingTrivia;
immutable(typeof(this))[] leadingTrivia;
/// ditto
const(typeof(this))[] trailingTrivia;
immutable(typeof(this))[] trailingTrivia;

string memoizedLeadingComment = null;
string memoizedTrailingComment = null;
Expand Down Expand Up @@ -494,8 +494,8 @@ if (is(Unqual!(ElementEncodingType!R) : ubyte) && isDynamicArray!R)
lexer.popFront();

if (!output.data.empty && !trailingTriviaAppender.data.empty)
(cast() output.data[$ - 1].trailingTrivia) = trailingTriviaAppender.data.dup;
t.leadingTrivia = leadingTriviaAppender.data.dup;
(cast() output.data[$ - 1].trailingTrivia) = trailingTriviaAppender.data.idup;
t.leadingTrivia = leadingTriviaAppender.data.idup;
leadingTriviaAppender.clear();
trailingTriviaAppender.clear();

Expand All @@ -506,7 +506,7 @@ if (is(Unqual!(ElementEncodingType!R) : ubyte) && isDynamicArray!R)
if (!output.data.empty)
{
trailingTriviaAppender.put(leadingTriviaAppender.data);
(cast() output.data[$ - 1].trailingTrivia) = trailingTriviaAppender.data.dup;
(cast() output.data[$ - 1].trailingTrivia) = trailingTriviaAppender.data.idup;
}

return output.data;
Expand Down Expand Up @@ -2327,3 +2327,21 @@ void main() {
test(17, tok!";", "", "");
test(18, tok!"}", "", "");
}

// dlang-community/D-Scanner#805
unittest
{
final class SomeExpr
{
Token tok;
}

auto e1 = new SomeExpr();
const e2 = new SomeExpr();
immutable e3 = new immutable SomeExpr();

immutable t1 = e1.tok;
immutable t2 = e2.tok;
immutable t3 = e3.tok;
}