Re-work the support on labels, variables and jumps

As a way to firstly adapt on the latest changes from the parser since
184c39579227 ("Re-work the parser from scratch"), the assembler had to
leave out some features on 16114b2ca358 ("Adapt the assembler to the
changes on the parser"). This commit reintroduces support for settings
labels, variables and referencing them, while also providing a more
robust implementation at that.

Signed-off-by: Miquel Sabaté Solà <mikisabate@gmail.com>

1 files changed, 6 insertions, 4 deletions

diff --git a/lib/xixanta/src/node.rs b/lib/xixanta/src/node.rs
index 18a5402..f55ca11 100644
--- a/lib/xixanta/src/node.rs
+++ b/lib/xixanta/src/node.rs
@@ -1,5 +1,4 @@
 use std::fmt;
-use std::ops::Range;
 
 /// A Positioned String. That is, a String which also has information on the
 /// line number and the column range.
@@ -11,14 +10,17 @@ pub struct PString {
     /// Line number where it has been found.
     pub line: usize,
 
-    /// The column range where it has been found.
-    pub range: Range<usize>,
+    /// The start column where it has been found.
+    pub start: usize,
+
+    /// The end column where it has been found.
+    pub end: usize,
 }
 
 impl PString {
     /// Returns true if the string has either an empty value or an empty range.
     pub fn is_empty(&self) -> bool {
-        self.value.is_empty() || self.range.is_empty()
+        self.value.is_empty() || (self.start == self.end)
     }
 
     /// Returns an empty tuple if the string contains a valid identifier, or a