src/Palete/VapiParser.vala

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

diff --git a/src/Palete/VapiParser.vala b/src/Palete/VapiParser.vala
index 0e4df17..fbee5d8 100644 (file)
--- a/src/Palete/VapiParser.vala
+++ b/src/Palete/VapiParser.vala
@@ -9,15 +9,15 @@ namespace Palete {
 
        public class VapiParser : Vala.CodeVisitor {
                
-               static  Gee.HashMap<string,Gir> cache = null;
+               
                
                
                
                Vala.CodeContext context;
                public VapiParser() {
                        base();
-                       if (cache == null) {
-                               cache =  new Gee.HashMap<string,Gir>();
+                       if (GirObject.cache == null) {
+                               GirObject.cache =  new Gee.HashMap<string,Gir>();
                        }
                }
                
@@ -36,7 +36,7 @@ namespace Palete {
                        }
                        
                        var g = new Gir.new_empty(element.name);
-                       cache.set(element.name, g);
+                       GirObject.cache.set(element.name, g);
                        
                        
                        foreach(var c in element.get_classes()) {
@@ -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);
                        }
                         
@@ -81,14 +81,22 @@ namespace Palete {
                        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",n);
+                       var cc = new GirObject("Paramset",sig.name); // what's the name on this?
                        cc.gparent = c;
                        cc.ns = c.ns;
                        c.paramset = cc;
@@ -105,9 +113,9 @@ namespace Palete {
                        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..
                        
-                       this.checkParamOverride(c);   
-                       break;
                }
                
                public void create_valac_tree( )