Merge remote-tracking branch 'jbeard/master'

# Conflicts:
#	mc_lexer.l
#	mc_parser.yy
#	mc_scanner.hpp

Author: mdhooge

.gitignore

@@ -0,0 +1,10 @@
+*.swp
+*.o
+location.hh
+position.hh
+stack.hh
+mc_lexer.yy.cc
+mc_parser.output
+mc_parser.tab.cc
+mc_parser.tab.hh
+my_wc

.travis.yml

@@ -0,0 +1,65 @@
+## container build, no sudo
+sudo: false
+
+language: cpp 
+
+compiler: 
+    - gcc 
+    - clang
+
+os:
+    - linux
+
+cache:
+  apt:
+  ccache:
+  directories:
+
+env:
+    global:
+        - GCC_VERSION=5
+        - CXXFLAGS=-std=c++11
+        - CFLAGS=-std=c99
+
+branches:
+    only:
+        - master
+
+before_install:
+    -   if [ ${CC} != "clang" ]; then
+            export CC=/usr/bin/gcc-${GCC_VERSION} CXX=/usr/bin/g++-${GCC_VERSION};
+            C=gcc;
+        fi
+
+
+addons:
+ apt:
+    sources:
+      - ubuntu-toolchain-r-test
+      - llvm-toolchain-precise
+    packages:
+# ensure these match GCC_VERSION
+      - gcc-5
+      - g++-5
+      - binutils
+      - gawk
+      - build-essential
+      - wget
+      - libtool
+      - flex
+
+
+before_script:
+    - echo $LANG
+    - echo $LC_ALL
+    - wget --no-check-certificate http://ftp.gnu.org/gnu/bison/bison-3.0.4.tar.gz
+    - mkdir $HOME/bison
+    - tar -xf bison-3.0.4.tar.gz; cd bison-3.0.4; ./configure --prefix=$HOME/bison; make -j 4 install; cd $PWD/..;
+    - export PATH=$HOME/bison/bin:$PATH
+script:
+    - ${CC} --version ; ${CXX} --version;
+    - bison --version
+    - pwd
+    - ls -la $HOME
+    - env
+    - make all && make test

Makefile

@@ -10,8 +10,8 @@ CXXDEBUG = -g -Wall
 CSTD = -std=c99
 CXXSTD = -std=c++11
 
-CFLAGS = -O0  $(CDEBUG) $(CSTD) 
-CXXFLAGS = -O0  $(CXXDEBUG) $(CXXSTD)
+CFLAGS = -Wno-deprecated-register -O0  $(CDEBUG) $(CSTD) 
+CXXFLAGS = -Wno-deprecated-register -O0  $(CXXDEBUG) $(CXXSTD)
 
 
 CPPOBJ = main mc_driver
@@ -44,6 +44,9 @@ lexer: mc_lexer.l
 	flex --outfile=mc_lexer.yy.cc  $<
 	$(CXX)  $(CXXFLAGS) -c mc_lexer.yy.cc -o lexer.o
 
+.PHONY: test
+test:
+	cd test && ./test0.pl
 
 .PHONY: clean
 clean:

README.md

@@ -1,4 +1,17 @@
-simple_wc_example
+###Simple Word Count Parser Example
 =================
 
