src/Palete/VapiParser.vala

[app.Builder.js] / src / Palete / VapiParser.vala

diff --git a/src/Palete/VapiParser.vala b/src/Palete/VapiParser.vala
index 67adccf..ca7dda4 100644 (file)
--- a/src/Palete/VapiParser.vala
+++ b/src/Palete/VapiParser.vala
@@ -42,12 +42,41 @@ namespace Palete {
                        foreach(var c in element.get_classes()) {
                                this.add_class(g, c);
                        }
+                       foreach(var c in element.get_enums()) {
+                               this.add_enum(g, c);
+                       }
+                       
                        
                        element.accept_children(this); // catch sub namespaces..
                        
                        
                }
                
+               
+               public void add_enum(GirObject parent, Vala.Enum cls)
+               {
+               
+                       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 == 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_class(GirObject parent, Vala.Class cls)
                {
                
@@ -66,6 +95,13 @@ namespace Palete {
                        }
                        
                        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);
                        }
                        
@@ -77,6 +113,8 @@ namespace Palete {
                                        c.implements.add(p.data_type.get_full_name());
                                }
                        }
+                         
+                       
                        
                         
                }
@@ -124,11 +162,14 @@ namespace Palete {
                
                public void add_method(GirObject parent, Vala.Method met)
                {
-                       if (met.name == null) { // ?? why?
-                               return;
+                       var n = met.name == null ? parent.name : "";
+                       var ty  = "Method";
+                       if (met is Vala.CreationMethod && n == "") {
+                               n = ".new";
+                               ty = "Ctor";
                        }
                        
-                       var c = new GirObject("Method",met.name);
+                       var c = new GirObject(ty,n);
                        c.gparent = parent;
                        c.ns = parent.ns;
                        
@@ -140,7 +181,11 @@ namespace Palete {
                                cc.type  =  met.return_type.data_type.get_full_name();
                                c.return_value = cc;
                        }
-                       parent.methods.set(met.name,c);
+                       if (met is Vala.CreationMethod) {
+                               parent.ctors.set(c.name,c);
+                       } else {
+                               parent.methods.set(met.name,c);
+                       }
                        
                        var params =  met.get_parameters() ;
                        if (params.size < 1) {