forked from extern/nushell
4be88ff572
The original purpose of this PR was to modernize the external parser to use the new Shape system. This commit does include some of that change, but a more important aspect of this change is an improvement to the expansion trace. Previous commit 6a7c00ea adding trace infrastructure to the syntax coloring feature. This commit adds tracing to the expander. The bulk of that work, in addition to the tree builder logic, was an overhaul of the formatter traits to make them more general purpose, and more structured. Some highlights: - `ToDebug` was split into two traits (`ToDebug` and `DebugFormat`) because implementations needed to become objects, but a convenience method on `ToDebug` didn't qualify - `DebugFormat`'s `fmt_debug` method now takes a `DebugFormatter` rather than a standard formatter, and `DebugFormatter` has a new (but still limited) facility for structured formatting. - Implementations of `ExpandSyntax` need to produce output that implements `DebugFormat`. Unlike the highlighter changes, these changes are fairly focused in the trace output, so these changes aren't behind a flag.
62 lines
1.5 KiB
Rust
62 lines
1.5 KiB
Rust
use crate::prelude::*;
|
|
use serde::{Deserialize, Serialize};
|
|
use std::fmt;
|
|
use std::str::FromStr;
|
|
|
|
#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Deserialize, Serialize)]
|
|
pub enum Operator {
|
|
Equal,
|
|
NotEqual,
|
|
LessThan,
|
|
GreaterThan,
|
|
LessThanOrEqual,
|
|
GreaterThanOrEqual,
|
|
Dot,
|
|
}
|
|
|
|
impl FormatDebug for Operator {
|
|
fn fmt_debug(&self, f: &mut DebugFormatter, _source: &str) -> fmt::Result {
|
|
write!(f, "{}", self.as_str())
|
|
}
|
|
}
|
|
|
|
impl Operator {
|
|
pub fn print(&self) -> String {
|
|
self.as_str().to_string()
|
|
}
|
|
|
|
pub fn as_str(&self) -> &str {
|
|
match *self {
|
|
Operator::Equal => "==",
|
|
Operator::NotEqual => "!=",
|
|
Operator::LessThan => "<",
|
|
Operator::GreaterThan => ">",
|
|
Operator::LessThanOrEqual => "<=",
|
|
Operator::GreaterThanOrEqual => ">=",
|
|
Operator::Dot => ".",
|
|
}
|
|
}
|
|
}
|
|
|
|
impl From<&str> for Operator {
|
|
fn from(input: &str) -> Operator {
|
|
Operator::from_str(input).unwrap()
|
|
}
|
|
}
|
|
|
|
impl FromStr for Operator {
|
|
type Err = ();
|
|
fn from_str(input: &str) -> Result<Self, <Self as std::str::FromStr>::Err> {
|
|
match input {
|
|
"==" => Ok(Operator::Equal),
|
|
"!=" => Ok(Operator::NotEqual),
|
|
"<" => Ok(Operator::LessThan),
|
|
">" => Ok(Operator::GreaterThan),
|
|
"<=" => Ok(Operator::LessThanOrEqual),
|
|
">=" => Ok(Operator::GreaterThanOrEqual),
|
|
"." => Ok(Operator::Dot),
|
|
_ => Err(()),
|
|
}
|
|
}
|
|
}
|