The-Homebrew-Cloud/Ryujinx-GtkSharp
2
0
Fork 0
mirror of https://github.com/Ryujinx/GtkSharp.git synced 2024-07-10 22:31:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

* parser/gapi2xml.pl: Make the enum value parser do the right

Browse Source 
thing with parenthesized values ("FOO = (1 << 2)") and within-type
	aliases ("GTK_ANCHOR_N = GTK_ANCHOR_NORTH"). Make it intentionally
	do the wrong thing with unparsable values (outputting them as-is
	into the api file) so that we are forced to fix them with metadata
	rather than silently getting incorrect values.

	* gdk/gdk-api-2.4.raw: 
	* gdk/gdk-api-2.6.raw (PixdataType): Now recognized as flags,
	not enum

	* gtk/Gtk.metadata: hide the enums ArgFlags and RcTokenType (which
	are not used by any wrapped API, and which formerly contained
	entirely wrong values).

	* gtk/gtk-api-2.4.raw: 
	* gtk/gtk-api-2.6.raw (AnchorType, SelectionMode): update with
	values for aliases

	* gnome/Gnome.metadata: fix value of Gnome.PrintButtons.Cancel

	* gnome/gnome-api.raw (PrintUnitBase, PaperSelectorFlags,
	PrintDialogFlags, PrintDialogRangeFlags): Now recognized as flags,
	with values.

svn path=/trunk/gtk-sharp/; revision=44937
This commit is contained in:
Dan Winship 2005-05-24 18:11:33 +00:00
parent de7c85720a
commit 40c4db88a4
19 changed files with 143 additions and 693 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ChangeLog
View File

@ -1,3 +1,30 @@
2005-05-24 Dan Winship <danw@novell.com>
* parser/gapi2xml.pl: Make the enum value parser do the right
thing with parenthesized values ("FOO = (1 << 2)") and within-type
aliases ("GTK_ANCHOR_N = GTK_ANCHOR_NORTH"). Make it intentionally
do the wrong thing with unparsable values (outputting them as-is
into the api file) so that we are forced to fix them with metadata
rather than silently getting incorrect values.
* gdk/gdk-api-2.4.raw:
* gdk/gdk-api-2.6.raw (PixdataType): Now recognized as flags,
not enum
* gtk/Gtk.metadata: hide the enums ArgFlags and RcTokenType (which
are not used by any wrapped API, and which formerly contained
entirely wrong values).
* gtk/gtk-api-2.4.raw:
* gtk/gtk-api-2.6.raw (AnchorType, SelectionMode): update with
values for aliases
* gnome/Gnome.metadata: fix value of Gnome.PrintButtons.Cancel
* gnome/gnome-api.raw (PrintUnitBase, PaperSelectorFlags,
PrintDialogFlags, PrintDialogRangeFlags): Now recognized as flags,
with values.
2005-05-24 John Luke <john.luke@gmail.com>
* configure.in.in: remove doc/updater/Makefile to fix build

12
doc/ChangeLog
View File

@ -1,3 +1,15 @@
2005-05-24 Dan Winship <danw@novell.com>
* en/Gdk/PixdataType.xml:
* en/Gnome/PaperSelectorFlags.xml:
* en/Gnome/PrintDialogFlags.xml:
* en/Gnome/PrintDialogRangeFlags.xml:
* en/Gnome/PrintUnitBase.xml: Regen, adding FlagsAttribute
* en/index.xml
* en/Gtk/ArgFlags.xml
* en/Gtk/RcTokenType.xml: remove removed types
2005-05-23 Mike Kestner <mkestner@novell.com>
* Makefile.am : add an update-delete target for --delete.

5
doc/en/Gdk/PixdataType.xml
View File

@ -121,4 +121,9 @@
</Member>
</Members>
<Attributes>
<Attribute>
<AttributeName>System.Flags</AttributeName>
</Attribute>
</Attributes>
</Type>

5
doc/en/Gnome/PaperSelectorFlags.xml
View File

@ -45,4 +45,9 @@
</Member>
</Members>
<Attributes>
<Attribute>
<AttributeName>System.Flags</AttributeName>
</Attribute>
</Attributes>
</Type>

5
doc/en/Gnome/PrintDialogFlags.xml
View File

@ -45,4 +45,9 @@
</Member>
</Members>
<Attributes>
<Attribute>
<AttributeName>System.Flags</AttributeName>
</Attribute>
</Attributes>
</Type>

5
doc/en/Gnome/PrintDialogRangeFlags.xml
View File

@ -87,4 +87,9 @@
</Member>
</Members>
<Attributes>
<Attribute>
<AttributeName>System.Flags</AttributeName>
</Attribute>
</Attributes>
</Type>

5
doc/en/Gnome/PrintUnitBase.xml
View File

@ -73,4 +73,9 @@
</Member>
</Members>
<Attributes>
<Attribute>
<AttributeName>System.Flags</AttributeName>
</Attribute>
</Attributes>
</Type>

98
doc/en/Gtk/ArgFlags.xml
View File

