[vala/staging: 3/22] libvaladoc: Replace SymbolAccessibility with Vala.SymbolAccessibility
- From: Rico Tzschichholz <ricotz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vala/staging: 3/22] libvaladoc: Replace SymbolAccessibility with Vala.SymbolAccessibility
- Date: Sun, 25 Nov 2018 13:08:21 +0000 (UTC)
commit 5b7827b6069cca7be07bad78bca40d93e857d2a0
Author: Rico Tzschichholz <ricotz ubuntu com>
Date: Sun Sep 16 17:06:57 2018 +0200
libvaladoc: Replace SymbolAccessibility with Vala.SymbolAccessibility
libvaladoc/Makefile.am | 1 -
libvaladoc/api/class.vala | 2 +-
libvaladoc/api/constant.vala | 2 +-
libvaladoc/api/delegate.vala | 2 +-
libvaladoc/api/enum.vala | 2 +-
libvaladoc/api/errordomain.vala | 2 +-
libvaladoc/api/field.vala | 2 +-
libvaladoc/api/formalparameter.vala | 2 +-
libvaladoc/api/interface.vala | 2 +-
libvaladoc/api/member.vala | 2 +-
libvaladoc/api/method.vala | 2 +-
libvaladoc/api/namespace.vala | 2 +-
libvaladoc/api/property.vala | 2 +-
libvaladoc/api/propertyaccessor.vala | 2 +-
libvaladoc/api/signal.vala | 2 +-
libvaladoc/api/struct.vala | 2 +-
libvaladoc/api/symbol.vala | 12 +-
libvaladoc/api/symbolaccessibility.vala | 51 ---------
libvaladoc/api/typeparameter.vala | 2 +-
libvaladoc/api/typesymbol.vala | 2 +-
valadoc/tests/drivers/generic-api-test.vala | 168 ++++++++++++++--------------
valadoc/treebuilder.vala | 50 +++------
22 files changed, 122 insertions(+), 194 deletions(-)
---
diff --git a/libvaladoc/Makefile.am b/libvaladoc/Makefile.am
index c35ebfc3e..1e19d0c23 100644
--- a/libvaladoc/Makefile.am
+++ b/libvaladoc/Makefile.am
@@ -53,7 +53,6 @@ libvaladoc_la_VALASOURCES = \
importer/valadocdocumentationimporterscanner.vala \
importer/girdocumentationimporter.vala \
importer/internalidregistrar.vala \
- api/symbolaccessibility.vala \
api/sourcecomment.vala \
api/girsourcecomment.vala \
api/attributeargument.vala \
diff --git a/libvaladoc/api/class.vala b/libvaladoc/api/class.vala
index 47781c959..9b0b8865d 100644
--- a/libvaladoc/api/class.vala
+++ b/libvaladoc/api/class.vala
@@ -45,7 +45,7 @@ public class Valadoc.Api.Class : TypeSymbol {
private string? private_cname;
private string? cname;
- public Class (Node parent, SourceFile file, string name, SymbolAccessibility accessibility,
+ public Class (Node parent, SourceFile file, string name, Vala.SymbolAccessibility accessibility,
SourceComment? comment, string? cname, string? private_cname, string?
class_macro_name,
string? type_macro_name, string? is_type_macro_name, string?
type_cast_macro_name,
string? type_function_name, string? class_type_macro_name, string?
is_class_type_macro_name,
diff --git a/libvaladoc/api/constant.vala b/libvaladoc/api/constant.vala
index d9d3f475d..fde36246f 100644
--- a/libvaladoc/api/constant.vala
+++ b/libvaladoc/api/constant.vala
@@ -37,7 +37,7 @@ public class Valadoc.Api.Constant : Member {
get;
}
- public Constant (Node parent, SourceFile file, string name, SymbolAccessibility accessibility,
+ public Constant (Node parent, SourceFile file, string name, Vala.SymbolAccessibility accessibility,
SourceComment? comment, string? cname, Vala.Constant data)
{
base (parent, file, name, accessibility, comment, data);
diff --git a/libvaladoc/api/delegate.vala b/libvaladoc/api/delegate.vala
index d7afcb17e..28718db84 100644
--- a/libvaladoc/api/delegate.vala
+++ b/libvaladoc/api/delegate.vala
@@ -39,7 +39,7 @@ public class Valadoc.Api.Delegate : TypeSymbol, Callable {
}
- public Delegate (Node parent, SourceFile file, string name, SymbolAccessibility accessibility,
+ public Delegate (Node parent, SourceFile file, string name, Vala.SymbolAccessibility accessibility,
SourceComment? comment, string? cname, bool is_static, Vala.Delegate
data)
{
base (parent, file, name, accessibility, comment, null, null, null, null, false, data);
diff --git a/libvaladoc/api/enum.vala b/libvaladoc/api/enum.vala
index 1af6f0d8d..f78fbb487 100644
--- a/libvaladoc/api/enum.vala
+++ b/libvaladoc/api/enum.vala
@@ -30,7 +30,7 @@ public class Valadoc.Api.Enum : TypeSymbol {
private string cname;
private string? type_id;
- public Enum (Node parent, SourceFile file, string name, SymbolAccessibility accessibility,
+ public Enum (Node parent, SourceFile file, string name, Vala.SymbolAccessibility accessibility,
SourceComment? comment, string? cname, string? type_macro_name,
string? type_function_name, Vala.Enum data)
{
diff --git a/libvaladoc/api/errordomain.vala b/libvaladoc/api/errordomain.vala
index 80b16bb7f..8e4eb480d 100644
--- a/libvaladoc/api/errordomain.vala
+++ b/libvaladoc/api/errordomain.vala
@@ -32,7 +32,7 @@ public class Valadoc.Api.ErrorDomain : TypeSymbol {
private string? dbus_name;
private string? cname;
- public ErrorDomain (Node parent, SourceFile file, string name, SymbolAccessibility accessibility,
+ public ErrorDomain (Node parent, SourceFile file, string name, Vala.SymbolAccessibility accessibility,
SourceComment? comment, string? cname, string?
quark_macro_name,
string? quark_function_name, string? dbus_name,
Vala.ErrorDomain data)
{
diff --git a/libvaladoc/api/field.vala b/libvaladoc/api/field.vala
index baf58a94f..16264fbc7 100644
--- a/libvaladoc/api/field.vala
+++ b/libvaladoc/api/field.vala
@@ -29,7 +29,7 @@ using Valadoc.Content;
public class Valadoc.Api.Field : Member {
private string? cname;
- public Field (Node parent, SourceFile file, string name, SymbolAccessibility accessibility,
+ public Field (Node parent, SourceFile file, string name, Vala.SymbolAccessibility accessibility,
SourceComment? comment, string? cname, bool is_static, bool is_volatile,
Vala.Field data)
{
diff --git a/libvaladoc/api/formalparameter.vala b/libvaladoc/api/formalparameter.vala
index 6b572b211..4c3bd9e24 100644
--- a/libvaladoc/api/formalparameter.vala
+++ b/libvaladoc/api/formalparameter.vala
@@ -58,7 +58,7 @@ public class Valadoc.Api.FormalParameter : Symbol {
private Vala.ParameterDirection type;
- public FormalParameter (Node parent, SourceFile file, string? name, SymbolAccessibility
accessibility, Vala.ParameterDirection type, bool ellipsis, Vala.Parameter data) {
+ public FormalParameter (Node parent, SourceFile file, string? name, Vala.SymbolAccessibility
accessibility, Vala.ParameterDirection type, bool ellipsis, Vala.Parameter data) {
base (parent, file, name, accessibility, data);
assert ((name == null && ellipsis) || (name != null && !ellipsis));
diff --git a/libvaladoc/api/interface.vala b/libvaladoc/api/interface.vala
index 7916649c3..e909d1365 100644
--- a/libvaladoc/api/interface.vala
+++ b/libvaladoc/api/interface.vala
@@ -32,7 +32,7 @@ public class Valadoc.Api.Interface : TypeSymbol {
private string? cname;
private string? type_id;
- public Interface (Node parent, SourceFile file, string name, SymbolAccessibility accessibility,
+ public Interface (Node parent, SourceFile file, string name, Vala.SymbolAccessibility accessibility,
SourceComment? comment, string? cname, string? type_macro_name,
string? is_type_macro_name,
string? type_cast_macro_name, string? type_function_name, string
interface_macro_name,
string? dbus_name, Vala.Interface data)
diff --git a/libvaladoc/api/member.vala b/libvaladoc/api/member.vala
index a812fc0ab..86b276604 100644
--- a/libvaladoc/api/member.vala
+++ b/libvaladoc/api/member.vala
@@ -25,7 +25,7 @@
public abstract class Valadoc.Api.Member : Symbol {
private SourceComment? source_comment;
- public Member (Node parent, SourceFile file, string name, SymbolAccessibility accessibility,
+ public Member (Node parent, SourceFile file, string name, Vala.SymbolAccessibility accessibility,
SourceComment? comment, Vala.Symbol data)
{
base (parent, file, name, accessibility, data);
diff --git a/libvaladoc/api/method.vala b/libvaladoc/api/method.vala
index 9c12c8f16..19d6f6442 100644
--- a/libvaladoc/api/method.vala
+++ b/libvaladoc/api/method.vala
@@ -43,7 +43,7 @@ public class Valadoc.Api.Method : Member, Callable {
}
- public Method (Node parent, SourceFile file, string name, SymbolAccessibility accessibility,
+ public Method (Node parent, SourceFile file, string name, Vala.SymbolAccessibility accessibility,
SourceComment? comment, string? cname, string? dbus_name, string?
dbus_result_name,
string? finish_function_cname, MethodBindingType binding_type, bool
is_yields,
bool is_dbus_visible, bool is_constructor, Vala.Method data)
diff --git a/libvaladoc/api/namespace.vala b/libvaladoc/api/namespace.vala
index c441782ca..b925e37bf 100644
--- a/libvaladoc/api/namespace.vala
+++ b/libvaladoc/api/namespace.vala
@@ -30,7 +30,7 @@ public class Valadoc.Api.Namespace : Symbol {
private SourceComment? source_comment;
public Namespace (Api.Node parent, SourceFile file, string? name, SourceComment? comment,
Vala.Namespace data) {
- base (parent, file, name, SymbolAccessibility.PUBLIC, data);
+ base (parent, file, name, Vala.SymbolAccessibility.PUBLIC, data);
this.source_comment = comment;
}
diff --git a/libvaladoc/api/property.vala b/libvaladoc/api/property.vala
index ad4c76405..9dd03b5da 100644
--- a/libvaladoc/api/property.vala
+++ b/libvaladoc/api/property.vala
@@ -31,7 +31,7 @@ public class Valadoc.Api.Property : Member {
private string? dbus_name;
private string? cname;
- public Property (Node parent, SourceFile file, string name, SymbolAccessibility accessibility,
+ public Property (Node parent, SourceFile file, string name, Vala.SymbolAccessibility accessibility,
SourceComment? comment, string? cname, string? dbus_name, bool
is_dbus_visible,
PropertyBindingType binding_type, Vala.Property data)
{
diff --git a/libvaladoc/api/propertyaccessor.vala b/libvaladoc/api/propertyaccessor.vala
index 59a90bad7..c603fae00 100644
--- a/libvaladoc/api/propertyaccessor.vala
+++ b/libvaladoc/api/propertyaccessor.vala
@@ -31,7 +31,7 @@ public class Valadoc.Api.PropertyAccessor : Symbol {
private Ownership ownership;
private string? cname;
- public PropertyAccessor (Property parent, SourceFile file, string name, SymbolAccessibility
accessibility,
+ public PropertyAccessor (Property parent, SourceFile file, string name, Vala.SymbolAccessibility
accessibility,
string? cname, PropertyAccessorType type, Ownership
ownership, Vala.PropertyAccessor data)
{
base (parent, file, name, accessibility, data);
diff --git a/libvaladoc/api/signal.vala b/libvaladoc/api/signal.vala
index 7da544bbd..e89836fcc 100644
--- a/libvaladoc/api/signal.vala
+++ b/libvaladoc/api/signal.vala
@@ -41,7 +41,7 @@ public class Valadoc.Api.Signal : Member, Callable {
}
- public Signal (Node parent, SourceFile file, string name, SymbolAccessibility accessibility,
+ public Signal (Node parent, SourceFile file, string name, Vala.SymbolAccessibility accessibility,
SourceComment? comment, string? cname, string? default_impl_cname, string?
dbus_name, bool is_dbus_visible,
bool is_virtual, Vala.Signal data)
{
diff --git a/libvaladoc/api/struct.vala b/libvaladoc/api/struct.vala
index a379b191b..a05544a42 100644
--- a/libvaladoc/api/struct.vala
+++ b/libvaladoc/api/struct.vala
@@ -34,7 +34,7 @@ public class Valadoc.Api.Struct : TypeSymbol {
private string? type_id;
private string? cname;
- public Struct (Node parent, SourceFile file, string name, SymbolAccessibility accessibility,
+ public Struct (Node parent, SourceFile file, string name, Vala.SymbolAccessibility accessibility,
SourceComment? comment, string? cname, string? type_macro_name,
string? type_function_name, string? type_id, string? dup_function_cname,
string? copy_function_cname, string? destroy_function_cname,
diff --git a/libvaladoc/api/symbol.vala b/libvaladoc/api/symbol.vala
index 3b375a330..c68270e0f 100644
--- a/libvaladoc/api/symbol.vala
+++ b/libvaladoc/api/symbol.vala
@@ -34,7 +34,7 @@ public abstract class Valadoc.Api.Symbol : Node {
get;
}
- public Symbol (Node parent, SourceFile file, string? name, SymbolAccessibility accessibility,
+ public Symbol (Node parent, SourceFile file, string? name, Vala.SymbolAccessibility accessibility,
Vala.Symbol data)
{
base (parent, file, name, data);
@@ -113,7 +113,7 @@ public abstract class Valadoc.Api.Symbol : Node {
return true;
}
- public SymbolAccessibility accessibility {
+ public Vala.SymbolAccessibility accessibility {
private set;
get;
}
@@ -123,7 +123,7 @@ public abstract class Valadoc.Api.Symbol : Node {
*/
public bool is_public {
get {
- return accessibility == SymbolAccessibility.PUBLIC;
+ return accessibility == Vala.SymbolAccessibility.PUBLIC;
}
}
@@ -132,7 +132,7 @@ public abstract class Valadoc.Api.Symbol : Node {
*/
public bool is_protected {
get {
- return accessibility == SymbolAccessibility.PROTECTED;
+ return accessibility == Vala.SymbolAccessibility.PROTECTED;
}
}
@@ -141,7 +141,7 @@ public abstract class Valadoc.Api.Symbol : Node {
*/
public bool is_internal {
get {
- return accessibility == SymbolAccessibility.INTERNAL;
+ return accessibility == Vala.SymbolAccessibility.INTERNAL;
}
}
@@ -150,7 +150,7 @@ public abstract class Valadoc.Api.Symbol : Node {
*/
public bool is_private {
get {
- return accessibility == SymbolAccessibility.PRIVATE;
+ return accessibility == Vala.SymbolAccessibility.PRIVATE;
}
}
}
diff --git a/libvaladoc/api/typeparameter.vala b/libvaladoc/api/typeparameter.vala
index bbeaa67c6..c2b773e7b 100644
--- a/libvaladoc/api/typeparameter.vala
+++ b/libvaladoc/api/typeparameter.vala
@@ -29,7 +29,7 @@ using Valadoc.Content;
public class Valadoc.Api.TypeParameter : Symbol {
public TypeParameter (Node parent, SourceFile file, string name, Vala.TypeParameter data) {
- base (parent, file, name, SymbolAccessibility.PUBLIC, data);
+ base (parent, file, name, Vala.SymbolAccessibility.PUBLIC, data);
}
/**
diff --git a/libvaladoc/api/typesymbol.vala b/libvaladoc/api/typesymbol.vala
index 17c3501c8..ce377585d 100644
--- a/libvaladoc/api/typesymbol.vala
+++ b/libvaladoc/api/typesymbol.vala
@@ -32,7 +32,7 @@ public abstract class Valadoc.Api.TypeSymbol : Symbol {
private string? type_cast_macro_name;
private string? type_function_name;
- public TypeSymbol (Node parent, SourceFile file, string name, SymbolAccessibility accessibility,
+ public TypeSymbol (Node parent, SourceFile file, string name, Vala.SymbolAccessibility accessibility,
SourceComment? comment, string? type_macro_name, string?
is_type_macro_name,
string? type_cast_macro_name, string? type_function_name, bool
is_basic_type,
Vala.TypeSymbol data)
diff --git a/valadoc/tests/drivers/generic-api-test.vala b/valadoc/tests/drivers/generic-api-test.vala
index 2e36d8faf..789b0e009 100644
--- a/valadoc/tests/drivers/generic-api-test.vala
+++ b/valadoc/tests/drivers/generic-api-test.vala
@@ -36,7 +36,7 @@ public static void test_enum_global (Api.Enum? en, Api.Package pkg, Api.Namespac
assert (en.is_basic_type == false);
// (.Symbol check)
assert (en.is_deprecated == false);
- assert (en.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (en.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (en.get_full_name () == "TestEnumGlobal");
assert (en.get_filename () == "api-test.data.vapi");
@@ -64,7 +64,7 @@ public static void test_enum_global (Api.Enum? en, Api.Package pkg, Api.Namespac
assert (enval.get_cname () == "TEST_ENUM_GLOBAL_ENVAL1");
// (.Symbol check)
assert (enval.is_deprecated == false);
- assert (enval.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (enval.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (enval.get_full_name () == "TestEnumGlobal.ENVAL1");
assert (enval.get_filename () == "api-test.data.vapi");
@@ -81,7 +81,7 @@ public static void test_enum_global (Api.Enum? en, Api.Package pkg, Api.Namespac
assert (enval.get_cname () == "TEST_ENUM_GLOBAL_ENVAL2");
// (.Symbol check)
assert (enval.is_deprecated == false);
- assert (enval.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (enval.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (enval.get_full_name () == "TestEnumGlobal.ENVAL2");
assert (enval.get_filename () == "api-test.data.vapi");
@@ -122,7 +122,7 @@ public static void test_enum_global (Api.Enum? en, Api.Package pkg, Api.Namespac
assert (method.is_inline == false);
// (.Symbol check)
assert (method.is_deprecated == false);
- assert (method.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (method.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (method.get_full_name () == "TestEnumGlobal.method");
assert (method.get_filename () == "api-test.data.vapi");
@@ -153,7 +153,7 @@ public static void test_enum_global (Api.Enum? en, Api.Package pkg, Api.Namespac
assert (method.is_inline == false);
// (.Symbol check)
assert (method.is_deprecated == false);
- assert (method.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (method.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (method.get_full_name () == "TestEnumGlobal.static_method");
assert (method.get_filename () == "api-test.data.vapi");
@@ -197,7 +197,7 @@ public static void test_erroromain_global (Api.ErrorDomain? err, Api.Package pkg
assert (err.is_basic_type == false);
// (.Symbol check)
assert (err.is_deprecated == false);
- assert (err.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (err.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (err.get_full_name () == "TestErrDomGlobal");
assert (err.get_filename () == "api-test.data.vapi");
@@ -223,7 +223,7 @@ public static void test_erroromain_global (Api.ErrorDomain? err, Api.Package pkg
assert (errc.get_cname () == "TEST_ERR_DOM_GLOBAL_ERROR1");
// (.Symbol check)
assert (errc.is_deprecated == false);
- assert (errc.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (errc.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (errc.get_full_name () == "TestErrDomGlobal.ERROR1");
assert (errc.get_filename () == "api-test.data.vapi");
@@ -238,7 +238,7 @@ public static void test_erroromain_global (Api.ErrorDomain? err, Api.Package pkg
assert (errc.get_cname () == "TEST_ERR_DOM_GLOBAL_ERROR2");
// (.Symbol check)
assert (errc.is_deprecated == false);
- assert (errc.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (errc.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (errc.get_full_name () == "TestErrDomGlobal.ERROR2");
assert (errc.get_filename () == "api-test.data.vapi");
@@ -279,7 +279,7 @@ public static void test_erroromain_global (Api.ErrorDomain? err, Api.Package pkg
assert (method.is_inline == false);
// (.Symbol check)
assert (method.is_deprecated == false);
- assert (method.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (method.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (method.get_full_name () == "TestErrDomGlobal.method");
assert (method.get_filename () == "api-test.data.vapi");
@@ -310,7 +310,7 @@ public static void test_erroromain_global (Api.ErrorDomain? err, Api.Package pkg
assert (method.is_inline == false);
// (.Symbol check)
assert (method.is_deprecated == false);
- assert (method.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (method.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (method.get_full_name () == "TestErrDomGlobal.static_method");
assert (method.get_filename () == "api-test.data.vapi");
@@ -364,7 +364,7 @@ public static void test_class_global (Api.Class? cl, Api.Package pkg, Api.Namesp
assert (cl.is_fundamental == true);
// (.Symbol check)
assert (cl.is_deprecated == false);
- assert (cl.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (cl.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
//assert (property.getter.get_full_name () == "TestClassGlobal.property_3");
assert (cl.get_full_name () == "TestClassGlobal");
@@ -395,7 +395,7 @@ public static void test_class_global (Api.Class? cl, Api.Package pkg, Api.Namesp
assert (method.is_inline == false);
// (.Symbol check)
assert (method.is_deprecated == false);
- assert (method.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (method.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (method.get_full_name () == "TestClassGlobal.method");
assert (method.get_filename () == "api-test.data.vapi");
@@ -426,7 +426,7 @@ public static void test_class_global (Api.Class? cl, Api.Package pkg, Api.Namesp
assert (method.is_inline == false);
// (.Symbol check)
assert (method.is_deprecated == false);
- assert (method.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (method.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (method.get_full_name () == "TestClassGlobal.static_method");
assert (method.get_filename () == "api-test.data.vapi");
@@ -461,7 +461,7 @@ public static void test_class_global (Api.Class? cl, Api.Package pkg, Api.Namesp
assert (method.is_inline == false);
// (.Symbol check)
assert (method.is_deprecated == false);
- assert (method.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (method.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (method.get_full_name () == "TestClassGlobal.TestClassGlobal");
assert (method.get_filename () == "api-test.data.vapi");
@@ -487,7 +487,7 @@ public static void test_class_global (Api.Class? cl, Api.Package pkg, Api.Namesp
assert (method.is_inline == false);
// (.Symbol check)
assert (method.is_deprecated == false);
- assert (method.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (method.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (method.get_full_name () == "TestClassGlobal.TestClassGlobal.named");
assert (method.get_filename () == "api-test.data.vapi");
@@ -529,7 +529,7 @@ public static void test_class_global (Api.Class? cl, Api.Package pkg, Api.Namesp
assert (property.base_property == null);
// (.Symbol check)
assert (property.is_deprecated == false);
- assert (property.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (property.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (property.get_full_name () == "TestClassGlobal.property_1");
assert (property.get_filename () == "api-test.data.vapi");
@@ -544,7 +544,7 @@ public static void test_class_global (Api.Class? cl, Api.Package pkg, Api.Namesp
assert (property.getter.is_owned == false);
// (.Symbol check)
assert (property.getter.is_deprecated == false);
- assert (property.getter.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (property.getter.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
//assert (property.getter.get_full_name () == "TestClassGlobal.property_2");
assert (property.getter.get_filename () == "api-test.data.vapi");
@@ -559,7 +559,7 @@ public static void test_class_global (Api.Class? cl, Api.Package pkg, Api.Namesp
assert (property.setter.is_owned == false);
// (.Symbol check)
assert (property.setter.is_deprecated == false);
- assert (property.setter.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (property.setter.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
//assert (property.getter.get_full_name () == "TestClassGlobal.property_2");
assert (property.setter.get_filename () == "api-test.data.vapi");
@@ -581,7 +581,7 @@ public static void test_class_global (Api.Class? cl, Api.Package pkg, Api.Namesp
assert (property.base_property == null);
// (.Symbol check)
assert (property.is_deprecated == false);
- assert (property.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (property.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (property.get_full_name () == "TestClassGlobal.property_2");
assert (property.get_filename () == "api-test.data.vapi");
@@ -595,7 +595,7 @@ public static void test_class_global (Api.Class? cl, Api.Package pkg, Api.Namesp
assert (property.getter.is_owned == false);
// (.Symbol check)
assert (property.getter.is_deprecated == false);
- assert (property.getter.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (property.getter.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
//assert (property.getter.get_full_name () == "TestClassGlobal.property_2");
assert (property.getter.get_filename () == "api-test.data.vapi");
@@ -618,7 +618,7 @@ public static void test_class_global (Api.Class? cl, Api.Package pkg, Api.Namesp
assert (property.base_property == null);
// (.Symbol check)
assert (property.is_deprecated == false);
- assert (property.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (property.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (property.get_full_name () == "TestClassGlobal.property_3");
assert (property.get_filename () == "api-test.data.vapi");
@@ -632,7 +632,7 @@ public static void test_class_global (Api.Class? cl, Api.Package pkg, Api.Namesp
assert (property.getter.is_owned == true);
// (.Symbol check)
assert (property.getter.is_deprecated == false);
- assert (property.getter.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (property.getter.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
//assert (property.getter.get_full_name () == "TestClassGlobal.property_3");
assert (property.getter.get_filename () == "api-test.data.vapi");
@@ -647,7 +647,7 @@ public static void test_class_global (Api.Class? cl, Api.Package pkg, Api.Namesp
assert (property.setter.is_owned == false);
// (.Symbol check)
assert (property.setter.is_deprecated == false);
- assert (property.setter.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (property.setter.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
//assert (property.getter.get_full_name () == "TestClassGlobal.property_3");
assert (property.setter.get_filename () == "api-test.data.vapi");
@@ -679,7 +679,7 @@ public static void test_class_global (Api.Class? cl, Api.Package pkg, Api.Namesp
assert (del.is_static == false);
// (.Symbol check)
assert (del.is_deprecated == false);
- assert (del.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (del.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
//assert (property.getter.get_full_name () == "TestClassGlobal.property_3");
assert (del.get_filename () == "api-test.data.vapi");
@@ -701,7 +701,7 @@ public static void test_class_global (Api.Class? cl, Api.Package pkg, Api.Namesp
//assert (sig.is_static == false);
// (.Symbol check)
assert (sig.is_deprecated == false);
- assert (sig.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (sig.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
//assert (sig.get_full_name () == "TestClassGlobal.property_3");
assert (sig.get_filename () == "api-test.data.vapi");
@@ -719,7 +719,7 @@ public static void test_class_global (Api.Class? cl, Api.Package pkg, Api.Namesp
assert (constant.get_cname () == "TEST_CLASS_GLOBAL_constant");
// (.Symbol check)
assert (constant.is_deprecated == false);
- assert (constant.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (constant.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (constant.get_full_name () == "TestClassGlobal.constant");
assert (constant.get_filename () == "api-test.data.vapi");
@@ -744,7 +744,7 @@ public static void test_class_global (Api.Class? cl, Api.Package pkg, Api.Namesp
assert (field.is_volatile == false);
// (.Symbol check)
assert (field.is_deprecated == false);
- assert (field.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (field.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (field.get_full_name () == "TestClassGlobal.field1");
assert (field.get_filename () == "api-test.data.vapi");
@@ -761,7 +761,7 @@ public static void test_class_global (Api.Class? cl, Api.Package pkg, Api.Namesp
assert (field.is_volatile == false);
// (.Symbol check)
assert (field.is_deprecated == false);
- assert (field.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (field.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (field.get_full_name () == "TestClassGlobal.field2");
assert (field.get_filename () == "api-test.data.vapi");
@@ -789,7 +789,7 @@ public static void test_class_global (Api.Class? cl, Api.Package pkg, Api.Namesp
assert (subcl.base_type == null);
// (.Symbol check)
assert (subcl.is_deprecated == false);
- assert (subcl.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (subcl.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (subcl.get_full_name () == "TestClassGlobal.InnerClass");
assert (subcl.get_filename () == "api-test.data.vapi");
@@ -811,7 +811,7 @@ public static void test_class_global (Api.Class? cl, Api.Package pkg, Api.Namesp
assert (substru.get_type_id () == "TEST_CLASS_GLOBAL_TYPE_INNER_STRUCT");
// (.Symbol check)
assert (substru.is_deprecated == false);
- assert (substru.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (substru.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (substru.get_full_name () == "TestClassGlobal.InnerStruct");
assert (substru.get_filename () == "api-test.data.vapi");
@@ -849,7 +849,7 @@ public static void test_interface_global (Api.Interface? iface, Api.Package pkg,
assert (iface.get_dbus_name () == null);
// (.Symbol check)
assert (iface.is_deprecated == false);
- assert (iface.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (iface.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (iface.get_full_name () == "TestInterfaceGlobal");
assert (iface.get_filename () == "api-test.data.vapi");
@@ -879,7 +879,7 @@ public static void test_interface_global (Api.Interface? iface, Api.Package pkg,
assert (method.is_inline == false);
// (.Symbol check)
assert (method.is_deprecated == false);
- assert (method.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (method.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (method.get_full_name () == "TestInterfaceGlobal.method");
assert (method.get_filename () == "api-test.data.vapi");
@@ -910,7 +910,7 @@ public static void test_interface_global (Api.Interface? iface, Api.Package pkg,
assert (method.is_inline == false);
// (.Symbol check)
assert (method.is_deprecated == false);
- assert (method.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (method.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (method.get_full_name () == "TestInterfaceGlobal.static_method");
assert (method.get_filename () == "api-test.data.vapi");
@@ -941,7 +941,7 @@ public static void test_interface_global (Api.Interface? iface, Api.Package pkg,
assert (property.base_property == null);
// (.Symbol check)
assert (property.is_deprecated == false);
- assert (property.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (property.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (property.get_full_name () == "TestInterfaceGlobal.property_1");
assert (property.get_filename () == "api-test.data.vapi");
@@ -956,7 +956,7 @@ public static void test_interface_global (Api.Interface? iface, Api.Package pkg,
assert (property.getter.is_owned == false);
// (.Symbol check)
assert (property.getter.is_deprecated == false);
- assert (property.getter.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (property.getter.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
//assert (property.getter.get_full_name () == "TestInterfaceGlobal.property_2");
assert (property.getter.get_filename () == "api-test.data.vapi");
@@ -971,7 +971,7 @@ public static void test_interface_global (Api.Interface? iface, Api.Package pkg,
assert (property.setter.is_owned == false);
// (.Symbol check)
assert (property.setter.is_deprecated == false);
- assert (property.setter.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (property.setter.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
//assert (property.getter.get_full_name () == "TestInterfaceGlobal.property_2");
assert (property.setter.get_filename () == "api-test.data.vapi");
@@ -993,7 +993,7 @@ public static void test_interface_global (Api.Interface? iface, Api.Package pkg,
assert (property.base_property == null);
// (.Symbol check)
assert (property.is_deprecated == false);
- assert (property.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (property.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (property.get_full_name () == "TestInterfaceGlobal.property_2");
assert (property.get_filename () == "api-test.data.vapi");
@@ -1007,7 +1007,7 @@ public static void test_interface_global (Api.Interface? iface, Api.Package pkg,
assert (property.getter.is_owned == false);
// (.Symbol check)
assert (property.getter.is_deprecated == false);
- assert (property.getter.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (property.getter.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
//assert (property.getter.get_full_name () == "TestInterfaceGlobal.property_2");
assert (property.getter.get_filename () == "api-test.data.vapi");
@@ -1030,7 +1030,7 @@ public static void test_interface_global (Api.Interface? iface, Api.Package pkg,
assert (property.base_property == null);
// (.Symbol check)
assert (property.is_deprecated == false);
- assert (property.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (property.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (property.get_full_name () == "TestInterfaceGlobal.property_3");
assert (property.get_filename () == "api-test.data.vapi");
@@ -1044,7 +1044,7 @@ public static void test_interface_global (Api.Interface? iface, Api.Package pkg,
assert (property.getter.is_owned == true);
// (.Symbol check)
assert (property.getter.is_deprecated == false);
- assert (property.getter.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (property.getter.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
//assert (property.getter.get_full_name () == "TestInterfaceGlobal.property_3");
assert (property.getter.get_filename () == "api-test.data.vapi");
@@ -1059,7 +1059,7 @@ public static void test_interface_global (Api.Interface? iface, Api.Package pkg,
assert (property.setter.is_owned == false);
// (.Symbol check)
assert (property.setter.is_deprecated == false);
- assert (property.setter.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (property.setter.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
//assert (property.getter.get_full_name () == "TestInterfaceGlobal.property_3");
assert (property.setter.get_filename () == "api-test.data.vapi");
@@ -1092,7 +1092,7 @@ public static void test_interface_global (Api.Interface? iface, Api.Package pkg,
assert (del.is_static == false);
// (.Symbol check)
assert (del.is_deprecated == false);
- assert (del.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (del.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
//assert (del.get_full_name () == "TestClassGlobal.property_3");
assert (del.get_filename () == "api-test.data.vapi");
@@ -1114,7 +1114,7 @@ public static void test_interface_global (Api.Interface? iface, Api.Package pkg,
//assert (sig.is_static == false);
// (.Symbol check)
assert (sig.is_deprecated == false);
- assert (sig.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (sig.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
//assert (sig.get_full_name () == "TestClassGlobal.property_3");
assert (sig.get_filename () == "api-test.data.vapi");
@@ -1132,7 +1132,7 @@ public static void test_interface_global (Api.Interface? iface, Api.Package pkg,
assert (constant.get_cname () == "TEST_INTERFACE_GLOBAL_constant");
// (.Symbol check)
assert (constant.is_deprecated == false);
- assert (constant.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (constant.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (constant.get_full_name () == "TestInterfaceGlobal.constant");
assert (constant.get_filename () == "api-test.data.vapi");
@@ -1172,7 +1172,7 @@ public static void test_struct_global (Api.Struct? stru, Api.Package pkg, Api.Na
assert (stru.get_type_id () == "TYPE_TEST_STRUCT_GLOBAL");
// (.Symbol check)
assert (stru.is_deprecated == false);
- assert (stru.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (stru.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
//assert (property.getter.get_full_name () == "TestClassGlobal.property_3");
assert (stru.get_full_name () == "TestStructGlobal");
@@ -1203,7 +1203,7 @@ public static void test_struct_global (Api.Struct? stru, Api.Package pkg, Api.Na
assert (method.is_inline == false);
// (.Symbol check)
assert (method.is_deprecated == false);
- assert (method.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (method.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (method.get_full_name () == "TestStructGlobal.method");
assert (method.get_filename () == "api-test.data.vapi");
@@ -1234,7 +1234,7 @@ public static void test_struct_global (Api.Struct? stru, Api.Package pkg, Api.Na
assert (method.is_inline == false);
// (.Symbol check)
assert (method.is_deprecated == false);
- assert (method.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (method.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (method.get_full_name () == "TestStructGlobal.static_method");
assert (method.get_filename () == "api-test.data.vapi");
@@ -1269,7 +1269,7 @@ public static void test_struct_global (Api.Struct? stru, Api.Package pkg, Api.Na
assert (method.is_inline == false);
// (.Symbol check)
assert (method.is_deprecated == false);
- assert (method.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (method.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (method.get_full_name () == "TestStructGlobal.TestStructGlobal");
assert (method.get_filename () == "api-test.data.vapi");
@@ -1295,7 +1295,7 @@ public static void test_struct_global (Api.Struct? stru, Api.Package pkg, Api.Na
assert (method.is_inline == false);
// (.Symbol check)
assert (method.is_deprecated == false);
- assert (method.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (method.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (method.get_full_name () == "TestStructGlobal.TestStructGlobal.named");
assert (method.get_filename () == "api-test.data.vapi");
@@ -1324,7 +1324,7 @@ public static void test_struct_global (Api.Struct? stru, Api.Package pkg, Api.Na
assert (constant.get_cname () == "TEST_STRUCT_GLOBAL_constant");
// (.Symbol check)
assert (constant.is_deprecated == false);
- assert (constant.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (constant.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (constant.get_full_name () == "TestStructGlobal.constant");
assert (constant.get_filename () == "api-test.data.vapi");
@@ -1350,7 +1350,7 @@ public static void test_struct_global (Api.Struct? stru, Api.Package pkg, Api.Na
assert (field.is_volatile == false);
// (.Symbol check)
assert (field.is_deprecated == false);
- assert (field.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (field.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (field.get_full_name () == "TestStructGlobal.field1");
assert (field.get_filename () == "api-test.data.vapi");
@@ -1367,7 +1367,7 @@ public static void test_struct_global (Api.Struct? stru, Api.Package pkg, Api.Na
assert (field.is_volatile == false);
// (.Symbol check)
assert (field.is_deprecated == false);
- assert (field.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (field.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (field.get_full_name () == "TestStructGlobal.field2");
assert (field.get_filename () == "api-test.data.vapi");
@@ -1408,7 +1408,7 @@ public static void test_struct_global (Api.Struct? stru, Api.Package pkg, Api.Na
assert (property.base_property == null);
// (.Symbol check)
assert (property.is_deprecated == false);
- assert (property.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (property.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (property.get_full_name () == "TestStructGlobal.property_1");
assert (property.get_filename () == "api-test.data.vapi");
@@ -1423,7 +1423,7 @@ public static void test_struct_global (Api.Struct? stru, Api.Package pkg, Api.Na
assert (property.getter.is_owned == false);
// (.Symbol check)
assert (property.getter.is_deprecated == false);
- assert (property.getter.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (property.getter.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
//assert (property.getter.get_full_name () == "TestInterfaceGlobal.property_2");
assert (property.getter.get_filename () == "api-test.data.vapi");
@@ -1438,7 +1438,7 @@ public static void test_struct_global (Api.Struct? stru, Api.Package pkg, Api.Na
assert (property.setter.is_owned == false);
// (.Symbol check)
assert (property.setter.is_deprecated == false);
- assert (property.setter.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (property.setter.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
//assert (property.getter.get_full_name () == "TestInterfaceGlobal.property_2");
assert (property.setter.get_filename () == "api-test.data.vapi");
@@ -1460,7 +1460,7 @@ public static void test_struct_global (Api.Struct? stru, Api.Package pkg, Api.Na
assert (property.base_property == null);
// (.Symbol check)
assert (property.is_deprecated == false);
- assert (property.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (property.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (property.get_full_name () == "TestStructGlobal.property_2");
assert (property.get_filename () == "api-test.data.vapi");
@@ -1474,7 +1474,7 @@ public static void test_struct_global (Api.Struct? stru, Api.Package pkg, Api.Na
assert (property.getter.is_owned == false);
// (.Symbol check)
assert (property.getter.is_deprecated == false);
- assert (property.getter.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (property.getter.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
//assert (property.getter.get_full_name () == "TestInterfaceGlobal.property_2");
assert (property.getter.get_filename () == "api-test.data.vapi");
@@ -1496,7 +1496,7 @@ public static void test_struct_global (Api.Struct? stru, Api.Package pkg, Api.Na
assert (property.base_property == null);
// (.Symbol check)
assert (property.is_deprecated == false);
- assert (property.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (property.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (property.get_full_name () == "TestStructGlobal.property_3");
assert (property.get_filename () == "api-test.data.vapi");
@@ -1510,7 +1510,7 @@ public static void test_struct_global (Api.Struct? stru, Api.Package pkg, Api.Na
assert (property.getter.is_owned == true);
// (.Symbol check)
assert (property.getter.is_deprecated == false);
- assert (property.getter.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (property.getter.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
//assert (property.getter.get_full_name () == "TestInterfaceGlobal.property_3");
assert (property.getter.get_filename () == "api-test.data.vapi");
@@ -1525,7 +1525,7 @@ public static void test_struct_global (Api.Struct? stru, Api.Package pkg, Api.Na
assert (property.setter.is_owned == false);
// (.Symbol check)
assert (property.setter.is_deprecated == false);
- assert (property.setter.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (property.setter.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
//assert (property.getter.get_full_name () == "TestInterfaceGlobal.property_3");
assert (property.setter.get_filename () == "api-test.data.vapi");
@@ -1637,7 +1637,7 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
assert (param.ellipsis == false);
// (.Symbol check)
assert (param.is_deprecated == false);
- assert (param.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (param.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (param.get_full_name () == "ParamTest.test_function_param_2.a");
assert (param.get_filename () == "api-test.data.vapi");
@@ -1673,7 +1673,7 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
assert (param.ellipsis == false);
// (.Symbol check)
assert (param.is_deprecated == false);
- assert (param.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (param.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (param.get_full_name () == "ParamTest.test_function_param_3.a");
assert (param.get_filename () == "api-test.data.vapi");
@@ -1709,7 +1709,7 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
assert (param.ellipsis == false);
// (.Symbol check)
assert (param.is_deprecated == false);
- assert (param.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (param.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (param.get_full_name () == "ParamTest.test_function_param_4.a");
assert (param.get_filename () == "api-test.data.vapi");
@@ -1745,7 +1745,7 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
assert (param.ellipsis == false);
// (.Symbol check)
assert (param.is_deprecated == false);
- assert (param.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (param.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (param.get_full_name () == "ParamTest.test_function_param_5.o");
assert (param.get_filename () == "api-test.data.vapi");
@@ -1781,7 +1781,7 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
assert (param.ellipsis == false);
// (.Symbol check)
assert (param.is_deprecated == false);
- assert (param.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (param.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (param.get_full_name () == "ParamTest.test_function_param_6.a");
assert (param.get_filename () == "api-test.data.vapi");
@@ -1817,7 +1817,7 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
assert (param.ellipsis == true);
// (.Symbol check)
assert (param.is_deprecated == false);
- assert (param.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (param.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (param.get_full_name () == null);
assert (param.get_filename () == "api-test.data.vapi");
@@ -1844,7 +1844,7 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
assert (param.ellipsis == false);
// (.Symbol check)
assert (param.is_deprecated == false);
- assert (param.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (param.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (param.get_full_name () == "ParamTest.test_function_param_8.a");
assert (param.get_filename () == "api-test.data.vapi");
@@ -1880,7 +1880,7 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
assert (param.ellipsis == false);
// (.Symbol check)
assert (param.is_deprecated == false);
- assert (param.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (param.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (param.get_full_name () == "ParamTest.test_function_param_9.a");
assert (param.get_filename () == "api-test.data.vapi");
@@ -1912,7 +1912,7 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
assert (param.ellipsis == false);
// (.Symbol check)
assert (param.is_deprecated == false);
- assert (param.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (param.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (param.get_full_name () == "ParamTest.test_function_param_9.b");
assert (param.get_filename () == "api-test.data.vapi");
@@ -1944,7 +1944,7 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
assert (param.ellipsis == false);
// (.Symbol check)
assert (param.is_deprecated == false);
- assert (param.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (param.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (param.get_full_name () == "ParamTest.test_function_param_9.c");
assert (param.get_filename () == "api-test.data.vapi");
@@ -1976,7 +1976,7 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
assert (param.ellipsis == false);
// (.Symbol check)
assert (param.is_deprecated == false);
- assert (param.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (param.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (param.get_full_name () == "ParamTest.test_function_param_9.d");
assert (param.get_filename () == "api-test.data.vapi");
@@ -2008,7 +2008,7 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
assert (param.ellipsis == false);
// (.Symbol check)
assert (param.is_deprecated == false);
- assert (param.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (param.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (param.get_full_name () == "ParamTest.test_function_param_9.e");
assert (param.get_filename () == "api-test.data.vapi");
@@ -2040,7 +2040,7 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
assert (param.ellipsis == false);
// (.Symbol check)
assert (param.is_deprecated == false);
- assert (param.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (param.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (param.get_full_name () == "ParamTest.test_function_param_9.f");
assert (param.get_filename () == "api-test.data.vapi");
@@ -2072,7 +2072,7 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
assert (param.ellipsis == true);
// (.Symbol check)
assert (param.is_deprecated == false);
- assert (param.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (param.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (param.get_full_name () == null);
assert (param.get_filename () == "api-test.data.vapi");
@@ -2099,7 +2099,7 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
assert (param.ellipsis == false);
// (.Symbol check)
assert (param.is_deprecated == false);
- assert (param.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (param.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (param.get_full_name () == "ParamTest.test_function_param_10.a");
assert (param.get_filename () == "api-test.data.vapi");
@@ -2137,7 +2137,7 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
assert (param.ellipsis == false);
// (.Symbol check)
assert (param.is_deprecated == false);
- assert (param.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (param.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (param.get_full_name () == "ParamTest.test_function_param_11.a");
assert (param.get_filename () == "api-test.data.vapi");
@@ -2176,7 +2176,7 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
assert (param.ellipsis == false);
// (.Symbol check)
assert (param.is_deprecated == false);
- assert (param.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (param.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (param.get_full_name () == "ParamTest.test_function_param_12.a");
assert (param.get_filename () == "api-test.data.vapi");
@@ -2215,7 +2215,7 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
assert (param.ellipsis == false);
// (.Symbol check)
assert (param.is_deprecated == false);
- assert (param.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (param.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (param.get_full_name () == "ParamTest.test_function_param_13.a");
assert (param.get_filename () == "api-test.data.vapi");
@@ -2254,7 +2254,7 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
assert (param.ellipsis == false);
// (.Symbol check)
assert (param.is_deprecated == false);
- assert (param.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (param.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (param.get_full_name () == "ParamTest.test_function_param_14.a");
assert (param.get_filename () == "api-test.data.vapi");
@@ -2683,7 +2683,7 @@ public static void test_global_ns (Api.Namespace global_ns, Api.Package pkg) {
assert (method.is_inline == false);
// (.Symbol check)
assert (method.is_deprecated == false);
- assert (method.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (method.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (method.get_full_name () == "test_function_global");
assert (method.get_filename () == "api-test.data.vapi");
@@ -2705,7 +2705,7 @@ public static void test_global_ns (Api.Namespace global_ns, Api.Package pkg) {
assert (del.is_basic_type == false);
// (.Symbol check)
assert (del.is_deprecated == false);
- assert (del.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (del.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (del.get_full_name () == "test_delegate_global");
assert (del.get_filename () == "api-test.data.vapi");
@@ -2726,7 +2726,7 @@ public static void test_global_ns (Api.Namespace global_ns, Api.Package pkg) {
assert (field.is_volatile == false);
// (.Symbol check)
assert (field.is_deprecated == false);
- assert (field.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (field.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (field.get_full_name () == "test_field_global");
assert (field.get_filename () == "api-test.data.vapi");
@@ -2745,7 +2745,7 @@ public static void test_global_ns (Api.Namespace global_ns, Api.Package pkg) {
assert (constant.get_cname () == "test_const_global");
// (.Symbol check)
assert (constant.is_deprecated == false);
- assert (constant.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (constant.accessibility == Vala.SymbolAccessibility.PUBLIC);
// (.Node)
assert (constant.get_full_name () == "test_const_global");
assert (constant.get_filename () == "api-test.data.vapi");
@@ -2853,7 +2853,7 @@ public static void test_package_out (Api.Package pkg) {
assert (global_ns.get_full_name () == null);
assert (global_ns.is_deprecated == false);
assert (global_ns.get_attributes ().size == 0);
- assert (global_ns.accessibility == Api.SymbolAccessibility.PUBLIC);
+ assert (global_ns.accessibility == Vala.SymbolAccessibility.PUBLIC);
assert (global_ns.package == pkg);
//assert (global_ns.nspace == null);
diff --git a/valadoc/treebuilder.vala b/valadoc/treebuilder.vala
index 003a61027..5c26ab920 100644
--- a/valadoc/treebuilder.vala
+++ b/valadoc/treebuilder.vala
@@ -575,26 +575,6 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
return MethodBindingType.UNMODIFIED;
}
-
- private SymbolAccessibility get_access_modifier(Vala.Symbol symbol) {
- switch (symbol.access) {
- case Vala.SymbolAccessibility.PROTECTED:
- return SymbolAccessibility.PROTECTED;
-
- case Vala.SymbolAccessibility.INTERNAL:
- return SymbolAccessibility.INTERNAL;
-
- case Vala.SymbolAccessibility.PRIVATE:
- return SymbolAccessibility.PRIVATE;
-
- case Vala.SymbolAccessibility.PUBLIC:
- return SymbolAccessibility.PUBLIC;
-
- default:
- error ("Unknown symbol accessibility modifier found");
- }
- }
-
private PropertyAccessorType get_property_accessor_type (Vala.PropertyAccessor element) {
if (element.construction) {
if (element.writable) {
@@ -980,7 +960,7 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
Class node = new Class (parent,
file,
element.name,
- get_access_modifier (element),
+ element.access,
comment,
get_cname (element),
get_private_cname (element),
@@ -1039,7 +1019,7 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
Interface node = new Interface (parent,
file,
element.name,
- get_access_modifier (element),
+ element.access,
comment,
get_cname (element),
get_type_macro_name (element),
@@ -1082,7 +1062,7 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
Struct node = new Struct (parent,
file,
element.name,
- get_access_modifier (element),
+ element.access,
comment,
get_cname (element),
get_type_macro_name (element),
@@ -1118,7 +1098,7 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
Field node = new Field (parent,
file,
element.name,
- get_access_modifier (element),
+ element.access,
comment,
get_cname (element),
element.binding == Vala.MemberBinding.STATIC,
@@ -1143,7 +1123,7 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
Property node = new Property (parent,
file,
element.name,
- get_access_modifier (element),
+ element.access,
comment,
element.nick,
Vala.GDBusModule.get_dbus_name_for_member (element),
@@ -1160,7 +1140,7 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
node.getter = new PropertyAccessor (node,
file,
element.name,
-
get_access_modifier (accessor),
+
accessor.access,
get_cname
(accessor),
get_property_accessor_type (accessor),
get_property_ownership (accessor),
@@ -1172,7 +1152,7 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
node.setter = new PropertyAccessor (node,
file,
element.name,
-
get_access_modifier (accessor),
+
accessor.access,
get_cname
(accessor),
get_property_accessor_type (accessor),
get_property_ownership (accessor),
@@ -1194,7 +1174,7 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
Method node = new Method (parent,
file,
get_method_name (element),
- get_access_modifier (element),
+ element.access,
comment,
get_cname (element),
Vala.GDBusModule.get_dbus_name_for_member
(element),
@@ -1224,7 +1204,7 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
Method node = new Method (parent,
file,
get_method_name (element),
- get_access_modifier (element),
+ element.access,
comment,
get_cname (element),
Vala.GDBusModule.get_dbus_name_for_member
(element),
@@ -1254,7 +1234,7 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
Api.Signal node = new Api.Signal (parent,
file,
element.name,
- get_access_modifier
(element),
+ element.access,
comment,
get_cname (element),
(element.default_handler !=
null)? get_cname (element.default_handler) : null,
@@ -1281,7 +1261,7 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
Delegate node = new Delegate (parent,
file,
element.name,
- get_access_modifier (element),
+ element.access,
comment,
get_cname (element),
!element.has_target,
@@ -1305,7 +1285,7 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
Symbol node = new Enum (parent,
file,
element.name,
- get_access_modifier (element),
+ element.access,
comment,
get_cname (element),
get_type_macro_name (element),
@@ -1350,7 +1330,7 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
Constant node = new Constant (parent,
file,
element.name,
- get_access_modifier (element),
+ element.access,
comment,
get_cname (element),
element);
@@ -1373,7 +1353,7 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
Symbol node = new ErrorDomain (parent,
file,
element.name,
- get_access_modifier (element),
+ element.access,
comment,
get_cname (element),
get_quark_macro_name (element),
@@ -1440,7 +1420,7 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
FormalParameter node = new FormalParameter (parent,
file,
element.name,
-
get_access_modifier(element),
+
element.access,
element.direction,
element.ellipsis,
element);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
