Merge pull request #26 from elite-lang/dev

v0.7.4

Author: xssss1

.gitmodules

@@ -9,3 +9,7 @@
 [submodule "RedApple"]
 	path = RedApple
 	url = https://github.com/elite-lang/RedApple.git
+
+[submodule "tools"]
+	path = tools
+	url = https://github.com/elite-lang/tools.git

Builder/CMakeLists.txt

@@ -13,13 +13,14 @@ SET (EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
 include_directories(../Lex/include 
 					../LR_Scanner/include 
 					../RedApple/includes 
-					../MetaScriptRunner/include)
+					../MetaScriptRunner/include
+					)
 link_directories(${CMAKE_CURRENT_SOURCE_DIR}/lib)
 endif()
 
 
 # 核心路径配置
-include_directories(src include)
+include_directories(src include ../tools)
 file(GLOB_RECURSE source_files ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp)
 if(USE_DYNAMIC)
 	add_library(builder SHARED ${source_files}) # 使用动态库

Builder/include/Builder.h

@@ -2,7 +2,7 @@
 * @Author: sxf
 * @Date:   2015-11-08 09:06:35
 * @Last Modified by:   sxf
-* @Last Modified time: 2015-12-21 19:30:12
+* @Last Modified time: 2015-12-25 14:34:16
 */
 
 
@@ -59,7 +59,6 @@ class Builder
 
 	Worker* worker = 0;
 	std::string buildpath;
-	static std::string fileReader(const char* path);
 	static std::string make_default_name(const char* filename);
 	static std::string get_file_name(const char* filename);
 

Builder/include/PathGetter.h

@@ -2,7 +2,7 @@
 * @Author: sxf
 * @Date:   2015-11-08 11:08:05
 * @Last Modified by:   sxf
-* @Last Modified time: 2015-12-22 08:22:19
+* @Last Modified time: 2015-12-25 10:24:59
 */
 
 #ifndef PATH_GETTER_H
@@ -23,6 +23,7 @@ class PathGetter
 	static const char* getEliteLibPath();
 	static const char* getEliteCfgPath();
 	static const char* getEliteToolsPath();
+	static const char* getElitePackagesPath();
 	static const char* getDefaultLexCfg();
 	static const char* getDefaultParserCfg();
 	static const char* getNowPath();

Builder/include/Worker.h

@@ -2,7 +2,7 @@
 * @Author: sxf
 * @Date:   2015-11-11 13:52:11
 * @Last Modified by:   sxf
-* @Last Modified time: 2015-12-22 11:18:14
+* @Last Modified time: 2015-12-25 10:12:56
 */
 #ifndef WORKER_H
 #define WORKER_H
@@ -23,7 +23,7 @@ class Worker
 	void Run(const char* input, const char* output);
 	void MetaGen(const char* output);
 
-	static Worker* CreateDefault(const char* lex_cfg, const char* parser_cfg);
+	static Worker* CreateDefault(const char* lex_cfg, const char* parser_cfg, const char* package_path);
 	static Worker* Create(LexInterface* l, Parser* p, ScriptRunner* s, CodeGen* c);
 
 	LexInterface* getLex() { return lex; }

Builder/src/Builder.cpp

@@ -2,7 +2,7 @@
 * @Author: sxf
 * @Date:   2015-11-08 10:20:02
 * @Last Modified by:   sxf
-* @Last Modified time: 2015-12-22 11:19:18
+* @Last Modified time: 2015-12-25 14:34:46
 */
 
 #include "Builder.h"
@@ -30,7 +30,7 @@ int Builder::BuildFile(std::string filename) {
 	string outfile_path = this->buildpath + "/" + program + ".bc";
 	outfile_path = PathUtils::native(outfile_path); // 本地化
 
-	string data = fileReader(filename.c_str());
+	string data = FileUtils::fileReader(filename.c_str());
 	printf("输入文件: %s \n输出文件: %s\n", filename.c_str(), outfile_path.c_str());
 	worker->Run(data.c_str(), outfile_path.c_str());
 
@@ -115,7 +115,10 @@ Builder* Builder::Create(Worker* worker) {
 Builder::Builder(Worker* worker) {
 	if (worker == 0) 
 		setWorker(Worker::CreateDefault(
-			PathGetter::getDefaultLexCfg(), PathGetter::getDefaultParserCfg()));
+			PathGetter::getDefaultLexCfg(), 
+			PathGetter::getDefaultParserCfg(),
+			PathGetter::getElitePackagesPath()
+		));
 	else 
 		setWorker(worker);
 }
@@ -128,18 +131,7 @@ void Builder::Close() {
 	delete this;
 }
 
