Use CharCounter to find line number

src/diagn/span.rs

@@ -5,19 +5,17 @@ use std::rc::Rc;
 pub struct Span
 {
  pub file: Rc<String>,
- pub line: Option<usize>,
  pub location: Option<(usize, usize)>
 }
 
 
 impl Span
 {
- pub fn new(filename: Rc<String>, line: usize, start: usize, end: usize) -> Span
+ pub fn new(filename: Rc<String>, start: usize, end: usize) -> Span
  {
  Span
  {
  file: filename,
- line: Some(line),
  location: Some((start, end))
  }
  }
@@ -28,7 +26,6 @@ impl Span
  Span
  {
  file: Rc::new("".to_string()),
- line: None,
  location: None
  }
  }
@@ -46,7 +43,6 @@ impl Span
  Span
  {
  file: self.file.clone(),
- line: self.line,
  location: Some((start, start))
  }
  }
@@ -65,7 +61,6 @@ impl Span
  Span
  {
  file: self.file.clone(),
- line: self.line,
  location: Some((end, end))
  }
  }
@@ -90,19 +85,9 @@ impl Span
  Some((start, end))
  };
 
- let line = if self.location.unwrap().0 <= other.location.unwrap().0
- {
- self.line
- }
- else
- {
- other.line
- };
-
  Span
  {
  file: self.file.clone(),
- line,
  location
  }
  }

src/driver.rs

@@ -226,10 +226,10 @@ fn drive_inner(
  OutputFormat::HexC => binary.format_c_array (16).bytes().collect(),
  OutputFormat::LogiSim8 => binary.format_logisim (8) .bytes().collect(),
  OutputFormat::LogiSim16 => binary.format_logisim (16).bytes().collect(),
- OutputFormat::Debugger => binary.format_debugger() .bytes().collect(),
 
  OutputFormat::AnnotatedHex => binary.format_annotated_hex(fileserver).bytes().collect(),
  OutputFormat::AnnotatedBin => binary.format_annotated_bin(fileserver).bytes().collect(),
+ OutputFormat::Debugger => binary.format_debugger (fileserver).bytes().collect(),
  };
 
  if out_stdout

src/syntax/token.rs

@@ -243,7 +243,6 @@ where S: Into<String>
  let filename = Rc::new(src_filename.into());
  let mut tokens = Vec::new();
  let mut index = 0;
- let mut line = 0;
  let mut had_error = false;
 
  while index < src.len()
@@ -258,12 +257,7 @@ where S: Into<String>
  check_for_string (&src[index..]).unwrap_or_else(||
  (TokenKind::Error, 1)))))));
 
- if kind == TokenKind::LineBreak
- {
- line += 1;
- }
-
- let span = Span::new(filename.clone(), line, index, index + length);
+ let span = Span::new(filename.clone(), index, index + length);
 
  // Get the source excerpt for variable tokens (e.g. identifiers).
  let excerpt = match kind.needs_excerpt()

src/test/excerpt.rs

@@ -16,7 +16,7 @@ fn test(src: &str, expected: ExpectedResult<&str>)
  let mut fileserver = util::FileServerMock::new();
  fileserver.add("test", src_quoted);
 
- let span = diagn::Span::new(Rc::new("test".to_string()), 0, 0, 0);
+ let span = diagn::Span::new(Rc::new("test".to_string()), 0, 0);
 
  let result = syntax::excerpt_as_string_contents(report.clone(), src_quoted, &span).ok();
  let result = result.as_ref().map(|s| s.as_ref());

src/util/bitvec_format.rs

@@ -1,4 +1,6 @@
 use crate::*;
+use crate::util::CharCounter;
+use crate::diagn::RcReport;
 
 
 impl util::BitVec
@@ -477,7 +479,7 @@ impl util::BitVec
  result
  }
 
- pub fn format_debugger(&self) -> String
+ pub fn format_debugger(&self, fileserver: &dyn util::FileServer) -> String
  {
  let mut result = String::new();
 
@@ -489,15 +491,19 @@ impl util::BitVec
  {
  a.offset.cmp(&b.offset)
  });
- 
+
  for span in &sorted_spans
  {
+ let chars = fileserver.get_chars(RcReport::new(), &span.span.file, None).ok().unwrap();
+ let counter = CharCounter::new(&chars);
+
  addr_width = std::cmp::max(
  addr_width,
  format!("{:x}", span.addr).len());
 
- if let Some(line) = span.span.line
+ if let Some((start, _)) = span.span.location
  {
+ let (line, _) = counter.get_line_column_at_index(start);
  line_width = std::cmp::max(
  line_width,
  format!("{}", line).len());
@@ -513,8 +519,21 @@ impl util::BitVec
 
  for span in &sorted_spans
  {
+ let chars = fileserver.get_chars(RcReport::new(), &span.span.file, None).ok().unwrap();
+ let counter = CharCounter::new(&chars);
+
+ let line = if let Some((start, _)) = span.span.location
+ {
+ let (l, _) = counter.get_line_column_at_index(start);
+ l
+ }
+ else
+ {
+ 0
+ };
+
  result.push_str(&format!(" {:1$x} | ", span.addr, addr_width));
- result.push_str(&format!("{:1$} | ", span.span.line.unwrap_or_default(), line_width));
+ result.push_str(&format!("{:1$} | ", line, line_width));
 
  if &*span.span.file != prev_filename
  {