From 5e00dbd6faf56c0bde9674c7702aa2d655be2db1 Mon Sep 17 00:00:00 2001 From: Karl Williamson Date: Sun, 26 Jul 2015 22:47:56 -0600 Subject: mktables: Convert PropValueAliases.txt to use new early infrastructure This file is crucial to compiling perl these days. This commit converts to use the new infrastructure for dealing with compiling Unicode releases prior to when this file was made available. --- lib/unicore/mktables | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'lib/unicore') diff --git a/lib/unicore/mktables b/lib/unicore/mktables index e9649d00ad..b7dc475361 100644 --- a/lib/unicore/mktables +++ b/lib/unicore/mktables @@ -10171,6 +10171,16 @@ END return @return; } +sub substitute_PropValueAliases($) { + # Deal with early releases that don't have the crucial + # PropValueAliases.txt file. + + my $file_object = shift; + $file_object->insert_lines(get_old_property_value_aliases()); + + process_PropValueAliases($file_object); +} + sub process_PropValueAliases { # This file contains values that properties look like: # bc ; AL ; Arabic_Letter @@ -10196,12 +10206,6 @@ sub process_PropValueAliases { my $file= shift; Carp::carp_extra_args(\@_) if main::DEBUG && @_; - # This whole file was non-existent in early releases, so use our own - # internal one if necessary. - if (! -e 'PropValueAliases.txt') { - $file->insert_lines(get_old_property_value_aliases()); - } - if ($v_version lt 4.0.0) { $file->insert_lines(split /\n/, <<'END' hst; L ; Leading_Jamo @@ -18536,8 +18540,9 @@ my @input_file_objects = ( Progress_Message => 'Finishing property setup', Handler => \&finish_property_setup, ), - Input_file->new('PropValueAliases.txt', v0, + Input_file->new('PropValueAliases.txt', v3.2, Handler => \&process_PropValueAliases, + Early => [ \&substitute_PropValueAliases ], Has_Missings_Defaults => $NOT_IGNORED, Required_Even_in_Debug_Skip => 1, ), -- cgit v1.2.1