ast: Add 'Expression' suffix to literals

Literals are now expressions, so in keeping with all the other
expression types, suffix the class name with Expression.

I'm not overly keen on requiring everything to have an Expression
suffix, but consistency is better than personal preference.

Bug: tint:888
Change-Id: Ida1f1b98c71d5d0fe6399bca938010cd5d3a00c3
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/68840
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: James Price <jrprice@google.com>
diff --git a/src/BUILD.gn b/src/BUILD.gn
index 0214c2c..86fa2ba 100644
--- a/src/BUILD.gn
+++ b/src/BUILD.gn
@@ -196,8 +196,8 @@
     "ast/block_statement.h",
     "ast/bool.cc",
     "ast/bool.h",
-    "ast/bool_literal.cc",
-    "ast/bool_literal.h",
+    "ast/bool_literal_expression.cc",
+    "ast/bool_literal_expression.h",
     "ast/break_statement.cc",
     "ast/break_statement.h",
     "ast/builtin.cc",
@@ -234,8 +234,8 @@
     "ast/f32.h",
     "ast/fallthrough_statement.cc",
     "ast/fallthrough_statement.h",
-    "ast/float_literal.cc",
-    "ast/float_literal.h",
+    "ast/float_literal_expression.cc",
+    "ast/float_literal_expression.h",
     "ast/for_loop_statement.cc",
     "ast/for_loop_statement.h",
     "ast/function.cc",
@@ -248,16 +248,16 @@
     "ast/identifier_expression.h",
     "ast/if_statement.cc",
     "ast/if_statement.h",
-    "ast/int_literal.cc",
-    "ast/int_literal.h",
+    "ast/int_literal_expression.cc",
+    "ast/int_literal_expression.h",
     "ast/internal_decoration.cc",
     "ast/internal_decoration.h",
     "ast/interpolate_decoration.cc",
     "ast/interpolate_decoration.h",
     "ast/invariant_decoration.cc",
     "ast/invariant_decoration.h",
-    "ast/literal.cc",
-    "ast/literal.h",
+    "ast/literal_expression.cc",
+    "ast/literal_expression.h",
     "ast/location_decoration.cc",
     "ast/location_decoration.h",
     "ast/loop_statement.cc",
@@ -286,8 +286,8 @@
     "ast/sampled_texture.h",
     "ast/sampler.cc",
     "ast/sampler.h",
-    "ast/sint_literal.cc",
-    "ast/sint_literal.h",
+    "ast/sint_literal_expression.cc",
+    "ast/sint_literal_expression.h",
     "ast/stage_decoration.cc",
     "ast/stage_decoration.h",
     "ast/statement.cc",
@@ -324,8 +324,8 @@
     "ast/type_name.h",
     "ast/u32.cc",
     "ast/u32.h",
-    "ast/uint_literal.cc",
-    "ast/uint_literal.h",
+    "ast/uint_literal_expression.cc",
+    "ast/uint_literal_expression.h",
     "ast/unary_op.cc",
     "ast/unary_op.h",
     "ast/unary_op_expression.cc",
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 34027d3..dec0ab0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -58,8 +58,8 @@
   ast/bitcast_expression.h
   ast/block_statement.cc
   ast/block_statement.h
-  ast/bool_literal.cc
-  ast/bool_literal.h
+  ast/bool_literal_expression.cc
+  ast/bool_literal_expression.h
   ast/bool.cc
   ast/bool.h
   ast/break_statement.cc
@@ -98,8 +98,8 @@
   ast/f32.h
   ast/fallthrough_statement.cc
   ast/fallthrough_statement.h
-  ast/float_literal.cc
-  ast/float_literal.h
+  ast/float_literal_expression.cc
+  ast/float_literal_expression.h
   ast/for_loop_statement.cc
   ast/for_loop_statement.h
   ast/function.cc
@@ -112,16 +112,16 @@
   ast/identifier_expression.h
   ast/if_statement.cc
   ast/if_statement.h
-  ast/int_literal.cc
-  ast/int_literal.h
+  ast/int_literal_expression.cc
+  ast/int_literal_expression.h
   ast/internal_decoration.cc
   ast/internal_decoration.h
   ast/interpolate_decoration.cc
   ast/interpolate_decoration.h
   ast/invariant_decoration.cc
   ast/invariant_decoration.h
