language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-27 22:09:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Add Position::offset, and recompute line/column info based on source

Browse source
This commit is contained in:
Joshua Warner 2021-12-23 21:06:08 -08:00
parent 443d738f9b
commit 4b04ec6bbc
7 changed files with 279 additions and 300 deletions
Download patch file Download diff file Expand all files Collapse all files

32
compiler/can/tests/test_can.rs
View file

@ -944,12 +944,12 @@ mod test_can {
let problem = Problem::RuntimeError(RuntimeError::CircularDef(vec![CycleEntry {
symbol: interns.symbol(home, "x".into()),
symbol_region: Region::new(
Position::new(0, 0),
Position::new(0, 1),
Position::new(0, 0, 0),
Position::new(0, 0, 0),
),
expr_region: Region::new(
Position::new(0, 4),
Position::new(0, 5),
Position::new(0, 0, 0),
Position::new(0, 0, 0),
),
}]));
@ -981,34 +981,34 @@ mod test_can {
CycleEntry {
symbol: interns.symbol(home, "x".into()),
symbol_region: Region::new(
Position::new(0, 0),
Position::new(0, 1),
Position::new(0, 0, 0),
Position::new(0, 0, 0),
),
expr_region: Region::new(
Position::new(0, 4),
Position::new(0, 5),
Position::new(0, 0, 0),
Position::new(0, 0, 0),
),
},
CycleEntry {
symbol: interns.symbol(home, "y".into()),
symbol_region: Region::new(
Position::new(1, 0),
Position::new(1, 1),
Position::new(0, 0, 0),
Position::new(0, 0, 0),
),
expr_region: Region::new(
Position::new(1, 4),
Position::new(1, 5),
Position::new(0, 0, 0),
Position::new(0, 0, 0),
),
},
CycleEntry {
symbol: interns.symbol(home, "z".into()),
symbol_region: Region::new(
Position::new(2, 0),
Position::new(2, 1),
Position::new(0, 0, 0),
Position::new(0, 0, 0),
),
expr_region: Region::new(
Position::new(2, 4),
Position::new(2, 5),
Position::new(0, 0, 0),
Position::new(0, 0, 0),
),
},
]));

11
compiler/parse/src/state.rs
View file