@ -1,98 +0,0 @@
<Type Name="ArgFlags" FullName="Gtk.ArgFlags">
<TypeSignature Language="C#" Value="public enum ArgFlags" Maintainer="auto" />
<AssemblyInfo>
<AssemblyName>gtk-sharp</AssemblyName>
<AssemblyPublicKey>[00 24 00 00 04 80 00 00 94 00 00 00 06 02 00 00 00 24 00 00 52 53 41 31 00 04 00 00 01 00 01 00 71 EB 6C 55 75 52 9C BF 72 44 F7 A6 EA 05 62 84 F9 EA E0 3B CF F2 CC 13 2C 9C 49 0A B3 09 EA B0 B5 6B CE 44 9D F5 03 D9 C0 A8 1E 52 05 85 CD BE 70 E2 FB 90 43 4B AC 04 FA 62 22 A8 00 98 B7 A1 A7 B3 AF 99 1A 41 23 24 BB 43 25 F6 B8 65 BB 64 EB F6 D1 C2 06 D5 73 2D DF BC 70 A7 38 9E E5 3E 0C 24 6E 32 79 74 1A D0 05 03 E4 98 42 E1 9B F3 7B 19 8B 40 21 26 CB 36 89 C2 EA 64 96 A4 7C B4]</AssemblyPublicKey>
<AssemblyVersion>2.0.0.0</AssemblyVersion>
</AssemblyInfo>
<ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the <link location="node:gtk-sharp/programming/threads">Gtk# Thread Programming</link> for details.</ThreadSafetyStatement>
<Docs>
<summary>Do not use.</summary>
<remarks>
</remarks>
</Docs>
<Base>
<BaseTypeName>System.Enum</BaseTypeName>
</Base>
<Attributes>
<Attribute>
<AttributeName>GLib.GType(WrapperType=typeof(Gtk.ArgFlagsGType))</AttributeName>
</Attribute>
<Attribute>
<AttributeName>System.Flags</AttributeName>
</Attribute>
</Attributes>
<Members>
<Member MemberName="Readable">
<MemberSignature Language="C#" Value="Readable" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>Gtk.ArgFlags</ReturnType>
</ReturnValue>
<Parameters>
</Parameters>
<Docs>
<summary>Do not use.</summary>
<remarks>
</remarks>
</Docs>
</Member>
<Member MemberName="Writable">
<MemberSignature Language="C#" Value="Writable" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>Gtk.ArgFlags</ReturnType>
</ReturnValue>
<Parameters>
</Parameters>
<Docs>
<summary>Do not use.</summary>
<remarks>
</remarks>
</Docs>
</Member>
<Member MemberName="Construct">
<MemberSignature Language="C#" Value="Construct" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>Gtk.ArgFlags</ReturnType>
</ReturnValue>
<Parameters>
</Parameters>
<Docs>
<summary>Do not use.</summary>
<remarks>
</remarks>
</Docs>
</Member>
<Member MemberName="ConstructOnly">
<MemberSignature Language="C#" Value="ConstructOnly" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>Gtk.ArgFlags</ReturnType>
</ReturnValue>
<Parameters>
</Parameters>
<Docs>
<summary>Do not use.</summary>
<remarks>
</remarks>
</Docs>
</Member>
<Member MemberName="ChildArg">
<MemberSignature Language="C#" Value="ChildArg" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>Gtk.ArgFlags</ReturnType>
</ReturnValue>
<Parameters>
</Parameters>
<Docs>
<summary>Do not use.</summary>
<remarks>
</remarks>
</Docs>
</Member>
</Members>
</Type>

519
doc/en/Gtk/RcTokenType.xml
View File

