sync

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

diff --git a/src/Palete/VapiParser.vala b/src/Palete/VapiParser.vala
index aa9ffee..b336e98 100644 (file)
--- a/src/Palete/VapiParser.vala
+++ b/src/Palete/VapiParser.vala
@@ -27,7 +27,7 @@ namespace Palete {
                                
                                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;
@@ -77,13 +77,13 @@ namespace Palete {
                         
                }
                
-               public void add_class(GirObject parent, Vala.Interface cls)
+               public void add_interface(GirObject parent, Vala.Interface cls)
                {
                
-                       var c = new GirObject("Class", parent.name + "." + cls.name);
+                       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.parent = cls.base_class == null ? "" : cls.base_class.get_full_name() ;  // extends...
                        c.gparent = parent;
                        
                        foreach(var p in cls.get_properties()) {
@@ -105,14 +105,14 @@ namespace Palete {
                                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());
-                               }
-                       }
+                       //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());
+                       //      }
+                       //}
                          
                        
                        
@@ -204,12 +204,16 @@ namespace Palete {
                
                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;
@@ -240,7 +244,7 @@ namespace Palete {
                        
                        
                        foreach(var p in params) {
-                               if (p.name == null) {
+                               if (p.name == null && !p.ellipsis) {
                                        continue;
                                }
                                this.add_param(cc, p);
@@ -250,12 +254,20 @@ namespace Palete {
                
                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); 
                        
                }
                
@@ -372,16 +384,14 @@ namespace Palete {
         
        }
 }
-/*
+ /*
 int main (string[] args) {
        
-       var g = Palete.Gir.factory("Gdk");
+       var g = Palete.Gir.factoryFqn("Gtk.SourceView");
        print("%s\n", g.asJSONString());
        
        return 0;
 }
-* */
  
- 
-
 
+*/