lune-org/lune
1
1
Fork 0
mirror of https://github.com/lune-org/lune.git synced 2025-01-05 19:09:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix generation of selene type definitions

Browse source
This commit is contained in:
Filip Tibell 2023-02-26 21:33:49 +01:00
parent 30ab71c92d
commit f6f9e9db1f
No known key found for this signature in database
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
packages/cli/src/gen/selene_defs.rs
View file

@ -6,6 +6,8 @@ use crate::gen::definitions::DefinitionsItemTag;
use super::definitions::{DefinitionsItem, DefinitionsItemKind, DefinitionsTree}; use super::definitions::{DefinitionsItem, DefinitionsItemKind, DefinitionsTree};
const USE_TYPE_UNIONS: bool = false;
pub fn generate_from_type_definitions(contents: &str) -> Result<String> { pub fn generate_from_type_definitions(contents: &str) -> Result<String> {
let tree = DefinitionsTree::from_type_definitions(contents)?; let tree = DefinitionsTree::from_type_definitions(contents)?;
let mut globals = YamlMapping::new(); let mut globals = YamlMapping::new();
@ -144,24 +146,24 @@ fn doc_item_to_selene_yaml_mapping(item: &DefinitionsItem) -> Result<YamlMapping
fn simplify_type_str_into_primitives(type_str: &str) -> String { fn simplify_type_str_into_primitives(type_str: &str) -> String {
let separator = format!(" {} ", Symbol::Pipe); let separator = format!(" {} ", Symbol::Pipe);
// Simplify type strings even further into ones that selene can understand, // Simplify type strings even further into ones that selene can understand,
// turning types such as `{ bool }` or `"string-literal"` into `bool[]` and `string` // turning types such as `{ bool }` or `"string-literal"` into `table` and `string`
let mut primitives = Vec::new(); let mut primitives = Vec::new();
for type_inner in type_str.split(&separator) { for type_inner in type_str.split(&separator) {
if type_inner.starts_with('{') && type_inner.ends_with('}') { if type_inner.starts_with('{') && type_inner.ends_with('}') {
primitives.push(format!( primitives.push("table".to_string());
"{}[]",
type_inner
.trim_start_matches('{')
.trim_end_matches('}')
.trim()
));
} else if type_inner.starts_with('"') && type_inner.ends_with('"') { } else if type_inner.starts_with('"') && type_inner.ends_with('"') {
primitives.push("string".to_string()); primitives.push("string".to_string());
} else if type_inner == "boolean" {
primitives.push("bool".to_string());
} else { } else {
primitives.push(type_inner.to_string()); primitives.push(type_inner.to_string());
} }
} }
primitives.sort_unstable(); if primitives.len() > 1 && !USE_TYPE_UNIONS {
primitives.dedup(); "any".to_string()
primitives.join(&separator) } else {
primitives.sort_unstable();
primitives.dedup();
primitives.join(&separator)
}
} }