generate gjs documentation, run under gjs

[gnome.introspection-doc-generator] / Introspect / Basic.js

diff --git a/Introspect/Basic.js b/Introspect/Basic.js
index 00cc18e..ccb0909 100644 (file)
--- a/Introspect/Basic.js
+++ b/Introspect/Basic.js
@@ -1,12 +1,13 @@
 //<script type="text/javascript">
 //Gtk = imports.gi.Gtk;
-GI      = imports.gi.GIRepository;
-GLib    = imports.gi.GLib;
-xml     = imports.libxml;
+const GI      = imports.gi.GIRepository;
+const GLib    = imports.gi.GLib;
+//xml     = imports.libxml;
+const xml     = imports.gi.libxml2;
 //GObject = imports.gi.GObject;
 
-XObject = imports.XObject.XObject;
-console = imports.console.console;
+const XObject = imports.XObject.XObject;
+const console = imports.console.console;
 
 
 
@@ -15,19 +16,21 @@ console = imports.console.console;
  */
 
 
-Basic = XObject.define(
+var Basic = XObject.define(
     function( ) {
          // never called?
     },
+
     Object,
+
     {
-        
         typeToName : function (type_info) {
             var ty = GI.type_tag_to_string( GI.type_info_get_tag(type_info));
             
             if ((ty == 'void') && GI.type_info_is_pointer(type_info)) {
                 return 'void*'; // it's a fake string?!?!!? - slightly naughty...
             }
+
             if (ty == 'array') {
                 // array of what!?!?
                 var param_type = GI.type_info_get_param_type (type_info, 0);
@@ -36,33 +39,31 @@ Basic = XObject.define(
                     return 'utf8';
                 }
                 
-                            
                 return ty;
             }
+
             if (ty != 'interface') {
                 return ty;
             }
+
             var interface_info = GI.type_info_get_interface (type_info);       
             var interface_type = GI.base_info_get_type (interface_info);
             if (interface_type  == GI.InfoType.CALLBACK) {
                 // callback.. 
-                var Callback = imports.Callback.Callback ;
+                var Callback = imports.Introspect.Callback.Callback ;
                 var ret=  new Callback(interface_info, this, false, false);
                 ret.alias = interface_info.get_namespace() + '.' + interface_info.get_name();
+
                 return ret;
-                 
-                
             }
 
             return  interface_info.get_namespace() + '.' + interface_info.get_name();
-            
         },
-        
+
         directions : [ "in", "out"," inout"],
-        
+
         argsToArrays : function(m,  returnArray) 
         {
-            
             var outIntoReturn = false;
             if (returnArray && returnArray.length == 1 && returnArray[0].type == 'void') {
                 outIntoReturn = true;