From 3ef6b1adff15dba862661cb2320f644dafbea45e Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Thu, 27 Nov 2003 04:32:19 +0000
Subject: [PATCH] small additional cleanups
---
Parser/FunctionManager.h | 24 +++++++++++-------------
Parser/Gmsh.tab.cpp | 4 ++--
Parser/Gmsh.y | 4 ++--
Parser/Gmsh.yy.cpp | 4 ++--
Plugin/Plugin.h | 4 ----
Plugin/PluginManager.h | 9 +--------
6 files changed, 18 insertions(+), 31 deletions(-)
diff --git a/Parser/FunctionManager.h b/Parser/FunctionManager.h
index dd02377173..4342c789f9 100644
--- a/Parser/FunctionManager.h
+++ b/Parser/FunctionManager.h
@@ -24,22 +24,20 @@ class mystack;
class mymap;
#include <stdio.h>
-/*
- Singleton, one function manager for
- all parsers.
-*/
+
+// Singleton, one function manager for all parsers.
class FunctionManager
{
- mymap *functions;
- mystack *calls;
- FunctionManager ();
- static FunctionManager *instance;
- public :
- static FunctionManager* Instance();
- int createFunction (char *name, FILE *f, char *filename, int lineno);
- int enterFunction (char *name, FILE **f, char *filename, int &lineno) const;
- int leaveFunction (FILE **f, char *filename, int &lineno);
+ mymap *functions;
+ mystack *calls;
+ FunctionManager ();
+ static FunctionManager *instance;
+ public :
+ static FunctionManager* Instance();
+ int createFunction(char *name, FILE *f, char *filename, int lineno);
+ int enterFunction(char *name, FILE **f, char *filename, int &lineno) const;
+ int leaveFunction(FILE **f, char *filename, int &lineno);
};
#endif
diff --git a/Parser/Gmsh.tab.cpp b/Parser/Gmsh.tab.cpp
index 0afff0d6c6..0248817b65 100644
--- a/Parser/Gmsh.tab.cpp
+++ b/Parser/Gmsh.tab.cpp
@@ -189,7 +189,7 @@
#line 1 "Gmsh.y"
-// $Id: Gmsh.tab.cpp,v 1.169 2003-11-27 02:33:31 geuzaine Exp $
+// $Id: Gmsh.tab.cpp,v 1.170 2003-11-27 04:32:18 geuzaine Exp $
//
// Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
//
@@ -248,7 +248,7 @@ static char tmpstring[1024];
static Symbol TheSymbol, *pSymbol;
static Surface *STL_Surf;
static Shape TheShape;
-static int i, j, k, flag, RecursionLevel = 0, ImbricatedLoop = 0;
+static int i, j, k, flag, ImbricatedLoop = 0;
static int Last_NumberOfPoints = 0;
static double d, *pd;
static ExtrudeParams extr;
diff --git a/Parser/Gmsh.y b/Parser/Gmsh.y
index 237577d314..7cac347e48 100644
--- a/Parser/Gmsh.y
+++ b/Parser/Gmsh.y
@@ -1,5 +1,5 @@
%{
-// $Id: Gmsh.y,v 1.148 2003-11-27 02:33:34 geuzaine Exp $
+// $Id: Gmsh.y,v 1.149 2003-11-27 04:32:18 geuzaine Exp $
//
// Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
//
@@ -58,7 +58,7 @@ static char tmpstring[1024];
static Symbol TheSymbol, *pSymbol;
static Surface *STL_Surf;
static Shape TheShape;
-static int i, j, k, flag, RecursionLevel = 0, ImbricatedLoop = 0;
+static int i, j, k, flag, ImbricatedLoop = 0;
static int Last_NumberOfPoints = 0;
static double d, *pd;
static ExtrudeParams extr;
diff --git a/Parser/Gmsh.yy.cpp b/Parser/Gmsh.yy.cpp
index 6ab8babc3b..bab4646bf1 100644
--- a/Parser/Gmsh.yy.cpp
+++ b/Parser/Gmsh.yy.cpp
@@ -2,7 +2,7 @@
/* A lexical scanner generated by flex */
/* Scanner skeleton version:
- * $Header: /cvsroot/gmsh/Parser/Gmsh.yy.cpp,v 1.168 2003-11-27 02:33:35 geuzaine Exp $
+ * $Header: /cvsroot/gmsh/Parser/Gmsh.yy.cpp,v 1.169 2003-11-27 04:32:19 geuzaine Exp $
*/
#define FLEX_SCANNER
@@ -1013,7 +1013,7 @@ char *yytext;
#define INITIAL 0
#line 2 "Gmsh.l"
-// $Id: Gmsh.yy.cpp,v 1.168 2003-11-27 02:33:35 geuzaine Exp $
+// $Id: Gmsh.yy.cpp,v 1.169 2003-11-27 04:32:19 geuzaine Exp $
//
// Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
//
diff --git a/Plugin/Plugin.h b/Plugin/Plugin.h
index 32669e4a6c..986b8fe51a 100644
--- a/Plugin/Plugin.h
+++ b/Plugin/Plugin.h
@@ -96,7 +96,3 @@ public:
};
#endif
-
-
-
-
diff --git a/Plugin/PluginManager.h b/Plugin/PluginManager.h
index f04f7d174b..2e2b3ac098 100644
--- a/Plugin/PluginManager.h
+++ b/Plugin/PluginManager.h
@@ -73,12 +73,5 @@ public :
// Save. Other plugins may perform other actions.
void action (char *pluginMane , char *action , void *data);
};
-#endif
-
-
-
-
-
-
-
+#endif
--
GitLab