--- parser3/src/main/compile.tab.C 2008/07/23 09:55:05 1.121
+++ parser3/src/main/compile.tab.C 2012/03/16 09:24:12 1.154
@@ -1,30 +1,39 @@
-/* A Bison parser, made by GNU Bison 1.875d. */
-/* Skeleton parser for Yacc-like parsing with Bison,
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+/* A Bison parser, made by GNU Bison 2.4.1. */
- This program is free software; you can redistribute it and/or modify
+/* 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
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., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
-
-/* As a special exception, when this file is copied by Bison into a
- Bison output file, you may use that output file without restriction.
- This special exception was added by the Free Software Foundation
- in version 1.24 of Bison. */
+ along with this program. If not, see . */
+
+/* As a special exception, you may create a larger work that contains
+ part or all of the Bison parser skeleton and distribute that work
+ under terms of your choice, so long as that work isn't itself a
+ parser generator using the skeleton or a modified version thereof
+ as a parser skeleton. Alternatively, if you modify or redistribute
+ the parser skeleton itself, you may (at your option) remove this
+ 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. */
-/* Written by Richard Stallman by simplifying the original so called
- ``semantic'' parser. */
+/* C LALR(1) parser skeleton written by Richard Stallman, by
+ simplifying the original so-called "semantic" parser. */
/* All symbols defined below should begin with yy or YY, to avoid
infringing on user name space. This should be done even for local
@@ -36,105 +45,42 @@
/* Identify Bison output. */
#define YYBISON 1
+/* Bison version. */
+#define YYBISON_VERSION "2.4.1"
+
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
/* Pure parsers. */
#define YYPURE 1
-/* Using locations. */
-#define YYLSP_NEEDED 0
-
+/* Push parsers. */
+#define YYPUSH 0
+/* Pull parsers. */
+#define YYPULL 1
-/* Tokens. */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
- /* Put the tokens into the symbol table, so that GDB and other debuggers
- know about them. */
- enum yytokentype {
- EON = 258,
- STRING = 259,
- BOGUS = 260,
- BAD_STRING_COMPARISON_OPERATOR = 261,
- BAD_HEX_LITERAL = 262,
- BAD_METHOD_DECL_START = 263,
- BAD_METHOD_PARAMETER_NAME_CHARACTER = 264,
- BAD_NONWHITESPACE_CHARACTER_IN_EXPLICIT_RESULT_MODE = 265,
- LAND = 266,
- LOR = 267,
- LXOR = 268,
- NXOR = 269,
- NLE = 270,
- NGE = 271,
- NEQ = 272,
- NNE = 273,
- NSL = 274,
- NSR = 275,
- SLT = 276,
- SGT = 277,
- SLE = 278,
- SGE = 279,
- SEQ = 280,
- SNE = 281,
- DEF = 282,
- IN = 283,
- FEXISTS = 284,
- DEXISTS = 285,
- IS = 286,
- LITERAL_TRUE = 287,
- LITERAL_FALSE = 288,
- NUNARY = 289
- };
-#endif
-#define EON 258
-#define STRING 259
-#define BOGUS 260
-#define BAD_STRING_COMPARISON_OPERATOR 261
-#define BAD_HEX_LITERAL 262
-#define BAD_METHOD_DECL_START 263
-#define BAD_METHOD_PARAMETER_NAME_CHARACTER 264
-#define BAD_NONWHITESPACE_CHARACTER_IN_EXPLICIT_RESULT_MODE 265
-#define LAND 266
-#define LOR 267
-#define LXOR 268
-#define NXOR 269
-#define NLE 270
-#define NGE 271
-#define NEQ 272
-#define NNE 273
-#define NSL 274
-#define NSR 275
-#define SLT 276
-#define SGT 277
-#define SLE 278
-#define SGE 279
-#define SEQ 280
-#define SNE 281
-#define DEF 282
-#define IN 283
-#define FEXISTS 284
-#define DEXISTS 285
-#define IS 286
-#define LITERAL_TRUE 287
-#define LITERAL_FALSE 288
-#define NUNARY 289
-
+/* Using locations. */
+#define YYLSP_NEEDED 0
/* Copy the first part of user declarations. */
+
+/* Line 189 of yacc.c */
#line 1 "compile.y"
/** @file
Parser: compiler(lexical parser and grammar).
- Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com)
+ Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com)
Author: Alexander Petrosyan (http://design.ru/paf)
- $Id: compile.tab.C,v 1.121 2008/07/23 09:55:05 misha Exp $
+
*/
+volatile const char * IDENT_COMPILE_Y = "$Id: compile.tab.C,v 1.154 2012/03/16 09:24:12 moko Exp $";
+
/**
@todo parser4:
- cache compiled code from request to request. to do that...
@@ -162,7 +108,6 @@
#include "pa_vobject.h"
#include "pa_vdouble.h"
#include "pa_globals.h"
-#include "pa_vvoid.h"
#include "pa_vmethod_frame.h"
// defines
@@ -170,7 +115,8 @@
#define USE_CONTROL_METHOD_NAME "USE"
#define OPTIONS_CONTROL_METHOD_NAME "OPTIONS"
#define OPTION_ALL_VARS_LOCAL_NAME "locals"
-#define OPTION_APPEND_METHODS "append"
+#define OPTION_PARTIAL_CLASS "partial"
+#define REM_OPERATOR_NAME "rem"
// forwards
@@ -180,7 +126,7 @@ static int yylex(YYSTYPE* lvalp, void* p
static const VBool vfalse(false);
static const VBool vtrue(true);
-static const VVoid vvoid;
+static const VString vempty;
// local convinient inplace typecast & var
#undef PC
@@ -190,6 +136,9 @@ static const VVoid vvoid;
#ifndef DOXYGEN
+/* Line 189 of yacc.c */
+#line 141 "compile.tab.C"
+
/* Enabling traces. */
#ifndef YYDEBUG
# define YYDEBUG 0
@@ -203,70 +152,233 @@ static const VVoid vvoid;
# define YYERROR_VERBOSE 0
#endif
-#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
+/* Enabling the token table. */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
+#endif
+
+
+/* Tokens. */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+ /* Put the tokens into the symbol table, so that GDB and other debuggers
+ know about them. */
+ enum yytokentype {
+ EON = 258,
+ STRING = 259,
+ BOGUS = 260,
+ BAD_STRING_COMPARISON_OPERATOR = 261,
+ BAD_HEX_LITERAL = 262,
+ BAD_METHOD_DECL_START = 263,
+ BAD_METHOD_PARAMETER_NAME_CHARACTER = 264,
+ BAD_NONWHITESPACE_CHARACTER_IN_EXPLICIT_RESULT_MODE = 265,
+ LAND = 266,
+ LOR = 267,
+ LXOR = 268,
+ NXOR = 269,
+ NLE = 270,
+ NGE = 271,
+ NEQ = 272,
+ NNE = 273,
+ NSL = 274,
+ NSR = 275,
+ SLT = 276,
+ SGT = 277,
+ SLE = 278,
+ SGE = 279,
+ SEQ = 280,
+ SNE = 281,
+ DEF = 282,
+ IN = 283,
+ FEXISTS = 284,
+ DEXISTS = 285,
+ IS = 286,
+ LITERAL_TRUE = 287,
+ LITERAL_FALSE = 288,
+ NUNARY = 289
+ };
+#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 214 of yacc.c. */
-#line 220 "compile.tab.C"
+/* Line 264 of yacc.c */
+#line 217 "compile.tab.C"
-#if ! defined (yyoverflow) || YYERROR_VERBOSE
+#ifdef short
+# undef short
+#endif
+
+#ifdef YYTYPE_UINT8
+typedef YYTYPE_UINT8 yytype_uint8;
+#else
+typedef unsigned char yytype_uint8;
+#endif
+
+#ifdef YYTYPE_INT8
+typedef YYTYPE_INT8 yytype_int8;
+#elif (defined __STDC__ || defined __C99__FUNC__ \
+ || defined __cplusplus || defined _MSC_VER)
+typedef signed char yytype_int8;
+#else
+typedef short int yytype_int8;
+#endif
-# ifndef YYFREE
-# define YYFREE free
+#ifdef YYTYPE_UINT16
+typedef YYTYPE_UINT16 yytype_uint16;
+#else
+typedef unsigned short int yytype_uint16;
+#endif
+
+#ifdef YYTYPE_INT16
+typedef YYTYPE_INT16 yytype_int16;
+#else
+typedef short int yytype_int16;
+#endif
+
+#ifndef YYSIZE_T
+# ifdef __SIZE_TYPE__
+# define YYSIZE_T __SIZE_TYPE__
+# elif defined size_t
+# define YYSIZE_T size_t
+# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
+ || defined __cplusplus || defined _MSC_VER)
+# include /* INFRINGES ON USER NAME SPACE */
+# define YYSIZE_T size_t
+# else
+# define YYSIZE_T unsigned int
+# endif
+#endif
+
+#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
+
+#ifndef YY_
+# if YYENABLE_NLS
+# if ENABLE_NLS
+# include /* INFRINGES ON USER NAME SPACE */
+# define YY_(msgid) dgettext ("bison-runtime", msgid)
+# endif
# endif
-# ifndef YYMALLOC
-# define YYMALLOC malloc
+# ifndef YY_
+# define YY_(msgid) msgid
# endif
+#endif
+
+/* Suppress unused-variable warnings by "using" E. */
+#if ! defined lint || defined __GNUC__
+# define YYUSE(e) ((void) (e))
+#else
+# define YYUSE(e) /* empty */
+#endif
+
+/* Identity function, used to suppress warnings about constant conditions. */
+#ifndef lint
+# define YYID(n) (n)
+#else
+#if (defined __STDC__ || defined __C99__FUNC__ \
+ || defined __cplusplus || defined _MSC_VER)
+static int
+YYID (int yyi)
+#else
+static int
+YYID (yyi)
+ int yyi;
+#endif
+{
+ return yyi;
+}
+#endif
+
+#if ! defined yyoverflow || YYERROR_VERBOSE
/* The parser invokes alloca or malloc; define the necessary symbols. */
# ifdef YYSTACK_USE_ALLOCA
# if YYSTACK_USE_ALLOCA
-# define YYSTACK_ALLOC alloca
-# endif
-# else
-# if defined (alloca) || defined (_ALLOCA_H)
-# define YYSTACK_ALLOC alloca
-# else
# ifdef __GNUC__
# define YYSTACK_ALLOC __builtin_alloca
+# elif defined __BUILTIN_VA_ARG_INCR
+# include /* INFRINGES ON USER NAME SPACE */
+# elif defined _AIX
+# define YYSTACK_ALLOC __alloca
+# elif defined _MSC_VER
+# include /* INFRINGES ON USER NAME SPACE */
+# define alloca _alloca
+# else
+# define YYSTACK_ALLOC alloca
+# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+ || defined __cplusplus || defined _MSC_VER)
+# include /* INFRINGES ON USER NAME SPACE */
+# ifndef _STDLIB_H
+# define _STDLIB_H 1
+# endif
+# endif
# endif
# endif
# endif
# ifdef YYSTACK_ALLOC
- /* Pacify GCC's `empty if-body' warning. */
-# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
-# else
-# if defined (__STDC__) || defined (__cplusplus)
-# include /* INFRINGES ON USER NAME SPACE */
-# define YYSIZE_T size_t
+ /* Pacify GCC's `empty if-body' warning. */
+# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
+# ifndef YYSTACK_ALLOC_MAXIMUM
+ /* The OS might guarantee only one guard page at the bottom of the stack,
+ and a page size can be as small as 4096 bytes. So we cannot safely
+ invoke alloca (N) if N exceeds 4096. Use a slightly smaller number
+ to allow for a few compiler-allocated temporary stack slots. */
+# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
# endif
+# else
# define YYSTACK_ALLOC YYMALLOC
# define YYSTACK_FREE YYFREE
+# ifndef YYSTACK_ALLOC_MAXIMUM
+# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
+# endif
+# if (defined __cplusplus && ! defined _STDLIB_H \
+ && ! ((defined YYMALLOC || defined malloc) \
+ && (defined YYFREE || defined free)))
+# include /* INFRINGES ON USER NAME SPACE */
+# ifndef _STDLIB_H
+# define _STDLIB_H 1
+# endif
+# endif
+# ifndef YYMALLOC
+# define YYMALLOC malloc
+# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+ || defined __cplusplus || defined _MSC_VER)
+void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
+# endif
+# endif
+# ifndef YYFREE
+# define YYFREE free
+# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+ || defined __cplusplus || defined _MSC_VER)
+void free (void *); /* INFRINGES ON USER NAME SPACE */
+# endif
+# endif
# endif
-#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
+#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
-#if (! defined (yyoverflow) \
- && (! defined (__cplusplus) \
- || (defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL)))
+#if (! defined yyoverflow \
+ && (! defined __cplusplus \
+ || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
/* A type that is properly aligned for any stack member. */
union yyalloc
{
- short int 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)
@@ -274,24 +386,24 @@ union yyalloc
/* The size of an array large to enough to hold all stacks, each with
N elements. */
# define YYSTACK_BYTES(N) \
- ((N) * (sizeof (short int) + sizeof (YYSTYPE)) \
+ ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
+ YYSTACK_GAP_MAXIMUM)
/* Copy COUNT objects from FROM to TO. The source and destination do
not overlap. */
# ifndef YYCOPY
-# if defined (__GNUC__) && 1 < __GNUC__
+# if defined __GNUC__ && 1 < __GNUC__
# define YYCOPY(To, From, Count) \
__builtin_memcpy (To, From, (Count) * sizeof (*(From)))
# else
# define YYCOPY(To, From, Count) \
do \
{ \
- register YYSIZE_T yyi; \
+ YYSIZE_T yyi; \
for (yyi = 0; yyi < (Count); yyi++) \
(To)[yyi] = (From)[yyi]; \
} \
- while (0)
+ while (YYID (0))
# endif
# endif
@@ -300,48 +412,42 @@ 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); \
} \
- while (0)
+ while (YYID (0))
#endif
-#if defined (__STDC__) || defined (__cplusplus)
- typedef signed char yysigned_char;
-#else
- typedef short int yysigned_char;
-#endif
-
-/* YYFINAL -- State number of the termination state. */
+/* YYFINAL -- State number of the termination state. */
#define YYFINAL 51
/* YYLAST -- Last index in YYTABLE. */
#define YYLAST 470
-/* YYNTOKENS -- Number of terminals. */
+/* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 62
-/* YYNNTS -- Number of nonterminals. */
+/* YYNNTS -- Number of nonterminals. */
#define YYNNTS 89
-/* YYNRULES -- Number of rules. */
+/* YYNRULES -- Number of rules. */
#define YYNRULES 172
-/* YYNRULES -- Number of states. */
+/* YYNRULES -- Number of states. */
#define YYNSTATES 263
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2
#define YYMAXUTOK 289
-#define YYTRANSLATE(YYX) \
+#define YYTRANSLATE(YYX) \
((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */
-static const unsigned char yytranslate[] =
+static const yytype_uint8 yytranslate[] =
{
0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
48, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@@ -377,7 +483,7 @@ static const unsigned char yytranslate[]
#if YYDEBUG
/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
YYRHS. */
-static const unsigned short int yyprhs[] =
+static const yytype_uint16 yyprhs[] =
{
0, 0, 3, 5, 7, 9, 12, 14, 16, 18,
23, 25, 27, 29, 32, 35, 37, 39, 40, 49,
@@ -399,8 +505,8 @@ static const unsigned short int yyprhs[]
468, 470, 472
};
-/* YYRHS -- A `-1'-separated list of the rules' RHS. */
-static const short int yyrhs[] =
+/* YYRHS -- A `-1'-separated list of the rules' RHS. */
+static const yytype_int16 yyrhs[] =
{
63, 0, -1, 65, -1, 64, -1, 66, -1, 64,
66, -1, 79, -1, 67, -1, 72, -1, 47, 4,
@@ -453,32 +559,32 @@ static const short int yyrhs[] =
};
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
-static const unsigned short int yyrline[] =
+static const yytype_uint16 yyrline[] =
{
- 0, 131, 131, 138, 140, 140, 141, 143, 143, 145,
- 240, 240, 241, 241, 242, 243, 243, 245, 245, 295,
- 295, 296, 297, 297, 298, 298, 300, 300, 304, 304,
- 306, 306, 307, 307, 308, 308, 308, 312, 319, 320,
- 320, 321, 323, 324, 325, 347, 348, 348, 352, 357,
- 358, 359, 360, 377, 382, 385, 386, 387, 389, 392,
- 389, 400, 408, 415, 416, 417, 419, 425, 426, 426,
- 430, 436, 439, 436, 455, 457, 457, 459, 460, 461,
- 463, 466, 463, 469, 470, 472, 473, 476, 477, 480,
- 481, 483, 487, 502, 507, 508, 509, 514, 514, 516,
- 516, 517, 518, 526, 531, 534, 535, 536, 537, 539,
- 543, 552, 555, 552, 563, 568, 568, 569, 575, 576,
- 578, 590, 602, 604, 605, 606, 607, 608, 609, 610,
- 611, 613, 614, 615, 616, 617, 618, 619, 620, 622,
- 623, 624, 625, 626, 627, 628, 629, 630, 631, 632,
- 633, 634, 635, 636, 637, 638, 639, 640, 641, 642,
- 643, 644, 645, 646, 647, 648, 651, 656, 665, 670,
- 671, 672, 674
+ 0, 133, 133, 140, 142, 142, 143, 145, 145, 147,
+ 254, 254, 255, 255, 256, 257, 257, 259, 259, 307,
+ 307, 308, 309, 309, 310, 310, 312, 312, 316, 316,
+ 318, 318, 319, 319, 320, 320, 320, 324, 365, 366,
+ 366, 367, 369, 370, 371, 424, 425, 425, 429, 442,
+ 443, 444, 445, 471, 476, 479, 480, 481, 483, 486,
+ 483, 494, 502, 509, 510, 511, 513, 519, 520, 520,
+ 524, 536, 539, 536, 584, 586, 586, 588, 589, 590,
+ 592, 595, 592, 598, 599, 601, 602, 605, 606, 609,
+ 610, 612, 615, 629, 634, 635, 636, 641, 641, 643,
+ 643, 644, 645, 653, 658, 661, 662, 663, 664, 666,
+ 670, 679, 682, 679, 690, 695, 695, 696, 702, 703,
+ 705, 718, 730, 732, 733, 734, 735, 736, 737, 738,
+ 739, 741, 742, 743, 744, 745, 746, 747, 748, 750,
+ 751, 752, 753, 754, 755, 756, 757, 758, 759, 760,
+ 761, 762, 763, 764, 765, 766, 767, 768, 769, 770,
+ 771, 772, 773, 774, 775, 776, 779, 784, 805, 810,
+ 811, 812, 814
};
#endif
-#if YYDEBUG || YYERROR_VERBOSE
-/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
- First, the terminals, then, starting at YYNTOKENS, nonterminals. */
+#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+ First, the terminals, then, starting at YYNTOKENS, nonterminals. */
static const char *const yytname[] =
{
"$end", "error", "$undefined", "EON", "STRING", "BOGUS",
@@ -491,7 +597,7 @@ static const char *const yytname[] =
"\"false\"", "'<'", "'>'", "'|'", "'&'", "'+'", "'-'", "'*'", "'/'",
"'\\\\'", "'%'", "NUNARY", "'~'", "'!'", "'@'", "'\\n'", "'['", "']'",
"';'", "'$'", "'{'", "'}'", "'.'", "'('", "')'", "'^'", "':'", "'\"'",
- "'''", "$accept", "all", "methods", "one_big_piece", "method",
+ "'\\''", "$accept", "all", "methods", "one_big_piece", "method",
"control_method", "maybe_control_strings", "control_strings",
"control_string", "maybe_string", "code_method", "@1",
"maybe_bracketed_strings", "bracketed_maybe_strings", "maybe_strings",
@@ -500,29 +606,29 @@ static const char *const yytname[] =
"name_without_curly_rdive", "name_without_curly_rdive_read",
"name_without_curly_rdive_class", "name_without_curly_rdive_code", "put",
"name_expr_wdive", "name_expr_wdive_root", "name_expr_wdive_write",
- "name_expr_wdive_class", "construct", "construct_square", "@2", "@3",
+ "name_expr_wdive_class", "construct", "construct_square", "@2", "$@3",
"construct_round", "construct_curly", "any_constructor_code_value",
"constructor_code_value", "constructor_code",
- "codes__excluding_sole_str_literal", "call", "call_value", "@4", "@5",
+ "codes__excluding_sole_str_literal", "call", "call_value", "$@4", "$@5",
"call_name", "store_params", "store_param", "store_square_param", "@6",
- "@7", "store_round_param", "store_curly_param", "store_code_param_parts",
- "store_expr_param_parts", "store_curly_param_parts",
- "store_code_param_part", "store_expr_param_part",
- "store_curly_param_part", "code_param_value", "name_expr_dive_code",
- "name_path", "name_step", "name_advance1", "name_advance2",
- "name_expr_value", "name_expr_subvar_value",
- "name_expr_with_subvar_value", "name_square_code_value", "@8", "@9",
+ "$@7", "store_round_param", "store_curly_param",
+ "store_code_param_parts", "store_expr_param_parts",
+ "store_curly_param_parts", "store_code_param_part",
+ "store_expr_param_part", "store_curly_param_part", "code_param_value",
+ "name_expr_dive_code", "name_path", "name_step", "name_advance1",
+ "name_advance2", "name_expr_value", "name_expr_subvar_value",
+ "name_expr_with_subvar_value", "name_square_code_value", "@8", "$@9",
"subvar_ref_name_rdive", "subvar_get_writes", "subvar__get_write",
"class_prefix", "class_static_prefix", "class_constructor_prefix",
"expr_value", "expr", "double_or_STRING", "string_inside_quotes_value",
- "write_string", "void_value", "true_value", "false_value", "empty", 0
+ "write_string", "empty_value", "true_value", "false_value", "empty", 0
};
#endif
# ifdef YYPRINT
/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
token YYLEX-NUM. */
-static const unsigned short int yytoknum[] =
+static const yytype_uint16 yytoknum[] =
{
0, 256, 257, 258, 259, 260, 261, 262, 263, 264,
265, 266, 267, 268, 269, 270, 271, 272, 273, 274,
@@ -535,7 +641,7 @@ static const unsigned short int yytoknum
# endif
/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
-static const unsigned char yyr1[] =
+static const yytype_uint8 yyr1[] =
{
0, 62, 63, 63, 64, 64, 65, 66, 66, 67,
68, 68, 69, 69, 70, 71, 71, 73, 72, 74,
@@ -558,7 +664,7 @@ static const unsigned char yyr1[] =
};
/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
-static const unsigned char yyr2[] =
+static const yytype_uint8 yyr2[] =
{
0, 2, 1, 1, 1, 2, 1, 1, 1, 4,
1, 1, 1, 2, 2, 1, 1, 0, 8, 1,
@@ -583,7 +689,7 @@ static const unsigned char yyr2[] =
/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
STATE-NUM when YYTABLE doesn't specify something else to do. Zero
means the default is an error. */
-static const unsigned char yydefact[] =
+static const yytype_uint8 yydefact[] =
{
172, 168, 0, 0, 71, 0, 3, 2, 4, 7,
8, 6, 29, 30, 33, 34, 37, 35, 36, 70,
@@ -614,8 +720,8 @@ static const unsigned char yydefact[] =
88, 86, 82
};
-/* YYDEFGOTO[NTERM-NUM]. */
-static const short int yydefgoto[] =
+/* YYDEFGOTO[NTERM-NUM]. */
+static const yytype_int16 yydefgoto[] =
{
-1, 5, 6, 7, 8, 9, 92, 93, 94, 95,
10, 244, 101, 56, 98, 99, 140, 161, 12, 13,
@@ -631,7 +737,7 @@ static const short int yydefgoto[] =
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
#define YYPACT_NINF -107
-static const short int yypact[] =
+static const yytype_int16 yypact[] =
{
14, -107, 13, 45, -107, 28, -15, -107, -107, -107,
-107, -107, 21, -107, -107, -107, -107, -107, -107, -107,
@@ -663,7 +769,7 @@ static const short int yypact[] =
};
/* YYPGOTO[NTERM-NUM]. */
-static const short int yypgoto[] =
+static const yytype_int16 yypgoto[] =
{
-107, -107, -107, -107, 206, -107, -107, -107, 124, -107,
-107, -107, -107, 170, -107, -107, -107, 1, -58, -7,
@@ -681,7 +787,7 @@ static const short int yypgoto[] =
number is the opposite. If zero, do what YYDEFACT says.
If YYTABLE_NINF, syntax error. */
#define YYTABLE_NINF -173
-static const short int yytable[] =
+static const yytype_int16 yytable[] =
{
16, 11, 19, 145, 106, 53, 43, 39, -103, 70,
23, 111, 16, 91, 19, 74, 83, 22, 1, 75,
@@ -733,7 +839,7 @@ static const short int yytable[] =
191
};
-static const short int yycheck[] =
+static const yytype_int16 yycheck[] =
{
0, 0, 0, 109, 62, 12, 3, 3, 3, 27,
4, 4, 12, 4, 12, 49, 39, 4, 4, 53,
@@ -787,7 +893,7 @@ static const short int yycheck[] =
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
symbol of state STATE-NUM. */
-static const unsigned char yystos[] =
+static const yytype_uint8 yystos[] =
{
0, 4, 47, 52, 58, 63, 64, 65, 66, 67,
72, 79, 80, 81, 82, 83, 84, 91, 106, 107,
@@ -818,22 +924,6 @@ static const unsigned char yystos[] =
122, 121, 50
};
-#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
-# define YYSIZE_T __SIZE_TYPE__
-#endif
-#if ! defined (YYSIZE_T) && defined (size_t)
-# define YYSIZE_T size_t
-#endif
-#if ! defined (YYSIZE_T)
-# if defined (__STDC__) || defined (__cplusplus)
-# include /* INFRINGES ON USER NAME SPACE */
-# define YYSIZE_T size_t
-# endif
-#endif
-#if ! defined (YYSIZE_T)
-# define YYSIZE_T unsigned int
-#endif
-
#define yyerrok (yyerrstatus = 0)
#define yyclearin (yychar = YYEMPTY)
#define YYEMPTY (-2)
@@ -859,30 +949,63 @@ do \
yychar = (Token); \
yylval = (Value); \
yytoken = YYTRANSLATE (yychar); \
- YYPOPSTACK; \
+ YYPOPSTACK (1); \
goto yybackup; \
} \
else \
- { \
- yyerror ("syntax error: cannot back up");\
+ { \
+ yyerror (YY_("syntax error: cannot back up")); \
YYERROR; \
} \
-while (0)
+while (YYID (0))
+
#define YYTERROR 1
#define YYERRCODE 256
-/* YYLLOC_DEFAULT -- Compute the default location (before the actions
- are run). */
+/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
+ If N is 0, then set CURRENT to the empty location which ends
+ the previous symbol: RHS[0] (always defined). */
+
+#define YYRHSLOC(Rhs, K) ((Rhs)[K])
#ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N) \
- ((Current).first_line = (Rhs)[1].first_line, \
- (Current).first_column = (Rhs)[1].first_column, \
- (Current).last_line = (Rhs)[N].last_line, \
- (Current).last_column = (Rhs)[N].last_column)
+# define YYLLOC_DEFAULT(Current, Rhs, N) \
+ do \
+ if (YYID (N)) \
+ { \
+ (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \
+ (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \
+ (Current).last_line = YYRHSLOC (Rhs, N).last_line; \
+ (Current).last_column = YYRHSLOC (Rhs, N).last_column; \
+ } \
+ else \
+ { \
+ (Current).first_line = (Current).last_line = \
+ YYRHSLOC (Rhs, 0).last_line; \
+ (Current).first_column = (Current).last_column = \
+ YYRHSLOC (Rhs, 0).last_column; \
+ } \
+ while (YYID (0))
#endif
+
+/* YY_LOCATION_PRINT -- Print the location on the stream.
+ This macro was not mandated originally: define only if we know
+ we won't break user code: when these are the locations we know. */
+
+#ifndef YY_LOCATION_PRINT
+# if YYLTYPE_IS_TRIVIAL
+# define YY_LOCATION_PRINT(File, Loc) \
+ fprintf (File, "%d.%d-%d.%d", \
+ (Loc).first_line, (Loc).first_column, \
+ (Loc).last_line, (Loc).last_column)
+# else
+# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# endif
+#endif
+
+
/* YYLEX -- calling `yylex' with the right arguments. */
#ifdef YYLEX_PARAM
@@ -903,43 +1026,100 @@ while (0)
do { \
if (yydebug) \
YYFPRINTF Args; \
-} while (0)
+} while (YYID (0))
-# define YYDSYMPRINT(Args) \
-do { \
- if (yydebug) \
- yysymprint Args; \
-} while (0)
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \
+do { \
+ if (yydebug) \
+ { \
+ YYFPRINTF (stderr, "%s ", Title); \
+ yy_symbol_print (stderr, \
+ Type, Value); \
+ YYFPRINTF (stderr, "\n"); \
+ } \
+} while (YYID (0))
-# define YYDSYMPRINTF(Title, Token, Value, Location) \
-do { \
- if (yydebug) \
- { \
- YYFPRINTF (stderr, "%s ", Title); \
- yysymprint (stderr, \
- Token, Value); \
- YYFPRINTF (stderr, "\n"); \
- } \
-} while (0)
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT. |
+`--------------------------------*/
+
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+ || defined __cplusplus || defined _MSC_VER)
+static void
+yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+#else
+static void
+yy_symbol_value_print (yyoutput, yytype, yyvaluep)
+ FILE *yyoutput;
+ int yytype;
+ YYSTYPE const * const yyvaluep;
+#endif
+{
+ if (!yyvaluep)
+ return;
+# ifdef YYPRINT
+ if (yytype < YYNTOKENS)
+ YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# else
+ YYUSE (yyoutput);
+# endif
+ switch (yytype)
+ {
+ default:
+ break;
+ }
+}
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT. |
+`--------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+ || defined __cplusplus || defined _MSC_VER)
+static void
+yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+#else
+static void
+yy_symbol_print (yyoutput, yytype, yyvaluep)
+ FILE *yyoutput;
+ int yytype;
+ YYSTYPE const * const yyvaluep;
+#endif
+{
+ if (yytype < YYNTOKENS)
+ YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
+ else
+ YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+
+ yy_symbol_value_print (yyoutput, yytype, yyvaluep);
+ YYFPRINTF (yyoutput, ")");
+}
/*------------------------------------------------------------------.
| yy_stack_print -- Print the state stack from its BOTTOM up to its |
| TOP (included). |
`------------------------------------------------------------------*/
-#if defined (__STDC__) || defined (__cplusplus)
+#if (defined __STDC__ || defined __C99__FUNC__ \
+ || defined __cplusplus || defined _MSC_VER)
static void
-yy_stack_print (short int *bottom, short int *top)
+yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
#else
static void
-yy_stack_print (bottom, top)
- short int *bottom;
- short int *top;
+yy_stack_print (yybottom, yytop)
+ yytype_int16 *yybottom;
+ yytype_int16 *yytop;
#endif
{
YYFPRINTF (stderr, "Stack now");
- for (/* Nothing. */; bottom <= top; ++bottom)
- YYFPRINTF (stderr, " %d", *bottom);
+ for (; yybottom <= yytop; yybottom++)
+ {
+ int yybot = *yybottom;
+ YYFPRINTF (stderr, " %d", yybot);
+ }
YYFPRINTF (stderr, "\n");
}
@@ -947,45 +1127,52 @@ yy_stack_print (bottom, top)
do { \
if (yydebug) \
yy_stack_print ((Bottom), (Top)); \
-} while (0)
+} while (YYID (0))
/*------------------------------------------------.
| Report that the YYRULE is going to be reduced. |
`------------------------------------------------*/
-#if defined (__STDC__) || defined (__cplusplus)
+#if (defined __STDC__ || defined __C99__FUNC__ \
+ || defined __cplusplus || defined _MSC_VER)
static void
-yy_reduce_print (int yyrule)
+yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
#else
static void
-yy_reduce_print (yyrule)
+yy_reduce_print (yyvsp, yyrule)
+ YYSTYPE *yyvsp;
int yyrule;
#endif
{
+ int yynrhs = yyr2[yyrule];
int yyi;
- unsigned int yylno = yyrline[yyrule];
- YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ",
- yyrule - 1, yylno);
- /* Print the symbols being reduced, and their result. */
- for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)
- YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]);
- YYFPRINTF (stderr, "-> %s\n", yytname [yyr1[yyrule]]);
+ unsigned long int yylno = yyrline[yyrule];
+ YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
+ yyrule - 1, yylno);
+ /* The symbols being reduced. */
+ for (yyi = 0; yyi < yynrhs; yyi++)
+ {
+ YYFPRINTF (stderr, " $%d = ", yyi + 1);
+ yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
+ &(yyvsp[(yyi + 1) - (yynrhs)])
+ );
+ YYFPRINTF (stderr, "\n");
+ }
}
# define YY_REDUCE_PRINT(Rule) \
do { \
if (yydebug) \
- yy_reduce_print (Rule); \
-} while (0)
+ yy_reduce_print (yyvsp, Rule); \
+} while (YYID (0))
/* Nonzero means print parse trace. It is left uninitialized so that
multiple parsers can coexist. */
int yydebug;
#else /* !YYDEBUG */
# define YYDPRINTF(Args)
-# define YYDSYMPRINT(Args)
-# define YYDSYMPRINTF(Title, Token, Value, Location)
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
# define YY_STACK_PRINT(Bottom, Top)
# define YY_REDUCE_PRINT(Rule)
#endif /* !YYDEBUG */
@@ -1000,13 +1187,9 @@ int yydebug;
if the built-in stack extension method is used).
Do not make this value too large; the results are undefined if
- SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
+ YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
evaluated with infinite-precision integer arithmetic. */
-#if defined (YYMAXDEPTH) && YYMAXDEPTH == 0
-# undef YYMAXDEPTH
-#endif
-
#ifndef YYMAXDEPTH
# define YYMAXDEPTH 10000
#endif
@@ -1016,45 +1199,47 @@ int yydebug;
#if YYERROR_VERBOSE
# ifndef yystrlen
-# if defined (__GLIBC__) && defined (_STRING_H)
+# if defined __GLIBC__ && defined _STRING_H
# define yystrlen strlen
# else
/* Return the length of YYSTR. */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+ || defined __cplusplus || defined _MSC_VER)
static YYSIZE_T
-# if defined (__STDC__) || defined (__cplusplus)
yystrlen (const char *yystr)
-# else
+#else
+static YYSIZE_T
yystrlen (yystr)
- const char *yystr;
-# endif
+ const char *yystr;
+#endif
{
- register const char *yys = yystr;
-
- while (*yys++ != '\0')
+ YYSIZE_T yylen;
+ for (yylen = 0; yystr[yylen]; yylen++)
continue;
-
- return yys - yystr - 1;
+ return yylen;
}
# endif
# endif
# ifndef yystpcpy
-# if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
+# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
# define yystpcpy stpcpy
# else
/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
YYDEST. */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+ || defined __cplusplus || defined _MSC_VER)
static char *
-# if defined (__STDC__) || defined (__cplusplus)
yystpcpy (char *yydest, const char *yysrc)
-# else
+#else
+static char *
yystpcpy (yydest, yysrc)
- char *yydest;
- const char *yysrc;
-# endif
+ char *yydest;
+ const char *yysrc;
+#endif
{
- register char *yyd = yydest;
- register const char *yys = yysrc;
+ char *yyd = yydest;
+ const char *yys = yysrc;
while ((*yyd++ = *yys++) != '\0')
continue;
@@ -1064,84 +1249,204 @@ yystpcpy (yydest, yysrc)
# endif
# endif
-#endif /* !YYERROR_VERBOSE */
+# ifndef yytnamerr
+/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
+ quotes and backslashes, so that it's suitable for yyerror. The
+ heuristic is that double-quoting is unnecessary unless the string
+ contains an apostrophe, a comma, or backslash (other than
+ backslash-backslash). YYSTR is taken from yytname. If YYRES is
+ null, do not copy; instead, return the length of what the result
+ would have been. */
+static YYSIZE_T
+yytnamerr (char *yyres, const char *yystr)
+{
+ if (*yystr == '"')
+ {
+ YYSIZE_T yyn = 0;
+ char const *yyp = yystr;
-
+ for (;;)
+ switch (*++yyp)
+ {
+ case '\'':
+ case ',':
+ goto do_not_strip_quotes;
+
+ case '\\':
+ if (*++yyp != '\\')
+ goto do_not_strip_quotes;
+ /* Fall through. */
+ default:
+ if (yyres)
+ yyres[yyn] = *yyp;
+ yyn++;
+ break;
+
+ case '"':
+ if (yyres)
+ yyres[yyn] = '\0';
+ return yyn;
+ }
+ do_not_strip_quotes: ;
+ }
-#if YYDEBUG
-/*--------------------------------.
-| Print this symbol on YYOUTPUT. |
-`--------------------------------*/
+ if (! yyres)
+ return yystrlen (yystr);
-#if defined (__STDC__) || defined (__cplusplus)
-static void
-yysymprint (FILE *yyoutput, int yytype, YYSTYPE *yyvaluep)
-#else
-static void
-yysymprint (yyoutput, yytype, yyvaluep)
- FILE *yyoutput;
- int yytype;
- YYSTYPE *yyvaluep;
-#endif
+ return yystpcpy (yyres, yystr) - yyres;
+}
+# endif
+
+/* Copy into YYRESULT an error message about the unexpected token
+ YYCHAR while in state YYSTATE. Return the number of bytes copied,
+ including the terminating null byte. If YYRESULT is null, do not
+ copy anything; just return the number of bytes that would be
+ copied. As a special case, return 0 if an ordinary "syntax error"
+ message will do. Return YYSIZE_MAXIMUM if overflow occurs during
+ size calculation. */
+static YYSIZE_T
+yysyntax_error (char *yyresult, int yystate, int yychar)
{
- /* Pacify ``unused variable'' warnings. */
- (void) yyvaluep;
+ int yyn = yypact[yystate];
- if (yytype < YYNTOKENS)
+ if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
+ return 0;
+ else
{
- YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
-# ifdef YYPRINT
- YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+ int yytype = YYTRANSLATE (yychar);
+ YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
+ YYSIZE_T yysize = yysize0;
+ YYSIZE_T yysize1;
+ int yysize_overflow = 0;
+ enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+ char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+ int yyx;
+
+# if 0
+ /* This is so xgettext sees the translatable formats that are
+ constructed on the fly. */
+ YY_("syntax error, unexpected %s");
+ YY_("syntax error, unexpected %s, expecting %s");
+ YY_("syntax error, unexpected %s, expecting %s or %s");
+ YY_("syntax error, unexpected %s, expecting %s or %s or %s");
+ YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
# endif
- }
- else
- YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+ char *yyfmt;
+ char const *yyf;
+ static char const yyunexpected[] = "syntax error, unexpected %s";
+ static char const yyexpecting[] = ", expecting %s";
+ static char const yyor[] = " or %s";
+ char yyformat[sizeof yyunexpected
+ + sizeof yyexpecting - 1
+ + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
+ * (sizeof yyor - 1))];
+ char const *yyprefix = yyexpecting;
+
+ /* Start YYX at -YYN if negative to avoid negative indexes in
+ YYCHECK. */
+ int yyxbegin = yyn < 0 ? -yyn : 0;
+
+ /* Stay within bounds of both yycheck and yytname. */
+ int yychecklim = YYLAST - yyn + 1;
+ int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+ int yycount = 1;
+
+ yyarg[0] = yytname[yytype];
+ yyfmt = yystpcpy (yyformat, yyunexpected);
+
+ for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+ if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+ {
+ if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+ {
+ yycount = 1;
+ yysize = yysize0;
+ yyformat[sizeof yyunexpected - 1] = '\0';
+ break;
+ }
+ yyarg[yycount++] = yytname[yyx];
+ yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+ yysize_overflow |= (yysize1 < yysize);
+ yysize = yysize1;
+ yyfmt = yystpcpy (yyfmt, yyprefix);
+ yyprefix = yyor;
+ }
+
+ yyf = YY_(yyformat);
+ yysize1 = yysize + yystrlen (yyf);
+ yysize_overflow |= (yysize1 < yysize);
+ yysize = yysize1;
- switch (yytype)
- {
- default:
- break;
+ if (yysize_overflow)
+ return YYSIZE_MAXIMUM;
+
+ if (yyresult)
+ {
+ /* Avoid sprintf, as that infringes on the user's name space.
+ Don't have undefined behavior even if the translation
+ produced a string with the wrong number of "%s"s. */
+ char *yyp = yyresult;
+ int yyi = 0;
+ while ((*yyp = *yyf) != '\0')
+ {
+ if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
+ {
+ yyp += yytnamerr (yyp, yyarg[yyi++]);
+ yyf += 2;
+ }
+ else
+ {
+ yyp++;
+ yyf++;
+ }
+ }
+ }
+ return yysize;
}
- YYFPRINTF (yyoutput, ")");
}
+#endif /* YYERROR_VERBOSE */
+
-#endif /* ! YYDEBUG */
/*-----------------------------------------------.
| Release the memory associated to this symbol. |
`-----------------------------------------------*/
-#if defined (__STDC__) || defined (__cplusplus)
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+ || defined __cplusplus || defined _MSC_VER)
static void
-yydestruct (int yytype, YYSTYPE *yyvaluep)
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
#else
static void
-yydestruct (yytype, yyvaluep)
+yydestruct (yymsg, yytype, yyvaluep)
+ const char *yymsg;
int yytype;
YYSTYPE *yyvaluep;
#endif
{
- /* Pacify ``unused variable'' warnings. */
- (void) yyvaluep;
+ YYUSE (yyvaluep);
+
+ if (!yymsg)
+ yymsg = "Deleting";
+ YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
switch (yytype)
{
default:
- break;
+ break;
}
}
-
/* Prevent warnings from -Wmissing-prototypes. */
-
#ifdef YYPARSE_PARAM
-# if defined (__STDC__) || defined (__cplusplus)
+#if defined __STDC__ || defined __cplusplus
int yyparse (void *YYPARSE_PARAM);
-# else
+#else
int yyparse ();
-# endif
+#endif
#else /* ! YYPARSE_PARAM */
-#if defined (__STDC__) || defined (__cplusplus)
+#if defined __STDC__ || defined __cplusplus
int yyparse (void);
#else
int yyparse ();
@@ -1152,20 +1457,23 @@ int yyparse ();
-
-/*----------.
-| yyparse. |
-`----------*/
+/*-------------------------.
+| yyparse or yypush_parse. |
+`-------------------------*/
#ifdef YYPARSE_PARAM
-# if defined (__STDC__) || defined (__cplusplus)
-int yyparse (void *YYPARSE_PARAM)
-# else
-int yyparse (YYPARSE_PARAM)
- void *YYPARSE_PARAM;
-# endif
+#if (defined __STDC__ || defined __C99__FUNC__ \
+ || defined __cplusplus || defined _MSC_VER)
+int
+yyparse (void *YYPARSE_PARAM)
+#else
+int
+yyparse (YYPARSE_PARAM)
+ void *YYPARSE_PARAM;
+#endif
#else /* ! YYPARSE_PARAM */
-#if defined (__STDC__) || defined (__cplusplus)
+#if (defined __STDC__ || defined __C99__FUNC__ \
+ || defined __cplusplus || defined _MSC_VER)
int
yyparse (void)
#else
@@ -1175,72 +1483,78 @@ yyparse ()
#endif
#endif
{
- /* The lookahead symbol. */
+/* The lookahead symbol. */
int yychar;
/* The semantic value of the lookahead symbol. */
YYSTYPE yylval;
-/* Number of syntax errors so far. */
-int yynerrs;
-
- register int yystate;
- register int yyn;
- int yyresult;
- /* Number of tokens to shift before error messages enabled. */
- int yyerrstatus;
- /* Lookahead token as an internal (translated) token number. */
- int yytoken = 0;
-
- /* 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. */
+ /* Number of syntax errors so far. */
+ int yynerrs;
- /* The state stack. */
- short int yyssa[YYINITDEPTH];
- short int *yyss = yyssa;
- register short int *yyssp;
+ int yystate;
+ /* Number of tokens to shift before error messages enabled. */
+ int yyerrstatus;
- /* The semantic value stack. */
- YYSTYPE yyvsa[YYINITDEPTH];
- YYSTYPE *yyvs = yyvsa;
- register YYSTYPE *yyvsp;
+ /* The stacks and their tools:
+ `yyss': related to states.
+ `yyvs': related to semantic values.
+ 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;
-#define YYPOPSTACK (yyvsp--, yyssp--)
+ /* The semantic value stack. */
+ YYSTYPE yyvsa[YYINITDEPTH];
+ YYSTYPE *yyvs;
+ YYSTYPE *yyvsp;
- 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;
-
- /* When reducing, the number of symbols on the RHS of the reduced
- rule. */
- int yylen;
+#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;
-
goto yysetstate;
/*------------------------------------------------------------.
@@ -1248,8 +1562,7 @@ int yynerrs;
`------------------------------------------------------------*/
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.
- */
+ have just been pushed. So pushing a state here evens the stacks. */
yyssp++;
yysetstate:
@@ -1262,21 +1575,19 @@ int yynerrs;
#ifdef yyoverflow
{
- /* Give user a chance to reallocate the stack. Use copies of
+ /* Give user a chance to reallocate the stack. Use copies of
these so that the &'s don't force the real ones into
memory. */
YYSTYPE *yyvs1 = yyvs;
- short int *yyss1 = yyss;
-
+ 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
be undefined if yyoverflow is a macro. */
- yyoverflow ("parser stack overflow",
+ yyoverflow (YY_("memory exhausted"),
&yyss1, yysize * sizeof (*yyssp),
&yyvs1, yysize * sizeof (*yyvsp),
-
&yystacksize);
yyss = yyss1;
@@ -1284,24 +1595,23 @@ int yynerrs;
}
#else /* no yyoverflow */
# ifndef YYSTACK_RELOCATE
- goto yyoverflowlab;
+ goto yyexhaustedlab;
# else
/* Extend the stack our own way. */
if (YYMAXDEPTH <= yystacksize)
- goto yyoverflowlab;
+ goto yyexhaustedlab;
yystacksize *= 2;
if (YYMAXDEPTH < yystacksize)
yystacksize = YYMAXDEPTH;
{
- short int *yyss1 = yyss;
+ yytype_int16 *yyss1 = yyss;
union yyalloc *yyptr =
(union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
if (! yyptr)
- goto yyoverflowlab;
- YYSTACK_RELOCATE (yyss);
- YYSTACK_RELOCATE (yyvs);
-
+ goto yyexhaustedlab;
+ YYSTACK_RELOCATE (yyss_alloc, yyss);
+ YYSTACK_RELOCATE (yyvs_alloc, yyvs);
# undef YYSTACK_RELOCATE
if (yyss1 != yyssa)
YYSTACK_FREE (yyss1);
@@ -1312,7 +1622,6 @@ int yynerrs;
yyssp = yyss + yysize - 1;
yyvsp = yyvs + yysize - 1;
-
YYDPRINTF ((stderr, "Stack size increased to %lu\n",
(unsigned long int) yystacksize));
@@ -1322,6 +1631,9 @@ int yynerrs;
YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+ if (yystate == YYFINAL)
+ YYACCEPT;
+
goto yybackup;
/*-----------.
@@ -1329,12 +1641,10 @@ int yynerrs;
`-----------*/
yybackup:
-/* Do appropriate processing given the current state. */
-/* Read a lookahead token if we need one and don't already have one. */
-/* yyresume: */
+ /* Do appropriate processing given the current state. Read a
+ lookahead token if we need one and don't already have one. */
/* First try to decide what to do without reference to lookahead token. */
-
yyn = yypact[yystate];
if (yyn == YYPACT_NINF)
goto yydefault;
@@ -1356,7 +1666,7 @@ yybackup:
else
{
yytoken = YYTRANSLATE (yychar);
- YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc);
+ YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
}
/* If the proper action on seeing token YYTOKEN is to reduce or to
@@ -1373,25 +1683,20 @@ yybackup:
goto yyreduce;
}
- if (yyn == YYFINAL)
- YYACCEPT;
-
- /* Shift the lookahead token. */
- YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken]));
-
- /* Discard the token being shifted unless it is eof. */
- if (yychar != YYEOF)
- yychar = YYEMPTY;
-
- *++yyvsp = yylval;
-
-
/* Count tokens shifted since error; after three, turn off error
status. */
if (yyerrstatus)
yyerrstatus--;
+ /* Shift the lookahead token. */
+ YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
+
+ /* Discard the shifted token. */
+ yychar = YYEMPTY;
+
yystate = yyn;
+ *++yyvsp = yylval;
+
goto yynewstate;
@@ -1427,21 +1732,25 @@ yyreduce:
switch (yyn)
{
case 2:
-#line 131 "compile.y"
+
+/* Line 1455 of yacc.c */
+#line 133 "compile.y"
{
- Method& method=*new Method(Method::CT_ANY,
+ Method* method=new Method(Method::CT_ANY,
0, 0, /*min, max numbered_params_count*/
0/*param_names*/, 0/*local_names*/,
- yyvsp[0]/*parser_code*/, 0/*native_code*/);
- PC.cclass->add_method(PC.alias_method(main_method_name), method);
+ (yyvsp[(1) - (1)])/*parser_code*/, 0/*native_code*/);
+ PC.cclass->set_method(PC.alias_method(main_method_name), method);
;}
break;
case 9:
-#line 146 "compile.y"
+
+/* Line 1455 of yacc.c */
+#line 148 "compile.y"
{
- const String& command=*LA2S(*yyvsp[-2]);
- YYSTYPE strings_code=yyvsp[0];
+ const String& command=LA2S(*(yyvsp[(2) - (4)]))->trim(String::TRIM_END);
+ YYSTYPE strings_code=(yyvsp[(4) - (4)]);
if(strings_code->count()<1*OPERATIONS_PER_OPVALUE) {
strcpy(PC.error, "@");
strcat(PC.error, command.cstr());
@@ -1451,7 +1760,7 @@ yyreduce:
if(command==CLASS_NAME) {
if(strings_code->count()==1*OPERATIONS_PER_OPVALUE) {
// new class' name
- const String& name=*LA2S(*strings_code);
+ const String& name=LA2S(*strings_code)->trim(String::TRIM_END);
// creating the class
VStateless_class* cclass=new VClass;
PC.cclass_new=cclass;
@@ -1462,7 +1771,7 @@ yyreduce:
}
} else if(command==USE_CONTROL_METHOD_NAME) {
for(size_t i=0; icount(); i+=OPERATIONS_PER_OPVALUE)
- PC.request.use_file(PC.request.main_class, *LA2S(*strings_code, i));
+ PC.request.use_file(PC.request.main_class, LA2S(*strings_code, i)->trim(String::TRIM_END), PC.request.get_used_filename(PC.file_no));
} else if(command==BASE_NAME) {
if(PC.append){
strcpy(PC.error, "can't set base while appending methods to class '");
@@ -1478,8 +1787,8 @@ yyreduce:
YYERROR;
}
if(strings_code->count()==1*OPERATIONS_PER_OPVALUE) {
- const String& base_name=*LA2S(*strings_code);
- if(Value* base_class_value=PC.request.classes().get(base_name)) {
+ const String& base_name=LA2S(*strings_code)->trim(String::TRIM_END);
+ if(Value* base_class_value=PC.request.get_class(base_name)) {
// @CLASS == @BASE sanity check
if(VStateless_class *base_class=base_class_value->get_class()) {
if(PC.cclass==base_class) {
@@ -1503,25 +1812,37 @@ yyreduce:
}
} else if(command==OPTIONS_CONTROL_METHOD_NAME) {
for(size_t i=0; icount(); i+=OPERATIONS_PER_OPVALUE) {
- const String& option=*LA2S(*strings_code, i);
+ const String& option=LA2S(*strings_code, i)->trim(String::TRIM_END);
if(option==OPTION_ALL_VARS_LOCAL_NAME){
PC.set_all_vars_local();
- } else if(option==OPTION_APPEND_METHODS) {
- if(!PC.class_reuse()){
- if(PC.cclass_new){
- strcpy(PC.error, "can't append methods to '");
- strncat(PC.error, PC.cclass_new->name().cstr(), MAX_STRING/2);
- strcat(PC.error, "' - the class doesn't exist");
+ } else if(option==OPTION_PARTIAL_CLASS){
+ if(PC.cclass_new){
+ if(VStateless_class* existed=PC.get_existed_class(PC.cclass_new)){
+ if(!PC.reuse_existed_class(existed)){
+ strcpy(PC.error, "can't append methods to '");
+ strncat(PC.error, PC.cclass_new->name().cstr(), MAX_STRING/2);
+ strcat(PC.error, "' - the class wasn't marked as partial");
+ YYERROR;
+ }
} else {
- strcpy(PC.error, "'"OPTION_APPEND_METHODS"' option should be used straight after @"CLASS_NAME);
+ // marks the new class as partial. we will be able to add methods here later.
+ PC.cclass_new->set_partial();
}
+ } else {
+ strcpy(PC.error, "'"OPTION_PARTIAL_CLASS"' option should be used straight after @"CLASS_NAME);
YYERROR;
}
+ } else if(option==method_call_type_static){
+ PC.set_methods_call_type(Method::CT_STATIC);
+ } else if(option==method_call_type_dynamic){
+ PC.set_methods_call_type(Method::CT_DYNAMIC);
} else {
strcpy(PC.error, "'");
strncat(PC.error, option.cstr(), MAX_STRING/2);
strcat(PC.error, "' invalid option. valid options are "
- "'"OPTION_APPEND_METHODS"' and '"OPTION_ALL_VARS_LOCAL_NAME"'");
+ "'"OPTION_PARTIAL_CLASS"', '"OPTION_ALL_VARS_LOCAL_NAME"'"
+ ", '"METHOD_CALL_TYPE_STATIC"' and '"METHOD_CALL_TYPE_DYNAMIC"'"
+ );
YYERROR;
}
}
@@ -1536,17 +1857,21 @@ yyreduce:
break;
case 13:
-#line 241 "compile.y"
- { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;}
+
+/* Line 1455 of yacc.c */
+#line 255 "compile.y"
+ { (yyval)=(yyvsp[(1) - (2)]); P(*(yyval), *(yyvsp[(2) - (2)])); ;}
break;
case 17:
-#line 245 "compile.y"
+
+/* Line 1455 of yacc.c */
+#line 259 "compile.y"
{
PC.class_add();
PC.explicit_result=false;
- YYSTYPE params_names_code=yyvsp[-3];
+ YYSTYPE params_names_code=(yyvsp[(3) - (6)]);
ArrayString* params_names=0;
if(int size=params_names_code->count()) {
params_names=new ArrayString;
@@ -1554,7 +1879,7 @@ yyreduce:
*params_names+=LA2S(*params_names_code, i);
}
- YYSTYPE locals_names_code=yyvsp[-2];
+ YYSTYPE locals_names_code=(yyvsp[(4) - (6)]);
ArrayString* locals_names=0;
bool all_vars_local=false;
if(int size=locals_names_code->count()) {
@@ -1569,712 +1894,1029 @@ yyreduce:
*locals_names+=local_name;
}
}
- if(!all_vars_local && PC.cclass && PC.cclass->is_vars_local()){
+ if(!all_vars_local && PC.cclass && PC.cclass->is_vars_local())
all_vars_local=true;
- }
Method* method=new Method(
//name,
- Method::CT_ANY,
+ GetMethodCallType(PC, *(yyvsp[(2) - (6)])),
0, 0/*min,max numbered_params_count*/,
params_names, locals_names,
0/*to be filled later in next {} */, 0, all_vars_local);
- *reinterpret_cast(&yyval)=method;
-
- // todo: check [][;result;]
+ *reinterpret_cast(&(yyval))=method;
;}
break;
case 18:
-#line 286 "compile.y"
+
+/* Line 1455 of yacc.c */
+#line 297 "compile.y"
{
- Method& method=*reinterpret_cast(yyvsp[-1]);
- // fill in the code
- method.parser_code=yyvsp[0];
- // register in class
- const String& name=*LA2S(*yyvsp[-6]);
- PC.cclass->add_method(PC.alias_method(name), method);
+ Method* method=reinterpret_cast((yyvsp[(7) - (8)]));
+ // fill in the code
+ method->parser_code=(yyvsp[(8) - (8)]);
+
+ // register in class
+ const String& name=*LA2S(*(yyvsp[(2) - (8)]));
+ PC.cclass->set_method(PC.alias_method(name), method);
;}
break;
case 21:
-#line 296 "compile.y"
- {yyval=yyvsp[-1];}
+
+/* Line 1455 of yacc.c */
+#line 308 "compile.y"
+ {(yyval)=(yyvsp[(2) - (3)]);;}
break;
case 25:
-#line 298 "compile.y"
- { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ;}
+
+/* Line 1455 of yacc.c */
+#line 310 "compile.y"
+ { (yyval)=(yyvsp[(1) - (3)]); P(*(yyval), *(yyvsp[(3) - (3)])); ;}
break;
case 31:
-#line 306 "compile.y"
- { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;}
+
+/* Line 1455 of yacc.c */
+#line 318 "compile.y"
+ { (yyval)=(yyvsp[(1) - (2)]); P(*(yyval), *(yyvsp[(2) - (2)])); ;}
break;
case 37:
-#line 312 "compile.y"
+
+/* Line 1455 of yacc.c */
+#line 324 "compile.y"
{
- yyval=yyvsp[0]; /* stack: resulting value */
- changetail_or_append(*yyval,
- OP_GET_ELEMENT, false, /*->*/OP_GET_ELEMENT__WRITE,
- /*or */OP_WRITE_VALUE
- ); /* value=pop; wcontext.write(value) */
+ (yyval)=N();
+ YYSTYPE code=(yyvsp[(1) - (1)]);
+ size_t count=code->count();
+
+#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT
+ if(
+ count!=3
+ || !maybe_change_first_opcode(*code, OP::OP_VALUE__GET_ELEMENT, /*=>*/OP::OP_VALUE__GET_ELEMENT__WRITE)
+ )
+#endif
+
+#ifdef OPTIMIZE_BYTECODE_GET_SELF_ELEMENT
+ if(
+ count!=3
+ || !maybe_change_first_opcode(*code, OP::OP_WITH_SELF__VALUE__GET_ELEMENT, /*=>*/OP::OP_WITH_SELF__VALUE__GET_ELEMENT__WRITE)
+ )
+#endif
+
+#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT
+ if(
+ count!=5
+ || !maybe_change_first_opcode(*code, OP::OP_GET_OBJECT_ELEMENT, /*=>*/OP::OP_GET_OBJECT_ELEMENT__WRITE)
+ )
+#endif
+
+#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT
+ if(
+ count!=5
+ || !maybe_change_first_opcode(*code, OP::OP_GET_OBJECT_VAR_ELEMENT, /*=>*/OP::OP_GET_OBJECT_VAR_ELEMENT__WRITE)
+ )
+#endif
+ {
+ changetail_or_append(*code,
+ OP::OP_GET_ELEMENT, false, /*=>*/OP::OP_GET_ELEMENT__WRITE,
+ /*or */OP::OP_WRITE_VALUE
+ ); /* value=pop; wcontext.write(value) */
+ }
+
+ P(*(yyval), *code);
;}
break;
case 38:
-#line 319 "compile.y"
- { yyval=yyvsp[0] ;}
+
+/* Line 1455 of yacc.c */
+#line 365 "compile.y"
+ { (yyval)=(yyvsp[(2) - (2)]); ;}
break;
case 41:
-#line 321 "compile.y"
- { yyval=yyvsp[-1] ;}
+
+/* Line 1455 of yacc.c */
+#line 367 "compile.y"
+ { (yyval)=(yyvsp[(2) - (3)]); ;}
break;
case 44:
-#line 325 "compile.y"
+
+/* Line 1455 of yacc.c */
+#line 371 "compile.y"
{
- yyval=N();
- ArrayOperation* diving_code=yyvsp[0];
- const String* first_name=LA2S(*diving_code);
- // self.xxx... -> xxx...
- // OP_VALUE+origin+string+OP_GET_ELEMENT+... -> OP_WITH_SELF+...
- if(first_name && *first_name==SELF_ELEMENT_NAME) {
- O(*yyval, OP_WITH_SELF); /* stack: starting context */
- P(*yyval, *diving_code,
- /* skip over... */
- diving_code->count()>=4?4/*OP_VALUE+origin+string+OP_GET_ELEMENTx*/:3/*OP_+origin+string*/);
+ (yyval)=N();
+ YYSTYPE diving_code=(yyvsp[(1) - (1)]);
+ size_t count=diving_code->count();
+
+ if(maybe_make_self(*(yyval), *diving_code, count)) {
+ // $self.
+ } else
+
+#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT
+ if(maybe_make_get_object_element(*(yyval), *diving_code, count)){
+ // optimization for $object.field + ^object.method[
+ } else
+#endif
+
+#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT
+ if(maybe_make_get_object_var_element(*(yyval), *diving_code, count)){
+ // optimization for $object.$var
+ } else
+#endif
+
+#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT
+ if(
+ count>=4
+ && (*diving_code)[0].code==OP::OP_VALUE
+ && (*diving_code)[3].code==OP::OP_GET_ELEMENT
+ ){
+ // optimization
+ O(*(yyval),
+ (PC.in_call_value && count==4)
+ ? OP::OP_VALUE__GET_ELEMENT_OR_OPERATOR // ^object[ : OP_VALUE+origin+string+OP_GET_ELEMENT => OP_VALUE__GET_ELEMENT_OR_OPERATOR+origin+string
+ : OP::OP_VALUE__GET_ELEMENT // $object : OP_VALUE+origin+string+OP_GET_ELEMENT => OP_VALUE__GET_ELEMENT+origin+string
+ );
+ P(*(yyval), *diving_code, 1/*offset*/, 2/*limit*/); // copy origin+value
+ if(count>4)
+ P(*(yyval), *diving_code, 4); // copy tail
} else {
- O(*yyval, OP_WITH_READ); /* stack: starting context */
+ O(*(yyval), OP::OP_WITH_READ); /* stack: starting context */
+ P(*(yyval), *diving_code);
+ }
+#else
+ {
+ O(*(yyval), OP::OP_WITH_READ); /* stack: starting context */
- // ^if ELEMENT -> ^if ELEMENT_OR_OPERATOR
- // OP_VALUE+origin+string+OP_GET_ELEMENT. -> OP_VALUE+origin+string+OP_GET_ELEMENT_OR_OPERATOR.
- if(PC.in_call_value && diving_code->count()==4)
- diving_code->put(4-1, OP_GET_ELEMENT_OR_OPERATOR);
- P(*yyval, *diving_code);
+ // ^if OP_ELEMENT => ^if OP_ELEMENT_OR_OPERATOR
+ // optimized OP_VALUE+origin+string+OP_GET_ELEMENT. => OP_VALUE+origin+string+OP_GET_ELEMENT_OR_OPERATOR.
+ if(PC.in_call_value && count==4)
+ diving_code->put(count-1, OP::OP_GET_ELEMENT_OR_OPERATOR);
+ P(*(yyval), *diving_code);
}
+#endif
/* diving code; stack: current context */
;}
break;
case 45:
-#line 347 "compile.y"
- { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;}
+
+/* Line 1455 of yacc.c */
+#line 424 "compile.y"
+ { (yyval)=(yyvsp[(1) - (2)]); P(*(yyval), *(yyvsp[(2) - (2)])); ;}
break;
case 47:
-#line 348 "compile.y"
- { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;}
+
+/* Line 1455 of yacc.c */
+#line 425 "compile.y"
+ { (yyval)=(yyvsp[(1) - (2)]); P(*(yyval), *(yyvsp[(2) - (2)])); ;}
break;
case 48:
-#line 352 "compile.y"
+
+/* Line 1455 of yacc.c */
+#line 429 "compile.y"
{
- yyval=yyvsp[-1]; /* stack: context,name */
- P(*yyval, *yyvsp[0]); /* stack: context,name,constructor_value */
+ (yyval)=N();
+#ifdef OPTIMIZE_BYTECODE_CONSTRUCT
+ if(maybe_optimize_construct(*(yyval), *(yyvsp[(2) - (3)]), *(yyvsp[(3) - (3)]))){
+ // $a(expr), $.a(expr), $a[value], $.a[value], $self.a[value], $self.a(expr)
+ } else
+#endif
+ {
+ P(*(yyval), *(yyvsp[(2) - (3)])); /* stack: context,name */
+ P(*(yyval), *(yyvsp[(3) - (3)])); /* stack: context,name,constructor_value */
+ }
;}
break;
case 52:
-#line 360 "compile.y"
+
+/* Line 1455 of yacc.c */
+#line 445 "compile.y"
{
- yyval=N();
- ArrayOperation* diving_code=yyvsp[0];
- const String* first_name=LA2S(*diving_code);
- // $self.xxx... -> $xxx...
- // OP_VALUE+origin+string+OP_GET_ELEMENT+... -> OP_WITH_SELF+...
- if(first_name && *first_name==SELF_ELEMENT_NAME) {
- O(*yyval, OP_WITH_SELF); /* stack: starting context */
- P(*yyval, *diving_code,
- /* skip over... */
- diving_code->count()>=4?4/*OP_VALUE+origin+string+OP_GET_ELEMENTx*/:3/*OP_+origin+string*/);
- } else {
- O(*yyval, OP_WITH_ROOT); /* stack: starting context */
- P(*yyval, *diving_code);
+ (yyval)=N();
+ YYSTYPE diving_code=(yyvsp[(1) - (1)]);
+ size_t count=diving_code->count();
+
+ if(maybe_make_self(*(yyval), *diving_code, count)) {
+ // $self.
+ } else
+#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT
+ if(
+ count>=4
+ && (*diving_code)[0].code==OP::OP_VALUE
+ && (*diving_code)[3].code==OP::OP_GET_ELEMENT
+ ){
+ O(*(yyval), OP::OP_WITH_ROOT__VALUE__GET_ELEMENT);
+ P(*(yyval), *diving_code, 1/*offset*/, 2/*limit*/); // copy origin+value
+ if(count>4)
+ P(*(yyval), *diving_code, 4); // tail
+ } else
+#endif
+ {
+ O(*(yyval), OP::OP_WITH_ROOT); /* stack: starting context */
+ P(*(yyval), *diving_code);
}
/* diving code; stack: current context */
;}
break;
case 53:
-#line 377 "compile.y"
+
+/* Line 1455 of yacc.c */
+#line 471 "compile.y"
{
- yyval=N();
- O(*yyval, OP_WITH_WRITE); /* stack: starting context */
- P(*yyval, *yyvsp[0]); /* diving code; stack: context,name */
+ (yyval)=N();
+ O(*(yyval), OP::OP_WITH_WRITE); /* stack: starting context */
+ P(*(yyval), *(yyvsp[(2) - (2)])); /* diving code; stack: context,name */
;}
break;
case 54:
-#line 382 "compile.y"
- { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;}
+
+/* Line 1455 of yacc.c */
+#line 476 "compile.y"
+ { (yyval)=(yyvsp[(1) - (2)]); P(*(yyval), *(yyvsp[(2) - (2)])); ;}
break;
case 58:
-#line 389 "compile.y"
+
+/* Line 1455 of yacc.c */
+#line 483 "compile.y"
{
// allow $result_or_other_variable[ letters here any time ]
- *reinterpret_cast(&yyval)=PC.explicit_result; PC.explicit_result=false;
+ *reinterpret_cast(&(yyval))=PC.explicit_result; PC.explicit_result=false;
;}
break;
case 59:
-#line 392 "compile.y"
+
+/* Line 1455 of yacc.c */
+#line 486 "compile.y"
{
- PC.explicit_result=*reinterpret_cast(&yyvsp[-1]);
+ PC.explicit_result=*reinterpret_cast(&(yyvsp[(2) - (3)]));
;}
break;
case 60:
-#line 394 "compile.y"
+
+/* Line 1455 of yacc.c */
+#line 488 "compile.y"
{
// stack: context, name
- yyval=yyvsp[-2]; // stack: context, name, value
- O(*yyval, OP_CONSTRUCT_VALUE); /* value=pop; name=pop; context=pop; construct(context,name,value) */
+ (yyval)=(yyvsp[(3) - (5)]); // stack: context, name, value
+ O(*(yyval), OP::OP_CONSTRUCT_VALUE); /* value=pop; name=pop; context=pop; construct(context,name,value) */
;}
break;
case 61:
-#line 400 "compile.y"
+
+/* Line 1455 of yacc.c */
+#line 494 "compile.y"
{
- yyval=N();
- O(*yyval, OP_PREPARE_TO_EXPRESSION);
+ (yyval)=N();
+ O(*(yyval), OP::OP_PREPARE_TO_EXPRESSION);
// stack: context, name
- P(*yyval, *yyvsp[-1]); // stack: context, name, value
- O(*yyval, OP_CONSTRUCT_EXPR); /* value=pop->as_expr_result; name=pop; context=pop; construct(context,name,value) */
+ P(*(yyval), *(yyvsp[(2) - (3)])); // stack: context, name, value
+ O(*(yyval), OP::OP_CONSTRUCT_EXPR); /* value=pop->as_expr_result; name=pop; context=pop; construct(context,name,value) */
;}
break;
case 62:
-#line 408 "compile.y"
+
+/* Line 1455 of yacc.c */
+#line 502 "compile.y"
{
// stack: context, name
- yyval=N();
- OA(*yyval, OP_CURLY_CODE__CONSTRUCT, yyvsp[-1]); /* code=pop; name=pop; context=pop; construct(context,name,junction(code)) */
+ (yyval)=N();
+ OA(*(yyval), OP::OP_CURLY_CODE__CONSTRUCT, (yyvsp[(2) - (3)])); /* code=pop; name=pop; context=pop; construct(context,name,junction(code)) */
;}
break;
case 66:
-#line 419 "compile.y"
+
+/* Line 1455 of yacc.c */
+#line 513 "compile.y"
{
- yyval=N();
- OA(*yyval, OP_OBJECT_POOL, yyvsp[0]); /* stack: empty write context */
+ (yyval)=N();
+ OA(*(yyval), OP::OP_OBJECT_POOL, (yyvsp[(1) - (1)])); /* stack: empty write context */
/* some code that writes to that context */
/* context=pop; stack: context.value() */
;}
break;
case 69:
-#line 426 "compile.y"
- { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;}
+
+/* Line 1455 of yacc.c */
+#line 520 "compile.y"
+ { (yyval)=(yyvsp[(1) - (2)]); P(*(yyval), *(yyvsp[(2) - (2)])); ;}
break;
case 70:
-#line 430 "compile.y"
+
+/* Line 1455 of yacc.c */
+#line 524 "compile.y"
{
- yyval=yyvsp[0]; /* stack: value */
- changetail_or_append(*yyval,
- OP_CALL, true, /*->*/ OP_CALL__WRITE,
- /*or */OP_WRITE_VALUE); /* value=pop; wcontext.write(value) */
+#ifdef OPTIMIZE_BYTECODE_CUT_REM_OPERATOR
+ if((*(yyvsp[(1) - (1)])).count())
+#endif
+ {
+ (yyval)=(yyvsp[(1) - (1)]); /* stack: value */
+ if(!maybe_change_first_opcode(*(yyval), OP::OP_CONSTRUCT_OBJECT, /*=>*/OP::OP_CONSTRUCT_OBJECT__WRITE))
+ changetail_or_append(*(yyval),
+ OP::OP_CALL, true, /*=>*/ OP::OP_CALL__WRITE,
+ /*or */OP::OP_WRITE_VALUE); /* value=pop; wcontext.write(value) */
+ }
;}
break;
case 71:
-#line 436 "compile.y"
+
+/* Line 1455 of yacc.c */
+#line 536 "compile.y"
{
PC.in_call_value=true;
;}
break;
case 72:
-#line 439 "compile.y"
+
+/* Line 1455 of yacc.c */
+#line 539 "compile.y"
{
PC.in_call_value=false;
;}
break;
case 73:
-#line 442 "compile.y"
+
+/* Line 1455 of yacc.c */
+#line 542 "compile.y"
{ /* ^field.$method{vasya} */
- yyval=yyvsp[-3]; /* with_xxx,diving code; stack: context,method_junction */
+#ifdef OPTIMIZE_BYTECODE_CUT_REM_OPERATOR
+#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT
+ const String* operator_name=LA2S(*(yyvsp[(3) - (6)]), 0, OP::OP_VALUE__GET_ELEMENT_OR_OPERATOR);
+#else
+ const String* operator_name=LA2S(*(yyvsp[(3) - (6)]), 1);
+#endif
+ if(operator_name && *operator_name==REM_OPERATOR_NAME){
+ (yyval)=N();
+ } else
+#endif
+ {
+ YYSTYPE params_code=(yyvsp[(5) - (6)]);
+ if(params_code->count()==3) { // probably [] case. [OP::OP_VALUE+origin+Void]
+ if(Value* value=LA2V(*params_code)) // it is OP_VALUE+origin+value?
+ if(const String * string=value->get_string())
+ if(string->is_empty()) // value is empty string?
+ params_code=0; // ^zzz[] case. don't append lone empty param.
+ }
+ /* stack: context, method_junction */
- YYSTYPE params_code=yyvsp[-1];
- if(params_code->count()==4) { // probably [] case. [OP_VALUE+origin+Void+STORE_PARAM]
- if(Value* value=LA2V(*params_code)) // it is OP_VALUE+origin+value?
- if(value->is_void()) // value is VVoid?
- params_code=0; // ^zzz[] case. don't append lone empty param.
- }
- /* stack: context, method_junction */
- OA(*yyval, OP_CALL, params_code); // method_frame=make frame(pop junction); ncontext=pop; call(ncontext,method_frame) stack: value
+ YYSTYPE var_code=(yyvsp[(3) - (6)]);
+ if(
+ var_code->count()==8
+ && (*var_code)[0].code==OP::OP_VALUE__GET_CLASS
+ && (*var_code)[3].code==OP::OP_PREPARE_TO_CONSTRUCT_OBJECT
+ && (*var_code)[4].code==OP::OP_VALUE
+ && (*var_code)[7].code==OP::OP_GET_ELEMENT
+ ){
+ yyval=N();
+ O(*(yyval), OP::OP_CONSTRUCT_OBJECT);
+ P(*(yyval), *var_code, 1/*offset*/, 2/*limit*/); // class name
+ P(*(yyval), *var_code, 5/*offset*/, 2/*limit*/); // constructor name
+ OA(*(yyval), params_code);
+ } else
+ {
+ (yyval)=var_code; /* with_xxx,diving code; stack: context,method_junction */
+ OA(*(yyval), OP::OP_CALL, params_code); // method_frame=make frame(pop junction); ncontext=pop; call(ncontext,method_frame) stack: value
+ }
+ }
;}
break;
case 76:
-#line 457 "compile.y"
- { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;}
+
+/* Line 1455 of yacc.c */
+#line 586 "compile.y"
+ { (yyval)=(yyvsp[(1) - (2)]); P(*(yyval), *(yyvsp[(2) - (2)])); ;}
break;
case 80:
-#line 463 "compile.y"
+
+/* Line 1455 of yacc.c */
+#line 592 "compile.y"
{
// allow ^call[ letters here any time ]
- *reinterpret_cast(&yyval)=PC.explicit_result; PC.explicit_result=false;
+ *reinterpret_cast(&(yyval))=PC.explicit_result; PC.explicit_result=false;
;}
break;
case 81:
-#line 466 "compile.y"
+
+/* Line 1455 of yacc.c */
+#line 595 "compile.y"
{
- PC.explicit_result=*reinterpret_cast(&yyvsp[-1]);
+ PC.explicit_result=*reinterpret_cast(&(yyvsp[(2) - (3)]));
;}
break;
case 82:
-#line 468 "compile.y"
- {yyval=yyvsp[-2];}
+
+/* Line 1455 of yacc.c */
+#line 597 "compile.y"
+ {(yyval)=(yyvsp[(3) - (5)]);;}
break;
case 83:
-#line 469 "compile.y"
- {yyval=yyvsp[-1];}
+
+/* Line 1455 of yacc.c */
+#line 598 "compile.y"
+ {(yyval)=(yyvsp[(2) - (3)]);;}
break;
case 84:
-#line 470 "compile.y"
- {yyval=yyvsp[-1];}
+
+/* Line 1455 of yacc.c */
+#line 599 "compile.y"
+ {(yyval)=(yyvsp[(2) - (3)]);;}
break;
case 86:
-#line 473 "compile.y"
- { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ;}
+
+/* Line 1455 of yacc.c */
+#line 602 "compile.y"
+ { (yyval)=(yyvsp[(1) - (3)]); P(*(yyval), *(yyvsp[(3) - (3)])); ;}
break;
case 88:
-#line 477 "compile.y"
- { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ;}
+
+/* Line 1455 of yacc.c */
+#line 606 "compile.y"
+ { (yyval)=(yyvsp[(1) - (3)]); P(*(yyval), *(yyvsp[(3) - (3)])); ;}
break;
case 90:
-#line 481 "compile.y"
- { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ;}
+
+/* Line 1455 of yacc.c */
+#line 610 "compile.y"
+ { (yyval)=(yyvsp[(1) - (3)]); P(*(yyval), *(yyvsp[(3) - (3)])); ;}
break;
case 91:
-#line 483 "compile.y"
+
+/* Line 1455 of yacc.c */
+#line 612 "compile.y"
{
- yyval=yyvsp[0];
- O(*yyval, OP_STORE_PARAM);
+ (yyval)=(yyvsp[(1) - (1)]);
;}
break;
case 92:
-#line 487 "compile.y"
+
+/* Line 1455 of yacc.c */
+#line 615 "compile.y"
{
- YYSTYPE expr_code=yyvsp[0];
+ YYSTYPE expr_code=(yyvsp[(1) - (1)]);
if(expr_code->count()==3
- && (*expr_code)[0].code==OP_VALUE) { // optimizing (double/bool/incidently 'string' too) case. [OP_VALUE+origin+Double]
- yyval=expr_code;
- O(*yyval, OP_STORE_PARAM); // no evaluating
+ && (*expr_code)[0].code==OP::OP_VALUE) { // optimizing (double/bool/incidently 'string' too) case. [OP::OP_VALUE+origin+Double]. no evaluating
+ (yyval)=expr_code;
} else {
- ArrayOperation* code=N();
- O(*code, OP_PREPARE_TO_EXPRESSION);
+ YYSTYPE code=N();
+ O(*code, OP::OP_PREPARE_TO_EXPRESSION);
P(*code, *expr_code);
- O(*code, OP_WRITE_EXPR_RESULT);
- yyval=N();
- OA(*yyval, OP_EXPR_CODE__STORE_PARAM, code);
+ O(*code, OP::OP_WRITE_EXPR_RESULT);
+ (yyval)=N();
+ OA(*(yyval), OP::OP_EXPR_CODE__STORE_PARAM, code);
}
;}
break;
case 93:
-#line 502 "compile.y"
+
+/* Line 1455 of yacc.c */
+#line 629 "compile.y"
{
- yyval=N();
- OA(*yyval, OP_CURLY_CODE__STORE_PARAM, yyvsp[0]);
+ (yyval)=N();
+ OA(*(yyval), OP::OP_CURLY_CODE__STORE_PARAM, (yyvsp[(1) - (1)]));
;}
break;
case 98:
-#line 514 "compile.y"
- { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;}
+
+/* Line 1455 of yacc.c */
+#line 641 "compile.y"
+ { (yyval)=(yyvsp[(1) - (2)]); P(*(yyval), *(yyvsp[(2) - (2)])); ;}
break;
case 100:
-#line 516 "compile.y"
- { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;}
+
+/* Line 1455 of yacc.c */
+#line 643 "compile.y"
+ { (yyval)=(yyvsp[(1) - (2)]); P(*(yyval), *(yyvsp[(2) - (2)])); ;}
break;
case 102:
-#line 518 "compile.y"
+
+/* Line 1455 of yacc.c */
+#line 645 "compile.y"
{
// we know that name_advance1 not called from ^xxx context
// so we'll not check for operator call possibility as we do in name_advance2
/* stack: context */
- yyval=yyvsp[0]; /* stack: context,name */
- O(*yyval, OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */
+ (yyval)=(yyvsp[(1) - (1)]); /* stack: context,name */
+ O(*(yyval), OP::OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */
;}
break;
case 103:
-#line 526 "compile.y"
+
+/* Line 1455 of yacc.c */
+#line 653 "compile.y"
{
/* stack: context */
- yyval=yyvsp[0]; /* stack: context,name */
- O(*yyval, OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */
+ (yyval)=(yyvsp[(1) - (1)]); /* stack: context,name */
+ O(*(yyval), OP::OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */
;}
break;
case 109:
-#line 539 "compile.y"
+
+/* Line 1455 of yacc.c */
+#line 666 "compile.y"
{
- yyval=yyvsp[0];
- O(*yyval, OP_GET_ELEMENT);
+ (yyval)=(yyvsp[(2) - (2)]);
+ O(*(yyval), OP::OP_GET_ELEMENT);
;}
break;
case 110:
-#line 543 "compile.y"
+
+/* Line 1455 of yacc.c */
+#line 670 "compile.y"
{
- ArrayOperation* code;
+ YYSTYPE code;
{
- change_string_literal_to_write_string_literal(*(code=yyvsp[-1]));
- P(*code, *yyvsp[0]);
+ change_string_literal_to_write_string_literal(*(code=(yyvsp[(1) - (2)])));
+ P(*code, *(yyvsp[(2) - (2)]));
}
- yyval=N();
- OA(*yyval, OP_STRING_POOL, code);
+ (yyval)=N();
+ OA(*(yyval), OP::OP_STRING_POOL, code);
;}
break;
case 111:
-#line 552 "compile.y"
+
+/* Line 1455 of yacc.c */
+#line 679 "compile.y"
{
// allow $result_or_other_variable[ letters here any time ]
- *reinterpret_cast(&yyval)=PC.explicit_result; PC.explicit_result=false;
+ *reinterpret_cast(&(yyval))=PC.explicit_result; PC.explicit_result=false;
;}
break;
case 112:
-#line 555 "compile.y"
+
+/* Line 1455 of yacc.c */
+#line 682 "compile.y"
{
- PC.explicit_result=*reinterpret_cast(&yyvsp[-1]);
+ PC.explicit_result=*reinterpret_cast(&(yyvsp[(2) - (3)]));
;}
break;
case 113:
-#line 557 "compile.y"
+
+/* Line 1455 of yacc.c */
+#line 684 "compile.y"
{
- yyval=N();
- OA(*yyval, OP_OBJECT_POOL, yyvsp[-2]); /* stack: empty write context */
+ (yyval)=N();
+ OA(*(yyval), OP::OP_OBJECT_POOL, (yyvsp[(3) - (5)])); /* stack: empty write context */
/* some code that writes to that context */
/* context=pop; stack: context.value() */
;}
break;
case 114:
-#line 563 "compile.y"
+
+/* Line 1455 of yacc.c */
+#line 690 "compile.y"
{
- yyval=N();
- O(*yyval, OP_WITH_READ);
- P(*yyval, *yyvsp[0]);
+ (yyval)=N();
+ O(*(yyval), OP::OP_WITH_READ);
+ P(*(yyval), *(yyvsp[(1) - (1)]));
;}
break;
case 116:
-#line 568 "compile.y"
- { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;}
+
+/* Line 1455 of yacc.c */
+#line 695 "compile.y"
+ { (yyval)=(yyvsp[(1) - (2)]); P(*(yyval), *(yyvsp[(2) - (2)])); ;}
break;
case 117:
-#line 569 "compile.y"
+
+/* Line 1455 of yacc.c */
+#line 696 "compile.y"
{
- yyval=yyvsp[0];
- O(*yyval, OP_GET_ELEMENT__WRITE);
+ (yyval)=(yyvsp[(2) - (2)]);
+ O(*(yyval), OP::OP_GET_ELEMENT__WRITE);
;}
break;
case 120:
-#line 578 "compile.y"
+
+/* Line 1455 of yacc.c */
+#line 705 "compile.y"
{
- yyval=yyvsp[-1]; // stack: class name string
- if(*LA2S(*yyval) == BASE_NAME) { // pseudo BASE class
+ (yyval)=(yyvsp[(1) - (2)]); // stack: class name string
+ if(*LA2S(*(yyval)) == BASE_NAME) { // pseudo BASE class
if(VStateless_class* base=PC.cclass->base_class()) {
- change_string_literal_value(*yyval, base->name());
+ change_string_literal_value(*(yyval), base->name());
} else {
strcpy(PC.error, "no base class declared");
YYERROR;
}
}
- O(*yyval, OP_GET_CLASS);
+ // optimized OP_VALUE+origin+string+OP_GET_CLASS => OP_VALUE__GET_CLASS+origin+string
+ maybe_change_first_opcode(*(yyval), OP::OP_VALUE, OP::OP_VALUE__GET_CLASS);
;}
break;
case 121:
-#line 590 "compile.y"
+
+/* Line 1455 of yacc.c */
+#line 718 "compile.y"
{
- yyval=yyvsp[-1];
+ (yyval)=(yyvsp[(1) - (2)]);
if(!PC.in_call_value) {
strcpy(PC.error, ":: not allowed here");
YYERROR;
}
- O(*yyval, OP_PREPARE_TO_CONSTRUCT_OBJECT);
+ O(*(yyval), OP::OP_PREPARE_TO_CONSTRUCT_OBJECT);
;}
break;
case 128:
-#line 609 "compile.y"
- { yyval = yyvsp[-1] ;}
+
+/* Line 1455 of yacc.c */
+#line 737 "compile.y"
+ { (yyval) = (yyvsp[(2) - (3)]); ;}
break;
case 129:
-#line 610 "compile.y"
- { yyval = yyvsp[-1] ;}
+
+/* Line 1455 of yacc.c */
+#line 738 "compile.y"
+ { (yyval) = (yyvsp[(2) - (3)]); ;}
break;
case 130:
-#line 611 "compile.y"
- { yyval = yyvsp[-1]; ;}
+
+/* Line 1455 of yacc.c */
+#line 739 "compile.y"
+ { (yyval) = (yyvsp[(2) - (3)]); ;}
break;
case 131:
-#line 613 "compile.y"
- { yyval=yyvsp[0]; O(*yyval, OP_NEG) ;}
+
+/* Line 1455 of yacc.c */
+#line 741 "compile.y"
+ { (yyval)=(yyvsp[(2) - (2)]); O(*(yyval), OP::OP_NEG); ;}
break;
case 132:
-#line 614 "compile.y"
- { yyval=yyvsp[0] ;}
+
+/* Line 1455 of yacc.c */
+#line 742 "compile.y"
+ { (yyval)=(yyvsp[(2) - (2)]); ;}
break;
case 133:
-#line 615 "compile.y"
- { yyval=yyvsp[0]; O(*yyval, OP_INV) ;}
+
+/* Line 1455 of yacc.c */
+#line 743 "compile.y"
+ { (yyval)=(yyvsp[(2) - (2)]); O(*(yyval), OP::OP_INV); ;}
break;
case 134:
-#line 616 "compile.y"
- { yyval=yyvsp[0]; O(*yyval, OP_NOT) ;}
+
+/* Line 1455 of yacc.c */
+#line 744 "compile.y"
+ { (yyval)=(yyvsp[(2) - (2)]); O(*(yyval), OP::OP_NOT); ;}
break;
case 135:
-#line 617 "compile.y"
- { yyval=yyvsp[0]; O(*yyval, OP_DEF) ;}
+
+/* Line 1455 of yacc.c */
+#line 745 "compile.y"
+ { (yyval)=(yyvsp[(2) - (2)]); O(*(yyval), OP::OP_DEF); ;}
break;
case 136:
-#line 618 "compile.y"
- { yyval=yyvsp[0]; O(*yyval, OP_IN) ;}
+
+/* Line 1455 of yacc.c */
+#line 746 "compile.y"
+ { (yyval)=(yyvsp[(2) - (2)]); O(*(yyval), OP::OP_IN); ;}
break;
case 137:
-#line 619 "compile.y"
- { yyval=yyvsp[0]; O(*yyval, OP_FEXISTS) ;}
+
+/* Line 1455 of yacc.c */
+#line 747 "compile.y"
+ { (yyval)=(yyvsp[(2) - (2)]); O(*(yyval), OP::OP_FEXISTS); ;}
break;
case 138:
-#line 620 "compile.y"
- { yyval=yyvsp[0]; O(*yyval, OP_DEXISTS) ;}
+
+/* Line 1455 of yacc.c */
+#line 748 "compile.y"
+ { (yyval)=(yyvsp[(2) - (2)]); O(*(yyval), OP::OP_DEXISTS); ;}
break;
case 139:
-#line 622 "compile.y"
- { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_SUB) ;}
+
+/* Line 1455 of yacc.c */
+#line 750 "compile.y"
+ { (yyval)=(yyvsp[(1) - (3)]); P(*(yyval), *(yyvsp[(3) - (3)])); O(*(yyval), OP::OP_SUB); ;}
break;
case 140:
-#line 623 "compile.y"
- { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_ADD) ;}
+
+/* Line 1455 of yacc.c */
+#line 751 "compile.y"
+ { (yyval)=(yyvsp[(1) - (3)]); P(*(yyval), *(yyvsp[(3) - (3)])); O(*(yyval), OP::OP_ADD); ;}
break;
case 141:
-#line 624 "compile.y"
- { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_MUL) ;}
+
+/* Line 1455 of yacc.c */
+#line 752 "compile.y"
+ { (yyval)=(yyvsp[(1) - (3)]); P(*(yyval), *(yyvsp[(3) - (3)])); O(*(yyval), OP::OP_MUL); ;}
break;
case 142:
-#line 625 "compile.y"
- { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_DIV) ;}
+
+/* Line 1455 of yacc.c */
+#line 753 "compile.y"
+ { (yyval)=(yyvsp[(1) - (3)]); P(*(yyval), *(yyvsp[(3) - (3)])); O(*(yyval), OP::OP_DIV); ;}
break;
case 143:
-#line 626 "compile.y"
- { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_MOD) ;}
+
+/* Line 1455 of yacc.c */
+#line 754 "compile.y"
+ { (yyval)=(yyvsp[(1) - (3)]); P(*(yyval), *(yyvsp[(3) - (3)])); O(*(yyval), OP::OP_MOD); ;}
break;
case 144:
-#line 627 "compile.y"
- { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_INTDIV) ;}
+
+/* Line 1455 of yacc.c */
+#line 755 "compile.y"
+ { (yyval)=(yyvsp[(1) - (3)]); P(*(yyval), *(yyvsp[(3) - (3)])); O(*(yyval), OP::OP_INTDIV); ;}
break;
case 145:
-#line 628 "compile.y"
- { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_SL) ;}
+
+/* Line 1455 of yacc.c */
+#line 756 "compile.y"
+ { (yyval)=(yyvsp[(1) - (3)]); P(*(yyval), *(yyvsp[(3) - (3)])); O(*(yyval), OP::OP_BIN_SL); ;}
break;
case 146:
-#line 629 "compile.y"
- { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_SR) ;}
+
+/* Line 1455 of yacc.c */
+#line 757 "compile.y"
+ { (yyval)=(yyvsp[(1) - (3)]); P(*(yyval), *(yyvsp[(3) - (3)])); O(*(yyval), OP::OP_BIN_SR); ;}
break;
case 147:
-#line 630 "compile.y"
- { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_AND) ;}
+
+/* Line 1455 of yacc.c */
+#line 758 "compile.y"
+ { (yyval)=(yyvsp[(1) - (3)]); P(*(yyval), *(yyvsp[(3) - (3)])); O(*(yyval), OP::OP_BIN_AND); ;}
break;
case 148:
-#line 631 "compile.y"
- { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_OR) ;}
+
+/* Line 1455 of yacc.c */
+#line 759 "compile.y"
+ { (yyval)=(yyvsp[(1) - (3)]); P(*(yyval), *(yyvsp[(3) - (3)])); O(*(yyval), OP::OP_BIN_OR); ;}
break;
case 149:
-#line 632 "compile.y"
- { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_XOR) ;}
+
+/* Line 1455 of yacc.c */
+#line 760 "compile.y"
+ { (yyval)=(yyvsp[(1) - (3)]); P(*(yyval), *(yyvsp[(3) - (3)])); O(*(yyval), OP::OP_BIN_XOR); ;}
break;
case 150:
-#line 633 "compile.y"
- { yyval=yyvsp[-2]; OA(*yyval, OP_NESTED_CODE, yyvsp[0]); O(*yyval, OP_LOG_AND) ;}
+
+/* Line 1455 of yacc.c */
+#line 761 "compile.y"
+ { (yyval)=(yyvsp[(1) - (3)]); OA(*(yyval), OP::OP_NESTED_CODE, (yyvsp[(3) - (3)])); O(*(yyval), OP::OP_LOG_AND); ;}
break;
case 151:
-#line 634 "compile.y"
- { yyval=yyvsp[-2]; OA(*yyval, OP_NESTED_CODE, yyvsp[0]); O(*yyval, OP_LOG_OR) ;}
+
+/* Line 1455 of yacc.c */
+#line 762 "compile.y"
+ { (yyval)=(yyvsp[(1) - (3)]); OA(*(yyval), OP::OP_NESTED_CODE, (yyvsp[(3) - (3)])); O(*(yyval), OP::OP_LOG_OR); ;}
break;
case 152:
-#line 635 "compile.y"
- { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_LOG_XOR) ;}
+
+/* Line 1455 of yacc.c */
+#line 763 "compile.y"
+ { (yyval)=(yyvsp[(1) - (3)]); P(*(yyval), *(yyvsp[(3) - (3)])); O(*(yyval), OP::OP_LOG_XOR); ;}
break;
case 153:
-#line 636 "compile.y"
- { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_LT) ;}
+
+/* Line 1455 of yacc.c */
+#line 764 "compile.y"
+ { (yyval)=(yyvsp[(1) - (3)]); P(*(yyval), *(yyvsp[(3) - (3)])); O(*(yyval), OP::OP_NUM_LT); ;}
break;
case 154:
-#line 637 "compile.y"
- { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_GT) ;}
+
+/* Line 1455 of yacc.c */
+#line 765 "compile.y"
+ { (yyval)=(yyvsp[(1) - (3)]); P(*(yyval), *(yyvsp[(3) - (3)])); O(*(yyval), OP::OP_NUM_GT); ;}
break;
case 155:
-#line 638 "compile.y"
- { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_LE) ;}
+
+/* Line 1455 of yacc.c */
+#line 766 "compile.y"
+ { (yyval)=(yyvsp[(1) - (3)]); P(*(yyval), *(yyvsp[(3) - (3)])); O(*(yyval), OP::OP_NUM_LE); ;}
break;
case 156:
-#line 639 "compile.y"
- { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_GE) ;}
+
+/* Line 1455 of yacc.c */
+#line 767 "compile.y"
+ { (yyval)=(yyvsp[(1) - (3)]); P(*(yyval), *(yyvsp[(3) - (3)])); O(*(yyval), OP::OP_NUM_GE); ;}
break;
case 157:
-#line 640 "compile.y"
- { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_EQ) ;}
+
+/* Line 1455 of yacc.c */
+#line 768 "compile.y"
+ { (yyval)=(yyvsp[(1) - (3)]); P(*(yyval), *(yyvsp[(3) - (3)])); O(*(yyval), OP::OP_NUM_EQ); ;}
break;
case 158:
-#line 641 "compile.y"
- { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_NE) ;}
+
+/* Line 1455 of yacc.c */
+#line 769 "compile.y"
+ { (yyval)=(yyvsp[(1) - (3)]); P(*(yyval), *(yyvsp[(3) - (3)])); O(*(yyval), OP::OP_NUM_NE); ;}
break;
case 159:
-#line 642 "compile.y"
- { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_LT) ;}
+
+/* Line 1455 of yacc.c */
+#line 770 "compile.y"
+ { (yyval)=(yyvsp[(1) - (3)]); P(*(yyval), *(yyvsp[(3) - (3)])); O(*(yyval), OP::OP_STR_LT); ;}
break;
case 160:
-#line 643 "compile.y"
- { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_GT) ;}
+
+/* Line 1455 of yacc.c */
+#line 771 "compile.y"
+ { (yyval)=(yyvsp[(1) - (3)]); P(*(yyval), *(yyvsp[(3) - (3)])); O(*(yyval), OP::OP_STR_GT); ;}
break;
case 161:
-#line 644 "compile.y"
- { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_LE) ;}
+
+/* Line 1455 of yacc.c */
+#line 772 "compile.y"
+ { (yyval)=(yyvsp[(1) - (3)]); P(*(yyval), *(yyvsp[(3) - (3)])); O(*(yyval), OP::OP_STR_LE); ;}
break;
case 162:
-#line 645 "compile.y"
- { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_GE) ;}
+
+/* Line 1455 of yacc.c */
+#line 773 "compile.y"
+ { (yyval)=(yyvsp[(1) - (3)]); P(*(yyval), *(yyvsp[(3) - (3)])); O(*(yyval), OP::OP_STR_GE); ;}
break;
case 163:
-#line 646 "compile.y"
- { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_EQ) ;}
+
+/* Line 1455 of yacc.c */
+#line 774 "compile.y"
+ { (yyval)=(yyvsp[(1) - (3)]); P(*(yyval), *(yyvsp[(3) - (3)])); O(*(yyval), OP::OP_STR_EQ); ;}
break;
case 164:
-#line 647 "compile.y"
- { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_NE) ;}
+
+/* Line 1455 of yacc.c */
+#line 775 "compile.y"
+ { (yyval)=(yyvsp[(1) - (3)]); P(*(yyval), *(yyvsp[(3) - (3)])); O(*(yyval), OP::OP_STR_NE); ;}
break;
case 165:
-#line 648 "compile.y"
- { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_IS) ;}
+
+/* Line 1455 of yacc.c */
+#line 776 "compile.y"
+ { (yyval)=(yyvsp[(1) - (3)]); P(*(yyval), *(yyvsp[(3) - (3)])); O(*(yyval), OP::OP_IS); ;}
break;
case 166:
-#line 651 "compile.y"
+
+/* Line 1455 of yacc.c */
+#line 779 "compile.y"
{
- // optimized from OP_STRING->OP_VALUE for doubles
- maybe_change_string_literal_to_double_literal(*(yyval=yyvsp[0]));
+ // optimized OP_STRING => OP_VALUE for doubles
+ maybe_change_string_literal_to_double_literal(*((yyval)=(yyvsp[(1) - (1)])));
;}
break;
case 167:
-#line 656 "compile.y"
+
+/* Line 1455 of yacc.c */
+#line 784 "compile.y"
{
- yyval=N();
- OA(*yyval, OP_STRING_POOL, yyvsp[0]); /* stack: empty write context */
+#ifdef OPTIMIZE_BYTECODE_STRING_POOL
+ // it brakes ^if(" 09 "){...}
+ YYSTYPE code=(yyvsp[(1) - (1)]);
+ (yyval)=N();
+ if(code->count()==3 && maybe_change_first_opcode(*code, OP::OP_STRING__WRITE, OP::OP_VALUE)){
+ // optimized OP_STRING__WRITE+origin+value => OP_VALUE+origin+value without starting OP_STRING_POOL
+ P(*(yyval), *code);
+ } else {
+ OA(*(yyval), OP::OP_STRING_POOL, code); /* stack: empty write context */
+ }
+#else
+ (yyval)=N();
+ OA(*(yyval), OP::OP_STRING_POOL, (yyvsp[(1) - (1)])); /* stack: empty write context */
+#endif
/* some code that writes to that context */
/* context=pop; stack: context.get_string() */
;}
break;
case 168:
-#line 665 "compile.y"
+
+/* Line 1455 of yacc.c */
+#line 805 "compile.y"
{
- // optimized from OP_STRING+OP_WRITE_VALUE to OP_STRING__WRITE
- change_string_literal_to_write_string_literal(*(yyval=yyvsp[0]))
+ // optimized OP_STRING+OP_WRITE_VALUE => OP_STRING__WRITE
+ change_string_literal_to_write_string_literal(*((yyval)=(yyvsp[(1) - (1)])));
;}
break;
case 169:
-#line 670 "compile.y"
- { yyval=VL(/*we know that we will not change it*/const_cast(&vvoid), 0, 0, 0) ;}
+
+/* Line 1455 of yacc.c */
+#line 810 "compile.y"
+ { (yyval)=VL(/*we know that we will not change it*/const_cast(&vempty), 0, 0, 0); ;}
break;
case 170:
-#line 671 "compile.y"
- { yyval = VL(/*we know that we will not change it*/const_cast(&vtrue), 0, 0, 0) ;}
+
+/* Line 1455 of yacc.c */
+#line 811 "compile.y"
+ { (yyval) = VL(/*we know that we will not change it*/const_cast(&vtrue), 0, 0, 0); ;}
break;
case 171:
-#line 672 "compile.y"
- { yyval = VL(/*we know that we will not change it*/const_cast(&vfalse), 0, 0, 0) ;}
+
+/* Line 1455 of yacc.c */
+#line 812 "compile.y"
+ { (yyval) = VL(/*we know that we will not change it*/const_cast(&vfalse), 0, 0, 0); ;}
break;
case 172:
-#line 674 "compile.y"
- { yyval=N() ;}
- break;
+/* Line 1455 of yacc.c */
+#line 814 "compile.y"
+ { (yyval)=N(); ;}
+ break;
- }
-/* Line 1010 of yacc.c. */
-#line 2268 "compile.tab.C"
-
- yyvsp -= yylen;
- yyssp -= yylen;
+/* Line 1455 of yacc.c */
+#line 2910 "compile.tab.C"
+ default: break;
+ }
+ YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
+ YYPOPSTACK (yylen);
+ yylen = 0;
YY_STACK_PRINT (yyss, yyssp);
*++yyvsp = yyval;
-
/* 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. */
@@ -2298,66 +2940,41 @@ yyerrlab:
if (!yyerrstatus)
{
++yynerrs;
-#if YYERROR_VERBOSE
- yyn = yypact[yystate];
-
- if (YYPACT_NINF < yyn && yyn < YYLAST)
- {
- YYSIZE_T yysize = 0;
- int yytype = YYTRANSLATE (yychar);
- const char* yyprefix;
- char *yymsg;
- int yyx;
-
- /* Start YYX at -YYN if negative to avoid negative indexes in
- YYCHECK. */
- int yyxbegin = yyn < 0 ? -yyn : 0;
-
- /* Stay within bounds of both yycheck and yytname. */
- int yychecklim = YYLAST - yyn;
- int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
- int yycount = 0;
-
- yyprefix = ", expecting ";
- for (yyx = yyxbegin; yyx < yyxend; ++yyx)
- if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+#if ! YYERROR_VERBOSE
+ yyerror (YY_("syntax error"));
+#else
+ {
+ YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
+ if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
+ {
+ YYSIZE_T yyalloc = 2 * yysize;
+ if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
+ yyalloc = YYSTACK_ALLOC_MAXIMUM;
+ if (yymsg != yymsgbuf)
+ YYSTACK_FREE (yymsg);
+ yymsg = (char *) YYSTACK_ALLOC (yyalloc);
+ if (yymsg)
+ yymsg_alloc = yyalloc;
+ else
{
- yysize += yystrlen (yyprefix) + yystrlen (yytname [yyx]);
- yycount += 1;
- if (yycount == 5)
- {
- yysize = 0;
- break;
- }
+ yymsg = yymsgbuf;
+ yymsg_alloc = sizeof yymsgbuf;
}
- yysize += (sizeof ("syntax error, unexpected ")
- + yystrlen (yytname[yytype]));
- yymsg = (char *) YYSTACK_ALLOC (yysize);
- if (yymsg != 0)
- {
- char *yyp = yystpcpy (yymsg, "syntax error, unexpected ");
- yyp = yystpcpy (yyp, yytname[yytype]);
+ }
- if (yycount < 5)
- {
- yyprefix = ", expecting ";
- for (yyx = yyxbegin; yyx < yyxend; ++yyx)
- if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
- {
- yyp = yystpcpy (yyp, yyprefix);
- yyp = yystpcpy (yyp, yytname[yyx]);
- yyprefix = " or ";
- }
- }
- yyerror (yymsg);
- YYSTACK_FREE (yymsg);
- }
- else
- yyerror ("syntax error; also virtual memory exhausted");
- }
- else
-#endif /* YYERROR_VERBOSE */
- yyerror ("syntax error");
+ if (0 < yysize && yysize <= yymsg_alloc)
+ {
+ (void) yysyntax_error (yymsg, yystate, yychar);
+ yyerror (yymsg);
+ }
+ else
+ {
+ yyerror (YY_("syntax error"));
+ if (yysize != 0)
+ goto yyexhaustedlab;
+ }
+ }
+#endif
}
@@ -2368,25 +2985,16 @@ yyerrlab:
error, discard it. */
if (yychar <= YYEOF)
- {
- /* If at end of input, pop the error token,
- then the rest of the stack, then return failure. */
+ {
+ /* Return failure if at end of input. */
if (yychar == YYEOF)
- for (;;)
- {
- YYPOPSTACK;
- if (yyssp == yyss)
- YYABORT;
- YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
- yydestruct (yystos[*yyssp], yyvsp);
- }
- }
+ YYABORT;
+ }
else
{
- YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc);
- yydestruct (yytoken, &yylval);
+ yydestruct ("Error: discarding",
+ yytoken, &yylval);
yychar = YYEMPTY;
-
}
}
@@ -2400,15 +3008,17 @@ yyerrlab:
`---------------------------------------------------*/
yyerrorlab:
-#ifdef __GNUC__
- /* Pacify GCC when the user code never invokes YYERROR and the label
- yyerrorlab therefore never appears in user code. */
- if (0)
+ /* 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;
-#endif
- yyvsp -= yylen;
- yyssp -= yylen;
+ /* Do not reclaim the symbols of the rule which action triggered
+ this YYERROR. */
+ YYPOPSTACK (yylen);
+ yylen = 0;
+ YY_STACK_PRINT (yyss, yyssp);
yystate = *yyssp;
goto yyerrlab1;
@@ -2437,21 +3047,20 @@ yyerrlab1:
if (yyssp == yyss)
YYABORT;
- YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
- yydestruct (yystos[yystate], yyvsp);
- YYPOPSTACK;
+
+ yydestruct ("Error: popping",
+ yystos[yystate], yyvsp);
+ YYPOPSTACK (1);
yystate = *yyssp;
YY_STACK_PRINT (yyss, yyssp);
}
- if (yyn == YYFINAL)
- YYACCEPT;
-
- YYDPRINTF ((stderr, "Shifting error token, "));
-
*++yyvsp = yylval;
+ /* Shift the error token. */
+ YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
+
yystate = yyn;
goto yynewstate;
@@ -2470,26 +3079,46 @@ yyabortlab:
yyresult = 1;
goto yyreturn;
-#ifndef yyoverflow
-/*----------------------------------------------.
-| yyoverflowlab -- parser overflow comes here. |
-`----------------------------------------------*/
-yyoverflowlab:
- yyerror ("parser stack overflow");
+#if !defined(yyoverflow) || YYERROR_VERBOSE
+/*-------------------------------------------------.
+| yyexhaustedlab -- memory exhaustion comes here. |
+`-------------------------------------------------*/
+yyexhaustedlab:
+ yyerror (YY_("memory exhausted"));
yyresult = 2;
/* Fall through. */
#endif
yyreturn:
+ if (yychar != YYEMPTY)
+ yydestruct ("Cleanup: discarding lookahead",
+ yytoken, &yylval);
+ /* Do not reclaim the symbols of the rule which action triggered
+ this YYABORT or YYACCEPT. */
+ YYPOPSTACK (yylen);
+ YY_STACK_PRINT (yyss, yyssp);
+ while (yyssp != yyss)
+ {
+ yydestruct ("Cleanup: popping",
+ yystos[*yyssp], yyvsp);
+ YYPOPSTACK (1);
+ }
#ifndef yyoverflow
if (yyss != yyssa)
YYSTACK_FREE (yyss);
#endif
- return yyresult;
+#if YYERROR_VERBOSE
+ if (yymsg != yymsgbuf)
+ YYSTACK_FREE (yymsg);
+#endif
+ /* Make sure YYID is used. */
+ return YYID (yyresult);
}
-#line 676 "compile.y"
+
+/* Line 1675 of yacc.c */
+#line 816 "compile.y"
#endif
@@ -3029,7 +3658,7 @@ default:
case ']': case '}': case ')':
case '"': case '\'':
case '<': case '>': // these stand for HTML brackets AND expression binary ops
- case '+': case '*': case '/': case '%':
+ case '+': case '*': case '/': case '\\': case '%':
case '&': case '|':
case '=': case '!':
// common delimiters
@@ -3259,12 +3888,9 @@ default:
break2:
if(end!=begin) { // there is last piece?
- if((c=='@' || c==0) && end[-1]=='\n') { // we are before LS_DEF_NAME or EOF?
- // strip last \n
- end--;
- if(end!=begin && end[-1]=='\n') // allow one empty line before LS_DEF_NAME
+ if(c=='@' || c==0) // we are before LS_DEF_NAME or EOF?
+ while(end!=begin && end[-1]=='\n') // trim all empty lines before LS_DEF_NAME and EOF
end--;
- }
if(end!=begin && pc.ls!=LS_USER_COMMENT) { // last piece still alive and not comment?
if(!pc.string_start)
pc.string_start=begin_pos;
@@ -3299,4 +3925,3 @@ static void yyprint(FILE *file, int type
fprintf(file, " \"%s\"", LA2S(*value)->cstr());
}
-