all errors now contain source location

crsn_screen/src/lib.rs

@@ -5,6 +5,7 @@ use crsn::asm::error::CrsnError;
 use crsn::asm::instr::op::OpKind;
 use crsn::asm::parse::arg_parser::TokenParser;
 use crsn::module::{CrsnExtension, ParseRes};
+use crsn::sexp::SourcePosition;
 
 mod defs;
 mod parse;
@@ -24,7 +25,7 @@ impl CrsnExtension for ScreenOps {
         "screen"
     }
 
-    fn parse_op<'a>(&self, keyword: &str, args: TokenParser<'a>) -> Result<ParseRes<'a, OpKind>, CrsnError> {
-        parse::parse(keyword, args)
+    fn parse_op<'a>(&self, pos: SourcePosition, keyword: &str, args: TokenParser<'a>) -> Result<ParseRes<'a, OpKind>, CrsnError> {
+        parse::parse(pos, keyword, args)
     }
 }

crsn_screen/src/parse.rs

@@ -5,8 +5,9 @@ use crsn::asm::parse::arg_parser::TokenParser;
 use crsn::module::ParseRes;
 
 use crate::defs::ScreenOp;
+use crsn::sexp::SourcePosition;
 
-pub(crate) fn parse<'a>(keyword: &str, mut args: TokenParser<'a>) -> Result<ParseRes<'a, OpKind>, CrsnError> {
+pub(crate) fn parse<'a>(pos: SourcePosition, keyword: &str, mut args: TokenParser<'a>) -> Result<ParseRes<'a, OpKind>, CrsnError> {
     Ok(ParseRes::ext(match keyword {
         "sc-init" => {
             ScreenOp::ScreenInit {