From c3d7cabf8bafa212e6f55e447fc80d56bffdebe3 Mon Sep 17 00:00:00 2001
From: Patrick Dular <patrick.dular@ulg.ac.be>
Date: Mon, 13 Mar 2017 13:07:18 +0000
Subject: [PATCH] Change of function name (different from the one in GetDP
 parser)

---
 Parser/Gmsh.tab.cpp | 14 +++++++-------
 Parser/Gmsh.y       | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Parser/Gmsh.tab.cpp b/Parser/Gmsh.tab.cpp
index c2c2a6c7db..1cd9e912e5 100644
--- a/Parser/Gmsh.tab.cpp
+++ b/Parser/Gmsh.tab.cpp
@@ -614,7 +614,7 @@ static std::map<std::string, std::vector<double> > floatOptions;
 static std::map<std::string, std::vector<std::string> > charOptions;
 static int flag_Enum, member_ValMax;
 
-void init_Options(int member_ValMax_ = 0)
+void init_options(int member_ValMax_ = 0)
 {
   floatOptions.clear(); charOptions.clear();
   flag_Enum = 0; member_ValMax = member_ValMax_;
@@ -7151,7 +7151,7 @@ yyreduce:
 
   case 114:
 #line 1240 "Gmsh.y"
-    { init_Options(); ;}
+    { init_options(); ;}
     break;
 
   case 115:
@@ -7177,7 +7177,7 @@ yyreduce:
 
   case 116:
 #line 1260 "Gmsh.y"
-    { init_Options(); ;}
+    { init_options(); ;}
     break;
 
   case 117:
@@ -7213,7 +7213,7 @@ yyreduce:
 
   case 119:
 #line 1287 "Gmsh.y"
-    { init_Options(); ;}
+    { init_options(); ;}
     break;
 
   case 120:
@@ -11370,7 +11370,7 @@ yyreduce:
 
   case 421:
 #line 4704 "Gmsh.y"
-    { init_Options(); ;}
+    { init_options(); ;}
     break;
 
   case 422:
@@ -11756,7 +11756,7 @@ yyreduce:
     {
       std::string struct_namespace((yyvsp[(2) - (3)].c2).char1? (yyvsp[(2) - (3)].c2).char1 : std::string("")),
         struct_name((yyvsp[(2) - (3)].c2).char2);
-      init_Options
+      init_options
         (nameSpaces.getMember_ValMax(struct_namespace, struct_name));
     ;}
     break;
@@ -12941,7 +12941,7 @@ yyreduce:
 
   case 559:
 #line 5954 "Gmsh.y"
-    { init_Options(); ;}
+    { init_options(); ;}
     break;
 
   case 560:
diff --git a/Parser/Gmsh.y b/Parser/Gmsh.y
index 4a72b07e80..ebc2a7ae21 100644
--- a/Parser/Gmsh.y
+++ b/Parser/Gmsh.y
@@ -93,7 +93,7 @@ static std::map<std::string, std::vector<double> > floatOptions;
 static std::map<std::string, std::vector<std::string> > charOptions;
 static int flag_Enum, member_ValMax;
 
-void init_Options(int member_ValMax_ = 0)
+void init_options(int member_ValMax_ = 0)
 {
   floatOptions.clear(); charOptions.clear();
   flag_Enum = 0; member_ValMax = member_ValMax_;
@@ -1237,7 +1237,7 @@ DefineConstants :
       Free($3);
     }
   | DefineConstants Comma String__Index tAFFECT '{' ListOfDouble
-    { init_Options(); }
+    { init_options(); }
     FloatParameterOptionsOrNone '}'
     {
       if(List_Nbr($6) != 1)
@@ -1257,7 +1257,7 @@ DefineConstants :
       Free($6);
     }
   | DefineConstants Comma String__Index LP RP tAFFECT '{' ListOfDouble
-    { init_Options(); }
+    { init_options(); }
     FloatParameterOptionsOrNone '}'
     {
       std::string key($3);
@@ -1284,7 +1284,7 @@ DefineConstants :
       Free($5);
     }
   | DefineConstants Comma String__Index tAFFECT '{' StringExpr
-    { init_Options(); }
+    { init_options(); }
       CharParameterOptionsOrNone '}'
     {
       std::string key($3), val($6);
@@ -4701,7 +4701,7 @@ FExpr_Single :
   // Variables
 
   | tDefineNumber LP FExpr
-    { init_Options(); }
+    { init_options(); }
     FloatParameterOptionsOrNone RP
     {
       std::vector<double> val(1, $3);
@@ -5025,7 +5025,7 @@ DefineStruct :
     {
       std::string struct_namespace($2.char1? $2.char1 : std::string("")),
         struct_name($2.char2);
-      init_Options
+      init_options
         (nameSpaces.getMember_ValMax(struct_namespace, struct_name));
     }
     '[' FloatParameterOptionsOrNone_NoComma ']'
@@ -5951,7 +5951,7 @@ StringExpr :
       Free($3);
     }
   | tDefineString LP StringExpr
-    { init_Options(); }
+    { init_options(); }
     CharParameterOptionsOrNone RP
     {
       std::string val($3);
-- 
GitLab