From 2768f41817732b1f6484bc6fec3dfdaf70dcc485 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Mon, 17 Nov 2025 11:01:16 -0800 Subject: Compilers: make CLikeCompiler.cross_compute_int private --- mesonbuild/compilers/fortran.py | 12 ++++++------ mesonbuild/compilers/mixins/clike.py | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/mesonbuild/compilers/fortran.py b/mesonbuild/compilers/fortran.py index af76c78a7..a2f9fa3e3 100644 --- a/mesonbuild/compilers/fortran.py +++ b/mesonbuild/compilers/fortran.py @@ -135,10 +135,10 @@ class FortranCompiler(CLikeCompiler, Compiler): end program test''' return self.compiles(t, extra_args=extra_args, dependencies=dependencies)[0] - def cross_compute_int(self, expression: str, low: T.Optional[int], high: T.Optional[int], - guess: T.Optional[int], prefix: str, - extra_args: T.Union[None, T.List[str], T.Callable[[CompileCheckMode], T.List[str]]] = None, - dependencies: T.Optional[T.List['Dependency']] = None) -> int: + def _cross_compute_int(self, expression: str, low: T.Optional[int], high: T.Optional[int], + guess: T.Optional[int], prefix: str, + extra_args: T.Union[None, T.List[str], T.Callable[[CompileCheckMode], T.List[str]]] = None, + dependencies: T.Optional[T.List['Dependency']] = None) -> int: # This only difference between this implementation and that of CLikeCompiler # is a change in logical conjunction operator (.and. instead of &&) @@ -192,7 +192,7 @@ class FortranCompiler(CLikeCompiler, Compiler): if extra_args is None: extra_args = [] if self.is_cross: - return self.cross_compute_int(expression, low, high, guess, prefix, extra_args, dependencies) + return self._cross_compute_int(expression, low, high, guess, prefix, extra_args, dependencies) t = f'''program test {prefix} print '(i0)', {expression} @@ -219,7 +219,7 @@ class FortranCompiler(CLikeCompiler, Compiler): if not self.compiles(t, extra_args=extra_args, dependencies=dependencies)[0]: return -1 - return self.cross_compute_int('c_sizeof(x)', None, None, None, prefix + '\nuse iso_c_binding\n' + typename + ' :: x', extra_args, dependencies) + return self._cross_compute_int('c_sizeof(x)', None, None, None, prefix + '\nuse iso_c_binding\n' + typename + ' :: x', extra_args, dependencies) def sizeof(self, typename: str, prefix: str, *, extra_args: T.Union[None, T.List[str], T.Callable[[CompileCheckMode], T.List[str]]] = None, diff --git a/mesonbuild/compilers/mixins/clike.py b/mesonbuild/compilers/mixins/clike.py index 0d7578bdd..28aef29d2 100644 --- a/mesonbuild/compilers/mixins/clike.py +++ b/mesonbuild/compilers/mixins/clike.py @@ -449,10 +449,10 @@ class CLikeCompiler(Compiler): int main(void) {{ static int a[1-2*!({expression})]; a[0]=0; return 0; }}''' return self.compiles(t, extra_args=extra_args, dependencies=dependencies)[0] - def cross_compute_int(self, expression: str, low: T.Optional[int], high: T.Optional[int], - guess: T.Optional[int], prefix: str, - extra_args: T.Union[None, T.List[str], T.Callable[[CompileCheckMode], T.List[str]]] = None, - dependencies: T.Optional[T.List['Dependency']] = None) -> int: + def _cross_compute_int(self, expression: str, low: T.Optional[int], high: T.Optional[int], + guess: T.Optional[int], prefix: str, + extra_args: T.Union[None, T.List[str], T.Callable[[CompileCheckMode], T.List[str]]] = None, + dependencies: T.Optional[T.List['Dependency']] = None) -> int: # Try user's guess first if isinstance(guess, int): if self._compile_int(f'{expression} == {guess}', prefix, extra_args, dependencies): @@ -518,7 +518,7 @@ class CLikeCompiler(Compiler): if extra_args is None: extra_args = [] if self.is_cross: - return self.cross_compute_int(expression, low, high, guess, prefix, extra_args, dependencies) + return self._cross_compute_int(expression, low, high, guess, prefix, extra_args, dependencies) t = f'''{prefix} #include #include @@ -548,7 +548,7 @@ class CLikeCompiler(Compiler): if not self.compiles(t, extra_args=extra_args, dependencies=dependencies)[0]: return -1 - return self.cross_compute_int(f'sizeof({typename})', None, None, None, prefix, extra_args, dependencies) + return self._cross_compute_int(f'sizeof({typename})', None, None, None, prefix, extra_args, dependencies) def sizeof(self, typename: str, prefix: str, *, extra_args: T.Union[None, T.List[str], T.Callable[[CompileCheckMode], T.List[str]]] = None, @@ -594,7 +594,7 @@ class CLikeCompiler(Compiler): char c; {typename} target; }};''' - return self.cross_compute_int('offsetof(struct tmp, target)', None, None, None, t, extra_args, dependencies) + return self._cross_compute_int('offsetof(struct tmp, target)', None, None, None, t, extra_args, dependencies) def alignment(self, typename: str, prefix: str, *, extra_args: T.Optional[T.List[str]] = None, -- cgit v1.2.3