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

Merge pull request #718 from petrbel/master 

TokenStreamRewriter indentation fix
This commit is contained in:
Sam Harwell 2014-09-27 10:00:33 -05:00
parent f143495ab2 2883ee2897
commit 61e23a2032
2 changed files with 48 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contributors.txt
View File

@ -58,4 +58,4 @@ YYYY/MM/DD, github id, Full name, email
2014/03/18, aphyr, Kyle Kingsbury, aphyr@aphyr.com 2014/03/18, aphyr, Kyle Kingsbury, aphyr@aphyr.com
2014/06/07, ericvergnaud, Eric Vergnaud, eric.vergnaud@wanadoo.fr 2014/06/07, ericvergnaud, Eric Vergnaud, eric.vergnaud@wanadoo.fr
2014/07/04, jimidle, Jim Idle, jimi@Idle.ws 2014/07/04, jimidle, Jim Idle, jimi@Idle.ws
2014/09/27, petrbel, Petr Bělohlávek, antlr@petrbel.cz

7
runtime/Java/src/org/antlr/v4/runtime/TokenStreamRewriter.java
View File

@ -526,8 +526,7 @@ public class TokenStreamRewriter {
System.out.println("new rop "+rop); System.out.println("new rop "+rop);
} }
else if ( !disjoint && !same ) { else if ( !disjoint && !same ) {
throw new IllegalArgumentException("replace op boundaries of "+rop+ throw new IllegalArgumentException("replace op boundaries of "+rop+" overlap with previous "+prevRop);
" overlap with previous "+prevRop);
} }
} }
} }
@ -558,8 +557,7 @@ public class TokenStreamRewriter {
continue; continue;
} }
if ( iop.index >= rop.index && iop.index <= rop.lastIndex ) { if ( iop.index >= rop.index && iop.index <= rop.lastIndex ) {
throw new IllegalArgumentException("insert op "+iop+ throw new IllegalArgumentException("insert op "+iop+" within boundaries of previous "+rop);
" within boundaries of previous "+rop);
} }
} }
} }
@ -597,5 +595,4 @@ public class TokenStreamRewriter {
} }
return ops; return ops;
} }
} }