• R/O
  • SSH
  • HTTPS

qrobosdk: コミット


コミットメタ情報

リビジョン1784 (tree)
日時2010-04-17 20:13:58
作者satofumi

ログメッセージ

test passed about convertToRoman()

変更サマリ

差分

--- trunk/libs/lua/luabindInput.cpp (nonexistent)
+++ trunk/libs/lua/luabindInput.cpp (revision 1784)
@@ -0,0 +1,26 @@
1+/*!
2+ \file
3+ \brief Lua への input モジュール登録
4+
5+ \author Satofumi KAMIMURA
6+
7+ $Id$
8+*/
9+
10+#include "luabindInput.h"
11+#include "convertToRoman.h"
12+#include "convertToJp.h"
13+#include <luabind/luabind.hpp>
14+
15+using namespace qrk;
16+using namespace luabind;
17+
18+
19+void qrk::luabindInput(lua_State* L)
20+{
21+ module(L)
22+ [
23+ def("convertToRoman", &convertToRoman),
24+ def("convertToJp", &convertToJp)
25+ ];
26+}
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
--- trunk/libs/lua/Makefile (revision 1783)
+++ trunk/libs/lua/Makefile (revision 1784)
@@ -4,8 +4,7 @@
44 # Compile options
55 CC = $(CXX)
66 CXXFLAGS = -g -O0 -Wall -W -Werror $(INCLUDES) `sdl-config --cflags`
7-#CXXFLAGS = -g -O0 -Wall -W $(INCLUDES) `sdl-config --cflags`
8-INCLUDES = -I/usr/include/lua5.1 -I.. -I../system -I../system/sdl -I../gui -I../geometry -I../audio -I../common -I../running -I../range_finder -I../coordinate -I../monitoring -I../running/beego_drive -I/usr/include/lua5.1 -I../timestamp -I../math
7+INCLUDES = -I/usr/include/lua5.1 -I.. -I../system -I../system/sdl -I../gui -I../geometry -I../audio -I../common -I../running -I../range_finder -I../coordinate -I../monitoring -I../running/beego_drive -I/usr/include/lua5.1 -I../timestamp -I../math -I../input
98
109 # Target
1110 LUA_LIB = lua.a
@@ -42,6 +41,7 @@
4241 $(LUABIND_LIB)(luabindGui.o) \
4342 $(LUABIND_LIB)(luabindNetwork.o) \
4443 $(LUABIND_LIB)(luabindAudio.o) \
44+ $(LUABIND_LIB)(luabindInput.o) \
4545 $(LUABIND_LIB)(luabindCoordinate.o) \
4646 $(LUABIND_LIB)(luabindRunning.o) \
4747 $(LUABIND_LIB)(luabindRangeFinder.o) \
@@ -90,6 +90,8 @@
9090 luabindGui.o: ../gui/Component.h ../gui/Button.h ../gui/Menu.h
9191 luabindGui.o: ../gui/ChatMessage.h ../gui/CallbackEvent.h ../gui/AlignUtils.h
9292 luabindInit.o: luabindInit.h LuaHandler.h ../system/log_printf.h
93+luabindInput.o: luabindInput.h ../input/convertToRoman.h
94+luabindInput.o: ../input/roman_table.h ../input/convertToJp.h
9395 luabindNetwork.o: luabindNetwork.h
9496 luabindRangeFinder.o: luabindRangeFinder.h ../monitoring/mUrgDevice.h
9597 luabindRangeFinder.o: ../range_finder/UrgDevice.h ../coordinate/Coordinate.h
--- trunk/libs/lua/luabindInput.h (nonexistent)
+++ trunk/libs/lua/luabindInput.h (revision 1784)
@@ -0,0 +1,26 @@
1+#ifndef QRK_LUABIND_INPUT_H
2+#define QRK_LUABIND_INPUT_H
3+
4+/*!
5+ \file
6+ \brief Lua への input モジュール登録
7+
8+ \author Satofumi KAMIMURA
9+
10+ $Id$
11+*/
12+
13+#include <lua.hpp>
14+
15+
16+namespace qrk
17+{
18+ /*!
19+ \brief Lua への input モジュール登録
20+
21+ \param[in,out] L Lua 変数
22+ */
23+ extern void luabindInput(lua_State* L);
24+}
25+
26+#endif /* !QRK_LUABIND_INPUT_H */
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
--- trunk/libs/input/TestConvertToJp.h (revision 1783)
+++ trunk/libs/input/TestConvertToJp.h (revision 1784)
@@ -19,7 +19,7 @@
1919 class TestConvertToJp : public CppUnit::TestFixture
2020 {
2121 CPPUNIT_TEST_SUITE(TestConvertToJp);
22- //CPPUNIT_TEST(romanConvertTest);
22+ CPPUNIT_TEST(romanConvertTest);
2323 CPPUNIT_TEST_SUITE_END();
2424
2525 public:
--- trunk/libs/input/convertToJp.h (revision 1783)
+++ trunk/libs/input/convertToJp.h (revision 1784)
@@ -15,6 +15,7 @@
1515
1616 namespace qrk
1717 {
18+ //! 日本語への変換
1819 extern std::string convertToJp(const char* raw_text);
1920 }
2021
--- trunk/libs/input/convertToRoman.h (revision 1783)
+++ trunk/libs/input/convertToRoman.h (revision 1784)
@@ -16,6 +16,7 @@
1616
1717 namespace qrk
1818 {
19+ //! 日本語のローマ字文字列への変換
1920 extern std::string convertToRoman(const char* jp_text);
2021 }
2122
--- trunk/libs/input/Utf8.h (revision 1783)
+++ trunk/libs/input/Utf8.h (revision 1784)
@@ -16,9 +16,7 @@
1616
1717 namespace qrk
1818 {
19- /*!
20- \brief UTF-8 文字列の操作クラス
21- */
19+ //! UTF-8 文字列の操作クラス
2220 class Utf8
2321 {
2422 Utf8(void);
--- trunk/libs/input/TestUtf8.h (revision 1783)
+++ trunk/libs/input/TestUtf8.h (revision 1784)
@@ -13,9 +13,8 @@
1313 #include <cppunit/extensions/HelperMacros.h>
1414
1515
16-/*!
17- \brief Utf8 のテストクラス
18-*/
16+
17+//! Utf8 のテストクラス
1918 class TestUtf8 : public CppUnit::TestFixture
2019 {
2120 CPPUNIT_TEST_SUITE(TestUtf8);
--- trunk/libs/Makefile (revision 1783)
+++ trunk/libs/Makefile (revision 1784)
@@ -18,6 +18,7 @@
1818 cd monitor/ && $(MAKE) test
1919 cd system/qt/ && qmake && make && ./allTest
2020 cd lua/ && $(MAKE) test
21+ cd input/ && $(MAKE) test
2122 cd simulator/beego_drive/ && $(MAKE)
2223 cd simulator/range_finder/ && $(MAKE)
2324
旧リポジトリブラウザで表示