@@ -1,5 +1,6 @@ - o constants + o fix dependencies + o fix construction o complex type conversions o iterators for array o Make use of the faster type checks FIXNUM_P. @@ -9,6 +10,7 @@ so learn about that. o Convert Structs. + x constants x unichar conversions x signals x embedding example TODO @@ -6,6 +6,7 @@ require File.dirname(__FILE__) + '/../lib/valar' options = Trollop.options do opt :"output-dir", "Output directory", :default => nil, :type => String opt :deps, "Dependencies", :default => "" + opt :vapidirs, "VAPI source directories, comma separated", :default => "" end Valar.parse_file(ARGV[0], options) bin/valar @@ -169,6 +169,15 @@ class Valar @objects.each do |obj| next unless obj.convertible? puts "#{obj.vala_typename}" + unless obj.constructor_params.empty? + c = obj.constructor_params.all? {|p| p[0].forward_convertible? } + Kernel.print " #{c ? "*" : "x"} #{" ".ljust(max_type_width)} #{obj.name.ljust(max_name_width)} (" + ps = obj.constructor_params.map do |type, name| + "#{type.name} #{name}" + end.join(", ") + Kernel.print(ps) + puts ")" + end obj.functions.sort_by{|m| m.name}.each do |meth| puts " #{meth.convertible? ? "*" : "x"} #{meth.returns.name.ljust(max_type_width)} #{meth.name.ljust(max_name_width)} (#{meth.params.map{|a| "#{a[0].name} #{a[1]}"}.join ", "})" if meth.throws.any? @@ -178,6 +187,9 @@ class Valar obj.members.sort_by{|m| m.name}.each do |mem| puts " * #{mem.type.name.ljust(max_type_width)} #{mem.name}" end + obj.constants.sort_by{|m| m.name}.each do |constant| + puts " #{constant.convertible? ? "*" : "x"} #{constant.type.name.ljust(max_type_width)} #{constant.name}" + end end end lib/library.rb @@ -43,7 +43,15 @@ class Valar deps = [] end deps.each do |dep| - parse_vapi_file("/usr/local/share/vala/vapi/#{dep}.vapi") + if File.exist? "/usr/local/share/vala/vapi/#{dep}.vapi" + parse_vapi_file("/usr/local/share/vala/vapi/#{dep}.vapi") + else + options[:vapidirs].split(",").each do |vdir| + if File.exist? vdir+"/#{dep}.vapi" + parse_vapi_file(vdir+"/#{dep}.vapi") + end + end + end end @library = parse_vapi_file(filename) @library.print lib/valar.rb ff179c73c491b7f0742f995e4a793ac0baf44c8b Daniel Lucraft dan@fluentradical.com http://github.com/danlucraft/valar/commit/0ffde70ff79da484a5384db90933b7b1417d58ea 0ffde70ff79da484a5384db90933b7b1417d58ea 2008-07-07T05:18:44-07:00 2008-07-07T05:18:04-07:00 Couple of changes to dependencies and prints out constructors ac778d5e8fb50a401d70d0960febf314d11bfe34 Daniel Lucraft dan@fluentradical.com