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

[Petteri Räty]

commit:     9c079e2625fefe91fb00c512e2253dab53844b33
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  2 02:56:18 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Sat Apr  2 15:46:49 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=9c079e26

Implement a public interface for variable retrieval

The interface will parse a specified script and return the
variables defined in the script. interpreter_exception will be
thrown if anything goes wrong while parsing.

---
 Makefile.am                                        |   14 +++-
 scripts/var_def.ebuild                             |   10 +++
 src/core/interpreter_exception.h                   |    4 +-
 src/libbash.cpp                                    |   71 ++++++++++++++++++++
 src/{core/interpreter_exception.h => libbash.h}    |   32 +++++----
 .../interpreter_exception.h => test/api_test.cpp   |   28 +++-----
 6 files changed, 125 insertions(+), 34 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index e8bbdb6..b6b2616 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -80,6 +80,7 @@ cppunittests_SOURCES =  test/run_tests.cpp \
 						src/builtins/tests/echo_tests.cpp \
 						src/builtins/tests/boolean_tests.cpp \
 						test/post_check.cpp \
+						test/api_test.cpp \
 						test/walker_test.cpp
 cppunittests_LDADD = libcppbash.la \
 					 $(GTEST_LIBS) \
@@ -92,6 +93,10 @@ GENERATED_PARSER_C = libbashLexer.c libbashParser.c
 GENERATED_PARSER_H = libbashLexer.h libbashParser.h
 GENERATED_WALKER_C = libbashWalker.c
 GENERATED_WALKER_H = libbashWalker.h
+BUILT_SOURCES = $(GENERATED_PARSER_C) \
+				$(GENERATED_PARSER_H) \
+				$(GENERATED_WALKER_C) \
+				$(GENERATED_WALKER_H)
 CLEANFILES = $(GENERATED_PARSER_C) \
 			 $(GENERATED_PARSER_H) \
 			 $(GENERATED_WALKER_C) \
@@ -106,17 +111,22 @@ CLEANFILES = $(GENERATED_PARSER_C) \
 			 walker.run
 
 lib_LTLIBRARIES = libcppbash.la
-libcppbash_la_SOURCES = src/cppbash_builtin.cpp \
+libcppbash_la_SOURCES = src/common.h \
+						src/libbash.h \
+						src/libbash.cpp \
+						src/cppbash_builtin.cpp \
 						src/cppbash_builtin.h \
 						src/builtins/echo_builtin.cpp \
 						src/builtins/echo_builtin.h \
 						src/builtins/boolean_builtins.h \
 						$(GENERATED_PARSER_C) \
+						$(GENERATED_PARSER_H) \
 						src/core/interpreter_exception.h \
 						src/core/interpreter.cpp \
 						src/core/interpreter.h \
 						src/core/symbols.hpp \
-						$(GENERATED_WALKER_C)
+						$(GENERATED_WALKER_C) \
+						$(GENERATED_WALKER_H)
 
 HIDDEN_FLAGS = -fvisibility=hidden \
 			   -fvisibility-inlines-hidden

diff --git a/scripts/var_def.ebuild b/scripts/var_def.ebuild
new file mode 100644
index 0000000..7100b84
--- /dev/null
+++ b/scripts/var_def.ebuild
@@ -0,0 +1,10 @@
+EAPI="1"
+DESCRIPTION="SunPinyin is a SLM (Statistical Language Model) based IME"
+HOMEPAGE="http://sunpinyin.googlecode.com"
+SRC_URI="http://open-gram.googlecode.com/files/dict.utf8.tar.bz2
+		http://open-gram.googlecode.com/files/lm_sc.t3g.arpa.tar.bz2"
+LICENSE="LGPL-2.1 CDDL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="abc"
+RDEPEND="dev-db/sqlite:3"

diff --git a/src/core/interpreter_exception.h b/src/core/interpreter_exception.h
index 785c6c3..bfce335 100644
--- a/src/core/interpreter_exception.h
+++ b/src/core/interpreter_exception.h
@@ -28,11 +28,13 @@
 #include <stdexcept>
 #include <string>
 
+#include "common.h"
+
 ///
 /// \class interpreter_exception
 /// \brief runtime exception occured during interpreting
 ///