@ -1,519 +0,0 @@
<Type Name="RcTokenType" FullName="Gtk.RcTokenType">
<TypeSignature Language="C#" Maintainer="auto" Value="public enum RcTokenType" />
<AssemblyInfo>
<AssemblyName>gtk-sharp</AssemblyName>
<AssemblyPublicKey>
</AssemblyPublicKey>
<AssemblyVersion>2.0.0.0</AssemblyVersion>
</AssemblyInfo>
<ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the <link location="node:gtk-sharp/programming/threads">Gtk# Thread Programming</link> for details.</ThreadSafetyStatement>
<Docs>
<summary>An enumeration used to represent the tokens in an RC file.</summary>
<remarks>The RcTokenType enumeration represents the tokens in the RC file. It is exposed so that theme engines can reuse these tokens when parsing the theme-engine specific portions of a RC file.</remarks>
</Docs>
<Base>
<BaseTypeName>System.Enum</BaseTypeName>
</Base>
<Attributes>
<Attribute>
<AttributeName>GLib.GType(WrapperType=typeof(Gtk.RcTokenTypeGType))</AttributeName>
</Attribute>
</Attributes>
<Members>
<Member MemberName="Invalid">
<MemberSignature Language="C#" Value="Invalid" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>Gtk.RcTokenType</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>Token to represent an invalid RC-file directive.</summary>
<remarks>
</remarks>
</Docs>
</Member>
<Member MemberName="Include">
<MemberSignature Language="C#" Value="Include" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>Gtk.RcTokenType</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>Token for including another RC file.</summary>
<remarks>
</remarks>
</Docs>
</Member>
<Member MemberName="Normal">
<MemberSignature Language="C#" Value="Normal" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>Gtk.RcTokenType</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>Token for the normal state of a widget.</summary>
<remarks>
</remarks>
</Docs>
</Member>
<Member MemberName="Active">
<MemberSignature Language="C#" Value="Active" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>Gtk.RcTokenType</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>Token for the active state of a widget.</summary>
<remarks>
</remarks>
</Docs>
</Member>
<Member MemberName="Prelight">
<MemberSignature Language="C#" Value="Prelight" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>Gtk.RcTokenType</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>Token for the prelight state of a widget.</summary>
<remarks>
</remarks>
</Docs>
</Member>
<Member MemberName="Selected">
<MemberSignature Language="C#" Value="Selected" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>Gtk.RcTokenType</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>Token for the selected state of a widget.</summary>
<remarks>
</remarks>
</Docs>
</Member>
<Member MemberName="Insensitive">
<MemberSignature Language="C#" Value="Insensitive" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>Gtk.RcTokenType</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>Token for the insensitive (unclickable) state of a widget.</summary>
<remarks>
</remarks>
</Docs>
</Member>
<Member MemberName="Fg">
<MemberSignature Language="C#" Value="Fg" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>Gtk.RcTokenType</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>Token for a foreground color.</summary>
<remarks>
</remarks>
</Docs>
</Member>
<Member MemberName="Bg">
<MemberSignature Language="C#" Value="Bg" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>Gtk.RcTokenType</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>Token for a background color.</summary>
<remarks>
</remarks>
</Docs>
</Member>
<Member MemberName="Text">
<MemberSignature Language="C#" Value="Text" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>Gtk.RcTokenType</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>Token for the text color of a widget.</summary>
<remarks>
</remarks>
</Docs>
</Member>
<Member MemberName="Base">
<MemberSignature Language="C#" Value="Base" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>Gtk.RcTokenType</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>Token for color used for the background of widgets displaying editable text.</summary>
<remarks>
</remarks>
</Docs>
</Member>
<Member MemberName="Xthickness">
<MemberSignature Language="C#" Value="Xthickness" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>Gtk.RcTokenType</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>Token for specifying X thickness.</summary>
<remarks>
</remarks>
</Docs>
</Member>
<Member MemberName="Ythickness">
<MemberSignature Language="C#" Value="Ythickness" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>Gtk.RcTokenType</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>Token for specifying Y thickness.</summary>
<remarks>
</remarks>
</Docs>
</Member>
<Member MemberName="Font">
<MemberSignature Language="C#" Value="Font" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>Gtk.RcTokenType</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>Token for specifying a font. Deprecated; use FontName declarations instead.</summary>
<remarks>
Deprecation is from GTK+ 2.x.</remarks>
</Docs>
</Member>
<Member MemberName="Fontset">
<MemberSignature Language="C#" Value="Fontset" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>Gtk.RcTokenType</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>Token for specifying a font set. Deprecated; use FontName declarations instead.</summary>
<remarks>
Deprecation is from GTK+ 2.x.</remarks>
</Docs>
</Member>
<Member MemberName="FontName">
<MemberSignature Language="C#" Value="FontName" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>Gtk.RcTokenType</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>Token for specifying a font name.</summary>
<remarks>
</remarks>
</Docs>
</Member>
<Member MemberName="BgPixmap">
<MemberSignature Language="C#" Value="BgPixmap" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>Gtk.RcTokenType</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>Token for specifying a background pixmap.</summary>
<remarks>
</remarks>
</Docs>
</Member>
<Member MemberName="PixmapPath">
<MemberSignature Language="C#" Value="PixmapPath" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>Gtk.RcTokenType</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>Token for specifying the path for pixmaps.</summary>
<remarks>
</remarks>
</Docs>
</Member>
<Member MemberName="Style">
<MemberSignature Language="C#" Value="Style" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>Gtk.RcTokenType</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>Token for specifying a style.</summary>
<remarks>
</remarks>
</Docs>
</Member>
<Member MemberName="Binding">
<MemberSignature Language="C#" Value="Binding" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>Gtk.RcTokenType</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>Token for specifying a key binding set.</summary>
<remarks>
</remarks>
</Docs>
</Member>
<Member MemberName="Bind">
<MemberSignature Language="C#" Value="Bind" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>Gtk.RcTokenType</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>Token for specifying a particular key binding.</summary>
<remarks>
</remarks>
</Docs>
</Member>
<Member MemberName="Widget">
<MemberSignature Language="C#" Value="Widget" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>Gtk.RcTokenType</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>Token for binding a style to a widget.</summary>
<remarks>
</remarks>
</Docs>
</Member>
<Member MemberName="WidgetClass">
<MemberSignature Language="C#" Value="WidgetClass" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>Gtk.RcTokenType</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>Token for binding a style to a class of widgets.</summary>
<remarks>
</remarks>
</Docs>
</Member>
<Member MemberName="Class">
<MemberSignature Language="C#" Value="Class" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>Gtk.RcTokenType</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>Token for applying a style to an object class.</summary>
<remarks>
</remarks>
</Docs>
</Member>
<Member MemberName="Lowest">
<MemberSignature Language="C#" Value="Lowest" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>Gtk.RcTokenType</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>Token for specifying that a given RC directive is lowest priority.</summary>
<remarks>
</remarks>
</Docs>
</Member>
<Member MemberName="Gtk">
<MemberSignature Language="C#" Value="Gtk" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>Gtk.RcTokenType</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>Token for specifying the "gtk" priority level (one above lowest).</summary>
<remarks>
</remarks>
</Docs>
</Member>
<Member MemberName="Application">
<MemberSignature Language="C#" Value="Application" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>Gtk.RcTokenType</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>Token for specifying the "application" priority level.</summary>
<remarks>
</remarks>
</Docs>
</Member>
<Member MemberName="Theme">
<MemberSignature Language="C#" Value="Theme" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>Gtk.RcTokenType</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>Token for specifying the "theme" priority level.</summary>
<remarks>
</remarks>
</Docs>
</Member>
<Member MemberName="Rc">
<MemberSignature Language="C#" Value="Rc" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>Gtk.RcTokenType</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>Token for specifying the "rc" priority level.</summary>
<remarks>
</remarks>
</Docs>
</Member>
<Member MemberName="Highest">
<MemberSignature Language="C#" Value="Highest" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>Gtk.RcTokenType</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>Token for specifying "highest" priority level.</summary>
<remarks>
</remarks>
</Docs>
</Member>
<Member MemberName="Engine">
<MemberSignature Language="C#" Value="Engine" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>Gtk.RcTokenType</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>Token to define an engine to use for this style.</summary>
<remarks>
</remarks>
</Docs>
</Member>
<Member MemberName="ModulePath">
<MemberSignature Language="C#" Value="ModulePath" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>Gtk.RcTokenType</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>Token to set path to search for theme engines.</summary>
<remarks>
</remarks>
</Docs>
</Member>
<Member MemberName="ImModulePath">
<MemberSignature Language="C#" Value="ImModulePath" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>Gtk.RcTokenType</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>Token to set path used for IM modules.</summary>
<remarks>
</remarks>
</Docs>
</Member>
<Member MemberName="ImModuleFile">
<MemberSignature Language="C#" Value="ImModuleFile" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>Gtk.RcTokenType</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>Token to set path to the IM modules file.</summary>
<remarks>
</remarks>
</Docs>
</Member>
<Member MemberName="Stock">
<MemberSignature Language="C#" Value="Stock" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>Gtk.RcTokenType</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>Token to specify the icon for a stock item.</summary>
<remarks>
</remarks>
</Docs>
</Member>
<Member MemberName="Ltr">
<MemberSignature Language="C#" Value="Ltr" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>Gtk.RcTokenType</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>Token to specify a value for use with a left-to-right language.</summary>
<remarks>
</remarks>
</Docs>
</Member>
<Member MemberName="Rtl">
<MemberSignature Language="C#" Value="Rtl" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>Gtk.RcTokenType</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>Token to specify a value for use with a right-to-left language.</summary>
<remarks>
</remarks>
</Docs>
</Member>
<Member MemberName="Last">
<MemberSignature Language="C#" Value="Last" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>Gtk.RcTokenType</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>Token to specify the last token. (FIXME: check this)</summary>
<remarks>
</remarks>
</Docs>
</Member>
</Members>
</Type>

