src/Palete/VapiParser.vala
[app.Builder.js] / src / Palete / VapiParser.vala
index 39a1931..1eb57b5 100644 (file)
@@ -61,7 +61,7 @@ namespace Palete {
                                this.add_property(c, p);
                        }
                        // methods...
-                       foreach(var p in cls.get_signal()) {
+                       foreach(var p in cls.get_signals()) {
                                this.add_signal(c, p);
                        }
                         
@@ -76,16 +76,47 @@ namespace Palete {
                        parent.props.set(prop.name,c);
                        
                }
-               public void add_signal(GirObject parent, Vala.Property sig)
+               public void add_signal(GirObject parent, Vala.Signal sig)
                {
                        var c = new GirObject("Signal",sig.name);
                        c.gparent = parent;
                        c.ns = parent.ns;
-                       c.type  = sig.return_type.data_type == null ? "" : sig.return_type.data_type.get_full_name();
                        
+                       if (sig.return_type.data_type != null) {
+                               print("creating return type on signal %s\n", sig.name);
+                               var cc = new GirObject("Return", "return-value");
+                               cc.gparent = c;
+                               cc.ns = c.ns;
+                               cc.type  =  sig.return_type.data_type.get_full_name();
+                               c.return_value = cc;
+                       }
                        parent.signals.set(sig.name,c);
                        
-               }         
+                       var params =  sig.get_parameters() ;
+                       if (params.size < 1) {
+                               return;
+                       }
+                       var cc = new GirObject("Paramset",sig.name); // what's the name on this?
+                       cc.gparent = c;
+                       cc.ns = c.ns;
+                       c.paramset = cc;
+                       
+                       
+                       foreach(var p in sig.get_parameters()) {
+                               this.add_param(cc, p);
+                       }
+                       
+               }       
+               public void add_param(GirObject parent, Vala.Parameter pam)
+               {
+                       var c = new GirObject("Param",pam.name);
+                       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..
+                       
+               }
                
                public void create_valac_tree( )
                {