Add edition to all parse functions of the parser crate

Author: Urhengulas

crates/mbe/src/syntax_bridge.rs

@@ -131,7 +131,7 @@ where
  _ => TokenBuffer::from_subtree(tt),
 };
 let parser_input = to_parser_input(&buffer);
-let parser_output = entry_point.parse(&parser_input);
+let parser_output = entry_point.parse(&parser_input, parser::Edition::Edition2021);
 letmut tree_sink = TtTreeSink::new(buffer.begin());
 for event in parser_output.iter(){
 match event {

crates/mbe/src/tt_iter.rs

@@ -143,7 +143,7 @@ impl<'a, S: Copy + fmt::Debug> TtIter<'a, S> {
 ) -> ExpandResult<Option<tt::TokenTree<S>>>{
 let buffer = tt::buffer::TokenBuffer::from_tokens(self.inner.as_slice());
 let parser_input = to_parser_input(&buffer);
-let tree_traversal = entry_point.parse(&parser_input);
+let tree_traversal = entry_point.parse(&parser_input, parser::Edition::Edition2021);
 letmut cursor = buffer.begin();
 letmut error = false;
 for step in tree_traversal.iter(){

crates/parser/src/lib.rs

@@ -87,7 +87,7 @@ pub enum TopEntryPoint {
 }
 
 implTopEntryPoint{
-pubfnparse(&self,input:&Input) -> Output{
+pubfnparse(&self,input:&Input,edition:Edition) -> Output{
 let _p = tracing::span!(tracing::Level::INFO,"TopEntryPoint::parse", ?self).entered();
 let entry_point:fn(&'_mut parser::Parser<'_>) = matchself{
 TopEntryPoint::SourceFile => grammar::entry::top::source_file,
@@ -99,7 +99,7 @@ impl TopEntryPoint {
 TopEntryPoint::MetaItem => grammar::entry::top::meta_item,
 TopEntryPoint::MacroEagerInput => grammar::entry::top::eager_macro_input,
 };
-letmut p = parser::Parser::new(input,Edition::Edition2021);
+letmut p = parser::Parser::new(input,edition);
 entry_point(&mut p);
 let events = p.finish();
 let res = event::process(events);
@@ -151,7 +151,7 @@ pub enum PrefixEntryPoint {
 }
 
 implPrefixEntryPoint{
-pubfnparse(&self,input:&Input) -> Output{
+pubfnparse(&self,input:&Input,edition:Edition) -> Output{
 let entry_point:fn(&'_mut parser::Parser<'_>) = matchself{
 PrefixEntryPoint::Vis => grammar::entry::prefix::vis,
 PrefixEntryPoint::Block => grammar::entry::prefix::block,
@@ -164,7 +164,7 @@ impl PrefixEntryPoint {
 PrefixEntryPoint::Item => grammar::entry::prefix::item,
 PrefixEntryPoint::MetaItem => grammar::entry::prefix::meta_item,
 };
-letmut p = parser::Parser::new(input,Edition::Edition2021);
+letmut p = parser::Parser::new(input,edition);
 entry_point(&mut p);
 let events = p.finish();
  event::process(events)
@@ -188,9 +188,9 @@ impl Reparser {
 ///
 /// Tokens must start with `{`, end with `}` and form a valid brace
 /// sequence.
-pubfnparse(self,tokens:&Input) -> Output{
+pubfnparse(self,tokens:&Input,edition:Edition) -> Output{
 letReparser(r) = self;
-letmut p = parser::Parser::new(tokens,Edition::Edition2021);
+letmut p = parser::Parser::new(tokens,edition);
 r(&mut p);
 let events = p.finish();
  event::process(events)

crates/parser/src/parser.rs

@@ -40,13 +40,7 @@ static PARSER_STEP_LIMIT: Limit = Limit::new(15_000_000);
 
 impl<'t>Parser<'t>{
 pub(super)fnnew(inp:&'tInput,edition:Edition) -> Parser<'t>{
-Parser{
- inp,
-pos:0,
-events:Vec::new(),
-steps:Cell::new(0),
- edition,
-}
+Parser{ inp,pos:0,events:Vec::new(),steps:Cell::new(0), edition }
 }
 
 pub(crate)fnfinish(self) -> Vec<Event>{

crates/parser/src/tests.rs

@@ -88,7 +88,7 @@ fn parse_inline_err() {
 fnparse(entry:TopEntryPoint,text:&str) -> (String,bool){
 let lexed = LexedStr::new(text);
 let input = lexed.to_input();
-let output = entry.parse(&input);
+let output = entry.parse(&input,crate::Edition::Edition2021);
 
 letmut buf = String::new();
 letmut errors = Vec::new();

crates/parser/src/tests/prefix_entries.rs

@@ -86,7 +86,7 @@ fn check(entry: PrefixEntryPoint, input: &str, prefix: &str) {
 let input = lexed.to_input();
 
 letmut n_tokens = 0;
-for step in entry.parse(&input).iter(){
+for step in entry.parse(&input,crate::Edition::Edition2021).iter(){
 match step {
 Step::Token{ n_input_tokens, .. } => n_tokens += n_input_tokens asusize,
 Step::FloatSplit{ .. } => n_tokens += 1,

crates/syntax/src/lib.rs

@@ -219,7 +219,8 @@ impl ast::TokenTree {
 }
 }
 
-let parser_output = parser::TopEntryPoint::MacroEagerInput.parse(&parser_input);
+let parser_output = parser::TopEntryPoint::MacroEagerInput
+.parse(&parser_input, parser::Edition::Edition2021);
 
 letmut tokens =
 self.syntax().descendants_with_tokens().filter_map(NodeOrToken::into_token);

crates/syntax/src/parsing.rs

@@ -13,7 +13,8 @@ pub(crate) fn parse_text(text: &str) -> (GreenNode, Vec<SyntaxError>) {
 let _p = tracing::span!(tracing::Level::INFO,"parse_text").entered();
 let lexed = parser::LexedStr::new(text);
 let parser_input = lexed.to_input();
-let parser_output = parser::TopEntryPoint::SourceFile.parse(&parser_input);
+let parser_output =
+ parser::TopEntryPoint::SourceFile.parse(&parser_input, parser::Edition::Edition2021);
 let(node, errors, _eof) = build_tree(lexed, parser_output);
 (node, errors)
 }

crates/syntax/src/parsing/reparsing.rs

@@ -94,7 +94,7 @@ fn reparse_block(
 returnNone;
 }
 
-let tree_traversal = reparser.parse(&parser_input);
+let tree_traversal = reparser.parse(&parser_input, parser::Edition::Edition2021);
 
 let(green, new_parser_errors, _eof) = build_tree(lexed, tree_traversal);