-simple word count example using flex/bison parser
+###Build Status
+Tested on linux and OS X
+
+[![Build Status](https://travis-ci.org/jonathan-beard/simple_wc_example.svg?branch=master)](https://travis-ci.org/jonathan-beard/simple_wc_example)
+
+###About
+So this is a super simple parser example. The tutorial is located here: 
+<a href="http://www.jonathanbeard.io/tutorials/FlexBisonC++.html" target="_blank">link</a>
+
+Between the tutorial and the code you should be able to get started with more advanced projects using C++ and Flex/Bison. Admittedly the example itself is a bit contrived, however it's mean to be simple and get the point across. If there are changes in Flex/Bison that prevent the example from compiling or if you just have improvements, feel free to generate a pull request or just shoot me an e-mail. 
+
+To compile just download and run make, there's a super simple test harness to make sure it runs in the <tt>test</tt> dir.
+
+Thanks!

main.cpp

@@ -4,7 +4,7 @@
 #include "mc_driver.hpp"
 
 int 
-main(const int argc, const char **argv)
+main( const int argc, const char **argv )
 {
    if(argc != 2 ) 
       return ( EXIT_FAILURE );

mc_driver.cpp

@@ -4,15 +4,16 @@
 
 #include "mc_driver.hpp"
 
-MC::MC_Driver::~MC_Driver(){ 
+MC::MC_Driver::~MC_Driver()
+{
    delete(scanner);
    scanner = nullptr;
    delete(parser);
    parser = nullptr;
 }
 
 void 
-MC::MC_Driver::parse( const char *filename )
+MC::MC_Driver::parse( const char * const filename )
 {
    assert( filename != nullptr );
    std::ifstream in_file( filename );

mc_driver.hpp

@@ -2,20 +2,15 @@
 #define __MCDRIVER_HPP__ 1
 
 #include <string>
+#include <cstdint>
 #include "mc_scanner.hpp"
 #include "mc_parser.tab.hh"
 
 namespace MC{
 
 class MC_Driver{
 public:
-   MC_Driver() : chars(0),
-                 words(0),
-                 lines(0),
-                 uppercase(0),
-                 lowercase(0),
-                 parser( nullptr ),
-                 scanner( nullptr ){};
+   MC_Driver() = default;
 
    virtual ~MC_Driver();
 
@@ -30,13 +25,13 @@ class MC_Driver{
 
    std::ostream& print(std::ostream &stream);
 private:
-   int chars;
-   int words;
-   int lines;
-   int uppercase;
-   int lowercase;
-   MC::MC_Parser *parser;
-   MC::MC_Scanner *scanner;
+   int chars      = 0;
+   int words      = 0;
+   int lines      = 0;
+   int uppercase  = 0;
+   int lowercase  = 0;
+   MC::MC_Parser  *parser  = nullptr;
+   MC::MC_Scanner *scanner = nullptr;
 };
 
 } /* end namespace MC */

mc_lexer.l

@@ -5,7 +5,7 @@
 /* Implementation of yyFlexScanner */ 
 #include "mc_scanner.hpp"
 #undef  YY_DECL
-#define YY_DECL int MC::MC_Scanner::yylex(MC::MC_Parser::semantic_type *lval)
+#define YY_DECL int MC::MC_Scanner::yylex(MC::MC_Parser::semantic_type * const lval, MC::MC_Parser::location_type *location)
 
 /* typedef to make the returns for the tokens shorter */
 typedef MC::MC_Parser::token token;
@@ -19,41 +19,46 @@ typedef MC::MC_Parser::token token;
 /* msvc2010 requires that we exclude this header file. */
 #define YY_NO_UNISTD_H
 
+/* update location on matching */
+#define YY_USER_ACTION loc->step(); loc->columns(yyleng);
+
 %}
 
-%option debug 
-%option nodefault 
-%option yyclass="MC::MC_Scanner" 
-%option noyywrap 
+%option debug
+%option nodefault
+%option yyclass="MC::MC_Scanner"
+%option noyywrap
 %option c++
 
 %%
 %{          // Code executed at the beginning of yylex
             yylval = lval;
 %}
 
-[a-z]       { 
-               return( token::LOWER );     
+[a-z]       {
+               return( token::LOWER );
             }
 
-[A-Z]       { 
-               return( token::UPPER );     
+[A-Z]       {
+               return( token::UPPER );
             }
 
-[a-zA-Z]+   { 
+[a-zA-Z]+   {
                // Section 10.1.5.1 of the 3.0.2 Bison Manual says the following should work
                // yylval.build( yytext );
                // But it doesn't.
                yylval->build<std::string>( yytext );
-               return( token::WORD );      
+               return( token::WORD );
             }
 
-\n          { 
-               return( token::NEWLINE );   
+\n          {
+               // Update line number
+               loc->lines();
+               return( token::NEWLINE );
             }
 
-.           { 
-               return( token::CHAR );      
+.           {
+               return( token::CHAR );
             }
 %%
 

mc_parser.yy

@@ -47,6 +47,7 @@
 %token               NEWLINE
 %token               CHAR
 
+%locations
 
 %%
 
@@ -69,7 +70,7 @@ item
 
 
 void 
-MC::MC_Parser::error( const std::string &err_message )
+MC::MC_Parser::error( const location_type &l, const std::string &err_message )
 {
-   std::cerr << "Error: " << err_message << "\n"; 
+   std::cerr << "Error: " << err_message << " at " << l << "\n";
 }

mc_scanner.hpp

@@ -6,22 +6,29 @@
 #endif
 
 #include "mc_parser.tab.hh"
+#include "location.hh"
 
 namespace MC{
 
 class MC_Scanner : public yyFlexLexer{
 public:
 
    MC_Scanner(std::istream *in) : yyFlexLexer(in),
-                                  yylval( nullptr ){};
+                                  yylval( nullptr )
+   {
+     loc = new MC::MC_Parser::location_type();
+   };
 
-   int yylex(MC::MC_Parser::semantic_type *lval);
+   int yylex(MC::MC_Parser::semantic_type * const lval, MC::MC_Parser::location_type *location);
    // YY_DECL defined in mc_lexer.l
    // Method body created by flex in mc_lexer.yy.cc
 
+
 private:
    /* yyval ptr */
    MC::MC_Parser::semantic_type *yylval;
+   /* location ptr */
+   MC::MC_Parser::location_type *loc;
 };
 
 } /* end namespace MC */

test/test0.pl

@@ -0,0 +1,16 @@
+#!/usr/bin/env perl
+use strict;
+use warnings;
+
+system( "../my_wc wordlist.txt > temp.txt" );
+my $diff = `diff temp.txt wordlist_out.txt`;
+chomp( $diff );
+if( $diff )
+{
+    print STDERR $diff;
+    unlink( "temp.txt" );
+    exit( -1 );
+}
+print STDERR "***PASSED***\n";
+unlink( "temp.txt" );
+exit( 0 );