Skip to content

Commit 72ab0d1

Browse files
jkeiserjkeiser
committed
Move stage 1 and 2 files to their own directories
1 parent 4ea866f commit 72ab0d1

32 files changed

+51
-45
lines changed

‎HACKING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ simdjson's source structure, from the top level, looks like this:
2929
```c++
3030
namespace simdjson {
3131
namespace haswell {
32-
#include "generic/stage1.h"
32+
#include "generic/stage1/json_structural_indexer.h"
3333
}
3434
}
3535
```

‎src/arm64/numberparsing.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ static inline uint32_t parse_eight_digits_unrolled(const char *chars) {
3131

3232
#define SWAR_NUMBER_PARSING
3333

34-
#include "generic/numberparsing.h"
34+
#include "generic/stage2/numberparsing.h"
3535

3636
} // namespace arm64
3737
} // namespace simdjson

‎src/arm64/stage1_find_marks.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,17 +71,17 @@ really_inline simd8<bool> must_be_continuation(simd8<uint8_t> prev1, simd8<uint8
7171
return is_second_byte ^ is_third_byte ^ is_fourth_byte;
7272
}
7373

74-
#include "generic/buf_block_reader.h"
75-
#include "generic/json_string_scanner.h"
76-
#include "generic/json_scanner.h"
74+
#include "generic/stage1/buf_block_reader.h"
75+
#include "generic/stage1/json_string_scanner.h"
76+
#include "generic/stage1/json_scanner.h"
7777

78-
#include "generic/json_minifier.h"
78+
#include "generic/stage1/json_minifier.h"
7979
WARN_UNUSED error_code implementation::minify(const uint8_t *buf, size_t len, uint8_t *dst, size_t &dst_len) const noexcept {
8080
return arm64::stage1::json_minifier::minify<64>(buf, len, dst, dst_len);
8181
}
8282

83-
#include "generic/utf8_lookup2_algorithm.h"
84-
#include "generic/json_structural_indexer.h"
83+
#include "generic/stage1/utf8_lookup2_algorithm.h"
84+
#include "generic/stage1/json_structural_indexer.h"
8585
WARN_UNUSED error_code implementation::stage1(const uint8_t *buf, size_t len, parser &parser, bool streaming) const noexcept {
8686
return arm64::stage1::json_structural_indexer::index<64>(buf, len, parser, streaming);
8787
}

‎src/arm64/stage2_build_tape.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
namespace simdjson {
1010
namespace arm64 {
1111

12-
#include "generic/atomparsing.h"
13-
#include "generic/structural_iterator.h"
14-
#include "generic/structural_parser.h"
15-
#include "generic/streaming_structural_parser.h"
12+
#include "generic/stage2/atomparsing.h"
13+
#include "generic/stage2/structural_iterator.h"
14+
#include "generic/stage2/structural_parser.h"
15+
#include "generic/stage2/streaming_structural_parser.h"
1616

1717
} // namespace arm64
1818
} // namespace simdjson

‎src/arm64/stringparsing.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ really_inline backslash_and_quote backslash_and_quote::copy_and_find(const uint8
4545
};
4646
}
4747

48-
#include "generic/stringparsing.h"
48+
#include "generic/stage2/stringparsing.h"
4949

5050
} // namespace arm64
5151
} // namespace simdjson

‎src/fallback/numberparsing.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ static inline uint32_t parse_eight_digits_unrolled(const char *chars) {
2626

2727
#define SWAR_NUMBER_PARSING
2828

29-
#include "generic/numberparsing.h"
29+
#include "generic/stage2/numberparsing.h"
3030

3131
} // namespace fallback
3232

‎src/fallback/stage2.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
namespace simdjson {
1111
namespace fallback {
1212

13-
#include "generic/atomparsing.h"
14-
#include "generic/structural_iterator.h"
15-
#include "generic/structural_parser.h"
16-
#include "generic/streaming_structural_parser.h"
13+
#include "generic/stage2/atomparsing.h"
14+
#include "generic/stage2/structural_iterator.h"
15+
#include "generic/stage2/structural_parser.h"
16+
#include "generic/stage2/streaming_structural_parser.h"
1717

1818
} // namespace fallback
1919
} // namespace simdjson

‎src/fallback/stringparsing.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ really_inline backslash_and_quote backslash_and_quote::copy_and_find(const uint8
2727
return { src[0] };
2828
}
2929

30-
#include "generic/stringparsing.h"
30+
#include "generic/stage2/stringparsing.h"
3131