-  ast/literal.cc
-  ast/literal.h
+  ast/literal_expression.cc
+  ast/literal_expression.h
   ast/location_decoration.cc
   ast/location_decoration.h
   ast/loop_statement.cc
@@ -150,8 +150,8 @@
   ast/sampled_texture.h
   ast/sampler.cc
   ast/sampler.h
-  ast/sint_literal.cc
-  ast/sint_literal.h
+  ast/sint_literal_expression.cc
+  ast/sint_literal_expression.h
   ast/stage_decoration.cc
   ast/stage_decoration.h
   ast/statement.cc
@@ -191,8 +191,8 @@
   ast/type_name.h
   ast/u32.cc
   ast/u32.h
-  ast/uint_literal.cc
-  ast/uint_literal.h
+  ast/uint_literal_expression.cc
+  ast/uint_literal_expression.h
   ast/unary_op_expression.cc
   ast/unary_op_expression.h
   ast/unary_op.cc
@@ -589,7 +589,7 @@
     ast/binding_decoration_test.cc
     ast/bitcast_expression_test.cc
     ast/block_statement_test.cc
-    ast/bool_literal_test.cc
+    ast/bool_literal_expression_test.cc
     ast/bool_test.cc
     ast/break_statement_test.cc
     ast/builtin_decoration_test.cc
@@ -604,14 +604,14 @@
     ast/external_texture_test.cc
     ast/f32_test.cc
     ast/fallthrough_statement_test.cc
-    ast/float_literal_test.cc
+    ast/float_literal_expression_test.cc
     ast/for_loop_statement_test.cc
     ast/function_test.cc
     ast/group_decoration_test.cc
     ast/i32_test.cc
     ast/identifier_expression_test.cc
     ast/if_statement_test.cc
-    ast/int_literal_test.cc
+    ast/int_literal_expression_test.cc
     ast/interpolate_decoration_test.cc
     ast/intrinsic_texture_helper_test.cc
     ast/intrinsic_texture_helper_test.h
@@ -629,7 +629,7 @@
     ast/return_statement_test.cc
     ast/sampled_texture_test.cc
     ast/sampler_test.cc
-    ast/sint_literal_test.cc
+    ast/sint_literal_expression_test.cc
     ast/stage_decoration_test.cc
     ast/storage_texture_test.cc
     ast/stride_decoration_test.cc
@@ -644,7 +644,7 @@
     ast/traverse_expressions_test.cc
     ast/type_constructor_expression_test.cc
     ast/u32_test.cc
-    ast/uint_literal_test.cc
+    ast/uint_literal_expression_test.cc
     ast/unary_op_expression_test.cc
     ast/variable_decl_statement_test.cc
     ast/variable_test.cc
diff --git a/src/ast/bool_literal.cc b/src/ast/bool_literal_expression.cc
similarity index 95%
rename from src/ast/bool_literal.cc
rename to src/ast/bool_literal_expression.cc
index 77e7e28..c61afd8 100644
--- a/src/ast/bool_literal.cc
+++ b/src/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/ast/bool_literal.h"
+#include "src/ast/bool_literal_expression.h"
 
 #include "src/program_builder.h"
 
diff --git a/src/ast/bool_literal.h b/src/ast/bool_literal_expression.h
similarity index 88%
rename from src/ast/bool_literal.h
rename to src/ast/bool_literal_expression.h
index e385f1d..9a571d2 100644
--- a/src/ast/bool_literal.h
+++ b/src/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_AST_BOOL_LITERAL_H_
-#define SRC_AST_BOOL_LITERAL_H_
+#ifndef SRC_AST_BOOL_LITERAL_EXPRESSION_H_
+#define SRC_AST_BOOL_LITERAL_EXPRESSION_H_
 
 #include <string>
 
-#include "src/ast/literal.h"
+#include "src/ast/literal_expression.h"
 
 namespace tint {
 namespace ast {
@@ -45,4 +45,4 @@
 }  // namespace ast
 }  // namespace tint
 
-#endif  // SRC_AST_BOOL_LITERAL_H_
+#endif  // SRC_AST_BOOL_LITERAL_EXPRESSION_H_
diff --git a/src/ast/bool_literal_test.cc b/src/ast/bool_literal_expression_test.cc
similarity index 100%
rename from src/ast/bool_literal_test.cc
rename to src/ast/bool_literal_expression_test.cc
diff --git a/src/ast/case_statement.h b/src/ast/case_statement.h
index 7b7af0c..71c80db 100644
--- a/src/ast/case_statement.h
+++ b/src/ast/case_statement.h
@@ -18,7 +18,7 @@
 #include <vector>
 
 #include "src/ast/block_statement.h"
