summaryrefslogtreecommitdiff
path: root/TAO/TAO_IDL
diff options
context:
space:
mode:
authorFred Hornsey <hornseyf@objectcomputing.com>2019-10-04 21:08:49 -0500
committerFred Hornsey <hornseyf@objectcomputing.com>2019-10-04 21:08:49 -0500
commitff963e1ab38760b92450e95826afdb021a266291 (patch)
treeb24bb773348d47d7379228958dd397e0a658ab32 /TAO/TAO_IDL
parent1881b42c239c75498f75b0e14f71ebb5c5ec4b1d (diff)
downloadATCD-ff963e1ab38760b92450e95826afdb021a266291.tar.gz
tao_idl: annotations on interfaces and operations
Used bison 3.4, but the generated code doesn't look very different. Also Updated annotations.md with: - a list of what can be annotated - how to extend annotation support in the future - other minor fixes
Diffstat (limited to 'TAO/TAO_IDL')
-rw-r--r--TAO/TAO_IDL/.gitignore1
-rw-r--r--TAO/TAO_IDL/ast/ast_attribute.cpp6
-rw-r--r--TAO/TAO_IDL/ast/ast_interface.cpp6
-rw-r--r--TAO/TAO_IDL/ast/ast_operation.cpp6
-rw-r--r--TAO/TAO_IDL/docs/annotations.md107
-rw-r--r--TAO/TAO_IDL/fe/fe_lookup.cpp2
-rw-r--r--TAO/TAO_IDL/fe/idl.tab.cpp4743
-rw-r--r--TAO/TAO_IDL/fe/idl.tab.hpp15
-rw-r--r--TAO/TAO_IDL/fe/idl.ypp216
-rw-r--r--TAO/TAO_IDL/include/ast_attribute.h2
-rw-r--r--TAO/TAO_IDL/include/ast_interface.h2
-rw-r--r--TAO/TAO_IDL/include/ast_operation.h2
-rw-r--r--TAO/TAO_IDL/tao_idl_fe.mpc2
13 files changed, 2640 insertions, 2470 deletions
diff --git a/TAO/TAO_IDL/.gitignore b/TAO/TAO_IDL/.gitignore
index 7259a262bc8..656394c8c3d 100644
--- a/TAO/TAO_IDL/.gitignore
+++ b/TAO/TAO_IDL/.gitignore
@@ -1,2 +1,3 @@
/tao_idl
/fe/idl.output
+/bison_report
diff --git a/TAO/TAO_IDL/ast/ast_attribute.cpp b/TAO/TAO_IDL/ast/ast_attribute.cpp
index c72b4476ec7..3dc8331d3a8 100644
--- a/TAO/TAO_IDL/ast/ast_attribute.cpp
+++ b/TAO/TAO_IDL/ast/ast_attribute.cpp
@@ -305,4 +305,10 @@ AST_Attribute::fe_add_set_exceptions (UTL_NameList *t)
return t;
}
+bool
+AST_Attribute::annotatable () const
+{
+ return true;
+}
+
IMPL_NARROW_FROM_DECL(AST_Attribute)
diff --git a/TAO/TAO_IDL/ast/ast_interface.cpp b/TAO/TAO_IDL/ast/ast_interface.cpp
index 5537fdfb139..7c328590ba9 100644
--- a/TAO/TAO_IDL/ast/ast_interface.cpp
+++ b/TAO/TAO_IDL/ast/ast_interface.cpp
@@ -1154,5 +1154,11 @@ AST_Interface::ast_accept (ast_visitor *visitor)
return visitor->visit_interface (this);
}
+bool
+AST_Interface::annotatable () const
+{
+ return true;
+}
+
IMPL_NARROW_FROM_DECL(AST_Interface)
IMPL_NARROW_FROM_SCOPE(AST_Interface)
diff --git a/TAO/TAO_IDL/ast/ast_operation.cpp b/TAO/TAO_IDL/ast/ast_operation.cpp
index 5ba409532b6..d82257840b4 100644
--- a/TAO/TAO_IDL/ast/ast_operation.cpp
+++ b/TAO/TAO_IDL/ast/ast_operation.cpp
@@ -561,5 +561,11 @@ AST_Operation::exceptions (void)
return this->pd_exceptions;
}
+bool
+AST_Operation::annotatable () const
+{
+ return true;
+}
+
IMPL_NARROW_FROM_DECL(AST_Operation)
IMPL_NARROW_FROM_SCOPE(AST_Operation)
diff --git a/TAO/TAO_IDL/docs/annotations.md b/TAO/TAO_IDL/docs/annotations.md
index 052c5aabc50..dc7b973331c 100644
--- a/TAO/TAO_IDL/docs/annotations.md
+++ b/TAO/TAO_IDL/docs/annotations.md
@@ -6,6 +6,7 @@ compiler that uses `tao_idl`.**
**Table of Contents:**
* [IDL Annotations](#idl-annotations)
+* [What Can Be Annotated](#what-can-be-annotated)
* [Special Cases of Annotations](#special-cases-of-annotations)
* [Union Discriminators](#union-discriminators)
* [Base Types in Sequences](#base-types-in-sequences)
@@ -20,9 +21,12 @@ compiler that uses `tao_idl`.**
* [Union Discriminators](#union-discriminators-1)
* [Base Types in Sequences](#base-types-in-sequences-1)
* [Base Types in Arrays](#base-types-in-arrays-1)
+* [Extending Annotation Support](#extending-annotation-support)
* [Limitations](#limitations)
* [History](#history)
* [TAO 2.5.5](#tao-255)
+ * [TAO 2.5.6](#tao-256)
+ * [TAO 2.5.7](#tao-257)
## IDL Annotations
@@ -35,7 +39,7 @@ of writing, version 4.2, they are described in section 7.4.15.1.
The concept behind annotations exists in other languages like Java and Python,
as decorators, and in C++11 and C#, as attributes. Like Java and Python,
annotations can appear in front of declarations, have `@` at the beginning, and
-can look like function call.
+look like function calls.
Here is an example of what IDL using some OMG standard annotations might look
like:
@@ -74,16 +78,42 @@ struct Report {
};
```
-### Special Cases of Annotations
+## What Can Be Annotated
Annotations "may be applied to any IDL constructs or sub-constructs", as
defined by the OMG. This is very vague and the OMG has not clarified this as of
-IDL 4.2. [(Also see Limitation #1)](#limitation1). What can be said about it
-though is that other than before normal declarations, like before structs,
-typedefs, and constants, in TAO\_IDL as of writing, annotations can also be
-applied in the following cases. See ["Reading Special Cases of
-Annotations"](#reading-special-cases-of-annotations) for how to have the
-compiler use these kinds of annotations.
+IDL 4.2 [(Limitation #1)](#limitation1). Because of the lack of standardization
+of what can be annotated and how, annotations for specific IDL elements have to
+be added on a as-needed basis.
+
+As of writing you can put annotations before the following things in IDL and a
+backend using TAO IDL should be able to read them:
+
+- modules
+- `typedef`s
+- constants
+- structures and their member values
+- unions and their cases
+- enumerations and their enumerators
+- interfaces and their operations and attributes
+
+These are the general cases. The rest of the cases are defined in the next
+section. If an annotation application isn't listed in the general case list or
+the special case section, it is almost certainly not supported and might cause
+warnings if the usage is a general case and syntax errors if the usage a
+special case. See ["Extending Annotation
+Support"](#extending-annotation-support) if you're interested in adding it and
+are familar with GNU Bison.
+
+### Special Cases of Annotations
+
+The annotations on all the elements in the list above can be accessed using the
+`annotations()` method covered later in [Reading Annotations in the
+AST](#reading-annotations-in-the-ast). In the cases listed below, the
+annotation is used within the declaration and therefore require special access
+methods. See ["Reading Special Cases of
+Annotations"](#reading-special-cases-of-annotations) for how to have a backend
+read these kinds of annotations.
#### Union Discriminators
@@ -345,11 +375,11 @@ these lines would also need to be added:
if (document)
{
const char *comment =
- AST_Annotation_Member::narrow_from_decl ((*document)["comment"])->
+ dynamic_cast<AST_Annotation_Member *> ((*document)["comment"])->
value ()->ev ()->u.strval->get_string ();
bool deprecated =
- AST_Annotation_Member::narrow_from_decl ((*document)["deprecated"])->
+ dynamic_cast<AST_Annotation_Member *> ((*document)["deprecated"])->
value ()->ev ()->u.bval;
/*
@@ -360,7 +390,7 @@ these lines would also need to be added:
*/
const char *api_type = 0;
AST_Expression *api_type_val =
- AST_Annotation_Member::narrow_from_decl ((*document)["api_type"])->
+ dynamic_cast<AST_Annotation_Member *> ((*document)["api_type"])->
value ();
AST_Enum *api_type_enum = api_type_val->enum_parent();
if (api_type_enum)
@@ -407,7 +437,7 @@ inserted into the client header file:
*
* API_TYPE: INTERNAL_API
*/
-struct struct1
+struct struct1
{
// ...
};
@@ -419,7 +449,7 @@ struct struct1
*
* API_TYPE: USER_API
*/
-struct struct2
+struct struct2
{
// ...
};
@@ -431,7 +461,7 @@ struct struct2
*
* \deprecated This is deprecated
*/
-struct struct3
+struct struct3
{
// ...
};
@@ -466,11 +496,10 @@ Annotations placed before a definition in a scope are interpreted as annotating
the node that is being defined. Annotations in other places require special
grammar and special handling in the API.
-The following cases show how to get the last annotation called `anno` from
-these special cases.
+The following cases show how to read annotations from these special cases.
-To access these methods on a type that has been "`typedef`-ed", it must be
-resolved completely using `AST_Type *primitive_base_type ()` and a
+**NOTE:** To access these methods on a type that has been "`typedef`-ed", it
+must be resolved completely using `AST_Type *primitive_base_type ()` and a
`dynamic_cast` to the correct type as these methods are specific to these
classes.
@@ -501,6 +530,37 @@ classes.
AST_Annotation_Appl *document = node->base_type_annotations ().find ("::@external");
```
+## Extending Annotation Support
+
+**NOTE: This section assumes familarity with GNU Bison and only covers the
+general concept of extending annotation support.**
+
+How to extend support for annotations on a particular IDL element depends on a
+few things. In the `fe/idl.ypp` bison file, if the annotation would be matched
+by the `at_least_one_definition` token, like it would when annotating a
+structure, or by the `at_least_one_export` token, like it will be when
+annotating a interface operation, the change is simple in principal:
+
+1. Make sure the `AST_Decl*` node of what you want to annotate is being passed
+ up the generic annotation code in `at_least_one_export` or
+ `at_least_one_definition`.
+
+1. Implement `virutal bool annotatable() const` in the `AST_*` files of the
+ node type to return `true`. The default implementation of `AST_Decl` returns
+ `false`.
+
+If you want to implement a annotation that goes within an IDL element, like on
+it does a union discriminator, that is more complicated and will involve
+modifying the grammar and adding a special cases method to the node's class,
+like in ["Reading Special Cases of Annotations"](#reading-special-cases-of-annotations).
+
+Finally, if you do extend annotation support, please update the annotation test
+in `$TAO_ROOT/tests/IDLv4/annotations/be_init.cpp` and this file, specifically
+the ["What Can Be Annotated"](#what-can-be-annotated) and ["History"](#history)
+sections. Also update [Reading Special Cases of
+Annotations](#reading-special-cases-of-annotations) if you've added support for
+a special case.
+
## Limitations
The current limitations exist in TAO\_IDL annotation implementation as of writing:
@@ -509,7 +569,8 @@ The current limitations exist in TAO\_IDL annotation implementation as of writin
1. Because of lack of a proper grammar specification in IDL for where
annotations can go, annotations in places other than before declarations in
scopes and other places listed above will result in syntax errors, even if
- they work with other IDL tools.
+ they work with other IDL tools. See ["What Can be
+ Annotated"](#what-can-be-annotated) for details.
2. Even though this is implicitly allowed by the IDL specification, Annotations
whose local names clash with IDL keywords are not supported. This includes
@@ -531,3 +592,11 @@ the same name. This also allowed for moving `UTL_find_annotation` into
The TAO IDL Frontend no longer internally prefixes annotation names and
annotation member names with `_cxx_` if they are also a C++ keyword.
+
+### TAO 2.5.7
+
+- The TAO IDL Frontend now supports annotations on interfaces, operations, and
+ attributes.
+
+- Expanded documentation on what can be annotated and how to extend annotation
+ support.
diff --git a/TAO/TAO_IDL/fe/fe_lookup.cpp b/TAO/TAO_IDL/fe/fe_lookup.cpp
index 9379a9bc8c1..cab5c866ace 100644
--- a/TAO/TAO_IDL/fe/fe_lookup.cpp
+++ b/TAO/TAO_IDL/fe/fe_lookup.cpp
@@ -2,7 +2,7 @@
#include "ace/OS_NS_string.h"
/* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /home/fred/oci/ace_tao/tao_idl_fixes/ACE_TAO/ACE/bin/ace_gperf -M -J -c -C -D -E -T -f 0 -a -o -t -p -K keyword_ -L C++ -Z TAO_IDL_CPP_Keyword_Table -N lookup -k1,2,$ fe/keywords.dat */
+/* Command-line: /home/fred/oci/ace_tao/xtypes/ACE_TAO/ACE/bin/ace_gperf -M -J -c -C -D -E -T -f 0 -a -o -t -p -K keyword_ -L C++ -Z TAO_IDL_CPP_Keyword_Table -N lookup -k1,2,$ fe/keywords.dat */
unsigned int
TAO_IDL_CPP_Keyword_Table::hash (const char *str, unsigned int len)
{
diff --git a/TAO/TAO_IDL/fe/idl.tab.cpp b/TAO/TAO_IDL/fe/idl.tab.cpp
index d38d0c5e995..9ff7834bc96 100644
--- a/TAO/TAO_IDL/fe/idl.tab.cpp
+++ b/TAO/TAO_IDL/fe/idl.tab.cpp
@@ -1,8 +1,9 @@
-/* A Bison parser, made by GNU Bison 3.1. */
+/* A Bison parser, made by GNU Bison 3.4. */
/* Bison implementation for Yacc-like parsers in C
- Copyright (C) 1984, 1989-1990, 2000-2015, 2018 Free Software Foundation, Inc.
+ Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2019 Free Software Foundation,
+ Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -40,11 +41,14 @@
define necessary library symbols; they are noted "INFRINGES ON
USER NAME SPACE" below. */
+/* Undocumented macros, especially those whose name start with YY_,
+ are private implementation details. Do not rely on them. */
+
/* Identify Bison output. */
#define YYBISON 1
/* Bison version. */
-#define YYBISON_VERSION "3.1"
+#define YYBISON_VERSION "3.4"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -69,8 +73,8 @@
#define yylval tao_yylval
#define yychar tao_yychar
-/* Copy the first part of user declarations. */
-#line 72 "fe/idl.ypp" /* yacc.c:339 */
+/* First part of user prologue. */
+#line 72 "fe/idl.ypp"
#include "utl_identifier.h"
#include "utl_err.h"
@@ -152,13 +156,17 @@ AST_Expression::ExprType t_param_const_type = AST_Expression::EV_none;
// Compile Optional Tracing Output for Parser, can be enabled with --bison-trace
#define YYDEBUG 1
-#line 156 "fe/idl.tab.cpp" /* yacc.c:339 */
+#line 160 "fe/idl.tab.cpp"
# ifndef YY_NULLPTR
-# if defined __cplusplus && 201103L <= __cplusplus
-# define YY_NULLPTR nullptr
+# if defined __cplusplus
+# if 201103L <= __cplusplus
+# define YY_NULLPTR nullptr
+# else
+# define YY_NULLPTR 0
+# endif
# else
-# define YY_NULLPTR 0
+# define YY_NULLPTR ((void*)0)
# endif
# endif
@@ -170,8 +178,8 @@ AST_Expression::ExprType t_param_const_type = AST_Expression::EV_none;
# define YYERROR_VERBOSE 0
#endif
-/* In a future release of Bison, this section will be replaced
- by #include "idl.tab.hpp". */
+/* Use api.header.include to #include this header
+ instead of duplicating it here. */
#ifndef YY_TAO_YY_FE_IDL_TAB_HPP_INCLUDED
# define YY_TAO_YY_FE_IDL_TAB_HPP_INCLUDED
/* Debug traces. */
@@ -277,10 +285,9 @@ extern int tao_yydebug;
/* Value type. */
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-
union YYSTYPE
{
-#line 158 "fe/idl.ypp" /* yacc.c:355 */
+#line 158 "fe/idl.ypp"
AST_Decl *dcval; /* Decl value */
UTL_StrList *slval; /* String list */
@@ -325,9 +332,9 @@ union YYSTYPE
AST_Decls *decls_val;
Decl_Annotations_Pair *decl_annotations_pair_val;
-#line 329 "fe/idl.tab.cpp" /* yacc.c:355 */
-};
+#line 336 "fe/idl.tab.cpp"
+};
typedef union YYSTYPE YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
# define YYSTYPE_IS_DECLARED 1
@@ -340,9 +347,7 @@ int tao_yyparse (void);
#endif /* !YY_TAO_YY_FE_IDL_TAB_HPP_INCLUDED */
-/* Copy the second part of user declarations. */
-#line 346 "fe/idl.tab.cpp" /* yacc.c:358 */
#ifdef short
# undef short
@@ -417,15 +422,6 @@ typedef short yytype_int16;
# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
#endif
-#if !defined _Noreturn \
- && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112)
-# if defined _MSC_VER && 1200 <= _MSC_VER
-# define _Noreturn __declspec (noreturn)
-# else
-# define _Noreturn YY_ATTRIBUTE ((__noreturn__))
-# endif
-#endif
-
/* Suppress unused-variable warnings by "using" E. */
#if ! defined lint || defined __GNUC__
# define YYUSE(E) ((void) (E))
@@ -453,6 +449,8 @@ typedef short yytype_int16;
#endif
+#define YY_ASSERT(E) ((void) (0 && (E)))
+
#if ! defined yyoverflow || YYERROR_VERBOSE
/* The parser invokes alloca or malloc; define the necessary symbols. */
@@ -584,27 +582,27 @@ union yyalloc
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 4
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 1537
+#define YYLAST 1567
/* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 109
/* YYNNTS -- Number of nonterminals. */
-#define YYNNTS 398
+#define YYNNTS 399
/* YYNRULES -- Number of rules. */
-#define YYNRULES 595
+#define YYNRULES 597
/* YYNSTATES -- Number of states. */
-#define YYNSTATES 876
+#define YYNSTATES 878
-/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
- by yylex, with out-of-bounds checking. */
#define YYUNDEFTOK 2
#define YYMAXUTOK 342
+/* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM
+ as returned by yylex, with out-of-bounds checking. */
#define YYTRANSLATE(YYX) \
((unsigned) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
- as returned by yylex, without out-of-bounds checking. */
+ as returned by yylex. */
static const yytype_uint8 yytranslate[] =
{
0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@@ -648,66 +646,66 @@ static const yytype_uint8 yytranslate[] =
/* YYRLINE[YYN] -- Source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] =
{
- 0, 387, 387, 390, 391, 399, 414, 420, 424, 428,
- 436, 435, 445, 444, 454, 453, 463, 462, 472, 471,
- 481, 480, 490, 489, 499, 498, 508, 507, 517, 516,
- 526, 525, 535, 534, 544, 543, 553, 552, 562, 561,
- 575, 574, 586, 625, 629, 585, 645, 653, 667, 677,
- 707, 711, 652, 734, 738, 739, 743, 744, 749, 754,
- 748, 840, 845, 839, 914, 915, 920, 958, 962, 919,
- 978, 977, 989, 1026, 1056, 1089, 1088, 1097, 1104, 1105,
- 1106, 1107, 1111, 1115, 1120, 1163, 1167, 1119, 1194, 1237,
- 1241, 1192, 1258, 1256, 1296, 1295, 1307, 1311, 1318, 1323,
- 1331, 1356, 1382, 1446, 1447, 1451, 1452, 1453, 1458, 1462,
- 1469, 1488, 1489, 1494, 1493, 1502, 1501, 1510, 1509, 1518,
- 1517, 1526, 1525, 1534, 1533, 1542, 1541, 1550, 1549, 1561,
- 1573, 1571, 1596, 1603, 1613, 1612, 1638, 1636, 1661, 1671,
- 1682, 1726, 1753, 1783, 1787, 1791, 1795, 1782, 1857, 1858,
- 1859, 1860, 1861, 1862, 1863, 1867, 1871, 1939, 1941, 1943,
- 1944, 1956, 1957, 1969, 1970, 1982, 1983, 1992, 2004, 2005,
- 2014, 2026, 2027, 2036, 2045, 2057, 2058, 2067, 2076, 2088,
- 2146, 2147, 2154, 2158, 2163, 2170, 2174, 2178, 2183, 2187,
- 2191, 2195, 2202, 2271, 2270, 2297, 2298, 2302, 2303, 2304,
- 2306, 2305, 2314, 2315, 2319, 2375, 2379, 2386, 2399, 2409,
- 2417, 2416, 2499, 2503, 2510, 2519, 2526, 2534, 2540, 2547,
- 2560, 2559, 2568, 2572, 2576, 2580, 2606, 2614, 2613, 2685,
- 2686, 2690, 2697, 2698, 2724, 2725, 2726, 2727, 2728, 2729,
- 2730, 2731, 2735, 2736, 2737, 2738, 2742, 2743, 2744, 2748,
- 2749, 2753, 2765, 2763, 2788, 2795, 2796, 2800, 2812, 2810,
- 2835, 2842, 2858, 2876, 2877, 2881, 2885, 2889, 2896, 2900,
- 2904, 2911, 2915, 2919, 2926, 2933, 2937, 2944, 2951, 2958,
- 2965, 2973, 2972, 2986, 3017, 3021, 2985, 3038, 3041, 3042,
- 3046, 3064, 3068, 3063, 3126, 3125, 3138, 3137, 3150, 3154,
- 3187, 3191, 3250, 3254, 3149, 3276, 3283, 3296, 3305, 3312,
- 3313, 3422, 3425, 3426, 3431, 3435, 3430, 3471, 3470, 3482,
- 3492, 3510, 3518, 3517, 3531, 3535, 3530, 3551, 3550, 3601,
- 3626, 3650, 3654, 3685, 3689, 3649, 3713, 3718, 3716, 3722,
- 3726, 3766, 3770, 3764, 3858, 3929, 3938, 3928, 3952, 3962,
- 3966, 3960, 4011, 4037, 4046, 4050, 4044, 4086, 4112, 4120,
- 4119, 4166, 4176, 4194, 4202, 4206, 4201, 4266, 4267, 4272,
- 4276, 4280, 4284, 4271, 4351, 4355, 4359, 4363, 4350, 4439,
- 4443, 4472, 4476, 4438, 4492, 4496, 4562, 4566, 4490, 4601,
- 4606, 4611, 4618, 4619, 4630, 4635, 4678, 4629, 4698, 4697,
- 4706, 4705, 4716, 4721, 4719, 4725, 4730, 4734, 4729, 4773,
- 4772, 4781, 4780, 4791, 4796, 4794, 4800, 4805, 4809, 4804,
- 4854, 4861, 4862, 4863, 4970, 4974, 4978, 4986, 4990, 4985,
- 4999, 5007, 5011, 5006, 5020, 5028, 5032, 5027, 5041, 5049,
- 5053, 5048, 5062, 5069, 5081, 5079, 5102, 5109, 5137, 5174,
- 5175, 5179, 5208, 5247, 5251, 5207, 5268, 5272, 5266, 5313,
- 5312, 5320, 5327, 5328, 5333, 5332, 5341, 5340, 5349, 5348,
- 5357, 5356, 5365, 5364, 5373, 5372, 5381, 5380, 5390, 5480,
- 5486, 5511, 5617, 5626, 5630, 5636, 5708, 5780, 5854, 5853,
- 5901, 5905, 5909, 5913, 5917, 5921, 5900, 5974, 5973, 5981,
- 5988, 5993, 6001, 6005, 6000, 6015, 6016, 6020, 6022, 6021,
- 6030, 6029, 6042, 6065, 6040, 6091, 6118, 6089, 6142, 6143,
- 6144, 6148, 6149, 6153, 6180, 6210, 6254, 6258, 6208, 6273,
- 6282, 6300, 6311, 6310, 6348, 6397, 6401, 6346, 6416, 6420,
- 6427, 6431, 6435, 6439, 6443, 6447, 6451, 6455, 6459, 6463,
- 6471, 6502, 6515, 6522, 6547, 6565, 6572, 6587, 6594, 6604,
- 6608, 6628, 6632, 6603, 6645, 6651, 6654, 6661, 6660, 6667,
- 6666, 6673, 6672, 6682, 6751, 6801, 6817, 6830, 6837, 6896,
- 6901, 6905, 6900, 6966, 6970, 6965, 6983, 6984, 6989, 6988,
- 6997, 6996, 7005, 7004, 7013, 7012
+ 0, 389, 389, 392, 393, 401, 416, 422, 426, 430,
+ 438, 437, 447, 446, 456, 455, 465, 464, 474, 473,
+ 483, 482, 492, 491, 501, 500, 510, 509, 519, 518,
+ 528, 527, 537, 536, 546, 545, 555, 554, 564, 563,
+ 577, 576, 588, 627, 631, 587, 647, 655, 669, 679,
+ 709, 713, 654, 736, 740, 741, 745, 746, 751, 756,
+ 750, 842, 847, 841, 916, 920, 928, 966, 970, 927,
+ 987, 986, 998, 1035, 1065, 1098, 1097, 1106, 1113, 1114,
+ 1115, 1116, 1120, 1124, 1129, 1172, 1176, 1128, 1203, 1246,
+ 1250, 1201, 1267, 1265, 1305, 1304, 1316, 1320, 1327, 1332,
+ 1340, 1365, 1391, 1455, 1456, 1460, 1461, 1462, 1467, 1471,
+ 1478, 1497, 1498, 1502, 1517, 1524, 1523, 1533, 1532, 1542,
+ 1541, 1551, 1550, 1560, 1559, 1569, 1568, 1578, 1577, 1587,
+ 1586, 1599, 1611, 1609, 1634, 1641, 1651, 1650, 1676, 1674,
+ 1699, 1709, 1720, 1764, 1791, 1823, 1827, 1831, 1835, 1822,
+ 1897, 1898, 1899, 1900, 1901, 1902, 1903, 1907, 1911, 1979,
+ 1981, 1983, 1984, 1996, 1997, 2009, 2010, 2022, 2023, 2032,
+ 2044, 2045, 2054, 2066, 2067, 2076, 2085, 2097, 2098, 2107,
+ 2116, 2128, 2186, 2187, 2194, 2198, 2203, 2210, 2214, 2218,
+ 2223, 2227, 2231, 2235, 2242, 2311, 2310, 2337, 2338, 2342,
+ 2343, 2344, 2346, 2345, 2354, 2355, 2359, 2415, 2419, 2426,
+ 2439, 2449, 2457, 2456, 2541, 2545, 2552, 2561, 2568, 2576,
+ 2582, 2589, 2602, 2601, 2610, 2614, 2618, 2622, 2650, 2658,
+ 2657, 2729, 2730, 2734, 2741, 2742, 2768, 2769, 2770, 2771,
+ 2772, 2773, 2774, 2775, 2779, 2780, 2781, 2782, 2786, 2787,
+ 2788, 2792, 2793, 2797, 2809, 2807, 2832, 2839, 2840, 2844,
+ 2856, 2854, 2879, 2886, 2902, 2920, 2921, 2925, 2929, 2933,
+ 2940, 2944, 2948, 2955, 2959, 2963, 2970, 2977, 2981, 2988,
+ 2995, 3002, 3009, 3017, 3016, 3030, 3061, 3065, 3029, 3082,
+ 3085, 3086, 3090, 3108, 3112, 3107, 3170, 3169, 3182, 3181,
+ 3194, 3198, 3231, 3235, 3294, 3298, 3193, 3320, 3327, 3340,
+ 3349, 3356, 3357, 3466, 3469, 3470, 3475, 3479, 3474, 3515,
+ 3514, 3526, 3536, 3554, 3562, 3561, 3575, 3579, 3574, 3595,
+ 3594, 3645, 3670, 3694, 3698, 3729, 3733, 3693, 3757, 3762,
+ 3760, 3766, 3770, 3810, 3814, 3808, 3902, 3973, 3982, 3972,
+ 3996, 4006, 4010, 4004, 4055, 4081, 4090, 4094, 4088, 4130,
+ 4156, 4164, 4163, 4210, 4220, 4238, 4246, 4250, 4245, 4310,
+ 4311, 4316, 4320, 4324, 4328, 4315, 4387, 4391, 4395, 4399,
+ 4386, 4467, 4471, 4500, 4504, 4466, 4519, 4523, 4584, 4588,
+ 4518, 4625, 4630, 4635, 4642, 4643, 4654, 4659, 4702, 4653,
+ 4722, 4721, 4730, 4729, 4740, 4745, 4743, 4749, 4754, 4758,
+ 4753, 4797, 4796, 4805, 4804, 4815, 4820, 4818, 4824, 4829,
+ 4833, 4828, 4878, 4885, 4886, 4887, 4994, 4998, 5002, 5010,
+ 5014, 5009, 5023, 5031, 5035, 5030, 5044, 5052, 5056, 5051,
+ 5065, 5073, 5077, 5072, 5086, 5093, 5105, 5103, 5126, 5133,
+ 5161, 5198, 5199, 5203, 5232, 5271, 5275, 5231, 5292, 5296,
+ 5290, 5337, 5336, 5344, 5351, 5352, 5357, 5356, 5365, 5364,
+ 5373, 5372, 5381, 5380, 5389, 5388, 5397, 5396, 5405, 5404,
+ 5414, 5504, 5510, 5535, 5641, 5650, 5654, 5660, 5732, 5804,
+ 5878, 5877, 5925, 5929, 5933, 5937, 5941, 5945, 5924, 5998,
+ 5997, 6005, 6012, 6017, 6025, 6029, 6024, 6039, 6040, 6044,
+ 6046, 6045, 6054, 6053, 6066, 6089, 6064, 6115, 6142, 6113,
+ 6166, 6167, 6168, 6172, 6173, 6177, 6204, 6234, 6278, 6282,
+ 6232, 6297, 6306, 6324, 6335, 6334, 6372, 6421, 6425, 6370,
+ 6440, 6444, 6451, 6455, 6459, 6463, 6467, 6471, 6475, 6479,
+ 6483, 6487, 6495, 6526, 6539, 6546, 6571, 6589, 6596, 6611,
+ 6618, 6628, 6632, 6652, 6656, 6627, 6669, 6675, 6678, 6685,
+ 6684, 6691, 6690, 6697, 6696, 6706, 6775, 6825, 6841, 6854,
+ 6861, 6920, 6925, 6929, 6924, 6990, 6994, 6989, 7007, 7008,
+ 7013, 7012, 7021, 7020, 7029, 7028, 7037, 7036
};
#endif
@@ -753,15 +751,15 @@ static const char *const yytname[] =
"$@38", "$@39", "value_header", "$@40", "value_decl", "$@41",
"opt_truncatable", "supports_spec", "value_forward_decl",
"value_box_decl", "value_elements", "value_element", "visibility",
- "state_member", "exports", "export", "$@42", "$@43", "$@44", "$@45",
- "$@46", "$@47", "$@48", "$@49", "at_least_one_scoped_name",
- "scoped_names", "$@50", "scoped_name", "$@51", "$@52", "id",
- "defining_id", "interface_forward", "const_dcl", "$@53", "$@54", "$@55",
- "$@56", "const_type", "expression", "const_expr", "or_expr", "xor_expr",
- "and_expr", "shift_expr", "add_expr", "mult_expr", "unary_expr",
- "primary_expr", "literal", "positive_int_expr", "annotation_dcl", "$@57",
- "annotation_body", "annotation_statement", "$@58",
- "annotation_member_type", "annotation_member",
+ "state_member", "exports", "at_least_one_export", "export", "$@42",
+ "$@43", "$@44", "$@45", "$@46", "$@47", "$@48", "$@49",
+ "at_least_one_scoped_name", "scoped_names", "$@50", "scoped_name",
+ "$@51", "$@52", "id", "defining_id", "interface_forward", "const_dcl",
+ "$@53", "$@54", "$@55", "$@56", "const_type", "expression", "const_expr",
+ "or_expr", "xor_expr", "and_expr", "shift_expr", "add_expr", "mult_expr",
+ "unary_expr", "primary_expr", "literal", "positive_int_expr",
+ "annotation_dcl", "$@57", "annotation_body", "annotation_statement",
+ "$@58", "annotation_member_type", "annotation_member",
"annotation_member_default", "at_least_one_annotation",
"annotations_maybe", "annotation_appl", "@59",
"annotation_appl_params_maybe", "annotation_appl_params",
@@ -845,12 +843,12 @@ static const yytype_uint16 yytoknum[] =
};
# endif
-#define YYPACT_NINF -611
+#define YYPACT_NINF -656
#define yypact_value_is_default(Yystate) \
- (!!((Yystate) == (-611)))
+ (!!((Yystate) == (-656)))
-#define YYTABLE_NINF -537
+#define YYTABLE_NINF -539
#define yytable_value_is_error(Yytable_value) \
0
@@ -859,94 +857,94 @@ static const yytype_uint16 yytoknum[] =
STATE-NUM. */
static const yytype_int16 yypact[] =
{
- -611, 63, 739, -611, -611, -611, -611, -611, -611, -611,
- -611, -611, -611, -611, 41, 66, 98, 107, -611, 41,
- 41, -611, 38, 38, -611, -611, 41, -611, -611, 7,
- -611, 674, 29, 56, -611, -611, 70, -611, -611, -611,
- -611, -611, -611, 270, -611, -611, -611, -611, -611, 1312,
- 93, -611, -611, 69, -611, 128, -611, -611, -611, -611,
- -611, -611, -611, -611, -611, -611, -611, -611, -611, -611,
- -611, -611, -611, -611, 110, -611, -611, -611, 110, -611,
- -611, 124, 132, 586, 38, 41, 1421, 41, 41, 41,
- 41, -611, -611, -611, 71, 41, 112, -611, 118, 41,
- -611, 110, 41, 135, 146, 41, -611, -611, 16, -611,
- 21, -611, -611, 149, -611, 151, 168, 705, -611, -611,
- -611, 181, 228, -611, 188, 204, 217, 166, -611, 159,
- -611, -611, -611, -611, -611, -611, 216, -611, -611, -611,
- -611, -611, -611, 227, -611, -611, -611, -611, -611, -611,
- -611, -611, -611, -611, -611, -611, -611, -611, -611, -611,
- -611, 128, -611, -611, -611, 15, -611, -611, 218, -611,
- 220, 225, 226, -611, 38, 229, 231, 233, -611, 235,
- 236, 237, 239, 241, 240, 246, 243, -611, -611, -611,
- 248, 249, -611, -611, -611, -611, 227, -611, -611, -611,
- -611, -611, -611, -611, -611, -611, 227, -611, -611, -611,
- -611, -611, -611, -611, -611, 250, -611, 251, -611, -611,
- 253, -611, 340, -611, -611, -611, 34, 44, -611, -611,
- -611, 586, -611, -611, -611, -611, 254, -611, -611, -611,
- -611, 341, -611, -611, 49, 255, -611, -611, -611, -611,
- -611, -611, -611, -611, 344, -611, 117, 258, 306, -611,
- -611, -611, -611, -611, -611, 227, -611, -611, 257, -611,
- -611, -611, -611, -611, -611, -611, -611, -611, 306, 265,
- 266, -611, -611, -611, 41, 41, 267, 268, -611, -611,
- -611, 272, -611, 340, -611, -611, -611, -611, -611, -611,
- 357, -611, 276, 275, -611, -611, -611, -611, -611, -611,
- -611, -611, -611, -611, 152, 152, 152, 117, 227, -611,
- -611, 274, 277, 279, 104, 145, 140, -611, -611, -611,
- -611, -611, 38, -611, -611, -611, -611, 281, -611, 38,
- -611, 117, 117, 117, 273, -611, -611, -611, -611, -611,
- -611, -611, 139, -611, 1, -611, -611, -611, -611, -611,
- -611, -611, -611, 38, 306, -611, -611, -611, 290, 253,
- 1158, 1181, 294, 288, -611, 705, -611, -611, -611, 280,
- 117, 117, 117, 117, 117, 117, 117, 117, 117, 117,
- 295, 41, -611, 227, 910, 523, 117, -611, -611, -611,
- -611, -611, 117, -611, 1261, -611, -611, -611, 428, 622,
- -611, -611, -611, -611, 62, 332, 38, 38, -611, -611,
- -611, -611, -611, 62, -611, 309, -611, 307, -611, 310,
- -611, -611, 945, 227, -611, 38, 306, -611, -611, -611,
- -611, 315, -611, -611, 41, -611, -611, 318, 319, 405,
- 323, -611, -611, 277, 279, 104, 145, 145, 140, 140,
- -611, -611, -611, -611, -611, 324, -611, -611, -611, 327,
- -611, -611, -611, -611, -611, -611, 866, -611, -611, -611,
- -611, -611, 329, -611, 1402, -611, -611, 333, 328, 1003,
- 331, 334, 335, 330, -611, 325, -611, 338, -611, -611,
- -611, 339, 345, 252, 38, 38, 38, -611, 346, -611,
- -611, -611, -611, -611, -611, -611, 41, 41, -611, 347,
- -611, -611, -611, 1029, 826, 393, 1456, -611, 227, 340,
- -611, -611, 57, 64, 350, 351, 352, 340, 353, -611,
- -611, 3, -611, 48, -611, -611, 359, 360, 227, -611,
- 154, 1421, -611, 413, -611, -611, -611, -611, 49, -611,
- 355, -611, 367, 369, 376, 378, 380, -611, 227, -611,
- -611, -611, -611, -611, 381, 382, -611, -611, -611, -611,
- -611, -611, -611, -611, -611, 117, -611, 340, -611, 383,
- 41, -611, -611, 464, 227, -611, -611, -611, -611, -611,
- -611, 65, 65, 65, 385, -611, 386, 387, 388, 389,
- 390, 397, -611, -611, -611, 398, 399, 400, 404, -611,
- -611, -611, -611, -611, -611, -611, -611, -611, -611, 117,
- -611, -611, -611, 41, -611, 408, 401, 409, -611, 434,
- -611, -611, -611, -611, -611, 414, 117, 415, 1287, -611,
- 38, -611, -611, -611, -611, -611, -611, -611, -611, -611,
- 50, -611, 330, 338, -611, -611, 395, -611, -611, -611,
- -611, -611, -611, -611, -611, -611, -611, 403, 403, -611,
- -611, -611, -611, 1456, 41, -611, 117, 402, -611, -611,
- -611, -611, -611, 417, 422, 424, 425, 154, -611, -611,
- -611, 38, -611, -611, -611, -611, 429, 227, 54, -611,
- -611, 430, -611, 481, -611, -611, -611, -611, -611, -611,
- -611, -611, 38, -611, -611, -611, -611, -611, 227, 431,
- 1074, -611, -611, 403, -611, 433, 419, 493, 507, 507,
- 41, 492, 457, 444, -611, 227, 467, -611, -611, 454,
- -611, -611, -611, -611, 455, -611, -611, -611, -611, -611,
- -611, -611, -611, -611, 501, 559, 458, -611, 507, 85,
- 1456, -611, 471, 461, 507, 465, 509, 41, 38, -611,
- -611, 480, -611, 468, 215, 507, -611, -611, -611, -611,
- -611, -611, -611, -611, -611, -611, -611, -611, -611, -611,
- -611, -611, 227, -611, 479, -611, -611, -611, -611, 469,
- -611, -611, -611, 489, 117, 485, 490, 72, -611, 219,
- 41, 493, 38, 38, 474, 41, 559, -611, 487, 1456,
- 543, -611, -611, -611, -611, -611, 1376, -611, -611, -611,
- 477, 478, -611, -611, -611, -611, -611, -611, -611, 495,
- -611, -611, -611, -611, 38, 215, 41, 486, -611, 41,
- 497, 499, -611, -611, -611, -611, -611, -611, 517, -611,
- 500, 513, -611, -611, 518, -611
+ -656, 127, 1208, -656, -656, -656, -656, -656, -656, -656,
+ -656, -656, -656, -656, 83, 105, 115, 155, -656, 83,
+ 83, -656, 44, 44, -656, -656, 83, -656, -656, 98,
+ -656, 285, 57, 110, -656, -656, 26, -656, -656, -656,
+ -656, -656, -656, 527, -656, -656, -656, -656, -656, 1339,
+ 130, -656, -656, 131, -656, 199, -656, -656, -656, -656,
+ -656, -656, -656, -656, -656, -656, -656, -656, -656, -656,
+ -656, -656, -656, -656, 147, -656, -656, -656, 147, -656,
+ -656, 134, 157, 1486, 44, 83, 1462, 83, 83, 83,
+ 83, -656, -656, -656, 53, 83, 86, -656, 100, 83,
+ -656, 147, 83, 167, 169, 83, -656, -656, 109, -656,
+ 111, -656, -656, 181, -656, 186, 189, 692, -656, -656,
+ -656, 194, 242, -656, 203, 206, 215, 161, -656, 42,
+ -656, -656, -656, -656, -656, -656, 216, -656, -656, -656,
+ -656, -656, -656, 230, -656, -656, -656, -656, -656, -656,
+ -656, -656, -656, -656, -656, -656, -656, -656, -656, -656,
+ -656, 199, -656, -656, -656, 103, -656, -656, 229, -656,
+ 238, 243, 244, -656, 44, 249, 251, 248, -656, 252,
+ 254, 255, 257, 258, 261, 262, 265, -656, -656, -656,
+ 266, 267, -656, -656, -656, -656, 230, -656, -656, -656,
+ -656, -656, -656, -656, -656, -656, 230, -656, -656, -656,
+ -656, -656, -656, -656, -656, 269, -656, 270, -656, -656,
+ 263, -656, 357, -656, -656, -656, 50, 56, -656, -656,
+ -656, 1486, -656, -656, -656, -656, 271, -656, -656, -656,
+ -656, 360, -656, -656, 55, 274, -656, -656, -656, -656,
+ -656, -656, -656, -656, 361, -656, 154, 279, 324, -656,
+ -656, -656, -656, -656, -656, 230, -656, -656, 275, -656,
+ -656, -656, -656, -656, -656, -656, -656, -656, 324, 286,
+ 287, -656, -656, -656, 83, 83, 293, 295, -656, -656,
+ -656, 292, -656, 357, -656, -656, -656, -656, -656, -656,
+ 387, -656, 305, 304, -656, -656, -656, -656, -656, -656,
+ -656, -656, -656, -656, 188, 188, 188, 154, 230, -656,
+ -656, 303, 307, 302, 143, 137, 113, -656, -656, -656,
+ -656, -656, 44, -656, -656, -656, -656, 312, -656, 44,
+ -656, 154, 154, 154, 296, -656, -656, -656, -656, -656,
+ -656, -656, 211, -656, -11, -656, -656, -656, -656, -656,
+ -656, -656, -656, 44, 324, -656, -656, -656, 318, 263,
+ 90, 1261, 320, 319, -656, 692, -656, -656, -656, 306,
+ 154, 154, 154, 154, 154, 154, 154, 154, 154, 154,
+ 321, 83, -656, 230, 983, -656, 554, 154, -656, -656,
+ -656, -656, -656, 154, -656, 637, -656, -656, -656, 410,
+ 899, -656, -656, -656, -656, 41, 355, 44, 44, -656,
+ -656, -656, -656, -656, 41, -656, 326, -656, 322, -656,
+ 327, -656, -656, 1018, 230, -656, 44, 324, -656, -656,
+ -656, -656, 330, -656, -656, 83, -656, -656, 332, 336,
+ 424, 339, -656, -656, 307, 302, 143, 137, 137, 113,
+ 113, -656, -656, -656, -656, -656, 335, -656, -656, -656,
+ 340, -656, -656, 1429, -656, -656, -656, -656, 676, -656,
+ -656, -656, -656, -656, 341, -656, 773, -656, -656, 344,
+ 342, 873, 346, 347, 350, 338, -656, 337, -656, 353,
+ -656, -656, -656, 354, 362, 197, 44, 44, 44, -656,
+ 370, -656, -656, -656, -656, -656, -656, -656, 83, 83,
+ -656, 376, -656, -656, -656, 1103, 815, 405, 1075, -656,
+ 230, 357, -656, -656, 68, 70, 379, 380, 384, 357,
+ 385, -656, -656, 71, -656, 60, -656, -656, 386, 390,
+ 230, -656, 136, 1462, -656, 421, -656, -656, -656, -656,
+ 55, -656, 389, -656, 393, -656, 394, 399, 400, 401,
+ -656, 230, -656, -656, -656, -656, -656, 402, 403, -656,
+ -656, -656, -656, -656, -656, -656, -656, -656, 154, -656,
+ 357, -656, 404, 83, -656, -656, 466, 230, -656, -656,
+ -656, -656, -656, -656, 81, 81, 81, 407, -656, 408,
+ 409, 411, 412, 413, 414, -656, -656, -656, 417, 419,
+ 420, 427, -656, -656, -656, -656, -656, -656, -656, -656,
+ -656, -656, 154, -656, -656, -656, 83, -656, 428, 425,
+ 430, -656, 432, -656, -656, -656, -656, -656, 423, 154,
+ 426, 1286, -656, 44, -656, -656, -656, -656, -656, -656,
+ 490, -656, -656, 66, -656, 338, 353, -656, -656, 416,
+ -656, -656, -656, -656, -656, -656, -656, -656, -656, -656,
+ 418, 418, -656, -656, -656, -656, 1075, 83, -656, 154,
+ 422, -656, -656, -656, -656, -656, 436, 437, 438, 442,
+ 136, -656, -656, -656, 44, -656, -656, -656, -656, 439,
+ 230, -656, -656, -656, 440, -656, 498, -656, -656, -656,
+ -656, -656, -656, -656, -656, 44, -656, -656, -656, -656,
+ -656, 230, 459, 1154, -656, 449, 418, -656, 467, 453,
+ 525, 538, 538, 83, 523, 488, 475, -656, 230, 499,
+ -656, -656, 483, -656, -656, -656, -656, -656, 485, -656,
+ -656, -656, -656, -656, -656, -656, -656, -656, 533, 592,
+ 491, 212, 538, 538, 174, 1075, -656, 502, 496, 538,
+ 497, 541, 83, 44, -656, -656, 512, -656, -656, -656,
+ -656, -656, 500, -656, -656, -656, -656, -656, -656, -656,
+ -656, -656, -656, -656, -656, -656, -656, -656, -656, -656,
+ -656, -656, 230, -656, 511, -656, 513, 1075, 570, 522,
+ 154, 519, 524, 54, -656, 268, 83, 525, 44, 44,
+ 508, 83, 592, -656, -656, -656, -656, -656, -656, -656,
+ -656, -656, 1403, -656, -656, -656, 515, 516, -656, -656,
+ -656, 212, 83, 514, 530, -656, -656, -656, -656, 44,
+ -656, -656, -656, -656, 83, 536, 520, 550, -656, -656,
+ -656, -656, 521, 534, -656, -656, 555, -656
};
/* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
@@ -954,139 +952,139 @@ static const yytype_int16 yypact[] =
means the default is an error. */
static const yytype_uint16 yydefact[] =
{
- 4, 0, 0, 3, 1, 38, 143, 40, 70, 220,
- 281, 296, 331, 379, 0, 0, 0, 0, 94, 0,
- 0, 490, 0, 0, 559, 580, 0, 6, 7, 42,
+ 4, 0, 0, 3, 1, 38, 145, 40, 70, 222,
+ 283, 298, 333, 381, 0, 0, 0, 0, 94, 0,
+ 0, 492, 0, 0, 561, 582, 0, 6, 7, 42,
24, 61, 0, 0, 22, 64, 77, 66, 26, 78,
83, 79, 84, 77, 80, 81, 65, 18, 10, 0,
- 0, 12, 226, 283, 222, 330, 223, 249, 250, 224,
- 20, 14, 16, 28, 450, 449, 452, 30, 488, 32,
- 520, 522, 521, 519, 77, 538, 539, 518, 77, 34,
+ 0, 12, 228, 285, 224, 332, 225, 251, 252, 226,
+ 20, 14, 16, 28, 452, 451, 454, 30, 490, 32,
+ 522, 524, 523, 521, 77, 540, 541, 520, 77, 34,
36, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 139, 261, 225, 77, 0, 77, 88, 77, 0,
- 82, 77, 0, 456, 531, 0, 138, 134, 0, 133,
- 0, 209, 209, 0, 46, 0, 0, 0, 209, 8,
- 9, 0, 97, 72, 0, 0, 0, 265, 267, 0,
- 271, 272, 275, 276, 277, 278, 274, 279, 280, 345,
- 353, 358, 92, 233, 102, 229, 231, 232, 230, 234,
- 263, 264, 235, 239, 236, 238, 237, 240, 241, 283,
- 246, 0, 247, 248, 242, 0, 245, 243, 352, 244,
- 357, 0, 0, 5, 0, 207, 0, 0, 298, 0,
- 0, 0, 0, 0, 0, 0, 0, 532, 525, 534,
- 0, 0, 583, 579, 39, 274, 156, 144, 148, 152,
- 153, 149, 150, 151, 154, 155, 41, 71, 221, 227,
- 282, 297, 332, 380, 73, 529, 74, 0, 530, 95,
- 461, 491, 0, 447, 136, 448, 0, 0, 193, 43,
- 25, 0, 545, 541, 542, 547, 544, 548, 546, 543,
- 540, 0, 48, 552, 0, 0, 23, 96, 75, 67,
- 27, 85, 266, 273, 268, 270, 0, 0, 99, 344,
- 341, 349, 354, 19, 11, 210, 13, 284, 0, 21,
- 15, 17, 29, 453, 31, 502, 489, 33, 99, 0,
- 0, 35, 37, 587, 0, 0, 0, 0, 89, 459,
- 457, 499, 135, 0, 560, 208, 581, 196, 4, 549,
- 0, 553, 0, 550, 182, 183, 184, 186, 189, 188,
- 190, 191, 187, 185, 0, 0, 0, 0, 179, 578,
- 157, 158, 159, 161, 163, 165, 168, 171, 175, 180,
- 577, 62, 0, 112, 104, 269, 192, 0, 346, 0,
- 93, 0, 0, 0, 213, 209, 299, 463, 506, 533,
- 526, 535, 584, 145, 261, 228, 254, 255, 256, 262,
- 333, 381, 112, 0, 99, 497, 492, 137, 0, 461,
- 0, 0, 3, 0, 49, 0, 176, 177, 178, 0,
+ 0, 141, 263, 227, 77, 0, 77, 88, 77, 0,
+ 82, 77, 0, 458, 533, 0, 140, 136, 0, 135,
+ 0, 211, 211, 0, 46, 0, 0, 0, 211, 8,
+ 9, 0, 97, 72, 0, 0, 0, 267, 269, 0,
+ 273, 274, 277, 278, 279, 280, 276, 281, 282, 347,
+ 355, 360, 92, 235, 102, 231, 233, 234, 232, 236,
+ 265, 266, 237, 241, 238, 240, 239, 242, 243, 285,
+ 248, 0, 249, 250, 244, 0, 247, 245, 354, 246,
+ 359, 0, 0, 5, 0, 209, 0, 0, 300, 0,
+ 0, 0, 0, 0, 0, 0, 0, 534, 527, 536,
+ 0, 0, 585, 581, 39, 276, 158, 146, 150, 154,
+ 155, 151, 152, 153, 156, 157, 41, 71, 223, 229,
+ 284, 299, 334, 382, 73, 531, 74, 0, 532, 95,
+ 463, 493, 0, 449, 138, 450, 0, 0, 195, 43,
+ 25, 0, 547, 543, 544, 549, 546, 550, 548, 545,
+ 542, 0, 48, 554, 0, 0, 23, 96, 75, 67,
+ 27, 85, 268, 275, 270, 272, 0, 0, 99, 346,
+ 343, 351, 356, 19, 11, 212, 13, 286, 0, 21,
+ 15, 17, 29, 455, 31, 504, 491, 33, 99, 0,
+ 0, 35, 37, 589, 0, 0, 0, 0, 89, 461,
+ 459, 501, 137, 0, 562, 210, 583, 198, 4, 551,
+ 0, 555, 0, 552, 184, 185, 186, 188, 191, 190,
+ 192, 193, 189, 187, 0, 0, 0, 0, 181, 580,
+ 159, 160, 161, 163, 165, 167, 170, 173, 177, 182,
+ 579, 62, 0, 112, 104, 271, 194, 0, 348, 0,
+ 93, 0, 0, 0, 215, 211, 301, 465, 508, 535,
+ 528, 537, 586, 147, 263, 230, 256, 257, 258, 264,
+ 335, 383, 112, 0, 99, 499, 494, 139, 0, 463,
+ 0, 0, 3, 0, 49, 0, 178, 179, 180, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 575, 0, 76, 132, 0, 0, 0, 209, 98, 342,
- 350, 355, 0, 211, 0, 285, 289, 209, 454, 0,
- 112, 104, 369, 374, 0, 484, 0, 0, 592, 367,
- 368, 588, 590, 0, 594, 0, 586, 0, 209, 251,
- 209, 289, 0, 460, 458, 0, 99, 561, 582, 200,
- 194, 0, 202, 195, 0, 197, 203, 0, 0, 0,
- 0, 551, 181, 160, 162, 164, 166, 167, 169, 170,
- 172, 173, 174, 209, 63, 129, 127, 389, 390, 0,
- 111, 119, 113, 123, 121, 125, 0, 115, 117, 394,
- 109, 108, 0, 103, 0, 105, 106, 0, 0, 0,
- 0, 0, 0, 133, 214, 0, 215, 218, 294, 291,
- 290, 0, 209, 0, 0, 0, 0, 474, 0, 462,
- 464, 466, 468, 470, 472, 476, 0, 0, 507, 0,
- 505, 508, 510, 0, 0, 0, 0, 480, 479, 0,
- 483, 482, 0, 0, 0, 0, 0, 0, 0, 585,
- 146, 0, 252, 0, 334, 339, 209, 0, 498, 493,
- 0, 0, 198, 206, 199, 45, 554, 50, 0, 130,
- 0, 69, 0, 0, 0, 0, 0, 393, 423, 420,
- 421, 422, 384, 392, 0, 0, 209, 87, 110, 107,
- 348, 347, 343, 351, 356, 0, 212, 0, 216, 0,
- 0, 286, 288, 265, 310, 305, 306, 307, 308, 300,
- 309, 0, 0, 0, 0, 455, 0, 0, 0, 0,
- 0, 0, 512, 515, 504, 0, 0, 0, 0, 370,
- 375, 478, 573, 574, 593, 589, 591, 481, 595, 0,
- 364, 360, 363, 0, 340, 0, 336, 0, 91, 0,
- 571, 567, 569, 562, 566, 0, 0, 0, 0, 576,
- 0, 128, 120, 114, 124, 122, 126, 209, 116, 118,
- 0, 219, 0, 218, 295, 292, 0, 487, 485, 486,
- 475, 465, 467, 469, 471, 473, 477, 0, 0, 509,
- 511, 528, 537, 0, 0, 147, 0, 361, 253, 335,
- 337, 383, 494, 0, 0, 0, 0, 564, 201, 205,
- 204, 0, 56, 42, 51, 55, 0, 131, 0, 395,
- 217, 0, 301, 398, 513, 516, 371, 376, 260, 365,
- 362, 209, 0, 572, 568, 570, 563, 565, 58, 0,
- 0, 57, 385, 0, 293, 0, 0, 0, 430, 430,
- 0, 434, 257, 0, 338, 495, 0, 52, 54, 0,
- 396, 302, 399, 406, 0, 405, 427, 514, 517, 372,
- 431, 377, 258, 366, 501, 0, 411, 386, 430, 0,
- 0, 401, 402, 0, 430, 0, 438, 0, 0, 496,
- 558, 0, 557, 0, 0, 430, 397, 317, 324, 322,
- 303, 313, 314, 321, 407, 403, 428, 373, 432, 435,
- 378, 259, 500, 59, 555, 410, 424, 425, 426, 0,
- 416, 417, 387, 0, 0, 0, 0, 0, 209, 319,
- 0, 0, 0, 0, 0, 0, 0, 412, 413, 0,
- 442, 318, 325, 323, 304, 312, 0, 320, 408, 404,
- 0, 0, 436, 60, 556, 414, 418, 439, 388, 0,
- 327, 315, 429, 433, 0, 0, 0, 0, 326, 0,
- 0, 0, 415, 419, 440, 328, 316, 437, 0, 446,
- 0, 443, 441, 444, 0, 445
+ 577, 0, 76, 134, 0, 111, 0, 0, 211, 98,
+ 344, 352, 357, 0, 213, 0, 287, 291, 211, 456,
+ 0, 112, 104, 371, 376, 0, 486, 0, 0, 594,
+ 369, 370, 590, 592, 0, 596, 0, 588, 0, 211,
+ 253, 211, 291, 0, 462, 460, 0, 99, 563, 584,
+ 202, 196, 0, 204, 197, 0, 199, 205, 0, 0,
+ 0, 0, 553, 183, 162, 164, 166, 168, 169, 171,
+ 172, 174, 175, 176, 211, 63, 131, 129, 391, 392,
+ 0, 114, 121, 0, 115, 125, 123, 127, 0, 117,
+ 119, 396, 109, 108, 0, 103, 0, 105, 106, 0,
+ 0, 0, 0, 0, 0, 135, 216, 0, 217, 220,
+ 296, 293, 292, 0, 211, 0, 0, 0, 0, 476,
+ 0, 464, 466, 468, 470, 472, 474, 478, 0, 0,
+ 509, 0, 507, 510, 512, 0, 0, 0, 0, 482,
+ 481, 0, 485, 484, 0, 0, 0, 0, 0, 0,
+ 0, 587, 148, 0, 254, 0, 336, 341, 211, 0,
+ 500, 495, 0, 0, 200, 208, 201, 45, 556, 50,
+ 0, 132, 0, 69, 0, 113, 0, 0, 0, 0,
+ 395, 425, 422, 423, 424, 386, 394, 0, 0, 211,
+ 87, 110, 107, 350, 349, 345, 353, 358, 0, 214,
+ 0, 218, 0, 0, 288, 290, 267, 312, 307, 308,
+ 309, 310, 302, 311, 0, 0, 0, 0, 457, 0,
+ 0, 0, 0, 0, 0, 514, 517, 506, 0, 0,
+ 0, 0, 372, 377, 480, 575, 576, 595, 591, 593,
+ 483, 597, 0, 366, 362, 365, 0, 342, 0, 338,
+ 0, 91, 0, 573, 569, 571, 564, 568, 0, 0,
+ 0, 0, 578, 0, 130, 122, 116, 126, 124, 128,
+ 0, 118, 120, 0, 221, 0, 220, 297, 294, 0,
+ 489, 487, 488, 477, 467, 469, 471, 473, 475, 479,
+ 0, 0, 511, 513, 530, 539, 0, 0, 149, 0,
+ 363, 255, 337, 339, 385, 496, 0, 0, 0, 0,
+ 566, 203, 207, 206, 0, 56, 42, 51, 55, 0,
+ 133, 387, 397, 219, 0, 303, 400, 515, 518, 373,
+ 378, 262, 367, 364, 211, 0, 574, 570, 572, 565,
+ 567, 58, 0, 0, 57, 0, 0, 295, 0, 0,
+ 0, 432, 432, 0, 436, 259, 0, 340, 497, 0,
+ 52, 54, 413, 388, 398, 304, 401, 408, 0, 407,
+ 429, 516, 519, 374, 433, 379, 260, 368, 503, 0,
+ 0, 0, 432, 432, 0, 0, 403, 404, 0, 432,
+ 0, 440, 0, 0, 498, 560, 0, 559, 412, 426,
+ 427, 428, 0, 418, 419, 389, 399, 319, 326, 324,
+ 305, 315, 316, 323, 409, 405, 430, 375, 434, 437,
+ 380, 261, 502, 59, 557, 414, 415, 0, 444, 0,
+ 0, 0, 0, 0, 211, 321, 0, 0, 0, 0,
+ 0, 0, 0, 416, 420, 441, 390, 320, 327, 325,
+ 306, 314, 0, 322, 410, 406, 0, 0, 438, 60,
+ 558, 0, 0, 0, 0, 329, 317, 431, 435, 0,
+ 417, 421, 442, 328, 0, 0, 0, 0, 330, 318,
+ 439, 448, 0, 445, 443, 446, 0, 447
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
- -611, -611, 311, 312, 565, -598, -611, -611, -611, -611,
- -611, -611, -611, -611, -611, -611, -611, -611, -611, -611,
- -611, -590, -611, -611, -611, -611, -611, -611, -611, -611,
- -611, -611, -611, -611, -611, -611, -122, -611, -611, -611,
- -611, -611, -611, -611, -611, -611, -611, -611, 238, -611,
- -611, 9, -611, -611, -611, 598, -611, -611, -611, -611,
- -611, -611, -611, 600, -611, 242, -611, -611, -248, -611,
- -611, 208, -611, -611, -611, -268, -353, -611, -611, -611,
- -611, -611, -611, -611, -611, -331, -611, -611, -22, -611,
- -611, -187, -10, -611, 17, -611, -611, -611, -611, -195,
- -9, -224, -611, 244, 263, 245, -120, -114, -90, -13,
- -611, -303, -611, -611, -611, -611, -611, -611, -611, -611,
- -611, 0, 571, -611, -611, -611, -611, -41, 59, 20,
- -611, 99, -611, -28, 162, -444, -611, -611, -611, 68,
- -611, -611, -610, -81, -611, -611, -7, -611, -70, -611,
- -611, -50, -49, -58, -55, -52, 293, -611, -40, -611,
- -37, -611, -611, -611, -611, 256, 326, 176, -611, -611,
- -611, -32, -611, -31, -611, -611, -611, -611, -611, -611,
- -611, -611, -611, -153, -611, -611, -611, -611, -611, -150,
- -611, -611, -611, -611, -611, -611, -611, -38, -611, -611,
- -611, -611, -611, -611, -611, -39, -611, -611, -611, -611,
- -611, -611, -611, -66, -611, -611, -611, -65, -611, -611,
- -611, -611, -611, -611, -611, -15, -611, -611, -338, -611,
- -611, -611, -611, -611, -611, -611, -611, -611, -611, 22,
- -611, -611, -611, -611, -611, -611, -611, -611, -611, -611,
- -611, -611, -611, -611, -611, -594, -611, -611, -611, -611,
- -611, -140, -611, -611, -611, -611, -611, -611, -611, -611,
- -172, -611, -611, -500, -611, -550, -611, -611, -611, -611,
- -611, -611, -611, -611, -611, -611, -611, -611, -611, -611,
- 25, 27, -611, -611, -611, -611, -611, -611, -611, -611,
- -611, 320, -611, -611, -611, -611, -611, -611, -611, -611,
- -611, -611, -309, 261, -293, -611, -611, -611, -611, -611,
- -611, -611, -611, -611, -611, -611, -611, -611, -611, -611,
- -611, -611, -611, -611, -611, -611, -611, -611, -611, -611,
- -611, -611, -611, -611, -611, -611, -611, -611, -611, -611,
- -611, -611, -611, -611, -611, -611, 610, -611, -611, -611,
- -611, -611, -611, -611, -611, -611, 316, -611, -611, -136,
- -611, -611, -611, -611, -611, -611, -611, -5, -611, -611,
- -611, 285, -611, -611, 138, -611, -611, -611, -611, -611,
- -611, -611, -611, -611, -611, -611, -611, -611
+ -656, -656, 331, 334, 584, -595, -656, -656, -656, -656,
+ -656, -656, -656, -656, -656, -656, -656, -656, -656, -656,
+ -656, -583, -656, -656, -656, -656, -656, -656, -656, -656,
+ -656, -656, -656, -656, -656, -656, -99, -656, -656, -656,
+ -656, -656, -656, -656, -656, -656, -656, -656, 283, -656,
+ -656, 207, -656, -656, -656, 619, -656, -656, -656, -656,
+ -656, -656, -656, 621, -656, 298, -656, -656, -238, -656,
+ -656, 231, -656, -656, -656, -288, -656, -353, -656, -656,
+ -656, -656, -656, -656, -656, -656, -325, -656, -656, -22,
+ -656, -656, -181, -10, -656, 16, -656, -656, -656, -656,
+ -189, 9, -227, -656, 290, 278, 260, -65, -58, -137,
+ -28, -656, -311, -656, -656, -656, -656, -656, -656, -656,
+ -656, 20, -85, 615, -656, -656, -656, -656, 0, 85,
+ 17, -656, 118, -656, -31, 182, -440, -656, -656, -656,
+ 88, -656, -656, -608, -67, -656, -656, -7, -656, -68,
+ -656, -656, -49, -44, -54, -48, -46, 308, -656, -41,
+ -656, -38, -656, -656, -656, -656, 272, 352, 213, -656,
+ -656, -656, -37, -656, -32, -656, -656, -656, -656, -656,
+ -656, -656, -656, -656, -140, -656, -656, -656, -656, -656,
+ -119, -656, -656, -656, -656, -656, -656, -656, -40, -656,
+ -656, -656, -656, -656, -656, -656, -17, -656, -656, -656,
+ -656, -656, -656, -656, -75, -656, -656, -656, -70, -656,
+ -656, -656, -656, -656, -656, -656, 19, -656, -656, -328,
+ -656, -656, -656, -656, -656, -656, -656, -656, -656, -656,
+ 18, -656, -656, -656, -656, -656, -656, -656, -656, -656,
+ -656, -656, -656, -656, -656, -656, -571, -656, -656, -656,
+ -656, -656, -116, -656, -656, -656, -656, -656, -656, -656,
+ -656, -143, -656, -656, -492, -656, -655, -656, -656, -656,
+ -656, -656, -656, -656, -656, -656, -656, -656, -656, -656,
+ -656, 21, 23, -656, -656, -656, -656, -656, -656, -656,
+ -656, -656, 345, -656, -656, -656, -656, -656, -656, -656,
+ -656, -656, -656, -300, 297, -261, -656, -656, -656, -656,
+ -656, -656, -656, -656, -656, -656, -656, -656, -656, -656,
+ -656, -656, -656, -656, -656, -656, -656, -656, -656, -656,
+ -656, -656, -656, -656, -656, -656, -656, -656, -656, -656,
+ -656, -656, -656, -656, -656, -656, -656, 639, -656, -656,
+ -656, -656, -656, -656, -656, -656, -656, 348, -656, -656,
+ -112, -656, -656, -656, -656, -656, -656, -656, 22, -656,
+ -656, -656, 316, -656, -656, 166, -656, -656, -656, -656,
+ -656, -656, -656, -656, -656, -656, -656, -656, -656
};
/* YYDEFGOTO[NTERM-NUM]. */
@@ -1094,44 +1092,44 @@ static const yytype_int16 yydefgoto[] =
{
-1, 1, 2, 3, 27, 28, 172, 176, 180, 181,
171, 179, 121, 116, 125, 182, 184, 186, 190, 191,
- 82, 29, 84, 30, 115, 298, 448, 31, 32, 117,
- 302, 450, 648, 729, 704, 730, 705, 706, 746, 825,
- 33, 118, 391, 34, 35, 124, 333, 469, 36, 85,
- 37, 142, 332, 38, 39, 40, 126, 334, 482, 41,
- 217, 362, 547, 42, 258, 43, 102, 248, 340, 44,
- 45, 395, 483, 484, 485, 394, 470, 563, 574, 575,
- 562, 565, 564, 566, 560, 392, 465, 650, 318, 222,
- 293, 109, 354, 46, 471, 83, 284, 427, 629, 197,
- 319, 336, 321, 322, 323, 324, 325, 326, 327, 328,
- 329, 337, 48, 297, 370, 443, 551, 444, 445, 647,
- 49, 404, 295, 344, 403, 495, 496, 588, 497, 472,
- 86, 208, 285, 209, 145, 146, 147, 148, 52, 355,
- 429, 633, 356, 717, 742, 777, 357, 358, 149, 150,
- 151, 152, 153, 154, 155, 156, 157, 158, 53, 87,
- 54, 177, 345, 501, 405, 502, 592, 500, 590, 711,
- 589, 55, 88, 56, 268, 407, 666, 735, 769, 816,
- 599, 790, 817, 791, 818, 860, 813, 792, 819, 793,
- 815, 814, 849, 851, 859, 57, 58, 59, 89, 286,
- 430, 635, 544, 636, 721, 545, 164, 341, 490, 165,
- 257, 397, 166, 167, 342, 491, 168, 169, 343, 492,
- 170, 359, 428, 631, 687, 632, 686, 743, 473, 419,
- 525, 683, 740, 774, 420, 526, 684, 741, 776, 474,
- 90, 287, 431, 637, 475, 657, 749, 785, 830, 476,
- 572, 487, 576, 733, 768, 714, 736, 737, 754, 772,
- 821, 755, 770, 820, 767, 783, 784, 809, 828, 855,
- 810, 829, 856, 573, 811, 757, 773, 822, 761, 775,
- 823, 800, 824, 854, 848, 857, 868, 870, 871, 874,
- 477, 478, 63, 64, 65, 183, 347, 508, 66, 220,
- 364, 290, 363, 408, 509, 606, 607, 608, 609, 610,
- 604, 611, 641, 529, 642, 423, 531, 512, 513, 514,
- 67, 185, 68, 105, 291, 436, 639, 722, 764, 366,
- 435, 779, 276, 348, 519, 409, 520, 615, 616, 521,
- 677, 738, 522, 678, 739, 69, 70, 71, 72, 73,
- 279, 410, 617, 74, 75, 76, 188, 278, 77, 280,
- 411, 618, 78, 241, 242, 303, 243, 781, 804, 782,
- 79, 111, 368, 550, 696, 643, 697, 644, 694, 695,
- 693, 424, 245, 390, 330, 80, 81, 112, 369, 193,
- 283, 425, 352, 426, 535, 536, 534, 538
+ 82, 29, 84, 30, 115, 298, 449, 31, 32, 117,
+ 302, 451, 651, 732, 707, 733, 708, 709, 749, 831,
+ 33, 118, 391, 34, 35, 124, 333, 470, 36, 85,
+ 37, 142, 332, 38, 39, 40, 126, 334, 484, 41,
+ 217, 362, 549, 42, 258, 43, 102, 248, 340, 44,
+ 45, 396, 485, 486, 487, 394, 395, 471, 566, 577,
+ 578, 564, 568, 567, 569, 562, 392, 466, 653, 318,
+ 222, 293, 109, 354, 46, 472, 83, 284, 428, 632,
+ 197, 319, 336, 321, 322, 323, 324, 325, 326, 327,
+ 328, 329, 337, 48, 297, 370, 444, 553, 445, 446,
+ 650, 473, 50, 295, 344, 404, 497, 498, 591, 499,
+ 474, 86, 208, 285, 209, 145, 146, 147, 148, 52,
+ 355, 430, 636, 356, 720, 745, 782, 357, 358, 149,
+ 150, 151, 152, 153, 154, 155, 156, 157, 158, 53,
+ 87, 54, 177, 345, 503, 406, 504, 595, 502, 593,
+ 714, 592, 55, 88, 56, 268, 408, 669, 738, 774,
+ 822, 602, 800, 823, 801, 824, 865, 819, 802, 825,
+ 803, 821, 820, 854, 856, 864, 57, 58, 59, 89,
+ 286, 431, 638, 546, 639, 724, 547, 164, 341, 492,
+ 165, 257, 398, 166, 167, 342, 493, 168, 169, 343,
+ 494, 170, 359, 429, 634, 690, 635, 689, 746, 475,
+ 420, 527, 686, 743, 779, 421, 528, 687, 744, 781,
+ 476, 90, 287, 432, 640, 477, 660, 735, 772, 818,
+ 478, 575, 489, 579, 736, 773, 717, 739, 740, 758,
+ 777, 827, 759, 775, 826, 753, 770, 771, 792, 816,
+ 851, 793, 817, 852, 576, 794, 761, 778, 828, 765,
+ 780, 829, 810, 830, 859, 836, 853, 867, 872, 873,
+ 876, 479, 480, 63, 64, 65, 183, 347, 510, 66,
+ 220, 364, 290, 363, 409, 511, 609, 610, 611, 612,
+ 613, 607, 614, 644, 531, 645, 424, 533, 514, 515,
+ 516, 67, 185, 68, 105, 291, 437, 642, 725, 768,
+ 366, 436, 784, 276, 348, 521, 410, 522, 618, 619,
+ 523, 680, 741, 524, 681, 742, 69, 70, 71, 72,
+ 73, 279, 411, 620, 74, 75, 76, 188, 278, 77,
+ 280, 412, 621, 78, 241, 242, 303, 243, 786, 814,
+ 787, 79, 111, 368, 552, 699, 646, 700, 647, 697,
+ 698, 696, 425, 245, 390, 330, 80, 81, 112, 369,
+ 193, 283, 426, 352, 427, 537, 538, 536, 540
};
/* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If
@@ -1139,316 +1137,322 @@ static const yytype_int16 yydefgoto[] =
number is the opposite. If YYTABLE_NINF, syntax error. */
static const yytype_int16 yytable[] =
{
- 108, 110, 50, 159, 92, 163, 160, 93, 398, 103,
- 104, 161, 162, 198, 418, 144, 113, 204, 205, 47,
- 320, 143, 51, 688, 60, 201, 620, 61, 202, 62,
- 349, 203, 569, 199, 200, 292, 299, 294, 399, 400,
- 401, 106, 486, 421, 91, 123, 159, 296, 163, 160,
- 702, 634, 106, 709, 161, 162, 518, 732, 703, 422,
- 622, 196, 206, 4, 143, 106, 47, 623, 106, 51,
- 507, 60, 8, 787, 61, 207, 62, 210, 211, 212,
- 213, 527, 569, 187, 715, 215, 787, 187, -359, 218,
- 174, 223, 219, 379, 432, 221, 225, 224, 114, 510,
- 788, 789, 224, 214, 8, 216, 367, 259, -359, 260,
- 630, 226, 227, 788, 789, 511, 434, 119, 244, 107,
- 106, 174, 304, 305, 306, 307, 308, 309, 310, 311,
- 107, 174, 702, 312, 313, 174, 174, 174, 224, 750,
- 703, 174, 523, 107, 120, 224, 224, 18, 314, 315,
- 178, 95, 265, 316, 317, 106, 18, -329, -140, -141,
- 99, 198, -311, 122, 122, 204, 205, 254, 255, 412,
- 413, 486, 488, 201, 252, 442, 202, 253, 494, 203,
- 174, 199, 200, 716, 412, 413, 383, 384, 549, 758,
- 304, 305, 306, 307, 308, 309, 310, 311, 107, 414,
- -142, 312, 313, 122, 415, 122, -100, 416, 417, 196,
- 838, 122, 640, 192, 414, 493, 314, 315, 786, 415,
- 194, 316, 317, -451, 797, 304, 305, 306, 307, 308,
- 309, 310, 311, 107, -523, 812, 312, 313, 228, 569,
- 229, 387, 388, 389, 385, 386, 863, 788, 789, 865,
- 806, 807, 808, 94, 96, 106, 230, 317, 98, 101,
- 593, 128, 129, 456, 457, 132, 133, 134, 135, 246,
- 794, 458, 459, 106, 353, 12, 247, 249, 127, 128,
- 129, 130, 131, 132, 133, 134, 135, 136, 137, 138,
- 10, 11, 250, 12, 139, 140, 141, 460, 461, 462,
- 198, 376, 377, 378, 204, 205, 251, 256, 224, 261,
- 393, 262, 201, 263, 264, 202, -208, 393, 203, 266,
- 199, 200, 267, 269, 270, 271, 569, 272, 274, 846,
- 273, 277, 447, 107, 320, 275, 281, 282, -524, 174,
- 288, 433, 621, 106, 301, 300, 289, 331, 196, 338,
- 627, 107, 335, 339, 350, 351, 360, 361, -101, 640,
- 373, 661, 346, 122, 159, 365, 163, 160, 374, 375,
- 380, 50, 161, 162, 381, 396, 499, 382, 402, 437,
- 449, 464, 143, 719, -44, 569, 452, 441, 47, 463,
- 530, 51, 528, 60, 532, 533, 61, 489, 62, 539,
- 662, 528, 540, 552, 542, 320, 554, 503, 556, 555,
- 570, 571, 557, 548, 667, 668, 669, 561, 559, 577,
- 580, 579, 699, 582, 619, 585, 583, 584, 541, 591,
- 543, 586, 587, 595, 553, -287, 605, 614, 624, 625,
- 626, 628, 646, 651, 159, 596, 163, 160, 597, -382,
- 638, 598, 161, 162, 568, 652, 499, 653, 412, 413,
- 570, 571, 143, 558, 654, 600, 655, 143, 656, 658,
- 659, 664, 252, 670, 671, 672, 673, 674, 675, 504,
- 505, 594, 601, 602, 603, 676, 679, 680, 414, 506,
- 681, 840, 841, 415, 682, 690, 416, 417, 689, 691,
- 692, 712, 698, 700, 568, 723, 612, 613, 713, 630,
- 724, 159, 725, 163, 160, 726, -400, 731, 734, 161,
- 162, 747, 751, 861, 466, 752, -391, 6, 753, 143,
- 9, -391, -391, -391, -391, -391, -391, -391, -391, -391,
- -391, -391, -391, 10, 11, 756, 12, 760, -391, -391,
- 13, 762, 763, 412, 413, 467, 468, -391, 765, 766,
- 778, 771, 780, 14, -409, 795, 796, 479, 480, 481,
- 798, 799, 803, 826, 805, 827, 660, 831, 833, 842,
- 834, 845, 847, 852, 853, 866, 22, 23, 858, 106,
- 832, 864, 869, 875, 127, 128, 129, 130, 131, 132,
- 133, 134, 135, 195, -391, 867, 872, 873, 748, 371,
- 372, 140, 141, -86, 173, 100, 97, 570, 571, 524,
- 685, 175, 710, 466, 453, -391, 6, 455, 707, 9,
- -391, -391, -391, -391, -391, -391, -391, -391, -391, -391,
- -391, -391, 10, 11, 454, 12, 663, -391, -391, 13,
- 645, 581, 412, 413, 467, 468, -391, 708, 665, 759,
- 578, 568, 14, 446, 835, 47, 516, 107, 51, 837,
- 60, 406, 720, 61, 92, 62, 517, 718, -47, 728,
- -47, 839, 744, 862, 537, 22, 23, 546, 189, 438,
- 844, 451, 727, 515, -47, -47, 649, -47, -47, 0,
- 745, -47, 0, -391, 570, 571, 0, 0, 0, 231,
- 0, 232, -503, 0, 0, 0, 0, 0, 0, 0,
- 0, 543, 0, -47, 0, 233, 234, -47, 235, 236,
- 92, 0, 237, 718, 0, 0, 0, 0, 0, -2,
- 5, -47, 0, 6, 7, 8, 9, 47, 568, 0,
- 51, 0, 60, 0, 238, 61, 802, 62, 239, 10,
- 11, 0, 12, 570, 571, 0, 13, 92, 0, 0,
- 801, 0, 240, 0, 0, 0, 0, 0, 0, 14,
- 15, 16, 17, 0, 0, 0, 0, 0, 18, 19,
- 0, 0, 20, 0, 0, 21, 159, 0, 163, 160,
- 393, 393, 22, 23, 161, 162, 0, 568, 850, 24,
- 25, 0, 0, 0, 143, 843, 0, 0, 836, 0,
- 0, 0, 0, 0, 0, 26, -209, 466, 0, -391,
- 6, 0, 393, 9, -391, -391, -391, -391, -391, -391,
- -391, -391, -391, -391, -391, -391, 10, 11, 0, 12,
- 0, -391, -391, 13, 0, 0, 412, 413, 467, 468,
- -391, 0, 0, 0, 0, 0, 14, 0, 0, 106,
- 479, 480, 481, 0, 127, 128, 129, 130, 131, 132,
- 133, 134, 135, 195, 137, 138, 0, 0, 0, 22,
- 23, 140, 141, 0, 0, 0, 0, 0, 0, 0,
- 567, 0, 0, 0, 0, 0, 0, -391, 0, 0,
- 0, 466, 0, -391, 6, 0, -536, 9, -391, -391,
- -391, -391, -391, -391, -391, -391, -391, -391, -391, -391,
- 10, 11, 0, 12, 0, -391, -391, 13, 0, 0,
- 412, 413, 467, 468, -391, 0, 466, 107, -391, 6,
- 14, 0, 9, -391, -391, -391, -391, -391, -391, -391,
- -391, -391, -391, -391, -391, 10, 11, 0, 12, 0,
- -391, -391, 13, 22, 23, 412, 413, 467, 468, -391,
- 0, 0, 0, 0, 0, 14, 0, 0, 0, 0,
- 0, -391, 0, 0, 0, 0, 0, 0, 0, 0,
- -68, 0, 0, 0, 0, 0, 106, 0, 22, 23,
+ 108, 110, 159, 163, 92, 160, 161, 93, 204, 103,
+ 104, 162, 144, 205, 399, 198, 113, 320, 47, 51,
+ 60, 143, 49, 61, 419, 62, 226, 227, 691, 201,
+ 400, 401, 402, 244, 199, 202, 623, 203, 572, 200,
+ 349, 292, 299, 488, 106, 159, 163, 106, 160, 161,
+ 254, 255, 422, 294, 162, 797, 705, 520, 106, 296,
+ 529, 196, 206, 637, 143, 47, 51, 60, 706, 712,
+ 61, 625, 62, 626, 433, 207, -361, 210, 211, 212,
+ 213, 509, 798, 799, 106, 215, 91, 762, 572, 218,
+ 379, 423, 219, 106, 6, 221, -361, 440, 127, 128,
+ 129, 130, 131, 132, 133, 134, 135, 195, 137, 512,
+ 718, 8, 367, 12, -142, 140, 141, 795, 796, 122,
+ 565, 8, 107, 525, 807, 107, 435, 4, 304, 305,
+ 306, 307, 308, 309, 310, 311, 107, 174, 705, 312,
+ 313, -143, 174, 174, -313, 119, 122, 174, 513, 224,
+ 706, 224, 265, 174, 314, 315, 204, 106, 174, 316,
+ 317, 205, 224, 198, 18, 754, 413, 414, 95, 252,
+ 490, 107, 253, 488, -144, 797, 496, 201, 633, 122,
+ 441, 443, 199, 202, 223, 203, 225, 200, -100, 114,
+ 224, 106, 224, 122, 719, 259, 415, 260, 120, 551,
+ 106, 416, 798, 799, 18, 596, 128, 129, 99, 196,
+ 132, 133, 134, 135, 387, 388, 389, 174, 844, -331,
+ 12, 178, 495, 192, 643, 383, 384, 304, 305, 306,
+ 307, 308, 309, 310, 311, 107, 385, 386, 312, 313,
+ 122, 413, 414, 123, 861, 194, 572, 789, 790, 791,
+ 461, 462, 463, 314, 315, -453, 868, -525, 316, 317,
+ 405, 304, 305, 306, 307, 308, 309, 310, 311, 107,
+ 228, 415, 312, 313, 353, 229, 416, 230, 107, 417,
+ 418, 187, 246, 804, 174, 187, 376, 377, 378, -47,
+ 247, -47, 249, 317, 250, 204, 798, 799, 94, 96,
+ 205, 214, 198, 216, 251, -47, -47, 256, -47, -47,
+ 393, 224, -47, 491, 98, 101, 201, 393, 457, 458,
+ 261, 199, 202, 505, 203, 834, 200, 459, 460, 262,
+ 448, 263, 264, 320, -47, 572, -210, 267, -47, 266,
+ 269, 434, 270, 271, 543, 272, 545, 273, 196, 274,
+ 624, 275, -47, 277, 281, 282, 289, -526, 630, 288,
+ 106, 664, 300, 301, 159, 163, 331, 160, 161, 335,
+ 338, 339, 643, 162, 501, 350, 351, 572, 722, 560,
+ 346, 465, 360, 143, 361, 365, 442, 47, 51, 60,
+ 373, 49, 61, 530, 62, 534, 535, 374, 375, 380,
+ 382, 403, 530, 573, 381, 320, 397, 438, 574, 665,
+ -44, 450, 453, 532, 550, 464, 541, 542, 554, 405,
+ 556, 544, 702, 670, 671, 672, 557, 558, 559, 561,
+ 563, 580, 582, 588, 583, 555, 622, 598, 585, 586,
+ 413, 414, 587, 589, 594, 159, 163, 590, 160, 161,
+ 649, 599, -289, 573, 162, 501, 571, 600, 574, 601,
+ 608, 506, 507, 405, 143, 603, 617, 627, 628, 143,
+ 415, 508, 629, 631, 252, 416, -384, 654, 417, 418,
+ 641, 655, 656, 597, 604, 605, 606, 657, 658, 659,
+ 661, 662, 667, 711, 663, 673, 674, 675, 695, 676,
+ 677, 678, 679, 846, 847, 682, 571, 683, 615, 616,
+ 684, 701, 159, 163, 703, 160, 161, 685, 692, 693,
+ 694, 162, 715, 716, 726, 727, 728, 734, 737, 633,
+ 106, 143, 729, -402, 866, 127, 128, 129, 130, 131,
+ 132, 133, 134, 135, 136, 137, 138, 10, 11, 750,
+ 12, 139, 140, 141, 752, 467, 755, -393, 6, 756,
+ 757, 9, -393, -393, -393, -393, -393, -393, -393, -393,
+ -393, -393, -393, -393, 10, 11, 760, 12, 764, -393,
+ -393, 13, 766, 767, 413, 414, 468, 469, -393, -411,
+ 769, 776, 783, 838, 14, 785, 805, 788, 481, 482,
+ 483, 806, 808, 809, 813, 832, 815, 833, 107, 835,
+ 837, 573, 839, 848, 840, -101, 574, 22, 23, 862,
+ 122, 857, 858, 863, 869, 871, 870, 874, 875, 371,
+ 877, 710, 372, 173, 751, -393, 100, 97, 500, 545,
+ 106, 688, 456, 526, -86, 127, 128, 129, 130, 131,
+ 132, 133, 134, 135, 136, 137, 138, 10, 11, 455,
+ 12, 139, 140, 141, 571, 175, 713, 47, 51, 60,
+ 454, 648, 61, 584, 62, 666, 763, 92, 447, 106,
+ 721, 668, 731, 841, 127, 128, 129, 130, 131, 132,
+ 133, 134, 135, 195, 137, 138, 231, 407, 232, 581,
+ 573, 140, 141, 748, 548, 574, 843, 747, 860, 723,
+ 570, 845, 233, 234, 439, 235, 236, 189, 107, 237,
+ 850, 539, 730, 452, 174, 517, 652, 0, 0, 0,
+ 0, 0, 0, 92, 0, 0, 721, 0, 0, 842,
+ 0, 238, 573, 0, 0, 239, 0, 574, 0, 47,
+ 51, 60, 0, 571, 61, 0, 62, 107, 0, 240,
+ 0, 812, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 92, 0, 500, 811, 106, 0, 0, 0,
0, 127, 128, 129, 130, 131, 132, 133, 134, 135,
- 136, 137, 138, 0, 0, 0, -391, 139, 140, 141,
- 466, 0, -391, 6, 0, -90, 9, -391, -391, -391,
- -391, -391, -391, -391, -391, -391, -391, -391, -391, 10,
- 11, 0, 12, 0, -391, -391, 13, 0, 0, 412,
- 413, 467, 468, -391, 0, 0, 0, 0, 0, 14,
- 0, 0, 0, 0, 0, 5, 0, 0, 6, 7,
- 8, 9, 0, 0, 107, 0, 0, 0, 0, 0,
- 174, 0, 22, 23, 10, 11, 0, 12, 0, 0,
- 0, 13, 0, 0, 0, 0, 0, 0, 0, 0,
- -391, 0, 0, 0, 14, 15, 16, 17, 0, -527,
- 0, 0, 0, 18, 19, 0, 0, 20, 0, 0,
- 21, 0, 0, 0, 0, 0, 0, 22, 23, 0,
- 0, 0, 0, 0, 24, 25, 701, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 26, 106, 6, 0, -53, 439, 127, 128, 129, 130,
- 131, 132, 133, 134, 135, 195, 137, 0, 0, 0,
- 0, 12, 5, 140, 141, 6, 7, 8, 9, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 10, 11, 0, 12, 0, 0, 0, 13, 0,
+ 136, 137, 138, 10, 11, 571, 12, 139, 140, 141,
+ 0, 159, 163, 0, 160, 161, 393, 393, 0, 0,
+ 162, 855, 0, 0, 0, 0, 467, 0, -393, 6,
+ 143, 849, 9, -393, -393, -393, -393, -393, -393, -393,
+ -393, -393, -393, -393, -393, 10, 11, 393, 12, 0,
+ -393, -393, 13, 0, 0, 413, 414, 468, 469, -393,
+ 0, 0, 0, 0, 107, 14, 0, 0, 0, 481,
+ 482, 483, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 106, 0, 22, 23,
+ 0, 127, 128, 129, 130, 131, 132, 133, 134, 135,
+ 136, 137, 138, 0, 0, 0, -393, 139, 140, 141,
+ 467, 0, -393, 6, 0, -538, 9, -393, -393, -393,
+ -393, -393, -393, -393, -393, -393, -393, -393, -393, 10,
+ 11, 0, 12, 0, -393, -393, 13, 0, 0, 413,
+ 414, 468, 469, -393, 0, 0, 0, 0, 0, 14,
+ 0, 0, 0, 518, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 519, 107, 0, 0, 0, 0, 0,
+ 174, 0, 22, 23, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 14, 15, 16, 17, 0, 0, 0, 0, 0,
- 18, 19, 0, 0, 20, 0, 0, 21, 0, 107,
- 0, 0, 0, 0, 22, 23, 0, 0, 440, 0,
- 0, 24, 25, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 498, 0, 106, 0, 0, 26, -209, 127,
- 128, 129, 130, 131, 132, 133, 134, 135, 136, 137,
- 138, 10, 11, 0, 12, 139, 140, 141, 5, 0,
- 0, 6, 7, 8, 9, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 10, 11, 0,
- 12, 0, 0, 5, 13, 0, 6, 7, 8, 9,
- 0, 0, 0, 0, 0, 0, 0, 14, 15, 16,
- 17, 0, 10, 11, 0, 12, 18, 19, 0, 13,
- 20, 0, 107, 21, 0, 0, 0, 0, 174, 0,
- 22, 23, 14, 15, 16, 17, 0, 24, 25, 701,
- 0, 18, 19, 0, 0, 20, 0, 0, 21, 0,
- 0, 0, 0, 26, 0, 22, 23, 0, 0, 106,
- 0, 0, 24, 25, 127, 128, 129, 130, 131, 132,
- 133, 134, 135, 136, 137, 138, 10, 11, 26, 12,
- 139, 140, 141, 498, 0, 106, 0, 0, 0, 0,
+ -393, 0, 0, 0, 467, 0, -393, 6, 0, -505,
+ 9, -393, -393, -393, -393, -393, -393, -393, -393, -393,
+ -393, -393, -393, 10, 11, 0, 12, 0, -393, -393,
+ 13, 0, 0, 413, 414, 468, 469, -393, 0, 467,
+ 0, -393, 6, 14, 0, 9, -393, -393, -393, -393,
+ -393, -393, -393, -393, -393, -393, -393, -393, 10, 11,
+ 0, 12, 0, -393, -393, 13, 22, 23, 413, 414,
+ 468, 469, -393, 0, 0, 0, 0, 0, 14, 0,
+ 0, 0, 0, 0, -393, 0, 0, 0, 0, 0,
+ -211, 0, 0, -68, 0, 0, 0, 0, 106, 0,
+ 0, 22, 23, 127, 128, 129, 130, 131, 132, 133,
+ 134, 135, 195, 137, 138, 0, 0, 0, 0, -393,
+ 140, 141, 0, 0, 467, -211, -393, 6, -90, 0,
+ 9, -393, -393, -393, -393, -393, -393, -393, -393, -393,
+ -393, -393, -393, 10, 11, 0, 12, 0, -393, -393,
+ 13, 0, 0, 413, 414, 468, 469, -393, 0, 0,
+ 0, 0, 0, 14, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 5, 107, 0, 6, 7,
+ 8, 9, 0, 0, 0, 0, 22, 23, 0, 0,
+ 0, 0, 0, 0, 10, 11, 0, 12, 0, 0,
+ 0, 13, 0, 0, -393, 0, 0, 0, 0, 0,
+ -211, 0, 0, -529, 14, 15, 16, 17, 0, 0,
+ 0, 0, 0, 18, 19, 0, 0, 20, -2, 5,
+ 21, 0, 6, 7, 8, 9, 0, 22, 23, 0,
+ 0, 0, 0, 0, 24, 25, 704, 0, 10, 11,
+ 0, 12, 0, 0, 0, 13, 0, 0, 0, 0,
+ 26, 0, 0, 0, -53, 0, 0, 0, 14, 15,
+ 16, 17, 0, 0, 0, 0, 0, 18, 19, 0,
+ 0, 20, 5, 0, 21, 6, 7, 8, 9, 0,
+ 0, 22, 23, 0, 0, 0, 0, 0, 24, 25,
+ 0, 10, 11, 0, 12, 0, 0, 5, 13, 0,
+ 6, 7, 8, 9, 26, -211, 0, 0, 0, 0,
+ 0, 14, 15, 16, 17, 0, 10, 11, 0, 12,
+ 18, 19, 0, 13, 20, 0, 0, 21, 0, 0,
+ 0, 0, 0, 0, 22, 23, 14, 15, 16, 17,
+ 0, 24, 25, 0, 0, 18, 19, 0, 0, 20,
+ 5, 0, 21, 6, 7, 8, 9, 26, -211, 22,
+ 23, 0, 0, 0, 0, 0, 24, 25, 704, 10,
+ 11, 0, 12, 0, 0, 0, 13, 0, 0, 0,
+ 0, 0, 26, 0, 0, 0, 0, 0, 0, 14,
+ 15, 16, 17, 0, 0, 0, 0, 0, 18, 19,
+ 0, 0, 20, 0, 0, 21, 0, 0, 0, 0,
+ 0, 0, 22, 23, 0, 0, 106, 0, 0, 24,
+ 25, 127, 128, 129, 130, 131, 132, 133, 134, 135,
+ 136, 137, 138, 10, 11, 26, 12, 139, 140, 141,
+ 467, 0, -393, 6, 0, 0, 9, -393, -393, -393,
+ -393, -393, -393, -393, -393, -393, -393, -393, -393, 10,
+ 11, 0, 12, 0, -393, -393, 13, 0, 0, 413,
+ 414, 468, 469, -393, 0, 106, 0, 0, 0, 14,
127, 128, 129, 130, 131, 132, 133, 134, 135, 136,
- 137, 138, 10, 11, 106, 12, 139, 140, 141, 127,
- 128, 129, 130, 131, 132, 133, 134, 135, 136, 137,
- 138, 10, 11, 0, 12, 139, 140, 141, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 107, 0, 106,
- 0, 0, 0, 174, 127, 128, 129, 130, 131, 132,
- 133, 134, 135, 195, 137, 138, 0, 0, 0, 0,
- 0, 140, 141, 107, 0, 0, 0, 0, 0, 0,
+ 137, 138, 10, 11, 107, 12, 139, 140, 141, 106,
+ 174, 0, 22, 23, 127, 128, 129, 130, 131, 132,
+ 133, 134, 135, 195, 0, 0, 0, 0, 0, 0,
+ -393, 140, 141, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 107, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 107, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 107
};
static const yytype_int16 yycheck[] =
{
- 22, 23, 2, 43, 14, 43, 43, 14, 339, 19,
- 20, 43, 43, 83, 352, 43, 26, 83, 83, 2,
- 244, 43, 2, 633, 2, 83, 526, 2, 83, 2,
- 278, 83, 476, 83, 83, 222, 231, 3, 341, 342,
- 343, 3, 395, 352, 3, 36, 86, 3, 86, 86,
- 648, 3, 3, 3, 86, 86, 409, 3, 648, 352,
- 3, 83, 84, 0, 86, 3, 49, 3, 3, 49,
- 408, 49, 6, 1, 49, 85, 49, 87, 88, 89,
- 90, 19, 526, 74, 678, 95, 1, 78, 87, 99,
- 87, 75, 102, 317, 362, 105, 75, 81, 91, 408,
- 28, 29, 81, 94, 6, 96, 293, 92, 107, 94,
- 107, 111, 112, 28, 29, 408, 364, 88, 118, 81,
- 3, 87, 73, 74, 75, 76, 77, 78, 79, 80,
- 81, 87, 730, 84, 85, 87, 87, 87, 81, 733,
- 730, 87, 410, 81, 88, 81, 81, 49, 99, 100,
- 22, 53, 174, 104, 105, 3, 49, 88, 88, 88,
- 53, 231, 90, 93, 93, 231, 231, 8, 9, 30,
- 31, 524, 396, 231, 8, 370, 231, 11, 402, 231,
- 87, 231, 231, 683, 30, 31, 82, 83, 436, 739,
- 73, 74, 75, 76, 77, 78, 79, 80, 81, 60,
- 88, 84, 85, 93, 65, 93, 88, 68, 69, 231,
- 820, 93, 550, 89, 60, 402, 99, 100, 768, 65,
- 88, 104, 105, 88, 774, 73, 74, 75, 76, 77,
- 78, 79, 80, 81, 88, 785, 84, 85, 89, 683,
- 89, 101, 102, 103, 99, 100, 856, 28, 29, 859,
- 35, 36, 37, 15, 16, 3, 88, 105, 16, 17,
- 8, 9, 10, 383, 384, 13, 14, 15, 16, 88,
- 770, 385, 386, 3, 284, 23, 48, 89, 8, 9,
- 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
- 20, 21, 88, 23, 24, 25, 26, 387, 388, 389,
- 370, 314, 315, 316, 370, 370, 89, 91, 81, 91,
- 332, 91, 370, 88, 88, 370, 87, 339, 370, 88,
- 370, 370, 89, 88, 88, 88, 770, 88, 88, 829,
- 89, 88, 370, 81, 558, 89, 88, 88, 88, 87,
- 89, 363, 529, 3, 3, 91, 93, 92, 370, 91,
- 537, 81, 8, 47, 89, 89, 89, 89, 88, 697,
- 3, 585, 105, 93, 404, 93, 404, 404, 92, 94,
- 96, 371, 404, 404, 97, 94, 404, 98, 105, 89,
- 92, 391, 404, 686, 90, 829, 106, 370, 371, 94,
- 58, 371, 414, 371, 416, 417, 371, 397, 371, 90,
- 587, 423, 95, 88, 94, 629, 88, 407, 3, 90,
- 476, 476, 89, 435, 601, 602, 603, 90, 94, 90,
- 92, 88, 646, 92, 31, 95, 92, 92, 428, 90,
- 430, 106, 94, 503, 444, 90, 90, 90, 88, 88,
- 88, 88, 29, 88, 484, 503, 484, 484, 503, 90,
- 90, 503, 484, 484, 476, 88, 484, 88, 30, 31,
- 526, 526, 484, 463, 88, 503, 88, 489, 88, 88,
- 88, 88, 8, 88, 88, 88, 88, 88, 88, 51,
- 52, 503, 504, 505, 506, 88, 88, 88, 60, 61,
- 90, 822, 823, 65, 90, 94, 68, 69, 90, 90,
- 66, 106, 88, 88, 526, 88, 516, 517, 105, 107,
- 88, 551, 88, 551, 551, 90, 35, 88, 88, 551,
- 551, 90, 89, 854, 1, 106, 3, 4, 35, 551,
- 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
- 17, 18, 19, 20, 21, 38, 23, 55, 25, 26,
- 27, 94, 108, 30, 31, 32, 33, 34, 91, 105,
- 59, 106, 3, 40, 106, 94, 105, 44, 45, 46,
- 105, 62, 92, 94, 106, 106, 576, 88, 93, 105,
- 90, 94, 39, 106, 106, 88, 63, 64, 93, 3,
- 814, 105, 75, 75, 8, 9, 10, 11, 12, 13,
- 14, 15, 16, 17, 81, 106, 106, 94, 730, 298,
- 298, 25, 26, 90, 49, 17, 16, 683, 683, 411,
- 629, 50, 663, 1, 380, 3, 4, 382, 650, 7,
- 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
- 18, 19, 20, 21, 381, 23, 587, 25, 26, 27,
- 551, 489, 30, 31, 32, 33, 34, 657, 590, 740,
- 484, 683, 40, 370, 817, 648, 44, 81, 648, 819,
- 648, 345, 687, 648, 684, 648, 54, 684, 4, 701,
- 6, 821, 721, 855, 423, 63, 64, 431, 78, 369,
- 826, 375, 697, 408, 20, 21, 558, 23, 24, -1,
- 722, 27, -1, 81, 770, 770, -1, -1, -1, 4,
- -1, 6, 90, -1, -1, -1, -1, -1, -1, -1,
- -1, 721, -1, 49, -1, 20, 21, 53, 23, 24,
- 740, -1, 27, 740, -1, -1, -1, -1, -1, 0,
- 1, 67, -1, 4, 5, 6, 7, 730, 770, -1,
- 730, -1, 730, -1, 49, 730, 778, 730, 53, 20,
- 21, -1, 23, 829, 829, -1, 27, 777, -1, -1,
- 777, -1, 67, -1, -1, -1, -1, -1, -1, 40,
- 41, 42, 43, -1, -1, -1, -1, -1, 49, 50,
- -1, -1, 53, -1, -1, 56, 836, -1, 836, 836,
- 822, 823, 63, 64, 836, 836, -1, 829, 836, 70,
- 71, -1, -1, -1, 836, 825, -1, -1, 818, -1,
- -1, -1, -1, -1, -1, 86, 87, 1, -1, 3,
- 4, -1, 854, 7, 8, 9, 10, 11, 12, 13,
- 14, 15, 16, 17, 18, 19, 20, 21, -1, 23,
- -1, 25, 26, 27, -1, -1, 30, 31, 32, 33,
- 34, -1, -1, -1, -1, -1, 40, -1, -1, 3,
- 44, 45, 46, -1, 8, 9, 10, 11, 12, 13,
- 14, 15, 16, 17, 18, 19, -1, -1, -1, 63,
- 64, 25, 26, -1, -1, -1, -1, -1, -1, -1,
- 34, -1, -1, -1, -1, -1, -1, 81, -1, -1,
- -1, 1, -1, 3, 4, -1, 90, 7, 8, 9,
- 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
- 20, 21, -1, 23, -1, 25, 26, 27, -1, -1,
- 30, 31, 32, 33, 34, -1, 1, 81, 3, 4,
- 40, -1, 7, 8, 9, 10, 11, 12, 13, 14,
- 15, 16, 17, 18, 19, 20, 21, -1, 23, -1,
- 25, 26, 27, 63, 64, 30, 31, 32, 33, 34,
- -1, -1, -1, -1, -1, 40, -1, -1, -1, -1,
- -1, 81, -1, -1, -1, -1, -1, -1, -1, -1,
- 90, -1, -1, -1, -1, -1, 3, -1, 63, 64,
+ 22, 23, 43, 43, 14, 43, 43, 14, 83, 19,
+ 20, 43, 43, 83, 339, 83, 26, 244, 2, 2,
+ 2, 43, 2, 2, 352, 2, 111, 112, 636, 83,
+ 341, 342, 343, 118, 83, 83, 528, 83, 478, 83,
+ 278, 222, 231, 396, 3, 86, 86, 3, 86, 86,
+ 8, 9, 352, 3, 86, 1, 651, 410, 3, 3,
+ 19, 83, 84, 3, 86, 49, 49, 49, 651, 3,
+ 49, 3, 49, 3, 362, 85, 87, 87, 88, 89,
+ 90, 409, 28, 29, 3, 95, 3, 742, 528, 99,
+ 317, 352, 102, 3, 4, 105, 107, 7, 8, 9,
+ 10, 11, 12, 13, 14, 15, 16, 17, 18, 409,
+ 681, 6, 293, 23, 88, 25, 26, 772, 773, 93,
+ 473, 6, 81, 411, 779, 81, 364, 0, 73, 74,
+ 75, 76, 77, 78, 79, 80, 81, 87, 733, 84,
+ 85, 88, 87, 87, 90, 88, 93, 87, 409, 81,
+ 733, 81, 174, 87, 99, 100, 231, 3, 87, 104,
+ 105, 231, 81, 231, 49, 736, 30, 31, 53, 8,
+ 397, 81, 11, 526, 88, 1, 403, 231, 107, 93,
+ 90, 370, 231, 231, 75, 231, 75, 231, 88, 91,
+ 81, 3, 81, 93, 686, 92, 60, 94, 88, 437,
+ 3, 65, 28, 29, 49, 8, 9, 10, 53, 231,
+ 13, 14, 15, 16, 101, 102, 103, 87, 826, 88,
+ 23, 22, 403, 89, 552, 82, 83, 73, 74, 75,
+ 76, 77, 78, 79, 80, 81, 99, 100, 84, 85,
+ 93, 30, 31, 36, 852, 88, 686, 35, 36, 37,
+ 387, 388, 389, 99, 100, 88, 864, 88, 104, 105,
+ 345, 73, 74, 75, 76, 77, 78, 79, 80, 81,
+ 89, 60, 84, 85, 284, 89, 65, 88, 81, 68,
+ 69, 74, 88, 775, 87, 78, 314, 315, 316, 4,
+ 48, 6, 89, 105, 88, 370, 28, 29, 15, 16,
+ 370, 94, 370, 96, 89, 20, 21, 91, 23, 24,
+ 332, 81, 27, 398, 16, 17, 370, 339, 383, 384,
+ 91, 370, 370, 408, 370, 817, 370, 385, 386, 91,
+ 370, 88, 88, 560, 49, 775, 87, 89, 53, 88,
+ 88, 363, 88, 88, 429, 88, 431, 89, 370, 88,
+ 531, 89, 67, 88, 88, 88, 93, 88, 539, 89,
+ 3, 588, 91, 3, 405, 405, 92, 405, 405, 8,
+ 91, 47, 700, 405, 405, 89, 89, 817, 689, 464,
+ 105, 391, 89, 405, 89, 93, 370, 371, 371, 371,
+ 3, 371, 371, 415, 371, 417, 418, 92, 94, 96,
+ 98, 105, 424, 478, 97, 632, 94, 89, 478, 590,
+ 90, 92, 106, 58, 436, 94, 90, 95, 88, 504,
+ 88, 94, 649, 604, 605, 606, 90, 3, 89, 94,
+ 90, 90, 88, 95, 92, 445, 31, 505, 92, 92,
+ 30, 31, 92, 106, 90, 486, 486, 94, 486, 486,
+ 29, 505, 90, 528, 486, 486, 478, 505, 528, 505,
+ 90, 51, 52, 548, 486, 505, 90, 88, 88, 491,
+ 60, 61, 88, 88, 8, 65, 90, 88, 68, 69,
+ 90, 88, 88, 505, 506, 507, 508, 88, 88, 88,
+ 88, 88, 88, 3, 579, 88, 88, 88, 66, 88,
+ 88, 88, 88, 828, 829, 88, 528, 88, 518, 519,
+ 90, 88, 553, 553, 88, 553, 553, 90, 90, 94,
+ 90, 553, 106, 105, 88, 88, 88, 88, 88, 107,
+ 3, 553, 90, 35, 859, 8, 9, 10, 11, 12,
+ 13, 14, 15, 16, 17, 18, 19, 20, 21, 90,
+ 23, 24, 25, 26, 105, 1, 89, 3, 4, 106,
+ 35, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+ 16, 17, 18, 19, 20, 21, 38, 23, 55, 25,
+ 26, 27, 94, 108, 30, 31, 32, 33, 34, 106,
+ 91, 106, 59, 820, 40, 3, 94, 106, 44, 45,
+ 46, 105, 105, 62, 92, 94, 106, 94, 81, 39,
+ 88, 686, 93, 105, 90, 88, 686, 63, 64, 105,
+ 93, 106, 106, 93, 88, 75, 106, 106, 94, 298,
+ 75, 653, 298, 49, 733, 81, 17, 16, 1, 724,
+ 3, 632, 382, 412, 90, 8, 9, 10, 11, 12,
+ 13, 14, 15, 16, 17, 18, 19, 20, 21, 381,
+ 23, 24, 25, 26, 686, 50, 666, 651, 651, 651,
+ 380, 553, 651, 491, 651, 590, 743, 687, 370, 3,
+ 687, 593, 704, 823, 8, 9, 10, 11, 12, 13,
+ 14, 15, 16, 17, 18, 19, 4, 345, 6, 486,
+ 775, 25, 26, 725, 432, 775, 825, 724, 851, 690,
+ 34, 827, 20, 21, 369, 23, 24, 78, 81, 27,
+ 832, 424, 700, 375, 87, 409, 560, -1, -1, -1,
+ -1, -1, -1, 743, -1, -1, 743, -1, -1, 824,
+ -1, 49, 817, -1, -1, 53, -1, 817, -1, 733,
+ 733, 733, -1, 775, 733, -1, 733, 81, -1, 67,
+ -1, 783, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 782, -1, 1, 782, 3, -1, -1, -1,
+ -1, 8, 9, 10, 11, 12, 13, 14, 15, 16,
+ 17, 18, 19, 20, 21, 817, 23, 24, 25, 26,
+ -1, 842, 842, -1, 842, 842, 828, 829, -1, -1,
+ 842, 842, -1, -1, -1, -1, 1, -1, 3, 4,
+ 842, 831, 7, 8, 9, 10, 11, 12, 13, 14,
+ 15, 16, 17, 18, 19, 20, 21, 859, 23, -1,
+ 25, 26, 27, -1, -1, 30, 31, 32, 33, 34,
+ -1, -1, -1, -1, 81, 40, -1, -1, -1, 44,
+ 45, 46, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 3, -1, 63, 64,
-1, 8, 9, 10, 11, 12, 13, 14, 15, 16,
17, 18, 19, -1, -1, -1, 81, 24, 25, 26,
1, -1, 3, 4, -1, 90, 7, 8, 9, 10,
11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
21, -1, 23, -1, 25, 26, 27, -1, -1, 30,
31, 32, 33, 34, -1, -1, -1, -1, -1, 40,
- -1, -1, -1, -1, -1, 1, -1, -1, 4, 5,
- 6, 7, -1, -1, 81, -1, -1, -1, -1, -1,
- 87, -1, 63, 64, 20, 21, -1, 23, -1, -1,
- -1, 27, -1, -1, -1, -1, -1, -1, -1, -1,
- 81, -1, -1, -1, 40, 41, 42, 43, -1, 90,
- -1, -1, -1, 49, 50, -1, -1, 53, -1, -1,
- 56, -1, -1, -1, -1, -1, -1, 63, 64, -1,
- -1, -1, -1, -1, 70, 71, 72, -1, -1, -1,
+ -1, -1, -1, 44, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 54, 81, -1, -1, -1, -1, -1,
+ 87, -1, 63, 64, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 86, 3, 4, -1, 90, 7, 8, 9, 10, 11,
- 12, 13, 14, 15, 16, 17, 18, -1, -1, -1,
- -1, 23, 1, 25, 26, 4, 5, 6, 7, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 20, 21, -1, 23, -1, -1, -1, 27, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 40, 41, 42, 43, -1, -1, -1, -1, -1,
- 49, 50, -1, -1, 53, -1, -1, 56, -1, 81,
- -1, -1, -1, -1, 63, 64, -1, -1, 90, -1,
- -1, 70, 71, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 1, -1, 3, -1, -1, 86, 87, 8,
- 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
- 19, 20, 21, -1, 23, 24, 25, 26, 1, -1,
- -1, 4, 5, 6, 7, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 20, 21, -1,
- 23, -1, -1, 1, 27, -1, 4, 5, 6, 7,
- -1, -1, -1, -1, -1, -1, -1, 40, 41, 42,
- 43, -1, 20, 21, -1, 23, 49, 50, -1, 27,
- 53, -1, 81, 56, -1, -1, -1, -1, 87, -1,
- 63, 64, 40, 41, 42, 43, -1, 70, 71, 72,
- -1, 49, 50, -1, -1, 53, -1, -1, 56, -1,
- -1, -1, -1, 86, -1, 63, 64, -1, -1, 3,
- -1, -1, 70, 71, 8, 9, 10, 11, 12, 13,
- 14, 15, 16, 17, 18, 19, 20, 21, 86, 23,
- 24, 25, 26, 1, -1, 3, -1, -1, -1, -1,
+ 81, -1, -1, -1, 1, -1, 3, 4, -1, 90,
+ 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
+ 17, 18, 19, 20, 21, -1, 23, -1, 25, 26,
+ 27, -1, -1, 30, 31, 32, 33, 34, -1, 1,
+ -1, 3, 4, 40, -1, 7, 8, 9, 10, 11,
+ 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
+ -1, 23, -1, 25, 26, 27, 63, 64, 30, 31,
+ 32, 33, 34, -1, -1, -1, -1, -1, 40, -1,
+ -1, -1, -1, -1, 81, -1, -1, -1, -1, -1,
+ 87, -1, -1, 90, -1, -1, -1, -1, 3, -1,
+ -1, 63, 64, 8, 9, 10, 11, 12, 13, 14,
+ 15, 16, 17, 18, 19, -1, -1, -1, -1, 81,
+ 25, 26, -1, -1, 1, 87, 3, 4, 90, -1,
+ 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
+ 17, 18, 19, 20, 21, -1, 23, -1, 25, 26,
+ 27, -1, -1, 30, 31, 32, 33, 34, -1, -1,
+ -1, -1, -1, 40, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 1, 81, -1, 4, 5,
+ 6, 7, -1, -1, -1, -1, 63, 64, -1, -1,
+ -1, -1, -1, -1, 20, 21, -1, 23, -1, -1,
+ -1, 27, -1, -1, 81, -1, -1, -1, -1, -1,
+ 87, -1, -1, 90, 40, 41, 42, 43, -1, -1,
+ -1, -1, -1, 49, 50, -1, -1, 53, 0, 1,
+ 56, -1, 4, 5, 6, 7, -1, 63, 64, -1,
+ -1, -1, -1, -1, 70, 71, 72, -1, 20, 21,
+ -1, 23, -1, -1, -1, 27, -1, -1, -1, -1,
+ 86, -1, -1, -1, 90, -1, -1, -1, 40, 41,
+ 42, 43, -1, -1, -1, -1, -1, 49, 50, -1,
+ -1, 53, 1, -1, 56, 4, 5, 6, 7, -1,
+ -1, 63, 64, -1, -1, -1, -1, -1, 70, 71,
+ -1, 20, 21, -1, 23, -1, -1, 1, 27, -1,
+ 4, 5, 6, 7, 86, 87, -1, -1, -1, -1,
+ -1, 40, 41, 42, 43, -1, 20, 21, -1, 23,
+ 49, 50, -1, 27, 53, -1, -1, 56, -1, -1,
+ -1, -1, -1, -1, 63, 64, 40, 41, 42, 43,
+ -1, 70, 71, -1, -1, 49, 50, -1, -1, 53,
+ 1, -1, 56, 4, 5, 6, 7, 86, 87, 63,
+ 64, -1, -1, -1, -1, -1, 70, 71, 72, 20,
+ 21, -1, 23, -1, -1, -1, 27, -1, -1, -1,
+ -1, -1, 86, -1, -1, -1, -1, -1, -1, 40,
+ 41, 42, 43, -1, -1, -1, -1, -1, 49, 50,
+ -1, -1, 53, -1, -1, 56, -1, -1, -1, -1,
+ -1, -1, 63, 64, -1, -1, 3, -1, -1, 70,
+ 71, 8, 9, 10, 11, 12, 13, 14, 15, 16,
+ 17, 18, 19, 20, 21, 86, 23, 24, 25, 26,
+ 1, -1, 3, 4, -1, -1, 7, 8, 9, 10,
+ 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
+ 21, -1, 23, -1, 25, 26, 27, -1, -1, 30,
+ 31, 32, 33, 34, -1, 3, -1, -1, -1, 40,
8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
- 18, 19, 20, 21, 3, 23, 24, 25, 26, 8,
- 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
- 19, 20, 21, -1, 23, 24, 25, 26, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 81, -1, 3,
- -1, -1, -1, 87, 8, 9, 10, 11, 12, 13,
- 14, 15, 16, 17, 18, 19, -1, -1, -1, -1,
- -1, 25, 26, 81, -1, -1, -1, -1, -1, -1,
+ 18, 19, 20, 21, 81, 23, 24, 25, 26, 3,
+ 87, -1, 63, 64, 8, 9, 10, 11, 12, 13,
+ 14, 15, 16, 17, -1, -1, -1, -1, -1, -1,
+ 81, 25, 26, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 81, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 81, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, 81
};
@@ -1461,90 +1465,90 @@ static const yytype_uint16 yystos[] =
20, 21, 23, 27, 40, 41, 42, 43, 49, 50,
53, 56, 63, 64, 70, 71, 86, 113, 114, 130,
132, 136, 137, 149, 152, 153, 157, 159, 162, 163,
- 164, 168, 172, 174, 178, 179, 202, 203, 221, 229,
- 230, 238, 247, 267, 269, 280, 282, 304, 305, 306,
- 348, 399, 400, 401, 402, 403, 407, 429, 431, 454,
- 455, 456, 457, 458, 462, 463, 464, 467, 471, 479,
- 494, 495, 129, 204, 131, 158, 239, 268, 281, 307,
- 349, 3, 201, 255, 157, 53, 157, 172, 174, 53,
- 164, 174, 175, 201, 201, 432, 3, 81, 197, 200,
- 197, 480, 496, 201, 91, 133, 122, 138, 150, 88,
+ 164, 168, 172, 174, 178, 179, 203, 204, 222, 230,
+ 231, 239, 248, 268, 270, 281, 283, 305, 306, 307,
+ 349, 400, 401, 402, 403, 404, 408, 430, 432, 455,
+ 456, 457, 458, 459, 463, 464, 465, 468, 472, 480,
+ 495, 496, 129, 205, 131, 158, 240, 269, 282, 308,
+ 350, 3, 202, 256, 157, 53, 157, 172, 174, 53,
+ 164, 174, 175, 202, 202, 433, 3, 81, 198, 201,
+ 198, 481, 497, 202, 91, 133, 122, 138, 150, 88,
88, 121, 93, 160, 154, 123, 165, 8, 9, 10,
11, 12, 13, 14, 15, 16, 17, 18, 19, 24,
- 25, 26, 160, 197, 242, 243, 244, 245, 246, 257,
- 258, 259, 260, 261, 262, 263, 264, 265, 266, 267,
- 269, 280, 282, 306, 315, 318, 321, 322, 325, 326,
- 329, 119, 115, 113, 87, 231, 116, 270, 22, 120,
- 117, 118, 124, 404, 125, 430, 126, 160, 465, 465,
- 127, 128, 89, 498, 88, 17, 197, 208, 257, 260,
- 261, 262, 263, 264, 322, 326, 197, 201, 240, 242,
- 201, 201, 201, 201, 160, 201, 160, 169, 201, 201,
- 408, 201, 198, 75, 81, 75, 230, 230, 89, 89,
+ 25, 26, 160, 198, 243, 244, 245, 246, 247, 258,
+ 259, 260, 261, 262, 263, 264, 265, 266, 267, 268,
+ 270, 281, 283, 307, 316, 319, 322, 323, 326, 327,
+ 330, 119, 115, 113, 87, 232, 116, 271, 22, 120,
+ 117, 118, 124, 405, 125, 431, 126, 160, 466, 466,
+ 127, 128, 89, 499, 88, 17, 198, 209, 258, 261,
+ 262, 263, 264, 265, 323, 327, 198, 202, 241, 243,
+ 202, 202, 202, 202, 160, 202, 160, 169, 202, 202,
+ 409, 202, 199, 75, 81, 75, 231, 231, 89, 89,
88, 4, 6, 20, 21, 23, 24, 27, 49, 53,
- 67, 472, 473, 475, 230, 491, 88, 48, 176, 89,
- 88, 89, 8, 11, 8, 9, 91, 319, 173, 92,
- 94, 91, 91, 88, 88, 197, 88, 89, 283, 88,
- 88, 88, 88, 89, 88, 89, 441, 88, 466, 459,
- 468, 88, 88, 499, 205, 241, 308, 350, 89, 93,
- 410, 433, 200, 199, 3, 231, 3, 222, 134, 208,
- 91, 3, 139, 474, 73, 74, 75, 76, 77, 78,
- 79, 80, 84, 85, 99, 100, 104, 105, 197, 209,
- 210, 211, 212, 213, 214, 215, 216, 217, 218, 219,
- 493, 92, 161, 155, 166, 8, 210, 220, 91, 47,
- 177, 316, 323, 327, 232, 271, 105, 405, 442, 177,
- 89, 89, 501, 201, 201, 248, 251, 255, 256, 330,
- 89, 89, 170, 411, 409, 93, 438, 200, 481, 497,
- 223, 111, 112, 3, 92, 94, 218, 218, 218, 210,
+ 67, 473, 474, 476, 231, 492, 88, 48, 176, 89,
+ 88, 89, 8, 11, 8, 9, 91, 320, 173, 92,
+ 94, 91, 91, 88, 88, 198, 88, 89, 284, 88,
+ 88, 88, 88, 89, 88, 89, 442, 88, 467, 460,
+ 469, 88, 88, 500, 206, 242, 309, 351, 89, 93,
+ 411, 434, 201, 200, 3, 232, 3, 223, 134, 209,
+ 91, 3, 139, 475, 73, 74, 75, 76, 77, 78,
+ 79, 80, 84, 85, 99, 100, 104, 105, 198, 210,
+ 211, 212, 213, 214, 215, 216, 217, 218, 219, 220,
+ 494, 92, 161, 155, 166, 8, 211, 221, 91, 47,
+ 177, 317, 324, 328, 233, 272, 105, 406, 443, 177,
+ 89, 89, 502, 202, 202, 249, 252, 256, 257, 331,
+ 89, 89, 170, 412, 410, 93, 439, 201, 482, 498,
+ 224, 111, 112, 3, 92, 94, 219, 219, 219, 211,
96, 97, 98, 82, 83, 99, 100, 101, 102, 103,
- 492, 151, 194, 197, 184, 180, 94, 320, 194, 220,
- 220, 220, 105, 233, 230, 273, 275, 284, 412, 444,
- 460, 469, 30, 31, 60, 65, 68, 69, 337, 338,
- 343, 421, 423, 424, 490, 500, 502, 206, 331, 249,
- 309, 351, 184, 197, 177, 439, 434, 89, 410, 7,
- 90, 203, 208, 224, 226, 227, 265, 306, 135, 92,
- 140, 475, 106, 212, 213, 214, 215, 215, 216, 216,
- 217, 217, 217, 94, 201, 195, 1, 32, 33, 156,
- 185, 203, 238, 337, 348, 353, 358, 399, 400, 44,
- 45, 46, 167, 181, 182, 183, 185, 360, 210, 230,
- 317, 324, 328, 200, 210, 234, 235, 237, 1, 242,
- 276, 272, 274, 230, 51, 52, 61, 337, 406, 413,
- 421, 423, 426, 427, 428, 490, 44, 54, 185, 443,
- 445, 448, 451, 184, 180, 339, 344, 19, 197, 422,
- 58, 425, 197, 197, 505, 503, 504, 422, 506, 90,
- 95, 230, 94, 230, 311, 314, 274, 171, 197, 177,
- 482, 225, 88, 201, 88, 90, 3, 89, 230, 94,
- 193, 90, 189, 186, 191, 190, 192, 34, 197, 244,
- 322, 326, 359, 382, 187, 188, 361, 90, 276, 88,
- 92, 243, 92, 92, 92, 95, 106, 94, 236, 279,
- 277, 90, 275, 8, 197, 257, 262, 263, 264, 289,
- 306, 197, 197, 197, 419, 90, 414, 415, 416, 417,
- 418, 420, 201, 201, 90, 446, 447, 461, 470, 31,
- 382, 200, 3, 3, 88, 88, 88, 200, 88, 207,
- 107, 332, 334, 250, 3, 310, 312, 352, 90, 435,
- 337, 421, 423, 484, 486, 240, 29, 228, 141, 493,
- 196, 88, 88, 88, 88, 88, 88, 354, 88, 88,
- 230, 210, 200, 237, 88, 248, 285, 200, 200, 200,
- 88, 88, 88, 88, 88, 88, 88, 449, 452, 88,
- 88, 90, 90, 340, 345, 209, 335, 333, 251, 90,
- 94, 90, 66, 489, 487, 488, 483, 485, 88, 210,
- 88, 72, 114, 130, 143, 145, 146, 197, 230, 3,
- 236, 278, 106, 105, 364, 364, 382, 252, 255, 220,
- 334, 313, 436, 88, 88, 88, 90, 486, 197, 142,
- 144, 88, 3, 362, 88, 286, 365, 366, 450, 453,
- 341, 346, 253, 336, 314, 197, 147, 90, 145, 355,
- 364, 89, 106, 35, 367, 370, 38, 384, 384, 252,
- 55, 387, 94, 108, 437, 91, 105, 373, 363, 287,
- 371, 106, 368, 385, 342, 388, 347, 254, 59, 440,
- 3, 476, 478, 374, 375, 356, 384, 1, 28, 29,
- 290, 292, 296, 298, 382, 94, 105, 384, 105, 62,
- 390, 255, 197, 92, 477, 106, 35, 36, 37, 376,
- 379, 383, 384, 295, 300, 299, 288, 291, 293, 297,
- 372, 369, 386, 389, 391, 148, 94, 106, 377, 380,
- 357, 88, 210, 93, 90, 292, 230, 298, 251, 370,
- 194, 194, 105, 201, 478, 94, 382, 39, 393, 301,
- 242, 302, 106, 106, 392, 378, 381, 394, 93, 303,
- 294, 194, 379, 251, 105, 251, 88, 106, 395, 75,
- 396, 397, 106, 94, 398, 75
+ 493, 151, 195, 198, 184, 185, 180, 94, 321, 195,
+ 221, 221, 221, 105, 234, 231, 274, 276, 285, 413,
+ 445, 461, 470, 30, 31, 60, 65, 68, 69, 338,
+ 339, 344, 422, 424, 425, 491, 501, 503, 207, 332,
+ 250, 310, 352, 184, 198, 177, 440, 435, 89, 411,
+ 7, 90, 204, 209, 225, 227, 228, 266, 307, 135,
+ 92, 140, 476, 106, 213, 214, 215, 216, 216, 217,
+ 217, 218, 218, 218, 94, 202, 196, 1, 32, 33,
+ 156, 186, 204, 230, 239, 338, 349, 354, 359, 400,
+ 401, 44, 45, 46, 167, 181, 182, 183, 186, 361,
+ 211, 231, 318, 325, 329, 201, 211, 235, 236, 238,
+ 1, 243, 277, 273, 275, 231, 51, 52, 61, 338,
+ 407, 414, 422, 424, 427, 428, 429, 491, 44, 54,
+ 186, 444, 446, 449, 452, 184, 180, 340, 345, 19,
+ 198, 423, 58, 426, 198, 198, 506, 504, 505, 423,
+ 507, 90, 95, 231, 94, 231, 312, 315, 275, 171,
+ 198, 177, 483, 226, 88, 202, 88, 90, 3, 89,
+ 231, 94, 194, 90, 190, 186, 187, 192, 191, 193,
+ 34, 198, 245, 323, 327, 360, 383, 188, 189, 362,
+ 90, 277, 88, 92, 244, 92, 92, 92, 95, 106,
+ 94, 237, 280, 278, 90, 276, 8, 198, 258, 263,
+ 264, 265, 290, 307, 198, 198, 198, 420, 90, 415,
+ 416, 417, 418, 419, 421, 202, 202, 90, 447, 448,
+ 462, 471, 31, 383, 201, 3, 3, 88, 88, 88,
+ 201, 88, 208, 107, 333, 335, 251, 3, 311, 313,
+ 353, 90, 436, 338, 422, 424, 485, 487, 241, 29,
+ 229, 141, 494, 197, 88, 88, 88, 88, 88, 88,
+ 355, 88, 88, 231, 211, 201, 238, 88, 249, 286,
+ 201, 201, 201, 88, 88, 88, 88, 88, 88, 88,
+ 450, 453, 88, 88, 90, 90, 341, 346, 210, 336,
+ 334, 252, 90, 94, 90, 66, 490, 488, 489, 484,
+ 486, 88, 211, 88, 72, 114, 130, 143, 145, 146,
+ 198, 3, 3, 237, 279, 106, 105, 365, 365, 383,
+ 253, 256, 221, 335, 314, 437, 88, 88, 88, 90,
+ 487, 198, 142, 144, 88, 356, 363, 88, 287, 366,
+ 367, 451, 454, 342, 347, 254, 337, 315, 198, 147,
+ 90, 145, 105, 374, 365, 89, 106, 35, 368, 371,
+ 38, 385, 385, 253, 55, 388, 94, 108, 438, 91,
+ 375, 376, 357, 364, 288, 372, 106, 369, 386, 343,
+ 389, 348, 255, 59, 441, 3, 477, 479, 106, 35,
+ 36, 37, 377, 380, 384, 385, 385, 1, 28, 29,
+ 291, 293, 297, 299, 383, 94, 105, 385, 105, 62,
+ 391, 256, 198, 92, 478, 106, 378, 381, 358, 296,
+ 301, 300, 289, 292, 294, 298, 373, 370, 387, 390,
+ 392, 148, 94, 94, 383, 39, 394, 88, 211, 93,
+ 90, 293, 231, 299, 252, 371, 195, 195, 105, 202,
+ 479, 379, 382, 395, 302, 243, 303, 106, 106, 393,
+ 380, 252, 105, 93, 304, 295, 195, 396, 252, 88,
+ 106, 75, 397, 398, 106, 94, 399, 75
};
/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
@@ -1561,55 +1565,55 @@ static const yytype_uint16 yyr1[] =
162, 162, 163, 163, 165, 166, 167, 164, 169, 170,
171, 168, 173, 172, 175, 174, 176, 176, 177, 177,
178, 178, 179, 180, 180, 181, 181, 181, 182, 182,
- 183, 184, 184, 186, 185, 187, 185, 188, 185, 189,
- 185, 190, 185, 191, 185, 192, 185, 193, 185, 194,
- 196, 195, 195, 197, 198, 197, 199, 197, 200, 201,
- 202, 202, 202, 204, 205, 206, 207, 203, 208, 208,
- 208, 208, 208, 208, 208, 208, 208, 209, 210, 211,
- 211, 212, 212, 213, 213, 214, 214, 214, 215, 215,
- 215, 216, 216, 216, 216, 217, 217, 217, 217, 218,
- 218, 218, 219, 219, 219, 219, 219, 219, 219, 219,
- 219, 219, 220, 222, 221, 223, 223, 224, 224, 224,
- 225, 224, 226, 226, 227, 228, 228, 229, 230, 230,
- 232, 231, 233, 233, 234, 234, 235, 236, 236, 237,
- 239, 238, 238, 238, 238, 238, 238, 241, 240, 242,
- 242, 243, 243, 243, 244, 244, 244, 244, 244, 244,
- 244, 244, 245, 245, 245, 245, 246, 246, 246, 247,
- 247, 248, 250, 249, 249, 251, 251, 252, 254, 253,
- 253, 255, 256, 257, 257, 258, 258, 258, 259, 259,
- 259, 260, 260, 260, 261, 262, 262, 263, 264, 265,
- 266, 268, 267, 270, 271, 272, 269, 273, 274, 274,
- 275, 277, 278, 276, 279, 276, 281, 280, 283, 284,
- 285, 286, 287, 288, 282, 289, 289, 289, 289, 289,
- 289, 290, 291, 291, 293, 294, 292, 295, 292, 296,
- 297, 297, 299, 298, 300, 301, 298, 303, 302, 304,
- 305, 307, 308, 309, 310, 306, 311, 313, 312, 312,
- 314, 316, 317, 315, 315, 319, 320, 318, 321, 323,
- 324, 322, 322, 325, 327, 328, 326, 326, 329, 331,
- 330, 332, 333, 333, 335, 336, 334, 337, 337, 339,
- 340, 341, 342, 338, 344, 345, 346, 347, 343, 349,
- 350, 351, 352, 348, 354, 355, 356, 357, 353, 358,
- 358, 358, 359, 359, 361, 362, 363, 360, 365, 364,
- 366, 364, 367, 369, 368, 368, 371, 372, 370, 374,
- 373, 375, 373, 376, 378, 377, 377, 380, 381, 379,
- 382, 382, 382, 382, 383, 383, 383, 385, 386, 384,
- 384, 388, 389, 387, 387, 391, 392, 390, 390, 394,
- 395, 393, 393, 396, 398, 397, 397, 399, 400, 401,
- 401, 402, 404, 405, 406, 403, 408, 409, 407, 411,
- 410, 410, 412, 412, 414, 413, 415, 413, 416, 413,
- 417, 413, 418, 413, 419, 413, 420, 413, 421, 422,
- 422, 423, 424, 425, 425, 426, 427, 428, 430, 429,
- 432, 433, 434, 435, 436, 437, 431, 439, 438, 438,
- 440, 440, 442, 443, 441, 444, 444, 445, 446, 445,
- 447, 445, 449, 450, 448, 452, 453, 451, 454, 454,
- 454, 455, 455, 456, 457, 459, 460, 461, 458, 462,
- 463, 464, 466, 465, 468, 469, 470, 467, 471, 471,
- 472, 472, 472, 472, 472, 472, 472, 472, 472, 472,
- 473, 474, 474, 475, 475, 476, 477, 477, 478, 480,
- 481, 482, 483, 479, 484, 485, 485, 487, 486, 488,
- 486, 489, 486, 490, 490, 491, 492, 492, 493, 494,
- 496, 497, 495, 499, 500, 498, 501, 501, 503, 502,
- 504, 502, 505, 502, 506, 502
+ 183, 184, 184, 185, 185, 187, 186, 188, 186, 189,
+ 186, 190, 186, 191, 186, 192, 186, 193, 186, 194,
+ 186, 195, 197, 196, 196, 198, 199, 198, 200, 198,
+ 201, 202, 203, 203, 203, 205, 206, 207, 208, 204,
+ 209, 209, 209, 209, 209, 209, 209, 209, 209, 210,
+ 211, 212, 212, 213, 213, 214, 214, 215, 215, 215,
+ 216, 216, 216, 217, 217, 217, 217, 218, 218, 218,
+ 218, 219, 219, 219, 220, 220, 220, 220, 220, 220,
+ 220, 220, 220, 220, 221, 223, 222, 224, 224, 225,
+ 225, 225, 226, 225, 227, 227, 228, 229, 229, 230,
+ 231, 231, 233, 232, 234, 234, 235, 235, 236, 237,
+ 237, 238, 240, 239, 239, 239, 239, 239, 239, 242,
+ 241, 243, 243, 244, 244, 244, 245, 245, 245, 245,
+ 245, 245, 245, 245, 246, 246, 246, 246, 247, 247,
+ 247, 248, 248, 249, 251, 250, 250, 252, 252, 253,
+ 255, 254, 254, 256, 257, 258, 258, 259, 259, 259,
+ 260, 260, 260, 261, 261, 261, 262, 263, 263, 264,
+ 265, 266, 267, 269, 268, 271, 272, 273, 270, 274,
+ 275, 275, 276, 278, 279, 277, 280, 277, 282, 281,
+ 284, 285, 286, 287, 288, 289, 283, 290, 290, 290,
+ 290, 290, 290, 291, 292, 292, 294, 295, 293, 296,
+ 293, 297, 298, 298, 300, 299, 301, 302, 299, 304,
+ 303, 305, 306, 308, 309, 310, 311, 307, 312, 314,
+ 313, 313, 315, 317, 318, 316, 316, 320, 321, 319,
+ 322, 324, 325, 323, 323, 326, 328, 329, 327, 327,
+ 330, 332, 331, 333, 334, 334, 336, 337, 335, 338,
+ 338, 340, 341, 342, 343, 339, 345, 346, 347, 348,
+ 344, 350, 351, 352, 353, 349, 355, 356, 357, 358,
+ 354, 359, 359, 359, 360, 360, 362, 363, 364, 361,
+ 366, 365, 367, 365, 368, 370, 369, 369, 372, 373,
+ 371, 375, 374, 376, 374, 377, 379, 378, 378, 381,
+ 382, 380, 383, 383, 383, 383, 384, 384, 384, 386,
+ 387, 385, 385, 389, 390, 388, 388, 392, 393, 391,
+ 391, 395, 396, 394, 394, 397, 399, 398, 398, 400,
+ 401, 402, 402, 403, 405, 406, 407, 404, 409, 410,
+ 408, 412, 411, 411, 413, 413, 415, 414, 416, 414,
+ 417, 414, 418, 414, 419, 414, 420, 414, 421, 414,
+ 422, 423, 423, 424, 425, 426, 426, 427, 428, 429,
+ 431, 430, 433, 434, 435, 436, 437, 438, 432, 440,
+ 439, 439, 441, 441, 443, 444, 442, 445, 445, 446,
+ 447, 446, 448, 446, 450, 451, 449, 453, 454, 452,
+ 455, 455, 455, 456, 456, 457, 458, 460, 461, 462,
+ 459, 463, 464, 465, 467, 466, 469, 470, 471, 468,
+ 472, 472, 473, 473, 473, 473, 473, 473, 473, 473,
+ 473, 473, 474, 475, 475, 476, 476, 477, 478, 478,
+ 479, 481, 482, 483, 484, 480, 485, 486, 486, 488,
+ 487, 489, 487, 490, 487, 491, 491, 492, 493, 493,
+ 494, 495, 497, 498, 496, 500, 501, 499, 502, 502,
+ 504, 503, 505, 503, 506, 503, 507, 503
};
/* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */
@@ -1626,55 +1630,55 @@ static const yytype_uint8 yyr2[] =
1, 1, 2, 1, 0, 0, 0, 7, 0, 0,
0, 8, 0, 4, 0, 3, 1, 0, 2, 0,
2, 1, 2, 2, 0, 1, 1, 2, 1, 1,
- 2, 2, 0, 0, 3, 0, 3, 0, 3, 0,
- 3, 0, 3, 0, 3, 0, 3, 0, 3, 2,
- 0, 4, 0, 1, 0, 3, 0, 4, 1, 1,
- 1, 2, 2, 0, 0, 0, 0, 9, 1, 1,
+ 2, 1, 0, 3, 2, 0, 3, 0, 3, 0,
+ 3, 0, 3, 0, 3, 0, 3, 0, 3, 0,
+ 3, 2, 0, 4, 0, 1, 0, 3, 0, 4,
+ 1, 1, 1, 2, 2, 0, 0, 0, 0, 9,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 3, 1, 3, 1, 3, 1, 3, 3, 1, 3,
- 3, 1, 3, 3, 3, 1, 2, 2, 2, 1,
- 1, 3, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 0, 6, 2, 0, 1, 2, 2,
- 0, 4, 1, 1, 4, 2, 0, 2, 2, 0,
- 0, 4, 3, 0, 1, 1, 2, 3, 0, 3,
- 0, 3, 1, 1, 1, 2, 1, 0, 3, 1,
+ 1, 1, 3, 1, 3, 1, 3, 1, 3, 3,
+ 1, 3, 3, 1, 3, 3, 3, 1, 2, 2,
+ 2, 1, 1, 3, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 0, 6, 2, 0, 1,
+ 2, 2, 0, 4, 1, 1, 4, 2, 0, 2,
+ 2, 0, 0, 4, 3, 0, 1, 1, 2, 3,
+ 0, 3, 0, 3, 1, 1, 1, 2, 1, 0,
+ 3, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 2, 0, 4, 0, 1, 1, 2,
+ 0, 4, 0, 1, 1, 1, 1, 1, 2, 1,
+ 2, 3, 2, 1, 1, 2, 1, 1, 1, 1,
+ 1, 1, 1, 0, 3, 0, 0, 0, 7, 2,
+ 2, 0, 2, 0, 0, 5, 0, 3, 0, 3,
+ 0, 0, 0, 0, 0, 0, 15, 1, 1, 1,
+ 1, 1, 1, 2, 2, 0, 0, 0, 6, 0,
+ 3, 2, 2, 0, 0, 3, 0, 0, 5, 0,
+ 3, 1, 1, 0, 0, 0, 0, 9, 2, 0,
+ 4, 0, 2, 0, 0, 6, 2, 0, 0, 6,
+ 6, 0, 0, 6, 1, 1, 0, 0, 6, 1,
+ 1, 0, 4, 2, 2, 0, 0, 0, 5, 1,
+ 1, 0, 0, 0, 0, 9, 0, 0, 0, 0,
+ 9, 0, 0, 0, 0, 9, 0, 0, 0, 0,
+ 10, 1, 1, 0, 1, 1, 0, 0, 0, 8,
+ 0, 3, 0, 4, 2, 0, 4, 0, 0, 0,
+ 5, 0, 3, 0, 4, 2, 0, 4, 0, 0,
+ 0, 5, 1, 1, 1, 1, 1, 1, 1, 0,
+ 0, 6, 0, 0, 0, 6, 0, 0, 0, 6,
+ 0, 0, 0, 6, 0, 2, 0, 4, 0, 3,
+ 3, 1, 1, 2, 0, 0, 0, 7, 0, 0,
+ 6, 0, 3, 0, 2, 0, 0, 3, 0, 3,
+ 0, 3, 0, 3, 0, 3, 0, 3, 0, 3,
+ 3, 1, 1, 3, 2, 1, 0, 3, 3, 3,
+ 0, 3, 0, 0, 0, 0, 0, 0, 13, 0,
+ 3, 0, 2, 0, 0, 0, 5, 2, 0, 1,
+ 0, 3, 0, 3, 0, 0, 6, 0, 0, 6,
+ 1, 1, 1, 1, 1, 2, 3, 0, 0, 0,
+ 8, 3, 3, 2, 0, 3, 0, 0, 0, 8,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 2, 0, 4, 0, 1, 1, 2, 0, 4,
- 0, 1, 1, 1, 1, 1, 2, 1, 2, 3,
- 2, 1, 1, 2, 1, 1, 1, 1, 1, 1,
- 1, 0, 3, 0, 0, 0, 7, 2, 2, 0,
- 2, 0, 0, 5, 0, 3, 0, 3, 0, 0,
- 0, 0, 0, 0, 15, 1, 1, 1, 1, 1,
- 1, 2, 2, 0, 0, 0, 6, 0, 3, 2,
- 2, 0, 0, 3, 0, 0, 5, 0, 3, 1,
- 1, 0, 0, 0, 0, 9, 2, 0, 4, 0,
- 2, 0, 0, 6, 2, 0, 0, 6, 6, 0,
- 0, 6, 1, 1, 0, 0, 6, 1, 1, 0,
- 4, 2, 2, 0, 0, 0, 5, 1, 1, 0,
- 0, 0, 0, 9, 0, 0, 0, 0, 9, 0,
- 0, 0, 0, 9, 0, 0, 0, 0, 11, 1,
- 1, 0, 1, 1, 0, 0, 0, 8, 0, 3,
- 0, 4, 2, 0, 4, 0, 0, 0, 5, 0,
- 3, 0, 4, 2, 0, 4, 0, 0, 0, 5,
- 1, 1, 1, 1, 1, 1, 1, 0, 0, 6,
- 0, 0, 0, 6, 0, 0, 0, 6, 0, 0,
- 0, 6, 0, 2, 0, 4, 0, 3, 3, 1,
- 1, 2, 0, 0, 0, 7, 0, 0, 6, 0,
- 3, 0, 2, 0, 0, 3, 0, 3, 0, 3,
- 0, 3, 0, 3, 0, 3, 0, 3, 3, 1,
- 1, 3, 2, 1, 0, 3, 3, 3, 0, 3,
- 0, 0, 0, 0, 0, 0, 13, 0, 3, 0,
- 2, 0, 0, 0, 5, 2, 0, 1, 0, 3,
- 0, 3, 0, 0, 6, 0, 0, 6, 1, 1,
- 1, 1, 1, 2, 3, 0, 0, 0, 8, 3,
- 3, 2, 0, 3, 0, 0, 0, 8, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 2,
- 2, 3, 0, 2, 5, 2, 3, 0, 1, 0,
- 0, 0, 0, 10, 2, 2, 0, 0, 3, 0,
- 3, 0, 3, 3, 3, 3, 4, 0, 1, 2,
- 0, 0, 6, 0, 0, 5, 2, 0, 0, 3,
- 0, 3, 0, 3, 0, 3
+ 1, 2, 2, 3, 0, 2, 5, 2, 3, 0,
+ 1, 0, 0, 0, 0, 10, 2, 2, 0, 0,
+ 3, 0, 3, 0, 3, 3, 3, 3, 4, 0,
+ 1, 2, 0, 0, 6, 0, 0, 5, 2, 0,
+ 0, 3, 0, 3, 0, 3, 0, 3
};
@@ -1690,22 +1694,22 @@ static const yytype_uint8 yyr2[] =
#define YYRECOVERING() (!!yyerrstatus)
-#define YYBACKUP(Token, Value) \
-do \
- if (yychar == YYEMPTY) \
- { \
- yychar = (Token); \
- yylval = (Value); \
- YYPOPSTACK (yylen); \
- yystate = *yyssp; \
- goto yybackup; \
- } \
- else \
- { \
- yyerror (YY_("syntax error: cannot back up")); \
- YYERROR; \
- } \
-while (0)
+#define YYBACKUP(Token, Value) \
+ do \
+ if (yychar == YYEMPTY) \
+ { \
+ yychar = (Token); \
+ yylval = (Value); \
+ YYPOPSTACK (yylen); \
+ yystate = *yyssp; \
+ goto yybackup; \
+ } \
+ else \
+ { \
+ yyerror (YY_("syntax error: cannot back up")); \
+ YYERROR; \
+ } \
+ while (0)
/* Error token number */
#define YYTERROR 1
@@ -1745,37 +1749,37 @@ do { \
} while (0)
-/*----------------------------------------.
-| Print this symbol's value on YYOUTPUT. |
-`----------------------------------------*/
+/*-----------------------------------.
+| Print this symbol's value on YYO. |
+`-----------------------------------*/
static void
-yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+yy_symbol_value_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep)
{
- FILE *yyo = yyoutput;
- YYUSE (yyo);
+ FILE *yyoutput = yyo;
+ YYUSE (yyoutput);
if (!yyvaluep)
return;
# ifdef YYPRINT
if (yytype < YYNTOKENS)
- YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+ YYPRINT (yyo, yytoknum[yytype], *yyvaluep);
# endif
YYUSE (yytype);
}
-/*--------------------------------.
-| Print this symbol on YYOUTPUT. |
-`--------------------------------*/
+/*---------------------------.
+| Print this symbol on YYO. |
+`---------------------------*/
static void
-yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+yy_symbol_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep)
{
- YYFPRINTF (yyoutput, "%s %s (",
+ YYFPRINTF (yyo, "%s %s (",
yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]);
- yy_symbol_value_print (yyoutput, yytype, yyvaluep);
- YYFPRINTF (yyoutput, ")");
+ yy_symbol_value_print (yyo, yytype, yyvaluep);
+ YYFPRINTF (yyo, ")");
}
/*------------------------------------------------------------------.
@@ -1820,7 +1824,7 @@ yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule)
YYFPRINTF (stderr, " $%d = ", yyi + 1);
yy_symbol_print (stderr,
yystos[yyssp[yyi + 1 - yynrhs]],
- &(yyvsp[(yyi + 1) - (yynrhs)])
+ &yyvsp[(yyi + 1) - (yynrhs)]
);
YYFPRINTF (stderr, "\n");
}
@@ -1924,7 +1928,10 @@ yytnamerr (char *yyres, const char *yystr)
case '\\':
if (*++yyp != '\\')
goto do_not_strip_quotes;
- /* Fall through. */
+ else
+ goto append;
+
+ append:
default:
if (yyres)
yyres[yyn] = *yyp;
@@ -1942,7 +1949,7 @@ yytnamerr (char *yyres, const char *yystr)
if (! yyres)
return yystrlen (yystr);
- return yystpcpy (yyres, yystr) - yyres;
+ return (YYSIZE_T) (yystpcpy (yyres, yystr) - yyres);
}
# endif
@@ -2020,10 +2027,10 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
yyarg[yycount++] = yytname[yyx];
{
YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
- if (! (yysize <= yysize1
- && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+ if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)
+ yysize = yysize1;
+ else
return 2;
- yysize = yysize1;
}
}
}
@@ -2047,9 +2054,10 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
{
YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
- if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+ if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)
+ yysize = yysize1;
+ else
return 2;
- yysize = yysize1;
}
if (*yymsg_alloc < yysize)
@@ -2175,23 +2183,33 @@ yyparse (void)
yychar = YYEMPTY; /* Cause a token to be read. */
goto yysetstate;
+
/*------------------------------------------------------------.
-| yynewstate -- Push a new state, which is found in yystate. |
+| yynewstate -- push a new state, which is found in yystate. |
`------------------------------------------------------------*/
- yynewstate:
+yynewstate:
/* In all cases, when you get here, the value and location stacks
have just been pushed. So pushing a state here evens the stacks. */
yyssp++;
- yysetstate:
- *yyssp = yystate;
+
+/*--------------------------------------------------------------------.
+| yynewstate -- set current state (the top of the stack) to yystate. |
+`--------------------------------------------------------------------*/
+yysetstate:
+ YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+ YY_ASSERT (0 <= yystate && yystate < YYNSTATES);
+ *yyssp = (yytype_int16) yystate;
if (yyss + yystacksize - 1 <= yyssp)
+#if !defined yyoverflow && !defined YYSTACK_RELOCATE
+ goto yyexhaustedlab;
+#else
{
/* Get the current used size of the three stacks, in elements. */
- YYSIZE_T yysize = yyssp - yyss + 1;
+ YYSIZE_T yysize = (YYSIZE_T) (yyssp - yyss + 1);
-#ifdef yyoverflow
+# if defined yyoverflow
{
/* Give user a chance to reallocate the stack. Use copies of
these so that the &'s don't force the real ones into
@@ -2207,14 +2225,10 @@ yyparse (void)
&yyss1, yysize * sizeof (*yyssp),
&yyvs1, yysize * sizeof (*yyvsp),
&yystacksize);
-
yyss = yyss1;
yyvs = yyvs1;
}
-#else /* no yyoverflow */
-# ifndef YYSTACK_RELOCATE
- goto yyexhaustedlab;
-# else
+# else /* defined YYSTACK_RELOCATE */
/* Extend the stack our own way. */
if (YYMAXDEPTH <= yystacksize)
goto yyexhaustedlab;
@@ -2230,12 +2244,11 @@ yyparse (void)
goto yyexhaustedlab;
YYSTACK_RELOCATE (yyss_alloc, yyss);
YYSTACK_RELOCATE (yyvs_alloc, yyvs);
-# undef YYSTACK_RELOCATE
+# undef YYSTACK_RELOCATE
if (yyss1 != yyssa)
YYSTACK_FREE (yyss1);
}
# endif
-#endif /* no yyoverflow */
yyssp = yyss + yysize - 1;
yyvsp = yyvs + yysize - 1;
@@ -2246,19 +2259,18 @@ yyparse (void)
if (yyss + yystacksize - 1 <= yyssp)
YYABORT;
}
-
- YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+#endif /* !defined yyoverflow && !defined YYSTACK_RELOCATE */
if (yystate == YYFINAL)
YYACCEPT;
goto yybackup;
+
/*-----------.
| yybackup. |
`-----------*/
yybackup:
-
/* Do appropriate processing given the current state. Read a
lookahead token if we need one and don't already have one. */
@@ -2316,7 +2328,6 @@ yybackup:
YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
*++yyvsp = yylval;
YY_IGNORE_MAYBE_UNINITIALIZED_END
-
goto yynewstate;
@@ -2331,7 +2342,7 @@ yydefault:
/*-----------------------------.
-| yyreduce -- Do a reduction. |
+| yyreduce -- do a reduction. |
`-----------------------------*/
yyreduce:
/* yyn is the number of a rule to reduce with. */
@@ -2351,11 +2362,11 @@ yyreduce:
YY_REDUCE_PRINT (yyn);
switch (yyn)
{
- case 5:
-#line 400 "fe/idl.ypp" /* yacc.c:1651 */
+ case 5:
+#line 402 "fe/idl.ypp"
{
- AST_Decl *d = (yyvsp[0].dcval);
AST_Annotation_Appls *annotations = (yyvsp[-1].annotations_val);
+ AST_Decl *d = (yyvsp[0].dcval);
if (d)
{
d->annotation_appls (*annotations);
@@ -2363,318 +2374,318 @@ yyreduce:
else
{
idl_global->err ()-> unsupported_warning(
- "Annotating this type of definition is not supported");
+ "Annotating this is not supported");
}
delete annotations;
}
-#line 2371 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2382 "fe/idl.tab.cpp"
break;
case 6:
-#line 415 "fe/idl.ypp" /* yacc.c:1651 */
+#line 417 "fe/idl.ypp"
{
}
-#line 2378 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2389 "fe/idl.tab.cpp"
break;
case 7:
-#line 421 "fe/idl.ypp" /* yacc.c:1651 */
+#line 423 "fe/idl.ypp"
{
(yyval.dcval) = (yyvsp[0].dcval);
}
-#line 2386 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2397 "fe/idl.tab.cpp"
break;
case 8:
-#line 425 "fe/idl.ypp" /* yacc.c:1651 */
+#line 427 "fe/idl.ypp"
{
(yyval.dcval) = 0;
}
-#line 2394 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2405 "fe/idl.tab.cpp"
break;
case 9:
-#line 429 "fe/idl.ypp" /* yacc.c:1651 */
+#line 431 "fe/idl.ypp"
{
(yyval.dcval) = 0;
}
-#line 2402 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2413 "fe/idl.tab.cpp"
break;
case 10:
-#line 436 "fe/idl.ypp" /* yacc.c:1651 */
+#line 438 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_AnnotationDeclSeen);
}
-#line 2410 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2421 "fe/idl.tab.cpp"
break;
case 11:
-#line 440 "fe/idl.ypp" /* yacc.c:1651 */
+#line 442 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
(yyval.dcval) = 0;
}
-#line 2419 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2430 "fe/idl.tab.cpp"
break;
case 12:
-#line 445 "fe/idl.ypp" /* yacc.c:1651 */
+#line 447 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_TypeDeclSeen);
}
-#line 2427 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2438 "fe/idl.tab.cpp"
break;
case 13:
-#line 449 "fe/idl.ypp" /* yacc.c:1651 */
+#line 451 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
(yyval.dcval) = (yyvsp[-2].dcval);
}
-#line 2436 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2447 "fe/idl.tab.cpp"
break;
case 14:
-#line 454 "fe/idl.ypp" /* yacc.c:1651 */
+#line 456 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_TypeIdDeclSeen);
}
-#line 2444 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2455 "fe/idl.tab.cpp"
break;
case 15:
-#line 458 "fe/idl.ypp" /* yacc.c:1651 */
+#line 460 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
(yyval.dcval) = 0;
}
-#line 2453 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2464 "fe/idl.tab.cpp"
break;
case 16:
-#line 463 "fe/idl.ypp" /* yacc.c:1651 */
+#line 465 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_TypePrefixDeclSeen);
}
-#line 2461 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2472 "fe/idl.tab.cpp"
break;
case 17:
-#line 467 "fe/idl.ypp" /* yacc.c:1651 */
+#line 469 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
(yyval.dcval) = 0;
}
-#line 2470 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2481 "fe/idl.tab.cpp"
break;
case 18:
-#line 472 "fe/idl.ypp" /* yacc.c:1651 */
+#line 474 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ConstDeclSeen);
}
-#line 2478 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2489 "fe/idl.tab.cpp"
break;
case 19:
-#line 476 "fe/idl.ypp" /* yacc.c:1651 */
+#line 478 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
(yyval.dcval) = (yyvsp[-2].dcval);
}
-#line 2487 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2498 "fe/idl.tab.cpp"
break;
case 20:
-#line 481 "fe/idl.ypp" /* yacc.c:1651 */
+#line 483 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ExceptDeclSeen);
}
-#line 2495 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2506 "fe/idl.tab.cpp"
break;
case 21:
-#line 485 "fe/idl.ypp" /* yacc.c:1651 */
+#line 487 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
(yyval.dcval) = 0;
}
-#line 2504 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2515 "fe/idl.tab.cpp"
break;
case 22:
-#line 490 "fe/idl.ypp" /* yacc.c:1651 */
+#line 492 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceDeclSeen);
}
-#line 2512 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2523 "fe/idl.tab.cpp"
break;
case 23:
-#line 494 "fe/idl.ypp" /* yacc.c:1651 */
+#line 496 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
- (yyval.dcval) = 0;
+ (yyval.dcval) = (yyvsp[-2].dcval);
}
-#line 2521 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2532 "fe/idl.tab.cpp"
break;
case 24:
-#line 499 "fe/idl.ypp" /* yacc.c:1651 */
+#line 501 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ModuleDeclSeen);
}
-#line 2529 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2540 "fe/idl.tab.cpp"
break;
case 25:
-#line 503 "fe/idl.ypp" /* yacc.c:1651 */
+#line 505 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
(yyval.dcval) = (yyvsp[-2].dcval);
}
-#line 2538 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2549 "fe/idl.tab.cpp"
break;
case 26:
-#line 508 "fe/idl.ypp" /* yacc.c:1651 */
+#line 510 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeDeclSeen);
}
-#line 2546 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2557 "fe/idl.tab.cpp"
break;
case 27:
-#line 512 "fe/idl.ypp" /* yacc.c:1651 */
+#line 514 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
(yyval.dcval) = 0;
}
-#line 2555 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2566 "fe/idl.tab.cpp"
break;
case 28:
-#line 517 "fe/idl.ypp" /* yacc.c:1651 */
+#line 519 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ComponentDeclSeen);
}
-#line 2563 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2574 "fe/idl.tab.cpp"
break;
case 29:
-#line 521 "fe/idl.ypp" /* yacc.c:1651 */
+#line 523 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
(yyval.dcval) = 0;
}
-#line 2572 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2583 "fe/idl.tab.cpp"
break;
case 30:
-#line 526 "fe/idl.ypp" /* yacc.c:1651 */
+#line 528 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_HomeDeclSeen);
}
-#line 2580 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2591 "fe/idl.tab.cpp"
break;
case 31:
-#line 530 "fe/idl.ypp" /* yacc.c:1651 */
+#line 532 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
(yyval.dcval) = 0;
}
-#line 2589 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2600 "fe/idl.tab.cpp"
break;
case 32:
-#line 535 "fe/idl.ypp" /* yacc.c:1651 */
+#line 537 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_EventDeclSeen);
}
-#line 2597 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2608 "fe/idl.tab.cpp"
break;
case 33:
-#line 539 "fe/idl.ypp" /* yacc.c:1651 */
+#line 541 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
(yyval.dcval) = 0;
}
-#line 2606 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2617 "fe/idl.tab.cpp"
break;
case 34:
-#line 544 "fe/idl.ypp" /* yacc.c:1651 */
+#line 546 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeDeclSeen);
}
-#line 2614 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2625 "fe/idl.tab.cpp"
break;
case 35:
-#line 548 "fe/idl.ypp" /* yacc.c:1651 */
+#line 550 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
(yyval.dcval) = 0;
}
-#line 2623 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2634 "fe/idl.tab.cpp"
break;
case 36:
-#line 553 "fe/idl.ypp" /* yacc.c:1651 */
+#line 555 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorDeclSeen);
}
-#line 2631 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2642 "fe/idl.tab.cpp"
break;
case 37:
-#line 557 "fe/idl.ypp" /* yacc.c:1651 */
+#line 559 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
(yyval.dcval) = 0;
}
-#line 2640 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2651 "fe/idl.tab.cpp"
break;
case 38:
-#line 562 "fe/idl.ypp" /* yacc.c:1651 */
+#line 564 "fe/idl.ypp"
{
idl_global->err()->syntax_error (idl_global->parse_state());
}
-#line 2648 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2659 "fe/idl.tab.cpp"
break;
case 39:
-#line 566 "fe/idl.ypp" /* yacc.c:1651 */
+#line 568 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
yyerrok;
(yyval.dcval) = 0;
}
-#line 2658 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2669 "fe/idl.tab.cpp"
break;
case 40:
-#line 575 "fe/idl.ypp" /* yacc.c:1651 */
+#line 577 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ModuleSeen);
}
-#line 2666 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2677 "fe/idl.tab.cpp"
break;
case 41:
-#line 579 "fe/idl.ypp" /* yacc.c:1651 */
+#line 581 "fe/idl.ypp"
{
(yyval.idlist) = (yyvsp[0].idlist);
}
-#line 2674 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2685 "fe/idl.tab.cpp"
break;
case 42:
-#line 586 "fe/idl.ypp" /* yacc.c:1651 */
+#line 588 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ModuleIDSeen);
@@ -2713,27 +2724,27 @@ yyreduce:
(yyval.dcval) = m;
}
-#line 2717 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2728 "fe/idl.tab.cpp"
break;
case 43:
-#line 625 "fe/idl.ypp" /* yacc.c:1651 */
+#line 627 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ModuleSqSeen);
}
-#line 2725 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2736 "fe/idl.tab.cpp"
break;
case 44:
-#line 629 "fe/idl.ypp" /* yacc.c:1651 */
+#line 631 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ModuleBodySeen);
}
-#line 2733 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2744 "fe/idl.tab.cpp"
break;
case 45:
-#line 633 "fe/idl.ypp" /* yacc.c:1651 */
+#line 635 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ModuleQsSeen);
/*
@@ -2743,19 +2754,19 @@ yyreduce:
idl_global->scopes ().pop ();
(yyval.dcval) = (yyvsp[-5].dcval);
}
-#line 2747 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2758 "fe/idl.tab.cpp"
break;
case 46:
-#line 646 "fe/idl.ypp" /* yacc.c:1651 */
+#line 648 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleIDSeen);
}
-#line 2755 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2766 "fe/idl.tab.cpp"
break;
case 47:
-#line 653 "fe/idl.ypp" /* yacc.c:1651 */
+#line 655 "fe/idl.ypp"
{
// The module_header rule is common to template module, fixed
// module and instantiated template module. In the last
@@ -2769,11 +2780,11 @@ yyreduce:
IDL_GlobalData::PS_ModuleIDSeen);
}
}
-#line 2773 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2784 "fe/idl.tab.cpp"
break;
case 48:
-#line 667 "fe/idl.ypp" /* yacc.c:1651 */
+#line 669 "fe/idl.ypp"
{
if (FE_Utils::duplicate_param_id ((yyvsp[0].plval)))
{
@@ -2783,11 +2794,11 @@ yyreduce:
return 1;
}
}
-#line 2787 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2798 "fe/idl.tab.cpp"
break;
case 49:
-#line 677 "fe/idl.ypp" /* yacc.c:1651 */
+#line 679 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleParamsSeen);
@@ -2817,27 +2828,27 @@ yyreduce:
// of the template module.
idl_global->current_params ((yyvsp[-2].plval));
}
-#line 2821 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2832 "fe/idl.tab.cpp"
break;
case 50:
-#line 707 "fe/idl.ypp" /* yacc.c:1651 */
+#line 709 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleSqSeen);
}
-#line 2829 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2840 "fe/idl.tab.cpp"
break;
case 51:
-#line 711 "fe/idl.ypp" /* yacc.c:1651 */
+#line 713 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleBodySeen);
}
-#line 2837 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2848 "fe/idl.tab.cpp"
break;
case 52:
-#line 715 "fe/idl.ypp" /* yacc.c:1651 */
+#line 717 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleQsSeen);
@@ -2854,29 +2865,29 @@ yyreduce:
// that we are no longer in a template module scope.
idl_global->current_params (0);
}
-#line 2858 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2869 "fe/idl.tab.cpp"
break;
case 58:
-#line 749 "fe/idl.ypp" /* yacc.c:1651 */
+#line 751 "fe/idl.ypp"
{
idl_global->set_parse_state (
IDL_GlobalData::PS_ModuleRefSeen);
}
-#line 2867 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2878 "fe/idl.tab.cpp"
break;
case 59:
-#line 754 "fe/idl.ypp" /* yacc.c:1651 */
+#line 756 "fe/idl.ypp"
{
idl_global->set_parse_state (
IDL_GlobalData::PS_ModuleRefParamsSeen);
}
-#line 2876 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2887 "fe/idl.tab.cpp"
break;
case 60:
-#line 759 "fe/idl.ypp" /* yacc.c:1651 */
+#line 761 "fe/idl.ypp"
{
idl_global->set_parse_state (
IDL_GlobalData::PS_ModuleRefIDSeen);
@@ -2954,29 +2965,29 @@ yyreduce:
idl_global->in_tmpl_mod_no_alias (itmna_flag);
idl_global->in_tmpl_mod_alias (false);
}
-#line 2958 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2969 "fe/idl.tab.cpp"
break;
case 61:
-#line 840 "fe/idl.ypp" /* yacc.c:1651 */
+#line 842 "fe/idl.ypp"
{
idl_global->set_parse_state (
IDL_GlobalData::PS_InstModuleSeen);
}
-#line 2967 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2978 "fe/idl.tab.cpp"
break;
case 62:
-#line 845 "fe/idl.ypp" /* yacc.c:1651 */
+#line 847 "fe/idl.ypp"
{
idl_global->set_parse_state (
IDL_GlobalData::PS_InstModuleArgsSeen);
}
-#line 2976 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2987 "fe/idl.tab.cpp"
break;
case 63:
-#line 850 "fe/idl.ypp" /* yacc.c:1651 */
+#line 852 "fe/idl.ypp"
{
idl_global->set_parse_state (
IDL_GlobalData::PS_InstModuleIDSeen);
@@ -3038,41 +3049,57 @@ yyreduce:
idl_global->set_err_count (idl_global->err_count () + 1);
}
}
-#line 3042 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3053 "fe/idl.tab.cpp"
+ break;
+
+ case 64:
+#line 917 "fe/idl.ypp"
+ {
+ (yyval.dcval) = (yyvsp[0].dcval);
+ }
+#line 3061 "fe/idl.tab.cpp"
+ break;
+
+ case 65:
+#line 921 "fe/idl.ypp"
+ {
+ (yyval.dcval) = (yyvsp[0].dcval);
+ }
+#line 3069 "fe/idl.tab.cpp"
break;
case 66:
-#line 920 "fe/idl.ypp" /* yacc.c:1651 */
+#line 928 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
AST_Interface *i = 0;
+ FE_InterfaceHeader *header = (yyvsp[0].ihval);
+ (yyvsp[0].ihval) = 0;
+
/*
* Make a new interface node and add it to its enclosing scope.
*/
- if (s != 0 && (yyvsp[0].ihval) != 0)
- {
- i =
- idl_global->gen ()->create_interface (
- (yyvsp[0].ihval)->name (),
- (yyvsp[0].ihval)->inherits (),
- (yyvsp[0].ihval)->n_inherits (),
- (yyvsp[0].ihval)->inherits_flat (),
- (yyvsp[0].ihval)->n_inherits_flat (),
- (yyvsp[0].ihval)->is_local (),
- (yyvsp[0].ihval)->is_abstract ()
- );
- AST_Interface::fwd_redefinition_helper (i,
- s);
+ if (s != 0 && header)
+ {
+ i = idl_global->gen ()->create_interface (
+ header->name (),
+ header->inherits (),
+ header->n_inherits (),
+ header->inherits_flat (),
+ header->n_inherits_flat (),
+ header->is_local (),
+ header->is_abstract ()
+ );
+ AST_Interface::fwd_redefinition_helper (i, s);
/*
* Add the interface to its definition scope.
*/
- (void) s->fe_add_interface (i);
+ s->fe_add_interface (i);
// This FE_InterfaceHeader class isn't destroyed with the AST.
- (yyvsp[0].ihval)->destroy ();
- delete (yyvsp[0].ihval);
- (yyvsp[0].ihval) = 0;
+ header->destroy ();
+ delete header;
}
/*
@@ -3080,57 +3107,58 @@ yyreduce:
*/
idl_global->scopes ().push (i);
}
-#line 3084 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3111 "fe/idl.tab.cpp"
break;
case 67:
-#line 958 "fe/idl.ypp" /* yacc.c:1651 */
+#line 966 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceSqSeen);
}
-#line 3092 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3119 "fe/idl.tab.cpp"
break;
case 68:
-#line 962 "fe/idl.ypp" /* yacc.c:1651 */
+#line 970 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceBodySeen);
}
-#line 3100 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3127 "fe/idl.tab.cpp"
break;
case 69:
-#line 966 "fe/idl.ypp" /* yacc.c:1651 */
+#line 974 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceQsSeen);
+ (yyval.dcval) = dynamic_cast<AST_Decl*> (idl_global->scopes ().top_non_null ());
/*
* Done with this interface - pop it off the scopes stack
*/
idl_global->scopes ().pop ();
}
-#line 3113 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3141 "fe/idl.tab.cpp"
break;
case 70:
-#line 978 "fe/idl.ypp" /* yacc.c:1651 */
+#line 987 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceSeen);
}
-#line 3121 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3149 "fe/idl.tab.cpp"
break;
case 71:
-#line 982 "fe/idl.ypp" /* yacc.c:1651 */
+#line 991 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceIDSeen);
(yyval.idval) = (yyvsp[0].idval);
}
-#line 3130 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3158 "fe/idl.tab.cpp"
break;
case 72:
-#line 990 "fe/idl.ypp" /* yacc.c:1651 */
+#line 999 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen);
@@ -3166,11 +3194,11 @@ yyreduce:
(yyvsp[0].nlval) = 0;
}
}
-#line 3170 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3198 "fe/idl.tab.cpp"
break;
case 73:
-#line 1027 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1036 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen);
@@ -3199,11 +3227,11 @@ yyreduce:
(yyvsp[0].nlval) = 0;
}
}
-#line 3203 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3231 "fe/idl.tab.cpp"
break;
case 74:
-#line 1057 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1066 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen);
@@ -3232,44 +3260,44 @@ yyreduce:
(yyvsp[0].nlval) = 0;
}
}
-#line 3236 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3264 "fe/idl.tab.cpp"
break;
case 75:
-#line 1089 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1098 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_InheritColonSeen);
}
-#line 3244 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3272 "fe/idl.tab.cpp"
break;
case 76:
-#line 1093 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1102 "fe/idl.ypp"
{
(yyvsp[0].nlval)->truncatable ((yyvsp[-2].bval));
(yyval.nlval) = (yyvsp[0].nlval);
}
-#line 3253 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3281 "fe/idl.tab.cpp"
break;
case 77:
-#line 1098 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1107 "fe/idl.ypp"
{
(yyval.nlval) = 0;
}
-#line 3261 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3289 "fe/idl.tab.cpp"
break;
case 82:
-#line 1112 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1121 "fe/idl.ypp"
{
idl_global->err ()->unsupported_error ("custom is not supported");
}
-#line 3269 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3297 "fe/idl.tab.cpp"
break;
case 84:
-#line 1120 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1129 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
AST_ValueType *v = 0;
@@ -3312,27 +3340,27 @@ yyreduce:
*/
idl_global->scopes ().push (v);
}
-#line 3316 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3344 "fe/idl.tab.cpp"
break;
case 85:
-#line 1163 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1172 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeSqSeen);
}
-#line 3324 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3352 "fe/idl.tab.cpp"
break;
case 86:
-#line 1167 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1176 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeBodySeen);
}
-#line 3332 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3360 "fe/idl.tab.cpp"
break;
case 87:
-#line 1171 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1180 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeQsSeen);
@@ -3351,11 +3379,11 @@ yyreduce:
*/
idl_global->scopes ().pop ();
}
-#line 3355 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3383 "fe/idl.tab.cpp"
break;
case 88:
-#line 1194 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1203 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
AST_ValueType *v = 0;
@@ -3398,27 +3426,27 @@ yyreduce:
*/
idl_global->scopes ().push (v);
}
-#line 3402 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3430 "fe/idl.tab.cpp"
break;
case 89:
-#line 1237 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1246 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeSqSeen);
}
-#line 3410 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3438 "fe/idl.tab.cpp"
break;
case 90:
-#line 1241 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1250 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeBodySeen);
}
-#line 3418 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3446 "fe/idl.tab.cpp"
break;
case 91:
-#line 1245 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1254 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeQsSeen);
@@ -3427,19 +3455,19 @@ yyreduce:
*/
idl_global->scopes ().pop ();
}
-#line 3431 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3459 "fe/idl.tab.cpp"
break;
case 92:
-#line 1258 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1267 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen);
}
-#line 3439 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3467 "fe/idl.tab.cpp"
break;
case 93:
-#line 1262 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1271 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_SupportSpecSeen);
@@ -3470,61 +3498,61 @@ yyreduce:
(yyvsp[-2].nlval) = 0;
}
}
-#line 3474 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3502 "fe/idl.tab.cpp"
break;
case 94:
-#line 1296 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1305 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeSeen);
}
-#line 3482 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3510 "fe/idl.tab.cpp"
break;
case 95:
-#line 1300 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1309 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeIDSeen);
(yyval.idval) = (yyvsp[0].idval);
}
-#line 3491 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3519 "fe/idl.tab.cpp"
break;
case 96:
-#line 1308 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1317 "fe/idl.ypp"
{
(yyval.bval) = true;
}
-#line 3499 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3527 "fe/idl.tab.cpp"
break;
case 97:
-#line 1312 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1321 "fe/idl.ypp"
{
(yyval.bval) = false;
}
-#line 3507 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3535 "fe/idl.tab.cpp"
break;
case 98:
-#line 1320 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1329 "fe/idl.ypp"
{
(yyval.nlval) = (yyvsp[0].nlval);
}
-#line 3515 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3543 "fe/idl.tab.cpp"
break;
case 99:
-#line 1324 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1333 "fe/idl.ypp"
{
/* | EMPTY */
(yyval.nlval) = 0;
}
-#line 3524 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3552 "fe/idl.tab.cpp"
break;
case 100:
-#line 1333 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1342 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
UTL_ScopedName n ((yyvsp[0].idval),
@@ -3547,11 +3575,11 @@ yyreduce:
delete (yyvsp[0].idval);
(yyvsp[0].idval) = 0;
}
-#line 3551 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3579 "fe/idl.tab.cpp"
break;
case 101:
-#line 1357 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1366 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
UTL_ScopedName n ((yyvsp[0].idval),
@@ -3574,11 +3602,11 @@ yyreduce:
delete (yyvsp[0].idval);
(yyvsp[0].idval) = 0;
}
-#line 3578 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3606 "fe/idl.tab.cpp"
break;
case 102:
-#line 1383 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1392 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ValueBoxDeclSeen);
@@ -3639,27 +3667,27 @@ yyreduce:
delete (yyvsp[-1].idval);
(yyvsp[-1].idval) = 0;
}
-#line 3643 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3671 "fe/idl.tab.cpp"
break;
case 108:
-#line 1459 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1468 "fe/idl.ypp"
{
(yyval.vival) = AST_Field::vis_PUBLIC;
}
-#line 3651 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3679 "fe/idl.tab.cpp"
break;
case 109:
-#line 1463 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1472 "fe/idl.ypp"
{
(yyval.vival) = AST_Field::vis_PRIVATE;
}
-#line 3659 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3687 "fe/idl.tab.cpp"
break;
case 110:
-#line 1470 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1479 "fe/idl.ypp"
{
if ((yyvsp[0].decls_val))
{
@@ -3675,159 +3703,193 @@ yyreduce:
}
delete (yyvsp[0].decls_val);
}
-#line 3679 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3707 "fe/idl.tab.cpp"
break;
case 113:
-#line 1494 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1503 "fe/idl.ypp"
{
- idl_global->set_parse_state (IDL_GlobalData::PS_TypeDeclSeen);
+ AST_Annotation_Appls *annotations = (yyvsp[-1].annotations_val);
+ AST_Decl *d = (yyvsp[0].dcval);
+ if (d)
+ {
+ d->annotation_appls (*annotations);
+ }
+ else
+ {
+ idl_global->err ()-> unsupported_warning(
+ "Annotating this is not supported");
+ }
+ delete annotations;
}
-#line 3687 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3726 "fe/idl.tab.cpp"
break;
case 114:
-#line 1498 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1518 "fe/idl.ypp"
{
- idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
}
-#line 3695 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3733 "fe/idl.tab.cpp"
break;
case 115:
-#line 1502 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1524 "fe/idl.ypp"
{
- idl_global->set_parse_state (IDL_GlobalData::PS_TypeIdDeclSeen);
+ idl_global->set_parse_state (IDL_GlobalData::PS_TypeDeclSeen);
}
-#line 3703 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3741 "fe/idl.tab.cpp"
break;
case 116:
-#line 1506 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1528 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
+ (yyval.dcval) = (yyvsp[-2].dcval);
}
-#line 3711 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3750 "fe/idl.tab.cpp"
break;
case 117:
-#line 1510 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1533 "fe/idl.ypp"
{
- idl_global->set_parse_state (IDL_GlobalData::PS_TypePrefixDeclSeen);
+ idl_global->set_parse_state (IDL_GlobalData::PS_TypeIdDeclSeen);
}
-#line 3719 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3758 "fe/idl.tab.cpp"
break;
case 118:
-#line 1514 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1537 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
+ (yyval.dcval) = 0;
}
-#line 3727 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3767 "fe/idl.tab.cpp"
break;
case 119:
-#line 1518 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1542 "fe/idl.ypp"
{
- idl_global->set_parse_state (IDL_GlobalData::PS_ConstDeclSeen);
+ idl_global->set_parse_state (IDL_GlobalData::PS_TypePrefixDeclSeen);
}
-#line 3735 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3775 "fe/idl.tab.cpp"
break;
case 120:
-#line 1522 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1546 "fe/idl.ypp"
{
- idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
+ idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
+ (yyval.dcval) = 0;
}
-#line 3743 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3784 "fe/idl.tab.cpp"
break;
case 121:
-#line 1526 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1551 "fe/idl.ypp"
{
- idl_global->set_parse_state (IDL_GlobalData::PS_ExceptDeclSeen);
+ idl_global->set_parse_state (IDL_GlobalData::PS_ConstDeclSeen);
}
-#line 3751 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3792 "fe/idl.tab.cpp"
break;
case 122:
-#line 1530 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1555 "fe/idl.ypp"
{
- idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
+ idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
+ (yyval.dcval) = (yyvsp[-2].dcval);
}
-#line 3759 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3801 "fe/idl.tab.cpp"
break;
case 123:
-#line 1534 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1560 "fe/idl.ypp"
{
- idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen);
+ idl_global->set_parse_state (IDL_GlobalData::PS_ExceptDeclSeen);
}
-#line 3767 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3809 "fe/idl.tab.cpp"
break;
case 124:
-#line 1538 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1564 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
+ (yyval.dcval) = 0;
}
-#line 3775 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3818 "fe/idl.tab.cpp"
break;
case 125:
-#line 1542 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1569 "fe/idl.ypp"
{
- idl_global->set_parse_state (IDL_GlobalData::PS_OpDeclSeen);
+ idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen);
}
-#line 3783 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3826 "fe/idl.tab.cpp"
break;
case 126:
-#line 1546 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1573 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
+ (yyval.dcval) = (yyvsp[-2].dcval);
}
-#line 3791 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3835 "fe/idl.tab.cpp"
break;
case 127:
-#line 1550 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1578 "fe/idl.ypp"
{
- idl_global->err()->syntax_error (idl_global->parse_state());
+ idl_global->set_parse_state (IDL_GlobalData::PS_OpDeclSeen);
}
-#line 3799 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3843 "fe/idl.tab.cpp"
break;
case 128:
-#line 1554 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1582 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
- yyerrok;
+ (yyval.dcval) = (yyvsp[-2].dcval);
}
-#line 3808 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3852 "fe/idl.tab.cpp"
break;
case 129:
-#line 1562 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1587 "fe/idl.ypp"
+ {
+ idl_global->err()->syntax_error (idl_global->parse_state());
+ }
+#line 3860 "fe/idl.tab.cpp"
+ break;
+
+ case 130:
+#line 1591 "fe/idl.ypp"
+ {
+ idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
+ yyerrok;
+ (yyval.dcval) = 0;
+ }
+#line 3870 "fe/idl.tab.cpp"
+ break;
+
+ case 131:
+#line 1600 "fe/idl.ypp"
{
ACE_NEW_RETURN ((yyval.nlval),
UTL_NameList ((yyvsp[-1].idlist),
(yyvsp[0].nlval)),
1);
}
-#line 3819 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3881 "fe/idl.tab.cpp"
break;
- case 130:
-#line 1573 "fe/idl.ypp" /* yacc.c:1651 */
+ case 132:
+#line 1611 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_SNListCommaSeen);
}
-#line 3827 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3889 "fe/idl.tab.cpp"
break;
- case 131:
-#line 1577 "fe/idl.ypp" /* yacc.c:1651 */
+ case 133:
+#line 1615 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ScopedNameSeen);
@@ -3847,19 +3909,19 @@ yyreduce:
(yyval.nlval) = (yyvsp[-3].nlval);
}
}
-#line 3851 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3913 "fe/idl.tab.cpp"
break;
- case 132:
-#line 1597 "fe/idl.ypp" /* yacc.c:1651 */
+ case 134:
+#line 1635 "fe/idl.ypp"
{
(yyval.nlval) = 0;
}
-#line 3859 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3921 "fe/idl.tab.cpp"
break;
- case 133:
-#line 1604 "fe/idl.ypp" /* yacc.c:1651 */
+ case 135:
+#line 1642 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_SN_IDSeen);
@@ -3868,19 +3930,19 @@ yyreduce:
0),
1);
}
-#line 3872 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3934 "fe/idl.tab.cpp"
break;
- case 134:
-#line 1613 "fe/idl.ypp" /* yacc.c:1651 */
+ case 136:
+#line 1651 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ScopeDelimSeen);
}
-#line 3880 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3942 "fe/idl.tab.cpp"
break;
- case 135:
-#line 1617 "fe/idl.ypp" /* yacc.c:1651 */
+ case 137:
+#line 1655 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_SN_IDSeen);
@@ -3900,11 +3962,11 @@ yyreduce:
sn),
1);
}
-#line 3904 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3966 "fe/idl.tab.cpp"
break;
- case 136:
-#line 1638 "fe/idl.ypp" /* yacc.c:1651 */
+ case 138:
+#line 1676 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ScopeDelimSeen);
@@ -3914,11 +3976,11 @@ yyreduce:
ACE::strdelete ((yyvsp[0].strval));
(yyvsp[0].strval) = 0;
}
-#line 3918 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3980 "fe/idl.tab.cpp"
break;
- case 137:
-#line 1648 "fe/idl.ypp" /* yacc.c:1651 */
+ case 139:
+#line 1686 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_SN_IDSeen);
@@ -3930,11 +3992,11 @@ yyreduce:
(yyvsp[-3].idlist)->nconc (sn);
(yyval.idlist) = (yyvsp[-3].idlist);
}
-#line 3934 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3996 "fe/idl.tab.cpp"
break;
- case 138:
-#line 1662 "fe/idl.ypp" /* yacc.c:1651 */
+ case 140:
+#line 1700 "fe/idl.ypp"
{
ACE_NEW_RETURN ((yyval.idval),
Identifier ((yyvsp[0].strval)),
@@ -3942,11 +4004,11 @@ yyreduce:
ACE::strdelete ((yyvsp[0].strval));
(yyvsp[0].strval) = 0;
}
-#line 3946 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4008 "fe/idl.tab.cpp"
break;
- case 139:
-#line 1672 "fe/idl.ypp" /* yacc.c:1651 */
+ case 141:
+#line 1710 "fe/idl.ypp"
{
/* defining_id is a defining identifier
whereas id is usually a reference to a defining identifier */
@@ -3954,11 +4016,11 @@ yyreduce:
ACE::strdelete ((yyvsp[0].strval));
(yyvsp[0].strval) = 0;
}
-#line 3958 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4020 "fe/idl.tab.cpp"
break;
- case 140:
-#line 1683 "fe/idl.ypp" /* yacc.c:1651 */
+ case 142:
+#line 1721 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
UTL_ScopedName n ((yyvsp[0].idval), 0);
@@ -4001,11 +4063,11 @@ yyreduce:
delete (yyvsp[0].idval);
(yyvsp[0].idval) = 0;
}
-#line 4005 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4067 "fe/idl.tab.cpp"
break;
- case 141:
-#line 1727 "fe/idl.ypp" /* yacc.c:1651 */
+ case 143:
+#line 1765 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
UTL_ScopedName n ((yyvsp[0].idval),
@@ -4031,11 +4093,11 @@ yyreduce:
delete (yyvsp[0].idval);
(yyvsp[0].idval) = 0;
}
-#line 4035 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4097 "fe/idl.tab.cpp"
break;
- case 142:
-#line 1754 "fe/idl.ypp" /* yacc.c:1651 */
+ case 144:
+#line 1792 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
UTL_ScopedName n ((yyvsp[0].idval),
@@ -4060,44 +4122,46 @@ yyreduce:
(yyvsp[0].idval)->destroy ();
delete (yyvsp[0].idval);
(yyvsp[0].idval) = 0;
+
+ (yyval.dcval) = dynamic_cast<AST_Decl*>(f);
}
-#line 4065 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4129 "fe/idl.tab.cpp"
break;
- case 143:
-#line 1783 "fe/idl.ypp" /* yacc.c:1651 */
+ case 145:
+#line 1823 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ConstSeen);
}
-#line 4073 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4137 "fe/idl.tab.cpp"
break;
- case 144:
-#line 1787 "fe/idl.ypp" /* yacc.c:1651 */
+ case 146:
+#line 1827 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ConstTypeSeen);
}
-#line 4081 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4145 "fe/idl.tab.cpp"
break;
- case 145:
-#line 1791 "fe/idl.ypp" /* yacc.c:1651 */
+ case 147:
+#line 1831 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ConstIDSeen);
}
-#line 4089 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4153 "fe/idl.tab.cpp"
break;
- case 146:
-#line 1795 "fe/idl.ypp" /* yacc.c:1651 */
+ case 148:
+#line 1835 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ConstAssignSeen);
}
-#line 4097 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4161 "fe/idl.tab.cpp"
break;
- case 147:
-#line 1799 "fe/idl.ypp" /* yacc.c:1651 */
+ case 149:
+#line 1839 "fe/idl.ypp"
{
(yyval.dcval) = 0;
UTL_ScopedName n ((yyvsp[-4].idval), 0);
@@ -4153,27 +4217,27 @@ yyreduce:
delete (yyvsp[-4].idval);
(yyvsp[-4].idval) = 0;
}
-#line 4157 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4221 "fe/idl.tab.cpp"
break;
- case 154:
-#line 1864 "fe/idl.ypp" /* yacc.c:1651 */
+ case 156:
+#line 1904 "fe/idl.ypp"
{
(yyval.etval) = AST_Expression::EV_string;
}
-#line 4165 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4229 "fe/idl.tab.cpp"
break;
- case 155:
-#line 1868 "fe/idl.ypp" /* yacc.c:1651 */
+ case 157:
+#line 1908 "fe/idl.ypp"
{
(yyval.etval) = AST_Expression::EV_wstring;
}
-#line 4173 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4237 "fe/idl.tab.cpp"
break;
- case 156:
-#line 1872 "fe/idl.ypp" /* yacc.c:1651 */
+ case 158:
+#line 1912 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
AST_PredefinedType *c = 0;
@@ -4239,11 +4303,11 @@ yyreduce:
sn = 0;
(yyvsp[0].idlist) = 0;
}
-#line 4243 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4307 "fe/idl.tab.cpp"
break;
- case 160:
-#line 1945 "fe/idl.ypp" /* yacc.c:1651 */
+ case 162:
+#line 1985 "fe/idl.ypp"
{
(yyval.exval) =
idl_global->gen ()->create_expr (
@@ -4252,11 +4316,11 @@ yyreduce:
(yyvsp[0].exval)
);
}
-#line 4256 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4320 "fe/idl.tab.cpp"
break;
- case 162:
-#line 1958 "fe/idl.ypp" /* yacc.c:1651 */
+ case 164:
+#line 1998 "fe/idl.ypp"
{
(yyval.exval) =
idl_global->gen ()->create_expr (
@@ -4265,11 +4329,11 @@ yyreduce:
(yyvsp[0].exval)
);
}
-#line 4269 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4333 "fe/idl.tab.cpp"
break;
- case 164:
-#line 1971 "fe/idl.ypp" /* yacc.c:1651 */
+ case 166:
+#line 2011 "fe/idl.ypp"
{
(yyval.exval) =
idl_global->gen ()->create_expr (
@@ -4278,11 +4342,11 @@ yyreduce:
(yyvsp[0].exval)
);
}
-#line 4282 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4346 "fe/idl.tab.cpp"
break;
- case 166:
-#line 1984 "fe/idl.ypp" /* yacc.c:1651 */
+ case 168:
+#line 2024 "fe/idl.ypp"
{
(yyval.exval) =
idl_global->gen ()->create_expr (
@@ -4291,11 +4355,11 @@ yyreduce:
(yyvsp[0].exval)
);
}
-#line 4295 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4359 "fe/idl.tab.cpp"
break;
- case 167:
-#line 1993 "fe/idl.ypp" /* yacc.c:1651 */
+ case 169:
+#line 2033 "fe/idl.ypp"
{
(yyval.exval) =
idl_global->gen ()->create_expr (
@@ -4304,11 +4368,11 @@ yyreduce:
(yyvsp[0].exval)
);
}
-#line 4308 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4372 "fe/idl.tab.cpp"
break;
- case 169:
-#line 2006 "fe/idl.ypp" /* yacc.c:1651 */
+ case 171:
+#line 2046 "fe/idl.ypp"
{
(yyval.exval) =
idl_global->gen ()->create_expr (
@@ -4317,11 +4381,11 @@ yyreduce:
(yyvsp[0].exval)
);
}
-#line 4321 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4385 "fe/idl.tab.cpp"
break;
- case 170:
-#line 2015 "fe/idl.ypp" /* yacc.c:1651 */
+ case 172:
+#line 2055 "fe/idl.ypp"
{
(yyval.exval) =
idl_global->gen ()->create_expr (
@@ -4330,11 +4394,11 @@ yyreduce:
(yyvsp[0].exval)
);
}
-#line 4334 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4398 "fe/idl.tab.cpp"
break;
- case 172:
-#line 2028 "fe/idl.ypp" /* yacc.c:1651 */
+ case 174:
+#line 2068 "fe/idl.ypp"
{
(yyval.exval) =
idl_global->gen ()->create_expr (
@@ -4343,11 +4407,11 @@ yyreduce:
(yyvsp[0].exval)
);
}
-#line 4347 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4411 "fe/idl.tab.cpp"
break;
- case 173:
-#line 2037 "fe/idl.ypp" /* yacc.c:1651 */
+ case 175:
+#line 2077 "fe/idl.ypp"
{
(yyval.exval) =
idl_global->gen ()->create_expr (
@@ -4356,11 +4420,11 @@ yyreduce:
(yyvsp[0].exval)
);
}
-#line 4360 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4424 "fe/idl.tab.cpp"
break;
- case 174:
-#line 2046 "fe/idl.ypp" /* yacc.c:1651 */
+ case 176:
+#line 2086 "fe/idl.ypp"
{
(yyval.exval) =
idl_global->gen ()->create_expr (
@@ -4369,11 +4433,11 @@ yyreduce:
(yyvsp[0].exval)
);
}
-#line 4373 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4437 "fe/idl.tab.cpp"
break;
- case 176:
-#line 2059 "fe/idl.ypp" /* yacc.c:1651 */
+ case 178:
+#line 2099 "fe/idl.ypp"
{
(yyval.exval) =
idl_global->gen ()->create_expr (
@@ -4382,11 +4446,11 @@ yyreduce:
0
);
}
-#line 4386 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4450 "fe/idl.tab.cpp"
break;
- case 177:
-#line 2068 "fe/idl.ypp" /* yacc.c:1651 */
+ case 179:
+#line 2108 "fe/idl.ypp"
{
(yyval.exval) =
idl_global->gen()->create_expr (
@@ -4395,11 +4459,11 @@ yyreduce:
0
);
}
-#line 4399 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4463 "fe/idl.tab.cpp"
break;
- case 178:
-#line 2077 "fe/idl.ypp" /* yacc.c:1651 */
+ case 180:
+#line 2117 "fe/idl.ypp"
{
(yyval.exval) =
idl_global->gen()->create_expr (
@@ -4408,11 +4472,11 @@ yyreduce:
0
);
}
-#line 4412 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4476 "fe/idl.tab.cpp"
break;
- case 179:
-#line 2089 "fe/idl.ypp" /* yacc.c:1651 */
+ case 181:
+#line 2129 "fe/idl.ypp"
{
/*
* An expression which is a scoped name is not resolved now,
@@ -4470,104 +4534,104 @@ yyreduce:
delete (yyvsp[0].idlist);
(yyvsp[0].idlist) = 0;
}
-#line 4474 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4538 "fe/idl.tab.cpp"
break;
- case 181:
-#line 2148 "fe/idl.ypp" /* yacc.c:1651 */
+ case 183:
+#line 2188 "fe/idl.ypp"
{
(yyval.exval) = (yyvsp[-1].exval);
}
-#line 4482 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4546 "fe/idl.tab.cpp"
break;
- case 182:
-#line 2155 "fe/idl.ypp" /* yacc.c:1651 */
+ case 184:
+#line 2195 "fe/idl.ypp"
{
(yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].ival));
}
-#line 4490 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4554 "fe/idl.tab.cpp"
break;
- case 183:
-#line 2159 "fe/idl.ypp" /* yacc.c:1651 */
+ case 185:
+#line 2199 "fe/idl.ypp"
{
(yyval.exval) =
idl_global->gen ()->create_expr ((yyvsp[0].uival));
}
-#line 4499 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4563 "fe/idl.tab.cpp"
break;
- case 184:
-#line 2164 "fe/idl.ypp" /* yacc.c:1651 */
+ case 186:
+#line 2204 "fe/idl.ypp"
{
(yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].sval));
(yyvsp[0].sval)->destroy ();
delete (yyvsp[0].sval);
(yyvsp[0].sval) = 0;
}
-#line 4510 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4574 "fe/idl.tab.cpp"
break;
- case 185:
-#line 2171 "fe/idl.ypp" /* yacc.c:1651 */
+ case 187:
+#line 2211 "fe/idl.ypp"
{
(yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].wsval));
}
-#line 4518 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4582 "fe/idl.tab.cpp"
break;
- case 186:
-#line 2175 "fe/idl.ypp" /* yacc.c:1651 */
+ case 188:
+#line 2215 "fe/idl.ypp"
{
(yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].cval));
}
-#line 4526 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4590 "fe/idl.tab.cpp"
break;
- case 187:
-#line 2179 "fe/idl.ypp" /* yacc.c:1651 */
+ case 189:
+#line 2219 "fe/idl.ypp"
{
ACE_OutputCDR::from_wchar wc ((yyvsp[0].wcval));
(yyval.exval) = idl_global->gen ()->create_expr (wc);
}
-#line 4535 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4599 "fe/idl.tab.cpp"
break;
- case 188:
-#line 2184 "fe/idl.ypp" /* yacc.c:1651 */
+ case 190:
+#line 2224 "fe/idl.ypp"
{
(yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].fixval));
}
-#line 4543 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4607 "fe/idl.tab.cpp"
break;
- case 189:
-#line 2188 "fe/idl.ypp" /* yacc.c:1651 */
+ case 191:
+#line 2228 "fe/idl.ypp"
{
(yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].dval));
}
-#line 4551 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4615 "fe/idl.tab.cpp"
break;
- case 190:
-#line 2192 "fe/idl.ypp" /* yacc.c:1651 */
+ case 192:
+#line 2232 "fe/idl.ypp"
{
(yyval.exval) = idl_global->gen ()->create_expr (true);
}
-#line 4559 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4623 "fe/idl.tab.cpp"
break;
- case 191:
-#line 2196 "fe/idl.ypp" /* yacc.c:1651 */
+ case 193:
+#line 2236 "fe/idl.ypp"
{
(yyval.exval) = idl_global->gen ()->create_expr (false);
}
-#line 4567 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4631 "fe/idl.tab.cpp"
break;
- case 192:
-#line 2203 "fe/idl.ypp" /* yacc.c:1651 */
+ case 194:
+#line 2243 "fe/idl.ypp"
{
int good_expression = 1;
(yyvsp[0].exval)->evaluate (AST_Expression::EK_positive_int);
@@ -4632,11 +4696,11 @@ yyreduce:
idl_global->err ()->syntax_error (idl_global->parse_state ());
}
}
-#line 4636 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4700 "fe/idl.tab.cpp"
break;
- case 193:
-#line 2271 "fe/idl.ypp" /* yacc.c:1651 */
+ case 195:
+#line 2311 "fe/idl.ypp"
{
if (idl_global->idl_version_ < IDL_VERSION_4)
{
@@ -4653,38 +4717,38 @@ yyreduce:
fe_add_annotation_decl (annotation_decl);
idl_global->scopes ().push (annotation_decl);
}
-#line 4657 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4721 "fe/idl.tab.cpp"
break;
- case 194:
-#line 2288 "fe/idl.ypp" /* yacc.c:1651 */
+ case 196:
+#line 2328 "fe/idl.ypp"
{
Identifier *id = (yyvsp[-4].idval);
idl_global->scopes ().pop ();
id->destroy ();
delete id;
}
-#line 4668 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4732 "fe/idl.tab.cpp"
break;
- case 200:
-#line 2306 "fe/idl.ypp" /* yacc.c:1651 */
+ case 202:
+#line 2346 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_TypedefSeen);
idl_global->in_typedef (true);
}
-#line 4677 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4741 "fe/idl.tab.cpp"
break;
- case 204:
-#line 2320 "fe/idl.ypp" /* yacc.c:1651 */
+ case 206:
+#line 2360 "fe/idl.ypp"
{
UTL_Scope *scope = idl_global->scopes ().top_non_null ();
UTL_Scope *root = idl_global->scopes ().bottom ();
AST_Expression::ExprType type = (yyvsp[-3].etval);
Identifier *name = (yyvsp[-2].idval);
- // Annotation Member Names Can't Clash with C++ keywords
+ // Annotation member names can't clash with C++ keywords
FE_Utils::original_local_name (name);
UTL_ScopedName *scoped_name = new UTL_ScopedName (name, 0);
AST_Expression *default_value = (yyvsp[-1].exval);
@@ -4730,27 +4794,27 @@ yyreduce:
delete result;
}
}
-#line 4734 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4798 "fe/idl.tab.cpp"
break;
- case 205:
-#line 2376 "fe/idl.ypp" /* yacc.c:1651 */
+ case 207:
+#line 2416 "fe/idl.ypp"
{
(yyval.exval) = (yyvsp[0].exval);
}
-#line 4742 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4806 "fe/idl.tab.cpp"
break;
- case 206:
-#line 2380 "fe/idl.ypp" /* yacc.c:1651 */
+ case 208:
+#line 2420 "fe/idl.ypp"
{
(yyval.exval) = 0;
}
-#line 4750 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4814 "fe/idl.tab.cpp"
break;
- case 207:
-#line 2387 "fe/idl.ypp" /* yacc.c:1651 */
+ case 209:
+#line 2427 "fe/idl.ypp"
{
AST_Annotation_Appls *annotations = (yyvsp[-1].annotations_val);
AST_Annotation_Appl *annotation = (yyvsp[0].annotation_val);
@@ -4760,11 +4824,11 @@ yyreduce:
}
(yyval.annotations_val) = annotations;
}
-#line 4764 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4828 "fe/idl.tab.cpp"
break;
- case 208:
-#line 2400 "fe/idl.ypp" /* yacc.c:1651 */
+ case 210:
+#line 2440 "fe/idl.ypp"
{
AST_Annotation_Appls *annotations = (yyvsp[-1].annotations_val);
AST_Annotation_Appl *annotation = (yyvsp[0].annotation_val);
@@ -4774,19 +4838,19 @@ yyreduce:
}
(yyval.annotations_val) = annotations;
}
-#line 4778 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4842 "fe/idl.tab.cpp"
break;
- case 209:
-#line 2410 "fe/idl.ypp" /* yacc.c:1651 */
+ case 211:
+#line 2450 "fe/idl.ypp"
{
(yyval.annotations_val) = new AST_Annotation_Appls ();
}
-#line 4786 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4850 "fe/idl.tab.cpp"
break;
- case 210:
-#line 2417 "fe/idl.ypp" /* yacc.c:1651 */
+ case 212:
+#line 2457 "fe/idl.ypp"
{
if (idl_global->idl_version_ < IDL_VERSION_4)
{
@@ -4832,18 +4896,20 @@ yyreduce:
break;
}
- // Ignore lookup errors for parameter values that might depend
- // on constants or enums from the annotation declaration.
+ /*
+ * Ignore lookup errors for parameter values that might depend on
+ * constants or enums from the missing annotation declaration.
+ */
idl_global->ignore_lookup_errors_ = true;
}
(yyval.annotation_decl_val) = decl;
}
-#line 4843 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4909 "fe/idl.tab.cpp"
break;
- case 211:
-#line 2470 "fe/idl.ypp" /* yacc.c:1651 */
+ case 213:
+#line 2512 "fe/idl.ypp"
{
idl_global->ignore_lookup_errors_ = false;
AST_Annotation_Appl *appl = 0;
@@ -4870,27 +4936,27 @@ yyreduce:
(yyval.annotation_val) = appl;
}
-#line 4874 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4940 "fe/idl.tab.cpp"
break;
- case 212:
-#line 2500 "fe/idl.ypp" /* yacc.c:1651 */
+ case 214:
+#line 2542 "fe/idl.ypp"
{
(yyval.annotation_params_val) = (yyvsp[-1].annotation_params_val);
}
-#line 4882 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4948 "fe/idl.tab.cpp"
break;
- case 213:
-#line 2504 "fe/idl.ypp" /* yacc.c:1651 */
+ case 215:
+#line 2546 "fe/idl.ypp"
{
(yyval.annotation_params_val) = 0;
}
-#line 4890 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4956 "fe/idl.tab.cpp"
break;
- case 214:
-#line 2511 "fe/idl.ypp" /* yacc.c:1651 */
+ case 216:
+#line 2553 "fe/idl.ypp"
{
AST_Annotation_Appl::Params *params = new AST_Annotation_Appl::Params;
AST_Annotation_Appl::Param *param = new AST_Annotation_Appl::Param;
@@ -4899,47 +4965,47 @@ yyreduce:
params->push (param);
(yyval.annotation_params_val) = params;
}
-#line 4903 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4969 "fe/idl.tab.cpp"
break;
- case 215:
-#line 2520 "fe/idl.ypp" /* yacc.c:1651 */
+ case 217:
+#line 2562 "fe/idl.ypp"
{
(yyval.annotation_params_val) = (yyvsp[0].annotation_params_val);
}
-#line 4911 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4977 "fe/idl.tab.cpp"
break;
- case 216:
-#line 2527 "fe/idl.ypp" /* yacc.c:1651 */
+ case 218:
+#line 2569 "fe/idl.ypp"
{
AST_Annotation_Appl::Params *params = (yyvsp[0].annotation_params_val);
params->push ((yyvsp[-1].annotation_param_val));
(yyval.annotation_params_val) = params;
}
-#line 4921 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4987 "fe/idl.tab.cpp"
break;
- case 217:
-#line 2535 "fe/idl.ypp" /* yacc.c:1651 */
+ case 219:
+#line 2577 "fe/idl.ypp"
{
AST_Annotation_Appl::Params *params = (yyvsp[0].annotation_params_val);
params->push ((yyvsp[-1].annotation_param_val));
(yyval.annotation_params_val) = params;
}
-#line 4931 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4997 "fe/idl.tab.cpp"
break;
- case 218:
-#line 2541 "fe/idl.ypp" /* yacc.c:1651 */
+ case 220:
+#line 2583 "fe/idl.ypp"
{
(yyval.annotation_params_val) = new AST_Annotation_Appl::Params;
}
-#line 4939 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5005 "fe/idl.tab.cpp"
break;
- case 219:
-#line 2548 "fe/idl.ypp" /* yacc.c:1651 */
+ case 221:
+#line 2590 "fe/idl.ypp"
{
AST_Annotation_Appl::Param *param = new AST_Annotation_Appl::Param;
param->id = (yyvsp[-2].idval);
@@ -4948,52 +5014,52 @@ yyreduce:
param->expr = (yyvsp[0].exval);
(yyval.annotation_param_val) = param;
}
-#line 4952 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5018 "fe/idl.tab.cpp"
break;
- case 220:
-#line 2560 "fe/idl.ypp" /* yacc.c:1651 */
+ case 222:
+#line 2602 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_TypedefSeen);
idl_global->in_typedef (true);
}
-#line 4961 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5027 "fe/idl.tab.cpp"
break;
- case 221:
-#line 2565 "fe/idl.ypp" /* yacc.c:1651 */
+ case 223:
+#line 2607 "fe/idl.ypp"
{
(yyval.dcval) = (yyvsp[0].dcval);
}
-#line 4969 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5035 "fe/idl.tab.cpp"
break;
- case 222:
-#line 2569 "fe/idl.ypp" /* yacc.c:1651 */
+ case 224:
+#line 2611 "fe/idl.ypp"
{
(yyval.dcval) = (yyvsp[0].dcval);
}
-#line 4977 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5043 "fe/idl.tab.cpp"
break;
- case 223:
-#line 2573 "fe/idl.ypp" /* yacc.c:1651 */
+ case 225:
+#line 2615 "fe/idl.ypp"
{
(yyval.dcval) = (yyvsp[0].dcval);
}
-#line 4985 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5051 "fe/idl.tab.cpp"
break;
- case 224:
-#line 2577 "fe/idl.ypp" /* yacc.c:1651 */
+ case 226:
+#line 2619 "fe/idl.ypp"
{
(yyval.dcval) = (yyvsp[0].dcval);
}
-#line 4993 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5059 "fe/idl.tab.cpp"
break;
- case 225:
-#line 2581 "fe/idl.ypp" /* yacc.c:1651 */
+ case 227:
+#line 2623 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
AST_Native *node = 0;
@@ -5018,28 +5084,30 @@ yyreduce:
(yyvsp[0].deval)->destroy ();
delete (yyvsp[0].deval);
(yyvsp[0].deval) = 0;
+
+ (yyval.dcval) = 0;
}
-#line 5023 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5091 "fe/idl.tab.cpp"
break;
- case 226:
-#line 2607 "fe/idl.ypp" /* yacc.c:1651 */
+ case 228:
+#line 2651 "fe/idl.ypp"
{
(yyval.dcval) = 0;
}
-#line 5031 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5099 "fe/idl.tab.cpp"
break;
- case 227:
-#line 2614 "fe/idl.ypp" /* yacc.c:1651 */
+ case 229:
+#line 2658 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_TypeSpecSeen);
}
-#line 5039 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5107 "fe/idl.tab.cpp"
break;
- case 228:
-#line 2618 "fe/idl.ypp" /* yacc.c:1651 */
+ case 230:
+#line 2662 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
FE_Declarator *d = 0;
@@ -5104,22 +5172,22 @@ yyreduce:
(yyval.dcval) = t;
}
-#line 5108 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5176 "fe/idl.tab.cpp"
break;
- case 231:
-#line 2691 "fe/idl.ypp" /* yacc.c:1651 */
+ case 233:
+#line 2735 "fe/idl.ypp"
{
(yyval.dcval) =
idl_global->scopes ().bottom ()->lookup_primitive_type (
(yyvsp[0].etval)
);
}
-#line 5119 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5187 "fe/idl.tab.cpp"
break;
- case 233:
-#line 2699 "fe/idl.ypp" /* yacc.c:1651 */
+ case 235:
+#line 2743 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
AST_Decl *d = 0;
@@ -5142,30 +5210,30 @@ yyreduce:
(yyval.dcval) = d;
}
-#line 5146 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5214 "fe/idl.tab.cpp"
break;
- case 251:
-#line 2754 "fe/idl.ypp" /* yacc.c:1651 */
+ case 253:
+#line 2798 "fe/idl.ypp"
{
ACE_NEW_RETURN ((yyval.dlval),
UTL_DeclList ((yyvsp[-1].deval),
(yyvsp[0].dlval)),
1);
}
-#line 5157 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5225 "fe/idl.tab.cpp"
break;
- case 252:
-#line 2765 "fe/idl.ypp" /* yacc.c:1651 */
+ case 254:
+#line 2809 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_DeclsCommaSeen);
}
-#line 5165 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5233 "fe/idl.tab.cpp"
break;
- case 253:
-#line 2769 "fe/idl.ypp" /* yacc.c:1651 */
+ case 255:
+#line 2813 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_DeclsDeclSeen);
@@ -5185,38 +5253,38 @@ yyreduce:
(yyval.dlval) = (yyvsp[-3].dlval);
}
}
-#line 5189 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5257 "fe/idl.tab.cpp"
break;
- case 254:
-#line 2789 "fe/idl.ypp" /* yacc.c:1651 */
+ case 256:
+#line 2833 "fe/idl.ypp"
{
(yyval.dlval) = 0;
}
-#line 5197 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5265 "fe/idl.tab.cpp"
break;
- case 257:
-#line 2801 "fe/idl.ypp" /* yacc.c:1651 */
+ case 259:
+#line 2845 "fe/idl.ypp"
{
ACE_NEW_RETURN ((yyval.dlval),
UTL_DeclList ((yyvsp[-1].deval),
(yyvsp[0].dlval)),
1);
}
-#line 5208 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5276 "fe/idl.tab.cpp"
break;
- case 258:
-#line 2812 "fe/idl.ypp" /* yacc.c:1651 */
+ case 260:
+#line 2856 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_DeclsCommaSeen);
}
-#line 5216 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5284 "fe/idl.tab.cpp"
break;
- case 259:
-#line 2816 "fe/idl.ypp" /* yacc.c:1651 */
+ case 261:
+#line 2860 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_DeclsDeclSeen);
@@ -5236,19 +5304,19 @@ yyreduce:
(yyval.dlval) = (yyvsp[-3].dlval);
}
}
-#line 5240 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5308 "fe/idl.tab.cpp"
break;
- case 260:
-#line 2836 "fe/idl.ypp" /* yacc.c:1651 */
+ case 262:
+#line 2880 "fe/idl.ypp"
{
(yyval.dlval) = 0;
}
-#line 5248 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5316 "fe/idl.tab.cpp"
break;
- case 261:
-#line 2843 "fe/idl.ypp" /* yacc.c:1651 */
+ case 263:
+#line 2887 "fe/idl.ypp"
{
UTL_ScopedName *sn = 0;
ACE_NEW_RETURN (sn,
@@ -5261,11 +5329,11 @@ yyreduce:
0),
1);
}
-#line 5265 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5333 "fe/idl.tab.cpp"
break;
- case 262:
-#line 2859 "fe/idl.ypp" /* yacc.c:1651 */
+ case 264:
+#line 2903 "fe/idl.ypp"
{
UTL_ScopedName *sn = 0;
ACE_NEW_RETURN (sn,
@@ -5280,156 +5348,156 @@ yyreduce:
(yyvsp[0].dcval)),
1);
}
-#line 5284 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5352 "fe/idl.tab.cpp"
break;
- case 265:
-#line 2882 "fe/idl.ypp" /* yacc.c:1651 */
+ case 267:
+#line 2926 "fe/idl.ypp"
{
(yyval.etval) = AST_Expression::EV_long;
}
-#line 5292 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5360 "fe/idl.tab.cpp"
break;
- case 266:
-#line 2886 "fe/idl.ypp" /* yacc.c:1651 */
+ case 268:
+#line 2930 "fe/idl.ypp"
{
(yyval.etval) = AST_Expression::EV_longlong;
}
-#line 5300 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5368 "fe/idl.tab.cpp"
break;
- case 267:
-#line 2890 "fe/idl.ypp" /* yacc.c:1651 */
+ case 269:
+#line 2934 "fe/idl.ypp"
{
(yyval.etval) = AST_Expression::EV_short;
}
-#line 5308 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5376 "fe/idl.tab.cpp"
break;
- case 268:
-#line 2897 "fe/idl.ypp" /* yacc.c:1651 */
+ case 270:
+#line 2941 "fe/idl.ypp"
{
(yyval.etval) = AST_Expression::EV_ulong;
}
-#line 5316 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5384 "fe/idl.tab.cpp"
break;
- case 269:
-#line 2901 "fe/idl.ypp" /* yacc.c:1651 */
+ case 271:
+#line 2945 "fe/idl.ypp"
{
(yyval.etval) = AST_Expression::EV_ulonglong;
}
-#line 5324 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5392 "fe/idl.tab.cpp"
break;
- case 270:
-#line 2905 "fe/idl.ypp" /* yacc.c:1651 */
+ case 272:
+#line 2949 "fe/idl.ypp"
{
(yyval.etval) = AST_Expression::EV_ushort;
}
-#line 5332 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5400 "fe/idl.tab.cpp"
break;
- case 271:
-#line 2912 "fe/idl.ypp" /* yacc.c:1651 */
+ case 273:
+#line 2956 "fe/idl.ypp"
{
(yyval.etval) = AST_Expression::EV_double;
}
-#line 5340 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5408 "fe/idl.tab.cpp"
break;
- case 272:
-#line 2916 "fe/idl.ypp" /* yacc.c:1651 */
+ case 274:
+#line 2960 "fe/idl.ypp"
{
(yyval.etval) = AST_Expression::EV_float;
}
-#line 5348 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5416 "fe/idl.tab.cpp"
break;
- case 273:
-#line 2920 "fe/idl.ypp" /* yacc.c:1651 */
+ case 275:
+#line 2964 "fe/idl.ypp"
{
(yyval.etval) = AST_Expression::EV_longdouble;
}
-#line 5356 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5424 "fe/idl.tab.cpp"
break;
- case 274:
-#line 2927 "fe/idl.ypp" /* yacc.c:1651 */
+ case 276:
+#line 2971 "fe/idl.ypp"
{
(yyval.etval) = AST_Expression::EV_fixed;
}
-#line 5364 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5432 "fe/idl.tab.cpp"
break;
- case 275:
-#line 2934 "fe/idl.ypp" /* yacc.c:1651 */
+ case 277:
+#line 2978 "fe/idl.ypp"
{
(yyval.etval) = AST_Expression::EV_char;
}
-#line 5372 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5440 "fe/idl.tab.cpp"
break;
- case 276:
-#line 2938 "fe/idl.ypp" /* yacc.c:1651 */
+ case 278:
+#line 2982 "fe/idl.ypp"
{
(yyval.etval) = AST_Expression::EV_wchar;
}
-#line 5380 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5448 "fe/idl.tab.cpp"
break;
- case 277:
-#line 2945 "fe/idl.ypp" /* yacc.c:1651 */
+ case 279:
+#line 2989 "fe/idl.ypp"
{
(yyval.etval) = AST_Expression::EV_octet;
}
-#line 5388 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5456 "fe/idl.tab.cpp"
break;
- case 278:
-#line 2952 "fe/idl.ypp" /* yacc.c:1651 */
+ case 280:
+#line 2996 "fe/idl.ypp"
{
(yyval.etval) = AST_Expression::EV_bool;
}
-#line 5396 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5464 "fe/idl.tab.cpp"
break;
- case 279:
-#line 2959 "fe/idl.ypp" /* yacc.c:1651 */
+ case 281:
+#line 3003 "fe/idl.ypp"
{
(yyval.etval) = AST_Expression::EV_any;
}
-#line 5404 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5472 "fe/idl.tab.cpp"
break;
- case 280:
-#line 2966 "fe/idl.ypp" /* yacc.c:1651 */
+ case 282:
+#line 3010 "fe/idl.ypp"
{
(yyval.etval) = AST_Expression::EV_object;
}
-#line 5412 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5480 "fe/idl.tab.cpp"
break;
- case 281:
-#line 2973 "fe/idl.ypp" /* yacc.c:1651 */
+ case 283:
+#line 3017 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_StructSeen);
}
-#line 5420 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5488 "fe/idl.tab.cpp"
break;
- case 282:
-#line 2977 "fe/idl.ypp" /* yacc.c:1651 */
+ case 284:
+#line 3021 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_StructIDSeen);
(yyval.idval) = (yyvsp[0].idval);
}
-#line 5429 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5497 "fe/idl.tab.cpp"
break;
- case 283:
-#line 2986 "fe/idl.ypp" /* yacc.c:1651 */
+ case 285:
+#line 3030 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
UTL_ScopedName n ((yyvsp[0].idval), 0);
@@ -5460,27 +5528,27 @@ yyreduce:
delete (yyvsp[0].idval);
(yyvsp[0].idval) = 0;
}
-#line 5464 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5532 "fe/idl.tab.cpp"
break;
- case 284:
-#line 3017 "fe/idl.ypp" /* yacc.c:1651 */
+ case 286:
+#line 3061 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_StructSqSeen);
}
-#line 5472 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5540 "fe/idl.tab.cpp"
break;
- case 285:
-#line 3021 "fe/idl.ypp" /* yacc.c:1651 */
+ case 287:
+#line 3065 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_StructBodySeen);
}
-#line 5480 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5548 "fe/idl.tab.cpp"
break;
- case 286:
-#line 3025 "fe/idl.ypp" /* yacc.c:1651 */
+ case 288:
+#line 3069 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_StructQsSeen);
@@ -5492,11 +5560,11 @@ yyreduce:
);
idl_global->scopes ().pop ();
}
-#line 5496 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5564 "fe/idl.tab.cpp"
break;
- case 290:
-#line 3047 "fe/idl.ypp" /* yacc.c:1651 */
+ case 292:
+#line 3091 "fe/idl.ypp"
{
AST_Annotation_Appls *annotations = (yyvsp[-1].annotations_val);
AST_Decls *members = (yyvsp[0].decls_val);
@@ -5510,27 +5578,27 @@ yyreduce:
delete annotations;
delete members;
}
-#line 5514 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5582 "fe/idl.tab.cpp"
break;
- case 291:
-#line 3064 "fe/idl.ypp" /* yacc.c:1651 */
+ case 293:
+#line 3108 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_MemberTypeSeen);
}
-#line 5522 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5590 "fe/idl.tab.cpp"
break;
- case 292:
-#line 3068 "fe/idl.ypp" /* yacc.c:1651 */
+ case 294:
+#line 3112 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_MemberDeclsSeen);
}
-#line 5530 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5598 "fe/idl.tab.cpp"
break;
- case 293:
-#line 3072 "fe/idl.ypp" /* yacc.c:1651 */
+ case 295:
+#line 3116 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
FE_Declarator *d = 0;
@@ -5584,53 +5652,53 @@ yyreduce:
(yyval.decls_val) = members;
}
-#line 5588 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5656 "fe/idl.tab.cpp"
break;
- case 294:
-#line 3126 "fe/idl.ypp" /* yacc.c:1651 */
+ case 296:
+#line 3170 "fe/idl.ypp"
{
idl_global->err()->syntax_error (idl_global->parse_state ());
}
-#line 5596 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5664 "fe/idl.tab.cpp"
break;
- case 295:
-#line 3130 "fe/idl.ypp" /* yacc.c:1651 */
+ case 297:
+#line 3174 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
yyerrok;
}
-#line 5605 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5673 "fe/idl.tab.cpp"
break;
- case 296:
-#line 3138 "fe/idl.ypp" /* yacc.c:1651 */
+ case 298:
+#line 3182 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_UnionSeen);
}
-#line 5613 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5681 "fe/idl.tab.cpp"
break;
- case 297:
-#line 3142 "fe/idl.ypp" /* yacc.c:1651 */
+ case 299:
+#line 3186 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_UnionIDSeen);
(yyval.idval) = (yyvsp[0].idval);
}
-#line 5622 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5690 "fe/idl.tab.cpp"
break;
- case 298:
-#line 3150 "fe/idl.ypp" /* yacc.c:1651 */
+ case 300:
+#line 3194 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_SwitchSeen);
}
-#line 5630 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5698 "fe/idl.tab.cpp"
break;
- case 299:
-#line 3154 "fe/idl.ypp" /* yacc.c:1651 */
+ case 301:
+#line 3198 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
UTL_ScopedName n ((yyvsp[-3].idval), 0);
@@ -5663,19 +5731,19 @@ yyreduce:
* Don't delete $1 yet; we'll need it a bit later.
*/
}
-#line 5667 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5735 "fe/idl.tab.cpp"
break;
- case 300:
-#line 3187 "fe/idl.ypp" /* yacc.c:1651 */
+ case 302:
+#line 3231 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_SwitchTypeSeen);
}
-#line 5675 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5743 "fe/idl.tab.cpp"
break;
- case 301:
-#line 3191 "fe/idl.ypp" /* yacc.c:1651 */
+ case 303:
+#line 3235 "fe/idl.ypp"
{
/*
* The top of the scopes must be an empty union we added after we
@@ -5734,27 +5802,27 @@ yyreduce:
delete disc_annotations;
}
-#line 5738 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5806 "fe/idl.tab.cpp"
break;
- case 302:
-#line 3250 "fe/idl.ypp" /* yacc.c:1651 */
+ case 304:
+#line 3294 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_UnionSqSeen);
}
-#line 5746 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5814 "fe/idl.tab.cpp"
break;
- case 303:
-#line 3254 "fe/idl.ypp" /* yacc.c:1651 */
+ case 305:
+#line 3298 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_UnionBodySeen);
}
-#line 5754 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5822 "fe/idl.tab.cpp"
break;
- case 304:
-#line 3258 "fe/idl.ypp" /* yacc.c:1651 */
+ case 306:
+#line 3302 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_UnionQsSeen);
@@ -5770,22 +5838,22 @@ yyreduce:
idl_global->scopes ().pop ();
}
}
-#line 5774 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5842 "fe/idl.tab.cpp"
break;
- case 305:
-#line 3277 "fe/idl.ypp" /* yacc.c:1651 */
+ case 307:
+#line 3321 "fe/idl.ypp"
{
(yyval.dcval) =
idl_global->scopes ().bottom ()->lookup_primitive_type (
(yyvsp[0].etval)
);
}
-#line 5785 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5853 "fe/idl.tab.cpp"
break;
- case 306:
-#line 3284 "fe/idl.ypp" /* yacc.c:1651 */
+ case 308:
+#line 3328 "fe/idl.ypp"
{
/* wchars are not allowed. */
if ((yyvsp[0].etval) == AST_Expression::EV_wchar)
@@ -5798,11 +5866,11 @@ yyreduce:
(yyvsp[0].etval)
);
}
-#line 5802 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5870 "fe/idl.tab.cpp"
break;
- case 307:
-#line 3297 "fe/idl.ypp" /* yacc.c:1651 */
+ case 309:
+#line 3341 "fe/idl.ypp"
{
/* octets are not allowed. */
idl_global->err ()->error0 (UTL_Error::EIDL_DISC_TYPE);
@@ -5811,22 +5879,22 @@ yyreduce:
(yyvsp[0].etval)
);
}
-#line 5815 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5883 "fe/idl.tab.cpp"
break;
- case 308:
-#line 3306 "fe/idl.ypp" /* yacc.c:1651 */
+ case 310:
+#line 3350 "fe/idl.ypp"
{
(yyval.dcval) =
idl_global->scopes ().bottom ()->lookup_primitive_type (
(yyvsp[0].etval)
);
}
-#line 5826 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5894 "fe/idl.tab.cpp"
break;
- case 310:
-#line 3314 "fe/idl.ypp" /* yacc.c:1651 */
+ case 312:
+#line 3358 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
AST_Decl *d = 0;
@@ -5933,27 +6001,27 @@ yyreduce:
delete (yyvsp[0].idlist);
(yyvsp[0].idlist) = 0;
}
-#line 5937 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6005 "fe/idl.tab.cpp"
break;
- case 314:
-#line 3431 "fe/idl.ypp" /* yacc.c:1651 */
+ case 316:
+#line 3475 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_UnionLabelSeen);
}
-#line 5945 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6013 "fe/idl.tab.cpp"
break;
- case 315:
-#line 3435 "fe/idl.ypp" /* yacc.c:1651 */
+ case 317:
+#line 3479 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_UnionElemSeen);
}
-#line 5953 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6021 "fe/idl.tab.cpp"
break;
- case 316:
-#line 3439 "fe/idl.ypp" /* yacc.c:1651 */
+ case 318:
+#line 3483 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
AST_UnionBranch *b = 0;
@@ -5985,39 +6053,39 @@ yyreduce:
delete annotations;
}
-#line 5989 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6057 "fe/idl.tab.cpp"
break;
- case 317:
-#line 3471 "fe/idl.ypp" /* yacc.c:1651 */
+ case 319:
+#line 3515 "fe/idl.ypp"
{
idl_global->err()->syntax_error (idl_global->parse_state());
}
-#line 5997 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6065 "fe/idl.tab.cpp"
break;
- case 318:
-#line 3475 "fe/idl.ypp" /* yacc.c:1651 */
+ case 320:
+#line 3519 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
yyerrok;
}
-#line 6006 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6074 "fe/idl.tab.cpp"
break;
- case 319:
-#line 3483 "fe/idl.ypp" /* yacc.c:1651 */
+ case 321:
+#line 3527 "fe/idl.ypp"
{
ACE_NEW_RETURN ((yyval.llval),
UTL_LabelList ((yyvsp[-1].ulval),
(yyvsp[0].llval)),
1);
}
-#line 6017 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6085 "fe/idl.tab.cpp"
break;
- case 320:
-#line 3493 "fe/idl.ypp" /* yacc.c:1651 */
+ case 322:
+#line 3537 "fe/idl.ypp"
{
UTL_LabelList *ll = 0;
ACE_NEW_RETURN (ll,
@@ -6035,27 +6103,27 @@ yyreduce:
(yyval.llval) = (yyvsp[-1].llval);
}
}
-#line 6039 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6107 "fe/idl.tab.cpp"
break;
- case 321:
-#line 3511 "fe/idl.ypp" /* yacc.c:1651 */
+ case 323:
+#line 3555 "fe/idl.ypp"
{
(yyval.llval) = 0;
}
-#line 6047 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6115 "fe/idl.tab.cpp"
break;
- case 322:
-#line 3518 "fe/idl.ypp" /* yacc.c:1651 */
+ case 324:
+#line 3562 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_DefaultSeen);
}
-#line 6055 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6123 "fe/idl.tab.cpp"
break;
- case 323:
-#line 3522 "fe/idl.ypp" /* yacc.c:1651 */
+ case 325:
+#line 3566 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_LabelColonSeen);
@@ -6064,27 +6132,27 @@ yyreduce:
0
);
}
-#line 6068 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6136 "fe/idl.tab.cpp"
break;
- case 324:
-#line 3531 "fe/idl.ypp" /* yacc.c:1651 */
+ case 326:
+#line 3575 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_CaseSeen);
}
-#line 6076 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6144 "fe/idl.tab.cpp"
break;
- case 325:
-#line 3535 "fe/idl.ypp" /* yacc.c:1651 */
+ case 327:
+#line 3579 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_LabelExprSeen);
}
-#line 6084 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6152 "fe/idl.tab.cpp"
break;
- case 326:
-#line 3539 "fe/idl.ypp" /* yacc.c:1651 */
+ case 328:
+#line 3583 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_LabelColonSeen);
@@ -6093,19 +6161,19 @@ yyreduce:
(yyvsp[-2].exval)
);
}
-#line 6097 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6165 "fe/idl.tab.cpp"
break;
- case 327:
-#line 3551 "fe/idl.ypp" /* yacc.c:1651 */
+ case 329:
+#line 3595 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_UnionElemTypeSeen);
}
-#line 6105 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6173 "fe/idl.tab.cpp"
break;
- case 328:
-#line 3555 "fe/idl.ypp" /* yacc.c:1651 */
+ case 330:
+#line 3599 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_UnionElemDeclSeen);
@@ -6149,11 +6217,11 @@ yyreduce:
(yyvsp[0].deval) = 0;
}
}
-#line 6153 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6221 "fe/idl.tab.cpp"
break;
- case 329:
-#line 3602 "fe/idl.ypp" /* yacc.c:1651 */
+ case 331:
+#line 3646 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
UTL_ScopedName n ((yyvsp[0].idval),
@@ -6175,11 +6243,11 @@ yyreduce:
(yyval.dcval) = d;
}
-#line 6179 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6247 "fe/idl.tab.cpp"
break;
- case 330:
-#line 3627 "fe/idl.ypp" /* yacc.c:1651 */
+ case 332:
+#line 3671 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
UTL_ScopedName n ((yyvsp[0].idval),
@@ -6199,19 +6267,19 @@ yyreduce:
delete (yyvsp[0].idval);
(yyvsp[0].idval) = 0;
}
-#line 6203 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6271 "fe/idl.tab.cpp"
break;
- case 331:
-#line 3650 "fe/idl.ypp" /* yacc.c:1651 */
+ case 333:
+#line 3694 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_EnumSeen);
}
-#line 6211 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6279 "fe/idl.tab.cpp"
break;
- case 332:
-#line 3654 "fe/idl.ypp" /* yacc.c:1651 */
+ case 334:
+#line 3698 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
UTL_ScopedName n ((yyvsp[0].idval), 0);
@@ -6242,27 +6310,27 @@ yyreduce:
delete (yyvsp[0].idval);
(yyvsp[0].idval) = 0;
}
-#line 6246 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6314 "fe/idl.tab.cpp"
break;
- case 333:
-#line 3685 "fe/idl.ypp" /* yacc.c:1651 */
+ case 335:
+#line 3729 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_EnumSqSeen);
}
-#line 6254 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6322 "fe/idl.tab.cpp"
break;
- case 334:
-#line 3689 "fe/idl.ypp" /* yacc.c:1651 */
+ case 336:
+#line 3733 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_EnumBodySeen);
}
-#line 6262 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6330 "fe/idl.tab.cpp"
break;
- case 335:
-#line 3693 "fe/idl.ypp" /* yacc.c:1651 */
+ case 337:
+#line 3737 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_EnumQsSeen);
@@ -6281,19 +6349,19 @@ yyreduce:
idl_global->scopes ().pop ();
}
}
-#line 6285 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6353 "fe/idl.tab.cpp"
break;
- case 337:
-#line 3718 "fe/idl.ypp" /* yacc.c:1651 */
+ case 339:
+#line 3762 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_EnumCommaSeen);
}
-#line 6293 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6361 "fe/idl.tab.cpp"
break;
- case 340:
-#line 3727 "fe/idl.ypp" /* yacc.c:1651 */
+ case 342:
+#line 3771 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
AST_Annotation_Appls *annotations = (yyvsp[-1].annotations_val);
@@ -6328,27 +6396,27 @@ yyreduce:
delete annotations;
}
-#line 6332 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6400 "fe/idl.tab.cpp"
break;
- case 341:
-#line 3766 "fe/idl.ypp" /* yacc.c:1651 */
+ case 343:
+#line 3810 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_SequenceCommaSeen);
}
-#line 6340 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6408 "fe/idl.tab.cpp"
break;
- case 342:
-#line 3770 "fe/idl.ypp" /* yacc.c:1651 */
+ case 344:
+#line 3814 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_SequenceExprSeen);
}
-#line 6348 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6416 "fe/idl.tab.cpp"
break;
- case 343:
-#line 3774 "fe/idl.ypp" /* yacc.c:1651 */
+ case 345:
+#line 3818 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_SequenceQsSeen);
@@ -6433,11 +6501,11 @@ yyreduce:
ev = 0;
(yyval.dcval) = seq;
}
-#line 6437 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6505 "fe/idl.tab.cpp"
break;
- case 344:
-#line 3860 "fe/idl.ypp" /* yacc.c:1651 */
+ case 346:
+#line 3904 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_SequenceQsSeen);
@@ -6503,11 +6571,11 @@ yyreduce:
delete type_annotations;
(yyval.dcval) = seq;
}
-#line 6507 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6575 "fe/idl.tab.cpp"
break;
- case 345:
-#line 3929 "fe/idl.ypp" /* yacc.c:1651 */
+ case 347:
+#line 3973 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_SequenceSeen);
@@ -6516,19 +6584,19 @@ yyreduce:
*/
idl_global->scopes ().push (0);
}
-#line 6520 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6588 "fe/idl.tab.cpp"
break;
- case 346:
-#line 3938 "fe/idl.ypp" /* yacc.c:1651 */
+ case 348:
+#line 3982 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_SequenceSqSeen);
}
-#line 6528 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6596 "fe/idl.tab.cpp"
break;
- case 347:
-#line 3942 "fe/idl.ypp" /* yacc.c:1651 */
+ case 349:
+#line 3986 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_SequenceTypeSeen);
Decl_Annotations_Pair *seq_head = new Decl_Annotations_Pair;
@@ -6536,36 +6604,36 @@ yyreduce:
seq_head->annotations = (yyvsp[-1].annotations_val);
(yyval.decl_annotations_pair_val) = seq_head;
}
-#line 6540 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6608 "fe/idl.tab.cpp"
break;
- case 348:
-#line 3953 "fe/idl.ypp" /* yacc.c:1651 */
+ case 350:
+#line 3997 "fe/idl.ypp"
{
(yyvsp[-1].exval)->evaluate (AST_Expression::EK_positive_int);
(yyval.dcval) = idl_global->gen ()->create_fixed ((yyvsp[-3].exval), (yyvsp[-1].exval));
}
-#line 6549 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6617 "fe/idl.tab.cpp"
break;
- case 349:
-#line 3962 "fe/idl.ypp" /* yacc.c:1651 */
+ case 351:
+#line 4006 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_StringSqSeen);
}
-#line 6557 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6625 "fe/idl.tab.cpp"
break;
- case 350:
-#line 3966 "fe/idl.ypp" /* yacc.c:1651 */
+ case 352:
+#line 4010 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_StringExprSeen);
}
-#line 6565 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6633 "fe/idl.tab.cpp"
break;
- case 351:
-#line 3970 "fe/idl.ypp" /* yacc.c:1651 */
+ case 353:
+#line 4014 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_StringQsSeen);
@@ -6607,11 +6675,11 @@ yyreduce:
delete ev;
ev = 0;
}
-#line 6611 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6679 "fe/idl.tab.cpp"
break;
- case 352:
-#line 4012 "fe/idl.ypp" /* yacc.c:1651 */
+ case 354:
+#line 4056 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_StringCompleted);
@@ -6634,35 +6702,35 @@ yyreduce:
(yyval.dcval) = tao_string_decl;
}
-#line 6638 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6706 "fe/idl.tab.cpp"
break;
- case 353:
-#line 4038 "fe/idl.ypp" /* yacc.c:1651 */
+ case 355:
+#line 4082 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_StringSeen);
}
-#line 6646 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6714 "fe/idl.tab.cpp"
break;
- case 354:
-#line 4046 "fe/idl.ypp" /* yacc.c:1651 */
+ case 356:
+#line 4090 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_StringSqSeen);
}
-#line 6654 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6722 "fe/idl.tab.cpp"
break;
- case 355:
-#line 4050 "fe/idl.ypp" /* yacc.c:1651 */
+ case 357:
+#line 4094 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_StringExprSeen);
}
-#line 6662 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6730 "fe/idl.tab.cpp"
break;
- case 356:
-#line 4054 "fe/idl.ypp" /* yacc.c:1651 */
+ case 358:
+#line 4098 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_StringQsSeen);
@@ -6695,11 +6763,11 @@ yyreduce:
(yyval.dcval) = string;
}
}
-#line 6699 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6767 "fe/idl.tab.cpp"
break;
- case 357:
-#line 4087 "fe/idl.ypp" /* yacc.c:1651 */
+ case 359:
+#line 4131 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_StringCompleted);
@@ -6722,27 +6790,27 @@ yyreduce:
(yyval.dcval) = string;
}
-#line 6726 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6794 "fe/idl.tab.cpp"
break;
- case 358:
-#line 4113 "fe/idl.ypp" /* yacc.c:1651 */
+ case 360:
+#line 4157 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_StringSeen);
}
-#line 6734 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6802 "fe/idl.tab.cpp"
break;
- case 359:
-#line 4120 "fe/idl.ypp" /* yacc.c:1651 */
+ case 361:
+#line 4164 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ArrayIDSeen);
}
-#line 6742 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6810 "fe/idl.tab.cpp"
break;
- case 360:
-#line 4124 "fe/idl.ypp" /* yacc.c:1651 */
+ case 362:
+#line 4168 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ArrayCompleted);
@@ -6782,22 +6850,22 @@ yyreduce:
(yyval.dcval) = array;
}
-#line 6786 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6854 "fe/idl.tab.cpp"
break;
- case 361:
-#line 4167 "fe/idl.ypp" /* yacc.c:1651 */
+ case 363:
+#line 4211 "fe/idl.ypp"
{
ACE_NEW_RETURN ((yyval.elval),
UTL_ExprList ((yyvsp[-1].exval),
(yyvsp[0].elval)),
1);
}
-#line 6797 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6865 "fe/idl.tab.cpp"
break;
- case 362:
-#line 4177 "fe/idl.ypp" /* yacc.c:1651 */
+ case 364:
+#line 4221 "fe/idl.ypp"
{
UTL_ExprList *el = 0;
ACE_NEW_RETURN (el,
@@ -6815,35 +6883,35 @@ yyreduce:
(yyval.elval) = (yyvsp[-1].elval);
}
}
-#line 6819 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6887 "fe/idl.tab.cpp"
break;
- case 363:
-#line 4195 "fe/idl.ypp" /* yacc.c:1651 */
+ case 365:
+#line 4239 "fe/idl.ypp"
{
(yyval.elval) = 0;
}
-#line 6827 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6895 "fe/idl.tab.cpp"
break;
- case 364:
-#line 4202 "fe/idl.ypp" /* yacc.c:1651 */
+ case 366:
+#line 4246 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_DimSqSeen);
}
-#line 6835 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6903 "fe/idl.tab.cpp"
break;
- case 365:
-#line 4206 "fe/idl.ypp" /* yacc.c:1651 */
+ case 367:
+#line 4250 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_DimExprSeen);
}
-#line 6843 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6911 "fe/idl.tab.cpp"
break;
- case 366:
-#line 4210 "fe/idl.ypp" /* yacc.c:1651 */
+ case 368:
+#line 4254 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_DimQsSeen);
@@ -6897,43 +6965,43 @@ yyreduce:
delete ev;
ev = 0;
}
-#line 6901 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6969 "fe/idl.tab.cpp"
break;
- case 369:
-#line 4272 "fe/idl.ypp" /* yacc.c:1651 */
+ case 371:
+#line 4316 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_AttrROSeen);
}
-#line 6909 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6977 "fe/idl.tab.cpp"
break;
- case 370:
-#line 4276 "fe/idl.ypp" /* yacc.c:1651 */
+ case 372:
+#line 4320 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_AttrSeen);
}
-#line 6917 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6985 "fe/idl.tab.cpp"
break;
- case 371:
-#line 4280 "fe/idl.ypp" /* yacc.c:1651 */
+ case 373:
+#line 4324 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_AttrTypeSeen);
}
-#line 6925 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6993 "fe/idl.tab.cpp"
break;
- case 372:
-#line 4284 "fe/idl.ypp" /* yacc.c:1651 */
+ case 374:
+#line 4328 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclsSeen);
}
-#line 6933 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7001 "fe/idl.tab.cpp"
break;
- case 373:
-#line 4288 "fe/idl.ypp" /* yacc.c:1651 */
+ case 375:
+#line 4332 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
AST_Attribute *a = 0;
@@ -6945,13 +7013,9 @@ yyreduce:
* Create nodes representing attributes and add them to the
* enclosing scope.
*/
- if (s != 0
- && (yyvsp[-4].dcval) != 0
- && (yyvsp[-2].dlval) != 0)
+ if (s != 0 && (yyvsp[-4].dcval) != 0 && (yyvsp[-2].dlval) != 0)
{
- for (UTL_DecllistActiveIterator l ((yyvsp[-2].dlval));
- !l.is_done ();
- l.next ())
+ for (UTL_DecllistActiveIterator l ((yyvsp[-2].dlval)); !l.is_done (); l.next ())
{
d = l.item ();
@@ -6967,14 +7031,8 @@ yyreduce:
continue;
}
- a =
- idl_global->gen ()->create_attribute (
- true,
- tp,
- d->name (),
- s->is_local (),
- s->is_abstract ()
- );
+ a = idl_global->gen ()->create_attribute (
+ true, tp, d->name (), s->is_local (), s->is_abstract ());
if ((yyvsp[0].nlval) != 0)
{
@@ -6992,44 +7050,46 @@ yyreduce:
(yyvsp[-2].dlval)->destroy ();
delete (yyvsp[-2].dlval);
(yyvsp[-2].dlval) = 0;
+
+ (yyval.dcval) = a;
}
-#line 6997 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7057 "fe/idl.tab.cpp"
break;
- case 374:
-#line 4351 "fe/idl.ypp" /* yacc.c:1651 */
+ case 376:
+#line 4387 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_AttrSeen);
}
-#line 7005 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7065 "fe/idl.tab.cpp"
break;
- case 375:
-#line 4355 "fe/idl.ypp" /* yacc.c:1651 */
+ case 377:
+#line 4391 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_AttrTypeSeen);
}
-#line 7013 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7073 "fe/idl.tab.cpp"
break;
- case 376:
-#line 4359 "fe/idl.ypp" /* yacc.c:1651 */
+ case 378:
+#line 4395 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclsSeen);
}
-#line 7021 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7081 "fe/idl.tab.cpp"
break;
- case 377:
-#line 4363 "fe/idl.ypp" /* yacc.c:1651 */
+ case 379:
+#line 4399 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpGetRaiseCompleted);
}
-#line 7029 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7089 "fe/idl.tab.cpp"
break;
- case 378:
-#line 4367 "fe/idl.ypp" /* yacc.c:1651 */
+ case 380:
+#line 4403 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
AST_Attribute *a = 0;
@@ -7041,13 +7101,9 @@ yyreduce:
* Create nodes representing attributes and add them to the
* enclosing scope.
*/
- if (s != 0
- && (yyvsp[-6].dcval) != 0
- && (yyvsp[-4].dlval) != 0)
+ if (s != 0 && (yyvsp[-6].dcval) != 0 && (yyvsp[-4].dlval) != 0)
{
- for (UTL_DecllistActiveIterator l ((yyvsp[-4].dlval));
- !l.is_done ();
- l.next ())
+ for (UTL_DecllistActiveIterator l ((yyvsp[-4].dlval)); !l.is_done (); l.next ())
{
d = l.item ();
@@ -7063,14 +7119,8 @@ yyreduce:
continue;
}
- a =
- idl_global->gen ()->create_attribute (
- false,
- tp,
- d->name (),
- s->is_local (),
- s->is_abstract ()
- );
+ a = idl_global->gen ()->create_attribute (
+ false, tp, d->name (), s->is_local (), s->is_abstract ());
if ((yyvsp[-2].nlval) != 0)
{
@@ -7097,20 +7147,22 @@ yyreduce:
(yyvsp[-4].dlval)->destroy ();
delete (yyvsp[-4].dlval);
(yyvsp[-4].dlval) = 0;
+
+ (yyval.dcval) = a;
}
-#line 7102 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7154 "fe/idl.tab.cpp"
break;
- case 379:
-#line 4439 "fe/idl.ypp" /* yacc.c:1651 */
+ case 381:
+#line 4467 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ExceptSeen);
}
-#line 7110 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7162 "fe/idl.tab.cpp"
break;
- case 380:
-#line 4443 "fe/idl.ypp" /* yacc.c:1651 */
+ case 382:
+#line 4471 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
UTL_ScopedName n ((yyvsp[0].idval),
@@ -7139,27 +7191,27 @@ yyreduce:
delete (yyvsp[0].idval);
(yyvsp[0].idval) = 0;
}
-#line 7143 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7195 "fe/idl.tab.cpp"
break;
- case 381:
-#line 4472 "fe/idl.ypp" /* yacc.c:1651 */
+ case 383:
+#line 4500 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ExceptSqSeen);
}
-#line 7151 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7203 "fe/idl.tab.cpp"
break;
- case 382:
-#line 4476 "fe/idl.ypp" /* yacc.c:1651 */
+ case 384:
+#line 4504 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ExceptBodySeen);
}
-#line 7159 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7211 "fe/idl.tab.cpp"
break;
- case 383:
-#line 4480 "fe/idl.ypp" /* yacc.c:1651 */
+ case 385:
+#line 4508 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ExceptQsSeen);
/*
@@ -7167,73 +7219,70 @@ yyreduce:
*/
idl_global->scopes ().pop ();
}
-#line 7171 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7223 "fe/idl.tab.cpp"
break;
- case 384:
-#line 4492 "fe/idl.ypp" /* yacc.c:1651 */
+ case 386:
+#line 4519 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpTypeSeen);
}
-#line 7179 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7231 "fe/idl.tab.cpp"
break;
- case 385:
-#line 4496 "fe/idl.ypp" /* yacc.c:1651 */
+ case 387:
+#line 4523 "fe/idl.ypp"
{
- UTL_Scope *s = idl_global->scopes ().top_non_null ();
+ AST_Operation *op = 0;
+ UTL_Scope *scope = idl_global->scopes ().top_non_null ();
+
+ AST_Operation::Flags op_flags = (yyvsp[-3].ofval);
+ AST_Decl *type_node = (yyvsp[-2].dcval);
+ (yyvsp[-2].dcval) = 0;
Identifier id ((yyvsp[0].strval));
ACE::strdelete ((yyvsp[0].strval));
(yyvsp[0].strval) = 0;
- UTL_ScopedName n (&id, 0);
- AST_Operation *o = 0;
+ UTL_ScopedName name (&id, 0);
idl_global->set_parse_state (IDL_GlobalData::PS_OpIDSeen);
/*
* Create a node representing an operation on an interface
* and add it to its enclosing scope.
*/
- if (s != 0 && (yyvsp[-3].dcval) != 0)
+ if (scope != 0 && type_node != 0)
{
- AST_Type *tp =
- AST_Type::narrow_from_decl ((yyvsp[-3].dcval));
+ AST_Type *type = AST_Type::narrow_from_decl (type_node);
- if (tp == 0)
+ if (type == 0)
{
- idl_global->err ()->not_a_type ((yyvsp[-3].dcval));
+ idl_global->err ()->not_a_type (type_node);
}
- else if (tp->node_type () == AST_Decl::NT_except)
+ else if (type->node_type () == AST_Decl::NT_except)
{
- idl_global->err ()->not_a_type ((yyvsp[-3].dcval));
+ idl_global->err ()->not_a_type (type_node);
}
else
{
- AST_Decl *d = ScopeAsDecl (s);
+ AST_Decl *d = ScopeAsDecl (scope);
AST_Decl::NodeType nt = d->node_type ();
- bool local =
- s->is_local ()
+ const bool local = scope->is_local ()
|| nt == AST_Decl::NT_valuetype
|| nt == AST_Decl::NT_eventtype;
- o =
- idl_global->gen ()->create_operation (
- tp,
- (yyvsp[-4].ofval),
- &n,
- local,
- s->is_abstract ());
+ op = idl_global->gen ()->create_operation (
+ type, op_flags, &name, local, scope->is_abstract ());
- if (!local && tp->is_local ())
+ if (!local && type->is_local ())
{
- idl_global->err ()->local_remote_mismatch (tp, o);
- o->destroy ();
- delete o;
- o = 0;
+ idl_global->err ()->local_remote_mismatch (type, op);
+ op->destroy ();
+ delete op;
+ op = 0;
}
else
{
- (void) s->fe_add_operation (o);
+ scope->fe_add_operation (op);
}
}
}
@@ -7241,31 +7290,29 @@ yyreduce:
/*
* Push the operation scope onto the scopes stack.
*/
- idl_global->scopes ().push (o);
-
- delete (yyvsp[-1].annotations_val);
+ idl_global->scopes ().push (op);
}
-#line 7249 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7296 "fe/idl.tab.cpp"
break;
- case 386:
-#line 4562 "fe/idl.ypp" /* yacc.c:1651 */
+ case 388:
+#line 4584 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpParsCompleted);
}
-#line 7257 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7304 "fe/idl.tab.cpp"
break;
- case 387:
-#line 4566 "fe/idl.ypp" /* yacc.c:1651 */
+ case 389:
+#line 4588 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted);
}
-#line 7265 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7312 "fe/idl.tab.cpp"
break;
- case 388:
-#line 4570 "fe/idl.ypp" /* yacc.c:1651 */
+ case 390:
+#line 4592 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
AST_Operation *o = 0;
@@ -7293,58 +7340,60 @@ yyreduce:
* Done with this operation. Pop its scope from the scopes stack.
*/
idl_global->scopes ().pop ();
+
+ (yyval.dcval) = o;
}
-#line 7298 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7347 "fe/idl.tab.cpp"
break;
- case 389:
-#line 4602 "fe/idl.ypp" /* yacc.c:1651 */
+ case 391:
+#line 4626 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpAttrSeen);
(yyval.ofval) = AST_Operation::OP_oneway;
}
-#line 7307 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7356 "fe/idl.tab.cpp"
break;
- case 390:
-#line 4607 "fe/idl.ypp" /* yacc.c:1651 */
+ case 392:
+#line 4631 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpAttrSeen);
(yyval.ofval) = AST_Operation::OP_idempotent;
}
-#line 7316 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7365 "fe/idl.tab.cpp"
break;
- case 391:
-#line 4612 "fe/idl.ypp" /* yacc.c:1651 */
+ case 393:
+#line 4636 "fe/idl.ypp"
{
(yyval.ofval) = AST_Operation::OP_noflags;
}
-#line 7324 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7373 "fe/idl.tab.cpp"
break;
- case 393:
-#line 4620 "fe/idl.ypp" /* yacc.c:1651 */
+ case 395:
+#line 4644 "fe/idl.ypp"
{
(yyval.dcval) =
idl_global->scopes ().bottom ()->lookup_primitive_type (
AST_Expression::EV_void
);
}
-#line 7335 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7384 "fe/idl.tab.cpp"
break;
- case 394:
-#line 4630 "fe/idl.ypp" /* yacc.c:1651 */
+ case 396:
+#line 4654 "fe/idl.ypp"
{
//@@ PS_FactorySeen?
idl_global->set_parse_state (IDL_GlobalData::PS_OpTypeSeen);
}
-#line 7344 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7393 "fe/idl.tab.cpp"
break;
- case 395:
-#line 4635 "fe/idl.ypp" /* yacc.c:1651 */
+ case 397:
+#line 4659 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
@@ -7387,19 +7436,19 @@ yyreduce:
delete (yyvsp[-1].annotations_val);
}
-#line 7391 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7440 "fe/idl.tab.cpp"
break;
- case 396:
-#line 4678 "fe/idl.ypp" /* yacc.c:1651 */
+ case 398:
+#line 4702 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpParsCompleted);
}
-#line 7399 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7448 "fe/idl.tab.cpp"
break;
- case 397:
-#line 4682 "fe/idl.ypp" /* yacc.c:1651 */
+ case 399:
+#line 4706 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted);
@@ -7412,67 +7461,67 @@ yyreduce:
idl_global->scopes ().pop ();
}
-#line 7416 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7465 "fe/idl.tab.cpp"
break;
- case 398:
-#line 4698 "fe/idl.ypp" /* yacc.c:1651 */
+ case 400:
+#line 4722 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpSqSeen);
}
-#line 7424 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7473 "fe/idl.tab.cpp"
break;
- case 399:
-#line 4702 "fe/idl.ypp" /* yacc.c:1651 */
+ case 401:
+#line 4726 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpQsSeen);
}
-#line 7432 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7481 "fe/idl.tab.cpp"
break;
- case 400:
-#line 4706 "fe/idl.ypp" /* yacc.c:1651 */
+ case 402:
+#line 4730 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpSqSeen);
}
-#line 7440 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7489 "fe/idl.tab.cpp"
break;
- case 401:
-#line 4711 "fe/idl.ypp" /* yacc.c:1651 */
+ case 403:
+#line 4735 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpQsSeen);
}
-#line 7448 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7497 "fe/idl.tab.cpp"
break;
- case 403:
-#line 4721 "fe/idl.ypp" /* yacc.c:1651 */
+ case 405:
+#line 4745 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpParCommaSeen);
}
-#line 7456 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7505 "fe/idl.tab.cpp"
break;
- case 406:
-#line 4730 "fe/idl.ypp" /* yacc.c:1651 */
+ case 408:
+#line 4754 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpParDirSeen);
}
-#line 7464 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7513 "fe/idl.tab.cpp"
break;
- case 407:
-#line 4734 "fe/idl.ypp" /* yacc.c:1651 */
+ case 409:
+#line 4758 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpParTypeSeen);
}
-#line 7472 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7521 "fe/idl.tab.cpp"
break;
- case 408:
-#line 4738 "fe/idl.ypp" /* yacc.c:1651 */
+ case 410:
+#line 4762 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
AST_Argument *a = 0;
@@ -7504,67 +7553,67 @@ yyreduce:
delete (yyvsp[0].deval);
(yyvsp[0].deval) = 0;
}
-#line 7508 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7557 "fe/idl.tab.cpp"
break;
- case 409:
-#line 4773 "fe/idl.ypp" /* yacc.c:1651 */
+ case 411:
+#line 4797 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpSqSeen);
}
-#line 7516 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7565 "fe/idl.tab.cpp"
break;
- case 410:
-#line 4777 "fe/idl.ypp" /* yacc.c:1651 */
+ case 412:
+#line 4801 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpQsSeen);
}
-#line 7524 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7573 "fe/idl.tab.cpp"
break;
- case 411:
-#line 4781 "fe/idl.ypp" /* yacc.c:1651 */
+ case 413:
+#line 4805 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpSqSeen);
}
-#line 7532 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7581 "fe/idl.tab.cpp"
break;
- case 412:
-#line 4786 "fe/idl.ypp" /* yacc.c:1651 */
+ case 414:
+#line 4810 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpQsSeen);
}
-#line 7540 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7589 "fe/idl.tab.cpp"
break;
- case 414:
-#line 4796 "fe/idl.ypp" /* yacc.c:1651 */
+ case 416:
+#line 4820 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpParCommaSeen);
}
-#line 7548 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7597 "fe/idl.tab.cpp"
break;
- case 417:
-#line 4805 "fe/idl.ypp" /* yacc.c:1651 */
+ case 419:
+#line 4829 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpParDirSeen);
}
-#line 7556 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7605 "fe/idl.tab.cpp"
break;
- case 418:
-#line 4809 "fe/idl.ypp" /* yacc.c:1651 */
+ case 420:
+#line 4833 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpParTypeSeen);
}
-#line 7564 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7613 "fe/idl.tab.cpp"
break;
- case 419:
-#line 4813 "fe/idl.ypp" /* yacc.c:1651 */
+ case 421:
+#line 4837 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
AST_Argument *a = 0;
@@ -7603,22 +7652,22 @@ yyreduce:
delete (yyvsp[0].deval);
(yyvsp[0].deval) = 0;
}
-#line 7607 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7656 "fe/idl.tab.cpp"
break;
- case 420:
-#line 4855 "fe/idl.ypp" /* yacc.c:1651 */
+ case 422:
+#line 4879 "fe/idl.ypp"
{
(yyval.dcval) =
idl_global->scopes ().bottom ()->lookup_primitive_type (
(yyvsp[0].etval)
);
}
-#line 7618 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7667 "fe/idl.tab.cpp"
break;
- case 423:
-#line 4864 "fe/idl.ypp" /* yacc.c:1651 */
+ case 425:
+#line 4888 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
AST_Decl *d = 0;
@@ -7722,186 +7771,186 @@ yyreduce:
(yyval.dcval) = d;
}
-#line 7726 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7775 "fe/idl.tab.cpp"
break;
- case 424:
-#line 4971 "fe/idl.ypp" /* yacc.c:1651 */
+ case 426:
+#line 4995 "fe/idl.ypp"
{
(yyval.dival) = AST_Argument::dir_IN;
}
-#line 7734 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7783 "fe/idl.tab.cpp"
break;
- case 425:
-#line 4975 "fe/idl.ypp" /* yacc.c:1651 */
+ case 427:
+#line 4999 "fe/idl.ypp"
{
(yyval.dival) = AST_Argument::dir_OUT;
}
-#line 7742 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7791 "fe/idl.tab.cpp"
break;
- case 426:
-#line 4979 "fe/idl.ypp" /* yacc.c:1651 */
+ case 428:
+#line 5003 "fe/idl.ypp"
{
(yyval.dival) = AST_Argument::dir_INOUT;
}
-#line 7750 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7799 "fe/idl.tab.cpp"
break;
- case 427:
-#line 4986 "fe/idl.ypp" /* yacc.c:1651 */
+ case 429:
+#line 5010 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseSeen);
}
-#line 7758 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7807 "fe/idl.tab.cpp"
break;
- case 428:
-#line 4990 "fe/idl.ypp" /* yacc.c:1651 */
+ case 430:
+#line 5014 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseSqSeen);
}
-#line 7766 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7815 "fe/idl.tab.cpp"
break;
- case 429:
-#line 4995 "fe/idl.ypp" /* yacc.c:1651 */
+ case 431:
+#line 5019 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseQsSeen);
(yyval.nlval) = (yyvsp[-1].nlval);
}
-#line 7775 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7824 "fe/idl.tab.cpp"
break;
- case 430:
-#line 5000 "fe/idl.ypp" /* yacc.c:1651 */
+ case 432:
+#line 5024 "fe/idl.ypp"
{
(yyval.nlval) = 0;
}
-#line 7783 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7832 "fe/idl.tab.cpp"
break;
- case 431:
-#line 5007 "fe/idl.ypp" /* yacc.c:1651 */
+ case 433:
+#line 5031 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpGetRaiseSeen);
}
-#line 7791 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7840 "fe/idl.tab.cpp"
break;
- case 432:
-#line 5011 "fe/idl.ypp" /* yacc.c:1651 */
+ case 434:
+#line 5035 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpGetRaiseSqSeen);
}
-#line 7799 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7848 "fe/idl.tab.cpp"
break;
- case 433:
-#line 5016 "fe/idl.ypp" /* yacc.c:1651 */
+ case 435:
+#line 5040 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpGetRaiseQsSeen);
(yyval.nlval) = (yyvsp[-1].nlval);
}
-#line 7808 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7857 "fe/idl.tab.cpp"
break;
- case 434:
-#line 5021 "fe/idl.ypp" /* yacc.c:1651 */
+ case 436:
+#line 5045 "fe/idl.ypp"
{
(yyval.nlval) = 0;
}
-#line 7816 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7865 "fe/idl.tab.cpp"
break;
- case 435:
-#line 5028 "fe/idl.ypp" /* yacc.c:1651 */
+ case 437:
+#line 5052 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpSetRaiseSeen);
}
-#line 7824 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7873 "fe/idl.tab.cpp"
break;
- case 436:
-#line 5032 "fe/idl.ypp" /* yacc.c:1651 */
+ case 438:
+#line 5056 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpSetRaiseSqSeen);
}
-#line 7832 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7881 "fe/idl.tab.cpp"
break;
- case 437:
-#line 5037 "fe/idl.ypp" /* yacc.c:1651 */
+ case 439:
+#line 5061 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpSetRaiseQsSeen);
(yyval.nlval) = (yyvsp[-1].nlval);
}
-#line 7841 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7890 "fe/idl.tab.cpp"
break;
- case 438:
-#line 5042 "fe/idl.ypp" /* yacc.c:1651 */
+ case 440:
+#line 5066 "fe/idl.ypp"
{
(yyval.nlval) = 0;
}
-#line 7849 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7898 "fe/idl.tab.cpp"
break;
- case 439:
-#line 5049 "fe/idl.ypp" /* yacc.c:1651 */
+ case 441:
+#line 5073 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpContextSeen);
}
-#line 7857 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7906 "fe/idl.tab.cpp"
break;
- case 440:
-#line 5053 "fe/idl.ypp" /* yacc.c:1651 */
+ case 442:
+#line 5077 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpContextSqSeen);
}
-#line 7865 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7914 "fe/idl.tab.cpp"
break;
- case 441:
-#line 5058 "fe/idl.ypp" /* yacc.c:1651 */
+ case 443:
+#line 5082 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpContextQsSeen);
(yyval.slval) = (yyvsp[-1].slval);
}
-#line 7874 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7923 "fe/idl.tab.cpp"
break;
- case 442:
-#line 5063 "fe/idl.ypp" /* yacc.c:1651 */
+ case 444:
+#line 5087 "fe/idl.ypp"
{
(yyval.slval) = 0;
}
-#line 7882 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7931 "fe/idl.tab.cpp"
break;
- case 443:
-#line 5070 "fe/idl.ypp" /* yacc.c:1651 */
+ case 445:
+#line 5094 "fe/idl.ypp"
{
ACE_NEW_RETURN ((yyval.slval),
UTL_StrList ((yyvsp[-1].sval),
(yyvsp[0].slval)),
1);
}
-#line 7893 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7942 "fe/idl.tab.cpp"
break;
- case 444:
-#line 5081 "fe/idl.ypp" /* yacc.c:1651 */
+ case 446:
+#line 5105 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpContextCommaSeen);
}
-#line 7901 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7950 "fe/idl.tab.cpp"
break;
- case 445:
-#line 5085 "fe/idl.ypp" /* yacc.c:1651 */
+ case 447:
+#line 5109 "fe/idl.ypp"
{
UTL_StrList *sl = 0;
ACE_NEW_RETURN (sl,
@@ -7919,19 +7968,19 @@ yyreduce:
(yyval.slval) = (yyvsp[-3].slval);
}
}
-#line 7923 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7972 "fe/idl.tab.cpp"
break;
- case 446:
-#line 5103 "fe/idl.ypp" /* yacc.c:1651 */
+ case 448:
+#line 5127 "fe/idl.ypp"
{
(yyval.slval) = 0;
}
-#line 7931 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7980 "fe/idl.tab.cpp"
break;
- case 447:
-#line 5110 "fe/idl.ypp" /* yacc.c:1651 */
+ case 449:
+#line 5134 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
AST_Decl *d =
@@ -7956,11 +8005,11 @@ yyreduce:
delete (yyvsp[0].sval);
(yyvsp[0].sval) = 0;
}
-#line 7960 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8009 "fe/idl.tab.cpp"
break;
- case 448:
-#line 5138 "fe/idl.ypp" /* yacc.c:1651 */
+ case 450:
+#line 5162 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
AST_Decl *d = ScopeAsDecl (s);
@@ -7994,11 +8043,11 @@ yyreduce:
delete (yyvsp[0].sval);
(yyvsp[0].sval) = 0;
}
-#line 7998 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8047 "fe/idl.tab.cpp"
break;
- case 451:
-#line 5181 "fe/idl.ypp" /* yacc.c:1651 */
+ case 453:
+#line 5205 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
UTL_ScopedName n ((yyvsp[0].idval),
@@ -8022,11 +8071,11 @@ yyreduce:
delete (yyvsp[0].idval);
(yyvsp[0].idval) = 0;
}
-#line 8026 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8075 "fe/idl.tab.cpp"
break;
- case 452:
-#line 5208 "fe/idl.ypp" /* yacc.c:1651 */
+ case 454:
+#line 5232 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
AST_Component *c = 0;
@@ -8065,27 +8114,27 @@ yyreduce:
*/
idl_global->scopes ().push (c);
}
-#line 8069 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8118 "fe/idl.tab.cpp"
break;
- case 453:
-#line 5247 "fe/idl.ypp" /* yacc.c:1651 */
+ case 455:
+#line 5271 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ComponentSqSeen);
}
-#line 8077 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8126 "fe/idl.tab.cpp"
break;
- case 454:
-#line 5251 "fe/idl.ypp" /* yacc.c:1651 */
+ case 456:
+#line 5275 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ComponentBodySeen);
}
-#line 8085 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8134 "fe/idl.tab.cpp"
break;
- case 455:
-#line 5255 "fe/idl.ypp" /* yacc.c:1651 */
+ case 457:
+#line 5279 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ComponentQsSeen);
@@ -8094,27 +8143,27 @@ yyreduce:
*/
idl_global->scopes ().pop ();
}
-#line 8098 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8147 "fe/idl.tab.cpp"
break;
- case 456:
-#line 5268 "fe/idl.ypp" /* yacc.c:1651 */
+ case 458:
+#line 5292 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ComponentIDSeen);
}
-#line 8106 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8155 "fe/idl.tab.cpp"
break;
- case 457:
-#line 5272 "fe/idl.ypp" /* yacc.c:1651 */
+ case 459:
+#line 5296 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen);
}
-#line 8114 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8163 "fe/idl.tab.cpp"
break;
- case 458:
-#line 5276 "fe/idl.ypp" /* yacc.c:1651 */
+ case 460:
+#line 5300 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_SupportSpecSeen);
@@ -8148,147 +8197,147 @@ yyreduce:
(yyvsp[-2].idlist) = 0;
}
}
-#line 8152 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8201 "fe/idl.tab.cpp"
break;
- case 459:
-#line 5313 "fe/idl.ypp" /* yacc.c:1651 */
+ case 461:
+#line 5337 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_InheritColonSeen);
}
-#line 8160 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8209 "fe/idl.tab.cpp"
break;
- case 460:
-#line 5317 "fe/idl.ypp" /* yacc.c:1651 */
+ case 462:
+#line 5341 "fe/idl.ypp"
{
(yyval.idlist) = (yyvsp[0].idlist);
}
-#line 8168 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8217 "fe/idl.tab.cpp"
break;
- case 461:
-#line 5321 "fe/idl.ypp" /* yacc.c:1651 */
+ case 463:
+#line 5345 "fe/idl.ypp"
{
(yyval.idlist) = 0;
}
-#line 8176 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8225 "fe/idl.tab.cpp"
break;
- case 464:
-#line 5333 "fe/idl.ypp" /* yacc.c:1651 */
+ case 466:
+#line 5357 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ProvidesDeclSeen);
}
-#line 8184 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8233 "fe/idl.tab.cpp"
break;
- case 465:
-#line 5337 "fe/idl.ypp" /* yacc.c:1651 */
+ case 467:
+#line 5361 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
}
-#line 8192 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8241 "fe/idl.tab.cpp"
break;
- case 466:
-#line 5341 "fe/idl.ypp" /* yacc.c:1651 */
+ case 468:
+#line 5365 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_UsesDeclSeen);
}
-#line 8200 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8249 "fe/idl.tab.cpp"
break;
- case 467:
-#line 5345 "fe/idl.ypp" /* yacc.c:1651 */
+ case 469:
+#line 5369 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
}
-#line 8208 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8257 "fe/idl.tab.cpp"
break;
- case 468:
-#line 5349 "fe/idl.ypp" /* yacc.c:1651 */
+ case 470:
+#line 5373 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_EmitsDeclSeen);
}
-#line 8216 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8265 "fe/idl.tab.cpp"
break;
- case 469:
-#line 5353 "fe/idl.ypp" /* yacc.c:1651 */
+ case 471:
+#line 5377 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
}
-#line 8224 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8273 "fe/idl.tab.cpp"
break;
- case 470:
-#line 5357 "fe/idl.ypp" /* yacc.c:1651 */
+ case 472:
+#line 5381 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_PublishesDeclSeen);
}
-#line 8232 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8281 "fe/idl.tab.cpp"
break;
- case 471:
-#line 5361 "fe/idl.ypp" /* yacc.c:1651 */
+ case 473:
+#line 5385 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
}
-#line 8240 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8289 "fe/idl.tab.cpp"
break;
- case 472:
-#line 5365 "fe/idl.ypp" /* yacc.c:1651 */
+ case 474:
+#line 5389 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ConsumesDeclSeen);
}
-#line 8248 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8297 "fe/idl.tab.cpp"
break;
- case 473:
-#line 5369 "fe/idl.ypp" /* yacc.c:1651 */
+ case 475:
+#line 5393 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
}
-#line 8256 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8305 "fe/idl.tab.cpp"
break;
- case 474:
-#line 5373 "fe/idl.ypp" /* yacc.c:1651 */
+ case 476:
+#line 5397 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen);
}
-#line 8264 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8313 "fe/idl.tab.cpp"
break;
- case 475:
-#line 5377 "fe/idl.ypp" /* yacc.c:1651 */
+ case 477:
+#line 5401 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
}
-#line 8272 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8321 "fe/idl.tab.cpp"
break;
- case 476:
-#line 5381 "fe/idl.ypp" /* yacc.c:1651 */
+ case 478:
+#line 5405 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ExtendedPortDeclSeen);
}
-#line 8280 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8329 "fe/idl.tab.cpp"
break;
- case 477:
-#line 5385 "fe/idl.ypp" /* yacc.c:1651 */
+ case 479:
+#line 5409 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
}
-#line 8288 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8337 "fe/idl.tab.cpp"
break;
- case 478:
-#line 5391 "fe/idl.ypp" /* yacc.c:1651 */
+ case 480:
+#line 5415 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
bool so_far_so_good = true;
@@ -8375,21 +8424,21 @@ yyreduce:
delete (yyvsp[0].idval);
(yyvsp[0].idval) = 0;
}
-#line 8379 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8428 "fe/idl.tab.cpp"
break;
- case 479:
-#line 5481 "fe/idl.ypp" /* yacc.c:1651 */
+ case 481:
+#line 5505 "fe/idl.ypp"
{
// Lookups and checking are done where the 'interface_type'
// token is used, in 'provides_decl' and 'uses_decl'.
(yyval.idlist) = (yyvsp[0].idlist);
}
-#line 8389 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8438 "fe/idl.tab.cpp"
break;
- case 480:
-#line 5487 "fe/idl.ypp" /* yacc.c:1651 */
+ case 482:
+#line 5511 "fe/idl.ypp"
{
Identifier *corba_id = 0;
@@ -8412,11 +8461,11 @@ yyreduce:
conc_name),
1);
}
-#line 8416 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8465 "fe/idl.tab.cpp"
break;
- case 481:
-#line 5512 "fe/idl.ypp" /* yacc.c:1651 */
+ case 483:
+#line 5536 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
bool so_far_so_good = true;
@@ -8519,37 +8568,37 @@ yyreduce:
delete (yyvsp[0].idval);
(yyvsp[0].idval) = 0;
}
-#line 8523 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8572 "fe/idl.tab.cpp"
break;
- case 482:
-#line 5618 "fe/idl.ypp" /* yacc.c:1651 */
+ case 484:
+#line 5642 "fe/idl.ypp"
{
// We use this extra rule here to use in both uses_decl and
// extended_uses_decl, so the LALR(1) parser can avoid conflicts.
(yyval.bval) = (yyvsp[0].bval);
}
-#line 8533 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8582 "fe/idl.tab.cpp"
break;
- case 483:
-#line 5627 "fe/idl.ypp" /* yacc.c:1651 */
+ case 485:
+#line 5651 "fe/idl.ypp"
{
(yyval.bval) = true;
}
-#line 8541 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8590 "fe/idl.tab.cpp"
break;
- case 484:
-#line 5631 "fe/idl.ypp" /* yacc.c:1651 */
+ case 486:
+#line 5655 "fe/idl.ypp"
{
(yyval.bval) = false;
}
-#line 8549 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8598 "fe/idl.tab.cpp"
break;
- case 485:
-#line 5637 "fe/idl.ypp" /* yacc.c:1651 */
+ case 487:
+#line 5661 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
bool so_far_so_good = true;
@@ -8619,11 +8668,11 @@ yyreduce:
delete (yyvsp[0].idval);
(yyvsp[0].idval) = 0;
}
-#line 8623 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8672 "fe/idl.tab.cpp"
break;
- case 486:
-#line 5709 "fe/idl.ypp" /* yacc.c:1651 */
+ case 488:
+#line 5733 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
bool so_far_so_good = true;
@@ -8693,11 +8742,11 @@ yyreduce:
delete (yyvsp[0].idval);
(yyvsp[0].idval) = 0;
}
-#line 8697 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8746 "fe/idl.tab.cpp"
break;
- case 487:
-#line 5781 "fe/idl.ypp" /* yacc.c:1651 */
+ case 489:
+#line 5805 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
bool so_far_so_good = true;
@@ -8767,11 +8816,11 @@ yyreduce:
delete (yyvsp[0].idval);
(yyvsp[0].idval) = 0;
}
-#line 8771 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8820 "fe/idl.tab.cpp"
break;
- case 488:
-#line 5854 "fe/idl.ypp" /* yacc.c:1651 */
+ case 490:
+#line 5878 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
AST_Home *h = 0;
@@ -8808,70 +8857,70 @@ yyreduce:
*/
idl_global->scopes ().push (h);
}
-#line 8812 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8861 "fe/idl.tab.cpp"
break;
- case 489:
-#line 5891 "fe/idl.ypp" /* yacc.c:1651 */
+ case 491:
+#line 5915 "fe/idl.ypp"
{
/*
* Done with this component - pop it off the scopes stack.
*/
idl_global->scopes ().pop ();
}
-#line 8823 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8872 "fe/idl.tab.cpp"
break;
- case 490:
-#line 5901 "fe/idl.ypp" /* yacc.c:1651 */
+ case 492:
+#line 5925 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_HomeSeen);
}
-#line 8831 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8880 "fe/idl.tab.cpp"
break;
- case 491:
-#line 5905 "fe/idl.ypp" /* yacc.c:1651 */
+ case 493:
+#line 5929 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_HomeIDSeen);
}
-#line 8839 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8888 "fe/idl.tab.cpp"
break;
- case 492:
-#line 5909 "fe/idl.ypp" /* yacc.c:1651 */
+ case 494:
+#line 5933 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen);
}
-#line 8847 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8896 "fe/idl.tab.cpp"
break;
- case 493:
-#line 5913 "fe/idl.ypp" /* yacc.c:1651 */
+ case 495:
+#line 5937 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_SupportSpecSeen);
}
-#line 8855 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8904 "fe/idl.tab.cpp"
break;
- case 494:
-#line 5917 "fe/idl.ypp" /* yacc.c:1651 */
+ case 496:
+#line 5941 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ManagesSeen);
}
-#line 8863 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8912 "fe/idl.tab.cpp"
break;
- case 495:
-#line 5921 "fe/idl.ypp" /* yacc.c:1651 */
+ case 497:
+#line 5945 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ManagesIDSeen);
}
-#line 8871 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8920 "fe/idl.tab.cpp"
break;
- case 496:
-#line 5925 "fe/idl.ypp" /* yacc.c:1651 */
+ case 498:
+#line 5949 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_PrimaryKeySpecSeen);
@@ -8917,107 +8966,107 @@ yyreduce:
(yyvsp[-6].nlval) = 0;
}
}
-#line 8921 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8970 "fe/idl.tab.cpp"
break;
- case 497:
-#line 5974 "fe/idl.ypp" /* yacc.c:1651 */
+ case 499:
+#line 5998 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_InheritColonSeen);
}
-#line 8929 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8978 "fe/idl.tab.cpp"
break;
- case 498:
-#line 5978 "fe/idl.ypp" /* yacc.c:1651 */
+ case 500:
+#line 6002 "fe/idl.ypp"
{
(yyval.idlist) = (yyvsp[0].idlist);
}
-#line 8937 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8986 "fe/idl.tab.cpp"
break;
- case 499:
-#line 5982 "fe/idl.ypp" /* yacc.c:1651 */
+ case 501:
+#line 6006 "fe/idl.ypp"
{
(yyval.idlist) = 0;
}
-#line 8945 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8994 "fe/idl.tab.cpp"
break;
- case 500:
-#line 5990 "fe/idl.ypp" /* yacc.c:1651 */
+ case 502:
+#line 6014 "fe/idl.ypp"
{
(yyval.idlist) = (yyvsp[0].idlist);
}
-#line 8953 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9002 "fe/idl.tab.cpp"
break;
- case 501:
-#line 5994 "fe/idl.ypp" /* yacc.c:1651 */
+ case 503:
+#line 6018 "fe/idl.ypp"
{
(yyval.idlist) = 0;
}
-#line 8961 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9010 "fe/idl.tab.cpp"
break;
- case 502:
-#line 6001 "fe/idl.ypp" /* yacc.c:1651 */
+ case 504:
+#line 6025 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_HomeSqSeen);
}
-#line 8969 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9018 "fe/idl.tab.cpp"
break;
- case 503:
-#line 6005 "fe/idl.ypp" /* yacc.c:1651 */
+ case 505:
+#line 6029 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_HomeBodySeen);
}
-#line 8977 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9026 "fe/idl.tab.cpp"
break;
- case 504:
-#line 6009 "fe/idl.ypp" /* yacc.c:1651 */
+ case 506:
+#line 6033 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_HomeQsSeen);
}
-#line 8985 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9034 "fe/idl.tab.cpp"
break;
- case 508:
-#line 6022 "fe/idl.ypp" /* yacc.c:1651 */
+ case 510:
+#line 6046 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_FactoryDeclSeen);
}
-#line 8993 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9042 "fe/idl.tab.cpp"
break;
- case 509:
-#line 6026 "fe/idl.ypp" /* yacc.c:1651 */
+ case 511:
+#line 6050 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
}
-#line 9001 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9050 "fe/idl.tab.cpp"
break;
- case 510:
-#line 6030 "fe/idl.ypp" /* yacc.c:1651 */
+ case 512:
+#line 6054 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_FinderDeclSeen);
}
-#line 9009 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9058 "fe/idl.tab.cpp"
break;
- case 511:
-#line 6034 "fe/idl.ypp" /* yacc.c:1651 */
+ case 513:
+#line 6058 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
}
-#line 9017 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9066 "fe/idl.tab.cpp"
break;
- case 512:
-#line 6042 "fe/idl.ypp" /* yacc.c:1651 */
+ case 514:
+#line 6066 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
UTL_ScopedName n ((yyvsp[0].idval),
@@ -9040,19 +9089,19 @@ yyreduce:
*/
idl_global->scopes ().push (f);
}
-#line 9044 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9093 "fe/idl.tab.cpp"
break;
- case 513:
-#line 6065 "fe/idl.ypp" /* yacc.c:1651 */
+ case 515:
+#line 6089 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpParsCompleted);
}
-#line 9052 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9101 "fe/idl.tab.cpp"
break;
- case 514:
-#line 6069 "fe/idl.ypp" /* yacc.c:1651 */
+ case 516:
+#line 6093 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted);
@@ -9070,11 +9119,11 @@ yyreduce:
*/
idl_global->scopes ().pop ();
}
-#line 9074 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9123 "fe/idl.tab.cpp"
break;
- case 515:
-#line 6091 "fe/idl.ypp" /* yacc.c:1651 */
+ case 517:
+#line 6115 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
UTL_ScopedName n ((yyvsp[0].idval),
@@ -9101,19 +9150,19 @@ yyreduce:
*/
idl_global->scopes ().push (f);
}
-#line 9105 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9154 "fe/idl.tab.cpp"
break;
- case 516:
-#line 6118 "fe/idl.ypp" /* yacc.c:1651 */
+ case 518:
+#line 6142 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpParsCompleted);
}
-#line 9113 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9162 "fe/idl.tab.cpp"
break;
- case 517:
-#line 6122 "fe/idl.ypp" /* yacc.c:1651 */
+ case 519:
+#line 6146 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted);
@@ -9131,11 +9180,11 @@ yyreduce:
*/
idl_global->scopes ().pop ();
}
-#line 9135 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9184 "fe/idl.tab.cpp"
break;
- case 523:
-#line 6155 "fe/idl.ypp" /* yacc.c:1651 */
+ case 525:
+#line 6179 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
UTL_ScopedName n ((yyvsp[0].idval),
@@ -9158,11 +9207,11 @@ yyreduce:
delete (yyvsp[0].idval);
(yyvsp[0].idval) = 0;
}
-#line 9162 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9211 "fe/idl.tab.cpp"
break;
- case 524:
-#line 6183 "fe/idl.ypp" /* yacc.c:1651 */
+ case 526:
+#line 6207 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
UTL_ScopedName n ((yyvsp[0].idval),
@@ -9185,11 +9234,11 @@ yyreduce:
delete (yyvsp[0].idval);
(yyvsp[0].idval) = 0;
}
-#line 9189 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9238 "fe/idl.tab.cpp"
break;
- case 525:
-#line 6210 "fe/idl.ypp" /* yacc.c:1651 */
+ case 527:
+#line 6234 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
AST_EventType *e = 0;
@@ -9233,27 +9282,27 @@ yyreduce:
delete (yyvsp[-1].idval);
(yyvsp[-1].idval) = 0;
}
-#line 9237 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9286 "fe/idl.tab.cpp"
break;
- case 526:
-#line 6254 "fe/idl.ypp" /* yacc.c:1651 */
+ case 528:
+#line 6278 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeSqSeen);
}
-#line 9245 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9294 "fe/idl.tab.cpp"
break;
- case 527:
-#line 6258 "fe/idl.ypp" /* yacc.c:1651 */
+ case 529:
+#line 6282 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeBodySeen);
}
-#line 9253 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9302 "fe/idl.tab.cpp"
break;
- case 528:
-#line 6262 "fe/idl.ypp" /* yacc.c:1651 */
+ case 530:
+#line 6286 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeQsSeen);
@@ -9262,19 +9311,19 @@ yyreduce:
*/
idl_global->scopes ().pop ();
}
-#line 9266 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9315 "fe/idl.tab.cpp"
break;
- case 529:
-#line 6276 "fe/idl.ypp" /* yacc.c:1651 */
+ case 531:
+#line 6300 "fe/idl.ypp"
{
(yyval.idval) = (yyvsp[0].idval);
}
-#line 9274 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9323 "fe/idl.tab.cpp"
break;
- case 530:
-#line 6285 "fe/idl.ypp" /* yacc.c:1651 */
+ case 532:
+#line 6309 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeIDSeen);
@@ -9287,29 +9336,29 @@ yyreduce:
ACE_TEXT (" custom yet\n")));
(yyval.idval) = 0;
}
-#line 9291 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9340 "fe/idl.tab.cpp"
break;
- case 531:
-#line 6302 "fe/idl.ypp" /* yacc.c:1651 */
+ case 533:
+#line 6326 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeIDSeen);
(yyval.idval) = (yyvsp[0].idval);
}
-#line 9301 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9350 "fe/idl.tab.cpp"
break;
- case 532:
-#line 6311 "fe/idl.ypp" /* yacc.c:1651 */
+ case 534:
+#line 6335 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen);
}
-#line 9309 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9358 "fe/idl.tab.cpp"
break;
- case 533:
-#line 6315 "fe/idl.ypp" /* yacc.c:1651 */
+ case 535:
+#line 6339 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_SupportSpecSeen);
@@ -9338,11 +9387,11 @@ yyreduce:
(yyvsp[-2].nlval) = 0;
}
}
-#line 9342 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9391 "fe/idl.tab.cpp"
break;
- case 534:
-#line 6348 "fe/idl.ypp" /* yacc.c:1651 */
+ case 536:
+#line 6372 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
AST_EventType *e = 0;
@@ -9391,27 +9440,27 @@ yyreduce:
*/
idl_global->scopes ().push (e);
}
-#line 9395 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9444 "fe/idl.tab.cpp"
break;
- case 535:
-#line 6397 "fe/idl.ypp" /* yacc.c:1651 */
+ case 537:
+#line 6421 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeSqSeen);
}
-#line 9403 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9452 "fe/idl.tab.cpp"
break;
- case 536:
-#line 6401 "fe/idl.ypp" /* yacc.c:1651 */
+ case 538:
+#line 6425 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeBodySeen);
}
-#line 9411 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9460 "fe/idl.tab.cpp"
break;
- case 537:
-#line 6405 "fe/idl.ypp" /* yacc.c:1651 */
+ case 539:
+#line 6429 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeQsSeen);
@@ -9420,108 +9469,108 @@ yyreduce:
*/
idl_global->scopes ().pop ();
}
-#line 9424 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9473 "fe/idl.tab.cpp"
break;
- case 538:
-#line 6417 "fe/idl.ypp" /* yacc.c:1651 */
+ case 540:
+#line 6441 "fe/idl.ypp"
{
(yyval.idval) = (yyvsp[0].idval);
}
-#line 9432 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9481 "fe/idl.tab.cpp"
break;
- case 539:
-#line 6421 "fe/idl.ypp" /* yacc.c:1651 */
+ case 541:
+#line 6445 "fe/idl.ypp"
{
(yyval.idval) = (yyvsp[0].idval);
}
-#line 9440 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9489 "fe/idl.tab.cpp"
break;
- case 540:
-#line 6428 "fe/idl.ypp" /* yacc.c:1651 */
+ case 542:
+#line 6452 "fe/idl.ypp"
{
(yyval.ntval) = AST_Decl::NT_type;
}
-#line 9448 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9497 "fe/idl.tab.cpp"
break;
- case 541:
-#line 6432 "fe/idl.ypp" /* yacc.c:1651 */
+ case 543:
+#line 6456 "fe/idl.ypp"
{
(yyval.ntval) = AST_Decl::NT_struct;
}
-#line 9456 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9505 "fe/idl.tab.cpp"
break;
- case 542:
-#line 6436 "fe/idl.ypp" /* yacc.c:1651 */
+ case 544:
+#line 6460 "fe/idl.ypp"
{
(yyval.ntval) = AST_Decl::NT_union;
}
-#line 9464 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9513 "fe/idl.tab.cpp"
break;
- case 543:
-#line 6440 "fe/idl.ypp" /* yacc.c:1651 */
+ case 545:
+#line 6464 "fe/idl.ypp"
{
(yyval.ntval) = AST_Decl::NT_eventtype;
}
-#line 9472 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9521 "fe/idl.tab.cpp"
break;
- case 544:
-#line 6444 "fe/idl.ypp" /* yacc.c:1651 */
+ case 546:
+#line 6468 "fe/idl.ypp"
{
(yyval.ntval) = AST_Decl::NT_sequence;
}
-#line 9480 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9529 "fe/idl.tab.cpp"
break;
- case 545:
-#line 6448 "fe/idl.ypp" /* yacc.c:1651 */
+ case 547:
+#line 6472 "fe/idl.ypp"
{
(yyval.ntval) = AST_Decl::NT_interface;
}
-#line 9488 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9537 "fe/idl.tab.cpp"
break;
- case 546:
-#line 6452 "fe/idl.ypp" /* yacc.c:1651 */
+ case 548:
+#line 6476 "fe/idl.ypp"
{
(yyval.ntval) = AST_Decl::NT_valuetype;
}
-#line 9496 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9545 "fe/idl.tab.cpp"
break;
- case 547:
-#line 6456 "fe/idl.ypp" /* yacc.c:1651 */
+ case 549:
+#line 6480 "fe/idl.ypp"
{
(yyval.ntval) = AST_Decl::NT_enum;
}
-#line 9504 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9553 "fe/idl.tab.cpp"
break;
- case 548:
-#line 6460 "fe/idl.ypp" /* yacc.c:1651 */
+ case 550:
+#line 6484 "fe/idl.ypp"
{
(yyval.ntval) = AST_Decl::NT_except;
}
-#line 9512 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9561 "fe/idl.tab.cpp"
break;
- case 549:
-#line 6464 "fe/idl.ypp" /* yacc.c:1651 */
+ case 551:
+#line 6488 "fe/idl.ypp"
{
(yyval.ntval) = AST_Decl::NT_const;
t_param_const_type = (yyvsp[0].etval);
}
-#line 9521 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9570 "fe/idl.tab.cpp"
break;
- case 550:
-#line 6472 "fe/idl.ypp" /* yacc.c:1651 */
+ case 552:
+#line 6496 "fe/idl.ypp"
{
if ((yyvsp[0].plval) == 0)
{
@@ -9549,11 +9598,11 @@ yyreduce:
(yyval.plval) = (yyvsp[0].plval);
}
-#line 9553 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9602 "fe/idl.tab.cpp"
break;
- case 551:
-#line 6503 "fe/idl.ypp" /* yacc.c:1651 */
+ case 553:
+#line 6527 "fe/idl.ypp"
{
if ((yyvsp[-2].plval) == 0)
{
@@ -9566,19 +9615,19 @@ yyreduce:
delete (yyvsp[0].pival);
(yyvsp[0].pival) = 0;
}
-#line 9570 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9619 "fe/idl.tab.cpp"
break;
- case 552:
-#line 6516 "fe/idl.ypp" /* yacc.c:1651 */
+ case 554:
+#line 6540 "fe/idl.ypp"
{
(yyval.plval) = 0;
}
-#line 9578 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9627 "fe/idl.tab.cpp"
break;
- case 553:
-#line 6523 "fe/idl.ypp" /* yacc.c:1651 */
+ case 555:
+#line 6547 "fe/idl.ypp"
{
ACE_NEW_RETURN ((yyval.pival),
@@ -9603,11 +9652,11 @@ yyreduce:
tao_enum_constant_decl = 0;
}
}
-#line 9607 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9656 "fe/idl.tab.cpp"
break;
- case 554:
-#line 6548 "fe/idl.ypp" /* yacc.c:1651 */
+ case 556:
+#line 6572 "fe/idl.ypp"
{
ACE_NEW_RETURN ((yyval.pival),
FE_Utils::T_Param_Info,
@@ -9622,19 +9671,19 @@ yyreduce:
ACE::strdelete ((yyvsp[0].strval));
(yyvsp[0].strval) = 0;
}
-#line 9626 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9675 "fe/idl.tab.cpp"
break;
- case 555:
-#line 6566 "fe/idl.ypp" /* yacc.c:1651 */
+ case 557:
+#line 6590 "fe/idl.ypp"
{
ACE_NEW_RETURN ((yyval.slval), UTL_StrList ((yyvsp[-1].sval), (yyvsp[0].slval)), 1);
}
-#line 9634 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9683 "fe/idl.tab.cpp"
break;
- case 556:
-#line 6573 "fe/idl.ypp" /* yacc.c:1651 */
+ case 558:
+#line 6597 "fe/idl.ypp"
{
UTL_StrList *sl = 0;
ACE_NEW_RETURN (sl, UTL_StrList ((yyvsp[0].sval), 0), 1);
@@ -9649,37 +9698,37 @@ yyreduce:
(yyval.slval) = (yyvsp[-2].slval);
}
}
-#line 9653 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9702 "fe/idl.tab.cpp"
break;
- case 557:
-#line 6588 "fe/idl.ypp" /* yacc.c:1651 */
+ case 559:
+#line 6612 "fe/idl.ypp"
{
(yyval.slval) = 0;
}
-#line 9661 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9710 "fe/idl.tab.cpp"
break;
- case 558:
-#line 6595 "fe/idl.ypp" /* yacc.c:1651 */
+ case 560:
+#line 6619 "fe/idl.ypp"
{
ACE_NEW_RETURN ((yyval.sval),
UTL_String ((yyvsp[0].strval), true),
1);
}
-#line 9671 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9720 "fe/idl.tab.cpp"
break;
- case 559:
-#line 6604 "fe/idl.ypp" /* yacc.c:1651 */
+ case 561:
+#line 6628 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeSeen);
}
-#line 9679 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9728 "fe/idl.tab.cpp"
break;
- case 560:
-#line 6608 "fe/idl.ypp" /* yacc.c:1651 */
+ case 562:
+#line 6632 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeIDSeen);
UTL_Scope *s = idl_global->scopes ().top_non_null ();
@@ -9699,102 +9748,102 @@ yyreduce:
delete (yyvsp[-1].annotations_val);
}
-#line 9703 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9752 "fe/idl.tab.cpp"
break;
- case 561:
-#line 6628 "fe/idl.ypp" /* yacc.c:1651 */
+ case 563:
+#line 6652 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeSqSeen);
}
-#line 9711 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9760 "fe/idl.tab.cpp"
break;
- case 562:
-#line 6632 "fe/idl.ypp" /* yacc.c:1651 */
+ case 564:
+#line 6656 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeBodySeen);
}
-#line 9719 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9768 "fe/idl.tab.cpp"
break;
- case 563:
-#line 6636 "fe/idl.ypp" /* yacc.c:1651 */
+ case 565:
+#line 6660 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeQsSeen);
// Done with this port type - pop it off the scopes stack.
idl_global->scopes ().pop ();
}
-#line 9730 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9779 "fe/idl.tab.cpp"
break;
- case 564:
-#line 6646 "fe/idl.ypp" /* yacc.c:1651 */
+ case 566:
+#line 6670 "fe/idl.ypp"
{
}
-#line 9737 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9786 "fe/idl.tab.cpp"
break;
- case 565:
-#line 6652 "fe/idl.ypp" /* yacc.c:1651 */
+ case 567:
+#line 6676 "fe/idl.ypp"
{
}
-#line 9744 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9793 "fe/idl.tab.cpp"
break;
- case 566:
-#line 6655 "fe/idl.ypp" /* yacc.c:1651 */
+ case 568:
+#line 6679 "fe/idl.ypp"
{
}
-#line 9751 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9800 "fe/idl.tab.cpp"
break;
- case 567:
-#line 6661 "fe/idl.ypp" /* yacc.c:1651 */
+ case 569:
+#line 6685 "fe/idl.ypp"
{
}
-#line 9758 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9807 "fe/idl.tab.cpp"
break;
- case 568:
-#line 6664 "fe/idl.ypp" /* yacc.c:1651 */
+ case 570:
+#line 6688 "fe/idl.ypp"
{
}
-#line 9765 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9814 "fe/idl.tab.cpp"
break;
- case 569:
-#line 6667 "fe/idl.ypp" /* yacc.c:1651 */
+ case 571:
+#line 6691 "fe/idl.ypp"
{
}
-#line 9772 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9821 "fe/idl.tab.cpp"
break;
- case 570:
-#line 6670 "fe/idl.ypp" /* yacc.c:1651 */
+ case 572:
+#line 6694 "fe/idl.ypp"
{
}
-#line 9779 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9828 "fe/idl.tab.cpp"
break;
- case 571:
-#line 6673 "fe/idl.ypp" /* yacc.c:1651 */
+ case 573:
+#line 6697 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen);
}
-#line 9787 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9836 "fe/idl.tab.cpp"
break;
- case 572:
-#line 6677 "fe/idl.ypp" /* yacc.c:1651 */
+ case 574:
+#line 6701 "fe/idl.ypp"
{
}
-#line 9794 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9843 "fe/idl.tab.cpp"
break;
- case 573:
-#line 6683 "fe/idl.ypp" /* yacc.c:1651 */
+ case 575:
+#line 6707 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ExtendedPortDeclSeen);
UTL_Scope *s = idl_global->scopes ().top_non_null ();
@@ -9863,11 +9912,11 @@ yyreduce:
delete (yyvsp[-1].idlist);
(yyvsp[-1].idlist) = 0;
}
-#line 9867 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9916 "fe/idl.tab.cpp"
break;
- case 574:
-#line 6752 "fe/idl.ypp" /* yacc.c:1651 */
+ case 576:
+#line 6776 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_MirrorPortDeclSeen);
UTL_Scope *s = idl_global->scopes ().top_non_null ();
@@ -9914,11 +9963,11 @@ yyreduce:
delete (yyvsp[-1].idlist);
(yyvsp[-1].idlist) = 0;
}
-#line 9918 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9967 "fe/idl.tab.cpp"
break;
- case 575:
-#line 6802 "fe/idl.ypp" /* yacc.c:1651 */
+ case 577:
+#line 6826 "fe/idl.ypp"
{
if ((yyvsp[0].alval) == 0)
{
@@ -9931,11 +9980,11 @@ yyreduce:
(yyvsp[0].alval)->enqueue_head ((yyvsp[-1].dcval));
(yyval.alval) = (yyvsp[0].alval);
}
-#line 9935 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9984 "fe/idl.tab.cpp"
break;
- case 576:
-#line 6818 "fe/idl.ypp" /* yacc.c:1651 */
+ case 578:
+#line 6842 "fe/idl.ypp"
{
if ((yyvsp[-3].alval) == 0)
{
@@ -9948,19 +9997,19 @@ yyreduce:
(yyvsp[-3].alval)->enqueue_tail ((yyvsp[0].dcval));
(yyval.alval) = (yyvsp[-3].alval);
}
-#line 9952 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 10001 "fe/idl.tab.cpp"
break;
- case 577:
-#line 6831 "fe/idl.ypp" /* yacc.c:1651 */
+ case 579:
+#line 6855 "fe/idl.ypp"
{
(yyval.alval) = 0;
}
-#line 9960 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 10009 "fe/idl.tab.cpp"
break;
- case 578:
-#line 6838 "fe/idl.ypp" /* yacc.c:1651 */
+ case 580:
+#line 6862 "fe/idl.ypp"
{
// To avoid grammar conflicts with this LALR(1) parser,
// we take advantage of the fact that an expression can
@@ -10016,27 +10065,27 @@ yyreduce:
0);
}
}
-#line 10020 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 10069 "fe/idl.tab.cpp"
break;
- case 580:
-#line 6901 "fe/idl.ypp" /* yacc.c:1651 */
+ case 582:
+#line 6925 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorSeen);
}
-#line 10028 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 10077 "fe/idl.tab.cpp"
break;
- case 581:
-#line 6905 "fe/idl.ypp" /* yacc.c:1651 */
+ case 583:
+#line 6929 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorIDSeen);
}
-#line 10036 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 10085 "fe/idl.tab.cpp"
break;
- case 582:
-#line 6909 "fe/idl.ypp" /* yacc.c:1651 */
+ case 584:
+#line 6933 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
AST_Connector *parent = 0;
@@ -10090,102 +10139,103 @@ yyreduce:
delete (yyvsp[-3].annotations_val);
}
-#line 10094 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 10143 "fe/idl.tab.cpp"
break;
- case 583:
-#line 6966 "fe/idl.ypp" /* yacc.c:1651 */
+ case 585:
+#line 6990 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorSqSeen);
}
-#line 10102 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 10151 "fe/idl.tab.cpp"
break;
- case 584:
-#line 6970 "fe/idl.ypp" /* yacc.c:1651 */
+ case 586:
+#line 6994 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorBodySeen);
}
-#line 10110 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 10159 "fe/idl.tab.cpp"
break;
- case 585:
-#line 6974 "fe/idl.ypp" /* yacc.c:1651 */
+ case 587:
+#line 6998 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorQsSeen);
// Done with this connector - pop it off the scope stack.
idl_global->scopes ().pop ();
}
-#line 10121 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 10170 "fe/idl.tab.cpp"
break;
- case 588:
-#line 6989 "fe/idl.ypp" /* yacc.c:1651 */
+ case 590:
+#line 7013 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ProvidesDeclSeen);
}
-#line 10129 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 10178 "fe/idl.tab.cpp"
break;
- case 589:
-#line 6993 "fe/idl.ypp" /* yacc.c:1651 */
+ case 591:
+#line 7017 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
}
-#line 10137 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 10186 "fe/idl.tab.cpp"
break;
- case 590:
-#line 6997 "fe/idl.ypp" /* yacc.c:1651 */
+ case 592:
+#line 7021 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_UsesDeclSeen);
}
-#line 10145 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 10194 "fe/idl.tab.cpp"
break;
- case 591:
-#line 7001 "fe/idl.ypp" /* yacc.c:1651 */
+ case 593:
+#line 7025 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
}
-#line 10153 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 10202 "fe/idl.tab.cpp"
break;
- case 592:
-#line 7005 "fe/idl.ypp" /* yacc.c:1651 */
+ case 594:
+#line 7029 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen);
}
-#line 10161 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 10210 "fe/idl.tab.cpp"
break;
- case 593:
-#line 7009 "fe/idl.ypp" /* yacc.c:1651 */
+ case 595:
+#line 7033 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
}
-#line 10169 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 10218 "fe/idl.tab.cpp"
break;
- case 594:
-#line 7013 "fe/idl.ypp" /* yacc.c:1651 */
+ case 596:
+#line 7037 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ExtendedPortDeclSeen);
}
-#line 10177 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 10226 "fe/idl.tab.cpp"
break;
- case 595:
-#line 7017 "fe/idl.ypp" /* yacc.c:1651 */
+ case 597:
+#line 7041 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
}
-#line 10185 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 10234 "fe/idl.tab.cpp"
break;
-#line 10189 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 10238 "fe/idl.tab.cpp"
+
default: break;
}
/* User semantic actions sometimes alter yychar, and that requires
@@ -10210,14 +10260,13 @@ yyreduce:
/* Now 'shift' the result of the reduction. Determine what state
that goes to, based on the state we popped back to and the rule
number reduced by. */
-
- yyn = yyr1[yyn];
-
- yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
- if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
- yystate = yytable[yystate];
- else
- yystate = yydefgoto[yyn - YYNTOKENS];
+ {
+ const int yylhs = yyr1[yyn] - YYNTOKENS;
+ const int yyi = yypgoto[yylhs] + *yyssp;
+ yystate = (0 <= yyi && yyi <= YYLAST && yycheck[yyi] == *yyssp
+ ? yytable[yyi]
+ : yydefgoto[yylhs]);
+ }
goto yynewstate;
@@ -10300,12 +10349,10 @@ yyerrlab:
| yyerrorlab -- error raised explicitly by YYERROR. |
`---------------------------------------------------*/
yyerrorlab:
-
- /* Pacify compilers like GCC when the user code never invokes
- YYERROR and the label yyerrorlab therefore never appears in user
- code. */
- if (/*CONSTCOND*/ 0)
- goto yyerrorlab;
+ /* Pacify compilers when the user code never invokes YYERROR and the
+ label yyerrorlab therefore never appears in user code. */
+ if (0)
+ YYERROR;
/* Do not reclaim the symbols of the rule whose action triggered
this YYERROR. */
@@ -10367,6 +10414,7 @@ yyacceptlab:
yyresult = 0;
goto yyreturn;
+
/*-----------------------------------.
| yyabortlab -- YYABORT comes here. |
`-----------------------------------*/
@@ -10374,6 +10422,7 @@ yyabortlab:
yyresult = 1;
goto yyreturn;
+
#if !defined yyoverflow || YYERROR_VERBOSE
/*-------------------------------------------------.
| yyexhaustedlab -- memory exhaustion comes here. |
@@ -10384,6 +10433,10 @@ yyexhaustedlab:
/* Fall through. */
#endif
+
+/*-----------------------------------------------------.
+| yyreturn -- parsing is finished, return the result. |
+`-----------------------------------------------------*/
yyreturn:
if (yychar != YYEMPTY)
{
@@ -10413,7 +10466,7 @@ yyreturn:
#endif
return yyresult;
}
-#line 7022 "fe/idl.ypp" /* yacc.c:1910 */
+#line 7046 "fe/idl.ypp"
/* programs */
@@ -10432,7 +10485,5 @@ tao_yywrap (void)
void
tao_yyerror (const char *msg)
{
- ACE_ERROR ((LM_ERROR,
- "%C\n",
- msg));
+ ACE_ERROR ((LM_ERROR, "%C\n", msg));
}
diff --git a/TAO/TAO_IDL/fe/idl.tab.hpp b/TAO/TAO_IDL/fe/idl.tab.hpp
index 7e6713cd4ec..b8d00042328 100644
--- a/TAO/TAO_IDL/fe/idl.tab.hpp
+++ b/TAO/TAO_IDL/fe/idl.tab.hpp
@@ -1,8 +1,9 @@
-/* A Bison parser, made by GNU Bison 3.1. */
+/* A Bison parser, made by GNU Bison 3.4. */
/* Bison interface for Yacc-like parsers in C
- Copyright (C) 1984, 1989-1990, 2000-2015, 2018 Free Software Foundation, Inc.
+ Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2019 Free Software Foundation,
+ Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -30,6 +31,9 @@
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
+/* Undocumented macros, especially those whose name start with YY_,
+ are private implementation details. Do not rely on them. */
+
#ifndef YY_TAO_YY_FE_IDL_TAB_HPP_INCLUDED
# define YY_TAO_YY_FE_IDL_TAB_HPP_INCLUDED
/* Debug traces. */
@@ -135,10 +139,9 @@ extern int tao_yydebug;
/* Value type. */
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-
union YYSTYPE
{
-#line 158 "fe/idl.ypp" /* yacc.c:1913 */
+#line 158 "fe/idl.ypp"
AST_Decl *dcval; /* Decl value */
UTL_StrList *slval; /* String list */
@@ -183,9 +186,9 @@ union YYSTYPE
AST_Decls *decls_val;
Decl_Annotations_Pair *decl_annotations_pair_val;
-#line 187 "fe/idl.tab.hpp" /* yacc.c:1913 */
-};
+#line 190 "fe/idl.tab.hpp"
+};
typedef union YYSTYPE YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
# define YYSTYPE_IS_DECLARED 1
diff --git a/TAO/TAO_IDL/fe/idl.ypp b/TAO/TAO_IDL/fe/idl.ypp
index 87715d364ec..0cab63a50b8 100644
--- a/TAO/TAO_IDL/fe/idl.ypp
+++ b/TAO/TAO_IDL/fe/idl.ypp
@@ -308,6 +308,8 @@ AST_Expression::ExprType t_param_const_type = AST_Expression::EV_none;
%type <dcval> param_type_spec type_dcl type_declarator actual_parameter
%type <dcval> fixed_type_spec
%type <dcval> definition fixed_definition module const_dcl struct_forward_type
+%type <dcval> interface_def interface interface_forward
+%type <dcval> export operation attribute attribute_readonly attribute_readwrite
%type <idlist> scoped_name interface_type component_inheritance_spec
%type <idlist> home_inheritance_spec primary_key_spec module_header
@@ -398,8 +400,8 @@ at_least_one_definition
*/
: definitions at_least_one_annotation definition
{
- AST_Decl *d = $3;
AST_Annotation_Appls *annotations = $2;
+ AST_Decl *d = $3;
if (d)
{
d->annotation_appls (*annotations);
@@ -407,7 +409,7 @@ at_least_one_definition
else
{
idl_global->err ()-> unsupported_warning(
- "Annotating this type of definition is not supported");
+ "Annotating this is not supported");
}
delete annotations;
}
@@ -493,7 +495,7 @@ fixed_definition
';'
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
- $$ = 0;
+ $$ = $1;
}
| module
{
@@ -912,41 +914,47 @@ template_module_inst
interface_def
: interface
+ {
+ $$ = $1;
+ }
| interface_forward
+ {
+ $$ = $1;
+ }
;
-interface :
- interface_header
+interface
+ : interface_header
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
AST_Interface *i = 0;
+ FE_InterfaceHeader *header = $1;
+ $1 = 0;
+
/*
* Make a new interface node and add it to its enclosing scope.
*/
- if (s != 0 && $1 != 0)
- {
- i =
- idl_global->gen ()->create_interface (
- $1->name (),
- $1->inherits (),
- $1->n_inherits (),
- $1->inherits_flat (),
- $1->n_inherits_flat (),
- $1->is_local (),
- $1->is_abstract ()
- );
- AST_Interface::fwd_redefinition_helper (i,
- s);
+ if (s != 0 && header)
+ {
+ i = idl_global->gen ()->create_interface (
+ header->name (),
+ header->inherits (),
+ header->n_inherits (),
+ header->inherits_flat (),
+ header->n_inherits_flat (),
+ header->is_local (),
+ header->is_abstract ()
+ );
+ AST_Interface::fwd_redefinition_helper (i, s);
/*
* Add the interface to its definition scope.
*/
- (void) s->fe_add_interface (i);
+ s->fe_add_interface (i);
// This FE_InterfaceHeader class isn't destroyed with the AST.
- $1->destroy ();
- delete $1;
- $1 = 0;
+ header->destroy ();
+ delete header;
}
/*
@@ -966,6 +974,7 @@ interface :
{
idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceQsSeen);
+ $$ = dynamic_cast<AST_Decl*> (idl_global->scopes ().top_non_null ());
/*
* Done with this interface - pop it off the scopes stack
*/
@@ -1485,10 +1494,31 @@ state_member
;
exports
- : exports export
+ : at_least_one_export
| %empty
;
+at_least_one_export
+ : exports at_least_one_annotation export
+ {
+ AST_Annotation_Appls *annotations = $2;
+ AST_Decl *d = $3;
+ if (d)
+ {
+ d->annotation_appls (*annotations);
+ }
+ else
+ {
+ idl_global->err ()-> unsupported_warning(
+ "Annotating this is not supported");
+ }
+ delete annotations;
+ }
+ | exports export
+ {
+ }
+ ;
+
export
: type_dcl
{
@@ -1497,6 +1527,7 @@ export
';'
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
+ $$ = $1;
}
| typeid_dcl
{
@@ -1505,6 +1536,7 @@ export
';'
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
+ $$ = 0;
}
| typeprefix_dcl
{
@@ -1513,6 +1545,7 @@ export
';'
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
+ $$ = 0;
}
| const_dcl
{
@@ -1521,6 +1554,7 @@ export
';'
{
idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
+ $$ = $1;
}
| exception
{
@@ -1529,6 +1563,7 @@ export
';'
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
+ $$ = 0;
}
| attribute
{
@@ -1537,6 +1572,7 @@ export
';'
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
+ $$ = $1;
}
| operation
{
@@ -1545,6 +1581,7 @@ export
';'
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
+ $$ = $1;
}
| error
{
@@ -1554,6 +1591,7 @@ export
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
yyerrok;
+ $$ = 0;
}
;
@@ -1775,6 +1813,8 @@ interface_forward :
$2->destroy ();
delete $2;
$2 = 0;
+
+ $$ = dynamic_cast<AST_Decl*>(f);
}
;
@@ -2459,8 +2499,10 @@ annotation_appl
break;
}
- // Ignore lookup errors for parameter values that might depend
- // on constants or enums from the annotation declaration.
+ /*
+ * Ignore lookup errors for parameter values that might depend on
+ * constants or enums from the missing annotation declaration.
+ */
idl_global->ignore_lookup_errors_ = true;
}
@@ -2602,6 +2644,8 @@ type_dcl
$2->destroy ();
delete $2;
$2 = 0;
+
+ $$ = 0;
}
| constructed_forward_type_spec
{
@@ -4296,13 +4340,9 @@ attribute_readonly :
* Create nodes representing attributes and add them to the
* enclosing scope.
*/
- if (s != 0
- && $5 != 0
- && $7 != 0)
+ if (s != 0 && $5 != 0 && $7 != 0)
{
- for (UTL_DecllistActiveIterator l ($7);
- !l.is_done ();
- l.next ())
+ for (UTL_DecllistActiveIterator l ($7); !l.is_done (); l.next ())
{
d = l.item ();
@@ -4318,14 +4358,8 @@ attribute_readonly :
continue;
}
- a =
- idl_global->gen ()->create_attribute (
- true,
- tp,
- d->name (),
- s->is_local (),
- s->is_abstract ()
- );
+ a = idl_global->gen ()->create_attribute (
+ true, tp, d->name (), s->is_local (), s->is_abstract ());
if ($9 != 0)
{
@@ -4343,6 +4377,8 @@ attribute_readonly :
$7->destroy ();
delete $7;
$7 = 0;
+
+ $$ = a;
}
;
@@ -4375,13 +4411,9 @@ attribute_readwrite :
* Create nodes representing attributes and add them to the
* enclosing scope.
*/
- if (s != 0
- && $3 != 0
- && $5 != 0)
+ if (s != 0 && $3 != 0 && $5 != 0)
{
- for (UTL_DecllistActiveIterator l ($5);
- !l.is_done ();
- l.next ())
+ for (UTL_DecllistActiveIterator l ($5); !l.is_done (); l.next ())
{
d = l.item ();
@@ -4397,14 +4429,8 @@ attribute_readwrite :
continue;
}
- a =
- idl_global->gen ()->create_attribute (
- false,
- tp,
- d->name (),
- s->is_local (),
- s->is_abstract ()
- );
+ a = idl_global->gen ()->create_attribute (
+ false, tp, d->name (), s->is_local (), s->is_abstract ());
if ($7 != 0)
{
@@ -4431,6 +4457,8 @@ attribute_readwrite :
$5->destroy ();
delete $5;
$5 = 0;
+
+ $$ = a;
}
;
@@ -4486,67 +4514,63 @@ exception :
}
;
-operation :
- opt_op_attribute
- op_type_spec
+operation
+ : opt_op_attribute op_type_spec
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpTypeSeen);
}
- annotations_maybe IDENTIFIER
+ IDENTIFIER
{
- UTL_Scope *s = idl_global->scopes ().top_non_null ();
- Identifier id ($5);
- ACE::strdelete ($5);
- $5 = 0;
+ AST_Operation *op = 0;
+ UTL_Scope *scope = idl_global->scopes ().top_non_null ();
- UTL_ScopedName n (&id, 0);
- AST_Operation *o = 0;
+ AST_Operation::Flags op_flags = $1;
+ AST_Decl *type_node = $2;
+ $2 = 0;
+ Identifier id ($4);
+ ACE::strdelete ($4);
+ $4 = 0;
+
+ UTL_ScopedName name (&id, 0);
idl_global->set_parse_state (IDL_GlobalData::PS_OpIDSeen);
/*
* Create a node representing an operation on an interface
* and add it to its enclosing scope.
*/
- if (s != 0 && $2 != 0)
+ if (scope != 0 && type_node != 0)
{
- AST_Type *tp =
- AST_Type::narrow_from_decl ($2);
+ AST_Type *type = AST_Type::narrow_from_decl (type_node);
- if (tp == 0)
+ if (type == 0)
{
- idl_global->err ()->not_a_type ($2);
+ idl_global->err ()->not_a_type (type_node);
}
- else if (tp->node_type () == AST_Decl::NT_except)
+ else if (type->node_type () == AST_Decl::NT_except)
{
- idl_global->err ()->not_a_type ($2);
+ idl_global->err ()->not_a_type (type_node);
}
else
{
- AST_Decl *d = ScopeAsDecl (s);
+ AST_Decl *d = ScopeAsDecl (scope);
AST_Decl::NodeType nt = d->node_type ();
- bool local =
- s->is_local ()
+ const bool local = scope->is_local ()
|| nt == AST_Decl::NT_valuetype
|| nt == AST_Decl::NT_eventtype;
- o =
- idl_global->gen ()->create_operation (
- tp,
- $1,
- &n,
- local,
- s->is_abstract ());
+ op = idl_global->gen ()->create_operation (
+ type, op_flags, &name, local, scope->is_abstract ());
- if (!local && tp->is_local ())
+ if (!local && type->is_local ())
{
- idl_global->err ()->local_remote_mismatch (tp, o);
- o->destroy ();
- delete o;
- o = 0;
+ idl_global->err ()->local_remote_mismatch (type, op);
+ op->destroy ();
+ delete op;
+ op = 0;
}
else
{
- (void) s->fe_add_operation (o);
+ scope->fe_add_operation (op);
}
}
}
@@ -4554,9 +4578,7 @@ operation :
/*
* Push the operation scope onto the scopes stack.
*/
- idl_global->scopes ().push (o);
-
- delete $4;
+ idl_global->scopes ().push (op);
}
parameter_list
{
@@ -4579,14 +4601,14 @@ operation :
{
o = AST_Operation::narrow_from_scope (s);
- if ($9 != 0 && o != 0)
+ if ($8 != 0 && o != 0)
{
- (void) o->fe_add_exceptions ($9);
+ (void) o->fe_add_exceptions ($8);
}
- if ($11 != 0)
+ if ($10 != 0)
{
- (void) o->fe_add_context ($11);
+ (void) o->fe_add_context ($10);
}
}
@@ -4594,6 +4616,8 @@ operation :
* Done with this operation. Pop its scope from the scopes stack.
*/
idl_global->scopes ().pop ();
+
+ $$ = o;
}
;
@@ -7037,7 +7061,5 @@ tao_yywrap (void)
void
tao_yyerror (const char *msg)
{
- ACE_ERROR ((LM_ERROR,
- "%C\n",
- msg));
+ ACE_ERROR ((LM_ERROR, "%C\n", msg));
}
diff --git a/TAO/TAO_IDL/include/ast_attribute.h b/TAO/TAO_IDL/include/ast_attribute.h
index 81662dba6ae..6a5b10ce5d5 100644
--- a/TAO/TAO_IDL/include/ast_attribute.h
+++ b/TAO/TAO_IDL/include/ast_attribute.h
@@ -108,6 +108,8 @@ public:
static AST_Decl::NodeType const NT;
+ virtual bool annotatable () const;
+
private:
// Data.
diff --git a/TAO/TAO_IDL/include/ast_interface.h b/TAO/TAO_IDL/include/ast_interface.h
index 1be13e4fda3..2be8cee24f3 100644
--- a/TAO/TAO_IDL/include/ast_interface.h
+++ b/TAO/TAO_IDL/include/ast_interface.h
@@ -173,6 +173,8 @@ public:
static AST_Decl::NodeType const NT;
typedef AST_InterfaceFwd FWD_TYPE;
+ virtual bool annotatable () const;
+
protected:
// Data.
diff --git a/TAO/TAO_IDL/include/ast_operation.h b/TAO/TAO_IDL/include/ast_operation.h
index cb4684c94e5..f226d57780d 100644
--- a/TAO/TAO_IDL/include/ast_operation.h
+++ b/TAO/TAO_IDL/include/ast_operation.h
@@ -149,6 +149,8 @@ public:
static AST_Decl::NodeType const NT;
+ virtual bool annotatable () const;
+
protected:
// Data.
diff --git a/TAO/TAO_IDL/tao_idl_fe.mpc b/TAO/TAO_IDL/tao_idl_fe.mpc
index f2fc3051adb..fcaad08f3f3 100644
--- a/TAO/TAO_IDL/tao_idl_fe.mpc
+++ b/TAO/TAO_IDL/tao_idl_fe.mpc
@@ -33,7 +33,7 @@ project(TAO_IDL_GEN) {
" @echo ' generate it using:'"
" @echo ' make y.tab'"
- debug_bison: BISON_FLAGS += --report all
+ debug_bison: BISON_FLAGS += --report=all --report-file=bison_report
debug_bison: y.tab
.PHONY: y.tab
View Lorry Controller Status