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.

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

Check type at assignment #1239

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Check type at assignment #1239

Show file tree
Hide file tree
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
25 changes: 25 additions & 0 deletions crates/analyzer/src/analyzer_error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,6 +503,22 @@ pub enum AnalyzerError {
other_location: SourceSpan,
},

#[diagnostic(
severity(Error),
code(mismatch_assignment),
help(""),
url("https://doc.veryl-lang.org/book/07_appendix/02_semantic_error.html#mismatch_assignment")
)]
#[error("\"{src}\" can't be assigned to \"{dst}\"")]
MismatchAssignment {
src: String,
dst: String,
#[source_code]
input: NamedSource<String>,
#[label("Error location")]
error_location: SourceSpan,
},

#[diagnostic(
severity(Error),
code(missing_if_reset),
Expand Down Expand Up @@ -1412,6 +1428,15 @@ impl AnalyzerError {
}
}

pub fn mismatch_assignment(src: &str, dst: &str, source: &str, token: &TokenRange) -> Self {
AnalyzerError::MismatchAssignment {
src: src.to_string(),
dst: dst.to_string(),
input: AnalyzerError::named_source(source, token),
error_location: token.into(),
}
}

pub fn missing_clock_signal(source: &str, token: &TokenRange) -> Self {
AnalyzerError::MissingClockSignal {
input: AnalyzerError::named_source(source, token),
Expand Down
158 changes: 80 additions & 78 deletions crates/analyzer/src/evaluator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,65 +318,64 @@ impl Evaluated {
let width = self.get_width();
let array = self.get_array();
if let (Some(beg), Some(end)) = (beg.get_value(), end.get_value()) {
if let Some(x) = array.first() {
if *x == 1 {
// select width

let select_width = width.first().unwrap_or(&0);
let mut rest = width[1..].to_vec();
if end > beg {
// TODO index error
self.set_unknown();
} else if beg >= *select_width as isize {
// TODO out of range error
self.set_unknown();
if let Some(select_array) = array.first() {
// select array

let _rest: Vec<_> = array[1..].iter().collect();
if beg > end {
// TODO index error
self.set_unknown();
} else if end >= *select_array as isize {
// TODO out of range error
self.set_unknown();
} else {
self.set_unknown();
}
} else {
// select width

let select_width = width.first().unwrap_or(&0);
let mut rest = if width.is_empty() {
vec![]
} else {
width[1..].to_vec()
};
if end > beg {
// TODO index error
self.set_unknown();
} else if beg >= *select_width as isize {
// TODO out of range error
self.set_unknown();
} else {
let part_size: usize = if rest.is_empty() {
1
} else {
let part_size: usize = if rest.is_empty() {
1
} else {
rest.iter().product()
};
rest.iter().product()
};

let end_bit = end * part_size as isize;
let beg_bit = beg * part_size as isize;
let end_bit = end * part_size as isize;
let beg_bit = beg * part_size as isize;

if let Some(value) = value {
let mask = !(1 << (beg_bit - end_bit + 1));
let new_value = (value >> end_bit) & mask;
self.set_value(new_value);
}
if let Some(value) = value {
let mask = !(1 << (beg_bit - end_bit + 1));
let new_value = (value >> end_bit) & mask;
self.set_value(new_value);
}

let new_width = if beg == end {
if rest.is_empty() {
vec![1]
} else {
rest
}
let new_width = if beg == end {
if rest.is_empty() {
vec![1]
} else {
let mut new_width = vec![(beg - end + 1) as usize];
new_width.append(&mut rest);
new_width
};

self.set_width(new_width);
}
} else {
// select array

let select_array = array.first().unwrap_or(&0);
let _rest: Vec<_> = array[1..].iter().collect();
if beg > end {
// TODO index error
self.set_unknown();
} else if end >= *select_array as isize {
// TODO out of range error
self.set_unknown();
rest
}
} else {
self.set_unknown();
}
let mut new_width = vec![(beg - end + 1) as usize];
new_width.append(&mut rest);
new_width
};

self.set_width(new_width);
}
} else {
self.set_unknown();
}
} else {
self.set_unknown();
Expand Down Expand Up @@ -409,14 +408,14 @@ impl Evaluated {
let value = calc_value(value0, value1);
let width = calc_width(width0, width1, context_width);
if let Some(value) = value {
Evaluated::create_fixed(value, false, vec![width], vec![1])
Evaluated::create_fixed(value, false, vec![width], vec![])
} else {
Evaluated::create_variable(false, vec![width], vec![1])
Evaluated::create_variable(false, vec![width], vec![])
}
}
(_, _, Some(width0), Some(width1)) => {
let width = calc_width(width0, width1, context_width);
Evaluated::create_variable(false, vec![width], vec![1])
Evaluated::create_variable(false, vec![width], vec![])
}
_ => Evaluated::create_unknown(),
};
Expand All @@ -438,14 +437,14 @@ impl Evaluated {
let value = calc_value(value0);
let width = calc_width(width0);
if let Some(value) = value {
Evaluated::create_fixed(value, false, vec![width], vec![1])
Evaluated::create_fixed(value, false, vec![width], vec![])
} else {
Evaluated::create_variable(false, vec![width], vec![1])
Evaluated::create_variable(false, vec![width], vec![])
}
}
(_, Some(width0)) => {
let width = calc_width(width0);
Evaluated::create_variable(false, vec![width], vec![1])
Evaluated::create_variable(false, vec![width], vec![])
}
_ => Evaluated::create_unknown(),
};
Expand Down Expand Up @@ -841,7 +840,7 @@ impl Evaluator {

pub fn type_array(&mut self, x: Type) -> Option<Vec<usize>> {
if x.array.is_empty() {
Some(vec![1])
Some(vec![])
} else {
let mut ret = Vec::new();
for x in &x.array {
Expand Down Expand Up @@ -884,7 +883,7 @@ impl Evaluator {
let width = str::parse::<usize>(width);
let value = isize::from_str_radix(value, radix);
if let (Ok(width), Ok(value)) = (width, value) {
Evaluated::create_fixed(value, signed, vec![width], vec![1])
Evaluated::create_fixed(value, signed, vec![width], vec![])
} else {
Evaluated::create_unknown_static()
}
Expand All @@ -896,7 +895,7 @@ impl Evaluator {
fn base_less(&mut self, arg: &BaseLess) -> Evaluated {
let text = arg.base_less_token.to_string().replace('_', "");
if let Ok(value) = str::parse::<isize>(&text) {
Evaluated::create_fixed(value, false, vec![32], vec![1])
Evaluated::create_fixed(value, false, vec![32], vec![])
} else {
Evaluated::create_unknown()
}
Expand Down Expand Up @@ -928,7 +927,7 @@ impl Evaluator {
Evaluated::create_unknown()
} else {
let width = *self.context_width.last().unwrap_or(&0);
Evaluated::create_fixed(value, false, vec![width], vec![1])
Evaluated::create_fixed(value, false, vec![width], vec![])
}
}

Expand Down Expand Up @@ -1074,42 +1073,42 @@ impl Evaluator {
CastingType::Clock(_) => Some(Evaluated::create_clock(
EvaluatedTypeClockKind::Implicit,
vec![1],
vec![1],
vec![],
)),
CastingType::ClockPosedge(_) => Some(Evaluated::create_clock(
EvaluatedTypeClockKind::Posedge,
vec![1],
vec![1],
vec![],
)),
CastingType::ClockNegedge(_) => Some(Evaluated::create_clock(
EvaluatedTypeClockKind::Negedge,
vec![1],
vec![1],
vec![],
)),
CastingType::Reset(_) => Some(Evaluated::create_reset(
EvaluatedTypeResetKind::Implicit,
vec![1],
vec![1],
vec![],
)),
CastingType::ResetAsyncHigh(_) => Some(Evaluated::create_reset(
EvaluatedTypeResetKind::AsyncHigh,
vec![1],
vec![1],
vec![],
)),
CastingType::ResetAsyncLow(_) => Some(Evaluated::create_reset(
EvaluatedTypeResetKind::AsyncLow,
vec![1],
vec![1],
vec![],
)),
CastingType::ResetSyncHigh(_) => Some(Evaluated::create_reset(
EvaluatedTypeResetKind::SyncHigh,
vec![1],
vec![1],
vec![],
)),
CastingType::ResetSyncLow(_) => Some(Evaluated::create_reset(
EvaluatedTypeResetKind::SyncLow,
vec![1],
vec![1],
vec![],
)),
_ => None,
};
Expand Down Expand Up @@ -1265,7 +1264,7 @@ impl Evaluator {
let arg = self.expression(&arg.expression);
if let EvaluatedValue::Fixed(x) = arg.value {
let ret = isize::BITS - x.leading_zeros();
Evaluated::create_fixed(ret as isize, false, vec![32], vec![1])
Evaluated::create_fixed(ret as isize, false, vec![32], vec![])
} else {
Evaluated::create_unknown()
}
Expand All @@ -1287,7 +1286,7 @@ impl Evaluator {
(Some(value0), Some(value1), Some(width0), Some(width1)) => {
let width = width0 + width1;
let value = (value0 << width1) | value1;
Evaluated::create_fixed(value, false, vec![width], vec![1])
Evaluated::create_fixed(value, false, vec![width], vec![])
}
_ => {
if x.is_known_static() && y.is_known_static() {
Expand All @@ -1308,7 +1307,7 @@ impl Evaluator {
if let Some(cio) = &arg.concatenation_item_opt {
let c = self.expression(cio.expression.as_ref());
if let EvaluatedValue::Fixed(c) = c.value {
let mut tmp = Evaluated::create_fixed(0, false, vec![0], vec![1]);
let mut tmp = Evaluated::create_fixed(0, false, vec![0], vec![]);
for _ in 0..c {
tmp = self.do_concatenation(tmp, e.clone());
}
Expand All @@ -1331,7 +1330,7 @@ impl Evaluator {
for cll in arg.concatenation_list_list.iter() {
eval_vec.push(self.concatenation_list_list(cll));
}
let default_value = Evaluated::create_fixed(0, false, vec![0], vec![1]);
let default_value = Evaluated::create_fixed(0, false, vec![0], vec![]);
eval_vec.iter().fold(default_value, |acc, x| {
self.do_concatenation(acc, x.clone())
})
Expand All @@ -1352,9 +1351,11 @@ impl Evaluator {
match arg {
ArrayLiteralItemGroup::ExpressionArrayLiteralItemOpt(x) => {
let exp_eval = self.expression(x.expression.as_ref());
if let Some(alio) = &x.array_literal_item_opt {
let repeat_exp = self.expression(alio.expression.as_ref());
self.do_concatenation(exp_eval, repeat_exp)
if let Some(_alio) = &x.array_literal_item_opt {
// TODO fix it
//let repeat_exp = self.expression(alio.expression.as_ref());
//self.do_concatenation(exp_eval, repeat_exp)
Evaluated::create_unknown()
} else {
exp_eval
}
Expand All @@ -1375,8 +1376,9 @@ impl Evaluator {

fn array_literal_list(&mut self, arg: &ArrayLiteralList) -> Evaluated {
// Currently only checking for `Defaul Colon Expression` syntax
let e = self.array_literal_item(arg.array_literal_item.as_ref());
let mut e = self.array_literal_item(arg.array_literal_item.as_ref());
if arg.array_literal_list_list.is_empty() {
e.set_array(vec![1]);
e
} else if e.is_known_static() {
let is_known_static: bool = arg
Expand Down
Loading