[gentoo-commits] proj/libbash:master commit in: /, src/core/, bashast/, test/

[Petteri Räty]

commit:     f3165d3aba092c6712943e1d41ffc5327a4d8ccc
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 30 02:04:01 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Wed Mar 30 12:06:08 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=f3165d3a

Rename grammar files

Grammar files are renamed for better consistency of the generated
files. It also help automake differentiate the grammars for gUnit
and C source files.

---
 .gitignore                                |   14 ++++++++------
 Makefile.am                               |   28 +++++++++++++++-------------
 bashast/{bashwalker.g => libbashWalker.g} |    4 ++--
 src/core/interpreter.h                    |    2 +-
 test/post_check.cpp                       |    6 +++---
 test/walker_test.cpp                      |   20 ++++++++++----------
 6 files changed, 39 insertions(+), 35 deletions(-)

diff --git a/.gitignore b/.gitignore
index 35588e4..4bf6402 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,7 +18,8 @@ missing
 Makefile
 autom4te.cache
 cppunittests
-bashast.g
+libbash.g
+libbash.tokens
 bashast.tokens
 bashast/.DS_Store
 bashast/*.ebuild
@@ -29,11 +30,12 @@ bashast/tmp/
 bashast/tokens.png
 bashastLexer.*
 bashastParser.*
-bashwalker.g
-bashwalker.h
-bashwalker.c
-bashwalker.cpp
-bashwalker.tokens
+libbashLexer.*
+libbashParser.*
+libbashWalker.h
+libbashWalker.c
+libbashWalker.cpp
+libbashWalker.tokens
 coding_standard/*.pdf
 coding_standard/*.log
 coding_standard/*.aux

diff --git a/Makefile.am b/Makefile.am
index faecc69..9207722 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -88,19 +88,19 @@ cppunittests_LDADD = libcppbash.la \
 cppunittests_LDFLAGS = -static
 endif
 
-GENERATED_PARSER_C = bashastLexer.c bashastParser.c
-GENERATED_PARSER_H = bashastLexer.h bashastParser.h
-GENERATED_WALKER_C = bashwalker.c
-GENERATED_WALKER_H = bashwalker.h
+GENERATED_PARSER_C = libbashLexer.c libbashParser.c
+GENERATED_PARSER_H = libbashLexer.h libbashParser.h
+GENERATED_WALKER_C = libbashWalker.c
+GENERATED_WALKER_H = libbashWalker.h
 CLEANFILES = $(GENERATED_PARSER_C) \
 			 $(GENERATED_PARSER_H) \
 			 $(GENERATED_WALKER_C) \
 			 $(GENERATED_WALKER_H) \
 			 $(check_JAVA) \
-			 bashast.g \
-			 bashast.tokens \
+			 libbash.g \
+			 libbash.tokens \
 			 bashast/bashast.tokens \
-			 bashwalker.tokens \
+			 libbashWalker.tokens \
 			 bashast/javagrammar.run \
 			 cgrammar.run \
 			 walker.run
@@ -125,7 +125,7 @@ libcppbash_la_CXXFLAGS = $(AM_CXXFLAGS) $(HIDDEN_FLAGS)
 libcppbash_la_CFLAGS = $(AM_CFLAGS) $(HIDDEN_FLAGS)
 
 EXTRA_DIST = bashast/bashast.g \
-			 bashast/bashwalker.g \
+			 bashast/libbashWalker.g \
 			 $(GUNIT_TESTS) \
 			 $(GUNIT_LOG_COMPILER)
 
@@ -134,20 +134,22 @@ coding_standard.pdf: coding_standard/coding_standard.tex
 
 ANTLR = @JAVA@ -classpath @antlr_cp@ org.antlr.Tool
 
-cgrammar.run: bashast.g
+cgrammar.run: libbash.g
 	$(AM_V_at)touch $@.tmp
 	$(AM_V_GEN)$(ANTLR) -fo . $<
 	$(AM_V_at)mv $@.tmp $@
 
-bashast.g: bashast/bashast.g
-	$(AM_V_at)sed -e 's/CommonTree/pANTLR3_BASE_TREE/g' -e 's/Java/C/g' $< > $@
+libbash.g: bashast/bashast.g
+	$(AM_V_at)sed -e 's/ASTLabelType	= CommonTree;/ASTLabelType	= pANTLR3_BASE_TREE;/g' \
+				  -e 's/language	= Java;/language	= C;/g' \
+				  -e 's/grammar bashast;/grammar libbash;/g' $< > $@
 
 # Avoid initializing C++ type to NULL by sed, variables whose name
 # starts with libbash_ will be stripped
-walker.run: bashast/bashwalker.g cgrammar.run
+walker.run: bashast/libbashWalker.g cgrammar.run
 	$(AM_V_at)touch $@.tmp
 	$(AM_V_GEN)$(ANTLR) -fo . $<
-	$(AM_V_at)sed -i -e 's/\(libbash_.*\) = NULL/\1/' bashwalker.c
+	$(AM_V_at)sed -i -e 's/\(libbash_.*\) = NULL/\1/' libbashWalker.c
 	$(AM_V_GEN)mv $@.tmp $@
 
 $(GENERATED_PARSER_C): cgrammar.run

diff --git a/bashast/bashwalker.g b/bashast/libbashWalker.g
similarity index 98%
rename from bashast/bashwalker.g
rename to bashast/libbashWalker.g
index d2c2438..6de281f 100644
--- a/bashast/bashwalker.g
+++ b/bashast/libbashWalker.g
@@ -16,12 +16,12 @@
    You should have received a copy of the GNU General Public License
    along with libbash.  If not, see <http://www.gnu.org/licenses/>.
 */
