updates

Author: jonathan-beard

mc_lexer.l

@@ -11,7 +11,7 @@ typedef MC::MC_Parser::token token;
 #define STOKEN( x ) ( new std::string( x ) )
 
 /* define yyterminate as this instead of NULL */
-#define yyterminate() return(token::END)
+#define yyterminate() return( token::END )
 
 /* msvc2010 requires that we exclude this header file. */
 #define YY_NO_UNISTD_H
@@ -26,20 +26,24 @@ typedef MC::MC_Parser::token token;
 
 %%
 [a-z]       { 
-               return(token::LOWER);     
+               return( token::LOWER );     
             }
+
 [A-Z]       { 
-               return(token::UPPER);     
+               return( token::UPPER );     
             }
+
 [a-zA-Z]+   { 
                yylval->sval = STOKEN( yytext );  
-               return(token::WORD);      
+               return( token::WORD );      
             }
+
 \n          { 
-               return(token::NEWLINE);   
+               return( token::NEWLINE );   
             }
+
 .           { 
-               return(token::CHAR);      
+               return( token::CHAR );      
             }
 %%
 

mc_parser.yy

@@ -2,8 +2,8 @@
 %require  "2.5"
 %debug 
 %defines 
-%define namespace "MC"
-%define parser_class_name "MC_Parser"
+%define api.namespace {MC}
+%define parser_class_name {MC_Parser}
 
 %code requires{
    namespace MC {
@@ -69,18 +69,19 @@ item
 %%
 
 
-void MC::MC_Parser::error( const MC::MC_Parser::location_type &l,
-                           const std::string &err_message)
+void 
+MC::MC_Parser::error( const std::string &err_message )
 {
    std::cerr << "Error: " << err_message << "\n"; 
 }
 
 
 /* include for access to scanner.yylex */
 #include "mc_scanner.hpp"
-static int yylex(MC::MC_Parser::semantic_type *yylval,
-                 MC::MC_Scanner  &scanner,
-                 MC::MC_Driver   &driver)
+static int 
+yylex( MC::MC_Parser::semantic_type *yylval,
+       MC::MC_Scanner  &scanner,
+       MC::MC_Driver   &driver )
 {
    return( scanner.yylex(yylval) );
 }