summaryrefslogtreecommitdiff
path: root/ace/Svc_Conf.y
diff options
context:
space:
mode:
Diffstat (limited to 'ace/Svc_Conf.y')
-rw-r--r--ace/Svc_Conf.y17
1 files changed, 3 insertions, 14 deletions
diff --git a/ace/Svc_Conf.y b/ace/Svc_Conf.y
index 1cbd9010104..fe45f8c4c1e 100644
--- a/ace/Svc_Conf.y
+++ b/ace/Svc_Conf.y
@@ -1,14 +1,11 @@
%{
// $Id$
-
#include "ace/ARGV.h"
#include "ace/Svc_Conf.h"
#include "ace/Module.h"
#include "ace/Stream.h"
-ACE_RCSID (ace,
- Svc_Conf_y,
- "$Id$")
+ACE_RCSID(ace, Svc_Conf_y, "$Id$")
// Prototypes.
static ACE_Module_Type *ace_get_module (ACE_Static_Node *str_rec,
@@ -22,13 +19,9 @@ static ACE_Module_Type *ace_get_module (ACE_Static_Node *str_rec,
// #define YYDEBUG 1
// Efficient memory allocation technique.
-ACE_Obstack_T<ACE_TCHAR> *ace_obstack = 0;
-
-// Keeps track of the number of errors encountered so far.
-int yyerrno = 0;
+ACE_Obstack *ace_obstack;
%}
-
%token ACE_DYNAMIC ACE_STATIC ACE_SUSPEND ACE_RESUME ACE_REMOVE ACE_USTREAM
%token ACE_MODULE_T ACE_STREAM_T ACE_SVC_OBJ_T ACE_ACTIVE ACE_INACTIVE
%token ACE_PATHNAME ACE_IDENT ACE_STRING
@@ -44,9 +37,6 @@ int yyerrno = 0;
%type <svc_record_> svc_location
%type <location_node_> svc_initializer
-// Generate a pure (reentrant) parser -- GNU Bison only
-%pure_parser
-
%%
svc_config_entries
@@ -318,7 +308,6 @@ parameters_opt
pathname
: ACE_PATHNAME
| ACE_IDENT
- | ACE_STRING
;
%%
@@ -458,7 +447,7 @@ int
main (int argc, char *argv[])
{
yyin = stdin;
- ace_obstack = new ACE_Obstack_T<ACE_TCHAR>;
+ ace_obstack = new ACE_Obstack;
// Try to reopen any filename argument to use YYIN.
if (argc > 1 && (yyin = freopen (argv[1], "r", stdin)) == 0)