Fix for issue #785; readme formatting (#786)

* Fix for issue #785; readme formatting

* cpplint fix; removed more autotools files; gtest warning fix

* Fewer ignored files

* Fix incorrect README.md merge

* Added cstring utility method

.gitignore

@@ -1,29 +1,3 @@
-# Autotools generated files
-
-Makefile.in
-aclocal.m4
-autom4te.cache
-compile
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-depcomp
-install-sh
-libtool
-ltmain.sh
-missing
-stamp-h1
-test-driver
-ylwrap
-m4/libtool.m4
-m4/ltoptions.m4
-m4/ltsugar.m4
-m4/ltversion.m4
-m4/lt~obsolete.m4
 frontends/p4/p4-lex.c
 frontends/p4/p4-parse.cpp
 py-compile

Dockerfile

@@ -12,8 +12,7 @@ ARG MAKEFLAGS=-j2
 # removed from the image.
 ARG IMAGE_TYPE=build
 
-ENV P4C_DEPS automake \
-             bison \
+ENV P4C_DEPS bison \
              build-essential \
              cmake \
              flex \
@@ -23,7 +22,6 @@ ENV P4C_DEPS automake \
              libfl-dev \
              libgc-dev \
              libgmp-dev \
-             libtool \
              pkg-config \
              python-ipaddr \
              python-pip \

README.md

@@ -102,7 +102,7 @@ included with `p4c` are documented here:
 
 Most dependencies can be installed using `apt-get install`:
 
-`sudo apt-get install g++ git automake libtool libgc-dev bison flex libfl-dev libgmp-dev libboost-dev libboost-iostreams-dev pkg-config python python-scapy python-ipaddr tcpdump`
+`sudo apt-get install g++ git automake libtool libgc-dev bison flex libfl-dev libgmp-dev libboost-dev libboost-iostreams-dev pkg-config python python-scapy python-ipaddr tcpdump cmake`
 
 For documentation building:
 `sudo apt-get install -y doxygen graphviz texlive-full`

ir/node.cpp

@@ -117,7 +117,8 @@ void IR::Node::sourceInfoToJSON(JSONGenerator &json) const {
     json << json.indent << "\"filename\" : " << fName << "," << std::endl;
     json << json.indent << "\"line\" : " << lineNumber << "," << std::endl;
     json << json.indent << "\"column\" : " << columnNumber << "," << std::endl;
-    json << json.indent << "\"source_fragment\" : " << si.toBriefSourceFragment() << std::endl;
+    json << json.indent << "\"source_fragment\" : " <<
+            si.toBriefSourceFragment().escapeJson() << std::endl;
 
     json << --json.indent << "}";
 }

lib/cstring.cpp

@@ -1,5 +1,5 @@
 /*
-Copyright 2013-present Barefoot Networks, Inc. 
+Copyright 2013-present Barefoot Networks, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -77,3 +77,14 @@ cstring cstring::replace(char c, char with) const {
             *p = with;
     return cstring(dup);
 }
+
+cstring cstring::escapeJson() const {
+    std::string out;
+    for (size_t i = 0; i < size(); i++) {
+        char c = get(i);
+        if (c == '\\' || c == '"')
+            out += "\\";
+        out += c;
+    }
+    return cstring(out);
+}

lib/cstring.h

@@ -88,6 +88,10 @@ class cstring {
     cstring(const std::string &a) { *this = a; }            // NOLINT(runtime/explicit)
     cstring &operator=(const char *);
     cstring &operator=(const std::string&);
+    /// @return a version of the string where all necessary characters
+    /// are properly escaped to make this into a json string (without
+    /// the enclosing quotes).
+    cstring escapeJson() const;
 
     template <typename Iter> cstring(Iter begin, Iter end) {
         *this = std::string(begin, end);

test/gtest/bmv2_isvalid.cpp

@@ -313,9 +313,9 @@ TEST(BMV2_SynthesizeValidField, ConstTableEntries) {
         ASSERT_TRUE(falses[1]->is<IR::Constant>());
         EXPECT_EQ(0, falses[1]->to<IR::Constant>()->asInt());
         ASSERT_TRUE(falses[2]->is<IR::BoolLiteral>());
-        EXPECT_EQ(false, falses[2]->to<IR::BoolLiteral>()->value);
+        ASSERT_FALSE(falses[2]->to<IR::BoolLiteral>()->value);
         ASSERT_TRUE(falses[3]->is<IR::BoolLiteral>());
-        EXPECT_EQ(false, falses[3]->to<IR::BoolLiteral>()->value);
+        ASSERT_FALSE(falses[3]->to<IR::BoolLiteral>()->value);
     });
 
     program = program->apply(P4::TypeChecking(&refMap, &typeMap));