danog/parser
1
0
Fork 0
mirror of https://github.com/danog/parser.git synced 2024-11-26 20:04:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: fix parsing by_ref parameters (#179)

Browse Source 
Signed-off-by: azjezz <azjezz@protonmail.com>
This commit is contained in:
Saif Eddin Gmati 2022-12-08 18:07:03 +01:00 committed by GitHub
parent 8af0c1e3a1
commit 4d0cd75fa9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 33251 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/parser/internal/data_type.rs
View File

@ -25,7 +25,10 @@ pub fn data_type(state: &mut State) -> ParseResult<Type> {
}
if state.current.kind == TokenKind::Ampersand
&& !matches!(state.peek.kind, TokenKind::Variable(_))
&& !matches!(
state.peek.kind,
TokenKind::Variable(_) | TokenKind::Ellipsis | TokenKind::Ampersand
)
{
return instersection(state, ty, false);
}
@ -52,7 +55,10 @@ pub fn optional_data_type(state: &mut State) -> ParseResult<Option<Type>> {
}
if state.current.kind == TokenKind::Ampersand
&& !matches!(state.peek.kind, TokenKind::Variable(_))
&& !matches!(
state.peek.kind,
TokenKind::Variable(_) | TokenKind::Ellipsis | TokenKind::Ampersand
)
{
return instersection(state, ty, false).map(Some);
}
@ -328,7 +334,10 @@ fn instersection(state: &mut State, other: Type, within_dnf: bool) -> ParseResul
types.push(ty);
if state.current.kind == TokenKind::Ampersand
&& !matches!(state.peek.kind, TokenKind::Variable(_))
&& !matches!(
state.peek.kind,
TokenKind::Variable(_) | TokenKind::Ellipsis | TokenKind::Ampersand
)
{
state.next();
} else {

1
src/parser/internal/parameters.rs
View File

@ -41,7 +41,6 @@ pub fn function_parameter_list(state: &mut State) -> Result<FunctionParameterLis
if state.current.kind == TokenKind::Ellipsis {
state.next();
variadic = true;
}

16222
tests/fixtures/0275/ast.txt vendored Normal file
View File

File diff suppressed because it is too large Load Diff

104
tests/fixtures/0275/code.php vendored Normal file
View File

@ -0,0 +1,104 @@
<?php
static fn (Foo &...$s): Bar => Bar::from($s);
static fn (Foo ...$s): Bar => Bar::from($s);
static fn (Foo &$s): Bar => Bar::from($s);
static fn (Foo $s): Bar => Bar::from($s);
static function (Foo &...$s): Bar { return Bar::from($s); };
static function (Foo ...$s): Bar { return Bar::from($s); };
static function (Foo &$s): Bar { return Bar::from($s); };
static function (Foo $s): Bar { return Bar::from($s); };
static fn (Foo&Bar&Baz &...$s): Bar => Bar::from($s);
static fn (Foo&Bar&Baz ...$s): Bar => Bar::from($s);
static fn (Foo&Bar&Baz &$s): Bar => Bar::from($s);
static fn (Foo&Bar&Baz $s): Bar => Bar::from($s);
static function (Foo&Bar&Baz &...$s): Bar { return Bar::from($s); };
static function (Foo&Bar&Baz ...$s): Bar { return Bar::from($s); };
static function (Foo&Bar&Baz &$s): Bar { return Bar::from($s); };
static function (Foo&Bar&Baz $s): Bar { return Bar::from($s); };
static fn (Foo|Bar|Baz &...$s): Bar => Bar::from($s);
static fn (Foo|Bar|Baz ...$s): Bar => Bar::from($s);
static fn (Foo|Bar|Baz &$s): Bar => Bar::from($s);
static fn (Foo|Bar|Baz $s): Bar => Bar::from($s);
static function (Foo|Bar|Baz &...$s): Bar { return Bar::from($s); };
static function (Foo|Bar|Baz ...$s): Bar { return Bar::from($s); };
static function (Foo|Bar|Baz &$s): Bar { return Bar::from($s); };
static function (Foo|Bar|Baz $s): Bar { return Bar::from($s); };
static fn (Foo|(Bar&Baz) &...$s): Bar => Bar::from($s);
static fn (Foo|(Bar&Baz) ...$s): Bar => Bar::from($s);
static fn (Foo|(Bar&Baz) &$s): Bar => Bar::from($s);
static fn (Foo|(Bar&Baz) $s): Bar => Bar::from($s);
static function (Foo|(Bar&Baz) &...$s): Bar { return Bar::from($s); };
static function (Foo|(Bar&Baz) ...$s): Bar { return Bar::from($s); };
static function (Foo|(Bar&Baz) &$s): Bar { return Bar::from($s); };
static function (Foo|(Bar&Baz) $s): Bar { return Bar::from($s); };
static fn (Foo&(Bar|Baz) &...$s): Bar => Bar::from($s);
static fn (Foo&(Bar|Baz) ...$s): Bar => Bar::from($s);
static fn (Foo&(Bar|Baz) &$s): Bar => Bar::from($s);
static fn (Foo&(Bar|Baz) $s): Bar => Bar::from($s);
static function (Foo&(Bar|Baz) &...$s): Bar { return Bar::from($s); };
static function (Foo&(Bar|Baz) ...$s): Bar { return Bar::from($s); };
static function (Foo&(Bar|Baz) &$s): Bar { return Bar::from($s); };
static function (Foo&(Bar|Baz) $s): Bar { return Bar::from($s); };
fn (Foo &...$s): Bar => Bar::from($s);
fn (Foo ...$s): Bar => Bar::from($s);
fn (Foo &$s): Bar => Bar::from($s);
fn (Foo $s): Bar => Bar::from($s);
function (Foo &...$s): Bar { return Bar::from($s); };
function (Foo ...$s): Bar { return Bar::from($s); };
function (Foo &$s): Bar { return Bar::from($s); };
function (Foo $s): Bar { return Bar::from($s); };
fn (Foo&Bar&Baz &...$s): Bar => Bar::from($s);
fn (Foo&Bar&Baz ...$s): Bar => Bar::from($s);
fn (Foo&Bar&Baz &$s): Bar => Bar::from($s);
fn (Foo&Bar&Baz $s): Bar => Bar::from($s);
function (Foo&Bar&Baz &...$s): Bar { return Bar::from($s); };
function (Foo&Bar&Baz ...$s): Bar { return Bar::from($s); };
function (Foo&Bar&Baz &$s): Bar { return Bar::from($s); };
function (Foo&Bar&Baz $s): Bar { return Bar::from($s); };
fn (Foo|Bar|Baz &...$s): Bar => Bar::from($s);
fn (Foo|Bar|Baz ...$s): Bar => Bar::from($s);
fn (Foo|Bar|Baz &$s): Bar => Bar::from($s);
fn (Foo|Bar|Baz $s): Bar => Bar::from($s);
function (Foo|Bar|Baz &...$s): Bar { return Bar::from($s); };
function (Foo|Bar|Baz ...$s): Bar { return Bar::from($s); };
function (Foo|Bar|Baz &$s): Bar { return Bar::from($s); };
function (Foo|Bar|Baz $s): Bar { return Bar::from($s); };
fn (Foo|(Bar&Baz) &...$s): Bar => Bar::from($s);
fn (Foo|(Bar&Baz) ...$s): Bar => Bar::from($s);
fn (Foo|(Bar&Baz) &$s): Bar => Bar::from($s);
fn (Foo|(Bar&Baz) $s): Bar => Bar::from($s);
function (Foo|(Bar&Baz) &...$s): Bar { return Bar::from($s); };
function (Foo|(Bar&Baz) ...$s): Bar { return Bar::from($s); };
function (Foo|(Bar&Baz) &$s): Bar { return Bar::from($s); };
function (Foo|(Bar&Baz) $s): Bar { return Bar::from($s); };
fn (Foo&(Bar|Baz) &...$s): Bar => Bar::from($s);
fn (Foo&(Bar|Baz) ...$s): Bar => Bar::from($s);
fn (Foo&(Bar|Baz) &$s): Bar => Bar::from($s);
fn (Foo&(Bar|Baz) $s): Bar => Bar::from($s);
function (Foo&(Bar|Baz) &...$s): Bar { return Bar::from($s); };
function (Foo&(Bar|Baz) ...$s): Bar { return Bar::from($s); };
function (Foo&(Bar|Baz) &$s): Bar { return Bar::from($s); };
function (Foo&(Bar|Baz) $s): Bar { return Bar::from($s); };
function foo(Foo &...$s): Bar { return Bar::from($s); }
function foo(Foo ...$s): Bar { return Bar::from($s); }
function foo(Foo &$s): Bar { return Bar::from($s); }
function foo(Foo $s): Bar { return Bar::from($s); }
function foo(Foo&Bar&Baz &...$s): Bar { return Bar::from($s); }
function foo(Foo&Bar&Baz ...$s): Bar { return Bar::from($s); }
function foo(Foo&Bar&Baz &$s): Bar { return Bar::from($s); }
function foo(Foo&Bar&Baz $s): Bar { return Bar::from($s); }
function foo(Foo|Bar|Baz &...$s): Bar { return Bar::from($s); }
function foo(Foo|Bar|Baz ...$s): Bar { return Bar::from($s); }
function foo(Foo|Bar|Baz &$s): Bar { return Bar::from($s); }
function foo(Foo|Bar|Baz $s): Bar { return Bar::from($s); }
function foo(Foo|(Bar&Baz) &...$s): Bar { return Bar::from($s); }
function foo(Foo|(Bar&Baz) ...$s): Bar { return Bar::from($s); }
function foo(Foo|(Bar&Baz) &$s): Bar { return Bar::from($s); }
function foo(Foo|(Bar&Baz) $s): Bar { return Bar::from($s); }
function foo(Foo&(Bar|Baz) &...$s): Bar { return Bar::from($s); }
function foo(Foo&(Bar|Baz) ...$s): Bar { return Bar::from($s); }
function foo(Foo&(Bar|Baz) &$s): Bar { return Bar::from($s); }
function foo(Foo&(Bar|Baz) $s): Bar { return Bar::from($s); }

16911
tests/fixtures/0275/tokens.txt vendored Normal file
View File

File diff suppressed because it is too large Load Diff

4
tests/third_party_tests.rs
View File

@ -80,8 +80,8 @@ fn third_party_6_spiral_framework() {
&["src", "tests"],
&[
// file contains syntax error used for testing.
"/src/Core/tests/Fixtures/CorruptedClass.php",
"/src/Tokenizer/tests/Classes/BrokenClass.php",
"src/Core/tests/Fixtures/CorruptedClass.php",
"src/Tokenizer/tests/Classes/BrokenClass.php",
],
);
}