greg/schala
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Block comments

Browse Source
This commit is contained in:
Greg Shuflin 2021-11-13 01:41:17 -08:00
parent 13353f8801
commit c67adc3a38
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
schala-lang/language/src/parsing/new.rs
View File

@ -15,12 +15,14 @@ enum ExtendedPart<'a> {
peg::parser! { peg::parser! {
pub grammar schala_parser() for str { pub grammar schala_parser() for str {
rule whitespace() = [' ' | '\t' ]* rule whitespace() = [' ' | '\t' ]
rule whitespace_or_newline() = [' ' | '\t' | '\n' ]* rule whitespace_or_newline() = [' ' | '\t' | '\n' ]
rule _ = quiet!{ whitespace() } rule _ = quiet!{ (block_comment() / whitespace())* }
rule __ = quiet!{ whitespace_or_newline() } rule __ = quiet!{ (block_comment() / whitespace_or_newline())* }
rule block_comment() = "/*" (block_comment() / !"*/" [_])* "*/"
pub rule program() -> AST = pub rule program() -> AST =
__ statements:(statement() ** delimiter() ) __ { AST { id: Default::default(), statements: statements.into() } } __ statements:(statement() ** delimiter() ) __ { AST { id: Default::default(), statements: statements.into() } }
@ -210,7 +212,7 @@ peg::parser! {
//TODO make the definition of operators more complex //TODO make the definition of operators more complex
rule operator() -> &'input str = rule operator() -> &'input str =
quiet!{$( ['+' | '-' | '*' | '/' | '%' | '<' | '>' | '=' | '!' | '$' | '&' | '|' | '?' | '^' | '`']+ )} / quiet!{!"*/" s:$( ['+' | '-' | '*' | '/' | '%' | '<' | '>' | '=' | '!' | '$' | '&' | '|' | '?' | '^' | '`']+ ) { s } } /
expected!("operator") expected!("operator")
rule extended_expr(struct_ok: bool) -> ExpressionKind = rule extended_expr(struct_ok: bool) -> ExpressionKind =

15
schala-lang/language/src/parsing/test.rs
View File

@ -1291,3 +1291,18 @@ fn blocks() {
assert_eq!(block.unwrap(), vec![exst(Value(qn!(a)))].into()); assert_eq!(block.unwrap(), vec![exst(Value(qn!(a)))].into());
} }
} }
#[test]
fn comments() {
use ExpressionKind::*;
let source = "1 + /* hella /* bro */ */ 2";
assert_expr2!(source, binop("+", expr(NatLiteral(1)), expr(NatLiteral(2))));
//TODO make sure this error message makes sense
let source = "1 + /* hella /* bro */ 2";
assert_fail_expr2!(source, "foo");
let source = "1 + /* hella */ bro */ 2";
assert_fail_expr2!(source, binop("+", expr(NatLiteral(1)), expr(NatLiteral(2))));
}