Move more semantic functions from func.d to funcsem.d and typesem.d (#…

…16552) --------- Co-authored-by: Alex Muscar <alex@muscar.eu>
dlang · Jun 2, 2024 · 0330991 · 0330991
1 parent 07bc5b9
commit 0330991
Show file tree

Hide file tree

Showing 6 changed files with 371 additions and 369 deletions.
diff --git a/compiler/src/dmd/cxxfrontend.d b/compiler/src/dmd/cxxfrontend.d
@@ -265,10 +265,10 @@ bool functionSemantic3(FuncDeclaration fd)
  return dmd.funcsem.functionSemantic3(fd);
 }
 
-MATCH leastAsSpecialized(FuncDeclaration f, FuncDeclaration g, Identifiers* names)
+MATCH leastAsSpecialized(FuncDeclaration fd, FuncDeclaration g, Identifiers* names)
 {
  import dmd.funcsem;
- return dmd.funcsem.leastAsSpecialized(f, g, names);
+ return dmd.funcsem.leastAsSpecialized(fd, g, names);
 }
 
 /***********************************************************

diff --git a/compiler/src/dmd/declaration.h b/compiler/src/dmd/declaration.h
@@ -35,6 +35,7 @@ namespace dmd
  bool functionSemantic(FuncDeclaration* fd);
  bool functionSemantic3(FuncDeclaration* fd);
  MATCH leastAsSpecialized(FuncDeclaration *f, FuncDeclaration *g, Identifiers *names);
+ PURE isPure(FuncDeclaration *f);
 }
 
 //enum STC : ulong from astenums.d:
@@ -719,7 +720,6 @@ class FuncDeclaration : public Declaration
  bool isCodeseg() const override final;
  bool isOverloadable() const override final;
  bool isAbstract() override final;
- PURE isPure();
  bool isSafe();
  bool isTrusted();
  bool isNogc();

diff --git a/compiler/src/dmd/frontend.h b/compiler/src/dmd/frontend.h
@@ -3621,14 +3621,6 @@ struct ObjcFuncDeclaration final
  {}
 };
 
-enum class PURE : uint8_t
-{
- impure = 0u,
- fwdref = 1u,
- weak = 2u,
- const_ = 3u,
-};
-
 enum class VarArg : uint8_t
 {
  none = 0u,
@@ -3798,7 +3790,6 @@ class FuncDeclaration : public Declaration
  bool isOverloadable() const final override;
  bool isAbstract() final override;
  void initInferAttributes();
- PURE isPure();
  bool isSafe();
  bool isTrusted();
  bool isNogc();
@@ -4365,6 +4356,14 @@ enum class TRUST : uint8_t
  safe = 3u,
 };
 
+enum class PURE : uint8_t
+{
+ impure = 0u,
+ fwdref = 1u,
+ weak = 2u,
+ const_ = 3u,
+};
+
 class TypeFunction final : public TypeNext
 {
 public: