rename gir to gobject-introspection

basis/atk/ffi/ffi.factor

@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.libraries alien.syntax combinators kernel
 system
-gir glib.ffi gobject.ffi ;
+gobject-introspection glib.ffi gobject.ffi ;
 IN: atk.ffi
 
 <<

basis/gdk/ffi/ffi.factor

@@ -2,8 +2,8 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.c-types alien.destructors alien.syntax
 alien.libraries cairo.ffi combinators kernel system
-gir gdk.pixbuf.ffi gio.ffi glib.ffi gmodule.ffi gobject.ffi
+gobject-introspection gdk.pixbuf.ffi gio.ffi glib.ffi gmodule.ffi
-pango.ffi ;
+gobject.ffi pango.ffi ;
 IN: gdk.ffi
 
 <<

basis/gdk/gl/ffi/ffi.factor

@@ -2,8 +2,8 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.c-types alien.libraries combinators kernel
 system vocabs.parser words
-gir gdk.ffi gdk.pixbuf.ffi gio.ffi glib.ffi gmodule.ffi
+gobject-introspection gdk.ffi gdk.pixbuf.ffi gio.ffi glib.ffi
-gobject.ffi pango.ffi ;
+gmodule.ffi gobject.ffi pango.ffi ;
 IN: gdk.gl.ffi
 
 <<

basis/gdk/pixbuf/ffi/ffi.factor

@@ -1,7 +1,7 @@
 ! Copyright (C) 2009 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.libraries combinators kernel system
-gir gio.ffi glib.ffi gmodule.ffi gobject.ffi ;
+gobject-introspection gio.ffi glib.ffi gmodule.ffi gobject.ffi ;
 EXCLUDE: alien.c-types => pointer ;
 IN: gdk.pixbuf.ffi
 

basis/gio/ffi/ffi.factor

@@ -1,7 +1,7 @@
 ! Copyright (C) 2009 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.libraries combinators kernel system
-gir glib.ffi gobject.ffi ;
+gobject-introspection glib.ffi gobject.ffi ;
 EXCLUDE: alien.c-types => pointer ;
 IN: gio.ffi
 

basis/glib/ffi/ffi.factor

@@ -1,8 +1,8 @@
 ! Copyright (C) 2009 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien alien.c-types alien.destructors
-alien.libraries alien.syntax combinators compiler.units gir
+alien.libraries alien.syntax combinators compiler.units
-kernel system vocabs.parser words ;
+gobject-introspection kernel system vocabs.parser words ;
 IN: glib.ffi
 
 <<

basis/gmodule/ffi/ffi.factor

@@ -1,7 +1,7 @@
 ! Copyright (C) 2009 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.libraries combinators kernel system
-gir glib.ffi ;
+gobject-introspection glib.ffi ;
 IN: gmodule.ffi
 
 <<

basis/gobject-introspection/common/common.factor

@@ -1,7 +1,7 @@
 ! Copyright (C) 2010 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: assocs kernel namespaces ;
-IN: gir.common
+IN: gobject-introspection.common
 
 CONSTANT: ffi-vocab "ffi"
 

basis/gobject-introspection/ffi/ffi.factor

@@ -1,11 +1,12 @@
 ! Copyright (C) 2009 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien alien.c-types alien.parser arrays
-classes.parser classes.struct combinators combinators.short-circuit
+classes.parser classes.struct combinators
-definitions effects fry gir.common gir.types kernel math.parser
+combinators.short-circuit definitions effects fry
-namespaces parser quotations sequences sequences.generalizations words
+gobject-introspection.common gobject-introspection.types kernel
-words.constant ;
+math.parser namespaces parser quotations sequences
-IN: gir.ffi
+sequences.generalizations words words.constant ;
+IN: gobject-introspection.ffi
 
 : string>c-type ( str -- c-type )
     parse-c-type ;

basis/gobject-introspection/gobject-introspection.factor

@@ -1,8 +1,9 @@
 ! Copyright (C) 2009 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors assocs combinators gir.common gir.ffi gir.loader
+USING: accessors assocs combinators gobject-introspection.common
+gobject-introspection.ffi gobject-introspection.loader
 kernel lexer locals math namespaces sequences vocabs.parser xml ;
-IN: gir
+IN: gobject-introspection
 
 : with-child-vocab ( name quot -- )
     swap current-vocab name>>

basis/gobject-introspection/loader/loader.factor

@@ -1,10 +1,11 @@
 ! Copyright (C) 2009 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors ascii combinators fry gir.common gir.repository
