diff --git a/reference/parle/examples.xml b/reference/parle/examples.xml index 190d93da85..299d414c3b 100644 --- a/reference/parle/examples.xml +++ b/reference/parle/examples.xml @@ -39,7 +39,7 @@ do { $tok = $lex->getToken(); if (Token::UNKNOWN == $tok->id) { - throw new LexerException("Unknown token '{$tok->value}' at offset {$tok->offset}."); + throw new LexerException("Unknown token '{$tok->value}' at offset {$lex->marker}."); } echo "TOKEN: ", $token_rev[$tok->id], PHP_EOL; diff --git a/reference/parle/parle.errorinfo.xml b/reference/parle/parle.errorinfo.xml index ef1b8105d8..8e378f6791 100644 --- a/reference/parle/parle.errorinfo.xml +++ b/reference/parle/parle.errorinfo.xml @@ -37,6 +37,11 @@ integer id + + public + integer + position + public mixed @@ -63,6 +68,12 @@ Error id. + + position + + Position in the input, where the error occurred. + + token diff --git a/reference/parle/parle.lexer.xml b/reference/parle/parle.lexer.xml index 1362ed6ddd..83962fcd94 100644 --- a/reference/parle/parle.lexer.xml +++ b/reference/parle/parle.lexer.xml @@ -82,6 +82,18 @@ state 0 + + public + integer + marker + 0 + + + public + integer + cursor + 0 + &Methods; @@ -156,6 +168,18 @@ Current lexer state, readonly. + + marker + + Position of the latest token match, readonly. + + + + cursor + + Current input offset, readonly. + + diff --git a/reference/parle/parle.token.xml b/reference/parle/parle.token.xml index f1444862f0..7427c9636d 100644 --- a/reference/parle/parle.token.xml +++ b/reference/parle/parle.token.xml @@ -62,11 +62,6 @@ string value - - public - integer - offset - &Methods; @@ -94,12 +89,6 @@ Token value. - - offset - - Token offset in the input. - -