Skip to content

use strum_macros::Display for Token #666

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
moritz-gross wants to merge 1 commit into from
Closed

use strum_macros::Display for Token #666

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 7 additions & 16 deletions src/infer_intent.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ use crate::pretty_print::mml_to_string;
use crate::xpath_functions::is_leaf;
use regex::Regex;
use phf::phf_set;
use strum_macros::Display;
#[allow(unused_imports)]
use log::{debug, error, warn};

Expand Down Expand Up @@ -284,31 +285,21 @@ static TERMINALS_AS_U8: [u8; 3] = *b"(,)";
// static TERMINALS: [char; 3] = ['(', ',',')'];

// 'i -- "i" for the lifetime of the INTENT_ATTR string
#[derive(Debug, PartialEq, Eq, Clone)]
#[derive(Debug, PartialEq, Eq, Clone, Display)]
enum Token<'i> {
#[strum(to_string = "Terminal('{0}')")]
Terminal(&'i str), // "(", ",", ")"
#[strum(to_string = "Property({0})")]
Property(&'i str),
#[strum(to_string = "ArgRef({0})")]
ArgRef(&'i str),
#[strum(to_string = "Literal({0})")]
ConceptOrLiteral(&'i str),
#[strum(to_string = "Number({0})")]
Number(&'i str),
None, // out of characters
}

impl fmt::Display for Token<'_> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
return write!(f, "{}",
match self {
Token::Terminal(str) => format!("Terminal('{str}')"),
Token::Property(str) => format!("Property({str})"),
Token::ArgRef(str) => format!("ArgRef({str})"),
Token::ConceptOrLiteral(str) => format!("Literal({str})"),
Token::Number(str) => format!("Number({str})"),
Token::None => "None".to_string(),
}
);
}
}

impl Token<'_> {
fn is_terminal(&self, terminal: &str) -> bool {
if let Token::Terminal(value) = *self {
Expand Down
Loading