+USING: accessors ascii combinators fry
-gir.types kernel math.parser sequences splitting xml.data
+gobject-introspection.common gobject-introspection.repository
-xml.traversal ;
+gobject-introspection.types kernel math.parser sequences
+splitting xml.data xml.traversal ;
 FROM: namespaces => set get ;
-IN: gir.loader
+IN: gobject-introspection.loader
 
 SYMBOL: namespace-prefix
 SYMBOL: namespace-PREFIX
@@ -221,7 +222,6 @@ SYMBOL: namespace-PREFIX
     [ field new ] dip {
         [ "name" attr >>name ]
         [ "writable" attr "1" = >>writable? ]
-        ! Для некоторых field  есть callback в качестве типа, решить, как лучше сделать
         [
             first-child-tag dup name>> main>> "callback" =
             [ drop "gpointer" ] [ "type" attr ] if

basis/gobject-introspection/repository/repository.factor

@@ -1,7 +1,7 @@
 ! Copyright (C) 2009 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: ;
-IN: gir.repository
+IN: gobject-introspection.repository
 
 TUPLE: node name ;
 

basis/gobject-introspection/types/types.factor

@@ -1,8 +1,10 @@
 ! Copyright (C) 2009 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors alien alien.c-types assocs combinators.short-circuit
+USING: accessors alien alien.c-types assocs
-gir.common gir.repository kernel namespaces specialized-arrays ;
+combinators.short-circuit gobject-introspection.common
-IN: gir.types
+gobject-introspection.repository kernel namespaces
+specialized-arrays ;
+IN: gobject-introspection.types
 
 TUPLE: gwrapper { underlying alien } ;
 TUPLE: grecord < gwrapper ;

basis/gobject/ffi/ffi.factor

@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.syntax alien.destructors alien.libraries
 combinators kernel literals math system
-gir glib.ffi ;
+gobject-introspection glib.ffi ;
 EXCLUDE: alien.c-types => pointer ;
 IN: gobject.ffi
 

basis/gst/ffi/ffi.factor

@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.syntax alien.libraries combinators kernel
 system
-gir glib.ffi gmodule.ffi gobject.ffi ;
+gobject-introspection glib.ffi gmodule.ffi gobject.ffi ;
 EXCLUDE: alien.c-types => pointer ;
 IN: gst.ffi
 
@@ -18,7 +18,7 @@ TYPEDEF: gpointer GstClockID
 TYPEDEF: guint64 GstClockTime
 TYPEDEF: gint64 GstClockTimeDiff
 
-! Временное исправление отсутвующих типов libxml2
+! types from libxml2
 TYPEDEF: void* xmlNodePtr
 TYPEDEF: void* xmlDocPtr
 TYPEDEF: void* xmlNsPtr

basis/gtk/ffi/ffi.factor

@@ -2,8 +2,8 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.syntax alien.destructors alien.libraries
 cairo.ffi combinators kernel system
-gir atk.ffi gdk.ffi gdk.pixbuf.ffi gio.ffi glib.ffi gmodule.ffi
+gobject-introspection atk.ffi gdk.ffi gdk.pixbuf.ffi gio.ffi
-gobject.ffi pango.ffi ;
+glib.ffi gmodule.ffi gobject.ffi pango.ffi ;
 EXCLUDE: alien.c-types => pointer ;
 IN: gtk.ffi
 

basis/gtk/gl/ffi/ffi.factor

@@ -1,8 +1,8 @@
 ! Copyright (C) 2010 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.libraries combinators kernel system
-gir gdk.ffi gdk.pixbuf.ffi gdk.gl.ffi gio.ffi glib.ffi
+gobject-introspection gdk.ffi gdk.pixbuf.ffi gdk.gl.ffi gio.ffi
-gmodule.ffi gobject.ffi gtk.ffi ;
+glib.ffi gmodule.ffi gobject.ffi gtk.ffi ;
 EXCLUDE: alien.c-types => pointer ;
 IN: gtk.gl.ffi
 

basis/pango/cairo/ffi/ffi.factor

@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.c-types alien.libraries alien.syntax cairo.ffi
 combinators kernel system
-gir pango.ffi ;
+gobject-introspection pango.ffi ;
 IN: pango.cairo.ffi
 
 << 

basis/pango/ffi/ffi.factor

@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.c-types alien.destructors alien.libraries
 alien.syntax combinators kernel system
-gir glib.ffi ;
+gobject-introspection glib.ffi ;
 IN: pango.ffi
 
 << 
@@ -13,7 +13,7 @@ IN: pango.ffi
 } cond 
 >>
 
-TYPEDEF: void PangoLayoutRun ! не совсем верно
+TYPEDEF: void PangoLayoutRun
 TYPEDEF: guint32 PangoGlyph
 
 IMPLEMENT-STRUCTS: PangoRectangle ;