Skip to content

Commit e45c9b9

Browse files
TomAFrenchTomAFrench
authored
chore!: fix a bunch of visibility issues (#38)
1 parent 2ee5547 commit e45c9b9

File tree

23 files changed

+460
-355
lines changed

23 files changed

+460
-355
lines changed

‎.github/workflows/test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
env:
1010
CARGO_TERM_COLOR: always
11-
MINIMUM_NOIR_VERSION: v0.37.0
11+
MINIMUM_NOIR_VERSION: v1.0.0-beta.1
1212

1313
jobs:
1414
noir-version-list:
@@ -84,4 +84,4 @@ jobs:
8484
fi
8585
env:
8686
# We treat any cancelled, skipped or failing jobs as a failure for the workflow as a whole.
87-
FAIL: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') || contains(needs.*.result, 'skipped') }}
87+
FAIL: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') || contains(needs.*.result, 'skipped') }}

‎Nargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "json_parser"
33
type = "lib"
44
authors = [""]
5-
compiler_version = ">=0.37.0"
5+
compiler_version = ">=1.0.0"
66

77
[dependencies]
88
noir_sort = {tag = "v0.2.2", git = "https://github.com/noir-lang/noir_sort"}

‎src/_comparison_tools/mod.nr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
mod lt;
2-
mod bounds_checker;
1+
pub(crate) mod lt;
2+
pub(crate) mod bounds_checker;

‎src/_string_tools/mod.nr‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
mod slice_field;
2-
mod slice_packed_field;
3-
mod string_chopper;
4-
mod sum_bytes_into_field;
1+
pub(crate) mod slice_field;
2+
pub(crate) mod slice_packed_field;
3+
pub(crate) mod string_chopper;
4+
pub(crate) mod sum_bytes_into_field;

‎src/_string_tools/string_chopper.nr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
use crate::_string_tools::slice_packed_field::slice_fields;
22

3-
struct StringChopper<let NeedlePackedFields: u32> {}
3+
pub(crate) struct StringChopper<let NeedlePackedFields: u32> {}
44

55
impl<let NeedlePackedFields: u32> StringChopper<NeedlePackedFields> {
6-
fn slice_string<let StringBytes: u32, let HaystackPackedFields: u32>(
6+
pub(crate) fn slice_string<let StringBytes: u32, let HaystackPackedFields: u32>(
77
_: Self,
88
haystack: [Field; HaystackPackedFields],
99
start_bytes: Field,

‎src/_table_generation/make_tables.nr‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,12 @@
11
//! Contains methods used to generate tables in `json_tables.nr`. These table generation methods shouldn't be used inside of actual circuits.
22

3-
mod CaptureMode {
4-
global GRAMMAR_CAPTURE: Field = 0;
5-
global STRING_CAPTURE: Field = 1;
6-
global NUMERIC_CAPTURE: Field = 2;
7-
global LITERAL_CAPTURE: Field = 3;
8-
global ERROR_CAPTURE: Field = 4;
3+
pub(crate) mod CaptureMode {
4+
pub(crate) global GRAMMAR_CAPTURE: Field = 0;
5+
pub(crate) global STRING_CAPTURE: Field = 1;
6+
pub(crate) global NUMERIC_CAPTURE: Field = 2;
7+
pub(crate) global LITERAL_CAPTURE: Field = 3;
8+
pub(crate) global ERROR_CAPTURE: Field = 4;
99
}
10-
use crate::_table_generation::make_tables::CaptureMode::STRING_CAPTURE;
11-
use crate::_table_generation::make_tables_subtables::{
12-
GRAMMAR_CAPTURE_ERROR_FLAG, GRAMMAR_CAPTURE_INCREASE_LENGTH, GRAMMAR_CAPTURE_PUSH_TRANSCRIPT,
13-
GRAMMAR_CAPTURE_TABLE, GRAMMAR_CAPTURE_TOKEN, LITERAL_CAPTURE_ERROR_FLAG,
14-
LITERAL_CAPTURE_INCREASE_LENGTH, LITERAL_CAPTURE_PUSH_TRANSCRIPT, LITERAL_CAPTURE_TABLE,
15-
LITERAL_CAPTURE_TOKEN, NUMERIC_CAPTURE_ERROR_FLAG, NUMERIC_CAPTURE_INCREASE_LENGTH,
16-
NUMERIC_CAPTURE_PUSH_TRANSCRIPT, NUMERIC_CAPTURE_TABLE, NUMERIC_CAPTURE_TOKEN,
17-
STRING_CAPTURE_ERROR_FLAG, STRING_CAPTURE_INCREASE_LENGTH, STRING_CAPTURE_PUSH_TRANSCRIPT,
18-
STRING_CAPTURE_TABLE, STRING_CAPTURE_TOKEN, TOKEN_IS_NUMERIC_OR_LITERAL,
19-
};
2010
use crate::enums::Layer::{ARRAY_LAYER, OBJECT_LAYER, SINGLE_VALUE_LAYER};
2111
use crate::enums::Token::{
2212
BEGIN_ARRAY_TOKEN, BEGIN_OBJECT_TOKEN, END_ARRAY_TOKEN, END_OBJECT_TOKEN, KEY_SEPARATOR_TOKEN,
@@ -25,6 +15,16 @@ use crate::enums::Token::{
2515
};
2616
use crate::token_flags::TokenFlags;
2717
use crate::transcript_entry::ValidationFlags;
18+
use super::make_tables_subtables::{
19+
GRAMMAR_CAPTURE_ERROR_FLAG, GRAMMAR_CAPTURE_INCREASE_LENGTH, GRAMMAR_CAPTURE_PUSH_TRANSCRIPT,
20+
GRAMMAR_CAPTURE_TABLE, GRAMMAR_CAPTURE_TOKEN, LITERAL_CAPTURE_ERROR_FLAG,
21+
LITERAL_CAPTURE_INCREASE_LENGTH, LITERAL_CAPTURE_PUSH_TRANSCRIPT, LITERAL_CAPTURE_TABLE,
22+
LITERAL_CAPTURE_TOKEN, NUMERIC_CAPTURE_ERROR_FLAG, NUMERIC_CAPTURE_INCREASE_LENGTH,
23+
NUMERIC_CAPTURE_PUSH_TRANSCRIPT, NUMERIC_CAPTURE_TABLE, NUMERIC_CAPTURE_TOKEN,
24+
STRING_CAPTURE_ERROR_FLAG, STRING_CAPTURE_INCREASE_LENGTH, STRING_CAPTURE_PUSH_TRANSCRIPT,
25+
STRING_CAPTURE_TABLE, STRING_CAPTURE_TOKEN, TOKEN_IS_NUMERIC_OR_LITERAL,
26+
};
27+
use CaptureMode::STRING_CAPTURE;
2828

2929
global CAPTURE_TABLE: [[Field; 128]; 4] =
3030
[GRAMMAR_CAPTURE_TABLE, STRING_CAPTURE_TABLE, NUMERIC_CAPTURE_TABLE, LITERAL_CAPTURE_TABLE];

‎src/_table_generation/make_tables_subtables.nr‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ use crate::enums::Token::{
66
KEY_TOKEN, LITERAL_TOKEN, NO_TOKEN, NUMERIC_TOKEN, STRING_TOKEN, VALUE_SEPARATOR_TOKEN,
77
};
88

9-
global TOKEN_IS_NUMERIC_OR_LITERAL: [Field; 11] = [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0];
9+
pub(crate) global TOKEN_IS_NUMERIC_OR_LITERAL: [Field; 11] = [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0];
1010

11-
global GRAMMAR_CAPTURE_TABLE: [Field; 128] = [
11+
pub(crate) global GRAMMAR_CAPTURE_TABLE: [Field; 128] = [
1212
/* NULL */ ERROR_CAPTURE,
1313
/* SOH */ ERROR_CAPTURE,
1414
/* TXT */ ERROR_CAPTURE,
@@ -142,7 +142,7 @@ global GRAMMAR_CAPTURE_TABLE: [Field; 128] = [
142142
/*DEL*/ ERROR_CAPTURE,
143143
];
144144

145-
global STRING_CAPTURE_TABLE: [Field; 128] = [
145+
pub(crate) global STRING_CAPTURE_TABLE: [Field; 128] = [
146146
/* NULL */ ERROR_CAPTURE,
147147
/* SOH */ ERROR_CAPTURE,
148148
/* TXT */ ERROR_CAPTURE,
@@ -273,7 +273,7 @@ global STRING_CAPTURE_TABLE: [Field; 128] = [
273273
/*DEL*/ ERROR_CAPTURE,
274274
];
275275

276-
global NUMERIC_CAPTURE_TABLE: [Field; 128] = [
276+
pub(crate) global NUMERIC_CAPTURE_TABLE: [Field; 128] = [
277277
/* NULL */ ERROR_CAPTURE,
278278
/* SOH */ ERROR_CAPTURE,
279279
/* TXT */ ERROR_CAPTURE,
@@ -404,7 +404,7 @@ global NUMERIC_CAPTURE_TABLE: [Field; 128] = [
404404
/*DEL*/ ERROR_CAPTURE,
405405
];
406406

407-
global LITERAL_CAPTURE_TABLE: [Field; 128] = [
407+
pub(crate) global LITERAL_CAPTURE_TABLE: [Field; 128] = [
408408
/* NULL */ ERROR_CAPTURE,
409409
/* SOH */ ERROR_CAPTURE,
410410
/* TXT */ ERROR_CAPTURE,
@@ -535,7 +535,7 @@ global LITERAL_CAPTURE_TABLE: [Field; 128] = [
535535
/*DEL*/ ERROR_CAPTURE,
536536
];
537537

538-
global GRAMMAR_CAPTURE_TOKEN: [Field; 128] = [
538+
pub(crate) global GRAMMAR_CAPTURE_TOKEN: [Field; 128] = [
539539
/* NULL */ NO_TOKEN,
540540
/* SOH */ NO_TOKEN,
541541
/* TXT */ NO_TOKEN,
@@ -677,7 +677,7 @@ global GRAMMAR_CAPTURE_TOKEN: [Field; 128] = [
677677
/*DEL*/ NO_TOKEN,
678678
];
679679

680-
global GRAMMAR_CAPTURE_PUSH_TRANSCRIPT: [bool; 128] = [
680+
pub(crate) global GRAMMAR_CAPTURE_PUSH_TRANSCRIPT: [bool; 128] = [
681681
/* NULL */ false,
682682
/* SOH */ false,
683683
/* TXT */ false,
@@ -819,7 +819,7 @@ global GRAMMAR_CAPTURE_PUSH_TRANSCRIPT: [bool; 128] = [
819819
/*DEL*/ false,
820820
];
821821

822-
global GRAMMAR_CAPTURE_INCREASE_LENGTH: [bool; 128] = [
822+
pub(crate) global GRAMMAR_CAPTURE_INCREASE_LENGTH: [bool; 128] = [
823823
/* NULL */ false,
824824
/* SOH */ false,
825825
/* TXT */ false,
@@ -961,7 +961,7 @@ global GRAMMAR_CAPTURE_INCREASE_LENGTH: [bool; 128] = [
961961
/*DEL*/ false,
962962
];
963963

964-
global STRING_CAPTURE_TOKEN: [Field; 128] = [
964+
pub(crate) global STRING_CAPTURE_TOKEN: [Field; 128] = [
965965
/* NULL */ NO_TOKEN,
966966
/* SOH */ NO_TOKEN,
967967
/* TXT */ NO_TOKEN,
@@ -1103,7 +1103,7 @@ global STRING_CAPTURE_TOKEN: [Field; 128] = [
11031103
/*DEL*/ NO_TOKEN,
11041104
];
11051105

1106-
global STRING_CAPTURE_PUSH_TRANSCRIPT: [bool; 128] = [
1106+
pub(crate) global STRING_CAPTURE_PUSH_TRANSCRIPT: [bool; 128] = [
11071107
/* NULL */ false,
11081108
/* SOH */ false,
11091109
/* TXT */ false,
@@ -1245,7 +1245,7 @@ global STRING_CAPTURE_PUSH_TRANSCRIPT: [bool; 128] = [
12451245
/*DEL*/ false,
12461246
];
12471247

1248-
global STRING_CAPTURE_INCREASE_LENGTH: [bool; 128] = [
1248+
pub(crate) global STRING_CAPTURE_INCREASE_LENGTH: [bool; 128] = [
12491249
/* NULL */ false,
12501250
/* SOH */ false,
12511251
/* TXT */ false,
@@ -1387,7 +1387,7 @@ global STRING_CAPTURE_INCREASE_LENGTH: [bool; 128] = [
13871387
/*DEL*/ false,
13881388
];
13891389

1390-
global NUMERIC_CAPTURE_TOKEN: [Field; 128] = [
1390+
pub(crate) global NUMERIC_CAPTURE_TOKEN: [Field; 128] = [
13911391
/* NULL */ NO_TOKEN,
13921392
/* SOH */ NO_TOKEN,
13931393
/* TXT */ NO_TOKEN,
@@ -1529,7 +1529,7 @@ global NUMERIC_CAPTURE_TOKEN: [Field; 128] = [
15291529
/*DEL*/ NO_TOKEN,
15301530
];
15311531

1532-
global NUMERIC_CAPTURE_PUSH_TRANSCRIPT: [bool; 128] = [
1532+
pub(crate) global NUMERIC_CAPTURE_PUSH_TRANSCRIPT: [bool; 128] = [
15331533
/* NULL */ false,
15341534
/* SOH */ false,
15351535
/* TXT */ false,
@@ -1671,7 +1671,7 @@ global NUMERIC_CAPTURE_PUSH_TRANSCRIPT: [bool; 128] = [
16711671
/*DEL*/ false,
16721672
];
16731673

1674-
global NUMERIC_CAPTURE_INCREASE_LENGTH: [bool; 128] = [
1674+
pub(crate) global NUMERIC_CAPTURE_INCREASE_LENGTH: [bool; 128] = [
16751675
/* NULL */ false,
16761676
/* SOH */ false,
16771677
/* TXT */ false,
@@ -1813,7 +1813,7 @@ global NUMERIC_CAPTURE_INCREASE_LENGTH: [bool; 128] = [
18131813
/*DEL*/ false,
18141814
];
18151815

1816-
global LITERAL_CAPTURE_TOKEN: [Field; 128] = [
1816+
pub(crate) global LITERAL_CAPTURE_TOKEN: [Field; 128] = [
18171817
/* NULL */ NO_TOKEN,
18181818
/* SOH */ NO_TOKEN,
18191819
/* TXT */ NO_TOKEN,
@@ -1944,7 +1944,7 @@ global LITERAL_CAPTURE_TOKEN: [Field; 128] = [
19441944
/*DEL*/ NO_TOKEN,
19451945
];
19461946

1947-
global LITERAL_CAPTURE_PUSH_TRANSCRIPT: [bool; 128] = [
1947+
pub(crate) global LITERAL_CAPTURE_PUSH_TRANSCRIPT: [bool; 128] = [
19481948
/* NULL */ false,
19491949
/* SOH */ false,
19501950
/* TXT */ false,
@@ -2086,7 +2086,7 @@ global LITERAL_CAPTURE_PUSH_TRANSCRIPT: [bool; 128] = [
20862086
/*DEL*/ false,
20872087
];
20882088

2089-
global LITERAL_CAPTURE_INCREASE_LENGTH: [bool; 128] = [
2089+
pub(crate) global LITERAL_CAPTURE_INCREASE_LENGTH: [bool; 128] = [
20902090
/* NULL */ false,
20912091
/* SOH */ false,
20922092
/* TXT */ false,
@@ -2230,7 +2230,7 @@ global LITERAL_CAPTURE_INCREASE_LENGTH: [bool; 128] = [
22302230

22312231
// ####
22322232

2233-
global GRAMMAR_CAPTURE_ERROR_FLAG: [bool; 128] = [
2233+
pub(crate) global GRAMMAR_CAPTURE_ERROR_FLAG: [bool; 128] = [
22342234
/* NULL */ true,
22352235
/* SOH */ true,
22362236
/* TXT */ true,
@@ -2364,7 +2364,7 @@ global GRAMMAR_CAPTURE_ERROR_FLAG: [bool; 128] = [
23642364
/*DEL*/ true,
23652365
];
23662366

2367-
global STRING_CAPTURE_ERROR_FLAG: [bool; 128] = [
2367+
pub(crate) global STRING_CAPTURE_ERROR_FLAG: [bool; 128] = [
23682368
/* NULL */ true,
23692369
/* SOH */ true,
23702370
/* TXT */ true,
@@ -2495,7 +2495,7 @@ global STRING_CAPTURE_ERROR_FLAG: [bool; 128] = [
24952495
/*DEL*/ true,
24962496
];
24972497

2498-
global NUMERIC_CAPTURE_ERROR_FLAG: [bool; 128] = [
2498+
pub(crate) global NUMERIC_CAPTURE_ERROR_FLAG: [bool; 128] = [
24992499
/* NULL */ true,
25002500
/* SOH */ true,
25012501
/* TXT */ true,
@@ -2626,7 +2626,7 @@ global NUMERIC_CAPTURE_ERROR_FLAG: [bool; 128] = [
26262626
/*DEL*/ true,
26272627
];
26282628

2629-
global LITERAL_CAPTURE_ERROR_FLAG: [bool; 128] = [
2629+
pub(crate) global LITERAL_CAPTURE_ERROR_FLAG: [bool; 128] = [
26302630
/* NULL */ true,
26312631
/* SOH */ true,
26322632
/* TXT */ true,

‎src/_table_generation/mod.nr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
mod make_tables;
2-
mod make_tables_subtables;
1+
pub(crate) mod make_tables;
2+
pub(crate) mod make_tables_subtables;

‎src/enums.nr‎

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,28 @@
1-
mod ScanMode {
2-
global GRAMMAR_SCAN: Field = 0;
3-
global STRING_SCAN: Field = 1;
4-
global NUMERIC_SCAN: Field = 2;
5-
global LITERAL_SCAN: Field = 3;
1+
pub(crate) mod ScanMode {
2+
pub(crate) global GRAMMAR_SCAN: Field = 0;
3+
pub(crate) global STRING_SCAN: Field = 1;
4+
pub(crate) global NUMERIC_SCAN: Field = 2;
5+
pub(crate) global LITERAL_SCAN: Field = 3;
66
}
77

8-
mod Token {
9-
global NO_TOKEN: Field = 0;
10-
global BEGIN_OBJECT_TOKEN: Field = 1;
11-
global END_OBJECT_TOKEN: Field = 2;
12-
global BEGIN_ARRAY_TOKEN: Field = 3;
13-
global END_ARRAY_TOKEN: Field = 4;
14-
global KEY_SEPARATOR_TOKEN: Field = 5;
15-
global VALUE_SEPARATOR_TOKEN: Field = 6;
16-
global STRING_TOKEN: Field = 7;
17-
global NUMERIC_TOKEN: Field = 8;
18-
global LITERAL_TOKEN: Field = 9;
19-
global KEY_TOKEN: Field = 10;
20-
global NUM_TOKENS: u32 = 11;
21-
global NUM_TOKENS_MUL_2: u32 = 22;
8+
pub(crate) mod Token {
9+
pub(crate) global NO_TOKEN: Field = 0;
10+
pub(crate) global BEGIN_OBJECT_TOKEN: Field = 1;
11+
pub(crate) global END_OBJECT_TOKEN: Field = 2;
12+
pub(crate) global BEGIN_ARRAY_TOKEN: Field = 3;
13+
pub(crate) global END_ARRAY_TOKEN: Field = 4;
14+
pub(crate) global KEY_SEPARATOR_TOKEN: Field = 5;
15+
pub(crate) global VALUE_SEPARATOR_TOKEN: Field = 6;
16+
pub(crate) global STRING_TOKEN: Field = 7;
17+
pub(crate) global NUMERIC_TOKEN: Field = 8;
18+
pub(crate) global LITERAL_TOKEN: Field = 9;
19+
pub(crate) global KEY_TOKEN: Field = 10;
20+
pub(crate) global NUM_TOKENS: u32 = 11;
21+
pub(crate) global NUM_TOKENS_MUL_2: u32 = 22;
2222
}
2323

24-
mod Layer {
25-
global OBJECT_LAYER: Field = 0;
26-
global ARRAY_LAYER: Field = 1;
27-
global SINGLE_VALUE_LAYER: Field = 2;
24+
pub(crate) mod Layer {
25+
pub(crate) global OBJECT_LAYER: Field = 0;
26+
pub(crate) global ARRAY_LAYER: Field = 1;
27+
pub(crate) global SINGLE_VALUE_LAYER: Field = 2;
2828
}
29-

0 commit comments

Comments
 (0)