2
doc/en/index.xml
View File

@ -977,7 +977,6 @@
<Type Name="WindowStateEventHandler" />
<Type Name="AccelFlags" />
<Type Name="AnchorType" />
<Type Name="ArgFlags" />
<Type Name="ArrowType" />
<Type Name="AttachOptions" />
<Type Name="ButtonBoxStyle" />
@ -1013,7 +1012,6 @@
<Type Name="PreviewType" />
<Type Name="ProgressBarOrientation" />
<Type Name="ProgressBarStyle" />
<Type Name="RcTokenType" />
<Type Name="ReliefStyle" />
<Type Name="ResizeMode" />
<Type Name="ResponseType" />

2
gda/gda-api.raw
View File

@ -10,7 +10,7 @@
<enum name="BlobMode" cname="GdaBlobMode" type="flags">
<member cname="GDA_BLOB_MODE_READ" name="Read" value="1" />
<member cname="GDA_BLOB_MODE_WRITE" name="Write" value="1 &lt;&lt; 1" />
<member cname="GDA_BLOB_MODE_RDWR" name="Rdwr" value="0x03 " />
<member cname="GDA_BLOB_MODE_RDWR" name="Rdwr" value="0x03" />
</enum>
<enum name="ClientEvent" cname="GdaClientEvent" type="enum">
<member cname="GDA_CLIENT_EVENT_INVALID" name="Invalid" />

8
gdk/gdk-api-2.4.raw
View File

@ -318,7 +318,7 @@
<member cname="GDK_BUTTON4_MASK" name="Button4Mask" value="1 &lt;&lt; 11" />
<member cname="GDK_BUTTON5_MASK" name="Button5Mask" value="1 &lt;&lt; 12" />
<member cname="GDK_RELEASE_MASK" name="ReleaseMask" value="1 &lt;&lt; 30" />
<member cname="GDK_MODIFIER_MASK" name="ModifierMask" />
<member cname="GDK_MODIFIER_MASK" name="ModifierMask" value="GDK_RELEASE_MASK | 0x1fff" />
</enum>
<enum name="NotifyType" cname="GdkNotifyType" gtype="gdk_notify_type_get_type" type="enum">
<member cname="GDK_NOTIFY_ANCESTOR" name="Ancestor" />
@ -4439,13 +4439,13 @@
<member cname="GDK_PIXDATA_DUMP_CONST" name="Const" value="1 &lt;&lt; 10" />
<member cname="GDK_PIXDATA_DUMP_RLE_DECODER" name="RleDecoder" value="1 &lt;&lt; 16" />
</enum>
<enum name="PixdataType" cname="GdkPixdataType" type="enum">
<enum name="PixdataType" cname="GdkPixdataType" type="flags">
<member cname="GDK_PIXDATA_COLOR_TYPE_RGB" name="ColorTypeRgb" value="0x01" />
<member cname="GDK_PIXDATA_COLOR_TYPE_RGBA" name="ColorTypeRgba" value="0x02" />
<member cname="GDK_PIXDATA_COLOR_TYPE_MASK" name="ColorTypeMask" value="0xff" />
<member cname="GDK_PIXDATA_SAMPLE_WIDTH_8" name="SampleWidth8" value="1 &lt;&lt; 16" />
<member cname="GDK_PIXDATA_SAMPLE_WIDTH_8" name="SampleWidth8" value="0x01 &lt;&lt; 16" />
<member cname="GDK_PIXDATA_SAMPLE_WIDTH_MASK" name="SampleWidthMask" value="0x0f &lt;&lt; 16" />
<member cname="GDK_PIXDATA_ENCODING_RAW" name="EncodingRaw" value="1 &lt;&lt; 24" />
<member cname="GDK_PIXDATA_ENCODING_RAW" name="EncodingRaw" value="0x01 &lt;&lt; 24" />
<member cname="GDK_PIXDATA_ENCODING_RLE" name="EncodingRle" value="0x02 &lt;&lt; 24" />
<member cname="GDK_PIXDATA_ENCODING_MASK" name="EncodingMask" value="0x0f &lt;&lt; 24" />
</enum>

