[asterisk-scf-commits] asterisk-scf/integration/ice.git branch "fix-shadow-violations" created.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Tue Apr 12 17:16:05 CDT 2011
branch "fix-shadow-violations" has been created
at 3a764538d6b35055b080e5b863247074b5e6d8c8 (commit)
- Log -----------------------------------------------------------------
commit 3a764538d6b35055b080e5b863247074b5e6d8c8
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Tue Apr 12 17:15:00 2011 -0500
Modify output of slice2cpp to avoid generating code with variables that
shadow other in-scope variables/functions/etc.
diff --git a/cpp/include/Slice/CPlusPlusUtil.h b/cpp/include/Slice/CPlusPlusUtil.h
index 0f3625d..63e4e20 100644
--- a/cpp/include/Slice/CPlusPlusUtil.h
+++ b/cpp/include/Slice/CPlusPlusUtil.h
@@ -47,9 +47,9 @@ SLICE_API void writeMarshalUnmarshalCode(::IceUtilInternal::Output&, const TypeP
int = 0, bool = false);
SLICE_API void writeMarshalCode(::IceUtilInternal::Output&, const ParamDeclList&, const TypePtr&,
- const StringList&, int = 0);
+ const StringList&, int = 0, const std::string& = "");
SLICE_API void writeUnmarshalCode(::IceUtilInternal::Output&, const ParamDeclList&, const TypePtr&,
- const StringList&, int = 0);
+ const StringList&, int = 0, const std::string& = "");
SLICE_API void writeAllocateCode(::IceUtilInternal::Output&, const ParamDeclList&, const TypePtr&,
const StringList&, int = 0);
diff --git a/cpp/src/Slice/CPlusPlusUtil.cpp b/cpp/src/Slice/CPlusPlusUtil.cpp
index 5e06261..137db9c 100644
--- a/cpp/src/Slice/CPlusPlusUtil.cpp
+++ b/cpp/src/Slice/CPlusPlusUtil.cpp
@@ -723,7 +723,7 @@ Slice::writeMarshalUnmarshalCode(Output& out, const TypePtr& type, const string&
<< fixedParam << "; ++__i_" << fixedParam << ")";
out << sb;
writeMarshalUnmarshalCode(out, seq->type(), fixedParam + ".first[__i_" + fixedParam + "]",
- true);
+ true, str);
out << eb;
}
}
@@ -758,7 +758,7 @@ Slice::writeMarshalUnmarshalCode(Output& out, const TypePtr& type, const string&
<< fixedParam << ".first; ___" << fixedParam << " != " << fixedParam << ".second; ++___"
<< fixedParam << ")";
out << sb;
- writeMarshalUnmarshalCode(out, seq->type(), "(*___" + fixedParam + ")", true, "", true, l, false);
+ writeMarshalUnmarshalCode(out, seq->type(), "(*___" + fixedParam + ")", true, str, true, l, false);
out << eb;
}
else if(!seqType.empty())
@@ -768,7 +768,7 @@ Slice::writeMarshalUnmarshalCode(Output& out, const TypePtr& type, const string&
out << nl << "for(__p_" << fixedParam << " = " << fixedParam << ".begin(); __p_" << fixedParam
<< " != " << fixedParam << ".end(); ++__p_" << fixedParam << ")";
out << sb;
- writeMarshalUnmarshalCode(out, seq->type(), "(*__p_" + fixedParam + ")", true);
+ writeMarshalUnmarshalCode(out, seq->type(), "(*__p_" + fixedParam + ")", true, str);
out << eb;
}
else
@@ -839,7 +839,7 @@ Slice::writeMarshalUnmarshalCode(Output& out, const TypePtr& type, const string&
StringList l;
l.push_back("cpp:type:" + seqType);
out << nl << seqType << " ___" << fixedParam << ";";
- writeMarshalUnmarshalCode(out, seq, "___" + fixedParam, false, "", true, l, false);
+ writeMarshalUnmarshalCode(out, seq, "___" + fixedParam, false, str, true, l, false);
}
}
else if(builtin->kind() == Builtin::KindByte)
@@ -903,11 +903,11 @@ Slice::writeMarshalUnmarshalCode(Output& out, const TypePtr& type, const string&
}
if(typeCtx & TypeContextAMIPrivateEnd)
{
- writeMarshalUnmarshalCode(out, seq, fixedParam, false, "", true, md, false);
+ writeMarshalUnmarshalCode(out, seq, fixedParam, false, str, true, md, false);
}
else
{
- writeMarshalUnmarshalCode(out, seq, "___" + fixedParam, false, "", true, md, false);
+ writeMarshalUnmarshalCode(out, seq, "___" + fixedParam, false, str, true, md, false);
out << nl << fixedParam << ".first = ___" << fixedParam << ".begin();";
out << nl << fixedParam << ".second = ___" << fixedParam << ".end();";
}
@@ -925,7 +925,7 @@ Slice::writeMarshalUnmarshalCode(Output& out, const TypePtr& type, const string&
out << nl << "for(__p_" << fixedParam << " = " << fixedParam << ".begin(); __p_" << fixedParam
<< " != " << fixedParam << ".end(); ++__p_" << fixedParam << ")";
out << sb;
- writeMarshalUnmarshalCode(out, seq->type(), "(*__p_" + fixedParam + ")", false);
+ writeMarshalUnmarshalCode(out, seq->type(), "(*__p_" + fixedParam + ")", false, str);
out << eb;
}
else
@@ -1003,31 +1003,31 @@ Slice::writeMarshalUnmarshalCode(Output& out, const TypePtr& type, const string&
void
Slice::writeMarshalCode(Output& out, const ParamDeclList& params, const TypePtr& ret, const StringList& metaData,
- int typeCtx)
+ int typeCtx, const string& str)
{
for(ParamDeclList::const_iterator p = params.begin(); p != params.end(); ++p)
{
- writeMarshalUnmarshalCode(out, (*p)->type(), fixKwd((*p)->name()), true, "", true, (*p)->getMetaData(),
+ writeMarshalUnmarshalCode(out, (*p)->type(), fixKwd((*p)->name()), true, str, true, (*p)->getMetaData(),
typeCtx);
}
if(ret)
{
- writeMarshalUnmarshalCode(out, ret, "__ret", true, "", true, metaData, false);
+ writeMarshalUnmarshalCode(out, ret, "__ret", true, str, true, metaData, false);
}
}
void
Slice::writeUnmarshalCode(Output& out, const ParamDeclList& params, const TypePtr& ret, const StringList& metaData,
- int typeCtx)
+ int typeCtx, const string& str)
{
for(ParamDeclList::const_iterator p = params.begin(); p != params.end(); ++p)
{
- writeMarshalUnmarshalCode(out, (*p)->type(), fixKwd((*p)->name()), false, "", true, (*p)->getMetaData(),
+ writeMarshalUnmarshalCode(out, (*p)->type(), fixKwd((*p)->name()), false, str, true, (*p)->getMetaData(),
typeCtx);
}
if(ret)
{
- writeMarshalUnmarshalCode(out, ret, "__ret", false, "", true, metaData, typeCtx);
+ writeMarshalUnmarshalCode(out, ret, "__ret", false, str, true, metaData, typeCtx);
}
}
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index dd5a09d..a9693be 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -3530,6 +3530,7 @@ Slice::Gen::DelegateDVisitor::visitOperation(const OperationPtr& p)
vector<string> params;
vector<string> paramsDecl;
+ vector<string> innerParamsDecl;
vector<string> args;
vector<string> argMembers;
@@ -3559,6 +3560,7 @@ Slice::Gen::DelegateDVisitor::visitOperation(const OperationPtr& p)
params.push_back(typeString);
paramsDecl.push_back(typeString + ' ' + paramName);
+ innerParamsDecl.push_back(typeString + ' ' + "inner_" + paramName);
args.push_back(paramName);
argMembers.push_back("_m_" + paramName);
}
@@ -3606,7 +3608,7 @@ Slice::Gen::DelegateDVisitor::visitOperation(const OperationPtr& p)
string resultRef = outputTypeToString(ret, p->getMetaData(), _useWstring);
C << resultRef + " __result";
}
- C << paramsDecl << "const ::Ice::Current& __current" << epar << " : ";
+ C << innerParamsDecl << "const ::Ice::Current& __current" << epar << " : ";
C.inc();
C << nl << "::IceInternal::Direct(__current)";
@@ -3619,7 +3621,7 @@ Slice::Gen::DelegateDVisitor::visitOperation(const OperationPtr& p)
{
if(args[i] != "__current")
{
- C << "," << nl << argMembers[i] + "(" + args[i] + ")";
+ C << "," << nl << argMembers[i] + "(" + "inner_" + args[i] + ")";
}
}
C.dec();
@@ -3632,8 +3634,8 @@ Slice::Gen::DelegateDVisitor::visitOperation(const OperationPtr& p)
C << nl << nl << "virtual ::Ice::DispatchStatus";
C << nl << "run(::Ice::Object* object)";
C << sb;
- C << nl << thisPointer << " servant = dynamic_cast< " << thisPointer << ">(object);";
- C << nl << "if(!servant)";
+ C << nl << thisPointer << " serv = dynamic_cast< " << thisPointer << ">(object);";
+ C << nl << "if(!serv)";
C << sb;
C << nl << "throw ::Ice::OperationNotExistException(__FILE__, __LINE__, _current.id, _current.facet, _current.operation);";
C << eb;
@@ -3650,7 +3652,7 @@ Slice::Gen::DelegateDVisitor::visitOperation(const OperationPtr& p)
{
C << "_result = ";
}
- C << "servant->" << name << spar << argMembers << epar << ';';
+ C << "serv->" << name << spar << argMembers << epar << ';';
C << nl << "return ::Ice::DispatchOK;";
if(!throws.empty())
@@ -6893,15 +6895,15 @@ Slice::Gen::AsyncImplVisitor::visitOperation(const OperationPtr& p)
{
C << nl << "try";
C << sb;
- C << nl << "::IceInternal::BasicStream* __os = this->__os();";
- writeMarshalCode(C, outParams, 0, StringList(), true);
+ C << nl << "::IceInternal::BasicStream* __outstream = this->__os();";
+ writeMarshalCode(C, outParams, 0, StringList(), true, "__outstream");
if(ret)
{
- writeMarshalUnmarshalCode(C, ret, "__ret", true, "", true, p->getMetaData(), true);
+ writeMarshalUnmarshalCode(C, ret, "__ret", true, "__outstream", true, p->getMetaData(), true);
}
if(p->returnsClasses())
{
- C << nl << "__os->writePendingObjects();";
+ C << nl << "__outstream->writePendingObjects();";
}
C << eb;
C << nl << "catch(const ::Ice::Exception& __ex)";
commit a685262dc0e4f0bb407b0cd0207ff34e1da549b4
Author: Darren Sessions <dsessions at digium.com>
Date: Thu Mar 31 18:46:00 2011 -0500
Revert accidental changes.
diff --git a/cpp/src/Slice/Grammar.cpp b/cpp/src/Slice/Grammar.cpp
index c62ddc5..2a95809 100644
--- a/cpp/src/Slice/Grammar.cpp
+++ b/cpp/src/Slice/Grammar.cpp
@@ -1,24 +1,23 @@
-/* A Bison parser, made by GNU Bison 2.3. */
-/* Skeleton implementation for Bison's Yacc-like parsers in C
+/* A Bison parser, made by GNU Bison 2.4.1. */
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+/* Skeleton implementation for Bison's Yacc-like parsers in C
+
+ Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify
+
+ 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
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* As a special exception, you may create a larger work that contains
part or all of the Bison parser skeleton and distribute that work
@@ -29,7 +28,7 @@
special exception, which will cause the skeleton and the resulting
Bison output files to be licensed under the GNU General Public
License without this special exception.
-
+
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
@@ -47,7 +46,7 @@
#define YYBISON 1
/* Bison version. */
-#define YYBISON_VERSION "2.3"
+#define YYBISON_VERSION "2.4.1"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -55,17 +54,93 @@
/* Pure parsers. */
#define YYPURE 1
+/* Push parsers. */
+#define YYPUSH 0
+
+/* Pull parsers. */
+#define YYPULL 1
+
/* Using locations. */
#define YYLSP_NEEDED 0
/* Substitute the variable and function names. */
-#define yyparse slice_parse
-#define yylex slice_lex
-#define yyerror slice_error
-#define yylval slice_lval
-#define yychar slice_char
-#define yydebug slice_debug
-#define yynerrs slice_nerrs
+#define yyparse slice_parse
+#define yylex slice_lex
+#define yyerror slice_error
+#define yylval slice_lval
+#define yychar slice_char
+#define yydebug slice_debug
+#define yynerrs slice_nerrs
+
+
+/* Copy the first part of user declarations. */
+
+/* Line 189 of yacc.c */
+#line 1 "Grammar.y"
+
+
+// **********************************************************************
+//
+// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#include <Slice/GrammarUtil.h>
+#include <IceUtil/UUID.h>
+#include <cstring>
+
+#ifdef _MSC_VER
+// I get these warnings from some bison versions:
+// warning C4102: 'yyoverflowlab' : unreferenced label
+# pragma warning( disable : 4102 )
+// warning C4065: switch statement contains 'default' but no 'case' labels
+# pragma warning( disable : 4065 )
+#endif
+
+using namespace std;
+using namespace Slice;
+
+void
+slice_error(const char* s)
+{
+ // yacc and recent versions of Bison use "syntax error" instead
+ // of "parse error".
+
+ if (strcmp(s, "parse error") == 0)
+ {
+ unit->error("syntax error");
+ }
+ else
+ {
+ unit->error(s);
+ }
+}
+
+
+
+/* Line 189 of yacc.c */
+#line 126 "y.tab.c"
+
+/* Enabling traces. */
+#ifndef YYDEBUG
+# define YYDEBUG 1
+#endif
+
+/* Enabling verbose error messages. */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 0
+#endif
+
+/* Enabling the token table. */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
+#endif
/* Tokens. */
@@ -163,84 +238,19 @@
-/* Copy the first part of user declarations. */
-#line 1 "Grammar.y"
-
-
-// **********************************************************************
-//
-// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <Slice/GrammarUtil.h>
-#include <IceUtil/UUID.h>
-#include <cstring>
-
-#ifdef _MSC_VER
-// I get these warnings from some bison versions:
-// warning C4102: 'yyoverflowlab' : unreferenced label
-# pragma warning( disable : 4102 )
-// warning C4065: switch statement contains 'default' but no 'case' labels
-# pragma warning( disable : 4065 )
-#endif
-
-using namespace std;
-using namespace Slice;
-
-void
-slice_error(const char* s)
-{
- // yacc and recent versions of Bison use "syntax error" instead
- // of "parse error".
-
- if (strcmp(s, "parse error") == 0)
- {
- unit->error("syntax error");
- }
- else
- {
- unit->error(s);
- }
-}
-
-
-
-/* Enabling traces. */
-#ifndef YYDEBUG
-# define YYDEBUG 1
-#endif
-
-/* Enabling verbose error messages. */
-#ifdef YYERROR_VERBOSE
-# undef YYERROR_VERBOSE
-# define YYERROR_VERBOSE 1
-#else
-# define YYERROR_VERBOSE 0
-#endif
-
-/* Enabling the token table. */
-#ifndef YYTOKEN_TABLE
-# define YYTOKEN_TABLE 0
-#endif
-
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef int YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
-# define YYSTYPE_IS_TRIVIAL 1
#endif
-
/* Copy the second part of user declarations. */
-/* Line 216 of yacc.c. */
-#line 244 "y.tab.c"
+/* Line 264 of yacc.c */
+#line 254 "y.tab.c"
#ifdef short
# undef short
@@ -290,7 +300,7 @@ typedef short int yytype_int16;
#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
#ifndef YY_
-# if defined YYENABLE_NLS && YYENABLE_NLS
+# if YYENABLE_NLS
# if ENABLE_NLS
# include <libintl.h> /* INFRINGES ON USER NAME SPACE */
# define YY_(msgid) dgettext ("bison-runtime", msgid)
@@ -315,14 +325,14 @@ typedef short int yytype_int16;
#if (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
static int
-YYID (int i)
+YYID (int yyi)
#else
static int
-YYID (i)
- int i;
+YYID (yyi)
+ int yyi;
#endif
{
- return i;
+ return yyi;
}
#endif
@@ -403,9 +413,9 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */
/* A type that is properly aligned for any stack member. */
union yyalloc
{
- yytype_int16 yyss;
- YYSTYPE yyvs;
- };
+ yytype_int16 yyss_alloc;
+ YYSTYPE yyvs_alloc;
+};
/* The size of the maximum gap between one aligned stack and the next. */
# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
@@ -439,12 +449,12 @@ union yyalloc
elements in the stack, and YYPTR gives the new location of the
stack. Advance YYPTR to a properly aligned location for the next
stack. */
-# define YYSTACK_RELOCATE(Stack) \
+# define YYSTACK_RELOCATE(Stack_alloc, Stack) \
do \
{ \
YYSIZE_T yynewbytes; \
- YYCOPY (&yyptr->Stack, Stack, yysize); \
- Stack = &yyptr->Stack; \
+ YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \
+ Stack = &yyptr->Stack_alloc; \
yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
yyptr += yynewbytes / sizeof (*yyptr); \
} \
@@ -635,7 +645,7 @@ static const char *const yytname[] =
"ICE_METADATA_OPEN", "ICE_METADATA_CLOSE", "ICE_GLOBAL_METADATA_OPEN",
"ICE_GLOBAL_METADATA_CLOSE", "BAD_CHAR", "';'", "'{'", "'}'", "'='",
"')'", "','", "'<'", "'>'", "'*'", "$accept", "start",
- "global_meta_data", "meta_data", "definitions", "@1", "@2", "@3",
+ "global_meta_data", "meta_data", "definitions", "$@1", "$@2", "$@3",
"definition", "module_def", "@4", "exception_id", "exception_decl",
"exception_def", "@5", "exception_extends", "exception_exports",
"type_id", "exception_export", "struct_id", "struct_decl", "struct_def",
@@ -1081,7 +1091,7 @@ while (YYID (0))
we won't break user code: when these are the locations we know. */
#ifndef YY_LOCATION_PRINT
-# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
+# if YYLTYPE_IS_TRIVIAL
# define YY_LOCATION_PRINT(File, Loc) \
fprintf (File, "%d.%d-%d.%d", \
(Loc).first_line, (Loc).first_column, \
@@ -1192,17 +1202,20 @@ yy_symbol_print (yyoutput, yytype, yyvaluep)
#if (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
static void
-yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
+yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
#else
static void
-yy_stack_print (bottom, top)
- yytype_int16 *bottom;
- yytype_int16 *top;
+yy_stack_print (yybottom, yytop)
+ yytype_int16 *yybottom;
+ yytype_int16 *yytop;
#endif
{
YYFPRINTF (stderr, "Stack now");
- for (; bottom <= top; ++bottom)
- YYFPRINTF (stderr, " %d", *bottom);
+ for (; yybottom <= yytop; yybottom++)
+ {
+ int yybot = *yybottom;
+ YYFPRINTF (stderr, " %d", yybot);
+ }
YYFPRINTF (stderr, "\n");
}
@@ -1236,11 +1249,11 @@ yy_reduce_print (yyvsp, yyrule)
/* The symbols being reduced. */
for (yyi = 0; yyi < yynrhs; yyi++)
{
- fprintf (stderr, " $%d = ", yyi + 1);
+ YYFPRINTF (stderr, " $%d = ", yyi + 1);
yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
&(yyvsp[(yyi + 1) - (yynrhs)])
);
- fprintf (stderr, "\n");
+ YYFPRINTF (stderr, "\n");
}
}
@@ -1520,10 +1533,8 @@ yydestruct (yymsg, yytype, yyvaluep)
break;
}
}
-
/* Prevent warnings from -Wmissing-prototypes. */
-
#ifdef YYPARSE_PARAM
#if defined __STDC__ || defined __cplusplus
int yyparse (void *YYPARSE_PARAM);
@@ -1542,10 +1553,9 @@ int yyparse ();
-
-/*----------.
-| yyparse. |
-`----------*/
+/*-------------------------.
+| yyparse or yypush_parse. |
+`-------------------------*/
#ifdef YYPARSE_PARAM
#if (defined __STDC__ || defined __C99__FUNC__ \
@@ -1569,74 +1579,75 @@ yyparse ()
#endif
#endif
{
- /* The look-ahead symbol. */
+/* The lookahead symbol. */
int yychar;
-/* The semantic value of the look-ahead symbol. */
+/* The semantic value of the lookahead symbol. */
YYSTYPE yylval;
-/* Number of syntax errors so far. */
-int yynerrs;
+ /* Number of syntax errors so far. */
+ int yynerrs;
- int yystate;
- int yyn;
- int yyresult;
- /* Number of tokens to shift before error messages enabled. */
- int yyerrstatus;
- /* Look-ahead token as an internal (translated) token number. */
- int yytoken = 0;
-#if YYERROR_VERBOSE
- /* Buffer for error messages, and its allocated size. */
- char yymsgbuf[128];
- char *yymsg = yymsgbuf;
- YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
-#endif
-
- /* Three stacks and their tools:
- `yyss': related to states,
- `yyvs': related to semantic values,
- `yyls': related to locations.
-
- Refer to the stacks thru separate pointers, to allow yyoverflow
- to reallocate them elsewhere. */
+ int yystate;
+ /* Number of tokens to shift before error messages enabled. */
+ int yyerrstatus;
- /* The state stack. */
- yytype_int16 yyssa[YYINITDEPTH];
- yytype_int16 *yyss = yyssa;
- yytype_int16 *yyssp;
+ /* The stacks and their tools:
+ `yyss': related to states.
+ `yyvs': related to semantic values.
- /* The semantic value stack. */
- YYSTYPE yyvsa[YYINITDEPTH];
- YYSTYPE *yyvs = yyvsa;
- YYSTYPE *yyvsp;
+ Refer to the stacks thru separate pointers, to allow yyoverflow
+ to reallocate them elsewhere. */
+ /* The state stack. */
+ yytype_int16 yyssa[YYINITDEPTH];
+ yytype_int16 *yyss;
+ yytype_int16 *yyssp;
+ /* The semantic value stack. */
+ YYSTYPE yyvsa[YYINITDEPTH];
+ YYSTYPE *yyvs;
+ YYSTYPE *yyvsp;
-#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N))
-
- YYSIZE_T yystacksize = YYINITDEPTH;
+ YYSIZE_T yystacksize;
+ int yyn;
+ int yyresult;
+ /* Lookahead token as an internal (translated) token number. */
+ int yytoken;
/* The variables used to return semantic value and location from the
action routines. */
YYSTYPE yyval;
+#if YYERROR_VERBOSE
+ /* Buffer for error messages, and its allocated size. */
+ char yymsgbuf[128];
+ char *yymsg = yymsgbuf;
+ YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
+
+#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N))
/* The number of symbols on the RHS of the reduced rule.
Keep to zero when no symbol should be popped. */
int yylen = 0;
+ yytoken = 0;
+ yyss = yyssa;
+ yyvs = yyvsa;
+ yystacksize = YYINITDEPTH;
+
YYDPRINTF ((stderr, "Starting parse\n"));
yystate = 0;
yyerrstatus = 0;
yynerrs = 0;
- yychar = YYEMPTY; /* Cause a token to be read. */
+ yychar = YYEMPTY; /* Cause a token to be read. */
/* Initialize stack pointers.
Waste one element of value and location stack
so that they stay on the same level as the state stack.
The wasted elements are never initialized. */
-
yyssp = yyss;
yyvsp = yyvs;
@@ -1666,7 +1677,6 @@ int yynerrs;
YYSTYPE *yyvs1 = yyvs;
yytype_int16 *yyss1 = yyss;
-
/* Each stack pointer address is followed by the size of the
data in use in that stack, in bytes. This used to be a
conditional around just the two extra args, but that might
@@ -1674,7 +1684,6 @@ int yynerrs;
yyoverflow (YY_("memory exhausted"),
&yyss1, yysize * sizeof (*yyssp),
&yyvs1, yysize * sizeof (*yyvsp),
-
&yystacksize);
yyss = yyss1;
@@ -1697,9 +1706,8 @@ int yynerrs;
(union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
if (! yyptr)
goto yyexhaustedlab;
- YYSTACK_RELOCATE (yyss);
- YYSTACK_RELOCATE (yyvs);
-
+ YYSTACK_RELOCATE (yyss_alloc, yyss);
+ YYSTACK_RELOCATE (yyvs_alloc, yyvs);
# undef YYSTACK_RELOCATE
if (yyss1 != yyssa)
YYSTACK_FREE (yyss1);
@@ -1710,7 +1718,6 @@ int yynerrs;
yyssp = yyss + yysize - 1;
yyvsp = yyvs + yysize - 1;
-
YYDPRINTF ((stderr, "Stack size increased to %lu\n",
(unsigned long int) yystacksize));
@@ -1720,6 +1727,9 @@ int yynerrs;
YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+ if (yystate == YYFINAL)
+ YYACCEPT;
+
goto yybackup;
/*-----------.
@@ -1728,16 +1738,16 @@ int yynerrs;
yybackup:
/* Do appropriate processing given the current state. Read a
- look-ahead token if we need one and don't already have one. */
+ lookahead token if we need one and don't already have one. */
- /* First try to decide what to do without reference to look-ahead token. */
+ /* First try to decide what to do without reference to lookahead token. */
yyn = yypact[yystate];
if (yyn == YYPACT_NINF)
goto yydefault;
- /* Not known => get a look-ahead token if don't already have one. */
+ /* Not known => get a lookahead token if don't already have one. */
- /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */
+ /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */
if (yychar == YYEMPTY)
{
YYDPRINTF ((stderr, "Reading a token: "));
@@ -1769,20 +1779,16 @@ yybackup:
goto yyreduce;
}
- if (yyn == YYFINAL)
- YYACCEPT;
-
/* Count tokens shifted since error; after three, turn off error
status. */
if (yyerrstatus)
yyerrstatus--;
- /* Shift the look-ahead token. */
+ /* Shift the lookahead token. */
YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
- /* Discard the shifted token unless it is eof. */
- if (yychar != YYEOF)
- yychar = YYEMPTY;
+ /* Discard the shifted token. */
+ yychar = YYEMPTY;
yystate = yyn;
*++yyvsp = yylval;
@@ -1822,12 +1828,16 @@ yyreduce:
switch (yyn)
{
case 2:
+
+/* Line 1455 of yacc.c */
#line 106 "Grammar.y"
{
}
break;
case 3:
+
+/* Line 1455 of yacc.c */
#line 114 "Grammar.y"
{
(yyval) = (yyvsp[(2) - (3)]);
@@ -1835,6 +1845,8 @@ yyreduce:
break;
case 4:
+
+/* Line 1455 of yacc.c */
#line 123 "Grammar.y"
{
(yyval) = (yyvsp[(2) - (3)]);
@@ -1842,6 +1854,8 @@ yyreduce:
break;
case 5:
+
+/* Line 1455 of yacc.c */
#line 127 "Grammar.y"
{
(yyval) = new StringListTok;
@@ -1849,6 +1863,8 @@ yyreduce:
break;
case 6:
+
+/* Line 1455 of yacc.c */
#line 136 "Grammar.y"
{
StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(1) - (1)]));
@@ -1860,6 +1876,8 @@ yyreduce:
break;
case 8:
+
+/* Line 1455 of yacc.c */
#line 145 "Grammar.y"
{
StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(1) - (2)]));
@@ -1872,6 +1890,8 @@ yyreduce:
break;
case 10:
+
+/* Line 1455 of yacc.c */
#line 155 "Grammar.y"
{
yyerrok;
@@ -1879,6 +1899,8 @@ yyreduce:
break;
case 12:
+
+/* Line 1455 of yacc.c */
#line 160 "Grammar.y"
{
unit->error("`;' missing after definition");
@@ -1886,12 +1908,16 @@ yyreduce:
break;
case 13:
+
+/* Line 1455 of yacc.c */
#line 164 "Grammar.y"
{
}
break;
case 14:
+
+/* Line 1455 of yacc.c */
#line 172 "Grammar.y"
{
assert((yyvsp[(1) - (1)]) == 0 || ModulePtr::dynamicCast((yyvsp[(1) - (1)])));
@@ -1899,6 +1925,8 @@ yyreduce:
break;
case 15:
+
+/* Line 1455 of yacc.c */
#line 176 "Grammar.y"
{
assert((yyvsp[(1) - (1)]) == 0 || ClassDeclPtr::dynamicCast((yyvsp[(1) - (1)])));
@@ -1906,6 +1934,8 @@ yyreduce:
break;
case 16:
+
+/* Line 1455 of yacc.c */
#line 180 "Grammar.y"
{
assert((yyvsp[(1) - (1)]) == 0 || ClassDefPtr::dynamicCast((yyvsp[(1) - (1)])));
@@ -1913,6 +1943,8 @@ yyreduce:
break;
case 17:
+
+/* Line 1455 of yacc.c */
#line 184 "Grammar.y"
{
assert((yyvsp[(1) - (1)]) == 0 || ClassDeclPtr::dynamicCast((yyvsp[(1) - (1)])));
@@ -1920,6 +1952,8 @@ yyreduce:
break;
case 18:
+
+/* Line 1455 of yacc.c */
#line 188 "Grammar.y"
{
assert((yyvsp[(1) - (1)]) == 0 || ClassDefPtr::dynamicCast((yyvsp[(1) - (1)])));
@@ -1927,6 +1961,8 @@ yyreduce:
break;
case 19:
+
+/* Line 1455 of yacc.c */
#line 192 "Grammar.y"
{
assert((yyvsp[(1) - (1)]) == 0);
@@ -1934,6 +1970,8 @@ yyreduce:
break;
case 20:
+
+/* Line 1455 of yacc.c */
#line 196 "Grammar.y"
{
assert((yyvsp[(1) - (1)]) == 0 || ExceptionPtr::dynamicCast((yyvsp[(1) - (1)])));
@@ -1941,6 +1979,8 @@ yyreduce:
break;
case 21:
+
+/* Line 1455 of yacc.c */
#line 200 "Grammar.y"
{
assert((yyvsp[(1) - (1)]) == 0);
@@ -1948,6 +1988,8 @@ yyreduce:
break;
case 22:
+
+/* Line 1455 of yacc.c */
#line 204 "Grammar.y"
{
assert((yyvsp[(1) - (1)]) == 0 || StructPtr::dynamicCast((yyvsp[(1) - (1)])));
@@ -1955,6 +1997,8 @@ yyreduce:
break;
case 23:
+
+/* Line 1455 of yacc.c */
#line 208 "Grammar.y"
{
assert((yyvsp[(1) - (1)]) == 0 || SequencePtr::dynamicCast((yyvsp[(1) - (1)])));
@@ -1962,6 +2006,8 @@ yyreduce:
break;
case 24:
+
+/* Line 1455 of yacc.c */
#line 212 "Grammar.y"
{
assert((yyvsp[(1) - (1)]) == 0 || DictionaryPtr::dynamicCast((yyvsp[(1) - (1)])));
@@ -1969,6 +2015,8 @@ yyreduce:
break;
case 25:
+
+/* Line 1455 of yacc.c */
#line 216 "Grammar.y"
{
assert((yyvsp[(1) - (1)]) == 0 || EnumPtr::dynamicCast((yyvsp[(1) - (1)])));
@@ -1976,6 +2024,8 @@ yyreduce:
break;
case 26:
+
+/* Line 1455 of yacc.c */
#line 220 "Grammar.y"
{
assert((yyvsp[(1) - (1)]) == 0 || ConstPtr::dynamicCast((yyvsp[(1) - (1)])));
@@ -1983,6 +2033,8 @@ yyreduce:
break;
case 27:
+
+/* Line 1455 of yacc.c */
#line 229 "Grammar.y"
{
unit->setSeenDefinition();
@@ -2003,6 +2055,8 @@ yyreduce:
break;
case 28:
+
+/* Line 1455 of yacc.c */
#line 246 "Grammar.y"
{
if((yyvsp[(3) - (6)]))
@@ -2018,6 +2072,8 @@ yyreduce:
break;
case 29:
+
+/* Line 1455 of yacc.c */
#line 263 "Grammar.y"
{
(yyval) = (yyvsp[(2) - (2)]);
@@ -2025,6 +2081,8 @@ yyreduce:
break;
case 30:
+
+/* Line 1455 of yacc.c */
#line 267 "Grammar.y"
{
StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
@@ -2034,6 +2092,8 @@ yyreduce:
break;
case 31:
+
+/* Line 1455 of yacc.c */
#line 278 "Grammar.y"
{
unit->error("exceptions cannot be forward declared");
@@ -2042,6 +2102,8 @@ yyreduce:
break;
case 32:
+
+/* Line 1455 of yacc.c */
#line 288 "Grammar.y"
{
IntegerTokPtr qual = IntegerTokPtr::dynamicCast((yyvsp[(1) - (3)]));
@@ -2059,6 +2121,8 @@ yyreduce:
break;
case 33:
+
+/* Line 1455 of yacc.c */
#line 302 "Grammar.y"
{
if((yyvsp[(4) - (7)]))
@@ -2070,6 +2134,8 @@ yyreduce:
break;
case 34:
+
+/* Line 1455 of yacc.c */
#line 315 "Grammar.y"
{
StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
@@ -2081,6 +2147,8 @@ yyreduce:
break;
case 35:
+
+/* Line 1455 of yacc.c */
#line 323 "Grammar.y"
{
(yyval) = 0;
@@ -2088,6 +2156,8 @@ yyreduce:
break;
case 36:
+
+/* Line 1455 of yacc.c */
#line 332 "Grammar.y"
{
StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(1) - (4)]));
@@ -2100,12 +2170,16 @@ yyreduce:
break;
case 37:
+
+/* Line 1455 of yacc.c */
#line 341 "Grammar.y"
{
}
break;
case 38:
+
+/* Line 1455 of yacc.c */
#line 344 "Grammar.y"
{
unit->error("`;' missing after definition");
@@ -2113,12 +2187,16 @@ yyreduce:
break;
case 39:
+
+/* Line 1455 of yacc.c */
#line 348 "Grammar.y"
{
}
break;
case 40:
+
+/* Line 1455 of yacc.c */
#line 356 "Grammar.y"
{
TypePtr type = TypePtr::dynamicCast((yyvsp[(1) - (2)]));
@@ -2130,6 +2208,8 @@ yyreduce:
break;
case 42:
+
+/* Line 1455 of yacc.c */
#line 375 "Grammar.y"
{
(yyval) = (yyvsp[(2) - (2)]);
@@ -2137,6 +2217,8 @@ yyreduce:
break;
case 43:
+
+/* Line 1455 of yacc.c */
#line 379 "Grammar.y"
{
StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
@@ -2146,6 +2228,8 @@ yyreduce:
break;
case 44:
+
+/* Line 1455 of yacc.c */
#line 390 "Grammar.y"
{
unit->error("structs cannot be forward declared");
@@ -2154,6 +2238,8 @@ yyreduce:
break;
case 45:
+
+/* Line 1455 of yacc.c */
#line 400 "Grammar.y"
{
BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (2)]));
@@ -2170,6 +2256,8 @@ yyreduce:
break;
case 46:
+
+/* Line 1455 of yacc.c */
#line 413 "Grammar.y"
{
if((yyvsp[(3) - (6)]))
@@ -2191,6 +2279,8 @@ yyreduce:
break;
case 47:
+
+/* Line 1455 of yacc.c */
#line 436 "Grammar.y"
{
StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(1) - (4)]));
@@ -2203,12 +2293,16 @@ yyreduce:
break;
case 48:
+
+/* Line 1455 of yacc.c */
#line 445 "Grammar.y"
{
}
break;
case 49:
+
+/* Line 1455 of yacc.c */
#line 448 "Grammar.y"
{
unit->error("`;' missing after definition");
@@ -2216,12 +2310,16 @@ yyreduce:
break;
case 50:
+
+/* Line 1455 of yacc.c */
#line 452 "Grammar.y"
{
}
break;
case 52:
+
+/* Line 1455 of yacc.c */
#line 466 "Grammar.y"
{
(yyval) = (yyvsp[(2) - (2)]);
@@ -2229,6 +2327,8 @@ yyreduce:
break;
case 53:
+
+/* Line 1455 of yacc.c */
#line 470 "Grammar.y"
{
StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
@@ -2238,6 +2338,8 @@ yyreduce:
break;
case 54:
+
+/* Line 1455 of yacc.c */
#line 481 "Grammar.y"
{
IntegerTokPtr qual = IntegerTokPtr::dynamicCast((yyvsp[(1) - (2)]));
@@ -2249,6 +2351,8 @@ yyreduce:
break;
case 55:
+
+/* Line 1455 of yacc.c */
#line 494 "Grammar.y"
{
IntegerTokPtr qual = IntegerTokPtr::dynamicCast((yyvsp[(1) - (4)]));
@@ -2275,6 +2379,8 @@ yyreduce:
break;
case 56:
+
+/* Line 1455 of yacc.c */
#line 517 "Grammar.y"
{
if((yyvsp[(5) - (8)]))
@@ -2290,6 +2396,8 @@ yyreduce:
break;
case 57:
+
+/* Line 1455 of yacc.c */
#line 534 "Grammar.y"
{
StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
@@ -2327,6 +2435,8 @@ yyreduce:
break;
case 58:
+
+/* Line 1455 of yacc.c */
#line 568 "Grammar.y"
{
(yyval) = 0;
@@ -2334,6 +2444,8 @@ yyreduce:
break;
case 59:
+
+/* Line 1455 of yacc.c */
#line 577 "Grammar.y"
{
(yyval) = (yyvsp[(2) - (2)]);
@@ -2341,6 +2453,8 @@ yyreduce:
break;
case 60:
+
+/* Line 1455 of yacc.c */
#line 581 "Grammar.y"
{
(yyval) = new ClassListTok;
@@ -2348,6 +2462,8 @@ yyreduce:
break;
case 61:
+
+/* Line 1455 of yacc.c */
#line 590 "Grammar.y"
{
StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(1) - (4)]));
@@ -2360,12 +2476,16 @@ yyreduce:
break;
case 62:
+
+/* Line 1455 of yacc.c */
#line 599 "Grammar.y"
{
}
break;
case 63:
+
+/* Line 1455 of yacc.c */
#line 602 "Grammar.y"
{
unit->error("`;' missing after definition");
@@ -2373,12 +2493,16 @@ yyreduce:
break;
case 64:
+
+/* Line 1455 of yacc.c */
#line 606 "Grammar.y"
{
}
break;
case 65:
+
+/* Line 1455 of yacc.c */
#line 614 "Grammar.y"
{
TypePtr type = TypeStringTokPtr::dynamicCast((yyvsp[(1) - (1)]))->v.first;
@@ -2405,6 +2529,8 @@ yyreduce:
break;
case 66:
+
+/* Line 1455 of yacc.c */
#line 637 "Grammar.y"
{
TypePtr type = TypeStringTokPtr::dynamicCast((yyvsp[(1) - (3)]))->v.first;
@@ -2435,6 +2561,8 @@ yyreduce:
break;
case 67:
+
+/* Line 1455 of yacc.c */
#line 664 "Grammar.y"
{
TypePtr type = TypePtr::dynamicCast((yyvsp[(1) - (2)]));
@@ -2460,6 +2588,8 @@ yyreduce:
break;
case 68:
+
+/* Line 1455 of yacc.c */
#line 686 "Grammar.y"
{
TypePtr type = TypePtr::dynamicCast((yyvsp[(1) - (1)]));
@@ -2484,6 +2614,8 @@ yyreduce:
break;
case 70:
+
+/* Line 1455 of yacc.c */
#line 713 "Grammar.y"
{
(yyval) = 0;
@@ -2491,6 +2623,8 @@ yyreduce:
break;
case 71:
+
+/* Line 1455 of yacc.c */
#line 722 "Grammar.y"
{
TypePtr returnType = TypePtr::dynamicCast((yyvsp[(1) - (2)]));
@@ -2518,6 +2652,8 @@ yyreduce:
break;
case 72:
+
+/* Line 1455 of yacc.c */
#line 746 "Grammar.y"
{
TypePtr returnType = TypePtr::dynamicCast((yyvsp[(2) - (3)]));
@@ -2545,6 +2681,8 @@ yyreduce:
break;
case 73:
+
+/* Line 1455 of yacc.c */
#line 770 "Grammar.y"
{
TypePtr returnType = TypePtr::dynamicCast((yyvsp[(1) - (2)]));
@@ -2572,6 +2710,8 @@ yyreduce:
break;
case 74:
+
+/* Line 1455 of yacc.c */
#line 794 "Grammar.y"
{
TypePtr returnType = TypePtr::dynamicCast((yyvsp[(2) - (3)]));
@@ -2599,6 +2739,8 @@ yyreduce:
break;
case 75:
+
+/* Line 1455 of yacc.c */
#line 823 "Grammar.y"
{
if((yyvsp[(1) - (3)]))
@@ -2614,6 +2756,8 @@ yyreduce:
break;
case 76:
+
+/* Line 1455 of yacc.c */
#line 835 "Grammar.y"
{
OperationPtr op = OperationPtr::dynamicCast((yyvsp[(4) - (5)]));
@@ -2627,6 +2771,8 @@ yyreduce:
break;
case 77:
+
+/* Line 1455 of yacc.c */
#line 845 "Grammar.y"
{
if((yyvsp[(1) - (3)]))
@@ -2638,6 +2784,8 @@ yyreduce:
break;
case 78:
+
+/* Line 1455 of yacc.c */
#line 853 "Grammar.y"
{
OperationPtr op = OperationPtr::dynamicCast((yyvsp[(4) - (5)]));
@@ -2651,6 +2799,8 @@ yyreduce:
break;
case 81:
+
+/* Line 1455 of yacc.c */
#line 875 "Grammar.y"
{
(yyval) = (yyvsp[(2) - (2)]);
@@ -2658,6 +2808,8 @@ yyreduce:
break;
case 82:
+
+/* Line 1455 of yacc.c */
#line 879 "Grammar.y"
{
StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
@@ -2667,6 +2819,8 @@ yyreduce:
break;
case 83:
+
+/* Line 1455 of yacc.c */
#line 890 "Grammar.y"
{
BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (2)]));
@@ -2679,6 +2833,8 @@ yyreduce:
break;
case 84:
+
+/* Line 1455 of yacc.c */
#line 904 "Grammar.y"
{
BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (3)]));
@@ -2700,6 +2856,8 @@ yyreduce:
break;
case 85:
+
+/* Line 1455 of yacc.c */
#line 922 "Grammar.y"
{
if((yyvsp[(4) - (7)]))
@@ -2715,6 +2873,8 @@ yyreduce:
break;
case 86:
+
+/* Line 1455 of yacc.c */
#line 939 "Grammar.y"
{
ClassListTokPtr intfs = ClassListTokPtr::dynamicCast((yyvsp[(3) - (3)]));
@@ -2753,6 +2913,8 @@ yyreduce:
break;
case 87:
+
+/* Line 1455 of yacc.c */
#line 974 "Grammar.y"
{
ClassListTokPtr intfs = new ClassListTok;
@@ -2791,6 +2953,8 @@ yyreduce:
break;
case 88:
+
+/* Line 1455 of yacc.c */
#line 1009 "Grammar.y"
{
unit->error("illegal inheritance from type Object");
@@ -2799,6 +2963,8 @@ yyreduce:
break;
case 89:
+
+/* Line 1455 of yacc.c */
#line 1019 "Grammar.y"
{
(yyval) = (yyvsp[(2) - (2)]);
@@ -2806,6 +2972,8 @@ yyreduce:
break;
case 90:
+
+/* Line 1455 of yacc.c */
#line 1023 "Grammar.y"
{
(yyval) = new ClassListTok;
@@ -2813,6 +2981,8 @@ yyreduce:
break;
case 91:
+
+/* Line 1455 of yacc.c */
#line 1032 "Grammar.y"
{
StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(1) - (4)]));
@@ -2825,12 +2995,16 @@ yyreduce:
break;
case 92:
+
+/* Line 1455 of yacc.c */
#line 1041 "Grammar.y"
{
}
break;
case 93:
+
+/* Line 1455 of yacc.c */
#line 1044 "Grammar.y"
{
unit->error("`;' missing after definition");
@@ -2838,12 +3012,16 @@ yyreduce:
break;
case 94:
+
+/* Line 1455 of yacc.c */
#line 1048 "Grammar.y"
{
}
break;
case 96:
+
+/* Line 1455 of yacc.c */
#line 1062 "Grammar.y"
{
ExceptionPtr exception = ExceptionPtr::dynamicCast((yyvsp[(1) - (3)]));
@@ -2854,6 +3032,8 @@ yyreduce:
break;
case 97:
+
+/* Line 1455 of yacc.c */
#line 1069 "Grammar.y"
{
ExceptionPtr exception = ExceptionPtr::dynamicCast((yyvsp[(1) - (1)]));
@@ -2864,6 +3044,8 @@ yyreduce:
break;
case 98:
+
+/* Line 1455 of yacc.c */
#line 1081 "Grammar.y"
{
StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
@@ -2879,6 +3061,8 @@ yyreduce:
break;
case 99:
+
+/* Line 1455 of yacc.c */
#line 1093 "Grammar.y"
{
StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
@@ -2888,6 +3072,8 @@ yyreduce:
break;
case 100:
+
+/* Line 1455 of yacc.c */
#line 1104 "Grammar.y"
{
BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (7)]));
@@ -2900,6 +3086,8 @@ yyreduce:
break;
case 101:
+
+/* Line 1455 of yacc.c */
#line 1113 "Grammar.y"
{
BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (7)]));
@@ -2913,6 +3101,8 @@ yyreduce:
break;
case 102:
+
+/* Line 1455 of yacc.c */
#line 1128 "Grammar.y"
{
BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (10)]));
@@ -2927,6 +3117,8 @@ yyreduce:
break;
case 103:
+
+/* Line 1455 of yacc.c */
#line 1139 "Grammar.y"
{
BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (10)]));
@@ -2942,6 +3134,8 @@ yyreduce:
break;
case 104:
+
+/* Line 1455 of yacc.c */
#line 1156 "Grammar.y"
{
(yyval) = (yyvsp[(2) - (2)]);
@@ -2949,6 +3143,8 @@ yyreduce:
break;
case 105:
+
+/* Line 1455 of yacc.c */
#line 1160 "Grammar.y"
{
StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
@@ -2958,6 +3154,8 @@ yyreduce:
break;
case 106:
+
+/* Line 1455 of yacc.c */
#line 1171 "Grammar.y"
{
BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (2)]));
@@ -2970,6 +3168,8 @@ yyreduce:
break;
case 107:
+
+/* Line 1455 of yacc.c */
#line 1180 "Grammar.y"
{
EnumPtr en = EnumPtr::dynamicCast((yyvsp[(3) - (6)]));
@@ -2987,6 +3187,8 @@ yyreduce:
break;
case 108:
+
+/* Line 1455 of yacc.c */
#line 1195 "Grammar.y"
{
unit->error("missing enumeration name");
@@ -3000,6 +3202,8 @@ yyreduce:
break;
case 109:
+
+/* Line 1455 of yacc.c */
#line 1210 "Grammar.y"
{
EnumeratorListTokPtr ens = EnumeratorListTokPtr::dynamicCast((yyvsp[(1) - (3)]));
@@ -3009,12 +3213,16 @@ yyreduce:
break;
case 110:
+
+/* Line 1455 of yacc.c */
#line 1216 "Grammar.y"
{
}
break;
case 111:
+
+/* Line 1455 of yacc.c */
#line 1224 "Grammar.y"
{
StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
@@ -3030,6 +3238,8 @@ yyreduce:
break;
case 112:
+
+/* Line 1455 of yacc.c */
#line 1236 "Grammar.y"
{
StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
@@ -3040,6 +3250,8 @@ yyreduce:
break;
case 113:
+
+/* Line 1455 of yacc.c */
#line 1243 "Grammar.y"
{
EnumeratorListTokPtr ens = new EnumeratorListTok;
@@ -3048,6 +3260,8 @@ yyreduce:
break;
case 114:
+
+/* Line 1455 of yacc.c */
#line 1253 "Grammar.y"
{
BoolTokPtr out = new BoolTok;
@@ -3057,6 +3271,8 @@ yyreduce:
break;
case 115:
+
+/* Line 1455 of yacc.c */
#line 1259 "Grammar.y"
{
BoolTokPtr out = new BoolTok;
@@ -3066,12 +3282,16 @@ yyreduce:
break;
case 116:
+
+/* Line 1455 of yacc.c */
#line 1270 "Grammar.y"
{
}
break;
case 117:
+
+/* Line 1455 of yacc.c */
#line 1273 "Grammar.y"
{
BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[(1) - (3)]));
@@ -3093,6 +3313,8 @@ yyreduce:
break;
case 118:
+
+/* Line 1455 of yacc.c */
#line 1291 "Grammar.y"
{
BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[(3) - (5)]));
@@ -3114,6 +3336,8 @@ yyreduce:
break;
case 119:
+
+/* Line 1455 of yacc.c */
#line 1309 "Grammar.y"
{
BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[(1) - (4)]));
@@ -3129,6 +3353,8 @@ yyreduce:
break;
case 120:
+
+/* Line 1455 of yacc.c */
#line 1321 "Grammar.y"
{
BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[(3) - (6)]));
@@ -3144,6 +3370,8 @@ yyreduce:
break;
case 121:
+
+/* Line 1455 of yacc.c */
#line 1333 "Grammar.y"
{
BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[(1) - (3)]));
@@ -3158,6 +3386,8 @@ yyreduce:
break;
case 122:
+
+/* Line 1455 of yacc.c */
#line 1344 "Grammar.y"
{
BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[(3) - (5)]));
@@ -3172,6 +3402,8 @@ yyreduce:
break;
case 123:
+
+/* Line 1455 of yacc.c */
#line 1360 "Grammar.y"
{
(yyval) = (yyvsp[(2) - (2)]);
@@ -3179,6 +3411,8 @@ yyreduce:
break;
case 124:
+
+/* Line 1455 of yacc.c */
#line 1364 "Grammar.y"
{
(yyval) = new ExceptionListTok;
@@ -3186,12 +3420,16 @@ yyreduce:
break;
case 125:
+
+/* Line 1455 of yacc.c */
#line 1373 "Grammar.y"
{
}
break;
case 126:
+
+/* Line 1455 of yacc.c */
#line 1376 "Grammar.y"
{
StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
@@ -3201,6 +3439,8 @@ yyreduce:
break;
case 127:
+
+/* Line 1455 of yacc.c */
#line 1382 "Grammar.y"
{
StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(1) - (3)]));
@@ -3212,6 +3452,8 @@ yyreduce:
break;
case 128:
+
+/* Line 1455 of yacc.c */
#line 1395 "Grammar.y"
{
(yyval) = unit->builtin(Builtin::KindByte);
@@ -3219,6 +3461,8 @@ yyreduce:
break;
case 129:
+
+/* Line 1455 of yacc.c */
#line 1399 "Grammar.y"
{
(yyval) = unit->builtin(Builtin::KindBool);
@@ -3226,6 +3470,8 @@ yyreduce:
break;
case 130:
+
+/* Line 1455 of yacc.c */
#line 1403 "Grammar.y"
{
(yyval) = unit->builtin(Builtin::KindShort);
@@ -3233,6 +3479,8 @@ yyreduce:
break;
case 131:
+
+/* Line 1455 of yacc.c */
#line 1407 "Grammar.y"
{
(yyval) = unit->builtin(Builtin::KindInt);
@@ -3240,6 +3488,8 @@ yyreduce:
break;
case 132:
+
+/* Line 1455 of yacc.c */
#line 1411 "Grammar.y"
{
(yyval) = unit->builtin(Builtin::KindLong);
@@ -3247,6 +3497,8 @@ yyreduce:
break;
case 133:
+
+/* Line 1455 of yacc.c */
#line 1415 "Grammar.y"
{
(yyval) = unit->builtin(Builtin::KindFloat);
@@ -3254,6 +3506,8 @@ yyreduce:
break;
case 134:
+
+/* Line 1455 of yacc.c */
#line 1419 "Grammar.y"
{
(yyval) = unit->builtin(Builtin::KindDouble);
@@ -3261,6 +3515,8 @@ yyreduce:
break;
case 135:
+
+/* Line 1455 of yacc.c */
#line 1423 "Grammar.y"
{
(yyval) = unit->builtin(Builtin::KindString);
@@ -3268,6 +3524,8 @@ yyreduce:
break;
case 136:
+
+/* Line 1455 of yacc.c */
#line 1427 "Grammar.y"
{
(yyval) = unit->builtin(Builtin::KindObject);
@@ -3275,6 +3533,8 @@ yyreduce:
break;
case 137:
+
+/* Line 1455 of yacc.c */
#line 1431 "Grammar.y"
{
(yyval) = unit->builtin(Builtin::KindObjectProxy);
@@ -3282,6 +3542,8 @@ yyreduce:
break;
case 138:
+
+/* Line 1455 of yacc.c */
#line 1435 "Grammar.y"
{
(yyval) = unit->builtin(Builtin::KindLocalObject);
@@ -3289,6 +3551,8 @@ yyreduce:
break;
case 139:
+
+/* Line 1455 of yacc.c */
#line 1439 "Grammar.y"
{
StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
@@ -3311,6 +3575,8 @@ yyreduce:
break;
case 140:
+
+/* Line 1455 of yacc.c */
#line 1458 "Grammar.y"
{
StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(1) - (2)]));
@@ -3350,6 +3616,8 @@ yyreduce:
break;
case 141:
+
+/* Line 1455 of yacc.c */
#line 1499 "Grammar.y"
{
StringTokPtr str1 = StringTokPtr::dynamicCast((yyvsp[(1) - (2)]));
@@ -3359,12 +3627,16 @@ yyreduce:
break;
case 142:
+
+/* Line 1455 of yacc.c */
#line 1505 "Grammar.y"
{
}
break;
case 143:
+
+/* Line 1455 of yacc.c */
#line 1513 "Grammar.y"
{
StringTokPtr str = StringTokPtr::dynamicCast((yyvsp[(3) - (3)]));
@@ -3375,6 +3647,8 @@ yyreduce:
break;
case 144:
+
+/* Line 1455 of yacc.c */
#line 1520 "Grammar.y"
{
StringTokPtr str = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
@@ -3385,6 +3659,8 @@ yyreduce:
break;
... 3313 lines suppressed ...
--
asterisk-scf/integration/ice.git
More information about the asterisk-scf-commits
mailing list