1 files changed, 29 insertions, 11 deletions

diff --git a/src/cuchaz/enigma/analysis/JavaSourceFromString.java b/src/cuchaz/enigma/analysis/Token.java
index cf5c4c2..74023e3 100644
--- a/src/cuchaz/enigma/analysis/JavaSourceFromString.java
+++ b/src/cuchaz/enigma/analysis/Token.java
@@ -10,22 +10,40 @@
  ******************************************************************************/
 package cuchaz.enigma.analysis;
 
-import java.net.URI;
-
-import javax.tools.SimpleJavaFileObject;
-
-public class JavaSourceFromString extends SimpleJavaFileObject
+public class Token implements Comparable<Token>
 {
-        private final String m_source;
+        public int start;
+        public int end;
+        
+        public Token( int start, int end )
+        {
+                this.start = start;
+                this.end = end;
+        }
+        
+        public boolean contains( int pos )
+        {
+                return pos >= start && pos <= end;
+        }
+
+        @Override
+        public int compareTo( Token other )
+        {
+                return start - other.start;
+        }
         
-        JavaSourceFromString( String name, String source )
+        @Override
+        public boolean equals( Object other )
         {
-                super( URI.create( "string:///" + name.replace( '.', '/' ) + Kind.SOURCE.extension ), Kind.SOURCE );
-                m_source = source;
+                if( other instanceof Token )
+                {
+                        return equals( (Token)other );
+                }
+                return false;
         }
         
-        public CharSequence getCharContent( boolean ignoreEncodingErrors )
+        public boolean equals( Token other )
         {
-                return m_source;
+                return start == other.start && end == other.end;
         }
 }