8
gdk/gdk-api-2.6.raw
View File

@ -319,7 +319,7 @@
<member cname="GDK_BUTTON4_MASK" name="Button4Mask" value="1 &lt;&lt; 11" />
<member cname="GDK_BUTTON5_MASK" name="Button5Mask" value="1 &lt;&lt; 12" />
<member cname="GDK_RELEASE_MASK" name="ReleaseMask" value="1 &lt;&lt; 30" />
<member cname="GDK_MODIFIER_MASK" name="ModifierMask" />
<member cname="GDK_MODIFIER_MASK" name="ModifierMask" value="GDK_RELEASE_MASK | 0x1fff" />
</enum>
<enum name="NotifyType" cname="GdkNotifyType" gtype="gdk_notify_type_get_type" type="enum">
<member cname="GDK_NOTIFY_ANCESTOR" name="Ancestor" />
@ -4635,13 +4635,13 @@
<member cname="GDK_PIXDATA_DUMP_CONST" name="Const" value="1 &lt;&lt; 10" />
<member cname="GDK_PIXDATA_DUMP_RLE_DECODER" name="RleDecoder" value="1 &lt;&lt; 16" />
</enum>
<enum name="PixdataType" cname="GdkPixdataType" type="enum">
<enum name="PixdataType" cname="GdkPixdataType" type="flags">
<member cname="GDK_PIXDATA_COLOR_TYPE_RGB" name="ColorTypeRgb" value="0x01" />
<member cname="GDK_PIXDATA_COLOR_TYPE_RGBA" name="ColorTypeRgba" value="0x02" />
<member cname="GDK_PIXDATA_COLOR_TYPE_MASK" name="ColorTypeMask" value="0xff" />
<member cname="GDK_PIXDATA_SAMPLE_WIDTH_8" name="SampleWidth8" value="1 &lt;&lt; 16" />
<member cname="GDK_PIXDATA_SAMPLE_WIDTH_8" name="SampleWidth8" value="0x01 &lt;&lt; 16" />
<member cname="GDK_PIXDATA_SAMPLE_WIDTH_MASK" name="SampleWidthMask" value="0x0f &lt;&lt; 16" />
<member cname="GDK_PIXDATA_ENCODING_RAW" name="EncodingRaw" value="1 &lt;&lt; 24" />
<member cname="GDK_PIXDATA_ENCODING_RAW" name="EncodingRaw" value="0x01 &lt;&lt; 24" />
<member cname="GDK_PIXDATA_ENCODING_RLE" name="EncodingRle" value="0x02 &lt;&lt; 24" />
<member cname="GDK_PIXDATA_ENCODING_MASK" name="EncodingMask" value="0x0f &lt;&lt; 24" />
</enum>

1
gnome/Gnome.metadata
View File

@ -1,5 +1,6 @@
<?xml version="1.0"?>
<metadata>
<attr path="/api/namespace/enum[@cname='GnomePrintButtons']/member[@name='Cancel']" name="value">(int)Gtk.ResponseType.Cancel</attr>
<attr path="/api/namespace/object[@cname='GnomeApp']/constructor[@cname='gnome_app_new']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GnomeApp']/field[@name='AccelGroup']" name="access">public</attr>
<attr path="/api/namespace/object[@cname='GnomeApp']/field[@name='Contents']" name="access">public</attr>

36
gnome/gnome-api.raw
View File

