Skip to content

Add sanity check for byte coercion #121

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

Merged
someone235 merged 1 commit into from
May 11, 2026
Merged

Add sanity check for byte coercion #121

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
12 changes: 6 additions & 6 deletions silverscript-lang/src/compiler/locals.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,8 @@ fn lower_statements<'i>(
&& identifier_uses.get(name).copied().unwrap_or(0) <= 1
&& !expr_references_any(expr, assigned_names) =>
{
let lowered_expr = coerce_expr_for_declared_scalar_type(substitute_expr(expr, &local_aliases)?, type_ref);
let lowered_expr = coerce_expr_for_declared_scalar_type(substitute_expr(expr, &local_aliases)?, type_ref)?;
local_aliases.insert(name.clone(), lowered_expr);
let _ = (type_ref, modifiers, span, type_span, modifier_spans, name_span);
}
Statement::VariableDefinition { type_ref, modifiers, name, expr, span, type_span, modifier_spans, name_span } => {
local_aliases.remove(name);
Expand Down Expand Up @@ -190,15 +189,16 @@ fn lower_statements<'i>(
Ok(lowered)
}

fn coerce_expr_for_declared_scalar_type<'i>(expr: Expr<'i>, type_ref: &TypeRef) -> Expr<'i> {
fn coerce_expr_for_declared_scalar_type<'i>(expr: Expr<'i>, type_ref: &TypeRef) -> Result<Expr<'i>, CompilerError> {
if matches!(type_ref.base, TypeBase::Byte)
&& type_ref.array_dims.is_empty()
&& let ExprKind::Int(value) = expr.kind
&& (0..=255).contains(&value)
{
return Expr::new(ExprKind::Byte(value as u8), expr.span);
let byte_value =
value.try_into().map_err(|_| CompilerError::Unsupported(format!("integer literal {value} is out of range for byte")))?;
return Ok(Expr::new(ExprKind::Byte(byte_value), expr.span));
}
expr
Ok(expr)
}

fn substitute_expr<'i>(expr: &Expr<'i>, aliases: &HashMap<String, Expr<'i>>) -> Result<Expr<'i>, CompilerError> {
Expand Down