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

rm QStack and use ArrayDeque 

[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9427]
This commit is contained in:
parrt 2011-11-22 14:33:35 -08:00
parent 0d691db980
commit 4b393cf448
2 changed files with 3 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
runtime/Java/src/org/antlr/v4/runtime/Lexer.java
View File

@ -29,8 +29,8 @@
package org.antlr.v4.runtime; package org.antlr.v4.runtime;
import org.antlr.v4.runtime.atn.LexerATNSimulator; import org.antlr.v4.runtime.atn.LexerATNSimulator;
import org.antlr.v4.runtime.misc.QStack;
import java.util.ArrayDeque;
import java.util.EmptyStackException; import java.util.EmptyStackException;
/** A lexer is recognizer that draws input symbols from a character stream. /** A lexer is recognizer that draws input symbols from a character stream.
@ -85,7 +85,7 @@ public abstract class Lexer extends Recognizer<Integer, LexerATNSimulator>
/** The token type for the current token */ /** The token type for the current token */
public int type; public int type;
public QStack<Integer> modeStack; // TODO: List? public ArrayDeque<Integer> modeStack; // TODO: List?
public int mode = Lexer.DEFAULT_MODE; public int mode = Lexer.DEFAULT_MODE;
/** You can set the text for the current token to override what is in /** You can set the text for the current token to override what is in
@ -181,7 +181,7 @@ public abstract class Lexer extends Recognizer<Integer, LexerATNSimulator>
public void pushMode(int m) { public void pushMode(int m) {
if ( LexerATNSimulator.debug ) System.out.println("pushMode "+m); if ( LexerATNSimulator.debug ) System.out.println("pushMode "+m);
if ( modeStack==null ) modeStack = new QStack<Integer>(); if ( modeStack==null ) modeStack = new ArrayDeque<Integer>();
modeStack.push(mode); modeStack.push(mode);
mode(m); mode(m);
} }

78
runtime/Java/src/org/antlr/v4/runtime/misc/QStack.java
View File

@ -1,78 +0,0 @@
/*
[The "BSD license"]
Copyright (c) 2011 Terence Parr
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
3. The name of the author may not be used to endorse or promote products
derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package org.antlr.v4.runtime.misc;
import java.util.EmptyStackException;
/** A quicker stack than Stack */
public class QStack<T> {
T[] elements;
public int sp = -1;
public QStack() {
elements = (T[])new Object[10];
}
public QStack(QStack s) {
elements = (T[])new Object[s.elements.length];
System.arraycopy(s.elements, 0, elements, 0, s.elements.length);
this.sp = s.sp;
}
public void push(T fset) {
if ( (sp+1)>=elements.length ) {
T[] f = (T[])new Object[elements.length*2];
System.arraycopy(elements, 0, f, 0, elements.length);
elements = f;
}
elements[++sp] = fset;
}
public T peek() {
if ( sp<0 ) throw new EmptyStackException();
return elements[sp];
}
public T get(int i) {
if ( i<0 ) throw new IllegalArgumentException("i<0");
if ( i>sp ) throw new IllegalArgumentException("i>"+sp);
return elements[sp];
}
public T pop() {
if ( sp<0 ) throw new EmptyStackException();
T o = elements[sp];
elements[sp] = null; // let gc reclaim that element
sp--;
return o;
}
public void clear() { sp = -1; }
}