lune-org/lune
1
1
Fork 0
mirror of https://github.com/lune-org/lune.git synced 2024-12-12 13:00:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Properly handle function generics in typedefs parser

Browse source
This commit is contained in:
Filip Tibell 2023-02-22 11:04:31 +01:00
parent 7b1b77fbba
commit 09db6d5d8a
No known key found for this signature in database
1 changed files with 28 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
packages/cli/src/gen/definitions/parser.rs
View file

@ -141,28 +141,43 @@ where
.collect()) .collect())
} }
fn simple_stringify_type_info(typ: &TypeInfo) -> String { fn simple_stringify_type_info(typ: &TypeInfo, parent_typ: Option<&TypeInfo>) -> String {
match typ { match typ {
TypeInfo::Array { type_info, .. } => { TypeInfo::Array { type_info, .. } => {
format!("{{ {} }}", simple_stringify_type_info(type_info)) format!("{{ {} }}", simple_stringify_type_info(type_info, Some(typ)))
} }
TypeInfo::Basic(tok) => { TypeInfo::Basic(tok) => match parent_typ {
if tok.token().to_string() == "T" { Some(TypeInfo::Callback { generics, .. }) => {
"any".to_string() // HACK: Assume that any literal type "T" is a generic that accepts any value if let Some(generics) = generics {
} else { // If the function that contains this arg has generic and a
tok.token().to_string() // generic is the same as this token, we stringify it as any
if generics
.generics()
.iter()
.any(|g| g.to_string() == tok.token().to_string())
{
"any".to_string()
} else {
tok.token().to_string()
}
} else {
tok.token().to_string()
}
} }
} _ => tok.token().to_string(),
},
TypeInfo::String(str) => str.token().to_string(), TypeInfo::String(str) => str.token().to_string(),
TypeInfo::Boolean(_) => "boolean".to_string(), TypeInfo::Boolean(_) => "boolean".to_string(),
TypeInfo::Callback { .. } => "function".to_string(), TypeInfo::Callback { .. } => "function".to_string(),
TypeInfo::Optional { base, .. } => format!("{}?", simple_stringify_type_info(base)), TypeInfo::Optional { base, .. } => {
format!("{}?", simple_stringify_type_info(base, Some(typ)))
}
TypeInfo::Table { .. } => "table".to_string(), TypeInfo::Table { .. } => "table".to_string(),
TypeInfo::Union { left, right, .. } => { TypeInfo::Union { left, right, .. } => {
format!( format!(
"{}{PIPE_SEPARATOR}{}", "{}{PIPE_SEPARATOR}{}",
simple_stringify_type_info(left), simple_stringify_type_info(left, Some(typ)),
simple_stringify_type_info(right) simple_stringify_type_info(right, Some(typ))
) )
} }
// TODO: Stringify custom table types properly, these show up as basic tokens // TODO: Stringify custom table types properly, these show up as basic tokens
@ -218,7 +233,7 @@ fn try_extract_normalized_function_args(typ: &TypeInfo) -> Option<Vec<String>> {
.pop() .pop()
.unwrap() .unwrap()
.iter() .iter()
.map(|type_arg| simple_stringify_type_info(type_arg.type_info())) .map(|type_arg| simple_stringify_type_info(type_arg.type_info(), Some(typ)))
.collect(), .collect(),
), ),
_ => { _ => {
@ -234,7 +249,7 @@ fn try_extract_normalized_function_args(typ: &TypeInfo) -> Option<Vec<String>> {
let mut type_arg_strings = type_args_multi let mut type_arg_strings = type_args_multi
.iter() .iter()
.filter_map(|type_args| type_args.get(index)) .filter_map(|type_args| type_args.get(index))
.map(|type_arg| simple_stringify_type_info(type_arg.type_info())) .map(|type_arg| simple_stringify_type_info(type_arg.type_info(), Some(typ)))
.collect::<Vec<_>>(); .collect::<Vec<_>>();
if type_arg_strings.len() < type_args_multi.len() { if type_arg_strings.len() < type_args_multi.len() {
for _ in type_arg_strings.len()..type_args_multi.len() { for _ in type_arg_strings.len()..type_args_multi.len() {