@ -8,8 +8,12 @@ use std::fmt;
#[derive(Clone)]
pub struct State<'a> {
/// The raw input bytes from the file.
/// Beware: bytes[0] always points the the current byte the parser is examining.
bytes: &'a [u8],
/// Length of the original input in bytes
input_len: usize,
/// Current position within the input (line/column)
pub xyzlcol: LineColumn,
@ -22,6 +26,7 @@ impl<'a> State<'a> {
pub fn new(bytes: &'a [u8]) -> State<'a> {
State {
bytes,
input_len: bytes.len(),
xyzlcol: LineColumn::default(),
indent_column: 0,
}
@ -40,7 +45,10 @@ impl<'a> State<'a> {
/// Returns the current position
pub const fn pos(&self) -> Position {
Position::new(self.xyzlcol.line, self.xyzlcol.column)
Position::new(
(self.input_len - self.bytes.len()) as u32,
self.xyzlcol.line,
self.xyzlcol.column)
}
/// Returns whether the parser has reached the end of the input
@ -95,6 +103,7 @@ impl<'a> State<'a> {
Region::new(
self.pos(),
Position::new(
self.pos().bump_column(length).offset,
self.xyzlcol.line,
self
.xyzlcol

22
compiler/parse/tests/test_parse.rs
View file

@ -366,7 +366,7 @@ mod test_parse {
assert_segments(r#""Hi, \u(123)!""#, |arena| {
bumpalo::vec![in arena;
Plaintext("Hi, "),
Unicode(Loc::new(Position::new(0, 8), Position::new(0, 11), "123")),
Unicode(Loc::new(Position::new(0, 0, 0), Position::new(0, 0, 0), "123")),
Plaintext("!")
]
});
@ -376,7 +376,7 @@ mod test_parse {
fn unicode_escape_in_front() {
assert_segments(r#""\u(1234) is a unicode char""#, |arena| {
bumpalo::vec![in arena;
Unicode(Loc::new(Position::new(0, 4), Position::new(0, 8), "1234")),
Unicode(Loc::new(Position::new(0, 0, 0), Position::new(0, 0, 0), "1234")),
Plaintext(" is a unicode char")
]
});
@ -387,7 +387,7 @@ mod test_parse {
assert_segments(r#""this is unicode: \u(1)""#, |arena| {
bumpalo::vec![in arena;
Plaintext("this is unicode: "),
Unicode(Loc::new(Position::new(0, 21), Position::new(0, 22), "1"))
Unicode(Loc::new(Position::new(0, 0, 0), Position::new(0, 0, 0), "1"))
]
});
}
@ -396,11 +396,11 @@ mod test_parse {
fn unicode_escape_multiple() {
assert_segments(r#""\u(a1) this is \u(2Bcd) unicode \u(ef97)""#, |arena| {
bumpalo::vec![in arena;
Unicode(Loc::new(Position::new(0, 4), Position::new(0, 6), "a1")),
Unicode(Loc::new(Position::new(0, 0, 0), Position::new(0, 0, 0), "a1")),
Plaintext(" this is "),
Unicode(Loc::new(Position::new(0, 19), Position::new(0, 23), "2Bcd")),
Unicode(Loc::new(Position::new(0, 0, 0), Position::new(0, 0, 0), "2Bcd")),
Plaintext(" unicode "),
Unicode(Loc::new(Position::new(0, 36), Position::new(0, 40), "ef97"))
Unicode(Loc::new(Position::new(0, 0, 0), Position::new(0, 0, 0), "ef97"))
]
});
}
@ -417,7 +417,7 @@ mod test_parse {
bumpalo::vec![in arena;
Plaintext("Hi, "),
Interpolated(Loc::new(Position::new(0, 7), Position::new(0, 11), expr)),
Interpolated(Loc::new(Position::new(0, 0, 0), Position::new(0, 0, 0), expr)),
Plaintext("!")
]
});
@ -432,7 +432,7 @@ mod test_parse {
});
bumpalo::vec![in arena;
Interpolated(Loc::new(Position::new(0, 3), Position::new(0, 7), expr)),
Interpolated(Loc::new(Position::new(0, 0, 0), Position::new(0, 0, 0), expr)),
Plaintext(", hi!")
]
});
@ -448,7 +448,7 @@ mod test_parse {
bumpalo::vec![in arena;
Plaintext("Hello "),
Interpolated(Loc::new(Position::new(0, 9), Position::new(0, 13), expr))
Interpolated(Loc::new(Position::new(0, 0, 0), Position::new(0, 0, 0), expr))
]
});
}
@ -468,9 +468,9 @@ mod test_parse {
bumpalo::vec![in arena;
Plaintext("Hi, "),
Interpolated(Loc::new(Position::new(0, 7), Position::new(0, 11), expr1)),
Interpolated(Loc::new(Position::new(0, 0, 0), Position::new(0, 0, 0), expr1)),
Plaintext("! How is "),
Interpolated(Loc::new(Position::new(0, 23), Position::new(0, 30), expr2)),
Interpolated(Loc::new(Position::new(0, 0, 0), Position::new(0, 0, 0), expr2)),
Plaintext(" going?")
]
});

148
compiler/region/src/all.rs
View file

