Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement primitive typenames #194

Merged
merged 2 commits into from
Jul 31, 2023
Merged

Implement primitive typenames #194

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6aac344
Implement primitive typenames
jrandolf-2 Jul 31, 2023
848884e
use BTreeSet instead of HashSet
anweiss Jul 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
250 changes: 153 additions & 97 deletions src/parser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,13 @@ use displaydoc::Display;
#[cfg(feature = "std")]
use codespan_reporting::term::termcolor::{ColorChoice, StandardStream};
#[cfg(feature = "std")]
use std::borrow::Cow;
use std::{borrow::Cow, collections::BTreeSet};

#[cfg(not(feature = "std"))]
use alloc::{
borrow::{Cow, ToOwned},
boxed::Box,
collections::BTreeSet,
string::{String, ToString},
vec::Vec,
};
Expand Down Expand Up @@ -56,6 +57,7 @@ pub struct Parser<'a> {
#[cfg(not(feature = "ast-span"))]
visited_rule_idents: Vec<&'a str>,
current_rule_generic_param_idents: Option<Vec<&'a str>>,
typenames: BTreeSet<&'a str>,
}

/// Parsing error types
Expand Down Expand Up @@ -120,6 +122,48 @@ impl<'a> Parser<'a> {
parser_position: Position::default(),
visited_rule_idents: Vec::default(),
current_rule_generic_param_idents: None,
typenames: BTreeSet::from([
"any",
"uint",
"nint",
"int",
"bstr",
"bytes",
"tstr",
"text",
"tdate",
"time",
"number",
"biguint",
"bignint",
"bigint",
"integer",
"unsigned",
"decfrac",
"bigfloat",
"eb64url",
"eb64legacy",
"eb16",
"encoded-cbor",
"uri",
"b64url",
"b64legacy",
"regexp",
"mime-message",
"cbor-any",
"float16",
"float32",
"float64",
"float16-32",
"float32-64",
"float",
"false",
"true",
"bool",
"nil",
"null",
"undefined",
]),
};