-tree grammar bashwalker;
+tree grammar libbashWalker;
 
 options
 {
 	language = C;
-	tokenVocab = bashast;
+	tokenVocab = libbash;
 	ASTLabelType = pANTLR3_BASE_TREE;
 }
 

diff --git a/src/core/interpreter.h b/src/core/interpreter.h
index 0833e02..1d6ced9 100644
--- a/src/core/interpreter.h
+++ b/src/core/interpreter.h
@@ -32,7 +32,7 @@
 
 #include <antlr3basetree.h>
 
-#include "bashastLexer.h"
+#include "libbashLexer.h"
 #include "core/symbols.hpp"
 
 ///

diff --git a/test/post_check.cpp b/test/post_check.cpp
index 098b0f8..1385290 100644
--- a/test/post_check.cpp
+++ b/test/post_check.cpp
@@ -36,15 +36,15 @@ static void check_file_size(const char *path, uintmax_t size_max)
 
 TEST(post_check, lexer_size)
 {
-  check_file_size("bashastLexer.c", 1024 * 1024);
+  check_file_size("libbashLexer.c", 1024 * 1024);
 }
 
 TEST(post_check, parser_size)
 {
-  check_file_size("bashastParser.c", 4096 * 1024);
+  check_file_size("libbashParser.c", 4096 * 1024);
 }
 
 TEST(post_check, walker_size)
 {
-  check_file_size("bashwalker.c", 4096 * 1024);
+  check_file_size("libbashWalker.c", 4096 * 1024);
 }

diff --git a/test/walker_test.cpp b/test/walker_test.cpp
index 98672aa..66ae75d 100644
--- a/test/walker_test.cpp
+++ b/test/walker_test.cpp
@@ -26,9 +26,9 @@
 
 #include <gtest/gtest.h>
 
-#include "bashastLexer.h"
-#include "bashastParser.h"
-#include "bashwalker.h"
+#include "libbashLexer.h"
+#include "libbashParser.h"
+#include "libbashWalker.h"
 #include "core/interpreter.h"
 
 using namespace std;
@@ -36,10 +36,10 @@ using namespace std;
 class walker_test: public ::testing::Test
 {
   pANTLR3_INPUT_STREAM input;
-  pbashastLexer lxr;
+  plibbashLexer lxr;
   pANTLR3_COMMON_TOKEN_STREAM tstream;
-  pbashastParser psr;
-  bashastParser_arithmetics_return langAST;
+  plibbashParser psr;
+  libbashParser_arithmetics_return langAST;
   pANTLR3_COMMON_TREE_NODE_STREAM nodes;
 protected:
   virtual void SetUp()
@@ -57,7 +57,7 @@ protected:
   }
   void init_walker(const char* script);
 public:
-  pbashwalker treePsr;
+  plibbashWalker treePsr;
   shared_ptr<interpreter> walker;
 
   int run_arithmetic(const char* script)
@@ -88,7 +88,7 @@ void walker_test::init_walker(const char *script){
     FAIL();
   }
 
-  lxr = bashastLexerNew(input);
+  lxr = libbashLexerNew(input);
   if ( lxr == NULL )
   {
     ANTLR3_FPRINTF(stderr,
@@ -105,7 +105,7 @@ void walker_test::init_walker(const char *script){
     FAIL();
   }
 
-  psr = bashastParserNew(tstream);
+  psr = libbashParserNew(tstream);
   if (psr == NULL)
   {
     ANTLR3_FPRINTF(stderr, "Out of memory trying to allocate parser\n");
@@ -115,7 +115,7 @@ void walker_test::init_walker(const char *script){
   langAST = psr->arithmetics(psr);
   nodes   = antlr3CommonTreeNodeStreamNewTree(langAST.tree,
                                               ANTLR3_SIZE_HINT);
-  treePsr = bashwalkerNew(nodes);
+  treePsr = libbashWalkerNew(nodes);
   walker->define("value", 100);
   set_interpreter(walker);
 }