src/Palete/VapiParser.vala

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

diff --git a/src/Palete/VapiParser.vala b/src/Palete/VapiParser.vala
index 55f1fae..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>();
                        }
                }
                
@@ -25,17 +25,25 @@ namespace Palete {
                
                public override void visit_namespace (Vala.Namespace element) 
                {
+                       if (element == null) {
+                               
+                               return;
+                       }
                        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);
-                       cache.set(element.name, g);
+                       GirObject.cache.set(element.name, g);
                        
                        
                        foreach(var c in element.get_classes()) {
                                this.add_class(g, c);
                        }
                        
-                        
+                       element.accept_children(this); // catch sub namespaces..
                        
                        
                }
@@ -46,14 +54,16 @@ namespace Palete {
                        var c = new GirObject("Class", parent.name + "." + cls.name);
                        parent.classes.set(cls.name, c);
                        c.ns = parent.name;
-                       c.parent = 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()) {
                                this.add_property(c, p);
                        }
                        // methods...
-                       
+                       foreach(var p in cls.get_signals()) {
+                               this.add_signal(c, p);
+                       }
                         
                }
                public void add_property(GirObject parent, Vala.Property prop)
@@ -62,11 +72,51 @@ namespace Palete {
                        c.gparent = parent;
                        c.ns = parent.ns;
                        c.propertyof = parent.name;
-                       c.type  = prop.property_type.data_type.get_full_name();
+                       c.type  = prop.property_type.data_type == null ? "" : prop.property_type.data_type.get_full_name();
                        parent.props.set(prop.name,c);
                        
                }
-                         
+               public void add_signal(GirObject parent, Vala.Signal sig)
+               {
+                       var c = new GirObject("Signal",sig.name);
+                       c.gparent = parent;
+                       c.ns = parent.ns;
+                       
+                       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( )
                {