shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-26 06:50:09 +03:00
Code Releases Wiki Activity

Feature #1747: Compile commit:73687ce

Browse Source
This commit is contained in:
Carlos Martín 2013-01-31 16:50:39 +01:00
parent 73687cebba
commit 98c385ca60
3 changed files with 75 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/xml/expr_arith.cc
View File

@ -496,8 +496,8 @@ static const yytype_int8 yyrhs[] =
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const yytype_uint8 yyrline[] =
{
0, 100, 100, 101, 104, 124, 125, 126, 127, 128,
129, 130, 131
0, 100, 100, 101, 104, 132, 133, 134, 135, 136,
137, 138, 139
};
#endif
@ -1518,15 +1518,23 @@ yyreduce:
#line 104 "expr_arith.y"
{ float val = 0.0;
ostringstream xpath_t;
vector<string> results;
xpath_t << "/HOST/TEMPLATE/" << (yyvsp[(1) - (1)].val_str)
<< "|/HOST/HOST_SHARE/" << (yyvsp[(1) - (1)].val_str)
<< "|/HOST/CLUSTER_TEMPLATE/" << (yyvsp[(1) - (1)].val_str);
if ((yyvsp[(1) - (1)].val_str)[0] == '/')
{
results = (*oxml)[(yyvsp[(1) - (1)].val_str)];
}
else
{
ostringstream xpath_t;
results = (*oxml)[xpath_t.str().c_str()];
xpath_t << "/HOST/TEMPLATE/" << (yyvsp[(1) - (1)].val_str)
<< "|/HOST/HOST_SHARE/" << (yyvsp[(1) - (1)].val_str)
<< "|/HOST/" << (yyvsp[(1) - (1)].val_str)
<< "|/HOST/CLUSTER_TEMPLATE/" << (yyvsp[(1) - (1)].val_str);
results = (*oxml)[xpath_t.str().c_str()];
}
if (results.size() != 0)
{
@ -1541,63 +1549,63 @@ yyreduce:
case 5:
/* Line 1806 of yacc.c */
#line 124 "expr_arith.y"
#line 132 "expr_arith.y"
{ (yyval.val_float) = (yyvsp[(1) - (1)].val_float); }
break;
case 6:
/* Line 1806 of yacc.c */
#line 125 "expr_arith.y"
#line 133 "expr_arith.y"
{ (yyval.val_float) = static_cast<float>((yyvsp[(1) - (1)].val_int)); }
break;
case 7:
/* Line 1806 of yacc.c */
#line 126 "expr_arith.y"
#line 134 "expr_arith.y"
{ (yyval.val_float) = (yyvsp[(1) - (3)].val_float) + (yyvsp[(3) - (3)].val_float);}
break;
case 8:
/* Line 1806 of yacc.c */
#line 127 "expr_arith.y"
#line 135 "expr_arith.y"
{ (yyval.val_float) = (yyvsp[(1) - (3)].val_float) - (yyvsp[(3) - (3)].val_float);}
break;
case 9:
/* Line 1806 of yacc.c */
#line 128 "expr_arith.y"
#line 136 "expr_arith.y"
{ (yyval.val_float) = (yyvsp[(1) - (3)].val_float) * (yyvsp[(3) - (3)].val_float);}
break;
case 10:
/* Line 1806 of yacc.c */
#line 129 "expr_arith.y"
#line 137 "expr_arith.y"
{ (yyval.val_float) = (yyvsp[(1) - (3)].val_float) / (yyvsp[(3) - (3)].val_float);}
break;
case 11:
/* Line 1806 of yacc.c */
#line 130 "expr_arith.y"
#line 138 "expr_arith.y"
{ (yyval.val_float) = - (yyvsp[(2) - (2)].val_float);}
break;
case 12:
/* Line 1806 of yacc.c */
#line 131 "expr_arith.y"
#line 139 "expr_arith.y"
{ (yyval.val_float) = (yyvsp[(2) - (3)].val_float);}
break;
/* Line 1806 of yacc.c */
#line 1601 "expr_arith.cc"
#line 1609 "expr_arith.cc"
default: break;
}
/* User semantic actions sometimes alter yychar, and that requires
@ -1835,7 +1843,7 @@ yyreturn:
/* Line 2067 of yacc.c */
#line 134 "expr_arith.y"
#line 142 "expr_arith.y"
extern "C" void expr_arith__error(

99
src/xml/expr_bool.cc
View File

@ -132,10 +132,12 @@ int get_xml_attribute(ObjectXML * oxml, const char* attr, float& val);
int get_xml_attribute(ObjectXML * oxml, const char* attr, string& val);
void get_xml_values(ObjectXML * oxml, const char* attr, vector<string>& results);
/* Line 268 of yacc.c */
#line 139 "expr_bool.cc"
#line 141 "expr_bool.cc"
/* Enabling traces. */
#ifndef YYDEBUG
@ -175,7 +177,7 @@ typedef union YYSTYPE
{
/* Line 293 of yacc.c */
#line 83 "expr_bool.y"
#line 85 "expr_bool.y"
char * val_str;
int val_int;
@ -184,7 +186,7 @@ typedef union YYSTYPE
/* Line 293 of yacc.c */
#line 188 "expr_bool.cc"
#line 190 "expr_bool.cc"
} YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
@ -209,7 +211,7 @@ typedef struct YYLTYPE
/* Line 343 of yacc.c */
#line 213 "expr_bool.cc"
#line 215 "expr_bool.cc"
#ifdef short
# undef short
@ -504,8 +506,8 @@ static const yytype_int8 yyrhs[] =
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const yytype_uint8 yyrline[] =
{
0, 103, 103, 104, 107, 112, 117, 122, 127, 132,
137, 142, 147, 152, 157, 158, 159, 160
0, 105, 105, 106, 109, 114, 119, 124, 129, 134,
139, 144, 149, 154, 159, 160, 161, 162
};
#endif
@ -1512,21 +1514,21 @@ yyreduce:
case 2:
/* Line 1806 of yacc.c */
#line 103 "expr_bool.y"
#line 105 "expr_bool.y"
{ result=(yyvsp[(1) - (1)].val_int); }
break;
case 3:
/* Line 1806 of yacc.c */
#line 104 "expr_bool.y"
#line 106 "expr_bool.y"
{ result=true; }
break;
case 4:
/* Line 1806 of yacc.c */
#line 107 "expr_bool.y"
#line 109 "expr_bool.y"
{ int val, rc;
rc = get_xml_attribute(oxml,(yyvsp[(1) - (3)].val_str),val);
@ -1536,7 +1538,7 @@ yyreduce:
case 5:
/* Line 1806 of yacc.c */
#line 112 "expr_bool.y"
#line 114 "expr_bool.y"
{ int val, rc;
rc = get_xml_attribute(oxml,(yyvsp[(1) - (4)].val_str),val);
@ -1546,7 +1548,7 @@ yyreduce:
case 6:
/* Line 1806 of yacc.c */
#line 117 "expr_bool.y"
#line 119 "expr_bool.y"
{ int val, rc;
rc = get_xml_attribute(oxml,(yyvsp[(1) - (3)].val_str),val);
@ -1556,7 +1558,7 @@ yyreduce:
case 7:
/* Line 1806 of yacc.c */
#line 122 "expr_bool.y"
#line 124 "expr_bool.y"
{ int val, rc;
rc = get_xml_attribute(oxml,(yyvsp[(1) - (3)].val_str),val);
@ -1566,7 +1568,7 @@ yyreduce:
case 8:
/* Line 1806 of yacc.c */
#line 127 "expr_bool.y"
#line 129 "expr_bool.y"
{ float val, rc;
rc = get_xml_attribute(oxml,(yyvsp[(1) - (3)].val_str),val);
@ -1576,7 +1578,7 @@ yyreduce:
case 9:
/* Line 1806 of yacc.c */
#line 132 "expr_bool.y"
#line 134 "expr_bool.y"
{ float val, rc;
rc = get_xml_attribute(oxml,(yyvsp[(1) - (4)].val_str),val);
@ -1586,7 +1588,7 @@ yyreduce:
case 10:
/* Line 1806 of yacc.c */
#line 137 "expr_bool.y"
#line 139 "expr_bool.y"
{ float val, rc;
rc = get_xml_attribute(oxml,(yyvsp[(1) - (3)].val_str),val);
@ -1596,7 +1598,7 @@ yyreduce:
case 11:
/* Line 1806 of yacc.c */
#line 142 "expr_bool.y"
#line 144 "expr_bool.y"
{ float val, rc;
rc = get_xml_attribute(oxml,(yyvsp[(1) - (3)].val_str),val);
@ -1606,7 +1608,7 @@ yyreduce:
case 12:
/* Line 1806 of yacc.c */
#line 147 "expr_bool.y"
#line 149 "expr_bool.y"
{ string val; int rc;
rc = get_xml_attribute(oxml,(yyvsp[(1) - (3)].val_str),val);
@ -1616,7 +1618,7 @@ yyreduce:
case 13:
/* Line 1806 of yacc.c */
#line 152 "expr_bool.y"
#line 154 "expr_bool.y"
{ string val; int rc;
rc = get_xml_attribute(oxml,(yyvsp[(1) - (4)].val_str),val);
@ -1626,35 +1628,35 @@ yyreduce:
case 14:
/* Line 1806 of yacc.c */
#line 157 "expr_bool.y"
#line 159 "expr_bool.y"
{ (yyval.val_int) = (yyvsp[(1) - (3)].val_int) && (yyvsp[(3) - (3)].val_int); }
break;
case 15:
/* Line 1806 of yacc.c */
#line 158 "expr_bool.y"
#line 160 "expr_bool.y"
{ (yyval.val_int) = (yyvsp[(1) - (3)].val_int) || (yyvsp[(3) - (3)].val_int); }
break;
case 16:
/* Line 1806 of yacc.c */
#line 159 "expr_bool.y"
#line 161 "expr_bool.y"
{ (yyval.val_int) = ! (yyvsp[(2) - (2)].val_int); }
break;
case 17:
/* Line 1806 of yacc.c */
#line 160 "expr_bool.y"
#line 162 "expr_bool.y"
{ (yyval.val_int) = (yyvsp[(2) - (3)].val_int); }
break;
/* Line 1806 of yacc.c */
#line 1658 "expr_bool.cc"
#line 1660 "expr_bool.cc"
default: break;
}
/* User semantic actions sometimes alter yychar, and that requires
@ -1892,7 +1894,7 @@ yyreturn:
/* Line 2067 of yacc.c */
#line 163 "expr_bool.y"
#line 165 "expr_bool.y"
extern "C" void expr_bool__error(
@ -1923,20 +1925,31 @@ extern "C" void expr_bool__error(
result = false;
}
void get_xml_values(ObjectXML * oxml, const char* attr, vector<string> &results)
{
if (attr[0] == '/')
{
results = (*oxml)[attr];
}
else
{
ostringstream xpath;
xpath << "/HOST/TEMPLATE/" << attr
<< "|/HOST/HOST_SHARE/" << attr
<< "|/HOST/" << attr
<< "|/HOST/CLUSTER_TEMPLATE/" << attr;
results = (*oxml)[xpath.str().c_str()];
}
}
int get_xml_attribute(ObjectXML * oxml, const char* attr, int& val)
{
val = 0;
//TODO: pass xpath base
vector<string> results;
ostringstream xpath_t;
xpath_t << "/HOST/TEMPLATE/" << attr
<< "|/HOST/HOST_SHARE/" << attr
<< "|/HOST/" << attr
<< "|/HOST/CLUSTER_TEMPLATE/" << attr;
results = (*oxml)[xpath_t.str().c_str()];
get_xml_values(oxml, attr, results);
if (results.size() != 0)
{
@ -1960,16 +1973,8 @@ int get_xml_attribute(ObjectXML * oxml, const char* attr, float& val)
{
val = 0.0;
//TODO: pass xpath base
ostringstream xpath_t;
vector<string> results;
xpath_t << "/HOST/TEMPLATE/" << attr
<< "|/HOST/HOST_SHARE/" << attr
<< "|/HOST/" << attr
<< "|/HOST/CLUSTER_TEMPLATE/" << attr;
results = (*oxml)[xpath_t.str().c_str()];
get_xml_values(oxml, attr, results);
if (results.size() != 0)
{
@ -1993,16 +1998,8 @@ int get_xml_attribute(ObjectXML * oxml, const char* attr, string& val)
{
val = "";
//TODO: pass xpath base
ostringstream xpath_t;
vector<string> results;
xpath_t << "/HOST/TEMPLATE/" << attr
<< "|/HOST/HOST_SHARE/" << attr
<< "|/HOST/" << attr
<< "|/HOST/CLUSTER_TEMPLATE/" << attr;
results = (*oxml)[xpath_t.str().c_str()];
get_xml_values(oxml, attr, results);
if (results.size() != 0)
{

2
src/xml/expr_bool.h
View File

@ -50,7 +50,7 @@ typedef union YYSTYPE
{
/* Line 2068 of yacc.c */
#line 83 "expr_bool.y"
#line 85 "expr_bool.y"
char * val_str;
int val_int;