Skip to content
Snippets Groups Projects
Commit c3d7cabf authored by Patrick Dular's avatar Patrick Dular
Browse files

Change of function name (different from the one in GetDP parser)

parent 3de0d5ed
No related branches found
No related tags found
No related merge requests found
...@@ -614,7 +614,7 @@ static std::map<std::string, std::vector<double> > floatOptions; ...@@ -614,7 +614,7 @@ static std::map<std::string, std::vector<double> > floatOptions;
static std::map<std::string, std::vector<std::string> > charOptions; static std::map<std::string, std::vector<std::string> > charOptions;
static int flag_Enum, member_ValMax; static int flag_Enum, member_ValMax;
   
void init_Options(int member_ValMax_ = 0) void init_options(int member_ValMax_ = 0)
{ {
floatOptions.clear(); charOptions.clear(); floatOptions.clear(); charOptions.clear();
flag_Enum = 0; member_ValMax = member_ValMax_; flag_Enum = 0; member_ValMax = member_ValMax_;
...@@ -7151,7 +7151,7 @@ yyreduce: ...@@ -7151,7 +7151,7 @@ yyreduce:
   
case 114: case 114:
#line 1240 "Gmsh.y" #line 1240 "Gmsh.y"
{ init_Options(); ;} { init_options(); ;}
break; break;
   
case 115: case 115:
...@@ -7177,7 +7177,7 @@ yyreduce: ...@@ -7177,7 +7177,7 @@ yyreduce:
   
case 116: case 116:
#line 1260 "Gmsh.y" #line 1260 "Gmsh.y"
{ init_Options(); ;} { init_options(); ;}
break; break;
   
case 117: case 117:
...@@ -7213,7 +7213,7 @@ yyreduce: ...@@ -7213,7 +7213,7 @@ yyreduce:
   
case 119: case 119:
#line 1287 "Gmsh.y" #line 1287 "Gmsh.y"
{ init_Options(); ;} { init_options(); ;}
break; break;
   
case 120: case 120:
...@@ -11370,7 +11370,7 @@ yyreduce: ...@@ -11370,7 +11370,7 @@ yyreduce:
   
case 421: case 421:
#line 4704 "Gmsh.y" #line 4704 "Gmsh.y"
{ init_Options(); ;} { init_options(); ;}
break; break;
   
case 422: case 422:
...@@ -11756,7 +11756,7 @@ yyreduce: ...@@ -11756,7 +11756,7 @@ yyreduce:
{ {
std::string struct_namespace((yyvsp[(2) - (3)].c2).char1? (yyvsp[(2) - (3)].c2).char1 : std::string("")), std::string struct_namespace((yyvsp[(2) - (3)].c2).char1? (yyvsp[(2) - (3)].c2).char1 : std::string("")),
struct_name((yyvsp[(2) - (3)].c2).char2); struct_name((yyvsp[(2) - (3)].c2).char2);
init_Options init_options
(nameSpaces.getMember_ValMax(struct_namespace, struct_name)); (nameSpaces.getMember_ValMax(struct_namespace, struct_name));
;} ;}
break; break;
...@@ -12941,7 +12941,7 @@ yyreduce: ...@@ -12941,7 +12941,7 @@ yyreduce:
   
case 559: case 559:
#line 5954 "Gmsh.y" #line 5954 "Gmsh.y"
{ init_Options(); ;} { init_options(); ;}
break; break;
   
case 560: case 560:
......
...@@ -93,7 +93,7 @@ static std::map<std::string, std::vector<double> > floatOptions; ...@@ -93,7 +93,7 @@ static std::map<std::string, std::vector<double> > floatOptions;
static std::map<std::string, std::vector<std::string> > charOptions; static std::map<std::string, std::vector<std::string> > charOptions;
static int flag_Enum, member_ValMax; static int flag_Enum, member_ValMax;
void init_Options(int member_ValMax_ = 0) void init_options(int member_ValMax_ = 0)
{ {
floatOptions.clear(); charOptions.clear(); floatOptions.clear(); charOptions.clear();
flag_Enum = 0; member_ValMax = member_ValMax_; flag_Enum = 0; member_ValMax = member_ValMax_;
...@@ -1237,7 +1237,7 @@ DefineConstants : ...@@ -1237,7 +1237,7 @@ DefineConstants :
Free($3); Free($3);
} }
| DefineConstants Comma String__Index tAFFECT '{' ListOfDouble | DefineConstants Comma String__Index tAFFECT '{' ListOfDouble
{ init_Options(); } { init_options(); }
FloatParameterOptionsOrNone '}' FloatParameterOptionsOrNone '}'
{ {
if(List_Nbr($6) != 1) if(List_Nbr($6) != 1)
...@@ -1257,7 +1257,7 @@ DefineConstants : ...@@ -1257,7 +1257,7 @@ DefineConstants :
Free($6); Free($6);
} }
| DefineConstants Comma String__Index LP RP tAFFECT '{' ListOfDouble | DefineConstants Comma String__Index LP RP tAFFECT '{' ListOfDouble
{ init_Options(); } { init_options(); }
FloatParameterOptionsOrNone '}' FloatParameterOptionsOrNone '}'
{ {
std::string key($3); std::string key($3);
...@@ -1284,7 +1284,7 @@ DefineConstants : ...@@ -1284,7 +1284,7 @@ DefineConstants :
Free($5); Free($5);
} }
| DefineConstants Comma String__Index tAFFECT '{' StringExpr | DefineConstants Comma String__Index tAFFECT '{' StringExpr
{ init_Options(); } { init_options(); }
CharParameterOptionsOrNone '}' CharParameterOptionsOrNone '}'
{ {
std::string key($3), val($6); std::string key($3), val($6);
...@@ -4701,7 +4701,7 @@ FExpr_Single : ...@@ -4701,7 +4701,7 @@ FExpr_Single :
// Variables // Variables
| tDefineNumber LP FExpr | tDefineNumber LP FExpr
{ init_Options(); } { init_options(); }
FloatParameterOptionsOrNone RP FloatParameterOptionsOrNone RP
{ {
std::vector<double> val(1, $3); std::vector<double> val(1, $3);
...@@ -5025,7 +5025,7 @@ DefineStruct : ...@@ -5025,7 +5025,7 @@ DefineStruct :
{ {
std::string struct_namespace($2.char1? $2.char1 : std::string("")), std::string struct_namespace($2.char1? $2.char1 : std::string("")),
struct_name($2.char2); struct_name($2.char2);
init_Options init_options
(nameSpaces.getMember_ValMax(struct_namespace, struct_name)); (nameSpaces.getMember_ValMax(struct_namespace, struct_name));
} }
'[' FloatParameterOptionsOrNone_NoComma ']' '[' FloatParameterOptionsOrNone_NoComma ']'
...@@ -5951,7 +5951,7 @@ StringExpr : ...@@ -5951,7 +5951,7 @@ StringExpr :
Free($3); Free($3);
} }
| tDefineString LP StringExpr | tDefineString LP StringExpr
{ init_Options(); } { init_options(); }
CharParameterOptionsOrNone RP CharParameterOptionsOrNone RP
{ {
std::string val($3); std::string val($3);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment