Skip to content

Commit 6144299

Browse files
committed
chore(parser): Break apart expression module to smaller files
1 parent 507ad97 commit 6144299

45 files changed

Lines changed: 2224 additions & 2192 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

rusty_parser/src/built_ins/close.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
use rusty_pc::and::VecCombiner;
22
use rusty_pc::*;
33

4+
use crate::expr::expression_pos_p;
5+
use crate::expr::file_handle::{
6+
file_handle_as_expression_pos_p, guarded_file_handle_or_expression_p
7+
};
48
use crate::input::StringView;
59
use crate::pc_specific::*;
610
use crate::tokens::comma_ws;
7-
use crate::{
8-
BuiltInSub, ParserError, file_handle_as_expression_pos_p, guarded_file_handle_or_expression_p, *
9-
};
11+
use crate::{BuiltInSub, ExpressionPos, Expressions, Keyword, ParserError, Statement};
1012

1113
// <result> ::= <CLOSE> | <CLOSE><file_handles>
1214
// file_handles ::= <first_file_handle> | <first_file_handle> <opt-ws> "," <opt-ws> <next_file_handles>

rusty_parser/src/built_ins/common.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
use rusty_common::{AtPos, Position, Positioned};
22
use rusty_pc::*;
33

4+
use crate::expr::expression_pos_p;
5+
use crate::expr::file_handle::file_handle_p;
46
use crate::input::StringView;
57
use crate::pc_specific::*;
68
use crate::tokens::comma_ws;
7-
use crate::{BuiltInSub, ParserError, *};
9+
use crate::{
10+
BuiltInSub, Expression, ExpressionPos, Expressions, FileHandle, Keyword, ParserError, Statement
11+
};
812

913
/// Parses built-in subs with optional arguments.
1014
/// Used only by `COLOR` and `LOCATE`.

rusty_parser/src/built_ins/data.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
use rusty_pc::*;
22

3+
use crate::expr::csv_expressions_first_guarded;
34
use crate::input::StringView;
45
use crate::pc_specific::*;
5-
use crate::{BuiltInSub, ParserError, *};
6+
use crate::{BuiltInSub, Keyword, ParserError, Statement};
67

78
pub fn parse() -> impl Parser<StringView, Output = Statement, Error = ParserError> {
89
seq2(

rusty_parser/src/built_ins/def_seg.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use rusty_pc::*;
22

3+
use crate::expr::expression_pos_p;
34
use crate::input::StringView;
45
use crate::pc_specific::*;
56
use crate::tokens::equal_sign_ws;

rusty_parser/src/built_ins/field.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
use rusty_common::*;
22
use rusty_pc::*;
33

4+
use crate::expr::expr_pos_ws_p;
5+
use crate::expr::file_handle::file_handle_p;
46
use crate::input::StringView;
57
use crate::pc_specific::*;
68
use crate::tokens::comma_ws;

rusty_parser/src/built_ins/get.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
use rusty_pc::*;
22

3+
use crate::expr::expression_pos_p;
4+
use crate::expr::file_handle::file_handle_p;
35
use crate::input::StringView;
46
use crate::pc_specific::*;
57
use crate::tokens::comma_ws;

rusty_parser/src/built_ins/input.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
use rusty_pc::*;
22

33
use crate::built_ins::common::{encode_opt_file_handle_arg, opt_file_handle_comma_p};
4+
use crate::expr::csv_expressions_non_opt;
45
use crate::input::StringView;
56
use crate::pc_specific::*;
67
use crate::{BuiltInSub, ParserError, *};

rusty_parser/src/built_ins/len.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use rusty_pc::*;
22

3+
use crate::expr::in_parenthesis_csv_expressions_non_opt;
34
use crate::input::StringView;
45
use crate::pc_specific::*;
56
use crate::{BuiltInFunction, ParserError, *};

rusty_parser/src/built_ins/line_input.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
use rusty_pc::*;
22

33
use crate::built_ins::common::{encode_opt_file_handle_arg, opt_file_handle_comma_p};
4+
use crate::expr::expression_pos_p;
45
use crate::input::StringView;
56
use crate::pc_specific::*;
67
use crate::{BuiltInSub, ParserError, *};

rusty_parser/src/built_ins/lset.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
use rusty_common::*;
22
use rusty_pc::*;
33

4+
use crate::expr::expression_pos_p;
45
use crate::input::StringView;
56
use crate::pc_specific::*;
67
use crate::tokens::equal_sign_ws;

0 commit comments

Comments
 (0)