-#include "src/ast/int_literal.h"
+#include "src/ast/int_literal_expression.h"
 
 namespace tint {
 namespace ast {
diff --git a/src/ast/float_literal.cc b/src/ast/float_literal_expression.cc
similarity index 95%
rename from src/ast/float_literal.cc
rename to src/ast/float_literal_expression.cc
index c895983..a76cc8d 100644
--- a/src/ast/float_literal.cc
+++ b/src/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/ast/float_literal.h"
+#include "src/ast/float_literal_expression.h"
 
 #include <limits>
 
diff --git a/src/ast/float_literal.h b/src/ast/float_literal_expression.h
similarity index 87%
rename from src/ast/float_literal.h
rename to src/ast/float_literal_expression.h
index 469e7a8..0e1b243 100644
--- a/src/ast/float_literal.h
+++ b/src/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_AST_FLOAT_LITERAL_H_
-#define SRC_AST_FLOAT_LITERAL_H_
+#ifndef SRC_AST_FLOAT_LITERAL_EXPRESSION_H_
+#define SRC_AST_FLOAT_LITERAL_EXPRESSION_H_
 
 #include <string>
 
-#include "src/ast/literal.h"
+#include "src/ast/literal_expression.h"
 
 namespace tint {
 namespace ast {
@@ -45,4 +45,4 @@
 }  // namespace ast
 }  // namespace tint
 
-#endif  // SRC_AST_FLOAT_LITERAL_H_
+#endif  // SRC_AST_FLOAT_LITERAL_EXPRESSION_H_
diff --git a/src/ast/float_literal_test.cc b/src/ast/float_literal_expression_test.cc
similarity index 100%
rename from src/ast/float_literal_test.cc
rename to src/ast/float_literal_expression_test.cc
diff --git a/src/ast/int_literal.cc b/src/ast/int_literal_expression.cc
similarity index 94%
rename from src/ast/int_literal.cc
rename to src/ast/int_literal_expression.cc
index ff164c0..c620d29 100644
--- a/src/ast/int_literal.cc
+++ b/src/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/ast/int_literal.h"
+#include "src/ast/int_literal_expression.h"
 
 TINT_INSTANTIATE_TYPEINFO(tint::ast::IntLiteral);
 
diff --git a/src/ast/int_literal.h b/src/ast/int_literal_expression.h
similarity index 87%
rename from src/ast/int_literal.h
rename to src/ast/int_literal_expression.h
index 96d55a9..aa79aaf 100644
--- a/src/ast/int_literal.h
+++ b/src/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_AST_INT_LITERAL_H_
-#define SRC_AST_INT_LITERAL_H_
+#ifndef SRC_AST_INT_LITERAL_EXPRESSION_H_
+#define SRC_AST_INT_LITERAL_EXPRESSION_H_
 
-#include "src/ast/literal.h"
+#include "src/ast/literal_expression.h"
 
 namespace tint {
 namespace ast {
@@ -41,4 +41,4 @@
 }  // namespace ast
 }  // namespace tint
 
-#endif  // SRC_AST_INT_LITERAL_H_
+#endif  // SRC_AST_INT_LITERAL_EXPRESSION_H_
diff --git a/src/ast/int_literal_test.cc b/src/ast/int_literal_expression_test.cc
similarity index 100%
rename from src/ast/int_literal_test.cc
rename to src/ast/int_literal_expression_test.cc
diff --git a/src/ast/literal.cc b/src/ast/literal_expression.cc
similarity index 94%
rename from src/ast/literal.cc
rename to src/ast/literal_expression.cc
index 6232a96..523cd51 100644
--- a/src/ast/literal.cc
+++ b/src/ast/literal_expression.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/ast/literal.h"
+#include "src/ast/literal_expression.h"
 
 TINT_INSTANTIATE_TYPEINFO(tint::ast::Literal);
 
diff --git a/src/ast/literal.h b/src/ast/literal_expression.h
similarity index 89%
rename from src/ast/literal.h
rename to src/ast/literal_expression.h
index 851b3ce..c76deb6 100644
--- a/src/ast/literal.h
+++ b/src/ast/literal_expression.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef SRC_AST_LITERAL_H_
-#define SRC_AST_LITERAL_H_
+#ifndef SRC_AST_LITERAL_EXPRESSION_H_
+#define SRC_AST_LITERAL_EXPRESSION_H_
 
 #include <string>
 
@@ -37,4 +37,4 @@
 }  // namespace ast
 }  // namespace tint
 