-std::string Builder::fileReader(const char* path) {
-    std::ifstream t(path, std::ios::binary);
-	std::string str;
 
-	t.seekg(0, std::ios::end);   
-	str.reserve(t.tellg());
-	t.seekg(0, std::ios::beg);
-
-	str.assign((std::istreambuf_iterator<char>(t)),
-	            std::istreambuf_iterator<char>());
-    return str;
-}
 string Builder::make_default_name(const char* filename) {
 	const char* ans = strrchr(filename, '/');
 	const char* file;

Builder/src/PathGetter.cpp

@@ -2,14 +2,14 @@
 * @Author: sxf
 * @Date:   2015-11-08 11:16:04
 * @Last Modified by:   sxf
-* @Last Modified time: 2015-12-20 12:02:27
+* @Last Modified time: 2015-12-25 11:16:36
 */
 
 #include <stdlib.h>
 #include "PathGetter.h"
 #include "FileUtils.h"
 #include "PathUtils.h"
- 
+#include "elite_tools.h"
 
 class PathGetter_Private {
 public:
@@ -21,6 +21,7 @@ class PathGetter_Private {
 	string elite_parser_path;
 	string elite_now_path;
 	string elite_tools_path;
+	string elite_packages_path;
 };
 
 
@@ -53,6 +54,11 @@ const char* PathGetter::getEliteToolsPath() {
 	return getInstance()->elite_tools_path.c_str();
 }
 
+const char* PathGetter::getElitePackagesPath() {
+	return getInstance()->elite_packages_path.c_str();
+}
+
+
 PathGetter_Private* PathGetter::getInstance() {
 	if (instance == NULL) {
 		instance = new PathGetter_Private();
@@ -75,11 +81,14 @@ void PathGetter_Private::setPath() {
 	elite_lib_path = elite_home;
 	elite_cfg_path = elite_home;
 	elite_tools_path = elite_home;
+	elite_packages_path = elite_home;
 	elite_lib_path.append("/libs");
 	elite_cfg_path.append("/conf");
+	elite_packages_path.append("/packages");
 	// 本地化
 	elite_lib_path = PathUtils::native(elite_lib_path);
 	elite_cfg_path = PathUtils::native(elite_cfg_path);
+	elite_packages_path = PathUtils::native(elite_packages_path);
 
 	if (!FileUtils::test_dir(elite_lib_path)) {
 		printf("%s 目录找不到\n", elite_lib_path.c_str());
@@ -89,16 +98,12 @@ void PathGetter_Private::setPath() {
 		printf("%s 目录找不到\n", elite_cfg_path.c_str());
 		exit(1);
 	}
+	if (!FileUtils::test_dir(elite_packages_path)) {
+		printf("%s 目录找不到\n", elite_packages_path.c_str());
+		exit(1);
+	}
 
-#if defined(_WIN32)
-	elite_tools_path.append("/tools/windows_x64");
-#endif
-#if defined(__linux__)
-	elite_tools_path.append("/tools/linux_x64");
-#endif
-#if defined(__APPLE__) && defined(__MACH__)
-	elite_tools_path.append("/tools/darwin_x64");
-#endif
+	elite_tools_path.append(ELITE_TOOLS_PATH);
 	// 本地化
 	elite_tools_path = PathUtils::native(elite_tools_path);
 

Builder/src/Worker.cpp

@@ -2,7 +2,7 @@
 * @Author: sxf
 * @Date:   2015-11-11 16:00:38
 * @Last Modified by:   sxf
-* @Last Modified time: 2015-12-22 11:18:24
+* @Last Modified time: 2015-12-25 10:26:37
 */
 
 
@@ -43,11 +43,12 @@ void Worker::MetaGen(const char* output) {
 }
 
 
-Worker* Worker::CreateDefault(const char* lex_cfg, const char* parser_cfg) {
+Worker* Worker::CreateDefault(const char* lex_cfg, 
+	const char* parser_cfg, const char* package_path) {
 	Lex* l = new Lex();
 	Parser* p = Parser::NewLRParser();
-	ScriptRunner* s = MetaScriptRunner::Create();
-	CodeGen* c = RedCodeGen::Create();
+	MetaScriptRunner* s = MetaScriptRunner::Create();
+	RedCodeGen* c = RedCodeGen::Create();
 
 	// 配置联系
     p->setLex(l);
@@ -57,6 +58,9 @@ Worker* Worker::CreateDefault(const char* lex_cfg, const char* parser_cfg) {
 	l->ReadConfig(lex_cfg);
 	p->AddBNF(parser_cfg);
 
+	// 配置外置插件
+	s->setUpLoader(package_path);
+
 	return Create(l, p, s, c);
 }
 

EliteTest/bug_list/7/test.elite

@@ -0,0 +1,26 @@
+// 这是一道经典的汉诺塔
+
+void work(int k, int src, int obj) {
+	if (k==1) {
+		print(src, obj);
+		return;
+	}
+	work(k-1, src, 3-obj-src);
+	print(src, obj);
+	work(k-1, 3-obj-src, obj);
+}
+
+int main() {
+	work(3, 0, 2);
+	return 0;
+}
+
+char[] select(int k) {
+	if (k == 0) return "A";
+	if (k == 1) return "B";
+	if (k == 2) return "C";
+}
+
+void print(int src, int obj) {
+	printf("%s => %s", select(src), select(obj));
+}

EliteTest/bug_list/6/test.elite EliteTest/full_test/6/test.eliteEliteTest/bug_list/6/test.elite renamed to EliteTest/full_test/6/test.elite

@@ -3,6 +3,7 @@ void print(int k) {
 	printf("hello-%d\n",k);
 }
 
-void main() {
+int main() {
 	FunctionCall("print", 5);
-}
+	return 0;
+}