Skip to content

Commit

Permalink
- FR# [1991429] Current configuration dropdown should be in a toolbar…
Browse files Browse the repository at this point in the history 
… - the workspace configuration is now visible regardless the selected tab in the workspace pane

- Cetered the 'Configuration Manager' dialog


git-svn-id: https://codelite.svn.sourceforge.net/svnroot/codelite/trunk@1660 9da81c78-c036-0410-9e1f-a2b0375e4b5a
  • Loading branch information
eranif committed Jun 12, 2008
1 parent f9f7e8f commit d9db04c
Show file tree
Hide file tree
Showing 11 changed files with 704 additions and 515 deletions.
179 changes: 90 additions & 89 deletions CodeLite/var_parser.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,112 +169,112 @@ short cl_var_lhs[] = { -1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 2,
2, 2, 2, 2, 0, 0, 5, 3, 3, 6,
6, 6, 7, 7, 7, 4, 4, 4, 13, 13,
15, 15, 15, 14, 14, 14, 14, 16, 16, 9,
9, 8, 8, 17, 17, 18, 18, 10, 11, 11,
11, 11, 11, 12, 12, 12,
15, 15, 15, 14, 14, 14, 14, 14, 16, 16,
9, 9, 8, 8, 17, 17, 18, 18, 10, 11,
11, 11, 11, 11, 12, 12, 12,
};
short cl_var_len[] = { 2,
1, 1, 1, 1, 1, 1, 1, 1, 1, 2,
2, 2, 2, 1, 0, 2, 0, 2, 1, 0,
1, 3, 4, 4, 7, 5, 5, 5, 1, 4,
0, 1, 1, 1, 1, 1, 1, 2, 5, 0,
2, 0, 1, 0, 1, 0, 2, 2, 0, 1,
1, 1, 1, 2, 3, 6,
0, 1, 1, 1, 1, 1, 1, 1, 2, 5,
0, 2, 0, 1, 0, 1, 0, 2, 2, 0,
1, 1, 1, 1, 2, 3, 6,
};
short cl_var_defred[] = { 15,
0, 19, 16, 0, 0, 0, 50, 51, 52, 53,
18, 0, 43, 0, 46, 46, 46, 6, 1, 0,
2, 5, 3, 0, 0, 9, 14, 54, 0, 0,
0, 19, 16, 0, 0, 0, 51, 52, 53, 54,
18, 0, 44, 0, 47, 47, 47, 6, 1, 0,
2, 5, 3, 0, 0, 9, 14, 55, 0, 0,
0, 0, 0, 13, 12, 4, 8, 7, 10, 11,
0, 41, 0, 45, 47, 48, 0, 29, 0, 38,
0, 32, 33, 28, 27, 46, 36, 35, 34, 37,
26, 0, 21, 40, 0, 0, 0, 0, 30, 22,
39, 0, 46, 0, 23, 24, 0, 0, 25,
0, 42, 0, 46, 48, 49, 0, 29, 0, 39,
0, 32, 33, 28, 27, 47, 37, 35, 36, 34,
38, 26, 0, 21, 41, 0, 0, 0, 0, 30,
22, 40, 0, 47, 0, 23, 24, 0, 0, 25,
};
short cl_var_dgoto[] = { 1,
27, 28, 3, 11, 4, 62, 63, 14, 29, 30,
12, 15, 49, 61, 54, 42, 46, 31,
27, 28, 3, 11, 4, 63, 64, 14, 29, 30,
12, 15, 49, 62, 54, 42, 46, 31,
};
short cl_var_sindex[] = { 0,
-249, 0, 0, -11, -251, -251, 0, 0, 0, 0,
0, -251, 0, -123, 0, 0, 0, 0, 0, -254,
0, 0, 0, -115, -115, 0, 0, 0, -266, -259,
49, -253, -243, 0, 0, 0, 0, 0, 0, 0,
-251, 0, 0, -11, -266, -266, 0, 0, 0, 0,
0, -266, 0, -115, 0, 0, 0, 0, 0, -207,
0, 0, 0, -91, -91, 0, 0, 0, -263, -261,
16, -250, -248, 0, 0, 0, 0, 0, 0, 0,
-58, 0, -21, 0, 0, 0, -21, 0, -10, 0,
-251, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, -7, 0, 0, -242, -251, -279, -174, 0, 0,
0, -57, 0, -251, 0, 0, 14, -279, 0,
-266, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, -35, 0, 0, -239, -266, -291, -142, 0,
0, 0, -57, 0, -266, 0, 0, -12, -291, 0,
};
short cl_var_rindex[] = { 0,
24, 0, 0, -202, -142, -142, 0, 0, 0, 0,
0, -142, 0, -240, 0, 0, 0, 0, 0, -38,
24, 0, 0, -185, -123, -123, 0, 0, 0, 0,
0, -123, 0, -263, 0, 0, 0, 0, 0, -38,
0, 0, 0, -27, -26, 0, 0, 0, 0, 0,
-34, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-19, 0, 1, 0, 0, 0, 1, 0, 0, 0,
-36, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, -142, -17, 0, 0, 0,
0, 48, 0, -36, 0, 0, 0, 48, 0,
0, 0, 0, 0, 0, 0, -123, -17, 0, 0,
0, 0, 23, 0, -36, 0, 0, 0, 23, 0,
};
short cl_var_gindex[] = { 0,
19, -14, 0, 0, 0, -8, 13, -24, 16, -3,
0, 26, 0, 0, 41, 0, 0, 0,
38, 3, 0, 0, 0, -6, 8, -29, 12, -3,
0, 31, 0, 0, 32, 0, 0, 0,
};
#define YYTABLESIZE 329
short cl_var_table[] = { 4,
31, 51, 74, 4, 34, 4, 2, 20, 35, 44,
8, 7, 32, 33, 8, 7, 8, 7, 55, 53,
56, 13, 55, 4, 56, 20, 64, 44, 6, 57,
58, 16, 5, 56, 8, 7, 66, 17, 41, 52,
31, 64, 39, 40, 31, 43, 10, 7, 59, 64,
71, 47, 65, 73, 67, 49, 49, 66, 31, 31,
49, 48, 69, 17, 40, 77, 49, 17, 75, 76,
49, 49, 49, 49, 79, 78, 49, 49, 70, 68,
60, 17, 17, 18, 19, 46, 44, 55, 20, 46,
45, 46, 0, 0, 21, 0, 0, 0, 0, 22,
23, 24, 49, 0, 25, 26, 0, 0, 0, 46,
0, 8, 0, 9, 0, 42, 42, 0, 0, 0,
42, 0, 0, 31, 0, 31, 42, 0, 0, 0,
72, 42, 42, 42, 18, 19, 42, 42, 0, 20,
0, 0, 18, 19, 0, 21, 17, 36, 17, 0,
22, 23, 24, 21, 0, 25, 26, 0, 22, 23,
37, 0, 42, 38, 26, 0, 0, 0, 0, 0,
31, 51, 75, 4, 2, 4, 13, 20, 67, 45,
8, 7, 32, 33, 8, 7, 8, 7, 56, 53,
57, 65, 56, 4, 57, 20, 68, 45, 6, 57,
59, 67, 5, 56, 8, 7, 16, 65, 72, 52,
31, 41, 17, 43, 31, 65, 10, 7, 60, 79,
58, 34, 66, 44, 47, 35, 48, 45, 31, 31,
47, 39, 40, 17, 47, 70, 47, 17, 78, 76,
77, 74, 50, 50, 71, 80, 69, 50, 55, 0,
61, 17, 17, 50, 47, 0, 0, 50, 50, 50,
50, 0, 0, 50, 50, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 8, 0, 9, 0, 18, 19, 0, 0, 50,
20, 0, 0, 31, 0, 31, 21, 0, 0, 0,
0, 22, 23, 24, 43, 43, 25, 26, 0, 43,
0, 0, 18, 19, 0, 43, 17, 20, 17, 0,
43, 43, 43, 21, 0, 43, 43, 0, 22, 23,
24, 0, 73, 25, 26, 0, 18, 19, 0, 0,
0, 36, 0, 0, 0, 0, 0, 21, 0, 0,
0, 43, 22, 23, 37, 0, 0, 38, 26, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 42, 42, 0, 0, 0, 42, 0, 0, 0,
0, 0, 42, 0, 0, 0, 0, 42, 42, 42,
0, 0, 42, 42, 0, 0, 0, 0, 0, 0,
0, 43, 43, 0, 0, 0, 43, 0, 0, 0,
0, 0, 43, 0, 0, 0, 0, 43, 43, 43,
0, 0, 43, 43, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 31, 0, 31, 31,
0, 0, 0, 31, 0, 0, 4, 0, 42, 31,
44, 50, 50, 31, 31, 31, 31, 8, 7, 31,
31, 17, 17, 0, 0, 55, 17, 56, 0, 0,
0, 0, 0, 31, 0, 0, 4, 0, 43, 31,
45, 50, 50, 31, 31, 31, 31, 8, 7, 31,
31, 17, 17, 0, 0, 56, 17, 57, 0, 0,
0, 0, 17, 0, 0, 0, 17, 17, 17, 17,
0, 0, 17, 17, 0, 31, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 17,
};
short cl_var_check[] = { 38,
0, 60, 60, 42, 259, 44, 256, 44, 263, 44,
0, 60, 60, 42, 256, 44, 273, 44, 44, 44,
38, 38, 16, 17, 42, 42, 44, 44, 38, 41,
38, 273, 42, 62, 42, 62, 51, 62, 40, 40,
41, 6, 44, 44, 62, 62, 44, 12, 305, 61,
40, 66, 24, 25, 44, 305, 58, 59, 59, 74,
330, 305, 56, 68, 62, 258, 259, 44, 58, 59,
263, 305, 305, 40, 305, 74, 269, 44, 72, 73,
273, 274, 275, 276, 78, 62, 279, 280, 66, 64,
91, 58, 59, 258, 259, 38, 38, 47, 263, 42,
42, 44, -1, -1, 269, -1, -1, -1, -1, 274,
275, 276, 305, -1, 279, 280, -1, -1, -1, 62,
-1, 123, -1, 125, -1, 258, 259, -1, -1, -1,
38, 51, 42, 62, 42, 62, 62, 62, 40, 40,
41, 44, 44, 44, 62, 62, 6, 67, 330, 61,
40, 305, 12, 305, 44, 75, 58, 59, 59, 62,
61, 259, 56, 38, 305, 263, 305, 42, 58, 59,
38, 24, 25, 40, 42, 305, 44, 44, 75, 73,
74, 69, 258, 259, 67, 79, 65, 263, 47, -1,
91, 58, 59, 269, 62, -1, -1, 273, 274, 275,
276, -1, -1, 279, 280, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, 123, -1, 125, -1, 258, 259, -1, -1, 305,
263, -1, -1, 123, -1, 125, 269, -1, -1, -1,
305, 274, 275, 276, 258, 259, 279, 280, -1, 263,
-1, 274, 275, 276, 258, 259, 279, 280, -1, 263,
-1, -1, 258, 259, -1, 269, 123, 263, 125, -1,
274, 275, 276, 269, -1, 279, 280, -1, 274, 275,
276, -1, 305, 279, 280, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
276, -1, 305, 279, 280, -1, 258, 259, -1, -1,
-1, 263, -1, -1, -1, -1, -1, 269, -1, -1,
-1, 305, 274, 275, 276, -1, -1, 279, 280, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
Expand Down Expand Up @@ -358,6 +358,7 @@ char *cl_var_rule[] = {
"postfix2 : '='",
"postfix2 : ')'",
"postfix : ';'",
"postfix : '='",
"postfix : ')'",
"postfix : '('",
"postfix : '['",
Expand Down Expand Up @@ -754,7 +755,7 @@ case 26:
{
/*create new variable for every variable name found*/
var = curr_var;
var.m_pattern = "/^" + yyvsp[-4] + " " + yyvsp[-3] + " " + gs_names.at(i) + " $/";
var.m_pattern = "/^" + yyvsp[-4] + " " + yyvsp[-3] + " " + yyvsp[-2] + gs_names.at(i) + " $/";
var.m_name = gs_names.at(i);
gs_vars->push_back(var);
}
Expand Down Expand Up @@ -821,69 +822,69 @@ break;
case 32:
{var_consumeUntil(',', ')');}
break;
case 36:
case 37:
{ yyval = yyvsp[0] + var_consumBracketsContent('(');}
break;
case 37:
case 38:
{ yyval = yyvsp[0] + var_consumBracketsContent('[');}
break;
case 38:
case 39:
{yyval = yyvsp[-1]+ yyvsp[0]; }
break;
case 39:
case 40:
{yyval = yyvsp[-4] + yyvsp[-3] + yyvsp[-2] + yyvsp[-1] + yyvsp[0];}
break;
case 40:
case 41:
{yyval = "";}
break;
case 41:
case 42:
{ yyval = yyvsp[-1] + yyvsp[0];}
break;
case 42:
case 43:
{yyval = ""; }
break;
case 43:
case 44:
{ yyval = yyvsp[0]; }
break;
case 44:
case 45:
{yyval = ""; }
break;
case 45:
case 46:
{ yyval = yyvsp[0]; }
break;
case 46:
case 47:
{yyval = ""; }
break;
case 47:
case 48:
{yyval = yyvsp[-1] + yyvsp[0];}
break;
case 48:
case 49:
{ yyval = yyvsp[-1] + yyvsp[0]; }
break;
case 49:
case 50:
{yyval = "";}
break;
case 50:
case 51:
{ yyval = ";";}
break;
case 51:
case 52:
{ yyval = "{";}
break;
case 52:
case 53:
{ yyval = "}";}
break;
case 53:
case 54:
{ yyval = ":";}
break;
case 54:
case 55:
{
yyval = yyvsp[-1] + " " + yyvsp[0];
yyvsp[0].erase(yyvsp[0].find_last_not_of(":")+1);
curr_var.m_type = yyvsp[0];
curr_var.m_isConst = !yyvsp[-1].empty();
}
break;
case 55:
case 56:
{
yyval = yyvsp[-2] + " " + yyvsp[-1] + yyvsp[0];
yyvsp[-1].erase(yyvsp[-1].find_last_not_of(":")+1);
Expand All @@ -892,7 +893,7 @@ case 55:
curr_var.m_isConst = !yyvsp[-2].empty();
}
break;
case 56:
case 57:
{
yyval = yyvsp[-5] + " " + yyvsp[-4] + yyvsp[-3] + " " + yyvsp[-2] + yyvsp[-1] + yyvsp[0];
yyvsp[-4].erase(yyvsp[-4].find_last_not_of(":")+1);
Expand Down
1 change: 1 addition & 0 deletions CxxParser/Release/test.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@ std::map<wxString, std::list<CppToken>* > m_matches;
int a,b,*c;
std::vector<int, int> vector;
(void *buffer = NULL, size_t size, size_t nmemb, void *stream)
wxStaticLine *line = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
3 changes: 2 additions & 1 deletion CxxParser/cpp_variables_grammar.y
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ variables : stmnt_starter variable_decl special_star_amp variable_name_list po
{
//create new variable for every variable name found
var = curr_var;
var.m_pattern = "/^" + $1 + " " + $2 + " " + gs_names.at(i) + " $/";
var.m_pattern = "/^" + $1 + " " + $2 + " " + $3 + gs_names.at(i) + " $/";
var.m_name = gs_names.at(i);
gs_vars->push_back(var);
}
Expand Down Expand Up @@ -243,6 +243,7 @@ postfix2: /*empty*/
;

postfix: ';'
| '='
| ')'
| '(' { $$ = $1 + var_consumBracketsContent('(');}
| '[' { $$ = $1 + var_consumBracketsContent('[');}
Expand Down
Loading

0 comments on commit d9db04c

Please sign in to comment.