transpile: Move literal_matches_ty to TypedAstContext

Author: Rua

c2rust-transpile/src/c_ast/mod.rs

@@ -1366,6 +1366,23 @@ impl TypedAstContext {
         }
         false
     }
+
+    /// Return whether the literal can be directly translated as this type.
+    pub fn literal_matches_ty(&self, lit: &CLiteral, ty: CQualTypeId, is_negated: bool) -> bool {
+        let ty_kind = &self.resolve_type(ty.ctype).kind;
+        match *lit {
+            CLiteral::Integer(value, _) | CLiteral::Character(value)
+                if ty_kind.is_integral_type() && !ty_kind.is_bool() =>
+            {
+                ty_kind.guaranteed_integer_in_range(value)
+                    && (!is_negated || ty_kind.is_signed_integral_type())
+            }
+            CLiteral::Floating(value, _) if ty_kind.is_floating_type() => {
+                ty_kind.guaranteed_float_in_range(value)
+            }
+            _ => false,
+        }
+    }
 }
 
 impl CommentContext {

c2rust-transpile/src/translator/literals.rs

@@ -31,23 +31,6 @@ impl<'c> Translation<'c> {
         Ok(mk().cast_expr(expr, target_ty))
     }
 
-    /// Return whether the literal can be directly translated as this type.
-    pub fn literal_matches_ty(&self, lit: &CLiteral, ty: CQualTypeId, is_negated: bool) -> bool {
-        let ty_kind = &self.ast_context.resolve_type(ty.ctype).kind;
-        match *lit {
-            CLiteral::Integer(value, _) | CLiteral::Character(value)
-                if ty_kind.is_integral_type() && !ty_kind.is_bool() =>
-            {
-                ty_kind.guaranteed_integer_in_range(value)
-                    && (!is_negated || ty_kind.is_signed_integral_type())
-            }
-            CLiteral::Floating(value, _) if ty_kind.is_floating_type() => {
-                ty_kind.guaranteed_float_in_range(value)
-            }
-            _ => false,
-        }
-    }
-
     /// Convert a C literal expression to a Rust expression
     pub fn convert_literal(
         &self,

c2rust-transpile/src/translator/mod.rs

@@ -3248,7 +3248,10 @@ impl<'c> Translation<'c> {
                     }
 
                     if let CExprKind::Literal(_, lit) = literal_expr_kind {
-                        if self.literal_matches_ty(lit, target_ty, is_negated) {
+                        if self
+                            .ast_context
+                            .literal_matches_ty(lit, target_ty, is_negated)
+                        {
                             return self.convert_expr(ctx, expr, Some(target_ty));
                         }
                     }