From 469b4e67aa7ec65d36cb6a9a3ab6a18988291d9c Mon Sep 17 00:00:00 2001
From: iximeow <me@iximeow.net>
Date: Wed, 20 Mar 2019 14:31:01 -0700
Subject: real color settings, and defaults
---
Cargo.toml | 1 +
src/lib.rs | 45 ++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 45 insertions(+), 1 deletion(-)
diff --git a/Cargo.toml b/Cargo.toml
index 768bcdc..f1d041e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,3 +9,4 @@ description = "fundamental traits to describe an architecture in the yaxpeax pro
[dependencies]
"num-traits" = "0.2"
+"termion" = "1.4.0"
diff --git a/src/lib.rs b/src/lib.rs
index 96c4144..7a69a06 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,4 +1,5 @@
extern crate num_traits;
+extern crate termion;
use std::str::FromStr;
@@ -6,10 +7,14 @@ use std::fmt::{Debug, Display, Formatter};
use std::ops::{Add, Sub, AddAssign, SubAssign};
+use std::rc::Rc;
+
use num_traits::identities;
use num_traits::{Bounded, WrappingAdd, WrappingSub, CheckedAdd, CheckedSub};
- // This is pretty wonk..
+use termion::color;
+
+ // This is pretty wonk..
pub trait AddressDisplay {
fn stringy(&self) -> String;
}
@@ -91,6 +96,44 @@ pub trait LengthedInstruction {
}
pub struct ColorSettings {
+ arithmetic: color::Fg<&'static color::Color>,
+ stack: color::Fg<&'static color::Color>,
+ nop: color::Fg<&'static color::Color>,
+ stop: color::Fg<&'static color::Color>,
+ control: color::Fg<&'static color::Color>,
+ data: color::Fg<&'static color::Color>,
+ comparison: color::Fg<&'static color::Color>,
+ invalid: color::Fg<&'static color::Color>,
+ platform: color::Fg<&'static color::Color>,
+ misc: color::Fg<&'static color::Color>
+}
+
+impl Default for ColorSettings {
+ fn default() -> ColorSettings {
+ ColorSettings {
+ arithmetic: color::Fg(&color::LightYellow),
+ stack: color::Fg(&color::Magenta),
+ nop: color::Fg(&color::Blue),
+ stop: color::Fg(&color::LightRed),
+ control: color::Fg(&color::Green),
+ data: color::Fg(&color::LightMagenta),
+ comparison: color::Fg(&color::Yellow),
+ invalid: color::Fg(&color::Red),
+ platform: color::Fg(&color::Cyan),
+ misc: color::Fg(&color::LightCyan),
+ }
+ }
+}
+
+impl ColorSettings {
+ pub fn arithmetic_op(&self) -> &color::Fg<&'static color::Color> { &self.arithmetic }
+ pub fn stack_op(&self) -> &color::Fg<&'static color::Color> { &self.stack }
+ pub fn nop_op(&self) -> &color::Fg<&'static color::Color> { &self.nop }
+ pub fn stop_op(&self) -> &color::Fg<&'static color::Color> { &self.stop }
+ pub fn control_flow_op(&self) -> &color::Fg<&'static color::Color> { &self.control }
+ pub fn data_op(&self) -> &color::Fg<&'static color::Color> { &self.data }
+ pub fn comparison_op(&self) -> &color::Fg<&'static color::Color> { &self.comparison }
+ pub fn invalid_op(&self) -> &color::Fg<&'static color::Color> { &self.invalid }
}
/*
--
cgit v1.1