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

v4: Specify generic arguments for ASTAdaptor usage, remove unnecessary casts 

[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9370]
This commit is contained in:
sharwell 2011-11-17 18:43:01 -08:00
parent c4bb346f9a
commit 1581c54ff6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
runtime/Java/src/org/antlr/v4/runtime/tree/ElementList.java
View File

@ -58,7 +58,7 @@ public class ElementList<E> extends ArrayList<E> {
if ( n == 0 ) throw new RewriteEmptyStreamException("n/a");
if ( cursor >= n) { // out of elements?
if ( n == 1 ) { // if size is 1, it's ok; return and we'll dup
return (E)adaptor.dupTree( get(0) );
return adaptor.dupTree( get(0) );
}
// out of elements and size was not 1, so we can't dup
throw new RewriteCardinalityException("size=="+n+" and out of elements");
@ -67,7 +67,7 @@ public class ElementList<E> extends ArrayList<E> {
// we have elements
if ( n == 1 ) {
cursor++; // move cursor even for single element list
return (E)adaptor.dupTree( get(0) );
return adaptor.dupTree( get(0) );
}
// must have more than one in list, pull from elements
E e = get(cursor);
@ -79,7 +79,7 @@ public class ElementList<E> extends ArrayList<E> {
public void remove() { throw new UnsupportedOperationException(); }
}
public ElementList(ASTAdaptor adaptor) {
public ElementList(ASTAdaptor<E> adaptor) {
this.adaptor = adaptor;
}
@ -87,7 +87,7 @@ public class ElementList<E> extends ArrayList<E> {
public E get(int index) {
E o = super.get(index);
if ( used.contains(index) ) {
return (E)adaptor.dupTree( o );
return adaptor.dupTree( o );
}
used.add(index); // any subsequent ref must be dup'd
return o;