diff options
author | Laria Carolin Chabowski <laria@laria.me> | 2020-05-01 17:52:50 +0200 |
---|---|---|
committer | Laria Carolin Chabowski <laria@laria.me> | 2020-05-01 17:55:59 +0200 |
commit | ec389d3441953bbd7cb27f59df61531ba856fb33 (patch) | |
tree | fc642e218ba83860c425464da0c12493e97f40e8 /src | |
parent | 6e86cd0f381de60f77845ea4a7b6cbcc5fda4a47 (diff) | |
download | ste-ec389d3441953bbd7cb27f59df61531ba856fb33.tar.gz ste-ec389d3441953bbd7cb27f59df61531ba856fb33.tar.bz2 ste-ec389d3441953bbd7cb27f59df61531ba856fb33.zip |
Fix parsing `]` as last input char
Previously ] was duplicated in the ouput
Diffstat (limited to 'src')
-rw-r--r-- | src/ste/Parser.php | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/ste/Parser.php b/src/ste/Parser.php index 0280f6d..6e7bf62 100644 --- a/src/ste/Parser.php +++ b/src/ste/Parser.php @@ -43,12 +43,21 @@ class Parser * @param int $n * @return string */ - private function next($n = 1) + private function peek($n = 1) { if ($n <= 0) { throw new \InvalidArgumentException("\$n must be > 0"); } - $c = mb_substr($this->text, $this->off, $n); + return mb_substr($this->text, $this->off, $n); + } + + /** + * @param int $n + * @return string + */ + private function next($n = 1) + { + $c = $this->peek($n); $this->off = min($this->off + $n, $this->len); return $c; } @@ -455,7 +464,9 @@ class Parser $arrayfields = array(); - while ($this->next() == "[") { + while ($this->peek() == "[") { + $this->next(); + $openedat = $this->off - 1; $res = $this->parse_text( self::ESCAPES_DEFAULT, /* Escapes */ @@ -471,7 +482,6 @@ class Parser $arrayfields[] = $res[0]; } - $this->back(); return $arrayfields; } |