mirror_php/json-parser
1
0
Fork 0
mirror of https://github.com/cerbero90/json-parser.git synced 2025-01-17 13:08:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refine callable pointers

Browse Source
This commit is contained in:
Andrea Marco Sartori 2023-01-13 23:57:12 +10:00
parent 6d731cdb51
commit 45ed8e9650
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Parser.php
View File

@ -67,10 +67,11 @@ final class Parser implements IteratorAggregate
continue; continue;
} }
if ($this->state->hasBuffer() && $this->state->inObject()) { if ($this->state->hasBuffer()) {
yield $this->decoder->decode($this->state->key()) => $this->decoder->decode($this->state->value()); $key = $this->decoder->decode($this->state->key());
} elseif ($this->state->hasBuffer() && !$this->state->inObject()) { $value = $this->decoder->decode($this->state->value());
yield $this->decoder->decode($this->state->value());
yield $key => $this->state->callPointer($value, $key);
} }
if ($this->state->canStopParsing()) { if ($this->state->canStopParsing()) {

2
src/Pointers/Pointer.php
View File

@ -100,7 +100,7 @@ final class Pointer implements Stringable
*/ */
public function call(mixed $value, mixed $key): mixed public function call(mixed $value, mixed $key): mixed
{ {
return call_user_func($this->callback, $value, $key); return call_user_func($this->callback, $value, $key) ?? $value;
} }
/** /**

12
src/State.php
View File

@ -124,6 +124,18 @@ final class State
return $this->pointers->wereFound() && !$this->pointer->includesTree($this->tree); return $this->pointers->wereFound() && !$this->pointer->includesTree($this->tree);
} }
/**
* Call the current pointer callback
*
* @param mixed $value
* @param mixed $key
* @return mixed
*/
public function callPointer(mixed $value, mixed $key): mixed
{
return $this->pointer->call($value, $key);
}
/** /**
* Mutate state depending on the given token * Mutate state depending on the given token
* *