luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-26 15:36:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "mkenums: Support public/private trigraph"

Browse Source 
This reverts commit 9ba17d511e.

This conflicts with the python port in the meson branch.
This commit is contained in:
Matthias Clasen 2017-07-13 19:03:00 -04:00
parent 9aa98db404
commit 41385745e7
1 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gobject/glib-mkenums.in
View File

@ -19,7 +19,6 @@ my $option_lowercase_name; # DEPRECATED. A lower case name to use as part
# uses abnormal capitalization and we can not # uses abnormal capitalization and we can not
# guess where to put the underscores. # guess where to put the underscores.
my $seenbitshift; # Have we seen bitshift operators? my $seenbitshift; # Have we seen bitshift operators?
my $seenprivate; # Have we seen a private option?
my $enum_prefix; # Prefix for this enumeration my $enum_prefix; # Prefix for this enumeration
my $enumname; # Name for this enumeration my $enumname; # Name for this enumeration
my $enumshort; # $enumname without prefix my $enumshort; # $enumname without prefix
@ -116,8 +115,6 @@ sub parse_entries {
$seenbitshift = 1; $seenbitshift = 1;
} }
next if $seenprivate;
if (defined $options) { if (defined $options) {
my %options = parse_trigraph($options); my %options = parse_trigraph($options);
if (!defined $options{skip}) { if (!defined $options{skip}) {
@ -128,21 +125,6 @@ sub parse_entries {
} }
} elsif (m@^\s*\#@) { } elsif (m@^\s*\#@) {
# ignore preprocessor directives # ignore preprocessor directives
} elsif (m@^\s*
/\*< (([^*]|\*(?!/))*) >\s*\*/
\s*$
@x) {
my ($options) = ($1);
if (defined $options) {
my %options = parse_trigraph($options);
if (defined $options{private}) {
$seenprivate = 1;
}
elsif (defined $options{public}) {
$seenprivate = 0;
}
}
} else { } else {
print STDERR "$0: $file_name:$.: Failed to parse `$_'\n"; print STDERR "$0: $file_name:$.: Failed to parse `$_'\n";
} }
@ -371,7 +353,6 @@ while (<>) {
} }
$seenbitshift = 0; $seenbitshift = 0;
$seenprivate = 0;
@entries = (); @entries = ();
# Now parse the entries # Now parse the entries