-class interpreter_exception: public std::runtime_error
+class LIBBASH_API interpreter_exception: public std::runtime_error
 {
 public:
   explicit interpreter_exception(const std::string& err_msg):

diff --git a/src/libbash.cpp b/src/libbash.cpp
new file mode 100644
index 0000000..60076b5
--- /dev/null
+++ b/src/libbash.cpp
@@ -0,0 +1,71 @@
+/*
+   Please use git log for copyright holder and year information
+
+   This file is part of libbash.
+
+   libbash is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 2 of the License, or
+   (at your option) any later version.
+
+   libbash is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with libbash.  If not, see <http://www.gnu.org/licenses/>.
+*/
+///
+/// \file libbash.cpp
+/// \author Mu Qiao
+/// \brief implementation for libbash interface
+///
+
+#include "libbash.h"
+
+#include <antlr3defs.h>
+
+#include "core/interpreter_exception.h"
+#include "libbashLexer.h"
+#include "libbashParser.h"
+#include "libbashWalker.h"
+
+namespace libbash
+{
+
+  void interpret(const std::string& path,
+                 std::unordered_map<std::string, std::string>& variables)
+  {
+    pANTLR3_INPUT_STREAM input = antlr3AsciiFileStreamNew(
+        reinterpret_cast<pANTLR3_UINT8>(const_cast<char *>(path.c_str())));
+    if ( input == NULL )
+      throw interpreter_exception("Unable to create input stream for script: " + path);
+
+    plibbashLexer lxr = libbashLexerNew(input);
+    if ( lxr == NULL )
+      throw interpreter_exception("Unable to create the lexer due to malloc() failure");
+
+    pANTLR3_COMMON_TOKEN_STREAM tstream = antlr3CommonTokenStreamSourceNew(
+        ANTLR3_SIZE_HINT, lxr->pLexer->rec->state->tokSource);
+    if (tstream == NULL)
+      throw interpreter_exception("Out of memory trying to allocate token stream");
+
+    plibbashParser psr = libbashParserNew(tstream);
+    if (psr == NULL)
+      throw interpreter_exception("Out of memory trying to allocate parser");
+
+    std::shared_ptr<interpreter> walker(new interpreter);
+    set_interpreter(walker);
+
+    libbashParser_start_return langAST = psr->start(psr);
+    pANTLR3_COMMON_TREE_NODE_STREAM nodes = antlr3CommonTreeNodeStreamNewTree(langAST.tree, ANTLR3_SIZE_HINT);
+    plibbashWalker treePsr = libbashWalkerNew(nodes);
+    treePsr->start(treePsr);
+
+    for(auto iter = walker->begin(); iter != walker->end(); ++iter)
+    {
+      variables[iter->first]=std::static_pointer_cast<variable>(iter->second)->get_value<std::string>();
+    }
+  }
+}

diff --git a/src/core/interpreter_exception.h b/src/libbash.h
similarity index 58%
copy from src/core/interpreter_exception.h
copy to src/libbash.h
index 785c6c3..d265b5b 100644
--- a/src/core/interpreter_exception.h
+++ b/src/libbash.h
@@ -17,26 +17,30 @@
    along with libbash.  If not, see <http://www.gnu.org/licenses/>.
 */
 ///
-/// \file interpreter_exception.h
+/// \file libbash.h
 /// \author Mu Qiao
-/// \brief implementation for interpreter_exception
+/// \brief public interface for libbash
 ///
 
-#ifndef INTERPRETER_EXCEPTION_H_
-#define INTERPRETER_EXCEPTION_H_
+#ifndef LIBBASH_H
+#define LIBBASH_H
 
-#include <stdexcept>
+#include <memory>
 #include <string>
+#include <unordered_map>
 
-///
-/// \class interpreter_exception
-/// \brief runtime exception occured during interpreting
-///
-class interpreter_exception: public std::runtime_error
+#include "common.h"
+#include "core/interpreter.h"
+
+namespace libbash
 {
-public:
-  explicit interpreter_exception(const std::string& err_msg):
-    runtime_error(err_msg){}
-};
+  ///
+  /// \brief interpret a script specifid by path, return a map filled with
+  ///        variables defined in the script
+  /// \param the path of target script
+  /// \param the map to store variables
+  void LIBBASH_API interpret(const std::string& path,
+                             std::unordered_map<std::string, std::string>& variables);
+}
 
 #endif

diff --git a/src/core/interpreter_exception.h b/test/api_test.cpp
similarity index 62%
copy from src/core/interpreter_exception.h
copy to test/api_test.cpp
index 785c6c3..5972f14 100644
--- a/src/core/interpreter_exception.h
+++ b/test/api_test.cpp
@@ -17,26 +17,20 @@
    along with libbash.  If not, see <http://www.gnu.org/licenses/>.
 */
 ///
-/// \file interpreter_exception.h
+/// \file api_test.cpp
 /// \author Mu Qiao
-/// \brief implementation for interpreter_exception
+/// \brief series of unit tests for the public interface
 ///
 
-#ifndef INTERPRETER_EXCEPTION_H_
-#define INTERPRETER_EXCEPTION_H_
+#include <gtest/gtest.h>
 
-#include <stdexcept>
-#include <string>
+#include "libbash.h"
 
-///
-/// \class interpreter_exception
-/// \brief runtime exception occured during interpreting
-///
-class interpreter_exception: public std::runtime_error
-{
-public:
-  explicit interpreter_exception(const std::string& err_msg):
-    runtime_error(err_msg){}
-};
+using namespace std;
 
-#endif
+TEST(libbashapi, bad_path)
+{
+  std::unordered_map<std::string, std::string> variables;
+  EXPECT_THROW(libbash::interpret("not exist", variables),
+               interpreter_exception);
+}