[shuffle] Move ast to new structure.
This CL moves the ast folder into the `lang/wgsl/ast` 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: Iff69e4d02f55d2c7f1fcd279715ddd81d3ede4b1
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/142003
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>
diff --git a/include/tint/tint.h b/include/tint/tint.h
index e676097..d3ab2bc 100644
--- a/include/tint/tint.h
+++ b/include/tint/tint.h
@@ -21,13 +21,13 @@
// TODO(tint:88): When implementing support for an install target, all of these
// headers will need to be moved to include/tint/.
-#include "src/tint/ast/transform/first_index_offset.h"
-#include "src/tint/ast/transform/renamer.h"
-#include "src/tint/ast/transform/single_entry_point.h"
-#include "src/tint/ast/transform/substitute_override.h"
-#include "src/tint/ast/transform/vertex_pulling.h"
#include "src/tint/diagnostic/printer.h"
#include "src/tint/inspector/inspector.h"
+#include "src/tint/lang/wgsl/ast/transform/first_index_offset.h"
+#include "src/tint/lang/wgsl/ast/transform/renamer.h"
+#include "src/tint/lang/wgsl/ast/transform/single_entry_point.h"
+#include "src/tint/lang/wgsl/ast/transform/substitute_override.h"
+#include "src/tint/lang/wgsl/ast/transform/vertex_pulling.h"
#include "src/tint/reader/reader.h"
#include "src/tint/transform/manager.h"
#include "src/tint/type/manager.h"
diff --git a/src/tint/BUILD.gn b/src/tint/BUILD.gn
index 6c60727..5756fdf 100644
--- a/src/tint/BUILD.gn
+++ b/src/tint/BUILD.gn
@@ -363,8 +363,8 @@
libtint_source_set("libtint_ast_transform_base_src") {
sources = [
- "ast/transform/transform.cc",
- "ast/transform/transform.h",
+ "lang/wgsl/ast/transform/transform.cc",
+ "lang/wgsl/ast/transform/transform.h",
]
deps = [
":libtint_builtins_src",
@@ -397,106 +397,106 @@
libtint_source_set("libtint_ast_transform_src") {
sources = [
- "ast/transform/add_block_attribute.cc",
- "ast/transform/add_block_attribute.h",
- "ast/transform/add_empty_entry_point.cc",
- "ast/transform/add_empty_entry_point.h",
- "ast/transform/array_length_from_uniform.cc",
- "ast/transform/array_length_from_uniform.h",
- "ast/transform/binding_remapper.cc",
- "ast/transform/binding_remapper.h",
- "ast/transform/builtin_polyfill.cc",
- "ast/transform/builtin_polyfill.h",
- "ast/transform/calculate_array_length.cc",
- "ast/transform/calculate_array_length.h",
- "ast/transform/canonicalize_entry_point_io.cc",
- "ast/transform/canonicalize_entry_point_io.h",
- "ast/transform/clamp_frag_depth.cc",
- "ast/transform/clamp_frag_depth.h",
- "ast/transform/combine_samplers.cc",
- "ast/transform/combine_samplers.h",
- "ast/transform/decompose_memory_access.cc",
- "ast/transform/decompose_memory_access.h",
- "ast/transform/decompose_strided_array.cc",
- "ast/transform/decompose_strided_array.h",
- "ast/transform/decompose_strided_matrix.cc",
- "ast/transform/decompose_strided_matrix.h",
- "ast/transform/demote_to_helper.cc",
- "ast/transform/demote_to_helper.h",
- "ast/transform/direct_variable_access.cc",
- "ast/transform/direct_variable_access.h",
- "ast/transform/disable_uniformity_analysis.cc",
- "ast/transform/disable_uniformity_analysis.h",
- "ast/transform/expand_compound_assignment.cc",
- "ast/transform/expand_compound_assignment.h",
- "ast/transform/first_index_offset.cc",
- "ast/transform/first_index_offset.h",
- "ast/transform/fold_trivial_lets.cc",
- "ast/transform/fold_trivial_lets.h",
- "ast/transform/for_loop_to_loop.cc",
- "ast/transform/for_loop_to_loop.h",
- "ast/transform/localize_struct_array_assignment.cc",
- "ast/transform/localize_struct_array_assignment.h",
- "ast/transform/merge_return.cc",
- "ast/transform/merge_return.h",
- "ast/transform/module_scope_var_to_entry_point_param.cc",
- "ast/transform/module_scope_var_to_entry_point_param.h",
- "ast/transform/multiplanar_external_texture.cc",
- "ast/transform/multiplanar_external_texture.h",
- "ast/transform/num_workgroups_from_uniform.cc",
- "ast/transform/num_workgroups_from_uniform.h",
- "ast/transform/packed_vec3.cc",
- "ast/transform/packed_vec3.h",
- "ast/transform/pad_structs.cc",
- "ast/transform/pad_structs.h",
- "ast/transform/preserve_padding.cc",
- "ast/transform/preserve_padding.h",
- "ast/transform/promote_initializers_to_let.cc",
- "ast/transform/promote_initializers_to_let.h",
- "ast/transform/promote_side_effects_to_decl.cc",
- "ast/transform/promote_side_effects_to_decl.h",
- "ast/transform/remove_continue_in_switch.cc",
- "ast/transform/remove_continue_in_switch.h",
- "ast/transform/remove_phonies.cc",
- "ast/transform/remove_phonies.h",
- "ast/transform/remove_unreachable_statements.cc",
- "ast/transform/remove_unreachable_statements.h",
- "ast/transform/renamer.cc",
- "ast/transform/renamer.h",
- "ast/transform/robustness.cc",
- "ast/transform/robustness.h",
- "ast/transform/simplify_pointers.cc",
- "ast/transform/simplify_pointers.h",
- "ast/transform/single_entry_point.cc",
- "ast/transform/single_entry_point.h",
- "ast/transform/spirv_atomic.cc",
- "ast/transform/spirv_atomic.h",
- "ast/transform/std140.cc",
- "ast/transform/std140.h",
- "ast/transform/substitute_override.cc",
- "ast/transform/substitute_override.h",
- "ast/transform/texture_1d_to_2d.cc",
- "ast/transform/texture_1d_to_2d.h",
- "ast/transform/truncate_interstage_variables.cc",
- "ast/transform/truncate_interstage_variables.h",
- "ast/transform/unshadow.cc",
- "ast/transform/unshadow.h",
- "ast/transform/utils/get_insertion_point.cc",
- "ast/transform/utils/get_insertion_point.h",
- "ast/transform/utils/hoist_to_decl_before.cc",
- "ast/transform/utils/hoist_to_decl_before.h",
- "ast/transform/var_for_dynamic_index.cc",
- "ast/transform/var_for_dynamic_index.h",
- "ast/transform/vectorize_matrix_conversions.cc",
- "ast/transform/vectorize_matrix_conversions.h",
- "ast/transform/vectorize_scalar_matrix_initializers.cc",
- "ast/transform/vectorize_scalar_matrix_initializers.h",
- "ast/transform/vertex_pulling.cc",
- "ast/transform/vertex_pulling.h",
- "ast/transform/while_to_loop.cc",
- "ast/transform/while_to_loop.h",
- "ast/transform/zero_init_workgroup_memory.cc",
- "ast/transform/zero_init_workgroup_memory.h",
+ "lang/wgsl/ast/transform/add_block_attribute.cc",
+ "lang/wgsl/ast/transform/add_block_attribute.h",
+ "lang/wgsl/ast/transform/add_empty_entry_point.cc",
+ "lang/wgsl/ast/transform/add_empty_entry_point.h",
+ "lang/wgsl/ast/transform/array_length_from_uniform.cc",
+ "lang/wgsl/ast/transform/array_length_from_uniform.h",
+ "lang/wgsl/ast/transform/binding_remapper.cc",
+ "lang/wgsl/ast/transform/binding_remapper.h",
+ "lang/wgsl/ast/transform/builtin_polyfill.cc",
+ "lang/wgsl/ast/transform/builtin_polyfill.h",
+ "lang/wgsl/ast/transform/calculate_array_length.cc",
+ "lang/wgsl/ast/transform/calculate_array_length.h",
+ "lang/wgsl/ast/transform/canonicalize_entry_point_io.cc",
+ "lang/wgsl/ast/transform/canonicalize_entry_point_io.h",
+ "lang/wgsl/ast/transform/clamp_frag_depth.cc",
+ "lang/wgsl/ast/transform/clamp_frag_depth.h",
+ "lang/wgsl/ast/transform/combine_samplers.cc",
+ "lang/wgsl/ast/transform/combine_samplers.h",
+ "lang/wgsl/ast/transform/decompose_memory_access.cc",
+ "lang/wgsl/ast/transform/decompose_memory_access.h",
+ "lang/wgsl/ast/transform/decompose_strided_array.cc",
+ "lang/wgsl/ast/transform/decompose_strided_array.h",
+ "lang/wgsl/ast/transform/decompose_strided_matrix.cc",
+ "lang/wgsl/ast/transform/decompose_strided_matrix.h",
+ "lang/wgsl/ast/transform/demote_to_helper.cc",
+ "lang/wgsl/ast/transform/demote_to_helper.h",
+ "lang/wgsl/ast/transform/direct_variable_access.cc",
+ "lang/wgsl/ast/transform/direct_variable_access.h",
+ "lang/wgsl/ast/transform/disable_uniformity_analysis.cc",
+ "lang/wgsl/ast/transform/disable_uniformity_analysis.h",
+ "lang/wgsl/ast/transform/expand_compound_assignment.cc",
+ "lang/wgsl/ast/transform/expand_compound_assignment.h",
+ "lang/wgsl/ast/transform/first_index_offset.cc",
+ "lang/wgsl/ast/transform/first_index_offset.h",
+ "lang/wgsl/ast/transform/fold_trivial_lets.cc",
+ "lang/wgsl/ast/transform/fold_trivial_lets.h",
+ "lang/wgsl/ast/transform/for_loop_to_loop.cc",
+ "lang/wgsl/ast/transform/for_loop_to_loop.h",
+ "lang/wgsl/ast/transform/localize_struct_array_assignment.cc",
+ "lang/wgsl/ast/transform/localize_struct_array_assignment.h",
+ "lang/wgsl/ast/transform/merge_return.cc",
+ "lang/wgsl/ast/transform/merge_return.h",
+ "lang/wgsl/ast/transform/module_scope_var_to_entry_point_param.cc",
+ "lang/wgsl/ast/transform/module_scope_var_to_entry_point_param.h",
+ "lang/wgsl/ast/transform/multiplanar_external_texture.cc",
+ "lang/wgsl/ast/transform/multiplanar_external_texture.h",
+ "lang/wgsl/ast/transform/num_workgroups_from_uniform.cc",
+ "lang/wgsl/ast/transform/num_workgroups_from_uniform.h",
+ "lang/wgsl/ast/transform/packed_vec3.cc",
+ "lang/wgsl/ast/transform/packed_vec3.h",
+ "lang/wgsl/ast/transform/pad_structs.cc",
+ "lang/wgsl/ast/transform/pad_structs.h",
+ "lang/wgsl/ast/transform/preserve_padding.cc",
+ "lang/wgsl/ast/transform/preserve_padding.h",
+ "lang/wgsl/ast/transform/promote_initializers_to_let.cc",
+ "lang/wgsl/ast/transform/promote_initializers_to_let.h",
+ "lang/wgsl/ast/transform/promote_side_effects_to_decl.cc",
+ "lang/wgsl/ast/transform/promote_side_effects_to_decl.h",
+ "lang/wgsl/ast/transform/remove_continue_in_switch.cc",
+ "lang/wgsl/ast/transform/remove_continue_in_switch.h",
+ "lang/wgsl/ast/transform/remove_phonies.cc",
+ "lang/wgsl/ast/transform/remove_phonies.h",
+ "lang/wgsl/ast/transform/remove_unreachable_statements.cc",
+ "lang/wgsl/ast/transform/remove_unreachable_statements.h",
+ "lang/wgsl/ast/transform/renamer.cc",
+ "lang/wgsl/ast/transform/renamer.h",
+ "lang/wgsl/ast/transform/robustness.cc",
+ "lang/wgsl/ast/transform/robustness.h",
+ "lang/wgsl/ast/transform/simplify_pointers.cc",
+ "lang/wgsl/ast/transform/simplify_pointers.h",
+ "lang/wgsl/ast/transform/single_entry_point.cc",
+ "lang/wgsl/ast/transform/single_entry_point.h",
+ "lang/wgsl/ast/transform/spirv_atomic.cc",
+ "lang/wgsl/ast/transform/spirv_atomic.h",
+ "lang/wgsl/ast/transform/std140.cc",
+ "lang/wgsl/ast/transform/std140.h",
+ "lang/wgsl/ast/transform/substitute_override.cc",
+ "lang/wgsl/ast/transform/substitute_override.h",
+ "lang/wgsl/ast/transform/texture_1d_to_2d.cc",
+ "lang/wgsl/ast/transform/texture_1d_to_2d.h",
+ "lang/wgsl/ast/transform/truncate_interstage_variables.cc",
+ "lang/wgsl/ast/transform/truncate_interstage_variables.h",
+ "lang/wgsl/ast/transform/unshadow.cc",
+ "lang/wgsl/ast/transform/unshadow.h",
+ "lang/wgsl/ast/transform/utils/get_insertion_point.cc",
+ "lang/wgsl/ast/transform/utils/get_insertion_point.h",
+ "lang/wgsl/ast/transform/utils/hoist_to_decl_before.cc",
+ "lang/wgsl/ast/transform/utils/hoist_to_decl_before.h",
+ "lang/wgsl/ast/transform/var_for_dynamic_index.cc",
+ "lang/wgsl/ast/transform/var_for_dynamic_index.h",
+ "lang/wgsl/ast/transform/vectorize_matrix_conversions.cc",
+ "lang/wgsl/ast/transform/vectorize_matrix_conversions.h",
+ "lang/wgsl/ast/transform/vectorize_scalar_matrix_initializers.cc",
+ "lang/wgsl/ast/transform/vectorize_scalar_matrix_initializers.h",
+ "lang/wgsl/ast/transform/vertex_pulling.cc",
+ "lang/wgsl/ast/transform/vertex_pulling.h",
+ "lang/wgsl/ast/transform/while_to_loop.cc",
+ "lang/wgsl/ast/transform/while_to_loop.h",
+ "lang/wgsl/ast/transform/zero_init_workgroup_memory.cc",
+ "lang/wgsl/ast/transform/zero_init_workgroup_memory.h",
]
deps = [
":libtint_ast_src",
@@ -552,84 +552,84 @@
libtint_source_set("libtint_ast_hdrs") {
sources = [
- "ast/accessor_expression.h",
- "ast/alias.h",
- "ast/assignment_statement.h",
- "ast/attribute.h",
- "ast/binary_expression.h",
- "ast/binding_attribute.h",
- "ast/bitcast_expression.h",
- "ast/block_statement.h",
- "ast/bool_literal_expression.h",
- "ast/break_if_statement.h",
- "ast/break_statement.h",
- "ast/builtin_attribute.h",
- "ast/call_expression.h",
- "ast/call_statement.h",
- "ast/case_selector.h",
- "ast/case_statement.h",
- "ast/compound_assignment_statement.h",
- "ast/const.h",
- "ast/const_assert.h",
- "ast/continue_statement.h",
- "ast/diagnostic_attribute.h",
- "ast/diagnostic_control.h",
- "ast/diagnostic_directive.h",
- "ast/diagnostic_rule_name.h",
- "ast/disable_validation_attribute.h",
- "ast/discard_statement.h",
- "ast/enable.h",
- "ast/expression.h",
- "ast/extension.h",
- "ast/float_literal_expression.h",
- "ast/for_loop_statement.h",
- "ast/function.h",
- "ast/group_attribute.h",
- "ast/id_attribute.h",
- "ast/identifier.h",
- "ast/identifier_expression.h",
- "ast/if_statement.h",
- "ast/increment_decrement_statement.h",
- "ast/index_accessor_expression.h",
- "ast/index_attribute.h",
- "ast/int_literal_expression.h",
- "ast/internal_attribute.h",
- "ast/interpolate_attribute.h",
- "ast/invariant_attribute.h",
- "ast/let.h",
- "ast/literal_expression.h",
- "ast/location_attribute.h",
- "ast/loop_statement.h",
- "ast/member_accessor_expression.h",
- "ast/module.h",
- "ast/must_use_attribute.h",
- "ast/node.h",
- "ast/node_id.h",
- "ast/override.h",
- "ast/parameter.h",
- "ast/phony_expression.h",
- "ast/pipeline_stage.h",
- "ast/return_statement.h",
- "ast/stage_attribute.h",
- "ast/statement.h",
- "ast/stride_attribute.h",
- "ast/struct.h",
- "ast/struct_member.h",
- "ast/struct_member_align_attribute.h",
- "ast/struct_member_offset_attribute.h",
- "ast/struct_member_size_attribute.h",
- "ast/switch_statement.h",
- "ast/templated_identifier.h",
- "ast/traverse_expressions.h",
- "ast/type.h",
- "ast/type_decl.h",
- "ast/unary_op.h",
- "ast/unary_op_expression.h",
- "ast/var.h",
- "ast/variable.h",
- "ast/variable_decl_statement.h",
- "ast/while_statement.h",
- "ast/workgroup_attribute.h",
+ "lang/wgsl/ast/accessor_expression.h",
+ "lang/wgsl/ast/alias.h",
+ "lang/wgsl/ast/assignment_statement.h",
+ "lang/wgsl/ast/attribute.h",
+ "lang/wgsl/ast/binary_expression.h",
+ "lang/wgsl/ast/binding_attribute.h",
+ "lang/wgsl/ast/bitcast_expression.h",
+ "lang/wgsl/ast/block_statement.h",
+ "lang/wgsl/ast/bool_literal_expression.h",
+ "lang/wgsl/ast/break_if_statement.h",
+ "lang/wgsl/ast/break_statement.h",
+ "lang/wgsl/ast/builtin_attribute.h",
+ "lang/wgsl/ast/call_expression.h",
+ "lang/wgsl/ast/call_statement.h",
+ "lang/wgsl/ast/case_selector.h",
+ "lang/wgsl/ast/case_statement.h",
+ "lang/wgsl/ast/compound_assignment_statement.h",
+ "lang/wgsl/ast/const.h",
+ "lang/wgsl/ast/const_assert.h",
+ "lang/wgsl/ast/continue_statement.h",
+ "lang/wgsl/ast/diagnostic_attribute.h",
+ "lang/wgsl/ast/diagnostic_control.h",
+ "lang/wgsl/ast/diagnostic_directive.h",
+ "lang/wgsl/ast/diagnostic_rule_name.h",
+ "lang/wgsl/ast/disable_validation_attribute.h",
+ "lang/wgsl/ast/discard_statement.h",
+ "lang/wgsl/ast/enable.h",
+ "lang/wgsl/ast/expression.h",
+ "lang/wgsl/ast/extension.h",
+ "lang/wgsl/ast/float_literal_expression.h",
+ "lang/wgsl/ast/for_loop_statement.h",
+ "lang/wgsl/ast/function.h",
+ "lang/wgsl/ast/group_attribute.h",
+ "lang/wgsl/ast/id_attribute.h",
+ "lang/wgsl/ast/identifier.h",
+ "lang/wgsl/ast/identifier_expression.h",
+ "lang/wgsl/ast/if_statement.h",
+ "lang/wgsl/ast/increment_decrement_statement.h",
+ "lang/wgsl/ast/index_accessor_expression.h",
+ "lang/wgsl/ast/index_attribute.h",
+ "lang/wgsl/ast/int_literal_expression.h",
+ "lang/wgsl/ast/internal_attribute.h",
+ "lang/wgsl/ast/interpolate_attribute.h",
+ "lang/wgsl/ast/invariant_attribute.h",
+ "lang/wgsl/ast/let.h",
+ "lang/wgsl/ast/literal_expression.h",
+ "lang/wgsl/ast/location_attribute.h",
+ "lang/wgsl/ast/loop_statement.h",
+ "lang/wgsl/ast/member_accessor_expression.h",
+ "lang/wgsl/ast/module.h",
+ "lang/wgsl/ast/must_use_attribute.h",
+ "lang/wgsl/ast/node.h",
+ "lang/wgsl/ast/node_id.h",
+ "lang/wgsl/ast/override.h",
+ "lang/wgsl/ast/parameter.h",
+ "lang/wgsl/ast/phony_expression.h",
+ "lang/wgsl/ast/pipeline_stage.h",
+ "lang/wgsl/ast/return_statement.h",
+ "lang/wgsl/ast/stage_attribute.h",
+ "lang/wgsl/ast/statement.h",
+ "lang/wgsl/ast/stride_attribute.h",
+ "lang/wgsl/ast/struct.h",
+ "lang/wgsl/ast/struct_member.h",
+ "lang/wgsl/ast/struct_member_align_attribute.h",
+ "lang/wgsl/ast/struct_member_offset_attribute.h",
+ "lang/wgsl/ast/struct_member_size_attribute.h",
+ "lang/wgsl/ast/switch_statement.h",
+ "lang/wgsl/ast/templated_identifier.h",
+ "lang/wgsl/ast/traverse_expressions.h",
+ "lang/wgsl/ast/type.h",
+ "lang/wgsl/ast/type_decl.h",
+ "lang/wgsl/ast/unary_op.h",
+ "lang/wgsl/ast/unary_op_expression.h",
+ "lang/wgsl/ast/var.h",
+ "lang/wgsl/ast/variable.h",
+ "lang/wgsl/ast/variable_decl_statement.h",
+ "lang/wgsl/ast/while_statement.h",
+ "lang/wgsl/ast/workgroup_attribute.h",
]
deps = [
":libtint_builtins_src",
@@ -642,82 +642,82 @@
libtint_source_set("libtint_ast_src") {
sources = [
- "ast/accessor_expression.cc",
- "ast/alias.cc",
- "ast/assignment_statement.cc",
- "ast/attribute.cc",
- "ast/binary_expression.cc",
- "ast/binding_attribute.cc",
- "ast/bitcast_expression.cc",
- "ast/block_statement.cc",
- "ast/bool_literal_expression.cc",
- "ast/break_if_statement.cc",
- "ast/break_statement.cc",
- "ast/builtin_attribute.cc",
- "ast/call_expression.cc",
- "ast/call_statement.cc",
- "ast/case_selector.cc",
- "ast/case_statement.cc",
- "ast/compound_assignment_statement.cc",
- "ast/const.cc",
- "ast/const_assert.cc",
- "ast/continue_statement.cc",
- "ast/diagnostic_attribute.cc",
- "ast/diagnostic_control.cc",
- "ast/diagnostic_directive.cc",
- "ast/diagnostic_rule_name.cc",
- "ast/disable_validation_attribute.cc",
- "ast/discard_statement.cc",
- "ast/enable.cc",
- "ast/expression.cc",
- "ast/extension.cc",
- "ast/float_literal_expression.cc",
- "ast/for_loop_statement.cc",
- "ast/function.cc",
- "ast/group_attribute.cc",
- "ast/id_attribute.cc",
- "ast/identifier.cc",
- "ast/identifier_expression.cc",
- "ast/if_statement.cc",
- "ast/increment_decrement_statement.cc",
- "ast/index_accessor_expression.cc",
- "ast/index_attribute.cc",
- "ast/int_literal_expression.cc",
- "ast/internal_attribute.cc",
- "ast/interpolate_attribute.cc",
- "ast/invariant_attribute.cc",
- "ast/let.cc",
- "ast/literal_expression.cc",
- "ast/location_attribute.cc",
- "ast/loop_statement.cc",
- "ast/member_accessor_expression.cc",
- "ast/module.cc",
- "ast/must_use_attribute.cc",
- "ast/node.cc",
- "ast/override.cc",
- "ast/parameter.cc",
- "ast/phony_expression.cc",
- "ast/pipeline_stage.cc",
- "ast/return_statement.cc",
- "ast/stage_attribute.cc",
- "ast/statement.cc",
- "ast/stride_attribute.cc",
- "ast/struct.cc",
- "ast/struct_member.cc",
- "ast/struct_member_align_attribute.cc",
- "ast/struct_member_offset_attribute.cc",
- "ast/struct_member_size_attribute.cc",
- "ast/switch_statement.cc",
- "ast/templated_identifier.cc",
- "ast/type.cc",
- "ast/type_decl.cc",
- "ast/unary_op.cc",
- "ast/unary_op_expression.cc",
- "ast/var.cc",
- "ast/variable.cc",
- "ast/variable_decl_statement.cc",
- "ast/while_statement.cc",
- "ast/workgroup_attribute.cc",
+ "lang/wgsl/ast/accessor_expression.cc",
+ "lang/wgsl/ast/alias.cc",
+ "lang/wgsl/ast/assignment_statement.cc",
+ "lang/wgsl/ast/attribute.cc",
+ "lang/wgsl/ast/binary_expression.cc",
+ "lang/wgsl/ast/binding_attribute.cc",
+ "lang/wgsl/ast/bitcast_expression.cc",
+ "lang/wgsl/ast/block_statement.cc",
+ "lang/wgsl/ast/bool_literal_expression.cc",
+ "lang/wgsl/ast/break_if_statement.cc",
+ "lang/wgsl/ast/break_statement.cc",
+ "lang/wgsl/ast/builtin_attribute.cc",
+ "lang/wgsl/ast/call_expression.cc",
+ "lang/wgsl/ast/call_statement.cc",
+ "lang/wgsl/ast/case_selector.cc",
+ "lang/wgsl/ast/case_statement.cc",
+ "lang/wgsl/ast/compound_assignment_statement.cc",
+ "lang/wgsl/ast/const.cc",
+ "lang/wgsl/ast/const_assert.cc",
+ "lang/wgsl/ast/continue_statement.cc",
+ "lang/wgsl/ast/diagnostic_attribute.cc",
+ "lang/wgsl/ast/diagnostic_control.cc",
+ "lang/wgsl/ast/diagnostic_directive.cc",
+ "lang/wgsl/ast/diagnostic_rule_name.cc",
+ "lang/wgsl/ast/disable_validation_attribute.cc",
+ "lang/wgsl/ast/discard_statement.cc",
+ "lang/wgsl/ast/enable.cc",
+ "lang/wgsl/ast/expression.cc",
+ "lang/wgsl/ast/extension.cc",
+ "lang/wgsl/ast/float_literal_expression.cc",
+ "lang/wgsl/ast/for_loop_statement.cc",
+ "lang/wgsl/ast/function.cc",
+ "lang/wgsl/ast/group_attribute.cc",
+ "lang/wgsl/ast/id_attribute.cc",
+ "lang/wgsl/ast/identifier.cc",
+ "lang/wgsl/ast/identifier_expression.cc",
+ "lang/wgsl/ast/if_statement.cc",
+ "lang/wgsl/ast/increment_decrement_statement.cc",
+ "lang/wgsl/ast/index_accessor_expression.cc",
+ "lang/wgsl/ast/index_attribute.cc",
+ "lang/wgsl/ast/int_literal_expression.cc",
+ "lang/wgsl/ast/internal_attribute.cc",
+ "lang/wgsl/ast/interpolate_attribute.cc",
+ "lang/wgsl/ast/invariant_attribute.cc",
+ "lang/wgsl/ast/let.cc",
+ "lang/wgsl/ast/literal_expression.cc",
+ "lang/wgsl/ast/location_attribute.cc",
+ "lang/wgsl/ast/loop_statement.cc",
+ "lang/wgsl/ast/member_accessor_expression.cc",
+ "lang/wgsl/ast/module.cc",
+ "lang/wgsl/ast/must_use_attribute.cc",
+ "lang/wgsl/ast/node.cc",
+ "lang/wgsl/ast/override.cc",
+ "lang/wgsl/ast/parameter.cc",
+ "lang/wgsl/ast/phony_expression.cc",
+ "lang/wgsl/ast/pipeline_stage.cc",
+ "lang/wgsl/ast/return_statement.cc",
+ "lang/wgsl/ast/stage_attribute.cc",
+ "lang/wgsl/ast/statement.cc",
+ "lang/wgsl/ast/stride_attribute.cc",
+ "lang/wgsl/ast/struct.cc",
+ "lang/wgsl/ast/struct_member.cc",
+ "lang/wgsl/ast/struct_member_align_attribute.cc",
+ "lang/wgsl/ast/struct_member_offset_attribute.cc",
+ "lang/wgsl/ast/struct_member_size_attribute.cc",
+ "lang/wgsl/ast/switch_statement.cc",
+ "lang/wgsl/ast/templated_identifier.cc",
+ "lang/wgsl/ast/type.cc",
+ "lang/wgsl/ast/type_decl.cc",
+ "lang/wgsl/ast/unary_op.cc",
+ "lang/wgsl/ast/unary_op_expression.cc",
+ "lang/wgsl/ast/var.cc",
+ "lang/wgsl/ast/variable.cc",
+ "lang/wgsl/ast/variable_decl_statement.cc",
+ "lang/wgsl/ast/while_statement.cc",
+ "lang/wgsl/ast/workgroup_attribute.cc",
]
public_deps = [ ":libtint_ast_hdrs" ]
deps = [
@@ -1579,73 +1579,73 @@
tint_unittests_source_set("libtint_unittests_ast_helper") {
sources = [
- "ast/test_helper.h",
- "ast/test_helper_test.cc",
+ "lang/wgsl/ast/test_helper.h",
+ "lang/wgsl/ast/test_helper_test.cc",
]
deps = [ ":libtint_ast_src" ]
}
tint_unittests_source_set("tint_unittests_ast_src") {
sources = [
- "ast/alias_test.cc",
- "ast/assignment_statement_test.cc",
- "ast/binary_expression_test.cc",
- "ast/binding_attribute_test.cc",
- "ast/bitcast_expression_test.cc",
- "ast/block_statement_test.cc",
- "ast/bool_literal_expression_test.cc",
- "ast/break_if_statement_test.cc",
- "ast/break_statement_test.cc",
- "ast/builtin_attribute_test.cc",
- "ast/builtin_texture_helper_test.cc",
- "ast/builtin_texture_helper_test.h",
- "ast/call_expression_test.cc",
- "ast/call_statement_test.cc",
- "ast/case_selector_test.cc",
- "ast/case_statement_test.cc",
- "ast/compound_assignment_statement_test.cc",
- "ast/const_assert_test.cc",
- "ast/continue_statement_test.cc",
- "ast/diagnostic_attribute_test.cc",
- "ast/diagnostic_control_test.cc",
- "ast/diagnostic_directive_test.cc",
- "ast/diagnostic_rule_name_test.cc",
- "ast/discard_statement_test.cc",
- "ast/enable_test.cc",
- "ast/float_literal_expression_test.cc",
- "ast/for_loop_statement_test.cc",
- "ast/function_test.cc",
- "ast/group_attribute_test.cc",
- "ast/id_attribute_test.cc",
- "ast/identifier_expression_test.cc",
- "ast/identifier_test.cc",
- "ast/if_statement_test.cc",
- "ast/increment_decrement_statement_test.cc",
- "ast/index_accessor_expression_test.cc",
- "ast/index_attribute_test.cc",
- "ast/int_literal_expression_test.cc",
- "ast/interpolate_attribute_test.cc",
- "ast/location_attribute_test.cc",
- "ast/loop_statement_test.cc",
- "ast/member_accessor_expression_test.cc",
- "ast/module_test.cc",
- "ast/phony_expression_test.cc",
- "ast/return_statement_test.cc",
- "ast/stage_attribute_test.cc",
- "ast/stride_attribute_test.cc",
- "ast/struct_member_align_attribute_test.cc",
- "ast/struct_member_offset_attribute_test.cc",
- "ast/struct_member_size_attribute_test.cc",
- "ast/struct_member_test.cc",
- "ast/struct_test.cc",
- "ast/switch_statement_test.cc",
- "ast/templated_identifier_test.cc",
- "ast/traverse_expressions_test.cc",
- "ast/unary_op_expression_test.cc",
- "ast/variable_decl_statement_test.cc",
- "ast/variable_test.cc",
- "ast/while_statement_test.cc",
- "ast/workgroup_attribute_test.cc",
+ "lang/wgsl/ast/alias_test.cc",
+ "lang/wgsl/ast/assignment_statement_test.cc",
+ "lang/wgsl/ast/binary_expression_test.cc",
+ "lang/wgsl/ast/binding_attribute_test.cc",
+ "lang/wgsl/ast/bitcast_expression_test.cc",
+ "lang/wgsl/ast/block_statement_test.cc",
+ "lang/wgsl/ast/bool_literal_expression_test.cc",
+ "lang/wgsl/ast/break_if_statement_test.cc",
+ "lang/wgsl/ast/break_statement_test.cc",
+ "lang/wgsl/ast/builtin_attribute_test.cc",
+ "lang/wgsl/ast/builtin_texture_helper_test.cc",
+ "lang/wgsl/ast/builtin_texture_helper_test.h",
+ "lang/wgsl/ast/call_expression_test.cc",
+ "lang/wgsl/ast/call_statement_test.cc",
+ "lang/wgsl/ast/case_selector_test.cc",
+ "lang/wgsl/ast/case_statement_test.cc",
+ "lang/wgsl/ast/compound_assignment_statement_test.cc",
+ "lang/wgsl/ast/const_assert_test.cc",
+ "lang/wgsl/ast/continue_statement_test.cc",
+ "lang/wgsl/ast/diagnostic_attribute_test.cc",
+ "lang/wgsl/ast/diagnostic_control_test.cc",
+ "lang/wgsl/ast/diagnostic_directive_test.cc",
+ "lang/wgsl/ast/diagnostic_rule_name_test.cc",
+ "lang/wgsl/ast/discard_statement_test.cc",
+ "lang/wgsl/ast/enable_test.cc",
+ "lang/wgsl/ast/float_literal_expression_test.cc",
+ "lang/wgsl/ast/for_loop_statement_test.cc",
+ "lang/wgsl/ast/function_test.cc",
+ "lang/wgsl/ast/group_attribute_test.cc",
+ "lang/wgsl/ast/id_attribute_test.cc",
+ "lang/wgsl/ast/identifier_expression_test.cc",
+ "lang/wgsl/ast/identifier_test.cc",
+ "lang/wgsl/ast/if_statement_test.cc",
+ "lang/wgsl/ast/increment_decrement_statement_test.cc",
+ "lang/wgsl/ast/index_accessor_expression_test.cc",
+ "lang/wgsl/ast/index_attribute_test.cc",
+ "lang/wgsl/ast/int_literal_expression_test.cc",
+ "lang/wgsl/ast/interpolate_attribute_test.cc",
+ "lang/wgsl/ast/location_attribute_test.cc",
+ "lang/wgsl/ast/loop_statement_test.cc",
+ "lang/wgsl/ast/member_accessor_expression_test.cc",
+ "lang/wgsl/ast/module_test.cc",
+ "lang/wgsl/ast/phony_expression_test.cc",
+ "lang/wgsl/ast/return_statement_test.cc",
+ "lang/wgsl/ast/stage_attribute_test.cc",
+ "lang/wgsl/ast/stride_attribute_test.cc",
+ "lang/wgsl/ast/struct_member_align_attribute_test.cc",
+ "lang/wgsl/ast/struct_member_offset_attribute_test.cc",
+ "lang/wgsl/ast/struct_member_size_attribute_test.cc",
+ "lang/wgsl/ast/struct_member_test.cc",
+ "lang/wgsl/ast/struct_test.cc",
+ "lang/wgsl/ast/switch_statement_test.cc",
+ "lang/wgsl/ast/templated_identifier_test.cc",
+ "lang/wgsl/ast/traverse_expressions_test.cc",
+ "lang/wgsl/ast/unary_op_expression_test.cc",
+ "lang/wgsl/ast/variable_decl_statement_test.cc",
+ "lang/wgsl/ast/variable_test.cc",
+ "lang/wgsl/ast/while_statement_test.cc",
+ "lang/wgsl/ast/workgroup_attribute_test.cc",
]
deps = [
":libtint_ast_src",
@@ -1657,7 +1657,7 @@
if (tint_build_wgsl_reader && tint_build_wgsl_writer) {
# This AST test relies on the WGSL reader and writer
- sources += [ "ast/module_clone_test.cc" ]
+ sources += [ "lang/wgsl/ast/module_clone_test.cc" ]
}
}
@@ -1824,61 +1824,61 @@
tint_unittests_source_set("tint_unittests_ast_transform_src") {
sources = [
- "ast/transform/add_block_attribute_test.cc",
- "ast/transform/add_empty_entry_point_test.cc",
- "ast/transform/array_length_from_uniform_test.cc",
- "ast/transform/binding_remapper_test.cc",
- "ast/transform/builtin_polyfill_test.cc",
- "ast/transform/calculate_array_length_test.cc",
- "ast/transform/canonicalize_entry_point_io_test.cc",
- "ast/transform/clamp_frag_depth_test.cc",
- "ast/transform/combine_samplers_test.cc",
- "ast/transform/decompose_memory_access_test.cc",
- "ast/transform/decompose_strided_array_test.cc",
- "ast/transform/decompose_strided_matrix_test.cc",
- "ast/transform/demote_to_helper_test.cc",
- "ast/transform/direct_variable_access_test.cc",
- "ast/transform/disable_uniformity_analysis_test.cc",
- "ast/transform/expand_compound_assignment_test.cc",
- "ast/transform/first_index_offset_test.cc",
- "ast/transform/fold_trivial_lets_test.cc",
- "ast/transform/for_loop_to_loop_test.cc",
- "ast/transform/localize_struct_array_assignment_test.cc",
- "ast/transform/merge_return_test.cc",
- "ast/transform/module_scope_var_to_entry_point_param_test.cc",
- "ast/transform/multiplanar_external_texture_test.cc",
- "ast/transform/num_workgroups_from_uniform_test.cc",
- "ast/transform/packed_vec3_test.cc",
- "ast/transform/pad_structs_test.cc",
- "ast/transform/preserve_padding_test.cc",
- "ast/transform/promote_initializers_to_let_test.cc",
- "ast/transform/promote_side_effects_to_decl_test.cc",
- "ast/transform/remove_continue_in_switch_test.cc",
- "ast/transform/remove_phonies_test.cc",
- "ast/transform/remove_unreachable_statements_test.cc",
- "ast/transform/renamer_test.cc",
- "ast/transform/robustness_test.cc",
- "ast/transform/simplify_pointers_test.cc",
- "ast/transform/single_entry_point_test.cc",
- "ast/transform/spirv_atomic_test.cc",
- "ast/transform/std140_exhaustive_test.cc",
- "ast/transform/std140_f16_test.cc",
- "ast/transform/std140_f32_test.cc",
- "ast/transform/std140_test.cc",
- "ast/transform/substitute_override_test.cc",
- "ast/transform/test_helper.h",
- "ast/transform/texture_1d_to_2d_test.cc",
- "ast/transform/transform_test.cc",
- "ast/transform/truncate_interstage_variables_test.cc",
- "ast/transform/unshadow_test.cc",
- "ast/transform/utils/get_insertion_point_test.cc",
- "ast/transform/utils/hoist_to_decl_before_test.cc",
- "ast/transform/var_for_dynamic_index_test.cc",
- "ast/transform/vectorize_matrix_conversions_test.cc",
- "ast/transform/vectorize_scalar_matrix_initializers_test.cc",
- "ast/transform/vertex_pulling_test.cc",
- "ast/transform/while_to_loop_test.cc",
- "ast/transform/zero_init_workgroup_memory_test.cc",
+ "lang/wgsl/ast/transform/add_block_attribute_test.cc",
+ "lang/wgsl/ast/transform/add_empty_entry_point_test.cc",
+ "lang/wgsl/ast/transform/array_length_from_uniform_test.cc",
+ "lang/wgsl/ast/transform/binding_remapper_test.cc",
+ "lang/wgsl/ast/transform/builtin_polyfill_test.cc",
+ "lang/wgsl/ast/transform/calculate_array_length_test.cc",
+ "lang/wgsl/ast/transform/canonicalize_entry_point_io_test.cc",
+ "lang/wgsl/ast/transform/clamp_frag_depth_test.cc",
+ "lang/wgsl/ast/transform/combine_samplers_test.cc",
+ "lang/wgsl/ast/transform/decompose_memory_access_test.cc",
+ "lang/wgsl/ast/transform/decompose_strided_array_test.cc",
+ "lang/wgsl/ast/transform/decompose_strided_matrix_test.cc",
+ "lang/wgsl/ast/transform/demote_to_helper_test.cc",
+ "lang/wgsl/ast/transform/direct_variable_access_test.cc",
+ "lang/wgsl/ast/transform/disable_uniformity_analysis_test.cc",
+ "lang/wgsl/ast/transform/expand_compound_assignment_test.cc",
+ "lang/wgsl/ast/transform/first_index_offset_test.cc",
+ "lang/wgsl/ast/transform/fold_trivial_lets_test.cc",
+ "lang/wgsl/ast/transform/for_loop_to_loop_test.cc",
+ "lang/wgsl/ast/transform/localize_struct_array_assignment_test.cc",
+ "lang/wgsl/ast/transform/merge_return_test.cc",
+ "lang/wgsl/ast/transform/module_scope_var_to_entry_point_param_test.cc",
+ "lang/wgsl/ast/transform/multiplanar_external_texture_test.cc",
+ "lang/wgsl/ast/transform/num_workgroups_from_uniform_test.cc",
+ "lang/wgsl/ast/transform/packed_vec3_test.cc",
+ "lang/wgsl/ast/transform/pad_structs_test.cc",
+ "lang/wgsl/ast/transform/preserve_padding_test.cc",
+ "lang/wgsl/ast/transform/promote_initializers_to_let_test.cc",
+ "lang/wgsl/ast/transform/promote_side_effects_to_decl_test.cc",
+ "lang/wgsl/ast/transform/remove_continue_in_switch_test.cc",
+ "lang/wgsl/ast/transform/remove_phonies_test.cc",
+ "lang/wgsl/ast/transform/remove_unreachable_statements_test.cc",
+ "lang/wgsl/ast/transform/renamer_test.cc",
+ "lang/wgsl/ast/transform/robustness_test.cc",
+ "lang/wgsl/ast/transform/simplify_pointers_test.cc",
+ "lang/wgsl/ast/transform/single_entry_point_test.cc",
+ "lang/wgsl/ast/transform/spirv_atomic_test.cc",
+ "lang/wgsl/ast/transform/std140_exhaustive_test.cc",
+ "lang/wgsl/ast/transform/std140_f16_test.cc",
+ "lang/wgsl/ast/transform/std140_f32_test.cc",
+ "lang/wgsl/ast/transform/std140_test.cc",
+ "lang/wgsl/ast/transform/substitute_override_test.cc",
+ "lang/wgsl/ast/transform/test_helper.h",
+ "lang/wgsl/ast/transform/texture_1d_to_2d_test.cc",
+ "lang/wgsl/ast/transform/transform_test.cc",
+ "lang/wgsl/ast/transform/truncate_interstage_variables_test.cc",
+ "lang/wgsl/ast/transform/unshadow_test.cc",
+ "lang/wgsl/ast/transform/utils/get_insertion_point_test.cc",
+ "lang/wgsl/ast/transform/utils/hoist_to_decl_before_test.cc",
+ "lang/wgsl/ast/transform/var_for_dynamic_index_test.cc",
+ "lang/wgsl/ast/transform/vectorize_matrix_conversions_test.cc",
+ "lang/wgsl/ast/transform/vectorize_scalar_matrix_initializers_test.cc",
+ "lang/wgsl/ast/transform/vertex_pulling_test.cc",
+ "lang/wgsl/ast/transform/while_to_loop_test.cc",
+ "lang/wgsl/ast/transform/zero_init_workgroup_memory_test.cc",
]
deps = [
diff --git a/src/tint/CMakeLists.txt b/src/tint/CMakeLists.txt
index 7e23bab..fc1ab0e 100644
--- a/src/tint/CMakeLists.txt
+++ b/src/tint/CMakeLists.txt
@@ -80,160 +80,160 @@
list(APPEND TINT_LIB_SRCS
../../include/tint/tint.h
- ast/accessor_expression.cc
- ast/accessor_expression.h
- ast/alias.cc
- ast/alias.h
- ast/assignment_statement.cc
- ast/assignment_statement.h
- ast/attribute.cc
- ast/attribute.h
- ast/binary_expression.cc
- ast/binary_expression.h
- ast/binding_attribute.cc
- ast/binding_attribute.h
- ast/bitcast_expression.cc
- ast/bitcast_expression.h
- ast/block_statement.cc
- ast/block_statement.h
- ast/bool_literal_expression.cc
- ast/bool_literal_expression.h
- ast/break_if_statement.cc
- ast/break_if_statement.h
- ast/break_statement.cc
- ast/break_statement.h
- ast/builtin_attribute.cc
- ast/builtin_attribute.h
- ast/call_expression.cc
- ast/call_expression.h
- ast/call_statement.cc
- ast/call_statement.h
- ast/case_selector.cc
- ast/case_selector.h
- ast/case_statement.cc
- ast/case_statement.h
- ast/compound_assignment_statement.cc
- ast/compound_assignment_statement.h
- ast/const.cc
- ast/const.h
- ast/const_assert.cc
- ast/const_assert.h
- ast/continue_statement.cc
- ast/continue_statement.h
- ast/diagnostic_attribute.cc
- ast/diagnostic_attribute.h
- ast/diagnostic_control.cc
- ast/diagnostic_control.h
- ast/diagnostic_directive.cc
- ast/diagnostic_directive.h
- ast/diagnostic_rule_name.cc
- ast/diagnostic_rule_name.h
- ast/disable_validation_attribute.cc
- ast/disable_validation_attribute.h
- ast/discard_statement.cc
- ast/discard_statement.h
- ast/enable.cc
- ast/enable.h
- ast/expression.cc
- ast/expression.h
- ast/extension.cc
- ast/extension.h
- ast/float_literal_expression.cc
- ast/float_literal_expression.h
- ast/for_loop_statement.cc
- ast/for_loop_statement.h
- ast/function.cc
- ast/function.h
- ast/group_attribute.cc
- ast/group_attribute.h
- ast/id_attribute.cc
- ast/id_attribute.h
- ast/identifier.cc
- ast/identifier.h
- ast/identifier_expression.cc
- ast/identifier_expression.h
- ast/if_statement.cc
- ast/if_statement.h
- ast/increment_decrement_statement.cc
- ast/increment_decrement_statement.h
- ast/index_accessor_expression.cc
- ast/index_accessor_expression.h
- ast/index_attribute.cc
- ast/index_attribute.h
- ast/int_literal_expression.cc
- ast/int_literal_expression.h
- ast/internal_attribute.cc
- ast/internal_attribute.h
- ast/interpolate_attribute.cc
- ast/interpolate_attribute.h
- ast/invariant_attribute.cc
- ast/invariant_attribute.h
- ast/let.cc
- ast/let.h
- ast/literal_expression.cc
- ast/literal_expression.h
- ast/location_attribute.cc
- ast/location_attribute.h
- ast/loop_statement.cc
- ast/loop_statement.h
- ast/member_accessor_expression.cc
- ast/member_accessor_expression.h
- ast/module.cc
- ast/module.h
- ast/must_use_attribute.cc
- ast/must_use_attribute.h
- ast/node_id.h
- ast/node.cc
- ast/node.h
- ast/override.cc
- ast/override.h
- ast/parameter.cc
- ast/parameter.h
- ast/phony_expression.cc
- ast/phony_expression.h
- ast/pipeline_stage.cc
- ast/pipeline_stage.h
- ast/return_statement.cc
- ast/return_statement.h
- ast/stage_attribute.cc
- ast/stage_attribute.h
- ast/statement.cc
- ast/statement.h
- ast/stride_attribute.cc
- ast/stride_attribute.h
- ast/struct_member_align_attribute.cc
- ast/struct_member_align_attribute.h
- ast/struct_member_offset_attribute.cc
- ast/struct_member_offset_attribute.h
- ast/struct_member_size_attribute.cc
- ast/struct_member_size_attribute.h
- ast/struct_member.cc
- ast/struct_member.h
- ast/struct.cc
- ast/struct.h
- ast/switch_statement.cc
- ast/switch_statement.h
- ast/templated_identifier.cc
- ast/templated_identifier.h
- ast/traverse_expressions.h
- ast/type.cc
- ast/type.h
- ast/type_decl.cc
- ast/type_decl.h
- ast/unary_op_expression.cc
- ast/unary_op_expression.h
- ast/unary_op.cc
- ast/unary_op.h
- ast/var.cc
- ast/var.h
- ast/variable_decl_statement.cc
- ast/variable_decl_statement.h
- ast/variable.cc
- ast/variable.h
- ast/while_statement.cc
- ast/while_statement.h
- ast/workgroup_attribute.cc
- ast/workgroup_attribute.h
+ lang/wgsl/ast/accessor_expression.cc
+ lang/wgsl/ast/accessor_expression.h
+ lang/wgsl/ast/alias.cc
+ lang/wgsl/ast/alias.h
+ lang/wgsl/ast/assignment_statement.cc
+ lang/wgsl/ast/assignment_statement.h
+ lang/wgsl/ast/attribute.cc
+ lang/wgsl/ast/attribute.h
+ lang/wgsl/ast/binary_expression.cc
+ lang/wgsl/ast/binary_expression.h
+ lang/wgsl/ast/binding_attribute.cc
+ lang/wgsl/ast/binding_attribute.h
+ lang/wgsl/ast/bitcast_expression.cc
+ lang/wgsl/ast/bitcast_expression.h
+ lang/wgsl/ast/block_statement.cc
+ lang/wgsl/ast/block_statement.h
+ lang/wgsl/ast/bool_literal_expression.cc
+ lang/wgsl/ast/bool_literal_expression.h
+ lang/wgsl/ast/break_if_statement.cc
+ lang/wgsl/ast/break_if_statement.h
+ lang/wgsl/ast/break_statement.cc
+ lang/wgsl/ast/break_statement.h
+ lang/wgsl/ast/builtin_attribute.cc
+ lang/wgsl/ast/builtin_attribute.h
+ lang/wgsl/ast/call_expression.cc
+ lang/wgsl/ast/call_expression.h
+ lang/wgsl/ast/call_statement.cc
+ lang/wgsl/ast/call_statement.h
+ lang/wgsl/ast/case_selector.cc
+ lang/wgsl/ast/case_selector.h
+ lang/wgsl/ast/case_statement.cc
+ lang/wgsl/ast/case_statement.h
+ lang/wgsl/ast/compound_assignment_statement.cc
+ lang/wgsl/ast/compound_assignment_statement.h
+ lang/wgsl/ast/const.cc
+ lang/wgsl/ast/const.h
+ lang/wgsl/ast/const_assert.cc
+ lang/wgsl/ast/const_assert.h
+ lang/wgsl/ast/continue_statement.cc
+ lang/wgsl/ast/continue_statement.h
+ lang/wgsl/ast/diagnostic_attribute.cc
+ lang/wgsl/ast/diagnostic_attribute.h
+ lang/wgsl/ast/diagnostic_control.cc
+ lang/wgsl/ast/diagnostic_control.h
+ lang/wgsl/ast/diagnostic_directive.cc
+ lang/wgsl/ast/diagnostic_directive.h
+ lang/wgsl/ast/diagnostic_rule_name.cc
+ lang/wgsl/ast/diagnostic_rule_name.h
+ lang/wgsl/ast/disable_validation_attribute.cc
+ lang/wgsl/ast/disable_validation_attribute.h
+ lang/wgsl/ast/discard_statement.cc
+ lang/wgsl/ast/discard_statement.h
+ lang/wgsl/ast/enable.cc
+ lang/wgsl/ast/enable.h
+ lang/wgsl/ast/expression.cc
+ lang/wgsl/ast/expression.h
+ lang/wgsl/ast/extension.cc
+ lang/wgsl/ast/extension.h
+ lang/wgsl/ast/float_literal_expression.cc
+ lang/wgsl/ast/float_literal_expression.h
+ lang/wgsl/ast/for_loop_statement.cc
+ lang/wgsl/ast/for_loop_statement.h
+ lang/wgsl/ast/function.cc
+ lang/wgsl/ast/function.h
+ lang/wgsl/ast/group_attribute.cc
+ lang/wgsl/ast/group_attribute.h
+ lang/wgsl/ast/id_attribute.cc
+ lang/wgsl/ast/id_attribute.h
+ lang/wgsl/ast/identifier.cc
+ lang/wgsl/ast/identifier.h
+ lang/wgsl/ast/identifier_expression.cc
+ lang/wgsl/ast/identifier_expression.h
+ lang/wgsl/ast/if_statement.cc
+ lang/wgsl/ast/if_statement.h
+ lang/wgsl/ast/increment_decrement_statement.cc
+ lang/wgsl/ast/increment_decrement_statement.h
+ lang/wgsl/ast/index_accessor_expression.cc
+ lang/wgsl/ast/index_accessor_expression.h
+ lang/wgsl/ast/index_attribute.cc
+ lang/wgsl/ast/index_attribute.h
+ lang/wgsl/ast/int_literal_expression.cc
+ lang/wgsl/ast/int_literal_expression.h
+ lang/wgsl/ast/internal_attribute.cc
+ lang/wgsl/ast/internal_attribute.h
+ lang/wgsl/ast/interpolate_attribute.cc
+ lang/wgsl/ast/interpolate_attribute.h
+ lang/wgsl/ast/invariant_attribute.cc
+ lang/wgsl/ast/invariant_attribute.h
+ lang/wgsl/ast/let.cc
+ lang/wgsl/ast/let.h
+ lang/wgsl/ast/literal_expression.cc
+ lang/wgsl/ast/literal_expression.h
+ lang/wgsl/ast/location_attribute.cc
+ lang/wgsl/ast/location_attribute.h
+ lang/wgsl/ast/loop_statement.cc
+ lang/wgsl/ast/loop_statement.h
+ lang/wgsl/ast/member_accessor_expression.cc
+ lang/wgsl/ast/member_accessor_expression.h
+ lang/wgsl/ast/module.cc
+ lang/wgsl/ast/module.h
+ lang/wgsl/ast/must_use_attribute.cc
+ lang/wgsl/ast/must_use_attribute.h
+ lang/wgsl/ast/node_id.h
+ lang/wgsl/ast/node.cc
+ lang/wgsl/ast/node.h
+ lang/wgsl/ast/override.cc
+ lang/wgsl/ast/override.h
+ lang/wgsl/ast/parameter.cc
+ lang/wgsl/ast/parameter.h
+ lang/wgsl/ast/phony_expression.cc
+ lang/wgsl/ast/phony_expression.h
+ lang/wgsl/ast/pipeline_stage.cc
+ lang/wgsl/ast/pipeline_stage.h
+ lang/wgsl/ast/return_statement.cc
+ lang/wgsl/ast/return_statement.h
+ lang/wgsl/ast/stage_attribute.cc
+ lang/wgsl/ast/stage_attribute.h
+ lang/wgsl/ast/statement.cc
+ lang/wgsl/ast/statement.h
+ lang/wgsl/ast/stride_attribute.cc
+ lang/wgsl/ast/stride_attribute.h
+ lang/wgsl/ast/struct_member_align_attribute.cc
+ lang/wgsl/ast/struct_member_align_attribute.h
+ lang/wgsl/ast/struct_member_offset_attribute.cc
+ lang/wgsl/ast/struct_member_offset_attribute.h
+ lang/wgsl/ast/struct_member_size_attribute.cc
+ lang/wgsl/ast/struct_member_size_attribute.h
+ lang/wgsl/ast/struct_member.cc
+ lang/wgsl/ast/struct_member.h
+ lang/wgsl/ast/struct.cc
+ lang/wgsl/ast/struct.h
+ lang/wgsl/ast/switch_statement.cc
+ lang/wgsl/ast/switch_statement.h
+ lang/wgsl/ast/templated_identifier.cc
+ lang/wgsl/ast/templated_identifier.h
+ lang/wgsl/ast/traverse_expressions.h
+ lang/wgsl/ast/type.cc
+ lang/wgsl/ast/type.h
+ lang/wgsl/ast/type_decl.cc
+ lang/wgsl/ast/type_decl.h
+ lang/wgsl/ast/unary_op_expression.cc
+ lang/wgsl/ast/unary_op_expression.h
+ lang/wgsl/ast/unary_op.cc
+ lang/wgsl/ast/unary_op.h
+ lang/wgsl/ast/var.cc
+ lang/wgsl/ast/var.h
+ lang/wgsl/ast/variable_decl_statement.cc
+ lang/wgsl/ast/variable_decl_statement.h
+ lang/wgsl/ast/variable.cc
+ lang/wgsl/ast/variable.h
+ lang/wgsl/ast/while_statement.cc
+ lang/wgsl/ast/while_statement.h
+ lang/wgsl/ast/workgroup_attribute.cc
+ lang/wgsl/ast/workgroup_attribute.h
builtin/fluent_types.h
builtin/number.cc
builtin/number.h
@@ -355,108 +355,108 @@
symbol.cc
symbol.h
tint.cc
- ast/transform/add_empty_entry_point.cc
- ast/transform/add_empty_entry_point.h
- ast/transform/add_block_attribute.cc
- ast/transform/add_block_attribute.h
- ast/transform/array_length_from_uniform.cc
- ast/transform/array_length_from_uniform.h
- ast/transform/binding_remapper.cc
- ast/transform/binding_remapper.h
- ast/transform/builtin_polyfill.cc
- ast/transform/builtin_polyfill.h
- ast/transform/calculate_array_length.cc
- ast/transform/calculate_array_length.h
- ast/transform/clamp_frag_depth.cc
- ast/transform/clamp_frag_depth.h
- ast/transform/canonicalize_entry_point_io.cc
- ast/transform/canonicalize_entry_point_io.h
- ast/transform/combine_samplers.cc
- ast/transform/combine_samplers.h
- ast/transform/decompose_memory_access.cc
- ast/transform/decompose_memory_access.h
- ast/transform/decompose_strided_array.cc
- ast/transform/decompose_strided_array.h
- ast/transform/decompose_strided_matrix.cc
- ast/transform/decompose_strided_matrix.h
- ast/transform/demote_to_helper.cc
- ast/transform/demote_to_helper.h
- ast/transform/direct_variable_access.cc
- ast/transform/direct_variable_access.h
- ast/transform/disable_uniformity_analysis.cc
- ast/transform/disable_uniformity_analysis.h
- ast/transform/expand_compound_assignment.cc
- ast/transform/expand_compound_assignment.h
- ast/transform/first_index_offset.cc
- ast/transform/first_index_offset.h
- ast/transform/fold_trivial_lets.cc
- ast/transform/fold_trivial_lets.h
- ast/transform/for_loop_to_loop.cc
- ast/transform/for_loop_to_loop.h
- ast/transform/localize_struct_array_assignment.cc
- ast/transform/localize_struct_array_assignment.h
- ast/transform/merge_return.cc
- ast/transform/merge_return.h
- ast/transform/module_scope_var_to_entry_point_param.cc
- ast/transform/module_scope_var_to_entry_point_param.h
- ast/transform/multiplanar_external_texture.cc
- ast/transform/multiplanar_external_texture.h
- ast/transform/num_workgroups_from_uniform.cc
- ast/transform/num_workgroups_from_uniform.h
- ast/transform/packed_vec3.cc
- ast/transform/packed_vec3.h
- ast/transform/pad_structs.cc
- ast/transform/pad_structs.h
- ast/transform/preserve_padding.cc
- ast/transform/preserve_padding.h
- ast/transform/promote_initializers_to_let.cc
- ast/transform/promote_initializers_to_let.h
- ast/transform/promote_side_effects_to_decl.cc
- ast/transform/promote_side_effects_to_decl.h
- ast/transform/remove_continue_in_switch.cc
- ast/transform/remove_continue_in_switch.h
- ast/transform/remove_phonies.cc
- ast/transform/remove_phonies.h
- ast/transform/remove_unreachable_statements.cc
- ast/transform/remove_unreachable_statements.h
- ast/transform/renamer.cc
- ast/transform/renamer.h
- ast/transform/robustness.cc
- ast/transform/robustness.h
- ast/transform/simplify_pointers.cc
- ast/transform/simplify_pointers.h
- ast/transform/single_entry_point.cc
- ast/transform/single_entry_point.h
- ast/transform/spirv_atomic.cc
- ast/transform/spirv_atomic.h
- ast/transform/std140.cc
- ast/transform/std140.h
- ast/transform/substitute_override.cc
- ast/transform/substitute_override.h
- ast/transform/texture_1d_to_2d.cc
- ast/transform/texture_1d_to_2d.h
- ast/transform/transform.cc
- ast/transform/transform.h
- ast/transform/truncate_interstage_variables.cc
- ast/transform/truncate_interstage_variables.h
- ast/transform/unshadow.cc
- ast/transform/unshadow.h
- ast/transform/utils/get_insertion_point.cc
- ast/transform/utils/get_insertion_point.h
- ast/transform/utils/hoist_to_decl_before.cc
- ast/transform/utils/hoist_to_decl_before.h
- ast/transform/var_for_dynamic_index.cc
- ast/transform/var_for_dynamic_index.h
- ast/transform/vectorize_matrix_conversions.cc
- ast/transform/vectorize_matrix_conversions.h
- ast/transform/vectorize_scalar_matrix_initializers.cc
- ast/transform/vectorize_scalar_matrix_initializers.h
- ast/transform/vertex_pulling.cc
- ast/transform/vertex_pulling.h
- ast/transform/while_to_loop.cc
- ast/transform/while_to_loop.h
- ast/transform/zero_init_workgroup_memory.cc
- ast/transform/zero_init_workgroup_memory.h
+ lang/wgsl/ast/transform/add_empty_entry_point.cc
+ lang/wgsl/ast/transform/add_empty_entry_point.h
+ lang/wgsl/ast/transform/add_block_attribute.cc
+ lang/wgsl/ast/transform/add_block_attribute.h
+ lang/wgsl/ast/transform/array_length_from_uniform.cc
+ lang/wgsl/ast/transform/array_length_from_uniform.h
+ lang/wgsl/ast/transform/binding_remapper.cc
+ lang/wgsl/ast/transform/binding_remapper.h
+ lang/wgsl/ast/transform/builtin_polyfill.cc
+ lang/wgsl/ast/transform/builtin_polyfill.h
+ lang/wgsl/ast/transform/calculate_array_length.cc
+ lang/wgsl/ast/transform/calculate_array_length.h
+ lang/wgsl/ast/transform/clamp_frag_depth.cc
+ lang/wgsl/ast/transform/clamp_frag_depth.h
+ lang/wgsl/ast/transform/canonicalize_entry_point_io.cc
+ lang/wgsl/ast/transform/canonicalize_entry_point_io.h
+ lang/wgsl/ast/transform/combine_samplers.cc
+ lang/wgsl/ast/transform/combine_samplers.h
+ lang/wgsl/ast/transform/decompose_memory_access.cc
+ lang/wgsl/ast/transform/decompose_memory_access.h
+ lang/wgsl/ast/transform/decompose_strided_array.cc
+ lang/wgsl/ast/transform/decompose_strided_array.h
+ lang/wgsl/ast/transform/decompose_strided_matrix.cc
+ lang/wgsl/ast/transform/decompose_strided_matrix.h
+ lang/wgsl/ast/transform/demote_to_helper.cc
+ lang/wgsl/ast/transform/demote_to_helper.h
+ lang/wgsl/ast/transform/direct_variable_access.cc
+ lang/wgsl/ast/transform/direct_variable_access.h
+ lang/wgsl/ast/transform/disable_uniformity_analysis.cc
+ lang/wgsl/ast/transform/disable_uniformity_analysis.h
+ lang/wgsl/ast/transform/expand_compound_assignment.cc
+ lang/wgsl/ast/transform/expand_compound_assignment.h
+ lang/wgsl/ast/transform/first_index_offset.cc
+ lang/wgsl/ast/transform/first_index_offset.h
+ lang/wgsl/ast/transform/fold_trivial_lets.cc
+ lang/wgsl/ast/transform/fold_trivial_lets.h
+ lang/wgsl/ast/transform/for_loop_to_loop.cc
+ lang/wgsl/ast/transform/for_loop_to_loop.h
+ lang/wgsl/ast/transform/localize_struct_array_assignment.cc
+ lang/wgsl/ast/transform/localize_struct_array_assignment.h
+ lang/wgsl/ast/transform/merge_return.cc
+ lang/wgsl/ast/transform/merge_return.h
+ lang/wgsl/ast/transform/module_scope_var_to_entry_point_param.cc
+ lang/wgsl/ast/transform/module_scope_var_to_entry_point_param.h
+ lang/wgsl/ast/transform/multiplanar_external_texture.cc
+ lang/wgsl/ast/transform/multiplanar_external_texture.h
+ lang/wgsl/ast/transform/num_workgroups_from_uniform.cc
+ lang/wgsl/ast/transform/num_workgroups_from_uniform.h
+ lang/wgsl/ast/transform/packed_vec3.cc
+ lang/wgsl/ast/transform/packed_vec3.h
+ lang/wgsl/ast/transform/pad_structs.cc
+ lang/wgsl/ast/transform/pad_structs.h
+ lang/wgsl/ast/transform/preserve_padding.cc
+ lang/wgsl/ast/transform/preserve_padding.h
+ lang/wgsl/ast/transform/promote_initializers_to_let.cc
+ lang/wgsl/ast/transform/promote_initializers_to_let.h
+ lang/wgsl/ast/transform/promote_side_effects_to_decl.cc
+ lang/wgsl/ast/transform/promote_side_effects_to_decl.h
+ lang/wgsl/ast/transform/remove_continue_in_switch.cc
+ lang/wgsl/ast/transform/remove_continue_in_switch.h
+ lang/wgsl/ast/transform/remove_phonies.cc
+ lang/wgsl/ast/transform/remove_phonies.h
+ lang/wgsl/ast/transform/remove_unreachable_statements.cc
+ lang/wgsl/ast/transform/remove_unreachable_statements.h
+ lang/wgsl/ast/transform/renamer.cc
+ lang/wgsl/ast/transform/renamer.h
+ lang/wgsl/ast/transform/robustness.cc
+ lang/wgsl/ast/transform/robustness.h
+ lang/wgsl/ast/transform/simplify_pointers.cc
+ lang/wgsl/ast/transform/simplify_pointers.h
+ lang/wgsl/ast/transform/single_entry_point.cc
+ lang/wgsl/ast/transform/single_entry_point.h
+ lang/wgsl/ast/transform/spirv_atomic.cc
+ lang/wgsl/ast/transform/spirv_atomic.h
+ lang/wgsl/ast/transform/std140.cc
+ lang/wgsl/ast/transform/std140.h
+ lang/wgsl/ast/transform/substitute_override.cc
+ lang/wgsl/ast/transform/substitute_override.h
+ lang/wgsl/ast/transform/texture_1d_to_2d.cc
+ lang/wgsl/ast/transform/texture_1d_to_2d.h
+ lang/wgsl/ast/transform/transform.cc
+ lang/wgsl/ast/transform/transform.h
+ lang/wgsl/ast/transform/truncate_interstage_variables.cc
+ lang/wgsl/ast/transform/truncate_interstage_variables.h
+ lang/wgsl/ast/transform/unshadow.cc
+ lang/wgsl/ast/transform/unshadow.h
+ lang/wgsl/ast/transform/utils/get_insertion_point.cc
+ lang/wgsl/ast/transform/utils/get_insertion_point.h
+ lang/wgsl/ast/transform/utils/hoist_to_decl_before.cc
+ lang/wgsl/ast/transform/utils/hoist_to_decl_before.h
+ lang/wgsl/ast/transform/var_for_dynamic_index.cc
+ lang/wgsl/ast/transform/var_for_dynamic_index.h
+ lang/wgsl/ast/transform/vectorize_matrix_conversions.cc
+ lang/wgsl/ast/transform/vectorize_matrix_conversions.h
+ lang/wgsl/ast/transform/vectorize_scalar_matrix_initializers.cc
+ lang/wgsl/ast/transform/vectorize_scalar_matrix_initializers.h
+ lang/wgsl/ast/transform/vertex_pulling.cc
+ lang/wgsl/ast/transform/vertex_pulling.h
+ lang/wgsl/ast/transform/while_to_loop.cc
+ lang/wgsl/ast/transform/while_to_loop.h
+ lang/wgsl/ast/transform/zero_init_workgroup_memory.cc
+ lang/wgsl/ast/transform/zero_init_workgroup_memory.h
transform/manager.cc
transform/manager.h
transform/transform.cc
@@ -947,67 +947,67 @@
################################################################################
if(TINT_BUILD_TESTS)
list(APPEND TINT_TEST_SRCS
- ast/alias_test.cc
- ast/assignment_statement_test.cc
- ast/binary_expression_test.cc
- ast/binding_attribute_test.cc
- ast/bitcast_expression_test.cc
- ast/block_statement_test.cc
- ast/bool_literal_expression_test.cc
- ast/break_if_statement_test.cc
- ast/break_statement_test.cc
- ast/builtin_attribute_test.cc
- ast/builtin_texture_helper_test.cc
- ast/builtin_texture_helper_test.h
- ast/call_expression_test.cc
- ast/call_statement_test.cc
- ast/case_selector_test.cc
- ast/case_statement_test.cc
- ast/compound_assignment_statement_test.cc
- ast/const_assert_test.cc
- ast/continue_statement_test.cc
- ast/diagnostic_attribute_test.cc
- ast/diagnostic_control_test.cc
- ast/diagnostic_directive_test.cc
- ast/diagnostic_rule_name_test.cc
- ast/discard_statement_test.cc
- ast/enable_test.cc
- ast/float_literal_expression_test.cc
- ast/for_loop_statement_test.cc
- ast/function_test.cc
- ast/group_attribute_test.cc
- ast/id_attribute_test.cc
- ast/identifier_test.cc
- ast/identifier_expression_test.cc
- ast/if_statement_test.cc
- ast/increment_decrement_statement_test.cc
- ast/index_accessor_expression_test.cc
- ast/index_attribute_test.cc
- ast/int_literal_expression_test.cc
- ast/interpolate_attribute_test.cc
- ast/location_attribute_test.cc
- ast/loop_statement_test.cc
- ast/member_accessor_expression_test.cc
- ast/module_test.cc
- ast/phony_expression_test.cc
- ast/return_statement_test.cc
- ast/stage_attribute_test.cc
- ast/stride_attribute_test.cc
- ast/struct_member_align_attribute_test.cc
- ast/struct_member_offset_attribute_test.cc
- ast/struct_member_size_attribute_test.cc
- ast/struct_member_test.cc
- ast/struct_test.cc
- ast/switch_statement_test.cc
- ast/templated_identifier_test.cc
- ast/test_helper.h
- ast/test_helper_test.cc
- ast/traverse_expressions_test.cc
- ast/unary_op_expression_test.cc
- ast/variable_decl_statement_test.cc
- ast/variable_test.cc
- ast/while_statement_test.cc
- ast/workgroup_attribute_test.cc
+ lang/wgsl/ast/alias_test.cc
+ lang/wgsl/ast/assignment_statement_test.cc
+ lang/wgsl/ast/binary_expression_test.cc
+ lang/wgsl/ast/binding_attribute_test.cc
+ lang/wgsl/ast/bitcast_expression_test.cc
+ lang/wgsl/ast/block_statement_test.cc
+ lang/wgsl/ast/bool_literal_expression_test.cc
+ lang/wgsl/ast/break_if_statement_test.cc
+ lang/wgsl/ast/break_statement_test.cc
+ lang/wgsl/ast/builtin_attribute_test.cc
+ lang/wgsl/ast/builtin_texture_helper_test.cc
+ lang/wgsl/ast/builtin_texture_helper_test.h
+ lang/wgsl/ast/call_expression_test.cc
+ lang/wgsl/ast/call_statement_test.cc
+ lang/wgsl/ast/case_selector_test.cc
+ lang/wgsl/ast/case_statement_test.cc
+ lang/wgsl/ast/compound_assignment_statement_test.cc
+ lang/wgsl/ast/const_assert_test.cc
+ lang/wgsl/ast/continue_statement_test.cc
+ lang/wgsl/ast/diagnostic_attribute_test.cc
+ lang/wgsl/ast/diagnostic_control_test.cc
+ lang/wgsl/ast/diagnostic_directive_test.cc
+ lang/wgsl/ast/diagnostic_rule_name_test.cc
+ lang/wgsl/ast/discard_statement_test.cc
+ lang/wgsl/ast/enable_test.cc
+ lang/wgsl/ast/float_literal_expression_test.cc
+ lang/wgsl/ast/for_loop_statement_test.cc
+ lang/wgsl/ast/function_test.cc
+ lang/wgsl/ast/group_attribute_test.cc
+ lang/wgsl/ast/id_attribute_test.cc
+ lang/wgsl/ast/identifier_test.cc
+ lang/wgsl/ast/identifier_expression_test.cc
+ lang/wgsl/ast/if_statement_test.cc
+ lang/wgsl/ast/increment_decrement_statement_test.cc
+ lang/wgsl/ast/index_accessor_expression_test.cc
+ lang/wgsl/ast/index_attribute_test.cc
+ lang/wgsl/ast/int_literal_expression_test.cc
+ lang/wgsl/ast/interpolate_attribute_test.cc
+ lang/wgsl/ast/location_attribute_test.cc
+ lang/wgsl/ast/loop_statement_test.cc
+ lang/wgsl/ast/member_accessor_expression_test.cc
+ lang/wgsl/ast/module_test.cc
+ lang/wgsl/ast/phony_expression_test.cc
+ lang/wgsl/ast/return_statement_test.cc
+ lang/wgsl/ast/stage_attribute_test.cc
+ lang/wgsl/ast/stride_attribute_test.cc
+ lang/wgsl/ast/struct_member_align_attribute_test.cc
+ lang/wgsl/ast/struct_member_offset_attribute_test.cc
+ lang/wgsl/ast/struct_member_size_attribute_test.cc
+ lang/wgsl/ast/struct_member_test.cc
+ lang/wgsl/ast/struct_test.cc
+ lang/wgsl/ast/switch_statement_test.cc
+ lang/wgsl/ast/templated_identifier_test.cc
+ lang/wgsl/ast/test_helper.h
+ lang/wgsl/ast/test_helper_test.cc
+ lang/wgsl/ast/traverse_expressions_test.cc
+ lang/wgsl/ast/unary_op_expression_test.cc
+ lang/wgsl/ast/variable_decl_statement_test.cc
+ lang/wgsl/ast/variable_test.cc
+ lang/wgsl/ast/while_statement_test.cc
+ lang/wgsl/ast/workgroup_attribute_test.cc
builtin/number_test.cc
clone_context_test.cc
constant/composite_test.cc
@@ -1097,7 +1097,7 @@
symbol_table_test.cc
symbol_test.cc
test_main.cc
- ast/transform/transform_test.cc
+ lang/wgsl/ast/transform/transform_test.cc
transform/manager_test.cc
type/array_test.cc
type/atomic_test.cc
@@ -1405,62 +1405,62 @@
if(${TINT_BUILD_WGSL_READER} AND ${TINT_BUILD_WGSL_WRITER})
list(APPEND TINT_TEST_SRCS
- ast/module_clone_test.cc
- ast/transform/add_empty_entry_point_test.cc
- ast/transform/add_block_attribute_test.cc
- ast/transform/array_length_from_uniform_test.cc
- ast/transform/binding_remapper_test.cc
- ast/transform/builtin_polyfill_test.cc
- ast/transform/calculate_array_length_test.cc
- ast/transform/clamp_frag_depth_test.cc
- ast/transform/canonicalize_entry_point_io_test.cc
- ast/transform/combine_samplers_test.cc
- ast/transform/decompose_memory_access_test.cc
- ast/transform/decompose_strided_array_test.cc
- ast/transform/decompose_strided_matrix_test.cc
- ast/transform/demote_to_helper_test.cc
- ast/transform/direct_variable_access_test.cc
- ast/transform/disable_uniformity_analysis_test.cc
- ast/transform/expand_compound_assignment_test.cc
- ast/transform/first_index_offset_test.cc
- ast/transform/fold_trivial_lets_test.cc
- ast/transform/for_loop_to_loop_test.cc
- ast/transform/expand_compound_assignment_test.cc
- ast/transform/localize_struct_array_assignment_test.cc
- ast/transform/merge_return_test.cc
- ast/transform/module_scope_var_to_entry_point_param_test.cc
- ast/transform/multiplanar_external_texture_test.cc
- ast/transform/num_workgroups_from_uniform_test.cc
- ast/transform/packed_vec3_test.cc
- ast/transform/pad_structs_test.cc
- ast/transform/preserve_padding_test.cc
- ast/transform/promote_initializers_to_let_test.cc
- ast/transform/promote_side_effects_to_decl_test.cc
- ast/transform/remove_continue_in_switch_test.cc
- ast/transform/remove_phonies_test.cc
- ast/transform/remove_unreachable_statements_test.cc
- ast/transform/renamer_test.cc
- ast/transform/robustness_test.cc
- ast/transform/simplify_pointers_test.cc
- ast/transform/single_entry_point_test.cc
- ast/transform/spirv_atomic_test.cc
- ast/transform/std140_exhaustive_test.cc
- ast/transform/std140_f16_test.cc
- ast/transform/std140_f32_test.cc
- ast/transform/std140_test.cc
- ast/transform/substitute_override_test.cc
- ast/transform/test_helper.h
- ast/transform/texture_1d_to_2d_test.cc
- ast/transform/truncate_interstage_variables_test.cc
- ast/transform/unshadow_test.cc
- ast/transform/var_for_dynamic_index_test.cc
- ast/transform/vectorize_matrix_conversions_test.cc
- ast/transform/vectorize_scalar_matrix_initializers_test.cc
- ast/transform/vertex_pulling_test.cc
- ast/transform/while_to_loop_test.cc
- ast/transform/zero_init_workgroup_memory_test.cc
- ast/transform/utils/get_insertion_point_test.cc
- ast/transform/utils/hoist_to_decl_before_test.cc
+ lang/wgsl/ast/module_clone_test.cc
+ lang/wgsl/ast/transform/add_empty_entry_point_test.cc
+ lang/wgsl/ast/transform/add_block_attribute_test.cc
+ lang/wgsl/ast/transform/array_length_from_uniform_test.cc
+ lang/wgsl/ast/transform/binding_remapper_test.cc
+ lang/wgsl/ast/transform/builtin_polyfill_test.cc
+ lang/wgsl/ast/transform/calculate_array_length_test.cc
+ lang/wgsl/ast/transform/clamp_frag_depth_test.cc
+ lang/wgsl/ast/transform/canonicalize_entry_point_io_test.cc
+ lang/wgsl/ast/transform/combine_samplers_test.cc
+ lang/wgsl/ast/transform/decompose_memory_access_test.cc
+ lang/wgsl/ast/transform/decompose_strided_array_test.cc
+ lang/wgsl/ast/transform/decompose_strided_matrix_test.cc
+ lang/wgsl/ast/transform/demote_to_helper_test.cc
+ lang/wgsl/ast/transform/direct_variable_access_test.cc
+ lang/wgsl/ast/transform/disable_uniformity_analysis_test.cc
+ lang/wgsl/ast/transform/expand_compound_assignment_test.cc
+ lang/wgsl/ast/transform/first_index_offset_test.cc
+ lang/wgsl/ast/transform/fold_trivial_lets_test.cc
+ lang/wgsl/ast/transform/for_loop_to_loop_test.cc
+ lang/wgsl/ast/transform/expand_compound_assignment_test.cc
+ lang/wgsl/ast/transform/localize_struct_array_assignment_test.cc
+ lang/wgsl/ast/transform/merge_return_test.cc
+ lang/wgsl/ast/transform/module_scope_var_to_entry_point_param_test.cc
+ lang/wgsl/ast/transform/multiplanar_external_texture_test.cc
+ lang/wgsl/ast/transform/num_workgroups_from_uniform_test.cc
+ lang/wgsl/ast/transform/packed_vec3_test.cc
+ lang/wgsl/ast/transform/pad_structs_test.cc
+ lang/wgsl/ast/transform/preserve_padding_test.cc
+ lang/wgsl/ast/transform/promote_initializers_to_let_test.cc
+ lang/wgsl/ast/transform/promote_side_effects_to_decl_test.cc
+ lang/wgsl/ast/transform/remove_continue_in_switch_test.cc
+ lang/wgsl/ast/transform/remove_phonies_test.cc
+ lang/wgsl/ast/transform/remove_unreachable_statements_test.cc
+ lang/wgsl/ast/transform/renamer_test.cc
+ lang/wgsl/ast/transform/robustness_test.cc
+ lang/wgsl/ast/transform/simplify_pointers_test.cc
+ lang/wgsl/ast/transform/single_entry_point_test.cc
+ lang/wgsl/ast/transform/spirv_atomic_test.cc
+ lang/wgsl/ast/transform/std140_exhaustive_test.cc
+ lang/wgsl/ast/transform/std140_f16_test.cc
+ lang/wgsl/ast/transform/std140_f32_test.cc
+ lang/wgsl/ast/transform/std140_test.cc
+ lang/wgsl/ast/transform/substitute_override_test.cc
+ lang/wgsl/ast/transform/test_helper.h
+ lang/wgsl/ast/transform/texture_1d_to_2d_test.cc
+ lang/wgsl/ast/transform/truncate_interstage_variables_test.cc
+ lang/wgsl/ast/transform/unshadow_test.cc
+ lang/wgsl/ast/transform/var_for_dynamic_index_test.cc
+ lang/wgsl/ast/transform/vectorize_matrix_conversions_test.cc
+ lang/wgsl/ast/transform/vectorize_scalar_matrix_initializers_test.cc
+ lang/wgsl/ast/transform/vertex_pulling_test.cc
+ lang/wgsl/ast/transform/while_to_loop_test.cc
+ lang/wgsl/ast/transform/zero_init_workgroup_memory_test.cc
+ lang/wgsl/ast/transform/utils/get_insertion_point_test.cc
+ lang/wgsl/ast/transform/utils/hoist_to_decl_before_test.cc
)
endif()
diff --git a/src/tint/cmd/generate_external_texture_bindings.cc b/src/tint/cmd/generate_external_texture_bindings.cc
index 52650ea..5e022b9 100644
--- a/src/tint/cmd/generate_external_texture_bindings.cc
+++ b/src/tint/cmd/generate_external_texture_bindings.cc
@@ -18,7 +18,7 @@
#include <unordered_map>
#include <vector>
-#include "src/tint/ast/module.h"
+#include "src/tint/lang/wgsl/ast/module.h"
#include "src/tint/program.h"
#include "src/tint/sem/binding_point.h"
#include "src/tint/sem/variable.h"
diff --git a/src/tint/cmd/info.cc b/src/tint/cmd/info.cc
index bc1a260..0022474 100644
--- a/src/tint/cmd/info.cc
+++ b/src/tint/cmd/info.cc
@@ -19,8 +19,8 @@
#include "spirv-tools/libspirv.hpp"
#endif // TINT_BUILD_SPV_READER
-#include "src/tint/ast/module.h"
#include "src/tint/cmd/helper.h"
+#include "src/tint/lang/wgsl/ast/module.h"
#include "src/tint/type/struct.h"
#include "src/tint/utils/io/command.h"
#include "src/tint/utils/string.h"
diff --git a/src/tint/cmd/main.cc b/src/tint/cmd/main.cc
index 7521ae5..cca77d4 100644
--- a/src/tint/cmd/main.cc
+++ b/src/tint/cmd/main.cc
@@ -38,9 +38,9 @@
#include "spirv-tools/libspirv.hpp"
#endif // TINT_BUILD_SPV_READER || TINT_BUILD_SPV_WRITER
-#include "src/tint/ast/module.h"
#include "src/tint/cmd/generate_external_texture_bindings.h"
#include "src/tint/cmd/helper.h"
+#include "src/tint/lang/wgsl/ast/module.h"
#include "src/tint/utils/cli.h"
#include "src/tint/utils/defer.h"
#include "src/tint/utils/io/command.h"
diff --git a/src/tint/fuzzers/shuffle_transform.h b/src/tint/fuzzers/shuffle_transform.h
index 8a5ceeb..f5f6153 100644
--- a/src/tint/fuzzers/shuffle_transform.h
+++ b/src/tint/fuzzers/shuffle_transform.h
@@ -15,7 +15,7 @@
#ifndef SRC_TINT_FUZZERS_SHUFFLE_TRANSFORM_H_
#define SRC_TINT_FUZZERS_SHUFFLE_TRANSFORM_H_
-#include "src/tint/ast/transform/transform.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
namespace tint::fuzzers {
diff --git a/src/tint/fuzzers/tint_ast_fuzzer/expression_size.cc b/src/tint/fuzzers/tint_ast_fuzzer/expression_size.cc
index f6f893f..addbbf5 100644
--- a/src/tint/fuzzers/tint_ast_fuzzer/expression_size.cc
+++ b/src/tint/fuzzers/tint_ast_fuzzer/expression_size.cc
@@ -14,7 +14,7 @@
#include "src/tint/fuzzers/tint_ast_fuzzer/expression_size.h"
-#include "src/tint/ast/traverse_expressions.h"
+#include "src/tint/lang/wgsl/ast/traverse_expressions.h"
namespace tint::fuzzers::ast_fuzzer {
diff --git a/src/tint/fuzzers/tint_ast_fuzzer/expression_size.h b/src/tint/fuzzers/tint_ast_fuzzer/expression_size.h
index e03e692..908f022 100644
--- a/src/tint/fuzzers/tint_ast_fuzzer/expression_size.h
+++ b/src/tint/fuzzers/tint_ast_fuzzer/expression_size.h
@@ -17,7 +17,7 @@
#include <unordered_map>
-#include "src/tint/ast/expression.h"
+#include "src/tint/lang/wgsl/ast/expression.h"
#include "src/tint/program.h"
namespace tint::fuzzers::ast_fuzzer {
diff --git a/src/tint/fuzzers/tint_ast_fuzzer/expression_size_test.cc b/src/tint/fuzzers/tint_ast_fuzzer/expression_size_test.cc
index c3c5130..0d9ca0d 100644
--- a/src/tint/fuzzers/tint_ast_fuzzer/expression_size_test.cc
+++ b/src/tint/fuzzers/tint_ast_fuzzer/expression_size_test.cc
@@ -18,9 +18,9 @@
#include "gtest/gtest.h"
-#include "src/tint/ast/binary_expression.h"
-#include "src/tint/ast/expression.h"
-#include "src/tint/ast/int_literal_expression.h"
+#include "src/tint/lang/wgsl/ast/binary_expression.h"
+#include "src/tint/lang/wgsl/ast/expression.h"
+#include "src/tint/lang/wgsl/ast/int_literal_expression.h"
#include "src/tint/lang/wgsl/reader/parser.h"
#include "src/tint/program.h"
diff --git a/src/tint/fuzzers/tint_ast_fuzzer/jump_tracker.cc b/src/tint/fuzzers/tint_ast_fuzzer/jump_tracker.cc
index d77a762..cf34941 100644
--- a/src/tint/fuzzers/tint_ast_fuzzer/jump_tracker.cc
+++ b/src/tint/fuzzers/tint_ast_fuzzer/jump_tracker.cc
@@ -17,13 +17,13 @@
#include <cassert>
#include <unordered_set>
-#include "src/tint/ast/break_statement.h"
-#include "src/tint/ast/discard_statement.h"
-#include "src/tint/ast/for_loop_statement.h"
-#include "src/tint/ast/loop_statement.h"
-#include "src/tint/ast/return_statement.h"
-#include "src/tint/ast/switch_statement.h"
-#include "src/tint/ast/while_statement.h"
+#include "src/tint/lang/wgsl/ast/break_statement.h"
+#include "src/tint/lang/wgsl/ast/discard_statement.h"
+#include "src/tint/lang/wgsl/ast/for_loop_statement.h"
+#include "src/tint/lang/wgsl/ast/loop_statement.h"
+#include "src/tint/lang/wgsl/ast/return_statement.h"
+#include "src/tint/lang/wgsl/ast/switch_statement.h"
+#include "src/tint/lang/wgsl/ast/while_statement.h"
#include "src/tint/sem/statement.h"
namespace tint::fuzzers::ast_fuzzer {
diff --git a/src/tint/fuzzers/tint_ast_fuzzer/jump_tracker.h b/src/tint/fuzzers/tint_ast_fuzzer/jump_tracker.h
index ec40ee8..f7d5edd 100644
--- a/src/tint/fuzzers/tint_ast_fuzzer/jump_tracker.h
+++ b/src/tint/fuzzers/tint_ast_fuzzer/jump_tracker.h
@@ -17,7 +17,7 @@
#include <unordered_set>
-#include "src/tint/ast/statement.h"
+#include "src/tint/lang/wgsl/ast/statement.h"
#include "src/tint/program.h"
namespace tint::fuzzers::ast_fuzzer {
diff --git a/src/tint/fuzzers/tint_ast_fuzzer/jump_tracker_test.cc b/src/tint/fuzzers/tint_ast_fuzzer/jump_tracker_test.cc
index 806dbb7..46b550a 100644
--- a/src/tint/fuzzers/tint_ast_fuzzer/jump_tracker_test.cc
+++ b/src/tint/fuzzers/tint_ast_fuzzer/jump_tracker_test.cc
@@ -18,16 +18,16 @@
#include "gtest/gtest.h"
-#include "src/tint/ast/block_statement.h"
-#include "src/tint/ast/break_statement.h"
-#include "src/tint/ast/discard_statement.h"
-#include "src/tint/ast/for_loop_statement.h"
-#include "src/tint/ast/if_statement.h"
-#include "src/tint/ast/loop_statement.h"
-#include "src/tint/ast/module.h"
-#include "src/tint/ast/return_statement.h"
-#include "src/tint/ast/switch_statement.h"
-#include "src/tint/ast/while_statement.h"
+#include "src/tint/lang/wgsl/ast/block_statement.h"
+#include "src/tint/lang/wgsl/ast/break_statement.h"
+#include "src/tint/lang/wgsl/ast/discard_statement.h"
+#include "src/tint/lang/wgsl/ast/for_loop_statement.h"
+#include "src/tint/lang/wgsl/ast/if_statement.h"
+#include "src/tint/lang/wgsl/ast/loop_statement.h"
+#include "src/tint/lang/wgsl/ast/module.h"
+#include "src/tint/lang/wgsl/ast/return_statement.h"
+#include "src/tint/lang/wgsl/ast/switch_statement.h"
+#include "src/tint/lang/wgsl/ast/while_statement.h"
#include "src/tint/lang/wgsl/reader/parser.h"
#include "src/tint/program.h"
diff --git a/src/tint/fuzzers/tint_ast_fuzzer/mutation_finders/change_binary_operators.cc b/src/tint/fuzzers/tint_ast_fuzzer/mutation_finders/change_binary_operators.cc
index 5dab56f..eb3f040 100644
--- a/src/tint/fuzzers/tint_ast_fuzzer/mutation_finders/change_binary_operators.cc
+++ b/src/tint/fuzzers/tint_ast_fuzzer/mutation_finders/change_binary_operators.cc
@@ -17,8 +17,8 @@
#include <memory>
#include <vector>
-#include "src/tint/ast/binary_expression.h"
#include "src/tint/fuzzers/tint_ast_fuzzer/mutations/change_binary_operator.h"
+#include "src/tint/lang/wgsl/ast/binary_expression.h"
namespace tint::fuzzers::ast_fuzzer {
diff --git a/src/tint/fuzzers/tint_ast_fuzzer/mutation_finders/change_unary_operators.cc b/src/tint/fuzzers/tint_ast_fuzzer/mutation_finders/change_unary_operators.cc
index adcf71f..12be86a 100644
--- a/src/tint/fuzzers/tint_ast_fuzzer/mutation_finders/change_unary_operators.cc
+++ b/src/tint/fuzzers/tint_ast_fuzzer/mutation_finders/change_unary_operators.cc
@@ -16,9 +16,9 @@
#include <memory>
-#include "src/tint/ast/unary_op_expression.h"
#include "src/tint/fuzzers/tint_ast_fuzzer/mutations/change_unary_operator.h"
#include "src/tint/fuzzers/tint_ast_fuzzer/util.h"
+#include "src/tint/lang/wgsl/ast/unary_op_expression.h"
#include "src/tint/type/reference.h"
namespace tint::fuzzers::ast_fuzzer {
diff --git a/src/tint/fuzzers/tint_ast_fuzzer/mutations/change_binary_operator.h b/src/tint/fuzzers/tint_ast_fuzzer/mutations/change_binary_operator.h
index cc80da3..00d6af3 100644
--- a/src/tint/fuzzers/tint_ast_fuzzer/mutations/change_binary_operator.h
+++ b/src/tint/fuzzers/tint_ast_fuzzer/mutations/change_binary_operator.h
@@ -17,7 +17,7 @@
#include "src/tint/fuzzers/tint_ast_fuzzer/mutation.h"
-#include "src/tint/ast/binary_expression.h"
+#include "src/tint/lang/wgsl/ast/binary_expression.h"
#include "src/tint/program.h"
#include "src/tint/sem/variable.h"
diff --git a/src/tint/fuzzers/tint_ast_fuzzer/mutations/change_unary_operator.h b/src/tint/fuzzers/tint_ast_fuzzer/mutations/change_unary_operator.h
index 1fa84a8..7fd2ff0 100644
--- a/src/tint/fuzzers/tint_ast_fuzzer/mutations/change_unary_operator.h
+++ b/src/tint/fuzzers/tint_ast_fuzzer/mutations/change_unary_operator.h
@@ -15,8 +15,8 @@
#ifndef SRC_TINT_FUZZERS_TINT_AST_FUZZER_MUTATIONS_CHANGE_UNARY_OPERATOR_H_
#define SRC_TINT_FUZZERS_TINT_AST_FUZZER_MUTATIONS_CHANGE_UNARY_OPERATOR_H_
-#include "src/tint/ast/unary_op.h"
#include "src/tint/fuzzers/tint_ast_fuzzer/mutation.h"
+#include "src/tint/lang/wgsl/ast/unary_op.h"
#include "src/tint/sem/variable.h"
namespace tint::fuzzers::ast_fuzzer {
diff --git a/src/tint/fuzzers/tint_ast_fuzzer/mutations/change_unary_operator_test.cc b/src/tint/fuzzers/tint_ast_fuzzer/mutations/change_unary_operator_test.cc
index 83ae15d..595e850 100644
--- a/src/tint/fuzzers/tint_ast_fuzzer/mutations/change_unary_operator_test.cc
+++ b/src/tint/fuzzers/tint_ast_fuzzer/mutations/change_unary_operator_test.cc
@@ -16,11 +16,11 @@
#include "gtest/gtest.h"
-#include "src/tint/ast/call_statement.h"
#include "src/tint/fuzzers/tint_ast_fuzzer/mutations/change_unary_operator.h"
#include "src/tint/fuzzers/tint_ast_fuzzer/mutator.h"
#include "src/tint/fuzzers/tint_ast_fuzzer/node_id_map.h"
#include "src/tint/fuzzers/tint_ast_fuzzer/probability_context.h"
+#include "src/tint/lang/wgsl/ast/call_statement.h"
#include "src/tint/lang/wgsl/ast_writer/generator.h"
#include "src/tint/lang/wgsl/reader/parser.h"
#include "src/tint/program_builder.h"
diff --git a/src/tint/fuzzers/tint_ast_fuzzer/mutations/delete_statement.cc b/src/tint/fuzzers/tint_ast_fuzzer/mutations/delete_statement.cc
index 89ab66b..b91b9d0 100644
--- a/src/tint/fuzzers/tint_ast_fuzzer/mutations/delete_statement.cc
+++ b/src/tint/fuzzers/tint_ast_fuzzer/mutations/delete_statement.cc
@@ -18,13 +18,13 @@
#include <utility>
#include <vector>
-#include "src/tint/ast/block_statement.h"
-#include "src/tint/ast/for_loop_statement.h"
-#include "src/tint/ast/if_statement.h"
-#include "src/tint/ast/loop_statement.h"
-#include "src/tint/ast/variable_decl_statement.h"
#include "src/tint/fuzzers/tint_ast_fuzzer/jump_tracker.h"
#include "src/tint/fuzzers/tint_ast_fuzzer/util.h"
+#include "src/tint/lang/wgsl/ast/block_statement.h"
+#include "src/tint/lang/wgsl/ast/for_loop_statement.h"
+#include "src/tint/lang/wgsl/ast/if_statement.h"
+#include "src/tint/lang/wgsl/ast/loop_statement.h"
+#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
#include "src/tint/program_builder.h"
#include "src/tint/sem/for_loop_statement.h"
#include "src/tint/sem/if_statement.h"
diff --git a/src/tint/fuzzers/tint_ast_fuzzer/mutations/delete_statement.h b/src/tint/fuzzers/tint_ast_fuzzer/mutations/delete_statement.h
index c7c0192..b77f822 100644
--- a/src/tint/fuzzers/tint_ast_fuzzer/mutations/delete_statement.h
+++ b/src/tint/fuzzers/tint_ast_fuzzer/mutations/delete_statement.h
@@ -15,9 +15,9 @@
#ifndef SRC_TINT_FUZZERS_TINT_AST_FUZZER_MUTATIONS_DELETE_STATEMENT_H_
#define SRC_TINT_FUZZERS_TINT_AST_FUZZER_MUTATIONS_DELETE_STATEMENT_H_
-#include "src/tint/ast/statement.h"
#include "src/tint/fuzzers/tint_ast_fuzzer/jump_tracker.h"
#include "src/tint/fuzzers/tint_ast_fuzzer/mutation.h"
+#include "src/tint/lang/wgsl/ast/statement.h"
namespace tint::fuzzers::ast_fuzzer {
diff --git a/src/tint/fuzzers/tint_ast_fuzzer/mutations/delete_statement_test.cc b/src/tint/fuzzers/tint_ast_fuzzer/mutations/delete_statement_test.cc
index 123ceaf..383e1d9 100644
--- a/src/tint/fuzzers/tint_ast_fuzzer/mutations/delete_statement_test.cc
+++ b/src/tint/fuzzers/tint_ast_fuzzer/mutations/delete_statement_test.cc
@@ -19,15 +19,15 @@
#include "gtest/gtest.h"
-#include "src/tint/ast/assignment_statement.h"
-#include "src/tint/ast/block_statement.h"
-#include "src/tint/ast/case_statement.h"
-#include "src/tint/ast/for_loop_statement.h"
-#include "src/tint/ast/if_statement.h"
-#include "src/tint/ast/switch_statement.h"
#include "src/tint/fuzzers/tint_ast_fuzzer/mutator.h"
#include "src/tint/fuzzers/tint_ast_fuzzer/node_id_map.h"
#include "src/tint/fuzzers/tint_ast_fuzzer/probability_context.h"
+#include "src/tint/lang/wgsl/ast/assignment_statement.h"
+#include "src/tint/lang/wgsl/ast/block_statement.h"
+#include "src/tint/lang/wgsl/ast/case_statement.h"
+#include "src/tint/lang/wgsl/ast/for_loop_statement.h"
+#include "src/tint/lang/wgsl/ast/if_statement.h"
+#include "src/tint/lang/wgsl/ast/switch_statement.h"
#include "src/tint/lang/wgsl/ast_writer/generator.h"
#include "src/tint/lang/wgsl/reader/parser.h"
#include "src/tint/program_builder.h"
diff --git a/src/tint/fuzzers/tint_ast_fuzzer/mutations/replace_identifier_test.cc b/src/tint/fuzzers/tint_ast_fuzzer/mutations/replace_identifier_test.cc
index d681555..fe5bec8 100644
--- a/src/tint/fuzzers/tint_ast_fuzzer/mutations/replace_identifier_test.cc
+++ b/src/tint/fuzzers/tint_ast_fuzzer/mutations/replace_identifier_test.cc
@@ -18,9 +18,9 @@
#include "gtest/gtest.h"
-#include "src/tint/ast/call_statement.h"
#include "src/tint/fuzzers/tint_ast_fuzzer/mutator.h"
#include "src/tint/fuzzers/tint_ast_fuzzer/node_id_map.h"
+#include "src/tint/lang/wgsl/ast/call_statement.h"
#include "src/tint/lang/wgsl/ast_writer/generator.h"
#include "src/tint/lang/wgsl/reader/parser.h"
#include "src/tint/program_builder.h"
diff --git a/src/tint/fuzzers/tint_ast_fuzzer/mutations/wrap_unary_operator.h b/src/tint/fuzzers/tint_ast_fuzzer/mutations/wrap_unary_operator.h
index 0ca6213..9af431f 100644
--- a/src/tint/fuzzers/tint_ast_fuzzer/mutations/wrap_unary_operator.h
+++ b/src/tint/fuzzers/tint_ast_fuzzer/mutations/wrap_unary_operator.h
@@ -19,7 +19,7 @@
#include "src/tint/fuzzers/tint_ast_fuzzer/mutation.h"
-#include "src/tint/ast/unary_op.h"
+#include "src/tint/lang/wgsl/ast/unary_op.h"
#include "src/tint/sem/variable.h"
namespace tint::fuzzers::ast_fuzzer {
diff --git a/src/tint/fuzzers/tint_ast_fuzzer/util.h b/src/tint/fuzzers/tint_ast_fuzzer/util.h
index b428d46..59d9bf1 100644
--- a/src/tint/fuzzers/tint_ast_fuzzer/util.h
+++ b/src/tint/fuzzers/tint_ast_fuzzer/util.h
@@ -17,8 +17,8 @@
#include <vector>
-#include "src/tint/ast/module.h"
-#include "src/tint/ast/variable_decl_statement.h"
+#include "src/tint/lang/wgsl/ast/module.h"
+#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
#include "src/tint/program.h"
#include "src/tint/sem/block_statement.h"
#include "src/tint/sem/function.h"
diff --git a/src/tint/fuzzers/tint_common_fuzzer.cc b/src/tint/fuzzers/tint_common_fuzzer.cc
index 62cd0ab..51895e1 100644
--- a/src/tint/fuzzers/tint_common_fuzzer.cc
+++ b/src/tint/fuzzers/tint_common_fuzzer.cc
@@ -30,9 +30,9 @@
#include "spirv-tools/libspirv.hpp"
#endif // TINT_BUILD_SPV_READER || TINT_BUILD_SPV_WRITER
-#include "src/tint/ast/module.h"
#include "src/tint/diagnostic/formatter.h"
#include "src/tint/fuzzers/apply_substitute_overrides.h"
+#include "src/tint/lang/wgsl/ast/module.h"
#include "src/tint/program.h"
#include "src/tint/sem/binding_point.h"
#include "src/tint/sem/variable.h"
diff --git a/src/tint/fuzzers/tint_robustness_fuzzer.cc b/src/tint/fuzzers/tint_robustness_fuzzer.cc
index f82bb53..79dec75 100644
--- a/src/tint/fuzzers/tint_robustness_fuzzer.cc
+++ b/src/tint/fuzzers/tint_robustness_fuzzer.cc
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/robustness.h"
#include "src/tint/fuzzers/fuzzer_init.h"
#include "src/tint/fuzzers/tint_common_fuzzer.h"
#include "src/tint/fuzzers/transform_builder.h"
+#include "src/tint/lang/wgsl/ast/transform/robustness.h"
namespace tint::fuzzers {
diff --git a/src/tint/fuzzers/transform_builder.h b/src/tint/fuzzers/transform_builder.h
index a8bcb6d..cda9017 100644
--- a/src/tint/fuzzers/transform_builder.h
+++ b/src/tint/fuzzers/transform_builder.h
@@ -20,10 +20,10 @@
#include "include/tint/tint.h"
-#include "src/tint/ast/transform/binding_remapper.h"
-#include "src/tint/ast/transform/robustness.h"
#include "src/tint/fuzzers/data_builder.h"
#include "src/tint/fuzzers/shuffle_transform.h"
+#include "src/tint/lang/wgsl/ast/transform/binding_remapper.h"
+#include "src/tint/lang/wgsl/ast/transform/robustness.h"
namespace tint::fuzzers {
diff --git a/src/tint/inspector/entry_point.h b/src/tint/inspector/entry_point.h
index b26780e..94cfc2c 100644
--- a/src/tint/inspector/entry_point.h
+++ b/src/tint/inspector/entry_point.h
@@ -22,8 +22,8 @@
#include "tint/override_id.h"
-#include "src/tint/ast/interpolate_attribute.h"
-#include "src/tint/ast/pipeline_stage.h"
+#include "src/tint/lang/wgsl/ast/interpolate_attribute.h"
+#include "src/tint/lang/wgsl/ast/pipeline_stage.h"
namespace tint::inspector {
diff --git a/src/tint/inspector/inspector.cc b/src/tint/inspector/inspector.cc
index 9a6d1e1..6d45a6c 100644
--- a/src/tint/inspector/inspector.cc
+++ b/src/tint/inspector/inspector.cc
@@ -17,21 +17,21 @@
#include <limits>
#include <utility>
-#include "src/tint/ast/bool_literal_expression.h"
-#include "src/tint/ast/call_expression.h"
-#include "src/tint/ast/float_literal_expression.h"
-#include "src/tint/ast/id_attribute.h"
-#include "src/tint/ast/identifier.h"
-#include "src/tint/ast/int_literal_expression.h"
-#include "src/tint/ast/interpolate_attribute.h"
-#include "src/tint/ast/location_attribute.h"
-#include "src/tint/ast/module.h"
-#include "src/tint/ast/override.h"
-#include "src/tint/ast/var.h"
#include "src/tint/builtin/builtin_value.h"
#include "src/tint/builtin/extension.h"
#include "src/tint/builtin/interpolation_sampling.h"
#include "src/tint/builtin/interpolation_type.h"
+#include "src/tint/lang/wgsl/ast/bool_literal_expression.h"
+#include "src/tint/lang/wgsl/ast/call_expression.h"
+#include "src/tint/lang/wgsl/ast/float_literal_expression.h"
+#include "src/tint/lang/wgsl/ast/id_attribute.h"
+#include "src/tint/lang/wgsl/ast/identifier.h"
+#include "src/tint/lang/wgsl/ast/int_literal_expression.h"
+#include "src/tint/lang/wgsl/ast/interpolate_attribute.h"
+#include "src/tint/lang/wgsl/ast/location_attribute.h"
+#include "src/tint/lang/wgsl/ast/module.h"
+#include "src/tint/lang/wgsl/ast/override.h"
+#include "src/tint/lang/wgsl/ast/var.h"
#include "src/tint/sem/builtin_enum_expression.h"
#include "src/tint/sem/call.h"
#include "src/tint/sem/function.h"
diff --git a/src/tint/inspector/inspector_test.cc b/src/tint/inspector/inspector_test.cc
index de09369..04a58d6 100644
--- a/src/tint/inspector/inspector_test.cc
+++ b/src/tint/inspector/inspector_test.cc
@@ -14,13 +14,13 @@
#include "gmock/gmock.h"
-#include "src/tint/ast/call_statement.h"
-#include "src/tint/ast/disable_validation_attribute.h"
-#include "src/tint/ast/id_attribute.h"
-#include "src/tint/ast/stage_attribute.h"
-#include "src/tint/ast/workgroup_attribute.h"
#include "src/tint/inspector/test_inspector_builder.h"
#include "src/tint/inspector/test_inspector_runner.h"
+#include "src/tint/lang/wgsl/ast/call_statement.h"
+#include "src/tint/lang/wgsl/ast/disable_validation_attribute.h"
+#include "src/tint/lang/wgsl/ast/id_attribute.h"
+#include "src/tint/lang/wgsl/ast/stage_attribute.h"
+#include "src/tint/lang/wgsl/ast/workgroup_attribute.h"
#include "src/tint/program_builder.h"
#include "src/tint/sem/variable.h"
#include "src/tint/type/depth_texture.h"
diff --git a/src/tint/inspector/test_inspector_builder.h b/src/tint/inspector/test_inspector_builder.h
index 0fa21b7..ed6d1c0 100644
--- a/src/tint/inspector/test_inspector_builder.h
+++ b/src/tint/inspector/test_inspector_builder.h
@@ -20,11 +20,11 @@
#include <tuple>
#include <vector>
-#include "src/tint/ast/call_statement.h"
-#include "src/tint/ast/disable_validation_attribute.h"
-#include "src/tint/ast/id_attribute.h"
-#include "src/tint/ast/stage_attribute.h"
-#include "src/tint/ast/workgroup_attribute.h"
+#include "src/tint/lang/wgsl/ast/call_statement.h"
+#include "src/tint/lang/wgsl/ast/disable_validation_attribute.h"
+#include "src/tint/lang/wgsl/ast/id_attribute.h"
+#include "src/tint/lang/wgsl/ast/stage_attribute.h"
+#include "src/tint/lang/wgsl/ast/workgroup_attribute.h"
#include "src/tint/program_builder.h"
#include "src/tint/sem/variable.h"
#include "src/tint/type/depth_texture.h"
diff --git a/src/tint/ir/from_program.cc b/src/tint/ir/from_program.cc
index 1ef7001..9c3aec1 100644
--- a/src/tint/ir/from_program.cc
+++ b/src/tint/ir/from_program.cc
@@ -20,54 +20,6 @@
#include <variant>
#include <vector>
-#include "src/tint/ast/accessor_expression.h"
-#include "src/tint/ast/alias.h"
-#include "src/tint/ast/assignment_statement.h"
-#include "src/tint/ast/binary_expression.h"
-#include "src/tint/ast/bitcast_expression.h"
-#include "src/tint/ast/block_statement.h"
-#include "src/tint/ast/bool_literal_expression.h"
-#include "src/tint/ast/break_if_statement.h"
-#include "src/tint/ast/break_statement.h"
-#include "src/tint/ast/call_expression.h"
-#include "src/tint/ast/call_statement.h"
-#include "src/tint/ast/compound_assignment_statement.h"
-#include "src/tint/ast/const.h"
-#include "src/tint/ast/const_assert.h"
-#include "src/tint/ast/continue_statement.h"
-#include "src/tint/ast/diagnostic_directive.h"
-#include "src/tint/ast/discard_statement.h"
-#include "src/tint/ast/enable.h"
-#include "src/tint/ast/float_literal_expression.h"
-#include "src/tint/ast/for_loop_statement.h"
-#include "src/tint/ast/function.h"
-#include "src/tint/ast/id_attribute.h"
-#include "src/tint/ast/identifier.h"
-#include "src/tint/ast/identifier_expression.h"
-#include "src/tint/ast/if_statement.h"
-#include "src/tint/ast/increment_decrement_statement.h"
-#include "src/tint/ast/index_accessor_expression.h"
-#include "src/tint/ast/int_literal_expression.h"
-#include "src/tint/ast/interpolate_attribute.h"
-#include "src/tint/ast/invariant_attribute.h"
-#include "src/tint/ast/let.h"
-#include "src/tint/ast/literal_expression.h"
-#include "src/tint/ast/loop_statement.h"
-#include "src/tint/ast/member_accessor_expression.h"
-#include "src/tint/ast/override.h"
-#include "src/tint/ast/phony_expression.h"
-#include "src/tint/ast/return_statement.h"
-#include "src/tint/ast/statement.h"
-#include "src/tint/ast/struct.h"
-#include "src/tint/ast/struct_member_align_attribute.h"
-#include "src/tint/ast/struct_member_size_attribute.h"
-#include "src/tint/ast/switch_statement.h"
-#include "src/tint/ast/templated_identifier.h"
-#include "src/tint/ast/traverse_expressions.h"
-#include "src/tint/ast/unary_op_expression.h"
-#include "src/tint/ast/var.h"
-#include "src/tint/ast/variable_decl_statement.h"
-#include "src/tint/ast/while_statement.h"
#include "src/tint/ir/block_param.h"
#include "src/tint/ir/builder.h"
#include "src/tint/ir/exit_if.h"
@@ -80,6 +32,54 @@
#include "src/tint/ir/store.h"
#include "src/tint/ir/switch.h"
#include "src/tint/ir/value.h"
+#include "src/tint/lang/wgsl/ast/accessor_expression.h"
+#include "src/tint/lang/wgsl/ast/alias.h"
+#include "src/tint/lang/wgsl/ast/assignment_statement.h"
+#include "src/tint/lang/wgsl/ast/binary_expression.h"
+#include "src/tint/lang/wgsl/ast/bitcast_expression.h"
+#include "src/tint/lang/wgsl/ast/block_statement.h"
+#include "src/tint/lang/wgsl/ast/bool_literal_expression.h"
+#include "src/tint/lang/wgsl/ast/break_if_statement.h"
+#include "src/tint/lang/wgsl/ast/break_statement.h"
+#include "src/tint/lang/wgsl/ast/call_expression.h"
+#include "src/tint/lang/wgsl/ast/call_statement.h"
+#include "src/tint/lang/wgsl/ast/compound_assignment_statement.h"
+#include "src/tint/lang/wgsl/ast/const.h"
+#include "src/tint/lang/wgsl/ast/const_assert.h"
+#include "src/tint/lang/wgsl/ast/continue_statement.h"
+#include "src/tint/lang/wgsl/ast/diagnostic_directive.h"
+#include "src/tint/lang/wgsl/ast/discard_statement.h"
+#include "src/tint/lang/wgsl/ast/enable.h"
+#include "src/tint/lang/wgsl/ast/float_literal_expression.h"
+#include "src/tint/lang/wgsl/ast/for_loop_statement.h"
+#include "src/tint/lang/wgsl/ast/function.h"
+#include "src/tint/lang/wgsl/ast/id_attribute.h"
+#include "src/tint/lang/wgsl/ast/identifier.h"
+#include "src/tint/lang/wgsl/ast/identifier_expression.h"
+#include "src/tint/lang/wgsl/ast/if_statement.h"
+#include "src/tint/lang/wgsl/ast/increment_decrement_statement.h"
+#include "src/tint/lang/wgsl/ast/index_accessor_expression.h"
+#include "src/tint/lang/wgsl/ast/int_literal_expression.h"
+#include "src/tint/lang/wgsl/ast/interpolate_attribute.h"
+#include "src/tint/lang/wgsl/ast/invariant_attribute.h"
+#include "src/tint/lang/wgsl/ast/let.h"
+#include "src/tint/lang/wgsl/ast/literal_expression.h"
+#include "src/tint/lang/wgsl/ast/loop_statement.h"
+#include "src/tint/lang/wgsl/ast/member_accessor_expression.h"
+#include "src/tint/lang/wgsl/ast/override.h"
+#include "src/tint/lang/wgsl/ast/phony_expression.h"
+#include "src/tint/lang/wgsl/ast/return_statement.h"
+#include "src/tint/lang/wgsl/ast/statement.h"
+#include "src/tint/lang/wgsl/ast/struct.h"
+#include "src/tint/lang/wgsl/ast/struct_member_align_attribute.h"
+#include "src/tint/lang/wgsl/ast/struct_member_size_attribute.h"
+#include "src/tint/lang/wgsl/ast/switch_statement.h"
+#include "src/tint/lang/wgsl/ast/templated_identifier.h"
+#include "src/tint/lang/wgsl/ast/traverse_expressions.h"
+#include "src/tint/lang/wgsl/ast/unary_op_expression.h"
+#include "src/tint/lang/wgsl/ast/var.h"
+#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
+#include "src/tint/lang/wgsl/ast/while_statement.h"
#include "src/tint/program.h"
#include "src/tint/scope_stack.h"
#include "src/tint/sem/builtin.h"
diff --git a/src/tint/ir/from_program_accessor_test.cc b/src/tint/ir/from_program_accessor_test.cc
index cbf6ac5..5245b91 100644
--- a/src/tint/ir/from_program_accessor_test.cc
+++ b/src/tint/ir/from_program_accessor_test.cc
@@ -13,13 +13,13 @@
// limitations under the License.
#include "gmock/gmock.h"
-#include "src/tint/ast/case_selector.h"
-#include "src/tint/ast/int_literal_expression.h"
#include "src/tint/constant/scalar.h"
#include "src/tint/ir/block.h"
#include "src/tint/ir/constant.h"
#include "src/tint/ir/program_test_helper.h"
#include "src/tint/ir/var.h"
+#include "src/tint/lang/wgsl/ast/case_selector.h"
+#include "src/tint/lang/wgsl/ast/int_literal_expression.h"
namespace tint::ir {
namespace {
diff --git a/src/tint/ir/from_program_binary_test.cc b/src/tint/ir/from_program_binary_test.cc
index 9763942..03dd7d5 100644
--- a/src/tint/ir/from_program_binary_test.cc
+++ b/src/tint/ir/from_program_binary_test.cc
@@ -13,10 +13,10 @@
// limitations under the License.
#include "gmock/gmock.h"
-#include "src/tint/ast/case_selector.h"
-#include "src/tint/ast/int_literal_expression.h"
#include "src/tint/constant/scalar.h"
#include "src/tint/ir/program_test_helper.h"
+#include "src/tint/lang/wgsl/ast/case_selector.h"
+#include "src/tint/lang/wgsl/ast/int_literal_expression.h"
namespace tint::ir {
namespace {
diff --git a/src/tint/ir/from_program_builtin_test.cc b/src/tint/ir/from_program_builtin_test.cc
index 296ec79..952bca1 100644
--- a/src/tint/ir/from_program_builtin_test.cc
+++ b/src/tint/ir/from_program_builtin_test.cc
@@ -13,10 +13,10 @@
// limitations under the License.
#include "gmock/gmock.h"
-#include "src/tint/ast/case_selector.h"
-#include "src/tint/ast/int_literal_expression.h"
#include "src/tint/constant/scalar.h"
#include "src/tint/ir/program_test_helper.h"
+#include "src/tint/lang/wgsl/ast/case_selector.h"
+#include "src/tint/lang/wgsl/ast/int_literal_expression.h"
namespace tint::ir {
namespace {
diff --git a/src/tint/ir/from_program_call_test.cc b/src/tint/ir/from_program_call_test.cc
index 3807e85..2411ffd 100644
--- a/src/tint/ir/from_program_call_test.cc
+++ b/src/tint/ir/from_program_call_test.cc
@@ -13,10 +13,10 @@
// limitations under the License.
#include "gmock/gmock.h"
-#include "src/tint/ast/case_selector.h"
-#include "src/tint/ast/int_literal_expression.h"
#include "src/tint/constant/scalar.h"
#include "src/tint/ir/program_test_helper.h"
+#include "src/tint/lang/wgsl/ast/case_selector.h"
+#include "src/tint/lang/wgsl/ast/int_literal_expression.h"
namespace tint::ir {
namespace {
diff --git a/src/tint/ir/from_program_function_test.cc b/src/tint/ir/from_program_function_test.cc
index 2fce0e7..0e098e9 100644
--- a/src/tint/ir/from_program_function_test.cc
+++ b/src/tint/ir/from_program_function_test.cc
@@ -13,10 +13,10 @@
// limitations under the License.
#include "gmock/gmock.h"
-#include "src/tint/ast/case_selector.h"
-#include "src/tint/ast/int_literal_expression.h"
#include "src/tint/constant/scalar.h"
#include "src/tint/ir/program_test_helper.h"
+#include "src/tint/lang/wgsl/ast/case_selector.h"
+#include "src/tint/lang/wgsl/ast/int_literal_expression.h"
namespace tint::ir {
namespace {
diff --git a/src/tint/ir/from_program_let_test.cc b/src/tint/ir/from_program_let_test.cc
index 72b680f..538bc762 100644
--- a/src/tint/ir/from_program_let_test.cc
+++ b/src/tint/ir/from_program_let_test.cc
@@ -13,10 +13,10 @@
// limitations under the License.
#include "gmock/gmock.h"
-#include "src/tint/ast/case_selector.h"
-#include "src/tint/ast/int_literal_expression.h"
#include "src/tint/constant/scalar.h"
#include "src/tint/ir/program_test_helper.h"
+#include "src/tint/lang/wgsl/ast/case_selector.h"
+#include "src/tint/lang/wgsl/ast/int_literal_expression.h"
namespace tint::ir {
namespace {
diff --git a/src/tint/ir/from_program_literal_test.cc b/src/tint/ir/from_program_literal_test.cc
index e0e6f8b..397dc2a 100644
--- a/src/tint/ir/from_program_literal_test.cc
+++ b/src/tint/ir/from_program_literal_test.cc
@@ -13,13 +13,13 @@
// limitations under the License.
#include "gmock/gmock.h"
-#include "src/tint/ast/case_selector.h"
-#include "src/tint/ast/int_literal_expression.h"
#include "src/tint/constant/scalar.h"
#include "src/tint/ir/block.h"
#include "src/tint/ir/constant.h"
#include "src/tint/ir/program_test_helper.h"
#include "src/tint/ir/var.h"
+#include "src/tint/lang/wgsl/ast/case_selector.h"
+#include "src/tint/lang/wgsl/ast/int_literal_expression.h"
namespace tint::ir {
namespace {
diff --git a/src/tint/ir/from_program_materialize_test.cc b/src/tint/ir/from_program_materialize_test.cc
index 21ccebd..221718b 100644
--- a/src/tint/ir/from_program_materialize_test.cc
+++ b/src/tint/ir/from_program_materialize_test.cc
@@ -13,10 +13,10 @@
// limitations under the License.
#include "gmock/gmock.h"
-#include "src/tint/ast/case_selector.h"
-#include "src/tint/ast/int_literal_expression.h"
#include "src/tint/constant/scalar.h"
#include "src/tint/ir/program_test_helper.h"
+#include "src/tint/lang/wgsl/ast/case_selector.h"
+#include "src/tint/lang/wgsl/ast/int_literal_expression.h"
namespace tint::ir {
namespace {
diff --git a/src/tint/ir/from_program_store_test.cc b/src/tint/ir/from_program_store_test.cc
index 31e9792..324e946 100644
--- a/src/tint/ir/from_program_store_test.cc
+++ b/src/tint/ir/from_program_store_test.cc
@@ -13,10 +13,10 @@
// limitations under the License.
#include "gmock/gmock.h"
-#include "src/tint/ast/case_selector.h"
-#include "src/tint/ast/int_literal_expression.h"
#include "src/tint/constant/scalar.h"
#include "src/tint/ir/program_test_helper.h"
+#include "src/tint/lang/wgsl/ast/case_selector.h"
+#include "src/tint/lang/wgsl/ast/int_literal_expression.h"
namespace tint::ir {
namespace {
diff --git a/src/tint/ir/from_program_test.cc b/src/tint/ir/from_program_test.cc
index ef07962..c721c7a 100644
--- a/src/tint/ir/from_program_test.cc
+++ b/src/tint/ir/from_program_test.cc
@@ -13,8 +13,6 @@
// limitations under the License.
#include "gmock/gmock.h"
-#include "src/tint/ast/case_selector.h"
-#include "src/tint/ast/int_literal_expression.h"
#include "src/tint/constant/scalar.h"
#include "src/tint/ir/block.h"
#include "src/tint/ir/if.h"
@@ -22,6 +20,8 @@
#include "src/tint/ir/multi_in_block.h"
#include "src/tint/ir/program_test_helper.h"
#include "src/tint/ir/switch.h"
+#include "src/tint/lang/wgsl/ast/case_selector.h"
+#include "src/tint/lang/wgsl/ast/int_literal_expression.h"
namespace tint::ir {
namespace {
diff --git a/src/tint/ir/from_program_unary_test.cc b/src/tint/ir/from_program_unary_test.cc
index 3335523..bd7708f 100644
--- a/src/tint/ir/from_program_unary_test.cc
+++ b/src/tint/ir/from_program_unary_test.cc
@@ -14,9 +14,9 @@
#include "src/tint/ir/program_test_helper.h"
-#include "src/tint/ast/case_selector.h"
-#include "src/tint/ast/int_literal_expression.h"
#include "src/tint/constant/scalar.h"
+#include "src/tint/lang/wgsl/ast/case_selector.h"
+#include "src/tint/lang/wgsl/ast/int_literal_expression.h"
namespace tint::ir {
namespace {
diff --git a/src/tint/ir/from_program_var_test.cc b/src/tint/ir/from_program_var_test.cc
index 58a5514..8cb53f1 100644
--- a/src/tint/ir/from_program_var_test.cc
+++ b/src/tint/ir/from_program_var_test.cc
@@ -13,10 +13,10 @@
// limitations under the License.
#include "gmock/gmock.h"
-#include "src/tint/ast/case_selector.h"
-#include "src/tint/ast/int_literal_expression.h"
#include "src/tint/constant/scalar.h"
#include "src/tint/ir/program_test_helper.h"
+#include "src/tint/lang/wgsl/ast/case_selector.h"
+#include "src/tint/lang/wgsl/ast/int_literal_expression.h"
namespace tint::ir {
namespace {
diff --git a/src/tint/lang/glsl/ast_writer/generator.cc b/src/tint/lang/glsl/ast_writer/generator.cc
index 146b386..7db15ba 100644
--- a/src/tint/lang/glsl/ast_writer/generator.cc
+++ b/src/tint/lang/glsl/ast_writer/generator.cc
@@ -14,9 +14,9 @@
#include "src/tint/lang/glsl/ast_writer/generator.h"
-#include "src/tint/ast/transform/binding_remapper.h"
-#include "src/tint/ast/transform/combine_samplers.h"
#include "src/tint/lang/glsl/ast_writer/generator_impl.h"
+#include "src/tint/lang/wgsl/ast/transform/binding_remapper.h"
+#include "src/tint/lang/wgsl/ast/transform/combine_samplers.h"
namespace tint::writer::glsl {
diff --git a/src/tint/lang/glsl/ast_writer/generator.h b/src/tint/lang/glsl/ast_writer/generator.h
index 5e32660..039d75a 100644
--- a/src/tint/lang/glsl/ast_writer/generator.h
+++ b/src/tint/lang/glsl/ast_writer/generator.h
@@ -21,9 +21,9 @@
#include <utility>
#include <vector>
-#include "src/tint/ast/pipeline_stage.h"
#include "src/tint/builtin/access.h"
#include "src/tint/lang/glsl/ast_writer/version.h"
+#include "src/tint/lang/wgsl/ast/pipeline_stage.h"
#include "src/tint/sem/binding_point.h"
#include "src/tint/sem/sampler_texture_pair.h"
#include "src/tint/writer/external_texture_options.h"
diff --git a/src/tint/lang/glsl/ast_writer/generator_bench.cc b/src/tint/lang/glsl/ast_writer/generator_bench.cc
index 07a7cdf..43345fb 100644
--- a/src/tint/lang/glsl/ast_writer/generator_bench.cc
+++ b/src/tint/lang/glsl/ast_writer/generator_bench.cc
@@ -14,9 +14,9 @@
#include <string>
-#include "src/tint/ast/identifier.h"
-#include "src/tint/ast/module.h"
#include "src/tint/bench/benchmark.h"
+#include "src/tint/lang/wgsl/ast/identifier.h"
+#include "src/tint/lang/wgsl/ast/module.h"
namespace tint::writer::glsl {
namespace {
diff --git a/src/tint/lang/glsl/ast_writer/generator_impl.cc b/src/tint/lang/glsl/ast_writer/generator_impl.cc
index d996deb..a877cb4 100644
--- a/src/tint/lang/glsl/ast_writer/generator_impl.cc
+++ b/src/tint/lang/glsl/ast_writer/generator_impl.cc
@@ -22,39 +22,39 @@
#include <utility>
#include <vector>
-#include "src/tint/ast/call_statement.h"
-#include "src/tint/ast/id_attribute.h"
-#include "src/tint/ast/internal_attribute.h"
-#include "src/tint/ast/interpolate_attribute.h"
-#include "src/tint/ast/transform/add_block_attribute.h"
-#include "src/tint/ast/transform/add_empty_entry_point.h"
-#include "src/tint/ast/transform/binding_remapper.h"
-#include "src/tint/ast/transform/builtin_polyfill.h"
-#include "src/tint/ast/transform/canonicalize_entry_point_io.h"
-#include "src/tint/ast/transform/combine_samplers.h"
-#include "src/tint/ast/transform/decompose_memory_access.h"
-#include "src/tint/ast/transform/demote_to_helper.h"
-#include "src/tint/ast/transform/direct_variable_access.h"
-#include "src/tint/ast/transform/disable_uniformity_analysis.h"
-#include "src/tint/ast/transform/expand_compound_assignment.h"
-#include "src/tint/ast/transform/multiplanar_external_texture.h"
-#include "src/tint/ast/transform/pad_structs.h"
-#include "src/tint/ast/transform/preserve_padding.h"
-#include "src/tint/ast/transform/promote_initializers_to_let.h"
-#include "src/tint/ast/transform/promote_side_effects_to_decl.h"
-#include "src/tint/ast/transform/remove_phonies.h"
-#include "src/tint/ast/transform/renamer.h"
-#include "src/tint/ast/transform/robustness.h"
-#include "src/tint/ast/transform/simplify_pointers.h"
-#include "src/tint/ast/transform/single_entry_point.h"
-#include "src/tint/ast/transform/std140.h"
-#include "src/tint/ast/transform/texture_1d_to_2d.h"
-#include "src/tint/ast/transform/unshadow.h"
-#include "src/tint/ast/transform/zero_init_workgroup_memory.h"
-#include "src/tint/ast/variable_decl_statement.h"
#include "src/tint/constant/splat.h"
#include "src/tint/constant/value.h"
#include "src/tint/debug.h"
+#include "src/tint/lang/wgsl/ast/call_statement.h"
+#include "src/tint/lang/wgsl/ast/id_attribute.h"
+#include "src/tint/lang/wgsl/ast/internal_attribute.h"
+#include "src/tint/lang/wgsl/ast/interpolate_attribute.h"
+#include "src/tint/lang/wgsl/ast/transform/add_block_attribute.h"
+#include "src/tint/lang/wgsl/ast/transform/add_empty_entry_point.h"
+#include "src/tint/lang/wgsl/ast/transform/binding_remapper.h"
+#include "src/tint/lang/wgsl/ast/transform/builtin_polyfill.h"
+#include "src/tint/lang/wgsl/ast/transform/canonicalize_entry_point_io.h"
+#include "src/tint/lang/wgsl/ast/transform/combine_samplers.h"
+#include "src/tint/lang/wgsl/ast/transform/decompose_memory_access.h"
+#include "src/tint/lang/wgsl/ast/transform/demote_to_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/direct_variable_access.h"
+#include "src/tint/lang/wgsl/ast/transform/disable_uniformity_analysis.h"
+#include "src/tint/lang/wgsl/ast/transform/expand_compound_assignment.h"
+#include "src/tint/lang/wgsl/ast/transform/multiplanar_external_texture.h"
+#include "src/tint/lang/wgsl/ast/transform/pad_structs.h"
+#include "src/tint/lang/wgsl/ast/transform/preserve_padding.h"
+#include "src/tint/lang/wgsl/ast/transform/promote_initializers_to_let.h"
+#include "src/tint/lang/wgsl/ast/transform/promote_side_effects_to_decl.h"
+#include "src/tint/lang/wgsl/ast/transform/remove_phonies.h"
+#include "src/tint/lang/wgsl/ast/transform/renamer.h"
+#include "src/tint/lang/wgsl/ast/transform/robustness.h"
+#include "src/tint/lang/wgsl/ast/transform/simplify_pointers.h"
+#include "src/tint/lang/wgsl/ast/transform/single_entry_point.h"
+#include "src/tint/lang/wgsl/ast/transform/std140.h"
+#include "src/tint/lang/wgsl/ast/transform/texture_1d_to_2d.h"
+#include "src/tint/lang/wgsl/ast/transform/unshadow.h"
+#include "src/tint/lang/wgsl/ast/transform/zero_init_workgroup_memory.h"
+#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
#include "src/tint/sem/block_statement.h"
#include "src/tint/sem/call.h"
#include "src/tint/sem/function.h"
diff --git a/src/tint/lang/glsl/ast_writer/generator_impl.h b/src/tint/lang/glsl/ast_writer/generator_impl.h
index aa4f87e..91cd6ab 100644
--- a/src/tint/lang/glsl/ast_writer/generator_impl.h
+++ b/src/tint/lang/glsl/ast_writer/generator_impl.h
@@ -21,21 +21,21 @@
#include <unordered_set>
#include <utility>
-#include "src/tint/ast/assignment_statement.h"
-#include "src/tint/ast/bitcast_expression.h"
-#include "src/tint/ast/break_statement.h"
-#include "src/tint/ast/continue_statement.h"
-#include "src/tint/ast/discard_statement.h"
-#include "src/tint/ast/for_loop_statement.h"
-#include "src/tint/ast/if_statement.h"
-#include "src/tint/ast/loop_statement.h"
-#include "src/tint/ast/return_statement.h"
-#include "src/tint/ast/switch_statement.h"
-#include "src/tint/ast/transform/decompose_memory_access.h"
-#include "src/tint/ast/unary_op_expression.h"
#include "src/tint/builtin/builtin_value.h"
#include "src/tint/lang/glsl/ast_writer/generator.h"
#include "src/tint/lang/glsl/ast_writer/version.h"
+#include "src/tint/lang/wgsl/ast/assignment_statement.h"
+#include "src/tint/lang/wgsl/ast/bitcast_expression.h"
+#include "src/tint/lang/wgsl/ast/break_statement.h"
+#include "src/tint/lang/wgsl/ast/continue_statement.h"
+#include "src/tint/lang/wgsl/ast/discard_statement.h"
+#include "src/tint/lang/wgsl/ast/for_loop_statement.h"
+#include "src/tint/lang/wgsl/ast/if_statement.h"
+#include "src/tint/lang/wgsl/ast/loop_statement.h"
+#include "src/tint/lang/wgsl/ast/return_statement.h"
+#include "src/tint/lang/wgsl/ast/switch_statement.h"
+#include "src/tint/lang/wgsl/ast/transform/decompose_memory_access.h"
+#include "src/tint/lang/wgsl/ast/unary_op_expression.h"
#include "src/tint/program_builder.h"
#include "src/tint/scope_stack.h"
#include "src/tint/utils/hash.h"
diff --git a/src/tint/lang/glsl/ast_writer/generator_impl_binary_test.cc b/src/tint/lang/glsl/ast_writer/generator_impl_binary_test.cc
index 0c77852..2afea56 100644
--- a/src/tint/lang/glsl/ast_writer/generator_impl_binary_test.cc
+++ b/src/tint/lang/glsl/ast_writer/generator_impl_binary_test.cc
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/call_statement.h"
-#include "src/tint/ast/variable_decl_statement.h"
#include "src/tint/lang/glsl/ast_writer/test_helper.h"
+#include "src/tint/lang/wgsl/ast/call_statement.h"
+#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
#include "src/tint/utils/string_stream.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/glsl/ast_writer/generator_impl_builtin_test.cc b/src/tint/lang/glsl/ast_writer/generator_impl_builtin_test.cc
index 76c6e97..4ea0f0d 100644
--- a/src/tint/lang/glsl/ast_writer/generator_impl_builtin_test.cc
+++ b/src/tint/lang/glsl/ast_writer/generator_impl_builtin_test.cc
@@ -13,9 +13,9 @@
// limitations under the License.
#include "gmock/gmock.h"
-#include "src/tint/ast/call_statement.h"
-#include "src/tint/ast/stage_attribute.h"
#include "src/tint/lang/glsl/ast_writer/test_helper.h"
+#include "src/tint/lang/wgsl/ast/call_statement.h"
+#include "src/tint/lang/wgsl/ast/stage_attribute.h"
#include "src/tint/sem/call.h"
#include "src/tint/utils/string_stream.h"
diff --git a/src/tint/lang/glsl/ast_writer/generator_impl_builtin_texture_test.cc b/src/tint/lang/glsl/ast_writer/generator_impl_builtin_texture_test.cc
index 41de2eb..f6cdaa0 100644
--- a/src/tint/lang/glsl/ast_writer/generator_impl_builtin_texture_test.cc
+++ b/src/tint/lang/glsl/ast_writer/generator_impl_builtin_texture_test.cc
@@ -13,10 +13,10 @@
// limitations under the License.
#include "gmock/gmock.h"
-#include "src/tint/ast/builtin_texture_helper_test.h"
-#include "src/tint/ast/call_statement.h"
-#include "src/tint/ast/stage_attribute.h"
#include "src/tint/lang/glsl/ast_writer/test_helper.h"
+#include "src/tint/lang/wgsl/ast/builtin_texture_helper_test.h"
+#include "src/tint/lang/wgsl/ast/call_statement.h"
+#include "src/tint/lang/wgsl/ast/stage_attribute.h"
namespace tint::writer::glsl {
namespace {
diff --git a/src/tint/lang/glsl/ast_writer/generator_impl_call_test.cc b/src/tint/lang/glsl/ast_writer/generator_impl_call_test.cc
index 76ed9f0..6c1b548 100644
--- a/src/tint/lang/glsl/ast_writer/generator_impl_call_test.cc
+++ b/src/tint/lang/glsl/ast_writer/generator_impl_call_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/call_statement.h"
#include "src/tint/lang/glsl/ast_writer/test_helper.h"
+#include "src/tint/lang/wgsl/ast/call_statement.h"
#include "src/tint/utils/string_stream.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/glsl/ast_writer/generator_impl_function_test.cc b/src/tint/lang/glsl/ast_writer/generator_impl_function_test.cc
index 7ad94c6..23e91a2 100644
--- a/src/tint/lang/glsl/ast_writer/generator_impl_function_test.cc
+++ b/src/tint/lang/glsl/ast_writer/generator_impl_function_test.cc
@@ -13,10 +13,10 @@
// limitations under the License.
#include "gmock/gmock.h"
-#include "src/tint/ast/stage_attribute.h"
-#include "src/tint/ast/variable_decl_statement.h"
-#include "src/tint/ast/workgroup_attribute.h"
#include "src/tint/lang/glsl/ast_writer/test_helper.h"
+#include "src/tint/lang/wgsl/ast/stage_attribute.h"
+#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
+#include "src/tint/lang/wgsl/ast/workgroup_attribute.h"
using ::testing::HasSubstr;
diff --git a/src/tint/lang/glsl/ast_writer/generator_impl_loop_test.cc b/src/tint/lang/glsl/ast_writer/generator_impl_loop_test.cc
index ac464cf..73b2cad 100644
--- a/src/tint/lang/glsl/ast_writer/generator_impl_loop_test.cc
+++ b/src/tint/lang/glsl/ast_writer/generator_impl_loop_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/variable_decl_statement.h"
#include "src/tint/lang/glsl/ast_writer/test_helper.h"
+#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/glsl/ast_writer/generator_impl_member_accessor_test.cc b/src/tint/lang/glsl/ast_writer/generator_impl_member_accessor_test.cc
index 9bb2ea7..84a1a97 100644
--- a/src/tint/lang/glsl/ast_writer/generator_impl_member_accessor_test.cc
+++ b/src/tint/lang/glsl/ast_writer/generator_impl_member_accessor_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/stage_attribute.h"
#include "src/tint/lang/glsl/ast_writer/test_helper.h"
+#include "src/tint/lang/wgsl/ast/stage_attribute.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/glsl/ast_writer/generator_impl_module_constant_test.cc b/src/tint/lang/glsl/ast_writer/generator_impl_module_constant_test.cc
index 850a3fc..672d359 100644
--- a/src/tint/lang/glsl/ast_writer/generator_impl_module_constant_test.cc
+++ b/src/tint/lang/glsl/ast_writer/generator_impl_module_constant_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/id_attribute.h"
#include "src/tint/lang/glsl/ast_writer/test_helper.h"
+#include "src/tint/lang/wgsl/ast/id_attribute.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/glsl/ast_writer/generator_impl_sanitizer_test.cc b/src/tint/lang/glsl/ast_writer/generator_impl_sanitizer_test.cc
index f087225..8e7df8c 100644
--- a/src/tint/lang/glsl/ast_writer/generator_impl_sanitizer_test.cc
+++ b/src/tint/lang/glsl/ast_writer/generator_impl_sanitizer_test.cc
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/call_statement.h"
-#include "src/tint/ast/stage_attribute.h"
-#include "src/tint/ast/variable_decl_statement.h"
#include "src/tint/lang/glsl/ast_writer/test_helper.h"
+#include "src/tint/lang/wgsl/ast/call_statement.h"
+#include "src/tint/lang/wgsl/ast/stage_attribute.h"
+#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/glsl/ast_writer/generator_impl_type_test.cc b/src/tint/lang/glsl/ast_writer/generator_impl_type_test.cc
index bebadda..7a04894 100644
--- a/src/tint/lang/glsl/ast_writer/generator_impl_type_test.cc
+++ b/src/tint/lang/glsl/ast_writer/generator_impl_type_test.cc
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/call_statement.h"
-#include "src/tint/ast/stage_attribute.h"
#include "src/tint/lang/glsl/ast_writer/test_helper.h"
+#include "src/tint/lang/wgsl/ast/call_statement.h"
+#include "src/tint/lang/wgsl/ast/stage_attribute.h"
#include "src/tint/type/depth_texture.h"
#include "src/tint/type/multisampled_texture.h"
#include "src/tint/type/sampled_texture.h"
diff --git a/src/tint/lang/glsl/ast_writer/generator_impl_variable_decl_statement_test.cc b/src/tint/lang/glsl/ast_writer/generator_impl_variable_decl_statement_test.cc
index 8ff35a7..ce87f7c 100644
--- a/src/tint/lang/glsl/ast_writer/generator_impl_variable_decl_statement_test.cc
+++ b/src/tint/lang/glsl/ast_writer/generator_impl_variable_decl_statement_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/variable_decl_statement.h"
#include "src/tint/lang/glsl/ast_writer/test_helper.h"
+#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/glsl/ast_writer/generator_impl_workgroup_var_test.cc b/src/tint/lang/glsl/ast_writer/generator_impl_workgroup_var_test.cc
index b3a1c35..eb95abb 100644
--- a/src/tint/lang/glsl/ast_writer/generator_impl_workgroup_var_test.cc
+++ b/src/tint/lang/glsl/ast_writer/generator_impl_workgroup_var_test.cc
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/id_attribute.h"
-#include "src/tint/ast/stage_attribute.h"
#include "src/tint/lang/glsl/ast_writer/test_helper.h"
+#include "src/tint/lang/wgsl/ast/id_attribute.h"
+#include "src/tint/lang/wgsl/ast/stage_attribute.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/hlsl/ast_writer/generator.h b/src/tint/lang/hlsl/ast_writer/generator.h
index 7ade099..7f74834 100644
--- a/src/tint/lang/hlsl/ast_writer/generator.h
+++ b/src/tint/lang/hlsl/ast_writer/generator.h
@@ -23,7 +23,7 @@
#include <utility>
#include <vector>
-#include "src/tint/ast/pipeline_stage.h"
+#include "src/tint/lang/wgsl/ast/pipeline_stage.h"
#include "src/tint/reflection.h"
#include "src/tint/sem/binding_point.h"
#include "src/tint/utils/bitset.h"
diff --git a/src/tint/lang/hlsl/ast_writer/generator_impl.cc b/src/tint/lang/hlsl/ast_writer/generator_impl.cc
index 38dcb1e..eb40897 100644
--- a/src/tint/lang/hlsl/ast_writer/generator_impl.cc
+++ b/src/tint/lang/hlsl/ast_writer/generator_impl.cc
@@ -22,38 +22,38 @@
#include <utility>
#include <vector>
-#include "src/tint/ast/call_statement.h"
-#include "src/tint/ast/id_attribute.h"
-#include "src/tint/ast/internal_attribute.h"
-#include "src/tint/ast/interpolate_attribute.h"
-#include "src/tint/ast/transform/add_empty_entry_point.h"
-#include "src/tint/ast/transform/array_length_from_uniform.h"
-#include "src/tint/ast/transform/binding_remapper.h"
-#include "src/tint/ast/transform/builtin_polyfill.h"
-#include "src/tint/ast/transform/calculate_array_length.h"
-#include "src/tint/ast/transform/canonicalize_entry_point_io.h"
-#include "src/tint/ast/transform/decompose_memory_access.h"
-#include "src/tint/ast/transform/demote_to_helper.h"
-#include "src/tint/ast/transform/direct_variable_access.h"
-#include "src/tint/ast/transform/disable_uniformity_analysis.h"
-#include "src/tint/ast/transform/expand_compound_assignment.h"
-#include "src/tint/ast/transform/localize_struct_array_assignment.h"
-#include "src/tint/ast/transform/multiplanar_external_texture.h"
-#include "src/tint/ast/transform/num_workgroups_from_uniform.h"
-#include "src/tint/ast/transform/promote_initializers_to_let.h"
-#include "src/tint/ast/transform/promote_side_effects_to_decl.h"
-#include "src/tint/ast/transform/remove_continue_in_switch.h"
-#include "src/tint/ast/transform/remove_phonies.h"
-#include "src/tint/ast/transform/robustness.h"
-#include "src/tint/ast/transform/simplify_pointers.h"
-#include "src/tint/ast/transform/truncate_interstage_variables.h"
-#include "src/tint/ast/transform/unshadow.h"
-#include "src/tint/ast/transform/vectorize_scalar_matrix_initializers.h"
-#include "src/tint/ast/transform/zero_init_workgroup_memory.h"
-#include "src/tint/ast/variable_decl_statement.h"
#include "src/tint/constant/splat.h"
#include "src/tint/constant/value.h"
#include "src/tint/debug.h"
+#include "src/tint/lang/wgsl/ast/call_statement.h"
+#include "src/tint/lang/wgsl/ast/id_attribute.h"
+#include "src/tint/lang/wgsl/ast/internal_attribute.h"
+#include "src/tint/lang/wgsl/ast/interpolate_attribute.h"
+#include "src/tint/lang/wgsl/ast/transform/add_empty_entry_point.h"
+#include "src/tint/lang/wgsl/ast/transform/array_length_from_uniform.h"
+#include "src/tint/lang/wgsl/ast/transform/binding_remapper.h"
+#include "src/tint/lang/wgsl/ast/transform/builtin_polyfill.h"
+#include "src/tint/lang/wgsl/ast/transform/calculate_array_length.h"
+#include "src/tint/lang/wgsl/ast/transform/canonicalize_entry_point_io.h"
+#include "src/tint/lang/wgsl/ast/transform/decompose_memory_access.h"
+#include "src/tint/lang/wgsl/ast/transform/demote_to_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/direct_variable_access.h"
+#include "src/tint/lang/wgsl/ast/transform/disable_uniformity_analysis.h"
+#include "src/tint/lang/wgsl/ast/transform/expand_compound_assignment.h"
+#include "src/tint/lang/wgsl/ast/transform/localize_struct_array_assignment.h"
+#include "src/tint/lang/wgsl/ast/transform/multiplanar_external_texture.h"
+#include "src/tint/lang/wgsl/ast/transform/num_workgroups_from_uniform.h"
+#include "src/tint/lang/wgsl/ast/transform/promote_initializers_to_let.h"
+#include "src/tint/lang/wgsl/ast/transform/promote_side_effects_to_decl.h"
+#include "src/tint/lang/wgsl/ast/transform/remove_continue_in_switch.h"
+#include "src/tint/lang/wgsl/ast/transform/remove_phonies.h"
+#include "src/tint/lang/wgsl/ast/transform/robustness.h"
+#include "src/tint/lang/wgsl/ast/transform/simplify_pointers.h"
+#include "src/tint/lang/wgsl/ast/transform/truncate_interstage_variables.h"
+#include "src/tint/lang/wgsl/ast/transform/unshadow.h"
+#include "src/tint/lang/wgsl/ast/transform/vectorize_scalar_matrix_initializers.h"
+#include "src/tint/lang/wgsl/ast/transform/zero_init_workgroup_memory.h"
+#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
#include "src/tint/sem/block_statement.h"
#include "src/tint/sem/call.h"
#include "src/tint/sem/function.h"
diff --git a/src/tint/lang/hlsl/ast_writer/generator_impl.h b/src/tint/lang/hlsl/ast_writer/generator_impl.h
index 3e440a0..8e355ff 100644
--- a/src/tint/lang/hlsl/ast_writer/generator_impl.h
+++ b/src/tint/lang/hlsl/ast_writer/generator_impl.h
@@ -21,20 +21,20 @@
#include <unordered_set>
#include <utility>
-#include "src/tint/ast/assignment_statement.h"
-#include "src/tint/ast/bitcast_expression.h"
-#include "src/tint/ast/break_statement.h"
-#include "src/tint/ast/continue_statement.h"
-#include "src/tint/ast/discard_statement.h"
-#include "src/tint/ast/for_loop_statement.h"
-#include "src/tint/ast/if_statement.h"
-#include "src/tint/ast/loop_statement.h"
-#include "src/tint/ast/return_statement.h"
-#include "src/tint/ast/switch_statement.h"
-#include "src/tint/ast/transform/decompose_memory_access.h"
-#include "src/tint/ast/unary_op_expression.h"
#include "src/tint/builtin/builtin_value.h"
#include "src/tint/lang/hlsl/ast_writer/generator.h"
+#include "src/tint/lang/wgsl/ast/assignment_statement.h"
+#include "src/tint/lang/wgsl/ast/bitcast_expression.h"
+#include "src/tint/lang/wgsl/ast/break_statement.h"
+#include "src/tint/lang/wgsl/ast/continue_statement.h"
+#include "src/tint/lang/wgsl/ast/discard_statement.h"
+#include "src/tint/lang/wgsl/ast/for_loop_statement.h"
+#include "src/tint/lang/wgsl/ast/if_statement.h"
+#include "src/tint/lang/wgsl/ast/loop_statement.h"
+#include "src/tint/lang/wgsl/ast/return_statement.h"
+#include "src/tint/lang/wgsl/ast/switch_statement.h"
+#include "src/tint/lang/wgsl/ast/transform/decompose_memory_access.h"
+#include "src/tint/lang/wgsl/ast/unary_op_expression.h"
#include "src/tint/program_builder.h"
#include "src/tint/scope_stack.h"
#include "src/tint/sem/binding_point.h"
diff --git a/src/tint/lang/hlsl/ast_writer/generator_impl_binary_test.cc b/src/tint/lang/hlsl/ast_writer/generator_impl_binary_test.cc
index 9816982..affce16 100644
--- a/src/tint/lang/hlsl/ast_writer/generator_impl_binary_test.cc
+++ b/src/tint/lang/hlsl/ast_writer/generator_impl_binary_test.cc
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/call_statement.h"
-#include "src/tint/ast/variable_decl_statement.h"
#include "src/tint/lang/hlsl/ast_writer/test_helper.h"
+#include "src/tint/lang/wgsl/ast/call_statement.h"
+#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
#include "src/tint/utils/string_stream.h"
namespace tint::writer::hlsl {
diff --git a/src/tint/lang/hlsl/ast_writer/generator_impl_builtin_test.cc b/src/tint/lang/hlsl/ast_writer/generator_impl_builtin_test.cc
index 07bfd35..082c735 100644
--- a/src/tint/lang/hlsl/ast_writer/generator_impl_builtin_test.cc
+++ b/src/tint/lang/hlsl/ast_writer/generator_impl_builtin_test.cc
@@ -13,9 +13,9 @@
// limitations under the License.
#include "gmock/gmock.h"
-#include "src/tint/ast/call_statement.h"
-#include "src/tint/ast/stage_attribute.h"
#include "src/tint/lang/hlsl/ast_writer/test_helper.h"
+#include "src/tint/lang/wgsl/ast/call_statement.h"
+#include "src/tint/lang/wgsl/ast/stage_attribute.h"
#include "src/tint/sem/call.h"
#include "src/tint/utils/string_stream.h"
diff --git a/src/tint/lang/hlsl/ast_writer/generator_impl_builtin_texture_test.cc b/src/tint/lang/hlsl/ast_writer/generator_impl_builtin_texture_test.cc
index 9c7acbd..5e2e59a 100644
--- a/src/tint/lang/hlsl/ast_writer/generator_impl_builtin_texture_test.cc
+++ b/src/tint/lang/hlsl/ast_writer/generator_impl_builtin_texture_test.cc
@@ -13,10 +13,10 @@
// limitations under the License.
#include "gmock/gmock.h"
-#include "src/tint/ast/builtin_texture_helper_test.h"
-#include "src/tint/ast/call_statement.h"
-#include "src/tint/ast/stage_attribute.h"
#include "src/tint/lang/hlsl/ast_writer/test_helper.h"
+#include "src/tint/lang/wgsl/ast/builtin_texture_helper_test.h"
+#include "src/tint/lang/wgsl/ast/call_statement.h"
+#include "src/tint/lang/wgsl/ast/stage_attribute.h"
namespace tint::writer::hlsl {
namespace {
diff --git a/src/tint/lang/hlsl/ast_writer/generator_impl_call_test.cc b/src/tint/lang/hlsl/ast_writer/generator_impl_call_test.cc
index ac266d6..bb9743a 100644
--- a/src/tint/lang/hlsl/ast_writer/generator_impl_call_test.cc
+++ b/src/tint/lang/hlsl/ast_writer/generator_impl_call_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/call_statement.h"
#include "src/tint/lang/hlsl/ast_writer/test_helper.h"
+#include "src/tint/lang/wgsl/ast/call_statement.h"
#include "src/tint/utils/string_stream.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/hlsl/ast_writer/generator_impl_function_test.cc b/src/tint/lang/hlsl/ast_writer/generator_impl_function_test.cc
index b892067..32454e9 100644
--- a/src/tint/lang/hlsl/ast_writer/generator_impl_function_test.cc
+++ b/src/tint/lang/hlsl/ast_writer/generator_impl_function_test.cc
@@ -13,10 +13,10 @@
// limitations under the License.
#include "gmock/gmock.h"
-#include "src/tint/ast/stage_attribute.h"
-#include "src/tint/ast/variable_decl_statement.h"
-#include "src/tint/ast/workgroup_attribute.h"
#include "src/tint/lang/hlsl/ast_writer/test_helper.h"
+#include "src/tint/lang/wgsl/ast/stage_attribute.h"
+#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
+#include "src/tint/lang/wgsl/ast/workgroup_attribute.h"
using ::testing::HasSubstr;
diff --git a/src/tint/lang/hlsl/ast_writer/generator_impl_loop_test.cc b/src/tint/lang/hlsl/ast_writer/generator_impl_loop_test.cc
index 67663e4..cdea5a4 100644
--- a/src/tint/lang/hlsl/ast_writer/generator_impl_loop_test.cc
+++ b/src/tint/lang/hlsl/ast_writer/generator_impl_loop_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/variable_decl_statement.h"
#include "src/tint/lang/hlsl/ast_writer/test_helper.h"
+#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/hlsl/ast_writer/generator_impl_member_accessor_test.cc b/src/tint/lang/hlsl/ast_writer/generator_impl_member_accessor_test.cc
index d6b42c9..755b51d 100644
--- a/src/tint/lang/hlsl/ast_writer/generator_impl_member_accessor_test.cc
+++ b/src/tint/lang/hlsl/ast_writer/generator_impl_member_accessor_test.cc
@@ -13,8 +13,8 @@
// limitations under the License.
#include "gmock/gmock.h"
-#include "src/tint/ast/stage_attribute.h"
#include "src/tint/lang/hlsl/ast_writer/test_helper.h"
+#include "src/tint/lang/wgsl/ast/stage_attribute.h"
using ::testing::HasSubstr;
diff --git a/src/tint/lang/hlsl/ast_writer/generator_impl_module_constant_test.cc b/src/tint/lang/hlsl/ast_writer/generator_impl_module_constant_test.cc
index 96e2da9..a1ee291 100644
--- a/src/tint/lang/hlsl/ast_writer/generator_impl_module_constant_test.cc
+++ b/src/tint/lang/hlsl/ast_writer/generator_impl_module_constant_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/id_attribute.h"
#include "src/tint/lang/hlsl/ast_writer/test_helper.h"
+#include "src/tint/lang/wgsl/ast/id_attribute.h"
namespace tint::writer::hlsl {
namespace {
diff --git a/src/tint/lang/hlsl/ast_writer/generator_impl_sanitizer_test.cc b/src/tint/lang/hlsl/ast_writer/generator_impl_sanitizer_test.cc
index 0ba1d22..d716b6b 100644
--- a/src/tint/lang/hlsl/ast_writer/generator_impl_sanitizer_test.cc
+++ b/src/tint/lang/hlsl/ast_writer/generator_impl_sanitizer_test.cc
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/call_statement.h"
-#include "src/tint/ast/stage_attribute.h"
-#include "src/tint/ast/variable_decl_statement.h"
#include "src/tint/lang/hlsl/ast_writer/test_helper.h"
+#include "src/tint/lang/wgsl/ast/call_statement.h"
+#include "src/tint/lang/wgsl/ast/stage_attribute.h"
+#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
namespace tint::writer::hlsl {
namespace {
diff --git a/src/tint/lang/hlsl/ast_writer/generator_impl_type_test.cc b/src/tint/lang/hlsl/ast_writer/generator_impl_type_test.cc
index b66f8d6..f640f68 100644
--- a/src/tint/lang/hlsl/ast_writer/generator_impl_type_test.cc
+++ b/src/tint/lang/hlsl/ast_writer/generator_impl_type_test.cc
@@ -13,9 +13,9 @@
// limitations under the License.
#include "gmock/gmock.h"
-#include "src/tint/ast/call_statement.h"
-#include "src/tint/ast/stage_attribute.h"
#include "src/tint/lang/hlsl/ast_writer/test_helper.h"
+#include "src/tint/lang/wgsl/ast/call_statement.h"
+#include "src/tint/lang/wgsl/ast/stage_attribute.h"
#include "src/tint/type/depth_texture.h"
#include "src/tint/type/multisampled_texture.h"
#include "src/tint/type/sampled_texture.h"
diff --git a/src/tint/lang/hlsl/ast_writer/generator_impl_variable_decl_statement_test.cc b/src/tint/lang/hlsl/ast_writer/generator_impl_variable_decl_statement_test.cc
index 0a61ec6..b8dfa9f 100644
--- a/src/tint/lang/hlsl/ast_writer/generator_impl_variable_decl_statement_test.cc
+++ b/src/tint/lang/hlsl/ast_writer/generator_impl_variable_decl_statement_test.cc
@@ -13,8 +13,8 @@
// limitations under the License.
#include "gmock/gmock.h"
-#include "src/tint/ast/variable_decl_statement.h"
#include "src/tint/lang/hlsl/ast_writer/test_helper.h"
+#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
namespace tint::writer::hlsl {
namespace {
diff --git a/src/tint/lang/hlsl/ast_writer/generator_impl_workgroup_var_test.cc b/src/tint/lang/hlsl/ast_writer/generator_impl_workgroup_var_test.cc
index 2d28d82..c062375 100644
--- a/src/tint/lang/hlsl/ast_writer/generator_impl_workgroup_var_test.cc
+++ b/src/tint/lang/hlsl/ast_writer/generator_impl_workgroup_var_test.cc
@@ -13,9 +13,9 @@
// limitations under the License.
#include "gmock/gmock.h"
-#include "src/tint/ast/id_attribute.h"
-#include "src/tint/ast/stage_attribute.h"
#include "src/tint/lang/hlsl/ast_writer/test_helper.h"
+#include "src/tint/lang/wgsl/ast/id_attribute.h"
+#include "src/tint/lang/wgsl/ast/stage_attribute.h"
using ::testing::HasSubstr;
diff --git a/src/tint/lang/hlsl/ast_writer/test_helper.h b/src/tint/lang/hlsl/ast_writer/test_helper.h
index 68ac3b2..06d81d8 100644
--- a/src/tint/lang/hlsl/ast_writer/test_helper.h
+++ b/src/tint/lang/hlsl/ast_writer/test_helper.h
@@ -20,9 +20,9 @@
#include <utility>
#include "gtest/gtest.h"
-#include "src/tint/ast/transform/renamer.h"
#include "src/tint/lang/hlsl/ast_writer/generator.h"
#include "src/tint/lang/hlsl/ast_writer/generator_impl.h"
+#include "src/tint/lang/wgsl/ast/transform/renamer.h"
#include "src/tint/transform/manager.h"
namespace tint::writer::hlsl {
diff --git a/src/tint/lang/msl/ast_writer/generator_bench.cc b/src/tint/lang/msl/ast_writer/generator_bench.cc
index 98d5ece..c1478c9 100644
--- a/src/tint/lang/msl/ast_writer/generator_bench.cc
+++ b/src/tint/lang/msl/ast_writer/generator_bench.cc
@@ -14,8 +14,8 @@
#include <string>
-#include "src/tint/ast/module.h"
#include "src/tint/bench/benchmark.h"
+#include "src/tint/lang/wgsl/ast/module.h"
#include "src/tint/sem/variable.h"
namespace tint::writer::msl {
diff --git a/src/tint/lang/msl/ast_writer/generator_impl.cc b/src/tint/lang/msl/ast_writer/generator_impl.cc
index 11f71ca..c82807c 100644
--- a/src/tint/lang/msl/ast_writer/generator_impl.cc
+++ b/src/tint/lang/msl/ast_writer/generator_impl.cc
@@ -21,37 +21,37 @@
#include <utility>
#include <vector>
-#include "src/tint/ast/alias.h"
-#include "src/tint/ast/bool_literal_expression.h"
-#include "src/tint/ast/call_statement.h"
-#include "src/tint/ast/disable_validation_attribute.h"
-#include "src/tint/ast/float_literal_expression.h"
-#include "src/tint/ast/id_attribute.h"
-#include "src/tint/ast/interpolate_attribute.h"
-#include "src/tint/ast/module.h"
-#include "src/tint/ast/transform/array_length_from_uniform.h"
-#include "src/tint/ast/transform/binding_remapper.h"
-#include "src/tint/ast/transform/builtin_polyfill.h"
-#include "src/tint/ast/transform/canonicalize_entry_point_io.h"
-#include "src/tint/ast/transform/demote_to_helper.h"
-#include "src/tint/ast/transform/disable_uniformity_analysis.h"
-#include "src/tint/ast/transform/expand_compound_assignment.h"
-#include "src/tint/ast/transform/module_scope_var_to_entry_point_param.h"
-#include "src/tint/ast/transform/multiplanar_external_texture.h"
-#include "src/tint/ast/transform/packed_vec3.h"
-#include "src/tint/ast/transform/preserve_padding.h"
-#include "src/tint/ast/transform/promote_initializers_to_let.h"
-#include "src/tint/ast/transform/promote_side_effects_to_decl.h"
-#include "src/tint/ast/transform/remove_phonies.h"
-#include "src/tint/ast/transform/robustness.h"
-#include "src/tint/ast/transform/simplify_pointers.h"
-#include "src/tint/ast/transform/unshadow.h"
-#include "src/tint/ast/transform/vectorize_scalar_matrix_initializers.h"
-#include "src/tint/ast/transform/zero_init_workgroup_memory.h"
-#include "src/tint/ast/variable_decl_statement.h"
#include "src/tint/constant/splat.h"
#include "src/tint/constant/value.h"
#include "src/tint/lang/msl/ast_writer/generator_support.h"
+#include "src/tint/lang/wgsl/ast/alias.h"
+#include "src/tint/lang/wgsl/ast/bool_literal_expression.h"
+#include "src/tint/lang/wgsl/ast/call_statement.h"
+#include "src/tint/lang/wgsl/ast/disable_validation_attribute.h"
+#include "src/tint/lang/wgsl/ast/float_literal_expression.h"
+#include "src/tint/lang/wgsl/ast/id_attribute.h"
+#include "src/tint/lang/wgsl/ast/interpolate_attribute.h"
+#include "src/tint/lang/wgsl/ast/module.h"
+#include "src/tint/lang/wgsl/ast/transform/array_length_from_uniform.h"
+#include "src/tint/lang/wgsl/ast/transform/binding_remapper.h"
+#include "src/tint/lang/wgsl/ast/transform/builtin_polyfill.h"
+#include "src/tint/lang/wgsl/ast/transform/canonicalize_entry_point_io.h"
+#include "src/tint/lang/wgsl/ast/transform/demote_to_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/disable_uniformity_analysis.h"
+#include "src/tint/lang/wgsl/ast/transform/expand_compound_assignment.h"
+#include "src/tint/lang/wgsl/ast/transform/module_scope_var_to_entry_point_param.h"
+#include "src/tint/lang/wgsl/ast/transform/multiplanar_external_texture.h"
+#include "src/tint/lang/wgsl/ast/transform/packed_vec3.h"
+#include "src/tint/lang/wgsl/ast/transform/preserve_padding.h"
+#include "src/tint/lang/wgsl/ast/transform/promote_initializers_to_let.h"
+#include "src/tint/lang/wgsl/ast/transform/promote_side_effects_to_decl.h"
+#include "src/tint/lang/wgsl/ast/transform/remove_phonies.h"
+#include "src/tint/lang/wgsl/ast/transform/robustness.h"
+#include "src/tint/lang/wgsl/ast/transform/simplify_pointers.h"
+#include "src/tint/lang/wgsl/ast/transform/unshadow.h"
+#include "src/tint/lang/wgsl/ast/transform/vectorize_scalar_matrix_initializers.h"
+#include "src/tint/lang/wgsl/ast/transform/zero_init_workgroup_memory.h"
+#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
#include "src/tint/sem/call.h"
#include "src/tint/sem/function.h"
#include "src/tint/sem/member_accessor_expression.h"
diff --git a/src/tint/lang/msl/ast_writer/generator_impl.h b/src/tint/lang/msl/ast_writer/generator_impl.h
index 9b691e6..07837c4 100644
--- a/src/tint/lang/msl/ast_writer/generator_impl.h
+++ b/src/tint/lang/msl/ast_writer/generator_impl.h
@@ -21,23 +21,23 @@
#include <unordered_set>
#include <vector>
-#include "src/tint/ast/assignment_statement.h"
-#include "src/tint/ast/binary_expression.h"
-#include "src/tint/ast/bitcast_expression.h"
-#include "src/tint/ast/break_statement.h"
-#include "src/tint/ast/continue_statement.h"
-#include "src/tint/ast/discard_statement.h"
-#include "src/tint/ast/expression.h"
-#include "src/tint/ast/if_statement.h"
-#include "src/tint/ast/index_accessor_expression.h"
-#include "src/tint/ast/interpolate_attribute.h"
-#include "src/tint/ast/loop_statement.h"
-#include "src/tint/ast/member_accessor_expression.h"
-#include "src/tint/ast/return_statement.h"
-#include "src/tint/ast/switch_statement.h"
-#include "src/tint/ast/unary_op_expression.h"
#include "src/tint/builtin/builtin_value.h"
#include "src/tint/lang/msl/ast_writer/generator.h"
+#include "src/tint/lang/wgsl/ast/assignment_statement.h"
+#include "src/tint/lang/wgsl/ast/binary_expression.h"
+#include "src/tint/lang/wgsl/ast/bitcast_expression.h"
+#include "src/tint/lang/wgsl/ast/break_statement.h"
+#include "src/tint/lang/wgsl/ast/continue_statement.h"
+#include "src/tint/lang/wgsl/ast/discard_statement.h"
+#include "src/tint/lang/wgsl/ast/expression.h"
+#include "src/tint/lang/wgsl/ast/if_statement.h"
+#include "src/tint/lang/wgsl/ast/index_accessor_expression.h"
+#include "src/tint/lang/wgsl/ast/interpolate_attribute.h"
+#include "src/tint/lang/wgsl/ast/loop_statement.h"
+#include "src/tint/lang/wgsl/ast/member_accessor_expression.h"
+#include "src/tint/lang/wgsl/ast/return_statement.h"
+#include "src/tint/lang/wgsl/ast/switch_statement.h"
+#include "src/tint/lang/wgsl/ast/unary_op_expression.h"
#include "src/tint/program.h"
#include "src/tint/scope_stack.h"
#include "src/tint/sem/struct.h"
diff --git a/src/tint/lang/msl/ast_writer/generator_impl_builtin_test.cc b/src/tint/lang/msl/ast_writer/generator_impl_builtin_test.cc
index 16aeb79..9305d9a 100644
--- a/src/tint/lang/msl/ast_writer/generator_impl_builtin_test.cc
+++ b/src/tint/lang/msl/ast_writer/generator_impl_builtin_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/call_statement.h"
#include "src/tint/lang/msl/ast_writer/test_helper.h"
+#include "src/tint/lang/wgsl/ast/call_statement.h"
#include "src/tint/sem/call.h"
#include "src/tint/utils/string_stream.h"
diff --git a/src/tint/lang/msl/ast_writer/generator_impl_builtin_texture_test.cc b/src/tint/lang/msl/ast_writer/generator_impl_builtin_texture_test.cc
index 171e217..ded73ba 100644
--- a/src/tint/lang/msl/ast_writer/generator_impl_builtin_texture_test.cc
+++ b/src/tint/lang/msl/ast_writer/generator_impl_builtin_texture_test.cc
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/builtin_texture_helper_test.h"
-#include "src/tint/ast/call_statement.h"
#include "src/tint/lang/msl/ast_writer/test_helper.h"
+#include "src/tint/lang/wgsl/ast/builtin_texture_helper_test.h"
+#include "src/tint/lang/wgsl/ast/call_statement.h"
#include "src/tint/utils/string_stream.h"
namespace tint::writer::msl {
diff --git a/src/tint/lang/msl/ast_writer/generator_impl_call_test.cc b/src/tint/lang/msl/ast_writer/generator_impl_call_test.cc
index fe3fad8..f923738 100644
--- a/src/tint/lang/msl/ast_writer/generator_impl_call_test.cc
+++ b/src/tint/lang/msl/ast_writer/generator_impl_call_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/call_statement.h"
#include "src/tint/lang/msl/ast_writer/test_helper.h"
+#include "src/tint/lang/wgsl/ast/call_statement.h"
#include "src/tint/utils/string_stream.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/msl/ast_writer/generator_impl_function_test.cc b/src/tint/lang/msl/ast_writer/generator_impl_function_test.cc
index c9ac56d..ea07e30 100644
--- a/src/tint/lang/msl/ast_writer/generator_impl_function_test.cc
+++ b/src/tint/lang/msl/ast_writer/generator_impl_function_test.cc
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/stage_attribute.h"
-#include "src/tint/ast/variable_decl_statement.h"
#include "src/tint/lang/msl/ast_writer/test_helper.h"
+#include "src/tint/lang/wgsl/ast/stage_attribute.h"
+#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
namespace tint::writer::msl {
namespace {
diff --git a/src/tint/lang/msl/ast_writer/generator_impl_loop_test.cc b/src/tint/lang/msl/ast_writer/generator_impl_loop_test.cc
index ed3ca24..c314afa 100644
--- a/src/tint/lang/msl/ast_writer/generator_impl_loop_test.cc
+++ b/src/tint/lang/msl/ast_writer/generator_impl_loop_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/variable_decl_statement.h"
#include "src/tint/lang/msl/ast_writer/test_helper.h"
+#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/msl/ast_writer/generator_impl_module_constant_test.cc b/src/tint/lang/msl/ast_writer/generator_impl_module_constant_test.cc
index a831d11..b4b746d 100644
--- a/src/tint/lang/msl/ast_writer/generator_impl_module_constant_test.cc
+++ b/src/tint/lang/msl/ast_writer/generator_impl_module_constant_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/id_attribute.h"
#include "src/tint/lang/msl/ast_writer/test_helper.h"
+#include "src/tint/lang/wgsl/ast/id_attribute.h"
namespace tint::writer::msl {
namespace {
diff --git a/src/tint/lang/msl/ast_writer/generator_impl_sanitizer_test.cc b/src/tint/lang/msl/ast_writer/generator_impl_sanitizer_test.cc
index 6ed2974..dee22b1 100644
--- a/src/tint/lang/msl/ast_writer/generator_impl_sanitizer_test.cc
+++ b/src/tint/lang/msl/ast_writer/generator_impl_sanitizer_test.cc
@@ -13,10 +13,10 @@
// limitations under the License.
#include "gmock/gmock.h"
-#include "src/tint/ast/call_statement.h"
-#include "src/tint/ast/stage_attribute.h"
-#include "src/tint/ast/variable_decl_statement.h"
#include "src/tint/lang/msl/ast_writer/test_helper.h"
+#include "src/tint/lang/wgsl/ast/call_statement.h"
+#include "src/tint/lang/wgsl/ast/stage_attribute.h"
+#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
namespace tint::writer::msl {
namespace {
diff --git a/src/tint/lang/msl/ast_writer/generator_impl_test.cc b/src/tint/lang/msl/ast_writer/generator_impl_test.cc
index e898da1..cd0026a 100644
--- a/src/tint/lang/msl/ast_writer/generator_impl_test.cc
+++ b/src/tint/lang/msl/ast_writer/generator_impl_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/stage_attribute.h"
#include "src/tint/lang/msl/ast_writer/test_helper.h"
+#include "src/tint/lang/wgsl/ast/stage_attribute.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/msl/ast_writer/generator_impl_variable_decl_statement_test.cc b/src/tint/lang/msl/ast_writer/generator_impl_variable_decl_statement_test.cc
index 0432096..e9dab8d 100644
--- a/src/tint/lang/msl/ast_writer/generator_impl_variable_decl_statement_test.cc
+++ b/src/tint/lang/msl/ast_writer/generator_impl_variable_decl_statement_test.cc
@@ -13,8 +13,8 @@
// limitations under the License.
#include "gmock/gmock.h"
-#include "src/tint/ast/variable_decl_statement.h"
#include "src/tint/lang/msl/ast_writer/test_helper.h"
+#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
namespace tint::writer::msl {
namespace {
diff --git a/src/tint/lang/spirv/reader/attributes.h b/src/tint/lang/spirv/reader/attributes.h
index f35ff0f..14aea32 100644
--- a/src/tint/lang/spirv/reader/attributes.h
+++ b/src/tint/lang/spirv/reader/attributes.h
@@ -15,8 +15,8 @@
#ifndef SRC_TINT_LANG_SPIRV_READER_ATTRIBUTES_H_
#define SRC_TINT_LANG_SPIRV_READER_ATTRIBUTES_H_
-#include "src/tint/ast/attribute.h"
#include "src/tint/builtin/builtin_value.h"
+#include "src/tint/lang/wgsl/ast/attribute.h"
#include "src/tint/program_builder.h"
#include "src/tint/utils/enum_set.h"
#include "src/tint/utils/vector.h"
diff --git a/src/tint/lang/spirv/reader/entry_point_info.h b/src/tint/lang/spirv/reader/entry_point_info.h
index b3e69f9..b7ae8da 100644
--- a/src/tint/lang/spirv/reader/entry_point_info.h
+++ b/src/tint/lang/spirv/reader/entry_point_info.h
@@ -17,7 +17,7 @@
#include <string>
-#include "src/tint/ast/pipeline_stage.h"
+#include "src/tint/lang/wgsl/ast/pipeline_stage.h"
#include "src/tint/utils/vector.h"
namespace tint::reader::spirv {
diff --git a/src/tint/lang/spirv/reader/enum_converter.h b/src/tint/lang/spirv/reader/enum_converter.h
index 2d8ff4e..800f6c8 100644
--- a/src/tint/lang/spirv/reader/enum_converter.h
+++ b/src/tint/lang/spirv/reader/enum_converter.h
@@ -17,10 +17,10 @@
#include "spirv/unified1/spirv.h"
#include "spirv/unified1/spirv.hpp11"
-#include "src/tint/ast/pipeline_stage.h"
#include "src/tint/builtin/address_space.h"
#include "src/tint/builtin/builtin_value.h"
#include "src/tint/lang/spirv/reader/fail_stream.h"
+#include "src/tint/lang/wgsl/ast/pipeline_stage.h"
#include "src/tint/type/storage_texture.h"
#include "src/tint/type/texture_dimension.h"
diff --git a/src/tint/lang/spirv/reader/function.cc b/src/tint/lang/spirv/reader/function.cc
index acc5633..601ab60 100644
--- a/src/tint/lang/spirv/reader/function.cc
+++ b/src/tint/lang/spirv/reader/function.cc
@@ -17,23 +17,23 @@
#include <algorithm>
#include <array>
-#include "src/tint/ast/assignment_statement.h"
-#include "src/tint/ast/bitcast_expression.h"
-#include "src/tint/ast/break_statement.h"
-#include "src/tint/ast/builtin_attribute.h"
-#include "src/tint/ast/call_statement.h"
-#include "src/tint/ast/continue_statement.h"
-#include "src/tint/ast/discard_statement.h"
-#include "src/tint/ast/if_statement.h"
-#include "src/tint/ast/loop_statement.h"
-#include "src/tint/ast/return_statement.h"
-#include "src/tint/ast/stage_attribute.h"
-#include "src/tint/ast/switch_statement.h"
-#include "src/tint/ast/transform/spirv_atomic.h"
-#include "src/tint/ast/unary_op_expression.h"
-#include "src/tint/ast/variable_decl_statement.h"
#include "src/tint/builtin/builtin_value.h"
#include "src/tint/builtin/function.h"
+#include "src/tint/lang/wgsl/ast/assignment_statement.h"
+#include "src/tint/lang/wgsl/ast/bitcast_expression.h"
+#include "src/tint/lang/wgsl/ast/break_statement.h"
+#include "src/tint/lang/wgsl/ast/builtin_attribute.h"
+#include "src/tint/lang/wgsl/ast/call_statement.h"
+#include "src/tint/lang/wgsl/ast/continue_statement.h"
+#include "src/tint/lang/wgsl/ast/discard_statement.h"
+#include "src/tint/lang/wgsl/ast/if_statement.h"
+#include "src/tint/lang/wgsl/ast/loop_statement.h"
+#include "src/tint/lang/wgsl/ast/return_statement.h"
+#include "src/tint/lang/wgsl/ast/stage_attribute.h"
+#include "src/tint/lang/wgsl/ast/switch_statement.h"
+#include "src/tint/lang/wgsl/ast/transform/spirv_atomic.h"
+#include "src/tint/lang/wgsl/ast/unary_op_expression.h"
+#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
#include "src/tint/switch.h"
#include "src/tint/type/depth_texture.h"
#include "src/tint/type/sampled_texture.h"
diff --git a/src/tint/lang/spirv/reader/parser.cc b/src/tint/lang/spirv/reader/parser.cc
index 845778e..e4244ea 100644
--- a/src/tint/lang/spirv/reader/parser.cc
+++ b/src/tint/lang/spirv/reader/parser.cc
@@ -16,14 +16,14 @@
#include <utility>
-#include "src/tint/ast/transform/decompose_strided_array.h"
-#include "src/tint/ast/transform/decompose_strided_matrix.h"
-#include "src/tint/ast/transform/fold_trivial_lets.h"
-#include "src/tint/ast/transform/remove_unreachable_statements.h"
-#include "src/tint/ast/transform/simplify_pointers.h"
-#include "src/tint/ast/transform/spirv_atomic.h"
-#include "src/tint/ast/transform/unshadow.h"
#include "src/tint/lang/spirv/reader/parser_impl.h"
+#include "src/tint/lang/wgsl/ast/transform/decompose_strided_array.h"
+#include "src/tint/lang/wgsl/ast/transform/decompose_strided_matrix.h"
+#include "src/tint/lang/wgsl/ast/transform/fold_trivial_lets.h"
+#include "src/tint/lang/wgsl/ast/transform/remove_unreachable_statements.h"
+#include "src/tint/lang/wgsl/ast/transform/simplify_pointers.h"
+#include "src/tint/lang/wgsl/ast/transform/spirv_atomic.h"
+#include "src/tint/lang/wgsl/ast/transform/unshadow.h"
#include "src/tint/transform/manager.h"
namespace tint::reader::spirv {
diff --git a/src/tint/lang/spirv/reader/parser_impl.cc b/src/tint/lang/spirv/reader/parser_impl.cc
index e79499c..f8b82d0c 100644
--- a/src/tint/lang/spirv/reader/parser_impl.cc
+++ b/src/tint/lang/spirv/reader/parser_impl.cc
@@ -20,12 +20,12 @@
#include <utility>
#include "source/opt/build_module.h"
-#include "src/tint/ast/bitcast_expression.h"
-#include "src/tint/ast/disable_validation_attribute.h"
-#include "src/tint/ast/id_attribute.h"
-#include "src/tint/ast/interpolate_attribute.h"
-#include "src/tint/ast/unary_op_expression.h"
#include "src/tint/lang/spirv/reader/function.h"
+#include "src/tint/lang/wgsl/ast/bitcast_expression.h"
+#include "src/tint/lang/wgsl/ast/disable_validation_attribute.h"
+#include "src/tint/lang/wgsl/ast/id_attribute.h"
+#include "src/tint/lang/wgsl/ast/interpolate_attribute.h"
+#include "src/tint/lang/wgsl/ast/unary_op_expression.h"
#include "src/tint/switch.h"
#include "src/tint/type/depth_texture.h"
#include "src/tint/type/multisampled_texture.h"
diff --git a/src/tint/lang/spirv/reader/parser_impl_barrier_test.cc b/src/tint/lang/spirv/reader/parser_impl_barrier_test.cc
index c867b2e..e245fa7 100644
--- a/src/tint/lang/spirv/reader/parser_impl_barrier_test.cc
+++ b/src/tint/lang/spirv/reader/parser_impl_barrier_test.cc
@@ -13,10 +13,10 @@
// limitations under the License.
#include "gmock/gmock.h"
-#include "src/tint/ast/call_statement.h"
#include "src/tint/lang/spirv/reader/function.h"
#include "src/tint/lang/spirv/reader/parser_impl_test_helper.h"
#include "src/tint/lang/spirv/reader/spirv_tools_helpers_test.h"
+#include "src/tint/lang/wgsl/ast/call_statement.h"
#include "src/tint/sem/call.h"
namespace tint::reader::spirv {
diff --git a/src/tint/lang/spirv/reader/parser_type.h b/src/tint/lang/spirv/reader/parser_type.h
index afe7ad2..ee53f117 100644
--- a/src/tint/lang/spirv/reader/parser_type.h
+++ b/src/tint/lang/spirv/reader/parser_type.h
@@ -19,10 +19,10 @@
#include <string>
#include <vector>
-#include "src/tint/ast/type.h"
#include "src/tint/builtin/access.h"
#include "src/tint/builtin/address_space.h"
#include "src/tint/builtin/texel_format.h"
+#include "src/tint/lang/wgsl/ast/type.h"
#include "src/tint/symbol.h"
#include "src/tint/type/sampler_kind.h"
#include "src/tint/type/texture_dimension.h"
diff --git a/src/tint/ast/accessor_expression.cc b/src/tint/lang/wgsl/ast/accessor_expression.cc
similarity index 95%
rename from src/tint/ast/accessor_expression.cc
rename to src/tint/lang/wgsl/ast/accessor_expression.cc
index 6d0a751..cd0130d 100644
--- a/src/tint/ast/accessor_expression.cc
+++ b/src/tint/lang/wgsl/ast/accessor_expression.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/accessor_expression.h"
+#include "src/tint/lang/wgsl/ast/accessor_expression.h"
#include "src/tint/program_builder.h"
diff --git a/src/tint/ast/accessor_expression.h b/src/tint/lang/wgsl/ast/accessor_expression.h
similarity index 85%
rename from src/tint/ast/accessor_expression.h
rename to src/tint/lang/wgsl/ast/accessor_expression.h
index 808ac2f..2551b5e 100644
--- a/src/tint/ast/accessor_expression.h
+++ b/src/tint/lang/wgsl/ast/accessor_expression.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_ACCESSOR_EXPRESSION_H_
-#define SRC_TINT_AST_ACCESSOR_EXPRESSION_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_ACCESSOR_EXPRESSION_H_
+#define SRC_TINT_LANG_WGSL_AST_ACCESSOR_EXPRESSION_H_
-#include "src/tint/ast/expression.h"
+#include "src/tint/lang/wgsl/ast/expression.h"
namespace tint::ast {
@@ -38,4 +38,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_ACCESSOR_EXPRESSION_H_
+#endif // SRC_TINT_LANG_WGSL_AST_ACCESSOR_EXPRESSION_H_
diff --git a/src/tint/ast/alias.cc b/src/tint/lang/wgsl/ast/alias.cc
similarity index 96%
rename from src/tint/ast/alias.cc
rename to src/tint/lang/wgsl/ast/alias.cc
index c878793..7261255 100644
--- a/src/tint/ast/alias.cc
+++ b/src/tint/lang/wgsl/ast/alias.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/alias.h"
+#include "src/tint/lang/wgsl/ast/alias.h"
#include "src/tint/program_builder.h"
diff --git a/src/tint/ast/alias.h b/src/tint/lang/wgsl/ast/alias.h
similarity index 87%
rename from src/tint/ast/alias.h
rename to src/tint/lang/wgsl/ast/alias.h
index 519a878..553f9c9 100644
--- a/src/tint/ast/alias.h
+++ b/src/tint/lang/wgsl/ast/alias.h
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_ALIAS_H_
-#define SRC_TINT_AST_ALIAS_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_ALIAS_H_
+#define SRC_TINT_LANG_WGSL_AST_ALIAS_H_
#include <string>
-#include "src/tint/ast/type.h"
-#include "src/tint/ast/type_decl.h"
+#include "src/tint/lang/wgsl/ast/type.h"
+#include "src/tint/lang/wgsl/ast/type_decl.h"
namespace tint::ast {
@@ -47,4 +47,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_ALIAS_H_
+#endif // SRC_TINT_LANG_WGSL_AST_ALIAS_H_
diff --git a/src/tint/ast/alias_test.cc b/src/tint/lang/wgsl/ast/alias_test.cc
similarity index 90%
rename from src/tint/ast/alias_test.cc
rename to src/tint/lang/wgsl/ast/alias_test.cc
index 8131f65..04c16b8 100644
--- a/src/tint/ast/alias_test.cc
+++ b/src/tint/lang/wgsl/ast/alias_test.cc
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/alias.h"
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/alias.h"
#include "src/tint/builtin/access.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/ast/assignment_statement.cc b/src/tint/lang/wgsl/ast/assignment_statement.cc
similarity index 96%
rename from src/tint/ast/assignment_statement.cc
rename to src/tint/lang/wgsl/ast/assignment_statement.cc
index 0441665..dcb57f9 100644
--- a/src/tint/ast/assignment_statement.cc
+++ b/src/tint/lang/wgsl/ast/assignment_statement.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/assignment_statement.h"
+#include "src/tint/lang/wgsl/ast/assignment_statement.h"
#include "src/tint/program_builder.h"
diff --git a/src/tint/ast/assignment_statement.h b/src/tint/lang/wgsl/ast/assignment_statement.h
similarity index 86%
rename from src/tint/ast/assignment_statement.h
rename to src/tint/lang/wgsl/ast/assignment_statement.h
index 482ec4e..a635987 100644
--- a/src/tint/ast/assignment_statement.h
+++ b/src/tint/lang/wgsl/ast/assignment_statement.h
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_ASSIGNMENT_STATEMENT_H_
-#define SRC_TINT_AST_ASSIGNMENT_STATEMENT_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_ASSIGNMENT_STATEMENT_H_
+#define SRC_TINT_LANG_WGSL_AST_ASSIGNMENT_STATEMENT_H_
-#include "src/tint/ast/expression.h"
-#include "src/tint/ast/statement.h"
+#include "src/tint/lang/wgsl/ast/expression.h"
+#include "src/tint/lang/wgsl/ast/statement.h"
namespace tint::ast {
@@ -53,4 +53,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_ASSIGNMENT_STATEMENT_H_
+#endif // SRC_TINT_LANG_WGSL_AST_ASSIGNMENT_STATEMENT_H_
diff --git a/src/tint/ast/assignment_statement_test.cc b/src/tint/lang/wgsl/ast/assignment_statement_test.cc
similarity index 95%
rename from src/tint/ast/assignment_statement_test.cc
rename to src/tint/lang/wgsl/ast/assignment_statement_test.cc
index 477501b..9785a72 100644
--- a/src/tint/ast/assignment_statement_test.cc
+++ b/src/tint/lang/wgsl/ast/assignment_statement_test.cc
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/assignment_statement.h"
+#include "src/tint/lang/wgsl/ast/assignment_statement.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/ast/attribute.cc b/src/tint/lang/wgsl/ast/attribute.cc
similarity index 93%
rename from src/tint/ast/attribute.cc
rename to src/tint/lang/wgsl/ast/attribute.cc
index 90d0d77..a2238f6 100644
--- a/src/tint/ast/attribute.cc
+++ b/src/tint/lang/wgsl/ast/attribute.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/attribute.h"
+#include "src/tint/lang/wgsl/ast/attribute.h"
TINT_INSTANTIATE_TYPEINFO(tint::ast::Attribute);
diff --git a/src/tint/ast/attribute.h b/src/tint/lang/wgsl/ast/attribute.h
similarity index 91%
rename from src/tint/ast/attribute.h
rename to src/tint/lang/wgsl/ast/attribute.h
index 66c309d..6356bb4 100644
--- a/src/tint/ast/attribute.h
+++ b/src/tint/lang/wgsl/ast/attribute.h
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_ATTRIBUTE_H_
-#define SRC_TINT_AST_ATTRIBUTE_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_ATTRIBUTE_H_
+#define SRC_TINT_LANG_WGSL_AST_ATTRIBUTE_H_
#include <string>
#include <vector>
-#include "src/tint/ast/node.h"
+#include "src/tint/lang/wgsl/ast/node.h"
namespace tint::ast {
@@ -64,4 +64,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_ATTRIBUTE_H_
+#endif // SRC_TINT_LANG_WGSL_AST_ATTRIBUTE_H_
diff --git a/src/tint/ast/binary_expression.cc b/src/tint/lang/wgsl/ast/binary_expression.cc
similarity index 96%
rename from src/tint/ast/binary_expression.cc
rename to src/tint/lang/wgsl/ast/binary_expression.cc
index 6e50f57..2de3b57 100644
--- a/src/tint/ast/binary_expression.cc
+++ b/src/tint/lang/wgsl/ast/binary_expression.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/binary_expression.h"
+#include "src/tint/lang/wgsl/ast/binary_expression.h"
#include "src/tint/program_builder.h"
diff --git a/src/tint/ast/binary_expression.h b/src/tint/lang/wgsl/ast/binary_expression.h
similarity index 97%
rename from src/tint/ast/binary_expression.h
rename to src/tint/lang/wgsl/ast/binary_expression.h
index 0382a9b..12aa167 100644
--- a/src/tint/ast/binary_expression.h
+++ b/src/tint/lang/wgsl/ast/binary_expression.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_BINARY_EXPRESSION_H_
-#define SRC_TINT_AST_BINARY_EXPRESSION_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_BINARY_EXPRESSION_H_
+#define SRC_TINT_LANG_WGSL_AST_BINARY_EXPRESSION_H_
-#include "src/tint/ast/expression.h"
+#include "src/tint/lang/wgsl/ast/expression.h"
namespace tint::ast {
@@ -307,4 +307,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_BINARY_EXPRESSION_H_
+#endif // SRC_TINT_LANG_WGSL_AST_BINARY_EXPRESSION_H_
diff --git a/src/tint/ast/binary_expression_test.cc b/src/tint/lang/wgsl/ast/binary_expression_test.cc
similarity index 97%
rename from src/tint/ast/binary_expression_test.cc
rename to src/tint/lang/wgsl/ast/binary_expression_test.cc
index 18ded61..6385ae1 100644
--- a/src/tint/ast/binary_expression_test.cc
+++ b/src/tint/lang/wgsl/ast/binary_expression_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "gtest/gtest-spi.h"
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/ast/binding_attribute.cc b/src/tint/lang/wgsl/ast/binding_attribute.cc
similarity index 96%
rename from src/tint/ast/binding_attribute.cc
rename to src/tint/lang/wgsl/ast/binding_attribute.cc
index 1b08b28..3f06e95 100644
--- a/src/tint/ast/binding_attribute.cc
+++ b/src/tint/lang/wgsl/ast/binding_attribute.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/binding_attribute.h"
+#include "src/tint/lang/wgsl/ast/binding_attribute.h"
#include <string>
diff --git a/src/tint/ast/binding_attribute.h b/src/tint/lang/wgsl/ast/binding_attribute.h
similarity index 85%
rename from src/tint/ast/binding_attribute.h
rename to src/tint/lang/wgsl/ast/binding_attribute.h
index 37c8224..918674e 100644
--- a/src/tint/ast/binding_attribute.h
+++ b/src/tint/lang/wgsl/ast/binding_attribute.h
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_BINDING_ATTRIBUTE_H_
-#define SRC_TINT_AST_BINDING_ATTRIBUTE_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_BINDING_ATTRIBUTE_H_
+#define SRC_TINT_LANG_WGSL_AST_BINDING_ATTRIBUTE_H_
#include <string>
-#include "src/tint/ast/attribute.h"
-#include "src/tint/ast/expression.h"
+#include "src/tint/lang/wgsl/ast/attribute.h"
+#include "src/tint/lang/wgsl/ast/expression.h"
namespace tint::ast {
@@ -48,4 +48,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_BINDING_ATTRIBUTE_H_
+#endif // SRC_TINT_LANG_WGSL_AST_BINDING_ATTRIBUTE_H_
diff --git a/src/tint/ast/binding_attribute_test.cc b/src/tint/lang/wgsl/ast/binding_attribute_test.cc
similarity index 94%
rename from src/tint/ast/binding_attribute_test.cc
rename to src/tint/lang/wgsl/ast/binding_attribute_test.cc
index 941bd68..02f895c 100644
--- a/src/tint/ast/binding_attribute_test.cc
+++ b/src/tint/lang/wgsl/ast/binding_attribute_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/ast/bitcast_expression.cc b/src/tint/lang/wgsl/ast/bitcast_expression.cc
similarity index 96%
rename from src/tint/ast/bitcast_expression.cc
rename to src/tint/lang/wgsl/ast/bitcast_expression.cc
index 089c659..3480d57 100644
--- a/src/tint/ast/bitcast_expression.cc
+++ b/src/tint/lang/wgsl/ast/bitcast_expression.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/bitcast_expression.h"
+#include "src/tint/lang/wgsl/ast/bitcast_expression.h"
#include "src/tint/program_builder.h"
diff --git a/src/tint/ast/bitcast_expression.h b/src/tint/lang/wgsl/ast/bitcast_expression.h
similarity index 86%
rename from src/tint/ast/bitcast_expression.h
rename to src/tint/lang/wgsl/ast/bitcast_expression.h
index d004ddf..ef2de22 100644
--- a/src/tint/ast/bitcast_expression.h
+++ b/src/tint/lang/wgsl/ast/bitcast_expression.h
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_BITCAST_EXPRESSION_H_
-#define SRC_TINT_AST_BITCAST_EXPRESSION_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_BITCAST_EXPRESSION_H_
+#define SRC_TINT_LANG_WGSL_AST_BITCAST_EXPRESSION_H_
-#include "src/tint/ast/expression.h"
-#include "src/tint/ast/type.h"
+#include "src/tint/lang/wgsl/ast/expression.h"
+#include "src/tint/lang/wgsl/ast/type.h"
namespace tint::ast {
@@ -52,4 +52,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_BITCAST_EXPRESSION_H_
+#endif // SRC_TINT_LANG_WGSL_AST_BITCAST_EXPRESSION_H_
diff --git a/src/tint/ast/bitcast_expression_test.cc b/src/tint/lang/wgsl/ast/bitcast_expression_test.cc
similarity index 94%
rename from src/tint/ast/bitcast_expression_test.cc
rename to src/tint/lang/wgsl/ast/bitcast_expression_test.cc
index ce4ab1d..54df821 100644
--- a/src/tint/ast/bitcast_expression_test.cc
+++ b/src/tint/lang/wgsl/ast/bitcast_expression_test.cc
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/bitcast_expression.h"
+#include "src/tint/lang/wgsl/ast/bitcast_expression.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/ast/block_statement.cc b/src/tint/lang/wgsl/ast/block_statement.cc
similarity index 96%
rename from src/tint/ast/block_statement.cc
rename to src/tint/lang/wgsl/ast/block_statement.cc
index 7c76319..a87d28f 100644
--- a/src/tint/ast/block_statement.cc
+++ b/src/tint/lang/wgsl/ast/block_statement.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/block_statement.h"
+#include "src/tint/lang/wgsl/ast/block_statement.h"
#include "src/tint/program_builder.h"
diff --git a/src/tint/ast/block_statement.h b/src/tint/lang/wgsl/ast/block_statement.h
similarity index 91%
rename from src/tint/ast/block_statement.h
rename to src/tint/lang/wgsl/ast/block_statement.h
index 8582ed3..befb6c7 100644
--- a/src/tint/ast/block_statement.h
+++ b/src/tint/lang/wgsl/ast/block_statement.h
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_BLOCK_STATEMENT_H_
-#define SRC_TINT_AST_BLOCK_STATEMENT_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_BLOCK_STATEMENT_H_
+#define SRC_TINT_LANG_WGSL_AST_BLOCK_STATEMENT_H_
#include <utility>
-#include "src/tint/ast/statement.h"
+#include "src/tint/lang/wgsl/ast/statement.h"
// Forward declarations
namespace tint::ast {
@@ -65,4 +65,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_BLOCK_STATEMENT_H_
+#endif // SRC_TINT_LANG_WGSL_AST_BLOCK_STATEMENT_H_
diff --git a/src/tint/ast/block_statement_test.cc b/src/tint/lang/wgsl/ast/block_statement_test.cc
similarity index 94%
rename from src/tint/ast/block_statement_test.cc
rename to src/tint/lang/wgsl/ast/block_statement_test.cc
index 3037508..d4ec4cf 100644
--- a/src/tint/ast/block_statement_test.cc
+++ b/src/tint/lang/wgsl/ast/block_statement_test.cc
@@ -14,9 +14,9 @@
#include "gmock/gmock.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/ast/discard_statement.h"
-#include "src/tint/ast/if_statement.h"
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/discard_statement.h"
+#include "src/tint/lang/wgsl/ast/if_statement.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/ast/bool_literal_expression.cc b/src/tint/lang/wgsl/ast/bool_literal_expression.cc
similarity index 94%
rename from src/tint/ast/bool_literal_expression.cc
rename to src/tint/lang/wgsl/ast/bool_literal_expression.cc
index 10ab4f0..bf275ea 100644
--- a/src/tint/ast/bool_literal_expression.cc
+++ b/src/tint/lang/wgsl/ast/bool_literal_expression.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/bool_literal_expression.h"
+#include "src/tint/lang/wgsl/ast/bool_literal_expression.h"
#include "src/tint/program_builder.h"
diff --git a/src/tint/ast/bool_literal_expression.h b/src/tint/lang/wgsl/ast/bool_literal_expression.h
similarity index 86%
rename from src/tint/ast/bool_literal_expression.h
rename to src/tint/lang/wgsl/ast/bool_literal_expression.h
index fe509df..eef02fa 100644
--- a/src/tint/ast/bool_literal_expression.h
+++ b/src/tint/lang/wgsl/ast/bool_literal_expression.h
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_BOOL_LITERAL_EXPRESSION_H_
-#define SRC_TINT_AST_BOOL_LITERAL_EXPRESSION_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_BOOL_LITERAL_EXPRESSION_H_
+#define SRC_TINT_LANG_WGSL_AST_BOOL_LITERAL_EXPRESSION_H_
#include <string>
-#include "src/tint/ast/literal_expression.h"
+#include "src/tint/lang/wgsl/ast/literal_expression.h"
namespace tint::ast {
@@ -45,4 +45,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_BOOL_LITERAL_EXPRESSION_H_
+#endif // SRC_TINT_LANG_WGSL_AST_BOOL_LITERAL_EXPRESSION_H_
diff --git a/src/tint/ast/bool_literal_expression_test.cc b/src/tint/lang/wgsl/ast/bool_literal_expression_test.cc
similarity index 95%
rename from src/tint/ast/bool_literal_expression_test.cc
rename to src/tint/lang/wgsl/ast/bool_literal_expression_test.cc
index efaa4ee..134bea9 100644
--- a/src/tint/ast/bool_literal_expression_test.cc
+++ b/src/tint/lang/wgsl/ast/bool_literal_expression_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/ast/break_if_statement.cc b/src/tint/lang/wgsl/ast/break_if_statement.cc
similarity index 96%
rename from src/tint/ast/break_if_statement.cc
rename to src/tint/lang/wgsl/ast/break_if_statement.cc
index dad7beb..ddd0e90 100644
--- a/src/tint/ast/break_if_statement.cc
+++ b/src/tint/lang/wgsl/ast/break_if_statement.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/break_if_statement.h"
+#include "src/tint/lang/wgsl/ast/break_if_statement.h"
#include "src/tint/program_builder.h"
diff --git a/src/tint/ast/break_if_statement.h b/src/tint/lang/wgsl/ast/break_if_statement.h
similarity index 84%
rename from src/tint/ast/break_if_statement.h
rename to src/tint/lang/wgsl/ast/break_if_statement.h
index 56cbabc..c986e90 100644
--- a/src/tint/ast/break_if_statement.h
+++ b/src/tint/lang/wgsl/ast/break_if_statement.h
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_BREAK_IF_STATEMENT_H_
-#define SRC_TINT_AST_BREAK_IF_STATEMENT_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_BREAK_IF_STATEMENT_H_
+#define SRC_TINT_LANG_WGSL_AST_BREAK_IF_STATEMENT_H_
#include <utility>
-#include "src/tint/ast/block_statement.h"
-#include "src/tint/ast/expression.h"
+#include "src/tint/lang/wgsl/ast/block_statement.h"
+#include "src/tint/lang/wgsl/ast/expression.h"
namespace tint::ast {
@@ -46,4 +46,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_BREAK_IF_STATEMENT_H_
+#endif // SRC_TINT_LANG_WGSL_AST_BREAK_IF_STATEMENT_H_
diff --git a/src/tint/ast/break_if_statement_test.cc b/src/tint/lang/wgsl/ast/break_if_statement_test.cc
similarity index 93%
rename from src/tint/ast/break_if_statement_test.cc
rename to src/tint/lang/wgsl/ast/break_if_statement_test.cc
index 1ff37a2..2eb0091 100644
--- a/src/tint/ast/break_if_statement_test.cc
+++ b/src/tint/lang/wgsl/ast/break_if_statement_test.cc
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/break_if_statement.h"
+#include "src/tint/lang/wgsl/ast/break_if_statement.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/ast/break_statement.cc b/src/tint/lang/wgsl/ast/break_statement.cc
similarity index 95%
rename from src/tint/ast/break_statement.cc
rename to src/tint/lang/wgsl/ast/break_statement.cc
index e898d8c..89c8c3a 100644
--- a/src/tint/ast/break_statement.cc
+++ b/src/tint/lang/wgsl/ast/break_statement.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/break_statement.h"
+#include "src/tint/lang/wgsl/ast/break_statement.h"
#include "src/tint/program_builder.h"
diff --git a/src/tint/ast/break_statement.h b/src/tint/lang/wgsl/ast/break_statement.h
similarity index 86%
rename from src/tint/ast/break_statement.h
rename to src/tint/lang/wgsl/ast/break_statement.h
index a22bf03..8d48e02 100644
--- a/src/tint/ast/break_statement.h
+++ b/src/tint/lang/wgsl/ast/break_statement.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_BREAK_STATEMENT_H_
-#define SRC_TINT_AST_BREAK_STATEMENT_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_BREAK_STATEMENT_H_
+#define SRC_TINT_LANG_WGSL_AST_BREAK_STATEMENT_H_
-#include "src/tint/ast/statement.h"
+#include "src/tint/lang/wgsl/ast/statement.h"
namespace tint::ast {
@@ -40,4 +40,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_BREAK_STATEMENT_H_
+#endif // SRC_TINT_LANG_WGSL_AST_BREAK_STATEMENT_H_
diff --git a/src/tint/ast/break_statement_test.cc b/src/tint/lang/wgsl/ast/break_statement_test.cc
similarity index 91%
rename from src/tint/ast/break_statement_test.cc
rename to src/tint/lang/wgsl/ast/break_statement_test.cc
index d2a1043..324d53d 100644
--- a/src/tint/ast/break_statement_test.cc
+++ b/src/tint/lang/wgsl/ast/break_statement_test.cc
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/break_statement.h"
+#include "src/tint/lang/wgsl/ast/break_statement.h"
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/ast/builtin_attribute.cc b/src/tint/lang/wgsl/ast/builtin_attribute.cc
similarity index 96%
rename from src/tint/ast/builtin_attribute.cc
rename to src/tint/lang/wgsl/ast/builtin_attribute.cc
index 44231c0..3b33e6a 100644
--- a/src/tint/ast/builtin_attribute.cc
+++ b/src/tint/lang/wgsl/ast/builtin_attribute.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/builtin_attribute.h"
+#include "src/tint/lang/wgsl/ast/builtin_attribute.h"
#include <string>
diff --git a/src/tint/ast/builtin_attribute.h b/src/tint/lang/wgsl/ast/builtin_attribute.h
similarity index 88%
rename from src/tint/ast/builtin_attribute.h
rename to src/tint/lang/wgsl/ast/builtin_attribute.h
index 8844757..a5157c2 100644
--- a/src/tint/ast/builtin_attribute.h
+++ b/src/tint/lang/wgsl/ast/builtin_attribute.h
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_BUILTIN_ATTRIBUTE_H_
-#define SRC_TINT_AST_BUILTIN_ATTRIBUTE_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_BUILTIN_ATTRIBUTE_H_
+#define SRC_TINT_LANG_WGSL_AST_BUILTIN_ATTRIBUTE_H_
#include <string>
-#include "src/tint/ast/attribute.h"
+#include "src/tint/lang/wgsl/ast/attribute.h"
// Forward declarations
namespace tint::ast {
@@ -52,4 +52,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_BUILTIN_ATTRIBUTE_H_
+#endif // SRC_TINT_LANG_WGSL_AST_BUILTIN_ATTRIBUTE_H_
diff --git a/src/tint/ast/builtin_attribute_test.cc b/src/tint/lang/wgsl/ast/builtin_attribute_test.cc
similarity index 96%
rename from src/tint/ast/builtin_attribute_test.cc
rename to src/tint/lang/wgsl/ast/builtin_attribute_test.cc
index 9c4f871..98254eb 100644
--- a/src/tint/ast/builtin_attribute_test.cc
+++ b/src/tint/lang/wgsl/ast/builtin_attribute_test.cc
@@ -14,8 +14,8 @@
#include "gtest/gtest-spi.h"
-#include "src/tint/ast/test_helper.h"
#include "src/tint/builtin/builtin_value.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/ast/builtin_texture_helper_test.cc b/src/tint/lang/wgsl/ast/builtin_texture_helper_test.cc
similarity index 99%
rename from src/tint/ast/builtin_texture_helper_test.cc
rename to src/tint/lang/wgsl/ast/builtin_texture_helper_test.cc
index 5c548db9..5219e73 100644
--- a/src/tint/ast/builtin_texture_helper_test.cc
+++ b/src/tint/lang/wgsl/ast/builtin_texture_helper_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/builtin_texture_helper_test.h"
+#include "src/tint/lang/wgsl/ast/builtin_texture_helper_test.h"
#include "src/tint/builtin/texel_format.h"
#include "src/tint/type/depth_texture.h"
diff --git a/src/tint/ast/builtin_texture_helper_test.h b/src/tint/lang/wgsl/ast/builtin_texture_helper_test.h
similarity index 97%
rename from src/tint/ast/builtin_texture_helper_test.h
rename to src/tint/lang/wgsl/ast/builtin_texture_helper_test.h
index 2a448a5..a928835 100644
--- a/src/tint/ast/builtin_texture_helper_test.h
+++ b/src/tint/lang/wgsl/ast/builtin_texture_helper_test.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_BUILTIN_TEXTURE_HELPER_TEST_H_
-#define SRC_TINT_AST_BUILTIN_TEXTURE_HELPER_TEST_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_BUILTIN_TEXTURE_HELPER_TEST_H_
+#define SRC_TINT_LANG_WGSL_AST_BUILTIN_TEXTURE_HELPER_TEST_H_
#include <vector>
@@ -270,4 +270,4 @@
} // namespace tint::ast::test
-#endif // SRC_TINT_AST_BUILTIN_TEXTURE_HELPER_TEST_H_
+#endif // SRC_TINT_LANG_WGSL_AST_BUILTIN_TEXTURE_HELPER_TEST_H_
diff --git a/src/tint/ast/call_expression.cc b/src/tint/lang/wgsl/ast/call_expression.cc
similarity index 96%
rename from src/tint/ast/call_expression.cc
rename to src/tint/lang/wgsl/ast/call_expression.cc
index 2e49c5f..5f2663a 100644
--- a/src/tint/ast/call_expression.cc
+++ b/src/tint/lang/wgsl/ast/call_expression.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/call_expression.h"
+#include "src/tint/lang/wgsl/ast/call_expression.h"
#include <utility>
diff --git a/src/tint/ast/call_expression.h b/src/tint/lang/wgsl/ast/call_expression.h
similarity index 90%
rename from src/tint/ast/call_expression.h
rename to src/tint/lang/wgsl/ast/call_expression.h
index 8ad4cf1..ee76612 100644
--- a/src/tint/ast/call_expression.h
+++ b/src/tint/lang/wgsl/ast/call_expression.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_CALL_EXPRESSION_H_
-#define SRC_TINT_AST_CALL_EXPRESSION_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_CALL_EXPRESSION_H_
+#define SRC_TINT_LANG_WGSL_AST_CALL_EXPRESSION_H_
-#include "src/tint/ast/expression.h"
+#include "src/tint/lang/wgsl/ast/expression.h"
// Forward declarations
namespace tint::ast {
@@ -61,4 +61,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_CALL_EXPRESSION_H_
+#endif // SRC_TINT_LANG_WGSL_AST_CALL_EXPRESSION_H_
diff --git a/src/tint/ast/call_expression_test.cc b/src/tint/lang/wgsl/ast/call_expression_test.cc
similarity index 98%
rename from src/tint/ast/call_expression_test.cc
rename to src/tint/lang/wgsl/ast/call_expression_test.cc
index 6a6ee29..c9117ee 100644
--- a/src/tint/ast/call_expression_test.cc
+++ b/src/tint/lang/wgsl/ast/call_expression_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "gtest/gtest-spi.h"
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/ast/call_statement.cc b/src/tint/lang/wgsl/ast/call_statement.cc
similarity index 96%
rename from src/tint/ast/call_statement.cc
rename to src/tint/lang/wgsl/ast/call_statement.cc
index 89772dc..4ae4d64 100644
--- a/src/tint/ast/call_statement.cc
+++ b/src/tint/lang/wgsl/ast/call_statement.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/call_statement.h"
+#include "src/tint/lang/wgsl/ast/call_statement.h"
#include "src/tint/program_builder.h"
diff --git a/src/tint/ast/call_statement.h b/src/tint/lang/wgsl/ast/call_statement.h
similarity index 85%
rename from src/tint/ast/call_statement.h
rename to src/tint/lang/wgsl/ast/call_statement.h
index ec561a1..fd0c3e7 100644
--- a/src/tint/ast/call_statement.h
+++ b/src/tint/lang/wgsl/ast/call_statement.h
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_CALL_STATEMENT_H_
-#define SRC_TINT_AST_CALL_STATEMENT_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_CALL_STATEMENT_H_
+#define SRC_TINT_LANG_WGSL_AST_CALL_STATEMENT_H_
-#include "src/tint/ast/call_expression.h"
-#include "src/tint/ast/statement.h"
+#include "src/tint/lang/wgsl/ast/call_expression.h"
+#include "src/tint/lang/wgsl/ast/statement.h"
namespace tint::ast {
@@ -45,4 +45,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_CALL_STATEMENT_H_
+#endif // SRC_TINT_LANG_WGSL_AST_CALL_STATEMENT_H_
diff --git a/src/tint/ast/call_statement_test.cc b/src/tint/lang/wgsl/ast/call_statement_test.cc
similarity index 93%
rename from src/tint/ast/call_statement_test.cc
rename to src/tint/lang/wgsl/ast/call_statement_test.cc
index a185911..bcf3002 100644
--- a/src/tint/ast/call_statement_test.cc
+++ b/src/tint/lang/wgsl/ast/call_statement_test.cc
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/call_statement.h"
+#include "src/tint/lang/wgsl/ast/call_statement.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/ast/case_selector.cc b/src/tint/lang/wgsl/ast/case_selector.cc
similarity index 95%
rename from src/tint/ast/case_selector.cc
rename to src/tint/lang/wgsl/ast/case_selector.cc
index a7f1446..2ba540e 100644
--- a/src/tint/ast/case_selector.cc
+++ b/src/tint/lang/wgsl/ast/case_selector.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/case_selector.h"
+#include "src/tint/lang/wgsl/ast/case_selector.h"
#include <utility>
diff --git a/src/tint/ast/case_selector.h b/src/tint/lang/wgsl/ast/case_selector.h
similarity index 86%
rename from src/tint/ast/case_selector.h
rename to src/tint/lang/wgsl/ast/case_selector.h
index e381557..b91dce9 100644
--- a/src/tint/ast/case_selector.h
+++ b/src/tint/lang/wgsl/ast/case_selector.h
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_CASE_SELECTOR_H_
-#define SRC_TINT_AST_CASE_SELECTOR_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_CASE_SELECTOR_H_
+#define SRC_TINT_LANG_WGSL_AST_CASE_SELECTOR_H_
#include <vector>
-#include "src/tint/ast/block_statement.h"
-#include "src/tint/ast/expression.h"
+#include "src/tint/lang/wgsl/ast/block_statement.h"
+#include "src/tint/lang/wgsl/ast/expression.h"
namespace tint::ast {
@@ -49,4 +49,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_CASE_SELECTOR_H_
+#endif // SRC_TINT_LANG_WGSL_AST_CASE_SELECTOR_H_
diff --git a/src/tint/ast/case_selector_test.cc b/src/tint/lang/wgsl/ast/case_selector_test.cc
similarity index 91%
rename from src/tint/ast/case_selector_test.cc
rename to src/tint/lang/wgsl/ast/case_selector_test.cc
index 16e74cc..9b5e36e 100644
--- a/src/tint/ast/case_selector_test.cc
+++ b/src/tint/lang/wgsl/ast/case_selector_test.cc
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/case_selector.h"
+#include "src/tint/lang/wgsl/ast/case_selector.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/ast/case_statement.cc b/src/tint/lang/wgsl/ast/case_statement.cc
similarity index 97%
rename from src/tint/ast/case_statement.cc
rename to src/tint/lang/wgsl/ast/case_statement.cc
index b7e6970..16e66b2 100644
--- a/src/tint/ast/case_statement.cc
+++ b/src/tint/lang/wgsl/ast/case_statement.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/case_statement.h"
+#include "src/tint/lang/wgsl/ast/case_statement.h"
#include <utility>
diff --git a/src/tint/ast/case_statement.h b/src/tint/lang/wgsl/ast/case_statement.h
similarity index 87%
rename from src/tint/ast/case_statement.h
rename to src/tint/lang/wgsl/ast/case_statement.h
index fd0d18d..026e14b 100644
--- a/src/tint/ast/case_statement.h
+++ b/src/tint/lang/wgsl/ast/case_statement.h
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_CASE_STATEMENT_H_
-#define SRC_TINT_AST_CASE_STATEMENT_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_CASE_STATEMENT_H_
+#define SRC_TINT_LANG_WGSL_AST_CASE_STATEMENT_H_
#include <vector>
-#include "src/tint/ast/block_statement.h"
-#include "src/tint/ast/case_selector.h"
+#include "src/tint/lang/wgsl/ast/block_statement.h"
+#include "src/tint/lang/wgsl/ast/case_selector.h"
namespace tint::ast {
@@ -58,4 +58,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_CASE_STATEMENT_H_
+#endif // SRC_TINT_LANG_WGSL_AST_CASE_STATEMENT_H_
diff --git a/src/tint/ast/case_statement_test.cc b/src/tint/lang/wgsl/ast/case_statement_test.cc
similarity index 95%
rename from src/tint/ast/case_statement_test.cc
rename to src/tint/lang/wgsl/ast/case_statement_test.cc
index af0fb33..4ef5471 100644
--- a/src/tint/ast/case_statement_test.cc
+++ b/src/tint/lang/wgsl/ast/case_statement_test.cc
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/case_statement.h"
+#include "src/tint/lang/wgsl/ast/case_statement.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/ast/discard_statement.h"
-#include "src/tint/ast/if_statement.h"
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/discard_statement.h"
+#include "src/tint/lang/wgsl/ast/if_statement.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/ast/compound_assignment_statement.cc b/src/tint/lang/wgsl/ast/compound_assignment_statement.cc
similarity index 96%
rename from src/tint/ast/compound_assignment_statement.cc
rename to src/tint/lang/wgsl/ast/compound_assignment_statement.cc
index fc9d300..c516a5b 100644
--- a/src/tint/ast/compound_assignment_statement.cc
+++ b/src/tint/lang/wgsl/ast/compound_assignment_statement.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/compound_assignment_statement.h"
+#include "src/tint/lang/wgsl/ast/compound_assignment_statement.h"
#include "src/tint/program_builder.h"
diff --git a/src/tint/ast/compound_assignment_statement.h b/src/tint/lang/wgsl/ast/compound_assignment_statement.h
similarity index 84%
rename from src/tint/ast/compound_assignment_statement.h
rename to src/tint/lang/wgsl/ast/compound_assignment_statement.h
index f23af15..c59e5e7 100644
--- a/src/tint/ast/compound_assignment_statement.h
+++ b/src/tint/lang/wgsl/ast/compound_assignment_statement.h
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_COMPOUND_ASSIGNMENT_STATEMENT_H_
-#define SRC_TINT_AST_COMPOUND_ASSIGNMENT_STATEMENT_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_COMPOUND_ASSIGNMENT_STATEMENT_H_
+#define SRC_TINT_LANG_WGSL_AST_COMPOUND_ASSIGNMENT_STATEMENT_H_
-#include "src/tint/ast/binary_expression.h"
-#include "src/tint/ast/expression.h"
-#include "src/tint/ast/statement.h"
+#include "src/tint/lang/wgsl/ast/binary_expression.h"
+#include "src/tint/lang/wgsl/ast/expression.h"
+#include "src/tint/lang/wgsl/ast/statement.h"
namespace tint::ast {
@@ -60,4 +60,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_COMPOUND_ASSIGNMENT_STATEMENT_H_
+#endif // SRC_TINT_LANG_WGSL_AST_COMPOUND_ASSIGNMENT_STATEMENT_H_
diff --git a/src/tint/ast/compound_assignment_statement_test.cc b/src/tint/lang/wgsl/ast/compound_assignment_statement_test.cc
similarity index 95%
rename from src/tint/ast/compound_assignment_statement_test.cc
rename to src/tint/lang/wgsl/ast/compound_assignment_statement_test.cc
index 7560889..2595c6a 100644
--- a/src/tint/ast/compound_assignment_statement_test.cc
+++ b/src/tint/lang/wgsl/ast/compound_assignment_statement_test.cc
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/compound_assignment_statement.h"
+#include "src/tint/lang/wgsl/ast/compound_assignment_statement.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/ast/const.cc b/src/tint/lang/wgsl/ast/const.cc
similarity index 96%
rename from src/tint/ast/const.cc
rename to src/tint/lang/wgsl/ast/const.cc
index 967f5f1..6d51d22 100644
--- a/src/tint/ast/const.cc
+++ b/src/tint/lang/wgsl/ast/const.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/const.h"
+#include "src/tint/lang/wgsl/ast/const.h"
#include <utility>
diff --git a/src/tint/ast/const.h b/src/tint/lang/wgsl/ast/const.h
similarity index 92%
rename from src/tint/ast/const.h
rename to src/tint/lang/wgsl/ast/const.h
index b008015..66c7882 100644
--- a/src/tint/ast/const.h
+++ b/src/tint/lang/wgsl/ast/const.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_CONST_H_
-#define SRC_TINT_AST_CONST_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_CONST_H_
+#define SRC_TINT_LANG_WGSL_AST_CONST_H_
-#include "src/tint/ast/variable.h"
+#include "src/tint/lang/wgsl/ast/variable.h"
namespace tint::ast {
@@ -63,4 +63,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_CONST_H_
+#endif // SRC_TINT_LANG_WGSL_AST_CONST_H_
diff --git a/src/tint/ast/const_assert.cc b/src/tint/lang/wgsl/ast/const_assert.cc
similarity index 96%
rename from src/tint/ast/const_assert.cc
rename to src/tint/lang/wgsl/ast/const_assert.cc
index 0dcdc16..3a60f40 100644
--- a/src/tint/ast/const_assert.cc
+++ b/src/tint/lang/wgsl/ast/const_assert.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/const_assert.h"
+#include "src/tint/lang/wgsl/ast/const_assert.h"
#include "src/tint/program_builder.h"
diff --git a/src/tint/ast/const_assert.h b/src/tint/lang/wgsl/ast/const_assert.h
similarity index 85%
rename from src/tint/ast/const_assert.h
rename to src/tint/lang/wgsl/ast/const_assert.h
index 8de59e3..a799093 100644
--- a/src/tint/ast/const_assert.h
+++ b/src/tint/lang/wgsl/ast/const_assert.h
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_CONST_ASSERT_H_
-#define SRC_TINT_AST_CONST_ASSERT_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_CONST_ASSERT_H_
+#define SRC_TINT_LANG_WGSL_AST_CONST_ASSERT_H_
-#include "src/tint/ast/statement.h"
-#include "src/tint/ast/variable.h"
+#include "src/tint/lang/wgsl/ast/statement.h"
+#include "src/tint/lang/wgsl/ast/variable.h"
namespace tint::ast {
@@ -44,4 +44,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_CONST_ASSERT_H_
+#endif // SRC_TINT_LANG_WGSL_AST_CONST_ASSERT_H_
diff --git a/src/tint/ast/const_assert_test.cc b/src/tint/lang/wgsl/ast/const_assert_test.cc
similarity index 94%
rename from src/tint/ast/const_assert_test.cc
rename to src/tint/lang/wgsl/ast/const_assert_test.cc
index ec938b7..b43cf61 100644
--- a/src/tint/ast/const_assert_test.cc
+++ b/src/tint/lang/wgsl/ast/const_assert_test.cc
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/const_assert.h"
+#include "src/tint/lang/wgsl/ast/const_assert.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/ast/continue_statement.cc b/src/tint/lang/wgsl/ast/continue_statement.cc
similarity index 95%
rename from src/tint/ast/continue_statement.cc
rename to src/tint/lang/wgsl/ast/continue_statement.cc
index a7868e8..4b8d92b 100644
--- a/src/tint/ast/continue_statement.cc
+++ b/src/tint/lang/wgsl/ast/continue_statement.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/continue_statement.h"
+#include "src/tint/lang/wgsl/ast/continue_statement.h"
#include "src/tint/program_builder.h"
diff --git a/src/tint/ast/continue_statement.h b/src/tint/lang/wgsl/ast/continue_statement.h
similarity index 86%
rename from src/tint/ast/continue_statement.h
rename to src/tint/lang/wgsl/ast/continue_statement.h
index 338a26e..3b1201c 100644
--- a/src/tint/ast/continue_statement.h
+++ b/src/tint/lang/wgsl/ast/continue_statement.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_CONTINUE_STATEMENT_H_
-#define SRC_TINT_AST_CONTINUE_STATEMENT_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_CONTINUE_STATEMENT_H_
+#define SRC_TINT_LANG_WGSL_AST_CONTINUE_STATEMENT_H_
-#include "src/tint/ast/statement.h"
+#include "src/tint/lang/wgsl/ast/statement.h"
namespace tint::ast {
@@ -40,4 +40,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_CONTINUE_STATEMENT_H_
+#endif // SRC_TINT_LANG_WGSL_AST_CONTINUE_STATEMENT_H_
diff --git a/src/tint/ast/continue_statement_test.cc b/src/tint/lang/wgsl/ast/continue_statement_test.cc
similarity index 91%
rename from src/tint/ast/continue_statement_test.cc
rename to src/tint/lang/wgsl/ast/continue_statement_test.cc
index 31cabdd..6e9a1e7 100644
--- a/src/tint/ast/continue_statement_test.cc
+++ b/src/tint/lang/wgsl/ast/continue_statement_test.cc
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/continue_statement.h"
+#include "src/tint/lang/wgsl/ast/continue_statement.h"
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/ast/diagnostic_attribute.cc b/src/tint/lang/wgsl/ast/diagnostic_attribute.cc
similarity index 96%
rename from src/tint/ast/diagnostic_attribute.cc
rename to src/tint/lang/wgsl/ast/diagnostic_attribute.cc
index d93cc3a..0e3ce31 100644
--- a/src/tint/ast/diagnostic_attribute.cc
+++ b/src/tint/lang/wgsl/ast/diagnostic_attribute.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/diagnostic_attribute.h"
+#include "src/tint/lang/wgsl/ast/diagnostic_attribute.h"
#include <string>
#include <utility>
diff --git a/src/tint/ast/diagnostic_attribute.h b/src/tint/lang/wgsl/ast/diagnostic_attribute.h
similarity index 84%
rename from src/tint/ast/diagnostic_attribute.h
rename to src/tint/lang/wgsl/ast/diagnostic_attribute.h
index fa63f83..38fbe23 100644
--- a/src/tint/ast/diagnostic_attribute.h
+++ b/src/tint/lang/wgsl/ast/diagnostic_attribute.h
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_DIAGNOSTIC_ATTRIBUTE_H_
-#define SRC_TINT_AST_DIAGNOSTIC_ATTRIBUTE_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_DIAGNOSTIC_ATTRIBUTE_H_
+#define SRC_TINT_LANG_WGSL_AST_DIAGNOSTIC_ATTRIBUTE_H_
#include <string>
-#include "src/tint/ast/attribute.h"
-#include "src/tint/ast/diagnostic_control.h"
+#include "src/tint/lang/wgsl/ast/attribute.h"
+#include "src/tint/lang/wgsl/ast/diagnostic_control.h"
namespace tint::ast {
@@ -47,4 +47,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_DIAGNOSTIC_ATTRIBUTE_H_
+#endif // SRC_TINT_LANG_WGSL_AST_DIAGNOSTIC_ATTRIBUTE_H_
diff --git a/src/tint/ast/diagnostic_attribute_test.cc b/src/tint/lang/wgsl/ast/diagnostic_attribute_test.cc
similarity index 96%
rename from src/tint/ast/diagnostic_attribute_test.cc
rename to src/tint/lang/wgsl/ast/diagnostic_attribute_test.cc
index a77c025..49de81c 100644
--- a/src/tint/ast/diagnostic_attribute_test.cc
+++ b/src/tint/lang/wgsl/ast/diagnostic_attribute_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/ast/diagnostic_control.cc b/src/tint/lang/wgsl/ast/diagnostic_control.cc
similarity index 86%
rename from src/tint/ast/diagnostic_control.cc
rename to src/tint/lang/wgsl/ast/diagnostic_control.cc
index 27ec3c1..fdae705 100644
--- a/src/tint/ast/diagnostic_control.cc
+++ b/src/tint/lang/wgsl/ast/diagnostic_control.cc
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/diagnostic_control.h"
+#include "src/tint/lang/wgsl/ast/diagnostic_control.h"
#include <string>
-#include "src/tint/ast/identifier.h"
-#include "src/tint/ast/templated_identifier.h"
#include "src/tint/builtin/diagnostic_severity.h"
+#include "src/tint/lang/wgsl/ast/identifier.h"
+#include "src/tint/lang/wgsl/ast/templated_identifier.h"
namespace tint::ast {
diff --git a/src/tint/ast/diagnostic_control.h b/src/tint/lang/wgsl/ast/diagnostic_control.h
similarity index 90%
rename from src/tint/ast/diagnostic_control.h
rename to src/tint/lang/wgsl/ast/diagnostic_control.h
index 2b504e4..5b5bcf8 100644
--- a/src/tint/ast/diagnostic_control.h
+++ b/src/tint/lang/wgsl/ast/diagnostic_control.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_DIAGNOSTIC_CONTROL_H_
-#define SRC_TINT_AST_DIAGNOSTIC_CONTROL_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_DIAGNOSTIC_CONTROL_H_
+#define SRC_TINT_LANG_WGSL_AST_DIAGNOSTIC_CONTROL_H_
#include <string>
#include <unordered_map>
@@ -51,4 +51,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_DIAGNOSTIC_CONTROL_H_
+#endif // SRC_TINT_LANG_WGSL_AST_DIAGNOSTIC_CONTROL_H_
diff --git a/src/tint/ast/diagnostic_control_test.cc b/src/tint/lang/wgsl/ast/diagnostic_control_test.cc
similarity index 90%
rename from src/tint/ast/diagnostic_control_test.cc
rename to src/tint/lang/wgsl/ast/diagnostic_control_test.cc
index d118677..74e855d 100644
--- a/src/tint/ast/diagnostic_control_test.cc
+++ b/src/tint/lang/wgsl/ast/diagnostic_control_test.cc
@@ -15,9 +15,9 @@
#include <string>
#include "gtest/gtest-spi.h"
-#include "src/tint/ast/diagnostic_control.h"
-#include "src/tint/ast/test_helper.h"
#include "src/tint/builtin/diagnostic_severity.h"
+#include "src/tint/lang/wgsl/ast/diagnostic_control.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/ast/diagnostic_directive.cc b/src/tint/lang/wgsl/ast/diagnostic_directive.cc
similarity index 95%
rename from src/tint/ast/diagnostic_directive.cc
rename to src/tint/lang/wgsl/ast/diagnostic_directive.cc
index 8783901..d2cceff 100644
--- a/src/tint/ast/diagnostic_directive.cc
+++ b/src/tint/lang/wgsl/ast/diagnostic_directive.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/diagnostic_directive.h"
+#include "src/tint/lang/wgsl/ast/diagnostic_directive.h"
#include "src/tint/program_builder.h"
diff --git a/src/tint/ast/diagnostic_directive.h b/src/tint/lang/wgsl/ast/diagnostic_directive.h
similarity index 86%
rename from src/tint/ast/diagnostic_directive.h
rename to src/tint/lang/wgsl/ast/diagnostic_directive.h
index b944384..5a917d9 100644
--- a/src/tint/ast/diagnostic_directive.h
+++ b/src/tint/lang/wgsl/ast/diagnostic_directive.h
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_DIAGNOSTIC_DIRECTIVE_H_
-#define SRC_TINT_AST_DIAGNOSTIC_DIRECTIVE_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_DIAGNOSTIC_DIRECTIVE_H_
+#define SRC_TINT_LANG_WGSL_AST_DIAGNOSTIC_DIRECTIVE_H_
#include <string>
#include <utility>
#include <vector>
-#include "src/tint/ast/diagnostic_control.h"
-#include "src/tint/ast/node.h"
+#include "src/tint/lang/wgsl/ast/diagnostic_control.h"
+#include "src/tint/lang/wgsl/ast/node.h"
namespace tint::ast {
@@ -52,4 +52,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_DIAGNOSTIC_DIRECTIVE_H_
+#endif // SRC_TINT_LANG_WGSL_AST_DIAGNOSTIC_DIRECTIVE_H_
diff --git a/src/tint/ast/diagnostic_directive_test.cc b/src/tint/lang/wgsl/ast/diagnostic_directive_test.cc
similarity index 94%
rename from src/tint/ast/diagnostic_directive_test.cc
rename to src/tint/lang/wgsl/ast/diagnostic_directive_test.cc
index c423ae9..009edb0 100644
--- a/src/tint/ast/diagnostic_directive_test.cc
+++ b/src/tint/lang/wgsl/ast/diagnostic_directive_test.cc
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/diagnostic_directive.h"
+#include "src/tint/lang/wgsl/ast/diagnostic_directive.h"
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/ast/diagnostic_rule_name.cc b/src/tint/lang/wgsl/ast/diagnostic_rule_name.cc
similarity index 97%
rename from src/tint/ast/diagnostic_rule_name.cc
rename to src/tint/lang/wgsl/ast/diagnostic_rule_name.cc
index 856e054..d0994c9 100644
--- a/src/tint/ast/diagnostic_rule_name.cc
+++ b/src/tint/lang/wgsl/ast/diagnostic_rule_name.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/diagnostic_rule_name.h"
+#include "src/tint/lang/wgsl/ast/diagnostic_rule_name.h"
#include <string>
diff --git a/src/tint/ast/diagnostic_rule_name.h b/src/tint/lang/wgsl/ast/diagnostic_rule_name.h
similarity index 91%
rename from src/tint/ast/diagnostic_rule_name.h
rename to src/tint/lang/wgsl/ast/diagnostic_rule_name.h
index a3d1189..b8692f9 100644
--- a/src/tint/ast/diagnostic_rule_name.h
+++ b/src/tint/lang/wgsl/ast/diagnostic_rule_name.h
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_DIAGNOSTIC_RULE_NAME_H_
-#define SRC_TINT_AST_DIAGNOSTIC_RULE_NAME_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_DIAGNOSTIC_RULE_NAME_H_
+#define SRC_TINT_LANG_WGSL_AST_DIAGNOSTIC_RULE_NAME_H_
#include <string>
-#include "src/tint/ast/node.h"
+#include "src/tint/lang/wgsl/ast/node.h"
// Forward declarations
namespace tint::ast {
@@ -65,4 +65,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_DIAGNOSTIC_RULE_NAME_H_
+#endif // SRC_TINT_LANG_WGSL_AST_DIAGNOSTIC_RULE_NAME_H_
diff --git a/src/tint/ast/diagnostic_rule_name_test.cc b/src/tint/lang/wgsl/ast/diagnostic_rule_name_test.cc
similarity index 93%
rename from src/tint/ast/diagnostic_rule_name_test.cc
rename to src/tint/lang/wgsl/ast/diagnostic_rule_name_test.cc
index 40caac7..d7ebb69 100644
--- a/src/tint/ast/diagnostic_rule_name_test.cc
+++ b/src/tint/lang/wgsl/ast/diagnostic_rule_name_test.cc
@@ -15,8 +15,8 @@
#include <string>
#include "gtest/gtest-spi.h"
-#include "src/tint/ast/diagnostic_rule_name.h"
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/diagnostic_rule_name.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/ast/disable_validation_attribute.cc b/src/tint/lang/wgsl/ast/disable_validation_attribute.cc
similarity index 97%
rename from src/tint/ast/disable_validation_attribute.cc
rename to src/tint/lang/wgsl/ast/disable_validation_attribute.cc
index 27eaef0..979b2d0 100644
--- a/src/tint/ast/disable_validation_attribute.cc
+++ b/src/tint/lang/wgsl/ast/disable_validation_attribute.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/disable_validation_attribute.h"
+#include "src/tint/lang/wgsl/ast/disable_validation_attribute.h"
#include "src/tint/clone_context.h"
#include "src/tint/program_builder.h"
diff --git a/src/tint/ast/disable_validation_attribute.h b/src/tint/lang/wgsl/ast/disable_validation_attribute.h
similarity index 92%
rename from src/tint/ast/disable_validation_attribute.h
rename to src/tint/lang/wgsl/ast/disable_validation_attribute.h
index 4cc0c08..44b815b 100644
--- a/src/tint/ast/disable_validation_attribute.h
+++ b/src/tint/lang/wgsl/ast/disable_validation_attribute.h
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_DISABLE_VALIDATION_ATTRIBUTE_H_
-#define SRC_TINT_AST_DISABLE_VALIDATION_ATTRIBUTE_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_DISABLE_VALIDATION_ATTRIBUTE_H_
+#define SRC_TINT_LANG_WGSL_AST_DISABLE_VALIDATION_ATTRIBUTE_H_
#include <string>
-#include "src/tint/ast/internal_attribute.h"
+#include "src/tint/lang/wgsl/ast/internal_attribute.h"
namespace tint::ast {
@@ -79,4 +79,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_DISABLE_VALIDATION_ATTRIBUTE_H_
+#endif // SRC_TINT_LANG_WGSL_AST_DISABLE_VALIDATION_ATTRIBUTE_H_
diff --git a/src/tint/ast/discard_statement.cc b/src/tint/lang/wgsl/ast/discard_statement.cc
similarity index 95%
rename from src/tint/ast/discard_statement.cc
rename to src/tint/lang/wgsl/ast/discard_statement.cc
index e76d01e..2f95e27 100644
--- a/src/tint/ast/discard_statement.cc
+++ b/src/tint/lang/wgsl/ast/discard_statement.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/discard_statement.h"
+#include "src/tint/lang/wgsl/ast/discard_statement.h"
#include "src/tint/program_builder.h"
diff --git a/src/tint/ast/discard_statement.h b/src/tint/lang/wgsl/ast/discard_statement.h
similarity index 86%
rename from src/tint/ast/discard_statement.h
rename to src/tint/lang/wgsl/ast/discard_statement.h
index 99d8ee7..b192da9 100644
--- a/src/tint/ast/discard_statement.h
+++ b/src/tint/lang/wgsl/ast/discard_statement.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_DISCARD_STATEMENT_H_
-#define SRC_TINT_AST_DISCARD_STATEMENT_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_DISCARD_STATEMENT_H_
+#define SRC_TINT_LANG_WGSL_AST_DISCARD_STATEMENT_H_
-#include "src/tint/ast/statement.h"
+#include "src/tint/lang/wgsl/ast/statement.h"
namespace tint::ast {
@@ -40,4 +40,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_DISCARD_STATEMENT_H_
+#endif // SRC_TINT_LANG_WGSL_AST_DISCARD_STATEMENT_H_
diff --git a/src/tint/ast/discard_statement_test.cc b/src/tint/lang/wgsl/ast/discard_statement_test.cc
similarity index 93%
rename from src/tint/ast/discard_statement_test.cc
rename to src/tint/lang/wgsl/ast/discard_statement_test.cc
index ee16ed3..be926a9 100644
--- a/src/tint/ast/discard_statement_test.cc
+++ b/src/tint/lang/wgsl/ast/discard_statement_test.cc
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/discard_statement.h"
+#include "src/tint/lang/wgsl/ast/discard_statement.h"
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/ast/enable.cc b/src/tint/lang/wgsl/ast/enable.cc
similarity index 96%
rename from src/tint/ast/enable.cc
rename to src/tint/lang/wgsl/ast/enable.cc
index b449444..439f45e 100644
--- a/src/tint/ast/enable.cc
+++ b/src/tint/lang/wgsl/ast/enable.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/enable.h"
+#include "src/tint/lang/wgsl/ast/enable.h"
#include "src/tint/program_builder.h"
diff --git a/src/tint/ast/enable.h b/src/tint/lang/wgsl/ast/enable.h
similarity index 90%
rename from src/tint/ast/enable.h
rename to src/tint/lang/wgsl/ast/enable.h
index ac7181a..fa32c57 100644
--- a/src/tint/ast/enable.h
+++ b/src/tint/lang/wgsl/ast/enable.h
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_ENABLE_H_
-#define SRC_TINT_AST_ENABLE_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_ENABLE_H_
+#define SRC_TINT_LANG_WGSL_AST_ENABLE_H_
#include <string>
#include <utility>
#include <vector>
-#include "src/tint/ast/extension.h"
+#include "src/tint/lang/wgsl/ast/extension.h"
namespace tint::ast {
@@ -55,4 +55,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_ENABLE_H_
+#endif // SRC_TINT_LANG_WGSL_AST_ENABLE_H_
diff --git a/src/tint/ast/enable_test.cc b/src/tint/lang/wgsl/ast/enable_test.cc
similarity index 93%
rename from src/tint/ast/enable_test.cc
rename to src/tint/lang/wgsl/ast/enable_test.cc
index 20105bc..61c7bbc 100644
--- a/src/tint/ast/enable_test.cc
+++ b/src/tint/lang/wgsl/ast/enable_test.cc
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/enable.h"
+#include "src/tint/lang/wgsl/ast/enable.h"
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/ast/expression.cc b/src/tint/lang/wgsl/ast/expression.cc
similarity index 94%
rename from src/tint/ast/expression.cc
rename to src/tint/lang/wgsl/ast/expression.cc
index 21989d0..4321e57 100644
--- a/src/tint/ast/expression.cc
+++ b/src/tint/lang/wgsl/ast/expression.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/expression.h"
+#include "src/tint/lang/wgsl/ast/expression.h"
TINT_INSTANTIATE_TYPEINFO(tint::ast::Expression);
diff --git a/src/tint/ast/expression.h b/src/tint/lang/wgsl/ast/expression.h
similarity index 85%
rename from src/tint/ast/expression.h
rename to src/tint/lang/wgsl/ast/expression.h
index e9fce0b..1ad9e2d 100644
--- a/src/tint/ast/expression.h
+++ b/src/tint/lang/wgsl/ast/expression.h
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_EXPRESSION_H_
-#define SRC_TINT_AST_EXPRESSION_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_EXPRESSION_H_
+#define SRC_TINT_LANG_WGSL_AST_EXPRESSION_H_
#include <string>
#include <vector>
-#include "src/tint/ast/node.h"
+#include "src/tint/lang/wgsl/ast/node.h"
namespace tint::ast {
@@ -37,4 +37,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_EXPRESSION_H_
+#endif // SRC_TINT_LANG_WGSL_AST_EXPRESSION_H_
diff --git a/src/tint/ast/extension.cc b/src/tint/lang/wgsl/ast/extension.cc
similarity index 95%
rename from src/tint/ast/extension.cc
rename to src/tint/lang/wgsl/ast/extension.cc
index bfb8ffd..4a00aa1 100644
--- a/src/tint/ast/extension.cc
+++ b/src/tint/lang/wgsl/ast/extension.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/extension.h"
+#include "src/tint/lang/wgsl/ast/extension.h"
#include "src/tint/program_builder.h"
diff --git a/src/tint/ast/extension.h b/src/tint/lang/wgsl/ast/extension.h
similarity index 89%
rename from src/tint/ast/extension.h
rename to src/tint/lang/wgsl/ast/extension.h
index 900d491..ba651b2 100644
--- a/src/tint/ast/extension.h
+++ b/src/tint/lang/wgsl/ast/extension.h
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_EXTENSION_H_
-#define SRC_TINT_AST_EXTENSION_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_EXTENSION_H_
+#define SRC_TINT_LANG_WGSL_AST_EXTENSION_H_
-#include "src/tint/ast/node.h"
#include "src/tint/builtin/extension.h"
+#include "src/tint/lang/wgsl/ast/node.h"
namespace tint::ast {
@@ -48,4 +48,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_EXTENSION_H_
+#endif // SRC_TINT_LANG_WGSL_AST_EXTENSION_H_
diff --git a/src/tint/ast/float_literal_expression.cc b/src/tint/lang/wgsl/ast/float_literal_expression.cc
similarity index 96%
rename from src/tint/ast/float_literal_expression.cc
rename to src/tint/lang/wgsl/ast/float_literal_expression.cc
index 5de8821..6cb5dd9 100644
--- a/src/tint/ast/float_literal_expression.cc
+++ b/src/tint/lang/wgsl/ast/float_literal_expression.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/float_literal_expression.h"
+#include "src/tint/lang/wgsl/ast/float_literal_expression.h"
#include <limits>
diff --git a/src/tint/ast/float_literal_expression.h b/src/tint/lang/wgsl/ast/float_literal_expression.h
similarity index 89%
rename from src/tint/ast/float_literal_expression.h
rename to src/tint/lang/wgsl/ast/float_literal_expression.h
index 40e7e7c..e156505 100644
--- a/src/tint/ast/float_literal_expression.h
+++ b/src/tint/lang/wgsl/ast/float_literal_expression.h
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_FLOAT_LITERAL_EXPRESSION_H_
-#define SRC_TINT_AST_FLOAT_LITERAL_EXPRESSION_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_FLOAT_LITERAL_EXPRESSION_H_
+#define SRC_TINT_LANG_WGSL_AST_FLOAT_LITERAL_EXPRESSION_H_
#include <string>
-#include "src/tint/ast/literal_expression.h"
+#include "src/tint/lang/wgsl/ast/literal_expression.h"
namespace tint::ast {
@@ -65,4 +65,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_FLOAT_LITERAL_EXPRESSION_H_
+#endif // SRC_TINT_LANG_WGSL_AST_FLOAT_LITERAL_EXPRESSION_H_
diff --git a/src/tint/ast/float_literal_expression_test.cc b/src/tint/lang/wgsl/ast/float_literal_expression_test.cc
similarity index 97%
rename from src/tint/ast/float_literal_expression_test.cc
rename to src/tint/lang/wgsl/ast/float_literal_expression_test.cc
index 6374583..98e6276 100644
--- a/src/tint/ast/float_literal_expression_test.cc
+++ b/src/tint/lang/wgsl/ast/float_literal_expression_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
#include "src/tint/utils/string_stream.h"
diff --git a/src/tint/ast/for_loop_statement.cc b/src/tint/lang/wgsl/ast/for_loop_statement.cc
similarity index 97%
rename from src/tint/ast/for_loop_statement.cc
rename to src/tint/lang/wgsl/ast/for_loop_statement.cc
index faec878..1bcd9c2 100644
--- a/src/tint/ast/for_loop_statement.cc
+++ b/src/tint/lang/wgsl/ast/for_loop_statement.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/for_loop_statement.h"
+#include "src/tint/lang/wgsl/ast/for_loop_statement.h"
#include <utility>
diff --git a/src/tint/ast/for_loop_statement.h b/src/tint/lang/wgsl/ast/for_loop_statement.h
similarity index 91%
rename from src/tint/ast/for_loop_statement.h
rename to src/tint/lang/wgsl/ast/for_loop_statement.h
index fa47a29..9156143 100644
--- a/src/tint/ast/for_loop_statement.h
+++ b/src/tint/lang/wgsl/ast/for_loop_statement.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_FOR_LOOP_STATEMENT_H_
-#define SRC_TINT_AST_FOR_LOOP_STATEMENT_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_FOR_LOOP_STATEMENT_H_
+#define SRC_TINT_LANG_WGSL_AST_FOR_LOOP_STATEMENT_H_
-#include "src/tint/ast/block_statement.h"
+#include "src/tint/lang/wgsl/ast/block_statement.h"
namespace tint::ast {
@@ -69,4 +69,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_FOR_LOOP_STATEMENT_H_
+#endif // SRC_TINT_LANG_WGSL_AST_FOR_LOOP_STATEMENT_H_
diff --git a/src/tint/ast/for_loop_statement_test.cc b/src/tint/lang/wgsl/ast/for_loop_statement_test.cc
similarity index 96%
rename from src/tint/ast/for_loop_statement_test.cc
rename to src/tint/lang/wgsl/ast/for_loop_statement_test.cc
index ad9050e..f6f145c 100644
--- a/src/tint/ast/for_loop_statement_test.cc
+++ b/src/tint/lang/wgsl/ast/for_loop_statement_test.cc
@@ -14,8 +14,8 @@
#include "gmock/gmock.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/ast/binary_expression.h"
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/binary_expression.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/ast/function.cc b/src/tint/lang/wgsl/ast/function.cc
similarity index 95%
rename from src/tint/ast/function.cc
rename to src/tint/lang/wgsl/ast/function.cc
index 59a4571..d3f54e1 100644
--- a/src/tint/ast/function.cc
+++ b/src/tint/lang/wgsl/ast/function.cc
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/function.h"
+#include "src/tint/lang/wgsl/ast/function.h"
-#include "src/tint/ast/stage_attribute.h"
-#include "src/tint/ast/workgroup_attribute.h"
+#include "src/tint/lang/wgsl/ast/stage_attribute.h"
+#include "src/tint/lang/wgsl/ast/workgroup_attribute.h"
#include "src/tint/program_builder.h"
TINT_INSTANTIATE_TYPEINFO(tint::ast::Function);
diff --git a/src/tint/ast/function.h b/src/tint/lang/wgsl/ast/function.h
similarity index 87%
rename from src/tint/ast/function.h
rename to src/tint/lang/wgsl/ast/function.h
index b47d74f..02c4876 100644
--- a/src/tint/ast/function.h
+++ b/src/tint/lang/wgsl/ast/function.h
@@ -12,22 +12,22 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_FUNCTION_H_
-#define SRC_TINT_AST_FUNCTION_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_FUNCTION_H_
+#define SRC_TINT_LANG_WGSL_AST_FUNCTION_H_
#include <string>
#include <tuple>
#include <utility>
#include <vector>
-#include "src/tint/ast/attribute.h"
-#include "src/tint/ast/binding_attribute.h"
-#include "src/tint/ast/block_statement.h"
-#include "src/tint/ast/builtin_attribute.h"
-#include "src/tint/ast/group_attribute.h"
-#include "src/tint/ast/location_attribute.h"
-#include "src/tint/ast/parameter.h"
-#include "src/tint/ast/pipeline_stage.h"
+#include "src/tint/lang/wgsl/ast/attribute.h"
+#include "src/tint/lang/wgsl/ast/binding_attribute.h"
+#include "src/tint/lang/wgsl/ast/block_statement.h"
+#include "src/tint/lang/wgsl/ast/builtin_attribute.h"
+#include "src/tint/lang/wgsl/ast/group_attribute.h"
+#include "src/tint/lang/wgsl/ast/location_attribute.h"
+#include "src/tint/lang/wgsl/ast/parameter.h"
+#include "src/tint/lang/wgsl/ast/pipeline_stage.h"
// Forward declarations
namespace tint::ast {
@@ -120,4 +120,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_FUNCTION_H_
+#endif // SRC_TINT_LANG_WGSL_AST_FUNCTION_H_
diff --git a/src/tint/ast/function_test.cc b/src/tint/lang/wgsl/ast/function_test.cc
similarity index 97%
rename from src/tint/ast/function_test.cc
rename to src/tint/lang/wgsl/ast/function_test.cc
index 36a96e3..c48e87a 100644
--- a/src/tint/ast/function_test.cc
+++ b/src/tint/lang/wgsl/ast/function_test.cc
@@ -13,10 +13,10 @@
// limitations under the License.
#include "gtest/gtest-spi.h"
-#include "src/tint/ast/discard_statement.h"
-#include "src/tint/ast/stage_attribute.h"
-#include "src/tint/ast/test_helper.h"
-#include "src/tint/ast/workgroup_attribute.h"
+#include "src/tint/lang/wgsl/ast/discard_statement.h"
+#include "src/tint/lang/wgsl/ast/stage_attribute.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/workgroup_attribute.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/ast/group_attribute.cc b/src/tint/lang/wgsl/ast/group_attribute.cc
similarity index 95%
rename from src/tint/ast/group_attribute.cc
rename to src/tint/lang/wgsl/ast/group_attribute.cc
index 9c1952c..9f3afc3 100644
--- a/src/tint/ast/group_attribute.cc
+++ b/src/tint/lang/wgsl/ast/group_attribute.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/group_attribute.h"
+#include "src/tint/lang/wgsl/ast/group_attribute.h"
#include <string>
diff --git a/src/tint/ast/group_attribute.h b/src/tint/lang/wgsl/ast/group_attribute.h
similarity index 85%
rename from src/tint/ast/group_attribute.h
rename to src/tint/lang/wgsl/ast/group_attribute.h
index 47cef56..ea45ea7 100644
--- a/src/tint/ast/group_attribute.h
+++ b/src/tint/lang/wgsl/ast/group_attribute.h
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_GROUP_ATTRIBUTE_H_
-#define SRC_TINT_AST_GROUP_ATTRIBUTE_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_GROUP_ATTRIBUTE_H_
+#define SRC_TINT_LANG_WGSL_AST_GROUP_ATTRIBUTE_H_
#include <string>
-#include "src/tint/ast/attribute.h"
-#include "src/tint/ast/expression.h"
+#include "src/tint/lang/wgsl/ast/attribute.h"
+#include "src/tint/lang/wgsl/ast/expression.h"
namespace tint::ast {
@@ -48,4 +48,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_GROUP_ATTRIBUTE_H_
+#endif // SRC_TINT_LANG_WGSL_AST_GROUP_ATTRIBUTE_H_
diff --git a/src/tint/ast/group_attribute_test.cc b/src/tint/lang/wgsl/ast/group_attribute_test.cc
similarity index 94%
rename from src/tint/ast/group_attribute_test.cc
rename to src/tint/lang/wgsl/ast/group_attribute_test.cc
index c8e2130..ad5078a 100644
--- a/src/tint/ast/group_attribute_test.cc
+++ b/src/tint/lang/wgsl/ast/group_attribute_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/ast/id_attribute.cc b/src/tint/lang/wgsl/ast/id_attribute.cc
similarity index 95%
rename from src/tint/ast/id_attribute.cc
rename to src/tint/lang/wgsl/ast/id_attribute.cc
index b056773..687cbe2 100644
--- a/src/tint/ast/id_attribute.cc
+++ b/src/tint/lang/wgsl/ast/id_attribute.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/id_attribute.h"
+#include "src/tint/lang/wgsl/ast/id_attribute.h"
#include <string>
diff --git a/src/tint/ast/id_attribute.h b/src/tint/lang/wgsl/ast/id_attribute.h
similarity index 86%
rename from src/tint/ast/id_attribute.h
rename to src/tint/lang/wgsl/ast/id_attribute.h
index 3e51ce4..119494a 100644
--- a/src/tint/ast/id_attribute.h
+++ b/src/tint/lang/wgsl/ast/id_attribute.h
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_ID_ATTRIBUTE_H_
-#define SRC_TINT_AST_ID_ATTRIBUTE_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_ID_ATTRIBUTE_H_
+#define SRC_TINT_LANG_WGSL_AST_ID_ATTRIBUTE_H_
#include <string>
-#include "src/tint/ast/attribute.h"
-#include "src/tint/ast/expression.h"
+#include "src/tint/lang/wgsl/ast/attribute.h"
+#include "src/tint/lang/wgsl/ast/expression.h"
namespace tint::ast {
@@ -48,4 +48,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_ID_ATTRIBUTE_H_
+#endif // SRC_TINT_LANG_WGSL_AST_ID_ATTRIBUTE_H_
diff --git a/src/tint/ast/id_attribute_test.cc b/src/tint/lang/wgsl/ast/id_attribute_test.cc
similarity index 89%
rename from src/tint/ast/id_attribute_test.cc
rename to src/tint/lang/wgsl/ast/id_attribute_test.cc
index 7541a1d..ee4bb65 100644
--- a/src/tint/ast/id_attribute_test.cc
+++ b/src/tint/lang/wgsl/ast/id_attribute_test.cc
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/id_attribute.h"
+#include "src/tint/lang/wgsl/ast/id_attribute.h"
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/ast/identifier.cc b/src/tint/lang/wgsl/ast/identifier.cc
similarity index 96%
rename from src/tint/ast/identifier.cc
rename to src/tint/lang/wgsl/ast/identifier.cc
index 49b9c86..23ccf35 100644
--- a/src/tint/ast/identifier.cc
+++ b/src/tint/lang/wgsl/ast/identifier.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/identifier.h"
+#include "src/tint/lang/wgsl/ast/identifier.h"
#include "src/tint/program_builder.h"
diff --git a/src/tint/ast/identifier.h b/src/tint/lang/wgsl/ast/identifier.h
similarity index 88%
rename from src/tint/ast/identifier.h
rename to src/tint/lang/wgsl/ast/identifier.h
index 3fc81df..7a4a6eb 100644
--- a/src/tint/ast/identifier.h
+++ b/src/tint/lang/wgsl/ast/identifier.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_IDENTIFIER_H_
-#define SRC_TINT_AST_IDENTIFIER_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_IDENTIFIER_H_
+#define SRC_TINT_LANG_WGSL_AST_IDENTIFIER_H_
-#include "src/tint/ast/node.h"
+#include "src/tint/lang/wgsl/ast/node.h"
namespace tint::ast {
@@ -44,4 +44,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_IDENTIFIER_H_
+#endif // SRC_TINT_LANG_WGSL_AST_IDENTIFIER_H_
diff --git a/src/tint/ast/identifier_expression.cc b/src/tint/lang/wgsl/ast/identifier_expression.cc
similarity index 95%
rename from src/tint/ast/identifier_expression.cc
rename to src/tint/lang/wgsl/ast/identifier_expression.cc
index d3ee29b..421c5e0 100644
--- a/src/tint/ast/identifier_expression.cc
+++ b/src/tint/lang/wgsl/ast/identifier_expression.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/identifier_expression.h"
+#include "src/tint/lang/wgsl/ast/identifier_expression.h"
#include "src/tint/program_builder.h"
diff --git a/src/tint/ast/identifier_expression.h b/src/tint/lang/wgsl/ast/identifier_expression.h
similarity index 87%
rename from src/tint/ast/identifier_expression.h
rename to src/tint/lang/wgsl/ast/identifier_expression.h
index 839445b..a62e4b3 100644
--- a/src/tint/ast/identifier_expression.h
+++ b/src/tint/lang/wgsl/ast/identifier_expression.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_IDENTIFIER_EXPRESSION_H_
-#define SRC_TINT_AST_IDENTIFIER_EXPRESSION_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_IDENTIFIER_EXPRESSION_H_
+#define SRC_TINT_LANG_WGSL_AST_IDENTIFIER_EXPRESSION_H_
-#include "src/tint/ast/expression.h"
+#include "src/tint/lang/wgsl/ast/expression.h"
// Forward declarations
namespace tint::ast {
@@ -52,4 +52,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_IDENTIFIER_EXPRESSION_H_
+#endif // SRC_TINT_LANG_WGSL_AST_IDENTIFIER_EXPRESSION_H_
diff --git a/src/tint/ast/identifier_expression_test.cc b/src/tint/lang/wgsl/ast/identifier_expression_test.cc
similarity index 97%
rename from src/tint/ast/identifier_expression_test.cc
rename to src/tint/lang/wgsl/ast/identifier_expression_test.cc
index 6e9b367..5fc21df 100644
--- a/src/tint/ast/identifier_expression_test.cc
+++ b/src/tint/lang/wgsl/ast/identifier_expression_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "gtest/gtest-spi.h"
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/ast/identifier_test.cc b/src/tint/lang/wgsl/ast/identifier_test.cc
similarity index 96%
rename from src/tint/ast/identifier_test.cc
rename to src/tint/lang/wgsl/ast/identifier_test.cc
index 9b0b4f4..45e6760 100644
--- a/src/tint/ast/identifier_test.cc
+++ b/src/tint/lang/wgsl/ast/identifier_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "gtest/gtest-spi.h"
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/ast/if_statement.cc b/src/tint/lang/wgsl/ast/if_statement.cc
similarity index 97%
rename from src/tint/ast/if_statement.cc
rename to src/tint/lang/wgsl/ast/if_statement.cc
index 40748c5..77319ef 100644
--- a/src/tint/ast/if_statement.cc
+++ b/src/tint/lang/wgsl/ast/if_statement.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/if_statement.h"
+#include "src/tint/lang/wgsl/ast/if_statement.h"
#include "src/tint/program_builder.h"
diff --git a/src/tint/ast/if_statement.h b/src/tint/lang/wgsl/ast/if_statement.h
similarity index 89%
rename from src/tint/ast/if_statement.h
rename to src/tint/lang/wgsl/ast/if_statement.h
index 3333084..70bd758 100644
--- a/src/tint/ast/if_statement.h
+++ b/src/tint/lang/wgsl/ast/if_statement.h
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_IF_STATEMENT_H_
-#define SRC_TINT_AST_IF_STATEMENT_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_IF_STATEMENT_H_
+#define SRC_TINT_LANG_WGSL_AST_IF_STATEMENT_H_
#include <utility>
-#include "src/tint/ast/block_statement.h"
-#include "src/tint/ast/expression.h"
+#include "src/tint/lang/wgsl/ast/block_statement.h"
+#include "src/tint/lang/wgsl/ast/expression.h"
namespace tint::ast {
@@ -65,4 +65,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_IF_STATEMENT_H_
+#endif // SRC_TINT_LANG_WGSL_AST_IF_STATEMENT_H_
diff --git a/src/tint/ast/if_statement_test.cc b/src/tint/lang/wgsl/ast/if_statement_test.cc
similarity index 94%
rename from src/tint/ast/if_statement_test.cc
rename to src/tint/lang/wgsl/ast/if_statement_test.cc
index b5b85fe..e231f1c 100644
--- a/src/tint/ast/if_statement_test.cc
+++ b/src/tint/lang/wgsl/ast/if_statement_test.cc
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/if_statement.h"
+#include "src/tint/lang/wgsl/ast/if_statement.h"
#include "gmock/gmock.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/ast/discard_statement.h"
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/discard_statement.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/ast/increment_decrement_statement.cc b/src/tint/lang/wgsl/ast/increment_decrement_statement.cc
similarity index 95%
rename from src/tint/ast/increment_decrement_statement.cc
rename to src/tint/lang/wgsl/ast/increment_decrement_statement.cc
index f37242e..834da15 100644
--- a/src/tint/ast/increment_decrement_statement.cc
+++ b/src/tint/lang/wgsl/ast/increment_decrement_statement.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/increment_decrement_statement.h"
+#include "src/tint/lang/wgsl/ast/increment_decrement_statement.h"
#include "src/tint/program_builder.h"
diff --git a/src/tint/ast/increment_decrement_statement.h b/src/tint/lang/wgsl/ast/increment_decrement_statement.h
similarity index 85%
rename from src/tint/ast/increment_decrement_statement.h
rename to src/tint/lang/wgsl/ast/increment_decrement_statement.h
index 5fa6b93..d920528 100644
--- a/src/tint/ast/increment_decrement_statement.h
+++ b/src/tint/lang/wgsl/ast/increment_decrement_statement.h
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_INCREMENT_DECREMENT_STATEMENT_H_
-#define SRC_TINT_AST_INCREMENT_DECREMENT_STATEMENT_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_INCREMENT_DECREMENT_STATEMENT_H_
+#define SRC_TINT_LANG_WGSL_AST_INCREMENT_DECREMENT_STATEMENT_H_
-#include "src/tint/ast/expression.h"
-#include "src/tint/ast/statement.h"
+#include "src/tint/lang/wgsl/ast/expression.h"
+#include "src/tint/lang/wgsl/ast/statement.h"
namespace tint::ast {
@@ -54,4 +54,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_INCREMENT_DECREMENT_STATEMENT_H_
+#endif // SRC_TINT_LANG_WGSL_AST_INCREMENT_DECREMENT_STATEMENT_H_
diff --git a/src/tint/ast/increment_decrement_statement_test.cc b/src/tint/lang/wgsl/ast/increment_decrement_statement_test.cc
similarity index 94%
rename from src/tint/ast/increment_decrement_statement_test.cc
rename to src/tint/lang/wgsl/ast/increment_decrement_statement_test.cc
index 6a5ae67..fa6f61d 100644
--- a/src/tint/ast/increment_decrement_statement_test.cc
+++ b/src/tint/lang/wgsl/ast/increment_decrement_statement_test.cc
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/increment_decrement_statement.h"
+#include "src/tint/lang/wgsl/ast/increment_decrement_statement.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/ast/index_accessor_expression.cc b/src/tint/lang/wgsl/ast/index_accessor_expression.cc
similarity index 96%
rename from src/tint/ast/index_accessor_expression.cc
rename to src/tint/lang/wgsl/ast/index_accessor_expression.cc
index 5462c6e..48503d47 100644
--- a/src/tint/ast/index_accessor_expression.cc
+++ b/src/tint/lang/wgsl/ast/index_accessor_expression.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/index_accessor_expression.h"
+#include "src/tint/lang/wgsl/ast/index_accessor_expression.h"
#include "src/tint/program_builder.h"
diff --git a/src/tint/ast/index_accessor_expression.h b/src/tint/lang/wgsl/ast/index_accessor_expression.h
similarity index 87%
rename from src/tint/ast/index_accessor_expression.h
rename to src/tint/lang/wgsl/ast/index_accessor_expression.h
index 6dc6f96..20ff4bd 100644
--- a/src/tint/ast/index_accessor_expression.h
+++ b/src/tint/lang/wgsl/ast/index_accessor_expression.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_INDEX_ACCESSOR_EXPRESSION_H_
-#define SRC_TINT_AST_INDEX_ACCESSOR_EXPRESSION_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_INDEX_ACCESSOR_EXPRESSION_H_
+#define SRC_TINT_LANG_WGSL_AST_INDEX_ACCESSOR_EXPRESSION_H_
-#include "src/tint/ast/accessor_expression.h"
+#include "src/tint/lang/wgsl/ast/accessor_expression.h"
namespace tint::ast {
@@ -50,4 +50,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_INDEX_ACCESSOR_EXPRESSION_H_
+#endif // SRC_TINT_LANG_WGSL_AST_INDEX_ACCESSOR_EXPRESSION_H_
diff --git a/src/tint/ast/index_accessor_expression_test.cc b/src/tint/lang/wgsl/ast/index_accessor_expression_test.cc
similarity index 97%
rename from src/tint/ast/index_accessor_expression_test.cc
rename to src/tint/lang/wgsl/ast/index_accessor_expression_test.cc
index efdcecb..8177109 100644
--- a/src/tint/ast/index_accessor_expression_test.cc
+++ b/src/tint/lang/wgsl/ast/index_accessor_expression_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "gtest/gtest-spi.h"
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/ast/index_attribute.cc b/src/tint/lang/wgsl/ast/index_attribute.cc
similarity index 95%
rename from src/tint/ast/index_attribute.cc
rename to src/tint/lang/wgsl/ast/index_attribute.cc
index 7916226..ffe227e 100644
--- a/src/tint/ast/index_attribute.cc
+++ b/src/tint/lang/wgsl/ast/index_attribute.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/index_attribute.h"
+#include "src/tint/lang/wgsl/ast/index_attribute.h"
#include <string>
diff --git a/src/tint/ast/index_attribute.h b/src/tint/lang/wgsl/ast/index_attribute.h
similarity index 86%
rename from src/tint/ast/index_attribute.h
rename to src/tint/lang/wgsl/ast/index_attribute.h
index e241ba6..8c8863b 100644
--- a/src/tint/ast/index_attribute.h
+++ b/src/tint/lang/wgsl/ast/index_attribute.h
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_INDEX_ATTRIBUTE_H_
-#define SRC_TINT_AST_INDEX_ATTRIBUTE_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_INDEX_ATTRIBUTE_H_
+#define SRC_TINT_LANG_WGSL_AST_INDEX_ATTRIBUTE_H_
#include <string>
-#include "src/tint/ast/attribute.h"
-#include "src/tint/ast/expression.h"
+#include "src/tint/lang/wgsl/ast/attribute.h"
+#include "src/tint/lang/wgsl/ast/expression.h"
namespace tint::ast {
@@ -48,4 +48,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_INDEX_ATTRIBUTE_H_
+#endif // SRC_TINT_LANG_WGSL_AST_INDEX_ATTRIBUTE_H_
diff --git a/src/tint/ast/index_attribute_test.cc b/src/tint/lang/wgsl/ast/index_attribute_test.cc
similarity index 89%
rename from src/tint/ast/index_attribute_test.cc
rename to src/tint/lang/wgsl/ast/index_attribute_test.cc
index bad37c6..6c6bc6f 100644
--- a/src/tint/ast/index_attribute_test.cc
+++ b/src/tint/lang/wgsl/ast/index_attribute_test.cc
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/id_attribute.h"
+#include "src/tint/lang/wgsl/ast/id_attribute.h"
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/ast/int_literal_expression.cc b/src/tint/lang/wgsl/ast/int_literal_expression.cc
similarity index 96%
rename from src/tint/ast/int_literal_expression.cc
rename to src/tint/lang/wgsl/ast/int_literal_expression.cc
index b659bbb..2e5949a 100644
--- a/src/tint/ast/int_literal_expression.cc
+++ b/src/tint/lang/wgsl/ast/int_literal_expression.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/int_literal_expression.h"
+#include "src/tint/lang/wgsl/ast/int_literal_expression.h"
#include "src/tint/program_builder.h"
diff --git a/src/tint/ast/int_literal_expression.h b/src/tint/lang/wgsl/ast/int_literal_expression.h
similarity index 89%
rename from src/tint/ast/int_literal_expression.h
rename to src/tint/lang/wgsl/ast/int_literal_expression.h
index bf13f8e..28e0c75 100644
--- a/src/tint/ast/int_literal_expression.h
+++ b/src/tint/lang/wgsl/ast/int_literal_expression.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_INT_LITERAL_EXPRESSION_H_
-#define SRC_TINT_AST_INT_LITERAL_EXPRESSION_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_INT_LITERAL_EXPRESSION_H_
+#define SRC_TINT_LANG_WGSL_AST_INT_LITERAL_EXPRESSION_H_
-#include "src/tint/ast/literal_expression.h"
+#include "src/tint/lang/wgsl/ast/literal_expression.h"
namespace tint::ast {
@@ -63,4 +63,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_INT_LITERAL_EXPRESSION_H_
+#endif // SRC_TINT_LANG_WGSL_AST_INT_LITERAL_EXPRESSION_H_
diff --git a/src/tint/ast/int_literal_expression_test.cc b/src/tint/lang/wgsl/ast/int_literal_expression_test.cc
similarity index 97%
rename from src/tint/ast/int_literal_expression_test.cc
rename to src/tint/lang/wgsl/ast/int_literal_expression_test.cc
index 9481c30..a6dec02 100644
--- a/src/tint/ast/int_literal_expression_test.cc
+++ b/src/tint/lang/wgsl/ast/int_literal_expression_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
#include "src/tint/utils/string_stream.h"
diff --git a/src/tint/ast/internal_attribute.cc b/src/tint/lang/wgsl/ast/internal_attribute.cc
similarity index 94%
rename from src/tint/ast/internal_attribute.cc
rename to src/tint/lang/wgsl/ast/internal_attribute.cc
index c5c5f2e..72a6249 100644
--- a/src/tint/ast/internal_attribute.cc
+++ b/src/tint/lang/wgsl/ast/internal_attribute.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/internal_attribute.h"
+#include "src/tint/lang/wgsl/ast/internal_attribute.h"
#include <utility>
diff --git a/src/tint/ast/internal_attribute.h b/src/tint/lang/wgsl/ast/internal_attribute.h
similarity index 90%
rename from src/tint/ast/internal_attribute.h
rename to src/tint/lang/wgsl/ast/internal_attribute.h
index a06a966..3e758e3 100644
--- a/src/tint/ast/internal_attribute.h
+++ b/src/tint/lang/wgsl/ast/internal_attribute.h
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_INTERNAL_ATTRIBUTE_H_
-#define SRC_TINT_AST_INTERNAL_ATTRIBUTE_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_INTERNAL_ATTRIBUTE_H_
+#define SRC_TINT_LANG_WGSL_AST_INTERNAL_ATTRIBUTE_H_
#include <string>
-#include "src/tint/ast/attribute.h"
+#include "src/tint/lang/wgsl/ast/attribute.h"
#include "src/tint/utils/vector.h"
// Forward declarations
@@ -56,4 +56,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_INTERNAL_ATTRIBUTE_H_
+#endif // SRC_TINT_LANG_WGSL_AST_INTERNAL_ATTRIBUTE_H_
diff --git a/src/tint/ast/interpolate_attribute.cc b/src/tint/lang/wgsl/ast/interpolate_attribute.cc
similarity index 96%
rename from src/tint/ast/interpolate_attribute.cc
rename to src/tint/lang/wgsl/ast/interpolate_attribute.cc
index eda6405..383f94a 100644
--- a/src/tint/ast/interpolate_attribute.cc
+++ b/src/tint/lang/wgsl/ast/interpolate_attribute.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/interpolate_attribute.h"
+#include "src/tint/lang/wgsl/ast/interpolate_attribute.h"
#include <string>
diff --git a/src/tint/ast/interpolate_attribute.h b/src/tint/lang/wgsl/ast/interpolate_attribute.h
similarity index 89%
rename from src/tint/ast/interpolate_attribute.h
rename to src/tint/lang/wgsl/ast/interpolate_attribute.h
index 65cf585..e8c1475 100644
--- a/src/tint/ast/interpolate_attribute.h
+++ b/src/tint/lang/wgsl/ast/interpolate_attribute.h
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_INTERPOLATE_ATTRIBUTE_H_
-#define SRC_TINT_AST_INTERPOLATE_ATTRIBUTE_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_INTERPOLATE_ATTRIBUTE_H_
+#define SRC_TINT_LANG_WGSL_AST_INTERPOLATE_ATTRIBUTE_H_
#include <string>
-#include "src/tint/ast/attribute.h"
+#include "src/tint/lang/wgsl/ast/attribute.h"
// Forward declarations
namespace tint::ast {
@@ -60,4 +60,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_INTERPOLATE_ATTRIBUTE_H_
+#endif // SRC_TINT_LANG_WGSL_AST_INTERPOLATE_ATTRIBUTE_H_
diff --git a/src/tint/ast/interpolate_attribute_test.cc b/src/tint/lang/wgsl/ast/interpolate_attribute_test.cc
similarity index 90%
rename from src/tint/ast/interpolate_attribute_test.cc
rename to src/tint/lang/wgsl/ast/interpolate_attribute_test.cc
index 462449d..4753a4f 100644
--- a/src/tint/ast/interpolate_attribute_test.cc
+++ b/src/tint/lang/wgsl/ast/interpolate_attribute_test.cc
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/interpolate_attribute.h"
+#include "src/tint/lang/wgsl/ast/interpolate_attribute.h"
#include <string>
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
#include "src/tint/utils/string.h"
namespace tint::ast {
diff --git a/src/tint/ast/invariant_attribute.cc b/src/tint/lang/wgsl/ast/invariant_attribute.cc
similarity index 95%
rename from src/tint/ast/invariant_attribute.cc
rename to src/tint/lang/wgsl/ast/invariant_attribute.cc
index 1fa4e5d..096709b 100644
--- a/src/tint/ast/invariant_attribute.cc
+++ b/src/tint/lang/wgsl/ast/invariant_attribute.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/invariant_attribute.h"
+#include "src/tint/lang/wgsl/ast/invariant_attribute.h"
#include "src/tint/program_builder.h"
diff --git a/src/tint/ast/invariant_attribute.h b/src/tint/lang/wgsl/ast/invariant_attribute.h
similarity index 86%
rename from src/tint/ast/invariant_attribute.h
rename to src/tint/lang/wgsl/ast/invariant_attribute.h
index b4da288..c8bdb4f 100644
--- a/src/tint/ast/invariant_attribute.h
+++ b/src/tint/lang/wgsl/ast/invariant_attribute.h
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_INVARIANT_ATTRIBUTE_H_
-#define SRC_TINT_AST_INVARIANT_ATTRIBUTE_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_INVARIANT_ATTRIBUTE_H_
+#define SRC_TINT_LANG_WGSL_AST_INVARIANT_ATTRIBUTE_H_
#include <string>
-#include "src/tint/ast/attribute.h"
+#include "src/tint/lang/wgsl/ast/attribute.h"
namespace tint::ast {
@@ -43,4 +43,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_INVARIANT_ATTRIBUTE_H_
+#endif // SRC_TINT_LANG_WGSL_AST_INVARIANT_ATTRIBUTE_H_
diff --git a/src/tint/ast/let.cc b/src/tint/lang/wgsl/ast/let.cc
similarity index 96%
rename from src/tint/ast/let.cc
rename to src/tint/lang/wgsl/ast/let.cc
index 6f63ceb..f2eee1f 100644
--- a/src/tint/ast/let.cc
+++ b/src/tint/lang/wgsl/ast/let.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/let.h"
+#include "src/tint/lang/wgsl/ast/let.h"
#include <utility>
diff --git a/src/tint/ast/let.h b/src/tint/lang/wgsl/ast/let.h
similarity index 91%
rename from src/tint/ast/let.h
rename to src/tint/lang/wgsl/ast/let.h
index 1e529c9..ecc119d 100644
--- a/src/tint/ast/let.h
+++ b/src/tint/lang/wgsl/ast/let.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_LET_H_
-#define SRC_TINT_AST_LET_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_LET_H_
+#define SRC_TINT_LANG_WGSL_AST_LET_H_
-#include "src/tint/ast/variable.h"
+#include "src/tint/lang/wgsl/ast/variable.h"
namespace tint::ast {
@@ -60,4 +60,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_LET_H_
+#endif // SRC_TINT_LANG_WGSL_AST_LET_H_
diff --git a/src/tint/ast/literal_expression.cc b/src/tint/lang/wgsl/ast/literal_expression.cc
similarity index 93%
rename from src/tint/ast/literal_expression.cc
rename to src/tint/lang/wgsl/ast/literal_expression.cc
index bcf62ad..df85321 100644
--- a/src/tint/ast/literal_expression.cc
+++ b/src/tint/lang/wgsl/ast/literal_expression.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/literal_expression.h"
+#include "src/tint/lang/wgsl/ast/literal_expression.h"
TINT_INSTANTIATE_TYPEINFO(tint::ast::LiteralExpression);
diff --git a/src/tint/ast/literal_expression.h b/src/tint/lang/wgsl/ast/literal_expression.h
similarity index 83%
rename from src/tint/ast/literal_expression.h
rename to src/tint/lang/wgsl/ast/literal_expression.h
index 5cf5c07..9036f9d 100644
--- a/src/tint/ast/literal_expression.h
+++ b/src/tint/lang/wgsl/ast/literal_expression.h
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_LITERAL_EXPRESSION_H_
-#define SRC_TINT_AST_LITERAL_EXPRESSION_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_LITERAL_EXPRESSION_H_
+#define SRC_TINT_LANG_WGSL_AST_LITERAL_EXPRESSION_H_
#include <string>
-#include "src/tint/ast/expression.h"
+#include "src/tint/lang/wgsl/ast/expression.h"
namespace tint::ast {
@@ -36,4 +36,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_LITERAL_EXPRESSION_H_
+#endif // SRC_TINT_LANG_WGSL_AST_LITERAL_EXPRESSION_H_
diff --git a/src/tint/ast/location_attribute.cc b/src/tint/lang/wgsl/ast/location_attribute.cc
similarity index 95%
rename from src/tint/ast/location_attribute.cc
rename to src/tint/lang/wgsl/ast/location_attribute.cc
index b9b3f12..87bc75c 100644
--- a/src/tint/ast/location_attribute.cc
+++ b/src/tint/lang/wgsl/ast/location_attribute.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/location_attribute.h"
+#include "src/tint/lang/wgsl/ast/location_attribute.h"
#include <string>
diff --git a/src/tint/ast/location_attribute.h b/src/tint/lang/wgsl/ast/location_attribute.h
similarity index 85%
rename from src/tint/ast/location_attribute.h
rename to src/tint/lang/wgsl/ast/location_attribute.h
index eb10307..949e2a6 100644
--- a/src/tint/ast/location_attribute.h
+++ b/src/tint/lang/wgsl/ast/location_attribute.h
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_LOCATION_ATTRIBUTE_H_
-#define SRC_TINT_AST_LOCATION_ATTRIBUTE_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_LOCATION_ATTRIBUTE_H_
+#define SRC_TINT_LANG_WGSL_AST_LOCATION_ATTRIBUTE_H_
#include <string>
-#include "src/tint/ast/attribute.h"
-#include "src/tint/ast/expression.h"
+#include "src/tint/lang/wgsl/ast/attribute.h"
+#include "src/tint/lang/wgsl/ast/expression.h"
namespace tint::ast {
@@ -48,4 +48,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_LOCATION_ATTRIBUTE_H_
+#endif // SRC_TINT_LANG_WGSL_AST_LOCATION_ATTRIBUTE_H_
diff --git a/src/tint/ast/location_attribute_test.cc b/src/tint/lang/wgsl/ast/location_attribute_test.cc
similarity index 94%
rename from src/tint/ast/location_attribute_test.cc
rename to src/tint/lang/wgsl/ast/location_attribute_test.cc
index 681ea43..122dd86 100644
--- a/src/tint/ast/location_attribute_test.cc
+++ b/src/tint/lang/wgsl/ast/location_attribute_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/ast/loop_statement.cc b/src/tint/lang/wgsl/ast/loop_statement.cc
similarity index 97%
rename from src/tint/ast/loop_statement.cc
rename to src/tint/lang/wgsl/ast/loop_statement.cc
index cd946cb..e9a73cf 100644
--- a/src/tint/ast/loop_statement.cc
+++ b/src/tint/lang/wgsl/ast/loop_statement.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/loop_statement.h"
+#include "src/tint/lang/wgsl/ast/loop_statement.h"
#include <utility>
diff --git a/src/tint/ast/loop_statement.h b/src/tint/lang/wgsl/ast/loop_statement.h
similarity index 90%
rename from src/tint/ast/loop_statement.h
rename to src/tint/lang/wgsl/ast/loop_statement.h
index 8539345..083c38e 100644
--- a/src/tint/ast/loop_statement.h
+++ b/src/tint/lang/wgsl/ast/loop_statement.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_LOOP_STATEMENT_H_
-#define SRC_TINT_AST_LOOP_STATEMENT_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_LOOP_STATEMENT_H_
+#define SRC_TINT_LANG_WGSL_AST_LOOP_STATEMENT_H_
-#include "src/tint/ast/block_statement.h"
+#include "src/tint/lang/wgsl/ast/block_statement.h"
namespace tint::ast {
@@ -56,4 +56,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_LOOP_STATEMENT_H_
+#endif // SRC_TINT_LANG_WGSL_AST_LOOP_STATEMENT_H_
diff --git a/src/tint/ast/loop_statement_test.cc b/src/tint/lang/wgsl/ast/loop_statement_test.cc
similarity index 94%
rename from src/tint/ast/loop_statement_test.cc
rename to src/tint/lang/wgsl/ast/loop_statement_test.cc
index e0fc0f1..2ca171d 100644
--- a/src/tint/ast/loop_statement_test.cc
+++ b/src/tint/lang/wgsl/ast/loop_statement_test.cc
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/loop_statement.h"
+#include "src/tint/lang/wgsl/ast/loop_statement.h"
#include "gmock/gmock.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/ast/discard_statement.h"
-#include "src/tint/ast/if_statement.h"
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/discard_statement.h"
+#include "src/tint/lang/wgsl/ast/if_statement.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/ast/member_accessor_expression.cc b/src/tint/lang/wgsl/ast/member_accessor_expression.cc
similarity index 96%
rename from src/tint/ast/member_accessor_expression.cc
rename to src/tint/lang/wgsl/ast/member_accessor_expression.cc
index 4b062fb..f6ccdec 100644
--- a/src/tint/ast/member_accessor_expression.cc
+++ b/src/tint/lang/wgsl/ast/member_accessor_expression.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/member_accessor_expression.h"
+#include "src/tint/lang/wgsl/ast/member_accessor_expression.h"
#include "src/tint/program_builder.h"
diff --git a/src/tint/ast/member_accessor_expression.h b/src/tint/lang/wgsl/ast/member_accessor_expression.h
similarity index 84%
rename from src/tint/ast/member_accessor_expression.h
rename to src/tint/lang/wgsl/ast/member_accessor_expression.h
index 5ae36b1..4d34fb1 100644
--- a/src/tint/ast/member_accessor_expression.h
+++ b/src/tint/lang/wgsl/ast/member_accessor_expression.h
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_MEMBER_ACCESSOR_EXPRESSION_H_
-#define SRC_TINT_AST_MEMBER_ACCESSOR_EXPRESSION_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_MEMBER_ACCESSOR_EXPRESSION_H_
+#define SRC_TINT_LANG_WGSL_AST_MEMBER_ACCESSOR_EXPRESSION_H_
-#include "src/tint/ast/accessor_expression.h"
-#include "src/tint/ast/identifier_expression.h"
+#include "src/tint/lang/wgsl/ast/accessor_expression.h"
+#include "src/tint/lang/wgsl/ast/identifier_expression.h"
namespace tint::ast {
@@ -51,4 +51,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_MEMBER_ACCESSOR_EXPRESSION_H_
+#endif // SRC_TINT_LANG_WGSL_AST_MEMBER_ACCESSOR_EXPRESSION_H_
diff --git a/src/tint/ast/member_accessor_expression_test.cc b/src/tint/lang/wgsl/ast/member_accessor_expression_test.cc
similarity index 98%
rename from src/tint/ast/member_accessor_expression_test.cc
rename to src/tint/lang/wgsl/ast/member_accessor_expression_test.cc
index 1c6e61d..3f1a4bf 100644
--- a/src/tint/ast/member_accessor_expression_test.cc
+++ b/src/tint/lang/wgsl/ast/member_accessor_expression_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "gtest/gtest-spi.h"
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/ast/module.cc b/src/tint/lang/wgsl/ast/module.cc
similarity index 97%
rename from src/tint/ast/module.cc
rename to src/tint/lang/wgsl/ast/module.cc
index fa652de..9ef1b3e 100644
--- a/src/tint/ast/module.cc
+++ b/src/tint/lang/wgsl/ast/module.cc
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/module.h"
+#include "src/tint/lang/wgsl/ast/module.h"
#include <utility>
-#include "src/tint/ast/type_decl.h"
+#include "src/tint/lang/wgsl/ast/type_decl.h"
#include "src/tint/program_builder.h"
#include "src/tint/switch.h"
diff --git a/src/tint/ast/module.h b/src/tint/lang/wgsl/ast/module.h
similarity index 94%
rename from src/tint/ast/module.h
rename to src/tint/lang/wgsl/ast/module.h
index 130939e..e588454 100644
--- a/src/tint/ast/module.h
+++ b/src/tint/lang/wgsl/ast/module.h
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_MODULE_H_
-#define SRC_TINT_AST_MODULE_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_MODULE_H_
+#define SRC_TINT_LANG_WGSL_AST_MODULE_H_
#include <string>
-#include "src/tint/ast/const_assert.h"
-#include "src/tint/ast/diagnostic_directive.h"
-#include "src/tint/ast/enable.h"
-#include "src/tint/ast/function.h"
+#include "src/tint/lang/wgsl/ast/const_assert.h"
+#include "src/tint/lang/wgsl/ast/diagnostic_directive.h"
+#include "src/tint/lang/wgsl/ast/enable.h"
+#include "src/tint/lang/wgsl/ast/function.h"
#include "src/tint/utils/vector.h"
namespace tint::ast {
@@ -160,4 +160,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_MODULE_H_
+#endif // SRC_TINT_LANG_WGSL_AST_MODULE_H_
diff --git a/src/tint/ast/module_clone_test.cc b/src/tint/lang/wgsl/ast/module_clone_test.cc
similarity index 100%
rename from src/tint/ast/module_clone_test.cc
rename to src/tint/lang/wgsl/ast/module_clone_test.cc
diff --git a/src/tint/ast/module_test.cc b/src/tint/lang/wgsl/ast/module_test.cc
similarity index 98%
rename from src/tint/ast/module_test.cc
rename to src/tint/lang/wgsl/ast/module_test.cc
index 878df56..744f86f 100644
--- a/src/tint/ast/module_test.cc
+++ b/src/tint/lang/wgsl/ast/module_test.cc
@@ -14,8 +14,8 @@
#include "gmock/gmock.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/ast/test_helper.h"
#include "src/tint/clone_context.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/ast/must_use_attribute.cc b/src/tint/lang/wgsl/ast/must_use_attribute.cc
similarity index 95%
rename from src/tint/ast/must_use_attribute.cc
rename to src/tint/lang/wgsl/ast/must_use_attribute.cc
index dc1af16..2b2e5e3 100644
--- a/src/tint/ast/must_use_attribute.cc
+++ b/src/tint/lang/wgsl/ast/must_use_attribute.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/must_use_attribute.h"
+#include "src/tint/lang/wgsl/ast/must_use_attribute.h"
#include "src/tint/program_builder.h"
diff --git a/src/tint/ast/must_use_attribute.h b/src/tint/lang/wgsl/ast/must_use_attribute.h
similarity index 86%
rename from src/tint/ast/must_use_attribute.h
rename to src/tint/lang/wgsl/ast/must_use_attribute.h
index a135176..6cc0124 100644
--- a/src/tint/ast/must_use_attribute.h
+++ b/src/tint/lang/wgsl/ast/must_use_attribute.h
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_MUST_USE_ATTRIBUTE_H_
-#define SRC_TINT_AST_MUST_USE_ATTRIBUTE_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_MUST_USE_ATTRIBUTE_H_
+#define SRC_TINT_LANG_WGSL_AST_MUST_USE_ATTRIBUTE_H_
#include <string>
-#include "src/tint/ast/attribute.h"
+#include "src/tint/lang/wgsl/ast/attribute.h"
namespace tint::ast {
@@ -43,4 +43,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_MUST_USE_ATTRIBUTE_H_
+#endif // SRC_TINT_LANG_WGSL_AST_MUST_USE_ATTRIBUTE_H_
diff --git a/src/tint/ast/node.cc b/src/tint/lang/wgsl/ast/node.cc
similarity index 94%
rename from src/tint/ast/node.cc
rename to src/tint/lang/wgsl/ast/node.cc
index 772c788..3384682 100644
--- a/src/tint/ast/node.cc
+++ b/src/tint/lang/wgsl/ast/node.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/node.h"
+#include "src/tint/lang/wgsl/ast/node.h"
TINT_INSTANTIATE_TYPEINFO(tint::ast::Node);
diff --git a/src/tint/ast/node.h b/src/tint/lang/wgsl/ast/node.h
similarity index 90%
rename from src/tint/ast/node.h
rename to src/tint/lang/wgsl/ast/node.h
index 3ad56f3..4873c05 100644
--- a/src/tint/ast/node.h
+++ b/src/tint/lang/wgsl/ast/node.h
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_NODE_H_
-#define SRC_TINT_AST_NODE_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_NODE_H_
+#define SRC_TINT_LANG_WGSL_AST_NODE_H_
#include <string>
-#include "src/tint/ast/node_id.h"
#include "src/tint/clone_context.h"
+#include "src/tint/lang/wgsl/ast/node_id.h"
namespace tint::ast {
@@ -60,4 +60,4 @@
} // namespace tint
-#endif // SRC_TINT_AST_NODE_H_
+#endif // SRC_TINT_LANG_WGSL_AST_NODE_H_
diff --git a/src/tint/ast/node_id.h b/src/tint/lang/wgsl/ast/node_id.h
similarity index 90%
rename from src/tint/ast/node_id.h
rename to src/tint/lang/wgsl/ast/node_id.h
index f6bddb1..ec8b635 100644
--- a/src/tint/ast/node_id.h
+++ b/src/tint/lang/wgsl/ast/node_id.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_NODE_ID_H_
-#define SRC_TINT_AST_NODE_ID_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_NODE_ID_H_
+#define SRC_TINT_LANG_WGSL_AST_NODE_ID_H_
#include <stddef.h>
@@ -38,4 +38,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_NODE_ID_H_
+#endif // SRC_TINT_LANG_WGSL_AST_NODE_ID_H_
diff --git a/src/tint/ast/override.cc b/src/tint/lang/wgsl/ast/override.cc
similarity index 96%
rename from src/tint/ast/override.cc
rename to src/tint/lang/wgsl/ast/override.cc
index ff1836e..1239623 100644
--- a/src/tint/ast/override.cc
+++ b/src/tint/lang/wgsl/ast/override.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/override.h"
+#include "src/tint/lang/wgsl/ast/override.h"
#include <utility>
diff --git a/src/tint/ast/override.h b/src/tint/lang/wgsl/ast/override.h
similarity index 92%
rename from src/tint/ast/override.h
rename to src/tint/lang/wgsl/ast/override.h
index 56fc211..bcedfbd 100644
--- a/src/tint/ast/override.h
+++ b/src/tint/lang/wgsl/ast/override.h
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_OVERRIDE_H_
-#define SRC_TINT_AST_OVERRIDE_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_OVERRIDE_H_
+#define SRC_TINT_LANG_WGSL_AST_OVERRIDE_H_
#include <string>
-#include "src/tint/ast/variable.h"
+#include "src/tint/lang/wgsl/ast/variable.h"
namespace tint::ast {
@@ -63,4 +63,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_OVERRIDE_H_
+#endif // SRC_TINT_LANG_WGSL_AST_OVERRIDE_H_
diff --git a/src/tint/ast/parameter.cc b/src/tint/lang/wgsl/ast/parameter.cc
similarity index 96%
rename from src/tint/ast/parameter.cc
rename to src/tint/lang/wgsl/ast/parameter.cc
index 4a76e55..4f0d598 100644
--- a/src/tint/ast/parameter.cc
+++ b/src/tint/lang/wgsl/ast/parameter.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/parameter.h"
+#include "src/tint/lang/wgsl/ast/parameter.h"
#include <utility>
diff --git a/src/tint/ast/parameter.h b/src/tint/lang/wgsl/ast/parameter.h
similarity index 91%
rename from src/tint/ast/parameter.h
rename to src/tint/lang/wgsl/ast/parameter.h
index b363d33..4ebe26b 100644
--- a/src/tint/ast/parameter.h
+++ b/src/tint/lang/wgsl/ast/parameter.h
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_PARAMETER_H_
-#define SRC_TINT_AST_PARAMETER_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_PARAMETER_H_
+#define SRC_TINT_LANG_WGSL_AST_PARAMETER_H_
#include <vector>
-#include "src/tint/ast/variable.h"
+#include "src/tint/lang/wgsl/ast/variable.h"
namespace tint::ast {
@@ -62,4 +62,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_PARAMETER_H_
+#endif // SRC_TINT_LANG_WGSL_AST_PARAMETER_H_
diff --git a/src/tint/ast/phony_expression.cc b/src/tint/lang/wgsl/ast/phony_expression.cc
similarity index 95%
rename from src/tint/ast/phony_expression.cc
rename to src/tint/lang/wgsl/ast/phony_expression.cc
index f2fca96..d41dd5c 100644
--- a/src/tint/ast/phony_expression.cc
+++ b/src/tint/lang/wgsl/ast/phony_expression.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/phony_expression.h"
+#include "src/tint/lang/wgsl/ast/phony_expression.h"
#include "src/tint/program_builder.h"
diff --git a/src/tint/ast/phony_expression.h b/src/tint/lang/wgsl/ast/phony_expression.h
similarity index 87%
rename from src/tint/ast/phony_expression.h
rename to src/tint/lang/wgsl/ast/phony_expression.h
index 764bf23..067e237 100644
--- a/src/tint/ast/phony_expression.h
+++ b/src/tint/lang/wgsl/ast/phony_expression.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_PHONY_EXPRESSION_H_
-#define SRC_TINT_AST_PHONY_EXPRESSION_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_PHONY_EXPRESSION_H_
+#define SRC_TINT_LANG_WGSL_AST_PHONY_EXPRESSION_H_
-#include "src/tint/ast/expression.h"
+#include "src/tint/lang/wgsl/ast/expression.h"
namespace tint::ast {
@@ -41,4 +41,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_PHONY_EXPRESSION_H_
+#endif // SRC_TINT_LANG_WGSL_AST_PHONY_EXPRESSION_H_
diff --git a/src/tint/ast/phony_expression_test.cc b/src/tint/lang/wgsl/ast/phony_expression_test.cc
similarity index 95%
rename from src/tint/ast/phony_expression_test.cc
rename to src/tint/lang/wgsl/ast/phony_expression_test.cc
index 8a4dd23..099eada 100644
--- a/src/tint/ast/phony_expression_test.cc
+++ b/src/tint/lang/wgsl/ast/phony_expression_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/ast/pipeline_stage.cc b/src/tint/lang/wgsl/ast/pipeline_stage.cc
similarity index 95%
rename from src/tint/ast/pipeline_stage.cc
rename to src/tint/lang/wgsl/ast/pipeline_stage.cc
index 72d3aca..5cf1f05 100644
--- a/src/tint/ast/pipeline_stage.cc
+++ b/src/tint/lang/wgsl/ast/pipeline_stage.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/pipeline_stage.h"
+#include "src/tint/lang/wgsl/ast/pipeline_stage.h"
namespace tint::ast {
diff --git a/src/tint/ast/pipeline_stage.h b/src/tint/lang/wgsl/ast/pipeline_stage.h
similarity index 86%
rename from src/tint/ast/pipeline_stage.h
rename to src/tint/lang/wgsl/ast/pipeline_stage.h
index 5344afd..8ddc450 100644
--- a/src/tint/ast/pipeline_stage.h
+++ b/src/tint/lang/wgsl/ast/pipeline_stage.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_PIPELINE_STAGE_H_
-#define SRC_TINT_AST_PIPELINE_STAGE_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_PIPELINE_STAGE_H_
+#define SRC_TINT_LANG_WGSL_AST_PIPELINE_STAGE_H_
#include "src/tint/utils/string_stream.h"
@@ -29,4 +29,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_PIPELINE_STAGE_H_
+#endif // SRC_TINT_LANG_WGSL_AST_PIPELINE_STAGE_H_
diff --git a/src/tint/ast/return_statement.cc b/src/tint/lang/wgsl/ast/return_statement.cc
similarity index 96%
rename from src/tint/ast/return_statement.cc
rename to src/tint/lang/wgsl/ast/return_statement.cc
index 4ac7313..6b666db 100644
--- a/src/tint/ast/return_statement.cc
+++ b/src/tint/lang/wgsl/ast/return_statement.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/return_statement.h"
+#include "src/tint/lang/wgsl/ast/return_statement.h"
#include "src/tint/program_builder.h"
diff --git a/src/tint/ast/return_statement.h b/src/tint/lang/wgsl/ast/return_statement.h
similarity index 86%
rename from src/tint/ast/return_statement.h
rename to src/tint/lang/wgsl/ast/return_statement.h
index 6beb215..d5d3e40 100644
--- a/src/tint/ast/return_statement.h
+++ b/src/tint/lang/wgsl/ast/return_statement.h
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_RETURN_STATEMENT_H_
-#define SRC_TINT_AST_RETURN_STATEMENT_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_RETURN_STATEMENT_H_
+#define SRC_TINT_LANG_WGSL_AST_RETURN_STATEMENT_H_
-#include "src/tint/ast/expression.h"
-#include "src/tint/ast/statement.h"
+#include "src/tint/lang/wgsl/ast/expression.h"
+#include "src/tint/lang/wgsl/ast/statement.h"
namespace tint::ast {
@@ -51,4 +51,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_RETURN_STATEMENT_H_
+#endif // SRC_TINT_LANG_WGSL_AST_RETURN_STATEMENT_H_
diff --git a/src/tint/ast/return_statement_test.cc b/src/tint/lang/wgsl/ast/return_statement_test.cc
similarity index 94%
rename from src/tint/ast/return_statement_test.cc
rename to src/tint/lang/wgsl/ast/return_statement_test.cc
index bbe860d..7e00c3b 100644
--- a/src/tint/ast/return_statement_test.cc
+++ b/src/tint/lang/wgsl/ast/return_statement_test.cc
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/return_statement.h"
+#include "src/tint/lang/wgsl/ast/return_statement.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/ast/stage_attribute.cc b/src/tint/lang/wgsl/ast/stage_attribute.cc
similarity index 95%
rename from src/tint/ast/stage_attribute.cc
rename to src/tint/lang/wgsl/ast/stage_attribute.cc
index c700950..aaa361c 100644
--- a/src/tint/ast/stage_attribute.cc
+++ b/src/tint/lang/wgsl/ast/stage_attribute.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/stage_attribute.h"
+#include "src/tint/lang/wgsl/ast/stage_attribute.h"
#include <string>
diff --git a/src/tint/ast/stage_attribute.h b/src/tint/lang/wgsl/ast/stage_attribute.h
similarity index 85%
rename from src/tint/ast/stage_attribute.h
rename to src/tint/lang/wgsl/ast/stage_attribute.h
index 9b32579..708e850 100644
--- a/src/tint/ast/stage_attribute.h
+++ b/src/tint/lang/wgsl/ast/stage_attribute.h
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_STAGE_ATTRIBUTE_H_
-#define SRC_TINT_AST_STAGE_ATTRIBUTE_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_STAGE_ATTRIBUTE_H_
+#define SRC_TINT_LANG_WGSL_AST_STAGE_ATTRIBUTE_H_
#include <string>
-#include "src/tint/ast/attribute.h"
-#include "src/tint/ast/pipeline_stage.h"
+#include "src/tint/lang/wgsl/ast/attribute.h"
+#include "src/tint/lang/wgsl/ast/pipeline_stage.h"
namespace tint::ast {
@@ -48,4 +48,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_STAGE_ATTRIBUTE_H_
+#endif // SRC_TINT_LANG_WGSL_AST_STAGE_ATTRIBUTE_H_
diff --git a/src/tint/ast/stage_attribute_test.cc b/src/tint/lang/wgsl/ast/stage_attribute_test.cc
similarity index 84%
rename from src/tint/ast/stage_attribute_test.cc
rename to src/tint/lang/wgsl/ast/stage_attribute_test.cc
index d4baaf2..1a81a55 100644
--- a/src/tint/ast/stage_attribute_test.cc
+++ b/src/tint/lang/wgsl/ast/stage_attribute_test.cc
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/stage_attribute.h"
+#include "src/tint/lang/wgsl/ast/stage_attribute.h"
-#include "src/tint/ast/test_helper.h"
-#include "src/tint/ast/workgroup_attribute.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/workgroup_attribute.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/ast/statement.cc b/src/tint/lang/wgsl/ast/statement.cc
similarity index 75%
rename from src/tint/ast/statement.cc
rename to src/tint/lang/wgsl/ast/statement.cc
index 42f01c4..91bbc2f 100644
--- a/src/tint/ast/statement.cc
+++ b/src/tint/lang/wgsl/ast/statement.cc
@@ -12,18 +12,18 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/statement.h"
+#include "src/tint/lang/wgsl/ast/statement.h"
-#include "src/tint/ast/assignment_statement.h"
-#include "src/tint/ast/break_statement.h"
-#include "src/tint/ast/call_statement.h"
-#include "src/tint/ast/continue_statement.h"
-#include "src/tint/ast/discard_statement.h"
-#include "src/tint/ast/if_statement.h"
-#include "src/tint/ast/loop_statement.h"
-#include "src/tint/ast/return_statement.h"
-#include "src/tint/ast/switch_statement.h"
-#include "src/tint/ast/variable_decl_statement.h"
+#include "src/tint/lang/wgsl/ast/assignment_statement.h"
+#include "src/tint/lang/wgsl/ast/break_statement.h"
+#include "src/tint/lang/wgsl/ast/call_statement.h"
+#include "src/tint/lang/wgsl/ast/continue_statement.h"
+#include "src/tint/lang/wgsl/ast/discard_statement.h"
+#include "src/tint/lang/wgsl/ast/if_statement.h"
+#include "src/tint/lang/wgsl/ast/loop_statement.h"
+#include "src/tint/lang/wgsl/ast/return_statement.h"
+#include "src/tint/lang/wgsl/ast/switch_statement.h"
+#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
TINT_INSTANTIATE_TYPEINFO(tint::ast::Statement);
diff --git a/src/tint/ast/statement.h b/src/tint/lang/wgsl/ast/statement.h
similarity index 86%
rename from src/tint/ast/statement.h
rename to src/tint/lang/wgsl/ast/statement.h
index 3aeff6a..9318fd0 100644
--- a/src/tint/ast/statement.h
+++ b/src/tint/lang/wgsl/ast/statement.h
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_STATEMENT_H_
-#define SRC_TINT_AST_STATEMENT_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_STATEMENT_H_
+#define SRC_TINT_LANG_WGSL_AST_STATEMENT_H_
#include <vector>
-#include "src/tint/ast/node.h"
+#include "src/tint/lang/wgsl/ast/node.h"
namespace tint::ast {
@@ -39,4 +39,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_STATEMENT_H_
+#endif // SRC_TINT_LANG_WGSL_AST_STATEMENT_H_
diff --git a/src/tint/ast/stride_attribute.cc b/src/tint/lang/wgsl/ast/stride_attribute.cc
similarity index 95%
rename from src/tint/ast/stride_attribute.cc
rename to src/tint/lang/wgsl/ast/stride_attribute.cc
index 408ee44..dc30855 100644
--- a/src/tint/ast/stride_attribute.cc
+++ b/src/tint/lang/wgsl/ast/stride_attribute.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/stride_attribute.h"
+#include "src/tint/lang/wgsl/ast/stride_attribute.h"
#include <string>
diff --git a/src/tint/ast/stride_attribute.h b/src/tint/lang/wgsl/ast/stride_attribute.h
similarity index 85%
rename from src/tint/ast/stride_attribute.h
rename to src/tint/lang/wgsl/ast/stride_attribute.h
index 0d6ba18..d7875d8 100644
--- a/src/tint/ast/stride_attribute.h
+++ b/src/tint/lang/wgsl/ast/stride_attribute.h
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_STRIDE_ATTRIBUTE_H_
-#define SRC_TINT_AST_STRIDE_ATTRIBUTE_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_STRIDE_ATTRIBUTE_H_
+#define SRC_TINT_LANG_WGSL_AST_STRIDE_ATTRIBUTE_H_
#include <string>
-#include "src/tint/ast/attribute.h"
-#include "src/tint/ast/internal_attribute.h"
+#include "src/tint/lang/wgsl/ast/attribute.h"
+#include "src/tint/lang/wgsl/ast/internal_attribute.h"
namespace tint::ast {
@@ -49,4 +49,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_STRIDE_ATTRIBUTE_H_
+#endif // SRC_TINT_LANG_WGSL_AST_STRIDE_ATTRIBUTE_H_
diff --git a/src/tint/ast/stride_attribute_test.cc b/src/tint/lang/wgsl/ast/stride_attribute_test.cc
similarity index 95%
rename from src/tint/ast/stride_attribute_test.cc
rename to src/tint/lang/wgsl/ast/stride_attribute_test.cc
index eb19034..32a180c 100644
--- a/src/tint/ast/stride_attribute_test.cc
+++ b/src/tint/lang/wgsl/ast/stride_attribute_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/ast/struct.cc b/src/tint/lang/wgsl/ast/struct.cc
similarity index 97%
rename from src/tint/ast/struct.cc
rename to src/tint/lang/wgsl/ast/struct.cc
index ebd33e2..8543885 100644
--- a/src/tint/ast/struct.cc
+++ b/src/tint/lang/wgsl/ast/struct.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/struct.h"
+#include "src/tint/lang/wgsl/ast/struct.h"
#include <string>
diff --git a/src/tint/ast/struct.h b/src/tint/lang/wgsl/ast/struct.h
similarity index 87%
rename from src/tint/ast/struct.h
rename to src/tint/lang/wgsl/ast/struct.h
index 067688d..2513834 100644
--- a/src/tint/ast/struct.h
+++ b/src/tint/lang/wgsl/ast/struct.h
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_STRUCT_H_
-#define SRC_TINT_AST_STRUCT_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_STRUCT_H_
+#define SRC_TINT_LANG_WGSL_AST_STRUCT_H_
#include <string>
#include <utility>
-#include "src/tint/ast/attribute.h"
-#include "src/tint/ast/struct_member.h"
-#include "src/tint/ast/type_decl.h"
+#include "src/tint/lang/wgsl/ast/attribute.h"
+#include "src/tint/lang/wgsl/ast/struct_member.h"
+#include "src/tint/lang/wgsl/ast/type_decl.h"
#include "src/tint/utils/vector.h"
namespace tint::ast {
@@ -60,4 +60,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_STRUCT_H_
+#endif // SRC_TINT_LANG_WGSL_AST_STRUCT_H_
diff --git a/src/tint/ast/struct_member.cc b/src/tint/lang/wgsl/ast/struct_member.cc
similarity index 96%
rename from src/tint/ast/struct_member.cc
rename to src/tint/lang/wgsl/ast/struct_member.cc
index acc20e5..bdd3cb6 100644
--- a/src/tint/ast/struct_member.cc
+++ b/src/tint/lang/wgsl/ast/struct_member.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/struct_member.h"
+#include "src/tint/lang/wgsl/ast/struct_member.h"
#include "src/tint/program_builder.h"
diff --git a/src/tint/ast/struct_member.h b/src/tint/lang/wgsl/ast/struct_member.h
similarity index 89%
rename from src/tint/ast/struct_member.h
rename to src/tint/lang/wgsl/ast/struct_member.h
index a44c23d..f8efe8b 100644
--- a/src/tint/ast/struct_member.h
+++ b/src/tint/lang/wgsl/ast/struct_member.h
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_STRUCT_MEMBER_H_
-#define SRC_TINT_AST_STRUCT_MEMBER_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_STRUCT_MEMBER_H_
+#define SRC_TINT_LANG_WGSL_AST_STRUCT_MEMBER_H_
#include <utility>
-#include "src/tint/ast/attribute.h"
-#include "src/tint/ast/type.h"
+#include "src/tint/lang/wgsl/ast/attribute.h"
+#include "src/tint/lang/wgsl/ast/type.h"
// Forward declarations
namespace tint::ast {
@@ -65,4 +65,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_STRUCT_MEMBER_H_
+#endif // SRC_TINT_LANG_WGSL_AST_STRUCT_MEMBER_H_
diff --git a/src/tint/ast/struct_member_align_attribute.cc b/src/tint/lang/wgsl/ast/struct_member_align_attribute.cc
similarity index 95%
rename from src/tint/ast/struct_member_align_attribute.cc
rename to src/tint/lang/wgsl/ast/struct_member_align_attribute.cc
index a7d69da..4362dc2 100644
--- a/src/tint/ast/struct_member_align_attribute.cc
+++ b/src/tint/lang/wgsl/ast/struct_member_align_attribute.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/struct_member_align_attribute.h"
+#include "src/tint/lang/wgsl/ast/struct_member_align_attribute.h"
#include <string>
diff --git a/src/tint/ast/struct_member_align_attribute.h b/src/tint/lang/wgsl/ast/struct_member_align_attribute.h
similarity index 85%
rename from src/tint/ast/struct_member_align_attribute.h
rename to src/tint/lang/wgsl/ast/struct_member_align_attribute.h
index b368b79..34e0f48 100644
--- a/src/tint/ast/struct_member_align_attribute.h
+++ b/src/tint/lang/wgsl/ast/struct_member_align_attribute.h
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_STRUCT_MEMBER_ALIGN_ATTRIBUTE_H_
-#define SRC_TINT_AST_STRUCT_MEMBER_ALIGN_ATTRIBUTE_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_STRUCT_MEMBER_ALIGN_ATTRIBUTE_H_
+#define SRC_TINT_LANG_WGSL_AST_STRUCT_MEMBER_ALIGN_ATTRIBUTE_H_
#include <stddef.h>
#include <string>
-#include "src/tint/ast/attribute.h"
-#include "src/tint/ast/expression.h"
+#include "src/tint/lang/wgsl/ast/attribute.h"
+#include "src/tint/lang/wgsl/ast/expression.h"
namespace tint::ast {
@@ -53,4 +53,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_STRUCT_MEMBER_ALIGN_ATTRIBUTE_H_
+#endif // SRC_TINT_LANG_WGSL_AST_STRUCT_MEMBER_ALIGN_ATTRIBUTE_H_
diff --git a/src/tint/ast/struct_member_align_attribute_test.cc b/src/tint/lang/wgsl/ast/struct_member_align_attribute_test.cc
similarity index 89%
rename from src/tint/ast/struct_member_align_attribute_test.cc
rename to src/tint/lang/wgsl/ast/struct_member_align_attribute_test.cc
index 3915a6e..8ef77f5 100644
--- a/src/tint/ast/struct_member_align_attribute_test.cc
+++ b/src/tint/lang/wgsl/ast/struct_member_align_attribute_test.cc
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/struct_member_align_attribute.h"
+#include "src/tint/lang/wgsl/ast/struct_member_align_attribute.h"
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/ast/struct_member_offset_attribute.cc b/src/tint/lang/wgsl/ast/struct_member_offset_attribute.cc
similarity index 95%
rename from src/tint/ast/struct_member_offset_attribute.cc
rename to src/tint/lang/wgsl/ast/struct_member_offset_attribute.cc
index ee6f458..995b119 100644
--- a/src/tint/ast/struct_member_offset_attribute.cc
+++ b/src/tint/lang/wgsl/ast/struct_member_offset_attribute.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/struct_member_offset_attribute.h"
+#include "src/tint/lang/wgsl/ast/struct_member_offset_attribute.h"
#include <string>
diff --git a/src/tint/ast/struct_member_offset_attribute.h b/src/tint/lang/wgsl/ast/struct_member_offset_attribute.h
similarity index 88%
rename from src/tint/ast/struct_member_offset_attribute.h
rename to src/tint/lang/wgsl/ast/struct_member_offset_attribute.h
index edfbb13..2b9f2d9 100644
--- a/src/tint/ast/struct_member_offset_attribute.h
+++ b/src/tint/lang/wgsl/ast/struct_member_offset_attribute.h
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_STRUCT_MEMBER_OFFSET_ATTRIBUTE_H_
-#define SRC_TINT_AST_STRUCT_MEMBER_OFFSET_ATTRIBUTE_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_STRUCT_MEMBER_OFFSET_ATTRIBUTE_H_
+#define SRC_TINT_LANG_WGSL_AST_STRUCT_MEMBER_OFFSET_ATTRIBUTE_H_
#include <string>
-#include "src/tint/ast/attribute.h"
-#include "src/tint/ast/expression.h"
+#include "src/tint/lang/wgsl/ast/attribute.h"
+#include "src/tint/lang/wgsl/ast/expression.h"
namespace tint::ast {
@@ -61,4 +61,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_STRUCT_MEMBER_OFFSET_ATTRIBUTE_H_
+#endif // SRC_TINT_LANG_WGSL_AST_STRUCT_MEMBER_OFFSET_ATTRIBUTE_H_
diff --git a/src/tint/ast/struct_member_offset_attribute_test.cc b/src/tint/lang/wgsl/ast/struct_member_offset_attribute_test.cc
similarity index 95%
rename from src/tint/ast/struct_member_offset_attribute_test.cc
rename to src/tint/lang/wgsl/ast/struct_member_offset_attribute_test.cc
index 6a7e4c9..bc665e7 100644
--- a/src/tint/ast/struct_member_offset_attribute_test.cc
+++ b/src/tint/lang/wgsl/ast/struct_member_offset_attribute_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/ast/struct_member_size_attribute.cc b/src/tint/lang/wgsl/ast/struct_member_size_attribute.cc
similarity index 95%
rename from src/tint/ast/struct_member_size_attribute.cc
rename to src/tint/lang/wgsl/ast/struct_member_size_attribute.cc
index 8d08ca8..26e64ed 100644
--- a/src/tint/ast/struct_member_size_attribute.cc
+++ b/src/tint/lang/wgsl/ast/struct_member_size_attribute.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/struct_member_size_attribute.h"
+#include "src/tint/lang/wgsl/ast/struct_member_size_attribute.h"
#include <string>
diff --git a/src/tint/ast/struct_member_size_attribute.h b/src/tint/lang/wgsl/ast/struct_member_size_attribute.h
similarity index 84%
rename from src/tint/ast/struct_member_size_attribute.h
rename to src/tint/lang/wgsl/ast/struct_member_size_attribute.h
index 5b2bb4e..5b818a2 100644
--- a/src/tint/ast/struct_member_size_attribute.h
+++ b/src/tint/lang/wgsl/ast/struct_member_size_attribute.h
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_STRUCT_MEMBER_SIZE_ATTRIBUTE_H_
-#define SRC_TINT_AST_STRUCT_MEMBER_SIZE_ATTRIBUTE_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_STRUCT_MEMBER_SIZE_ATTRIBUTE_H_
+#define SRC_TINT_LANG_WGSL_AST_STRUCT_MEMBER_SIZE_ATTRIBUTE_H_
#include <stddef.h>
#include <string>
-#include "src/tint/ast/attribute.h"
-#include "src/tint/ast/expression.h"
+#include "src/tint/lang/wgsl/ast/attribute.h"
+#include "src/tint/lang/wgsl/ast/expression.h"
namespace tint::ast {
@@ -50,4 +50,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_STRUCT_MEMBER_SIZE_ATTRIBUTE_H_
+#endif // SRC_TINT_LANG_WGSL_AST_STRUCT_MEMBER_SIZE_ATTRIBUTE_H_
diff --git a/src/tint/ast/struct_member_size_attribute_test.cc b/src/tint/lang/wgsl/ast/struct_member_size_attribute_test.cc
similarity index 89%
rename from src/tint/ast/struct_member_size_attribute_test.cc
rename to src/tint/lang/wgsl/ast/struct_member_size_attribute_test.cc
index 17e4ae6..f7f4c2c 100644
--- a/src/tint/ast/struct_member_size_attribute_test.cc
+++ b/src/tint/lang/wgsl/ast/struct_member_size_attribute_test.cc
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/struct_member_size_attribute.h"
+#include "src/tint/lang/wgsl/ast/struct_member_size_attribute.h"
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/ast/struct_member_test.cc b/src/tint/lang/wgsl/ast/struct_member_test.cc
similarity index 98%
rename from src/tint/ast/struct_member_test.cc
rename to src/tint/lang/wgsl/ast/struct_member_test.cc
index 22f40df..2b82094 100644
--- a/src/tint/ast/struct_member_test.cc
+++ b/src/tint/lang/wgsl/ast/struct_member_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "gtest/gtest-spi.h"
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/ast/struct_test.cc b/src/tint/lang/wgsl/ast/struct_test.cc
similarity index 94%
rename from src/tint/ast/struct_test.cc
rename to src/tint/lang/wgsl/ast/struct_test.cc
index 3a638d3..499723b 100644
--- a/src/tint/ast/struct_test.cc
+++ b/src/tint/lang/wgsl/ast/struct_test.cc
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/struct.h"
+#include "src/tint/lang/wgsl/ast/struct.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/ast/alias.h"
-#include "src/tint/ast/test_helper.h"
-#include "src/tint/ast/transform/add_block_attribute.h"
+#include "src/tint/lang/wgsl/ast/alias.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/add_block_attribute.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/ast/switch_statement.cc b/src/tint/lang/wgsl/ast/switch_statement.cc
similarity index 97%
rename from src/tint/ast/switch_statement.cc
rename to src/tint/lang/wgsl/ast/switch_statement.cc
index fa6fe07..858001c 100644
--- a/src/tint/ast/switch_statement.cc
+++ b/src/tint/lang/wgsl/ast/switch_statement.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/switch_statement.h"
+#include "src/tint/lang/wgsl/ast/switch_statement.h"
#include <utility>
diff --git a/src/tint/ast/switch_statement.h b/src/tint/lang/wgsl/ast/switch_statement.h
similarity index 89%
rename from src/tint/ast/switch_statement.h
rename to src/tint/lang/wgsl/ast/switch_statement.h
index f376f82..ca958c5 100644
--- a/src/tint/ast/switch_statement.h
+++ b/src/tint/lang/wgsl/ast/switch_statement.h
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_SWITCH_STATEMENT_H_
-#define SRC_TINT_AST_SWITCH_STATEMENT_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_SWITCH_STATEMENT_H_
+#define SRC_TINT_LANG_WGSL_AST_SWITCH_STATEMENT_H_
-#include "src/tint/ast/case_statement.h"
-#include "src/tint/ast/expression.h"
+#include "src/tint/lang/wgsl/ast/case_statement.h"
+#include "src/tint/lang/wgsl/ast/expression.h"
namespace tint::ast {
@@ -64,4 +64,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_SWITCH_STATEMENT_H_
+#endif // SRC_TINT_LANG_WGSL_AST_SWITCH_STATEMENT_H_
diff --git a/src/tint/ast/switch_statement_test.cc b/src/tint/lang/wgsl/ast/switch_statement_test.cc
similarity index 97%
rename from src/tint/ast/switch_statement_test.cc
rename to src/tint/lang/wgsl/ast/switch_statement_test.cc
index 795220d..a3846dc 100644
--- a/src/tint/ast/switch_statement_test.cc
+++ b/src/tint/lang/wgsl/ast/switch_statement_test.cc
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/switch_statement.h"
+#include "src/tint/lang/wgsl/ast/switch_statement.h"
#include "gmock/gmock.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/ast/templated_identifier.cc b/src/tint/lang/wgsl/ast/templated_identifier.cc
similarity index 96%
rename from src/tint/ast/templated_identifier.cc
rename to src/tint/lang/wgsl/ast/templated_identifier.cc
index 98274b6..3bb34d4 100644
--- a/src/tint/ast/templated_identifier.cc
+++ b/src/tint/lang/wgsl/ast/templated_identifier.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/templated_identifier.h"
+#include "src/tint/lang/wgsl/ast/templated_identifier.h"
#include <utility>
diff --git a/src/tint/ast/templated_identifier.h b/src/tint/lang/wgsl/ast/templated_identifier.h
similarity index 89%
rename from src/tint/ast/templated_identifier.h
rename to src/tint/lang/wgsl/ast/templated_identifier.h
index 92b8345..086e2cd 100644
--- a/src/tint/ast/templated_identifier.h
+++ b/src/tint/lang/wgsl/ast/templated_identifier.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TEMPLATED_IDENTIFIER_H_
-#define SRC_TINT_AST_TEMPLATED_IDENTIFIER_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TEMPLATED_IDENTIFIER_H_
+#define SRC_TINT_LANG_WGSL_AST_TEMPLATED_IDENTIFIER_H_
-#include "src/tint/ast/identifier.h"
+#include "src/tint/lang/wgsl/ast/identifier.h"
// Forward declarations
namespace tint::ast {
@@ -59,4 +59,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_TEMPLATED_IDENTIFIER_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TEMPLATED_IDENTIFIER_H_
diff --git a/src/tint/ast/templated_identifier_test.cc b/src/tint/lang/wgsl/ast/templated_identifier_test.cc
similarity index 97%
rename from src/tint/ast/templated_identifier_test.cc
rename to src/tint/lang/wgsl/ast/templated_identifier_test.cc
index ce62c79..01f243f 100644
--- a/src/tint/ast/templated_identifier_test.cc
+++ b/src/tint/lang/wgsl/ast/templated_identifier_test.cc
@@ -14,7 +14,7 @@
#include "gtest/gtest-spi.h"
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/ast/test_helper.h b/src/tint/lang/wgsl/ast/test_helper.h
similarity index 97%
rename from src/tint/ast/test_helper.h
rename to src/tint/lang/wgsl/ast/test_helper.h
index 6ef328d..3f3656dc 100644
--- a/src/tint/ast/test_helper.h
+++ b/src/tint/lang/wgsl/ast/test_helper.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TEST_HELPER_H_
-#define SRC_TINT_AST_TEST_HELPER_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TEST_HELPER_H_
+#define SRC_TINT_LANG_WGSL_AST_TEST_HELPER_H_
#include <tuple>
#include <utility>
@@ -167,4 +167,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_TEST_HELPER_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TEST_HELPER_H_
diff --git a/src/tint/ast/test_helper_test.cc b/src/tint/lang/wgsl/ast/test_helper_test.cc
similarity index 96%
rename from src/tint/ast/test_helper_test.cc
rename to src/tint/lang/wgsl/ast/test_helper_test.cc
index 74d529f..6f397f6 100644
--- a/src/tint/ast/test_helper_test.cc
+++ b/src/tint/lang/wgsl/ast/test_helper_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
namespace tint::ast {
diff --git a/src/tint/ast/transform/add_block_attribute.cc b/src/tint/lang/wgsl/ast/transform/add_block_attribute.cc
similarity index 98%
rename from src/tint/ast/transform/add_block_attribute.cc
rename to src/tint/lang/wgsl/ast/transform/add_block_attribute.cc
index d841d4a..1c53ecb 100644
--- a/src/tint/ast/transform/add_block_attribute.cc
+++ b/src/tint/lang/wgsl/ast/transform/add_block_attribute.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/add_block_attribute.h"
+#include "src/tint/lang/wgsl/ast/transform/add_block_attribute.h"
#include <unordered_set>
#include <utility>
diff --git a/src/tint/ast/transform/add_block_attribute.h b/src/tint/lang/wgsl/ast/transform/add_block_attribute.h
similarity index 87%
rename from src/tint/ast/transform/add_block_attribute.h
rename to src/tint/lang/wgsl/ast/transform/add_block_attribute.h
index b23bb8f..e083b6d 100644
--- a/src/tint/ast/transform/add_block_attribute.h
+++ b/src/tint/lang/wgsl/ast/transform/add_block_attribute.h
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TRANSFORM_ADD_BLOCK_ATTRIBUTE_H_
-#define SRC_TINT_AST_TRANSFORM_ADD_BLOCK_ATTRIBUTE_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_ADD_BLOCK_ATTRIBUTE_H_
+#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_ADD_BLOCK_ATTRIBUTE_H_
#include <string>
-#include "src/tint/ast/internal_attribute.h"
-#include "src/tint/ast/transform/transform.h"
+#include "src/tint/lang/wgsl/ast/internal_attribute.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
namespace tint::ast::transform {
@@ -61,4 +61,4 @@
} // namespace tint::ast::transform
-#endif // SRC_TINT_AST_TRANSFORM_ADD_BLOCK_ATTRIBUTE_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_ADD_BLOCK_ATTRIBUTE_H_
diff --git a/src/tint/ast/transform/add_block_attribute_test.cc b/src/tint/lang/wgsl/ast/transform/add_block_attribute_test.cc
similarity index 98%
rename from src/tint/ast/transform/add_block_attribute_test.cc
rename to src/tint/lang/wgsl/ast/transform/add_block_attribute_test.cc
index ce1975c..bc4126f 100644
--- a/src/tint/ast/transform/add_block_attribute_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/add_block_attribute_test.cc
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/add_block_attribute.h"
+#include "src/tint/lang/wgsl/ast/transform/add_block_attribute.h"
#include <memory>
#include <utility>
-#include "src/tint/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/ast/transform/add_empty_entry_point.cc b/src/tint/lang/wgsl/ast/transform/add_empty_entry_point.cc
similarity index 96%
rename from src/tint/ast/transform/add_empty_entry_point.cc
rename to src/tint/lang/wgsl/ast/transform/add_empty_entry_point.cc
index 947b5f0..5ba160f 100644
--- a/src/tint/ast/transform/add_empty_entry_point.cc
+++ b/src/tint/lang/wgsl/ast/transform/add_empty_entry_point.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/add_empty_entry_point.h"
+#include "src/tint/lang/wgsl/ast/transform/add_empty_entry_point.h"
#include <utility>
diff --git a/src/tint/ast/transform/add_empty_entry_point.h b/src/tint/lang/wgsl/ast/transform/add_empty_entry_point.h
similarity index 81%
rename from src/tint/ast/transform/add_empty_entry_point.h
rename to src/tint/lang/wgsl/ast/transform/add_empty_entry_point.h
index d2939e5..572faba 100644
--- a/src/tint/ast/transform/add_empty_entry_point.h
+++ b/src/tint/lang/wgsl/ast/transform/add_empty_entry_point.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TRANSFORM_ADD_EMPTY_ENTRY_POINT_H_
-#define SRC_TINT_AST_TRANSFORM_ADD_EMPTY_ENTRY_POINT_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_ADD_EMPTY_ENTRY_POINT_H_
+#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_ADD_EMPTY_ENTRY_POINT_H_
-#include "src/tint/ast/transform/transform.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
namespace tint::ast::transform {
@@ -35,4 +35,4 @@
} // namespace tint::ast::transform
-#endif // SRC_TINT_AST_TRANSFORM_ADD_EMPTY_ENTRY_POINT_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_ADD_EMPTY_ENTRY_POINT_H_
diff --git a/src/tint/ast/transform/add_empty_entry_point_test.cc b/src/tint/lang/wgsl/ast/transform/add_empty_entry_point_test.cc
similarity index 93%
rename from src/tint/ast/transform/add_empty_entry_point_test.cc
rename to src/tint/lang/wgsl/ast/transform/add_empty_entry_point_test.cc
index c234df6..fb5e65b 100644
--- a/src/tint/ast/transform/add_empty_entry_point_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/add_empty_entry_point_test.cc
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/add_empty_entry_point.h"
+#include "src/tint/lang/wgsl/ast/transform/add_empty_entry_point.h"
#include <utility>
-#include "src/tint/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/ast/transform/array_length_from_uniform.cc b/src/tint/lang/wgsl/ast/transform/array_length_from_uniform.cc
similarity index 98%
rename from src/tint/ast/transform/array_length_from_uniform.cc
rename to src/tint/lang/wgsl/ast/transform/array_length_from_uniform.cc
index eafd805..5f404b4 100644
--- a/src/tint/ast/transform/array_length_from_uniform.cc
+++ b/src/tint/lang/wgsl/ast/transform/array_length_from_uniform.cc
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/array_length_from_uniform.h"
+#include "src/tint/lang/wgsl/ast/transform/array_length_from_uniform.h"
#include <memory>
#include <string>
#include <utility>
-#include "src/tint/ast/transform/simplify_pointers.h"
+#include "src/tint/lang/wgsl/ast/transform/simplify_pointers.h"
#include "src/tint/program_builder.h"
#include "src/tint/sem/call.h"
#include "src/tint/sem/function.h"
diff --git a/src/tint/ast/transform/array_length_from_uniform.h b/src/tint/lang/wgsl/ast/transform/array_length_from_uniform.h
similarity index 92%
rename from src/tint/ast/transform/array_length_from_uniform.h
rename to src/tint/lang/wgsl/ast/transform/array_length_from_uniform.h
index 5c714ea..9b4cc2f 100644
--- a/src/tint/ast/transform/array_length_from_uniform.h
+++ b/src/tint/lang/wgsl/ast/transform/array_length_from_uniform.h
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TRANSFORM_ARRAY_LENGTH_FROM_UNIFORM_H_
-#define SRC_TINT_AST_TRANSFORM_ARRAY_LENGTH_FROM_UNIFORM_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_ARRAY_LENGTH_FROM_UNIFORM_H_
+#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_ARRAY_LENGTH_FROM_UNIFORM_H_
#include <unordered_map>
#include <unordered_set>
-#include "src/tint/ast/transform/transform.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
#include "src/tint/sem/binding_point.h"
// Forward declarations
@@ -111,4 +111,4 @@
} // namespace tint::ast::transform
-#endif // SRC_TINT_AST_TRANSFORM_ARRAY_LENGTH_FROM_UNIFORM_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_ARRAY_LENGTH_FROM_UNIFORM_H_
diff --git a/src/tint/ast/transform/array_length_from_uniform_test.cc b/src/tint/lang/wgsl/ast/transform/array_length_from_uniform_test.cc
similarity index 97%
rename from src/tint/ast/transform/array_length_from_uniform_test.cc
rename to src/tint/lang/wgsl/ast/transform/array_length_from_uniform_test.cc
index 8441655..efa223a 100644
--- a/src/tint/ast/transform/array_length_from_uniform_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/array_length_from_uniform_test.cc
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/array_length_from_uniform.h"
+#include "src/tint/lang/wgsl/ast/transform/array_length_from_uniform.h"
#include <utility>
-#include "src/tint/ast/transform/simplify_pointers.h"
-#include "src/tint/ast/transform/test_helper.h"
-#include "src/tint/ast/transform/unshadow.h"
+#include "src/tint/lang/wgsl/ast/transform/simplify_pointers.h"
+#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/unshadow.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/ast/transform/binding_remapper.cc b/src/tint/lang/wgsl/ast/transform/binding_remapper.cc
similarity index 97%
rename from src/tint/ast/transform/binding_remapper.cc
rename to src/tint/lang/wgsl/ast/transform/binding_remapper.cc
index fd646eb..0b226c0 100644
--- a/src/tint/ast/transform/binding_remapper.cc
+++ b/src/tint/lang/wgsl/ast/transform/binding_remapper.cc
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/binding_remapper.h"
+#include "src/tint/lang/wgsl/ast/transform/binding_remapper.h"
#include <string>
#include <unordered_set>
#include <utility>
-#include "src/tint/ast/disable_validation_attribute.h"
+#include "src/tint/lang/wgsl/ast/disable_validation_attribute.h"
#include "src/tint/program_builder.h"
#include "src/tint/sem/function.h"
#include "src/tint/sem/variable.h"
diff --git a/src/tint/ast/transform/binding_remapper.h b/src/tint/lang/wgsl/ast/transform/binding_remapper.h
similarity index 91%
rename from src/tint/ast/transform/binding_remapper.h
rename to src/tint/lang/wgsl/ast/transform/binding_remapper.h
index 6a28f32..00241bc 100644
--- a/src/tint/ast/transform/binding_remapper.h
+++ b/src/tint/lang/wgsl/ast/transform/binding_remapper.h
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TRANSFORM_BINDING_REMAPPER_H_
-#define SRC_TINT_AST_TRANSFORM_BINDING_REMAPPER_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_BINDING_REMAPPER_H_
+#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_BINDING_REMAPPER_H_
#include <unordered_map>
-#include "src/tint/ast/transform/transform.h"
#include "src/tint/builtin/access.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
#include "src/tint/sem/binding_point.h"
namespace tint::ast::transform {
@@ -75,4 +75,4 @@
} // namespace tint::ast::transform
-#endif // SRC_TINT_AST_TRANSFORM_BINDING_REMAPPER_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_BINDING_REMAPPER_H_
diff --git a/src/tint/ast/transform/binding_remapper_test.cc b/src/tint/lang/wgsl/ast/transform/binding_remapper_test.cc
similarity index 98%
rename from src/tint/ast/transform/binding_remapper_test.cc
rename to src/tint/lang/wgsl/ast/transform/binding_remapper_test.cc
index 023b919..354f0ab 100644
--- a/src/tint/ast/transform/binding_remapper_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/binding_remapper_test.cc
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/binding_remapper.h"
+#include "src/tint/lang/wgsl/ast/transform/binding_remapper.h"
#include <utility>
-#include "src/tint/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/ast/transform/builtin_polyfill.cc b/src/tint/lang/wgsl/ast/transform/builtin_polyfill.cc
similarity index 99%
rename from src/tint/ast/transform/builtin_polyfill.cc
rename to src/tint/lang/wgsl/ast/transform/builtin_polyfill.cc
index 01b9f65..aa6e0d6 100644
--- a/src/tint/ast/transform/builtin_polyfill.cc
+++ b/src/tint/lang/wgsl/ast/transform/builtin_polyfill.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/builtin_polyfill.h"
+#include "src/tint/lang/wgsl/ast/transform/builtin_polyfill.h"
#include <algorithm>
#include <tuple>
diff --git a/src/tint/ast/transform/builtin_polyfill.h b/src/tint/lang/wgsl/ast/transform/builtin_polyfill.h
similarity index 94%
rename from src/tint/ast/transform/builtin_polyfill.h
rename to src/tint/lang/wgsl/ast/transform/builtin_polyfill.h
index 1973d9e..0bdf89f 100644
--- a/src/tint/ast/transform/builtin_polyfill.h
+++ b/src/tint/lang/wgsl/ast/transform/builtin_polyfill.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TRANSFORM_BUILTIN_POLYFILL_H_
-#define SRC_TINT_AST_TRANSFORM_BUILTIN_POLYFILL_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_BUILTIN_POLYFILL_H_
+#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_BUILTIN_POLYFILL_H_
-#include "src/tint/ast/transform/transform.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
namespace tint::ast::transform {
@@ -115,4 +115,4 @@
} // namespace tint::ast::transform
-#endif // SRC_TINT_AST_TRANSFORM_BUILTIN_POLYFILL_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_BUILTIN_POLYFILL_H_
diff --git a/src/tint/ast/transform/builtin_polyfill_test.cc b/src/tint/lang/wgsl/ast/transform/builtin_polyfill_test.cc
similarity index 99%
rename from src/tint/ast/transform/builtin_polyfill_test.cc
rename to src/tint/lang/wgsl/ast/transform/builtin_polyfill_test.cc
index 668c4fc..505632e 100644
--- a/src/tint/ast/transform/builtin_polyfill_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/builtin_polyfill_test.cc
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/builtin_polyfill.h"
+#include "src/tint/lang/wgsl/ast/transform/builtin_polyfill.h"
#include <utility>
-#include "src/tint/ast/transform/direct_variable_access.h"
-#include "src/tint/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/direct_variable_access.h"
+#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/ast/transform/calculate_array_length.cc b/src/tint/lang/wgsl/ast/transform/calculate_array_length.cc
similarity index 97%
rename from src/tint/ast/transform/calculate_array_length.cc
rename to src/tint/lang/wgsl/ast/transform/calculate_array_length.cc
index 9ce16da..7844aca 100644
--- a/src/tint/ast/transform/calculate_array_length.cc
+++ b/src/tint/lang/wgsl/ast/transform/calculate_array_length.cc
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/calculate_array_length.h"
+#include "src/tint/lang/wgsl/ast/transform/calculate_array_length.h"
#include <unordered_map>
#include <utility>
-#include "src/tint/ast/call_statement.h"
-#include "src/tint/ast/disable_validation_attribute.h"
-#include "src/tint/ast/transform/simplify_pointers.h"
+#include "src/tint/lang/wgsl/ast/call_statement.h"
+#include "src/tint/lang/wgsl/ast/disable_validation_attribute.h"
+#include "src/tint/lang/wgsl/ast/transform/simplify_pointers.h"
#include "src/tint/program_builder.h"
#include "src/tint/sem/block_statement.h"
#include "src/tint/sem/call.h"
diff --git a/src/tint/ast/transform/calculate_array_length.h b/src/tint/lang/wgsl/ast/transform/calculate_array_length.h
similarity index 87%
rename from src/tint/ast/transform/calculate_array_length.h
rename to src/tint/lang/wgsl/ast/transform/calculate_array_length.h
index cab9c24..c9139ff 100644
--- a/src/tint/ast/transform/calculate_array_length.h
+++ b/src/tint/lang/wgsl/ast/transform/calculate_array_length.h
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TRANSFORM_CALCULATE_ARRAY_LENGTH_H_
-#define SRC_TINT_AST_TRANSFORM_CALCULATE_ARRAY_LENGTH_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_CALCULATE_ARRAY_LENGTH_H_
+#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_CALCULATE_ARRAY_LENGTH_H_
#include <string>
-#include "src/tint/ast/internal_attribute.h"
-#include "src/tint/ast/transform/transform.h"
+#include "src/tint/lang/wgsl/ast/internal_attribute.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
// Forward declarations
namespace tint {
@@ -68,4 +68,4 @@
} // namespace tint::ast::transform
-#endif // SRC_TINT_AST_TRANSFORM_CALCULATE_ARRAY_LENGTH_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_CALCULATE_ARRAY_LENGTH_H_
diff --git a/src/tint/ast/transform/calculate_array_length_test.cc b/src/tint/lang/wgsl/ast/transform/calculate_array_length_test.cc
similarity index 97%
rename from src/tint/ast/transform/calculate_array_length_test.cc
rename to src/tint/lang/wgsl/ast/transform/calculate_array_length_test.cc
index 5930540..38115a2 100644
--- a/src/tint/ast/transform/calculate_array_length_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/calculate_array_length_test.cc
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/calculate_array_length.h"
+#include "src/tint/lang/wgsl/ast/transform/calculate_array_length.h"
-#include "src/tint/ast/transform/simplify_pointers.h"
-#include "src/tint/ast/transform/test_helper.h"
-#include "src/tint/ast/transform/unshadow.h"
+#include "src/tint/lang/wgsl/ast/transform/simplify_pointers.h"
+#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/unshadow.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/ast/transform/canonicalize_entry_point_io.cc b/src/tint/lang/wgsl/ast/transform/canonicalize_entry_point_io.cc
similarity index 99%
rename from src/tint/ast/transform/canonicalize_entry_point_io.cc
rename to src/tint/lang/wgsl/ast/transform/canonicalize_entry_point_io.cc
index 6662688..de1c5f5 100644
--- a/src/tint/ast/transform/canonicalize_entry_point_io.cc
+++ b/src/tint/lang/wgsl/ast/transform/canonicalize_entry_point_io.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/canonicalize_entry_point_io.h"
+#include "src/tint/lang/wgsl/ast/transform/canonicalize_entry_point_io.h"
#include <algorithm>
#include <string>
@@ -20,9 +20,9 @@
#include <utility>
#include <vector>
-#include "src/tint/ast/disable_validation_attribute.h"
-#include "src/tint/ast/transform/unshadow.h"
#include "src/tint/builtin/builtin_value.h"
+#include "src/tint/lang/wgsl/ast/disable_validation_attribute.h"
+#include "src/tint/lang/wgsl/ast/transform/unshadow.h"
#include "src/tint/program_builder.h"
#include "src/tint/sem/function.h"
diff --git a/src/tint/ast/transform/canonicalize_entry_point_io.h b/src/tint/lang/wgsl/ast/transform/canonicalize_entry_point_io.h
similarity index 93%
rename from src/tint/ast/transform/canonicalize_entry_point_io.h
rename to src/tint/lang/wgsl/ast/transform/canonicalize_entry_point_io.h
index 3ee9ea6..02d4acf 100644
--- a/src/tint/ast/transform/canonicalize_entry_point_io.h
+++ b/src/tint/lang/wgsl/ast/transform/canonicalize_entry_point_io.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TRANSFORM_CANONICALIZE_ENTRY_POINT_IO_H_
-#define SRC_TINT_AST_TRANSFORM_CANONICALIZE_ENTRY_POINT_IO_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_CANONICALIZE_ENTRY_POINT_IO_H_
+#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_CANONICALIZE_ENTRY_POINT_IO_H_
-#include "src/tint/ast/transform/transform.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
namespace tint::ast::transform {
@@ -138,4 +138,4 @@
} // namespace tint::ast::transform
-#endif // SRC_TINT_AST_TRANSFORM_CANONICALIZE_ENTRY_POINT_IO_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_CANONICALIZE_ENTRY_POINT_IO_H_
diff --git a/src/tint/ast/transform/canonicalize_entry_point_io_test.cc b/src/tint/lang/wgsl/ast/transform/canonicalize_entry_point_io_test.cc
similarity index 99%
rename from src/tint/ast/transform/canonicalize_entry_point_io_test.cc
rename to src/tint/lang/wgsl/ast/transform/canonicalize_entry_point_io_test.cc
index 8a5dc05..d969c98 100644
--- a/src/tint/ast/transform/canonicalize_entry_point_io_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/canonicalize_entry_point_io_test.cc
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/canonicalize_entry_point_io.h"
+#include "src/tint/lang/wgsl/ast/transform/canonicalize_entry_point_io.h"
-#include "src/tint/ast/transform/test_helper.h"
-#include "src/tint/ast/transform/unshadow.h"
+#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/unshadow.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/ast/transform/clamp_frag_depth.cc b/src/tint/lang/wgsl/ast/transform/clamp_frag_depth.cc
similarity index 96%
rename from src/tint/ast/transform/clamp_frag_depth.cc
rename to src/tint/lang/wgsl/ast/transform/clamp_frag_depth.cc
index 1e12b1d..6910727 100644
--- a/src/tint/ast/transform/clamp_frag_depth.cc
+++ b/src/tint/lang/wgsl/ast/transform/clamp_frag_depth.cc
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/clamp_frag_depth.h"
+#include "src/tint/lang/wgsl/ast/transform/clamp_frag_depth.h"
#include <utility>
-#include "src/tint/ast/attribute.h"
-#include "src/tint/ast/builtin_attribute.h"
-#include "src/tint/ast/function.h"
-#include "src/tint/ast/module.h"
-#include "src/tint/ast/struct.h"
#include "src/tint/builtin/builtin_value.h"
+#include "src/tint/lang/wgsl/ast/attribute.h"
+#include "src/tint/lang/wgsl/ast/builtin_attribute.h"
+#include "src/tint/lang/wgsl/ast/function.h"
+#include "src/tint/lang/wgsl/ast/module.h"
+#include "src/tint/lang/wgsl/ast/struct.h"
#include "src/tint/program_builder.h"
#include "src/tint/sem/function.h"
#include "src/tint/sem/statement.h"
diff --git a/src/tint/ast/transform/clamp_frag_depth.h b/src/tint/lang/wgsl/ast/transform/clamp_frag_depth.h
similarity index 88%
rename from src/tint/ast/transform/clamp_frag_depth.h
rename to src/tint/lang/wgsl/ast/transform/clamp_frag_depth.h
index 3ba8b2f..0338dbd 100644
--- a/src/tint/ast/transform/clamp_frag_depth.h
+++ b/src/tint/lang/wgsl/ast/transform/clamp_frag_depth.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TRANSFORM_CLAMP_FRAG_DEPTH_H_
-#define SRC_TINT_AST_TRANSFORM_CLAMP_FRAG_DEPTH_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_CLAMP_FRAG_DEPTH_H_
+#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_CLAMP_FRAG_DEPTH_H_
-#include "src/tint/ast/transform/transform.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
// Forward declarations
namespace tint {
@@ -72,4 +72,4 @@
} // namespace tint::ast::transform
-#endif // SRC_TINT_AST_TRANSFORM_CLAMP_FRAG_DEPTH_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_CLAMP_FRAG_DEPTH_H_
diff --git a/src/tint/ast/transform/clamp_frag_depth_test.cc b/src/tint/lang/wgsl/ast/transform/clamp_frag_depth_test.cc
similarity index 98%
rename from src/tint/ast/transform/clamp_frag_depth_test.cc
rename to src/tint/lang/wgsl/ast/transform/clamp_frag_depth_test.cc
index 7a0ac9f..d2d567d 100644
--- a/src/tint/ast/transform/clamp_frag_depth_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/clamp_frag_depth_test.cc
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/clamp_frag_depth.h"
+#include "src/tint/lang/wgsl/ast/transform/clamp_frag_depth.h"
-#include "src/tint/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/ast/transform/combine_samplers.cc b/src/tint/lang/wgsl/ast/transform/combine_samplers.cc
similarity index 99%
rename from src/tint/ast/transform/combine_samplers.cc
rename to src/tint/lang/wgsl/ast/transform/combine_samplers.cc
index e3a3d82..2e6775f 100644
--- a/src/tint/ast/transform/combine_samplers.cc
+++ b/src/tint/lang/wgsl/ast/transform/combine_samplers.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/combine_samplers.h"
+#include "src/tint/lang/wgsl/ast/transform/combine_samplers.h"
#include <string>
#include <unordered_map>
diff --git a/src/tint/ast/transform/combine_samplers.h b/src/tint/lang/wgsl/ast/transform/combine_samplers.h
similarity index 93%
rename from src/tint/ast/transform/combine_samplers.h
rename to src/tint/lang/wgsl/ast/transform/combine_samplers.h
index f9de2e7..ffc793d 100644
--- a/src/tint/ast/transform/combine_samplers.h
+++ b/src/tint/lang/wgsl/ast/transform/combine_samplers.h
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TRANSFORM_COMBINE_SAMPLERS_H_
-#define SRC_TINT_AST_TRANSFORM_COMBINE_SAMPLERS_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_COMBINE_SAMPLERS_H_
+#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_COMBINE_SAMPLERS_H_
#include <string>
#include <unordered_map>
-#include "src/tint/ast/transform/transform.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
#include "src/tint/sem/sampler_texture_pair.h"
namespace tint::ast::transform {
@@ -99,4 +99,4 @@
} // namespace tint::ast::transform
-#endif // SRC_TINT_AST_TRANSFORM_COMBINE_SAMPLERS_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_COMBINE_SAMPLERS_H_
diff --git a/src/tint/ast/transform/combine_samplers_test.cc b/src/tint/lang/wgsl/ast/transform/combine_samplers_test.cc
similarity index 99%
rename from src/tint/ast/transform/combine_samplers_test.cc
rename to src/tint/lang/wgsl/ast/transform/combine_samplers_test.cc
index fa74b8a..6308232 100644
--- a/src/tint/ast/transform/combine_samplers_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/combine_samplers_test.cc
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/combine_samplers.h"
+#include "src/tint/lang/wgsl/ast/transform/combine_samplers.h"
#include <memory>
#include <utility>
-#include "src/tint/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/ast/transform/decompose_memory_access.cc b/src/tint/lang/wgsl/ast/transform/decompose_memory_access.cc
similarity index 99%
rename from src/tint/ast/transform/decompose_memory_access.cc
rename to src/tint/lang/wgsl/ast/transform/decompose_memory_access.cc
index c1b606c..b4a06c7 100644
--- a/src/tint/ast/transform/decompose_memory_access.cc
+++ b/src/tint/lang/wgsl/ast/transform/decompose_memory_access.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/decompose_memory_access.h"
+#include "src/tint/lang/wgsl/ast/transform/decompose_memory_access.h"
#include <memory>
#include <string>
@@ -20,10 +20,10 @@
#include <utility>
#include <vector>
-#include "src/tint/ast/assignment_statement.h"
-#include "src/tint/ast/call_statement.h"
-#include "src/tint/ast/disable_validation_attribute.h"
-#include "src/tint/ast/unary_op.h"
+#include "src/tint/lang/wgsl/ast/assignment_statement.h"
+#include "src/tint/lang/wgsl/ast/call_statement.h"
+#include "src/tint/lang/wgsl/ast/disable_validation_attribute.h"
+#include "src/tint/lang/wgsl/ast/unary_op.h"
#include "src/tint/program_builder.h"
#include "src/tint/sem/call.h"
#include "src/tint/sem/member_accessor_expression.h"
diff --git a/src/tint/ast/transform/decompose_memory_access.h b/src/tint/lang/wgsl/ast/transform/decompose_memory_access.h
similarity index 92%
rename from src/tint/ast/transform/decompose_memory_access.h
rename to src/tint/lang/wgsl/ast/transform/decompose_memory_access.h
index 21d7cb7..9b02195 100644
--- a/src/tint/ast/transform/decompose_memory_access.h
+++ b/src/tint/lang/wgsl/ast/transform/decompose_memory_access.h
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TRANSFORM_DECOMPOSE_MEMORY_ACCESS_H_
-#define SRC_TINT_AST_TRANSFORM_DECOMPOSE_MEMORY_ACCESS_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_DECOMPOSE_MEMORY_ACCESS_H_
+#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_DECOMPOSE_MEMORY_ACCESS_H_
#include <string>
-#include "src/tint/ast/internal_attribute.h"
-#include "src/tint/ast/transform/transform.h"
+#include "src/tint/lang/wgsl/ast/internal_attribute.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
// Forward declarations
namespace tint {
@@ -131,4 +131,4 @@
} // namespace tint::ast::transform
-#endif // SRC_TINT_AST_TRANSFORM_DECOMPOSE_MEMORY_ACCESS_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_DECOMPOSE_MEMORY_ACCESS_H_
diff --git a/src/tint/ast/transform/decompose_memory_access_test.cc b/src/tint/lang/wgsl/ast/transform/decompose_memory_access_test.cc
similarity index 99%
rename from src/tint/ast/transform/decompose_memory_access_test.cc
rename to src/tint/lang/wgsl/ast/transform/decompose_memory_access_test.cc
index 3bff4a8..8f77635 100644
--- a/src/tint/ast/transform/decompose_memory_access_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/decompose_memory_access_test.cc
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/decompose_memory_access.h"
+#include "src/tint/lang/wgsl/ast/transform/decompose_memory_access.h"
-#include "src/tint/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/ast/transform/decompose_strided_array.cc b/src/tint/lang/wgsl/ast/transform/decompose_strided_array.cc
similarity index 97%
rename from src/tint/ast/transform/decompose_strided_array.cc
rename to src/tint/lang/wgsl/ast/transform/decompose_strided_array.cc
index 130c528..08dec78 100644
--- a/src/tint/ast/transform/decompose_strided_array.cc
+++ b/src/tint/lang/wgsl/ast/transform/decompose_strided_array.cc
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/decompose_strided_array.h"
+#include "src/tint/lang/wgsl/ast/transform/decompose_strided_array.h"
#include <unordered_map>
#include <utility>
#include <vector>
-#include "src/tint/ast/transform/simplify_pointers.h"
+#include "src/tint/lang/wgsl/ast/transform/simplify_pointers.h"
#include "src/tint/program_builder.h"
#include "src/tint/sem/call.h"
#include "src/tint/sem/member_accessor_expression.h"
diff --git a/src/tint/ast/transform/decompose_strided_array.h b/src/tint/lang/wgsl/ast/transform/decompose_strided_array.h
similarity index 84%
rename from src/tint/ast/transform/decompose_strided_array.h
rename to src/tint/lang/wgsl/ast/transform/decompose_strided_array.h
index a9d10cc..2839672 100644
--- a/src/tint/ast/transform/decompose_strided_array.h
+++ b/src/tint/lang/wgsl/ast/transform/decompose_strided_array.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TRANSFORM_DECOMPOSE_STRIDED_ARRAY_H_
-#define SRC_TINT_AST_TRANSFORM_DECOMPOSE_STRIDED_ARRAY_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_DECOMPOSE_STRIDED_ARRAY_H_
+#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_DECOMPOSE_STRIDED_ARRAY_H_
-#include "src/tint/ast/transform/transform.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
namespace tint::ast::transform {
@@ -43,4 +43,4 @@
} // namespace tint::ast::transform
-#endif // SRC_TINT_AST_TRANSFORM_DECOMPOSE_STRIDED_ARRAY_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_DECOMPOSE_STRIDED_ARRAY_H_
diff --git a/src/tint/ast/transform/decompose_strided_array_test.cc b/src/tint/lang/wgsl/ast/transform/decompose_strided_array_test.cc
similarity index 98%
rename from src/tint/ast/transform/decompose_strided_array_test.cc
rename to src/tint/lang/wgsl/ast/transform/decompose_strided_array_test.cc
index 28ac32a..18a1208 100644
--- a/src/tint/ast/transform/decompose_strided_array_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/decompose_strided_array_test.cc
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/decompose_strided_array.h"
+#include "src/tint/lang/wgsl/ast/transform/decompose_strided_array.h"
#include <memory>
#include <utility>
#include <vector>
-#include "src/tint/ast/transform/simplify_pointers.h"
-#include "src/tint/ast/transform/test_helper.h"
-#include "src/tint/ast/transform/unshadow.h"
+#include "src/tint/lang/wgsl/ast/transform/simplify_pointers.h"
+#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/unshadow.h"
#include "src/tint/program_builder.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/ast/transform/decompose_strided_matrix.cc b/src/tint/lang/wgsl/ast/transform/decompose_strided_matrix.cc
similarity index 98%
rename from src/tint/ast/transform/decompose_strided_matrix.cc
rename to src/tint/lang/wgsl/ast/transform/decompose_strided_matrix.cc
index 0eb04cb..fc7a6d4 100644
--- a/src/tint/ast/transform/decompose_strided_matrix.cc
+++ b/src/tint/lang/wgsl/ast/transform/decompose_strided_matrix.cc
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/decompose_strided_matrix.h"
+#include "src/tint/lang/wgsl/ast/transform/decompose_strided_matrix.h"
#include <unordered_map>
#include <utility>
#include <vector>
-#include "src/tint/ast/transform/simplify_pointers.h"
+#include "src/tint/lang/wgsl/ast/transform/simplify_pointers.h"
#include "src/tint/program_builder.h"
#include "src/tint/sem/member_accessor_expression.h"
#include "src/tint/sem/value_expression.h"
diff --git a/src/tint/ast/transform/decompose_strided_matrix.h b/src/tint/lang/wgsl/ast/transform/decompose_strided_matrix.h
similarity index 84%
rename from src/tint/ast/transform/decompose_strided_matrix.h
rename to src/tint/lang/wgsl/ast/transform/decompose_strided_matrix.h
index 2fa6324..5036313 100644
--- a/src/tint/ast/transform/decompose_strided_matrix.h
+++ b/src/tint/lang/wgsl/ast/transform/decompose_strided_matrix.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TRANSFORM_DECOMPOSE_STRIDED_MATRIX_H_
-#define SRC_TINT_AST_TRANSFORM_DECOMPOSE_STRIDED_MATRIX_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_DECOMPOSE_STRIDED_MATRIX_H_
+#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_DECOMPOSE_STRIDED_MATRIX_H_
-#include "src/tint/ast/transform/transform.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
namespace tint::ast::transform {
@@ -43,4 +43,4 @@
} // namespace tint::ast::transform
-#endif // SRC_TINT_AST_TRANSFORM_DECOMPOSE_STRIDED_MATRIX_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_DECOMPOSE_STRIDED_MATRIX_H_
diff --git a/src/tint/ast/transform/decompose_strided_matrix_test.cc b/src/tint/lang/wgsl/ast/transform/decompose_strided_matrix_test.cc
similarity index 98%
rename from src/tint/ast/transform/decompose_strided_matrix_test.cc
rename to src/tint/lang/wgsl/ast/transform/decompose_strided_matrix_test.cc
index f1646ff..d9dcac7 100644
--- a/src/tint/ast/transform/decompose_strided_matrix_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/decompose_strided_matrix_test.cc
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/decompose_strided_matrix.h"
+#include "src/tint/lang/wgsl/ast/transform/decompose_strided_matrix.h"
#include <memory>
#include <utility>
#include <vector>
-#include "src/tint/ast/disable_validation_attribute.h"
-#include "src/tint/ast/transform/simplify_pointers.h"
-#include "src/tint/ast/transform/test_helper.h"
-#include "src/tint/ast/transform/unshadow.h"
+#include "src/tint/lang/wgsl/ast/disable_validation_attribute.h"
+#include "src/tint/lang/wgsl/ast/transform/simplify_pointers.h"
+#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/unshadow.h"
#include "src/tint/program_builder.h"
namespace tint::ast::transform {
diff --git a/src/tint/ast/transform/demote_to_helper.cc b/src/tint/lang/wgsl/ast/transform/demote_to_helper.cc
similarity index 98%
rename from src/tint/ast/transform/demote_to_helper.cc
rename to src/tint/lang/wgsl/ast/transform/demote_to_helper.cc
index 83bfee9..97a6670 100644
--- a/src/tint/ast/transform/demote_to_helper.cc
+++ b/src/tint/lang/wgsl/ast/transform/demote_to_helper.cc
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/demote_to_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/demote_to_helper.h"
#include <unordered_map>
#include <unordered_set>
#include <utility>
-#include "src/tint/ast/transform/utils/hoist_to_decl_before.h"
+#include "src/tint/lang/wgsl/ast/transform/utils/hoist_to_decl_before.h"
#include "src/tint/program_builder.h"
#include "src/tint/sem/block_statement.h"
#include "src/tint/sem/call.h"
diff --git a/src/tint/ast/transform/demote_to_helper.h b/src/tint/lang/wgsl/ast/transform/demote_to_helper.h
similarity index 86%
rename from src/tint/ast/transform/demote_to_helper.h
rename to src/tint/lang/wgsl/ast/transform/demote_to_helper.h
index a3529ec..3f1463f 100644
--- a/src/tint/ast/transform/demote_to_helper.h
+++ b/src/tint/lang/wgsl/ast/transform/demote_to_helper.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TRANSFORM_DEMOTE_TO_HELPER_H_
-#define SRC_TINT_AST_TRANSFORM_DEMOTE_TO_HELPER_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_DEMOTE_TO_HELPER_H_
+#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_DEMOTE_TO_HELPER_H_
-#include "src/tint/ast/transform/transform.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
namespace tint::ast::transform {
@@ -44,4 +44,4 @@
} // namespace tint::ast::transform
-#endif // SRC_TINT_AST_TRANSFORM_DEMOTE_TO_HELPER_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_DEMOTE_TO_HELPER_H_
diff --git a/src/tint/ast/transform/demote_to_helper_test.cc b/src/tint/lang/wgsl/ast/transform/demote_to_helper_test.cc
similarity index 99%
rename from src/tint/ast/transform/demote_to_helper_test.cc
rename to src/tint/lang/wgsl/ast/transform/demote_to_helper_test.cc
index 6d9e698..526895f 100644
--- a/src/tint/ast/transform/demote_to_helper_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/demote_to_helper_test.cc
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/demote_to_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/demote_to_helper.h"
#include <utility>
-#include "src/tint/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/ast/transform/direct_variable_access.cc b/src/tint/lang/wgsl/ast/transform/direct_variable_access.cc
similarity index 99%
rename from src/tint/ast/transform/direct_variable_access.cc
rename to src/tint/lang/wgsl/ast/transform/direct_variable_access.cc
index dd250a5..2e39b11 100644
--- a/src/tint/ast/transform/direct_variable_access.cc
+++ b/src/tint/lang/wgsl/ast/transform/direct_variable_access.cc
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/direct_variable_access.h"
+#include "src/tint/lang/wgsl/ast/transform/direct_variable_access.h"
#include <algorithm>
#include <string>
#include <utility>
-#include "src/tint/ast/transform/utils/hoist_to_decl_before.h"
-#include "src/tint/ast/traverse_expressions.h"
+#include "src/tint/lang/wgsl/ast/transform/utils/hoist_to_decl_before.h"
+#include "src/tint/lang/wgsl/ast/traverse_expressions.h"
#include "src/tint/program_builder.h"
#include "src/tint/sem/call.h"
#include "src/tint/sem/function.h"
diff --git a/src/tint/ast/transform/direct_variable_access.h b/src/tint/lang/wgsl/ast/transform/direct_variable_access.h
similarity index 89%
rename from src/tint/ast/transform/direct_variable_access.h
rename to src/tint/lang/wgsl/ast/transform/direct_variable_access.h
index adf8d94..eb9dbc6 100644
--- a/src/tint/ast/transform/direct_variable_access.h
+++ b/src/tint/lang/wgsl/ast/transform/direct_variable_access.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TRANSFORM_DIRECT_VARIABLE_ACCESS_H_
-#define SRC_TINT_AST_TRANSFORM_DIRECT_VARIABLE_ACCESS_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_DIRECT_VARIABLE_ACCESS_H_
+#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_DIRECT_VARIABLE_ACCESS_H_
-#include "src/tint/ast/transform/transform.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
namespace tint::ast::transform {
@@ -29,7 +29,7 @@
/// unique variable. Calls to specialized functions are transformed so that the pointer arguments
/// are replaced with an array of access-chain indicies, and if the pointer is in the 'function' or
/// 'private' address space, also with a pointer to the root object. For more information, see the
-/// comments in src/tint/ast/transform/direct_variable_access.cc.
+/// comments in src/tint/lang/wgsl/ast/transform/direct_variable_access.cc.
///
/// @note DirectVariableAccess requires the transform::Unshadow transform to have been run first.
class DirectVariableAccess final : public utils::Castable<DirectVariableAccess, Transform> {
@@ -71,4 +71,4 @@
} // namespace tint::ast::transform
-#endif // SRC_TINT_AST_TRANSFORM_DIRECT_VARIABLE_ACCESS_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_DIRECT_VARIABLE_ACCESS_H_
diff --git a/src/tint/ast/transform/direct_variable_access_test.cc b/src/tint/lang/wgsl/ast/transform/direct_variable_access_test.cc
similarity index 99%
rename from src/tint/ast/transform/direct_variable_access_test.cc
rename to src/tint/lang/wgsl/ast/transform/direct_variable_access_test.cc
index ecc8843..992a89f 100644
--- a/src/tint/ast/transform/direct_variable_access_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/direct_variable_access_test.cc
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/direct_variable_access.h"
+#include "src/tint/lang/wgsl/ast/transform/direct_variable_access.h"
#include <memory>
#include <utility>
-#include "src/tint/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
#include "src/tint/utils/string.h"
namespace tint::ast::transform {
diff --git a/src/tint/ast/transform/disable_uniformity_analysis.cc b/src/tint/lang/wgsl/ast/transform/disable_uniformity_analysis.cc
similarity index 95%
rename from src/tint/ast/transform/disable_uniformity_analysis.cc
rename to src/tint/lang/wgsl/ast/transform/disable_uniformity_analysis.cc
index 8e3a780..d02d9de 100644
--- a/src/tint/ast/transform/disable_uniformity_analysis.cc
+++ b/src/tint/lang/wgsl/ast/transform/disable_uniformity_analysis.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/disable_uniformity_analysis.h"
+#include "src/tint/lang/wgsl/ast/transform/disable_uniformity_analysis.h"
#include <utility>
diff --git a/src/tint/ast/transform/disable_uniformity_analysis.h b/src/tint/lang/wgsl/ast/transform/disable_uniformity_analysis.h
similarity index 80%
rename from src/tint/ast/transform/disable_uniformity_analysis.h
rename to src/tint/lang/wgsl/ast/transform/disable_uniformity_analysis.h
index 5e53303..4205acd 100644
--- a/src/tint/ast/transform/disable_uniformity_analysis.h
+++ b/src/tint/lang/wgsl/ast/transform/disable_uniformity_analysis.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TRANSFORM_DISABLE_UNIFORMITY_ANALYSIS_H_
-#define SRC_TINT_AST_TRANSFORM_DISABLE_UNIFORMITY_ANALYSIS_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_DISABLE_UNIFORMITY_ANALYSIS_H_
+#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_DISABLE_UNIFORMITY_ANALYSIS_H_
-#include "src/tint/ast/transform/transform.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
namespace tint::ast::transform {
@@ -36,4 +36,4 @@
} // namespace tint::ast::transform
-#endif // SRC_TINT_AST_TRANSFORM_DISABLE_UNIFORMITY_ANALYSIS_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_DISABLE_UNIFORMITY_ANALYSIS_H_
diff --git a/src/tint/ast/transform/disable_uniformity_analysis_test.cc b/src/tint/lang/wgsl/ast/transform/disable_uniformity_analysis_test.cc
similarity index 92%
rename from src/tint/ast/transform/disable_uniformity_analysis_test.cc
rename to src/tint/lang/wgsl/ast/transform/disable_uniformity_analysis_test.cc
index 4c6f4bf..2791562 100644
--- a/src/tint/ast/transform/disable_uniformity_analysis_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/disable_uniformity_analysis_test.cc
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/disable_uniformity_analysis.h"
+#include "src/tint/lang/wgsl/ast/transform/disable_uniformity_analysis.h"
#include <string>
#include <utility>
-#include "src/tint/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/ast/transform/expand_compound_assignment.cc b/src/tint/lang/wgsl/ast/transform/expand_compound_assignment.cc
similarity index 96%
rename from src/tint/ast/transform/expand_compound_assignment.cc
rename to src/tint/lang/wgsl/ast/transform/expand_compound_assignment.cc
index f793418..b9e17a4 100644
--- a/src/tint/ast/transform/expand_compound_assignment.cc
+++ b/src/tint/lang/wgsl/ast/transform/expand_compound_assignment.cc
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/expand_compound_assignment.h"
+#include "src/tint/lang/wgsl/ast/transform/expand_compound_assignment.h"
#include <utility>
-#include "src/tint/ast/compound_assignment_statement.h"
-#include "src/tint/ast/increment_decrement_statement.h"
-#include "src/tint/ast/transform/utils/hoist_to_decl_before.h"
+#include "src/tint/lang/wgsl/ast/compound_assignment_statement.h"
+#include "src/tint/lang/wgsl/ast/increment_decrement_statement.h"
+#include "src/tint/lang/wgsl/ast/transform/utils/hoist_to_decl_before.h"
#include "src/tint/program_builder.h"
#include "src/tint/sem/block_statement.h"
#include "src/tint/sem/for_loop_statement.h"
diff --git a/src/tint/ast/transform/expand_compound_assignment.h b/src/tint/lang/wgsl/ast/transform/expand_compound_assignment.h
similarity index 85%
rename from src/tint/ast/transform/expand_compound_assignment.h
rename to src/tint/lang/wgsl/ast/transform/expand_compound_assignment.h
index 8da91b5..ff43727 100644
--- a/src/tint/ast/transform/expand_compound_assignment.h
+++ b/src/tint/lang/wgsl/ast/transform/expand_compound_assignment.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TRANSFORM_EXPAND_COMPOUND_ASSIGNMENT_H_
-#define SRC_TINT_AST_TRANSFORM_EXPAND_COMPOUND_ASSIGNMENT_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_EXPAND_COMPOUND_ASSIGNMENT_H_
+#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_EXPAND_COMPOUND_ASSIGNMENT_H_
-#include "src/tint/ast/transform/transform.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
namespace tint::ast::transform {
@@ -56,4 +56,4 @@
} // namespace tint::ast::transform
-#endif // SRC_TINT_AST_TRANSFORM_EXPAND_COMPOUND_ASSIGNMENT_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_EXPAND_COMPOUND_ASSIGNMENT_H_
diff --git a/src/tint/ast/transform/expand_compound_assignment_test.cc b/src/tint/lang/wgsl/ast/transform/expand_compound_assignment_test.cc
similarity index 98%
rename from src/tint/ast/transform/expand_compound_assignment_test.cc
rename to src/tint/lang/wgsl/ast/transform/expand_compound_assignment_test.cc
index 179a6f8..0c2f880 100644
--- a/src/tint/ast/transform/expand_compound_assignment_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/expand_compound_assignment_test.cc
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/expand_compound_assignment.h"
+#include "src/tint/lang/wgsl/ast/transform/expand_compound_assignment.h"
#include <utility>
-#include "src/tint/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/ast/transform/first_index_offset.cc b/src/tint/lang/wgsl/ast/transform/first_index_offset.cc
similarity index 98%
rename from src/tint/ast/transform/first_index_offset.cc
rename to src/tint/lang/wgsl/ast/transform/first_index_offset.cc
index dd28585..c570a6d 100644
--- a/src/tint/ast/transform/first_index_offset.cc
+++ b/src/tint/lang/wgsl/ast/transform/first_index_offset.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/first_index_offset.h"
+#include "src/tint/lang/wgsl/ast/transform/first_index_offset.h"
#include <memory>
#include <unordered_map>
diff --git a/src/tint/ast/transform/first_index_offset.h b/src/tint/lang/wgsl/ast/transform/first_index_offset.h
similarity index 93%
rename from src/tint/ast/transform/first_index_offset.h
rename to src/tint/lang/wgsl/ast/transform/first_index_offset.h
index c1dd512..68e5500 100644
--- a/src/tint/ast/transform/first_index_offset.h
+++ b/src/tint/lang/wgsl/ast/transform/first_index_offset.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TRANSFORM_FIRST_INDEX_OFFSET_H_
-#define SRC_TINT_AST_TRANSFORM_FIRST_INDEX_OFFSET_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_FIRST_INDEX_OFFSET_H_
+#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_FIRST_INDEX_OFFSET_H_
-#include "src/tint/ast/transform/transform.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
namespace tint::ast::transform {
@@ -117,4 +117,4 @@
} // namespace tint::ast::transform
-#endif // SRC_TINT_AST_TRANSFORM_FIRST_INDEX_OFFSET_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_FIRST_INDEX_OFFSET_H_
diff --git a/src/tint/ast/transform/first_index_offset_test.cc b/src/tint/lang/wgsl/ast/transform/first_index_offset_test.cc
similarity index 98%
rename from src/tint/ast/transform/first_index_offset_test.cc
rename to src/tint/lang/wgsl/ast/transform/first_index_offset_test.cc
index ce480e2..c186921 100644
--- a/src/tint/ast/transform/first_index_offset_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/first_index_offset_test.cc
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/first_index_offset.h"
+#include "src/tint/lang/wgsl/ast/transform/first_index_offset.h"
#include <memory>
#include <utility>
#include <vector>
-#include "src/tint/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/ast/transform/fold_trivial_lets.cc b/src/tint/lang/wgsl/ast/transform/fold_trivial_lets.cc
similarity index 97%
rename from src/tint/ast/transform/fold_trivial_lets.cc
rename to src/tint/lang/wgsl/ast/transform/fold_trivial_lets.cc
index 0cf0b7d..dbaac2a 100644
--- a/src/tint/ast/transform/fold_trivial_lets.cc
+++ b/src/tint/lang/wgsl/ast/transform/fold_trivial_lets.cc
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/fold_trivial_lets.h"
+#include "src/tint/lang/wgsl/ast/transform/fold_trivial_lets.h"
#include <utility>
-#include "src/tint/ast/traverse_expressions.h"
+#include "src/tint/lang/wgsl/ast/traverse_expressions.h"
#include "src/tint/program_builder.h"
#include "src/tint/sem/value_expression.h"
#include "src/tint/utils/hashmap.h"
diff --git a/src/tint/ast/transform/fold_trivial_lets.h b/src/tint/lang/wgsl/ast/transform/fold_trivial_lets.h
similarity index 84%
rename from src/tint/ast/transform/fold_trivial_lets.h
rename to src/tint/lang/wgsl/ast/transform/fold_trivial_lets.h
index 9fee63e..2ce8f12 100644
--- a/src/tint/ast/transform/fold_trivial_lets.h
+++ b/src/tint/lang/wgsl/ast/transform/fold_trivial_lets.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TRANSFORM_FOLD_TRIVIAL_LETS_H_
-#define SRC_TINT_AST_TRANSFORM_FOLD_TRIVIAL_LETS_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_FOLD_TRIVIAL_LETS_H_
+#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_FOLD_TRIVIAL_LETS_H_
-#include "src/tint/ast/transform/transform.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
namespace tint::ast::transform {
@@ -41,4 +41,4 @@
} // namespace tint::ast::transform
-#endif // SRC_TINT_AST_TRANSFORM_FOLD_TRIVIAL_LETS_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_FOLD_TRIVIAL_LETS_H_
diff --git a/src/tint/ast/transform/fold_trivial_lets_test.cc b/src/tint/lang/wgsl/ast/transform/fold_trivial_lets_test.cc
similarity index 97%
rename from src/tint/ast/transform/fold_trivial_lets_test.cc
rename to src/tint/lang/wgsl/ast/transform/fold_trivial_lets_test.cc
index c000c7a..9d9357f 100644
--- a/src/tint/ast/transform/fold_trivial_lets_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/fold_trivial_lets_test.cc
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/fold_trivial_lets.h"
+#include "src/tint/lang/wgsl/ast/transform/fold_trivial_lets.h"
-#include "src/tint/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/ast/transform/for_loop_to_loop.cc b/src/tint/lang/wgsl/ast/transform/for_loop_to_loop.cc
similarity index 95%
rename from src/tint/ast/transform/for_loop_to_loop.cc
rename to src/tint/lang/wgsl/ast/transform/for_loop_to_loop.cc
index 8b52e99..830703f 100644
--- a/src/tint/ast/transform/for_loop_to_loop.cc
+++ b/src/tint/lang/wgsl/ast/transform/for_loop_to_loop.cc
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/for_loop_to_loop.h"
+#include "src/tint/lang/wgsl/ast/transform/for_loop_to_loop.h"
#include <utility>
-#include "src/tint/ast/break_statement.h"
+#include "src/tint/lang/wgsl/ast/break_statement.h"
#include "src/tint/program_builder.h"
TINT_INSTANTIATE_TYPEINFO(tint::ast::transform::ForLoopToLoop);
diff --git a/src/tint/ast/transform/for_loop_to_loop.h b/src/tint/lang/wgsl/ast/transform/for_loop_to_loop.h
similarity index 82%
rename from src/tint/ast/transform/for_loop_to_loop.h
rename to src/tint/lang/wgsl/ast/transform/for_loop_to_loop.h
index 3d8536e..8d2ff51 100644
--- a/src/tint/ast/transform/for_loop_to_loop.h
+++ b/src/tint/lang/wgsl/ast/transform/for_loop_to_loop.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TRANSFORM_FOR_LOOP_TO_LOOP_H_
-#define SRC_TINT_AST_TRANSFORM_FOR_LOOP_TO_LOOP_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_FOR_LOOP_TO_LOOP_H_
+#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_FOR_LOOP_TO_LOOP_H_
-#include "src/tint/ast/transform/transform.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
namespace tint::ast::transform {
@@ -37,4 +37,4 @@
} // namespace tint::ast::transform
-#endif // SRC_TINT_AST_TRANSFORM_FOR_LOOP_TO_LOOP_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_FOR_LOOP_TO_LOOP_H_
diff --git a/src/tint/ast/transform/for_loop_to_loop_test.cc b/src/tint/lang/wgsl/ast/transform/for_loop_to_loop_test.cc
similarity index 97%
rename from src/tint/ast/transform/for_loop_to_loop_test.cc
rename to src/tint/lang/wgsl/ast/transform/for_loop_to_loop_test.cc
index cdfc28f..2beadb3 100644
--- a/src/tint/ast/transform/for_loop_to_loop_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/for_loop_to_loop_test.cc
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/for_loop_to_loop.h"
+#include "src/tint/lang/wgsl/ast/transform/for_loop_to_loop.h"
-#include "src/tint/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/ast/transform/localize_struct_array_assignment.cc b/src/tint/lang/wgsl/ast/transform/localize_struct_array_assignment.cc
similarity index 96%
rename from src/tint/ast/transform/localize_struct_array_assignment.cc
rename to src/tint/lang/wgsl/ast/transform/localize_struct_array_assignment.cc
index 286dd29..ccb6095 100644
--- a/src/tint/ast/transform/localize_struct_array_assignment.cc
+++ b/src/tint/lang/wgsl/ast/transform/localize_struct_array_assignment.cc
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/localize_struct_array_assignment.h"
+#include "src/tint/lang/wgsl/ast/transform/localize_struct_array_assignment.h"
#include <unordered_map>
#include <utility>
-#include "src/tint/ast/assignment_statement.h"
-#include "src/tint/ast/transform/simplify_pointers.h"
-#include "src/tint/ast/traverse_expressions.h"
+#include "src/tint/lang/wgsl/ast/assignment_statement.h"
+#include "src/tint/lang/wgsl/ast/transform/simplify_pointers.h"
+#include "src/tint/lang/wgsl/ast/traverse_expressions.h"
#include "src/tint/program_builder.h"
#include "src/tint/sem/member_accessor_expression.h"
#include "src/tint/sem/statement.h"
diff --git a/src/tint/ast/transform/localize_struct_array_assignment.h b/src/tint/lang/wgsl/ast/transform/localize_struct_array_assignment.h
similarity index 84%
rename from src/tint/ast/transform/localize_struct_array_assignment.h
rename to src/tint/lang/wgsl/ast/transform/localize_struct_array_assignment.h
index 5770e9f..0b62934 100644
--- a/src/tint/ast/transform/localize_struct_array_assignment.h
+++ b/src/tint/lang/wgsl/ast/transform/localize_struct_array_assignment.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TRANSFORM_LOCALIZE_STRUCT_ARRAY_ASSIGNMENT_H_
-#define SRC_TINT_AST_TRANSFORM_LOCALIZE_STRUCT_ARRAY_ASSIGNMENT_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_LOCALIZE_STRUCT_ARRAY_ASSIGNMENT_H_
+#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_LOCALIZE_STRUCT_ARRAY_ASSIGNMENT_H_
-#include "src/tint/ast/transform/transform.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
namespace tint::ast::transform {
@@ -47,4 +47,4 @@
} // namespace tint::ast::transform
-#endif // SRC_TINT_AST_TRANSFORM_LOCALIZE_STRUCT_ARRAY_ASSIGNMENT_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_LOCALIZE_STRUCT_ARRAY_ASSIGNMENT_H_
diff --git a/src/tint/ast/transform/localize_struct_array_assignment_test.cc b/src/tint/lang/wgsl/ast/transform/localize_struct_array_assignment_test.cc
similarity index 97%
rename from src/tint/ast/transform/localize_struct_array_assignment_test.cc
rename to src/tint/lang/wgsl/ast/transform/localize_struct_array_assignment_test.cc
index 85bbfed..268d85d 100644
--- a/src/tint/ast/transform/localize_struct_array_assignment_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/localize_struct_array_assignment_test.cc
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/localize_struct_array_assignment.h"
-#include "src/tint/ast/transform/simplify_pointers.h"
-#include "src/tint/ast/transform/unshadow.h"
+#include "src/tint/lang/wgsl/ast/transform/localize_struct_array_assignment.h"
+#include "src/tint/lang/wgsl/ast/transform/simplify_pointers.h"
+#include "src/tint/lang/wgsl/ast/transform/unshadow.h"
-#include "src/tint/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/ast/transform/merge_return.cc b/src/tint/lang/wgsl/ast/transform/merge_return.cc
similarity index 99%
rename from src/tint/ast/transform/merge_return.cc
rename to src/tint/lang/wgsl/ast/transform/merge_return.cc
index aa5d26a..d522300 100644
--- a/src/tint/ast/transform/merge_return.cc
+++ b/src/tint/lang/wgsl/ast/transform/merge_return.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/merge_return.h"
+#include "src/tint/lang/wgsl/ast/transform/merge_return.h"
#include <utility>
diff --git a/src/tint/ast/transform/merge_return.h b/src/tint/lang/wgsl/ast/transform/merge_return.h
similarity index 82%
rename from src/tint/ast/transform/merge_return.h
rename to src/tint/lang/wgsl/ast/transform/merge_return.h
index 4b11098..3d295b9 100644
--- a/src/tint/ast/transform/merge_return.h
+++ b/src/tint/lang/wgsl/ast/transform/merge_return.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TRANSFORM_MERGE_RETURN_H_
-#define SRC_TINT_AST_TRANSFORM_MERGE_RETURN_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_MERGE_RETURN_H_
+#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_MERGE_RETURN_H_
-#include "src/tint/ast/transform/transform.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
namespace tint::ast::transform {
@@ -35,4 +35,4 @@
} // namespace tint::ast::transform
-#endif // SRC_TINT_AST_TRANSFORM_MERGE_RETURN_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_MERGE_RETURN_H_
diff --git a/src/tint/ast/transform/merge_return_test.cc b/src/tint/lang/wgsl/ast/transform/merge_return_test.cc
similarity index 98%
rename from src/tint/ast/transform/merge_return_test.cc
rename to src/tint/lang/wgsl/ast/transform/merge_return_test.cc
index b7ec516..ad492e6 100644
--- a/src/tint/ast/transform/merge_return_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/merge_return_test.cc
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/merge_return.h"
+#include "src/tint/lang/wgsl/ast/transform/merge_return.h"
#include <utility>
-#include "src/tint/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/ast/transform/module_scope_var_to_entry_point_param.cc b/src/tint/lang/wgsl/ast/transform/module_scope_var_to_entry_point_param.cc
similarity index 99%
rename from src/tint/ast/transform/module_scope_var_to_entry_point_param.cc
rename to src/tint/lang/wgsl/ast/transform/module_scope_var_to_entry_point_param.cc
index 1392794..96658d8 100644
--- a/src/tint/ast/transform/module_scope_var_to_entry_point_param.cc
+++ b/src/tint/lang/wgsl/ast/transform/module_scope_var_to_entry_point_param.cc
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/module_scope_var_to_entry_point_param.h"
+#include "src/tint/lang/wgsl/ast/transform/module_scope_var_to_entry_point_param.h"
#include <unordered_map>
#include <unordered_set>
#include <utility>
#include <vector>
-#include "src/tint/ast/disable_validation_attribute.h"
+#include "src/tint/lang/wgsl/ast/disable_validation_attribute.h"
#include "src/tint/program_builder.h"
#include "src/tint/sem/call.h"
#include "src/tint/sem/function.h"
diff --git a/src/tint/ast/transform/module_scope_var_to_entry_point_param.h b/src/tint/lang/wgsl/ast/transform/module_scope_var_to_entry_point_param.h
similarity index 88%
rename from src/tint/ast/transform/module_scope_var_to_entry_point_param.h
rename to src/tint/lang/wgsl/ast/transform/module_scope_var_to_entry_point_param.h
index 258c24c..4136aa6 100644
--- a/src/tint/ast/transform/module_scope_var_to_entry_point_param.h
+++ b/src/tint/lang/wgsl/ast/transform/module_scope_var_to_entry_point_param.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TRANSFORM_MODULE_SCOPE_VAR_TO_ENTRY_POINT_PARAM_H_
-#define SRC_TINT_AST_TRANSFORM_MODULE_SCOPE_VAR_TO_ENTRY_POINT_PARAM_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_MODULE_SCOPE_VAR_TO_ENTRY_POINT_PARAM_H_
+#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_MODULE_SCOPE_VAR_TO_ENTRY_POINT_PARAM_H_
-#include "src/tint/ast/transform/transform.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
namespace tint::ast::transform {
@@ -80,4 +80,4 @@
} // namespace tint::ast::transform
-#endif // SRC_TINT_AST_TRANSFORM_MODULE_SCOPE_VAR_TO_ENTRY_POINT_PARAM_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_MODULE_SCOPE_VAR_TO_ENTRY_POINT_PARAM_H_
diff --git a/src/tint/ast/transform/module_scope_var_to_entry_point_param_test.cc b/src/tint/lang/wgsl/ast/transform/module_scope_var_to_entry_point_param_test.cc
similarity index 99%
rename from src/tint/ast/transform/module_scope_var_to_entry_point_param_test.cc
rename to src/tint/lang/wgsl/ast/transform/module_scope_var_to_entry_point_param_test.cc
index eb7f048..2689bb0 100644
--- a/src/tint/ast/transform/module_scope_var_to_entry_point_param_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/module_scope_var_to_entry_point_param_test.cc
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/module_scope_var_to_entry_point_param.h"
+#include "src/tint/lang/wgsl/ast/transform/module_scope_var_to_entry_point_param.h"
#include <utility>
-#include "src/tint/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/ast/transform/multiplanar_external_texture.cc b/src/tint/lang/wgsl/ast/transform/multiplanar_external_texture.cc
similarity index 99%
rename from src/tint/ast/transform/multiplanar_external_texture.cc
rename to src/tint/lang/wgsl/ast/transform/multiplanar_external_texture.cc
index db1ae5a..90f00a4 100644
--- a/src/tint/ast/transform/multiplanar_external_texture.cc
+++ b/src/tint/lang/wgsl/ast/transform/multiplanar_external_texture.cc
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/multiplanar_external_texture.h"
+#include "src/tint/lang/wgsl/ast/transform/multiplanar_external_texture.h"
#include <string>
#include <vector>
-#include "src/tint/ast/function.h"
+#include "src/tint/lang/wgsl/ast/function.h"
#include "src/tint/program_builder.h"
#include "src/tint/sem/call.h"
#include "src/tint/sem/function.h"
diff --git a/src/tint/ast/transform/multiplanar_external_texture.h b/src/tint/lang/wgsl/ast/transform/multiplanar_external_texture.h
similarity index 90%
rename from src/tint/ast/transform/multiplanar_external_texture.h
rename to src/tint/lang/wgsl/ast/transform/multiplanar_external_texture.h
index 69fc21e..e2b0d80 100644
--- a/src/tint/ast/transform/multiplanar_external_texture.h
+++ b/src/tint/lang/wgsl/ast/transform/multiplanar_external_texture.h
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TRANSFORM_MULTIPLANAR_EXTERNAL_TEXTURE_H_
-#define SRC_TINT_AST_TRANSFORM_MULTIPLANAR_EXTERNAL_TEXTURE_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_MULTIPLANAR_EXTERNAL_TEXTURE_H_
+#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_MULTIPLANAR_EXTERNAL_TEXTURE_H_
#include <unordered_map>
#include <utility>
-#include "src/tint/ast/struct_member.h"
-#include "src/tint/ast/transform/transform.h"
#include "src/tint/builtin/function.h"
+#include "src/tint/lang/wgsl/ast/struct_member.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
#include "src/tint/sem/binding_point.h"
#include "src/tint/sem/external_texture.h"
@@ -80,4 +80,4 @@
} // namespace tint::ast::transform
-#endif // SRC_TINT_AST_TRANSFORM_MULTIPLANAR_EXTERNAL_TEXTURE_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_MULTIPLANAR_EXTERNAL_TEXTURE_H_
diff --git a/src/tint/ast/transform/multiplanar_external_texture_test.cc b/src/tint/lang/wgsl/ast/transform/multiplanar_external_texture_test.cc
similarity index 99%
rename from src/tint/ast/transform/multiplanar_external_texture_test.cc
rename to src/tint/lang/wgsl/ast/transform/multiplanar_external_texture_test.cc
index 8acf254..cbe48e4 100644
--- a/src/tint/ast/transform/multiplanar_external_texture_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/multiplanar_external_texture_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/multiplanar_external_texture.h"
-#include "src/tint/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/multiplanar_external_texture.h"
+#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/ast/transform/num_workgroups_from_uniform.cc b/src/tint/lang/wgsl/ast/transform/num_workgroups_from_uniform.cc
similarity index 97%
rename from src/tint/ast/transform/num_workgroups_from_uniform.cc
rename to src/tint/lang/wgsl/ast/transform/num_workgroups_from_uniform.cc
index 54ecec5..6360631 100644
--- a/src/tint/ast/transform/num_workgroups_from_uniform.cc
+++ b/src/tint/lang/wgsl/ast/transform/num_workgroups_from_uniform.cc
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/num_workgroups_from_uniform.h"
+#include "src/tint/lang/wgsl/ast/transform/num_workgroups_from_uniform.h"
#include <memory>
#include <string>
#include <unordered_set>
#include <utility>
-#include "src/tint/ast/transform/canonicalize_entry_point_io.h"
#include "src/tint/builtin/builtin_value.h"
+#include "src/tint/lang/wgsl/ast/transform/canonicalize_entry_point_io.h"
#include "src/tint/program_builder.h"
#include "src/tint/sem/function.h"
#include "src/tint/utils/hash.h"
diff --git a/src/tint/ast/transform/num_workgroups_from_uniform.h b/src/tint/lang/wgsl/ast/transform/num_workgroups_from_uniform.h
similarity index 91%
rename from src/tint/ast/transform/num_workgroups_from_uniform.h
rename to src/tint/lang/wgsl/ast/transform/num_workgroups_from_uniform.h
index cecb03d..947ece5 100644
--- a/src/tint/ast/transform/num_workgroups_from_uniform.h
+++ b/src/tint/lang/wgsl/ast/transform/num_workgroups_from_uniform.h
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TRANSFORM_NUM_WORKGROUPS_FROM_UNIFORM_H_
-#define SRC_TINT_AST_TRANSFORM_NUM_WORKGROUPS_FROM_UNIFORM_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_NUM_WORKGROUPS_FROM_UNIFORM_H_
+#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_NUM_WORKGROUPS_FROM_UNIFORM_H_
#include <optional>
-#include "src/tint/ast/transform/transform.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
#include "src/tint/sem/binding_point.h"
// Forward declarations
@@ -80,4 +80,4 @@
} // namespace tint::ast::transform
-#endif // SRC_TINT_AST_TRANSFORM_NUM_WORKGROUPS_FROM_UNIFORM_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_NUM_WORKGROUPS_FROM_UNIFORM_H_
diff --git a/src/tint/ast/transform/num_workgroups_from_uniform_test.cc b/src/tint/lang/wgsl/ast/transform/num_workgroups_from_uniform_test.cc
similarity index 98%
rename from src/tint/ast/transform/num_workgroups_from_uniform_test.cc
rename to src/tint/lang/wgsl/ast/transform/num_workgroups_from_uniform_test.cc
index 2910655..b547355 100644
--- a/src/tint/ast/transform/num_workgroups_from_uniform_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/num_workgroups_from_uniform_test.cc
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/num_workgroups_from_uniform.h"
+#include "src/tint/lang/wgsl/ast/transform/num_workgroups_from_uniform.h"
#include <utility>
-#include "src/tint/ast/transform/canonicalize_entry_point_io.h"
-#include "src/tint/ast/transform/test_helper.h"
-#include "src/tint/ast/transform/unshadow.h"
+#include "src/tint/lang/wgsl/ast/transform/canonicalize_entry_point_io.h"
+#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/unshadow.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/ast/transform/packed_vec3.cc b/src/tint/lang/wgsl/ast/transform/packed_vec3.cc
similarity index 99%
rename from src/tint/ast/transform/packed_vec3.cc
rename to src/tint/lang/wgsl/ast/transform/packed_vec3.cc
index 126bb7b..da02d5b 100644
--- a/src/tint/ast/transform/packed_vec3.cc
+++ b/src/tint/lang/wgsl/ast/transform/packed_vec3.cc
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/packed_vec3.h"
+#include "src/tint/lang/wgsl/ast/transform/packed_vec3.h"
#include <algorithm>
#include <string>
#include <utility>
-#include "src/tint/ast/assignment_statement.h"
#include "src/tint/builtin/builtin.h"
+#include "src/tint/lang/wgsl/ast/assignment_statement.h"
#include "src/tint/program_builder.h"
#include "src/tint/sem/array_count.h"
#include "src/tint/sem/index_accessor_expression.h"
diff --git a/src/tint/ast/transform/packed_vec3.h b/src/tint/lang/wgsl/ast/transform/packed_vec3.h
similarity index 90%
rename from src/tint/ast/transform/packed_vec3.h
rename to src/tint/lang/wgsl/ast/transform/packed_vec3.h
index ae2cf1d..e03f2c7 100644
--- a/src/tint/ast/transform/packed_vec3.h
+++ b/src/tint/lang/wgsl/ast/transform/packed_vec3.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TRANSFORM_PACKED_VEC3_H_
-#define SRC_TINT_AST_TRANSFORM_PACKED_VEC3_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_PACKED_VEC3_H_
+#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_PACKED_VEC3_H_
-#include "src/tint/ast/transform/transform.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
namespace tint::ast::transform {
@@ -56,4 +56,4 @@
} // namespace tint::ast::transform
-#endif // SRC_TINT_AST_TRANSFORM_PACKED_VEC3_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_PACKED_VEC3_H_
diff --git a/src/tint/ast/transform/packed_vec3_test.cc b/src/tint/lang/wgsl/ast/transform/packed_vec3_test.cc
similarity index 99%
rename from src/tint/ast/transform/packed_vec3_test.cc
rename to src/tint/lang/wgsl/ast/transform/packed_vec3_test.cc
index 6ad0b0a..0461f26 100644
--- a/src/tint/ast/transform/packed_vec3_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/packed_vec3_test.cc
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/packed_vec3.h"
+#include "src/tint/lang/wgsl/ast/transform/packed_vec3.h"
#include <string>
#include <utility>
#include <vector>
-#include "src/tint/ast/module.h"
-#include "src/tint/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/module.h"
+#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
#include "src/tint/program_builder.h"
#include "src/tint/sem/struct.h"
#include "src/tint/sem/variable.h"
diff --git a/src/tint/ast/transform/pad_structs.cc b/src/tint/lang/wgsl/ast/transform/pad_structs.cc
similarity index 96%
rename from src/tint/ast/transform/pad_structs.cc
rename to src/tint/lang/wgsl/ast/transform/pad_structs.cc
index 57211ac..d276b15 100644
--- a/src/tint/ast/transform/pad_structs.cc
+++ b/src/tint/lang/wgsl/ast/transform/pad_structs.cc
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/pad_structs.h"
+#include "src/tint/lang/wgsl/ast/transform/pad_structs.h"
#include <string>
#include <unordered_map>
#include <utility>
-#include "src/tint/ast/disable_validation_attribute.h"
-#include "src/tint/ast/parameter.h"
+#include "src/tint/lang/wgsl/ast/disable_validation_attribute.h"
+#include "src/tint/lang/wgsl/ast/parameter.h"
#include "src/tint/program_builder.h"
#include "src/tint/sem/call.h"
#include "src/tint/sem/module.h"
diff --git a/src/tint/ast/transform/pad_structs.h b/src/tint/lang/wgsl/ast/transform/pad_structs.h
similarity index 84%
rename from src/tint/ast/transform/pad_structs.h
rename to src/tint/lang/wgsl/ast/transform/pad_structs.h
index be234a4..64d42d1 100644
--- a/src/tint/ast/transform/pad_structs.h
+++ b/src/tint/lang/wgsl/ast/transform/pad_structs.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TRANSFORM_PAD_STRUCTS_H_
-#define SRC_TINT_AST_TRANSFORM_PAD_STRUCTS_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_PAD_STRUCTS_H_
+#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_PAD_STRUCTS_H_
-#include "src/tint/ast/transform/transform.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
namespace tint::ast::transform {
@@ -40,4 +40,4 @@
} // namespace tint::ast::transform
-#endif // SRC_TINT_AST_TRANSFORM_PAD_STRUCTS_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_PAD_STRUCTS_H_
diff --git a/src/tint/ast/transform/pad_structs_test.cc b/src/tint/lang/wgsl/ast/transform/pad_structs_test.cc
similarity index 98%
rename from src/tint/ast/transform/pad_structs_test.cc
rename to src/tint/lang/wgsl/ast/transform/pad_structs_test.cc
index f7dc437..03c8baa 100644
--- a/src/tint/ast/transform/pad_structs_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/pad_structs_test.cc
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/pad_structs.h"
+#include "src/tint/lang/wgsl/ast/transform/pad_structs.h"
#include <memory>
#include <utility>
-#include "src/tint/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/ast/transform/preserve_padding.cc b/src/tint/lang/wgsl/ast/transform/preserve_padding.cc
similarity index 99%
rename from src/tint/ast/transform/preserve_padding.cc
rename to src/tint/lang/wgsl/ast/transform/preserve_padding.cc
index 99908e1..ac48194 100644
--- a/src/tint/ast/transform/preserve_padding.cc
+++ b/src/tint/lang/wgsl/ast/transform/preserve_padding.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/preserve_padding.h"
+#include "src/tint/lang/wgsl/ast/transform/preserve_padding.h"
#include <unordered_set>
#include <utility>
diff --git a/src/tint/ast/transform/preserve_padding.h b/src/tint/lang/wgsl/ast/transform/preserve_padding.h
similarity index 86%
rename from src/tint/ast/transform/preserve_padding.h
rename to src/tint/lang/wgsl/ast/transform/preserve_padding.h
index fc460c6..4100013 100644
--- a/src/tint/ast/transform/preserve_padding.h
+++ b/src/tint/lang/wgsl/ast/transform/preserve_padding.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TRANSFORM_PRESERVE_PADDING_H_
-#define SRC_TINT_AST_TRANSFORM_PRESERVE_PADDING_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_PRESERVE_PADDING_H_
+#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_PRESERVE_PADDING_H_
-#include "src/tint/ast/transform/transform.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
namespace tint::ast::transform {
@@ -44,4 +44,4 @@
} // namespace tint::ast::transform
-#endif // SRC_TINT_AST_TRANSFORM_PRESERVE_PADDING_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_PRESERVE_PADDING_H_
diff --git a/src/tint/ast/transform/preserve_padding_test.cc b/src/tint/lang/wgsl/ast/transform/preserve_padding_test.cc
similarity index 98%
rename from src/tint/ast/transform/preserve_padding_test.cc
rename to src/tint/lang/wgsl/ast/transform/preserve_padding_test.cc
index 4ebe210..85919e1 100644
--- a/src/tint/ast/transform/preserve_padding_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/preserve_padding_test.cc
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/preserve_padding.h"
+#include "src/tint/lang/wgsl/ast/transform/preserve_padding.h"
#include <utility>
-#include "src/tint/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/ast/transform/promote_initializers_to_let.cc b/src/tint/lang/wgsl/ast/transform/promote_initializers_to_let.cc
similarity index 96%
rename from src/tint/ast/transform/promote_initializers_to_let.cc
rename to src/tint/lang/wgsl/ast/transform/promote_initializers_to_let.cc
index 9560145..4569d99 100644
--- a/src/tint/ast/transform/promote_initializers_to_let.cc
+++ b/src/tint/lang/wgsl/ast/transform/promote_initializers_to_let.cc
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/promote_initializers_to_let.h"
+#include "src/tint/lang/wgsl/ast/transform/promote_initializers_to_let.h"
#include <utility>
-#include "src/tint/ast/transform/utils/hoist_to_decl_before.h"
-#include "src/tint/ast/traverse_expressions.h"
+#include "src/tint/lang/wgsl/ast/transform/utils/hoist_to_decl_before.h"
+#include "src/tint/lang/wgsl/ast/traverse_expressions.h"
#include "src/tint/program_builder.h"
#include "src/tint/sem/call.h"
#include "src/tint/sem/statement.h"
diff --git a/src/tint/ast/transform/promote_initializers_to_let.h b/src/tint/lang/wgsl/ast/transform/promote_initializers_to_let.h
similarity index 84%
rename from src/tint/ast/transform/promote_initializers_to_let.h
rename to src/tint/lang/wgsl/ast/transform/promote_initializers_to_let.h
index 7014942..bbc473b 100644
--- a/src/tint/ast/transform/promote_initializers_to_let.h
+++ b/src/tint/lang/wgsl/ast/transform/promote_initializers_to_let.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TRANSFORM_PROMOTE_INITIALIZERS_TO_LET_H_
-#define SRC_TINT_AST_TRANSFORM_PROMOTE_INITIALIZERS_TO_LET_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_PROMOTE_INITIALIZERS_TO_LET_H_
+#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_PROMOTE_INITIALIZERS_TO_LET_H_
-#include "src/tint/ast/transform/transform.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
namespace tint::ast::transform {
@@ -41,4 +41,4 @@
} // namespace tint::ast::transform
-#endif // SRC_TINT_AST_TRANSFORM_PROMOTE_INITIALIZERS_TO_LET_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_PROMOTE_INITIALIZERS_TO_LET_H_
diff --git a/src/tint/ast/transform/promote_initializers_to_let_test.cc b/src/tint/lang/wgsl/ast/transform/promote_initializers_to_let_test.cc
similarity index 99%
rename from src/tint/ast/transform/promote_initializers_to_let_test.cc
rename to src/tint/lang/wgsl/ast/transform/promote_initializers_to_let_test.cc
index aedd225..57c919c 100644
--- a/src/tint/ast/transform/promote_initializers_to_let_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/promote_initializers_to_let_test.cc
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/promote_initializers_to_let.h"
+#include "src/tint/lang/wgsl/ast/transform/promote_initializers_to_let.h"
-#include "src/tint/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/ast/transform/promote_side_effects_to_decl.cc b/src/tint/lang/wgsl/ast/transform/promote_side_effects_to_decl.cc
similarity index 98%
rename from src/tint/ast/transform/promote_side_effects_to_decl.cc
rename to src/tint/lang/wgsl/ast/transform/promote_side_effects_to_decl.cc
index fed8327..6adde0d 100644
--- a/src/tint/ast/transform/promote_side_effects_to_decl.cc
+++ b/src/tint/lang/wgsl/ast/transform/promote_side_effects_to_decl.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/promote_side_effects_to_decl.h"
+#include "src/tint/lang/wgsl/ast/transform/promote_side_effects_to_decl.h"
#include <memory>
#include <string>
@@ -20,9 +20,9 @@
#include <utility>
#include <vector>
-#include "src/tint/ast/transform/utils/get_insertion_point.h"
-#include "src/tint/ast/transform/utils/hoist_to_decl_before.h"
-#include "src/tint/ast/traverse_expressions.h"
+#include "src/tint/lang/wgsl/ast/transform/utils/get_insertion_point.h"
+#include "src/tint/lang/wgsl/ast/transform/utils/hoist_to_decl_before.h"
+#include "src/tint/lang/wgsl/ast/traverse_expressions.h"
#include "src/tint/sem/block_statement.h"
#include "src/tint/sem/call.h"
#include "src/tint/sem/for_loop_statement.h"
diff --git a/src/tint/ast/transform/promote_side_effects_to_decl.h b/src/tint/lang/wgsl/ast/transform/promote_side_effects_to_decl.h
similarity index 82%
rename from src/tint/ast/transform/promote_side_effects_to_decl.h
rename to src/tint/lang/wgsl/ast/transform/promote_side_effects_to_decl.h
index 784b079..25f48a8 100644
--- a/src/tint/ast/transform/promote_side_effects_to_decl.h
+++ b/src/tint/lang/wgsl/ast/transform/promote_side_effects_to_decl.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TRANSFORM_PROMOTE_SIDE_EFFECTS_TO_DECL_H_
-#define SRC_TINT_AST_TRANSFORM_PROMOTE_SIDE_EFFECTS_TO_DECL_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_PROMOTE_SIDE_EFFECTS_TO_DECL_H_
+#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_PROMOTE_SIDE_EFFECTS_TO_DECL_H_
-#include "src/tint/ast/transform/transform.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
namespace tint::ast::transform {
@@ -39,4 +39,4 @@
} // namespace tint::ast::transform
-#endif // SRC_TINT_AST_TRANSFORM_PROMOTE_SIDE_EFFECTS_TO_DECL_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_PROMOTE_SIDE_EFFECTS_TO_DECL_H_
diff --git a/src/tint/ast/transform/promote_side_effects_to_decl_test.cc b/src/tint/lang/wgsl/ast/transform/promote_side_effects_to_decl_test.cc
similarity index 99%
rename from src/tint/ast/transform/promote_side_effects_to_decl_test.cc
rename to src/tint/lang/wgsl/ast/transform/promote_side_effects_to_decl_test.cc
index ec54d24..175a91e 100644
--- a/src/tint/ast/transform/promote_side_effects_to_decl_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/promote_side_effects_to_decl_test.cc
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/promote_side_effects_to_decl.h"
+#include "src/tint/lang/wgsl/ast/transform/promote_side_effects_to_decl.h"
-#include "src/tint/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/ast/transform/remove_continue_in_switch.cc b/src/tint/lang/wgsl/ast/transform/remove_continue_in_switch.cc
similarity index 94%
rename from src/tint/ast/transform/remove_continue_in_switch.cc
rename to src/tint/lang/wgsl/ast/transform/remove_continue_in_switch.cc
index 7843efc..2558ba4 100644
--- a/src/tint/ast/transform/remove_continue_in_switch.cc
+++ b/src/tint/lang/wgsl/ast/transform/remove_continue_in_switch.cc
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/remove_continue_in_switch.h"
+#include "src/tint/lang/wgsl/ast/transform/remove_continue_in_switch.h"
#include <string>
#include <unordered_map>
#include <utility>
-#include "src/tint/ast/continue_statement.h"
-#include "src/tint/ast/switch_statement.h"
-#include "src/tint/ast/transform/utils/get_insertion_point.h"
+#include "src/tint/lang/wgsl/ast/continue_statement.h"
+#include "src/tint/lang/wgsl/ast/switch_statement.h"
+#include "src/tint/lang/wgsl/ast/transform/utils/get_insertion_point.h"
#include "src/tint/program_builder.h"
#include "src/tint/sem/block_statement.h"
#include "src/tint/sem/for_loop_statement.h"
diff --git a/src/tint/ast/transform/remove_continue_in_switch.h b/src/tint/lang/wgsl/ast/transform/remove_continue_in_switch.h
similarity index 83%
rename from src/tint/ast/transform/remove_continue_in_switch.h
rename to src/tint/lang/wgsl/ast/transform/remove_continue_in_switch.h
index 53e27c8..ad78617 100644
--- a/src/tint/ast/transform/remove_continue_in_switch.h
+++ b/src/tint/lang/wgsl/ast/transform/remove_continue_in_switch.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TRANSFORM_REMOVE_CONTINUE_IN_SWITCH_H_
-#define SRC_TINT_AST_TRANSFORM_REMOVE_CONTINUE_IN_SWITCH_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_REMOVE_CONTINUE_IN_SWITCH_H_
+#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_REMOVE_CONTINUE_IN_SWITCH_H_
-#include "src/tint/ast/transform/transform.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
namespace tint::ast::transform {
@@ -42,4 +42,4 @@
} // namespace tint::ast::transform
-#endif // SRC_TINT_AST_TRANSFORM_REMOVE_CONTINUE_IN_SWITCH_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_REMOVE_CONTINUE_IN_SWITCH_H_
diff --git a/src/tint/ast/transform/remove_continue_in_switch_test.cc b/src/tint/lang/wgsl/ast/transform/remove_continue_in_switch_test.cc
similarity index 98%
rename from src/tint/ast/transform/remove_continue_in_switch_test.cc
rename to src/tint/lang/wgsl/ast/transform/remove_continue_in_switch_test.cc
index 237ceea..8b88195 100644
--- a/src/tint/ast/transform/remove_continue_in_switch_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/remove_continue_in_switch_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/remove_continue_in_switch.h"
-#include "src/tint/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/remove_continue_in_switch.h"
+#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/ast/transform/remove_phonies.cc b/src/tint/lang/wgsl/ast/transform/remove_phonies.cc
similarity index 97%
rename from src/tint/ast/transform/remove_phonies.cc
rename to src/tint/lang/wgsl/ast/transform/remove_phonies.cc
index 7197347..290eeee 100644
--- a/src/tint/ast/transform/remove_phonies.cc
+++ b/src/tint/lang/wgsl/ast/transform/remove_phonies.cc
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/remove_phonies.h"
+#include "src/tint/lang/wgsl/ast/transform/remove_phonies.h"
#include <memory>
#include <unordered_map>
#include <utility>
#include <vector>
-#include "src/tint/ast/traverse_expressions.h"
+#include "src/tint/lang/wgsl/ast/traverse_expressions.h"
#include "src/tint/program_builder.h"
#include "src/tint/sem/block_statement.h"
#include "src/tint/sem/function.h"
diff --git a/src/tint/ast/transform/remove_phonies.h b/src/tint/lang/wgsl/ast/transform/remove_phonies.h
similarity index 84%
rename from src/tint/ast/transform/remove_phonies.h
rename to src/tint/lang/wgsl/ast/transform/remove_phonies.h
index 1379252..5b5c0f1 100644
--- a/src/tint/ast/transform/remove_phonies.h
+++ b/src/tint/lang/wgsl/ast/transform/remove_phonies.h
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TRANSFORM_REMOVE_PHONIES_H_
-#define SRC_TINT_AST_TRANSFORM_REMOVE_PHONIES_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_REMOVE_PHONIES_H_
+#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_REMOVE_PHONIES_H_
#include <string>
#include <unordered_map>
-#include "src/tint/ast/transform/transform.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
namespace tint::ast::transform {
@@ -41,4 +41,4 @@
} // namespace tint::ast::transform
-#endif // SRC_TINT_AST_TRANSFORM_REMOVE_PHONIES_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_REMOVE_PHONIES_H_
diff --git a/src/tint/ast/transform/remove_phonies_test.cc b/src/tint/lang/wgsl/ast/transform/remove_phonies_test.cc
similarity index 98%
rename from src/tint/ast/transform/remove_phonies_test.cc
rename to src/tint/lang/wgsl/ast/transform/remove_phonies_test.cc
index 718e303..210dcda 100644
--- a/src/tint/ast/transform/remove_phonies_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/remove_phonies_test.cc
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/remove_phonies.h"
+#include "src/tint/lang/wgsl/ast/transform/remove_phonies.h"
#include <memory>
#include <utility>
#include <vector>
-#include "src/tint/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/ast/transform/remove_unreachable_statements.cc b/src/tint/lang/wgsl/ast/transform/remove_unreachable_statements.cc
similarity index 93%
rename from src/tint/ast/transform/remove_unreachable_statements.cc
rename to src/tint/lang/wgsl/ast/transform/remove_unreachable_statements.cc
index 7ee5cf0..50b9dfa 100644
--- a/src/tint/ast/transform/remove_unreachable_statements.cc
+++ b/src/tint/lang/wgsl/ast/transform/remove_unreachable_statements.cc
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/remove_unreachable_statements.h"
+#include "src/tint/lang/wgsl/ast/transform/remove_unreachable_statements.h"
#include <memory>
#include <unordered_map>
#include <utility>
#include <vector>
-#include "src/tint/ast/traverse_expressions.h"
+#include "src/tint/lang/wgsl/ast/traverse_expressions.h"
#include "src/tint/program_builder.h"
#include "src/tint/sem/block_statement.h"
#include "src/tint/sem/function.h"
diff --git a/src/tint/ast/transform/remove_unreachable_statements.h b/src/tint/lang/wgsl/ast/transform/remove_unreachable_statements.h
similarity index 81%
rename from src/tint/ast/transform/remove_unreachable_statements.h
rename to src/tint/lang/wgsl/ast/transform/remove_unreachable_statements.h
index 2049e70..c5131df 100644
--- a/src/tint/ast/transform/remove_unreachable_statements.h
+++ b/src/tint/lang/wgsl/ast/transform/remove_unreachable_statements.h
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TRANSFORM_REMOVE_UNREACHABLE_STATEMENTS_H_
-#define SRC_TINT_AST_TRANSFORM_REMOVE_UNREACHABLE_STATEMENTS_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_REMOVE_UNREACHABLE_STATEMENTS_H_
+#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_REMOVE_UNREACHABLE_STATEMENTS_H_
#include <string>
#include <unordered_map>
-#include "src/tint/ast/transform/transform.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
namespace tint::ast::transform {
@@ -41,4 +41,4 @@
} // namespace tint::ast::transform
-#endif // SRC_TINT_AST_TRANSFORM_REMOVE_UNREACHABLE_STATEMENTS_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_REMOVE_UNREACHABLE_STATEMENTS_H_
diff --git a/src/tint/ast/transform/remove_unreachable_statements_test.cc b/src/tint/lang/wgsl/ast/transform/remove_unreachable_statements_test.cc
similarity index 96%
rename from src/tint/ast/transform/remove_unreachable_statements_test.cc
rename to src/tint/lang/wgsl/ast/transform/remove_unreachable_statements_test.cc
index 45f1869..cc88c61 100644
--- a/src/tint/ast/transform/remove_unreachable_statements_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/remove_unreachable_statements_test.cc
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/remove_unreachable_statements.h"
+#include "src/tint/lang/wgsl/ast/transform/remove_unreachable_statements.h"
-#include "src/tint/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/ast/transform/renamer.cc b/src/tint/lang/wgsl/ast/transform/renamer.cc
similarity index 99%
rename from src/tint/ast/transform/renamer.cc
rename to src/tint/lang/wgsl/ast/transform/renamer.cc
index ff669f7..34f796c 100644
--- a/src/tint/ast/transform/renamer.cc
+++ b/src/tint/lang/wgsl/ast/transform/renamer.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/renamer.h"
+#include "src/tint/lang/wgsl/ast/transform/renamer.h"
#include <memory>
#include <utility>
diff --git a/src/tint/ast/transform/renamer.h b/src/tint/lang/wgsl/ast/transform/renamer.h
similarity index 93%
rename from src/tint/ast/transform/renamer.h
rename to src/tint/lang/wgsl/ast/transform/renamer.h
index 5e7c92d..e6f4afd 100644
--- a/src/tint/ast/transform/renamer.h
+++ b/src/tint/lang/wgsl/ast/transform/renamer.h
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TRANSFORM_RENAMER_H_
-#define SRC_TINT_AST_TRANSFORM_RENAMER_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_RENAMER_H_
+#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_RENAMER_H_
#include <string>
#include <unordered_map>
-#include "src/tint/ast/transform/transform.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
namespace tint::ast::transform {
@@ -93,4 +93,4 @@
} // namespace tint::ast::transform
-#endif // SRC_TINT_AST_TRANSFORM_RENAMER_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_RENAMER_H_
diff --git a/src/tint/ast/transform/renamer_test.cc b/src/tint/lang/wgsl/ast/transform/renamer_test.cc
similarity index 99%
rename from src/tint/ast/transform/renamer_test.cc
rename to src/tint/lang/wgsl/ast/transform/renamer_test.cc
index c93340d..7cfd18d 100644
--- a/src/tint/ast/transform/renamer_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/renamer_test.cc
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/renamer.h"
+#include "src/tint/lang/wgsl/ast/transform/renamer.h"
#include <memory>
#include <unordered_set>
#include <vector>
#include "gmock/gmock.h"
-#include "src/tint/ast/transform/test_helper.h"
#include "src/tint/builtin/builtin.h"
#include "src/tint/builtin/texel_format.h"
+#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
#include "src/tint/utils/string.h"
namespace tint::ast::transform {
diff --git a/src/tint/ast/transform/robustness.cc b/src/tint/lang/wgsl/ast/transform/robustness.cc
similarity index 99%
rename from src/tint/ast/transform/robustness.cc
rename to src/tint/lang/wgsl/ast/transform/robustness.cc
index 1e9a4a0..c5b7bbb 100644
--- a/src/tint/ast/transform/robustness.cc
+++ b/src/tint/lang/wgsl/ast/transform/robustness.cc
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/robustness.h"
+#include "src/tint/lang/wgsl/ast/transform/robustness.h"
#include <algorithm>
#include <limits>
#include <utility>
-#include "src/tint/ast/transform/utils/hoist_to_decl_before.h"
+#include "src/tint/lang/wgsl/ast/transform/utils/hoist_to_decl_before.h"
#include "src/tint/program_builder.h"
#include "src/tint/sem/block_statement.h"
#include "src/tint/sem/builtin.h"
diff --git a/src/tint/ast/transform/robustness.h b/src/tint/lang/wgsl/ast/transform/robustness.h
similarity index 94%
rename from src/tint/ast/transform/robustness.h
rename to src/tint/lang/wgsl/ast/transform/robustness.h
index be01bb5..8f12e04 100644
--- a/src/tint/ast/transform/robustness.h
+++ b/src/tint/lang/wgsl/ast/transform/robustness.h
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TRANSFORM_ROBUSTNESS_H_
-#define SRC_TINT_AST_TRANSFORM_ROBUSTNESS_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_ROBUSTNESS_H_
+#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_ROBUSTNESS_H_
#include <unordered_set>
-#include "src/tint/ast/transform/transform.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
#include "src/tint/sem/binding_point.h"
namespace tint::ast::transform {
@@ -104,4 +104,4 @@
} // namespace tint::ast::transform
-#endif // SRC_TINT_AST_TRANSFORM_ROBUSTNESS_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_ROBUSTNESS_H_
diff --git a/src/tint/ast/transform/robustness_test.cc b/src/tint/lang/wgsl/ast/transform/robustness_test.cc
similarity index 99%
rename from src/tint/ast/transform/robustness_test.cc
rename to src/tint/lang/wgsl/ast/transform/robustness_test.cc
index 0b7e15c..7bef166 100644
--- a/src/tint/ast/transform/robustness_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/robustness_test.cc
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/robustness.h"
+#include "src/tint/lang/wgsl/ast/transform/robustness.h"
-#include "src/tint/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
namespace tint::ast::transform {
diff --git a/src/tint/ast/transform/simplify_pointers.cc b/src/tint/lang/wgsl/ast/transform/simplify_pointers.cc
similarity index 98%
rename from src/tint/ast/transform/simplify_pointers.cc
rename to src/tint/lang/wgsl/ast/transform/simplify_pointers.cc
index 1fb8f5d..8f37331 100644
--- a/src/tint/ast/transform/simplify_pointers.cc
+++ b/src/tint/lang/wgsl/ast/transform/simplify_pointers.cc
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/simplify_pointers.h"
+#include "src/tint/lang/wgsl/ast/transform/simplify_pointers.h"
#include <memory>
#include <unordered_map>
#include <utility>
#include <vector>
-#include "src/tint/ast/transform/unshadow.h"
+#include "src/tint/lang/wgsl/ast/transform/unshadow.h"
#include "src/tint/program_builder.h"
#include "src/tint/sem/block_statement.h"
#include "src/tint/sem/function.h"
diff --git a/src/tint/ast/transform/simplify_pointers.h b/src/tint/lang/wgsl/ast/transform/simplify_pointers.h
similarity index 87%
rename from src/tint/ast/transform/simplify_pointers.h
rename to src/tint/lang/wgsl/ast/transform/simplify_pointers.h
index a4c67a5..b44e4a4 100644
--- a/src/tint/ast/transform/simplify_pointers.h
+++ b/src/tint/lang/wgsl/ast/transform/simplify_pointers.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TRANSFORM_SIMPLIFY_POINTERS_H_
-#define SRC_TINT_AST_TRANSFORM_SIMPLIFY_POINTERS_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_SIMPLIFY_POINTERS_H_
+#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_SIMPLIFY_POINTERS_H_
-#include "src/tint/ast/transform/transform.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
namespace tint::ast::transform {
@@ -50,4 +50,4 @@
} // namespace tint::ast::transform
-#endif // SRC_TINT_AST_TRANSFORM_SIMPLIFY_POINTERS_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_SIMPLIFY_POINTERS_H_
diff --git a/src/tint/ast/transform/simplify_pointers_test.cc b/src/tint/lang/wgsl/ast/transform/simplify_pointers_test.cc
similarity index 97%
rename from src/tint/ast/transform/simplify_pointers_test.cc
rename to src/tint/lang/wgsl/ast/transform/simplify_pointers_test.cc
index adcf6dc..7801548 100644
--- a/src/tint/ast/transform/simplify_pointers_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/simplify_pointers_test.cc
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/simplify_pointers.h"
+#include "src/tint/lang/wgsl/ast/transform/simplify_pointers.h"
-#include "src/tint/ast/transform/test_helper.h"
-#include "src/tint/ast/transform/unshadow.h"
+#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/unshadow.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/ast/transform/single_entry_point.cc b/src/tint/lang/wgsl/ast/transform/single_entry_point.cc
similarity index 98%
rename from src/tint/ast/transform/single_entry_point.cc
rename to src/tint/lang/wgsl/ast/transform/single_entry_point.cc
index f896097..3cd47cc 100644
--- a/src/tint/ast/transform/single_entry_point.cc
+++ b/src/tint/lang/wgsl/ast/transform/single_entry_point.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/single_entry_point.h"
+#include "src/tint/lang/wgsl/ast/transform/single_entry_point.h"
#include <unordered_set>
#include <utility>
diff --git a/src/tint/ast/transform/single_entry_point.h b/src/tint/lang/wgsl/ast/transform/single_entry_point.h
similarity index 87%
rename from src/tint/ast/transform/single_entry_point.h
rename to src/tint/lang/wgsl/ast/transform/single_entry_point.h
index 69c38e3..3a130c1 100644
--- a/src/tint/ast/transform/single_entry_point.h
+++ b/src/tint/lang/wgsl/ast/transform/single_entry_point.h
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TRANSFORM_SINGLE_ENTRY_POINT_H_
-#define SRC_TINT_AST_TRANSFORM_SINGLE_ENTRY_POINT_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_SINGLE_ENTRY_POINT_H_
+#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_SINGLE_ENTRY_POINT_H_
#include <string>
-#include "src/tint/ast/transform/transform.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
namespace tint::ast::transform {
@@ -61,4 +61,4 @@
} // namespace tint::ast::transform
-#endif // SRC_TINT_AST_TRANSFORM_SINGLE_ENTRY_POINT_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_SINGLE_ENTRY_POINT_H_
diff --git a/src/tint/ast/transform/single_entry_point_test.cc b/src/tint/lang/wgsl/ast/transform/single_entry_point_test.cc
similarity index 98%
rename from src/tint/ast/transform/single_entry_point_test.cc
rename to src/tint/lang/wgsl/ast/transform/single_entry_point_test.cc
index 6a4ebf2..783a722 100644
--- a/src/tint/ast/transform/single_entry_point_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/single_entry_point_test.cc
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/single_entry_point.h"
+#include "src/tint/lang/wgsl/ast/transform/single_entry_point.h"
#include <utility>
-#include "src/tint/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/ast/transform/spirv_atomic.cc b/src/tint/lang/wgsl/ast/transform/spirv_atomic.cc
similarity index 99%
rename from src/tint/ast/transform/spirv_atomic.cc
rename to src/tint/lang/wgsl/ast/transform/spirv_atomic.cc
index 3ee89f2..5eb8de8 100644
--- a/src/tint/ast/transform/spirv_atomic.cc
+++ b/src/tint/lang/wgsl/ast/transform/spirv_atomic.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/spirv_atomic.h"
+#include "src/tint/lang/wgsl/ast/transform/spirv_atomic.h"
#include <string>
#include <unordered_map>
diff --git a/src/tint/ast/transform/spirv_atomic.h b/src/tint/lang/wgsl/ast/transform/spirv_atomic.h
similarity index 89%
rename from src/tint/ast/transform/spirv_atomic.h
rename to src/tint/lang/wgsl/ast/transform/spirv_atomic.h
index 4ada485..6fbcd66 100644
--- a/src/tint/ast/transform/spirv_atomic.h
+++ b/src/tint/lang/wgsl/ast/transform/spirv_atomic.h
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TRANSFORM_SPIRV_ATOMIC_H_
-#define SRC_TINT_AST_TRANSFORM_SPIRV_ATOMIC_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_SPIRV_ATOMIC_H_
+#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_SPIRV_ATOMIC_H_
#include <string>
-#include "src/tint/ast/internal_attribute.h"
-#include "src/tint/ast/transform/transform.h"
#include "src/tint/builtin/function.h"
+#include "src/tint/lang/wgsl/ast/internal_attribute.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
// Forward declarations
namespace tint {
@@ -74,4 +74,4 @@
} // namespace tint::ast::transform
-#endif // SRC_TINT_AST_TRANSFORM_SPIRV_ATOMIC_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_SPIRV_ATOMIC_H_
diff --git a/src/tint/ast/transform/spirv_atomic_test.cc b/src/tint/lang/wgsl/ast/transform/spirv_atomic_test.cc
similarity index 99%
rename from src/tint/ast/transform/spirv_atomic_test.cc
rename to src/tint/lang/wgsl/ast/transform/spirv_atomic_test.cc
index 6ca0f6e..f03912e 100644
--- a/src/tint/ast/transform/spirv_atomic_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/spirv_atomic_test.cc
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/spirv_atomic.h"
+#include "src/tint/lang/wgsl/ast/transform/spirv_atomic.h"
#include <memory>
#include <string>
#include <utility>
#include <vector>
-#include "src/tint/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
#include "src/tint/lang/wgsl/reader/parser_impl.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/ast/transform/std140.cc b/src/tint/lang/wgsl/ast/transform/std140.cc
similarity index 99%
rename from src/tint/ast/transform/std140.cc
rename to src/tint/lang/wgsl/ast/transform/std140.cc
index 69f7a1f..3b12c15 100644
--- a/src/tint/ast/transform/std140.cc
+++ b/src/tint/lang/wgsl/ast/transform/std140.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/std140.h"
+#include "src/tint/lang/wgsl/ast/transform/std140.h"
#include <algorithm>
#include <string>
diff --git a/src/tint/ast/transform/std140.h b/src/tint/lang/wgsl/ast/transform/std140.h
similarity index 89%
rename from src/tint/ast/transform/std140.h
rename to src/tint/lang/wgsl/ast/transform/std140.h
index a07885f..78a7cf0 100644
--- a/src/tint/ast/transform/std140.h
+++ b/src/tint/lang/wgsl/ast/transform/std140.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TRANSFORM_STD140_H_
-#define SRC_TINT_AST_TRANSFORM_STD140_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_STD140_H_
+#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_STD140_H_
-#include "src/tint/ast/transform/transform.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
namespace tint::ast::transform {
@@ -46,4 +46,4 @@
} // namespace tint::ast::transform
-#endif // SRC_TINT_AST_TRANSFORM_STD140_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_STD140_H_
diff --git a/src/tint/ast/transform/std140_exhaustive_test.cc b/src/tint/lang/wgsl/ast/transform/std140_exhaustive_test.cc
similarity index 99%
rename from src/tint/ast/transform/std140_exhaustive_test.cc
rename to src/tint/lang/wgsl/ast/transform/std140_exhaustive_test.cc
index 417d028..f05ee31 100644
--- a/src/tint/ast/transform/std140_exhaustive_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/std140_exhaustive_test.cc
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/std140.h"
+#include "src/tint/lang/wgsl/ast/transform/std140.h"
#include <string>
#include <utility>
#include <vector>
-#include "src/tint/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
#include "src/tint/utils/string.h"
namespace tint::ast::transform {
diff --git a/src/tint/ast/transform/std140_f16_test.cc b/src/tint/lang/wgsl/ast/transform/std140_f16_test.cc
similarity index 99%
rename from src/tint/ast/transform/std140_f16_test.cc
rename to src/tint/lang/wgsl/ast/transform/std140_f16_test.cc
index ce30e70..50f5fe5 100644
--- a/src/tint/ast/transform/std140_f16_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/std140_f16_test.cc
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/std140.h"
+#include "src/tint/lang/wgsl/ast/transform/std140.h"
#include <string>
#include <utility>
#include <vector>
-#include "src/tint/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
#include "src/tint/utils/string.h"
namespace tint::ast::transform {
diff --git a/src/tint/ast/transform/std140_f32_test.cc b/src/tint/lang/wgsl/ast/transform/std140_f32_test.cc
similarity index 99%
rename from src/tint/ast/transform/std140_f32_test.cc
rename to src/tint/lang/wgsl/ast/transform/std140_f32_test.cc
index 4819420..f46d33a 100644
--- a/src/tint/ast/transform/std140_f32_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/std140_f32_test.cc
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/std140.h"
+#include "src/tint/lang/wgsl/ast/transform/std140.h"
#include <string>
#include <utility>
#include <vector>
-#include "src/tint/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
#include "src/tint/utils/string.h"
namespace tint::ast::transform {
diff --git a/src/tint/ast/transform/std140_test.cc b/src/tint/lang/wgsl/ast/transform/std140_test.cc
similarity index 97%
rename from src/tint/ast/transform/std140_test.cc
rename to src/tint/lang/wgsl/ast/transform/std140_test.cc
index 28e9fc7..5d203b7 100644
--- a/src/tint/ast/transform/std140_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/std140_test.cc
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/std140.h"
+#include "src/tint/lang/wgsl/ast/transform/std140.h"
#include <string>
#include <utility>
#include <vector>
-#include "src/tint/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
#include "src/tint/utils/string.h"
// This file contains the should-run tests and a trival empty module test for Std140 transform.
diff --git a/src/tint/ast/transform/substitute_override.cc b/src/tint/lang/wgsl/ast/transform/substitute_override.cc
similarity index 98%
rename from src/tint/ast/transform/substitute_override.cc
rename to src/tint/lang/wgsl/ast/transform/substitute_override.cc
index f0d7717..1b97062 100644
--- a/src/tint/ast/transform/substitute_override.cc
+++ b/src/tint/lang/wgsl/ast/transform/substitute_override.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/substitute_override.h"
+#include "src/tint/lang/wgsl/ast/transform/substitute_override.h"
#include <functional>
#include <utility>
diff --git a/src/tint/ast/transform/substitute_override.h b/src/tint/lang/wgsl/ast/transform/substitute_override.h
similarity index 90%
rename from src/tint/ast/transform/substitute_override.h
rename to src/tint/lang/wgsl/ast/transform/substitute_override.h
index 7734973..bd918c2e 100644
--- a/src/tint/ast/transform/substitute_override.h
+++ b/src/tint/lang/wgsl/ast/transform/substitute_override.h
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TRANSFORM_SUBSTITUTE_OVERRIDE_H_
-#define SRC_TINT_AST_TRANSFORM_SUBSTITUTE_OVERRIDE_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_SUBSTITUTE_OVERRIDE_H_
+#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_SUBSTITUTE_OVERRIDE_H_
#include <string>
#include <unordered_map>
#include "tint/override_id.h"
-#include "src/tint/ast/transform/transform.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
#include "src/tint/reflection.h"
namespace tint::ast::transform {
@@ -83,4 +83,4 @@
} // namespace tint::ast::transform
-#endif // SRC_TINT_AST_TRANSFORM_SUBSTITUTE_OVERRIDE_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_SUBSTITUTE_OVERRIDE_H_
diff --git a/src/tint/ast/transform/substitute_override_test.cc b/src/tint/lang/wgsl/ast/transform/substitute_override_test.cc
similarity index 97%
rename from src/tint/ast/transform/substitute_override_test.cc
rename to src/tint/lang/wgsl/ast/transform/substitute_override_test.cc
index 9f3cd63..8b1513c 100644
--- a/src/tint/ast/transform/substitute_override_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/substitute_override_test.cc
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/substitute_override.h"
+#include "src/tint/lang/wgsl/ast/transform/substitute_override.h"
-#include "src/tint/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/ast/transform/test_helper.h b/src/tint/lang/wgsl/ast/transform/test_helper.h
similarity index 96%
rename from src/tint/ast/transform/test_helper.h
rename to src/tint/lang/wgsl/ast/transform/test_helper.h
index 771f698..bddfd55 100644
--- a/src/tint/ast/transform/test_helper.h
+++ b/src/tint/lang/wgsl/ast/transform/test_helper.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TRANSFORM_TEST_HELPER_H_
-#define SRC_TINT_AST_TRANSFORM_TEST_HELPER_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_TEST_HELPER_H_
+#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_TEST_HELPER_H_
#include <memory>
#include <string>
@@ -21,7 +21,7 @@
#include <vector>
#include "gtest/gtest.h"
-#include "src/tint/ast/transform/transform.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
#include "src/tint/lang/wgsl/ast_writer/generator.h"
#include "src/tint/lang/wgsl/reader/parser.h"
#include "src/tint/transform/manager.h"
@@ -165,4 +165,4 @@
} // namespace tint::ast::transform
-#endif // SRC_TINT_AST_TRANSFORM_TEST_HELPER_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_TEST_HELPER_H_
diff --git a/src/tint/ast/transform/texture_1d_to_2d.cc b/src/tint/lang/wgsl/ast/transform/texture_1d_to_2d.cc
similarity index 98%
rename from src/tint/ast/transform/texture_1d_to_2d.cc
rename to src/tint/lang/wgsl/ast/transform/texture_1d_to_2d.cc
index bbe4855..4a82a5c 100644
--- a/src/tint/ast/transform/texture_1d_to_2d.cc
+++ b/src/tint/lang/wgsl/ast/transform/texture_1d_to_2d.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/texture_1d_to_2d.h"
+#include "src/tint/lang/wgsl/ast/transform/texture_1d_to_2d.h"
#include <utility>
diff --git a/src/tint/ast/transform/texture_1d_to_2d.h b/src/tint/lang/wgsl/ast/transform/texture_1d_to_2d.h
similarity index 83%
rename from src/tint/ast/transform/texture_1d_to_2d.h
rename to src/tint/lang/wgsl/ast/transform/texture_1d_to_2d.h
index 2c43adf..32122cf 100644
--- a/src/tint/ast/transform/texture_1d_to_2d.h
+++ b/src/tint/lang/wgsl/ast/transform/texture_1d_to_2d.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TRANSFORM_TEXTURE_1D_TO_2D_H_
-#define SRC_TINT_AST_TRANSFORM_TEXTURE_1D_TO_2D_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_TEXTURE_1D_TO_2D_H_
+#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_TEXTURE_1D_TO_2D_H_
-#include "src/tint/ast/transform/transform.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
namespace tint::ast::transform {
@@ -40,4 +40,4 @@
} // namespace tint::ast::transform
-#endif // SRC_TINT_AST_TRANSFORM_TEXTURE_1D_TO_2D_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_TEXTURE_1D_TO_2D_H_
diff --git a/src/tint/ast/transform/texture_1d_to_2d_test.cc b/src/tint/lang/wgsl/ast/transform/texture_1d_to_2d_test.cc
similarity index 97%
rename from src/tint/ast/transform/texture_1d_to_2d_test.cc
rename to src/tint/lang/wgsl/ast/transform/texture_1d_to_2d_test.cc
index 4189385..52b17e2 100644
--- a/src/tint/ast/transform/texture_1d_to_2d_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/texture_1d_to_2d_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/texture_1d_to_2d.h"
-#include "src/tint/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/texture_1d_to_2d.h"
+#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/ast/transform/transform.cc b/src/tint/lang/wgsl/ast/transform/transform.cc
similarity index 98%
rename from src/tint/ast/transform/transform.cc
rename to src/tint/lang/wgsl/ast/transform/transform.cc
index 6a9eebc..5bb87d7 100644
--- a/src/tint/ast/transform/transform.cc
+++ b/src/tint/lang/wgsl/ast/transform/transform.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/transform.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
#include <algorithm>
#include <string>
diff --git a/src/tint/ast/transform/transform.h b/src/tint/lang/wgsl/ast/transform/transform.h
similarity index 95%
rename from src/tint/ast/transform/transform.h
rename to src/tint/lang/wgsl/ast/transform/transform.h
index 2ad3701..0b37aee 100644
--- a/src/tint/ast/transform/transform.h
+++ b/src/tint/lang/wgsl/ast/transform/transform.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TRANSFORM_TRANSFORM_H_
-#define SRC_TINT_AST_TRANSFORM_TRANSFORM_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_TRANSFORM_H_
+#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_TRANSFORM_H_
#include "src/tint/transform/transform.h"
@@ -97,4 +97,4 @@
} // namespace tint::ast::transform
-#endif // SRC_TINT_AST_TRANSFORM_TRANSFORM_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_TRANSFORM_H_
diff --git a/src/tint/ast/transform/transform_test.cc b/src/tint/lang/wgsl/ast/transform/transform_test.cc
similarity index 97%
rename from src/tint/ast/transform/transform_test.cc
rename to src/tint/lang/wgsl/ast/transform/transform_test.cc
index 8f86596..3c24b35 100644
--- a/src/tint/ast/transform/transform_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/transform_test.cc
@@ -14,9 +14,9 @@
#include <string>
-#include "src/tint/ast/test_helper.h"
-#include "src/tint/ast/transform/transform.h"
#include "src/tint/clone_context.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
#include "src/tint/program_builder.h"
#include "gtest/gtest.h"
diff --git a/src/tint/ast/transform/truncate_interstage_variables.cc b/src/tint/lang/wgsl/ast/transform/truncate_interstage_variables.cc
similarity index 98%
rename from src/tint/ast/transform/truncate_interstage_variables.cc
rename to src/tint/lang/wgsl/ast/transform/truncate_interstage_variables.cc
index 1e5bf71..e63f471 100644
--- a/src/tint/ast/transform/truncate_interstage_variables.cc
+++ b/src/tint/lang/wgsl/ast/transform/truncate_interstage_variables.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/truncate_interstage_variables.h"
+#include "src/tint/lang/wgsl/ast/transform/truncate_interstage_variables.h"
#include <memory>
#include <string>
diff --git a/src/tint/ast/transform/truncate_interstage_variables.h b/src/tint/lang/wgsl/ast/transform/truncate_interstage_variables.h
similarity index 93%
rename from src/tint/ast/transform/truncate_interstage_variables.h
rename to src/tint/lang/wgsl/ast/transform/truncate_interstage_variables.h
index 702c01b..2d91e67 100644
--- a/src/tint/ast/transform/truncate_interstage_variables.h
+++ b/src/tint/lang/wgsl/ast/transform/truncate_interstage_variables.h
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TRANSFORM_TRUNCATE_INTERSTAGE_VARIABLES_H_
-#define SRC_TINT_AST_TRANSFORM_TRUNCATE_INTERSTAGE_VARIABLES_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_TRUNCATE_INTERSTAGE_VARIABLES_H_
+#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_TRUNCATE_INTERSTAGE_VARIABLES_H_
#include <bitset>
-#include "src/tint/ast/transform/transform.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
#include "src/tint/sem/binding_point.h"
namespace tint::ast::transform {
@@ -128,4 +128,4 @@
} // namespace tint::ast::transform
-#endif // SRC_TINT_AST_TRANSFORM_TRUNCATE_INTERSTAGE_VARIABLES_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_TRUNCATE_INTERSTAGE_VARIABLES_H_
diff --git a/src/tint/ast/transform/truncate_interstage_variables_test.cc b/src/tint/lang/wgsl/ast/transform/truncate_interstage_variables_test.cc
similarity index 98%
rename from src/tint/ast/transform/truncate_interstage_variables_test.cc
rename to src/tint/lang/wgsl/ast/transform/truncate_interstage_variables_test.cc
index ecd691e..2a8c689 100644
--- a/src/tint/ast/transform/truncate_interstage_variables_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/truncate_interstage_variables_test.cc
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/truncate_interstage_variables.h"
-#include "src/tint/ast/transform/canonicalize_entry_point_io.h"
+#include "src/tint/lang/wgsl/ast/transform/truncate_interstage_variables.h"
+#include "src/tint/lang/wgsl/ast/transform/canonicalize_entry_point_io.h"
#include "gmock/gmock.h"
-#include "src/tint/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/ast/transform/unshadow.cc b/src/tint/lang/wgsl/ast/transform/unshadow.cc
similarity index 98%
rename from src/tint/ast/transform/unshadow.cc
rename to src/tint/lang/wgsl/ast/transform/unshadow.cc
index 26cf00a..bf804d1 100644
--- a/src/tint/ast/transform/unshadow.cc
+++ b/src/tint/lang/wgsl/ast/transform/unshadow.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/unshadow.h"
+#include "src/tint/lang/wgsl/ast/transform/unshadow.h"
#include <memory>
#include <unordered_map>
diff --git a/src/tint/ast/transform/unshadow.h b/src/tint/lang/wgsl/ast/transform/unshadow.h
similarity index 83%
rename from src/tint/ast/transform/unshadow.h
rename to src/tint/lang/wgsl/ast/transform/unshadow.h
index a231258..966140d 100644
--- a/src/tint/ast/transform/unshadow.h
+++ b/src/tint/lang/wgsl/ast/transform/unshadow.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TRANSFORM_UNSHADOW_H_
-#define SRC_TINT_AST_TRANSFORM_UNSHADOW_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_UNSHADOW_H_
+#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_UNSHADOW_H_
-#include "src/tint/ast/transform/transform.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
namespace tint::ast::transform {
@@ -39,4 +39,4 @@
} // namespace tint::ast::transform
-#endif // SRC_TINT_AST_TRANSFORM_UNSHADOW_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_UNSHADOW_H_
diff --git a/src/tint/ast/transform/unshadow_test.cc b/src/tint/lang/wgsl/ast/transform/unshadow_test.cc
similarity index 98%
rename from src/tint/ast/transform/unshadow_test.cc
rename to src/tint/lang/wgsl/ast/transform/unshadow_test.cc
index e0246b7..a87f6b7 100644
--- a/src/tint/ast/transform/unshadow_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/unshadow_test.cc
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/unshadow.h"
+#include "src/tint/lang/wgsl/ast/transform/unshadow.h"
-#include "src/tint/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/ast/transform/utils/get_insertion_point.cc b/src/tint/lang/wgsl/ast/transform/utils/get_insertion_point.cc
similarity index 96%
rename from src/tint/ast/transform/utils/get_insertion_point.cc
rename to src/tint/lang/wgsl/ast/transform/utils/get_insertion_point.cc
index 64f12f81..32ba34b 100644
--- a/src/tint/ast/transform/utils/get_insertion_point.cc
+++ b/src/tint/lang/wgsl/ast/transform/utils/get_insertion_point.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/utils/get_insertion_point.h"
+#include "src/tint/lang/wgsl/ast/transform/utils/get_insertion_point.h"
#include "src/tint/debug.h"
#include "src/tint/diagnostic/diagnostic.h"
#include "src/tint/sem/for_loop_statement.h"
diff --git a/src/tint/ast/transform/utils/get_insertion_point.h b/src/tint/lang/wgsl/ast/transform/utils/get_insertion_point.h
similarity index 86%
rename from src/tint/ast/transform/utils/get_insertion_point.h
rename to src/tint/lang/wgsl/ast/transform/utils/get_insertion_point.h
index 10fab59..687e155 100644
--- a/src/tint/ast/transform/utils/get_insertion_point.h
+++ b/src/tint/lang/wgsl/ast/transform/utils/get_insertion_point.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TRANSFORM_UTILS_GET_INSERTION_POINT_H_
-#define SRC_TINT_AST_TRANSFORM_UTILS_GET_INSERTION_POINT_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_UTILS_GET_INSERTION_POINT_H_
+#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_UTILS_GET_INSERTION_POINT_H_
#include <utility>
@@ -36,4 +36,4 @@
} // namespace tint::ast::transform::utils
-#endif // SRC_TINT_AST_TRANSFORM_UTILS_GET_INSERTION_POINT_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_UTILS_GET_INSERTION_POINT_H_
diff --git a/src/tint/ast/transform/utils/get_insertion_point_test.cc b/src/tint/lang/wgsl/ast/transform/utils/get_insertion_point_test.cc
similarity index 95%
rename from src/tint/ast/transform/utils/get_insertion_point_test.cc
rename to src/tint/lang/wgsl/ast/transform/utils/get_insertion_point_test.cc
index 9a85f1f..8ec261e 100644
--- a/src/tint/ast/transform/utils/get_insertion_point_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/utils/get_insertion_point_test.cc
@@ -15,9 +15,9 @@
#include <utility>
#include "gtest/gtest-spi.h"
-#include "src/tint/ast/transform/test_helper.h"
-#include "src/tint/ast/transform/utils/get_insertion_point.h"
#include "src/tint/debug.h"
+#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/utils/get_insertion_point.h"
#include "src/tint/program_builder.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/ast/transform/utils/hoist_to_decl_before.cc b/src/tint/lang/wgsl/ast/transform/utils/hoist_to_decl_before.cc
similarity index 99%
rename from src/tint/ast/transform/utils/hoist_to_decl_before.cc
rename to src/tint/lang/wgsl/ast/transform/utils/hoist_to_decl_before.cc
index 09dce2b..799c790 100644
--- a/src/tint/ast/transform/utils/hoist_to_decl_before.cc
+++ b/src/tint/lang/wgsl/ast/transform/utils/hoist_to_decl_before.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/utils/hoist_to_decl_before.h"
+#include "src/tint/lang/wgsl/ast/transform/utils/hoist_to_decl_before.h"
#include <utility>
diff --git a/src/tint/ast/transform/utils/hoist_to_decl_before.h b/src/tint/lang/wgsl/ast/transform/utils/hoist_to_decl_before.h
similarity index 93%
rename from src/tint/ast/transform/utils/hoist_to_decl_before.h
rename to src/tint/lang/wgsl/ast/transform/utils/hoist_to_decl_before.h
index 5d09c02..7c55042 100644
--- a/src/tint/ast/transform/utils/hoist_to_decl_before.h
+++ b/src/tint/lang/wgsl/ast/transform/utils/hoist_to_decl_before.h
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TRANSFORM_UTILS_HOIST_TO_DECL_BEFORE_H_
-#define SRC_TINT_AST_TRANSFORM_UTILS_HOIST_TO_DECL_BEFORE_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_UTILS_HOIST_TO_DECL_BEFORE_H_
+#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_UTILS_HOIST_TO_DECL_BEFORE_H_
#include <functional>
#include <memory>
-#include "src/tint/ast/transform/transform.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
#include "src/tint/sem/value_expression.h"
namespace tint::ast::transform {
@@ -104,4 +104,4 @@
} // namespace tint::ast::transform
-#endif // SRC_TINT_AST_TRANSFORM_UTILS_HOIST_TO_DECL_BEFORE_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_UTILS_HOIST_TO_DECL_BEFORE_H_
diff --git a/src/tint/ast/transform/utils/hoist_to_decl_before_test.cc b/src/tint/lang/wgsl/ast/transform/utils/hoist_to_decl_before_test.cc
similarity index 99%
rename from src/tint/ast/transform/utils/hoist_to_decl_before_test.cc
rename to src/tint/lang/wgsl/ast/transform/utils/hoist_to_decl_before_test.cc
index 89b137c..f2c1bbc 100644
--- a/src/tint/ast/transform/utils/hoist_to_decl_before_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/utils/hoist_to_decl_before_test.cc
@@ -15,8 +15,8 @@
#include <utility>
#include "gtest/gtest-spi.h"
-#include "src/tint/ast/transform/test_helper.h"
-#include "src/tint/ast/transform/utils/hoist_to_decl_before.h"
+#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/utils/hoist_to_decl_before.h"
#include "src/tint/program_builder.h"
#include "src/tint/sem/if_statement.h"
#include "src/tint/sem/index_accessor_expression.h"
diff --git a/src/tint/ast/transform/var_for_dynamic_index.cc b/src/tint/lang/wgsl/ast/transform/var_for_dynamic_index.cc
similarity index 94%
rename from src/tint/ast/transform/var_for_dynamic_index.cc
rename to src/tint/lang/wgsl/ast/transform/var_for_dynamic_index.cc
index 0224eb2..d3302d9 100644
--- a/src/tint/ast/transform/var_for_dynamic_index.cc
+++ b/src/tint/lang/wgsl/ast/transform/var_for_dynamic_index.cc
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/var_for_dynamic_index.h"
+#include "src/tint/lang/wgsl/ast/transform/var_for_dynamic_index.h"
#include <utility>
-#include "src/tint/ast/transform/utils/hoist_to_decl_before.h"
+#include "src/tint/lang/wgsl/ast/transform/utils/hoist_to_decl_before.h"
#include "src/tint/program_builder.h"
TINT_INSTANTIATE_TYPEINFO(tint::ast::transform::VarForDynamicIndex);
diff --git a/src/tint/ast/transform/var_for_dynamic_index.h b/src/tint/lang/wgsl/ast/transform/var_for_dynamic_index.h
similarity index 83%
rename from src/tint/ast/transform/var_for_dynamic_index.h
rename to src/tint/lang/wgsl/ast/transform/var_for_dynamic_index.h
index 986698c..3d66520 100644
--- a/src/tint/ast/transform/var_for_dynamic_index.h
+++ b/src/tint/lang/wgsl/ast/transform/var_for_dynamic_index.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TRANSFORM_VAR_FOR_DYNAMIC_INDEX_H_
-#define SRC_TINT_AST_TRANSFORM_VAR_FOR_DYNAMIC_INDEX_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_VAR_FOR_DYNAMIC_INDEX_H_
+#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_VAR_FOR_DYNAMIC_INDEX_H_
-#include "src/tint/ast/transform/transform.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
namespace tint::ast::transform {
@@ -39,4 +39,4 @@
} // namespace tint::ast::transform
-#endif // SRC_TINT_AST_TRANSFORM_VAR_FOR_DYNAMIC_INDEX_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_VAR_FOR_DYNAMIC_INDEX_H_
diff --git a/src/tint/ast/transform/var_for_dynamic_index_test.cc b/src/tint/lang/wgsl/ast/transform/var_for_dynamic_index_test.cc
similarity index 97%
rename from src/tint/ast/transform/var_for_dynamic_index_test.cc
rename to src/tint/lang/wgsl/ast/transform/var_for_dynamic_index_test.cc
index 34d781f..1a79f73 100644
--- a/src/tint/ast/transform/var_for_dynamic_index_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/var_for_dynamic_index_test.cc
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/var_for_dynamic_index.h"
-#include "src/tint/ast/transform/for_loop_to_loop.h"
+#include "src/tint/lang/wgsl/ast/transform/var_for_dynamic_index.h"
+#include "src/tint/lang/wgsl/ast/transform/for_loop_to_loop.h"
-#include "src/tint/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/ast/transform/vectorize_matrix_conversions.cc b/src/tint/lang/wgsl/ast/transform/vectorize_matrix_conversions.cc
similarity index 98%
rename from src/tint/ast/transform/vectorize_matrix_conversions.cc
rename to src/tint/lang/wgsl/ast/transform/vectorize_matrix_conversions.cc
index f012936..511cfbc 100644
--- a/src/tint/ast/transform/vectorize_matrix_conversions.cc
+++ b/src/tint/lang/wgsl/ast/transform/vectorize_matrix_conversions.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/vectorize_matrix_conversions.h"
+#include "src/tint/lang/wgsl/ast/transform/vectorize_matrix_conversions.h"
#include <tuple>
#include <unordered_map>
diff --git a/src/tint/ast/transform/vectorize_matrix_conversions.h b/src/tint/lang/wgsl/ast/transform/vectorize_matrix_conversions.h
similarity index 80%
rename from src/tint/ast/transform/vectorize_matrix_conversions.h
rename to src/tint/lang/wgsl/ast/transform/vectorize_matrix_conversions.h
index 108b073..b61777a 100644
--- a/src/tint/ast/transform/vectorize_matrix_conversions.h
+++ b/src/tint/lang/wgsl/ast/transform/vectorize_matrix_conversions.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TRANSFORM_VECTORIZE_MATRIX_CONVERSIONS_H_
-#define SRC_TINT_AST_TRANSFORM_VECTORIZE_MATRIX_CONVERSIONS_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_VECTORIZE_MATRIX_CONVERSIONS_H_
+#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_VECTORIZE_MATRIX_CONVERSIONS_H_
-#include "src/tint/ast/transform/transform.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
namespace tint::ast::transform {
@@ -37,4 +37,4 @@
} // namespace tint::ast::transform
-#endif // SRC_TINT_AST_TRANSFORM_VECTORIZE_MATRIX_CONVERSIONS_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_VECTORIZE_MATRIX_CONVERSIONS_H_
diff --git a/src/tint/ast/transform/vectorize_matrix_conversions_test.cc b/src/tint/lang/wgsl/ast/transform/vectorize_matrix_conversions_test.cc
similarity index 98%
rename from src/tint/ast/transform/vectorize_matrix_conversions_test.cc
rename to src/tint/lang/wgsl/ast/transform/vectorize_matrix_conversions_test.cc
index 52d08cb..c876461 100644
--- a/src/tint/ast/transform/vectorize_matrix_conversions_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/vectorize_matrix_conversions_test.cc
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/vectorize_matrix_conversions.h"
+#include "src/tint/lang/wgsl/ast/transform/vectorize_matrix_conversions.h"
#include <string>
#include <utility>
-#include "src/tint/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
#include "src/tint/utils/string.h"
namespace tint::ast::transform {
diff --git a/src/tint/ast/transform/vectorize_scalar_matrix_initializers.cc b/src/tint/lang/wgsl/ast/transform/vectorize_scalar_matrix_initializers.cc
similarity index 98%
rename from src/tint/ast/transform/vectorize_scalar_matrix_initializers.cc
rename to src/tint/lang/wgsl/ast/transform/vectorize_scalar_matrix_initializers.cc
index 44ec2f9..763e3da 100644
--- a/src/tint/ast/transform/vectorize_scalar_matrix_initializers.cc
+++ b/src/tint/lang/wgsl/ast/transform/vectorize_scalar_matrix_initializers.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/vectorize_scalar_matrix_initializers.h"
+#include "src/tint/lang/wgsl/ast/transform/vectorize_scalar_matrix_initializers.h"
#include <unordered_map>
#include <utility>
diff --git a/src/tint/ast/transform/vectorize_scalar_matrix_initializers.h b/src/tint/lang/wgsl/ast/transform/vectorize_scalar_matrix_initializers.h
similarity index 79%
rename from src/tint/ast/transform/vectorize_scalar_matrix_initializers.h
rename to src/tint/lang/wgsl/ast/transform/vectorize_scalar_matrix_initializers.h
index 55f736c..519975d 100644
--- a/src/tint/ast/transform/vectorize_scalar_matrix_initializers.h
+++ b/src/tint/lang/wgsl/ast/transform/vectorize_scalar_matrix_initializers.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TRANSFORM_VECTORIZE_SCALAR_MATRIX_INITIALIZERS_H_
-#define SRC_TINT_AST_TRANSFORM_VECTORIZE_SCALAR_MATRIX_INITIALIZERS_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_VECTORIZE_SCALAR_MATRIX_INITIALIZERS_H_
+#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_VECTORIZE_SCALAR_MATRIX_INITIALIZERS_H_
-#include "src/tint/ast/transform/transform.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
namespace tint::ast::transform {
@@ -37,4 +37,4 @@
} // namespace tint::ast::transform
-#endif // SRC_TINT_AST_TRANSFORM_VECTORIZE_SCALAR_MATRIX_INITIALIZERS_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_VECTORIZE_SCALAR_MATRIX_INITIALIZERS_H_
diff --git a/src/tint/ast/transform/vectorize_scalar_matrix_initializers_test.cc b/src/tint/lang/wgsl/ast/transform/vectorize_scalar_matrix_initializers_test.cc
similarity index 97%
rename from src/tint/ast/transform/vectorize_scalar_matrix_initializers_test.cc
rename to src/tint/lang/wgsl/ast/transform/vectorize_scalar_matrix_initializers_test.cc
index ea9bfbb..26a8670 100644
--- a/src/tint/ast/transform/vectorize_scalar_matrix_initializers_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/vectorize_scalar_matrix_initializers_test.cc
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/vectorize_scalar_matrix_initializers.h"
+#include "src/tint/lang/wgsl/ast/transform/vectorize_scalar_matrix_initializers.h"
#include <string>
#include <utility>
-#include "src/tint/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
#include "src/tint/utils/string.h"
namespace tint::ast::transform {
diff --git a/src/tint/ast/transform/vertex_pulling.cc b/src/tint/lang/wgsl/ast/transform/vertex_pulling.cc
similarity index 99%
rename from src/tint/ast/transform/vertex_pulling.cc
rename to src/tint/lang/wgsl/ast/transform/vertex_pulling.cc
index cd9337a..3857d16 100644
--- a/src/tint/ast/transform/vertex_pulling.cc
+++ b/src/tint/lang/wgsl/ast/transform/vertex_pulling.cc
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/vertex_pulling.h"
+#include "src/tint/lang/wgsl/ast/transform/vertex_pulling.h"
#include <algorithm>
#include <utility>
-#include "src/tint/ast/assignment_statement.h"
-#include "src/tint/ast/bitcast_expression.h"
-#include "src/tint/ast/variable_decl_statement.h"
#include "src/tint/builtin/builtin_value.h"
+#include "src/tint/lang/wgsl/ast/assignment_statement.h"
+#include "src/tint/lang/wgsl/ast/bitcast_expression.h"
+#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
#include "src/tint/program_builder.h"
#include "src/tint/sem/variable.h"
#include "src/tint/switch.h"
diff --git a/src/tint/ast/transform/vertex_pulling.h b/src/tint/lang/wgsl/ast/transform/vertex_pulling.h
similarity index 96%
rename from src/tint/ast/transform/vertex_pulling.h
rename to src/tint/lang/wgsl/ast/transform/vertex_pulling.h
index 1327fc9..b10ea62 100644
--- a/src/tint/ast/transform/vertex_pulling.h
+++ b/src/tint/lang/wgsl/ast/transform/vertex_pulling.h
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TRANSFORM_VERTEX_PULLING_H_
-#define SRC_TINT_AST_TRANSFORM_VERTEX_PULLING_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_VERTEX_PULLING_H_
+#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_VERTEX_PULLING_H_
#include <memory>
#include <string>
#include <unordered_map>
#include <vector>
-#include "src/tint/ast/transform/transform.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
#include "src/tint/reflection.h"
namespace tint::ast::transform {
@@ -184,4 +184,4 @@
} // namespace tint::ast::transform
-#endif // SRC_TINT_AST_TRANSFORM_VERTEX_PULLING_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_VERTEX_PULLING_H_
diff --git a/src/tint/ast/transform/vertex_pulling_test.cc b/src/tint/lang/wgsl/ast/transform/vertex_pulling_test.cc
similarity index 99%
rename from src/tint/ast/transform/vertex_pulling_test.cc
rename to src/tint/lang/wgsl/ast/transform/vertex_pulling_test.cc
index a0640e8..16e1a1f 100644
--- a/src/tint/ast/transform/vertex_pulling_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/vertex_pulling_test.cc
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/vertex_pulling.h"
+#include "src/tint/lang/wgsl/ast/transform/vertex_pulling.h"
#include <utility>
-#include "src/tint/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/ast/transform/while_to_loop.cc b/src/tint/lang/wgsl/ast/transform/while_to_loop.cc
similarity index 94%
rename from src/tint/ast/transform/while_to_loop.cc
rename to src/tint/lang/wgsl/ast/transform/while_to_loop.cc
index a38711d..8f85172 100644
--- a/src/tint/ast/transform/while_to_loop.cc
+++ b/src/tint/lang/wgsl/ast/transform/while_to_loop.cc
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/while_to_loop.h"
+#include "src/tint/lang/wgsl/ast/transform/while_to_loop.h"
#include <utility>
-#include "src/tint/ast/break_statement.h"
+#include "src/tint/lang/wgsl/ast/break_statement.h"
#include "src/tint/program_builder.h"
TINT_INSTANTIATE_TYPEINFO(tint::ast::transform::WhileToLoop);
diff --git a/src/tint/ast/transform/while_to_loop.h b/src/tint/lang/wgsl/ast/transform/while_to_loop.h
similarity index 83%
rename from src/tint/ast/transform/while_to_loop.h
rename to src/tint/lang/wgsl/ast/transform/while_to_loop.h
index dc24471..8171912 100644
--- a/src/tint/ast/transform/while_to_loop.h
+++ b/src/tint/lang/wgsl/ast/transform/while_to_loop.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TRANSFORM_WHILE_TO_LOOP_H_
-#define SRC_TINT_AST_TRANSFORM_WHILE_TO_LOOP_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_WHILE_TO_LOOP_H_
+#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_WHILE_TO_LOOP_H_
-#include "src/tint/ast/transform/transform.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
namespace tint::ast::transform {
@@ -37,4 +37,4 @@
} // namespace tint::ast::transform
-#endif // SRC_TINT_AST_TRANSFORM_WHILE_TO_LOOP_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_WHILE_TO_LOOP_H_
diff --git a/src/tint/ast/transform/while_to_loop_test.cc b/src/tint/lang/wgsl/ast/transform/while_to_loop_test.cc
similarity index 94%
rename from src/tint/ast/transform/while_to_loop_test.cc
rename to src/tint/lang/wgsl/ast/transform/while_to_loop_test.cc
index 82af0a6..c8b5e46 100644
--- a/src/tint/ast/transform/while_to_loop_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/while_to_loop_test.cc
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/while_to_loop.h"
+#include "src/tint/lang/wgsl/ast/transform/while_to_loop.h"
-#include "src/tint/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/ast/transform/zero_init_workgroup_memory.cc b/src/tint/lang/wgsl/ast/transform/zero_init_workgroup_memory.cc
similarity index 99%
rename from src/tint/ast/transform/zero_init_workgroup_memory.cc
rename to src/tint/lang/wgsl/ast/transform/zero_init_workgroup_memory.cc
index bd39599..a6edc6d 100644
--- a/src/tint/ast/transform/zero_init_workgroup_memory.cc
+++ b/src/tint/lang/wgsl/ast/transform/zero_init_workgroup_memory.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/zero_init_workgroup_memory.h"
+#include "src/tint/lang/wgsl/ast/transform/zero_init_workgroup_memory.h"
#include <algorithm>
#include <map>
@@ -20,8 +20,8 @@
#include <utility>
#include <vector>
-#include "src/tint/ast/workgroup_attribute.h"
#include "src/tint/builtin/builtin_value.h"
+#include "src/tint/lang/wgsl/ast/workgroup_attribute.h"
#include "src/tint/program_builder.h"
#include "src/tint/sem/function.h"
#include "src/tint/sem/variable.h"
diff --git a/src/tint/ast/transform/zero_init_workgroup_memory.h b/src/tint/lang/wgsl/ast/transform/zero_init_workgroup_memory.h
similarity index 82%
rename from src/tint/ast/transform/zero_init_workgroup_memory.h
rename to src/tint/lang/wgsl/ast/transform/zero_init_workgroup_memory.h
index 9fc8c08..9d69b9e 100644
--- a/src/tint/ast/transform/zero_init_workgroup_memory.h
+++ b/src/tint/lang/wgsl/ast/transform/zero_init_workgroup_memory.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TRANSFORM_ZERO_INIT_WORKGROUP_MEMORY_H_
-#define SRC_TINT_AST_TRANSFORM_ZERO_INIT_WORKGROUP_MEMORY_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRANSFORM_ZERO_INIT_WORKGROUP_MEMORY_H_
+#define SRC_TINT_LANG_WGSL_AST_TRANSFORM_ZERO_INIT_WORKGROUP_MEMORY_H_
-#include "src/tint/ast/transform/transform.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
namespace tint::ast::transform {
@@ -41,4 +41,4 @@
} // namespace tint::ast::transform
-#endif // SRC_TINT_AST_TRANSFORM_ZERO_INIT_WORKGROUP_MEMORY_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRANSFORM_ZERO_INIT_WORKGROUP_MEMORY_H_
diff --git a/src/tint/ast/transform/zero_init_workgroup_memory_test.cc b/src/tint/lang/wgsl/ast/transform/zero_init_workgroup_memory_test.cc
similarity index 99%
rename from src/tint/ast/transform/zero_init_workgroup_memory_test.cc
rename to src/tint/lang/wgsl/ast/transform/zero_init_workgroup_memory_test.cc
index 046a49c..54a9854 100644
--- a/src/tint/ast/transform/zero_init_workgroup_memory_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/zero_init_workgroup_memory_test.cc
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/transform/zero_init_workgroup_memory.h"
+#include "src/tint/lang/wgsl/ast/transform/zero_init_workgroup_memory.h"
#include <utility>
-#include "src/tint/ast/transform/test_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/ast/traverse_expressions.h b/src/tint/lang/wgsl/ast/traverse_expressions.h
similarity index 89%
rename from src/tint/ast/traverse_expressions.h
rename to src/tint/lang/wgsl/ast/traverse_expressions.h
index 780de1a..0ee10bb 100644
--- a/src/tint/ast/traverse_expressions.h
+++ b/src/tint/lang/wgsl/ast/traverse_expressions.h
@@ -12,19 +12,19 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TRAVERSE_EXPRESSIONS_H_
-#define SRC_TINT_AST_TRAVERSE_EXPRESSIONS_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TRAVERSE_EXPRESSIONS_H_
+#define SRC_TINT_LANG_WGSL_AST_TRAVERSE_EXPRESSIONS_H_
#include <vector>
-#include "src/tint/ast/binary_expression.h"
-#include "src/tint/ast/bitcast_expression.h"
-#include "src/tint/ast/call_expression.h"
-#include "src/tint/ast/index_accessor_expression.h"
-#include "src/tint/ast/literal_expression.h"
-#include "src/tint/ast/member_accessor_expression.h"
-#include "src/tint/ast/phony_expression.h"
-#include "src/tint/ast/unary_op_expression.h"
+#include "src/tint/lang/wgsl/ast/binary_expression.h"
+#include "src/tint/lang/wgsl/ast/bitcast_expression.h"
+#include "src/tint/lang/wgsl/ast/call_expression.h"
+#include "src/tint/lang/wgsl/ast/index_accessor_expression.h"
+#include "src/tint/lang/wgsl/ast/literal_expression.h"
+#include "src/tint/lang/wgsl/ast/member_accessor_expression.h"
+#include "src/tint/lang/wgsl/ast/phony_expression.h"
+#include "src/tint/lang/wgsl/ast/unary_op_expression.h"
#include "src/tint/switch.h"
#include "src/tint/utils/compiler_macros.h"
#include "src/tint/utils/reverse.h"
@@ -161,4 +161,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_TRAVERSE_EXPRESSIONS_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TRAVERSE_EXPRESSIONS_H_
diff --git a/src/tint/ast/traverse_expressions_test.cc b/src/tint/lang/wgsl/ast/traverse_expressions_test.cc
similarity index 98%
rename from src/tint/ast/traverse_expressions_test.cc
rename to src/tint/lang/wgsl/ast/traverse_expressions_test.cc
index 0db73c2..1a0607b 100644
--- a/src/tint/ast/traverse_expressions_test.cc
+++ b/src/tint/lang/wgsl/ast/traverse_expressions_test.cc
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/traverse_expressions.h"
+#include "src/tint/lang/wgsl/ast/traverse_expressions.h"
#include "gmock/gmock.h"
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
using ::testing::ElementsAre;
diff --git a/src/tint/ast/type.cc b/src/tint/lang/wgsl/ast/type.cc
similarity index 87%
rename from src/tint/ast/type.cc
rename to src/tint/lang/wgsl/ast/type.cc
index 7267c80..69d28eb 100644
--- a/src/tint/ast/type.cc
+++ b/src/tint/lang/wgsl/ast/type.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/type.h"
-#include "src/tint/ast/identifier_expression.h"
+#include "src/tint/lang/wgsl/ast/type.h"
+#include "src/tint/lang/wgsl/ast/identifier_expression.h"
namespace tint {
diff --git a/src/tint/ast/type.h b/src/tint/lang/wgsl/ast/type.h
similarity index 92%
rename from src/tint/ast/type.h
rename to src/tint/lang/wgsl/ast/type.h
index e5d626c..4015081 100644
--- a/src/tint/ast/type.h
+++ b/src/tint/lang/wgsl/ast/type.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TYPE_H_
-#define SRC_TINT_AST_TYPE_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TYPE_H_
+#define SRC_TINT_LANG_WGSL_AST_TYPE_H_
#include "src/tint/program_id.h"
@@ -49,4 +49,4 @@
} // namespace tint
-#endif // SRC_TINT_AST_TYPE_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TYPE_H_
diff --git a/src/tint/ast/type_decl.cc b/src/tint/lang/wgsl/ast/type_decl.cc
similarity index 90%
rename from src/tint/ast/type_decl.cc
rename to src/tint/lang/wgsl/ast/type_decl.cc
index 206bf45..5bd9d26 100644
--- a/src/tint/ast/type_decl.cc
+++ b/src/tint/lang/wgsl/ast/type_decl.cc
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/type_decl.h"
+#include "src/tint/lang/wgsl/ast/type_decl.h"
-#include "src/tint/ast/templated_identifier.h"
+#include "src/tint/lang/wgsl/ast/templated_identifier.h"
TINT_INSTANTIATE_TYPEINFO(tint::ast::TypeDecl);
diff --git a/src/tint/ast/type_decl.h b/src/tint/lang/wgsl/ast/type_decl.h
similarity index 87%
rename from src/tint/ast/type_decl.h
rename to src/tint/lang/wgsl/ast/type_decl.h
index aa0bc14..1414370 100644
--- a/src/tint/ast/type_decl.h
+++ b/src/tint/lang/wgsl/ast/type_decl.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_TYPE_DECL_H_
-#define SRC_TINT_AST_TYPE_DECL_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_TYPE_DECL_H_
+#define SRC_TINT_LANG_WGSL_AST_TYPE_DECL_H_
-#include "src/tint/ast/node.h"
+#include "src/tint/lang/wgsl/ast/node.h"
// Forward declarations
namespace tint::ast {
@@ -43,4 +43,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_TYPE_DECL_H_
+#endif // SRC_TINT_LANG_WGSL_AST_TYPE_DECL_H_
diff --git a/src/tint/ast/unary_op.cc b/src/tint/lang/wgsl/ast/unary_op.cc
similarity index 96%
rename from src/tint/ast/unary_op.cc
rename to src/tint/lang/wgsl/ast/unary_op.cc
index 34d15f7..288e19c 100644
--- a/src/tint/ast/unary_op.cc
+++ b/src/tint/lang/wgsl/ast/unary_op.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/unary_op.h"
+#include "src/tint/lang/wgsl/ast/unary_op.h"
namespace tint::ast {
diff --git a/src/tint/ast/unary_op.h b/src/tint/lang/wgsl/ast/unary_op.h
similarity index 88%
rename from src/tint/ast/unary_op.h
rename to src/tint/lang/wgsl/ast/unary_op.h
index 368803d..1e817fc 100644
--- a/src/tint/ast/unary_op.h
+++ b/src/tint/lang/wgsl/ast/unary_op.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_UNARY_OP_H_
-#define SRC_TINT_AST_UNARY_OP_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_UNARY_OP_H_
+#define SRC_TINT_LANG_WGSL_AST_UNARY_OP_H_
#include "src/tint/utils/string_stream.h"
@@ -35,4 +35,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_UNARY_OP_H_
+#endif // SRC_TINT_LANG_WGSL_AST_UNARY_OP_H_
diff --git a/src/tint/ast/unary_op_expression.cc b/src/tint/lang/wgsl/ast/unary_op_expression.cc
similarity index 96%
rename from src/tint/ast/unary_op_expression.cc
rename to src/tint/lang/wgsl/ast/unary_op_expression.cc
index 104d74a..2f795c4 100644
--- a/src/tint/ast/unary_op_expression.cc
+++ b/src/tint/lang/wgsl/ast/unary_op_expression.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/unary_op_expression.h"
+#include "src/tint/lang/wgsl/ast/unary_op_expression.h"
#include "src/tint/program_builder.h"
diff --git a/src/tint/ast/unary_op_expression.h b/src/tint/lang/wgsl/ast/unary_op_expression.h
similarity index 85%
rename from src/tint/ast/unary_op_expression.h
rename to src/tint/lang/wgsl/ast/unary_op_expression.h
index 6004975..22d70f5 100644
--- a/src/tint/ast/unary_op_expression.h
+++ b/src/tint/lang/wgsl/ast/unary_op_expression.h
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_UNARY_OP_EXPRESSION_H_
-#define SRC_TINT_AST_UNARY_OP_EXPRESSION_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_UNARY_OP_EXPRESSION_H_
+#define SRC_TINT_LANG_WGSL_AST_UNARY_OP_EXPRESSION_H_
-#include "src/tint/ast/expression.h"
-#include "src/tint/ast/unary_op.h"
+#include "src/tint/lang/wgsl/ast/expression.h"
+#include "src/tint/lang/wgsl/ast/unary_op.h"
namespace tint::ast {
@@ -53,4 +53,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_UNARY_OP_EXPRESSION_H_
+#endif // SRC_TINT_LANG_WGSL_AST_UNARY_OP_EXPRESSION_H_
diff --git a/src/tint/ast/unary_op_expression_test.cc b/src/tint/lang/wgsl/ast/unary_op_expression_test.cc
similarity index 94%
rename from src/tint/ast/unary_op_expression_test.cc
rename to src/tint/lang/wgsl/ast/unary_op_expression_test.cc
index e1ec8dd..82b9764 100644
--- a/src/tint/ast/unary_op_expression_test.cc
+++ b/src/tint/lang/wgsl/ast/unary_op_expression_test.cc
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/unary_op_expression.h"
+#include "src/tint/lang/wgsl/ast/unary_op_expression.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/ast/var.cc b/src/tint/lang/wgsl/ast/var.cc
similarity index 97%
rename from src/tint/ast/var.cc
rename to src/tint/lang/wgsl/ast/var.cc
index fdd700a..6f3faca 100644
--- a/src/tint/ast/var.cc
+++ b/src/tint/lang/wgsl/ast/var.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/var.h"
+#include "src/tint/lang/wgsl/ast/var.h"
#include "src/tint/program_builder.h"
diff --git a/src/tint/ast/var.h b/src/tint/lang/wgsl/ast/var.h
similarity index 94%
rename from src/tint/ast/var.h
rename to src/tint/lang/wgsl/ast/var.h
index e3cfde0..d7a6770 100644
--- a/src/tint/ast/var.h
+++ b/src/tint/lang/wgsl/ast/var.h
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_VAR_H_
-#define SRC_TINT_AST_VAR_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_VAR_H_
+#define SRC_TINT_LANG_WGSL_AST_VAR_H_
#include <utility>
#include <vector>
-#include "src/tint/ast/variable.h"
+#include "src/tint/lang/wgsl/ast/variable.h"
namespace tint::ast {
@@ -85,4 +85,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_VAR_H_
+#endif // SRC_TINT_LANG_WGSL_AST_VAR_H_
diff --git a/src/tint/ast/variable.cc b/src/tint/lang/wgsl/ast/variable.cc
similarity index 85%
rename from src/tint/ast/variable.cc
rename to src/tint/lang/wgsl/ast/variable.cc
index 4a4f756..d0eb80d 100644
--- a/src/tint/ast/variable.cc
+++ b/src/tint/lang/wgsl/ast/variable.cc
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/variable.h"
-#include "src/tint/ast/binding_attribute.h"
-#include "src/tint/ast/group_attribute.h"
-#include "src/tint/ast/templated_identifier.h"
+#include "src/tint/lang/wgsl/ast/variable.h"
+#include "src/tint/lang/wgsl/ast/binding_attribute.h"
+#include "src/tint/lang/wgsl/ast/group_attribute.h"
+#include "src/tint/lang/wgsl/ast/templated_identifier.h"
TINT_INSTANTIATE_TYPEINFO(tint::ast::Variable);
diff --git a/src/tint/ast/variable.h b/src/tint/lang/wgsl/ast/variable.h
similarity index 87%
rename from src/tint/ast/variable.h
rename to src/tint/lang/wgsl/ast/variable.h
index 0a1ccb2..84393c52 100644
--- a/src/tint/ast/variable.h
+++ b/src/tint/lang/wgsl/ast/variable.h
@@ -12,19 +12,19 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_VARIABLE_H_
-#define SRC_TINT_AST_VARIABLE_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_VARIABLE_H_
+#define SRC_TINT_LANG_WGSL_AST_VARIABLE_H_
#include <utility>
#include <vector>
-#include "src/tint/ast/attribute.h"
-#include "src/tint/ast/binding_attribute.h"
-#include "src/tint/ast/expression.h"
-#include "src/tint/ast/group_attribute.h"
-#include "src/tint/ast/type.h"
#include "src/tint/builtin/access.h"
#include "src/tint/builtin/address_space.h"
+#include "src/tint/lang/wgsl/ast/attribute.h"
+#include "src/tint/lang/wgsl/ast/binding_attribute.h"
+#include "src/tint/lang/wgsl/ast/expression.h"
+#include "src/tint/lang/wgsl/ast/group_attribute.h"
+#include "src/tint/lang/wgsl/ast/type.h"
// Forward declarations
namespace tint::ast {
@@ -88,4 +88,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_VARIABLE_H_
+#endif // SRC_TINT_LANG_WGSL_AST_VARIABLE_H_
diff --git a/src/tint/ast/variable_decl_statement.cc b/src/tint/lang/wgsl/ast/variable_decl_statement.cc
similarity index 95%
rename from src/tint/ast/variable_decl_statement.cc
rename to src/tint/lang/wgsl/ast/variable_decl_statement.cc
index 62c5797..d83b87b 100644
--- a/src/tint/ast/variable_decl_statement.cc
+++ b/src/tint/lang/wgsl/ast/variable_decl_statement.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/variable_decl_statement.h"
+#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
#include "src/tint/program_builder.h"
diff --git a/src/tint/ast/variable_decl_statement.h b/src/tint/lang/wgsl/ast/variable_decl_statement.h
similarity index 85%
rename from src/tint/ast/variable_decl_statement.h
rename to src/tint/lang/wgsl/ast/variable_decl_statement.h
index 7732299..e9b796d 100644
--- a/src/tint/ast/variable_decl_statement.h
+++ b/src/tint/lang/wgsl/ast/variable_decl_statement.h
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_VARIABLE_DECL_STATEMENT_H_
-#define SRC_TINT_AST_VARIABLE_DECL_STATEMENT_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_VARIABLE_DECL_STATEMENT_H_
+#define SRC_TINT_LANG_WGSL_AST_VARIABLE_DECL_STATEMENT_H_
-#include "src/tint/ast/statement.h"
-#include "src/tint/ast/variable.h"
+#include "src/tint/lang/wgsl/ast/statement.h"
+#include "src/tint/lang/wgsl/ast/variable.h"
namespace tint::ast {
@@ -48,4 +48,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_VARIABLE_DECL_STATEMENT_H_
+#endif // SRC_TINT_LANG_WGSL_AST_VARIABLE_DECL_STATEMENT_H_
diff --git a/src/tint/ast/variable_decl_statement_test.cc b/src/tint/lang/wgsl/ast/variable_decl_statement_test.cc
similarity index 94%
rename from src/tint/ast/variable_decl_statement_test.cc
rename to src/tint/lang/wgsl/ast/variable_decl_statement_test.cc
index 5867ae9..df8a033 100644
--- a/src/tint/ast/variable_decl_statement_test.cc
+++ b/src/tint/lang/wgsl/ast/variable_decl_statement_test.cc
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/variable_decl_statement.h"
+#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/ast/variable_test.cc b/src/tint/lang/wgsl/ast/variable_test.cc
similarity index 97%
rename from src/tint/ast/variable_test.cc
rename to src/tint/lang/wgsl/ast/variable_test.cc
index bc8f274..08ca16c 100644
--- a/src/tint/ast/variable_test.cc
+++ b/src/tint/lang/wgsl/ast/variable_test.cc
@@ -14,9 +14,9 @@
#include "gtest/gtest-spi.h"
-#include "src/tint/ast/id_attribute.h"
-#include "src/tint/ast/test_helper.h"
#include "src/tint/builtin/builtin_value.h"
+#include "src/tint/lang/wgsl/ast/id_attribute.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/ast/while_statement.cc b/src/tint/lang/wgsl/ast/while_statement.cc
similarity index 97%
rename from src/tint/ast/while_statement.cc
rename to src/tint/lang/wgsl/ast/while_statement.cc
index 713a0f6..dec91ac 100644
--- a/src/tint/ast/while_statement.cc
+++ b/src/tint/lang/wgsl/ast/while_statement.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/while_statement.h"
+#include "src/tint/lang/wgsl/ast/while_statement.h"
#include <utility>
diff --git a/src/tint/ast/while_statement.h b/src/tint/lang/wgsl/ast/while_statement.h
similarity index 90%
rename from src/tint/ast/while_statement.h
rename to src/tint/lang/wgsl/ast/while_statement.h
index 6545a65..9d824c7 100644
--- a/src/tint/ast/while_statement.h
+++ b/src/tint/lang/wgsl/ast/while_statement.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_WHILE_STATEMENT_H_
-#define SRC_TINT_AST_WHILE_STATEMENT_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_WHILE_STATEMENT_H_
+#define SRC_TINT_LANG_WGSL_AST_WHILE_STATEMENT_H_
-#include "src/tint/ast/block_statement.h"
+#include "src/tint/lang/wgsl/ast/block_statement.h"
namespace tint::ast {
@@ -59,4 +59,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_WHILE_STATEMENT_H_
+#endif // SRC_TINT_LANG_WGSL_AST_WHILE_STATEMENT_H_
diff --git a/src/tint/ast/while_statement_test.cc b/src/tint/lang/wgsl/ast/while_statement_test.cc
similarity index 96%
rename from src/tint/ast/while_statement_test.cc
rename to src/tint/lang/wgsl/ast/while_statement_test.cc
index ef287fc..f22edc9 100644
--- a/src/tint/ast/while_statement_test.cc
+++ b/src/tint/lang/wgsl/ast/while_statement_test.cc
@@ -14,8 +14,8 @@
#include "gmock/gmock.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/ast/binary_expression.h"
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/binary_expression.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/ast/workgroup_attribute.cc b/src/tint/lang/wgsl/ast/workgroup_attribute.cc
similarity index 96%
rename from src/tint/ast/workgroup_attribute.cc
rename to src/tint/lang/wgsl/ast/workgroup_attribute.cc
index 3167f59..936f8e4 100644
--- a/src/tint/ast/workgroup_attribute.cc
+++ b/src/tint/lang/wgsl/ast/workgroup_attribute.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/workgroup_attribute.h"
+#include "src/tint/lang/wgsl/ast/workgroup_attribute.h"
#include <string>
diff --git a/src/tint/ast/workgroup_attribute.h b/src/tint/lang/wgsl/ast/workgroup_attribute.h
similarity index 91%
rename from src/tint/ast/workgroup_attribute.h
rename to src/tint/lang/wgsl/ast/workgroup_attribute.h
index 8789df7..593a6bc 100644
--- a/src/tint/ast/workgroup_attribute.h
+++ b/src/tint/lang/wgsl/ast/workgroup_attribute.h
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_AST_WORKGROUP_ATTRIBUTE_H_
-#define SRC_TINT_AST_WORKGROUP_ATTRIBUTE_H_
+#ifndef SRC_TINT_LANG_WGSL_AST_WORKGROUP_ATTRIBUTE_H_
+#define SRC_TINT_LANG_WGSL_AST_WORKGROUP_ATTRIBUTE_H_
#include <array>
#include <string>
-#include "src/tint/ast/attribute.h"
+#include "src/tint/lang/wgsl/ast/attribute.h"
// Forward declarations
namespace tint::ast {
@@ -68,4 +68,4 @@
} // namespace tint::ast
-#endif // SRC_TINT_AST_WORKGROUP_ATTRIBUTE_H_
+#endif // SRC_TINT_LANG_WGSL_AST_WORKGROUP_ATTRIBUTE_H_
diff --git a/src/tint/ast/workgroup_attribute_test.cc b/src/tint/lang/wgsl/ast/workgroup_attribute_test.cc
similarity index 93%
rename from src/tint/ast/workgroup_attribute_test.cc
rename to src/tint/lang/wgsl/ast/workgroup_attribute_test.cc
index be833b6..0dd8729 100644
--- a/src/tint/ast/workgroup_attribute_test.cc
+++ b/src/tint/lang/wgsl/ast/workgroup_attribute_test.cc
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/workgroup_attribute.h"
+#include "src/tint/lang/wgsl/ast/workgroup_attribute.h"
-#include "src/tint/ast/stage_attribute.h"
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/stage_attribute.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/wgsl/ast_writer/generator_impl.cc b/src/tint/lang/wgsl/ast_writer/generator_impl.cc
index 130dec9..a046225b 100644
--- a/src/tint/lang/wgsl/ast_writer/generator_impl.cc
+++ b/src/tint/lang/wgsl/ast_writer/generator_impl.cc
@@ -16,22 +16,22 @@
#include <algorithm>
-#include "src/tint/ast/alias.h"
-#include "src/tint/ast/bool_literal_expression.h"
-#include "src/tint/ast/call_statement.h"
-#include "src/tint/ast/float_literal_expression.h"
-#include "src/tint/ast/id_attribute.h"
-#include "src/tint/ast/internal_attribute.h"
-#include "src/tint/ast/interpolate_attribute.h"
-#include "src/tint/ast/invariant_attribute.h"
-#include "src/tint/ast/module.h"
-#include "src/tint/ast/stage_attribute.h"
-#include "src/tint/ast/stride_attribute.h"
-#include "src/tint/ast/struct_member_align_attribute.h"
-#include "src/tint/ast/struct_member_offset_attribute.h"
-#include "src/tint/ast/struct_member_size_attribute.h"
-#include "src/tint/ast/variable_decl_statement.h"
-#include "src/tint/ast/workgroup_attribute.h"
+#include "src/tint/lang/wgsl/ast/alias.h"
+#include "src/tint/lang/wgsl/ast/bool_literal_expression.h"
+#include "src/tint/lang/wgsl/ast/call_statement.h"
+#include "src/tint/lang/wgsl/ast/float_literal_expression.h"
+#include "src/tint/lang/wgsl/ast/id_attribute.h"
+#include "src/tint/lang/wgsl/ast/internal_attribute.h"
+#include "src/tint/lang/wgsl/ast/interpolate_attribute.h"
+#include "src/tint/lang/wgsl/ast/invariant_attribute.h"
+#include "src/tint/lang/wgsl/ast/module.h"
+#include "src/tint/lang/wgsl/ast/stage_attribute.h"
+#include "src/tint/lang/wgsl/ast/stride_attribute.h"
+#include "src/tint/lang/wgsl/ast/struct_member_align_attribute.h"
+#include "src/tint/lang/wgsl/ast/struct_member_offset_attribute.h"
+#include "src/tint/lang/wgsl/ast/struct_member_size_attribute.h"
+#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
+#include "src/tint/lang/wgsl/ast/workgroup_attribute.h"
#include "src/tint/sem/struct.h"
#include "src/tint/sem/switch_statement.h"
#include "src/tint/switch.h"
diff --git a/src/tint/lang/wgsl/ast_writer/generator_impl.h b/src/tint/lang/wgsl/ast_writer/generator_impl.h
index a393412..fe98186 100644
--- a/src/tint/lang/wgsl/ast_writer/generator_impl.h
+++ b/src/tint/lang/wgsl/ast_writer/generator_impl.h
@@ -17,22 +17,22 @@
#include <string>
-#include "src/tint/ast/assignment_statement.h"
-#include "src/tint/ast/binary_expression.h"
-#include "src/tint/ast/bitcast_expression.h"
-#include "src/tint/ast/break_if_statement.h"
-#include "src/tint/ast/break_statement.h"
-#include "src/tint/ast/compound_assignment_statement.h"
-#include "src/tint/ast/continue_statement.h"
-#include "src/tint/ast/discard_statement.h"
-#include "src/tint/ast/for_loop_statement.h"
-#include "src/tint/ast/if_statement.h"
-#include "src/tint/ast/index_accessor_expression.h"
-#include "src/tint/ast/loop_statement.h"
-#include "src/tint/ast/member_accessor_expression.h"
-#include "src/tint/ast/return_statement.h"
-#include "src/tint/ast/switch_statement.h"
-#include "src/tint/ast/unary_op_expression.h"
+#include "src/tint/lang/wgsl/ast/assignment_statement.h"
+#include "src/tint/lang/wgsl/ast/binary_expression.h"
+#include "src/tint/lang/wgsl/ast/bitcast_expression.h"
+#include "src/tint/lang/wgsl/ast/break_if_statement.h"
+#include "src/tint/lang/wgsl/ast/break_statement.h"
+#include "src/tint/lang/wgsl/ast/compound_assignment_statement.h"
+#include "src/tint/lang/wgsl/ast/continue_statement.h"
+#include "src/tint/lang/wgsl/ast/discard_statement.h"
+#include "src/tint/lang/wgsl/ast/for_loop_statement.h"
+#include "src/tint/lang/wgsl/ast/if_statement.h"
+#include "src/tint/lang/wgsl/ast/index_accessor_expression.h"
+#include "src/tint/lang/wgsl/ast/loop_statement.h"
+#include "src/tint/lang/wgsl/ast/member_accessor_expression.h"
+#include "src/tint/lang/wgsl/ast/return_statement.h"
+#include "src/tint/lang/wgsl/ast/switch_statement.h"
+#include "src/tint/lang/wgsl/ast/unary_op_expression.h"
#include "src/tint/program.h"
#include "src/tint/sem/struct.h"
#include "src/tint/utils/string_stream.h"
diff --git a/src/tint/lang/wgsl/ast_writer/generator_impl_call_test.cc b/src/tint/lang/wgsl/ast_writer/generator_impl_call_test.cc
index 21faae0..2471962 100644
--- a/src/tint/lang/wgsl/ast_writer/generator_impl_call_test.cc
+++ b/src/tint/lang/wgsl/ast_writer/generator_impl_call_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/call_statement.h"
+#include "src/tint/lang/wgsl/ast/call_statement.h"
#include "src/tint/lang/wgsl/ast_writer/test_helper.h"
#include "src/tint/utils/string_stream.h"
diff --git a/src/tint/lang/wgsl/ast_writer/generator_impl_function_test.cc b/src/tint/lang/wgsl/ast_writer/generator_impl_function_test.cc
index 3121c31..200e60c 100644
--- a/src/tint/lang/wgsl/ast_writer/generator_impl_function_test.cc
+++ b/src/tint/lang/wgsl/ast_writer/generator_impl_function_test.cc
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/stage_attribute.h"
-#include "src/tint/ast/variable_decl_statement.h"
-#include "src/tint/ast/workgroup_attribute.h"
#include "src/tint/builtin/builtin_value.h"
+#include "src/tint/lang/wgsl/ast/stage_attribute.h"
+#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
+#include "src/tint/lang/wgsl/ast/workgroup_attribute.h"
#include "src/tint/lang/wgsl/ast_writer/test_helper.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/ast_writer/generator_impl_global_decl_test.cc b/src/tint/lang/wgsl/ast_writer/generator_impl_global_decl_test.cc
index dd20231..75161a2 100644
--- a/src/tint/lang/wgsl/ast_writer/generator_impl_global_decl_test.cc
+++ b/src/tint/lang/wgsl/ast_writer/generator_impl_global_decl_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/stage_attribute.h"
-#include "src/tint/ast/variable_decl_statement.h"
+#include "src/tint/lang/wgsl/ast/stage_attribute.h"
+#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
#include "src/tint/lang/wgsl/ast_writer/test_helper.h"
#include "src/tint/type/sampled_texture.h"
#include "src/tint/type/texture_dimension.h"
diff --git a/src/tint/lang/wgsl/ast_writer/generator_impl_variable_decl_statement_test.cc b/src/tint/lang/wgsl/ast_writer/generator_impl_variable_decl_statement_test.cc
index bc66f1e..a681d10 100644
--- a/src/tint/lang/wgsl/ast_writer/generator_impl_variable_decl_statement_test.cc
+++ b/src/tint/lang/wgsl/ast_writer/generator_impl_variable_decl_statement_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/variable_decl_statement.h"
+#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
#include "src/tint/lang/wgsl/ast_writer/test_helper.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/reader/parser_impl.cc b/src/tint/lang/wgsl/reader/parser_impl.cc
index 00d8c91..5138e61 100644
--- a/src/tint/lang/wgsl/reader/parser_impl.cc
+++ b/src/tint/lang/wgsl/reader/parser_impl.cc
@@ -16,25 +16,25 @@
#include <limits>
-#include "src/tint/ast/assignment_statement.h"
-#include "src/tint/ast/bitcast_expression.h"
-#include "src/tint/ast/break_if_statement.h"
-#include "src/tint/ast/break_statement.h"
-#include "src/tint/ast/call_statement.h"
-#include "src/tint/ast/continue_statement.h"
-#include "src/tint/ast/discard_statement.h"
-#include "src/tint/ast/id_attribute.h"
-#include "src/tint/ast/if_statement.h"
-#include "src/tint/ast/increment_decrement_statement.h"
-#include "src/tint/ast/invariant_attribute.h"
-#include "src/tint/ast/loop_statement.h"
-#include "src/tint/ast/return_statement.h"
-#include "src/tint/ast/stage_attribute.h"
-#include "src/tint/ast/switch_statement.h"
-#include "src/tint/ast/unary_op_expression.h"
-#include "src/tint/ast/variable_decl_statement.h"
-#include "src/tint/ast/workgroup_attribute.h"
#include "src/tint/builtin/attribute.h"
+#include "src/tint/lang/wgsl/ast/assignment_statement.h"
+#include "src/tint/lang/wgsl/ast/bitcast_expression.h"
+#include "src/tint/lang/wgsl/ast/break_if_statement.h"
+#include "src/tint/lang/wgsl/ast/break_statement.h"
+#include "src/tint/lang/wgsl/ast/call_statement.h"
+#include "src/tint/lang/wgsl/ast/continue_statement.h"
+#include "src/tint/lang/wgsl/ast/discard_statement.h"
+#include "src/tint/lang/wgsl/ast/id_attribute.h"
+#include "src/tint/lang/wgsl/ast/if_statement.h"
+#include "src/tint/lang/wgsl/ast/increment_decrement_statement.h"
+#include "src/tint/lang/wgsl/ast/invariant_attribute.h"
+#include "src/tint/lang/wgsl/ast/loop_statement.h"
+#include "src/tint/lang/wgsl/ast/return_statement.h"
+#include "src/tint/lang/wgsl/ast/stage_attribute.h"
+#include "src/tint/lang/wgsl/ast/switch_statement.h"
+#include "src/tint/lang/wgsl/ast/unary_op_expression.h"
+#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
+#include "src/tint/lang/wgsl/ast/workgroup_attribute.h"
#include "src/tint/lang/wgsl/reader/classify_template_args.h"
#include "src/tint/lang/wgsl/reader/lexer.h"
#include "src/tint/type/depth_texture.h"
diff --git a/src/tint/lang/wgsl/reader/parser_impl_break_stmt_test.cc b/src/tint/lang/wgsl/reader/parser_impl_break_stmt_test.cc
index 1282434..ff3c4bd 100644
--- a/src/tint/lang/wgsl/reader/parser_impl_break_stmt_test.cc
+++ b/src/tint/lang/wgsl/reader/parser_impl_break_stmt_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/break_statement.h"
+#include "src/tint/lang/wgsl/ast/break_statement.h"
#include "src/tint/lang/wgsl/reader/parser_impl_test_helper.h"
namespace tint::reader::wgsl {
diff --git a/src/tint/lang/wgsl/reader/parser_impl_call_stmt_test.cc b/src/tint/lang/wgsl/reader/parser_impl_call_stmt_test.cc
index e35c6b5..e3058d6 100644
--- a/src/tint/lang/wgsl/reader/parser_impl_call_stmt_test.cc
+++ b/src/tint/lang/wgsl/reader/parser_impl_call_stmt_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/call_statement.h"
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/call_statement.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
#include "src/tint/lang/wgsl/reader/parser_impl_test_helper.h"
namespace tint::reader::wgsl {
diff --git a/src/tint/lang/wgsl/reader/parser_impl_compound_stmt_test.cc b/src/tint/lang/wgsl/reader/parser_impl_compound_stmt_test.cc
index 21f7baa..6d984c11 100644
--- a/src/tint/lang/wgsl/reader/parser_impl_compound_stmt_test.cc
+++ b/src/tint/lang/wgsl/reader/parser_impl_compound_stmt_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/discard_statement.h"
+#include "src/tint/lang/wgsl/ast/discard_statement.h"
#include "src/tint/lang/wgsl/reader/parser_impl_test_helper.h"
namespace tint::reader::wgsl {
diff --git a/src/tint/lang/wgsl/reader/parser_impl_continue_stmt_test.cc b/src/tint/lang/wgsl/reader/parser_impl_continue_stmt_test.cc
index 1c3b2ac..ea03a99 100644
--- a/src/tint/lang/wgsl/reader/parser_impl_continue_stmt_test.cc
+++ b/src/tint/lang/wgsl/reader/parser_impl_continue_stmt_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/continue_statement.h"
+#include "src/tint/lang/wgsl/ast/continue_statement.h"
#include "src/tint/lang/wgsl/reader/parser_impl_test_helper.h"
namespace tint::reader::wgsl {
diff --git a/src/tint/lang/wgsl/reader/parser_impl_continuing_stmt_test.cc b/src/tint/lang/wgsl/reader/parser_impl_continuing_stmt_test.cc
index fd8ceb0..de24790 100644
--- a/src/tint/lang/wgsl/reader/parser_impl_continuing_stmt_test.cc
+++ b/src/tint/lang/wgsl/reader/parser_impl_continuing_stmt_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/discard_statement.h"
+#include "src/tint/lang/wgsl/ast/discard_statement.h"
#include "src/tint/lang/wgsl/reader/parser_impl_test_helper.h"
namespace tint::reader::wgsl {
diff --git a/src/tint/lang/wgsl/reader/parser_impl_diagnostic_attribute_test.cc b/src/tint/lang/wgsl/reader/parser_impl_diagnostic_attribute_test.cc
index 06c7a28..1af4402 100644
--- a/src/tint/lang/wgsl/reader/parser_impl_diagnostic_attribute_test.cc
+++ b/src/tint/lang/wgsl/reader/parser_impl_diagnostic_attribute_test.cc
@@ -14,8 +14,8 @@
#include "src/tint/lang/wgsl/reader/parser_impl_test_helper.h"
-#include "src/tint/ast/diagnostic_control.h"
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/diagnostic_control.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
namespace tint::reader::wgsl {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser_impl_diagnostic_control_test.cc b/src/tint/lang/wgsl/reader/parser_impl_diagnostic_control_test.cc
index d5ece9a..09ec3cb 100644
--- a/src/tint/lang/wgsl/reader/parser_impl_diagnostic_control_test.cc
+++ b/src/tint/lang/wgsl/reader/parser_impl_diagnostic_control_test.cc
@@ -14,8 +14,8 @@
#include "src/tint/lang/wgsl/reader/parser_impl_test_helper.h"
-#include "src/tint/ast/diagnostic_control.h"
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/diagnostic_control.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
namespace tint::reader::wgsl {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser_impl_diagnostic_directive_test.cc b/src/tint/lang/wgsl/reader/parser_impl_diagnostic_directive_test.cc
index 4e4c566..c5d95e0 100644
--- a/src/tint/lang/wgsl/reader/parser_impl_diagnostic_directive_test.cc
+++ b/src/tint/lang/wgsl/reader/parser_impl_diagnostic_directive_test.cc
@@ -14,8 +14,8 @@
#include "src/tint/lang/wgsl/reader/parser_impl_test_helper.h"
-#include "src/tint/ast/diagnostic_control.h"
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/diagnostic_control.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
namespace tint::reader::wgsl {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser_impl_enable_directive_test.cc b/src/tint/lang/wgsl/reader/parser_impl_enable_directive_test.cc
index 2039f90..675e70b 100644
--- a/src/tint/lang/wgsl/reader/parser_impl_enable_directive_test.cc
+++ b/src/tint/lang/wgsl/reader/parser_impl_enable_directive_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/wgsl/reader/parser_impl_test_helper.h"
-#include "src/tint/ast/enable.h"
+#include "src/tint/lang/wgsl/ast/enable.h"
namespace tint::reader::wgsl {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser_impl_for_stmt_test.cc b/src/tint/lang/wgsl/reader/parser_impl_for_stmt_test.cc
index a4b1b5a..ecd06e3 100644
--- a/src/tint/lang/wgsl/reader/parser_impl_for_stmt_test.cc
+++ b/src/tint/lang/wgsl/reader/parser_impl_for_stmt_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/wgsl/reader/parser_impl_test_helper.h"
-#include "src/tint/ast/discard_statement.h"
+#include "src/tint/lang/wgsl/ast/discard_statement.h"
namespace tint::reader::wgsl {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser_impl_function_attribute_list_test.cc b/src/tint/lang/wgsl/reader/parser_impl_function_attribute_list_test.cc
index c647c89..5ac213e 100644
--- a/src/tint/lang/wgsl/reader/parser_impl_function_attribute_list_test.cc
+++ b/src/tint/lang/wgsl/reader/parser_impl_function_attribute_list_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/workgroup_attribute.h"
+#include "src/tint/lang/wgsl/ast/workgroup_attribute.h"
#include "src/tint/lang/wgsl/reader/parser_impl_test_helper.h"
namespace tint::reader::wgsl {
diff --git a/src/tint/lang/wgsl/reader/parser_impl_function_attribute_test.cc b/src/tint/lang/wgsl/reader/parser_impl_function_attribute_test.cc
index c2fb866..3e54dc1 100644
--- a/src/tint/lang/wgsl/reader/parser_impl_function_attribute_test.cc
+++ b/src/tint/lang/wgsl/reader/parser_impl_function_attribute_test.cc
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/stage_attribute.h"
-#include "src/tint/ast/test_helper.h"
-#include "src/tint/ast/workgroup_attribute.h"
+#include "src/tint/lang/wgsl/ast/stage_attribute.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/workgroup_attribute.h"
#include "src/tint/lang/wgsl/reader/parser_impl_test_helper.h"
namespace tint::reader::wgsl {
diff --git a/src/tint/lang/wgsl/reader/parser_impl_function_decl_test.cc b/src/tint/lang/wgsl/reader/parser_impl_function_decl_test.cc
index b84bb17..2aca45c 100644
--- a/src/tint/lang/wgsl/reader/parser_impl_function_decl_test.cc
+++ b/src/tint/lang/wgsl/reader/parser_impl_function_decl_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/test_helper.h"
-#include "src/tint/ast/workgroup_attribute.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/workgroup_attribute.h"
#include "src/tint/lang/wgsl/reader/parser_impl_test_helper.h"
#include "src/tint/utils/string.h"
diff --git a/src/tint/lang/wgsl/reader/parser_impl_function_header_test.cc b/src/tint/lang/wgsl/reader/parser_impl_function_header_test.cc
index 8fbd9a4..e043e68 100644
--- a/src/tint/lang/wgsl/reader/parser_impl_function_header_test.cc
+++ b/src/tint/lang/wgsl/reader/parser_impl_function_header_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
#include "src/tint/lang/wgsl/reader/parser_impl_test_helper.h"
namespace tint::reader::wgsl {
diff --git a/src/tint/lang/wgsl/reader/parser_impl_global_constant_decl_test.cc b/src/tint/lang/wgsl/reader/parser_impl_global_constant_decl_test.cc
index fe1d800..696058f 100644
--- a/src/tint/lang/wgsl/reader/parser_impl_global_constant_decl_test.cc
+++ b/src/tint/lang/wgsl/reader/parser_impl_global_constant_decl_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/id_attribute.h"
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/id_attribute.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
#include "src/tint/lang/wgsl/reader/parser_impl_test_helper.h"
namespace tint::reader::wgsl {
diff --git a/src/tint/lang/wgsl/reader/parser_impl_global_decl_test.cc b/src/tint/lang/wgsl/reader/parser_impl_global_decl_test.cc
index 2111a75..0e19d15 100644
--- a/src/tint/lang/wgsl/reader/parser_impl_global_decl_test.cc
+++ b/src/tint/lang/wgsl/reader/parser_impl_global_decl_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
#include "src/tint/lang/wgsl/reader/parser_impl_test_helper.h"
namespace tint::reader::wgsl {
diff --git a/src/tint/lang/wgsl/reader/parser_impl_global_variable_decl_test.cc b/src/tint/lang/wgsl/reader/parser_impl_global_variable_decl_test.cc
index e71212b..45cb31f 100644
--- a/src/tint/lang/wgsl/reader/parser_impl_global_variable_decl_test.cc
+++ b/src/tint/lang/wgsl/reader/parser_impl_global_variable_decl_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
#include "src/tint/lang/wgsl/reader/parser_impl_test_helper.h"
namespace tint::reader::wgsl {
diff --git a/src/tint/lang/wgsl/reader/parser_impl_loop_stmt_test.cc b/src/tint/lang/wgsl/reader/parser_impl_loop_stmt_test.cc
index e605a0b..839dc5c 100644
--- a/src/tint/lang/wgsl/reader/parser_impl_loop_stmt_test.cc
+++ b/src/tint/lang/wgsl/reader/parser_impl_loop_stmt_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/discard_statement.h"
+#include "src/tint/lang/wgsl/ast/discard_statement.h"
#include "src/tint/lang/wgsl/reader/parser_impl_test_helper.h"
namespace tint::reader::wgsl {
diff --git a/src/tint/lang/wgsl/reader/parser_impl_param_list_test.cc b/src/tint/lang/wgsl/reader/parser_impl_param_list_test.cc
index 001f74b..2318a13 100644
--- a/src/tint/lang/wgsl/reader/parser_impl_param_list_test.cc
+++ b/src/tint/lang/wgsl/reader/parser_impl_param_list_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
#include "src/tint/lang/wgsl/reader/parser_impl_test_helper.h"
namespace tint::reader::wgsl {
diff --git a/src/tint/lang/wgsl/reader/parser_impl_primary_expression_test.cc b/src/tint/lang/wgsl/reader/parser_impl_primary_expression_test.cc
index 5a3ec5a..a7862a3 100644
--- a/src/tint/lang/wgsl/reader/parser_impl_primary_expression_test.cc
+++ b/src/tint/lang/wgsl/reader/parser_impl_primary_expression_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/bitcast_expression.h"
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/bitcast_expression.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
#include "src/tint/lang/wgsl/reader/parser_impl_test_helper.h"
namespace tint::reader::wgsl {
diff --git a/src/tint/lang/wgsl/reader/parser_impl_singular_expression_test.cc b/src/tint/lang/wgsl/reader/parser_impl_singular_expression_test.cc
index c242bab..18c8f3a 100644
--- a/src/tint/lang/wgsl/reader/parser_impl_singular_expression_test.cc
+++ b/src/tint/lang/wgsl/reader/parser_impl_singular_expression_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
#include "src/tint/lang/wgsl/reader/parser_impl_test_helper.h"
namespace tint::reader::wgsl {
diff --git a/src/tint/lang/wgsl/reader/parser_impl_statement_test.cc b/src/tint/lang/wgsl/reader/parser_impl_statement_test.cc
index 25ebc27..d0ff3e9 100644
--- a/src/tint/lang/wgsl/reader/parser_impl_statement_test.cc
+++ b/src/tint/lang/wgsl/reader/parser_impl_statement_test.cc
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/break_statement.h"
-#include "src/tint/ast/continue_statement.h"
-#include "src/tint/ast/discard_statement.h"
+#include "src/tint/lang/wgsl/ast/break_statement.h"
+#include "src/tint/lang/wgsl/ast/continue_statement.h"
+#include "src/tint/lang/wgsl/ast/discard_statement.h"
#include "src/tint/lang/wgsl/reader/parser_impl_test_helper.h"
namespace tint::reader::wgsl {
diff --git a/src/tint/lang/wgsl/reader/parser_impl_statements_test.cc b/src/tint/lang/wgsl/reader/parser_impl_statements_test.cc
index 800337c..385aa9c 100644
--- a/src/tint/lang/wgsl/reader/parser_impl_statements_test.cc
+++ b/src/tint/lang/wgsl/reader/parser_impl_statements_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/discard_statement.h"
+#include "src/tint/lang/wgsl/ast/discard_statement.h"
#include "src/tint/lang/wgsl/reader/parser_impl_test_helper.h"
namespace tint::reader::wgsl {
diff --git a/src/tint/lang/wgsl/reader/parser_impl_struct_attribute_decl_test.cc b/src/tint/lang/wgsl/reader/parser_impl_struct_attribute_decl_test.cc
index f8addb4..a33f632 100644
--- a/src/tint/lang/wgsl/reader/parser_impl_struct_attribute_decl_test.cc
+++ b/src/tint/lang/wgsl/reader/parser_impl_struct_attribute_decl_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/invariant_attribute.h"
+#include "src/tint/lang/wgsl/ast/invariant_attribute.h"
#include "src/tint/lang/wgsl/reader/parser_impl_test_helper.h"
namespace tint::reader::wgsl {
diff --git a/src/tint/lang/wgsl/reader/parser_impl_struct_body_decl_test.cc b/src/tint/lang/wgsl/reader/parser_impl_struct_body_decl_test.cc
index 977904d..ba36f9a 100644
--- a/src/tint/lang/wgsl/reader/parser_impl_struct_body_decl_test.cc
+++ b/src/tint/lang/wgsl/reader/parser_impl_struct_body_decl_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
#include "src/tint/lang/wgsl/reader/parser_impl_test_helper.h"
namespace tint::reader::wgsl {
diff --git a/src/tint/lang/wgsl/reader/parser_impl_struct_member_test.cc b/src/tint/lang/wgsl/reader/parser_impl_struct_member_test.cc
index 4dce83a..6f4da06 100644
--- a/src/tint/lang/wgsl/reader/parser_impl_struct_member_test.cc
+++ b/src/tint/lang/wgsl/reader/parser_impl_struct_member_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
#include "src/tint/lang/wgsl/reader/parser_impl_test_helper.h"
namespace tint::reader::wgsl {
diff --git a/src/tint/lang/wgsl/reader/parser_impl_type_alias_test.cc b/src/tint/lang/wgsl/reader/parser_impl_type_alias_test.cc
index ad8874e..c8b8595 100644
--- a/src/tint/lang/wgsl/reader/parser_impl_type_alias_test.cc
+++ b/src/tint/lang/wgsl/reader/parser_impl_type_alias_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
#include "src/tint/lang/wgsl/reader/parser_impl_test_helper.h"
namespace tint::reader::wgsl {
diff --git a/src/tint/lang/wgsl/reader/parser_impl_type_decl_test.cc b/src/tint/lang/wgsl/reader/parser_impl_type_decl_test.cc
index ffcbed6..02c43f2 100644
--- a/src/tint/lang/wgsl/reader/parser_impl_type_decl_test.cc
+++ b/src/tint/lang/wgsl/reader/parser_impl_type_decl_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/alias.h"
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/alias.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
#include "src/tint/lang/wgsl/reader/parser_impl_test_helper.h"
#include "src/tint/type/sampled_texture.h"
diff --git a/src/tint/lang/wgsl/reader/parser_impl_unary_expression_test.cc b/src/tint/lang/wgsl/reader/parser_impl_unary_expression_test.cc
index 7517a37..0f5201f 100644
--- a/src/tint/lang/wgsl/reader/parser_impl_unary_expression_test.cc
+++ b/src/tint/lang/wgsl/reader/parser_impl_unary_expression_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/unary_op_expression.h"
+#include "src/tint/lang/wgsl/ast/unary_op_expression.h"
#include "src/tint/lang/wgsl/reader/parser_impl_test_helper.h"
namespace tint::reader::wgsl {
diff --git a/src/tint/lang/wgsl/reader/parser_impl_variable_attribute_list_test.cc b/src/tint/lang/wgsl/reader/parser_impl_variable_attribute_list_test.cc
index 1ea68c7..a888506 100644
--- a/src/tint/lang/wgsl/reader/parser_impl_variable_attribute_list_test.cc
+++ b/src/tint/lang/wgsl/reader/parser_impl_variable_attribute_list_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
#include "src/tint/lang/wgsl/reader/parser_impl_test_helper.h"
namespace tint::reader::wgsl {
diff --git a/src/tint/lang/wgsl/reader/parser_impl_variable_attribute_test.cc b/src/tint/lang/wgsl/reader/parser_impl_variable_attribute_test.cc
index d18209e..6d59ed6 100644
--- a/src/tint/lang/wgsl/reader/parser_impl_variable_attribute_test.cc
+++ b/src/tint/lang/wgsl/reader/parser_impl_variable_attribute_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/test_helper.h"
#include "src/tint/builtin/builtin_value.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
#include "src/tint/lang/wgsl/reader/parser_impl_test_helper.h"
namespace tint::reader::wgsl {
diff --git a/src/tint/lang/wgsl/reader/parser_impl_variable_decl_test.cc b/src/tint/lang/wgsl/reader/parser_impl_variable_decl_test.cc
index c722334..8448452 100644
--- a/src/tint/lang/wgsl/reader/parser_impl_variable_decl_test.cc
+++ b/src/tint/lang/wgsl/reader/parser_impl_variable_decl_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
#include "src/tint/lang/wgsl/reader/parser_impl_test_helper.h"
namespace tint::reader::wgsl {
diff --git a/src/tint/lang/wgsl/reader/parser_impl_variable_ident_decl_test.cc b/src/tint/lang/wgsl/reader/parser_impl_variable_ident_decl_test.cc
index 2b44124..0891ca4 100644
--- a/src/tint/lang/wgsl/reader/parser_impl_variable_ident_decl_test.cc
+++ b/src/tint/lang/wgsl/reader/parser_impl_variable_ident_decl_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
#include "src/tint/lang/wgsl/reader/parser_impl_test_helper.h"
namespace tint::reader::wgsl {
diff --git a/src/tint/lang/wgsl/reader/parser_impl_variable_qualifier_test.cc b/src/tint/lang/wgsl/reader/parser_impl_variable_qualifier_test.cc
index 21e52eb..ccfc78c 100644
--- a/src/tint/lang/wgsl/reader/parser_impl_variable_qualifier_test.cc
+++ b/src/tint/lang/wgsl/reader/parser_impl_variable_qualifier_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
#include "src/tint/lang/wgsl/reader/parser_impl_test_helper.h"
namespace tint::reader::wgsl {
diff --git a/src/tint/lang/wgsl/reader/parser_impl_variable_stmt_test.cc b/src/tint/lang/wgsl/reader/parser_impl_variable_stmt_test.cc
index 3217d99..06b1f74 100644
--- a/src/tint/lang/wgsl/reader/parser_impl_variable_stmt_test.cc
+++ b/src/tint/lang/wgsl/reader/parser_impl_variable_stmt_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
#include "src/tint/lang/wgsl/reader/parser_impl_test_helper.h"
namespace tint::reader::wgsl {
diff --git a/src/tint/lang/wgsl/reader/parser_impl_while_stmt_test.cc b/src/tint/lang/wgsl/reader/parser_impl_while_stmt_test.cc
index 7a859ae..f38669a 100644
--- a/src/tint/lang/wgsl/reader/parser_impl_while_stmt_test.cc
+++ b/src/tint/lang/wgsl/reader/parser_impl_while_stmt_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/wgsl/reader/parser_impl_test_helper.h"
-#include "src/tint/ast/discard_statement.h"
+#include "src/tint/lang/wgsl/ast/discard_statement.h"
namespace tint::reader::wgsl {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser_test.cc b/src/tint/lang/wgsl/reader/parser_test.cc
index 4cb45c8..12c37f9 100644
--- a/src/tint/lang/wgsl/reader/parser_test.cc
+++ b/src/tint/lang/wgsl/reader/parser_test.cc
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "src/tint/ast/module.h"
+#include "src/tint/lang/wgsl/ast/module.h"
namespace tint::reader::wgsl {
namespace {
diff --git a/src/tint/lang/wgsl/syntax_tree_writer/generator_impl.cc b/src/tint/lang/wgsl/syntax_tree_writer/generator_impl.cc
index bc23479..a861e66 100644
--- a/src/tint/lang/wgsl/syntax_tree_writer/generator_impl.cc
+++ b/src/tint/lang/wgsl/syntax_tree_writer/generator_impl.cc
@@ -16,22 +16,22 @@
#include <algorithm>
-#include "src/tint/ast/alias.h"
-#include "src/tint/ast/bool_literal_expression.h"
-#include "src/tint/ast/call_statement.h"
-#include "src/tint/ast/float_literal_expression.h"
-#include "src/tint/ast/id_attribute.h"
-#include "src/tint/ast/internal_attribute.h"
-#include "src/tint/ast/interpolate_attribute.h"
-#include "src/tint/ast/invariant_attribute.h"
-#include "src/tint/ast/module.h"
-#include "src/tint/ast/stage_attribute.h"
-#include "src/tint/ast/stride_attribute.h"
-#include "src/tint/ast/struct_member_align_attribute.h"
-#include "src/tint/ast/struct_member_offset_attribute.h"
-#include "src/tint/ast/struct_member_size_attribute.h"
-#include "src/tint/ast/variable_decl_statement.h"
-#include "src/tint/ast/workgroup_attribute.h"
+#include "src/tint/lang/wgsl/ast/alias.h"
+#include "src/tint/lang/wgsl/ast/bool_literal_expression.h"
+#include "src/tint/lang/wgsl/ast/call_statement.h"
+#include "src/tint/lang/wgsl/ast/float_literal_expression.h"
+#include "src/tint/lang/wgsl/ast/id_attribute.h"
+#include "src/tint/lang/wgsl/ast/internal_attribute.h"
+#include "src/tint/lang/wgsl/ast/interpolate_attribute.h"
+#include "src/tint/lang/wgsl/ast/invariant_attribute.h"
+#include "src/tint/lang/wgsl/ast/module.h"
+#include "src/tint/lang/wgsl/ast/stage_attribute.h"
+#include "src/tint/lang/wgsl/ast/stride_attribute.h"
+#include "src/tint/lang/wgsl/ast/struct_member_align_attribute.h"
+#include "src/tint/lang/wgsl/ast/struct_member_offset_attribute.h"
+#include "src/tint/lang/wgsl/ast/struct_member_size_attribute.h"
+#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
+#include "src/tint/lang/wgsl/ast/workgroup_attribute.h"
#include "src/tint/sem/struct.h"
#include "src/tint/sem/switch_statement.h"
#include "src/tint/switch.h"
diff --git a/src/tint/lang/wgsl/syntax_tree_writer/generator_impl.h b/src/tint/lang/wgsl/syntax_tree_writer/generator_impl.h
index 26914fe..871ae7f 100644
--- a/src/tint/lang/wgsl/syntax_tree_writer/generator_impl.h
+++ b/src/tint/lang/wgsl/syntax_tree_writer/generator_impl.h
@@ -17,22 +17,22 @@
#include <string>
-#include "src/tint/ast/assignment_statement.h"
-#include "src/tint/ast/binary_expression.h"
-#include "src/tint/ast/bitcast_expression.h"
-#include "src/tint/ast/break_if_statement.h"
-#include "src/tint/ast/break_statement.h"
-#include "src/tint/ast/compound_assignment_statement.h"
-#include "src/tint/ast/continue_statement.h"
-#include "src/tint/ast/discard_statement.h"
-#include "src/tint/ast/for_loop_statement.h"
-#include "src/tint/ast/if_statement.h"
-#include "src/tint/ast/index_accessor_expression.h"
-#include "src/tint/ast/loop_statement.h"
-#include "src/tint/ast/member_accessor_expression.h"
-#include "src/tint/ast/return_statement.h"
-#include "src/tint/ast/switch_statement.h"
-#include "src/tint/ast/unary_op_expression.h"
+#include "src/tint/lang/wgsl/ast/assignment_statement.h"
+#include "src/tint/lang/wgsl/ast/binary_expression.h"
+#include "src/tint/lang/wgsl/ast/bitcast_expression.h"
+#include "src/tint/lang/wgsl/ast/break_if_statement.h"
+#include "src/tint/lang/wgsl/ast/break_statement.h"
+#include "src/tint/lang/wgsl/ast/compound_assignment_statement.h"
+#include "src/tint/lang/wgsl/ast/continue_statement.h"
+#include "src/tint/lang/wgsl/ast/discard_statement.h"
+#include "src/tint/lang/wgsl/ast/for_loop_statement.h"
+#include "src/tint/lang/wgsl/ast/if_statement.h"
+#include "src/tint/lang/wgsl/ast/index_accessor_expression.h"
+#include "src/tint/lang/wgsl/ast/loop_statement.h"
+#include "src/tint/lang/wgsl/ast/member_accessor_expression.h"
+#include "src/tint/lang/wgsl/ast/return_statement.h"
+#include "src/tint/lang/wgsl/ast/switch_statement.h"
+#include "src/tint/lang/wgsl/ast/unary_op_expression.h"
#include "src/tint/program.h"
#include "src/tint/sem/struct.h"
#include "src/tint/utils/string_stream.h"
diff --git a/src/tint/program.h b/src/tint/program.h
index 940a6ec..8d3b4ac 100644
--- a/src/tint/program.h
+++ b/src/tint/program.h
@@ -18,8 +18,8 @@
#include <string>
#include <unordered_set>
-#include "src/tint/ast/function.h"
#include "src/tint/constant/manager.h"
+#include "src/tint/lang/wgsl/ast/function.h"
#include "src/tint/program_id.h"
#include "src/tint/sem/info.h"
#include "src/tint/symbol_table.h"
diff --git a/src/tint/program_builder.cc b/src/tint/program_builder.cc
index 20a3fc4..c82e4b0 100644
--- a/src/tint/program_builder.cc
+++ b/src/tint/program_builder.cc
@@ -14,10 +14,10 @@
#include "src/tint/program_builder.h"
-#include "src/tint/ast/assignment_statement.h"
-#include "src/tint/ast/call_statement.h"
-#include "src/tint/ast/variable_decl_statement.h"
#include "src/tint/debug.h"
+#include "src/tint/lang/wgsl/ast/assignment_statement.h"
+#include "src/tint/lang/wgsl/ast/call_statement.h"
+#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
#include "src/tint/sem/type_expression.h"
#include "src/tint/sem/value_expression.h"
#include "src/tint/sem/variable.h"
diff --git a/src/tint/program_builder.h b/src/tint/program_builder.h
index f8866ac..0362ef6 100644
--- a/src/tint/program_builder.h
+++ b/src/tint/program_builder.h
@@ -21,67 +21,67 @@
#include "tint/override_id.h"
-#include "src/tint/ast/alias.h"
-#include "src/tint/ast/assignment_statement.h"
-#include "src/tint/ast/binary_expression.h"
-#include "src/tint/ast/binding_attribute.h"
-#include "src/tint/ast/bitcast_expression.h"
-#include "src/tint/ast/bool_literal_expression.h"
-#include "src/tint/ast/break_if_statement.h"
-#include "src/tint/ast/break_statement.h"
-#include "src/tint/ast/call_expression.h"
-#include "src/tint/ast/call_statement.h"
-#include "src/tint/ast/case_statement.h"
-#include "src/tint/ast/compound_assignment_statement.h"
-#include "src/tint/ast/const.h"
-#include "src/tint/ast/const_assert.h"
-#include "src/tint/ast/continue_statement.h"
-#include "src/tint/ast/diagnostic_attribute.h"
-#include "src/tint/ast/diagnostic_control.h"
-#include "src/tint/ast/diagnostic_directive.h"
-#include "src/tint/ast/diagnostic_rule_name.h"
-#include "src/tint/ast/disable_validation_attribute.h"
-#include "src/tint/ast/discard_statement.h"
-#include "src/tint/ast/enable.h"
-#include "src/tint/ast/float_literal_expression.h"
-#include "src/tint/ast/for_loop_statement.h"
-#include "src/tint/ast/id_attribute.h"
-#include "src/tint/ast/identifier.h"
-#include "src/tint/ast/if_statement.h"
-#include "src/tint/ast/increment_decrement_statement.h"
-#include "src/tint/ast/index_accessor_expression.h"
-#include "src/tint/ast/index_attribute.h"
-#include "src/tint/ast/int_literal_expression.h"
-#include "src/tint/ast/interpolate_attribute.h"
-#include "src/tint/ast/invariant_attribute.h"
-#include "src/tint/ast/let.h"
-#include "src/tint/ast/loop_statement.h"
-#include "src/tint/ast/member_accessor_expression.h"
-#include "src/tint/ast/module.h"
-#include "src/tint/ast/must_use_attribute.h"
-#include "src/tint/ast/override.h"
-#include "src/tint/ast/parameter.h"
-#include "src/tint/ast/phony_expression.h"
-#include "src/tint/ast/return_statement.h"
-#include "src/tint/ast/stage_attribute.h"
-#include "src/tint/ast/stride_attribute.h"
-#include "src/tint/ast/struct_member_align_attribute.h"
-#include "src/tint/ast/struct_member_offset_attribute.h"
-#include "src/tint/ast/struct_member_size_attribute.h"
-#include "src/tint/ast/switch_statement.h"
-#include "src/tint/ast/templated_identifier.h"
-#include "src/tint/ast/type.h"
-#include "src/tint/ast/unary_op_expression.h"
-#include "src/tint/ast/var.h"
-#include "src/tint/ast/variable_decl_statement.h"
-#include "src/tint/ast/while_statement.h"
-#include "src/tint/ast/workgroup_attribute.h"
#include "src/tint/builtin/extension.h"
#include "src/tint/builtin/fluent_types.h"
#include "src/tint/builtin/interpolation_sampling.h"
#include "src/tint/builtin/interpolation_type.h"
#include "src/tint/builtin/number.h"
#include "src/tint/constant/manager.h"
+#include "src/tint/lang/wgsl/ast/alias.h"
+#include "src/tint/lang/wgsl/ast/assignment_statement.h"
+#include "src/tint/lang/wgsl/ast/binary_expression.h"
+#include "src/tint/lang/wgsl/ast/binding_attribute.h"
+#include "src/tint/lang/wgsl/ast/bitcast_expression.h"
+#include "src/tint/lang/wgsl/ast/bool_literal_expression.h"
+#include "src/tint/lang/wgsl/ast/break_if_statement.h"
+#include "src/tint/lang/wgsl/ast/break_statement.h"
+#include "src/tint/lang/wgsl/ast/call_expression.h"
+#include "src/tint/lang/wgsl/ast/call_statement.h"
+#include "src/tint/lang/wgsl/ast/case_statement.h"
+#include "src/tint/lang/wgsl/ast/compound_assignment_statement.h"
+#include "src/tint/lang/wgsl/ast/const.h"
+#include "src/tint/lang/wgsl/ast/const_assert.h"
+#include "src/tint/lang/wgsl/ast/continue_statement.h"
+#include "src/tint/lang/wgsl/ast/diagnostic_attribute.h"
+#include "src/tint/lang/wgsl/ast/diagnostic_control.h"
+#include "src/tint/lang/wgsl/ast/diagnostic_directive.h"
+#include "src/tint/lang/wgsl/ast/diagnostic_rule_name.h"
+#include "src/tint/lang/wgsl/ast/disable_validation_attribute.h"
+#include "src/tint/lang/wgsl/ast/discard_statement.h"
+#include "src/tint/lang/wgsl/ast/enable.h"
+#include "src/tint/lang/wgsl/ast/float_literal_expression.h"
+#include "src/tint/lang/wgsl/ast/for_loop_statement.h"
+#include "src/tint/lang/wgsl/ast/id_attribute.h"
+#include "src/tint/lang/wgsl/ast/identifier.h"
+#include "src/tint/lang/wgsl/ast/if_statement.h"
+#include "src/tint/lang/wgsl/ast/increment_decrement_statement.h"
+#include "src/tint/lang/wgsl/ast/index_accessor_expression.h"
+#include "src/tint/lang/wgsl/ast/index_attribute.h"
+#include "src/tint/lang/wgsl/ast/int_literal_expression.h"
+#include "src/tint/lang/wgsl/ast/interpolate_attribute.h"
+#include "src/tint/lang/wgsl/ast/invariant_attribute.h"
+#include "src/tint/lang/wgsl/ast/let.h"
+#include "src/tint/lang/wgsl/ast/loop_statement.h"
+#include "src/tint/lang/wgsl/ast/member_accessor_expression.h"
+#include "src/tint/lang/wgsl/ast/module.h"
+#include "src/tint/lang/wgsl/ast/must_use_attribute.h"
+#include "src/tint/lang/wgsl/ast/override.h"
+#include "src/tint/lang/wgsl/ast/parameter.h"
+#include "src/tint/lang/wgsl/ast/phony_expression.h"
+#include "src/tint/lang/wgsl/ast/return_statement.h"
+#include "src/tint/lang/wgsl/ast/stage_attribute.h"
+#include "src/tint/lang/wgsl/ast/stride_attribute.h"
+#include "src/tint/lang/wgsl/ast/struct_member_align_attribute.h"
+#include "src/tint/lang/wgsl/ast/struct_member_offset_attribute.h"
+#include "src/tint/lang/wgsl/ast/struct_member_size_attribute.h"
+#include "src/tint/lang/wgsl/ast/switch_statement.h"
+#include "src/tint/lang/wgsl/ast/templated_identifier.h"
+#include "src/tint/lang/wgsl/ast/type.h"
+#include "src/tint/lang/wgsl/ast/unary_op_expression.h"
+#include "src/tint/lang/wgsl/ast/var.h"
+#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
+#include "src/tint/lang/wgsl/ast/while_statement.h"
+#include "src/tint/lang/wgsl/ast/workgroup_attribute.h"
#include "src/tint/program.h"
#include "src/tint/program_id.h"
#include "src/tint/sem/array_count.h"
diff --git a/src/tint/program_test.cc b/src/tint/program_test.cc
index 0267bcc..6831282 100644
--- a/src/tint/program_test.cc
+++ b/src/tint/program_test.cc
@@ -13,8 +13,8 @@
// limitations under the License.
#include "gtest/gtest-spi.h"
-#include "src/tint/ast/return_statement.h"
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/return_statement.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
namespace tint {
namespace {
diff --git a/src/tint/resolver/attribute_validation_test.cc b/src/tint/resolver/attribute_validation_test.cc
index c64a325..576b55c 100644
--- a/src/tint/resolver/attribute_validation_test.cc
+++ b/src/tint/resolver/attribute_validation_test.cc
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/disable_validation_attribute.h"
-#include "src/tint/ast/transform/add_block_attribute.h"
#include "src/tint/builtin/builtin_value.h"
+#include "src/tint/lang/wgsl/ast/disable_validation_attribute.h"
+#include "src/tint/lang/wgsl/ast/transform/add_block_attribute.h"
#include "src/tint/resolver/resolver.h"
#include "src/tint/resolver/resolver_test_helper.h"
#include "src/tint/type/texture_dimension.h"
diff --git a/src/tint/resolver/bitcast_validation_test.cc b/src/tint/resolver/bitcast_validation_test.cc
index 631c9c8..9dd1f8d 100644
--- a/src/tint/resolver/bitcast_validation_test.cc
+++ b/src/tint/resolver/bitcast_validation_test.cc
@@ -14,7 +14,7 @@
#include <type_traits>
-#include "src/tint/ast/bitcast_expression.h"
+#include "src/tint/lang/wgsl/ast/bitcast_expression.h"
#include "src/tint/resolver/resolver.h"
#include "src/tint/resolver/resolver_test_helper.h"
diff --git a/src/tint/resolver/builtin_test.cc b/src/tint/resolver/builtin_test.cc
index 04e23f6..1c9334b 100644
--- a/src/tint/resolver/builtin_test.cc
+++ b/src/tint/resolver/builtin_test.cc
@@ -15,19 +15,19 @@
#include "src/tint/resolver/resolver.h"
#include "gmock/gmock.h"
-#include "src/tint/ast/assignment_statement.h"
-#include "src/tint/ast/bitcast_expression.h"
-#include "src/tint/ast/break_statement.h"
-#include "src/tint/ast/builtin_texture_helper_test.h"
-#include "src/tint/ast/call_statement.h"
-#include "src/tint/ast/continue_statement.h"
-#include "src/tint/ast/if_statement.h"
-#include "src/tint/ast/loop_statement.h"
-#include "src/tint/ast/return_statement.h"
-#include "src/tint/ast/stage_attribute.h"
-#include "src/tint/ast/switch_statement.h"
-#include "src/tint/ast/unary_op_expression.h"
-#include "src/tint/ast/variable_decl_statement.h"
+#include "src/tint/lang/wgsl/ast/assignment_statement.h"
+#include "src/tint/lang/wgsl/ast/bitcast_expression.h"
+#include "src/tint/lang/wgsl/ast/break_statement.h"
+#include "src/tint/lang/wgsl/ast/builtin_texture_helper_test.h"
+#include "src/tint/lang/wgsl/ast/call_statement.h"
+#include "src/tint/lang/wgsl/ast/continue_statement.h"
+#include "src/tint/lang/wgsl/ast/if_statement.h"
+#include "src/tint/lang/wgsl/ast/loop_statement.h"
+#include "src/tint/lang/wgsl/ast/return_statement.h"
+#include "src/tint/lang/wgsl/ast/stage_attribute.h"
+#include "src/tint/lang/wgsl/ast/switch_statement.h"
+#include "src/tint/lang/wgsl/ast/unary_op_expression.h"
+#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
#include "src/tint/resolver/resolver_test_helper.h"
#include "src/tint/sem/call.h"
#include "src/tint/sem/function.h"
diff --git a/src/tint/resolver/builtin_validation_test.cc b/src/tint/resolver/builtin_validation_test.cc
index 3996aa9..07c5578 100644
--- a/src/tint/resolver/builtin_validation_test.cc
+++ b/src/tint/resolver/builtin_validation_test.cc
@@ -14,7 +14,7 @@
#include <unordered_set>
-#include "src/tint/ast/builtin_texture_helper_test.h"
+#include "src/tint/lang/wgsl/ast/builtin_texture_helper_test.h"
#include "src/tint/resolver/resolver_test_helper.h"
#include "src/tint/sem/value_constructor.h"
#include "src/tint/utils/string_stream.h"
diff --git a/src/tint/resolver/builtins_validation_test.cc b/src/tint/resolver/builtins_validation_test.cc
index a1cc2e2..8b96025 100644
--- a/src/tint/resolver/builtins_validation_test.cc
+++ b/src/tint/resolver/builtins_validation_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/call_statement.h"
#include "src/tint/builtin/builtin_value.h"
+#include "src/tint/lang/wgsl/ast/call_statement.h"
#include "src/tint/resolver/resolver_test_helper.h"
#include "src/tint/utils/string_stream.h"
diff --git a/src/tint/resolver/call_test.cc b/src/tint/resolver/call_test.cc
index 6ebd629..a1279bb 100644
--- a/src/tint/resolver/call_test.cc
+++ b/src/tint/resolver/call_test.cc
@@ -15,7 +15,7 @@
#include "src/tint/resolver/resolver.h"
#include "gmock/gmock.h"
-#include "src/tint/ast/call_statement.h"
+#include "src/tint/lang/wgsl/ast/call_statement.h"
#include "src/tint/resolver/resolver_test_helper.h"
namespace tint::resolver {
diff --git a/src/tint/resolver/call_validation_test.cc b/src/tint/resolver/call_validation_test.cc
index 100e9c4..421330a 100644
--- a/src/tint/resolver/call_validation_test.cc
+++ b/src/tint/resolver/call_validation_test.cc
@@ -15,7 +15,7 @@
#include "src/tint/resolver/resolver.h"
#include "gmock/gmock.h"
-#include "src/tint/ast/call_statement.h"
+#include "src/tint/lang/wgsl/ast/call_statement.h"
#include "src/tint/resolver/resolver_test_helper.h"
namespace tint::resolver {
diff --git a/src/tint/resolver/control_block_validation_test.cc b/src/tint/resolver/control_block_validation_test.cc
index ba7aa53..05eeabc 100644
--- a/src/tint/resolver/control_block_validation_test.cc
+++ b/src/tint/resolver/control_block_validation_test.cc
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/break_statement.h"
-#include "src/tint/ast/continue_statement.h"
-#include "src/tint/ast/switch_statement.h"
+#include "src/tint/lang/wgsl/ast/break_statement.h"
+#include "src/tint/lang/wgsl/ast/continue_statement.h"
+#include "src/tint/lang/wgsl/ast/switch_statement.h"
#include "src/tint/resolver/resolver_test_helper.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/resolver/dependency_graph.cc b/src/tint/resolver/dependency_graph.cc
index 2a4669d..6e82d59 100644
--- a/src/tint/resolver/dependency_graph.cc
+++ b/src/tint/resolver/dependency_graph.cc
@@ -19,47 +19,47 @@
#include <variant>
#include <vector>
-#include "src/tint/ast/alias.h"
-#include "src/tint/ast/assignment_statement.h"
-#include "src/tint/ast/block_statement.h"
-#include "src/tint/ast/break_if_statement.h"
-#include "src/tint/ast/break_statement.h"
-#include "src/tint/ast/call_statement.h"
-#include "src/tint/ast/compound_assignment_statement.h"
-#include "src/tint/ast/const.h"
-#include "src/tint/ast/continue_statement.h"
-#include "src/tint/ast/diagnostic_attribute.h"
-#include "src/tint/ast/discard_statement.h"
-#include "src/tint/ast/for_loop_statement.h"
-#include "src/tint/ast/id_attribute.h"
-#include "src/tint/ast/identifier.h"
-#include "src/tint/ast/if_statement.h"
-#include "src/tint/ast/increment_decrement_statement.h"
-#include "src/tint/ast/index_attribute.h"
-#include "src/tint/ast/internal_attribute.h"
-#include "src/tint/ast/interpolate_attribute.h"
-#include "src/tint/ast/invariant_attribute.h"
-#include "src/tint/ast/let.h"
-#include "src/tint/ast/location_attribute.h"
-#include "src/tint/ast/loop_statement.h"
-#include "src/tint/ast/must_use_attribute.h"
-#include "src/tint/ast/override.h"
-#include "src/tint/ast/return_statement.h"
-#include "src/tint/ast/stage_attribute.h"
-#include "src/tint/ast/stride_attribute.h"
-#include "src/tint/ast/struct.h"
-#include "src/tint/ast/struct_member_align_attribute.h"
-#include "src/tint/ast/struct_member_offset_attribute.h"
-#include "src/tint/ast/struct_member_size_attribute.h"
-#include "src/tint/ast/switch_statement.h"
-#include "src/tint/ast/templated_identifier.h"
-#include "src/tint/ast/traverse_expressions.h"
-#include "src/tint/ast/var.h"
-#include "src/tint/ast/variable_decl_statement.h"
-#include "src/tint/ast/while_statement.h"
-#include "src/tint/ast/workgroup_attribute.h"
#include "src/tint/builtin/builtin.h"
#include "src/tint/builtin/builtin_value.h"
+#include "src/tint/lang/wgsl/ast/alias.h"
+#include "src/tint/lang/wgsl/ast/assignment_statement.h"
+#include "src/tint/lang/wgsl/ast/block_statement.h"
+#include "src/tint/lang/wgsl/ast/break_if_statement.h"
+#include "src/tint/lang/wgsl/ast/break_statement.h"
+#include "src/tint/lang/wgsl/ast/call_statement.h"
+#include "src/tint/lang/wgsl/ast/compound_assignment_statement.h"
+#include "src/tint/lang/wgsl/ast/const.h"
+#include "src/tint/lang/wgsl/ast/continue_statement.h"
+#include "src/tint/lang/wgsl/ast/diagnostic_attribute.h"
+#include "src/tint/lang/wgsl/ast/discard_statement.h"
+#include "src/tint/lang/wgsl/ast/for_loop_statement.h"
+#include "src/tint/lang/wgsl/ast/id_attribute.h"
+#include "src/tint/lang/wgsl/ast/identifier.h"
+#include "src/tint/lang/wgsl/ast/if_statement.h"
+#include "src/tint/lang/wgsl/ast/increment_decrement_statement.h"
+#include "src/tint/lang/wgsl/ast/index_attribute.h"
+#include "src/tint/lang/wgsl/ast/internal_attribute.h"
+#include "src/tint/lang/wgsl/ast/interpolate_attribute.h"
+#include "src/tint/lang/wgsl/ast/invariant_attribute.h"
+#include "src/tint/lang/wgsl/ast/let.h"
+#include "src/tint/lang/wgsl/ast/location_attribute.h"
+#include "src/tint/lang/wgsl/ast/loop_statement.h"
+#include "src/tint/lang/wgsl/ast/must_use_attribute.h"
+#include "src/tint/lang/wgsl/ast/override.h"
+#include "src/tint/lang/wgsl/ast/return_statement.h"
+#include "src/tint/lang/wgsl/ast/stage_attribute.h"
+#include "src/tint/lang/wgsl/ast/stride_attribute.h"
+#include "src/tint/lang/wgsl/ast/struct.h"
+#include "src/tint/lang/wgsl/ast/struct_member_align_attribute.h"
+#include "src/tint/lang/wgsl/ast/struct_member_offset_attribute.h"
+#include "src/tint/lang/wgsl/ast/struct_member_size_attribute.h"
+#include "src/tint/lang/wgsl/ast/switch_statement.h"
+#include "src/tint/lang/wgsl/ast/templated_identifier.h"
+#include "src/tint/lang/wgsl/ast/traverse_expressions.h"
+#include "src/tint/lang/wgsl/ast/var.h"
+#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
+#include "src/tint/lang/wgsl/ast/while_statement.h"
+#include "src/tint/lang/wgsl/ast/workgroup_attribute.h"
#include "src/tint/scope_stack.h"
#include "src/tint/sem/builtin.h"
#include "src/tint/switch.h"
diff --git a/src/tint/resolver/dependency_graph.h b/src/tint/resolver/dependency_graph.h
index e4f0348..8c247e2 100644
--- a/src/tint/resolver/dependency_graph.h
+++ b/src/tint/resolver/dependency_graph.h
@@ -18,7 +18,6 @@
#include <string>
#include <vector>
-#include "src/tint/ast/module.h"
#include "src/tint/builtin/access.h"
#include "src/tint/builtin/builtin.h"
#include "src/tint/builtin/builtin_value.h"
@@ -27,6 +26,7 @@
#include "src/tint/builtin/interpolation_type.h"
#include "src/tint/builtin/texel_format.h"
#include "src/tint/diagnostic/diagnostic.h"
+#include "src/tint/lang/wgsl/ast/module.h"
#include "src/tint/utils/hashmap.h"
namespace tint::resolver {
diff --git a/src/tint/resolver/entry_point_validation_test.cc b/src/tint/resolver/entry_point_validation_test.cc
index 4da98db..8e89e5f 100644
--- a/src/tint/resolver/entry_point_validation_test.cc
+++ b/src/tint/resolver/entry_point_validation_test.cc
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/builtin_attribute.h"
-#include "src/tint/ast/location_attribute.h"
-#include "src/tint/ast/return_statement.h"
-#include "src/tint/ast/stage_attribute.h"
#include "src/tint/builtin/builtin_value.h"
+#include "src/tint/lang/wgsl/ast/builtin_attribute.h"
+#include "src/tint/lang/wgsl/ast/location_attribute.h"
+#include "src/tint/lang/wgsl/ast/return_statement.h"
+#include "src/tint/lang/wgsl/ast/stage_attribute.h"
#include "src/tint/resolver/resolver.h"
#include "src/tint/resolver/resolver_test_helper.h"
diff --git a/src/tint/resolver/function_validation_test.cc b/src/tint/resolver/function_validation_test.cc
index 1ea121d..02dfd92 100644
--- a/src/tint/resolver/function_validation_test.cc
+++ b/src/tint/resolver/function_validation_test.cc
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/discard_statement.h"
-#include "src/tint/ast/return_statement.h"
-#include "src/tint/ast/stage_attribute.h"
#include "src/tint/builtin/builtin_value.h"
+#include "src/tint/lang/wgsl/ast/discard_statement.h"
+#include "src/tint/lang/wgsl/ast/return_statement.h"
+#include "src/tint/lang/wgsl/ast/stage_attribute.h"
#include "src/tint/resolver/resolver.h"
#include "src/tint/resolver/resolver_test_helper.h"
#include "src/tint/utils/string_stream.h"
diff --git a/src/tint/resolver/intrinsic_table.cc b/src/tint/resolver/intrinsic_table.cc
index f6bf22e..fbc3963 100644
--- a/src/tint/resolver/intrinsic_table.cc
+++ b/src/tint/resolver/intrinsic_table.cc
@@ -18,7 +18,7 @@
#include <limits>
#include <utility>
-#include "src/tint/ast/binary_expression.h"
+#include "src/tint/lang/wgsl/ast/binary_expression.h"
#include "src/tint/program_builder.h"
#include "src/tint/sem/evaluation_stage.h"
#include "src/tint/sem/pipeline_stage_set.h"
diff --git a/src/tint/resolver/intrinsic_table.h b/src/tint/resolver/intrinsic_table.h
index 78e2e7a..e35b323 100644
--- a/src/tint/resolver/intrinsic_table.h
+++ b/src/tint/resolver/intrinsic_table.h
@@ -18,8 +18,8 @@
#include <memory>
#include <string>
-#include "src/tint/ast/binary_expression.h"
-#include "src/tint/ast/unary_op.h"
+#include "src/tint/lang/wgsl/ast/binary_expression.h"
+#include "src/tint/lang/wgsl/ast/unary_op.h"
#include "src/tint/resolver/const_eval.h"
#include "src/tint/resolver/ctor_conv_intrinsic.h"
#include "src/tint/sem/builtin.h"
diff --git a/src/tint/resolver/ptr_ref_validation_test.cc b/src/tint/resolver/ptr_ref_validation_test.cc
index 2da5cf0..bcf8427 100644
--- a/src/tint/resolver/ptr_ref_validation_test.cc
+++ b/src/tint/resolver/ptr_ref_validation_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "gmock/gmock.h"
-#include "src/tint/ast/bitcast_expression.h"
+#include "src/tint/lang/wgsl/ast/bitcast_expression.h"
#include "src/tint/resolver/resolver.h"
#include "src/tint/resolver/resolver_test_helper.h"
#include "src/tint/type/reference.h"
diff --git a/src/tint/resolver/resolver.cc b/src/tint/resolver/resolver.cc
index 3a47118..aacc057 100644
--- a/src/tint/resolver/resolver.cc
+++ b/src/tint/resolver/resolver.cc
@@ -20,29 +20,29 @@
#include <limits>
#include <utility>
-#include "src/tint/ast/alias.h"
-#include "src/tint/ast/assignment_statement.h"
-#include "src/tint/ast/attribute.h"
-#include "src/tint/ast/bitcast_expression.h"
-#include "src/tint/ast/break_statement.h"
-#include "src/tint/ast/call_statement.h"
-#include "src/tint/ast/continue_statement.h"
-#include "src/tint/ast/disable_validation_attribute.h"
-#include "src/tint/ast/discard_statement.h"
-#include "src/tint/ast/for_loop_statement.h"
-#include "src/tint/ast/id_attribute.h"
-#include "src/tint/ast/if_statement.h"
-#include "src/tint/ast/internal_attribute.h"
-#include "src/tint/ast/interpolate_attribute.h"
-#include "src/tint/ast/loop_statement.h"
-#include "src/tint/ast/return_statement.h"
-#include "src/tint/ast/switch_statement.h"
-#include "src/tint/ast/traverse_expressions.h"
-#include "src/tint/ast/unary_op_expression.h"
-#include "src/tint/ast/variable_decl_statement.h"
-#include "src/tint/ast/while_statement.h"
-#include "src/tint/ast/workgroup_attribute.h"
#include "src/tint/builtin/builtin.h"
+#include "src/tint/lang/wgsl/ast/alias.h"
+#include "src/tint/lang/wgsl/ast/assignment_statement.h"
+#include "src/tint/lang/wgsl/ast/attribute.h"
+#include "src/tint/lang/wgsl/ast/bitcast_expression.h"
+#include "src/tint/lang/wgsl/ast/break_statement.h"
+#include "src/tint/lang/wgsl/ast/call_statement.h"
+#include "src/tint/lang/wgsl/ast/continue_statement.h"
+#include "src/tint/lang/wgsl/ast/disable_validation_attribute.h"
+#include "src/tint/lang/wgsl/ast/discard_statement.h"
+#include "src/tint/lang/wgsl/ast/for_loop_statement.h"
+#include "src/tint/lang/wgsl/ast/id_attribute.h"
+#include "src/tint/lang/wgsl/ast/if_statement.h"
+#include "src/tint/lang/wgsl/ast/internal_attribute.h"
+#include "src/tint/lang/wgsl/ast/interpolate_attribute.h"
+#include "src/tint/lang/wgsl/ast/loop_statement.h"
+#include "src/tint/lang/wgsl/ast/return_statement.h"
+#include "src/tint/lang/wgsl/ast/switch_statement.h"
+#include "src/tint/lang/wgsl/ast/traverse_expressions.h"
+#include "src/tint/lang/wgsl/ast/unary_op_expression.h"
+#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
+#include "src/tint/lang/wgsl/ast/while_statement.h"
+#include "src/tint/lang/wgsl/ast/workgroup_attribute.h"
#include "src/tint/resolver/uniformity.h"
#include "src/tint/sem/break_if_statement.h"
#include "src/tint/sem/builtin_enum_expression.h"
diff --git a/src/tint/resolver/resolver_test.cc b/src/tint/resolver/resolver_test.cc
index c4d57aa..3f99b16 100644
--- a/src/tint/resolver/resolver_test.cc
+++ b/src/tint/resolver/resolver_test.cc
@@ -18,23 +18,23 @@
#include "gmock/gmock.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/ast/assignment_statement.h"
-#include "src/tint/ast/bitcast_expression.h"
-#include "src/tint/ast/break_statement.h"
-#include "src/tint/ast/builtin_texture_helper_test.h"
-#include "src/tint/ast/call_statement.h"
-#include "src/tint/ast/continue_statement.h"
-#include "src/tint/ast/float_literal_expression.h"
-#include "src/tint/ast/id_attribute.h"
-#include "src/tint/ast/if_statement.h"
-#include "src/tint/ast/loop_statement.h"
-#include "src/tint/ast/return_statement.h"
-#include "src/tint/ast/stage_attribute.h"
-#include "src/tint/ast/switch_statement.h"
-#include "src/tint/ast/unary_op_expression.h"
-#include "src/tint/ast/variable_decl_statement.h"
-#include "src/tint/ast/workgroup_attribute.h"
#include "src/tint/builtin/builtin_value.h"
+#include "src/tint/lang/wgsl/ast/assignment_statement.h"
+#include "src/tint/lang/wgsl/ast/bitcast_expression.h"
+#include "src/tint/lang/wgsl/ast/break_statement.h"
+#include "src/tint/lang/wgsl/ast/builtin_texture_helper_test.h"
+#include "src/tint/lang/wgsl/ast/call_statement.h"
+#include "src/tint/lang/wgsl/ast/continue_statement.h"
+#include "src/tint/lang/wgsl/ast/float_literal_expression.h"
+#include "src/tint/lang/wgsl/ast/id_attribute.h"
+#include "src/tint/lang/wgsl/ast/if_statement.h"
+#include "src/tint/lang/wgsl/ast/loop_statement.h"
+#include "src/tint/lang/wgsl/ast/return_statement.h"
+#include "src/tint/lang/wgsl/ast/stage_attribute.h"
+#include "src/tint/lang/wgsl/ast/switch_statement.h"
+#include "src/tint/lang/wgsl/ast/unary_op_expression.h"
+#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
+#include "src/tint/lang/wgsl/ast/workgroup_attribute.h"
#include "src/tint/resolver/resolver_test_helper.h"
#include "src/tint/sem/call.h"
#include "src/tint/sem/function.h"
diff --git a/src/tint/resolver/struct_pipeline_stage_use_test.cc b/src/tint/resolver/struct_pipeline_stage_use_test.cc
index 70e6046..daa9e12 100644
--- a/src/tint/resolver/struct_pipeline_stage_use_test.cc
+++ b/src/tint/resolver/struct_pipeline_stage_use_test.cc
@@ -15,8 +15,8 @@
#include "src/tint/resolver/resolver.h"
#include "gmock/gmock.h"
-#include "src/tint/ast/stage_attribute.h"
#include "src/tint/builtin/builtin_value.h"
+#include "src/tint/lang/wgsl/ast/stage_attribute.h"
#include "src/tint/resolver/resolver_test_helper.h"
#include "src/tint/sem/struct.h"
diff --git a/src/tint/resolver/type_validation_test.cc b/src/tint/resolver/type_validation_test.cc
index 117b2ad..2296df4 100644
--- a/src/tint/resolver/type_validation_test.cc
+++ b/src/tint/resolver/type_validation_test.cc
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/id_attribute.h"
-#include "src/tint/ast/return_statement.h"
-#include "src/tint/ast/stage_attribute.h"
+#include "src/tint/lang/wgsl/ast/id_attribute.h"
+#include "src/tint/lang/wgsl/ast/return_statement.h"
+#include "src/tint/lang/wgsl/ast/stage_attribute.h"
#include "src/tint/resolver/resolver.h"
#include "src/tint/resolver/resolver_test_helper.h"
#include "src/tint/type/multisampled_texture.h"
diff --git a/src/tint/resolver/validation_test.cc b/src/tint/resolver/validation_test.cc
index 23fb56a..184cc06 100644
--- a/src/tint/resolver/validation_test.cc
+++ b/src/tint/resolver/validation_test.cc
@@ -16,21 +16,21 @@
#include "gmock/gmock.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/ast/assignment_statement.h"
-#include "src/tint/ast/bitcast_expression.h"
-#include "src/tint/ast/break_statement.h"
-#include "src/tint/ast/builtin_texture_helper_test.h"
-#include "src/tint/ast/call_statement.h"
-#include "src/tint/ast/continue_statement.h"
-#include "src/tint/ast/discard_statement.h"
-#include "src/tint/ast/if_statement.h"
-#include "src/tint/ast/loop_statement.h"
-#include "src/tint/ast/return_statement.h"
-#include "src/tint/ast/stage_attribute.h"
-#include "src/tint/ast/switch_statement.h"
-#include "src/tint/ast/unary_op_expression.h"
-#include "src/tint/ast/variable_decl_statement.h"
#include "src/tint/builtin/builtin_value.h"
+#include "src/tint/lang/wgsl/ast/assignment_statement.h"
+#include "src/tint/lang/wgsl/ast/bitcast_expression.h"
+#include "src/tint/lang/wgsl/ast/break_statement.h"
+#include "src/tint/lang/wgsl/ast/builtin_texture_helper_test.h"
+#include "src/tint/lang/wgsl/ast/call_statement.h"
+#include "src/tint/lang/wgsl/ast/continue_statement.h"
+#include "src/tint/lang/wgsl/ast/discard_statement.h"
+#include "src/tint/lang/wgsl/ast/if_statement.h"
+#include "src/tint/lang/wgsl/ast/loop_statement.h"
+#include "src/tint/lang/wgsl/ast/return_statement.h"
+#include "src/tint/lang/wgsl/ast/stage_attribute.h"
+#include "src/tint/lang/wgsl/ast/switch_statement.h"
+#include "src/tint/lang/wgsl/ast/unary_op_expression.h"
+#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
#include "src/tint/resolver/resolver_test_helper.h"
#include "src/tint/sem/call.h"
#include "src/tint/sem/function.h"
diff --git a/src/tint/resolver/validator.cc b/src/tint/resolver/validator.cc
index 10d4076..a66e953 100644
--- a/src/tint/resolver/validator.cc
+++ b/src/tint/resolver/validator.cc
@@ -18,27 +18,27 @@
#include <limits>
#include <utility>
-#include "src/tint/ast/alias.h"
-#include "src/tint/ast/assignment_statement.h"
-#include "src/tint/ast/bitcast_expression.h"
-#include "src/tint/ast/break_statement.h"
-#include "src/tint/ast/call_statement.h"
-#include "src/tint/ast/continue_statement.h"
-#include "src/tint/ast/disable_validation_attribute.h"
-#include "src/tint/ast/discard_statement.h"
-#include "src/tint/ast/for_loop_statement.h"
-#include "src/tint/ast/id_attribute.h"
-#include "src/tint/ast/if_statement.h"
-#include "src/tint/ast/index_attribute.h"
-#include "src/tint/ast/internal_attribute.h"
-#include "src/tint/ast/interpolate_attribute.h"
-#include "src/tint/ast/loop_statement.h"
-#include "src/tint/ast/return_statement.h"
-#include "src/tint/ast/switch_statement.h"
-#include "src/tint/ast/traverse_expressions.h"
-#include "src/tint/ast/unary_op_expression.h"
-#include "src/tint/ast/variable_decl_statement.h"
-#include "src/tint/ast/workgroup_attribute.h"
+#include "src/tint/lang/wgsl/ast/alias.h"
+#include "src/tint/lang/wgsl/ast/assignment_statement.h"
+#include "src/tint/lang/wgsl/ast/bitcast_expression.h"
+#include "src/tint/lang/wgsl/ast/break_statement.h"
+#include "src/tint/lang/wgsl/ast/call_statement.h"
+#include "src/tint/lang/wgsl/ast/continue_statement.h"
+#include "src/tint/lang/wgsl/ast/disable_validation_attribute.h"
+#include "src/tint/lang/wgsl/ast/discard_statement.h"
+#include "src/tint/lang/wgsl/ast/for_loop_statement.h"
+#include "src/tint/lang/wgsl/ast/id_attribute.h"
+#include "src/tint/lang/wgsl/ast/if_statement.h"
+#include "src/tint/lang/wgsl/ast/index_attribute.h"
+#include "src/tint/lang/wgsl/ast/internal_attribute.h"
+#include "src/tint/lang/wgsl/ast/interpolate_attribute.h"
+#include "src/tint/lang/wgsl/ast/loop_statement.h"
+#include "src/tint/lang/wgsl/ast/return_statement.h"
+#include "src/tint/lang/wgsl/ast/switch_statement.h"
+#include "src/tint/lang/wgsl/ast/traverse_expressions.h"
+#include "src/tint/lang/wgsl/ast/unary_op_expression.h"
+#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
+#include "src/tint/lang/wgsl/ast/workgroup_attribute.h"
#include "src/tint/sem/break_if_statement.h"
#include "src/tint/sem/call.h"
#include "src/tint/sem/for_loop_statement.h"
diff --git a/src/tint/resolver/validator.h b/src/tint/resolver/validator.h
index 6f32d89..0ee21a3 100644
--- a/src/tint/resolver/validator.h
+++ b/src/tint/resolver/validator.h
@@ -19,7 +19,7 @@
#include <string>
#include <utility>
-#include "src/tint/ast/pipeline_stage.h"
+#include "src/tint/lang/wgsl/ast/pipeline_stage.h"
#include "src/tint/program_builder.h"
#include "src/tint/resolver/sem_helper.h"
#include "src/tint/scope_stack.h"
diff --git a/src/tint/sem/accessor_expression.cc b/src/tint/sem/accessor_expression.cc
index 8f1cf1e..81ca6dc 100644
--- a/src/tint/sem/accessor_expression.cc
+++ b/src/tint/sem/accessor_expression.cc
@@ -16,7 +16,7 @@
#include <utility>
-#include "src/tint/ast/index_accessor_expression.h"
+#include "src/tint/lang/wgsl/ast/index_accessor_expression.h"
TINT_INSTANTIATE_TYPEINFO(tint::sem::AccessorExpression);
diff --git a/src/tint/sem/accessor_expression.h b/src/tint/sem/accessor_expression.h
index 0ea824a..ac35191 100644
--- a/src/tint/sem/accessor_expression.h
+++ b/src/tint/sem/accessor_expression.h
@@ -17,7 +17,7 @@
#include <vector>
-#include "src/tint/ast/index_accessor_expression.h"
+#include "src/tint/lang/wgsl/ast/index_accessor_expression.h"
#include "src/tint/sem/value_expression.h"
namespace tint::sem {
diff --git a/src/tint/sem/array_count.cc b/src/tint/sem/array_count.cc
index 2f7d1e1..91828fc 100644
--- a/src/tint/sem/array_count.cc
+++ b/src/tint/sem/array_count.cc
@@ -14,7 +14,7 @@
#include "src/tint/sem/array_count.h"
-#include "src/tint/ast/identifier.h"
+#include "src/tint/lang/wgsl/ast/identifier.h"
TINT_INSTANTIATE_TYPEINFO(tint::sem::NamedOverrideArrayCount);
TINT_INSTANTIATE_TYPEINFO(tint::sem::UnnamedOverrideArrayCount);
diff --git a/src/tint/sem/block_statement.cc b/src/tint/sem/block_statement.cc
index 12b8318..218f2fe 100644
--- a/src/tint/sem/block_statement.cc
+++ b/src/tint/sem/block_statement.cc
@@ -14,8 +14,8 @@
#include "src/tint/sem/block_statement.h"
-#include "src/tint/ast/block_statement.h"
-#include "src/tint/ast/function.h"
+#include "src/tint/lang/wgsl/ast/block_statement.h"
+#include "src/tint/lang/wgsl/ast/function.h"
#include "src/tint/sem/function.h"
TINT_INSTANTIATE_TYPEINFO(tint::sem::BlockStatement);
diff --git a/src/tint/sem/break_if_statement.cc b/src/tint/sem/break_if_statement.cc
index 0d4a59d..a790f77 100644
--- a/src/tint/sem/break_if_statement.cc
+++ b/src/tint/sem/break_if_statement.cc
@@ -14,7 +14,7 @@
#include "src/tint/sem/break_if_statement.h"
-#include "src/tint/ast/break_if_statement.h"
+#include "src/tint/lang/wgsl/ast/break_if_statement.h"
TINT_INSTANTIATE_TYPEINFO(tint::sem::BreakIfStatement);
diff --git a/src/tint/sem/call.h b/src/tint/sem/call.h
index f24899d..e39aef3 100644
--- a/src/tint/sem/call.h
+++ b/src/tint/sem/call.h
@@ -17,7 +17,7 @@
#include <vector>
-#include "src/tint/ast/call_expression.h"
+#include "src/tint/lang/wgsl/ast/call_expression.h"
#include "src/tint/sem/builtin.h"
#include "src/tint/sem/value_expression.h"
#include "src/tint/utils/vector.h"
diff --git a/src/tint/sem/expression.h b/src/tint/sem/expression.h
index 36b4b71..8aee313 100644
--- a/src/tint/sem/expression.h
+++ b/src/tint/sem/expression.h
@@ -15,7 +15,7 @@
#ifndef SRC_TINT_SEM_EXPRESSION_H_
#define SRC_TINT_SEM_EXPRESSION_H_
-#include "src/tint/ast/expression.h"
+#include "src/tint/lang/wgsl/ast/expression.h"
#include "src/tint/sem/node.h"
// Forward declarations
diff --git a/src/tint/sem/for_loop_statement.cc b/src/tint/sem/for_loop_statement.cc
index d27c858..ce0b20c 100644
--- a/src/tint/sem/for_loop_statement.cc
+++ b/src/tint/sem/for_loop_statement.cc
@@ -14,7 +14,7 @@
#include "src/tint/sem/for_loop_statement.h"
-#include "src/tint/ast/for_loop_statement.h"
+#include "src/tint/lang/wgsl/ast/for_loop_statement.h"
TINT_INSTANTIATE_TYPEINFO(tint::sem::ForLoopStatement);
diff --git a/src/tint/sem/function.cc b/src/tint/sem/function.cc
index eab78e0..18d271a 100644
--- a/src/tint/sem/function.cc
+++ b/src/tint/sem/function.cc
@@ -14,9 +14,9 @@
#include "src/tint/sem/function.h"
-#include "src/tint/ast/function.h"
-#include "src/tint/ast/identifier.h"
-#include "src/tint/ast/must_use_attribute.h"
+#include "src/tint/lang/wgsl/ast/function.h"
+#include "src/tint/lang/wgsl/ast/identifier.h"
+#include "src/tint/lang/wgsl/ast/must_use_attribute.h"
#include "src/tint/sem/variable.h"
#include "src/tint/type/depth_texture.h"
#include "src/tint/type/external_texture.h"
diff --git a/src/tint/sem/function.h b/src/tint/sem/function.h
index 6a27be4..e9edcb2 100644
--- a/src/tint/sem/function.h
+++ b/src/tint/sem/function.h
@@ -20,8 +20,8 @@
#include <utility>
#include <vector>
-#include "src/tint/ast/diagnostic_control.h"
-#include "src/tint/ast/variable.h"
+#include "src/tint/lang/wgsl/ast/diagnostic_control.h"
+#include "src/tint/lang/wgsl/ast/variable.h"
#include "src/tint/sem/call.h"
#include "src/tint/utils/unique_vector.h"
#include "src/tint/utils/vector.h"
diff --git a/src/tint/sem/if_statement.cc b/src/tint/sem/if_statement.cc
index f9c8673..e576830 100644
--- a/src/tint/sem/if_statement.cc
+++ b/src/tint/sem/if_statement.cc
@@ -14,7 +14,7 @@
#include "src/tint/sem/if_statement.h"
-#include "src/tint/ast/if_statement.h"
+#include "src/tint/lang/wgsl/ast/if_statement.h"
TINT_INSTANTIATE_TYPEINFO(tint::sem::IfStatement);
diff --git a/src/tint/sem/index_accessor_expression.cc b/src/tint/sem/index_accessor_expression.cc
index 7b076ef..06ef447 100644
--- a/src/tint/sem/index_accessor_expression.cc
+++ b/src/tint/sem/index_accessor_expression.cc
@@ -14,7 +14,7 @@
#include "src/tint/sem/index_accessor_expression.h"
-#include "src/tint/ast/index_accessor_expression.h"
+#include "src/tint/lang/wgsl/ast/index_accessor_expression.h"
#include <utility>
diff --git a/src/tint/sem/index_accessor_expression.h b/src/tint/sem/index_accessor_expression.h
index 40a39b4..fc9890f 100644
--- a/src/tint/sem/index_accessor_expression.h
+++ b/src/tint/sem/index_accessor_expression.h
@@ -17,7 +17,7 @@
#include <vector>
-#include "src/tint/ast/index_accessor_expression.h"
+#include "src/tint/lang/wgsl/ast/index_accessor_expression.h"
#include "src/tint/sem/accessor_expression.h"
namespace tint::sem {
diff --git a/src/tint/sem/info.h b/src/tint/sem/info.h
index 9e5a139..e29eb9a 100644
--- a/src/tint/sem/info.h
+++ b/src/tint/sem/info.h
@@ -20,9 +20,9 @@
#include <unordered_map>
#include <vector>
-#include "src/tint/ast/diagnostic_control.h"
-#include "src/tint/ast/node.h"
#include "src/tint/debug.h"
+#include "src/tint/lang/wgsl/ast/diagnostic_control.h"
+#include "src/tint/lang/wgsl/ast/node.h"
#include "src/tint/sem/node.h"
#include "src/tint/sem/type_mappings.h"
#include "src/tint/utils/unique_vector.h"
diff --git a/src/tint/sem/loop_statement.cc b/src/tint/sem/loop_statement.cc
index 7dfc0db..c9e08d7 100644
--- a/src/tint/sem/loop_statement.cc
+++ b/src/tint/sem/loop_statement.cc
@@ -14,8 +14,8 @@
#include "src/tint/sem/loop_statement.h"
-#include "src/tint/ast/block_statement.h"
-#include "src/tint/ast/loop_statement.h"
+#include "src/tint/lang/wgsl/ast/block_statement.h"
+#include "src/tint/lang/wgsl/ast/loop_statement.h"
TINT_INSTANTIATE_TYPEINFO(tint::sem::LoopStatement);
TINT_INSTANTIATE_TYPEINFO(tint::sem::LoopContinuingBlockStatement);
diff --git a/src/tint/sem/member_accessor_expression.cc b/src/tint/sem/member_accessor_expression.cc
index eb3de06..b1ad2c3 100644
--- a/src/tint/sem/member_accessor_expression.cc
+++ b/src/tint/sem/member_accessor_expression.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/member_accessor_expression.h"
+#include "src/tint/lang/wgsl/ast/member_accessor_expression.h"
#include "src/tint/sem/member_accessor_expression.h"
#include <utility>
diff --git a/src/tint/sem/module.h b/src/tint/sem/module.h
index 172c22b..70f1254 100644
--- a/src/tint/sem/module.h
+++ b/src/tint/sem/module.h
@@ -15,8 +15,8 @@
#ifndef SRC_TINT_SEM_MODULE_H_
#define SRC_TINT_SEM_MODULE_H_
-#include "src/tint/ast/diagnostic_control.h"
#include "src/tint/builtin/extension.h"
+#include "src/tint/lang/wgsl/ast/diagnostic_control.h"
#include "src/tint/sem/node.h"
#include "src/tint/utils/vector.h"
diff --git a/src/tint/sem/pipeline_stage_set.h b/src/tint/sem/pipeline_stage_set.h
index e27f206..f9b86de 100644
--- a/src/tint/sem/pipeline_stage_set.h
+++ b/src/tint/sem/pipeline_stage_set.h
@@ -15,7 +15,7 @@
#ifndef SRC_TINT_SEM_PIPELINE_STAGE_SET_H_
#define SRC_TINT_SEM_PIPELINE_STAGE_SET_H_
-#include "src/tint/ast/pipeline_stage.h"
+#include "src/tint/lang/wgsl/ast/pipeline_stage.h"
#include "src/tint/utils/enum_set.h"
namespace tint::sem {
diff --git a/src/tint/sem/statement.cc b/src/tint/sem/statement.cc
index bc1ba25..79ce24f 100644
--- a/src/tint/sem/statement.cc
+++ b/src/tint/sem/statement.cc
@@ -14,11 +14,11 @@
#include <algorithm>
-#include "src/tint/ast/block_statement.h"
-#include "src/tint/ast/identifier.h"
-#include "src/tint/ast/loop_statement.h"
-#include "src/tint/ast/statement.h"
-#include "src/tint/ast/variable.h"
+#include "src/tint/lang/wgsl/ast/block_statement.h"
+#include "src/tint/lang/wgsl/ast/identifier.h"
+#include "src/tint/lang/wgsl/ast/loop_statement.h"
+#include "src/tint/lang/wgsl/ast/statement.h"
+#include "src/tint/lang/wgsl/ast/variable.h"
#include "src/tint/sem/block_statement.h"
#include "src/tint/sem/statement.h"
#include "src/tint/sem/variable.h"
diff --git a/src/tint/sem/statement.h b/src/tint/sem/statement.h
index 1d9b6cb..87c560c 100644
--- a/src/tint/sem/statement.h
+++ b/src/tint/sem/statement.h
@@ -15,7 +15,7 @@
#ifndef SRC_TINT_SEM_STATEMENT_H_
#define SRC_TINT_SEM_STATEMENT_H_
-#include "src/tint/ast/diagnostic_control.h"
+#include "src/tint/lang/wgsl/ast/diagnostic_control.h"
#include "src/tint/sem/behavior.h"
#include "src/tint/sem/node.h"
#include "src/tint/symbol.h"
diff --git a/src/tint/sem/struct.cc b/src/tint/sem/struct.cc
index e6c0e73..03c88cc 100644
--- a/src/tint/sem/struct.cc
+++ b/src/tint/sem/struct.cc
@@ -14,7 +14,7 @@
#include "src/tint/sem/struct.h"
-#include "src/tint/ast/struct_member.h"
+#include "src/tint/lang/wgsl/ast/struct_member.h"
TINT_INSTANTIATE_TYPEINFO(tint::sem::Struct);
TINT_INSTANTIATE_TYPEINFO(tint::sem::StructMember);
diff --git a/src/tint/sem/struct.h b/src/tint/sem/struct.h
index fd59dcd..9107cf6 100644
--- a/src/tint/sem/struct.h
+++ b/src/tint/sem/struct.h
@@ -17,8 +17,8 @@
#include <optional>
-#include "src/tint/ast/struct.h"
#include "src/tint/builtin/address_space.h"
+#include "src/tint/lang/wgsl/ast/struct.h"
#include "src/tint/symbol.h"
#include "src/tint/type/struct.h"
#include "src/tint/type/type.h"
diff --git a/src/tint/sem/switch_statement.cc b/src/tint/sem/switch_statement.cc
index 4ee4671..ef737d2 100644
--- a/src/tint/sem/switch_statement.cc
+++ b/src/tint/sem/switch_statement.cc
@@ -14,8 +14,8 @@
#include "src/tint/sem/switch_statement.h"
-#include "src/tint/ast/case_statement.h"
-#include "src/tint/ast/switch_statement.h"
+#include "src/tint/lang/wgsl/ast/case_statement.h"
+#include "src/tint/lang/wgsl/ast/switch_statement.h"
TINT_INSTANTIATE_TYPEINFO(tint::sem::CaseStatement);
TINT_INSTANTIATE_TYPEINFO(tint::sem::CaseSelector);
diff --git a/src/tint/sem/variable.cc b/src/tint/sem/variable.cc
index 95c4236..a37bde1 100644
--- a/src/tint/sem/variable.cc
+++ b/src/tint/sem/variable.cc
@@ -16,9 +16,9 @@
#include <utility>
-#include "src/tint/ast/identifier_expression.h"
-#include "src/tint/ast/parameter.h"
-#include "src/tint/ast/variable.h"
+#include "src/tint/lang/wgsl/ast/identifier_expression.h"
+#include "src/tint/lang/wgsl/ast/parameter.h"
+#include "src/tint/lang/wgsl/ast/variable.h"
#include "src/tint/type/pointer.h"
TINT_INSTANTIATE_TYPEINFO(tint::sem::Variable);
diff --git a/src/tint/sem/variable.h b/src/tint/sem/variable.h
index cc8b661..9ddfd51 100644
--- a/src/tint/sem/variable.h
+++ b/src/tint/sem/variable.h
@@ -21,9 +21,9 @@
#include "tint/override_id.h"
-#include "src/tint/ast/parameter.h"
#include "src/tint/builtin/access.h"
#include "src/tint/builtin/address_space.h"
+#include "src/tint/lang/wgsl/ast/parameter.h"
#include "src/tint/sem/binding_point.h"
#include "src/tint/sem/parameter_usage.h"
#include "src/tint/sem/value_expression.h"
diff --git a/src/tint/sem/while_statement.cc b/src/tint/sem/while_statement.cc
index eed8109..2ec0924 100644
--- a/src/tint/sem/while_statement.cc
+++ b/src/tint/sem/while_statement.cc
@@ -14,7 +14,7 @@
#include "src/tint/sem/while_statement.h"
-#include "src/tint/ast/while_statement.h"
+#include "src/tint/lang/wgsl/ast/while_statement.h"
TINT_INSTANTIATE_TYPEINFO(tint::sem::WhileStatement);
diff --git a/src/tint/transform/manager.cc b/src/tint/transform/manager.cc
index def22dd..dea62c9 100644
--- a/src/tint/transform/manager.cc
+++ b/src/tint/transform/manager.cc
@@ -14,7 +14,7 @@
#include "src/tint/transform/manager.h"
-#include "src/tint/ast/transform/transform.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
#include "src/tint/program_builder.h"
#if TINT_BUILD_IR
diff --git a/src/tint/transform/manager_test.cc b/src/tint/transform/manager_test.cc
index f8f8e0b..ba60ebc 100644
--- a/src/tint/transform/manager_test.cc
+++ b/src/tint/transform/manager_test.cc
@@ -17,7 +17,7 @@
#include <string>
#include "gtest/gtest.h"
-#include "src/tint/ast/transform/transform.h"
+#include "src/tint/lang/wgsl/ast/transform/transform.h"
#include "src/tint/program_builder.h"
#if TINT_BUILD_IR
diff --git a/src/tint/val/msl.cc b/src/tint/val/msl.cc
index 13bae1dc..a0a0fc8 100644
--- a/src/tint/val/msl.cc
+++ b/src/tint/val/msl.cc
@@ -14,7 +14,7 @@
#include "src/tint/val/val.h"
-#include "src/tint/ast/module.h"
+#include "src/tint/lang/wgsl/ast/module.h"
#include "src/tint/program.h"
#include "src/tint/utils/io/command.h"
#include "src/tint/utils/io/tmpfile.h"
diff --git a/src/tint/val/val.h b/src/tint/val/val.h
index 02ffc78..b6ca6e7 100644
--- a/src/tint/val/val.h
+++ b/src/tint/val/val.h
@@ -19,7 +19,7 @@
#include <utility>
#include <vector>
-#include "src/tint/ast/pipeline_stage.h"
+#include "src/tint/lang/wgsl/ast/pipeline_stage.h"
// Forward declarations
namespace tint {
diff --git a/src/tint/writer/append_vector_test.cc b/src/tint/writer/append_vector_test.cc
index b9e7857..8df4282 100644
--- a/src/tint/writer/append_vector_test.cc
+++ b/src/tint/writer/append_vector_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "src/tint/writer/append_vector.h"
-#include "src/tint/ast/test_helper.h"
+#include "src/tint/lang/wgsl/ast/test_helper.h"
#include "src/tint/program_builder.h"
#include "src/tint/resolver/resolver.h"
#include "src/tint/sem/value_constructor.h"
diff --git a/src/tint/writer/check_supported_extensions.cc b/src/tint/writer/check_supported_extensions.cc
index 88ddcdd..6e7a371 100644
--- a/src/tint/writer/check_supported_extensions.cc
+++ b/src/tint/writer/check_supported_extensions.cc
@@ -16,8 +16,8 @@
#include <string>
-#include "src/tint/ast/module.h"
#include "src/tint/diagnostic/diagnostic.h"
+#include "src/tint/lang/wgsl/ast/module.h"
#include "src/tint/utils/hashset.h"
#include "src/tint/utils/string.h"
diff --git a/src/tint/writer/flatten_bindings.cc b/src/tint/writer/flatten_bindings.cc
index fe262d6..d514bdc 100644
--- a/src/tint/writer/flatten_bindings.cc
+++ b/src/tint/writer/flatten_bindings.cc
@@ -16,8 +16,8 @@
#include <utility>
-#include "src/tint/ast/transform/binding_remapper.h"
#include "src/tint/inspector/inspector.h"
+#include "src/tint/lang/wgsl/ast/transform/binding_remapper.h"
#include "src/tint/transform/manager.h"
#include "src/tint/writer/binding_point.h"
diff --git a/src/tint/writer/spirv/builder.cc b/src/tint/writer/spirv/builder.cc
index ccc51dc..c1436b6 100644
--- a/src/tint/writer/spirv/builder.cc
+++ b/src/tint/writer/spirv/builder.cc
@@ -18,12 +18,12 @@
#include <utility>
#include "spirv/unified1/GLSL.std.450.h"
-#include "src/tint/ast/call_statement.h"
-#include "src/tint/ast/id_attribute.h"
-#include "src/tint/ast/internal_attribute.h"
-#include "src/tint/ast/transform/add_block_attribute.h"
-#include "src/tint/ast/traverse_expressions.h"
#include "src/tint/constant/value.h"
+#include "src/tint/lang/wgsl/ast/call_statement.h"
+#include "src/tint/lang/wgsl/ast/id_attribute.h"
+#include "src/tint/lang/wgsl/ast/internal_attribute.h"
+#include "src/tint/lang/wgsl/ast/transform/add_block_attribute.h"
+#include "src/tint/lang/wgsl/ast/traverse_expressions.h"
#include "src/tint/sem/builtin.h"
#include "src/tint/sem/call.h"
#include "src/tint/sem/function.h"
diff --git a/src/tint/writer/spirv/builder.h b/src/tint/writer/spirv/builder.h
index 17e96cd..1454780 100644
--- a/src/tint/writer/spirv/builder.h
+++ b/src/tint/writer/spirv/builder.h
@@ -22,19 +22,19 @@
#include <vector>
#include "spirv/unified1/spirv.h"
-#include "src/tint/ast/assignment_statement.h"
-#include "src/tint/ast/bitcast_expression.h"
-#include "src/tint/ast/break_statement.h"
-#include "src/tint/ast/continue_statement.h"
-#include "src/tint/ast/discard_statement.h"
-#include "src/tint/ast/if_statement.h"
-#include "src/tint/ast/interpolate_attribute.h"
-#include "src/tint/ast/loop_statement.h"
-#include "src/tint/ast/return_statement.h"
-#include "src/tint/ast/switch_statement.h"
-#include "src/tint/ast/unary_op_expression.h"
-#include "src/tint/ast/variable_decl_statement.h"
#include "src/tint/builtin/builtin_value.h"
+#include "src/tint/lang/wgsl/ast/assignment_statement.h"
+#include "src/tint/lang/wgsl/ast/bitcast_expression.h"
+#include "src/tint/lang/wgsl/ast/break_statement.h"
+#include "src/tint/lang/wgsl/ast/continue_statement.h"
+#include "src/tint/lang/wgsl/ast/discard_statement.h"
+#include "src/tint/lang/wgsl/ast/if_statement.h"
+#include "src/tint/lang/wgsl/ast/interpolate_attribute.h"
+#include "src/tint/lang/wgsl/ast/loop_statement.h"
+#include "src/tint/lang/wgsl/ast/return_statement.h"
+#include "src/tint/lang/wgsl/ast/switch_statement.h"
+#include "src/tint/lang/wgsl/ast/unary_op_expression.h"
+#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
#include "src/tint/program_builder.h"
#include "src/tint/scope_stack.h"
#include "src/tint/sem/builtin.h"
diff --git a/src/tint/writer/spirv/builder_builtin_test.cc b/src/tint/writer/spirv/builder_builtin_test.cc
index dd76407..923ad8d 100644
--- a/src/tint/writer/spirv/builder_builtin_test.cc
+++ b/src/tint/writer/spirv/builder_builtin_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/call_statement.h"
-#include "src/tint/ast/stage_attribute.h"
+#include "src/tint/lang/wgsl/ast/call_statement.h"
+#include "src/tint/lang/wgsl/ast/stage_attribute.h"
#include "src/tint/type/depth_texture.h"
#include "src/tint/type/texture_dimension.h"
#include "src/tint/utils/string.h"
diff --git a/src/tint/writer/spirv/builder_builtin_texture_test.cc b/src/tint/writer/spirv/builder_builtin_texture_test.cc
index 6709f35..53176c7 100644
--- a/src/tint/writer/spirv/builder_builtin_texture_test.cc
+++ b/src/tint/writer/spirv/builder_builtin_texture_test.cc
@@ -14,9 +14,9 @@
#include "gmock/gmock.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/ast/builtin_texture_helper_test.h"
-#include "src/tint/ast/call_statement.h"
-#include "src/tint/ast/stage_attribute.h"
+#include "src/tint/lang/wgsl/ast/builtin_texture_helper_test.h"
+#include "src/tint/lang/wgsl/ast/call_statement.h"
+#include "src/tint/lang/wgsl/ast/stage_attribute.h"
#include "src/tint/writer/spirv/spv_dump.h"
#include "src/tint/writer/spirv/test_helper.h"
diff --git a/src/tint/writer/spirv/builder_call_test.cc b/src/tint/writer/spirv/builder_call_test.cc
index b4774cb..9116241 100644
--- a/src/tint/writer/spirv/builder_call_test.cc
+++ b/src/tint/writer/spirv/builder_call_test.cc
@@ -13,7 +13,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/call_statement.h"
+#include "src/tint/lang/wgsl/ast/call_statement.h"
#include "src/tint/writer/spirv/spv_dump.h"
#include "src/tint/writer/spirv/test_helper.h"
diff --git a/src/tint/writer/spirv/builder_entry_point_test.cc b/src/tint/writer/spirv/builder_entry_point_test.cc
index 46ffb2d..8715de0 100644
--- a/src/tint/writer/spirv/builder_entry_point_test.cc
+++ b/src/tint/writer/spirv/builder_entry_point_test.cc
@@ -15,13 +15,13 @@
#include <memory>
#include "gtest/gtest.h"
-#include "src/tint/ast/builtin_attribute.h"
-#include "src/tint/ast/location_attribute.h"
-#include "src/tint/ast/return_statement.h"
-#include "src/tint/ast/stage_attribute.h"
-#include "src/tint/ast/variable.h"
#include "src/tint/builtin/address_space.h"
#include "src/tint/builtin/builtin_value.h"
+#include "src/tint/lang/wgsl/ast/builtin_attribute.h"
+#include "src/tint/lang/wgsl/ast/location_attribute.h"
+#include "src/tint/lang/wgsl/ast/return_statement.h"
+#include "src/tint/lang/wgsl/ast/stage_attribute.h"
+#include "src/tint/lang/wgsl/ast/variable.h"
#include "src/tint/program.h"
#include "src/tint/type/f32.h"
#include "src/tint/type/vector.h"
diff --git a/src/tint/writer/spirv/builder_function_attribute_test.cc b/src/tint/writer/spirv/builder_function_attribute_test.cc
index 2bdcc44..5d0a868 100644
--- a/src/tint/writer/spirv/builder_function_attribute_test.cc
+++ b/src/tint/writer/spirv/builder_function_attribute_test.cc
@@ -14,8 +14,8 @@
#include "gmock/gmock.h"
#include "gtest/gtest-spi.h"
-#include "src/tint/ast/stage_attribute.h"
-#include "src/tint/ast/workgroup_attribute.h"
+#include "src/tint/lang/wgsl/ast/stage_attribute.h"
+#include "src/tint/lang/wgsl/ast/workgroup_attribute.h"
#include "src/tint/writer/spirv/spv_dump.h"
#include "src/tint/writer/spirv/test_helper.h"
diff --git a/src/tint/writer/spirv/builder_function_test.cc b/src/tint/writer/spirv/builder_function_test.cc
index 04b5a84..f2bd977 100644
--- a/src/tint/writer/spirv/builder_function_test.cc
+++ b/src/tint/writer/spirv/builder_function_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/stage_attribute.h"
+#include "src/tint/lang/wgsl/ast/stage_attribute.h"
#include "src/tint/writer/spirv/spv_dump.h"
#include "src/tint/writer/spirv/test_helper.h"
diff --git a/src/tint/writer/spirv/builder_global_variable_test.cc b/src/tint/writer/spirv/builder_global_variable_test.cc
index 0640ec7..564ed1f 100644
--- a/src/tint/writer/spirv/builder_global_variable_test.cc
+++ b/src/tint/writer/spirv/builder_global_variable_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/ast/id_attribute.h"
-#include "src/tint/ast/stage_attribute.h"
+#include "src/tint/lang/wgsl/ast/id_attribute.h"
+#include "src/tint/lang/wgsl/ast/stage_attribute.h"
#include "src/tint/type/texture_dimension.h"
#include "src/tint/writer/spirv/spv_dump.h"
#include "src/tint/writer/spirv/test_helper.h"
diff --git a/src/tint/writer/spirv/generator_impl.cc b/src/tint/writer/spirv/generator_impl.cc
index edab51c..1674313 100644
--- a/src/tint/writer/spirv/generator_impl.cc
+++ b/src/tint/writer/spirv/generator_impl.cc
@@ -17,32 +17,32 @@
#include <utility>
#include <vector>
-#include "src/tint/ast/transform/add_block_attribute.h"
-#include "src/tint/ast/transform/add_empty_entry_point.h"
-#include "src/tint/ast/transform/binding_remapper.h"
-#include "src/tint/ast/transform/builtin_polyfill.h"
-#include "src/tint/ast/transform/canonicalize_entry_point_io.h"
-#include "src/tint/ast/transform/clamp_frag_depth.h"
-#include "src/tint/ast/transform/demote_to_helper.h"
-#include "src/tint/ast/transform/direct_variable_access.h"
-#include "src/tint/ast/transform/disable_uniformity_analysis.h"
-#include "src/tint/ast/transform/expand_compound_assignment.h"
-#include "src/tint/ast/transform/for_loop_to_loop.h"
-#include "src/tint/ast/transform/merge_return.h"
-#include "src/tint/ast/transform/multiplanar_external_texture.h"
-#include "src/tint/ast/transform/preserve_padding.h"
-#include "src/tint/ast/transform/promote_side_effects_to_decl.h"
-#include "src/tint/ast/transform/remove_phonies.h"
-#include "src/tint/ast/transform/remove_unreachable_statements.h"
-#include "src/tint/ast/transform/robustness.h"
-#include "src/tint/ast/transform/simplify_pointers.h"
-#include "src/tint/ast/transform/std140.h"
-#include "src/tint/ast/transform/unshadow.h"
-#include "src/tint/ast/transform/var_for_dynamic_index.h"
-#include "src/tint/ast/transform/vectorize_matrix_conversions.h"
-#include "src/tint/ast/transform/vectorize_scalar_matrix_initializers.h"
-#include "src/tint/ast/transform/while_to_loop.h"
-#include "src/tint/ast/transform/zero_init_workgroup_memory.h"
+#include "src/tint/lang/wgsl/ast/transform/add_block_attribute.h"
+#include "src/tint/lang/wgsl/ast/transform/add_empty_entry_point.h"
+#include "src/tint/lang/wgsl/ast/transform/binding_remapper.h"
+#include "src/tint/lang/wgsl/ast/transform/builtin_polyfill.h"
+#include "src/tint/lang/wgsl/ast/transform/canonicalize_entry_point_io.h"
+#include "src/tint/lang/wgsl/ast/transform/clamp_frag_depth.h"
+#include "src/tint/lang/wgsl/ast/transform/demote_to_helper.h"
+#include "src/tint/lang/wgsl/ast/transform/direct_variable_access.h"
+#include "src/tint/lang/wgsl/ast/transform/disable_uniformity_analysis.h"
+#include "src/tint/lang/wgsl/ast/transform/expand_compound_assignment.h"
+#include "src/tint/lang/wgsl/ast/transform/for_loop_to_loop.h"
+#include "src/tint/lang/wgsl/ast/transform/merge_return.h"
+#include "src/tint/lang/wgsl/ast/transform/multiplanar_external_texture.h"
+#include "src/tint/lang/wgsl/ast/transform/preserve_padding.h"
+#include "src/tint/lang/wgsl/ast/transform/promote_side_effects_to_decl.h"
+#include "src/tint/lang/wgsl/ast/transform/remove_phonies.h"
+#include "src/tint/lang/wgsl/ast/transform/remove_unreachable_statements.h"
+#include "src/tint/lang/wgsl/ast/transform/robustness.h"
+#include "src/tint/lang/wgsl/ast/transform/simplify_pointers.h"
+#include "src/tint/lang/wgsl/ast/transform/std140.h"
+#include "src/tint/lang/wgsl/ast/transform/unshadow.h"
+#include "src/tint/lang/wgsl/ast/transform/var_for_dynamic_index.h"
+#include "src/tint/lang/wgsl/ast/transform/vectorize_matrix_conversions.h"
+#include "src/tint/lang/wgsl/ast/transform/vectorize_scalar_matrix_initializers.h"
+#include "src/tint/lang/wgsl/ast/transform/while_to_loop.h"
+#include "src/tint/lang/wgsl/ast/transform/zero_init_workgroup_memory.h"
#include "src/tint/transform/manager.h"
namespace tint::writer::spirv {