@ -5342,11 +5342,11 @@
<member cname="GNOME_PRINT_ERROR_NOPAGE" name="ErrorNopage" value="-7" />
<member cname="GNOME_PRINT_ERROR_NOMATCH" name="ErrorNomatch" value="-8" />
</enum>
<enum name="PrintUnitBase" cname="GnomePrintUnitBase" type="enum">
<member cname="GNOME_PRINT_UNIT_DIMENSIONLESS" name="Dimensionless" />
<member cname="GNOME_PRINT_UNIT_ABSOLUTE" name="Absolute" />
<member cname="GNOME_PRINT_UNIT_DEVICE" name="Device" />
<member cname="GNOME_PRINT_UNIT_USERSPACE" name="Userspace" />
<enum name="PrintUnitBase" cname="GnomePrintUnitBase" type="flags">
<member cname="GNOME_PRINT_UNIT_DIMENSIONLESS" name="Dimensionless" value="1 &lt;&lt; 0" />
<member cname="GNOME_PRINT_UNIT_ABSOLUTE" name="Absolute" value="1 &lt;&lt; 1" />
<member cname="GNOME_PRINT_UNIT_DEVICE" name="Device" value="1 &lt;&lt; 2" />
<member cname="GNOME_PRINT_UNIT_USERSPACE" name="Userspace" value="1 &lt;&lt; 3" />
</enum>
<object name="Font" cname="GnomeFont" parent="GObject">
<property name="FontName" cname="FontName" type="gchar*" readable="true" />
@ -7172,25 +7172,25 @@
</class>
</namespace>
<namespace name="Gnome" library="gnomeprintui-2-2">
<enum name="PaperSelectorFlags" cname="GnomePaperSelectorFlags" type="enum">
<member cname="GNOME_PAPER_SELECTOR_MARGINS" name="Margins" />
<member cname="GNOME_PAPER_SELECTOR_FEED_ORIENTATION" name="FeedOrientation" />
<enum name="PaperSelectorFlags" cname="GnomePaperSelectorFlags" type="flags">
<member cname="GNOME_PAPER_SELECTOR_MARGINS" name="Margins" value="1 &lt;&lt; 0" />
<member cname="GNOME_PAPER_SELECTOR_FEED_ORIENTATION" name="FeedOrientation" value="1 &lt;&lt; 1" />
</enum>
<enum name="PrintButtons" cname="GnomePrintButtons" type="enum">
<member cname="GNOME_PRINT_DIALOG_RESPONSE_PRINT" name="Print" value="1" />
<member cname="GNOME_PRINT_DIALOG_RESPONSE_PREVIEW" name="Preview" />
<member cname="GNOME_PRINT_DIALOG_RESPONSE_CANCEL" name="Cancel" />
<member cname="GNOME_PRINT_DIALOG_RESPONSE_CANCEL" name="Cancel" value="GTK_RESPONSE_CANCEL" />
</enum>
<enum name="PrintDialogFlags" cname="GnomePrintDialogFlags" type="enum">
<member cname="GNOME_PRINT_DIALOG_RANGE" name="Range" />
<member cname="GNOME_PRINT_DIALOG_COPIES" name="Copies" />
<enum name="PrintDialogFlags" cname="GnomePrintDialogFlags" type="flags">
<member cname="GNOME_PRINT_DIALOG_RANGE" name="Range" value="1 &lt;&lt; 0" />
<member cname="GNOME_PRINT_DIALOG_COPIES" name="Copies" value="1 &lt;&lt; 1" />
</enum>
<enum name="PrintDialogRangeFlags" cname="GnomePrintDialogRangeFlags" type="enum">
<member cname="GNOME_PRINT_RANGE_CURRENT" name="Current" />
<member cname="GNOME_PRINT_RANGE_ALL" name="All" />
<member cname="GNOME_PRINT_RANGE_RANGE" name="Range" />
<member cname="GNOME_PRINT_RANGE_SELECTION" name="Selection" />
<member cname="GNOME_PRINT_RANGE_SELECTION_UNSENSITIVE" name="SelectionUnsensitive" />
<enum name="PrintDialogRangeFlags" cname="GnomePrintDialogRangeFlags" type="flags">
<member cname="GNOME_PRINT_RANGE_CURRENT" name="Current" value="1 &lt;&lt; 0" />
<member cname="GNOME_PRINT_RANGE_ALL" name="All" value="1 &lt;&lt; 1" />
<member cname="GNOME_PRINT_RANGE_RANGE" name="Range" value="1 &lt;&lt; 2" />
<member cname="GNOME_PRINT_RANGE_SELECTION" name="Selection" value="1 &lt;&lt; 3" />
<member cname="GNOME_PRINT_RANGE_SELECTION_UNSENSITIVE" name="SelectionUnsensitive" value="1 &lt;&lt; 4" />
</enum>
<enum name="PrintRangeType" cname="GnomePrintRangeType" type="enum">
<member cname="GNOME_PRINT_RANGETYPE_NONE" name="None" />

2
gtk/Gtk.metadata
View File

@ -66,6 +66,7 @@
<attr path="/api/namespace/class[@cname='GtkTree_']/method[@name='GetRowDragData']/*/*[@name='tree_model']" name="pass_as">out</attr>
<attr path="/api/namespace/class[@cname='GtkTree_']/method[@name='GetRowDragData']/*/*[@name='path']" name="pass_as">out</attr>
<attr path="/api/namespace/class[@cname='GtkType_']" name="hidden">1</attr>
<attr path="/api/namespace/enum[@cname='GtkArgFlags']" name="hidden">1</attr>
<attr path="/api/namespace/enum[@cname='GtkDebugFlag']" name="hidden">1</attr>
<attr path="/api/namespace/enum[@cname='GtkIMPreeditStyle']" name="hidden">1</attr>
<attr path="/api/namespace/enum[@cname='GtkIMStatusStyle']" name="hidden">1</attr>
@ -73,6 +74,7 @@
<attr path="/api/namespace/enum[@cname='GtkPathPriorityType']" name="hidden">1</attr>
<attr path="/api/namespace/enum[@cname='GtkPathType']" name="hidden">1</attr>
<attr path="/api/namespace/enum[@cname='GtkRcFlags']" name="hidden">1</attr>
<attr path="/api/namespace/enum[@cname='GtkRcTokenType']" name="hidden">1</attr>
<attr path="/api/namespace/enum[@cname='GtkSignalRunType']" name="hidden">1</attr>
<attr path="/api/namespace/enum[@cname='GtkToolbarSpaceStyle']" name="hidden">1</attr>
<attr path="/api/namespace/enum[@cname='GtkVisibility']" name="hidden">1</attr>

40
gtk/gtk-api-2.4.raw
View File

