Use identifiers to denote internal macro patterns

hcpl · hcpl · commit 56432718fdf6 · 2018-04-08T08:24:00.000+03:00
I believe this is something fixed by rust-lang/rust#42913 in Rust 1.20, but we still need to support Rust 1.15.
diff --git a/src/macros.rs b/src/macros.rs
@@ -253,20 +253,20 @@ macro_rules! simple_derive {
     (
         $iname:ident impl $path:path { $($rest:tt)* }
     ) => {
-        simple_derive!(@I [$iname, $path] { $($rest)* } [] []);
+        simple_derive!(__I [$iname, $path] { $($rest)* } [] []);
     };
 
     // Adding a filter block
     (
-        @I $opt:tt {
+        __I $opt:tt {
             filter($s:ident) {
                 $($body:tt)*
             }
             $($rest:tt)*
         } [$($done:tt)*] [$($filter:tt)*]
     ) => {
         simple_derive!(
-            @I $opt { $($rest)* } [$($done)*] [
+            __I $opt { $($rest)* } [$($done)*] [
                 $($filter)*
                 [
                     st_name = $s,
@@ -280,15 +280,15 @@ macro_rules! simple_derive {
 
     // &self bound method
     (
-        @I $opt:tt {
+        __I $opt:tt {
             fn $fn_name:ident (&self as $s:ident $($params:tt)*) $(-> $t:ty)* {
                 $($body:tt)*
             }
             $($rest:tt)*
         } [$($done:tt)*] [$($filter:tt)*]
     ) => {
         simple_derive!(
-            @I $opt { $($rest)* } [
+            __I $opt { $($rest)* } [
                 $($done)*
                 [
                     st_name = $s,
@@ -307,15 +307,15 @@ macro_rules! simple_derive {
 
     // &mut self bound method
     (
-        @I $opt:tt {
+        __I $opt:tt {
             fn $fn_name:ident (&mut self as $s:ident $($params:tt)*) $(-> $t:ty)* {
                 $($body:tt)*
             }
             $($rest:tt)*
         } [$($done:tt)*] [$($filter:tt)*]
     ) => {
         simple_derive!(
-            @I $opt { $($rest)* } [
+            __I $opt { $($rest)* } [
                 $($done)*
                 [
                     st_name = $s,
@@ -334,15 +334,15 @@ macro_rules! simple_derive {
 
     // self bound method
     (
-        @I $opt:tt {
+        __I $opt:tt {
             fn $fn_name:ident (self as $s:ident $($params:tt)*) $(-> $t:ty)* {
                 $($body:tt)*
             }
             $($rest:tt)*
         } [$($done:tt)*] [$($filter:tt)*]
     ) => {
         simple_derive!(
-            @I $opt { $($rest)* } [
+            __I $opt { $($rest)* } [
                 $($done)*
                 [
                     st_name = $s,
@@ -363,7 +363,7 @@ macro_rules! simple_derive {
 
     // codegen after data collection
     (
-        @I [$iname:ident, $path:path] {} [$(
+        __I [$iname:ident, $path:path] {} [$(
             [
                 st_name = $st_name:ident,
                 bind_style = $bind_style:ident,

Original file line number	Diff line number	Diff line change
`@@ -253,20 +253,20 @@ macro_rules! simple_derive {`
`253`	`253`	`(`
`254`	`254`	`$iname:ident impl $path:path { $($rest:tt)* }`
`255`	`255`	`) => {`
`256`		`- simple_derive!(@I [$iname, $path] { $($rest)* } [] []);`
	`256`	`+ simple_derive!(__I [$iname, $path] { $($rest)* } [] []);`
`257`	`257`	`};`
`258`	`258`
`259`	`259`	`// Adding a filter block`
`260`	`260`	`(`
`261`		`- @I $opt:tt {`
	`261`	`+ __I $opt:tt {`
`262`	`262`	`filter($s:ident) {`
`263`	`263`	`$($body:tt)*`
`264`	`264`	`}`
`265`	`265`	`$($rest:tt)*`
`266`	`266`	`} [$($done:tt)] [$($filter:tt)]`
`267`	`267`	`) => {`
`268`	`268`	`simple_derive!(`
`269`		`- @I $opt { $($rest)* } [$($done)*] [`
	`269`	`+ __I $opt { $($rest)* } [$($done)*] [`
`270`	`270`	`$($filter)*`
`271`	`271`	`[`
`272`	`272`	`st_name = $s,`
`@@ -280,15 +280,15 @@ macro_rules! simple_derive {`
`280`	`280`
`281`	`281`	`// &self bound method`
`282`	`282`	`(`
`283`		`- @I $opt:tt {`
	`283`	`+ __I $opt:tt {`
`284`	`284`	`fn $fn_name:ident (&self as $s:ident $($params:tt)) $(-> $t:ty) {`
`285`	`285`	`$($body:tt)*`
`286`	`286`	`}`
`287`	`287`	`$($rest:tt)*`
`288`	`288`	`} [$($done:tt)] [$($filter:tt)]`
`289`	`289`	`) => {`
`290`	`290`	`simple_derive!(`
`291`		`- @I $opt { $($rest)* } [`
	`291`	`+ __I $opt { $($rest)* } [`
`292`	`292`	`$($done)*`
`293`	`293`	`[`
`294`	`294`	`st_name = $s,`
`@@ -307,15 +307,15 @@ macro_rules! simple_derive {`
`307`	`307`
`308`	`308`	`// &mut self bound method`
`309`	`309`	`(`
`310`		`- @I $opt:tt {`
	`310`	`+ __I $opt:tt {`
`311`	`311`	`fn $fn_name:ident (&mut self as $s:ident $($params:tt)) $(-> $t:ty) {`
`312`	`312`	`$($body:tt)*`
`313`	`313`	`}`
`314`	`314`	`$($rest:tt)*`
`315`	`315`	`} [$($done:tt)] [$($filter:tt)]`
`316`	`316`	`) => {`
`317`	`317`	`simple_derive!(`
`318`		`- @I $opt { $($rest)* } [`
	`318`	`+ __I $opt { $($rest)* } [`
`319`	`319`	`$($done)*`
`320`	`320`	`[`
`321`	`321`	`st_name = $s,`
`@@ -334,15 +334,15 @@ macro_rules! simple_derive {`
`334`	`334`
`335`	`335`	`// self bound method`
`336`	`336`	`(`
`337`		`- @I $opt:tt {`
	`337`	`+ __I $opt:tt {`
`338`	`338`	`fn $fn_name:ident (self as $s:ident $($params:tt)) $(-> $t:ty) {`
`339`	`339`	`$($body:tt)*`
`340`	`340`	`}`
`341`	`341`	`$($rest:tt)*`
`342`	`342`	`} [$($done:tt)] [$($filter:tt)]`
`343`	`343`	`) => {`
`344`	`344`	`simple_derive!(`
`345`		`- @I $opt { $($rest)* } [`
	`345`	`+ __I $opt { $($rest)* } [`
`346`	`346`	`$($done)*`
`347`	`347`	`[`
`348`	`348`	`st_name = $s,`
`@@ -363,7 +363,7 @@ macro_rules! simple_derive {`
`363`	`363`
`364`	`364`	`// codegen after data collection`
`365`	`365`	`(`
`366`		`- @I [$iname:ident, $path:path] {} [$(`
	`366`	`+ __I [$iname:ident, $path:path] {} [$(`
`367`	`367`	`[`
`368`	`368`	`st_name = $st_name:ident,`
`369`	`369`	`bind_style = $bind_style:ident,`