From 4f4e53dd8517c0b2cbe36f0cf866f9f5ebe294e9 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Mon, 24 May 2004 10:50:45 +0000 Subject: Makefile.def (host_modules): add libcpp. ChangeLog: 2004-05-23 Paolo Bonzini * Makefile.def (host_modules): add libcpp. * Makefile.tpl: Add dependencies on and for libcpp. * Makefile.in: Regenerate. * configure.in: Add libcpp host module. * configure: Regenerate. config/ChangeLog: 2004-05-23 Paolo Bonzini * acx.m4 (ACX_HEADER_STDBOOL, ACX_HEADER_STRING): From gcc. gcc/ChangeLog: 2004-05-23 Paolo Bonzini Move libcpp to the toplevel. * Makefile.in: Remove references to libcpp files, use CPPLIBS instead of libcpp.a. Define SYMTAB_H and change hashtable.h to that. * aclocal.m4 (gcc_AC_HEADER_STDBOOL, gcc_AC_HEADER_STRING, gcc_AC_C__BOOL): Remove. * configure.ac (gcc_AC_C__BOOL, HAVE_UCHAR): Remove tests. * configure: Regenerate. * config.in: Regenerate. * c-ppoutput.c: Include ../libcpp/internal.h instead of cpphash.h. * cppcharset.c: Removed. * cpperror.c: Removed. * cppexp.c: Removed. * cppfiles.c: Removed. * cpphash.c: Removed. * cpphash.h: Removed. * cppinit.c: Removed. * cpplex.c: Removed. * cpplib.c: Removed. * cpplib.h: Removed. * cppmacro.c: Removed. * cpppch.c: Removed. * cpptrad.c: Removed. * cppucnid.h: Removed. * cppucnid.pl: Removed. * cppucnid.tab: Removed. * hashtable.c: Removed. * hashtable.h: Removed. * line-map.c: Removed. * line-map.h: Removed. * mkdeps.c: Removed. * mkdeps.h: Removed. * stringpool.h: Include symtab.h instead of hashtable.h. * tree.h: Include symtab.h instead of hashtable.h. * system.h (O_NONBLOCK, O_NOCTTY): Do not define. gcc/cp/ChangeLog: 2004-05-23 Paolo Bonzini * Make-lang.in: No need to specify $(LIBCPP). gcc/java/ChangeLog: 2004-05-23 Paolo Bonzini * Make-lang.in: Link in $(LIBCPP) instead of mkdeps.o. libcpp/ChangeLog: 2004-05-23 Paolo Bonzini Moved libcpp from the gcc subdirectory to the toplevel. * Makefile.am: New file. * Makefile.in: Regenerate. * configure.ac: New file. * configure: Regenerate. * config.in: Regenerate. * charset.c: Moved from gcc/cppcharset.c. Add note about brokenness of input charset detection. Adjust for change in name of cppucnid.h. * errors.c: Moved from gcc/cpperror.c. Do not include intl.h. * expr.c: Moved from gcc/cppexp.c. * files.c: Moved from gcc/cppfiles.c. Do not include intl.h. Remove #define of O_BINARY, it is in system.h. * identifiers.c: Moved from gcc/cpphash.c. * internal.h: Moved from gcc/cpphash.h. Change header guard name. All other files adjusted to match name change. * init.c: Moved from gcc/cppinit.c. (init_library) [ENABLE_NLS]: Call bindtextdomain. * lex.c: Moved from gcc/cpplex.c. * directives.c: Moved from gcc/cpplib.c. * macro.c: Moved from gcc/cppmacro.c. * pch.c: Moved from gcc/cpppch.c. Do not include intl.h. * traditional.c: Moved from gcc/cpptrad.c. * ucnid.h: Moved from gcc/cppucnid.h. Change header guard name. * ucnid.pl: Moved from gcc/cppucnid.pl. * ucnid.tab: Moved from gcc/cppucnid.tab. Change header guard name. * symtab.c: Moved from gcc/hashtable.c. * line-map.c: Moved from gcc. Do not include intl.h. * mkdeps.c: Moved from gcc. * system.h: New file. libcpp/include/ChangeLog: 2004-05-23 Paolo Bonzini * cpplib.h: Moved from gcc. Change header guard name. * line-map.h: Moved from gcc. Change header guard name. * mkdeps.h: Moved from gcc. Change header guard name. * symtab.h: Moved from gcc/hashtable.h. Change header guard name. libcpp/po/ChangeLog: 2004-05-23 Paolo Bonzini * be.po: Extracted from gcc/po/be.po. * ca.po: Extracted from gcc/po/ca.po. * da.po: Extracted from gcc/po/da.po. * de.po: Extracted from gcc/po/de.po. * el.po: Extracted from gcc/po/el.po. * es.po: Extracted from gcc/po/es.po. * fr.po: Extracted from gcc/po/fr.po. * ja.po: Extracted from gcc/po/ja.po. * nl.po: Extracted from gcc/po/nl.po. * sv.po: Extracted from gcc/po/sv.po. * tr.po: Extracted from gcc/po/tr.po. From-SVN: r82199 --- gcc/cppucnid.pl | 130 -------------------------------------------------------- 1 file changed, 130 deletions(-) delete mode 100644 gcc/cppucnid.pl (limited to 'gcc/cppucnid.pl') diff --git a/gcc/cppucnid.pl b/gcc/cppucnid.pl deleted file mode 100644 index eb8bbca..0000000 --- a/gcc/cppucnid.pl +++ /dev/null @@ -1,130 +0,0 @@ -#! /usr/bin/perl -w -use strict; - -# Convert cppucnid.tab to cppucnid.h. We use two arrays of length -# 65536 to represent the table, since this is nice and simple. The -# first array holds the tags indicating which ranges are valid in -# which contexts. The second array holds the language name associated -# with each element. - -our(@tags, @names); -@tags = ("") x 65536; -@names = ("") x 65536; - - -# Array mapping tag numbers to standard #defines -our @stds; - -# Current standard and language -our($curstd, $curlang); - -# First block of the file is a template to be saved for later. -our @template; - -while (<>) { - chomp; - last if $_ eq '%%'; - push @template, $_; -}; - -# Second block of the file is the UCN tables. -# The format looks like this: -# -# [std] -# -# ; language -# xxxx-xxxx xxxx xxxx-xxxx .... -# -# with comment lines starting with #. - -while (<>) { - chomp; - /^#/ and next; - /^\s*$/ and next; - /^\[(.+)\]$/ and do { - $curstd = $1; - next; - }; - /^; (.+)$/ and do { - $curlang = $1; - next; - }; - - process_range(split); -} - -# Print out the template, inserting as requested. -$\ = "\n"; -for (@template) { - print("/* Automatically generated from cppucnid.tab, do not edit */"), - next if $_ eq "[dne]"; - print_table(), next if $_ eq "[table]"; - print; -} - -sub print_table { - my($lo, $hi); - my $prevname = ""; - - for ($lo = 0; $lo <= $#tags; $lo = $hi) { - $hi = $lo; - $hi++ while $hi <= $#tags - && $tags[$hi] eq $tags[$lo] - && $names[$hi] eq $names[$lo]; - - # Range from $lo to $hi-1. - # Don't make entries for ranges that are not valid idchars. - next if ($tags[$lo] eq ""); - my $tag = $tags[$lo]; - $tag = " ".$tag if $tag =~ /^C99/; - - if ($names[$lo] eq $prevname) { - printf(" { 0x%04x, 0x%04x, %-11s },\n", - $lo, $hi-1, $tag); - } else { - printf(" { 0x%04x, 0x%04x, %-11s }, /* %s */\n", - $lo, $hi-1, $tag, $names[$lo]); - } - $prevname = $names[$lo]; - } -} - -# The line is a list of four-digit hexadecimal numbers or -# pairs of such numbers. Each is a valid identifier character -# from the given language, under the given standard. -sub process_range { - for my $range (@_) { - if ($range =~ /^[0-9a-f]{4}$/) { - my $i = hex($range); - if ($tags[$i] eq "") { - $tags[$i] = $curstd; - } else { - $tags[$i] = $curstd . "|" . $tags[$i]; - } - if ($names[$i] ne "" && $names[$i] ne $curlang) { - warn sprintf ("language overlap: %s/%s at %x (tag %d)", - $names[$i], $curlang, $i, $tags[$i]); - next; - } - $names[$i] = $curlang; - } elsif ($range =~ /^ ([0-9a-f]{4}) - ([0-9a-f]{4}) $/x) { - my ($start, $end) = (hex($1), hex($2)); - my $i; - for ($i = $start; $i <= $end; $i++) { - if ($tags[$i] eq "") { - $tags[$i] = $curstd; - } else { - $tags[$i] = $curstd . "|" . $tags[$i]; - } - if ($names[$i] ne "" && $names[$i] ne $curlang) { - warn sprintf ("language overlap: %s/%s at %x (tag %d)", - $names[$i], $curlang, $i, $tags[$i]); - next; - } - $names[$i] = $curlang; - } - } else { - warn "malformed range expression $range"; - } - } -} -- cgit v1.1