3232
} // namespace fallback
3333
} // namespace simdjson

‎src/generic/buf_block_reader.h renamed to ‎src/generic/stage1/buf_block_reader.h

File renamed without changes.

‎src/generic/json_minifier.h renamed to ‎src/generic/stage1/json_minifier.h

File renamed without changes.

‎src/generic/json_scanner.h renamed to ‎src/generic/stage1/json_scanner.h

File renamed without changes.

‎src/generic/json_string_scanner.h renamed to ‎src/generic/stage1/json_string_scanner.h

File renamed without changes.

‎src/generic/json_structural_indexer.h renamed to ‎src/generic/stage1/json_structural_indexer.h

File renamed without changes.

‎src/generic/utf8_fastvalidate_algorithm.h renamed to ‎src/generic/stage1/utf8_fastvalidate_algorithm.h

File renamed without changes.

‎src/generic/utf8_lookup2_algorithm.h renamed to ‎src/generic/stage1/utf8_lookup2_algorithm.h

File renamed without changes.

‎src/generic/utf8_lookup_algorithm.h renamed to ‎src/generic/stage1/utf8_lookup_algorithm.h

File renamed without changes.

‎src/generic/utf8_range_algorithm.h renamed to ‎src/generic/stage1/utf8_range_algorithm.h

File renamed without changes.

‎src/generic/utf8_zwegner_algorithm.h renamed to ‎src/generic/stage1/utf8_zwegner_algorithm.h

File renamed without changes.

‎src/generic/atomparsing.h renamed to ‎src/generic/stage2/atomparsing.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
namespace stage2 {
12
namespace atomparsing {
23

34
really_inline uint32_t string_to_uint32(const char* str) { return *reinterpret_cast<const uint32_t *>(str); }
@@ -46,4 +47,5 @@ really_inline bool is_valid_null_atom(const uint8_t *src, size_t len) {
4647
else { return false; }
4748
}
4849

49-
} // namespace atomparsing
50+
} // namespace atomparsing
51+
} // namespace stage2

‎src/generic/numberparsing.h renamed to ‎src/generic/stage2/numberparsing.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
namespace stage2 {
12
namespace numberparsing {
23

34
// Attempts to compute i * 10^(power) exactly; and if "negative" is
@@ -568,3 +569,4 @@ really_inline bool parse_number(UNUSED const uint8_t *const src,
568569
}
569570

570571
} // namespace numberparsing
572+
} // namespace stage2

‎src/generic/streaming_structural_parser.h renamed to ‎src/generic/stage2/streaming_structural_parser.h

File renamed without changes.

‎src/generic/stringparsing.h renamed to ‎src/generic/stage2/stringparsing.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// We assume the file in which it is include already includes
44
// "stringparsing.h" (this simplifies amalgation)
55

6+
namespace stage2 {
67
namespace stringparsing {
78

89
// begin copypasta
@@ -118,4 +119,5 @@ WARN_UNUSED really_inline uint8_t *parse_string(const uint8_t *src, uint8_t *dst
118119
return nullptr;
119120
}
120121

121-
} // namespace stringparsing
122+
} // namespace stringparsing
123+
} // namespace stage2

‎src/generic/structural_iterator.h renamed to ‎src/generic/stage2/structural_iterator.h

File renamed without changes.

‎src/generic/structural_parser.h renamed to ‎src/generic/stage2/structural_parser.h

File renamed without changes.

‎src/haswell/numberparsing.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ static inline uint32_t parse_eight_digits_unrolled(const char *chars) {
3939

4040
#define SWAR_NUMBER_PARSING
4141

42-
#include "generic/numberparsing.h"
42+
#include "generic/stage2/numberparsing.h"
4343

4444
} // namespace haswell
4545

‎src/haswell/stage1.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,17 +60,17 @@ really_inline simd8<bool> must_be_continuation(simd8<uint8_t> prev1, simd8<uint8
6060
return simd8<int8_t>(is_second_byte | is_third_byte | is_fourth_byte) > int8_t(0);
6161
}
6262

63-
#include "generic/buf_block_reader.h"
64-
#include "generic/json_string_scanner.h"
65-
#include "generic/json_scanner.h"
63+
#include "generic/stage1/buf_block_reader.h"
64+
#include "generic/stage1/json_string_scanner.h"
65+
#include "generic/stage1/json_scanner.h"
6666

