[vala/wip/issue/713: 31/32] Rework API
- From: Rico Tzschichholz <ricotz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vala/wip/issue/713: 31/32] Rework API
- Date: Sat, 4 Apr 2020 20:41:35 +0000 (UTC)
commit 9349ac44d1be4ffdf7c1d9cb3c06855a60305e6f
Author: Rico Tzschichholz <ricotz ubuntu com>
Date: Sat Apr 4 22:12:05 2020 +0200
Rework API
ccode/valaccodefile.vala | 10 ++++------
codegen/valaccodebasemodule.vala | 10 ++++------
codegen/valagtypemodule.vala | 8 ++++----
3 files changed, 12 insertions(+), 16 deletions(-)
---
diff --git a/ccode/valaccodefile.vala b/ccode/valaccodefile.vala
index a82eac5c0..7145946b1 100644
--- a/ccode/valaccodefile.vala
+++ b/ccode/valaccodefile.vala
@@ -22,7 +22,7 @@
public class Vala.CCodeFile {
- public CCodeFileType cfile_type { get; set; }
+ public CCodeFileType file_type { get; private set; }
public weak SourceFile? file { get; private set; }
@@ -39,11 +39,9 @@ public class Vala.CCodeFile {
CCodeFragment constant_declaration = new CCodeFragment ();
CCodeFragment type_member_definition = new CCodeFragment ();
- public CCodeFile (SourceFile? source_file = null) {
+ public CCodeFile (CCodeFileType type = CCodeFileType.SOURCE, SourceFile? source_file = null) {
file = source_file;
- if (source_file != null) {
- cfile_type = CCodeFileType.SOURCE;
- }
+ file_type = type;
}
public bool add_declaration (string name) {
@@ -154,7 +152,7 @@ public class Vala.CCodeFile {
return false;
}
- if (cfile_type == CCodeFileType.SOURCE) {
+ if (file_type == CCodeFileType.SOURCE) {
writer.line_directives = line_directives;
comments.write (writer);
diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index 087c38dbe..9a9e9e0cc 100644
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -557,10 +557,8 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
gtk_widget_type = (Class) gtk_ns.scope.lookup ("Widget");
}
- header_file = new CCodeFile ();
- header_file.cfile_type = CCodeFileType.PUBLIC_HEADER;
- internal_header_file = new CCodeFile ();
- internal_header_file.cfile_type = CCodeFileType.INTERNAL_HEADER;
+ header_file = new CCodeFile (CCodeFileType.PUBLIC_HEADER);
+ internal_header_file = new CCodeFile (CCodeFileType.INTERNAL_HEADER);
/* we're only interested in non-pkg source files */
var source_files = context.get_source_files ();
@@ -671,7 +669,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 ().header_filename != null
- && (decl_space.cfile_type != CCodeFileType.PUBLIC_HEADER &&
!sym.is_internal_symbol ());
+ && (decl_space.file_type != CCodeFileType.PUBLIC_HEADER &&
!sym.is_internal_symbol ());
if (decl_space.add_declaration (name)) {
return true;
}
@@ -753,7 +751,7 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
}
public override void visit_source_file (SourceFile source_file) {
- cfile = new CCodeFile (source_file);
+ cfile = new CCodeFile (CCodeFileType.SOURCE, source_file);
user_marshal_set = new HashSet<string> (str_hash, str_equal);
diff --git a/codegen/valagtypemodule.vala b/codegen/valagtypemodule.vala
index ca953cf05..4e8c91702 100644
--- a/codegen/valagtypemodule.vala
+++ b/codegen/valagtypemodule.vala
@@ -198,8 +198,8 @@ 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.header_filename == null|| decl_space.cfile_type == CCodeFileType.PUBLIC_HEADER
- || (decl_space.cfile_type == CCodeFileType.INTERNAL_HEADER &&
base_class.is_internal_symbol()))) {
+ && (context.header_filename == null|| decl_space.file_type == CCodeFileType.PUBLIC_HEADER
+ || (decl_space.file_type == CCodeFileType.INTERNAL_HEADER &&
base_class.is_internal_symbol()))) {
string autoptr_cleanup_func;
if (is_reference_counting (base_class)) {
autoptr_cleanup_func = get_ccode_unref_function (base_class);
@@ -426,8 +426,8 @@ 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.header_filename == null || decl_space.cfile_type ==
CCodeFileType.PUBLIC_HEADER
- || (decl_space.cfile_type == CCodeFileType.INTERNAL_HEADER &&
cl.is_internal_symbol()))) {
+ && (context.header_filename == null || decl_space.file_type ==
CCodeFileType.PUBLIC_HEADER
+ || (decl_space.file_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 ());
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]