diff options
| author | Eike Rathke <erack@redhat.com> | 2017-05-08 19:21:38 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2017-05-08 19:22:06 +0200 |
| commit | d32f02bf0c46f840b433a0773397cd2dfa3b0a21 (patch) | |
| tree | 97633d7439c98a5193ae782f0d601ec401116fe8 | |
| parent | e8a05109d91bb9e82fcec5204514766f4bdbbee8 (diff) | |
Adapt to reality, defines are LanguageType strong_int
... since c70d49c7c888da8cfd73db8585e7be1f37fc398a, so adjust the regex.
Change-Id: I460b5983cd7a0d3e4c4368e946bb8b8f6153f9a4
| -rwxr-xr-x | i18nlangtag/source/isolang/langid.pl | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/i18nlangtag/source/isolang/langid.pl b/i18nlangtag/source/isolang/langid.pl index ffbadeff0beb..521a693795a2 100755 --- a/i18nlangtag/source/isolang/langid.pl +++ b/i18nlangtag/source/isolang/langid.pl @@ -211,7 +211,7 @@ sub main() # LangID value to obtain the define identifier. if ($grepdef) { - # #define LANGUAGE_AFRIKAANS 0x0436 + # #define LANGUAGE_AFRIKAANS LanguageType(0x0436) @resultlist = grepFile( $modifier . '^\s*#\s*define\s+[A-Z_]*' . $grepdef, "$SRC_ROOT", "include", "i18nlangtag/lang.h", 1, ()); @@ -221,15 +221,15 @@ sub main() printf( "LangID: 0x%04X (dec %d), primary: 0x%03x, sub 0x%02x\n", $lcid, $lcid, $parts[0], $parts[1]); my $buf = sprintf( "0x%04X", $lcid); - # #define LANGUAGE_AFRIKAANS 0x0436 + # #define LANGUAGE_AFRIKAANS LanguageType(0x0436) @resultlist = grepFile( - '^\s*#\s*define\s+\w+\s+' . $buf, + '^\s*#\s*define\s+\w+\s+LanguageType\(' . $buf . '\)', "$SRC_ROOT", "include", "i18nlangtag/lang.h", 1, ()); } for $result (@resultlist) { - # #define LANGUAGE_AFRIKAANS 0x0436 - if ($result =~ /^\s*#\s*define\s+(\w+)\s+(0x[0-9a-fA-F]+)/) + # #define LANGUAGE_AFRIKAANS LanguageType(0x0436) + if ($result =~ /^\s*#\s*define\s+(\w+)\s+LanguageType\((0x[0-9a-fA-F]+)\)/) { push( @greplist, '\b' . $1 . '\b'); $modifier = ""; # complete identifier now case sensitive @@ -328,8 +328,8 @@ sub main() my @lcidlist; for $result (@resultlist) { - # #define LANGUAGE_AFRIKAANS 0x0436 - if ($result =~ /^\s*#\s*define\s+(\w+)\s+(0x[0-9a-fA-F]+)/) + # #define LANGUAGE_AFRIKAANS LanguageType(0x0436) + if ($result =~ /^\s*#\s*define\s+(\w+)\s+LanguageType\((0x[0-9a-fA-F]+)\)/) { push( @lcidlist, oct( $2)); } |