-// valac VapiParser.vala --pkg libvala-0.24 --pkg posix -o /tmp/treebuilder
+ // valac -g --pkg libvala-0.26 --pkg gee-1.0 --pkg json-glib-1.0 --pkg gtk+-3.0 VapiParser.vala Gir.vala GirObject.vala -o /tmp/vdoc
namespace Palete {
public class VapiParser : Vala.CodeVisitor {
-
-
-
-
- Vala.CodeContext context;
- public VapiParser() {
+ Vala.CodeContext context;
+
+ public VapiParser() {
base();
+ // should not really happen..
if (Gir.cache == null) {
Gir.cache = new Gee.HashMap<string,Gir>();
}
return;
}
- print("parsing namespace %s\n", element.name);
+ //print("parsing namespace %s\n", element.name);
if (element.name == null) {
element.accept_children(this); // catch sub namespaces..
return;
}
- var g = new Gir.new_empty(element.name);
+ var g = new Gir(element.name);
Gir.cache.set(element.name, g);
foreach(var c in element.get_enums()) {
this.add_enum(g, c);
}
-
+ foreach(var c in element.get_interfaces()) {
+ this.add_interface(g, c);
+ }
element.accept_children(this); // catch sub namespaces..
var c = new GirObject("Enum", cls.name);
parent.consts.set(cls.name, c);
c.ns = parent.name;
+
c.gparent = parent;
foreach(var e in cls.get_values()) {
var em = new GirObject("EnumMember",e.name);
em.gparent = c;
em.ns = c.ns;
- em.type = e.type_reference && e.type_reference.data_type == null ? "" : e.type_reference.data_type.get_full_name();
+ em.type = e.type_reference == null || e.type_reference.data_type == null ? "" : e.type_reference.data_type.get_full_name();
// unlikely to get value..
//c.value = element->get_prop("value");
c.consts.set(e.name,em);
}
+ public void add_interface(GirObject parent, Vala.Interface cls)
+ {
+
+ var c = new GirObject("Interface", parent.name + "." + cls.name);
+ parent.classes.set(cls.name, c);
+ c.ns = parent.name;
+ //c.parent = cls.base_class == null ? "" : cls.base_class.get_full_name() ; // extends...
+ c.gparent = parent;
+
+ foreach(var p in cls.get_properties()) {
+ this.add_property(c, p);
+ }
+ // methods...
+ foreach(var p in cls.get_signals()) {
+ this.add_signal(c, p);
+ }
+
+ foreach(var p in cls.get_methods()) {
+ // skip static methods..
+ if (p.binding != Vala.MemberBinding.INSTANCE &&
+ !(p is Vala.CreationMethod)
+ ) {
+ continue;
+ }
+
+ this.add_method(c, p);
+ }
+
+ //if (cls.base_class != null) {
+ // c.inherits.add(cls.base_class.get_full_name());
+ //}
+ //foreach(var p in cls.get_base_types()) {
+ // if (p.data_type != null) {
+ // c.implements.add(p.data_type.get_full_name());
+ // }
+ //}
+
+
+
+
+ }
public void add_class(GirObject parent, Vala.Class cls)
{
public void add_method(GirObject parent, Vala.Method met)
{
- var n = met.name == null ? parent.name : "";
+ var n = met.name == null ? "" : met.name;
var ty = "Method";
- if (met is Vala.CreationMethod && n == "") {
- n = ".new";
+ if (met is Vala.CreationMethod) {
ty = "Ctor";
+ if(n == "" || n == ".new") {
+ n = "new";
+ }
+
}
+ //print("add_method : %s\n", n);
var c = new GirObject(ty,n);
c.gparent = parent;
foreach(var p in params) {
- if (p.name == null) {
+ if (p.name == null && !p.ellipsis) {
continue;
}
this.add_param(cc, p);
public void add_param(GirObject parent, Vala.Parameter pam)
{
- var c = new GirObject("Param",pam.name);
+
+ var n = pam.name;
+ if (pam.ellipsis) {
+ n = "___";
+ }
+ var c = new GirObject("Param",n);
c.gparent = parent;
c.ns = parent.ns;
parent.params.add(c);
- c.type = pam.variable_type.data_type == null ? "" : pam.variable_type.data_type.get_full_name();
- // this.checkParamOverride(c); - this is an old kludge for Gir files..
+
+ if (!pam.ellipsis) {
+ c.type = pam.variable_type.data_type == null ? "" : pam.variable_type.data_type.get_full_name();
+ }
+ Gir.checkParamOverride(c);
}
var ns_ref = new Vala.UsingDirective (new Vala.UnresolvedSymbol (null, "GLib", null));
context.root.add_using_directive (ns_ref);
-
- // default.. packages..
+
context.add_external_package ("glib-2.0");
context.add_external_package ("gobject-2.0");
- context.add_external_package ("gdk-3.0");
- context.add_external_package ("atk");
- context.add_external_package ("gdk-x11-3.0");
- context.add_external_package ("x11");
-
- // user defined ones..
- //context.add_package ("Gtk");
-
- var vfile = new Vala.SourceFile (context, Vala.SourceFileType.PACKAGE, "/usr/share/vala-0.26/vapi/gtk+-3.0.vapi");
- context.add_source_file (vfile);
-
- //context.add_external_package ("libvala-0.24");
-
-
+ // core packages we are interested in for the builder..
+ // some of these may fail... - we probalby need a better way to handle this..
+
+ context.add_external_package ("gtk+-3.0");
+ if (!context.add_external_package ("webkit2gtk-4.0")) {
+ context.add_external_package ("webkit2gtk-3.0");
+ }
+ context.add_external_package ("clutter-gtk-1.0");
+ context.add_external_package ("gdl-3.0");
+ context.add_external_package ("gtksourceview-3.0");
+ context.add_external_package ("vte-2.90"); //??? -- hopefullly that works..
//add_documented_files (context, settings.source_files);
Vala.Parser parser = new Vala.Parser ();
// dump the tree for Gtk?
- print("%s\n", Gir.cache.get("Gtk").asJSONString());
+
print("ALL OK?\n");
}
}
}
-
+ /*
int main (string[] args) {
-
- var a = new Palete.VapiParser( );
- a.create_valac_tree();
+
+ var g = Palete.Gir.factoryFqn("Gtk.SourceView");
+ print("%s\n", g.asJSONString());
+
return 0;
}
-
+*/
projects / app.Builder.js / blobdiff