Skip to content

Commit

Permalink
refactor: rename arguments to modifiers
Browse files Browse the repository at this point in the history
  • Loading branch information
sunng87 committed Oct 20, 2022
1 parent 5aa13eb commit 46ff407
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
6 changes: 3 additions & 3 deletions src/ast/data_type.rs
Original file line number Diff line number Diff line change
Expand Up @@ -217,11 +217,11 @@ impl fmt::Display for DataType {
DataType::String => write!(f, "STRING"),
DataType::Bytea => write!(f, "BYTEA"),
DataType::Array(ty) => write!(f, "{}[]", ty),
DataType::Custom(ty, args) => {
if args.is_empty() {
DataType::Custom(ty, modifiers) => {
if modifiers.is_empty() {
write!(f, "{}", ty)
} else {
write!(f, "{}({})", ty, args.join(", "))
write!(f, "{}({})", ty, modifiers.join(", "))
}
}
DataType::Enum(vals) => {
Expand Down
18 changes: 9 additions & 9 deletions src/parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3624,8 +3624,8 @@ impl<'a> Parser<'a> {
_ => {
self.prev_token();
let type_name = self.parse_object_name()?;
if let Some(arguments) = self.parse_optional_type_arguments()? {
Ok(DataType::Custom(type_name, arguments))
if let Some(modifiers) = self.parse_optional_type_modifiers()? {
Ok(DataType::Custom(type_name, modifiers))
} else {
Ok(DataType::Custom(type_name, vec![]))
}
Expand Down Expand Up @@ -3874,26 +3874,26 @@ impl<'a> Parser<'a> {
}
}

pub fn parse_optional_type_arguments(&mut self) -> Result<Option<Vec<String>>, ParserError> {
pub fn parse_optional_type_modifiers(&mut self) -> Result<Option<Vec<String>>, ParserError> {
if self.consume_token(&Token::LParen) {
let mut args = Vec::new();
let mut modifiers = Vec::new();
loop {
match self.next_token() {
Token::Word(w) => args.push(w.to_string()),
Token::Number(n, _) => args.push(n),
Token::SingleQuotedString(s) => args.push(s),
Token::Word(w) => modifiers.push(w.to_string()),
Token::Number(n, _) => modifiers.push(n),
Token::SingleQuotedString(s) => modifiers.push(s),

Token::Comma => {
continue;
}
Token::RParen => {
break;
}
unexpected => self.expected("type argument", unexpected)?,
unexpected => self.expected("type modifiers", unexpected)?,
}
}

Ok(Some(args))
Ok(Some(modifiers))
} else {
Ok(None)
}
Expand Down

0 comments on commit 46ff407

Please sign in to comment.