Skip to content

refactor: removing end of file token #28

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
Jun 11, 2024
Merged

refactor: removing end of file token #28

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
1 change: 0 additions & 1 deletion src/lexical_analysis/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ impl<'a> LexicalAnalysis<'a> {
None => {
debug!("End of the source code.");
parse_context!(tokens, context);
add_token!(tokens, Token::EndOfFile);
break;
}
}
Expand Down
2 changes: 0 additions & 2 deletions src/lexical_analysis/model/token/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#[derive(Debug, Clone, PartialEq)]
pub(crate) enum Token {
EndOfFile,

// Identifiers
Identifier { literal: String },

Expand Down
2 changes: 1 addition & 1 deletion src/syntax_analysis/expression/utilities/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ impl<'a> SyntaxAnalysis<'a> {

while let Some(token) = self.tokens.peek() {
match token {
Token::ClosingCurlyBracket | Token::EndOfFile => break,
Token::ClosingCurlyBracket => break,
_ => {
blocks.push(self.get_next_syntax_tree_node()?);
}
Expand Down
11 changes: 3 additions & 8 deletions src/syntax_analysis/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,9 @@ impl<'a> SyntaxAnalysis<'a> {
pub(crate) fn get_abstract_syntax_tree(&mut self) -> Result<Vec<SyntaxTreeNode>, SyntaxError> {
let mut abstract_syntax_tree: Vec<SyntaxTreeNode> = vec![];

while let Some(token) = self.tokens.peek() {
match token {
Token::EndOfFile => break,
_ => {
let syntax_tree_node = self.get_next_syntax_tree_node()?;
abstract_syntax_tree.push(syntax_tree_node)
}
}
while self.tokens.peek().is_some() {
let syntax_tree_node = self.get_next_syntax_tree_node()?;
abstract_syntax_tree.push(syntax_tree_node)
}

Ok(abstract_syntax_tree)
Expand Down
1 change: 0 additions & 1 deletion ...erpreter__tests__boolean_expression__test_boolean_expression_case_1_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@ expression: tokens
---
[
False,
EndOfFile,
]
1 change: 0 additions & 1 deletion ...erpreter__tests__boolean_expression__test_boolean_expression_case_2_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@ expression: tokens
---
[
False,
EndOfFile,
]
1 change: 0 additions & 1 deletion ...erpreter__tests__boolean_expression__test_boolean_expression_case_3_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@ expression: tokens
---
[
True,
EndOfFile,
]
1 change: 0 additions & 1 deletion ...erpreter__tests__boolean_expression__test_boolean_expression_case_4_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@ expression: tokens
---
[
True,
EndOfFile,
]
1 change: 0 additions & 1 deletion ...sts__boolean_infix_expression__test_boolean_infix_expression_case_1_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@ expression: tokens
True,
Equals,
True,
EndOfFile,
]
1 change: 0 additions & 1 deletion ...sts__boolean_infix_expression__test_boolean_infix_expression_case_2_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@ expression: tokens
False,
Equals,
False,
EndOfFile,
]
1 change: 0 additions & 1 deletion ...sts__boolean_infix_expression__test_boolean_infix_expression_case_3_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@ expression: tokens
True,
Equals,
False,
EndOfFile,
]
1 change: 0 additions & 1 deletion ...sts__boolean_infix_expression__test_boolean_infix_expression_case_4_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@ expression: tokens
False,
Equals,
True,
EndOfFile,
]
1 change: 0 additions & 1 deletion ...sts__boolean_infix_expression__test_boolean_infix_expression_case_5_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@ expression: tokens
True,
NotEquals,
False,
EndOfFile,
]
1 change: 0 additions & 1 deletion ...sts__boolean_infix_expression__test_boolean_infix_expression_case_6_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@ expression: tokens
False,
NotEquals,
True,
EndOfFile,
]
1 change: 0 additions & 1 deletion ...sts__boolean_infix_expression__test_boolean_infix_expression_case_7_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@ expression: tokens
True,
NotEquals,
True,
EndOfFile,
]
1 change: 0 additions & 1 deletion ...sts__boolean_infix_expression__test_boolean_infix_expression_case_8_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@ expression: tokens
False,
NotEquals,
False,
EndOfFile,
]
1 change: 0 additions & 1 deletion ...s__boolean_prefix_expression__test_boolean_prefix_expression_case_1_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,4 @@ expression: tokens
[
Not,
False,
EndOfFile,
]
1 change: 0 additions & 1 deletion ...s__boolean_prefix_expression__test_boolean_prefix_expression_case_2_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,4 @@ expression: tokens
[
Not,
True,
EndOfFile,
]
1 change: 0 additions & 1 deletion ...s__boolean_prefix_expression__test_boolean_prefix_expression_case_3_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@ expression: tokens
Not,
Not,
True,
EndOfFile,
]
1 change: 0 additions & 1 deletion ...ey_interpreter__tests__call_expression__test_call_expression_case_1_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,4 @@ expression: tokens
},
ClosingRoundBracket,
SemiColon,
EndOfFile,
]
1 change: 0 additions & 1 deletion ...ey_interpreter__tests__call_expression__test_call_expression_case_2_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,4 @@ expression: tokens
},
ClosingRoundBracket,
SemiColon,
EndOfFile,
]
1 change: 0 additions & 1 deletion ...ey_interpreter__tests__call_expression__test_call_expression_case_3_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,4 @@ expression: tokens
},
ClosingRoundBracket,
SemiColon,
EndOfFile,
]
1 change: 0 additions & 1 deletion ...ey_interpreter__tests__call_expression__test_call_expression_case_4_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,4 @@ expression: tokens
},
ClosingRoundBracket,
SemiColon,
EndOfFile,
]
1 change: 0 additions & 1 deletion ...ey_interpreter__tests__call_expression__test_call_expression_case_5_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,4 @@ expression: tokens
ClosingRoundBracket,
ClosingRoundBracket,
SemiColon,
EndOfFile,
]
1 change: 0 additions & 1 deletion ...s/snapshots/monkey_interpreter__tests__code_samples__test_factorial_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,5 +85,4 @@ expression: tokens
literal: 9,
},
ClosingRoundBracket,
EndOfFile,
]
4 changes: 1 addition & 3 deletions ...s/snapshots/monkey_interpreter__tests__edge_cases__test_edge_case_1_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,4 @@
source: src/tests/edge_cases/mod.rs
expression: tokens
---
[
EndOfFile,
]
[]
1 change: 0 additions & 1 deletion ...nfix_expression__test_type_mismatch_boolean_infix_expression_case_1_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,4 @@ expression: tokens
Integer {
literal: 5,
},
EndOfFile,
]
1 change: 0 additions & 1 deletion ...nfix_expression__test_type_mismatch_boolean_infix_expression_case_2_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@ expression: tokens
},
Equals,
True,
EndOfFile,
]
1 change: 0 additions & 1 deletion ...nfix_expression__test_type_mismatch_boolean_infix_expression_case_3_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,4 @@ expression: tokens
String {
literal: "this is a string",
},
EndOfFile,
]
1 change: 0 additions & 1 deletion ...fix_expression__test_type_mismatch_boolean_prefix_expression_case_1_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,4 @@ expression: tokens
[
Minus,
True,
EndOfFile,
]
1 change: 0 additions & 1 deletion ...fix_expression__test_type_mismatch_boolean_prefix_expression_case_2_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@ expression: tokens
Minus,
True,
SemiColon,
EndOfFile,
]
1 change: 0 additions & 1 deletion ...fix_expression__test_type_mismatch_boolean_prefix_expression_case_3_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,4 @@ expression: tokens
[
Minus,
False,
EndOfFile,
]
1 change: 0 additions & 1 deletion ...fix_expression__test_type_mismatch_boolean_prefix_expression_case_4_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,4 @@ expression: tokens
[
Minus,
False,
EndOfFile,
]
1 change: 0 additions & 1 deletion ...fix_expression__test_type_mismatch_integer_infix_expression_case_10_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,4 @@ expression: tokens
Integer {
literal: 10,
},
EndOfFile,
]
1 change: 0 additions & 1 deletion ...fix_expression__test_type_mismatch_integer_infix_expression_case_11_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,4 @@ expression: tokens
Integer {
literal: 7,
},
EndOfFile,
]
1 change: 0 additions & 1 deletion ...fix_expression__test_type_mismatch_integer_infix_expression_case_12_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,4 @@ expression: tokens
Integer {
literal: 7,
},
EndOfFile,
]
1 change: 0 additions & 1 deletion ...fix_expression__test_type_mismatch_integer_infix_expression_case_13_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,4 @@ expression: tokens
Integer {
literal: 4,
},
EndOfFile,
]
1 change: 0 additions & 1 deletion ...fix_expression__test_type_mismatch_integer_infix_expression_case_14_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,4 @@ expression: tokens
String {
literal: "muliply",
},
EndOfFile,
]
1 change: 0 additions & 1 deletion ...nfix_expression__test_type_mismatch_integer_infix_expression_case_1_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@ expression: tokens
},
Plus,
True,
EndOfFile,
]
1 change: 0 additions & 1 deletion ...nfix_expression__test_type_mismatch_integer_infix_expression_case_2_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@ expression: tokens
},
Minus,
True,
EndOfFile,
]
1 change: 0 additions & 1 deletion ...nfix_expression__test_type_mismatch_integer_infix_expression_case_3_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@ expression: tokens
Integer {
literal: 9,
},
EndOfFile,
]
1 change: 0 additions & 1 deletion ...nfix_expression__test_type_mismatch_integer_infix_expression_case_4_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@ expression: tokens
},
Divide,
False,
EndOfFile,
]
1 change: 0 additions & 1 deletion ...nfix_expression__test_type_mismatch_integer_infix_expression_case_5_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@ expression: tokens
},
Plus,
False,
EndOfFile,
]
1 change: 0 additions & 1 deletion ...nfix_expression__test_type_mismatch_integer_infix_expression_case_6_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@ expression: tokens
String {
literal: "this is a string",
},
EndOfFile,
]
1 change: 0 additions & 1 deletion ...nfix_expression__test_type_mismatch_integer_infix_expression_case_7_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@ expression: tokens
String {
literal: "can't multiply",
},
EndOfFile,
]
1 change: 0 additions & 1 deletion ...nfix_expression__test_type_mismatch_integer_infix_expression_case_8_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@ expression: tokens
},
Divide,
True,
EndOfFile,
]
1 change: 0 additions & 1 deletion ...nfix_expression__test_type_mismatch_integer_infix_expression_case_9_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,4 @@ expression: tokens
String {
literal: " cant append",
},
EndOfFile,
]
1 change: 0 additions & 1 deletion ...fix_expression__test_type_mismatch_integer_prefix_expression_case_1_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,4 @@ expression: tokens
Integer {
literal: 5,
},
EndOfFile,
]
1 change: 0 additions & 1 deletion ...x_expression__test_unknown_operator_integer_infix_expression_case_1_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@ expression: tokens
False,
Plus,
True,
EndOfFile,
]
1 change: 0 additions & 1 deletion ...x_expression__test_unknown_operator_integer_infix_expression_case_2_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@ expression: tokens
True,
Minus,
True,
EndOfFile,
]
1 change: 0 additions & 1 deletion ...x_expression__test_unknown_operator_integer_infix_expression_case_3_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@ expression: tokens
True,
Multiply,
True,
EndOfFile,
]
1 change: 0 additions & 1 deletion ...x_expression__test_unknown_operator_integer_infix_expression_case_4_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@ expression: tokens
False,
Divide,
False,
EndOfFile,
]
1 change: 0 additions & 1 deletion ...monkey_interpreter__tests__fn_expression__test_fn_expression_case_1_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,4 @@ expression: tokens
literal: 3,
},
ClosingCurlyBracket,
EndOfFile,
]
1 change: 0 additions & 1 deletion ...monkey_interpreter__tests__fn_expression__test_fn_expression_case_2_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,4 @@ expression: tokens
SemiColon,
ClosingCurlyBracket,
SemiColon,
EndOfFile,
]
1 change: 0 additions & 1 deletion ...monkey_interpreter__tests__fn_expression__test_fn_expression_case_3_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,4 @@ expression: tokens
literal: 3,
},
ClosingCurlyBracket,
EndOfFile,
]
1 change: 0 additions & 1 deletion ...monkey_interpreter__tests__fn_expression__test_fn_expression_case_4_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,4 @@ expression: tokens
},
SemiColon,
ClosingCurlyBracket,
EndOfFile,
]
1 change: 0 additions & 1 deletion ...monkey_interpreter__tests__fn_expression__test_fn_expression_case_5_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@ expression: tokens
ClosingRoundBracket,
OpeningCurlyBracket,
ClosingCurlyBracket,
EndOfFile,
]
1 change: 0 additions & 1 deletion ...r__tests__identifier_expression__test_identifier_expression_case_10_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,4 @@ expression: tokens
Identifier {
literal: "flatcase",
},
EndOfFile,
]
1 change: 0 additions & 1 deletion ...r__tests__identifier_expression__test_identifier_expression_case_11_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,4 @@ expression: tokens
Identifier {
literal: "camelCase",
},
EndOfFile,
]
1 change: 0 additions & 1 deletion ...r__tests__identifier_expression__test_identifier_expression_case_12_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,4 @@ expression: tokens
Identifier {
literal: "PascalCase",
},
EndOfFile,
]
1 change: 0 additions & 1 deletion ...r__tests__identifier_expression__test_identifier_expression_case_13_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,4 @@ expression: tokens
Identifier {
literal: "UPPER_CASE_SNAKE_CASE",
},
EndOfFile,
]
1 change: 0 additions & 1 deletion ...r__tests__identifier_expression__test_identifier_expression_case_14_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,4 @@ expression: tokens
Identifier {
literal: "timeout_ms_copy",
},
EndOfFile,
]
1 change: 0 additions & 1 deletion ...r__tests__identifier_expression__test_identifier_expression_case_15_lexical_analysis.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,4 @@ expression: tokens
Identifier {
literal: "is_directory",
},
EndOfFile,
]
Loading