提交: 54c9ccaa2b2a4d4ba22188987566ef2404ad0e59 - nullptr (git)

自作言語nullptrのインタープリターです。

Commit MetaInfo

• 修订版: 54c9ccaa2b2a4d4ba22188987566ef2404ad0e59 (tree)
• 时间: 2015-08-13 00:05:27
• 作者: VOSystems <diverge.vosystems@gmai...>
• Commiter: VOSystems

Log Message

begin to create Load Identifier function

更改概述

• modified: nullptr.sdf
• modified: nullptr/Module.cpp
• modified: nullptr/Module.h
• modified: nullptr/Preprocessor.cpp
• modified: nullptr/Preprocessor.h
• modified: nullptr/nullptr.h

差异

Binary files a/nullptr.sdf and b/nullptr.sdf differ

--- a/nullptr/Module.cpp
+++ b/nullptr/Module.cpp
@@ -13,7 +13,7 @@ nullptr interpreter
 using namespace std;
 using namespace VOSystemsNullptr::Core;
 
-inline VOSystemsNullptr::System::ModuleFunction SearchDLL(VOSystemsNullptr::System::Module module, string name);
+inline LibraryFunction SearchDLL(Library lib, string name);
 
 bool Module::Connect(std::string name)
 {
@@ -43,16 +43,16 @@ bool Module::Run(std::string name, BasicTypes::Int* paramInt, BasicTypes::String
 	
 	switch(m_mf.mode){
 	case System::NotFound:
-	case System::ReturnBool:
+	case System::BoolType:
 	default:
 		return false;
 		break;
-	case System::ReturnInt:
+	case System::IntType:
 		Core::IntFunc ifunc=(Core::IntFunc)GetProcAddress(m_module,"runRI");
 		m_int=(*ifunc)(name,paramInt,paramString);
 		
 		break;
-	case System::ReturnString:
+	case System::StringType:
 		Core::StrFunc sfunc=(Core::StrFunc)GetProcAddress(m_module,"runRS");
 		m_str=(*sfunc)(name,paramInt,paramString);
 		break;
@@ -72,18 +72,18 @@ bool Module::DisConnect(void)
 	}
 }
 
-VOSystemsNullptr::System::ModuleFunction Module::DllSearch(std::string name)
+LibraryFunction Module::DllSearch(std::string name)
 {
 	this->m_modules.size();
 	vector<thread> th(this->m_modules.size());
-	vector<future<System::ModuleFunction>> fu(this->m_modules.size());
+	vector<future<LibraryFunction>> fu(this->m_modules.size());
 
 	for(size_t C=0; C<this->m_modules.size(); C++){
-		System::Module mod=m_modules[C];
+		Library mod=m_modules[C];
 		fu[C]=async([mod,name](string){SearchDLL(mod,name);});//th[C]=thread([mod,name](){SearchDLL(mod,name);});
 	}
 
-	vector<System::ModuleFunction> result(this->m_modules.size());
+	vector<LibraryFunction> result(this->m_modules.size());
 	for(size_t C=0; C<this->m_modules.size(); C++){
 		result[C]=fu[C].get();
 		if(!result[C].mode==System::NotFound){
@@ -91,19 +91,19 @@ VOSystemsNullptr::System::ModuleFunction Module::DllSearch(std::string name)
 		}
 	}
 
-	VOSystemsNullptr::System::ModuleFunction mf;
-	mf.mode=VOSystemsNullptr::System::NotFound;
+	LibraryFunction mf;
+	mf.mode=System::NotFound;
 	return mf;
 }
 
-inline VOSystemsNullptr::System::ModuleFunction SearchDLL(VOSystemsNullptr::System::Module module, string name)
+inline LibraryFunction SearchDLL(Library lib, string name)
 {
-	for(size_t C=0; C<module.size(); C++){
-		if(module[C].name==name){
-			return module[C];
+	for(size_t C=0; C<lib.size(); C++){
+		if(lib[C].name==name){
+			return lib[C];
 		}
 	}
-	VOSystemsNullptr::System::ModuleFunction mf;
+	LibraryFunction mf;
 	mf.mode=VOSystemsNullptr::System::NotFound;
 	return mf;
 }
\ No newline at end of file

--- a/nullptr/Module.h
+++ b/nullptr/Module.h
@@ -11,20 +11,28 @@ namespace VOSystemsNullptr
 {
 	namespace Core
 	{
+		struct LibraryFunction{
+			std::string name,dllname;
+			unsigned char mode;
+			unsigned char ArguInt,ArguBool,ArguString;
+		};
+
+		typedef std::vector<struct LibraryFunction> Library;
+
 		typedef BasicTypes::String (*StrFunc)(std::string, BasicTypes::Int*,BasicTypes::String*);
 		typedef BasicTypes::Int (*IntFunc)(std::string, BasicTypes::Int*,BasicTypes::String*);
 
 		class Module
 		{
 		private:
-			std::vector<System::Module> m_modules;
+			std::vector<Library> m_modules;
 			std::string m_CurrentConnectModuleName;
 			HMODULE m_module;
-			System::ModuleFunction m_mf;
+			LibraryFunction m_mf;
 			BasicTypes::Int m_int;
 			BasicTypes::String m_str;
 
-			VOSystemsNullptr::System::ModuleFunction DllSearch(std::string name);
+			LibraryFunction DllSearch(std::string name);
 		public:
 			bool Connect(std::string name);
 			bool Run(std::string name, BasicTypes::Int* paramInt, BasicTypes::String* paramString);

--- a/nullptr/Preprocessor.cpp
+++ b/nullptr/Preprocessor.cpp
@@ -122,7 +122,7 @@ void Preprocessor::Trim(void)
 	}while(!line.empty());
 }
 
-void Preprocessor::Load(System::Module& module)
+void Preprocessor::LoadLib(Library& module)
 {
 	regex func_regex(R"(.+ .+(Int \d+\s*,\s*String \d+\s*,\s*bool \d+\s*);*)");
 	regex bool_regex(R"(bool .+(Int \d+\s*,\s*String \d+\s*,\s*bool \d+\s*);*)");
@@ -136,20 +136,20 @@ void Preprocessor::Load(System::Module& module)
 		do{
 			line=fop();
 			if(regex_match(line,func_regex)){
-				System::ModuleFunction mf;
+				LibraryFunction mf;
 				mf.dllname=m_modulefiles[C];
 				string::iterator start;
 				
 				if(regex_match(line,bool_regex)){
-					mf.mode=System::ReturnBool;
+					mf.mode=System::BoolType;
 					start=line.begin()+5;
 
-				}else if(regex_match(line,bool_regex)){
-					mf.mode=System::ReturnInt;
+				}else if(regex_match(line,int_regex)){
+					mf.mode=System::IntType;
 					start=line.begin()+4;
 
-				}else if(regex_match(line,bool_regex)){
-					mf.mode=System::ReturnString;
+				}else if(regex_match(line,str_regex)){
+					mf.mode=System::StringType;
 					start=line.begin()+7;
 
 				}else{
@@ -173,4 +173,32 @@ void Preprocessor::Load(System::Module& module)
 			}
 		}while(!line.empty());
 	}
+}
+
+void Preprocessor::LoadId(System::IdentifierList& list)
+{
+	regex 
+		bool_regex(R"(bool[\s\t]+.+)"),
+		int_regex(R"(Int[\s\t]+.+)"),
+		str_regex(R"(String[\s\t]+.+)");
+
+	System::FileOperator fope(m_src,";");
+	string line;
+	System::Identifier id;
+
+	do{
+		line=fope();
+
+		if(regex_match(line,bool_regex)){
+			id.type=System::BoolType;
+
+		}else if(regex_match(line,int_regex)){
+			id.type=System::IntType;
+
+		}else if(regex_match(line,str_regex)){
+			id.type=System::StringType;
+
+		}
+
+	}while(!line.empty());
 }
\ No newline at end of file

--- a/nullptr/Preprocessor.h
+++ b/nullptr/Preprocessor.h
@@ -17,7 +17,8 @@ namespace VOSystemsNullptr
 			Preprocessor(std::string source);
 			void Extract(void);
 			void Trim(void);
-			void Load(System::Module& module);
+			void LoadLib(Library& module);
+			void LoadId(System::IdentifierList& list);
 		};
 	}
 }
\ No newline at end of file

--- a/nullptr/nullptr.h
+++ b/nullptr/nullptr.h
@@ -82,28 +82,22 @@ namespace VOSystemsNullptr
 	}
 	
 	namespace System{
+
+		enum Types{
+			NotFound=0,
+			BoolType=1,
+			IntType=2,
+			StringType=4,
+		};
+
 		typedef struct _Identifier{
 			std::string name;
 			std::streamoff pos;
+			unsigned char type;
 		}Identifier;
 
 		typedef std::vector<Identifier> IdentifierList;
 
-		enum ModuleMode{
-			NotFound=0,
-			ReturnBool=1,
-			ReturnInt=2,
-			ReturnString=4,
-		};
-
-		struct ModuleFunction{
-			std::string name,dllname;
-			unsigned char mode;
-			unsigned char ArguInt,ArguBool,ArguString;
-		};
-
-		typedef std::vector<struct ModuleFunction> Module;
-
 		class FileOperator
 		{
 		private: