Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[String_] Add rawValue attribute #831

Merged
merged 6 commits into from May 15, 2022
Merged

[String_] Add rawValue attribute #831

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ff88c44
add raw value to String_ as 3rd arg
TomasVotruba May 9, 2022
deb7d79
add parse raw value string test
TomasVotruba May 9, 2022
2f90510
make use of attributes
TomasVotruba May 12, 2022
8c3d790
add String_::fromString() method by convention
TomasVotruba May 15, 2022
23b4147
move strKind() parser helper method to String_::fromString()
TomasVotruba May 15, 2022
502d182
pass attributes directly
TomasVotruba May 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions grammar/php5.y
View file
Open in desktop
Expand Up @@ -691,7 +691,6 @@ scalar_dereference:
array_expr '[' dim_offset ']' { $$ = Expr\ArrayDimFetch[$1, $3]; }
| T_CONSTANT_ENCAPSED_STRING '[' dim_offset ']'
{ $attrs = attributes();
TomasVotruba marked this conversation as resolved.
Show resolved Hide resolved
$attrs['kind'] = strKind($1);
$$ = Expr\ArrayDimFetch[Scalar\String_::fromString($1, $attrs), $3]; }
| constant '[' dim_offset ']' { $$ = Expr\ArrayDimFetch[$1, $3]; }
| scalar_dereference '[' dim_offset ']' { $$ = Expr\ArrayDimFetch[$1, $3]; }
Expand Down Expand Up @@ -797,7 +796,6 @@ common_scalar:
| T_DNUMBER { $$ = Scalar\DNumber::fromString($1, attributes()); }
| T_CONSTANT_ENCAPSED_STRING
{ $attrs = attributes();
$attrs['kind'] = strKind($1);
$$ = Scalar\String_::fromString($1, $attrs, false); }
| T_LINE { $$ = Scalar\MagicConst\Line[]; }
| T_FILE { $$ = Scalar\MagicConst\File[]; }
Expand Down
1 change: 0 additions & 1 deletion grammar/php7.y
View file
Open in desktop
Expand Up @@ -1016,7 +1016,6 @@ dereferencable_scalar:
| array_short_syntax { $$ = $1; }
| T_CONSTANT_ENCAPSED_STRING
{ $attrs = attributes();
$attrs['kind'] = strKind($1);
$$ = Scalar\String_::fromString($1, $attrs); }
| '"' encaps_list '"'
{ $attrs = attributes(); $attrs['kind'] = Scalar\String_::KIND_DOUBLE_QUOTED;
Expand Down
8 changes: 0 additions & 8 deletions grammar/phpyLang.php
View file
Open in desktop
Expand Up @@ -128,14 +128,6 @@ function($matches) {
. ' else { ' . $args[0] . ' = null; }';
}

if ('strKind' === $name) {
assertArgs(1, $args, $name);

return '(' . $args[0] . '[0] === "\'" || (' . $args[0] . '[1] === "\'" && '
. '(' . $args[0] . '[0] === \'b\' || ' . $args[0] . '[0] === \'B\')) '
. '? Scalar\String_::KIND_SINGLE_QUOTED : Scalar\String_::KIND_DOUBLE_QUOTED)';
}

if ('prependLeadingComments' === $name) {
assertArgs(1, $args, $name);

Expand Down
5 changes: 5 additions & 0 deletions lib/PhpParser/Node/Scalar/String_.php
View file
Open in desktop
Expand Up @@ -47,7 +47,12 @@ public function getSubNodeNames() : array {
*/
public static function fromString(string $str, array $attributes = [], bool $parseUnicodeEscape = true): self
{
$attributes['kind'] = ($str[0] === "'" || ($str[1] === "'" && ($str[0] === 'b' || $str[0] === 'B')))
? Scalar\String_::KIND_SINGLE_QUOTED
: Scalar\String_::KIND_DOUBLE_QUOTED;

$attributes['rawValue'] = $str;

$string = self::parse($str, $parseUnicodeEscape);

return new self($string, $attributes);
Expand Down
2 changes: 0 additions & 2 deletions lib/PhpParser/Parser/Php5.php
View file
Open in desktop
Expand Up @@ -2148,7 +2148,6 @@ protected function initReduceCallbacks() {
},
392 => function ($stackPos) {
$attrs = $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes;
$attrs['kind'] = ($this->semStack[$stackPos-(4-1)][0] === "'" || ($this->semStack[$stackPos-(4-1)][1] === "'" && ($this->semStack[$stackPos-(4-1)][0] === 'b' || $this->semStack[$stackPos-(4-1)][0] === 'B')) ? Scalar\String_::KIND_SINGLE_QUOTED : Scalar\String_::KIND_DOUBLE_QUOTED);
$this->semValue = new Expr\ArrayDimFetch(Scalar\String_::fromString($this->semStack[$stackPos-(4-1)], $attrs), $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
},
393 => function ($stackPos) {
Expand Down Expand Up @@ -2280,7 +2279,6 @@ protected function initReduceCallbacks() {
},
435 => function ($stackPos) {
$attrs = $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes;
$attrs['kind'] = ($this->semStack[$stackPos-(1-1)][0] === "'" || ($this->semStack[$stackPos-(1-1)][1] === "'" && ($this->semStack[$stackPos-(1-1)][0] === 'b' || $this->semStack[$stackPos-(1-1)][0] === 'B')) ? Scalar\String_::KIND_SINGLE_QUOTED : Scalar\String_::KIND_DOUBLE_QUOTED);
$this->semValue = Scalar\String_::fromString($this->semStack[$stackPos-(1-1)], $attrs, false);
},
436 => function ($stackPos) {
Expand Down
1 change: 0 additions & 1 deletion lib/PhpParser/Parser/Php7.php
View file
Open in desktop
Expand Up @@ -2544,7 +2544,6 @@ protected function initReduceCallbacks() {
},
512 => function ($stackPos) {
$attrs = $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes;
$attrs['kind'] = ($this->semStack[$stackPos-(1-1)][0] === "'" || ($this->semStack[$stackPos-(1-1)][1] === "'" && ($this->semStack[$stackPos-(1-1)][0] === 'b' || $this->semStack[$stackPos-(1-1)][0] === 'B')) ? Scalar\String_::KIND_SINGLE_QUOTED : Scalar\String_::KIND_DOUBLE_QUOTED);
$this->semValue = Scalar\String_::fromString($this->semStack[$stackPos-(1-1)], $attrs);
},
513 => function ($stackPos) {
Expand Down