From 4a6c45f7cd138ac6f40a9551c277f5a7552fdfbf Mon Sep 17 00:00:00 2001 From: ruanshudong Date: Mon, 9 Mar 2020 16:25:36 +0800 Subject: [PATCH] support cmake --- servant/CMakeLists.txt | 10 +- servant/libservant/Application.cpp | 18 +- servant/libservant/TarsConfig.cpp | 14 +- servant/protocol | 2 +- servant/script/create_tars_server.bat | 2 +- servant/script/create_tars_server.sh | 31 ++- servant/script/demo/DemoServant.tars | 10 - servant/script/demo/DemoServantImp.cpp | 19 -- servant/script/demo/DemoServantImp.h | 35 ---- servant/script/demo/DemoServer.cpp | 43 ---- servant/script/demo/DemoServer.h | 34 --- servant/script/demo/makefile | 17 -- servant/script/http_demo/DemoServer.cpp | 40 +--- servant/script/http_demo/makefile | 17 -- servant/script/win_create.bat | 2 +- servant/servant/Application.h | 1 - tools/CMakeLists.txt | 75 ------- tools/tars2node/main.cpp | 3 +- tools/tarsgrammar/CMakeLists.txt | 74 +++++++ tools/tarsparse/tars.lex.cpp | 36 ++-- tools/tarsparse/tars.tab.cpp | 266 ++++++++++++------------ util/src/tc_config.cpp | 6 +- 22 files changed, 279 insertions(+), 476 deletions(-) mode change 100644 => 100755 servant/script/create_tars_server.sh delete mode 100644 servant/script/demo/DemoServant.tars delete mode 100644 servant/script/demo/DemoServantImp.cpp delete mode 100644 servant/script/demo/DemoServantImp.h delete mode 100644 servant/script/demo/DemoServer.cpp delete mode 100644 servant/script/demo/DemoServer.h delete mode 100644 servant/script/demo/makefile delete mode 100644 servant/script/http_demo/makefile diff --git a/servant/CMakeLists.txt b/servant/CMakeLists.txt index 992a7f4..4d2f345 100644 --- a/servant/CMakeLists.txt +++ b/servant/CMakeLists.txt @@ -2,15 +2,12 @@ cmake_minimum_required(VERSION 3.2) project(servant) - if(_USE_OPENTRACKING) include_directories(${util_SOURCE_DIR}/include ${OPENTRACKING_INC}) else() include_directories(${util_SOURCE_DIR}/include) endif() -# link_libraries(pthread) - #调用tars2cpp, 生成tars对应的文件 macro(complice_tars OUT_DEPENDS_LIST HEADER TARS_DIR) set(DEPENDS_LIST) @@ -40,7 +37,7 @@ macro(complice_tars OUT_DEPENDS_LIST HEADER TARS_DIR) add_custom_command( OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/${TARS_H} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - DEPENDS tars2cpp + DEPENDS tars2cpp ${TARS_IN} COMMAND ${TARS2CPP} --with-tars ${INCLUDE} ${TARS_IN} COMMENT "${TARS2CPP} --with-tars ${INCLUDE} ${TARS_IN}") @@ -65,10 +62,11 @@ add_subdirectory(protocol/servant) add_subdirectory(tup) add_subdirectory(libservant) - install(DIRECTORY servant DESTINATION include) install(DIRECTORY tup DESTINATION include) install(DIRECTORY jmem DESTINATION include) -install(DIRECTORY script DESTINATION .) +install(DIRECTORY script DESTINATION . + PATTERN "*.sh" + PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ) install(DIRECTORY makefile DESTINATION .) diff --git a/servant/libservant/Application.cpp b/servant/libservant/Application.cpp index 219f28f..81bb4af 100644 --- a/servant/libservant/Application.cpp +++ b/servant/libservant/Application.cpp @@ -194,7 +194,10 @@ void Application::waitForShutdown() destroyApp(); - TarsRemoteNotify::getInstance()->report("stop", true); + TarsRemoteNotify::getInstance()->report("stop"); + + std::this_thread::sleep_for(std::chrono::milliseconds(100)); //稍微休息一下, 让当前处理包能够回复 + } void Application::terminate() @@ -717,7 +720,9 @@ void Application::main(const TC_Option &option) { keepActiving.detach(); TarsRemoteNotify::getInstance()->report("exit: " + string(ex.what())); - cout << "[init exception]:" << ex.what() << endl; + std::this_thread::sleep_for(std::chrono::milliseconds(100)); //稍微休息一下, 让当前处理包能够回复 + + cout << "[init exception]:" << ex.what() << endl; exit(-1); } } @@ -803,8 +808,10 @@ void Application::main(const TC_Option &option) cout << "[main exception]:" << ex.what() << endl; TarsRemoteNotify::getInstance()->report("exit: " + string(ex.what())); - - exit(-1); + + std::this_thread::sleep_for(std::chrono::milliseconds(100)); //稍微休息一下, 让当前处理包能够回复 + + exit(-1); } //初始化完毕后, 日志再修改为异步 @@ -1330,8 +1337,9 @@ void Application::checkServantNameValid(const string& servant, const string& sPr TarsRemoteNotify::getInstance()->report("exit:" + os.str()); - cout << os.str() << endl; + std::this_thread::sleep_for(std::chrono::milliseconds(100)); //稍微休息一下, 让当前处理包能够回复 + cout << os.str() << endl; exit(-1); } diff --git a/servant/libservant/TarsConfig.cpp b/servant/libservant/TarsConfig.cpp index a3b6f31..40d2ce4 100755 --- a/servant/libservant/TarsConfig.cpp +++ b/servant/libservant/TarsConfig.cpp @@ -44,7 +44,7 @@ bool TarsRemoteConfig::addConfig(const string & sFileName, string &buffer, bool try { - string sFullFileName = _basePath + "/" + sFileName; + string sFullFileName = _basePath + FILE_SEP + sFileName; string newFile = getRemoteFile(sFileName, bAppConfigOnly); @@ -168,12 +168,12 @@ string TarsRemoteConfig::index2file(const string & sFullFileName, int index) void TarsRemoteConfig::localRename(const string& oldFile, const string& newFile) { -#if TARGET_PLATFORM_WINDOWS - //by goodenpei,windows下面先remove后rename,否则rename会失败 - if (TC_File::isFileExist(oldFile) && TC_File::isFileExist(newFile)) - { - ::remove(newFile.c_str()); - } +#if TARGET_PLATFORM_WINDOWS + //by goodenpei,windows下面先remove后rename,否则rename会失败 + if (TC_File::isFileExist(oldFile) && TC_File::isFileExist(newFile)) + { + ::remove(newFile.c_str()); + } #endif if (::rename(oldFile.c_str(), newFile.c_str()) != 0) { diff --git a/servant/protocol b/servant/protocol index 504ebee..ba7008c 160000 --- a/servant/protocol +++ b/servant/protocol @@ -1 +1 @@ -Subproject commit 504ebee584ac972943a9ffef7b738114300793e4 +Subproject commit ba7008c400802efbe6860d7c172efdb0595e314c diff --git a/servant/script/create_tars_server.bat b/servant/script/create_tars_server.bat index 4b34347..d2750ae 100644 --- a/servant/script/create_tars_server.bat +++ b/servant/script/create_tars_server.bat @@ -1 +1 @@ -c:\\taf\\cpp\\script\\busybox.exe bash c:\\taf\\cpp\\script\\win_create.bat %1 %2 %3 +c:\\tars\\cpp\\script\\busybox.exe bash c:\\tars\\cpp\\script\\win_create.bat %1 %2 %3 diff --git a/servant/script/create_tars_server.sh b/servant/script/create_tars_server.sh old mode 100644 new mode 100755 index 0acee5d..30be853 --- a/servant/script/create_tars_server.sh +++ b/servant/script/create_tars_server.sh @@ -10,27 +10,31 @@ APP=$1 SERVER=$2 SERVANT=$3 +echo "APP:$APP, SERVER:$SERVER, SERVANT:$SERVANT" + if [ "$SERVER" == "$SERVANT" ] then echo "Error!(ServerName == ServantName)" exit -1 fi -if [ ! -d $APP/$SERVER ] +if [ ! -d $SERVER ] then - echo "[mkdir: $APP/$SERVER]" - mkdir -p $APP/$SERVER + echo "[mkdir: $SERVER]" + mkdir -p $SERVER fi echo "[create server: $APP.$SERVER ...]" DEMO_PATH=/usr/local/tars/cpp/script/demo -cp $DEMO_PATH/* $APP/$SERVER/ +#make cleanall -C $DEMO_PATH -cd $APP/$SERVER/ +cp -rf $DEMO_PATH/* $SERVER/ -SRC_FILE="DemoServer.h DemoServer.cpp DemoServantImp.h DemoServantImp.cpp DemoServant.tars makefile" +cd $SERVER/src + +SRC_FILE="DemoServer.h DemoServer.cpp DemoServantImp.h DemoServantImp.cpp DemoServant.tars CMakeLists.txt" for FILE in $SRC_FILE do @@ -39,14 +43,21 @@ do cat $FILE | sed "s/DemoApp/$APP/g" > $FILE.tmp mv $FILE.tmp $FILE - + cat $FILE | sed "s/DemoServant/$SERVANT/g" > $FILE.tmp mv $FILE.tmp $FILE done -rename "DemoServer" "$SERVER" $SRC_FILE -rename "DemoServant" "$SERVANT" $SRC_FILE +mv DemoServer.h ${SERVER}.h +mv DemoServer.cpp ${SERVER}.cpp +mv DemoServantImp.h ${SERVANT}Imp.h +mv DemoServantImp.cpp ${SERVANT}Imp.cpp +mv DemoServant.tars ${SERVANT}.tars -cd ../../ +cd .. +mkdir build; cd build +cmake ..; make + +#cd ../../ echo "[done.]" diff --git a/servant/script/demo/DemoServant.tars b/servant/script/demo/DemoServant.tars deleted file mode 100644 index 87f1910..0000000 --- a/servant/script/demo/DemoServant.tars +++ /dev/null @@ -1,10 +0,0 @@ - -module DemoApp -{ - -interface DemoServant -{ - int test(); -}; - -}; diff --git a/servant/script/demo/DemoServantImp.cpp b/servant/script/demo/DemoServantImp.cpp deleted file mode 100644 index c5ca8bc..0000000 --- a/servant/script/demo/DemoServantImp.cpp +++ /dev/null @@ -1,19 +0,0 @@ -#include "DemoServantImp.h" -#include "servant/Application.h" - -using namespace std; - -////////////////////////////////////////////////////// -void DemoServantImp::initialize() -{ - //initialize servant here: - //... -} - -////////////////////////////////////////////////////// -void DemoServantImp::destroy() -{ - //destroy servant here: - //... -} - diff --git a/servant/script/demo/DemoServantImp.h b/servant/script/demo/DemoServantImp.h deleted file mode 100644 index 1f10d1b..0000000 --- a/servant/script/demo/DemoServantImp.h +++ /dev/null @@ -1,35 +0,0 @@ -#ifndef _DemoServantImp_H_ -#define _DemoServantImp_H_ - -#include "servant/Application.h" -#include "DemoServant.h" - -/** - * - * - */ -class DemoServantImp : public DemoApp::DemoServant -{ -public: - /** - * - */ - virtual ~DemoServantImp() {} - - /** - * - */ - virtual void initialize(); - - /** - * - */ - virtual void destroy(); - - /** - * - */ - virtual int test(tars::TarsCurrentPtr current) { return 0;}; -}; -///////////////////////////////////////////////////// -#endif diff --git a/servant/script/demo/DemoServer.cpp b/servant/script/demo/DemoServer.cpp deleted file mode 100644 index c1ad88f..0000000 --- a/servant/script/demo/DemoServer.cpp +++ /dev/null @@ -1,43 +0,0 @@ -#include "DemoServer.h" -#include "DemoServantImp.h" - -using namespace std; - -DemoServer g_app; - -///////////////////////////////////////////////////////////////// -void -DemoServer::initialize() -{ - //initialize application here: - //... - - addServant(ServerConfig::Application + "." + ServerConfig::ServerName + ".DemoServantObj"); -} -///////////////////////////////////////////////////////////////// -void -DemoServer::destroyApp() -{ - //destroy application here: - //... -} -///////////////////////////////////////////////////////////////// -int -main(int argc, char* argv[]) -{ - try - { - g_app.main(argc, argv); - g_app.waitForShutdown(); - } - catch (std::exception& e) - { - cerr << "std::exception:" << e.what() << std::endl; - } - catch (...) - { - cerr << "unknown exception." << std::endl; - } - return -1; -} -///////////////////////////////////////////////////////////////// diff --git a/servant/script/demo/DemoServer.h b/servant/script/demo/DemoServer.h deleted file mode 100644 index 462c966..0000000 --- a/servant/script/demo/DemoServer.h +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef _DemoServer_H_ -#define _DemoServer_H_ - -#include -#include "servant/Application.h" - -using namespace tars; - -/** - * - **/ -class DemoServer : public Application -{ -public: - /** - * - **/ - virtual ~DemoServer() {}; - - /** - * - **/ - virtual void initialize(); - - /** - * - **/ - virtual void destroyApp(); -}; - -extern DemoServer g_app; - -//////////////////////////////////////////// -#endif diff --git a/servant/script/demo/makefile b/servant/script/demo/makefile deleted file mode 100644 index 50d831d..0000000 --- a/servant/script/demo/makefile +++ /dev/null @@ -1,17 +0,0 @@ - -#----------------------------------------------------------------------- - -APP := DemoApp -TARGET := DemoServer -CONFIG := -STRIP_FLAG:= N -TARS2CPP_FLAG:= - -INCLUDE += -LIB += - -#----------------------------------------------------------------------- - -include /usr/local/tars/cpp/makefile/makefile.tars - -#----------------------------------------------------------------------- diff --git a/servant/script/http_demo/DemoServer.cpp b/servant/script/http_demo/DemoServer.cpp index 522ebc3..d5208df 100644 --- a/servant/script/http_demo/DemoServer.cpp +++ b/servant/script/http_demo/DemoServer.cpp @@ -5,44 +5,6 @@ using namespace std; DemoServer g_app; -struct HttpProtocol -{ - /** - * 解析http请求 - * @param in - * @param out - * - * @return int - */ - static int parseHttp(string &in, string &out) - { - try - { - //判断请求是否是HTTP请求 - bool b = TC_HttpRequest ::checkRequest(in.c_str(), in.length()); - //完整的HTTP请求 - if(b) - { - out = in; - in = ""; - //TLOGDEBUG("out size: " << out.size() << endl); - return TC_EpollServer::PACKET_FULL; - } - else - { - return TC_EpollServer::PACKET_LESS; - } - } - catch(exception &ex) - { - return TC_EpollServer::PACKET_ERR; - } - - return TC_EpollServer::PACKET_LESS; //表示收到的包不完全 - } - -}; - ///////////////////////////////////////////////////////////////// void DemoServer::initialize() @@ -51,7 +13,7 @@ DemoServer::initialize() //... addServant(ServerConfig::Application + "." + ServerConfig::ServerName + ".DemoServantObj"); - addServantProtocol(ServerConfig::Application + "." + ServerConfig::ServerName + ".DemoServantObj", &HttpProtocol::parseHttp); + addServantProtocol(ServerConfig::Application + "." + ServerConfig::ServerName + ".DemoServantObj", &TC_NetWorkBuffer::parseHttp); } ///////////////////////////////////////////////////////////////// void diff --git a/servant/script/http_demo/makefile b/servant/script/http_demo/makefile deleted file mode 100644 index 50d831d..0000000 --- a/servant/script/http_demo/makefile +++ /dev/null @@ -1,17 +0,0 @@ - -#----------------------------------------------------------------------- - -APP := DemoApp -TARGET := DemoServer -CONFIG := -STRIP_FLAG:= N -TARS2CPP_FLAG:= - -INCLUDE += -LIB += - -#----------------------------------------------------------------------- - -include /usr/local/tars/cpp/makefile/makefile.tars - -#----------------------------------------------------------------------- diff --git a/servant/script/win_create.bat b/servant/script/win_create.bat index ed2afa0..fdde913 100644 --- a/servant/script/win_create.bat +++ b/servant/script/win_create.bat @@ -28,7 +28,7 @@ echo "[create server: $APP.$SERVER ...]" DEMO_PATH=c:\\taf\\cpp\\script\\demo -SRC_FILE="DemoServer.h DemoServer.cpp DemoServantImp.h DemoServantImp.cpp DemoServant.jce makefile CMakeLists.txt" +SRC_FILE="DemoServer.h DemoServer.cpp DemoServantImp.h DemoServantImp.cpp DemoServant.tars makefile CMakeLists.txt" for FILE in $SRC_FILE do diff --git a/servant/servant/Application.h b/servant/servant/Application.h index 6f64f22..a85ac7d 100644 --- a/servant/servant/Application.h +++ b/servant/servant/Application.h @@ -231,7 +231,6 @@ public: void addServant(const string &id) { ServantHelperManager::getInstance()->addServant(id, this, true); - } /** diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 0137660..88d0503 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -21,81 +21,6 @@ function(tars2language TARGET) endfunction() IF(UNIX) - -macro(complice_lex OUT_DEPENDS_LEX_LIST) - set(DEPENDS_LIST) - - FILE(GLOB SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/*.l") - -# set(CLEAN_LIST) - - foreach (FILE ${SRC_LIST}) - - get_filename_component(NAME_WE ${FILE} NAME_WE) - - set(LEX_IN ${FILE}) - set(LEX_CPP ${NAME_WE}.lex.cpp) - - add_custom_command( - OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/${LEX_CPP} - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - DEPENDS ${LEX_IN} - COMMAND flex --nounist ${LEX_IN} - COMMENT "flex --nounist ${LEX_IN}") - - list(APPEND DEPENDS_LIST ${CMAKE_CURRENT_SOURCE_DIR}/${LEX_CPP}) - - get_filename_component(PATH ${FILE} PATH) -# list(APPEND CLEAN_LIST ${PATH}/${LEX_CPP}) - - endforeach (FILE) - - set(OUT_DEPENDS_LEX_LIST ${DEPENDS_LIST}) - -# set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${CLEAN_LIST}") - -endmacro() - -macro(complice_yacc OUT_DEPENDS_YACC_LIST) - set(DEPENDS_LIST) - - FILE(GLOB SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/*.y") - -# set(CLEAN_LIST) - - foreach (FILE ${SRC_LIST}) - - get_filename_component(NAME_WE ${FILE} NAME_WE) - - set(YACC_IN ${FILE}) - set(YACC_H ${NAME_WE}.tab.hpp) - set(YACC_CPP ${NAME_WE}.tab.cpp) - - add_custom_command( - OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/${YACC_H} - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - DEPENDS ${YACC_IN} - COMMAND bison ${YACC_IN} -o ${YACC_CPP} - COMMENT "bison ${YACC_IN} -o ${YACC_CPP}") - - list(APPEND DEPENDS_LIST ${CMAKE_CURRENT_SOURCE_DIR}/${YACC_H}) - - get_filename_component(PATH ${FILE} PATH) - -# list(APPEND CLEAN_LIST ${PATH}/${YACC_H}) -# list(APPEND CLEAN_LIST ${PATH}/${YACC_CPP}) - #if (EXISTS ${PATH}/${NAME_WE}.tab.cpp) - # list(APPEND CLEAN_LIST ${PATH}/${NAME_WE}.tab.cpp) - #endif (EXISTS ${PATH}/${NAME_WE}.tab.cpp) - - endforeach (FILE) - -# set(OUT_DEPENDS_YACC_LIST ${DEPENDS_LIST}) - -# set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${CLEAN_LIST}") - -endmacro() - add_subdirectory(tarsgrammar) ENDIF(UNIX) diff --git a/tools/tars2node/main.cpp b/tools/tars2node/main.cpp index e5cd317..da808e8 100644 --- a/tools/tars2node/main.cpp +++ b/tools/tars2node/main.cpp @@ -117,7 +117,8 @@ int main(int argc, char* argv[]) #undef ALLOW_USE_RESERVED_NAMESPACE #undef ALLOW_USE_RESERVED_NAMESPACE_BASE #undef ALLOW_USE_RESERVED_NAMESPACE_V - + + g_parse->setTars(option.hasParam("with-tars")); g_parse->setUseCurrentPath(option.hasParam("relative")); CodeGenerator generator; diff --git a/tools/tarsgrammar/CMakeLists.txt b/tools/tarsgrammar/CMakeLists.txt index 7b1cf3f..91fcc3c 100644 --- a/tools/tarsgrammar/CMakeLists.txt +++ b/tools/tarsgrammar/CMakeLists.txt @@ -1,4 +1,78 @@ +macro(complice_lex OUT_DEPENDS_LEX_LIST) + set(DEPENDS_LIST) + + FILE(GLOB SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/*.l") + + # set(CLEAN_LIST) + + foreach (FILE ${SRC_LIST}) + + get_filename_component(NAME_WE ${FILE} NAME_WE) + + set(LEX_IN ${FILE}) + set(LEX_CPP ${NAME_WE}.lex.cpp) + + add_custom_command( + OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/${LEX_CPP} + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + DEPENDS ${LEX_IN} + COMMAND flex --nounist ${LEX_IN} + COMMENT "flex --nounist ${LEX_IN}") + + list(APPEND DEPENDS_LIST ${CMAKE_CURRENT_SOURCE_DIR}/${LEX_CPP}) + + get_filename_component(PATH ${FILE} PATH) + # list(APPEND CLEAN_LIST ${PATH}/${LEX_CPP}) + + endforeach (FILE) + + set(OUT_DEPENDS_LEX_LIST ${DEPENDS_LIST}) + + # set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${CLEAN_LIST}") + +endmacro() + +macro(complice_yacc OUT_DEPENDS_YACC_LIST) + set(DEPENDS_LIST) + + FILE(GLOB SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/*.y") + + # set(CLEAN_LIST) + + foreach (FILE ${SRC_LIST}) + + get_filename_component(NAME_WE ${FILE} NAME_WE) + + set(YACC_IN ${FILE}) + set(YACC_H ${NAME_WE}.tab.hpp) + set(YACC_CPP ${NAME_WE}.tab.cpp) + + add_custom_command( + OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/${YACC_H} + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + DEPENDS ${YACC_IN} + COMMAND bison ${YACC_IN} -o ${YACC_CPP} + COMMENT "bison ${YACC_IN} -o ${YACC_CPP}") + + list(APPEND DEPENDS_LIST ${CMAKE_CURRENT_SOURCE_DIR}/${YACC_H}) + + get_filename_component(PATH ${FILE} PATH) + + # list(APPEND CLEAN_LIST ${PATH}/${YACC_H}) + # list(APPEND CLEAN_LIST ${PATH}/${YACC_CPP}) + #if (EXISTS ${PATH}/${NAME_WE}.tab.cpp) + # list(APPEND CLEAN_LIST ${PATH}/${NAME_WE}.tab.cpp) + #endif (EXISTS ${PATH}/${NAME_WE}.tab.cpp) + + endforeach (FILE) + + # set(OUT_DEPENDS_YACC_LIST ${DEPENDS_LIST}) + + # set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${CLEAN_LIST}") + +endmacro() + ########################################################################################## #生成.l和.y文件生成的代码文件copy到tarsparse目录下 diff --git a/tools/tarsparse/tars.lex.cpp b/tools/tarsparse/tars.lex.cpp index 36dbbf3..bf25792 100644 --- a/tools/tarsparse/tars.lex.cpp +++ b/tools/tarsparse/tars.lex.cpp @@ -513,7 +513,7 @@ int yy_flex_debug = 0; #define YY_MORE_ADJ 0 #define YY_RESTORE_YY_MORE_OFFSET char *yytext; -#line 1 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.l" +#line 1 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.l" /** * Tencent is pleased to support the open source community by making Tars available. * @@ -529,7 +529,7 @@ char *yytext; * CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -#line 20 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.l" +#line 20 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.l" #include #include #include @@ -742,7 +742,7 @@ YY_DECL register char *yy_cp, *yy_bp; register int yy_act; -#line 67 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.l" +#line 67 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.l" #line 749 "tars.lex.cpp" @@ -840,12 +840,12 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 69 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.l" +#line 69 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.l" { BEGIN(INCL); } YY_BREAK case 2: YY_RULE_SETUP -#line 71 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.l" +#line 71 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.l" { if ( include_file_stack_ptr >= MAX_INCLUDE_DEPTH ) { @@ -878,7 +878,7 @@ YY_RULE_SETUP YY_BREAK case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(INCL): -#line 101 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.l" +#line 101 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.l" { --include_file_stack_ptr; if ( include_file_stack_ptr < 0 ) @@ -897,14 +897,14 @@ case YY_STATE_EOF(INCL): YY_BREAK case 3: YY_RULE_SETUP -#line 117 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.l" +#line 117 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.l" { return TARS_SCOPE_DELIMITER; } YY_BREAK case 4: YY_RULE_SETUP -#line 121 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.l" +#line 121 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.l" { // C++ comment bool e = false; @@ -925,7 +925,7 @@ YY_RULE_SETUP YY_BREAK case 5: YY_RULE_SETUP -#line 139 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.l" +#line 139 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.l" { // C comment bool e = false; @@ -976,7 +976,7 @@ YY_RULE_SETUP YY_BREAK case 6: YY_RULE_SETUP -#line 187 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.l" +#line 187 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.l" { StringGrammarPtr ident = new StringGrammar; ident->v = yytext; @@ -987,7 +987,7 @@ YY_RULE_SETUP case 7: /* rule 7 can match eol */ YY_RULE_SETUP -#line 194 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.l" +#line 194 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.l" { StringGrammarPtr ident = new StringGrammar; ident->v = yytext; @@ -1000,7 +1000,7 @@ YY_RULE_SETUP YY_BREAK case 8: YY_RULE_SETUP -#line 204 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.l" +#line 204 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.l" { StringGrammarPtr str = new StringGrammar; bool e = false; @@ -1115,7 +1115,7 @@ YY_RULE_SETUP YY_BREAK case 9: YY_RULE_SETUP -#line 316 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.l" +#line 316 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.l" { errno = 0; IntergerGrammarPtr ptr = new IntergerGrammar; @@ -1140,7 +1140,7 @@ YY_RULE_SETUP YY_BREAK case 10: YY_RULE_SETUP -#line 338 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.l" +#line 338 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.l" { errno = 0; FloatGrammarPtr ptr = new FloatGrammar; @@ -1175,7 +1175,7 @@ YY_RULE_SETUP case 11: /* rule 11 can match eol */ YY_RULE_SETUP -#line 369 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.l" +#line 369 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.l" { if(yytext[0] == '\n') { @@ -1185,7 +1185,7 @@ YY_RULE_SETUP YY_BREAK case 12: YY_RULE_SETUP -#line 376 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.l" +#line 376 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.l" { if(yytext[0] < 32 || yytext[0] > 126) { @@ -1204,7 +1204,7 @@ YY_RULE_SETUP YY_BREAK case 13: YY_RULE_SETUP -#line 392 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.l" +#line 392 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.l" ECHO; YY_BREAK #line 1211 "tars.lex.cpp" @@ -2214,7 +2214,7 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 392 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.l" +#line 392 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.l" diff --git a/tools/tarsparse/tars.tab.cpp b/tools/tarsparse/tars.tab.cpp index 64378e0..9a11ba7 100644 --- a/tools/tarsparse/tars.tab.cpp +++ b/tools/tarsparse/tars.tab.cpp @@ -65,7 +65,7 @@ /* First part of user prologue. */ -#line 17 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:338 */ +#line 17 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:338 */ #include #include @@ -1457,14 +1457,14 @@ yyreduce: switch (yyn) { case 3: -#line 75 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 75 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { } #line 1464 "tars.tab.cpp" /* yacc.c:1660 */ break; case 5: -#line 79 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 79 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { yyerrok; } @@ -1472,7 +1472,7 @@ yyreduce: break; case 7: -#line 84 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 84 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { g_parse->error("`;' missing after definition"); } @@ -1480,14 +1480,14 @@ yyreduce: break; case 8: -#line 88 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 88 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { } #line 1487 "tars.tab.cpp" /* yacc.c:1660 */ break; case 9: -#line 96 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 96 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { assert((yyvsp[0]) == 0 || NamespacePtr::dynamicCast((yyvsp[0]))); } @@ -1495,7 +1495,7 @@ yyreduce: break; case 10: -#line 100 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 100 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { assert((yyvsp[0]) == 0 || InterfacePtr::dynamicCast((yyvsp[0]))); } @@ -1503,7 +1503,7 @@ yyreduce: break; case 11: -#line 104 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 104 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { assert((yyvsp[0]) == 0 || StructPtr::dynamicCast((yyvsp[0]))); } @@ -1511,14 +1511,14 @@ yyreduce: break; case 12: -#line 108 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 108 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { } #line 1518 "tars.tab.cpp" /* yacc.c:1660 */ break; case 13: -#line 111 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 111 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { assert((yyvsp[0]) == 0 || EnumPtr::dynamicCast((yyvsp[0]))); } @@ -1526,7 +1526,7 @@ yyreduce: break; case 14: -#line 115 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 115 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { assert((yyvsp[0]) == 0 || ConstPtr::dynamicCast((yyvsp[0]))); } @@ -1534,7 +1534,7 @@ yyreduce: break; case 15: -#line 124 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 124 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { (yyval) = (yyvsp[0]); } @@ -1542,7 +1542,7 @@ yyreduce: break; case 16: -#line 128 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 128 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { if((yyvsp[-2])) { @@ -1560,7 +1560,7 @@ yyreduce: break; case 17: -#line 147 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 147 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { NamespacePtr c = NamespacePtr::dynamicCast(g_parse->currentContainer()); if(!c) @@ -1577,7 +1577,7 @@ yyreduce: break; case 18: -#line 160 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 160 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { StringGrammarPtr ident = StringGrammarPtr::dynamicCast((yyvsp[0])); g_parse->error("keyword `" + ident->v + "' cannot be used as enumeration name"); @@ -1587,7 +1587,7 @@ yyreduce: break; case 19: -#line 171 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 171 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { (yyval) = (yyvsp[-1]); } @@ -1595,14 +1595,14 @@ yyreduce: break; case 20: -#line 175 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 175 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { } #line 1602 "tars.tab.cpp" /* yacc.c:1660 */ break; case 21: -#line 183 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 183 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { TypePtr type = TypePtr::dynamicCast(g_parse->createBuiltin(Builtin::KindLong)); StringGrammarPtr ident = StringGrammarPtr::dynamicCast((yyvsp[0])); @@ -1617,7 +1617,7 @@ yyreduce: break; case 22: -#line 194 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 194 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { StringGrammarPtr ident = StringGrammarPtr::dynamicCast((yyvsp[0])); g_parse->error("keyword `" + ident->v + "' cannot be used as enumerator"); @@ -1626,7 +1626,7 @@ yyreduce: break; case 23: -#line 199 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 199 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { TypePtr type = TypePtr::dynamicCast(g_parse->createBuiltin(Builtin::KindLong)); StringGrammarPtr ident = StringGrammarPtr::dynamicCast((yyvsp[-2])); @@ -1643,14 +1643,14 @@ yyreduce: break; case 24: -#line 212 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 212 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { } #line 1650 "tars.tab.cpp" /* yacc.c:1660 */ break; case 25: -#line 220 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 220 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { StringGrammarPtr ident = StringGrammarPtr::dynamicCast((yyvsp[0])); ContainerPtr c = g_parse->currentContainer(); @@ -1669,7 +1669,7 @@ yyreduce: break; case 26: -#line 235 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 235 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { if((yyvsp[-3])) { @@ -1685,7 +1685,7 @@ yyreduce: break; case 27: -#line 253 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 253 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { StringGrammarPtr ident = StringGrammarPtr::dynamicCast((yyvsp[-1])); StructPtr sp = StructPtr::dynamicCast(g_parse->findUserType(ident->v)); @@ -1700,14 +1700,14 @@ yyreduce: break; case 28: -#line 264 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 264 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { } #line 1707 "tars.tab.cpp" /* yacc.c:1660 */ break; case 29: -#line 272 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 272 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { StringGrammarPtr ident = StringGrammarPtr::dynamicCast((yyvsp[0])); StructPtr np = g_parse->getKeyStruct(); @@ -1724,7 +1724,7 @@ yyreduce: break; case 30: -#line 285 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 285 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { StringGrammarPtr ident = StringGrammarPtr::dynamicCast((yyvsp[0])); StructPtr np = g_parse->getKeyStruct(); @@ -1741,7 +1741,7 @@ yyreduce: break; case 31: -#line 304 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 304 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { StringGrammarPtr ident = StringGrammarPtr::dynamicCast((yyvsp[0])); @@ -1762,7 +1762,7 @@ yyreduce: break; case 32: -#line 321 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 321 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { if((yyvsp[-3])) { @@ -1778,7 +1778,7 @@ yyreduce: break; case 33: -#line 338 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 338 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { (yyval) = (yyvsp[0]); } @@ -1786,7 +1786,7 @@ yyreduce: break; case 34: -#line 342 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 342 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { StringGrammarPtr ident = StringGrammarPtr::dynamicCast((yyvsp[0])); g_parse->error("keyword `" + ident->v + "' cannot be used as interface name"); @@ -1796,21 +1796,21 @@ yyreduce: break; case 35: -#line 353 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 353 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { } #line 1803 "tars.tab.cpp" /* yacc.c:1660 */ break; case 36: -#line 356 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 356 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { } #line 1810 "tars.tab.cpp" /* yacc.c:1660 */ break; case 37: -#line 359 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 359 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { g_parse->error("`;' missing after definition"); } @@ -1818,14 +1818,14 @@ yyreduce: break; case 38: -#line 363 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 363 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { } #line 1825 "tars.tab.cpp" /* yacc.c:1660 */ break; case 40: -#line 377 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 377 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { if((yyvsp[-2])) { @@ -1841,7 +1841,7 @@ yyreduce: break; case 41: -#line 394 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 394 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { TypePtr returnType = TypePtr::dynamicCast((yyvsp[-1])); StringGrammarPtr ident = StringGrammarPtr::dynamicCast((yyvsp[0])); @@ -1869,7 +1869,7 @@ yyreduce: break; case 43: -#line 424 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 424 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { (yyval) = 0; } @@ -1877,14 +1877,14 @@ yyreduce: break; case 44: -#line 434 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 434 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { } #line 1884 "tars.tab.cpp" /* yacc.c:1660 */ break; case 45: -#line 437 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 437 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { TypeIdPtr tsp = TypeIdPtr::dynamicCast((yyvsp[0])); @@ -1899,7 +1899,7 @@ yyreduce: break; case 46: -#line 448 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 448 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { TypeIdPtr tsp = TypeIdPtr::dynamicCast((yyvsp[0])); @@ -1914,7 +1914,7 @@ yyreduce: break; case 47: -#line 459 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 459 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { BoolGrammarPtr isOutParam = BoolGrammarPtr::dynamicCast((yyvsp[-1])); TypeIdPtr tsp = TypeIdPtr::dynamicCast((yyvsp[0])); @@ -1930,7 +1930,7 @@ yyreduce: break; case 48: -#line 471 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 471 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { BoolGrammarPtr isOutParam = BoolGrammarPtr::dynamicCast((yyvsp[-1])); TypeIdPtr tsp = TypeIdPtr::dynamicCast((yyvsp[0])); @@ -1946,7 +1946,7 @@ yyreduce: break; case 49: -#line 483 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 483 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { BoolGrammarPtr isRouteKeyParam = BoolGrammarPtr::dynamicCast((yyvsp[-1])); TypeIdPtr tsp = TypeIdPtr::dynamicCast((yyvsp[0])); @@ -1962,7 +1962,7 @@ yyreduce: break; case 50: -#line 495 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 495 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { BoolGrammarPtr isRouteKeyParam = BoolGrammarPtr::dynamicCast((yyvsp[-1])); TypeIdPtr tsp = TypeIdPtr::dynamicCast((yyvsp[0])); @@ -1978,7 +1978,7 @@ yyreduce: break; case 51: -#line 507 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 507 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { g_parse->error("'out' must be defined with a type"); } @@ -1986,7 +1986,7 @@ yyreduce: break; case 52: -#line 511 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 511 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { g_parse->error("'routekey' must be defined with a type"); } @@ -1994,7 +1994,7 @@ yyreduce: break; case 53: -#line 520 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 520 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { BoolGrammarPtr routekey = new BoolGrammar; routekey->v = true; @@ -2004,7 +2004,7 @@ yyreduce: break; case 54: -#line 531 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 531 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { BoolGrammarPtr out = new BoolGrammar; out->v = true; @@ -2014,7 +2014,7 @@ yyreduce: break; case 55: -#line 542 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 542 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { StringGrammarPtr ident = StringGrammarPtr::dynamicCast((yyvsp[0])); NamespacePtr np = NamespacePtr::dynamicCast(g_parse->currentContainer()); @@ -2040,7 +2040,7 @@ yyreduce: break; case 56: -#line 564 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 564 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { if((yyvsp[-3])) { @@ -2059,7 +2059,7 @@ yyreduce: break; case 57: -#line 584 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 584 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { (yyval) = (yyvsp[0]); } @@ -2067,7 +2067,7 @@ yyreduce: break; case 58: -#line 588 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 588 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { StringGrammarPtr ident = StringGrammarPtr::dynamicCast((yyvsp[0])); @@ -2077,7 +2077,7 @@ yyreduce: break; case 59: -#line 594 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 594 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { g_parse->error("abstract declarator '' used as declaration"); } @@ -2085,7 +2085,7 @@ yyreduce: break; case 60: -#line 603 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 603 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { } @@ -2093,7 +2093,7 @@ yyreduce: break; case 61: -#line 607 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 607 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { g_parse->error("';' missing after definition"); } @@ -2101,14 +2101,14 @@ yyreduce: break; case 62: -#line 611 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 611 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { } #line 2108 "tars.tab.cpp" /* yacc.c:1660 */ break; case 63: -#line 621 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 621 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { (yyval) = GrammarBasePtr::dynamicCast((yyvsp[0])); } @@ -2116,7 +2116,7 @@ yyreduce: break; case 64: -#line 630 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 630 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { StructPtr np = StructPtr::dynamicCast(g_parse->currentContainer()); if(np) @@ -2138,7 +2138,7 @@ yyreduce: break; case 65: -#line 648 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 648 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { StructPtr np = StructPtr::dynamicCast(g_parse->currentContainer()); if(np) @@ -2164,7 +2164,7 @@ yyreduce: break; case 66: -#line 670 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 670 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { StructPtr np = StructPtr::dynamicCast(g_parse->currentContainer()); if(np) @@ -2190,7 +2190,7 @@ yyreduce: break; case 67: -#line 692 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 692 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { StructPtr np = StructPtr::dynamicCast(g_parse->currentContainer()); if(np) @@ -2211,7 +2211,7 @@ yyreduce: break; case 68: -#line 709 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 709 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { g_parse->error("struct member need 'tag'"); } @@ -2219,7 +2219,7 @@ yyreduce: break; case 69: -#line 713 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 713 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { g_parse->error("struct member need 'tag'"); } @@ -2227,7 +2227,7 @@ yyreduce: break; case 70: -#line 717 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 717 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { g_parse->error("struct member need 'require' or 'optional'"); } @@ -2235,7 +2235,7 @@ yyreduce: break; case 71: -#line 721 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 721 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { g_parse->error("struct member need 'tag' or 'require' or 'optional'"); } @@ -2243,7 +2243,7 @@ yyreduce: break; case 72: -#line 730 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 730 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { IntergerGrammarPtr intVal = IntergerGrammarPtr::dynamicCast((yyvsp[0])); ostringstream sstr; @@ -2257,7 +2257,7 @@ yyreduce: break; case 73: -#line 740 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 740 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { FloatGrammarPtr floatVal = FloatGrammarPtr::dynamicCast((yyvsp[0])); ostringstream sstr; @@ -2271,7 +2271,7 @@ yyreduce: break; case 74: -#line 750 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 750 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { StringGrammarPtr ident = StringGrammarPtr::dynamicCast((yyvsp[0])); ConstGrammarPtr c = new ConstGrammar(); @@ -2283,7 +2283,7 @@ yyreduce: break; case 75: -#line 758 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 758 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { StringGrammarPtr ident = StringGrammarPtr::dynamicCast((yyvsp[0])); ConstGrammarPtr c = new ConstGrammar(); @@ -2295,7 +2295,7 @@ yyreduce: break; case 76: -#line 766 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 766 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { StringGrammarPtr ident = StringGrammarPtr::dynamicCast((yyvsp[0])); ConstGrammarPtr c = new ConstGrammar(); @@ -2307,7 +2307,7 @@ yyreduce: break; case 77: -#line 774 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 774 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { StringGrammarPtr ident = StringGrammarPtr::dynamicCast((yyvsp[0])); @@ -2324,7 +2324,7 @@ yyreduce: break; case 78: -#line 787 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 787 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { StringGrammarPtr scoped = StringGrammarPtr::dynamicCast((yyvsp[-2])); @@ -2343,7 +2343,7 @@ yyreduce: break; case 79: -#line 807 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 807 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { NamespacePtr np = NamespacePtr::dynamicCast(g_parse->currentContainer()); if(!np) @@ -2360,7 +2360,7 @@ yyreduce: break; case 80: -#line 825 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 825 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { TypePtr type = TypePtr::dynamicCast((yyvsp[-1])); StringGrammarPtr ident = StringGrammarPtr::dynamicCast((yyvsp[0])); @@ -2373,7 +2373,7 @@ yyreduce: break; case 81: -#line 834 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 834 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { TypePtr type = g_parse->createVector(TypePtr::dynamicCast((yyvsp[-4]))); IntergerGrammarPtr iPtrSize = IntergerGrammarPtr::dynamicCast((yyvsp[-1])); @@ -2387,7 +2387,7 @@ yyreduce: break; case 82: -#line 844 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 844 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { TypePtr type = g_parse->createVector(TypePtr::dynamicCast((yyvsp[-2]))); //IntergerGrammarPtr iPtrSize = IntergerGrammarPtr::dynamicCast($4); @@ -2401,7 +2401,7 @@ yyreduce: break; case 83: -#line 854 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 854 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { TypePtr type = TypePtr::dynamicCast((yyvsp[-3])); StringGrammarPtr ident = StringGrammarPtr::dynamicCast((yyvsp[-2])); @@ -2414,7 +2414,7 @@ yyreduce: break; case 84: -#line 863 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 863 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { StringGrammarPtr ident = StringGrammarPtr::dynamicCast((yyvsp[0])); g_parse->error("keyword `" + ident->v + "' cannot be used as data member name"); @@ -2423,7 +2423,7 @@ yyreduce: break; case 85: -#line 868 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 868 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { g_parse->error("missing data member name"); } @@ -2431,7 +2431,7 @@ yyreduce: break; case 86: -#line 872 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 872 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { g_parse->error("unkown type"); } @@ -2439,7 +2439,7 @@ yyreduce: break; case 87: -#line 881 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 881 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { TypePtr type = TypePtr::dynamicCast((yyvsp[-2])); @@ -2452,7 +2452,7 @@ yyreduce: break; case 88: -#line 890 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 890 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { (yyval) = (yyvsp[0]); } @@ -2460,7 +2460,7 @@ yyreduce: break; case 89: -#line 894 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 894 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { g_parse->error("array missing size"); } @@ -2468,7 +2468,7 @@ yyreduce: break; case 90: -#line 903 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 903 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { (yyval) = g_parse->createBuiltin(Builtin::KindBool); } @@ -2476,7 +2476,7 @@ yyreduce: break; case 91: -#line 907 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 907 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { (yyval) = g_parse->createBuiltin(Builtin::KindByte); } @@ -2484,7 +2484,7 @@ yyreduce: break; case 92: -#line 911 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 911 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { (yyval) = g_parse->createBuiltin(Builtin::KindShort,true); } @@ -2492,7 +2492,7 @@ yyreduce: break; case 93: -#line 915 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 915 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { (yyval) = g_parse->createBuiltin(Builtin::KindShort); } @@ -2500,7 +2500,7 @@ yyreduce: break; case 94: -#line 919 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 919 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { (yyval) = g_parse->createBuiltin(Builtin::KindInt,true); } @@ -2508,7 +2508,7 @@ yyreduce: break; case 95: -#line 923 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 923 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { (yyval) = g_parse->createBuiltin(Builtin::KindInt); } @@ -2516,7 +2516,7 @@ yyreduce: break; case 96: -#line 927 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 927 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { (yyval) = g_parse->createBuiltin(Builtin::KindLong,true); } @@ -2524,7 +2524,7 @@ yyreduce: break; case 97: -#line 931 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 931 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { (yyval) = g_parse->createBuiltin(Builtin::KindLong); } @@ -2532,7 +2532,7 @@ yyreduce: break; case 98: -#line 935 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 935 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { (yyval) = g_parse->createBuiltin(Builtin::KindFloat); } @@ -2540,7 +2540,7 @@ yyreduce: break; case 99: -#line 939 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 939 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { (yyval) = g_parse->createBuiltin(Builtin::KindDouble); } @@ -2548,7 +2548,7 @@ yyreduce: break; case 100: -#line 943 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 943 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { (yyval) = g_parse->createBuiltin(Builtin::KindString); } @@ -2556,7 +2556,7 @@ yyreduce: break; case 101: -#line 947 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 947 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { (yyval) = GrammarBasePtr::dynamicCast((yyvsp[0])); } @@ -2564,7 +2564,7 @@ yyreduce: break; case 102: -#line 951 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 951 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { (yyval) = GrammarBasePtr::dynamicCast((yyvsp[0])); } @@ -2572,7 +2572,7 @@ yyreduce: break; case 103: -#line 955 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 955 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { StringGrammarPtr ident = StringGrammarPtr::dynamicCast((yyvsp[0])); TypePtr sp = g_parse->findUserType(ident->v); @@ -2589,7 +2589,7 @@ yyreduce: break; case 104: -#line 973 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 973 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { (yyval) = GrammarBasePtr::dynamicCast(g_parse->createVector(TypePtr::dynamicCast((yyvsp[-1])))); } @@ -2597,7 +2597,7 @@ yyreduce: break; case 105: -#line 977 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 977 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { g_parse->error("vector error"); } @@ -2605,7 +2605,7 @@ yyreduce: break; case 106: -#line 981 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 981 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { g_parse->error("vector missing '>'"); } @@ -2613,7 +2613,7 @@ yyreduce: break; case 107: -#line 985 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 985 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { g_parse->error("vector missing type"); } @@ -2621,7 +2621,7 @@ yyreduce: break; case 108: -#line 994 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 994 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { (yyval) = GrammarBasePtr::dynamicCast(g_parse->createMap(TypePtr::dynamicCast((yyvsp[-3])), TypePtr::dynamicCast((yyvsp[-1])))); } @@ -2629,7 +2629,7 @@ yyreduce: break; case 109: -#line 998 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 998 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { g_parse->error("map error"); } @@ -2637,14 +2637,14 @@ yyreduce: break; case 110: -#line 1007 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 1007 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { } #line 2644 "tars.tab.cpp" /* yacc.c:1660 */ break; case 111: -#line 1010 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 1010 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { StringGrammarPtr ident = StringGrammarPtr::dynamicCast((yyvsp[0])); ident->v = "::" + ident->v; @@ -2654,7 +2654,7 @@ yyreduce: break; case 112: -#line 1016 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 1016 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { StringGrammarPtr scoped = StringGrammarPtr::dynamicCast((yyvsp[-2])); StringGrammarPtr ident = StringGrammarPtr::dynamicCast((yyvsp[0])); @@ -2666,175 +2666,175 @@ yyreduce: break; case 113: -#line 1029 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 1029 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { } #line 2673 "tars.tab.cpp" /* yacc.c:1660 */ break; case 114: -#line 1032 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 1032 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { } #line 2680 "tars.tab.cpp" /* yacc.c:1660 */ break; case 115: -#line 1035 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 1035 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { } #line 2687 "tars.tab.cpp" /* yacc.c:1660 */ break; case 116: -#line 1038 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 1038 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { } #line 2694 "tars.tab.cpp" /* yacc.c:1660 */ break; case 117: -#line 1041 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 1041 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { } #line 2701 "tars.tab.cpp" /* yacc.c:1660 */ break; case 118: -#line 1044 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 1044 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { } #line 2708 "tars.tab.cpp" /* yacc.c:1660 */ break; case 119: -#line 1047 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 1047 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { } #line 2715 "tars.tab.cpp" /* yacc.c:1660 */ break; case 120: -#line 1050 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 1050 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { } #line 2722 "tars.tab.cpp" /* yacc.c:1660 */ break; case 121: -#line 1053 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 1053 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { } #line 2729 "tars.tab.cpp" /* yacc.c:1660 */ break; case 122: -#line 1056 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 1056 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { } #line 2736 "tars.tab.cpp" /* yacc.c:1660 */ break; case 123: -#line 1059 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 1059 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { } #line 2743 "tars.tab.cpp" /* yacc.c:1660 */ break; case 124: -#line 1062 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 1062 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { } #line 2750 "tars.tab.cpp" /* yacc.c:1660 */ break; case 125: -#line 1065 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 1065 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { } #line 2757 "tars.tab.cpp" /* yacc.c:1660 */ break; case 126: -#line 1068 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 1068 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { } #line 2764 "tars.tab.cpp" /* yacc.c:1660 */ break; case 127: -#line 1071 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 1071 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { } #line 2771 "tars.tab.cpp" /* yacc.c:1660 */ break; case 128: -#line 1074 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 1074 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { } #line 2778 "tars.tab.cpp" /* yacc.c:1660 */ break; case 129: -#line 1077 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 1077 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { } #line 2785 "tars.tab.cpp" /* yacc.c:1660 */ break; case 130: -#line 1080 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 1080 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { } #line 2792 "tars.tab.cpp" /* yacc.c:1660 */ break; case 131: -#line 1083 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 1083 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { } #line 2799 "tars.tab.cpp" /* yacc.c:1660 */ break; case 132: -#line 1086 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 1086 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { } #line 2806 "tars.tab.cpp" /* yacc.c:1660 */ break; case 133: -#line 1089 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 1089 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { } #line 2813 "tars.tab.cpp" /* yacc.c:1660 */ break; case 134: -#line 1092 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 1092 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { } #line 2820 "tars.tab.cpp" /* yacc.c:1660 */ break; case 135: -#line 1095 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 1095 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { } #line 2827 "tars.tab.cpp" /* yacc.c:1660 */ break; case 136: -#line 1098 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 1098 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { } #line 2834 "tars.tab.cpp" /* yacc.c:1660 */ break; case 137: -#line 1101 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ +#line 1101 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1660 */ { } #line 2841 "tars.tab.cpp" /* yacc.c:1660 */ @@ -3068,7 +3068,7 @@ yyreturn: #endif return yyresult; } -#line 1105 "/Users/jarod/centos/TarsCpp/tools/tarsgrammar/tars.y" /* yacc.c:1903 */ +#line 1105 "/Volumes/MyData/centos/TarsCloud/framework/tarscpp/tools/tarsgrammar/tars.y" /* yacc.c:1903 */ diff --git a/util/src/tc_config.cpp b/util/src/tc_config.cpp index 8e526af..f9631d3 100644 --- a/util/src/tc_config.cpp +++ b/util/src/tc_config.cpp @@ -383,7 +383,7 @@ string TC_ConfigDomain::tostr(int i) const string sTab; for(int k = 0; k < i; ++k) { - sTab += "\t"; + sTab += " "; } ostringstream buf; @@ -399,11 +399,11 @@ string TC_ConfigDomain::tostr(int i) const //值为空, 则不打印出= if(it->second.empty()) { - buf << "\t" << sTab << reverse_parse(_key[n]) << endl; + buf << " " << sTab << reverse_parse(_key[n]) << endl; } else { - buf << "\t" << sTab << reverse_parse(_key[n]) << "=" << reverse_parse(it->second) << endl; + buf << " " << sTab << reverse_parse(_key[n]) << "=" << reverse_parse(it->second) << endl; } }