import edu.berkeley.sbp.Input.Location;
import edu.berkeley.sbp.util.*;
-public abstract class CartesianInput<Tok> implements Input.Stream<Tok> {
+public abstract class CartesianInput<Tok> implements Input<Tok> {
private int line = 1;
private int col = 0;