[prev in list] [next in list] [prev in thread] [next in thread]
List: kdevelop-bugs
Subject: [Bug 147194] comment management in Qmake *.pro file
From: Andreas Pakulat <apaku () gmx ! de>
Date: 2007-06-26 13:01:19
Message-ID: 20070626130119.21062.qmail () ktown ! kde ! org
[Download RAW message or body]
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
http://bugs.kde.org/show_bug.cgi?id=147194
apaku gmx de changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|UNCONFIRMED |RESOLVED
Resolution| |FIXED
------- Additional Comments From apaku gmx de 2007-06-26 15:01 -------
SVN commit 680520 by apaku:
Allow COMMENT_CONT as statement
BUG:147194
M +6 -0 qmake.yy
M +62 -49 qmake_yacc.cpp
M +1 -1 qmake_yacc.hpp
--- branches/KDE/3.5/kdevelop/buildtools/lib/parsers/qmake/qmake.yy #680519:680520
@ -412,6 +412,12 @
CommentAST *node = new CommentAST();
node->comment = $<value>1;
$<node>$ = node;
+ }
+ | COMMENT_CONT
+ {
+ CommentAST *node = new CommentAST();
+ node->comment = $<value>1;
+ $<node>$ = node;
}
;
--- branches/KDE/3.5/kdevelop/buildtools/lib/parsers/qmake/qmake_yacc.cpp #680519:680520
@ -750,9 +750,18 @
;}
break;
+ case 49:
+#line 417 "qmake.yy"
+ {
+ CommentAST *node = new CommentAST();
+ node->comment = (yysemantic_stack_[(1) - (1)].value);
+ (yyval.node) = node;
+ ;}
+ break;
+
/* Line 675 of lalr1.cc. */
-#line 756 "qmake_yacc.cpp"
+#line 765 "qmake_yacc.cpp"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1_[yyn], &yyval, &yyloc);
@ -959,17 +968,17 @
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
- const signed char Parser::yypact_ninf_ = -44;
+ const signed char Parser::yypact_ninf_ = -45;
const signed char
Parser::yypact_[] =
{
- -44, 19, -44, -44, 8, 45, -44, -44, -44, -44,
- -44, -44, -44, -44, -44, -44, -44, -44, -44, 12,
- 10, 31, -44, 24, -44, -15, -5, 8, -44, -44,
- -44, -44, -44, 26, -44, 14, -44, -44, -44, -44,
- -44, -44, -44, -44, 0, 31, -44, -44, -44, 18,
- 18, -44, -44, 20, 26, 26, 27, -44, -44, -44,
- -44, 31, 39, -44
+ -45, 11, -45, -45, 14, 47, -45, -45, -45, -45,
+ -45, -45, -45, -45, -45, -45, -45, -45, -45, -45,
+ 1, -1, 17, -45, 25, -45, -11, 18, 14, -45,
+ -45, -45, -45, -45, 30, -45, -8, -45, -45, -45,
+ -45, -45, -45, -45, -45, 0, 17, -45, -45, -45,
+ 22, 22, -45, -45, -2, 30, 30, 29, -45, -45,
+ -45, -45, 17, 23, -45
};
/* YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE
@ -978,31 +987,31 @
const unsigned char
Parser::yydefact_[] =
{
- 2, 0, 5, 1, 3, 36, 49, 48, 4, 6,
- 7, 8, 9, 10, 31, 32, 33, 34, 35, 41,
- 30, 44, 40, 0, 29, 30, 0, 0, 5, 37,
- 38, 28, 27, 29, 23, 0, 15, 17, 21, 20,
- 16, 26, 19, 43, 0, 44, 22, 11, 18, 13,
- 14, 12, 42, 47, 0, 0, 0, 39, 24, 25,
- 45, 44, 0, 46
+ 2, 0, 5, 1, 3, 36, 50, 48, 49, 4,
+ 6, 7, 8, 9, 10, 31, 32, 33, 34, 35,
+ 41, 30, 44, 40, 0, 29, 30, 0, 0, 5,
+ 37, 38, 28, 27, 29, 23, 0, 15, 17, 21,
+ 20, 16, 26, 19, 43, 0, 44, 22, 11, 18,
+ 13, 14, 12, 42, 47, 0, 0, 0, 39, 24,
+ 25, 45, 44, 0, 46
};
/* YYPGOTO[NTERM-NUM]. */
const signed char
Parser::yypgoto_[] =
{
- -44, -44, -44, 7, 29, -44, -32, -44, 22, -25,
- -44, -44, -44, -44, -44, -44, -43, -44, -44, -44,
- -44
+ -45, -45, -45, 19, 31, -45, -33, -45, 21, -26,
+ -45, -45, -45, -45, -45, -45, -44, -45, -45, -45,
+ -45
};
/* YYDEFGOTO[NTERM-NUM]. */
const signed char
Parser::yydefgoto_[] =
{
- -1, 1, 2, 4, 8, 9, 41, 25, 42, 26,
- 20, 10, 21, 11, 45, 23, 29, 57, 61, 12,
- 13
+ -1, 1, 2, 4, 9, 10, 42, 26, 43, 27,
+ 21, 11, 22, 12, 46, 24, 30, 58, 62, 13,
+ 14
};
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
@ -1012,24 +1021,24 @
const signed char
Parser::yytable_[] =
{
- 35, 46, 53, 5, 31, 32, 33, 36, 37, 38,
- 39, 5, 6, 7, 31, 32, 52, 40, 62, 3,
- 6, 7, 58, 59, 54, 55, 47, 48, 49, 50,
- 22, 24, -30, -30, 30, 44, 51, -30, -30, 24,
- 38, 39, 27, 56, 60, 31, 32, 34, 28, 14,
- 15, 16, 17, 18, 19, 63, 43
+ 36, 47, 54, 5, 48, 49, 50, 51, 32, 33,
+ 34, 3, 6, 7, 52, 8, 53, 5, 63, 23,
+ 25, 57, 59, 60, 55, 56, 6, 7, 28, 8,
+ 37, 38, 39, 40, 29, 31, -30, 32, 33, 64,
+ 41, -30, -30, 25, 39, 40, 61, 35, 45, 32,
+ 33, 15, 16, 17, 18, 19, 20, 0, 0, 44
};
/* YYCHECK. */
- const unsigned char
+ const signed char
Parser::yycheck_[] =
{
- 25, 33, 45, 3, 19, 20, 21, 12, 13, 14,
- 15, 3, 12, 13, 19, 20, 16, 22, 61, 0,
- 12, 13, 54, 55, 49, 50, 12, 13, 14, 15,
- 18, 21, 14, 15, 10, 28, 22, 19, 20, 21,
- 14, 15, 11, 23, 17, 19, 20, 25, 17, 4,
- 5, 6, 7, 8, 9, 16, 27
+ 26, 34, 46, 3, 12, 13, 14, 15, 19, 20,
+ 21, 0, 12, 13, 22, 15, 16, 3, 62, 18,
+ 21, 23, 55, 56, 50, 51, 12, 13, 11, 15,
+ 12, 13, 14, 15, 17, 10, 14, 19, 20, 16,
+ 22, 19, 20, 21, 14, 15, 17, 26, 29, 19,
+ 20, 4, 5, 6, 7, 8, 9, -1, -1, 28
};
/* STOS_[STATE-NUM] -- The (internal number of the) accessing
@ -1037,13 +1046,13 @
const unsigned char
Parser::yystos_[] =
{
- 0, 25, 26, 0, 27, 3, 12, 13, 28, 29,
- 35, 37, 43, 44, 4, 5, 6, 7, 8, 9,
- 34, 36, 18, 39, 21, 31, 33, 11, 17, 40,
- 10, 19, 20, 21, 32, 33, 12, 13, 14, 15,
- 22, 30, 32, 28, 27, 38, 30, 12, 13, 14,
- 15, 22, 16, 40, 33, 33, 23, 41, 30, 30,
- 17, 42, 40, 16
+ 0, 25, 26, 0, 27, 3, 12, 13, 15, 28,
+ 29, 35, 37, 43, 44, 4, 5, 6, 7, 8,
+ 9, 34, 36, 18, 39, 21, 31, 33, 11, 17,
+ 40, 10, 19, 20, 21, 32, 33, 12, 13, 14,
+ 15, 22, 30, 32, 28, 27, 38, 30, 12, 13,
+ 14, 15, 22, 16, 40, 33, 33, 23, 41, 30,
+ 30, 17, 42, 40, 16
};
#if YYDEBUG
@ -1066,7 +1075,8 @
28, 29, 29, 29, 29, 29, 29, 29, 29, 30,
30, 30, 31, 31, 31, 31, 31, 32, 32, 33,
33, 34, 34, 34, 34, 34, 36, 35, 38, 37,
- 39, 39, 40, 40, 40, 42, 41, 41, 43, 44
+ 39, 39, 40, 40, 40, 42, 41, 41, 43, 43,
+ 44
};
/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
@ -1077,7 +1087,8 @
1, 5, 5, 5, 5, 4, 4, 4, 5, 1,
1, 1, 3, 2, 5, 5, 2, 1, 1, 1,
0, 1, 1, 1, 1, 1, 0, 3, 0, 7,
- 1, 0, 3, 2, 0, 0, 5, 0, 1, 1
+ 1, 0, 3, 2, 0, 0, 5, 0, 1, 1,
+ 1
};
#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
@ -1117,7 +1128,7 @
-1, -1, 3, 36, 40, -1, -1, 3, 9, 39,
10, 38, 40, 41, -1, 18, -1, -1, 17, 27,
16, -1, 11, 28, -1, -1, -1, 23, 17, 42,
- 40, 16, -1, -1, 13, -1, 12, -1
+ 40, 16, -1, -1, 13, -1, 15, -1, 12, -1
};
/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
@ -1129,7 +1140,8 @
19, 21, 27, 33, 39, 45, 50, 55, 60, 66,
68, 70, 72, 76, 79, 85, 91, 94, 96, 98,
100, 101, 103, 105, 107, 109, 111, 112, 116, 117,
- 125, 127, 128, 132, 135, 136, 137, 143, 144, 146
+ 125, 127, 128, 132, 135, 136, 137, 143, 144, 146,
+ 148
};
/* YYRLINE[YYN] -- Source line where rule number YYN was defined. */
@ -1140,7 +1152,8 @
175, 181, 192, 202, 213, 224, 233, 241, 250, 263,
263, 263, 265, 270, 274, 283, 292, 301, 302, 306,
312, 317, 321, 325, 329, 333, 340, 339, 354, 353,
- 378, 379, 382, 383, 388, 392, 391, 405, 410, 418
+ 378, 379, 382, 383, 388, 392, 391, 405, 410, 416,
+ 424
};
// Print the state stack on the debug stream.
@ -1216,7 +1229,7 @
}
const int Parser::yyeof_ = 0;
- const int Parser::yylast_ = 56;
+ const int Parser::yylast_ = 59;
const int Parser::yynnts_ = 21;
const int Parser::yyempty_ = -2;
const int Parser::yyfinal_ = 3;
@ -1229,7 +1242,7 @
} // namespace QMake
-#line 421 "qmake.yy"
+#line 427 "qmake.yy"
--- branches/KDE/3.5/kdevelop/buildtools/lib/parsers/qmake/qmake_yacc.hpp #680519:680520
@ -336,7 +336,7 @
static const signed char yytable_[];
static const signed char yytable_ninf_;
- static const unsigned char yycheck_[];
+ static const signed char yycheck_[];
/// For a state, its accessing symbol.
static const unsigned char yystos_[];
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic