Skip to content

Commit 78c29ca

Browse files
domenicquirldomenicquirl
committed
use full relation names for T! 
1 parent 2fd73a3 commit 78c29ca

File tree

3 files changed

+50
-50
lines changed

3 files changed

+50
-50
lines changed

‎polonius-parser/src/lexer.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,11 @@ impl<'input> Lexer<'input> {
8383
// relation keywords
8484
kw if kw.starts_with("use_of_var_derefs_origin".as_bytes()) => (
8585
"use_of_var_derefs_origin".len() as u32,
86-
T![use of var derefs origin],
86+
T![use_of_var_derefs_origin],
8787
),
8888
kw if kw.starts_with("drop_of_var_derefs_origin".as_bytes()) => (
8989
"drop_of_var_derefs_origin".len() as u32,
90-
T![drop of var derefs origin],
90+
T![drop_of_var_derefs_origin],
9191
),
9292
kw if kw.starts_with("placeholders".as_bytes()) => {
9393
("placeholders".len() as u32, T![placeholders])
@@ -101,26 +101,26 @@ impl<'input> Lexer<'input> {
101101
// effect keywords - facts
102102
kw if kw.starts_with("outlives".as_bytes()) => ("outlives".len() as u32, T![outlives]),
103103
kw if kw.starts_with("loan_issued_at".as_bytes()) => {
104-
("loan_issued_at".len() as u32, T![loan issued at])
104+
("loan_issued_at".len() as u32, T![loan_issued_at])
105105
}
106106
kw if kw.starts_with("loan_invalidated_at".as_bytes()) => {
107-
("loan_invalidated_at".len() as u32, T![loan invalidated at])
107+
("loan_invalidated_at".len() as u32, T![loan_invalidated_at])
108108
}
109109
kw if kw.starts_with("loan_killed_at".as_bytes()) => {
110-
("loan_killed_at".len() as u32, T![loan killed at])
110+
("loan_killed_at".len() as u32, T![loan_killed_at])
111111
}
112112
kw if kw.starts_with("var_used_at".as_bytes()) => {
113-
("var_used_at".len() as u32, T![var used at])
113+
("var_used_at".len() as u32, T![var_used_at])
114114
}
115115
kw if kw.starts_with("var_defined_at".as_bytes()) => {
116-
("var_defined_at".len() as u32, T![var defined at])
116+
("var_defined_at".len() as u32, T![var_defined_at])
117117
}
118118
kw if kw.starts_with("origin_live_on_entry".as_bytes()) => (
119119
"origin_live_on_entry".len() as u32,
120-
T![origin live on entry],
120+
T![origin_live_on_entry],
121121
),
122122
kw if kw.starts_with("var_dropped_at".as_bytes()) => {
123-
("var_dropped_at".len() as u32, T![var dropped at])
123+
("var_dropped_at".len() as u32, T![var_dropped_at])
124124
}
125125
// effect keywords - use
126126
kw if kw.starts_with("use".as_bytes()) => ("use".len() as u32, T![use]),

‎polonius-parser/src/parser.rs

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -134,15 +134,15 @@ where
134134
}
135135

136136
pub fn parse_use_of_var_derefs_origin(&mut self) -> Result<Vec<(String, String)>> {
137-
self.consume(T![use of var derefs origin])?;
137+
self.consume(T![use_of_var_derefs_origin])?;
138138
self.consume(T!['{'])?;
139139
let var_region_mappings = self.parse_var_region_mappings()?;
140140
self.consume(T!['}'])?;
141141
Ok(var_region_mappings)
142142
}
143143

144144
pub fn parse_drop_of_var_derefs_origin(&mut self) -> Result<Vec<(String, String)>> {
145-
self.consume(T![drop of var derefs origin])?;
145+
self.consume(T![drop_of_var_derefs_origin])?;
146146
self.consume(T!['{'])?;
147147
let var_region_mappings = self.parse_var_region_mappings()?;
148148
self.consume(T!['}'])?;
@@ -242,52 +242,52 @@ where
242242
self.consume(T![')'])?;
243243
Ok(Fact::Outlives { a, b })
244244
}
245-
T![loan issued at] => {
246-
self.consume(T![loan issued at])?;
245+
T![loan_issued_at] => {
246+
self.consume(T![loan_issued_at])?;
247247
self.consume(T!['('])?;
248248
let origin = self.parse_parameter(T![origin])?;
249249
self.consume(T![,])?;
250250
let loan = self.parse_parameter(T![loan])?;
251251
self.consume(T![')'])?;
252252
Ok(Fact::LoanIssuedAt { origin, loan })
253253
}
254-
T![loan invalidated at] => {
255-
self.consume(T![loan invalidated at])?;
254+
T![loan_invalidated_at] => {
255+
self.consume(T![loan_invalidated_at])?;
256256
self.consume(T!['('])?;
257257
let loan = self.parse_parameter(T![loan])?;
258258
self.consume(T![')'])?;
259259
Ok(Fact::LoanInvalidatedAt { loan })
260260
}
261-
T![loan killed at] => {
262-
self.consume(T![loan killed at])?;
261+
T![loan_killed_at] => {
262+
self.consume(T![loan_killed_at])?;
263263
self.consume(T!['('])?;
264264
let loan = self.parse_parameter(T![loan])?;
265265
self.consume(T![')'])?;
266266
Ok(Fact::LoanKilledAt { loan })
267267
}
268-
T![var used at] => {
269-
self.consume(T![var used at])?;
268+
T![var_used_at] => {
269+
self.consume(T![var_used_at])?;
270270
self.consume(T!['('])?;
271271
let variable = self.parse_parameter(T![variable])?;
272272
self.consume(T![')'])?;
273273
Ok(Fact::UseVariable { variable })
274274
}
275-
T![var defined at] => {
276-
self.consume(T![var defined at])?;
275+
T![var_defined_at] => {
276+
self.consume(T![var_defined_at])?;
277277
self.consume(T!['('])?;
278278
let variable = self.parse_parameter(T![variable])?;
279279
self.consume(T![')'])?;
280280
Ok(Fact::DefineVariable { variable })
281281
}
282-
T![origin live on entry] => {
283-
self.consume(T![origin live on entry])?;
282+
T![origin_live_on_entry] => {
283+
self.consume(T![origin_live_on_entry])?;
284284
self.consume(T!['('])?;
285285
let origin = self.parse_parameter(T![origin])?;
286286
self.consume(T![')'])?;
287287
Ok(Fact::OriginLiveOnEntry { origin })
288288
}
289-
T![var dropped at] => {
290-
self.consume(T![var dropped at])?;
289+
T![var_dropped_at] => {
290+
self.consume(T![var_dropped_at])?;
291291
self.consume(T!['('])?;
292292
let variable = self.parse_parameter(T![variable])?;
293293
self.consume(T![')'])?;
@@ -297,13 +297,13 @@ where
297297
found,
298298
expected: vec![
299299
T![outlives],
300-
T![loan issued at],
301-
T![loan invalidated at],
302-
T![loan killed at],
303-
T![var used at],
304-
T![var defined at],
305-
T![origin live on entry],
306-
T![var dropped at],
300+
T![loan_issued_at],
301+
T![loan_invalidated_at],
302+
T![loan_killed_at],
303+
T![var_used_at],
304+
T![var_defined_at],
305+
T![origin_live_on_entry],
306+
T![var_dropped_at],
307307
],
308308
position: self.position(),
309309
}),

‎polonius-parser/src/token.rs

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -98,22 +98,22 @@ macro_rules! T {
9898
['{'] => { $crate::token::TokenKind::LCurly};
9999
['}'] => { $crate::token::TokenKind::RCurly};
100100
// relation keywords
101-
[use of var derefs origin] => { $crate::token::TokenKind::KwUseOfVarDerefsOrigin};
102-
[drop of var derefs origin] => { $crate::token::TokenKind::KwDropOfVarDerefsOrigin};
101+
[use_of_var_derefs_origin] => { $crate::token::TokenKind::KwUseOfVarDerefsOrigin};
102+
[drop_of_var_derefs_origin] => { $crate::token::TokenKind::KwDropOfVarDerefsOrigin};
103103
[placeholders] => { $crate::token::TokenKind::KwPlaceholders};
104104
[known subsets] => { $crate::token::TokenKind::KwKnownSubsets};
105105
// CFG keywords
106106
[block] => { $crate::token::TokenKind::KwBlock};
107107
[goto] => { $crate::token::TokenKind::KwGoto};
108108
// effect keywords - facts
109109
[outlives] => { $crate::token::TokenKind::KwOutlives};
110-
[loan issued at] => { $crate::token::TokenKind::KwLoanIssuedAt};
111-
[loan invalidated at] => { $crate::token::TokenKind::KwLoanInvalidatedAt};
112-
[loan killed at] => { $crate::token::TokenKind::KwLoanKilledAt};
113-
[var used at] => { $crate::token::TokenKind::KwVarUsedAt};
114-
[var defined at] => { $crate::token::TokenKind::KwVarDefinedAt};
115-
[origin live on entry] => { $crate::token::TokenKind::KwOriginLiveOnEntry};
116-
[var dropped at] => { $crate::token::TokenKind::KwVarDroppedAt};
110+
[loan_issued_at] => { $crate::token::TokenKind::KwLoanIssuedAt};
111+
[loan_invalidated_at] => { $crate::token::TokenKind::KwLoanInvalidatedAt};
112+
[loan_killed_at] => { $crate::token::TokenKind::KwLoanKilledAt};
113+
[var_used_at] => { $crate::token::TokenKind::KwVarUsedAt};
114+
[var_defined_at] => { $crate::token::TokenKind::KwVarDefinedAt};
115+
[origin_live_on_entry] => { $crate::token::TokenKind::KwOriginLiveOnEntry};
116+
[var_dropped_at] => { $crate::token::TokenKind::KwVarDroppedAt};
117117
// effect keywords - use
118118
[use] => { $crate::token::TokenKind::KwUse};
119119
// parameters
@@ -154,20 +154,20 @@ impl fmt::Display for TokenKind {
154154
T![')'] => write!(f, ")"),
155155
T!['{'] => write!(f, "{{"),
156156
T!['}'] => write!(f, "}}"),
157-
T![use of var derefs origin] => write!(f, "use_of_var_derefs_origin"),
158-
T![drop of var derefs origin] => write!(f, "drop_of_var_derefs_origin"),
157+
T![use_of_var_derefs_origin] => write!(f, "use_of_var_derefs_origin"),
158+
T![drop_of_var_derefs_origin] => write!(f, "drop_of_var_derefs_origin"),
159159
T![placeholders] => write!(f, "placeholders"),
160160
T![known subsets] => write!(f, "known_subsets"),
161161
T![block] => write!(f, "block"),
162162
T![goto] => write!(f, "goto"),
163163
T![outlives] => write!(f, "outlives"),
164-
T![loan issued at] => write!(f, "loan_issued_at"),
165-
T![loan invalidated at] => write!(f, "loan_invalidated_at"),
166-
T![loan killed at] => write!(f, "loan_killed_at"),
167-
T![var used at] => write!(f, "var_used_at"),
168-
T![var defined at] => write!(f, "var_defined_at"),
169-
T![origin live on entry] => write!(f, "origin_live_on_entry"),
170-
T![var dropped at] => write!(f, "var_dropped_at"),
164+
T![loan_issued_at] => write!(f, "loan_issued_at"),
165+
T![loan_invalidated_at] => write!(f, "loan_invalidated_at"),
166+
T![loan_killed_at] => write!(f, "loan_killed_at"),
167+
T![var_used_at] => write!(f, "var_used_at"),
168+
T![var_defined_at] => write!(f, "var_defined_at"),
169+
T![origin_live_on_entry] => write!(f, "origin_live_on_entry"),
170+
T![var_dropped_at] => write!(f, "var_dropped_at"),
171171
T![use] => write!(f, "use"),
172172
T![origin] => write!(f, "Origin"),
173173
T![Block] => write!(f, "Block"),

0 commit comments

Comments
 (0)