projects
/
sbp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
got new tib tokenizer going
[sbp.git]
/
src
/
edu
/
berkeley
/
sbp
/
Token.java
diff --git
a/src/edu/berkeley/sbp/Token.java
b/src/edu/berkeley/sbp/Token.java
index
196f5ca
..
551ee6d
100644
(file)
--- a/
src/edu/berkeley/sbp/Token.java
+++ b/
src/edu/berkeley/sbp/Token.java
@@
-10,25
+10,19
@@
import edu.berkeley.sbp.*;
/** a token of input -- note that this represents an <i>actual input token</i> rather than an <tt>Element</tt> which <i>matches</i> a token */
public interface Token {
/** a token of input -- note that this represents an <i>actual input token</i> rather than an <tt>Element</tt> which <i>matches</i> a token */
public interface Token {
- // FIXME!!! remove this
- /** converts this <tt>Token</tt> into a standalone result (ie for a non-rewriting pattern) */
- public String result();
-
/** this is declared abstract as a way of forcing subclasses to provide a thoughtful implementation */
public abstract String toString();
/** this is declared abstract as a way of forcing subclasses to provide a thoughtful implementation */
public abstract String toString();
- public abstract Location getLocation();
-
/** a sequence of input tokens; returns null when EOF is reached */
public static interface Stream<T extends Token> {
/** a sequence of input tokens; returns null when EOF is reached */
public static interface Stream<T extends Token> {
- public T next() throws IOException;
+ public T next(int numstates) throws IOException;
+ public abstract Location getLocation();
}
}
- /** a location within the input stream */
+ /** a location *between tokens* in the input stream */
public static interface Location {
public String toString();
public static interface Location {
public String toString();
- public String getContext();
}
}
-
}
}
+