jasder
/
antlr
1
0
Fork 1
Code Issues Pull Requests Releases 1 Wiki Activity

Align overlap condition on java implementation

This commit is contained in:
Thomas 2019-05-13 22:38:06 +02:00
parent 6fbc156f6c
commit e7660d6cfa
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
runtime/CSharp/runtime/CSharp/Antlr4.Runtime/TokenStreamRewriter.cs
View File

@ -612,7 +612,6 @@ namespace Antlr4.Runtime
} }
// throw exception unless disjoint or identical // throw exception unless disjoint or identical
bool disjoint = prevRop.lastIndex < rop.index || prevRop.index > rop.lastIndex; bool disjoint = prevRop.lastIndex < rop.index || prevRop.index > rop.lastIndex;
bool same = prevRop.index == rop.index && prevRop.lastIndex == rop.lastIndex;
// Delete special case of replace (text==null): // Delete special case of replace (text==null):
// D.i-j.u D.x-y.v | boundaries overlap combine to max(min)..max(right) // D.i-j.u D.x-y.v | boundaries overlap combine to max(min)..max(right)
if (prevRop.text == null && rop.text == null && !disjoint) if (prevRop.text == null && rop.text == null && !disjoint)
@ -628,7 +627,7 @@ namespace Antlr4.Runtime
} }
else else
{ {
if (!disjoint && !same) if ( !disjoint )
{ {
throw new ArgumentException("replace op boundaries of " + rop + " overlap with previous " + prevRop); throw new ArgumentException("replace op boundaries of " + rop + " overlap with previous " + prevRop);
} }