Skip to content
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
181 changes: 94 additions & 87 deletions src/ast.rs

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions src/ast/atomic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -82,14 +82,14 @@ impl AstBuilderImpl<'_> {
args.push(order);
self.postfix(Node {
nt: NodeType::Atomic(operation),
token: Some(token),
cty: Some(if operation == AtomicOperation::Store {
Type::Void
} else {
ty
}),
volatile_access: object.qualifiers().volatile,
token: Some(token),
args,
volatile_access: object.qualifiers().volatile,
..Node::default()
})
}
Expand All @@ -116,8 +116,8 @@ impl AstBuilderImpl<'_> {
if matches!(ty, Type::Ptr(_)) {
Node {
nt: NodeType::Cast,
cty: Some(ty.clone()),
token: value.token.clone(),
cty: Some(ty.clone()),
lhs: Some(Box::new(value)),
..Node::default()
}
Expand Down Expand Up @@ -190,10 +190,10 @@ impl AstBuilderImpl<'_> {
nt: NodeType::Atomic(AtomicOperation::CompareExchange(
expected_object.qualifiers().volatile,
)),
cty: Some(Type::Bool),
token: Some(token),
volatile_access: object.qualifiers().volatile,
cty: Some(Type::Bool),
args: vec![pointer, expected, desired, weak, success, failure],
volatile_access: object.qualifiers().volatile,
..Node::default()
})
}
Expand Down
2 changes: 1 addition & 1 deletion src/ast/attributes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ impl AstBuilderImpl<'_> {
continue;
}
let name = self.tokens[self.cur].clone();
if !matches!(name.tt, TokenType::Ident | TokenType::Reserved) {
if !matches!(name.tt, TokenType::Reserved | TokenType::Ident) {
self.error_logger
.print_error_position(name.pos, "attribute name expected");
}
Expand Down
33 changes: 17 additions & 16 deletions src/ast/builtins.rs
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ impl AstBuilderImpl<'_> {
self.expect_reserved(")");
Node {
token: Some(token),
value: Some(offset),
cty: Some(Type::integer(64, false)),
value: Some(offset),
..Node::default()
}
}
Expand All @@ -111,12 +111,6 @@ impl AstBuilderImpl<'_> {
.or_insert_with(|| GlobalVariable {
ty: ty.clone(),
alignment: 1,
thread_local: false,
internal: true,
weak_import: false,
hidden: false,
common: false,
declaration_only: false,
data: Some(GlobalVariableData::Arr(
function
.s_value
Expand All @@ -125,12 +119,18 @@ impl AstBuilderImpl<'_> {
.map(|byte| GlobalVariableData::Elem(byte.to_string()))
.collect(),
)),
internal: true,
declaration_only: false,
common: false,
weak_import: false,
hidden: false,
thread_local: false,
});
Node {
nt: NodeType::GlobalVar,
global_name: name,
token: Some(token),
cty: Some(ty),
global_name: name,
..Node::default()
}
}
Expand All @@ -146,9 +146,9 @@ impl AstBuilderImpl<'_> {
self.expect_conversion(&ty, &expected);
let cast = |operand| Node {
nt: NodeType::Cast,
token: Some(token.clone()),
cty: Some(ty.clone()),
lhs: Some(Box::new(operand)),
token: Some(token.clone()),
..Node::default()
};
let value = cast(value);
Expand Down Expand Up @@ -190,10 +190,11 @@ impl AstBuilderImpl<'_> {
};
self.expect_reserved("(");
self.expect_reserved(")");
let value = ty.float_constant(f64::INFINITY);
Node {
token: Some(token),
value: Some(ty.float_constant(f64::INFINITY)),
cty: Some(ty),
value: Some(value),
..Node::default()
}
}
Expand Down Expand Up @@ -232,13 +233,13 @@ impl AstBuilderImpl<'_> {
} else {
0x7ff8_0000_0000_0000 | (payload & 0x0007_ffff_ffff_ffff)
};
let extended_float = (ty.float_bits() == Some(80))
.then(|| Box::new(crate::floating::Extended::qnan(Some(payload.into())).to_bits()));
return Node {
token: Some(token),
value: Some(bits as usize),
extended_float: (ty.float_bits() == Some(80)).then(|| {
Box::new(crate::floating::Extended::qnan(Some(payload.into())).to_bits())
}),
cty: Some(ty),
value: Some(bits as usize),
extended_float,
..Node::default()
};
}
Expand Down Expand Up @@ -389,17 +390,17 @@ impl AstBuilderImpl<'_> {
}
}
self.functions.entry(name.into()).or_insert_with(|| Func {
cty: ty.clone(),
token: Some(token.clone()),
cty: ty.clone(),
..Func::default()
});
self.scope_stack[0]
.entry(name.into())
.or_insert_with(|| Identifier::Static(ty.clone()));
self.postfix(Node {
nt: NodeType::GlobalVar,
cty: Some(ty),
token: Some(token),
cty: Some(ty),
global_name: name.into(),
..Node::default()
})
Expand Down
75 changes: 37 additions & 38 deletions src/ast/const_eval.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,21 +29,20 @@ impl AstBuilderImpl<'_> {
.is_some_and(|ty| ty.integer_info().is_some())
&& node.lhs.as_deref().is_some_and(Self::integer_constant)
}
NodeType::BitNot => node.lhs.as_deref().is_some_and(Self::integer_constant),
NodeType::Add
| NodeType::Sub
| NodeType::Mul
| NodeType::Div
| NodeType::Mod
| NodeType::BitLeft
| NodeType::BitRight
| NodeType::BitAnd
| NodeType::BitXor
| NodeType::BitOr
| NodeType::Eq
| NodeType::Ne
| NodeType::Lt
| NodeType::Le
| NodeType::BitAnd
| NodeType::BitOr
| NodeType::BitXor
| NodeType::BitLeft
| NodeType::BitRight
| NodeType::LogicalAnd
| NodeType::LogicalOr => {
node.lhs
Expand All @@ -54,6 +53,7 @@ impl AstBuilderImpl<'_> {
.as_ref()
.is_some_and(|child| Self::integer_constant(child))
}
NodeType::BitNot => node.lhs.as_deref().is_some_and(Self::integer_constant),
NodeType::Conditional => [&node.cond, &node.then, &node.els]
.into_iter()
.flatten()
Expand Down Expand Up @@ -241,7 +241,24 @@ impl AstBuilderImpl<'_> {
}
};
}

