Add a column property to PKToken.

include/PEGKit/PKToken.h

@@ -216,6 +216,12 @@ typedef NS_ENUM(NSInteger, PKTokenType) {
 */
 @property (nonatomic, readonly) NSUInteger lineNumber;
 
+/*!
+ @property   column
+ @brief      The zero-based position within the line of the start of this token in the original source string.
+ */
+@property (nonatomic, readonly) NSUInteger column;
+
 /*!
     @property   tokenKind
     @brief      The kind of this token.

include/PEGKit/PKTokenizer.h

@@ -175,5 +175,13 @@
 #endif
 
 @property (nonatomic, readonly) NSUInteger lineNumber;
+
+/*!
+ @property   lineStartOffset
+ @brief      The offset within the original string where the current line started.
+ @details    This is set by PKWhitespaceState and used to compute PKToken.column.
+ */
+@property (nonatomic, readonly) NSUInteger lineStartOffset;
+
 @property (nonatomic, assign) id <PKTokenizerDelegate>delegate;
 @end

src/PKToken.m

@@ -82,6 +82,7 @@ - (BOOL)isEqual:(id)obj ignoringCase:(BOOL)ignoringCase;
 
 @property (nonatomic, readwrite) NSUInteger offset;
 @property (nonatomic, readwrite) NSUInteger lineNumber;
+@property (nonatomic, readwrite) NSUInteger column;
 @end
 
 @implementation PKToken
@@ -106,6 +107,7 @@ - (instancetype)initWithTokenType:(PKTokenType)t stringValue:(NSString *)s doubl
         self.doubleValue = n;
         self.offset = NSNotFound;
         self.lineNumber = NSNotFound;
+        self.column = NSNotFound;
 
         self.isNumber = (PKTokenTypeNumber == t);
         self.isQuotedString = (PKTokenTypeQuotedString == t);

src/PKTokenizer.m

@@ -26,6 +26,7 @@
 
 @interface PKToken ()
 @property (nonatomic, readwrite) NSUInteger lineNumber;
+@property (nonatomic, readwrite) NSUInteger column;
 @end
 
 @interface PKTokenizerState ()
@@ -40,6 +41,7 @@ - (NSInteger)tokenKindForStringValue:(NSString *)str;
 @property (nonatomic, retain) PKReader *reader;
 @property (nonatomic, retain) NSMutableArray *tokenizerStates;
 @property (nonatomic, readwrite) NSUInteger lineNumber;
+@property (nonatomic, readwrite) NSUInteger lineStartOffset;
 @end
 
 @implementation PKTokenizer
@@ -182,6 +184,7 @@ - (PKToken *)nextToken {
         if (state) {
             result = [state nextTokenFromReader:_reader startingWith:c tokenizer:self];
             result.lineNumber = _lineNumber;
+            result.column = result.offset - _lineStartOffset;
         } else {
             result = [PKToken EOFToken];
         }
@@ -261,6 +264,7 @@ - (void)setString:(NSString *)s {
     }
     _reader.string = _string;
     self.lineNumber = 1;
+    self.lineStartOffset = 0;
 }
 
 
@@ -271,6 +275,7 @@ - (void)setStream:(NSInputStream *)s {
     }
     _reader.stream = _stream;
     self.lineNumber = 1;
+    self.lineStartOffset = 0;
 }
 
 

src/PKWhitespaceState.m

@@ -35,6 +35,7 @@ @interface PKToken ()
 
 @interface PKTokenizer ()
 @property (nonatomic, readwrite) NSUInteger lineNumber;
+@property (nonatomic, readwrite) NSUInteger lineStartOffset;
 @end
 
 @interface PKTokenizerState ()
@@ -102,6 +103,7 @@ - (PKToken *)nextTokenFromReader:(PKReader *)r startingWith:(PKUniChar)cin token
     while ([self isWhitespaceChar:c]) {
         if ('\n' == c) {
             t.lineNumber++;
+            t.lineStartOffset = r.offset;
         }
         if (_reportsWhitespaceTokens) {
             [self append:c];