-
Notifications
You must be signed in to change notification settings - Fork 87
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #13 from Ph0enixKM/A14
A14 Feature: Add Command
- Loading branch information
Showing
5 changed files
with
92 additions
and
50 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
use heraclitus_compiler::prelude::*; | ||
use crate::{utils::metadata::ParserMetadata, modules::{Type, Typed}}; | ||
use crate::modules::expression::expr::Expr; | ||
|
||
use super::parse_interpolated_region; | ||
|
||
#[derive(Debug)] | ||
pub struct Command { | ||
strings: Vec<String>, | ||
interps: Vec<Expr> | ||
} | ||
|
||
impl Typed for Command { | ||
fn get_type(&self) -> Type { | ||
Type::Text | ||
} | ||
} | ||
|
||
impl SyntaxModule<ParserMetadata> for Command { | ||
syntax_name!("Command"); | ||
|
||
fn new() -> Self { | ||
Command { | ||
strings: vec![], | ||
interps: vec![] | ||
} | ||
} | ||
|
||
fn parse(&mut self, meta: &mut ParserMetadata) -> SyntaxResult { | ||
(self.strings, self.interps) = parse_interpolated_region(meta, '$')?; | ||
Ok(()) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,53 @@ | ||
use std::vec; | ||
|
||
use heraclitus_compiler::prelude::*; | ||
use crate::utils::metadata::ParserMetadata; | ||
use crate::modules::expression::expr::Expr; | ||
|
||
pub mod bool; | ||
pub mod number; | ||
pub mod text; | ||
pub mod void; | ||
pub mod void; | ||
pub mod command; | ||
|
||
pub fn parse_interpolated_region(meta: &mut ParserMetadata, letter: char) -> Result<(Vec<String>, Vec<Expr>), ErrorDetails> { | ||
let mut strings = vec![]; | ||
let mut interps = vec![]; | ||
// Handle full string | ||
if let Ok(word) = token_by(meta, |word| word.starts_with(letter) && word.ends_with(letter) && word.len() > 1) { | ||
let stripped = word.chars().take(word.len() - 1).skip(1).collect::<String>(); | ||
strings.push(stripped); | ||
Ok((strings, interps)) | ||
} | ||
else { | ||
let mut is_interp = false; | ||
// Initialize string | ||
strings.push(token_by(meta, |word| word.starts_with(letter))?); | ||
// Factor rest of the interpolation | ||
while let Some(token) = meta.get_current_token() { | ||
// Track interpolations | ||
match token.word.as_str() { | ||
"{" => is_interp = true, | ||
"}" => is_interp = false, | ||
// Manage inserting strings and intrpolations | ||
_ => if is_interp { | ||
let mut expr = Expr::new(); | ||
syntax(meta, &mut expr)?; | ||
interps.push(expr); | ||
// TODO: [H50] In the next release of Heraclitus | ||
// Change this line to `meta.offset_index(-1)` | ||
meta.set_index(meta.get_index() - 1); | ||
} | ||
else { | ||
strings.push(token.word.clone()); | ||
if token.word.ends_with(letter) { | ||
meta.increment_index(); | ||
return Ok((strings, interps)) | ||
} | ||
} | ||
} | ||
meta.increment_index(); | ||
} | ||
Err(ErrorDetails::from_metadata(meta)) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters