fix some syntax issues

src/asm/parser/directive_const.rs

@@ -1,11 +1,11 @@
-use super::*;
+use crate::*;
 
 
 pub fn parse(
     report: &mut diagn::Report,
     walker: &mut syntax::Walker,
     _header_span: diagn::Span)
-    -> Result<AstSymbol, ()>
+    -> Result<asm::AstSymbol, ()>
 {
     let mut no_emit = false;
 
@@ -50,11 +50,11 @@ pub fn parse(
     let expr = expr::parse(report, walker)?;
     walker.expect_linebreak(report)?;
 
-    Ok(AstSymbol {
+    Ok(asm::AstSymbol {
         decl_span,
         hierarchy_level,
         name,
-        kind: AstSymbolKind::Constant(AstSymbolConstant {
+        kind: asm::AstSymbolKind::Constant(asm::AstSymbolConstant {
             expr,
         }),
         no_emit,

src/asm/parser/directive_if.rs

@@ -1,4 +1,4 @@
-use crate::{*, asm::AstTopLevel};
+use crate::*;
 
 
 #[derive(Clone, Debug)]
@@ -36,7 +36,7 @@ pub fn parse(
 fn parse_braced_block(
     report: &mut diagn::Report,
     walker: &mut syntax::Walker)
-    -> Result<AstTopLevel, ()>
+    -> Result<asm::AstTopLevel, ()>
 {
     walker.expect(report, syntax::TokenKind::BraceOpen)?;
 
@@ -53,7 +53,7 @@ fn parse_braced_block(
 fn parse_else_blocks(
     report: &mut diagn::Report,
     walker: &mut syntax::Walker)
-    -> Result<Option<AstTopLevel>, ()>
+    -> Result<Option<asm::AstTopLevel>, ()>
 {
     if !walker.next_useful_is(0, syntax::TokenKind::Hash) ||
         !walker.next_useful_is(1, syntax::TokenKind::Identifier)
@@ -93,7 +93,7 @@ fn parse_else_blocks(
             walker,
             header_span)?;
 
-        let ast_toplevel = AstTopLevel {
+        let ast_toplevel = asm::AstTopLevel {
             nodes: vec![asm::AstAny::DirectiveIf(ast_if)],
         };
 

src/asm/parser/fields.rs

@@ -1,4 +1,4 @@
-use super::*;
+use crate::*;
 
 
 pub struct AstFields

src/asm/parser/symbol.rs

@@ -1,4 +1,4 @@
-use super::*;
+use crate::*;
 
 
 #[derive(Clone, Debug)]
@@ -32,7 +32,7 @@ pub struct AstSymbolConstant
 pub fn parse(
     report: &mut diagn::Report,
     walker: &mut syntax::Walker)
-    -> Result<AstAny, ()>
+    -> Result<asm::AstAny, ()>
 {
     let mut decl_span = diagn::Span::new_dummy();
     let mut hierarchy_level = 0;
@@ -53,7 +53,7 @@ pub fn parse(
         let expr = expr::parse(report, walker)?;
         walker.expect_linebreak(report)?;
 
-        Ok(AstAny::Symbol(AstSymbol {
+        Ok(asm::AstAny::Symbol(AstSymbol {
             decl_span,
             hierarchy_level,
             name,
@@ -70,7 +70,7 @@ pub fn parse(
         let tk_colon = walker.expect(report, syntax::TokenKind::Colon)?;
         decl_span = decl_span.join(tk_colon.span);
 
-        Ok(AstAny::Symbol(AstSymbol {
+        Ok(asm::AstAny::Symbol(AstSymbol {
             decl_span,
             hierarchy_level,
             name,

src/lib.rs

@@ -30,7 +30,7 @@ pub fn assemble_str_to_binary(
 
 	let mut report = diagn::Report::new();
 	let mut fileserver = util::FileServerMock::new();
-	fileserver.add(virtual_filename, src.clone());
+	fileserver.add(virtual_filename, src);
 
 	let opts = asm::AssemblyOptions::new();