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

Jump to bottom

fix: allow ident name start with _ #278

Merged
merged 1 commit into from
Oct 25, 2024
Merged

fix: allow ident name start with _ #278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pilota-build/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pilota-build"
version = "0.11.21"
version = "0.11.22"
edition = "2021"
description = "Compile thrift and protobuf idl into rust code at compile-time."
documentation = "https://docs.rs/pilota-build"
Expand Down
35 changes: 23 additions & 12 deletions pilota-build/src/symbol.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,26 +151,37 @@ pub trait IdentName {

impl IdentName for &str {
fn upper_camel_ident(&self) -> FastStr {
let s = self.to_upper_camel_case();
s.into()
if let Some(index) = self.find(|c: char| c != '_') {
let s = self[index..].to_upper_camel_case();
return format!("{}{}", &self[0..index], s).into();
}
self.to_string().into()
}

fn snake_ident(&self) -> FastStr {
if is_common_initialism(self) {
to_snake_case(self)
} else {
self.to_snake_case()
if let Some(index) = self.find(|c: char| c != '_') {
let s = &self[index..];
let s = if is_common_initialism(s) {
to_snake_case(s)
} else {
s.to_snake_case()
};
return format!("{}{}", &self[0..index], s).into();
}
.into()
self.to_string().into()
}

fn shouty_snake_case(&self) -> FastStr {
if is_common_initialism(self) {
to_snake_case(self).to_uppercase()
} else {
self.to_shouty_snake_case()
if let Some(index) = self.find(|c: char| c != '_') {
let s = &self[index..];
let s = if is_common_initialism(s) {
to_snake_case(s).to_uppercase()
} else {
s.to_shouty_snake_case()
};
return format!("{}{}", &self[0..index], s).into();
}
.into()
self.to_string().into()
}
}

Expand Down
116 changes: 116 additions & 0 deletions pilota-build/test_data/thrift/enum_test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1086,6 +1086,8 @@ pub mod enum_test {
pub Index: Index,

pub index: ::std::option::Option<Index>,

pub _enum: ::std::option::Option<_Enum>,
}
impl ::pilota::thrift::Message for Request {
fn encode<T: ::pilota::thrift::TOutputProtocol>(
Expand All @@ -1101,6 +1103,9 @@ pub mod enum_test {
if let Some(value) = self.index.as_ref() {
__protocol.write_i32_field(2, (value).inner())?;
}
if let Some(value) = self._enum.as_ref() {
__protocol.write_i32_field(3, (value).inner())?;
}
__protocol.write_field_stop()?;
__protocol.write_struct_end()?;
::std::result::Result::Ok(())
Expand All @@ -1114,6 +1119,7 @@ pub mod enum_test {

let mut var_1 = None;
let mut var_2 = None;
let mut var_3 = None;

let mut __pilota_decoding_field_id = None;

Expand All @@ -1135,6 +1141,9 @@ pub mod enum_test {
Some(2) if field_ident.field_type == ::pilota::thrift::TType::I32 => {
var_2 = Some(::pilota::thrift::Message::decode(__protocol)?);
}
Some(3) if field_ident.field_type == ::pilota::thrift::TType::I32 => {
var_3 = Some(::pilota::thrift::Message::decode(__protocol)?);
}
_ => {
__protocol.skip(field_ident.field_type)?;
}
Expand Down Expand Up @@ -1165,6 +1174,7 @@ pub mod enum_test {
let data = Self {
Index: var_1,
index: var_2,
_enum: var_3,
};
::std::result::Result::Ok(data)
}
Expand All @@ -1182,6 +1192,7 @@ pub mod enum_test {
::std::boxed::Box::pin(async move {
let mut var_1 = None;
let mut var_2 = None;
let mut var_3 = None;

let mut __pilota_decoding_field_id = None;

Expand Down Expand Up @@ -1215,6 +1226,16 @@ pub mod enum_test {
.await?,
);
}
Some(3)
if field_ident.field_type == ::pilota::thrift::TType::I32 =>
{
var_3 = Some(
<_Enum as ::pilota::thrift::Message>::decode_async(
__protocol,
)
.await?,
);
}
_ => {
__protocol.skip(field_ident.field_type).await?;
}
Expand Down Expand Up @@ -1248,6 +1269,7 @@ pub mod enum_test {
let data = Self {
Index: var_1,
index: var_2,
_enum: var_3,
};
::std::result::Result::Ok(data)
})
Expand All @@ -1262,10 +1284,104 @@ pub mod enum_test {
+ self.index.as_ref().map_or(0, |value| {
__protocol.i32_field_len(Some(2), (value).inner())
})
+ self._enum.as_ref().map_or(0, |value| {
__protocol.i32_field_len(Some(3), (value).inner())
})
+ __protocol.field_stop_len()
+ __protocol.struct_end_len()
}
}
#[derive(PartialOrd, Hash, Eq, Ord, Debug, ::pilota::derivative::Derivative)]
#[derivative(Default)]
#[derive(Clone, PartialEq, Copy)]
#[repr(transparent)]
pub struct _Enum(i32);

impl _Enum {
pub const _1: Self = Self(1);
pub const _2: Self = Self(2);

pub fn inner(&self) -> i32 {
self.0
}

pub fn to_string(&self) -> ::std::string::String {
match self {
Self(1) => ::std::string::String::from("_1"),
Self(2) => ::std::string::String::from("_2"),
Self(val) => val.to_string(),
}
}
}

impl ::std::convert::From<i32> for _Enum {
fn from(value: i32) -> Self {
Self(value)
}
}

impl ::std::convert::From<_Enum> for i32 {
fn from(value: _Enum) -> i32 {
value.0
}
}

impl ::pilota::thrift::Message for _Enum {
fn encode<T: ::pilota::thrift::TOutputProtocol>(
&self,
__protocol: &mut T,
) -> ::std::result::Result<(), ::pilota::thrift::ThriftException> {
#[allow(unused_imports)]
use ::pilota::thrift::TOutputProtocolExt;
__protocol.write_i32(self.inner())?;
::std::result::Result::Ok(())
}

fn decode<T: ::pilota::thrift::TInputProtocol>(
__protocol: &mut T,
) -> ::std::result::Result<Self, ::pilota::thrift::ThriftException> {
#[allow(unused_imports)]
use ::pilota::{thrift::TLengthProtocolExt, Buf};
let value = __protocol.read_i32()?;
::std::result::Result::Ok(::std::convert::TryFrom::try_from(value).map_err(
|err| {
::pilota::thrift::new_protocol_exception(
::pilota::thrift::ProtocolExceptionKind::InvalidData,
format!("invalid enum value for _Enum, value: {}", value),
)
},
)?)
}

fn decode_async<'a, T: ::pilota::thrift::TAsyncInputProtocol>(
__protocol: &'a mut T,
) -> ::std::pin::Pin<
::std::boxed::Box<
dyn ::std::future::Future<
Output = ::std::result::Result<Self, ::pilota::thrift::ThriftException>,
> + Send
+ 'a,
>,
> {
::std::boxed::Box::pin(async move {
let value = __protocol.read_i32().await?;
::std::result::Result::Ok(::std::convert::TryFrom::try_from(value).map_err(
|err| {
::pilota::thrift::new_protocol_exception(
::pilota::thrift::ProtocolExceptionKind::InvalidData,
format!("invalid enum value for _Enum, value: {}", value),
)
},
)?)
})
}

fn size<T: ::pilota::thrift::TLengthProtocol>(&self, __protocol: &mut T) -> usize {
#[allow(unused_imports)]
use ::pilota::thrift::TLengthProtocolExt;
__protocol.i32_len(self.inner())
}
}
pub trait Test {}
#[derive(PartialOrd, Hash, Eq, Ord, Debug, ::pilota::derivative::Derivative)]
#[derivative(Default)]
Expand Down
6 changes: 6 additions & 0 deletions pilota-build/test_data/thrift/enum_test.thrift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,15 @@ enum Err {
enum Ok {
}

enum _Enum {
_1 = 1,
_2 = 2
}

struct Request {
1: required Index Index,
2: Index index,
3: _Enum _enum,
}
service Test {
Err test_enum(1: Ok req);
Expand Down
2 changes: 1 addition & 1 deletion pilota-thrift-parser/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pilota-thrift-parser"
version = "0.11.1"
version = "0.11.2"
edition = "2021"
description = "Pilota thrift Parser."
documentation = "https://docs.rs/pilota"
Expand Down
14 changes: 5 additions & 9 deletions pilota-thrift-parser/src/parser/identifier.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
use nom::{
bytes::complete::take_while,
character::complete::{char as cchar, satisfy},
combinator::recognize,
sequence::tuple,
IResult,
bytes::complete::take_while, character::complete::satisfy, combinator::recognize,
sequence::tuple, IResult,
};

use super::super::{descriptor::Ident, parser::*};
Expand All @@ -15,8 +12,7 @@ impl Parser for Ident {
fn parse(input: &str) -> IResult<&str, Ident> {
map(
recognize(tuple((
many0(cchar('_')),
satisfy(|c| c.is_ascii_alphabetic()),
satisfy(|c| c.is_ascii_alphabetic() || c == '_'),
take_while(|c: char| c.is_ascii_alphanumeric() || c == '_'),
))),
|ident: &str| -> Ident { Ident(ident.into()) },
Expand All @@ -42,8 +38,8 @@ mod test {

assert_eq!(Ident::parse("_ihciah,").unwrap().1, "_ihciah");
assert_eq!(Ident::parse("ihciah,").unwrap().1, "ihciah");
assert!(Ident::parse("_123").is_err());
assert!(Ident::parse("_").is_err());
assert_eq!(Ident::parse("_123").unwrap().1, "_123");
assert_eq!(Ident::parse("_").unwrap().1, "_");
assert!(Ident::parse("123").is_err());
}

Expand Down
Loading