p.next_token()?;
Expand Down Expand Up @@ -658,6 +702,7 @@ impl<'a> Parser<'a> {
self.advance_newline()?;

self.current_rule_generic_param_idents = None;
self.typenames.insert(ident.ident);

Ok(Rule::Type {
rule: TypeRule {
Expand Down Expand Up @@ -766,6 +811,7 @@ impl<'a> Parser<'a> {
}

self.current_rule_generic_param_idents = None;
self.typenames.insert(ident.ident);

return Ok(Rule::Type {
rule: TypeRule {
Expand Down Expand Up @@ -809,6 +855,7 @@ impl<'a> Parser<'a> {
}

self.current_rule_generic_param_idents = None;
self.typenames.insert(ident.ident);

return Ok(Rule::Type {
rule: TypeRule {
Expand Down Expand Up @@ -900,6 +947,7 @@ impl<'a> Parser<'a> {
);

self.current_rule_generic_param_idents = None;
self.typenames.insert(ident.ident);

Ok(Rule::Type {
rule: TypeRule {
Expand Down Expand Up @@ -2170,61 +2218,65 @@ impl<'a> Parser<'a> {

#[cfg(feature = "ast-span")]
if let Some((name, generic_args, _)) = entry_type.groupname_entry() {
if name.socket.is_none()
&& token::lookup_ident(name.ident)
.in_standard_prelude()
.is_none()
{
if let Some(params) = &self.current_rule_generic_param_idents {
if !params.iter().any(|&p| p == name.ident) {
if !self.typenames.contains(name.ident) {
if name.socket.is_none()
&& token::lookup_ident(name.ident)
.in_standard_prelude()
.is_none()
{
if let Some(params) = &self.current_rule_generic_param_idents {
if !params.iter().any(|&p| p == name.ident) {
self.visited_rule_idents.push((name.ident, name.span));
}
} else {
self.visited_rule_idents.push((name.ident, name.span));
}
} else {
self.visited_rule_idents.push((name.ident, name.span));
}
}

return Ok(GroupEntry::TypeGroupname {
ge: TypeGroupnameEntry {
occur,
name,
generic_args,
},
#[cfg(feature = "ast-comments")]
leading_comments: comments_before_type_or_group,
#[cfg(feature = "ast-comments")]
trailing_comments,
span,
});
return Ok(GroupEntry::TypeGroupname {
ge: TypeGroupnameEntry {
occur,
name,
generic_args,
},
#[cfg(feature = "ast-comments")]
leading_comments: comments_before_type_or_group,
#[cfg(feature = "ast-comments")]
trailing_comments,
span,
});
}
}

#[cfg(not(feature = "ast-span"))]
if let Some((name, generic_args)) = entry_type.groupname_entry() {
if name.socket.is_none()
&& token::lookup_ident(name.ident)
.in_standard_prelude()
.is_none()
{
if let Some(params) = &self.current_rule_generic_param_idents {
if !params.iter().any(|&p| p == name.ident) {
if !self.typenames.contains(name.ident) {
if name.socket.is_none()
&& token::lookup_ident(name.ident)
.in_standard_prelude()
.is_none()
{
if let Some(params) = &self.current_rule_generic_param_idents {
if !params.iter().any(|&p| p == name.ident) {
self.visited_rule_idents.push(name.ident);
}
} else {
self.visited_rule_idents.push(name.ident);
}
} else {
self.visited_rule_idents.push(name.ident);
}
}

return Ok(GroupEntry::TypeGroupname {
ge: TypeGroupnameEntry {
occur,
name,
generic_args,
},
#[cfg(feature = "ast-comments")]
leading_comments: comments_before_type_or_group,
#[cfg(feature = "ast-comments")]
trailing_comments,
});
return Ok(GroupEntry::TypeGroupname {
ge: TypeGroupnameEntry {
occur,
name,
generic_args,
},
#[cfg(feature = "ast-comments")]
leading_comments: comments_before_type_or_group,
#[cfg(feature = "ast-comments")]
trailing_comments,
});
}
}

// A parse tree that returns a type instead of a member key needs to
Expand Down Expand Up @@ -2406,77 +2458,81 @@ impl<'a> Parser<'a> {

#[cfg(feature = "ast-span")]
if let Some((name, generic_args, _)) = entry_type.groupname_entry() {
if generic_args.is_some() && self.peek_token_is(&Token::LANGLEBRACKET) {
while !self.peek_token_is(&Token::RANGLEBRACKET) {
if !self.typenames.contains(name.ident) {
if generic_args.is_some() && self.peek_token_is(&Token::LANGLEBRACKET) {
while !self.peek_token_is(&Token::RANGLEBRACKET) {
self.next_token()?;
}

self.next_token()?;
}

self.next_token()?;
}

if name.socket.is_none()
&& token::lookup_ident(name.ident)
.in_standard_prelude()
.is_none()
{
if let Some(params) = &self.current_rule_generic_param_idents {
if !params.iter().any(|&p| p == name.ident) {
if name.socket.is_none()
&& token::lookup_ident(name.ident)
.in_standard_prelude()
.is_none()
{
if let Some(params) = &self.current_rule_generic_param_idents {
if !params.iter().any(|&p| p == name.ident) {
self.visited_rule_idents.push((name.ident, name.span));
}
} else {
self.visited_rule_idents.push((name.ident, name.span));
}
} else {
self.visited_rule_idents.push((name.ident, name.span));
}
}

return Ok(GroupEntry::TypeGroupname {
ge: TypeGroupnameEntry {
occur,
name,
generic_args,
},
#[cfg(feature = "ast-comments")]
leading_comments: None,
#[cfg(feature = "ast-comments")]
trailing_comments,
span,
});
return Ok(GroupEntry::TypeGroupname {
ge: TypeGroupnameEntry {
occur,
name,
generic_args,
},
#[cfg(feature = "ast-comments")]
leading_comments: None,
#[cfg(feature = "ast-comments")]
trailing_comments,
span,
});
}
}

#[cfg(not(feature = "ast-span"))]
if let Some((name, generic_args)) = entry_type.groupname_entry() {
if generic_args.is_some() && self.peek_token_is(&Token::LANGLEBRACKET) {
while !self.peek_token_is(&Token::RANGLEBRACKET) {
if !self.typenames.contains(name.ident) {
if generic_args.is_some() && self.peek_token_is(&Token::LANGLEBRACKET) {
while !self.peek_token_is(&Token::RANGLEBRACKET) {
self.next_token()?;
}

self.next_token()?;
}

self.next_token()?;
}

if name.socket.is_none()
&& token::lookup_ident(name.ident)
.in_standard_prelude()
.is_none()
{
if let Some(params) = &self.current_rule_generic_param_idents {
if !params.iter().any(|&p| p == name.ident) {
if name.socket.is_none()
&& token::lookup_ident(name.ident)
.in_standard_prelude()
.is_none()
{
if let Some(params) = &self.current_rule_generic_param_idents {
if !params.iter().any(|&p| p == name.ident) {
self.visited_rule_idents.push(name.ident);
}
} else {
self.visited_rule_idents.push(name.ident);
}
} else {
self.visited_rule_idents.push(name.ident);
}
}

return Ok(GroupEntry::TypeGroupname {
ge: TypeGroupnameEntry {
occur,
name,
generic_args,
},
#[cfg(feature = "ast-comments")]
leading_comments: None,
#[cfg(feature = "ast-comments")]
trailing_comments,
});
return Ok(GroupEntry::TypeGroupname {
ge: TypeGroupnameEntry {
occur,
name,
generic_args,
},
#[cfg(feature = "ast-comments")]
leading_comments: None,
#[cfg(feature = "ast-comments")]
trailing_comments,
});
}
}

#[cfg(feature = "ast-span")]
Expand Down