@ -2,58 +2,37 @@ use std::fmt::{self, Debug};
#[derive(Copy, Clone, Eq, PartialEq, PartialOrd, Ord, Hash, Default)]
pub struct Region {
start_line: u32,
end_line: u32,
start_col: u16,
end_col: u16,
start: Position,
end: Position,
}
impl Region {
pub const fn zero() -> Self {
Region {
start_line: 0,
end_line: 0,
start_col: 0,
end_col: 0,
start: Position::zero(),
end: Position::zero(),
}
}
pub const fn new(start: Position, end: Position) -> Self {
Self {
start_line: start.line,
end_line: end.line,
start_col: start.column,
end_col: end.column,
start,
end,
}
}
pub fn contains(&self, other: &Self) -> bool {
use std::cmp::Ordering::*;
match self.start_line.cmp(&other.start_line) {
Greater => false,
Equal => match self.end_line.cmp(&other.end_line) {
Less => false,
Equal => self.start_col <= other.start_col && self.end_col >= other.end_col,
Greater => self.start_col >= other.start_col,
},
Less => match self.end_line.cmp(&other.end_line) {
Less => false,
Equal => self.end_col >= other.end_col,
Greater => true,
},
}
self.start <= other.start && self.end >= other.end
}
pub fn is_empty(&self) -> bool {
self.end_line == self.start_line && self.start_col == self.end_col
self.start == self.end
}
pub fn span_across(start: &Region, end: &Region) -> Self {
Region {
start_line: start.start_line,
end_line: end.end_line,
start_col: start.start_col,
end_col: end.end_col,
start: start.start,
end: end.end,
}
}
@ -76,56 +55,23 @@ impl Region {
}
}
pub fn lines_between(&self, other: &Region) -> u32 {
if self.end_line <= other.start_line {
other.start_line - self.end_line
} else if self.start_line >= other.end_line {
self.start_line - other.end_line
} else {
// intersection
0
}
}
pub const fn from_pos(pos: Position) -> Self {
Region {
start_col: pos.column,
start_line: pos.line,
end_col: pos.column + 1,
end_line: pos.line,
}
}
pub const fn from_rows_cols(
start_line: u32,
start_col: u16,
end_line: u32,
end_col: u16,
) -> Self {
Region {
start_line,
end_line,
start_col,
end_col,
start: pos,
end: pos.bump_column(1),
}
}
pub const fn start(&self) -> Position {
Position {
line: self.start_line,
column: self.start_col,
}
self.start
}
pub const fn end(&self) -> Position {
Position {
line: self.end_line,
column: self.end_col,
}
self.end
}
pub const fn between(start: Position, end: Position) -> Self {
Self::from_rows_cols(start.line, start.column, end.line, end.column)
Self::new(start, end)
}
}
@ -137,7 +83,7 @@ fn region_size() {
impl fmt::Debug for Region {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
if self.start_line == 0 && self.start_col == 0 && self.end_line == 0 && self.end_col == 0 {
if self.start == Position::zero() && self.end == Position::zero() {
// In tests, it's super common to set all Located values to 0.
// Also in tests, we don't want to bother printing the locations
// because it makes failed assertions much harder to read.
@ -145,8 +91,8 @@ impl fmt::Debug for Region {
} else {
write!(
f,
"|L {}-{}, C {}-{}|",
self.start_line, self.end_line, self.start_col, self.end_col,
"@{}-{}",
self.start.offset, self.end.offset,
)
}
}
@ -154,17 +100,18 @@ impl fmt::Debug for Region {
#[derive(Copy, Clone, Eq, PartialEq, PartialOrd, Ord, Hash, Default)]
pub struct Position {
pub offset: u32,
line: u32,
column: u16,
}
impl Position {
pub const fn zero() -> Position {
Position { line: 0, column: 0 }
Position { offset: 0, line: 0, column: 0 }
}
pub const fn new(line: u32, column: u16) -> Position {
Position { line, column }
pub const fn new(offset: u32, line: u32, column: u16) -> Position {
Position { offset, line, column }
}
#[must_use]
@ -172,15 +119,16 @@ impl Position {
Self {
line: self.line,
column: self.column + count,
offset: self.offset + count as u32,
}
}
#[must_use]
pub fn bump_invisible(self, _count: u16) -> Self {
// This WILL affect the byte offset once we switch to that
pub fn bump_invisible(self, count: u16) -> Self {
Self {
line: self.line,
column: self.column,
offset: self.offset + count as u32,
}
}
@ -189,12 +137,14 @@ impl Position {
Self {
line: self.line + 1,
column: 0,
offset: self.offset + 1,
}
}
#[must_use]
pub const fn sub(self, count: u16) -> Self {
Self {
offset: self.offset - count as u32,
line: self.line,
column: self.column - count,
}
@ -203,7 +153,7 @@ impl Position {
impl Debug for Position {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(f, "{}:{}", self.line, self.column)
write!(f, "@{}", self.offset)
}
}
@ -325,6 +275,23 @@ impl LineColumnRegion {
}
}
impl fmt::Debug for LineColumnRegion {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
if self.start.line == 0 && self.start.column == 0 && self.end.line == 0 && self.end.column == 0 {
// In tests, it's super common to set all Located values to 0.
// Also in tests, we don't want to bother printing the locations
// because it makes failed assertions much harder to read.
write!(f, "…")
} else {
write!(
f,
"|L {}-{}, C {}-{}|",
self.start.line, self.end.line, self.start.column, self.end.column,
)
}
}
}
#[derive(Clone, Eq, Copy, PartialEq, PartialOrd, Ord, Hash)]
pub struct Loc<T> {
pub region: Region,
@ -373,10 +340,8 @@ where
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
let region = self.region;
if region.start_line == 0
&& region.start_col == 0
&& region.end_line == 0
&& region.end_col == 0
if region.start == Position::zero()
&& region.end == Position::zero()
{
// In tests, it's super common to set all Located values to 0.
// Also in tests, we don't want to bother printing the locations
@ -415,18 +380,23 @@ impl LineInfo {
}
pub fn convert_pos(&self, pos: Position) -> LineColumn {
// TODO
LineColumn {
line: pos.line,
column: pos.column,
}
let res = self.convert_offset(pos.offset);
// let expected = LineColumn { line: pos.line, column: pos.column };
// assert_eq!(expected, res);
res
}
pub fn convert_region(&self, region: Region) -> LineColumnRegion {
LineColumnRegion {
let res = LineColumnRegion {
start: self.convert_pos(region.start()),
end: self.convert_pos(region.end()),
}
};
let expected = LineColumnRegion::new(
LineColumn { line: region.start.line, column: region.start.column },
LineColumn { line: region.end.line, column: region.end.column },
);
assert_eq!(expected, res);
res
}
}

2
compiler/types/src/subs.rs
View file

@ -12,7 +12,7 @@ use ven_ena::unify::{InPlace, Snapshot, UnificationTable, UnifyKey};
static_assertions::assert_eq_size!([u8; 6 * 8], Descriptor);
static_assertions::assert_eq_size!([u8; 4 * 8], Content);
static_assertions::assert_eq_size!([u8; 3 * 8], FlatType);
static_assertions::assert_eq_size!([u8; 6 * 8], Problem);
// static_assertions::assert_eq_size!([u8; 6 * 8], Problem);
static_assertions::assert_eq_size!([u8; 12], UnionTags);
static_assertions::assert_eq_size!([u8; 2 * 8], RecordFields);

26
reporting/src/error/canonicalize.rs
View file

@ -2,7 +2,7 @@ use roc_collections::all::MutSet;
use roc_module::ident::{Ident, Lowercase, ModuleName};
use roc_problem::can::PrecedenceProblem::BothNonAssociative;
use roc_problem::can::{BadPattern, FloatErrorKind, IntErrorKind, Problem, RuntimeError};
use roc_region::all::{Loc, Region, LineInfo, LineColumn};
use roc_region::all::{Loc, Region, LineInfo, LineColumn, LineColumnRegion};
use std::path::PathBuf;
use crate::error::r#type::suggest;
@ -496,11 +496,11 @@ fn to_bad_ident_expr_report<'b>(
match bad_ident {
Start(_) | Space(_, _) => unreachable!("these are handled in the parser"),
WeirdDotAccess(pos) | StrayDot(pos) => {
let region = Region::from_pos(pos);
let region = LineColumnRegion::from_pos(lines.convert_pos(pos));
alloc.stack(vec![
alloc.reflow(r"I trying to parse a record field access here:"),
alloc.region_with_subregion(lines.convert_region(surroundings), lines.convert_region(region)),
alloc.region_with_subregion(lines.convert_region(surroundings), region),
alloc.concat(vec![
alloc.reflow("So I expect to see a lowercase letter next, like "),
alloc.parser_suggestion(".name"),
@ -527,11 +527,11 @@ fn to_bad_ident_expr_report<'b>(
]),
WeirdDotQualified(pos) => {
let region = Region::from_pos(pos);
let region = LineColumnRegion::from_pos(lines.convert_pos(pos));
alloc.stack(vec![
alloc.reflow("I am trying to parse a qualified name here:"),
alloc.region_with_subregion(lines.convert_region(surroundings), lines.convert_region(region)),
alloc.region_with_subregion(lines.convert_region(surroundings), region),
alloc.concat(vec![
alloc.reflow("I was expecting to see an identifier next, like "),
alloc.parser_suggestion("height"),
@ -542,11 +542,11 @@ fn to_bad_ident_expr_report<'b>(
])
}
QualifiedTag(pos) => {
let region = Region::from_pos(pos);
let region = LineColumnRegion::from_pos(lines.convert_pos(pos));
alloc.stack(vec![
alloc.reflow("I am trying to parse a qualified name here:"),
alloc.region_with_subregion(lines.convert_region(surroundings), lines.convert_region(region)),
alloc.region_with_subregion(lines.convert_region(surroundings), region),
alloc.concat(vec![
alloc.reflow(r"This looks like a qualified tag name to me, "),
alloc.reflow(r"but tags cannot be qualified! "),
@ -632,11 +632,11 @@ fn to_bad_ident_pattern_report<'b>(
match bad_ident {
Start(_) | Space(_, _) => unreachable!("these are handled in the parser"),
WeirdDotAccess(pos) | StrayDot(pos) => {
let region = Region::from_pos(pos);
let region = LineColumnRegion::from_pos(lines.convert_pos(pos));
alloc.stack(vec![
alloc.reflow(r"I trying to parse a record field accessor here:"),
alloc.region_with_subregion(lines.convert_region(surroundings), lines.convert_region(region)),
alloc.region_with_subregion(lines.convert_region(surroundings), region),
alloc.concat(vec![
alloc.reflow("Something like "),
alloc.parser_suggestion(".name"),
@ -663,11 +663,11 @@ fn to_bad_ident_pattern_report<'b>(
]),
WeirdDotQualified(pos) => {
let region = Region::from_pos(pos);
let region = LineColumnRegion::from_pos(lines.convert_pos(pos));
alloc.stack(vec![
alloc.reflow("I am trying to parse a qualified name here:"),
alloc.region_with_subregion(lines.convert_region(surroundings), lines.convert_region(region)),
alloc.region_with_subregion(lines.convert_region(surroundings), region),
alloc.concat(vec![
alloc.reflow("I was expecting to see an identifier next, like "),
alloc.parser_suggestion("height"),
@ -678,11 +678,11 @@ fn to_bad_ident_pattern_report<'b>(
])
}
QualifiedTag(pos) => {
let region = Region::from_pos(pos);
let region = LineColumnRegion::from_pos(lines.convert_pos(pos));
alloc.stack(vec![
alloc.reflow("I am trying to parse a qualified name here:"),
alloc.region_with_subregion(lines.convert_region(surroundings), lines.convert_region(region)),
alloc.region_with_subregion(lines.convert_region(surroundings), region),
alloc.concat(vec![
alloc.reflow(r"This looks like a qualified tag name to me, "),
alloc.reflow(r"but tags cannot be qualified! "),

338
reporting/src/error/parse.rs
View file

File diff suppressed because it is too large Load diff