Skip to content
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.

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

A3 Feature: Add Literal #6

Merged
merged 3 commits into from
Jul 28, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use heraclitus_compiler::prelude::*;
use modules::block;

fn main() {
let code = "true";
let code = "''";
let rules = rules::get_rules();
let mut cc = Compiler::new("Amber", rules);
let mut block = block::Block::new();
Expand Down
3 changes: 3 additions & 0 deletions src/modules/block.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
use std::process::exit;

use heraclitus_compiler::prelude::*;
use super::statement::Statement;

Expand All @@ -16,6 +18,7 @@ impl Block {
.exit();
} else {
println!("Couldn't load file '{}'", path);
exit(1);
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions src/modules/literal/mod.rs
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
pub mod bool;
pub mod number;
pub mod text;
19 changes: 19 additions & 0 deletions src/modules/literal/number.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
use heraclitus_compiler::prelude::*;

#[derive(Debug)]
pub struct Number {
value: String
}

impl SyntaxModule<DefaultMetadata> for Number {
fn new() -> Self {
Number {
value: format!("")
}
}

fn parse(&mut self, meta: &mut DefaultMetadata) -> SyntaxResult {
self.value = number(meta, vec![])?;
Ok(())
}
}
20 changes: 20 additions & 0 deletions src/modules/literal/text.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
use heraclitus_compiler::prelude::*;

#[derive(Debug)]
pub struct Text {
value: String
}

impl SyntaxModule<DefaultMetadata> for Text {
fn new() -> Self {
Text {
value: format!("")
}
}

fn parse(&mut self, meta: &mut DefaultMetadata) -> SyntaxResult {
self.value = token_by(meta, |word| word.starts_with('\'') && word.ends_with('\''))?;
self.value = self.value.chars().take(self.value.len() - 2).skip(1).collect::<String>();
Ok(())
}
}
20 changes: 16 additions & 4 deletions src/modules/statement.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
use heraclitus_compiler::prelude::*;
use super::literal::bool::Bool;
use super::literal::{
bool::Bool,
number::Number,
text::Text
};

#[derive(Debug)]
enum StatementType {
Bool(Bool)
Bool(Bool),
Number(Number),
Text(Text)
}

#[derive(Debug)]
Expand All @@ -13,12 +19,18 @@ pub struct Statement {

impl Statement {
fn statement_types(&self) -> Vec<StatementType> {
vec![StatementType::Bool(Bool::new())]
vec![
StatementType::Bool(Bool::new()),
StatementType::Number(Number::new()),
StatementType::Text(Text::new())
]
}

fn parse_statement(&mut self, meta: &mut DefaultMetadata, statement: StatementType) -> SyntaxResult {
match statement {
StatementType::Bool(bool) => self.get(meta, bool, StatementType::Bool)
StatementType::Bool(bool) => self.get(meta, bool, StatementType::Bool),
StatementType::Number(num) => self.get(meta, num, StatementType::Number),
StatementType::Text(txt) => self.get(meta, txt, StatementType::Text)
}
}

Expand Down
7 changes: 6 additions & 1 deletion src/rules.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ pub fn get_rules() -> Rules {
'+', '-', '*', '/',
'(', ')', '[', ']', '{', '}'
];
let region = reg![];
let region = reg![
reg!(string as "string literal" => {
begin: "'",
end: "'"
})
];
Rules::new(symbols, region)
}