@ -22,20 +22,20 @@
<member cname="GTK_ANCHOR_SOUTH_EAST" name="SouthEast" />
<member cname="GTK_ANCHOR_WEST" name="West" />
<member cname="GTK_ANCHOR_EAST" name="East" />
<member cname="GTK_ANCHOR_N" name="N" />
<member cname="GTK_ANCHOR_NW" name="Nw" />
<member cname="GTK_ANCHOR_NE" name="Ne" />
<member cname="GTK_ANCHOR_S" name="S" />
<member cname="GTK_ANCHOR_SW" name="Sw" />
<member cname="GTK_ANCHOR_SE" name="Se" />
<member cname="GTK_ANCHOR_W" name="W" />
<member cname="GTK_ANCHOR_E" name="E" />
<member cname="GTK_ANCHOR_N" name="N" value="North" />
<member cname="GTK_ANCHOR_NW" name="Nw" value="NorthWest" />
<member cname="GTK_ANCHOR_NE" name="Ne" value="NorthEast" />
<member cname="GTK_ANCHOR_S" name="S" value="South" />
<member cname="GTK_ANCHOR_SW" name="Sw" value="SouthWest" />
<member cname="GTK_ANCHOR_SE" name="Se" value="SouthEast" />
<member cname="GTK_ANCHOR_W" name="W" value="West" />
<member cname="GTK_ANCHOR_E" name="E" value="East" />
</enum>
<enum name="ArgFlags" cname="GtkArgFlags" deprecated="1" gtype="gtk_arg_flags_get_type" type="flags">
<member cname="GTK_ARG_READABLE" name="Readable" />
<member cname="GTK_ARG_WRITABLE" name="Writable" />
<member cname="GTK_ARG_CONSTRUCT" name="Construct" />
<member cname="GTK_ARG_CONSTRUCT_ONLY" name="ConstructOnly" />
<member cname="GTK_ARG_READABLE" name="Readable" value="G_PARAM_READABLE" />
<member cname="GTK_ARG_WRITABLE" name="Writable" value="G_PARAM_WRITABLE" />
<member cname="GTK_ARG_CONSTRUCT" name="Construct" value="G_PARAM_CONSTRUCT" />
<member cname="GTK_ARG_CONSTRUCT_ONLY" name="ConstructOnly" value="G_PARAM_CONSTRUCT_ONLY" />
<member cname="GTK_ARG_CHILD_ARG" name="ChildArg" value="1 &lt;&lt; 4" />
</enum>
<enum name="ArrowType" cname="GtkArrowType" gtype="gtk_arrow_type_get_type" type="enum">
@ -288,7 +288,7 @@
<member cname="GTK_RC_BASE" name="Base" value="1 &lt;&lt; 3" />
</enum>
<enum name="RcTokenType" cname="GtkRcTokenType" gtype="gtk_rc_token_type_get_type" type="enum">
<member cname="GTK_RC_TOKEN_INVALID" name="Invalid" />
<member cname="GTK_RC_TOKEN_INVALID" name="Invalid" value="G_TOKEN_LAST" />
<member cname="GTK_RC_TOKEN_INCLUDE" name="Include" />
<member cname="GTK_RC_TOKEN_NORMAL" name="Normal" />
<member cname="GTK_RC_TOKEN_ACTIVE" name="Active" />
@ -381,7 +381,7 @@
<member cname="GTK_SELECTION_SINGLE" name="Single" />
<member cname="GTK_SELECTION_BROWSE" name="Browse" />
<member cname="GTK_SELECTION_MULTIPLE" name="Multiple" />
<member cname="GTK_SELECTION_EXTENDED" name="Extended" />
<member cname="GTK_SELECTION_EXTENDED" name="Extended" value="Multiple" />
</enum>
<enum name="ShadowType" cname="GtkShadowType" gtype="gtk_shadow_type_get_type" type="enum">
<member cname="GTK_SHADOW_NONE" name="None" />
@ -397,12 +397,12 @@
<member cname="GTK_SIDE_RIGHT" name="Right" />
</enum>
<enum name="SignalRunType" cname="GtkSignalRunType" deprecated="1" gtype="gtk_signal_run_type_get_type" type="enum">
<member cname="GTK_RUN_FIRST" name="First" />
<member cname="GTK_RUN_LAST" name="Last" />
<member cname="GTK_RUN_BOTH" name="Both" />
<member cname="GTK_RUN_NO_RECURSE" name="NoRecurse" />
<member cname="GTK_RUN_ACTION" name="Action" />
<member cname="GTK_RUN_NO_HOOKS" name="NoHooks" />
<member cname="GTK_RUN_FIRST" name="First" value="G_SIGNAL_RUN_FIRST" />
<member cname="GTK_RUN_LAST" name="Last" value="G_SIGNAL_RUN_LAST" />
<member cname="GTK_RUN_BOTH" name="Both" value="GTK_RUN_FIRST | GTK_RUN_LAST" />
<member cname="GTK_RUN_NO_RECURSE" name="NoRecurse" value="G_SIGNAL_NO_RECURSE" />
<member cname="GTK_RUN_ACTION" name="Action" value="G_SIGNAL_ACTION" />
<member cname="GTK_RUN_NO_HOOKS" name="NoHooks" value="G_SIGNAL_NO_HOOKS" />
</enum>
<enum name="SizeGroupMode" cname="GtkSizeGroupMode" gtype="gtk_size_group_mode_get_type" type="enum">
<member cname="GTK_SIZE_GROUP_NONE" name="None" />

40
gtk/gtk-api-2.6.raw
View File

