3b56934fb9
2 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
Zack Weinberg
|
0e5921e8a0 |
Integrated preprocessor.
top level: * Makefile.in: Remove all references to c-parse.gperf, c-gperf.h, and c-parse.h. Remove -d from yacc command line generating c-parse.c. Update dependencies. * c-parse.gperf, c-gperf.h: Delete. * c-common.c: Don't define parse_options, cpp_token, yy_cur, yy_lim, or yy_get_token. Don't define get_directive_line if USE_CPPLIB. * c-common.h: Add multiple include guard. Define RID values for every keyword in C, C++, and Objective C. Put all the modifiers first. (struct c_fileinfo, get_fileinfo, dump_time_statistics): New. * c-decl.c (c_decode_option): Handle -lang-objc here. (print_lang_identifier): Handle C_IS_RESERVED_WORD case. (grokdeclarator): Adjust for new RID scheme. (extract_interface_info): New stub. * c-lang.c: Don't declare yy_cur or parse_options. (lang_init_options): Call cpp_init. Don't call cpp_options_init. (lang_init): Don't call check_newline if USE_CPPLIB. * c-lex.c: Don't include c-parse.h. Do include timevar.h. Elide lots of unnecessary code if USE_CPPLIB. Delete code rendered unnecessary by new architecture. Move routines not shared with C++ to c-parse.in. Maintain a local idea of the line number. Handle C++ as well as C. [USE_CPPLIB]: Declare and register callbacks for #ident and for entering/leaving files. (init_c_lex, c_lex): Are now the entry points to this file. (check_newline): Break out directive handling to process_directive. (read_ucs, is_extended_char, utf8_extend_token): Moved here from C++ front end. (readescape, parse_float): Overhaul. (lex_number, lex_string, lex_charconst): Break out of c_lex (n'ee yylex). (get_fileinfo, update_header_times, dump_one_header, dump_time_statistics): New and/or moved here from C++. Support per-file data needed by C++ and per-header timing statistics (C++ only, at the moment). * c-lex.h: Update prototypes. Add multiple include guard. * c-tree.h (struct lang_identifier): Add rid_code field. (C_IS_RESERVED_WORD, C_RID_CODE): New. * c-parse.in: Include c-pragma.h. Remove unnecesary calls to reinit_parse_for_function and/or position_after_white_space. (save_filename, save_lineno): Look ahead before saving. (label -> identifier ':'): Save file and line before shifting ':'. (reservedwords): No need to call get_identifier. (init_parse, finish_parse, yyerror, yylex, yyprint, make_pointer_declarator): Are now here for C/ObjC. (rid_to_yy): Conversion table from RID constants to Yacc codes. * c-pragma.c: Rewrite parsing logic to fit with cpplib's #pragma registry. Provide dummy implementation of that interface if !USE_CPPLIB. * c-pragma.h: Update to match. * flags.h: Add multiple include guard. (flag_detailed_statistics): Moved here from C++. * toplev.c: Define flag_detailed_statistics. * gcc.c (C specs): Use %(trad_capable_cpp) for -E|-M|-MM case #if USE_CPPLIB. * timevar.def (TV_CPP, TV_LEX): New. * timevar.h: Add multiple include guard. * objc/lang-specs.h: Use %(trad_capable_cpp) for -E|-M|-MM case #if USE_CPPLIB. * objc/objc-act.c: Don't mention yy_cur or parse_options. Initialize cpplib properly. Force lineno to 0 after first call to check_newline. Don't handle -lang-objc here. Move forget_protocol_qualifiers and remember_protocol_qualifiers here. cp: * Make-lang.in, Makefile.in: Remove all references to input.c, gxx.gperf, and hash.h. Add ../c-lex.o to C_OBJS. * gxx.gperf, hash.h, input.c: Delete. * lang-specs.h: Pass -lang-c++ to cc1plus so cpplib is initialized properly. * class.c (fixup_pending_inline): Take a tree, not a struct pending_inline *. All callers changed. (init_class_processing): Set RID_PUBLIC, RID_PRIVATE, RID_PROTECTED entries in ridpointers[] array here. * decl.c (duplicate_decls): Do not refer to struct pending_inline. (record_builtin_type, init_decl_processing): Use RID_MAX not CP_RID_MAX. (grokdeclarator): Use C_IS_RESERVED_WORD. * decl2.c (lang_decode_option): Ignore -lang-c++ for sake of cpplib. (grok_x_components): Do not inspect pending_inlines chain. * cp-tree.h (struct lang_identifier): Add rid_code entry. (C_IS_RESERVED_WORD, C_RID_CODE, C_RID_YYCODE): New. (flag_no_gnu_keywords, flag_operator_names, rid_to_yy): Declare. (DEFARG_LENGTH, struct pending_inline, TIME_IDENTIFIER_TIME, TIME_IDENTIFIER_FILEINFO): Kill. Update prototypes. * lex.h: Expunge cp_rid. Rewrite RIDBIT macros to use just a single 32-bit word. * parse.y: Call do_pending_inlines unconditionally. reinit_parse_for_method is now snarf_method. fn.defpen is no longer necessary. Remove unnecessary <itype> annotation on SCOPE. Do not refer to end_of_file or struct pending_inline. * semantics.c (begin_inline_definitions): Call do_pending_inlines unconditionally. * lex.c: Remove all code now shared with C front end. Initialize cpplib properly if USE_CPPLIB. Put reserved words into the get_identifier table. Rewrite pragma handling to work with the registry. Move code to save tokens for later processing to spew.c. * spew.c: Rewrite everything in terms of token streams instead of text. Move routines here from lex.c / input.c as appropriate. GC-mark trees hanging off the pending inlines chain. testsuite: * g++.old-deja/g++.benjamin/13478.C: Put meaningful tags on ERROR markers. * g++.old-deja/g++.brendan/crash8.C: Move ERROR marker up one line. * gcc.dg/c99-array-nonobj-1.c: Don't expect func[] cases to fail. * gcc.dg/wtr-label-1.c: Don't use unconstrained .* in error regexps. * gcc.dg/wtr-suffix-1.c: Correct error regexps. * gcc.dg/cpp/unc1.c, gcc.dg/cpp/unc2.c, gcc.dg/cpp/unc3.c: Preprocess only. * gcc.dg/cpp/unc4.c: Adjust line number in dg-error line. * gcc.dg/noncompile/const-ll-1.c: Generalize error regexp. From-SVN: r36216 |
||
Zack Weinberg
|
d845dc520b |
cpp: New directory.
* gcc.dg/cpp: New directory. * gcc.dg/cpp/cpp.exp: New driver. * gcc.dg/cpp/20000627-1.c: New test. * gcc.c-torture/special/special.exp: Remove entry for 921210-1.c. * gcc.c-torture/special/921210-1.c: Move to gcc.dg/cpp/19921210-1.c and rewrite as a compilation test. * gcc.dg: Move many files into the cpp subdirectory, possibly renaming or editing them as well. Old name New name 990119-1.c cpp/19990119-1.c 990228-1.c cpp/19990228-1.c 990407-1.c cpp/19990407-1.c 990409-1.c cpp/19990409-1.c 990413-1.c cpp/19990413-1.c 990703-1.c cpp/19990703-1.c 20000127-1.c cpp/20000127-1.c 20000129-1.c cpp/20000129-1.c 20000207-1.c cpp/20000207-1.c 20000207-2.c cpp/20000207-2.c 20000209-1.c cpp/20000209-1.c 20000209-2.c cpp/20000209-2.c 20000301-1.c cpp/20000301-1.c 20000419-1.c cpp/20000419-1.c 20000510-1.S cpp/20000510-1.S 20000519-1.c cpp/20000519-1.c 20000529-1.c cpp/20000529-1.c 20000625-1.c cpp/20000625-1.c 20000625-2.c cpp/20000625-2.c cpp-as1.c cpp/assert1.c cpp-as2.c cpp/assert2.c cxx-comments-1.c cpp/cxxcom1.c cxx-comments-2.c cpp/cxxcom2.c endif-label.c cpp/endif.c cpp-hash1.c cpp/hash1.c cpp-hash2.c cpp/hash2.c cpp-if1.c cpp/if-1.c cpp-if2.c cpp/if-2.c cpp-if3.c cpp/if-3.c cpp-if4.c cpp/if-4.c cpp-if5.c cpp/if-5.c cpp-cond.c cpp/if-cexp.c cpp-missingop.c cpp/if-mop.c cpp-missingparen.c cpp/if-mpar.c cpp-opprec.c cpp/if-oppr.c cpp-ifparen.c cpp/if-paren.c cpp-shortcircuit.c cpp/if-sc.c cpp-shift.c cpp/if-shift.c cpp-unary.c cpp/if-unary.c cpp-li1.c cpp/line1.c cpp-li2.c cpp/line2.c lineno.c cpp/line3.c lineno-2.c cpp/line4.c cpp-mi.c cpp/mi1.c cpp-mic.h cpp/mi1c.h cpp-micc.h cpp/mi1cc.h cpp-mind.h cpp/mi1nd.h cpp-mindp.h cpp/mi1ndp.h cpp-mix.h cpp/mi1x.h cpp-mi2.c cpp/mi2.c cpp-mi2a.h cpp/mi2a.h cpp-mi2b.h cpp/mi2b.h cpp-mi2c.h cpp/mi2c.h cpp-mi3.c cpp/mi3.c cpp-mi3.def cpp/mi3.def poison-1.c cpp/poison.c pr-impl.c cpp/prag-imp.c cpp-redef-2.c cpp/redef1.c cpp-redef.c cpp/redef2.c strpaste.c cpp/strp1.c strpaste-2.c cpp/strp2.c cpp-tradpaste.c cpp/tr-paste.c cpp-tradstringify.c cpp/tr-str.c cpp-tradwarn1.c cpp/tr-warn1.c cpp-tradwarn2.c cpp/tr-warn2.c trigraphs.c cpp/trigraphs.c cpp-unc1.c cpp/unc1.c cpp-unc2.c cpp/unc2.c cpp-unc3.c cpp/unc3.c cpp-unc.c cpp/unc4.c undef.c cpp/undef1.c undef-2.c cpp/undef2.c cpp-wi1.c cpp/widestr1.c From-SVN: r34747 |