Skip to content

feat: make parser, and lexer immutable #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 1, 2022
Merged

feat: make parser, and lexer immutable #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions bin/snapshot.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ use std::env;
use std::fs::read_dir;
use std::path::PathBuf;

static PARSER: Parser = Parser::new();
static LEXER: Lexer = Lexer::new();

fn main() {
let manifest = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap());
let mut entries = read_dir(manifest.join("tests"))
Expand All @@ -14,10 +17,6 @@ fn main() {

entries.sort();

let mut content = String::new();
content.push_str("/// this file is auto-generated by the build script.\n");
content.push_str("/// you should never manually change it.\n\n\n");

for entry in entries {
let code_filename = entry.join("code.php");
let ast_filename = entry.join("ast.txt");
Expand Down Expand Up @@ -46,8 +45,7 @@ fn main() {
}

let code = std::fs::read_to_string(&code_filename).unwrap();
let mut lexer = Lexer::new();
let tokens = lexer.tokenize(code.as_bytes());
let tokens = LEXER.tokenize(code.as_bytes());

match tokens {
Ok(tokens) => {
Expand All @@ -57,8 +55,7 @@ fn main() {
entry.to_string_lossy()
);

let mut parser = Parser::new(None);
let ast = parser.parse(tokens);
let ast = PARSER.parse(tokens);
match ast {
Ok(ast) => {
std::fs::write(ast_filename, format!("{:#?}\n", ast)).unwrap();
Expand Down
32 changes: 10 additions & 22 deletions build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,11 @@ fn main() {

let mut content = String::new();
content.push_str("/// this file is auto-generated by the build script.\n");
content.push_str("/// you should never manually change it.\n\n\n");
content.push_str("/// you should never manually change it.\n\n");
content.push_str("use php_parser_rs::prelude::{Lexer, Parser};\n");
content.push_str("use pretty_assertions::assert_str_eq;\n\n");
content.push_str("static PARSER: Parser = Parser::new();\n");
content.push_str("static LEXER: Lexer = Lexer::new();\n\n");

for entry in entries {
let code_filename = entry.join("code.php");
Expand Down Expand Up @@ -98,10 +102,6 @@ fn build_success_test(
format!(
r#"#[test]
fn test_success_{}() {{
use php_parser_rs::prelude::Parser;
use php_parser_rs::prelude::Lexer;
use pretty_assertions::assert_str_eq;

let code_filename = "{}";
let ast_filename = "{}";
let tokens_filename = "{}";
Expand All @@ -110,13 +110,11 @@ fn test_success_{}() {{
let expected_ast = std::fs::read_to_string(&ast_filename).unwrap();
let expected_tokens = std::fs::read_to_string(&tokens_filename).unwrap();

let mut lexer = Lexer::new();
let tokens = lexer.tokenize(code.as_bytes()).unwrap();
let tokens = LEXER.tokenize(code.as_bytes()).unwrap();

assert_str_eq!(expected_tokens.trim(), format!("{{:#?}}", tokens));

let mut parser = Parser::new(None);
let ast = parser.parse(tokens).unwrap();
let ast = PARSER.parse(tokens).unwrap();

assert_str_eq!(expected_ast.trim(), format!("{{:#?}}", ast));
}}
Expand All @@ -137,17 +135,13 @@ fn build_lexer_error_test(
format!(
r#"#[test]
fn test_lexer_error_{}() {{
use php_parser_rs::prelude::Lexer;
use pretty_assertions::assert_str_eq;

let code_filename = "{}";
let lexer_error_filename = "{}";

let code = std::fs::read_to_string(&code_filename).unwrap();
let expected_error = std::fs::read_to_string(&lexer_error_filename).unwrap();

let mut lexer = Lexer::new();
let error = lexer.tokenize(code.as_bytes()).err().unwrap();
let error = LEXER.tokenize(code.as_bytes()).err().unwrap();

assert_str_eq!(
expected_error.trim(),
Expand All @@ -171,10 +165,6 @@ fn build_parser_error_test(
format!(
r#"#[test]
fn test_paser_error_{}() {{
use php_parser_rs::prelude::Parser;
use php_parser_rs::prelude::Lexer;
use pretty_assertions::assert_str_eq;

let code_filename = "{}";
let tokens_filename = "{}";
let parser_error_filename = "{}";
Expand All @@ -183,13 +173,11 @@ fn test_paser_error_{}() {{
let expected_tokens = std::fs::read_to_string(&tokens_filename).unwrap();
let expected_error = std::fs::read_to_string(&parser_error_filename).unwrap();

let mut lexer = Lexer::new();
let tokens = lexer.tokenize(code.as_bytes()).unwrap();
let tokens = LEXER.tokenize(code.as_bytes()).unwrap();

assert_str_eq!(expected_tokens.trim(), format!("{{:#?}}", tokens));

let mut parser = Parser::new(None);
let error = parser.parse(tokens).err().unwrap();
let error = PARSER.parse(tokens).err().unwrap();

assert_str_eq!(
expected_error.trim(),
Expand Down
Loading