NodeType::Add
| NodeType::Sub
| NodeType::Mul
| NodeType::Div
| NodeType::Mod
| NodeType::BitLeft
| NodeType::BitRight
| NodeType::BitAnd
| NodeType::BitXor
| NodeType::BitOr
| NodeType::Eq
| NodeType::Ne
| NodeType::Lt
| NodeType::Le => {}
NodeType::BitNot => {
let value = !self.eval(node.lhs.as_ref().unwrap());
return node.resolve_type().unwrap().convert_constant(value);
}
NodeType::LogicalAnd => {
return (self.eval_truth(node.lhs.as_ref().unwrap())
&& self.eval_truth(node.rhs.as_ref().unwrap())) as i64;
Expand All @@ -257,24 +274,6 @@ impl AstBuilderImpl<'_> {
self.eval(node.els.as_ref().unwrap())
};
}
NodeType::BitNot => {
let value = !self.eval(node.lhs.as_ref().unwrap());
return node.resolve_type().unwrap().convert_constant(value);
}
NodeType::Eq
| NodeType::Ne
| NodeType::Le
| NodeType::Lt
| NodeType::Add
| NodeType::Sub
| NodeType::Mul
| NodeType::Div
| NodeType::Mod
| NodeType::BitAnd
| NodeType::BitOr
| NodeType::BitXor
| NodeType::BitLeft
| NodeType::BitRight => {}
_ => {
self.error_logger.print_error_position(
node.token.as_ref().unwrap().pos,
Expand All @@ -294,33 +293,26 @@ impl AstBuilderImpl<'_> {
if unsigned {
let (lhs, rhs) = (lhs as u64, rhs as u64);
let value = match node.nt {
NodeType::Div if rhs != 0 => Some(lhs / rhs),
NodeType::Mod if rhs != 0 => Some(lhs % rhs),
NodeType::Lt => Some(u64::from(lhs < rhs)),
NodeType::Le => Some(u64::from(lhs <= rhs)),
NodeType::Add => Some(lhs.wrapping_add(rhs)),
NodeType::Sub => Some(lhs.wrapping_sub(rhs)),
NodeType::Mul => Some(lhs.wrapping_mul(rhs)),
NodeType::Div if rhs != 0 => Some(lhs / rhs),
NodeType::Mod if rhs != 0 => Some(lhs % rhs),
NodeType::BitRight if rhs < ty.integer_info().unwrap().0 as u64 => Some(lhs >> rhs),
NodeType::Lt => Some(u64::from(lhs < rhs)),
NodeType::Le => Some(u64::from(lhs <= rhs)),
_ => None,
};
if let Some(value) = value {
return ty.convert_constant(value as i64);
}
}
let result = match node.nt {
NodeType::Eq => Some((lhs == rhs) as i64),
NodeType::Ne => Some((lhs != rhs) as i64),
NodeType::Le => Some((lhs <= rhs) as i64),
NodeType::Lt => Some((lhs < rhs) as i64),
NodeType::Add => lhs.checked_add(rhs),
NodeType::Sub => lhs.checked_sub(rhs),
NodeType::Mul => lhs.checked_mul(rhs),
NodeType::Div => lhs.checked_div(rhs),
NodeType::Mod => lhs.checked_rem(rhs),
NodeType::BitAnd => Some(lhs & rhs),
NodeType::BitOr => Some(lhs | rhs),
NodeType::BitXor => Some(lhs ^ rhs),
NodeType::BitLeft
if (0..lhs_ty.promoted().integer_info().unwrap().0 as i64).contains(&rhs) =>
{
Expand All @@ -331,6 +323,13 @@ impl AstBuilderImpl<'_> {
{
lhs.checked_shr(rhs as u32)
}
NodeType::BitAnd => Some(lhs & rhs),
NodeType::BitXor => Some(lhs ^ rhs),
NodeType::BitOr => Some(lhs | rhs),
NodeType::Eq => Some((lhs == rhs) as i64),
NodeType::Ne => Some((lhs != rhs) as i64),
NodeType::Lt => Some((lhs < rhs) as i64),
NodeType::Le => Some((lhs <= rhs) as i64),
_ => None,
};
let value = result.unwrap_or_else(|| {
Expand Down Expand Up @@ -388,7 +387,6 @@ impl AstBuilderImpl<'_> {
}
let value = match node.nt {
NodeType::Num => ty.float_value(node.value.unwrap()),
NodeType::FloatAbs => self.eval_float_as(node.lhs.as_ref().unwrap(), &ty).abs(),
NodeType::Cast => self.eval_float(node.lhs.as_ref().unwrap()),
NodeType::Add => {
self.eval_float_as(node.lhs.as_ref().unwrap(), &ty)
Expand All @@ -413,6 +411,7 @@ impl AstBuilderImpl<'_> {
self.eval_float(node.els.as_ref().unwrap())
}
}
NodeType::FloatAbs => self.eval_float_as(node.lhs.as_ref().unwrap(), &ty).abs(),
_ => {
self.error_logger.print_error_position(
node.token.as_ref().unwrap().pos,
Expand Down Expand Up @@ -449,7 +448,6 @@ impl AstBuilderImpl<'_> {
|bits| Extended::from_bits(**bits),
),
NodeType::Cast => self.eval_extended(node.lhs.as_ref().unwrap()),
NodeType::FloatAbs => self.eval_extended(node.lhs.as_ref().unwrap()).abs(),
NodeType::Add | NodeType::Sub | NodeType::Mul | NodeType::Div => {
let lhs = self.eval_extended(node.lhs.as_ref().unwrap());
let rhs = self.eval_extended(node.rhs.as_ref().unwrap());
Expand All @@ -474,6 +472,7 @@ impl AstBuilderImpl<'_> {
node.els.as_ref().unwrap()
})
}
NodeType::FloatAbs => self.eval_extended(node.lhs.as_ref().unwrap()).abs(),
_ => {
self.error_logger.print_error_position(
node.token.as_ref().unwrap().pos,
Expand Down
Loading
Loading