-#endif  // SRC_AST_LITERAL_H_
+#endif  // SRC_AST_LITERAL_EXPRESSION_H_
diff --git a/src/ast/sint_literal.cc b/src/ast/sint_literal_expression.cc
similarity index 96%
rename from src/ast/sint_literal.cc
rename to src/ast/sint_literal_expression.cc
index 99f291d..78da9fc 100644
--- a/src/ast/sint_literal.cc
+++ b/src/ast/sint_literal_expression.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/ast/sint_literal.h"
+#include "src/ast/sint_literal_expression.h"
 
 #include "src/program_builder.h"
 
diff --git a/src/ast/sint_literal.h b/src/ast/sint_literal_expression.h
similarity index 88%
rename from src/ast/sint_literal.h
rename to src/ast/sint_literal_expression.h
index ec807d6..584f360 100644
--- a/src/ast/sint_literal.h
+++ b/src/ast/sint_literal_expression.h
@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef SRC_AST_SINT_LITERAL_H_
-#define SRC_AST_SINT_LITERAL_H_
+#ifndef SRC_AST_SINT_LITERAL_EXPRESSION_H_
+#define SRC_AST_SINT_LITERAL_EXPRESSION_H_
 
 #include <string>
 
-#include "src/ast/int_literal.h"
+#include "src/ast/int_literal_expression.h"
 
 namespace tint {
 namespace ast {
@@ -48,4 +48,4 @@
 }  // namespace ast
 }  // namespace tint
 
-#endif  // SRC_AST_SINT_LITERAL_H_
+#endif  // SRC_AST_SINT_LITERAL_EXPRESSION_H_
diff --git a/src/ast/sint_literal_test.cc b/src/ast/sint_literal_expression_test.cc
similarity index 100%
rename from src/ast/sint_literal_test.cc
rename to src/ast/sint_literal_expression_test.cc
diff --git a/src/ast/traverse_expressions.h b/src/ast/traverse_expressions.h
index 97658f3..c169775 100644
--- a/src/ast/traverse_expressions.h
+++ b/src/ast/traverse_expressions.h
@@ -21,7 +21,7 @@
 #include "src/ast/binary_expression.h"
 #include "src/ast/bitcast_expression.h"
 #include "src/ast/call_expression.h"
-#include "src/ast/literal.h"
+#include "src/ast/literal_expression.h"
 #include "src/ast/member_accessor_expression.h"
 #include "src/ast/phony_expression.h"
 #include "src/ast/type_constructor_expression.h"
diff --git a/src/ast/uint_literal.cc b/src/ast/uint_literal_expression.cc
similarity index 95%
rename from src/ast/uint_literal.cc
rename to src/ast/uint_literal_expression.cc
index 27ebda0..9efc365 100644
--- a/src/ast/uint_literal.cc
+++ b/src/ast/uint_literal_expression.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/ast/uint_literal.h"
+#include "src/ast/uint_literal_expression.h"
 
 #include "src/program_builder.h"
 
diff --git a/src/ast/uint_literal.h b/src/ast/uint_literal_expression.h
similarity index 88%
rename from src/ast/uint_literal.h
rename to src/ast/uint_literal_expression.h
index 3429758..9a89046 100644
--- a/src/ast/uint_literal.h
+++ b/src/ast/uint_literal_expression.h
@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef SRC_AST_UINT_LITERAL_H_
-#define SRC_AST_UINT_LITERAL_H_
+#ifndef SRC_AST_UINT_LITERAL_EXPRESSION_H_
+#define SRC_AST_UINT_LITERAL_EXPRESSION_H_
 
 #include <string>
 
-#include "src/ast/int_literal.h"
+#include "src/ast/int_literal_expression.h"
 
 namespace tint {
 namespace ast {
@@ -48,4 +48,4 @@
 }  // namespace ast
 }  // namespace tint
 
