updates

Author: jonathan-beard

Makefile

@@ -17,8 +17,6 @@ CXXFLAGS = -O0  $(CXXDEBUG) $(CXXSTD)
 CPPOBJ = main mc_driver
 SOBJ =  parser lexer
 
-LIBS = -lfl
-
 FILES = $(addsuffix .cpp, $(CPPOBJ))
 
 OBJS  = $(addsuffix .o, $(CPPOBJ))
@@ -36,7 +34,6 @@ wc: $(FILES)
 	$(MAKE) $(SOBJ)
 	$(MAKE) $(OBJS)
 	$(CXX) $(CXXFLAGS) -o $(EXE) $(OBJS) parser.o lexer.o $(LIBS)
-	rm -rf *.o
 
 
 parser: mc_parser.yy
@@ -47,8 +44,6 @@ lexer: mc_lexer.l
 	flex --outfile=mc_lexer.yy.cc  $<
 	$(CXX)  $(CXXFLAGS) -c mc_lexer.yy.cc -o lexer.o
 
-%.o: %.cpp
-	$(CXX) -c $(CXXFLAGS) $(CXXSTD) -o $@ $<
 
 .PHONY: clean
 clean:

mc_driver.cpp

@@ -4,64 +4,87 @@
 
 #include "mc_driver.hpp"
 
-// wamckee 2013 APR 2 - Instead of testing for == FAIL below,
-// we test for != ACCEPT (in which ACCEPT has a value of zero).
-// When compiling on a MSVC 2010 platform using cygwin's Flex and Bison,
-// we note that the return value from parse() is not -1 but rather +1.
-// It is more likely that on different platforms the return value of zero
-// will be used consistantly to indicate an accept state. Whereas, the
-// value of the abort or fail state will be more likely not to be a specific
-// value but rather a value that is not equal to zero.
-
-#ifndef ACCEPT
-#define ACCEPT 0
-#endif
-
 MC::MC_Driver::~MC_Driver(){ 
-   delete(scanner);  // wamckee 2013 APR 2
-   delete(parser);   // wamckee 2013 APR 2
+   delete(scanner);
+   delete(parser);
 }
 
-void MC::MC_Driver::parse( const char *filename ){
+void 
+MC::MC_Driver::parse( const char *filename )
+{
    assert( filename != nullptr );
    std::ifstream in_file( filename );
    if( ! in_file.good() ) exit( EXIT_FAILURE );
 
-   delete(scanner); // wamckee 2013 APR 2
+   delete(scanner);
+   scanner = nullptr;
    scanner = new MC::MC_Scanner( &in_file );
    /* check to see if its initialized */
    assert( scanner != nullptr );
 
-   delete(parser); // wamckee 2013 APR 2
+   delete(parser); 
+   parser = nullptr;
    parser = new MC::MC_Parser( (*scanner) /* scanner */, 
                                (*this) /* driver */ );
    assert( parser != nullptr );
 
-   if(parser->parse() != ACCEPT) // wamckee 2013 APR 2
+   const int accept( 0 );
+   if( parser->parse() != accept )
    {
       std::cerr << "Parse failed!!\n";
    }
 }
 
-void MC::MC_Driver::add_upper(){ uppercase++; chars++; words++; }
+void 
+MC::MC_Driver::add_upper()
+{ 
+   uppercase++; 
+   chars++; 
+   words++; 
+}
 
-void MC::MC_Driver::add_lower(){ lowercase++; chars++; words++; }
+void 
+MC::MC_Driver::add_lower()
+{ 
+   lowercase++; 
+   chars++; 
+   words++; 
+}
 
-void MC::MC_Driver::add_word( const std::string &c ){
+void 
+MC::MC_Driver::add_word( const std::string &c )
+{
    words++; 
    chars += c.length();
    for(auto it(c.begin()); it != c.end(); ++it){
-      if( islower( (*it) ) ) { lowercase++; }
-      else if ( isupper( (*it) ) ) { uppercase++; }
+      if( islower( (*it) ) )
+      { 
+         lowercase++; 
+      }
+      else if ( isupper( (*it) ) ) 
+      { 
+         uppercase++; 
+      }
    }
 }
 
-void MC::MC_Driver::add_newline(){ lines++; chars++; }
+void 
+MC::MC_Driver::add_newline()
+{ 
+   lines++; 
+   chars++; 
+}
 
-void MC::MC_Driver::add_char(){ chars++; }
+void 
+MC::MC_Driver::add_char()
+{ 
+   chars++; 
+}
 
 
-std::ostream& MC::MC_Driver::print(std::ostream &stream){
+std::ostream& 
+MC::MC_Driver::print( std::ostream &stream )
+{
    stream << "Uppercase: " << uppercase << "\n";
    stream << "Lowercase: " << lowercase << "\n";
    stream << "Lines: " << lines << "\n";

mc_driver.hpp

@@ -3,7 +3,7 @@
 
 #include <string>
 #include "mc_scanner.hpp"
-#include "mc_Parser.tab.hh"
+#include "mc_parser.tab.hh"
 
 namespace MC{
 

mc_lexer.l

@@ -26,23 +26,19 @@ typedef MC::MC_Parser::token token;
 
 %%
 [a-z]       { 
-               yylval->sval = STOKEN( yytext );  
                return(token::LOWER);     
             }
 [A-Z]       { 
-               yylval->sval = STOKEN( yytext );  
                return(token::UPPER);     
             }
 [a-zA-Z]+   { 
                yylval->sval = STOKEN( yytext );  
                return(token::WORD);      
             }
 \n          { 
-               yylval->sval = STOKEN( yytext );  
                return(token::NEWLINE);   
             }
 .           { 
-               yylval->sval = STOKEN( yytext );  
                return(token::CHAR);      
             }
 %%

mc_parser.yy

@@ -38,29 +38,26 @@
    std::string *sval;
 }
 
-%token        END    0     "end of file"
-%token <sval> UPPER
-%token <sval> LOWER
-%token <sval> WORD
-%token <sval> NEWLINE
-%token <sval> CHAR
+%token            END    0     "end of file"
+%token            UPPER
+%token            LOWER
+%token   <sval>   WORD
+%token            NEWLINE
+%token            CHAR
 
-%type <sval> object
 
-%destructor { delete( $$ ); } UPPER LOWER WORD NEWLINE CHAR
+%destructor { delete( $$ ); } WORD
 
 
 %%
 
 list_option : END | list END;
 
 list
-  : object
-  | list object
+  : item
+  | list item
   ;
 
-object : item { delete( $$ ); }
-
 item
   : UPPER   { driver.add_upper(); }
   | LOWER   { driver.add_lower(); }
@@ -79,7 +76,6 @@ void MC::MC_Parser::error( const MC::MC_Parser::location_type &l,
 }
 
 
-
 /* include for access to scanner.yylex */
 #include "mc_scanner.hpp"
 static int yylex(MC::MC_Parser::semantic_type *yylval,