提交: ed684ba4bf71042a3c88f1a07ab15cce9d0d04fc - nullptr (git)

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

Commit MetaInfo

• 修订版: ed684ba4bf71042a3c88f1a07ab15cce9d0d04fc (tree)
• 时间: 2015-08-08 16:35:37
• 作者: Diverge <diverge.vosystems@gmai...>
• Commiter: Diverge

Log Message

外部モジュールローダの実装開始

更改概述

• modified: nullptr.sdf
• modified: nullptr/ControlManager.cpp
• add: nullptr/ModuleLoader.cpp
• modified: nullptr/nullptr.cpp
• modified: nullptr/nullptr.h
• modified: nullptr/nullptr.vcxproj
• modified: nullptr/nullptr.vcxproj.filters
• modified: nullptr/nullptrInterpreter.h

差异

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

--- a/nullptr/ControlManager.cpp
+++ b/nullptr/ControlManager.cpp
@@ -148,23 +148,32 @@ std::vector<std::string> Nullptr::ProcBrackets(std::vector<std::string> lex)
 std::string Nullptr::CalcBracket(std::string inBracket)
 {
 	vector<BasicTypes::Int> num;
+	BasicTypes::Int intd;
+
 	bool minus=false;
+	unsigned char operate=0;
+	enum Operator{
+		plus=1,
+		minus=2,
+		multiple=4,
+		divide=8,
+		mod=16,
+	};
+
 	for(size_t C=0; C<inBracket.size(); C++){
 		switch(inBracket[C]){
-		case '+':
-
-			break;
 		case '-':
-
+			minus=!minus;
+		case '+':
 			break;
 		case '*':
-
+			operate=multiple;
 			break;
 		case '/':
-
+			operate=divide;
 			break;
 		case '%':
-
+			operate=mod;
 			break;
 
 		default:
@@ -174,6 +183,17 @@ std::string Nullptr::CalcBracket(std::string inBracket)
 				n[c-C]=inBracket[c];
 			}
 			num.push_back({!minus,stoull(n)});
+			switch(operate){
+			case multiple:
+				num.push_back((*num.end())*(*(num.end()-1)));
+				break;
+			case divide:
+				num.push_back((*(num.end()-1))/(*num.end()));
+				break;
+			case mod:
+				num.push_back((*(num.end()-1))%(*num.end()));
+				break;
+			}
 			break;
 		}
 	}

--- /dev/null
+++ b/nullptr/ModuleLoader.cpp
@@ -0,0 +1,40 @@
+/*
+nullptr interpreter
+(C) 2015 VOSystems.
+*/
+
+#include"nullptr.h"
+#include"nullptrInterpreter.h"
+
+using namespace std;
+using namespace VOSystemsNullptr;
+
+bool Nullptr::ModuleInfoLoader(std::string name)
+{
+	string src=m_src;
+	string work=m_workline;
+
+	m_src=name+".nullptrmodule";
+	do{
+		LineLoad();
+
+	}while(!m_workline.empty());
+
+	m_src=src;
+	m_workline=work;
+}
+
+bool Nullptr::ModuleConnect(std::string name)
+{
+
+}
+
+bool Nullptr::ModuleRun(std::string name)
+{
+
+}
+
+bool Nullptr::ModuleDisConnect(std::string name)
+{
+
+}

--- a/nullptr/nullptr.cpp
+++ b/nullptr/nullptr.cpp
@@ -119,6 +119,11 @@ ErrorNext:;
 	m_src = "./NullptrTmp/Extracted.nullptr";
 }
 
+void Nullptr::Trim(void)
+{
+
+}
+
 void Nullptr::Work(void)
 {
 	do{

--- a/nullptr/nullptr.h
+++ b/nullptr/nullptr.h
@@ -74,5 +74,23 @@ namespace VOSystemsNullptr
 		}Identifier;
 
 		typedef std::vector<Identifier> IdentifierList;
+
+		enum ModuleMode{
+			NotFound=0,
+			ReturnBool=1,
+			ReturnInt=2,
+			ReturnString=4,
+		};
+
+		struct ModuleFunction{
+			std::string name;
+			unsigned char mode;
+			unsigned char ArguInt,ArguBool,ArguString;
+		};
+
+		typedef struct _Module{
+			std::string name;
+			std::vector<struct ModuleFunction> modules;
+		}Module;
 	}
 }
\ No newline at end of file

--- a/nullptr/nullptr.vcxproj
+++ b/nullptr/nullptr.vcxproj
@@ -126,6 +126,7 @@
     <ClCompile Include="ControlManager.cpp" />
     <ClCompile Include="int.cpp" />
     <ClCompile Include="ManageVar.cpp" />
+    <ClCompile Include="ModuleLoader.cpp" />
     <ClCompile Include="nullptr.cpp" />
     <ClCompile Include="open.cpp" />
   </ItemGroup>

--- a/nullptr/nullptr.vcxproj.filters
+++ b/nullptr/nullptr.vcxproj.filters
@@ -41,6 +41,9 @@
     <ClCompile Include="ControlManager.cpp">
       <Filter>ソース ファイル</Filter>
     </ClCompile>
+    <ClCompile Include="ModuleLoader.cpp">
+      <Filter>ソース ファイル</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="iostream.nullptrmodule" />

--- a/nullptr/nullptrInterpreter.h
+++ b/nullptr/nullptrInterpreter.h
@@ -28,6 +28,15 @@ namespace VOSystemsNullptr
 
 		void LineLoad(void);//行読み込み
 		void Extract(void);//プリプロセッサー、展開
+		void Trim(void);//プリプロセッサー、除去
+
+		bool ModuleInfoLoader(std::string name);
+		bool ModuleConnect(std::string name);
+		bool ModuleRun(std::string name);
+		bool ModuleDisConnect(std::string name);
+
+		std::vector<System::Module> m_modules;
+		System::Module m_CurrentConnectModule;
 
 		std::string m_stdout,m_stdin,m_stderr;//標準入出力系の名前