Parsers/source-stream-0.rs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated macros to match new generics and associated types

Browse Source
This commit is contained in:
Andrew Golovashevich 2025-11-18 18:35:03 +03:00
parent 5667c81095
commit 9d3f2816a4
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib.rs
View File

@ -1,7 +1,7 @@
#![allow(non_snake_case)]
mod _keyword_impls;
// mod macros;
mod macros;
pub trait Predicate<C> {
fn check(&mut self, chr: C) -> bool;

6
src/macros/builder_trait_decl.rs
View File

@ -10,7 +10,7 @@ macro_rules! builder_trait_decl {
) => {
$scope trait $name
<
'source, 'pos, 'builder, C, P:Pos<'pos>, CS:CollectedSubstring<'source, C>
'source, 'pos, P:Pos<'pos>, CS:CollectedSubstring<'source>
$(, $generic0Name $(: $generic0Bound)? $(, $genericNName $(: $genericNBound)?)* )?
>
$(: $base0 $(, $baseN)*)?
@ -28,8 +28,8 @@ macro_rules! builder_trait_decl {
) => {
$scope trait $name
<
'source, 'pos, 'builder, $lifetime0Name $(, $lifetimeNName)*,
C, P: Pos<'pos>, CS: CollectedSubstring<'source, C>
'source, 'pos, $lifetime0Name $(, $lifetimeNName)*,
P: Pos<'pos>, CS: CollectedSubstring<'source>
$(, $genericNName $(: $genericNBound)?)*
>
$(: $base0 $(, $baseN)*)?

12
src/macros/builder_type_t.rs
View File

@ -9,7 +9,7 @@ macro_rules! builder_type_t {
) => {
$name
<
'source, 'pos, 'builder, C, P, CS
'source, 'pos, P, CS
$(, $generic0Name $(, $genericNName)*)?
>
@ -23,8 +23,8 @@ macro_rules! builder_type_t {
) => {
$name
<
'source, 'pos, 'builder, $lifetime0Name $(, $lifetimeNName)*,
C, P, CS $(, $genericNName)*
'source, 'pos, $lifetime0Name $(, $lifetimeNName)*,
P, CS $(, $genericNName)*
>
};
@ -37,7 +37,7 @@ macro_rules! builder_type_t {
) => {
impl $name
<
'source, 'pos, 'builder, C, P, CS
'source, 'pos, P, CS
$(, $generic0Name $(, $genericNName)*)?
>
@ -51,8 +51,8 @@ macro_rules! builder_type_t {
) => {
impl $name
<
'source, 'pos, 'builder, $lifetime0Name $(, $lifetimeNName)*,
C, P, CS $(, $genericNName)*
'source, 'pos, $lifetime0Name $(, $lifetimeNName)*,
P, CS $(, $genericNName)*
>
};
}

16
src/macros/parser_fn_decl.rs
View File

@ -12,7 +12,7 @@ macro_rules! parser_fn_decl {
) => {
$scope fn $name
<
'source, 'pos, 'builder, C, P:Pos<'pos>, CS:CollectedSubstring<'source, C>
'source, 'pos, P:Pos<'pos>, CS:CollectedSubstring<'source>
$(, $generic0Name $(: $generic0Bound)? $(, $genericNName $(: $genericNBound)?)* )?
>
($srcName: $srcType $(, $argNName : $argNType)*)
@ -33,8 +33,8 @@ macro_rules! parser_fn_decl {
) => {
$scope fn $name
<
'source, 'pos, 'builder, $lifetime0Name $(, $lifetimeNName)*,
C, P: Pos<'pos>, CS: CollectedSubstring<'source, C>
'source, 'pos, $lifetime0Name $(, $lifetimeNName)*,
P: Pos<'pos>, CS: CollectedSubstring<'source>
$(, $genericNName $(: $genericNBound)?)*
>
($srcName: $srcType $(, $argNName : $argNType)*)
@ -54,10 +54,10 @@ macro_rules! parser_fn_decl {
) => {
$scope fn $name
<
'source, 'pos, 'builder, C, P:Pos<'pos>, CS:CollectedSubstring<'source, C>
'source, 'pos, P:Pos<'pos>, CS:CollectedSubstring<'source>
$(, $generic0Name $(: $generic0Bound)? $(, $genericNName $(: $genericNBound)?)* )?
>
($srcName: &'source mut impl SourceStream<'source, 'pos, C, P, CS> $(, $argNName : $argNType)*)
($srcName: &'source mut impl SourceStream<'source, 'pos, P=P, CS=CS> $(, $argNName : $argNType)*)
$(-> $ret)?
$body
};
@ -75,11 +75,11 @@ macro_rules! parser_fn_decl {
) => {
$scope fn $name
<
'source, 'pos, 'builder, $lifetime0Name $(, $lifetimeNName)*,
C, P: Pos<'pos>, CS: CollectedSubstring<'source, C>
'source, 'pos, $lifetime0Name $(, $lifetimeNName)*,
P: Pos<'pos>, CS: CollectedSubstring<'source>
$(, $genericNName $(: $genericNBound)?)*
>
($srcName: &'source mut impl SourceStream<'source, 'pos, C, P, CS> $(, $argNName : $argNType)*)
($srcName: &'source mut impl SourceStream<'source, 'pos, P=P, CS=CS> $(, $argNName : $argNType)*)
$(-> $ret)?
$body
};