cleanup. remove conditional jumps, replaced by condition embedded in the enum

crsn_screen/src/lib.rs

@@ -2,7 +2,7 @@
 extern crate log;
 
 use crsn::asm::error::CrsnError;
-use crsn::asm::instr::Op;
+use crsn::asm::instr::op::OpKind;
 use crsn::asm::parse::arg_parser::TokenParser;
 use crsn::module::{CrsnExtension, ParseRes};
 
@@ -24,7 +24,7 @@ impl CrsnExtension for ScreenOps {
         "screen"
     }
 
-    fn parse_op<'a>(&self, keyword: &str, args: TokenParser<'a>) -> Result<ParseRes<'a, Op>, CrsnError> {
+    fn parse_op<'a>(&self, keyword: &str, args: TokenParser<'a>) -> Result<ParseRes<'a, OpKind>, CrsnError> {
         parse::parse(keyword, args)
     }
 }

crsn_screen/src/parse.rs

@@ -1,12 +1,12 @@
 use crsn::asm::data::Rd;
 use crsn::asm::error::CrsnError;
-use crsn::asm::instr::Op;
+use crsn::asm::instr::op::OpKind;
 use crsn::asm::parse::arg_parser::TokenParser;
 use crsn::module::ParseRes;
 
 use crate::defs::ScreenOp;
 
-pub(crate) fn parse<'a>(keyword: &str, mut args: TokenParser<'a>) -> Result<ParseRes<'a, Op>, CrsnError> {
+pub(crate) fn parse<'a>(keyword: &str, mut args: TokenParser<'a>) -> Result<ParseRes<'a, OpKind>, CrsnError> {
     Ok(ParseRes::ext(match keyword {
         "sc-init" => {
             ScreenOp::ScreenInit {