From 2f4fc005937e75d931eb6ef87a3fe16364d45113 Mon Sep 17 00:00:00 2001
From: Ben Longbons <b.r.longbons@gmail.com>
Date: Thu, 26 Jun 2014 21:59:27 -0700
Subject: Stick everything in a namespace

---
 src/sexpr/fwd.hpp         | 4 ++++
 src/sexpr/lexer.cpp       | 4 ++++
 src/sexpr/lexer.hpp       | 4 ++++
 src/sexpr/lexer_test.cpp  | 3 +++
 src/sexpr/parser.cpp      | 4 ++++
 src/sexpr/parser.hpp      | 4 ++++
 src/sexpr/parser.py       | 2 +-
 src/sexpr/parser_test.cpp | 3 +++
 8 files changed, 27 insertions(+), 1 deletion(-)

(limited to 'src/sexpr')

diff --git a/src/sexpr/fwd.hpp b/src/sexpr/fwd.hpp
index ad8304b..722d923 100644
--- a/src/sexpr/fwd.hpp
+++ b/src/sexpr/fwd.hpp
@@ -21,6 +21,10 @@
 
 # include "../sanity.hpp"
 
+
+namespace tmwa
+{
 // meh, add more when I feel like it
+} // namespace tmwa
 
 #endif // TMWA_SEXPR_FWD_HPP
diff --git a/src/sexpr/lexer.cpp b/src/sexpr/lexer.cpp
index a032c92..ea1890e 100644
--- a/src/sexpr/lexer.cpp
+++ b/src/sexpr/lexer.cpp
@@ -26,6 +26,9 @@
 
 #include "../poison.hpp"
 
+
+namespace tmwa
+{
 namespace sexpr
 {
     Lexeme Lexer::_adv()
@@ -228,3 +231,4 @@ namespace sexpr
         }
     }
 } // namespace sexpr
+} // namespace tmwa
diff --git a/src/sexpr/lexer.hpp b/src/sexpr/lexer.hpp
index 2fec51a..d1c4643 100644
--- a/src/sexpr/lexer.hpp
+++ b/src/sexpr/lexer.hpp
@@ -29,6 +29,9 @@
 
 # include "../io/line.hpp"
 
+
+namespace tmwa
+{
 namespace sexpr
 {
     enum Lexeme
@@ -70,5 +73,6 @@ namespace sexpr
 
     LString token_name(Lexeme tok);
 } // namespace sexpr
+} // namespace tmwa
 
 #endif // TMWA_SEXPR_LEXER_HPP
diff --git a/src/sexpr/lexer_test.cpp b/src/sexpr/lexer_test.cpp
index 936e92a..acdfa2f 100644
--- a/src/sexpr/lexer_test.cpp
+++ b/src/sexpr/lexer_test.cpp
@@ -25,6 +25,8 @@
 #include "../poison.hpp"
 
 
+namespace tmwa
+{
 #pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
 
 static
@@ -136,3 +138,4 @@ TEST(sexpr, lexbad)
         EXPECT_EQ(lexer.peek(), sexpr::TOK_ERROR);
     }
 }
+} // namespace tmwa
diff --git a/src/sexpr/parser.cpp b/src/sexpr/parser.cpp
index 00d2480..8768e14 100644
--- a/src/sexpr/parser.cpp
+++ b/src/sexpr/parser.cpp
@@ -25,6 +25,9 @@
 
 #include "../poison.hpp"
 
+
+namespace tmwa
+{
 namespace sexpr
 {
     bool token_is_int(ZString s, int64_t& out, bool& ok)
@@ -82,3 +85,4 @@ namespace sexpr
         return rv;
     }
 } // namespace sexpr
+} // namespace tmwa
diff --git a/src/sexpr/parser.hpp b/src/sexpr/parser.hpp
index ad3ad90..2404a9a 100644
--- a/src/sexpr/parser.hpp
+++ b/src/sexpr/parser.hpp
@@ -29,6 +29,9 @@
 
 # include "lexer.hpp"
 
+
+namespace tmwa
+{
 namespace sexpr
 {
     enum Type
@@ -78,5 +81,6 @@ namespace sexpr
     /// return false on error or eof, check lex.peek() == TOK_EOF to see
     bool parse(Lexer& lex, SExpr& out);
 } // namespace sexpr
+} // namespace tmwa
 
 #endif // TMWA_SEXPR_PARSER_HPP
diff --git a/src/sexpr/parser.py b/src/sexpr/parser.py
index d638259..201f457 100644
--- a/src/sexpr/parser.py
+++ b/src/sexpr/parser.py
@@ -2,7 +2,7 @@ class SExpr(object):
     ''' print a SExpr
     '''
     __slots__ = ('_value')
-    name = 'sexpr::SExpr'
+    name = 'tmwa::sexpr::SExpr'
     enabled = True
 
     def __init__(self, value):
diff --git a/src/sexpr/parser_test.cpp b/src/sexpr/parser_test.cpp
index e37b78f..5113c1a 100644
--- a/src/sexpr/parser_test.cpp
+++ b/src/sexpr/parser_test.cpp
@@ -23,6 +23,8 @@
 #include "../poison.hpp"
 
 
+namespace tmwa
+{
 #pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
 
 static
@@ -110,3 +112,4 @@ TEST(sexpr, parsebad)
         EXPECT_EQ(lexer.peek(), sexpr::TOK_ERROR);
     }
 }
+} // namespace tmwa
-- 
cgit v1.2.3-60-g2f50