* cplus-dem.c (work_stuff): Replace const_type and volatile_type

	with type_quals.
	(TYPE_UNQUALIFIED): New macro.
	(TYPE_QUAL_CONST): Likewise.
	(TYPE_QUAL_VOLATILE): Likewise.
	(TYPE_QUAL_RESTRICT): Likewise.
	(code_for_qualifier): New function.
	(qualifier_string): Likewise.
	(demangle_qualifier): Likewise.
	(internal_cplus_demangle): Use them.
	(demangle_signature): Likewise.
	(demangle_template_value_parm): Likewise.
	(do_type): Likewise.
	(demangle_fund_type)): Likewise.
	* Makefile.in (hash.h): Run gperf when necessary.
	* cp-tree.h (CP_TYPE_READONLY): Remove.
	(CP_TYPE_VOLATILE): Likewise.
	(CP_TYPE_QUALS): New macro.
	(CP_TYPE_CONST_P): Likewise.
	(CP_TYPE_VOLATILE_P): Likewise.
	(CP_TYPE_RESTRICT_P): Likewise.
	(CP_TYPE_CONST_NON_VOLATILE_P): Likewise.
	(cp_build_type_variant): Rename to ...
	(cp_build_qualified_type): New function.
	(c_apply_type_quals_to_decl): Declare.
	(SIGNATURE_POINTER_NAME_FORMAT): Modify to allow `restrict'.
	(SIGNATURE_REFERENCE_NAME_FORMAT): Likewise.
	(cp_type_qual_from_rid): New function.
	(compparms): Remove unused parameter.  All callers changed.
	(cp_type_quals): New function.
	(at_least_as_qualified_p): Likewise.
	(more_qualified_p): Likewise.
	* call.c (standard_conversion): Replace calls to
	cp_build_type_variant with cp_build_qualified_type.  Use
	CP_TYPE_QUALS to get qualifiers and at_least_as_qualified_p to
	compare them.  Use CP_TYPE_* macros to check qualifiers.
	(reference_binding): Likewise.
	(implicit_conversion): Likewise.
	(add_builtin_candidates): Likewise.
	(build_over_call): Likewise.
	* class.c (overrides): Compare all qualifiers, not just `const',
	on method declarations.
	* cvt.c (convert_to_reference): More CP_TYPE_QUALS conversion, etc.
	(convert_pointer_to_real): Likewise.
	(type_promotes_to): Likewise.
	* decl.c (check_for_uninitialized_const_var): New function.
	(init_decl_processing): More CP_TYPE_QUALS conversion, etc.
	(cp_finish_decl): Use check_for_uninitialized_const_var.
	(grokdeclarator): More CP_TYPE_QUALS conversion, etc.  Update to
	handle `restrict'.
	(grok_ctor_properties): Likewise.
	(grok_op_properties): Likewise.
	(start_function): Likewise.
	(rever_static_member_fn): Likewise.
	* decl2.c (grok_method_quals): Likewise.
	(grokfield): Likewise.
	* error.c (dump_readonly_or_volatile): Rename to ...
	(dump_qualifiers): New function.  Handle `restrict'.
	(dump_type_real): Use it.
	(dump_aggr_type): Likewise.
	(dump_type_prefix): Likewise.
	(dump_type_suffix): Likewise.
	(dump_function_decl): Likewise.
	(cv_as_string): Likewise.
	* gxx.gperf: Add __restrict and __restrict__.
	* gxxint.texi: Document `u' as used for `__restrict', and a few
	other previously undocumented codes.
	* hash.h: Regenerated.
	* init.c (expand_aggr_init): More CP_TYPE_QUALS conversion, etc.
	(build_member_call): Likewise.
	(build_new_1): Likewise.
	* lex.c (init_parse): Add entry for RID_RESTRICT.
	(cons_up_default_function): More CP_TYPE_QUALS conversion, etc.
	(cp_type_qual_from_rid): Define.
	* lex.h (enum rid): Add RID_RESTRICT.
	* method.c (process_modifiers): Deal with `restrict'.
	* parse.y (primary): More CP_TYPE_QUALS conversion, etc.
	* parse.c: Regenerated.
	* pt.c (convert_nontype_argument): More CP_TYPE_QUALS conversion, etc.
	(tsubst_aggr_type): Likewise.
	(tsubst): Likewise.
	(check_cv_quals_for_unify): Likewise.
	(unify): Likewise.
	* rtti.c (init_rtti_processing): Likewise.
	(build_headof): Likewise.
	(get_tinfo_var): Likewise.
	(buidl_dynamic_cast_1): Likewise.  Fix `volatile' handling.
	(expand_class_desc): Likewise.
	(expand_attr_desc): Likewise.
	(synthesize_tinfo_fn): Likewise.
	* search.c (covariant_return_p): Likewise.  Fix `volatile' handling.
	(get_matching_virtual): Likewise.
	(expand_upcast_fixups): Likewise.
	* sig.c (build_signature_pointer_or_reference_name): Take
	type_quals, not constp and volatilep.
	(build_signature_pointer_or_reference_type): Likewise.
	(match_method_types): More CP_TYPE_QUALS conversion, etc.
	(build_signature_pointer_constructor): Likewise.
	(build_signature_method_call): Likewise.
	* tree.c (build_cplus_array_type): Likewise.
	(cp_build_type_variant): Rename to ...
	(cp_build_qualified_type): New function.  Deal with `__restrict'.
	(canonical_type_variant): More CP_TYPE_QUALS conversion, etc.
	(build_exception_variant): Likewise.
	(mapcar): Likewise.
	* typeck.c (qualif_type): Likewise.
	(common_type): Likewise.
	(comptypes): Likewise.
	(comp_cv_target_types): Likewise.
	(at_least_as_qualified_p): Define.
	(more_qualified_p): Likewise.
	(comp_cv_qualification): More CP_TYPE_QUALS conversion, etc.
	(compparms): Likewise.
	(inline_conversion): Likewise.
	(string_conv_p): Likewise.
	(build_component_ref): Likewise.
	(build_indirect_ref): Likewise.
	(build_array_ref): Likewise.
	(build_unary_op): Likewise.
	(build_conditional_expr): Likewise.
	(build_static_cast): Likewise.
	(build_c_cast): Likewise.
	(build_modify_expr): Likewise.
	(convert_For_assignment): Likewise.
	(comp_ptr_ttypes_real): Likewise.
	(cp_type_quals): New function.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@23258 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 125 insertions, 135 deletions

