threeoh6000/granite
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: threeoh6000:develop
Branches Tags
threeoh6000:main
threeoh6000:develop
threeoh6000:1.0.3
threeoh6000:1.0.2
threeoh6000:1.0.1
threeoh6000:1.0.0
..
compare: threeoh6000:main
Branches Tags
threeoh6000:develop
threeoh6000:main
threeoh6000:1.0.3
threeoh6000:1.0.2
threeoh6000:1.0.1
threeoh6000:1.0.0

No commits in common. "develop" and "main" have entirely different histories.
develop ... main

3 changed files with 152 additions and 34 deletions
Show stats Expand all files Collapse all files

16
Cargo.lock generated
View file

@ -53,9 +53,9 @@ dependencies = [
[[package]]
name = "clap"
version = "4.5.16"
version = "4.5.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019"
checksum = "11d8838454fda655dafd3accb2b6e2bea645b9e4078abe84a22ceb947235c5cc"
dependencies = [
"clap_builder",
"clap_derive",
@ -99,10 +99,9 @@ checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
[[package]]
name = "granite"
version = "1.1.0-develop"
version = "1.0.3"
dependencies = [
"clap",
"parsegranite",
]
[[package]]
@ -117,11 +116,6 @@ version = "1.70.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
[[package]]
name = "parsegranite"
version = "1.1.0-develop"
source = "git+https://git.colean.cc/threeoh6000/parsegranite?rev=1a345d4#1a345d469398afdbfa0ab93608279ea802455c46"
[[package]]
name = "proc-macro2"
version = "1.0.86"
@ -148,9 +142,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
[[package]]
name = "syn"
version = "2.0.75"
version = "2.0.74"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f6af063034fc1935ede7be0122941bafa9bacb949334d090b77ca98b5817c7d9"
checksum = "1fceb41e3d546d0bd83421d3409b1460cc7444cd389341a4c880fe7a042cb3d7"
dependencies = [
"proc-macro2",
"quote",

3
Cargo.toml
View file

@ -1,8 +1,7 @@
[package]
name = "granite"
version = "1.1.0-develop"
version = "1.0.3"
edition = "2021"
[dependencies]
clap = { version = "4.5.15", features = ["derive"] }
parsegranite = { git = "https://git.colean.cc/threeoh6000/parsegranite", rev = "1a345d4", version = "1.1.0-develop" }

167
src/main.rs
View file

@ -4,7 +4,18 @@ use std::process::exit;
use std::io;
use std::io::Write;
use std::fs;
use parsegranite::{parse, Program, Operator};
#[derive(Debug)]
struct Statement {
operator: String,
arguments: Vec<String>,
}
#[derive(Debug)]
struct Program {
statements: Vec<Statement>,
labels: HashMap<String, usize>,
}
/// A toy programming language runtime.
#[derive(Parser, Debug)]
@ -44,9 +55,9 @@ fn execute(program: Program) {
loop {
if current_statement >= statements.len() { break; }
let statement = &statements[current_statement];
if statement.operator == Operator::SetVariable {
if statement.operator == ">" {
vars.insert(statement.arguments[1].clone(), statement.arguments[0].clone());
} else if statement.operator == Operator::Increment {
} else if statement.operator == "^" {
if vars.contains_key(&statement.arguments[0]) {
let value = vars.get(&statement.arguments[0]).unwrap();
let binding = value.parse::<i64>();
@ -62,7 +73,7 @@ fn execute(program: Program) {
println!("Missing variable {}.", statement.arguments[0]);
exit(1);
}
} else if statement.operator == Operator::Decrement {
} else if statement.operator == "v" {
if vars.contains_key(&statement.arguments[0]) {
let value = vars.get(&statement.arguments[0]).unwrap();
let binding = value.parse::<i64>();
@ -78,7 +89,7 @@ fn execute(program: Program) {
println!("Missing variable {}.", statement.arguments[0]);
exit(1);
}
} else if statement.operator == Operator::Print {
} else if statement.operator == "!" {
if vars.contains_key(&statement.arguments[0]) {
let value = vars.get(&statement.arguments[0]).unwrap();
println!("{}", value);
@ -86,7 +97,7 @@ fn execute(program: Program) {
println!("Missing variable {}.", statement.arguments[0]);
exit(1);
}
} else if statement.operator == Operator::StringConcatenation {
} else if statement.operator == "*" {
if vars.contains_key(&statement.arguments[0]) && vars.contains_key(&statement.arguments[1]) {
let left = vars.get(&statement.arguments[0]).unwrap();
let right = vars.get(&statement.arguments[1]).unwrap();
@ -95,7 +106,7 @@ fn execute(program: Program) {
println!("Missing variable.");
exit(1);
}
} else if statement.operator == Operator::JumpIfGreaterThan {
} else if statement.operator == "+" {
if vars.contains_key(&statement.arguments[1]) && labels.contains_key(&statement.arguments[0]) {
let binding;
if vars.contains_key(&statement.arguments[2]) {
@ -119,7 +130,7 @@ fn execute(program: Program) {
println!("Missing variable or label.");
exit(1);
}
} else if statement.operator == Operator::JumpIfLessThan {
} else if statement.operator == "-" {
if vars.contains_key(&statement.arguments[1]) && labels.contains_key(&statement.arguments[0]) {
let binding;
if vars.contains_key(&statement.arguments[2]) {
@ -144,7 +155,7 @@ fn execute(program: Program) {
println!("Missing variable or label.");
exit(1);
}
} else if statement.operator == Operator::JumpIfEqualTo {
} else if statement.operator == "=" {
if vars.contains_key(&statement.arguments[1]) && labels.contains_key(&statement.arguments[0]) {
let binding;
if vars.contains_key(&statement.arguments[2]) {
@ -168,7 +179,7 @@ fn execute(program: Program) {
println!("Missing variable or label.");
exit(1);
}
} else if statement.operator == Operator::UnconditionalJump {
} else if statement.operator == "<" {
if labels.contains_key(&statement.arguments[0]) {
let label_loc = labels.get(&statement.arguments[0]).unwrap();
current_statement = label_loc.clone();
@ -176,7 +187,7 @@ fn execute(program: Program) {
println!("Numerical type issues.");
exit(1);
}
} else if statement.operator == Operator::ArithmeticAdd {
} else if statement.operator == "a" {
if vars.contains_key(&statement.arguments[0]) && vars.contains_key(&statement.arguments[1]) {
let value = vars.get(&statement.arguments[0]).unwrap();
let value1 = vars.get(&statement.arguments[1]).unwrap();
@ -193,7 +204,7 @@ fn execute(program: Program) {
println!("Missing variables.");
exit(1);
}
} else if statement.operator == Operator::ArithmeticSubtract {
} else if statement.operator == "s" {
if vars.contains_key(&statement.arguments[0]) && vars.contains_key(&statement.arguments[1]) {
let value = vars.get(&statement.arguments[0]).unwrap();
let value1 = vars.get(&statement.arguments[1]).unwrap();
@ -210,7 +221,7 @@ fn execute(program: Program) {
println!("Missing variables.");
exit(1);
}
} else if statement.operator == Operator::ArithmeticMultiply {
} else if statement.operator == "m" {
if vars.contains_key(&statement.arguments[0]) && vars.contains_key(&statement.arguments[1]) {
let value = vars.get(&statement.arguments[0]).unwrap();
let value1 = vars.get(&statement.arguments[1]).unwrap();
@ -227,7 +238,7 @@ fn execute(program: Program) {
println!("Missing variables.");
exit(1);
}
} else if statement.operator == Operator::ArithmeticDivide {
} else if statement.operator == "d" {
if vars.contains_key(&statement.arguments[0]) && vars.contains_key(&statement.arguments[1]) {
let value = vars.get(&statement.arguments[0]).unwrap();
let value1 = vars.get(&statement.arguments[1]).unwrap();
@ -244,9 +255,9 @@ fn execute(program: Program) {
println!("Missing variables.");
exit(1);
}
} else if statement.operator == Operator::ExplicitExit {
} else if statement.operator == "~" {
exit(0);
} else if statement.operator == Operator::TakeInput {
} else if statement.operator == "?" {
if vars.contains_key(&statement.arguments[0]) {
let value = vars.get(&statement.arguments[0]).unwrap();
print!("{}", value);
@ -257,7 +268,7 @@ fn execute(program: Program) {
let mut input = String::new();
io::stdin().read_line(&mut input).expect("Failed to read line!");
vars.insert(statement.arguments[0].clone(), input.trim().to_string());
} else if statement.operator == Operator::TypeCheck {
} else if statement.operator == "&" {
if vars.contains_key(&statement.arguments[0]) {
let value = vars.get(&statement.arguments[0]).unwrap();
let binding = value.parse::<i64>();
@ -269,7 +280,7 @@ fn execute(program: Program) {
} else {
vars.insert(statement.arguments[1].clone(), "-1".to_string());
}
} else if statement.operator == Operator::VariableClone {
} else if statement.operator == "%" {
if vars.contains_key(&statement.arguments[0]) {
let value = vars.get(&statement.arguments[0]).unwrap();
vars.insert(statement.arguments[1].clone(), value.clone());
@ -277,11 +288,11 @@ fn execute(program: Program) {
println!("Missing variable on clone.");
exit(1);
}
} else if statement.operator == Operator::VariableDrop {
} else if statement.operator == "$" {
vars.remove(&statement.arguments[0]);
} else if statement.operator == Operator::StackPush {
} else if statement.operator == "#" {
stack.push(current_statement);
} else if statement.operator == Operator::Return {
} else if statement.operator == "|" {
current_statement = stack.pop().expect("Stack underflow.");
current_statement = current_statement + 1;
}
@ -290,3 +301,117 @@ fn execute(program: Program) {
current_statement = current_statement + 1;
}
}
fn parse(data: &str) -> Result<Program, String> {
let mut program_begun = false;
let mut operator: Option<String> = None;
let mut arguments: Vec<String> = vec![];
let mut expected_arguments: i32 = -1;
let mut argument_builder: String = "".to_string();
let mut statements: Vec<Statement> = vec![];
let mut labels: HashMap<String, usize> = HashMap::new();
let mut inside_string = false;
let mut string_escape = false;
for char in data.chars() {
if !program_begun && char == ':' {
program_begun = true;
} else if program_begun {
if operator.is_none() {
let potential_argument_length = operator_to_arglength(char.clone());
if potential_argument_length.is_none() { return Err(format!("Invalid operator {} at statement {}.", char, statements.len())); }
expected_arguments = potential_argument_length.unwrap();
operator = Some(char.to_string());
} else if expected_arguments > 0 {
if inside_string {
if char == '"' && !string_escape {
inside_string = false;
} else {
if char == '\\' {
if !string_escape { string_escape = true; }
else {
argument_builder = format!("{}{}", argument_builder, char);
string_escape = false;
}
} else {
argument_builder = format!("{}{}", argument_builder, char);
string_escape = false;
}
}
} else if char == ',' {
expected_arguments = expected_arguments - 1;
arguments.push(argument_builder);
argument_builder = "".to_string();
} else if char == ':' && !inside_string {
expected_arguments = expected_arguments - 1;
arguments.push(argument_builder);
argument_builder = "".to_string();
if expected_arguments != 0 {
return Err(format!("Invalid amount of arguments for operator {} at {}.", operator.unwrap(), statements.len()));
}
} else if char == '"' {
if argument_builder.len() != 0 { return Err(format!("Cannot start string where argument already exists at {}.", statements.len())); }
inside_string = true;
} else if char == '\n' && !inside_string {
continue;
} else {
argument_builder = format!("{}{}", argument_builder, char);
}
}
if operator.is_some() && char == ':' && !inside_string {
let new_statement = Statement { operator: operator.clone().unwrap(), arguments: arguments.clone() };
statements.push(new_statement);
if operator.clone().unwrap() == "@" {
labels.insert(statements[statements.len()-1].arguments[0].clone(), statements.len()-1);
}
operator = None;
arguments = vec![];
argument_builder = "".to_string();
expected_arguments = -1;
}
}
}
if argument_builder.len() != 0 {
arguments.push(argument_builder);
expected_arguments = expected_arguments - 1;
}
if expected_arguments != 0 {
return Err(format!("Invalid amount of arguments for operator {} at {}.", operator.unwrap(), statements.len()));
}
let new_statement = Statement { operator: operator.unwrap().clone(), arguments: arguments.clone() };
statements.push(new_statement);
let program = Program { statements: statements, labels: labels };
Ok(program)
}
fn operator_to_arglength(operator: char) -> Option<i32> {
match operator {
'>' => Some(2),
'?' => Some(1),
'!' => Some(1),
'~' => Some(0),
'<' => Some(1),
'^' => Some(1),
'v' => Some(1),
'@' => Some(1),
'+' => Some(3),
'-' => Some(3),
'=' => Some(3),
'*' => Some(3),
'a' => Some(3),
's' => Some(3),
'm' => Some(3),
'd' => Some(3),
'0' => Some(1),
'&' => Some(2),
'$' => Some(1),
'%' => Some(2),
'#' => Some(0),
'|' => Some(0),
_ => None,
}
}