diff options
Diffstat (limited to 'cpp/src/FreezeScript')
-rw-r--r-- | cpp/src/FreezeScript/Grammar.cpp | 110 | ||||
-rw-r--r-- | cpp/src/FreezeScript/Grammar.h | 7 | ||||
-rw-r--r-- | cpp/src/FreezeScript/Scanner.cpp | 98 | ||||
-rw-r--r-- | cpp/src/FreezeScript/Scanner.l | 14 |
4 files changed, 137 insertions, 92 deletions
diff --git a/cpp/src/FreezeScript/Grammar.cpp b/cpp/src/FreezeScript/Grammar.cpp index 8e47febf5d7..c435a0ad234 100644 --- a/cpp/src/FreezeScript/Grammar.cpp +++ b/cpp/src/FreezeScript/Grammar.cpp @@ -1,10 +1,9 @@ - -/* A Bison parser, made by GNU Bison 2.4.1. */ +/* A Bison parser, made by GNU Bison 2.4.3. */ /* 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. + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006, + 2009, 2010 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 @@ -46,7 +45,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.4.1" +#define YYBISON_VERSION "2.4.3" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -120,7 +119,7 @@ freeze_script_error(const char* s) /* Line 189 of yacc.c */ -#line 124 "Grammar.tab.c" +#line 123 "Grammar.tab.c" /* Enabling traces. */ #ifndef YYDEBUG @@ -191,7 +190,7 @@ typedef int YYSTYPE; /* Line 264 of yacc.c */ -#line 195 "Grammar.tab.c" +#line 194 "Grammar.tab.c" #ifdef short # undef short @@ -241,7 +240,7 @@ typedef short int yytype_int16; #define YYSIZE_MAXIMUM ((YYSIZE_T) -1) #ifndef YY_ -# if YYENABLE_NLS +# if defined YYENABLE_NLS && YYENABLE_NLS # if ENABLE_NLS # include <libintl.h> /* INFRINGES ON USER NAME SPACE */ # define YY_(msgid) dgettext ("bison-runtime", msgid) @@ -646,9 +645,18 @@ static const yytype_uint8 yystos[] = /* Like YYERROR except do call yyerror. This remains here temporarily to ease the transition to the new meaning of YYERROR, for GCC. - Once GCC version 2 has supplanted version 1, this can go. */ + Once GCC version 2 has supplanted version 1, this can go. However, + YYFAIL appears to be in use. Nevertheless, it is formally deprecated + in Bison 2.4.2's NEWS entry, where a plan to phase it out is + discussed. */ #define YYFAIL goto yyerrlab +#if defined YYFAIL + /* This is here to suppress warnings from the GCC cpp's + -Wunused-macros. Normally we don't worry about that warning, but + some users do, and we want to make it easy for users to remove + YYFAIL uses, which will produce warnings from Bison 2.5. */ +#endif #define YYRECOVERING() (!!yyerrstatus) @@ -705,7 +713,7 @@ while (YYID (0)) we won't break user code: when these are the locations we know. */ #ifndef YY_LOCATION_PRINT -# if YYLTYPE_IS_TRIVIAL +# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL # define YY_LOCATION_PRINT(File, Loc) \ fprintf (File, "%d.%d-%d.%d", \ (Loc).first_line, (Loc).first_column, \ @@ -1443,7 +1451,7 @@ yyreduce: { case 2: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 85 "../FreezeScript/Grammar.y" { parseResult = (yyvsp[(1) - (1)]); @@ -1452,7 +1460,7 @@ yyreduce: case 3: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 94 "../FreezeScript/Grammar.y" { (yyval) = (yyvsp[(1) - (1)]); @@ -1461,7 +1469,7 @@ yyreduce: case 4: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 103 "../FreezeScript/Grammar.y" { (yyval) = new BinaryNode(BinOpLess, parseDataFactory, (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)])); @@ -1470,7 +1478,7 @@ yyreduce: case 5: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 107 "../FreezeScript/Grammar.y" { (yyval) = new BinaryNode(BinOpGreater, parseDataFactory, (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)])); @@ -1479,7 +1487,7 @@ yyreduce: case 6: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 111 "../FreezeScript/Grammar.y" { (yyval) = new BinaryNode(BinOpLessEq, parseDataFactory, (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)])); @@ -1488,7 +1496,7 @@ yyreduce: case 7: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 115 "../FreezeScript/Grammar.y" { (yyval) = new BinaryNode(BinOpGrEq, parseDataFactory, (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)])); @@ -1497,7 +1505,7 @@ yyreduce: case 8: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 119 "../FreezeScript/Grammar.y" { (yyval) = new BinaryNode(BinOpEq, parseDataFactory, (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)])); @@ -1506,7 +1514,7 @@ yyreduce: case 9: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 123 "../FreezeScript/Grammar.y" { (yyval) = new BinaryNode(BinOpNotEq, parseDataFactory, (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)])); @@ -1515,7 +1523,7 @@ yyreduce: case 10: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 127 "../FreezeScript/Grammar.y" { (yyval) = new BinaryNode(BinOpOr, parseDataFactory, (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)])); @@ -1524,7 +1532,7 @@ yyreduce: case 11: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 131 "../FreezeScript/Grammar.y" { (yyval) = new BinaryNode(BinOpAnd, parseDataFactory, (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)])); @@ -1533,7 +1541,7 @@ yyreduce: case 12: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 135 "../FreezeScript/Grammar.y" { (yyval) = new BinaryNode(BinOpMul, parseDataFactory, (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)])); @@ -1542,7 +1550,7 @@ yyreduce: case 13: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 139 "../FreezeScript/Grammar.y" { (yyval) = new BinaryNode(BinOpDiv, parseDataFactory, (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)])); @@ -1551,7 +1559,7 @@ yyreduce: case 14: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 143 "../FreezeScript/Grammar.y" { (yyval) = new BinaryNode(BinOpMod, parseDataFactory, (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)])); @@ -1560,7 +1568,7 @@ yyreduce: case 15: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 147 "../FreezeScript/Grammar.y" { (yyval) = new BinaryNode(BinOpAdd, parseDataFactory, (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)])); @@ -1569,7 +1577,7 @@ yyreduce: case 16: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 151 "../FreezeScript/Grammar.y" { (yyval) = new BinaryNode(BinOpSub, parseDataFactory, (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)])); @@ -1578,7 +1586,7 @@ yyreduce: case 17: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 155 "../FreezeScript/Grammar.y" { (yyval) = (yyvsp[(1) - (1)]); @@ -1587,7 +1595,7 @@ yyreduce: case 18: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 164 "../FreezeScript/Grammar.y" { (yyval) = (yyvsp[(2) - (3)]); @@ -1596,7 +1604,7 @@ yyreduce: case 19: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 168 "../FreezeScript/Grammar.y" { (yyval) = new UnaryNode(UnaryOpNeg, parseDataFactory, (yyvsp[(2) - (2)])); @@ -1605,7 +1613,7 @@ yyreduce: case 20: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 172 "../FreezeScript/Grammar.y" { (yyval) = new UnaryNode(UnaryOpNot, parseDataFactory, (yyvsp[(2) - (2)])); @@ -1614,7 +1622,7 @@ yyreduce: case 21: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 176 "../FreezeScript/Grammar.y" { IntegerTokPtr intVal = IntegerTokPtr::dynamicCast((yyvsp[(1) - (1)])); @@ -1625,7 +1633,7 @@ yyreduce: case 22: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 182 "../FreezeScript/Grammar.y" { FloatingTokPtr floatVal = FloatingTokPtr::dynamicCast((yyvsp[(1) - (1)])); @@ -1636,7 +1644,7 @@ yyreduce: case 23: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 188 "../FreezeScript/Grammar.y" { StringTokPtr stringVal = StringTokPtr::dynamicCast((yyvsp[(1) - (1)])); @@ -1647,7 +1655,7 @@ yyreduce: case 24: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 194 "../FreezeScript/Grammar.y" { (yyval) = new DataNode(parseDataFactory->createBoolean(true, true)); @@ -1656,7 +1664,7 @@ yyreduce: case 25: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 198 "../FreezeScript/Grammar.y" { (yyval) = new DataNode(parseDataFactory->createBoolean(false, true)); @@ -1665,7 +1673,7 @@ yyreduce: case 26: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 202 "../FreezeScript/Grammar.y" { (yyval) = new DataNode(parseDataFactory->createNil(true)); @@ -1674,7 +1682,7 @@ yyreduce: case 27: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 206 "../FreezeScript/Grammar.y" { (yyval) = (yyvsp[(1) - (1)]); @@ -1683,7 +1691,7 @@ yyreduce: case 28: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 210 "../FreezeScript/Grammar.y" { EntityNodePtr entity = EntityNodePtr::dynamicCast((yyvsp[(1) - (3)])); @@ -1697,7 +1705,7 @@ yyreduce: case 29: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 219 "../FreezeScript/Grammar.y" { (yyval) = (yyvsp[(1) - (1)]); @@ -1706,7 +1714,7 @@ yyreduce: case 30: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 223 "../FreezeScript/Grammar.y" { StringTokPtr stringVal = StringTokPtr::dynamicCast((yyvsp[(1) - (1)])); @@ -1717,7 +1725,7 @@ yyreduce: case 31: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 234 "../FreezeScript/Grammar.y" { EntityNodePtr entity = EntityNodePtr::dynamicCast((yyvsp[(1) - (4)])); @@ -1729,7 +1737,7 @@ yyreduce: case 32: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 241 "../FreezeScript/Grammar.y" { StringTokPtr stringVal = StringTokPtr::dynamicCast((yyvsp[(3) - (3)])); @@ -1743,7 +1751,7 @@ yyreduce: case 33: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 250 "../FreezeScript/Grammar.y" { StringTokPtr stringVal = StringTokPtr::dynamicCast((yyvsp[(1) - (1)])); @@ -1754,7 +1762,7 @@ yyreduce: case 34: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 261 "../FreezeScript/Grammar.y" { StringTokPtr func = StringTokPtr::dynamicCast((yyvsp[(1) - (4)])); @@ -1767,7 +1775,7 @@ yyreduce: case 35: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 274 "../FreezeScript/Grammar.y" { NodeListTokPtr l = NodeListTokPtr::dynamicCast((yyvsp[(1) - (3)])); @@ -1779,7 +1787,7 @@ yyreduce: case 36: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 281 "../FreezeScript/Grammar.y" { NodeListTokPtr result = new NodeListTok; @@ -1790,7 +1798,7 @@ yyreduce: case 37: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 287 "../FreezeScript/Grammar.y" { (yyval) = new NodeListTok; @@ -1799,7 +1807,7 @@ yyreduce: case 38: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 296 "../FreezeScript/Grammar.y" { StringTokPtr stringVal = StringTokPtr::dynamicCast((yyvsp[(1) - (3)])); @@ -1813,7 +1821,7 @@ yyreduce: case 39: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 305 "../FreezeScript/Grammar.y" { StringTokPtr idVal = StringTokPtr::dynamicCast((yyvsp[(2) - (2)])); @@ -1826,8 +1834,8 @@ yyreduce: -/* Line 1455 of yacc.c */ -#line 1831 "Grammar.tab.c" +/* Line 1464 of yacc.c */ +#line 1839 "Grammar.tab.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -2038,7 +2046,7 @@ yyreturn: -/* Line 1675 of yacc.c */ +/* Line 1684 of yacc.c */ #line 314 "../FreezeScript/Grammar.y" diff --git a/cpp/src/FreezeScript/Grammar.h b/cpp/src/FreezeScript/Grammar.h index ae561a72f12..de0df9778b2 100644 --- a/cpp/src/FreezeScript/Grammar.h +++ b/cpp/src/FreezeScript/Grammar.h @@ -1,10 +1,9 @@ - -/* A Bison parser, made by GNU Bison 2.4.1. */ +/* A Bison parser, made by GNU Bison 2.4.3. */ /* Skeleton interface for Bison's Yacc-like parsers in C - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 - Free Software Foundation, Inc. + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006, + 2009, 2010 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 diff --git a/cpp/src/FreezeScript/Scanner.cpp b/cpp/src/FreezeScript/Scanner.cpp index ee7882b26d6..f5cdbaf7f81 100644 --- a/cpp/src/FreezeScript/Scanner.cpp +++ b/cpp/src/FreezeScript/Scanner.cpp @@ -75,7 +75,6 @@ typedef int flex_int32_t; typedef unsigned char flex_uint8_t; typedef unsigned short int flex_uint16_t; typedef unsigned int flex_uint32_t; -#endif /* ! C99 */ /* Limits of integral types. */ #ifndef INT8_MIN @@ -106,6 +105,8 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif +#endif /* ! C99 */ + #endif /* ! FLEXINT_H */ #ifdef __cplusplus @@ -162,7 +163,15 @@ typedef unsigned int flex_uint32_t; /* Size of default input buffer. */ #ifndef YY_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k. + * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. + * Ditto for the __ia64__ case accordingly. + */ +#define YY_BUF_SIZE 32768 +#else #define YY_BUF_SIZE 16384 +#endif /* __ia64__ */ #endif /* The state buf must be large enough to hold one state per character in the main buffer. @@ -525,7 +534,6 @@ char *freeze_script_text; // // ********************************************************************** -#include <IceUtil/ScannerConfig.h> #include <FreezeScript/GrammarUtil.h> // Before Grammar.h, so that YYSTYPE is defined #include <FreezeScript/Grammar.h> #include <IceUtil/InputUtil.h> @@ -537,12 +545,25 @@ char *freeze_script_text; #if defined(_MSC_VER) && defined(ICE_64) // +// '=' : conversion from 'size_t' to 'int', possible loss of data +// The result of fread() is a size_t and gets inserted into an int +// +# pragma warning( 4 : 4267 ) +// // 'initializing' : conversion from '__int64' to 'int', possible loss of data // Puts a pointer-difference into an int // # pragma warning( 4 : 4244 ) #endif +#ifdef _MSC_VER +# ifdef freeze_script_wrap +# undef freeze_script_wrap +# define freeze_script_wrap() 1 +# endif +# define YY_NO_UNISTD_H +#endif + using namespace std; using namespace FreezeScript; @@ -561,7 +582,7 @@ StringTokPtr parseString(char); #define YY_USER_INIT initScanner(); #define YY_INPUT(buf, result, max_size) { result = getInput(buf, max_size); } -#line 563 "lex.yy.c" +#line 584 "lex.yy.c" #define INITIAL 0 @@ -642,7 +663,12 @@ static int input (void ); /* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k */ +#define YY_READ_BUF_SIZE 16384 +#else #define YY_READ_BUF_SIZE 8192 +#endif /* __ia64__ */ #endif /* Copy whatever the last rule matched to the standard output. */ @@ -661,7 +687,7 @@ static int input (void ); if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ int c = '*'; \ - unsigned n; \ + size_t n; \ for ( n = 0; n < max_size && \ (c = getc( freeze_script_in )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -743,10 +769,10 @@ YY_DECL register char *yy_cp, *yy_bp; register int yy_act; -#line 61 "Scanner.l" +#line 73 "Scanner.l" -#line 748 "lex.yy.c" +#line 774 "lex.yy.c" if ( !(yy_init) ) { @@ -827,7 +853,7 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 63 "Scanner.l" +#line 75 "Scanner.l" { // C++-style comment int c; @@ -844,7 +870,7 @@ YY_RULE_SETUP YY_BREAK case 2: YY_RULE_SETUP -#line 77 "Scanner.l" +#line 89 "Scanner.l" { // C-style comment while(true) @@ -876,7 +902,7 @@ YY_RULE_SETUP YY_BREAK case 3: YY_RULE_SETUP -#line 106 "Scanner.l" +#line 118 "Scanner.l" { StringTokPtr ident = new StringTok; ident->v = freeze_script_text; @@ -886,7 +912,7 @@ YY_RULE_SETUP YY_BREAK case 4: YY_RULE_SETUP -#line 113 "Scanner.l" +#line 125 "Scanner.l" { StringTokPtr str = parseString('"'); *yylvalp = str; @@ -895,7 +921,7 @@ YY_RULE_SETUP YY_BREAK case 5: YY_RULE_SETUP -#line 119 "Scanner.l" +#line 131 "Scanner.l" { StringTokPtr str = parseString('\''); *yylvalp = str; @@ -904,7 +930,7 @@ YY_RULE_SETUP YY_BREAK case 6: YY_RULE_SETUP -#line 125 "Scanner.l" +#line 137 "Scanner.l" { IntegerTokPtr itp = new IntegerTok; *yylvalp = itp; @@ -921,7 +947,7 @@ YY_RULE_SETUP YY_BREAK case 7: YY_RULE_SETUP -#line 139 "Scanner.l" +#line 151 "Scanner.l" { errno = 0; FloatingTokPtr ftp = new FloatingTok; @@ -953,7 +979,7 @@ YY_RULE_SETUP case 8: /* rule 8 can match eol */ YY_RULE_SETUP -#line 167 "Scanner.l" +#line 179 "Scanner.l" { // Igore white-space @@ -965,97 +991,97 @@ YY_RULE_SETUP YY_BREAK case 9: YY_RULE_SETUP -#line 176 "Scanner.l" +#line 188 "Scanner.l" return TOK_LESS_THAN; YY_BREAK case 10: YY_RULE_SETUP -#line 177 "Scanner.l" +#line 189 "Scanner.l" return TOK_GREATER_THAN; YY_BREAK case 11: YY_RULE_SETUP -#line 178 "Scanner.l" +#line 190 "Scanner.l" return TOK_LESS_EQUAL; YY_BREAK case 12: YY_RULE_SETUP -#line 179 "Scanner.l" +#line 191 "Scanner.l" return TOK_GREATER_EQUAL; YY_BREAK case 13: YY_RULE_SETUP -#line 180 "Scanner.l" +#line 192 "Scanner.l" return TOK_EQUAL; YY_BREAK case 14: YY_RULE_SETUP -#line 181 "Scanner.l" +#line 193 "Scanner.l" return TOK_NEQ; YY_BREAK case 15: YY_RULE_SETUP -#line 182 "Scanner.l" +#line 194 "Scanner.l" return TOK_ADD; YY_BREAK case 16: YY_RULE_SETUP -#line 183 "Scanner.l" +#line 195 "Scanner.l" return TOK_SUB; YY_BREAK case 17: YY_RULE_SETUP -#line 184 "Scanner.l" +#line 196 "Scanner.l" return TOK_MUL; YY_BREAK case 18: YY_RULE_SETUP -#line 185 "Scanner.l" +#line 197 "Scanner.l" return TOK_DIV; YY_BREAK case 19: YY_RULE_SETUP -#line 186 "Scanner.l" +#line 198 "Scanner.l" return TOK_MOD; YY_BREAK case 20: YY_RULE_SETUP -#line 187 "Scanner.l" +#line 199 "Scanner.l" return TOK_LPAREN; YY_BREAK case 21: YY_RULE_SETUP -#line 188 "Scanner.l" +#line 200 "Scanner.l" return TOK_RPAREN; YY_BREAK case 22: YY_RULE_SETUP -#line 189 "Scanner.l" +#line 201 "Scanner.l" return TOK_LBRACKET; YY_BREAK case 23: YY_RULE_SETUP -#line 190 "Scanner.l" +#line 202 "Scanner.l" return TOK_RBRACKET; YY_BREAK case 24: YY_RULE_SETUP -#line 191 "Scanner.l" +#line 203 "Scanner.l" return TOK_SCOPE_DELIMITER; YY_BREAK case 25: YY_RULE_SETUP -#line 193 "Scanner.l" +#line 205 "Scanner.l" { return freeze_script_text[0]; } YY_BREAK case 26: YY_RULE_SETUP -#line 197 "Scanner.l" +#line 209 "Scanner.l" ECHO; YY_BREAK -#line 1057 "lex.yy.c" +#line 1083 "lex.yy.c" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -1810,8 +1836,8 @@ YY_BUFFER_STATE freeze_script__scan_string (yyconst char * yystr ) /** Setup the input buffer state to scan the given bytes. The next call to freeze_script_lex() will * scan from a @e copy of @a bytes. - * @param bytes the byte buffer to scan - * @param len the number of bytes in the buffer pointed to by @a bytes. + * @param yybytes the byte buffer to scan + * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. * * @return the newly allocated buffer state object. */ @@ -2050,7 +2076,7 @@ void freeze_script_free (void * ptr ) #define YYTABLES_NAME "yytables" -#line 197 "Scanner.l" +#line 209 "Scanner.l" diff --git a/cpp/src/FreezeScript/Scanner.l b/cpp/src/FreezeScript/Scanner.l index a78144547c8..81974e656b5 100644 --- a/cpp/src/FreezeScript/Scanner.l +++ b/cpp/src/FreezeScript/Scanner.l @@ -9,7 +9,6 @@ // // ********************************************************************** -#include <IceUtil/ScannerConfig.h> #include <FreezeScript/GrammarUtil.h> // Before Grammar.h, so that YYSTYPE is defined #include <FreezeScript/Grammar.h> #include <IceUtil/InputUtil.h> @@ -21,12 +20,25 @@ #if defined(_MSC_VER) && defined(ICE_64) // +// '=' : conversion from 'size_t' to 'int', possible loss of data +// The result of fread() is a size_t and gets inserted into an int +// +# pragma warning( 4 : 4267 ) +// // 'initializing' : conversion from '__int64' to 'int', possible loss of data // Puts a pointer-difference into an int // # pragma warning( 4 : 4244 ) #endif +#ifdef _MSC_VER +# ifdef freeze_script_wrap +# undef freeze_script_wrap +# define freeze_script_wrap() 1 +# endif +# define YY_NO_UNISTD_H +#endif + using namespace std; using namespace FreezeScript; |