[vala/wip/issue/713: 30/32] vala: remove use_header variable from CodeContext
- From: Rico Tzschichholz <ricotz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vala/wip/issue/713: 30/32] vala: remove use_header variable from CodeContext
- Date: Sat, 4 Apr 2020 20:41:30 +0000 (UTC)
commit 7407ee94d9a16437478fb61737a0e318612ad352
Author: scythe loves you <scythe ortsz com>
Date: Sat Mar 21 14:15:16 2020 -0400
vala: remove use_header variable from CodeContext
also remove uses in codegen
codegen/valaccodebasemodule.vala | 2 +-
codegen/valagtypemodule.vala | 4 ++--
vala/valacodecontext.vala | 6 ------
3 files changed, 3 insertions(+), 9 deletions(-)
---
diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index 06a692708..087c38dbe 100644
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -670,7 +670,7 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
}
public bool add_symbol_declaration (CCodeFile decl_space, Symbol sym, string name) {
- bool in_generated_header = CodeContext.get ().use_header
+ bool in_generated_header = CodeContext.get ().header_filename != null
&& (decl_space.cfile_type != CCodeFileType.PUBLIC_HEADER &&
!sym.is_internal_symbol ());
if (decl_space.add_declaration (name)) {
return true;
diff --git a/codegen/valagtypemodule.vala b/codegen/valagtypemodule.vala
index f7433f205..ca953cf05 100644
--- a/codegen/valagtypemodule.vala
+++ b/codegen/valagtypemodule.vala
@@ -198,7 +198,7 @@ public class Vala.GTypeModule : GErrorModule {
// Custom unref-methods need to be emitted before G_DEFINE_AUTOPTR_CLEANUP_FUNC,
// so we guard against that special case and handle it in generate_method_declaration.
if (!(base_class.is_compact && is_reference_counting (base_class))
- && (!context.use_header || decl_space.cfile_type == CCodeFileType.PUBLIC_HEADER
+ && (context.header_filename == null|| decl_space.cfile_type == CCodeFileType.PUBLIC_HEADER
|| (decl_space.cfile_type == CCodeFileType.INTERNAL_HEADER &&
base_class.is_internal_symbol()))) {
string autoptr_cleanup_func;
if (is_reference_counting (base_class)) {
@@ -426,7 +426,7 @@ public class Vala.GTypeModule : GErrorModule {
// in addition to the non-ref-countable case in generate_class_declaration.
unowned Class? cl = m.parent_symbol as Class;
if (cl != null && cl.is_compact && get_ccode_unref_function (cl) == get_ccode_name (m)
- && (!context.use_header || decl_space.cfile_type == CCodeFileType.PUBLIC_HEADER
+ && (context.header_filename == null || decl_space.cfile_type ==
CCodeFileType.PUBLIC_HEADER
|| (decl_space.cfile_type == CCodeFileType.INTERNAL_HEADER &&
cl.is_internal_symbol()))) {
decl_space.add_type_member_declaration (new CCodeIdentifier
("G_DEFINE_AUTOPTR_CLEANUP_FUNC (%s, %s)".printf (get_ccode_name (cl), get_ccode_name (m))));
decl_space.add_type_member_declaration (new CCodeNewline ());
diff --git a/vala/valacodecontext.vala b/vala/valacodecontext.vala
index 25f7bb65d..6ddcd8f5c 100644
--- a/vala/valacodecontext.vala
+++ b/vala/valacodecontext.vala
@@ -91,12 +91,6 @@ public class Vala.CodeContext {
*/
public string? internal_header_filename { get; set; }
- public bool use_header {
- get {
- return (header_filename != null);
- }
- }
-
/**
* Base directory used for header_filename in the VAPIs.
*/
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]