-#endif  // SRC_AST_UINT_LITERAL_H_
+#endif  // SRC_AST_UINT_LITERAL_EXPRESSION_H_
diff --git a/src/ast/uint_literal_test.cc b/src/ast/uint_literal_expression_test.cc
similarity index 100%
rename from src/ast/uint_literal_test.cc
rename to src/ast/uint_literal_expression_test.cc
diff --git a/src/inspector/inspector.cc b/src/inspector/inspector.cc
index 0ef2872..baf9b45 100644
--- a/src/inspector/inspector.cc
+++ b/src/inspector/inspector.cc
@@ -17,15 +17,15 @@
 #include <limits>
 #include <utility>
 
-#include "src/ast/bool_literal.h"
+#include "src/ast/bool_literal_expression.h"
 #include "src/ast/call_expression.h"
-#include "src/ast/float_literal.h"
+#include "src/ast/float_literal_expression.h"
 #include "src/ast/interpolate_decoration.h"
 #include "src/ast/location_decoration.h"
 #include "src/ast/module.h"
 #include "src/ast/override_decoration.h"
-#include "src/ast/sint_literal.h"
-#include "src/ast/uint_literal.h"
+#include "src/ast/sint_literal_expression.h"
+#include "src/ast/uint_literal_expression.h"
 #include "src/sem/array.h"
 #include "src/sem/call.h"
 #include "src/sem/depth_multisampled_texture_type.h"
diff --git a/src/program_builder.h b/src/program_builder.h
index 2c13980..11f0276 100644
--- a/src/program_builder.h
+++ b/src/program_builder.h
@@ -28,7 +28,7 @@
 #include "src/ast/binding_decoration.h"
 #include "src/ast/bitcast_expression.h"
 #include "src/ast/bool.h"
-#include "src/ast/bool_literal.h"
+#include "src/ast/bool_literal_expression.h"
 #include "src/ast/break_statement.h"
 #include "src/ast/call_expression.h"
 #include "src/ast/call_statement.h"
@@ -38,7 +38,7 @@
 #include "src/ast/disable_validation_decoration.h"
 #include "src/ast/external_texture.h"
 #include "src/ast/f32.h"
-#include "src/ast/float_literal.h"
+#include "src/ast/float_literal_expression.h"
 #include "src/ast/for_loop_statement.h"
 #include "src/ast/i32.h"
 #include "src/ast/if_statement.h"
@@ -55,7 +55,7 @@
 #include "src/ast/return_statement.h"
 #include "src/ast/sampled_texture.h"
 #include "src/ast/sampler.h"
-#include "src/ast/sint_literal.h"
+#include "src/ast/sint_literal_expression.h"
 #include "src/ast/stage_decoration.h"
 #include "src/ast/storage_texture.h"
 #include "src/ast/stride_decoration.h"
@@ -67,7 +67,7 @@
 #include "src/ast/type_constructor_expression.h"
 #include "src/ast/type_name.h"
 #include "src/ast/u32.h"
-#include "src/ast/uint_literal.h"
+#include "src/ast/uint_literal_expression.h"
 #include "src/ast/unary_op_expression.h"
 #include "src/ast/variable_decl_statement.h"
 #include "src/ast/vector.h"
diff --git a/src/resolver/resolver_test.cc b/src/resolver/resolver_test.cc
index 99f206a..cf1a91f 100644
--- a/src/resolver/resolver_test.cc
+++ b/src/resolver/resolver_test.cc
@@ -23,7 +23,7 @@
 #include "src/ast/break_statement.h"
 #include "src/ast/call_statement.h"
 #include "src/ast/continue_statement.h"
-#include "src/ast/float_literal.h"
+#include "src/ast/float_literal_expression.h"
 #include "src/ast/if_statement.h"
 #include "src/ast/intrinsic_texture_helper_test.h"
 #include "src/ast/loop_statement.h"
diff --git a/src/writer/msl/generator_impl.cc b/src/writer/msl/generator_impl.cc
index 3f73586..eccfa3a 100644
--- a/src/writer/msl/generator_impl.cc
+++ b/src/writer/msl/generator_impl.cc
@@ -22,16 +22,16 @@
 #include <vector>
 
 #include "src/ast/alias.h"
-#include "src/ast/bool_literal.h"
+#include "src/ast/bool_literal_expression.h"
 #include "src/ast/call_statement.h"
 #include "src/ast/disable_validation_decoration.h"
 #include "src/ast/fallthrough_statement.h"
-#include "src/ast/float_literal.h"
+#include "src/ast/float_literal_expression.h"
 #include "src/ast/interpolate_decoration.h"
 #include "src/ast/module.h"
 #include "src/ast/override_decoration.h"
-#include "src/ast/sint_literal.h"
-#include "src/ast/uint_literal.h"
+#include "src/ast/sint_literal_expression.h"
+#include "src/ast/uint_literal_expression.h"
 #include "src/ast/variable_decl_statement.h"
 #include "src/ast/void.h"
 #include "src/sem/array.h"
diff --git a/src/writer/wgsl/generator_impl.cc b/src/writer/wgsl/generator_impl.cc
index 5d1a77e..00fca10 100644
--- a/src/writer/wgsl/generator_impl.cc
+++ b/src/writer/wgsl/generator_impl.cc
@@ -21,12 +21,12 @@
 #include "src/ast/array.h"
 #include "src/ast/atomic.h"
 #include "src/ast/bool.h"
-#include "src/ast/bool_literal.h"
+#include "src/ast/bool_literal_expression.h"
 #include "src/ast/call_statement.h"
 #include "src/ast/depth_texture.h"
 #include "src/ast/external_texture.h"
 #include "src/ast/f32.h"
-#include "src/ast/float_literal.h"
+#include "src/ast/float_literal_expression.h"
 #include "src/ast/i32.h"
 #include "src/ast/internal_decoration.h"
 #include "src/ast/interpolate_decoration.h"
@@ -37,7 +37,7 @@
 #include "src/ast/override_decoration.h"
 #include "src/ast/pointer.h"
 #include "src/ast/sampled_texture.h"
-#include "src/ast/sint_literal.h"
+#include "src/ast/sint_literal_expression.h"
 #include "src/ast/stage_decoration.h"
 #include "src/ast/storage_texture.h"
 #include "src/ast/stride_decoration.h"
@@ -47,7 +47,7 @@
 #include "src/ast/struct_member_size_decoration.h"
 #include "src/ast/type_name.h"
 #include "src/ast/u32.h"
-#include "src/ast/uint_literal.h"
+#include "src/ast/uint_literal_expression.h"
 #include "src/ast/variable_decl_statement.h"
 #include "src/ast/vector.h"
 #include "src/ast/void.h"
diff --git a/test/BUILD.gn b/test/BUILD.gn
index 6c4b740..a8a6cd1 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -154,7 +154,7 @@
     "../src/ast/binding_decoration_test.cc",
     "../src/ast/bitcast_expression_test.cc",
     "../src/ast/block_statement_test.cc",
-    "../src/ast/bool_literal_test.cc",
+    "../src/ast/bool_literal_expression_test.cc",
     "../src/ast/bool_test.cc",
     "../src/ast/break_statement_test.cc",
     "../src/ast/builtin_decoration_test.cc",
@@ -169,14 +169,14 @@
     "../src/ast/external_texture_test.cc",
     "../src/ast/f32_test.cc",
     "../src/ast/fallthrough_statement_test.cc",
-    "../src/ast/float_literal_test.cc",
+    "../src/ast/float_literal_expression_test.cc",
     "../src/ast/for_loop_statement_test.cc",
     "../src/ast/function_test.cc",
     "../src/ast/group_decoration_test.cc",
     "../src/ast/i32_test.cc",
     "../src/ast/identifier_expression_test.cc",
     "../src/ast/if_statement_test.cc",
-    "../src/ast/int_literal_test.cc",
+    "../src/ast/int_literal_expression_test.cc",
     "../src/ast/interpolate_decoration_test.cc",
     "../src/ast/intrinsic_texture_helper_test.cc",
     "../src/ast/intrinsic_texture_helper_test.h",
@@ -194,7 +194,7 @@
     "../src/ast/return_statement_test.cc",
     "../src/ast/sampled_texture_test.cc",
     "../src/ast/sampler_test.cc",
-    "../src/ast/sint_literal_test.cc",
+    "../src/ast/sint_literal_expression_test.cc",
     "../src/ast/stage_decoration_test.cc",
     "../src/ast/storage_texture_test.cc",
     "../src/ast/stride_decoration_test.cc",
@@ -209,7 +209,7 @@
     "../src/ast/traverse_expressions_test.cc",
     "../src/ast/type_constructor_expression_test.cc",
     "../src/ast/u32_test.cc",
-    "../src/ast/uint_literal_test.cc",
+    "../src/ast/uint_literal_expression_test.cc",
     "../src/ast/unary_op_expression_test.cc",
     "../src/ast/variable_decl_statement_test.cc",
     "../src/ast/variable_test.cc",