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.

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

Add the unknown type #36

Merged
merged 2 commits into from Dec 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/.vitepress/components/Editor.vue
Expand Up @@ -132,6 +132,7 @@ const beforeMount = (monaco: Monaco) => {
"boolean",
"string",
"buffer",
"unknown",
"Instance",
"Vector3",
] as const;
Expand Down
2 changes: 2 additions & 0 deletions zap/src/config.rs
Expand Up @@ -88,6 +88,7 @@ pub enum Ty<'src> {

Vector3,
Boolean,
Unknown,
}

impl<'src> Ty<'src> {
Expand All @@ -106,6 +107,7 @@ impl<'src> Ty<'src> {
Self::Enum(enum_ty) => enum_ty.max_size(config, recursed),
Self::Struct(struct_ty) => struct_ty.max_size(config, recursed),
Self::Instance(_) => Some(2),
Self::Unknown => None,
Self::Ref(name) => {
if recursed.contains(name) {
None
Expand Down
13 changes: 13 additions & 0 deletions zap/src/irgen/des.rs
Expand Up @@ -185,6 +185,16 @@ impl Des {
}
}

Ty::Unknown => {
self.push_assign(Var::from("incoming_ipos"), Expr::from("incoming_ipos").add(1.0.into()));
self.push_assign(
into.clone(),
Var::from("incoming_inst")
.eindex(Var::from("incoming_ipos").into())
.into(),
);
}

_ => self.push_ty(ty, into.clone()),
}

Expand Down Expand Up @@ -239,6 +249,9 @@ impl Des {
}
}

// unknown is always an opt
Ty::Unknown => unreachable!(),

Ty::Boolean => self.push_assign(into, self.readu8().eq(1.0.into())),
Ty::Vector3 => {
self.push_local("x", Some(self.readnumty(NumTy::F32)));
Expand Down
6 changes: 6 additions & 0 deletions zap/src/irgen/ser.rs
Expand Up @@ -218,6 +218,12 @@ impl Ser {
))
}

Ty::Unknown => self.push_stmt(Stmt::Call(
Var::from("table").nindex("insert"),
None,
vec!["outgoing_inst".into(), from_expr],
)),

Ty::Vector3 => {
self.push_writef32(from.clone().nindex("X").into());
self.push_writef32(from.clone().nindex("Y").into());
Expand Down
1 change: 1 addition & 0 deletions zap/src/output/luau/mod.rs
Expand Up @@ -159,6 +159,7 @@ pub trait Output {

Ty::Instance(name) => self.push(name.unwrap_or("Instance")),

Ty::Unknown => self.push("unknown"),
Ty::Boolean => self.push("boolean"),
Ty::Vector3 => self.push("Vector3"),
}
Expand Down
1 change: 1 addition & 0 deletions zap/src/output/typescript/mod.rs
Expand Up @@ -172,6 +172,7 @@ pub trait Output {

Ty::Instance(name) => self.push(name.unwrap_or("Instance")),

Ty::Unknown => self.push("unknown"),
Ty::Boolean => self.push("boolean"),
Ty::Vector3 => self.push("Vector3"),
}
Expand Down
15 changes: 14 additions & 1 deletion zap/src/parser/convert.rs
Expand Up @@ -217,11 +217,24 @@ impl<'src> SyntaxTy<'src> {
),

SyntaxTyKind::Map(key, val) => Ty::Map(Box::new(key.into_config(state)), Box::new(val.into_config(state))),
SyntaxTyKind::Opt(ty) => Ty::Opt(Box::new(ty.into_config(state))),
SyntaxTyKind::Opt(ty) => {
let ty = ty.into_config(state);

if let Ty::Opt(ty) = &ty {
if let Ty::Unknown = **ty {
state.push_report(Report::AnalyzeInvalidOptionalType {
span: (self.end - 1)..self.end,
});
}
}

Ty::Opt(Box::new(ty))
}

SyntaxTyKind::Ref(name) => match name.into_config() {
"boolean" => Ty::Boolean,
"Vector3" => Ty::Vector3,
"unknown" => Ty::Opt(Box::new(Ty::Unknown)),

_ => {
let name = name.into_config();
Expand Down
14 changes: 14 additions & 0 deletions zap/src/parser/reports.rs
Expand Up @@ -76,6 +76,10 @@ pub enum Report<'src> {
min: f64,
max: f64,
},

AnalyzeInvalidOptionalType {
span: Span,
},
}

impl<'src> Report<'src> {
Expand All @@ -98,6 +102,7 @@ impl<'src> Report<'src> {
Self::AnalyzeUnknownOptName { .. } => Severity::Warning,
Self::AnalyzeUnknownTypeRef { .. } => Severity::Error,
Self::AnalyzeNumOutsideRange { .. } => Severity::Error,
Self::AnalyzeInvalidOptionalType { .. } => Severity::Error,
}
}

Expand All @@ -123,6 +128,7 @@ impl<'src> Report<'src> {
Self::AnalyzeUnknownOptName { .. } => "unknown opt name".to_string(),
Self::AnalyzeUnknownTypeRef { name, .. } => format!("unknown type reference '{}'", name),
Self::AnalyzeNumOutsideRange { .. } => "number outside range".to_string(),
Self::AnalyzeInvalidOptionalType { .. } => "type must not be optional".to_string(),
}
}

Expand All @@ -145,6 +151,7 @@ impl<'src> Report<'src> {
Self::AnalyzeUnknownOptName { .. } => "3008",
Self::AnalyzeUnknownTypeRef { .. } => "3009",
Self::AnalyzeNumOutsideRange { .. } => "3010",
Self::AnalyzeInvalidOptionalType { .. } => "3011",
}
}

Expand Down Expand Up @@ -216,6 +223,10 @@ impl<'src> Report<'src> {
Self::AnalyzeNumOutsideRange { span, .. } => {
vec![Label::primary((), span.clone()).with_message("number outside range")]
}

Self::AnalyzeInvalidOptionalType { span, .. } => {
vec![Label::primary((), span.clone()).with_message("must be removed")]
}
}
}

Expand Down Expand Up @@ -261,6 +272,9 @@ impl<'src> Report<'src> {
format!("(inclusive) min: {}", min),
format!("(inclusive) max: {}", max),
]),
Self::AnalyzeInvalidOptionalType { .. } => Some(vec![
"this type can only be used when it is not marked as optional".to_string(),
]),
}
}
}
Expand Down