diff --git a/gcc/cp/hash.h b/gcc/cp/hash.h
index 21ebdd7901e..71c2f317ffe 100644
--- a/gcc/cp/hash.h
+++ b/gcc/cp/hash.h
@@ -1,14 +1,14 @@
 /* KR-C code produced by gperf version 2.7.1 (19981006 egcs) */
-/* Command-line: gperf -L KR-C -F , 0, 0 -p -j1 -g -o -t -N is_reserved_word -k1,4,7,$ ./gxx.gperf  */
+/* Command-line: gperf -L KR-C -F , 0, 0 -p -j1 -g -o -t -N is_reserved_word -k1,4,7,$ ../../../gcc/cp/gxx.gperf  */
 /* Command-line: gperf -L KR-C -F ', 0, 0' -p -j1 -g -o -t -N is_reserved_word -k1,4,$,7 gplus.gperf  */
 struct resword { char *name; short token; enum rid rid;};
 
-#define TOTAL_KEYWORDS 104
+#define TOTAL_KEYWORDS 106
 #define MIN_WORD_LENGTH 2
 #define MAX_WORD_LENGTH 16
 #define MIN_HASH_VALUE 4
-#define MAX_HASH_VALUE 261
-/* maximum key range = 258, duplicates = 0 */
+#define MAX_HASH_VALUE 250
+/* maximum key range = 247, duplicates = 0 */
 
 #ifdef __GNUC__
 __inline
