no_std
Add `std` default feature Only implement for String if `std` is enabled Replace std Vec with heapless
This commit is contained in:
10
src/enums.rs
10
src/enums.rs
@@ -1,6 +1,8 @@
|
||||
#[cfg(test)]
|
||||
mod tests;
|
||||
|
||||
use heapless::{Vec, consts::U5};
|
||||
|
||||
///The following are the implemented ANSI escape sequences. More to be added.
|
||||
#[derive(Debug, PartialEq)]
|
||||
pub enum AnsiSequence {
|
||||
@@ -13,7 +15,7 @@ pub enum AnsiSequence {
|
||||
CursorRestore,
|
||||
EraseDisplay,
|
||||
EraseLine,
|
||||
SetGraphicsMode(Vec<u32>),
|
||||
SetGraphicsMode(Vec<u8, U5>),
|
||||
SetMode(u8),
|
||||
ResetMode(u8),
|
||||
HideCursor,
|
||||
@@ -54,9 +56,9 @@ pub enum AnsiSequence {
|
||||
SetTopAndBottom(u32, u32),
|
||||
}
|
||||
|
||||
use std::fmt::Display;
|
||||
use core::fmt::{Display, Formatter, Result as DisplayResult};
|
||||
impl Display for AnsiSequence {
|
||||
fn fmt(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
|
||||
fn fmt(&self, formatter: &mut Formatter) -> DisplayResult {
|
||||
write!(formatter, "\u{1b}")?;
|
||||
|
||||
use AnsiSequence::*;
|
||||
@@ -179,7 +181,7 @@ pub enum Output<'a> {
|
||||
}
|
||||
|
||||
impl<'a> Display for Output<'a> {
|
||||
fn fmt(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
|
||||
fn fmt(&self, formatter: &mut Formatter) -> DisplayResult {
|
||||
use Output::*;
|
||||
match self {
|
||||
TextBlock(txt) => write!(formatter, "{}", txt),
|
||||
|
@@ -1,4 +1,5 @@
|
||||
#![recursion_limit="256"]
|
||||
#![cfg_attr(not(any(feature = "std", test)), no_std)]
|
||||
|
||||
mod enums;
|
||||
mod parsers;
|
||||
|
@@ -3,7 +3,8 @@ mod tests;
|
||||
|
||||
use crate::{AnsiSequence, Output};
|
||||
|
||||
use std::convert::TryInto;
|
||||
use core::convert::TryInto;
|
||||
use heapless::Vec;
|
||||
use nom::*;
|
||||
|
||||
macro_rules! tag_parser {
|
||||
@@ -97,7 +98,9 @@ named!(
|
||||
tag!("[") >>
|
||||
val: parse_int >>
|
||||
tag!("m") >>
|
||||
(AnsiSequence::SetGraphicsMode(vec![val]))
|
||||
val: expr_res!(val.try_into()) >>
|
||||
conv: expr_res!(Vec::from_slice(&[val])) >>
|
||||
(AnsiSequence::SetGraphicsMode(conv))
|
||||
)
|
||||
);
|
||||
|
||||
@@ -109,7 +112,13 @@ named!(
|
||||
tag!(";") >>
|
||||
val2: parse_int >>
|
||||
tag!("m") >>
|
||||
(AnsiSequence::SetGraphicsMode(vec![val1, val2]))
|
||||
val1: expr_res!(val1.try_into()) >>
|
||||
val2: expr_res!(val2.try_into()) >>
|
||||
conv: expr_res!(Vec::from_slice(&[
|
||||
val1,
|
||||
val2,
|
||||
])) >>
|
||||
(AnsiSequence::SetGraphicsMode(conv))
|
||||
)
|
||||
);
|
||||
|
||||
@@ -123,7 +132,15 @@ named!(
|
||||
tag!(";") >>
|
||||
val3: parse_int >>
|
||||
tag!("m") >>
|
||||
(AnsiSequence::SetGraphicsMode(vec![val1, val2, val3]))
|
||||
val1: expr_res!(val1.try_into()) >>
|
||||
val2: expr_res!(val2.try_into()) >>
|
||||
val3: expr_res!(val3.try_into()) >>
|
||||
conv: expr_res!(Vec::from_slice(&[
|
||||
val1,
|
||||
val2,
|
||||
val3,
|
||||
])) >>
|
||||
(AnsiSequence::SetGraphicsMode(conv))
|
||||
)
|
||||
);
|
||||
|
||||
@@ -131,11 +148,10 @@ named!(
|
||||
graphics_mode4<&str, AnsiSequence>,
|
||||
do_parse!(
|
||||
tag!("[m") >>
|
||||
(AnsiSequence::SetGraphicsMode(vec![]))
|
||||
(AnsiSequence::SetGraphicsMode(Vec::new()))
|
||||
)
|
||||
);
|
||||
|
||||
|
||||
named!(
|
||||
graphics_mode5<&str, AnsiSequence>,
|
||||
do_parse!(
|
||||
@@ -150,7 +166,19 @@ named!(
|
||||
tag!(";") >>
|
||||
val5: parse_int >>
|
||||
tag!("m") >>
|
||||
(AnsiSequence::SetGraphicsMode(vec![val1, val2, val3, val4, val5]))
|
||||
val1: expr_res!(val1.try_into()) >>
|
||||
val2: expr_res!(val2.try_into()) >>
|
||||
val3: expr_res!(val3.try_into()) >>
|
||||
val4: expr_res!(val4.try_into()) >>
|
||||
val5: expr_res!(val5.try_into()) >>
|
||||
conv: expr_res!(Vec::from_slice(&[
|
||||
val1,
|
||||
val2,
|
||||
val3,
|
||||
val4,
|
||||
val5,
|
||||
])) >>
|
||||
(AnsiSequence::SetGraphicsMode(conv))
|
||||
)
|
||||
);
|
||||
|
||||
|
@@ -1,5 +1,8 @@
|
||||
use super::*;
|
||||
use crate::*;
|
||||
use crate::{
|
||||
enums::{AnsiSequence, Output},
|
||||
parsers::parse_escape,
|
||||
traits::AnsiParser,
|
||||
};
|
||||
|
||||
use std::fmt::Write;
|
||||
|
||||
|
@@ -13,6 +13,7 @@ impl AnsiParser for str {
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(any(feature = "std", test))]
|
||||
impl AnsiParser for String {
|
||||
fn ansi_parse(&self) -> AnsiParseIterator<'_> {
|
||||
AnsiParseIterator {
|
||||
|
Reference in New Issue
Block a user