Fix bug where print is not accepted without trailing semi or whitespace

This should fix #73
ezrosent · Sep 16, 2021 · b26ba0c · b26ba0c
1 parent 73fdd95
commit b26ba0c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/harness.rs b/src/harness.rs
@@ -879,6 +879,13 @@ print w,z;
         "1 1\n7 21\n"
     );
 
+    test_program!(
+        print_no_space,
+        r#"{print}"#,
+        "test\n",
+        @input "test\n"
+    );
+
     test_program!(
         uncalled_function,
         r#"function unused() { return 5; }

diff --git a/src/lexer.rs b/src/lexer.rs
@@ -130,6 +130,7 @@ lazy_static! {
     static ref WS_BRACE: Regex = Regex::new(r"^[\s{}]").unwrap();
     static ref WS_SEMI: Regex = Regex::new(r"^[\s;]").unwrap();
     static ref WS_SEMI_NL: Regex = Regex::new(r"^[\s;\n]").unwrap();
+    static ref WS_SEMI_NL_RB: Regex = Regex::new(r"^[\s;\n}]").unwrap();
     static ref WS_SEMI_RPAREN: Regex = Regex::new(r"^[\s;)]").unwrap();
     static ref WS_PAREN: Regex = Regex::new(r"^[\s()]").unwrap();
 }
@@ -146,7 +147,7 @@ keyword_map!(
     [b"for", Tok::For, WS_PAREN.clone()],
     [b"if", Tok::If],
     [b"else", Tok::Else],
-    [b"print", Tok::Print, WS_SEMI_NL.clone()],
+    [b"print", Tok::Print, WS_SEMI_NL_RB.clone()],
     [b"printf", Tok::Printf, WS_SEMI_NL.clone()],
     [b"print(", Tok::PrintLP],
     [b"printf(", Tok::PrintfLP],