@@ -18,34 +18,34 @@ hash (str, len)
      register char *str;
      register unsigned int len;
 {
-  static unsigned short asso_values[] =
+  static unsigned char asso_values[] =
     {
-      262, 262, 262, 262, 262, 262, 262, 262, 262, 262,
-      262, 262, 262, 262, 262, 262, 262, 262, 262, 262,
-      262, 262, 262, 262, 262, 262, 262, 262, 262, 262,
-      262, 262, 262, 262, 262, 262, 262, 262, 262, 262,
-      262, 262, 262, 262, 262, 262, 262, 262, 262, 262,
-      262, 262, 262, 262, 262, 262, 262, 262, 262, 262,
-      262, 262, 262, 262, 262, 262, 262, 262, 262, 262,
-      262, 262, 262, 262, 262, 262, 262, 262, 262, 262,
-      262, 262, 262, 262, 262, 262, 262, 262, 262, 262,
-      262, 262, 262, 262, 262,   0, 262,  87,  25,  96,
-       60,   0,  55,   7,   4,  41, 262,   2,  15,  49,
-       14,  63,  32,  29,   3,  23,   6,   8,   2,   2,
-        0,   7, 262, 262, 262, 262, 262, 262, 262, 262,
-      262, 262, 262, 262, 262, 262, 262, 262, 262, 262,
-      262, 262, 262, 262, 262, 262, 262, 262, 262, 262,
-      262, 262, 262, 262, 262, 262, 262, 262, 262, 262,
-      262, 262, 262, 262, 262, 262, 262, 262, 262, 262,
-      262, 262, 262, 262, 262, 262, 262, 262, 262, 262,
-      262, 262, 262, 262, 262, 262, 262, 262, 262, 262,
-      262, 262, 262, 262, 262, 262, 262, 262, 262, 262,
-      262, 262, 262, 262, 262, 262, 262, 262, 262, 262,
-      262, 262, 262, 262, 262, 262, 262, 262, 262, 262,
-      262, 262, 262, 262, 262, 262, 262, 262, 262, 262,
-      262, 262, 262, 262, 262, 262, 262, 262, 262, 262,
-      262, 262, 262, 262, 262, 262, 262, 262, 262, 262,
-      262, 262, 262, 262, 262, 262
+      251, 251, 251, 251, 251, 251, 251, 251, 251, 251,
+      251, 251, 251, 251, 251, 251, 251, 251, 251, 251,
+      251, 251, 251, 251, 251, 251, 251, 251, 251, 251,
+      251, 251, 251, 251, 251, 251, 251, 251, 251, 251,
+      251, 251, 251, 251, 251, 251, 251, 251, 251, 251,
+      251, 251, 251, 251, 251, 251, 251, 251, 251, 251,
+      251, 251, 251, 251, 251, 251, 251, 251, 251, 251,
+      251, 251, 251, 251, 251, 251, 251, 251, 251, 251,
+      251, 251, 251, 251, 251, 251, 251, 251, 251, 251,
+      251, 251, 251, 251, 251,   0, 251,  64,  93,   3,
+        0,   0,  74,  35,   0,  26, 251,   2,  31,  65,
+       23,  76,   7,  19,  45,  37,   6,  64,  12,  38,
+       14,   4, 251, 251, 251, 251, 251, 251, 251, 251,
+      251, 251, 251, 251, 251, 251, 251, 251, 251, 251,
+      251, 251, 251, 251, 251, 251, 251, 251, 251, 251,
+      251, 251, 251, 251, 251, 251, 251, 251, 251, 251,
+      251, 251, 251, 251, 251, 251, 251, 251, 251, 251,
+      251, 251, 251, 251, 251, 251, 251, 251, 251, 251,
+      251, 251, 251, 251, 251, 251, 251, 251, 251, 251,
+      251, 251, 251, 251, 251, 251, 251, 251, 251, 251,
+      251, 251, 251, 251, 251, 251, 251, 251, 251, 251,
+      251, 251, 251, 251, 251, 251, 251, 251, 251, 251,
+      251, 251, 251, 251, 251, 251, 251, 251, 251, 251,
+      251, 251, 251, 251, 251, 251, 251, 251, 251, 251,
+      251, 251, 251, 251, 251, 251, 251, 251, 251, 251,
+      251, 251, 251, 251, 251, 251
     };
   register int hval = len;
 
@@ -80,155 +80,145 @@ is_reserved_word (str, len)
       {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
       {"else", ELSE, NORID,},
       {"", 0, 0},
-      {"xor", '^', NORID,},
-      {"", 0, 0},
+      {"delete", DELETE, NORID,},
+      {"case", CASE, NORID,},
       {"__real__", REALPART, NORID},
       {"", 0, 0},
       {"true", CXX_TRUE, NORID,},
-      {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
+      {"catch", CATCH, NORID,},
+      {"typeid", TYPEID, NORID,},
       {"try", TRY, NORID,},
       {"", 0, 0}, {"", 0, 0},
-      {"new", NEW, NORID,},
+      {"void", TYPESPEC, RID_VOID,},
+      {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
+      {"private", VISSPEC, RID_PRIVATE,},
+      {"template", TEMPLATE, RID_TEMPLATE,},
+      {"protected", VISSPEC, RID_PROTECTED,},
       {"extern", SCSPEC, RID_EXTERN,},
-      {"__real", REALPART, NORID},
-      {"while", WHILE, NORID,},
+      {"", 0, 0}, {"", 0, 0},
       {"not", '!', NORID,},
-      {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
-      {"__extension__", EXTENSION, NORID},
       {"", 0, 0},
-      {"__null", CONSTANT, RID_NULL},
-      {"__asm__", ASM_KEYWORD, NORID},
-      {"return", RETURN, NORID,},
+      {"__signed", TYPESPEC, RID_SIGNED},
+      {"int", TYPESPEC, RID_INT,},
+      {"__signed__", TYPESPEC, RID_SIGNED},
+      {"__real", REALPART, NORID},
       {"", 0, 0},
-      {"long", TYPESPEC, RID_LONG,},
-      {"using", USING, NORID,},
       {"xor_eq", ASSIGN, NORID,},
-      {"__inline", SCSPEC, RID_INLINE},
-      {"short", TYPESPEC, RID_SHORT,},
-      {"__inline__", SCSPEC, RID_INLINE},
+      {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
+      {"__attribute", ATTRIBUTE, NORID},
+      {"__asm__", ASM_KEYWORD, NORID},
+      {"__attribute__", ATTRIBUTE, NORID},
+      {"compl", '~', NORID,},
+      {"public", VISSPEC, RID_PUBLIC,},
+      {"not_eq", EQCOMPARE, NORID,},
       {"switch", SWITCH, NORID,},
-      {"__alignof__", ALIGNOF, NORID},
-      {"private", VISSPEC, RID_PRIVATE,},
-      {"reinterpret_cast", REINTERPRET_CAST, NORID,},
-      {"struct", AGGR, RID_RECORD,},
+      {"__extension__", EXTENSION, NORID},
+      {"const", CV_QUALIFIER, RID_CONST,},
+      {"static", SCSPEC, RID_STATIC,},
       {"", 0, 0},
-      {"virtual", SCSPEC, RID_VIRTUAL,},
+      {"__inline", SCSPEC, RID_INLINE},
+      {"", 0, 0},
+      {"__inline__", SCSPEC, RID_INLINE},
+      {"__restrict__", CV_QUALIFIER, RID_RESTRICT},
+      {"inline", SCSPEC, RID_INLINE,},
+      {"const_cast", CONST_CAST, NORID,},
       {"static_cast", STATIC_CAST, NORID,},
-      {"", 0, 0}, {"", 0, 0},
-      {"not_eq", EQCOMPARE, NORID,},
-      {"int", TYPESPEC, RID_INT,},
-      {"__signed__", TYPESPEC, RID_SIGNED},
-      {"template", TEMPLATE, RID_TEMPLATE,},
+      {"__restrict", CV_QUALIFIER, RID_RESTRICT},
+      {"xor", '^', NORID,},
+      {"__wchar_t", TYPESPEC, RID_WCHAR  /* Unique to ANSI C++ */,},
+      {"new", NEW, NORID,},
+      {"__alignof__", ALIGNOF, NORID},
+      {"signed", TYPESPEC, RID_SIGNED,},
+      {"and", ANDAND, NORID,},
+      {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
+      {"explicit", SCSPEC, RID_EXPLICIT,},
       {"", 0, 0},
-      {"signature", AGGR, RID_SIGNATURE	/* Extension */,},
-      {"register", SCSPEC, RID_REGISTER,},
-      {"this", THIS, NORID,},
       {"__imag__", IMAGPART, NORID},
-      {"__attribute", ATTRIBUTE, NORID},
-      {"bool", TYPESPEC, RID_BOOL,},
-      {"__attribute__", ATTRIBUTE, NORID},
-      {"for", FOR, NORID,},
-      {"__imag", IMAGPART, NORID},
+      {"while", WHILE, NORID,},
+      {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
+      {"do", DO, NORID,},
       {"typename", TYPENAME_KEYWORD, NORID,},
-      {"", 0, 0}, {"", 0, 0},
-      {"delete", DELETE, NORID,},
+      {"friend", SCSPEC, RID_FRIEND,},
+      {"continue", CONTINUE, NORID,},
+      {"class", AGGR, RID_CLASS,},
+      {"default", DEFAULT, NORID,},
+      {"this", THIS, NORID,},
+      {"dynamic_cast", DYNAMIC_CAST, NORID,},
       {"typeof", TYPEOF, NORID,},
-      {"or", OROR, NORID,},
-      {"", 0, 0},
-      {"explicit", SCSPEC, RID_EXPLICIT,},
-      {"", 0, 0},
-      {"typeid", TYPEID, NORID,},
-      {"", 0, 0}, {"", 0, 0},
+      {"virtual", SCSPEC, RID_VIRTUAL,},
       {"export", SCSPEC, RID_EXPORT,},
-      {"throw", THROW, NORID,},
-      {"__asm", ASM_KEYWORD, NORID},
+      {"and_eq", ASSIGN, NORID,},
+      {"__typeof__", TYPEOF, NORID},
       {"__const__", CV_QUALIFIER, RID_CONST},
       {"__volatile", CV_QUALIFIER, RID_VOLATILE},
-      {"__typeof__", TYPEOF, NORID},
+      {"short", TYPESPEC, RID_SHORT,},
       {"__volatile__", CV_QUALIFIER, RID_VOLATILE},
       {"__const", CV_QUALIFIER, RID_CONST},
-      {"false", CXX_FALSE, NORID,},
-      {"sizeof", SIZEOF, NORID,},
-      {"", 0, 0}, {"", 0, 0},
-      {"__complex", TYPESPEC, RID_COMPLEX},
-      {"inline", SCSPEC, RID_INLINE,},
-      {"__complex__", TYPESPEC, RID_COMPLEX},
-      {"union", AGGR, RID_UNION,},
+      {"namespace", NAMESPACE, NORID,},
+      {"char", TYPESPEC, RID_CHAR,},
+      {"unsigned", TYPESPEC, RID_UNSIGNED,},
       {"double", TYPESPEC, RID_DOUBLE,},
-      {"", 0, 0},
-      {"__alignof", ALIGNOF, NORID},
-      {"", 0, 0}, {"", 0, 0},
-      {"bitor", '|', NORID,},
       {"or_eq", ASSIGN, NORID,},
+      {"__null", CONSTANT, RID_NULL},
       {"if", IF, NORID,},
-      {"", 0, 0},
-      {"case", CASE, NORID,},
-      {"", 0, 0},
-      {"enum", ENUM, NORID,},
-      {"signed", TYPESPEC, RID_SIGNED,},
-      {"", 0, 0},
-      {"__sigof__", SIGOF, NORID		/* Extension */,},
-      {"char", TYPESPEC, RID_CHAR,},
-      {"", 0, 0}, {"", 0, 0},
-      {"__signed", TYPESPEC, RID_SIGNED},
-      {"namespace", NAMESPACE, NORID,},
+      {"__signature__", AGGR, RID_SIGNATURE	/* Extension */,},
       {"__label__", LABEL, NORID},
-      {"volatile", CV_QUALIFIER, RID_VOLATILE,},
-      {"protected", VISSPEC, RID_PROTECTED,},
-      {"__wchar_t", TYPESPEC, RID_WCHAR  /* Unique to ANSI C++ */,},
-      {"", 0, 0}, {"", 0, 0},
-      {"unsigned", TYPESPEC, RID_UNSIGNED,},
-      {"continue", CONTINUE, NORID,},
-      {"break", BREAK, NORID,},
-      {"", 0, 0},
-      {"friend", SCSPEC, RID_FRIEND,},
-      {"and_eq", ASSIGN, NORID,},
-      {"typedef", SCSPEC, RID_TYPEDEF,},
+      {"long", TYPESPEC, RID_LONG,},
+      {"__imag", IMAGPART, NORID},
+      {"__asm", ASM_KEYWORD, NORID},
       {"", 0, 0},
-      {"do", DO, NORID,},
-      {"void", TYPESPEC, RID_VOID,},
+      {"__sigof__", SIGOF, NORID		/* Extension */,},
       {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
-      {"const", CV_QUALIFIER, RID_CONST,},
-      {"static", SCSPEC, RID_STATIC,},
+      {"struct", AGGR, RID_RECORD,},
       {"", 0, 0},
-      {"__typeof", TYPEOF, NORID},
+      {"volatile", CV_QUALIFIER, RID_VOLATILE,},
+      {"false", CXX_FALSE, NORID,},
+      {"sizeof", SIZEOF, NORID,},
+      {"__complex__", TYPESPEC, RID_COMPLEX},
       {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
-      {"goto", GOTO, NORID,},
+      {"for", FOR, NORID,},
+      {"or", OROR, NORID,},
+      {"register", SCSPEC, RID_REGISTER,},
+      {"throw", THROW, NORID,},
       {"", 0, 0},
-      {"asm", ASM_KEYWORD, NORID,},
-      {"operator", OPERATOR, NORID,},
-      {"__signature__", AGGR, RID_SIGNATURE	/* Extension */,},
+      {"using", USING, NORID,},
+      {"", 0, 0}, {"", 0, 0},
+      {"__complex", TYPESPEC, RID_COMPLEX},
       {"", 0, 0},
+      {"asm", ASM_KEYWORD, NORID,},
+      {"signature", AGGR, RID_SIGNATURE	/* Extension */,},
+      {"enum", ENUM, NORID,},
+      {"reinterpret_cast", REINTERPRET_CAST, NORID,},
       {"mutable", SCSPEC, RID_MUTABLE,},
-      {"", 0, 0}, {"", 0, 0},
-      {"sigof", SIGOF, NORID		/* Extension */,},
-      {"class", AGGR, RID_CLASS,},
-      {"compl", '~', NORID,},
-      {"public", VISSPEC, RID_PUBLIC,},
-      {"and", ANDAND, NORID,},
-      {"", 0, 0}, {"", 0, 0},
-      {"float", TYPESPEC, RID_FLOAT,},
+      {"__alignof", ALIGNOF, NORID},
+      {"return", RETURN, NORID,},
       {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
-      {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
-      {"default", DEFAULT, NORID,},
+      {"", 0, 0},
+      {"float", TYPESPEC, RID_FLOAT,},
       {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
-      {"", 0, 0}, {"", 0, 0},
+      {"bool", TYPESPEC, RID_BOOL,},
+      {"", 0, 0},
+      {"typedef", SCSPEC, RID_TYPEDEF,},
+      {"__typeof", TYPEOF, NORID},
       {"bitand", '&', NORID,},
+      {"break", BREAK, NORID,},
+      {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
+      {"union", AGGR, RID_UNION,},
       {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
       {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
       {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
-      {"catch", CATCH, NORID,},
+      {"goto", GOTO, NORID,},
+      {"sigof", SIGOF, NORID		/* Extension */,},
       {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
-      {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
-      {"auto", SCSPEC, RID_AUTO,},
       {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
-      {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
-      {"const_cast", CONST_CAST, NORID,},
+      {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
+      {"bitor", '|', NORID,},
+      {"auto", SCSPEC, RID_AUTO,},
       {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
       {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
       {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
       {"", 0, 0}, {"", 0, 0},
-      {"dynamic_cast", DYNAMIC_CAST, NORID,}
+      {"operator", OPERATOR, NORID,}
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)