Implement an intelligent source merging strategy

The previous source merging strategy was to concatenate source units
in the reverse order that they were added to the resolver, which
generally only worked when each source unit had at most one
macro-resolving parent.

An issue arose when some macros in a source unit were resolved by a
source unit which had been added earlier in the order, as the required
macro definitions would then be merged after they were referenced,
preventing the program from assembling.

The new source merging strategy finds an optimal merge order by first
recording for a given source unit the ID of each unit which resolves a
macro referenced by the given unit, and then only merging those source
units whose macro-defining dependencies have already been merged. In the
case that a cycle is detected, where two or more source units depend on
one another, a message is printed and the assembly is aborted.

1 files changed, 16 insertions, 3 deletions

diff --git a/src/gather_libraries.rs b/src/gather_libraries.rs
index 0b5d2a6..0fd1131 100644
--- a/src/gather_libraries.rs
+++ b/src/gather_libraries.rs
@@ -117,15 +117,19 @@ fn parse_symbols_from_source(source_code: String, path: Option<&Path>) -> Symbol
     let mut references = Vec::new();
 
     for token in token_iter {
+        let source = token.source;
         match token.variant {
             SynVar::LabelDefinition(name) => {
-                definitions.push(Symbol { name, source: token.source });
+                let variant = SymbolVariant::LabelDefinition;
+                definitions.push(Symbol { name, source, variant });
             },
             SynVar::MacroDefinition(name) => {
-                definitions.push(Symbol { name, source: token.source });
+                let variant = SymbolVariant::MacroDefinition;
+                definitions.push(Symbol { name, source, variant });
             }
             SynVar::Symbol(name) => {
-                references.push(Symbol { name, source: token.source });
+                let variant = SymbolVariant::Reference;
+                references.push(Symbol { name, source, variant });
             },
             _ => (),
         }
@@ -181,5 +185,14 @@ pub struct Symbols {
 
 pub struct Symbol {
     pub name: String,
+    pub variant: SymbolVariant,
     pub source: SourceSpan,
 }
+
+
+#[derive(PartialEq)]
+pub enum SymbolVariant {
+    LabelDefinition,
+    MacroDefinition,
+    Reference,
+}