From 98416e7f755dc9d660349556400363e734ac7828 Mon Sep 17 00:00:00 2001
From: Dylan Baker <dylan@pnwbakers.com>
Date: Thu, 17 Sep 2020 13:33:27 -0700
Subject: compilers: put name_string method in base compiler

Every language had the exact same implementation
---
 mesonbuild/compilers/compilers.py    | 3 +++
 mesonbuild/compilers/cs.py           | 3 ---
 mesonbuild/compilers/cuda.py         | 3 ---
 mesonbuild/compilers/d.py            | 3 ---
 mesonbuild/compilers/java.py         | 3 ---
 mesonbuild/compilers/mixins/clike.py | 4 +---
 mesonbuild/compilers/rust.py         | 3 ---
 mesonbuild/compilers/swift.py        | 3 ---
 mesonbuild/compilers/vala.py         | 3 ---
 9 files changed, 4 insertions(+), 24 deletions(-)

(limited to 'mesonbuild')

diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py
index fd2d081..44922eb 100644
--- a/mesonbuild/compilers/compilers.py
+++ b/mesonbuild/compilers/compilers.py
@@ -1044,6 +1044,9 @@ class Compiler(metaclass=abc.ABCMeta):
     def get_has_func_attribute_extra_args(self, name: str) -> T.List[str]:
         raise EnvironmentException('{} does not support function attributes'.format(self.id))
 
+    def name_string(self) -> str:
+        return ' '.join(self.exelist)
+
 
 def get_args_from_envvars(lang: str,
                           for_machine: MachineChoice,
diff --git a/mesonbuild/compilers/cs.py b/mesonbuild/compilers/cs.py
index 843348e..cc5d6ad 100644
--- a/mesonbuild/compilers/cs.py
+++ b/mesonbuild/compilers/cs.py
@@ -95,9 +95,6 @@ class CsCompiler(BasicLinkerIsCompilerMixin, Compiler):
 
         return parameter_list
 
-    def name_string(self):
-        return ' '.join(self.exelist)
-
     def get_pch_use_args(self, pch_dir, header):
         return []
 
diff --git a/mesonbuild/compilers/cuda.py b/mesonbuild/compilers/cuda.py
index 0d89bbc..482d504 100644
--- a/mesonbuild/compilers/cuda.py
+++ b/mesonbuild/compilers/cuda.py
@@ -210,9 +210,6 @@ class CudaCompiler(Compiler):
     def get_option_link_args(self, options):
         return self._cook_link_args(self.host_compiler.get_option_link_args(self._to_host_compiler_options(options)))
 
-    def name_string(self):
-        return ' '.join(self.exelist)
-
     def get_soname_args(self, *args):
         return self._cook_link_args(self.host_compiler.get_soname_args(*args))
 
diff --git a/mesonbuild/compilers/d.py b/mesonbuild/compilers/d.py
index a74dc95..dd6129e 100644
--- a/mesonbuild/compilers/d.py
+++ b/mesonbuild/compilers/d.py
@@ -633,9 +633,6 @@ class DCompiler(Compiler):
     def thread_link_flags(self, env):
         return self.linker.thread_flags(env)
 
-    def name_string(self):
-        return ' '.join(self.exelist)
-
 
 class GnuDCompiler(GnuCompiler, DCompiler):
 
diff --git a/mesonbuild/compilers/java.py b/mesonbuild/compilers/java.py
index 5aeb250..2c0b340 100644
--- a/mesonbuild/compilers/java.py
+++ b/mesonbuild/compilers/java.py
@@ -64,9 +64,6 @@ class JavaCompiler(BasicLinkerIsCompilerMixin, Compiler):
     def get_pic_args(self):
         return []
 
-    def name_string(self):
-        return ' '.join(self.exelist)
-
     def get_pch_use_args(self, pch_dir, header):
         return []
 
diff --git a/mesonbuild/compilers/mixins/clike.py b/mesonbuild/compilers/mixins/clike.py
index 662c634..293d7f9 100644
--- a/mesonbuild/compilers/mixins/clike.py
+++ b/mesonbuild/compilers/mixins/clike.py
@@ -138,6 +138,7 @@ class CLikeCompiler:
         def get_linker_always_args(self) -> T.List[str]: ...
         def get_pch_suffix(self) -> str: ...
         def get_id(self) -> str: ...
+        def name_string(self) -> str: ...
         def remove_linkerlike_args(self, args: T.List[str]) -> T.List[str]: ...
         @classmethod
         def use_linker_args(cls, linker: str) -> T.List[str]: ...
@@ -306,9 +307,6 @@ class CLikeCompiler:
     def get_pic_args(self) -> T.List[str]:
         return ['-fPIC']
 
-    def name_string(self) -> str:
-        return ' '.join(self.exelist)
-
     def get_pch_use_args(self, pch_dir: str, header: str) -> T.List[str]:
         return ['-include', os.path.basename(header)]
 
diff --git a/mesonbuild/compilers/rust.py b/mesonbuild/compilers/rust.py
index a47d6ed..dd036a3 100644
--- a/mesonbuild/compilers/rust.py
+++ b/mesonbuild/compilers/rust.py
@@ -45,9 +45,6 @@ class RustCompiler(Compiler):
     def needs_static_linker(self):
         return False
 
-    def name_string(self):
-        return ' '.join(self.exelist)
-
     def sanity_check(self, work_dir, environment):
         source_name = os.path.join(work_dir, 'sanity.rs')
         output_name = os.path.join(work_dir, 'rusttest')
diff --git a/mesonbuild/compilers/swift.py b/mesonbuild/compilers/swift.py
index 1942120..f753133 100644
--- a/mesonbuild/compilers/swift.py
+++ b/mesonbuild/compilers/swift.py
@@ -42,9 +42,6 @@ class SwiftCompiler(Compiler):
         self.id = 'llvm'
         self.is_cross = is_cross
 
-    def name_string(self):
-        return ' '.join(self.exelist)
-
     def needs_static_linker(self):
         return True
 
diff --git a/mesonbuild/compilers/vala.py b/mesonbuild/compilers/vala.py
index a5d49b6..dc28c31 100644
--- a/mesonbuild/compilers/vala.py
+++ b/mesonbuild/compilers/vala.py
@@ -35,9 +35,6 @@ class ValaCompiler(Compiler):
         self.id = 'valac'
         self.base_options = ['b_colorout']
 
-    def name_string(self):
-        return ' '.join(self.exelist)
-
     def needs_static_linker(self):
         return False # Because compiles into C.
 
-- 
cgit v1.1