67-
#include "generic/json_minifier.h"
67+
#include "generic/stage1/json_minifier.h"
6868
WARN_UNUSED error_code implementation::minify(const uint8_t *buf, size_t len, uint8_t *dst, size_t &dst_len) const noexcept {
6969
return haswell::stage1::json_minifier::minify<128>(buf, len, dst, dst_len);
7070
}
7171

72-
#include "generic/utf8_lookup2_algorithm.h"
73-
#include "generic/json_structural_indexer.h"
72+
#include "generic/stage1/utf8_lookup2_algorithm.h"
73+
#include "generic/stage1/json_structural_indexer.h"
7474
WARN_UNUSED error_code implementation::stage1(const uint8_t *buf, size_t len, parser &parser, bool streaming) const noexcept {
7575
return haswell::stage1::json_structural_indexer::index<128>(buf, len, parser, streaming);
7676
}

‎src/haswell/stage2.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ TARGET_HASWELL
1010
namespace simdjson {
1111
namespace haswell {
1212

13-
#include "generic/atomparsing.h"
14-
#include "generic/structural_iterator.h"
15-
#include "generic/structural_parser.h"
16-
#include "generic/streaming_structural_parser.h"
13+
#include "generic/stage2/atomparsing.h"
14+
#include "generic/stage2/structural_iterator.h"
15+
#include "generic/stage2/structural_parser.h"
16+
#include "generic/stage2/streaming_structural_parser.h"
1717

1818
} // namespace haswell
1919
} // namespace simdjson

‎src/haswell/stringparsing.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ really_inline backslash_and_quote backslash_and_quote::copy_and_find(const uint8
4141
};
4242
}
4343

44-
#include "generic/stringparsing.h"
44+
#include "generic/stage2/stringparsing.h"
4545

4646
} // namespace haswell
4747
} // namespace simdjson

‎src/westmere/numberparsing.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ static inline uint32_t parse_eight_digits_unrolled(const char *chars) {
4040

4141
#define SWAR_NUMBER_PARSING
4242

43-
#include "generic/numberparsing.h"
43+
#include "generic/stage2/numberparsing.h"
4444

4545
} // namespace westmere
4646

‎src/westmere/stage1.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,17 +59,17 @@ really_inline simd8<bool> must_be_continuation(simd8<uint8_t> prev1, simd8<uint8
5959
return simd8<int8_t>(is_second_byte | is_third_byte | is_fourth_byte) > int8_t(0);
6060
}
6161

62-
#include "generic/buf_block_reader.h"
63-
#include "generic/json_string_scanner.h"
64-
#include "generic/json_scanner.h"
62+
#include "generic/stage1/buf_block_reader.h"
63+
#include "generic/stage1/json_string_scanner.h"
64+
#include "generic/stage1/json_scanner.h"
6565

66-
#include "generic/json_minifier.h"
66+
#include "generic/stage1/json_minifier.h"
6767
WARN_UNUSED error_code implementation::minify(const uint8_t *buf, size_t len, uint8_t *dst, size_t &dst_len) const noexcept {
6868
return westmere::stage1::json_minifier::minify<64>(buf, len, dst, dst_len);
6969
}
7070

71-
#include "generic/utf8_lookup2_algorithm.h"
72-
#include "generic/json_structural_indexer.h"
71+
#include "generic/stage1/utf8_lookup2_algorithm.h"
72+
#include "generic/stage1/json_structural_indexer.h"
7373
WARN_UNUSED error_code implementation::stage1(const uint8_t *buf, size_t len, parser &parser, bool streaming) const noexcept {
7474
return westmere::stage1::json_structural_indexer::index<64>(buf, len, parser, streaming);
7575
}

‎src/westmere/stage2.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ TARGET_WESTMERE
1010
namespace simdjson {
1111
namespace westmere {
1212

13-
#include "generic/atomparsing.h"
14-
#include "generic/structural_iterator.h"
15-
#include "generic/structural_parser.h"
16-
#include "generic/streaming_structural_parser.h"
13+
#include "generic/stage2/atomparsing.h"
14+
#include "generic/stage2/structural_iterator.h"
15+
#include "generic/stage2/structural_parser.h"
16+
#include "generic/stage2/streaming_structural_parser.h"
1717

1818
} // namespace westmere
1919
} // namespace simdjson

‎src/westmere/stringparsing.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ really_inline backslash_and_quote backslash_and_quote::copy_and_find(const uint8
4343
};
4444
}
4545

46-
#include "generic/stringparsing.h"
46+
#include "generic/stage2/stringparsing.h"
4747

4848
} // namespace westmere
4949
} // namespace simdjson

0 commit comments

Comments
 (0)