Modify read!s

Author: qryxip

examples/abc054-c.rs

@@ -7,17 +7,17 @@ use std::io::{self, Read};
 fn main() {
     let mut input = read_to_static(io::stdin()).split_whitespace();
     macro_rules! read {
-        (_1based) => {
-            read!(usize) - 1
-        };
         ([$tt:tt]) => (read!([$tt; read!(usize)]));
         ([$tt:tt; $n:expr]) => ((0..$n).map(|_| read!($tt)).collect::<Vec<_>>());
         (($($tt:tt),+)) => (($(read!($tt)),*));
         ($ty:ty) => (input.next().unwrap().parse::<$ty>().unwrap());
+        ({ Usize1 }) => {
+            read!(usize) - 1
+        };
     }
 
     let n = read!(usize);
-    let abs = read!([(_1based, _1based)]);
+    let abs = read!([({ Usize1 }, { Usize1 })]);
 
     let graph = UnMatrix::<(), (), Option<()>, usize>::from_edges(abs);
     let mut ans = 0;

examples/abc118-b-naive.rs

@@ -6,17 +6,17 @@ use std::ops::{BitAnd, BitOr};
 fn main() {
     let mut input = read_to_static(io::stdin()).split_whitespace();
     macro_rules! read {
-        (_1based) => {
-            read!(usize) - 1
-        };
         ([$tt:tt]) => (read!([$tt; read!(usize)]));
         ([$tt:tt; $n:expr]) => ((0..$n).map(|_| read!($tt)).collect::<Vec<_>>());
         (($($tt:tt),+)) => (($(read!($tt)),*));
         ($ty:ty) => (input.next().unwrap().parse::<$ty>().unwrap());
+        ({ Usize1 }) => {
+            read!(usize) - 1
+        };
     }
 
     let (n, _) = read!((usize, usize));
-    let a = read!([[_1based]; n]);
+    let a = read!([[{ Usize1 }]; n]);
 
     let ans = a
         .into_iter()

examples/abc120-d.rs

@@ -7,17 +7,17 @@ use std::io::{self, BufWriter, Read, StdoutLock, Write as _};
 fn main() {
     let mut input = read_to_static(io::stdin()).split_whitespace();
     macro_rules! read {
-        (_1based) => {
-            read!(usize) - 1
-        };
         ([$tt:tt]) => (read!([$tt; read!(usize)]));
         ([$tt:tt; $n:expr]) => ((0..$n).map(|_| read!($tt)).collect::<Vec<_>>());
         (($($tt:tt),+)) => (($(read!($tt)),*));
         ($ty:ty) => (input.next().unwrap().parse::<$ty>().unwrap());
+        ({ Usize1 }) => {
+            read!(usize) - 1
+        };
     }
 
     let n = read!(usize);
-    let abs = read!([(_1based, _1based)]);
+    let abs = read!([({ Usize1 }, { Usize1 })]);
 
     let max = n * (n - 1) / 2;
     let mut uf = QuickFindUf::<UnionBySize>::new(n);

examples/abc151-d.rs

@@ -10,7 +10,11 @@ use std::iter;
 fn main() {
     let mut input = read_to_static(io::stdin()).split_whitespace();
     macro_rules! read {
-        (_maze<$c:literal, ($h:expr, $w:expr)>) => {
+        ([$tt:tt]) => (read!([$tt; read!(usize)]));
+        ([$tt:tt; $n:expr]) => ((0..$n).map(|_| read!($tt)).collect::<Vec<_>>());
+        (($($tt:tt),+)) => (($(read!($tt)),*));
+        ($ty:ty) => (input.next().unwrap().parse::<$ty>().unwrap());
+        ({ Maze<$c:literal, ($h:expr, $w:expr)> }) => {
             Array::from_shape_vec(
                 ($h, $w),
                 (0..$h)
@@ -21,14 +25,10 @@ fn main() {
             )
             .unwrap()
         };
-        ([$tt:tt]) => (read!([$tt; read!(usize)]));
-        ([$tt:tt; $n:expr]) => ((0..$n).map(|_| read!($tt)).collect::<Vec<_>>());
-        (($($tt:tt),+)) => (($(read!($tt)),*));
-        ($ty:ty) => (input.next().unwrap().parse::<$ty>().unwrap());
     }
 
     let (h, w) = read!((usize, usize));
-    let maze = read!(_maze<b'.', (h, w)>);
+    let maze = read!({ Maze<b'.', (h, w)> });
 
     let neighbors = Array::from_shape_fn((h, w), |(i, j)| -> SmallVec<[_; 4]> {
         let mut neighbors = smallvec![];

examples/arc065-c.rs

@@ -8,16 +8,16 @@ use std::io::{self, Read};
 fn main() {
     let mut input = read_to_static(io::stdin()).split_whitespace();
     macro_rules! read {
-        (_bytes) => {
-            read!(String).into_bytes()
-        };
         ([$tt:tt]) => (read!([$tt; read!(usize)]));
         ([$tt:tt; $n:expr]) => ((0..$n).map(|_| read!($tt)).collect::<Vec<_>>());
         (($($tt:tt),+)) => (($(read!($tt)),*));
         ($ty:ty) => (input.next().unwrap().parse::<$ty>().unwrap());
+        ({ Bytes }) => {
+            read!(String).into_bytes()
+        };
     }
 
-    let s = read!(_bytes);
+    let s = read!({ Bytes });
 
     lazy_static! {
         static ref R: Regex = Regex::new(r"\A(dream(er)?|eraser?)*\z").unwrap();