MensBeam
/
Lit
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Fixed injections, still trouble with php close tag 

• Before injections would inject themselves onto the rule stack which was incorrect. Now they inject into the current rule list.
main
Dustin Wilson 3 years ago
parent
e2aa1fa1ed
commit
3ba9fdb68b
2 changed files with 18 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      composer.lock
  2. 38
      lib/Tokenizer.php

4
composer.lock
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "4adc23361d14315afd30b4dd2846557e", "content-hash": "a1e7abc5ea4187862ef68f682eabf335",
"packages": [ "packages": [
{ {
"name": "mensbeam/html", "name": "mensbeam/html",
@ -252,5 +252,5 @@
"ext-json": "*" "ext-json": "*"
}, },
"platform-dev": [], "platform-dev": [],
"plugin-api-version": "2.0.0" "plugin-api-version": "2.1.0"
} }

38
lib/Tokenizer.php
View File

@ -23,7 +23,7 @@ class Tokenizer {
protected Data $data; protected Data $data;
protected Grammar $grammar; protected Grammar $grammar;
protected int $offset = 0; protected int $offset = 0;
protected ?Pattern $activeInjection = null; protected bool $activeInjection = false;
protected string $line = ''; protected string $line = '';
protected int $lineNumber = 1; protected int $lineNumber = 1;
// Cache of rule lists which have had references spliced to keep from having to // Cache of rule lists which have had references spliced to keep from having to
@ -105,20 +105,6 @@ class Tokenizer {
$injected = false; $injected = false;
while (true) { while (true) {
/*if ($this->activeInjection === null && $this->grammar->injections !== null) {
foreach ($this->grammar->injections as $selector => $injection) {
$selector = ScopeParser::parseSelector($selector);
if ($selector->matches($this->scopeStack)) {
$prefix = $selector->getPrefix($this->scopeStack);
if ($prefix === Filter::PREFIX_LEFT || $prefix === Filter::PREFIX_BOTH) {
$this->ruleStack[] = $injection;
$this->activeInjection = $injection;
break;
}
}
}
}*/
// Grab the current rule list from the cache if available to prevent having to // Grab the current rule list from the cache if available to prevent having to
// splice in references repeatedly. // splice in references repeatedly.
$cacheIndex = array_search(end($this->ruleStack)->patterns, $this->ruleCacheIndexes); $cacheIndex = array_search(end($this->ruleStack)->patterns, $this->ruleCacheIndexes);
@ -127,7 +113,7 @@ class Tokenizer {
} else { } else {
$currentRules = end($this->ruleStack)->patterns; $currentRules = end($this->ruleStack)->patterns;
if ($this->grammar->injections !== null) { if (!$this->activeInjection && $this->grammar->injections !== null) {
foreach ($this->grammar->injections as $selector => $injection) { foreach ($this->grammar->injections as $selector => $injection) {
$selector = ScopeParser::parseSelector($selector); $selector = ScopeParser::parseSelector($selector);
if ($selector->matches($this->scopeStack)) { if ($selector->matches($this->scopeStack)) {
@ -138,7 +124,7 @@ class Tokenizer {
break; break;
} }
} }
if ($prefix === Filter::PREFIX_RIGHT || $prefix === Filter::PREFIX_BOTH) { if ($prefix === null || $prefix === Filter::PREFIX_RIGHT || $prefix === Filter::PREFIX_BOTH) {
$currentRules = [ ...$currentRules, ...$injection->patterns ]; $currentRules = [ ...$currentRules, ...$injection->patterns ];
} }
@ -226,6 +212,8 @@ class Tokenizer {
} }
if ($injected) { if ($injected) {
// Injections need to be re-evaluated against the scope stack every time they're
// injected so don't cache them.
$temp = $currentRules; $temp = $currentRules;
foreach ($temp as $k => $r) { foreach ($temp as $k => $r) {
if ($r instanceof Pattern && $r->injection) { if ($r instanceof Pattern && $r->injection) {
@ -301,6 +289,9 @@ class Tokenizer {
} }
$this->ruleStack[] = $pattern->captures[$k]; $this->ruleStack[] = $pattern->captures[$k];
// Don't do injections on capture lists.
$activeInjection = $this->activeInjection;
$this->activeInjection = true;
// Only tokenize the part of the line that's contains the match. // Only tokenize the part of the line that's contains the match.
$captureEndOffset = $m[1] + strlen($m[0]); $captureEndOffset = $m[1] + strlen($m[0]);
$tokens = [ ...$tokens, ...$this->tokenizeLine($captureEndOffset) ]; $tokens = [ ...$tokens, ...$this->tokenizeLine($captureEndOffset) ];
@ -316,6 +307,8 @@ class Tokenizer {
} }
array_pop($this->ruleStack); array_pop($this->ruleStack);
// Return to the original active injection state.
$this->activeInjection = $activeInjection;
$this->offset = $m[1] + strlen($m[0]); $this->offset = $m[1] + strlen($m[0]);
} }
// Otherwise, create a token for the capture. // Otherwise, create a token for the capture.
@ -416,6 +409,7 @@ class Tokenizer {
} }
$this->ruleStack[] = $pattern; $this->ruleStack[] = $pattern;
$this->activeInjection = ($pattern->injection);
// If the rule has patterns process tokens from its subpatterns. // If the rule has patterns process tokens from its subpatterns.
if ($pattern->patterns !== null && $this->offset < $stopOffset) { if ($pattern->patterns !== null && $this->offset < $stopOffset) {
@ -449,8 +443,8 @@ class Tokenizer {
} }
// If what was just popped is the active injection then remove it, too. // If what was just popped is the active injection then remove it, too.
if ($popped === $this->activeInjection) { if ($popped->injection) {
$this->activeInjection = null; $this->activeInjection = false;
} }
} }
} }
@ -467,9 +461,9 @@ class Tokenizer {
} }
// If what was just popped is the active injection then remove it, too. // If what was just popped is the active injection then remove it, too.
/*if ($popped === $this->activeInjection) { if ($popped->injection) {
$this->activeInjection = null; $this->activeInjection = false;
}*/ }
} }
// If the offset isn't at the end of the line then look for more matches. // If the offset isn't at the end of the line then look for more matches.

Write Preview
Loading…
Cancel
Save