src/Palete/VapiParser.vala
[app.Builder.js] / src / Palete / VapiParser.vala
index 3f88df6..1eb57b5 100644 (file)
 
 namespace Palete {
         
-       private class PackageMetaData {
-               public Package package;
-               public Gee.HashMap<Vala.Namespace, Valadoc.Api.Namespace> namespaces = new HashMap<Vala.Namespace, Valadoc.Api.Namespace> ();
-               public ArrayList<Vala.SourceFile> files = new ArrayList<Vala.SourceFile> ();
+        
+        
 
-               public PackageMetaData ( Valadoc.Api.Package  package) {
-                       this.package = package;
+       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>();
+                       }
                }
-
-               public Namespace get_namespace (Vala.Namespace vns, SourceFile file) {
-                       Namespace? ns = namespaces.get (vns);
-                       if (ns != null) {
-                               return ns;
+               
+               
+               
+               public override void visit_namespace (Vala.Namespace element) 
+               {
+                       if (element == null) {
+                               
+                               return;
                        }
-
-                       // find documentation comment if existing:
-                       /*
-                       SourceComment? comment = null;
-                       if (vns.source_reference != null) {
-                               foreach (Vala.Comment c in vns.get_comments()) {
-                                       if (c.source_reference.file == file.data ||
-                                               (c.source_reference.file.file_type == Vala.SourceFileType.SOURCE
-                                                && ((Vala.SourceFile) file.data).file_type == Vala.SourceFileType.SOURCE)
-                                       ) {
-                                               Vala.SourceReference pos = c.source_reference;
-                                               if (c is Vala.GirComment) {
-                                                       comment = new GirSourceComment (c.content,
-                                                                                                                       file,
-                                                                                                                       pos.begin.line,
-                                                                                                                       pos.begin.column,
-                                                                                                                       pos.end.line,
-                                                                                                                       pos.end.column);
-                                               } else {
-                                                       comment = new SourceComment (c.content,
-                                                                                                                file,
-                                                                                                                pos.begin.line,
-                                                                                                                pos.begin.column,
-                                                                                                                pos.end.line,
-                                                                                                                pos.end.column);
-                                               }
-                                               break;
-                                       }
-                               }
+                       print("parsing namespace %s\n", element.name);
+                       if (element.name == null) {
+                               element.accept_children(this); // catch sub namespaces..
+                               return;
                        }
-                       * */
-
-                       // find parent if existing
-                       var parent_vns = vns.parent_symbol;
-
-                       if (parent_vns == null) {
-                               ns = new Namespace (package, file, vns.name, comment, vns);
-                               package.add_child (ns);
-                       } else {
-                               Namespace parent_ns = get_namespace ((Vala.Namespace) parent_vns, file);
-                               ns = new Namespace (parent_ns, file, vns.name, comment, vns);
-                               parent_ns.add_child (ns);
+                       
+                       var g = new Gir.new_empty(element.name);
+                       cache.set(element.name, g);
+                       
+                       
+                       foreach(var c in element.get_classes()) {
+                               this.add_class(g, c);
                        }
-
-                       namespaces.set (vns, ns);
-                       return ns;
-               }
-
-               public void register_source_file (Vala.SourceFile file) {
-                       files.add (file);
+                       
+                       element.accept_children(this); // catch sub namespaces..
+                       
+                       
                }
-
-               public bool is_package_for_file (Vala.SourceFile source_file) {
-                       if (source_file.file_type == Vala.SourceFileType.SOURCE && !package.is_package) {
-                               return true;
+               
+               public void add_class(GirObject parent, Vala.Class cls)
+               {
+               
+                       var c = new GirObject("Class", 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.gparent = parent;
+                       
+                       foreach(var p in cls.get_properties()) {
+                               this.add_property(c, p);
                        }
-
-                       return files.contains (source_file);
+                       // methods...
+                       foreach(var p in cls.get_signals()) {
+                               this.add_signal(c, p);
+                       }
+                        
                }
-       }
-
-        
-
-       public class VapiParser : Vala.CodeVisitor {
-               private ArrayList<PackageMetaData> packages = new ArrayList<PackageMetaData> ();
-               Vala.CodeContext context;
-               public VapiParser() {
-                       base();
+               public void add_property(GirObject parent, Vala.Property prop)
+               {
+                       var c = new GirObject("Prop",prop.name);
+                       c.gparent = parent;
+                       c.ns = parent.ns;
+                       c.propertyof = parent.name;
+                       c.type  = prop.property_type.data_type == null ? "" : prop.property_type.data_type.get_full_name();
+                       parent.props.set(prop.name,c);
                        
                }
-               private PackageMetaData register_package (Package package) {
-                       PackageMetaData meta_data = new PackageMetaData (package);
-                       tree.add_package (package);
-                       packages.add (meta_data);
-                       return meta_data;
+               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 checkPackage(string name)
+               public void create_valac_tree( )
                {
                        // init context:
                        context = new Vala.CodeContext ();
@@ -125,10 +147,7 @@ namespace Palete {
                        
                        
                        //vapidirs +=  Path.get_dirname (context.get_vapi_path("glib-2.0")) ;
-                       
-                       //for(var i =0 ; i < vapidirs.length; i++) {
-                       //      valac += " --vapidir=" + vapidirs[i];
-                       //}
+                        
                                
                        
                        // or context.get_vapi_path("glib-2.0"); // should return path..
@@ -158,14 +177,17 @@ namespace Palete {
                        // default.. packages..
                        context.add_external_package ("glib-2.0"); 
                        context.add_external_package ("gobject-2.0");
+                       context.add_external_package ("gdk-3.0");
+                       context.add_external_package ("atk");
+                       context.add_external_package ("gdk-x11-3.0");
+                       context.add_external_package ("x11");
+                       
                        // user defined ones..
-                       context.add_package ("Gtk");
+                       //context.add_package ("Gtk");
                  
                        var vfile = new Vala.SourceFile (context, Vala.SourceFileType.PACKAGE, "/usr/share/vala-0.26/vapi/gtk+-3.0.vapi");
                        context.add_source_file (vfile);
-                       Package vdpkg = new Package (pkg, true, null);
-                       register_source_file (register_package (vdpkg), vfile);
-                       
+                        
                        //context.add_external_package ("libvala-0.24");
                        
                         
@@ -198,7 +220,12 @@ namespace Palete {
                         
                        Vala.CodeContext.pop ();
                         
-                       print("%s\n", valac);
+                       context.accept(this);
+                       
+                       // dump the tree for Gtk?
+                       
+                       
+                       print("%s\n", cache.get("Gtk").asJSONString());
                        print("ALL OK?\n");
                 
                }
@@ -211,10 +238,10 @@ namespace Palete {
  
 int main (string[] args) {
 
-       var a = new VapiParser(file);
+       var a = new Palete.VapiParser( );
        a.create_valac_tree();
        return 0;
 }
-*/