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

Allow ! in comments (#296)

Browse Source
This commit is contained in:
Casey Rodarmor 2018-01-23 08:17:14 +01:00 committed by GitHub
parent 573cebd4ab
commit 5cbcf47038
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/lexer.rs
View File

@ -129,22 +129,22 @@ impl<'a> Lexer<'a> {
pub fn inner(mut self) -> CompilationResult<'a, Vec<Token<'a>>> { pub fn inner(mut self) -> CompilationResult<'a, Vec<Token<'a>>> {
lazy_static! { lazy_static! {
static ref AT: Regex = token(r"@" );
static ref BACKTICK: Regex = token(r"`[^`\n\r]*`" ); static ref BACKTICK: Regex = token(r"`[^`\n\r]*`" );
static ref COLON: Regex = token(r":" ); static ref COLON: Regex = token(r":" );
static ref PAREN_L: Regex = token(r"[(]" );
static ref PAREN_R: Regex = token(r"[)]" );
static ref AT: Regex = token(r"@" );
static ref COMMA: Regex = token(r"," ); static ref COMMA: Regex = token(r"," );
static ref COMMENT: Regex = token(r"#([^!\n\r]*)?\r?$" ); static ref COMMENT: Regex = token(r"#([^!\n\r][^\n\r]*)?\r?$" );
static ref EOF: Regex = token(r"\z" ); static ref EOF: Regex = token(r"\z" );
static ref EOL: Regex = token(r"\n|\r\n" ); static ref EOL: Regex = token(r"\n|\r\n" );
static ref EQUALS: Regex = token(r"=" ); static ref EQUALS: Regex = token(r"=" );
static ref INTERPOLATION_END: Regex = token(r"[}][}]" ); static ref INTERPOLATION_END: Regex = token(r"[}][}]" );
static ref INTERPOLATION_START_TOKEN: Regex = token(r"[{][{]" ); static ref INTERPOLATION_START_TOKEN: Regex = token(r"[{][{]" );
static ref NAME: Regex = token(r"([a-zA-Z_][a-zA-Z0-9_-]*)" ); static ref NAME: Regex = token(r"([a-zA-Z_][a-zA-Z0-9_-]*)" );
static ref PAREN_L: Regex = token(r"[(]" );
static ref PAREN_R: Regex = token(r"[)]" );
static ref PLUS: Regex = token(r"[+]" ); static ref PLUS: Regex = token(r"[+]" );
static ref STRING: Regex = token(r#"["]"# );
static ref RAW_STRING: Regex = token(r#"'[^']*'"# ); static ref RAW_STRING: Regex = token(r#"'[^']*'"# );
static ref STRING: Regex = token(r#"["]"# );
static ref UNTERMINATED_RAW_STRING: Regex = token(r#"'[^']*"# ); static ref UNTERMINATED_RAW_STRING: Regex = token(r#"'[^']*"# );
static ref INTERPOLATION_START: Regex = re(r"^[{][{]" ); static ref INTERPOLATION_START: Regex = re(r"^[{][{]" );
static ref LEADING_TEXT: Regex = re(r"^(?m)(.+?)[{][{]" ); static ref LEADING_TEXT: Regex = re(r"^(?m)(.+?)[{][{]" );
@ -502,6 +502,12 @@ bob:
"N:=#." "N:=#."
} }
summary_test! {
tokenize_comment_with_bang,
"a:=#foo!",
"N:=#."
}
summary_test! { summary_test! {
tokenize_order, tokenize_order,
r" r"