@ -22,20 +22,20 @@
<member cname="GTK_ANCHOR_SOUTH_EAST" name="SouthEast" />
<member cname="GTK_ANCHOR_WEST" name="West" />
<member cname="GTK_ANCHOR_EAST" name="East" />
<member cname="GTK_ANCHOR_N" name="N" />
<member cname="GTK_ANCHOR_NW" name="Nw" />
<member cname="GTK_ANCHOR_NE" name="Ne" />
<member cname="GTK_ANCHOR_S" name="S" />
<member cname="GTK_ANCHOR_SW" name="Sw" />
<member cname="GTK_ANCHOR_SE" name="Se" />
<member cname="GTK_ANCHOR_W" name="W" />
<member cname="GTK_ANCHOR_E" name="E" />
<member cname="GTK_ANCHOR_N" name="N" value="North" />
<member cname="GTK_ANCHOR_NW" name="Nw" value="NorthWest" />
<member cname="GTK_ANCHOR_NE" name="Ne" value="NorthEast" />
<member cname="GTK_ANCHOR_S" name="S" value="South" />
<member cname="GTK_ANCHOR_SW" name="Sw" value="SouthWest" />
<member cname="GTK_ANCHOR_SE" name="Se" value="SouthEast" />
<member cname="GTK_ANCHOR_W" name="W" value="West" />
<member cname="GTK_ANCHOR_E" name="E" value="East" />
</enum>
<enum name="ArgFlags" cname="GtkArgFlags" deprecated="1" gtype="gtk_arg_flags_get_type" type="flags">
<member cname="GTK_ARG_READABLE" name="Readable" />
<member cname="GTK_ARG_WRITABLE" name="Writable" />
<member cname="GTK_ARG_CONSTRUCT" name="Construct" />
<member cname="GTK_ARG_CONSTRUCT_ONLY" name="ConstructOnly" />
<member cname="GTK_ARG_READABLE" name="Readable" value="G_PARAM_READABLE" />
<member cname="GTK_ARG_WRITABLE" name="Writable" value="G_PARAM_WRITABLE" />
<member cname="GTK_ARG_CONSTRUCT" name="Construct" value="G_PARAM_CONSTRUCT" />
<member cname="GTK_ARG_CONSTRUCT_ONLY" name="ConstructOnly" value="G_PARAM_CONSTRUCT_ONLY" />
<member cname="GTK_ARG_CHILD_ARG" name="ChildArg" value="1 &lt;&lt; 4" />
</enum>
<enum name="ArrowType" cname="GtkArrowType" gtype="gtk_arrow_type_get_type" type="enum">
@ -289,7 +289,7 @@
<member cname="GTK_RC_BASE" name="Base" value="1 &lt;&lt; 3" />
</enum>
<enum name="RcTokenType" cname="GtkRcTokenType" gtype="gtk_rc_token_type_get_type" type="enum">
<member cname="GTK_RC_TOKEN_INVALID" name="Invalid" />
<member cname="GTK_RC_TOKEN_INVALID" name="Invalid" value="G_TOKEN_LAST" />
<member cname="GTK_RC_TOKEN_INCLUDE" name="Include" />
<member cname="GTK_RC_TOKEN_NORMAL" name="Normal" />
<member cname="GTK_RC_TOKEN_ACTIVE" name="Active" />
@ -382,7 +382,7 @@
<member cname="GTK_SELECTION_SINGLE" name="Single" />
<member cname="GTK_SELECTION_BROWSE" name="Browse" />
<member cname="GTK_SELECTION_MULTIPLE" name="Multiple" />
<member cname="GTK_SELECTION_EXTENDED" name="Extended" />
<member cname="GTK_SELECTION_EXTENDED" name="Extended" value="Multiple" />
</enum>
<enum name="ShadowType" cname="GtkShadowType" gtype="gtk_shadow_type_get_type" type="enum">
<member cname="GTK_SHADOW_NONE" name="None" />
@ -398,12 +398,12 @@
<member cname="GTK_SIDE_RIGHT" name="Right" />
</enum>
<enum name="SignalRunType" cname="GtkSignalRunType" deprecated="1" gtype="gtk_signal_run_type_get_type" type="enum">
<member cname="GTK_RUN_FIRST" name="First" />
<member cname="GTK_RUN_LAST" name="Last" />
<member cname="GTK_RUN_BOTH" name="Both" />
<member cname="GTK_RUN_NO_RECURSE" name="NoRecurse" />
<member cname="GTK_RUN_ACTION" name="Action" />
<member cname="GTK_RUN_NO_HOOKS" name="NoHooks" />
<member cname="GTK_RUN_FIRST" name="First" value="G_SIGNAL_RUN_FIRST" />
<member cname="GTK_RUN_LAST" name="Last" value="G_SIGNAL_RUN_LAST" />
<member cname="GTK_RUN_BOTH" name="Both" value="GTK_RUN_FIRST | GTK_RUN_LAST" />
<member cname="GTK_RUN_NO_RECURSE" name="NoRecurse" value="G_SIGNAL_NO_RECURSE" />
<member cname="GTK_RUN_ACTION" name="Action" value="G_SIGNAL_ACTION" />
<member cname="GTK_RUN_NO_HOOKS" name="NoHooks" value="G_SIGNAL_NO_HOOKS" />
</enum>
<enum name="SizeGroupMode" cname="GtkSizeGroupMode" gtype="gtk_size_group_mode_get_type" type="enum">
<member cname="GTK_SIZE_GROUP_NONE" name="None" />

16
parser/gapi2xml.pl
View File

@ -228,12 +228,12 @@ foreach $cname (sort(keys(%edefs))) {
if ($enum_gtype{$cname}) {
$enum_elem->setAttribute("gtype", $enum_gtype{$cname});
}
if ($def =~ /=\s*1\s*<<\s*\d+/) {
if ($def =~ /<</) {
$enum_elem->setAttribute('type', "flags");
} else {
$enum_elem->setAttribute('type', "enum");
}
$def =~ /\{(.*)\}/;
$def =~ /\{(.*\S)\s*\}/;
@vals = split(/,\s*/, $1);
$vals[0] =~ s/^\s+//;
@v0 = split(/_/, $vals[0]);
@ -252,12 +252,14 @@ foreach $cname (sort(keys(%edefs))) {
}
foreach $val (@vals) {
if ($val =~ /$common\_?(\w+)\s*=\s*(\-?\d+.*)/) {
$val =~ s/=\s*\(\s*(.*\S)\s*\)\s*/= \1/;
if ($val =~ /$common\_?(\w+)\s*=\s*(.*)$/) {
$name = $1;
if ($2 =~ /1u?\s*<<\s*(\d+)/) {
$enumval = "1 << $1";
} else {
$enumval = $2;
$enumval = $2;
if ($enumval =~ /^(\d+|0x[0-9A-Fa-f]+)u?\s*<<\s*(\d+)$/) {
$enumval = "$1 << $2";
} elsif ($enumval =~ /^$common\_?(\w+)$/) {
$enumval = StudlyCaps(lc($1))
}
} elsif ($val =~ /$common\_?(\w+)/) {
$name = $1; $enumval = "";