[shuffle] Move reader/wgsl to new structure.
This CL moves the wgsl reader into the `lang/wgsl/reader` folder and
updates the includes. The namespaces and build groups are not updated in
this CL, just the code move.
Bug: tint:1988
Change-Id: I538b653ec8df6dfef5d0ed2d1a9a2e003785ee29
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/142001
Reviewed-by: Ben Clayton <bclayton@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
diff --git a/src/tint/CMakeLists.txt b/src/tint/CMakeLists.txt
index 5d7dc31..88b83c2 100644
--- a/src/tint/CMakeLists.txt
+++ b/src/tint/CMakeLists.txt
@@ -640,17 +640,17 @@
if(${TINT_BUILD_WGSL_READER})
list(APPEND TINT_LIB_SRCS
- reader/wgsl/classify_template_args.cc
- reader/wgsl/classify_template_args.h
- reader/wgsl/lexer.cc
- reader/wgsl/lexer.h
- reader/wgsl/parser.cc
- reader/wgsl/parser.h
- reader/wgsl/parser_impl.cc
- reader/wgsl/parser_impl.h
- reader/wgsl/parser_impl_detail.h
- reader/wgsl/token.cc
- reader/wgsl/token.h
+ lang/wgsl/reader/classify_template_args.cc
+ lang/wgsl/reader/classify_template_args.h
+ lang/wgsl/reader/lexer.cc
+ lang/wgsl/reader/lexer.h
+ lang/wgsl/reader/parser.cc
+ lang/wgsl/reader/parser.h
+ lang/wgsl/reader/parser_impl.cc
+ lang/wgsl/reader/parser_impl.h
+ lang/wgsl/reader/parser_impl_detail.h
+ lang/wgsl/reader/token.cc
+ lang/wgsl/reader/token.h
)
endif()
@@ -1225,74 +1225,74 @@
if(${TINT_BUILD_WGSL_READER})
list(APPEND TINT_TEST_SRCS
- reader/wgsl/classify_template_args_test.cc
- reader/wgsl/lexer_test.cc
- reader/wgsl/parser_test.cc
- reader/wgsl/parser_impl_additive_expression_test.cc
- reader/wgsl/parser_impl_argument_expression_list_test.cc
- reader/wgsl/parser_impl_assignment_stmt_test.cc
- reader/wgsl/parser_impl_bitwise_expression_test.cc
- reader/wgsl/parser_impl_break_stmt_test.cc
- reader/wgsl/parser_impl_bug_cases_test.cc
- reader/wgsl/parser_impl_call_stmt_test.cc
- reader/wgsl/parser_impl_compound_stmt_test.cc
- reader/wgsl/parser_impl_const_literal_test.cc
- reader/wgsl/parser_impl_continue_stmt_test.cc
- reader/wgsl/parser_impl_continuing_stmt_test.cc
- reader/wgsl/parser_impl_core_lhs_expression_test.cc
- reader/wgsl/parser_impl_diagnostic_attribute_test.cc
- reader/wgsl/parser_impl_diagnostic_control_test.cc
- reader/wgsl/parser_impl_diagnostic_directive_test.cc
- reader/wgsl/parser_impl_enable_directive_test.cc
- reader/wgsl/parser_impl_error_msg_test.cc
- reader/wgsl/parser_impl_error_resync_test.cc
- reader/wgsl/parser_impl_expression_test.cc
- reader/wgsl/parser_impl_for_stmt_test.cc
- reader/wgsl/parser_impl_function_decl_test.cc
- reader/wgsl/parser_impl_function_attribute_list_test.cc
- reader/wgsl/parser_impl_function_attribute_test.cc
- reader/wgsl/parser_impl_function_header_test.cc
- reader/wgsl/parser_impl_global_constant_decl_test.cc
- reader/wgsl/parser_impl_global_decl_test.cc
- reader/wgsl/parser_impl_global_variable_decl_test.cc
- reader/wgsl/parser_impl_if_stmt_test.cc
- reader/wgsl/parser_impl_increment_decrement_stmt_test.cc
- reader/wgsl/parser_impl_lhs_expression_test.cc
- reader/wgsl/parser_impl_loop_stmt_test.cc
- reader/wgsl/parser_impl_math_expression_test.cc
- reader/wgsl/parser_impl_multiplicative_expression_test.cc
- reader/wgsl/parser_impl_param_list_test.cc
- reader/wgsl/parser_impl_paren_expression_test.cc
- reader/wgsl/parser_impl_primary_expression_test.cc
- reader/wgsl/parser_impl_relational_expression_test.cc
- reader/wgsl/parser_impl_reserved_keyword_test.cc
- reader/wgsl/parser_impl_require_directive_test.cc
- reader/wgsl/parser_impl_shift_expression_test.cc
- reader/wgsl/parser_impl_singular_expression_test.cc
- reader/wgsl/parser_impl_statement_test.cc
- reader/wgsl/parser_impl_statements_test.cc
- reader/wgsl/parser_impl_struct_body_decl_test.cc
- reader/wgsl/parser_impl_struct_decl_test.cc
- reader/wgsl/parser_impl_struct_attribute_decl_test.cc
- reader/wgsl/parser_impl_struct_member_attribute_decl_test.cc
- reader/wgsl/parser_impl_struct_member_attribute_test.cc
- reader/wgsl/parser_impl_struct_member_test.cc
- reader/wgsl/parser_impl_switch_body_test.cc
- reader/wgsl/parser_impl_switch_stmt_test.cc
- reader/wgsl/parser_impl_test.cc
- reader/wgsl/parser_impl_test_helper.cc
- reader/wgsl/parser_impl_test_helper.h
- reader/wgsl/parser_impl_type_alias_test.cc
- reader/wgsl/parser_impl_type_decl_test.cc
- reader/wgsl/parser_impl_unary_expression_test.cc
- reader/wgsl/parser_impl_variable_decl_test.cc
- reader/wgsl/parser_impl_variable_attribute_list_test.cc
- reader/wgsl/parser_impl_variable_attribute_test.cc
- reader/wgsl/parser_impl_variable_ident_decl_test.cc
- reader/wgsl/parser_impl_variable_stmt_test.cc
- reader/wgsl/parser_impl_variable_qualifier_test.cc
- reader/wgsl/parser_impl_while_stmt_test.cc
- reader/wgsl/token_test.cc
+ lang/wgsl/reader/classify_template_args_test.cc
+ lang/wgsl/reader/lexer_test.cc
+ lang/wgsl/reader/parser_test.cc
+ lang/wgsl/reader/parser_impl_additive_expression_test.cc
+ lang/wgsl/reader/parser_impl_argument_expression_list_test.cc
+ lang/wgsl/reader/parser_impl_assignment_stmt_test.cc
+ lang/wgsl/reader/parser_impl_bitwise_expression_test.cc
+ lang/wgsl/reader/parser_impl_break_stmt_test.cc
+ lang/wgsl/reader/parser_impl_bug_cases_test.cc
+ lang/wgsl/reader/parser_impl_call_stmt_test.cc
+ lang/wgsl/reader/parser_impl_compound_stmt_test.cc
+ lang/wgsl/reader/parser_impl_const_literal_test.cc
+ lang/wgsl/reader/parser_impl_continue_stmt_test.cc
+ lang/wgsl/reader/parser_impl_continuing_stmt_test.cc
+ lang/wgsl/reader/parser_impl_core_lhs_expression_test.cc
+ lang/wgsl/reader/parser_impl_diagnostic_attribute_test.cc
+ lang/wgsl/reader/parser_impl_diagnostic_control_test.cc
+ lang/wgsl/reader/parser_impl_diagnostic_directive_test.cc
+ lang/wgsl/reader/parser_impl_enable_directive_test.cc
+ lang/wgsl/reader/parser_impl_error_msg_test.cc
+ lang/wgsl/reader/parser_impl_error_resync_test.cc
+ lang/wgsl/reader/parser_impl_expression_test.cc
+ lang/wgsl/reader/parser_impl_for_stmt_test.cc
+ lang/wgsl/reader/parser_impl_function_decl_test.cc
+ lang/wgsl/reader/parser_impl_function_attribute_list_test.cc
+ lang/wgsl/reader/parser_impl_function_attribute_test.cc
+ lang/wgsl/reader/parser_impl_function_header_test.cc
+ lang/wgsl/reader/parser_impl_global_constant_decl_test.cc
+ lang/wgsl/reader/parser_impl_global_decl_test.cc
+ lang/wgsl/reader/parser_impl_global_variable_decl_test.cc
+ lang/wgsl/reader/parser_impl_if_stmt_test.cc
+ lang/wgsl/reader/parser_impl_increment_decrement_stmt_test.cc
+ lang/wgsl/reader/parser_impl_lhs_expression_test.cc
+ lang/wgsl/reader/parser_impl_loop_stmt_test.cc
+ lang/wgsl/reader/parser_impl_math_expression_test.cc
+ lang/wgsl/reader/parser_impl_multiplicative_expression_test.cc
+ lang/wgsl/reader/parser_impl_param_list_test.cc
+ lang/wgsl/reader/parser_impl_paren_expression_test.cc
+ lang/wgsl/reader/parser_impl_primary_expression_test.cc
+ lang/wgsl/reader/parser_impl_relational_expression_test.cc
+ lang/wgsl/reader/parser_impl_reserved_keyword_test.cc
+ lang/wgsl/reader/parser_impl_require_directive_test.cc
+ lang/wgsl/reader/parser_impl_shift_expression_test.cc
+ lang/wgsl/reader/parser_impl_singular_expression_test.cc
+ lang/wgsl/reader/parser_impl_statement_test.cc
+ lang/wgsl/reader/parser_impl_statements_test.cc
+ lang/wgsl/reader/parser_impl_struct_body_decl_test.cc
+ lang/wgsl/reader/parser_impl_struct_decl_test.cc
+ lang/wgsl/reader/parser_impl_struct_attribute_decl_test.cc
+ lang/wgsl/reader/parser_impl_struct_member_attribute_decl_test.cc
+ lang/wgsl/reader/parser_impl_struct_member_attribute_test.cc
+ lang/wgsl/reader/parser_impl_struct_member_test.cc
+ lang/wgsl/reader/parser_impl_switch_body_test.cc
+ lang/wgsl/reader/parser_impl_switch_stmt_test.cc
+ lang/wgsl/reader/parser_impl_test.cc
+ lang/wgsl/reader/parser_impl_test_helper.cc
+ lang/wgsl/reader/parser_impl_test_helper.h
+ lang/wgsl/reader/parser_impl_type_alias_test.cc
+ lang/wgsl/reader/parser_impl_type_decl_test.cc
+ lang/wgsl/reader/parser_impl_unary_expression_test.cc
+ lang/wgsl/reader/parser_impl_variable_decl_test.cc
+ lang/wgsl/reader/parser_impl_variable_attribute_list_test.cc
+ lang/wgsl/reader/parser_impl_variable_attribute_test.cc
+ lang/wgsl/reader/parser_impl_variable_ident_decl_test.cc
+ lang/wgsl/reader/parser_impl_variable_stmt_test.cc
+ lang/wgsl/reader/parser_impl_variable_qualifier_test.cc
+ lang/wgsl/reader/parser_impl_while_stmt_test.cc
+ lang/wgsl/reader/token_test.cc
)
endif()
@@ -1710,7 +1710,7 @@
list(APPEND TINT_BENCHMARK_SRCS
"switch_bench.cc"
"bench/benchmark.cc"
- "reader/wgsl/parser_bench.cc"
+ "lang/wgsl/reader/parser_bench.cc"
)
if (${TINT_BUILD_GLSL_WRITER})
