dane/deelang
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

&'a str are actually heap Strings

Browse Source
This commit is contained in:
Dane Johnson
2022-02-06 22:40:14 -06:00
parent 7069a70d70
commit 96d446dde3
1 changed files with 53 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
rust/src/parser.rs
View File

@@ -1,30 +1,30 @@
#[derive(Debug,PartialEq)] #[derive(Debug,PartialEq)]
pub enum Stmt<'a> { pub enum Stmt {
Assignment(&'a str, Expr<'a>), Assignment(String, Expr),
Funcall(Expr<'a>), Funcall(Expr),
} }
#[derive(Debug,PartialEq)] #[derive(Debug,PartialEq)]
pub enum Expr<'a> { pub enum Expr {
Id(&'a str), Id(String),
Num(f64), Num(f64),
Funcall(&'a str, Vec<Expr<'a>>), Funcall(String, Vec<Expr>),
Funcdef(Option<&'a str>, Box<Expr<'a>>), Funcdef(Option<String>, Box<Expr>),
Plus(Box<Expr<'a>>, Box<Expr<'a>>), Plus(Box<Expr>, Box<Expr>),
Minus(Box<Expr<'a>>, Box<Expr<'a>>), Minus(Box<Expr>, Box<Expr>),
Mult(Box<Expr<'a>>, Box<Expr<'a>>), Mult(Box<Expr>, Box<Expr>),
Div(Box<Expr<'a>>, Box<Expr<'a>>), Div(Box<Expr>, Box<Expr>),
Block(Vec<Stmt<'a>>), Block(Vec<Stmt>),
} }
peg::parser! { peg::parser! {
grammar deelang_parser() for str { grammar deelang_parser() for str {
pub rule program() -> Vec<Stmt<'input>> pub rule program() -> Vec<Stmt>
= __* s:stmt()* { s } = __* s:stmt()* { s }
pub rule stmt() -> Stmt<'input> pub rule stmt() -> Stmt
= i:id() "<-" _ e:expr() stop() { Stmt::Assignment(i, e) } / = i:id() "<-" _ e:expr() stop() { Stmt::Assignment(i, e) } /
f:funcall() stop() { Stmt::Funcall(f) } f:funcall() stop() { Stmt::Funcall(f) }
rule expr() -> Expr<'input> = precedence! { rule expr() -> Expr = precedence! {
e1:(@) "+" _ e2:@ { Expr::Plus(Box::new(e1), Box::new(e2)) } e1:(@) "+" _ e2:@ { Expr::Plus(Box::new(e1), Box::new(e2)) }
e1:(@) "-" _ e2:@ { Expr::Minus(Box::new(e1), Box::new(e2)) } e1:(@) "-" _ e2:@ { Expr::Minus(Box::new(e1), Box::new(e2)) }
-- --
@@ -37,16 +37,16 @@ peg::parser! {
i:id() _ { Expr::Id(i) } i:id() _ { Expr::Id(i) }
n:num() _ { Expr::Num(n) } n:num() _ { Expr::Num(n) }
} }
rule block() -> Expr<'input> rule block() -> Expr
= stop() indent() __* s:stmt()+ dedent() { Expr::Block(s) } = stop() indent() __* s:stmt()+ dedent() { Expr::Block(s) }
rule id() -> &'input str rule id() -> String
= i:$(letter() (letter() / digit() / ['?'|'.'|'-'])*) _ { i } = i:$(letter() (letter() / digit() / ['?'|'.'|'-'])*) _ { i.to_string() }
rule num() -> f64 rule num() -> f64
= n:$(digit()+ "."? digit()* / "." digit()+) _ { n.parse().unwrap() } = n:$(digit()+ "."? digit()* / "." digit()+) _ { n.parse().unwrap() }
rule funcall() -> Expr<'input> rule funcall() -> Expr
= i:id() "(" _ e:(expr() ** ("," _)) ")" _ { Expr::Funcall(i, e) } = i:id() "(" _ e:(expr() ** ("," _)) ")" _ { Expr::Funcall(i, e) }
rule funcdef() -> Expr<'input> rule funcdef() -> Expr
= i:id()? "->" _ e:(expr() / block()) { Expr::Funcdef(i, Box::new(e)) } = i:id()? "->" _ e:(expr() / block()) { Expr::Funcdef(i, Box::new(e)) }
rule letter() rule letter()
@@ -104,18 +104,14 @@ fn preprocess(input: &str) -> String {
output output
} }
pub fn parse<'a>(prgm: &'a str) -> Vec<Stmt<'a>> { pub fn parse(prgm: &str) -> Vec<Stmt> {
let prgm = preprocess(prgm); let prgm = preprocess(&prgm);
let prgm = Box::new(prgm); deelang_parser::program(&prgm).unwrap()
let prgm = Box::leak(prgm);
deelang_parser::program(prgm).unwrap()
} }
pub fn parse_stmt<'a>(stmt: &'a str) -> Stmt<'a> { pub fn parse_stmt(stmt: &str) -> Stmt {
let stmt = preprocess(stmt); let stmt = preprocess(&stmt);
let stmt = Box::new(stmt); deelang_parser::stmt(&stmt).unwrap()
let stmt = Box::leak(stmt);
deelang_parser::stmt(stmt).unwrap()
} }
@@ -128,16 +124,16 @@ mod test {
let prgm = r"## This is a comment let prgm = r"## This is a comment
apple <- 1 ## This is too apple <- 1 ## This is too
## This comment ends the file"; ## This comment ends the file";
let expected = vec![Stmt::Assignment("apple", Expr::Num(1.0))]; let expected = vec![Stmt::Assignment("apple".to_string(), Expr::Num(1.0))];
assert_eq!(deelang_parser::program(prgm).unwrap(), expected); assert_eq!(deelang_parser::program(prgm).unwrap(), expected);
} }
#[test] #[test]
fn test_funcall() { fn test_funcall() {
let expected = vec![ let expected = vec![
Stmt::Funcall(Expr::Funcall("pear", vec![])), Stmt::Funcall(Expr::Funcall("pear".to_string(), vec![])),
Stmt::Funcall(Expr::Funcall("pear", Stmt::Funcall(Expr::Funcall("pear".to_string(),
vec![Expr::Id("x"), Expr::Id("y")], vec![Expr::Id("x".to_string()), Expr::Id("y".to_string())],
)) ))
]; ];
let prgm = r"pear() let prgm = r"pear()
@@ -150,13 +146,13 @@ pear(x, y)";
let prgm = r"apple <- 1 let prgm = r"apple <- 1
apple <- pear(x, y)"; apple <- pear(x, y)";
let expected = vec![ let expected = vec![
Stmt::Assignment("apple", Stmt::Assignment("apple".to_string(),
Expr::Num(1.0)), Expr::Num(1.0)),
Stmt::Assignment("apple", Stmt::Assignment("apple".to_string(),
Expr::Funcall("pear", Expr::Funcall("pear".to_string(),
vec![ vec![
Expr::Id("x"), Expr::Id("x".to_string()),
Expr::Id("y"), Expr::Id("y".to_string()),
])), ])),
]; ];
assert_eq!(deelang_parser::program(prgm).unwrap(), expected); assert_eq!(deelang_parser::program(prgm).unwrap(), expected);
@@ -168,17 +164,17 @@ apple <- pear(x, y)";
one <- 3 - 2 one <- 3 - 2
four <- (3 - 1) * 2"; four <- (3 - 1) * 2";
let expected = vec![ let expected = vec![
Stmt::Assignment("three", Stmt::Assignment("three".to_string(),
Expr::Plus( Expr::Plus(
Box::new(Expr::Num(1.0)), Box::new(Expr::Num(1.0)),
Box::new(Expr::Num(2.0)) Box::new(Expr::Num(2.0))
)), )),
Stmt::Assignment("one", Stmt::Assignment("one".to_string(),
Expr::Minus( Expr::Minus(
Box::new(Expr::Num(3.0)), Box::new(Expr::Num(3.0)),
Box::new(Expr::Num(2.0)) Box::new(Expr::Num(2.0))
)), )),
Stmt::Assignment("four", Stmt::Assignment("four".to_string(),
Expr::Mult( Expr::Mult(
Box::new(Expr::Minus( Box::new(Expr::Minus(
Box::new(Expr::Num(3.0)), Box::new(Expr::Num(3.0)),
@@ -194,13 +190,13 @@ four <- (3 - 1) * 2";
fn test_compound_expression() { fn test_compound_expression() {
let prgm = "apple <- pear(x, y) + z"; let prgm = "apple <- pear(x, y) + z";
let expected = vec![ let expected = vec![
Stmt::Assignment("apple", Stmt::Assignment("apple".to_string(),
Expr::Plus( Expr::Plus(
Box::new(Expr::Funcall( Box::new(Expr::Funcall(
"pear", "pear".to_string(),
vec![Expr::Id("x"), Expr::Id("y")], vec![Expr::Id("x".to_string()), Expr::Id("y".to_string())],
)), )),
Box::new(Expr::Id("z")) Box::new(Expr::Id("z".to_string()))
) )
), ),
]; ];
@@ -218,33 +214,33 @@ baz()
foo <- x -> y -> x * y"; foo <- x -> y -> x * y";
let expected = vec![ let expected = vec![
Stmt::Assignment( Stmt::Assignment(
"foo", "foo".to_string(),
Expr::Funcdef( Expr::Funcdef(
None, None,
Box::new(Expr::Funcall("bar", vec![])), Box::new(Expr::Funcall("bar".to_string(), vec![])),
) )
), ),
Stmt::Assignment( Stmt::Assignment(
"foo", "foo".to_string(),
Expr::Funcdef( Expr::Funcdef(
None, None,
Box::new(Expr::Block(vec![ Box::new(Expr::Block(vec![
Stmt::Funcall(Expr::Funcall("bar", vec![])), Stmt::Funcall(Expr::Funcall("bar".to_string(), vec![])),
Stmt::Funcall(Expr::Funcall("baz", vec![])), Stmt::Funcall(Expr::Funcall("baz".to_string(), vec![])),
])) ]))
) )
), ),
Stmt::Assignment( Stmt::Assignment(
"foo", "foo".to_string(),
Expr::Funcdef( Expr::Funcdef(
Some("x"), Some("x".to_string()),
Box::new( Box::new(
Expr::Funcdef( Expr::Funcdef(
Some("y"), Some("y".to_string()),
Box::new( Box::new(
Expr::Mult( Expr::Mult(
Box::new(Expr::Id("x")), Box::new(Expr::Id("x".to_string())),
Box::new(Expr::Id("y")), Box::new(Expr::Id("y".to_string())),
) )
) )
) )