提交: 1e15288bc2b347085ca08395a65b88f366d5b6c9 - nullptr (git)

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

Commit MetaInfo

• 修訂: 1e15288bc2b347085ca08395a65b88f366d5b6c9 (tree)
• 時間: 2015-08-07 00:25:26
• 作者: Diverge <diverge.vosystems@gmai...>
• Commiter: Diverge

Log Message

ソース分割
モジュールの読み込みについて決定(未実装)
制御構文の実装開始

Change Summary

• modified: nullptr.sdf
• add: nullptr/BasicModule.cpp
• add: nullptr/ControlManager.cpp
• modified: nullptr/Debug/nullptr.tlog/CL.command.1.tlog
• modified: nullptr/Debug/nullptr.tlog/CL.read.1.tlog
• modified: nullptr/Debug/nullptr.tlog/CL.write.1.tlog
• modified: nullptr/Debug/nullptr.tlog/link.command.1.tlog
• modified: nullptr/Debug/nullptr.tlog/link.read.1.tlog
• modified: nullptr/Debug/nullptr.tlog/link.write.1.tlog
• modified: nullptr/Debug/vc140.idb
• add: nullptr/ManageVar.cpp
• modified: nullptr/NullptrTmp/Extracted.nullptr
• modified: nullptr/nullptr.cpp
• modified: nullptr/nullptr.h
• modified: nullptr/nullptr.vcxproj
• modified: nullptr/nullptr.vcxproj.filters
• add: nullptr/nullptrInterpreter.h
• modified: nullptr/open.cpp

差異

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

--- /dev/null
+++ b/nullptr/BasicModule.cpp
@@ -0,0 +1,63 @@
+/*
+	nullptr interpreter
+	(C) 2015 VOSystems.
+*/
+
+#include"nullptr.h"
+#include"nullptrInterpreter.h"
+#include<iostream>
+#include<fstream>
+#include<direct.h>
+#include<cctype>
+#include<algorithm>
+#include<Windows.h>
+
+using namespace VOSystemsNullptr;
+using namespace std;
+
+void Nullptr::Screen(std::string line)
+{
+	vector<string> str=Split(line,"<<<");
+
+	for(size_t C=1; C<str.size(); C++){
+		if(regex_match(str[C],regex("\".+\""))){
+			cout<<Replace(str[C],"\"","");
+		}else if(str[C]=="endl"){
+			cout<<endl;
+		}else if(str[C]=="flush"){
+			cout<<flush;
+		}else if(regex_match(str[C],regex("\\d+"))){
+			cout<<stoi(str[C]);
+		}else{
+			BasicTypes::Int ull;
+			if(GetInt(str[C],ull)){
+				cout<<BasicTypes::IntManager(to_string(0),ull)(ull,'d');
+			}else{
+				string s;
+				if(GetStr(str[C],s)){
+					cout<<s;
+				}
+			}
+		}
+	}
+}
+
+void Nullptr::Keyboard(std::string line)
+{
+	vector<string> str=Split(line,">>>");
+	for(size_t C=1; C<str.size(); C++){
+		string in;
+		cin>>in;
+		if(all_of(in.cbegin(),in.cend(),isdigit)){
+			BasicTypes::Int ints={stoll(in)<0 ? -stoll(in) : stoull(in),stoll(in)>=0};
+			AssignInt(str[C],ints);
+		}else{
+			AssignStr(str[C],in);
+		}
+	}
+}
+
+void Nullptr::EScreen(std::string line)
+{
+
+}
\ No newline at end of file

--- /dev/null
+++ b/nullptr/ControlManager.cpp
@@ -0,0 +1,62 @@
+/*
+	nullptr interpreter
+	(C) 2015 VOSystems.
+*/
+
+#include"nullptr.h"
+#include"nullptrInterpreter.h"
+#include<iostream>
+#include<fstream>
+#include<direct.h>
+#include<cctype>
+#include<algorithm>
+#include<Windows.h>
+
+using namespace VOSystemsNullptr;
+using namespace std;
+
+bool Nullptr::If(string line)
+{
+	vector<string> str=Split(line,"{");//if(judge) { sentence;
+	vector<string> ctrl=Split(str[0],"(");//if ( judge)
+	string judge=Replace(ctrl[1],")","");//judge )
+	
+}
+
+bool Nullptr::For(string line)
+{
+
+}
+
+bool Nullptr::While(string line)
+{
+
+}
+
+bool Nullptr::Loop(string line)
+{
+
+}
+
+bool Nullptr::Switch(string line)
+{
+
+}
+
+bool Nullptr::Goto(string line)
+{
+
+}
+
+bool Nullptr::GetBool(string judge)
+{
+	vector<string> andSplit=Split(judge,"&&");
+	for(size_t C=0; C<andSplit.size(); C++){
+		vector<string> orSplit=Split(andSplit[C],"||");
+		
+		for(size_t c=0; c<orSplit.size(); c++){
+			
+		}
+	}
+TrueEnd:
+}
\ No newline at end of file

Binary files a/nullptr/Debug/nullptr.tlog/CL.command.1.tlog and b/nullptr/Debug/nullptr.tlog/CL.command.1.tlog differ

Binary files a/nullptr/Debug/nullptr.tlog/CL.read.1.tlog and b/nullptr/Debug/nullptr.tlog/CL.read.1.tlog differ

Binary files a/nullptr/Debug/nullptr.tlog/CL.write.1.tlog and b/nullptr/Debug/nullptr.tlog/CL.write.1.tlog differ

Binary files a/nullptr/Debug/nullptr.tlog/link.command.1.tlog and b/nullptr/Debug/nullptr.tlog/link.command.1.tlog differ

Binary files a/nullptr/Debug/nullptr.tlog/link.read.1.tlog and b/nullptr/Debug/nullptr.tlog/link.read.1.tlog differ

Binary files a/nullptr/Debug/nullptr.tlog/link.write.1.tlog and b/nullptr/Debug/nullptr.tlog/link.write.1.tlog differ

Binary files a/nullptr/Debug/vc140.idb and b/nullptr/Debug/vc140.idb differ

--- /dev/null
+++ b/nullptr/ManageVar.cpp
@@ -0,0 +1,113 @@
+/*
+	nullptr interpreter
+	(C) 2015 VOSystems.
+*/
+
+#include"nullptr.h"
+#include"nullptrInterpreter.h"
+#include<regex>
+#include<vector>
+#include<string>
+
+using namespace std;
+using namespace VOSystemsNullptr;
+
+bool Nullptr::NewVar(std::string line)
+{
+	regex_replace(line,regex(" +"),"\t");
+	line=Replace(line,"\t"," ");
+	vector<string> str=Split(line," ");
+
+	unsigned long long type=0;
+
+	for(size_t C=0; C<str.size(); C++){
+		if(str[C]=="Int"){
+			C++;
+			vector<string> s=Split(str[C],"=");
+			if(s.size()>0){
+				string name=s[0];
+				BasicTypes::Int intd={0,true};
+
+				if(s.size()>1){
+					intd.data=stoll(Replace(s[1],"\"",""));
+					intd.positive=(intd.data>=0);
+				}
+				return NewInt(name,intd);
+			}
+
+		}else if(str[C]=="String"){
+			C++;
+			vector<string> s=Split(str[C],"=");
+			if(s.size()>0){
+				string name=s[0];
+				string value;
+				if(s.size()>1){
+					value=Replace(s[1],"\"","");
+				}
+				return NewStr(name,value);
+			}
+		}
+
+	}
+	return false;
+}
+
+bool Nullptr::NewInt(std::string name, BasicTypes::Int value)
+{
+	BasicTypes::IntManager inte(name,value);
+	m_int.push_back(inte);
+	return true;
+}
+
+bool Nullptr::AssignInt(std::string name, BasicTypes::Int value)
+{
+	for(size_t C=0; C<m_int.size(); C++){
+		if(m_int[C].GetName()==name){
+			m_int[C]=value;
+			return true;
+		}
+	}
+	return false;
+}
+
+bool Nullptr::GetInt(std::string name, BasicTypes::Int& target)
+{
+	for(size_t C=0; C<m_int.size(); C++){
+		if(m_int[C].GetName()==name){
+			target=m_int[C]();
+			return true;
+		}
+	}
+	return false;
+}
+
+bool Nullptr::NewStr(std::string name, std::string value)
+{
+	BasicTypes::String str;
+	str.data=value;
+	str.name=name;
+	m_string.push_back(str);
+	return true;
+}
+
+bool Nullptr::AssignStr(std::string name, std::string value)
+{
+	for(size_t C=0; C<m_string.size(); C++){
+		if(m_string[C].name==name){
+			m_string[C].data=value;
+			return true;
+		}
+	}
+	return false;
+}
+
+bool Nullptr::GetStr(std::string name, std::string& target)
+{
+	for(size_t C=0; C<m_string.size(); C++){
+		if(m_string[C].name==name){
+			target=m_string[C].data;
+			return true;
+		}
+	}
+	return false;
+}
\ No newline at end of file

--- a/nullptr/NullptrTmp/Extracted.nullptr
+++ b/nullptr/NullptrTmp/Extracted.nullptr
@@ -1,5 +1,5 @@
 screen<<<"Check"<<<endl;
-screen<<<123<<<endl;理??c
+screen<<<123<<<endl;理?
 screen<<<"Hello,World!!"<<<endl;
 screen<<<"HW"<<<flush;
 screen<<<"HWHW"<<<endl;

--- a/nullptr/nullptr.cpp
+++ b/nullptr/nullptr.cpp
@@ -4,6 +4,7 @@
 */
 
 #include"nullptr.h"
+#include"nullptrInterpreter.h"
 #include<iostream>
 #include<fstream>
 #include<direct.h>
@@ -14,7 +15,8 @@
 using namespace VOSystemsNullptr;
 using namespace std;
 
-vector<string> split(const string &str, const string &delim) {
+vector<string> Nullptr::Split(const string &str, const string &delim)
+{
 	vector<string> res;
 	size_t current = 0, found, delimlen = delim.size();
 	while ((found = str.find(delim, current)) != string::npos) {
@@ -25,7 +27,7 @@ vector<string> split(const string &str, const string &delim) {
 	return res;
 }
 
-std::string Replace(std::string src, std::string before, std::string after)
+std::string Nullptr::Replace(std::string src, std::string before, std::string after)
 {
 	std::string::size_type  Pos(src.find(before));
 
@@ -37,7 +39,7 @@ std::string Replace(std::string src, std::string before, std::string after)
 	return src;
 }
 
-bool Find(const string& str, const string& find)
+bool Nullptr::Find(const string& str, const string& find)
 {
 	return(str.find(find) != string::npos);
 }
@@ -96,7 +98,7 @@ void Nullptr::Extract(void)
 				id=Replace(id,"\t","");
 				id=Replace(id," ","");
 				id=Replace(id,";","");
-				vector<string> ids=split(id,"->");
+				vector<string> ids=Split(id,"->");
 				if(id.size()>1){
 					if(ids[0]=="stdin"){
 						m_stdin=ids[1];
@@ -147,46 +149,6 @@ void Nullptr::Work(void)
 	}
 }
 
-bool Nullptr::NewVar(std::string line)
-{
-	regex_replace(line,regex(" +"),"\t");
-	line=Replace(line,"\t"," ");
-	vector<string> str=split(line," ");
-
-	unsigned long long type=0;
-
-	for(size_t C=0; C<str.size(); C++){
-		if(str[C]=="Int"){
-			C++;
-			vector<string> s=split(str[C],"=");
-			if(s.size()>0){
-				string name=s[0];
-				BasicTypes::Int intd={0,true};
-
-				if(s.size()>1){
-					intd.data=stoll(Replace(s[1],"\"",""));
-					intd.positive=(intd.data>=0);
-				}
-				return NewInt(name,intd);
-			}
-
-		}else if(str[C]=="String"){
-			C++;
-			vector<string> s=split(str[C],"=");
-			if(s.size()>0){
-				string name=s[0];
-				string value;
-				if(s.size()>1){
-					value=Replace(s[1],"\"","");
-				}
-				return NewStr(name,value);
-			}
-		}
-		
-	}
-	return false;
-}
-
 void Nullptr::LineLoad(void)
 {
 	ifstream fin(m_src);
@@ -206,109 +168,3 @@ void Nullptr::LineLoad(void)
 	fin.close();
 }
 
-bool Nullptr::NewInt(std::string name, BasicTypes::Int value)
-{
-	BasicTypes::IntManager inte(name,value);
-	m_int.push_back(inte);
-	return true;
-}
-
-bool Nullptr::AssignInt(std::string name, BasicTypes::Int value)
-{
-	for(size_t C=0; C<m_int.size(); C++){
-		if(m_int[C].GetName()==name){
-			m_int[C]=value;
-			return true;
-		}
-	}
-	return false;
-}
-
-bool Nullptr::GetInt(std::string name, BasicTypes::Int& target)
-{
-	for(size_t C=0; C<m_int.size(); C++){
-		if(m_int[C].GetName()==name){
-			target=m_int[C]();
-			return true;
-		}
-	}
-	return false;
-}
-
-bool Nullptr::NewStr(std::string name, std::string value)
-{
-	BasicTypes::String str;
-	str.data=value;
-	str.name=name;
-	m_string.push_back(str);
-	return true;
-}
-
-bool Nullptr::AssignStr(std::string name, std::string value)
-{
-	for(size_t C=0; C<m_string.size(); C++){
-		if(m_string[C].name==name){
-			m_string[C].data=value;
-			return true;
-		}
-	}
-	return false;
-}
-
-bool Nullptr::GetStr(std::string name, std::string& target)
-{
-	for(size_t C=0; C<m_string.size(); C++){
-		if(m_string[C].name==name){
-			target=m_string[C].data;
-			return true;
-		}
-	}
-	return false;
-}
-
-void Nullptr::Screen(std::string line)
-{
-	vector<string> str=split(line,"<<<");
-	
-	for(size_t C=1; C<str.size(); C++){
-		if(regex_match(str[C],regex("\".+\""))){
-			cout<<Replace(str[C],"\"","");
-		}else if(str[C]=="endl"){
-			cout<<endl;
-		}else if(str[C]=="flush"){
-			cout<<flush;
-		}else if(regex_match(str[C],regex("\\d+"))){
-			cout<<stoi(str[C]);
-		}else{
-			BasicTypes::Int ull;
-			if(GetInt(str[C],ull)){
-				cout<<BasicTypes::IntManager(to_string(0),ull)(ull,'d');
-			}else{
-				string s;
-				if(GetStr(str[C],s)){
-					cout<<s;
-				}
-			}
-		}
-	}
-}
-
-void Nullptr::Keyboard(std::string line)
-{
-	vector<string> str=split(line,">>>");
-	for(size_t C=1; C<str.size(); C++){
-		string in;
-		cin>>in;
-		if(all_of(in.cbegin(),in.cend(),isdigit)){
-			BasicTypes::Int ints={stoll(in)<0 ? -stoll(in) : stoull(in),stoll(in)>=0};
-			AssignInt(str[C],ints);
-		}else{
-			AssignStr(str[C],in);
-		}
-	}
-}
-
-void Nullptr::EScreen(std::string line)
-{
-
-}
\ No newline at end of file

--- a/nullptr/nullptr.h
+++ b/nullptr/nullptr.h
@@ -26,7 +26,6 @@ namespace VOSystemsNullptr
 			BasicTypes::Int m_data;
 			std::string m_name;
 			
-
 		public:
 			IntManager(std::string name, Int data) :m_name(name),m_data(data) {};
 
@@ -56,6 +55,10 @@ namespace VOSystemsNullptr
 			std::string data;
 		}String;
 
+		typedef struct _Bool{
+			bool data;
+			std::string name;
+		}Bool;
 	}
 	
 	namespace System{
@@ -66,51 +69,4 @@ namespace VOSystemsNullptr
 
 		typedef std::vector<Identifier> IdentifierList;
 	}
-
-	class Nullptr
-	{
-	private:
-		std::vector<BasicTypes::IntManager> m_int;
-		std::vector<BasicTypes::String> m_string;
-		System::IdentifierList m_list;
-
-		std::string m_workline;
-
-		std::streamoff m_eip;
-		std::string m_src;
-
-		System::IdentifierList m_idlist;
-
-		void LineLoad(void);
-		void Extract(void);
-
-		std::string m_stdout,m_stdin,m_stderr;
-
-		void Screen(std::string line);
-		void Keyboard(std::string line);
-		void EScreen(std::string line);
-
-		bool NewInt(std::string name, BasicTypes::Int value);
-		bool AssignInt(std::string name, BasicTypes::Int value);
-		bool GetInt(std::string name, BasicTypes::Int& target);
-
-		bool NewStr(std::string name, std::string value);
-		bool AssignStr(std::string name, std::string value);
-		bool GetStr(std::string name, std::string& target);
-
-		bool NewVar(std::string line);
-
-		unsigned int 
-			m_major=0,
-			m_minor=0,
-			m_build=12,
-			m_revision=30;
-
-
-	public:
-		Nullptr(std::string file);
-		~Nullptr(void);
-
-		void Work(void);
-	};
 }
\ No newline at end of file

--- a/nullptr/nullptr.vcxproj
+++ b/nullptr/nullptr.vcxproj
@@ -119,9 +119,13 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="nullptr.h" />
+    <ClInclude Include="nullptrInterpreter.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="BasicModule.cpp" />
+    <ClCompile Include="ControlManager.cpp" />
     <ClCompile Include="int.cpp" />
+    <ClCompile Include="ManageVar.cpp" />
     <ClCompile Include="nullptr.cpp" />
     <ClCompile Include="open.cpp" />
   </ItemGroup>

--- a/nullptr/nullptr.vcxproj.filters
+++ b/nullptr/nullptr.vcxproj.filters
@@ -18,6 +18,9 @@
     <ClInclude Include="nullptr.h">
       <Filter>ヘッダー ファイル</Filter>
     </ClInclude>
+    <ClInclude Include="nullptrInterpreter.h">
+      <Filter>ヘッダー ファイル</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="nullptr.cpp">
@@ -29,6 +32,15 @@
     <ClCompile Include="int.cpp">
       <Filter>ソース ファイル</Filter>
     </ClCompile>
+    <ClCompile Include="ManageVar.cpp">
+      <Filter>ソース ファイル</Filter>
+    </ClCompile>
+    <ClCompile Include="BasicModule.cpp">
+      <Filter>ソース ファイル</Filter>
+    </ClCompile>
+    <ClCompile Include="ControlManager.cpp">
+      <Filter>ソース ファイル</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="iostream.nullptrmodule" />

--- /dev/null
+++ b/nullptr/nullptrInterpreter.h
@@ -0,0 +1,74 @@
+/*
+nullptr Interpreter.
+(C) 2015 VOSystems.
+*/
+
+#pragma once
+
+#include<vector>
+#include<string>
+#include<regex>
+#include<fstream>
+#include"nullptr.h"
+
+namespace VOSystemsNullptr
+{
+	class Nullptr
+	{
+	private:
+		std::vector<BasicTypes::IntManager> m_int;//Int変数リスト
+		std::vector<BasicTypes::String> m_string;//String変数リスト
+		std::vector<BasicTypes::Bool> m_bool;//bool変数リスト
+		System::IdentifierList m_list;//識別子リスト
+
+		std::string m_workline;//行の内容(セミコロンの次からセミコロンまで)
+
+		std::streamoff m_eip;//x86のEIPと同じ、命令ポインタ
+		std::string m_src;//ソースファイル名
+
+		void LineLoad(void);//行読み込み
+		void Extract(void);//プリプロセッサー、展開
+
+		std::string m_stdout,m_stdin,m_stderr;//標準入出力系の名前
+
+		std::vector<std::string> Split(const std::string &str, const std::string &delim);//文字列分割
+		std::string Replace(std::string src, std::string before, std::string after);//文字列置き換え
+		bool Find(const std::string& str, const std::string& find);//文字列検索
+
+		void Screen(std::string line);//ベーシックモジュール->標準出力
+		void Keyboard(std::string line);//ベーシックモジュール->標準入力
+		void EScreen(std::string line);//ベーシックモジュール標準エラー出力
+
+		bool NewInt(std::string name, BasicTypes::Int value);//Int変数作成
+		bool AssignInt(std::string name, BasicTypes::Int value);//Int変数代入
+		bool GetInt(std::string name, BasicTypes::Int& target);//Int変数、値取得
+
+		bool NewStr(std::string name, std::string value);//String変数作成
+		bool AssignStr(std::string name, std::string value);//String変数代入
+		bool GetStr(std::string name, std::string& target);//String変数、値取得
+
+		bool NewVar(std::string line);//変数作成
+
+		bool If(std::string line);
+		bool For(std::string line);
+		bool While(std::string line);
+		bool Loop(std::string line);
+		bool Switch(std::string line);
+		bool Goto(std::string line);
+		bool GetBool(std::string judge);
+
+		/*バージョン*/
+		unsigned int 
+			m_major=0,
+			m_minor=0,
+			m_build=12,
+			m_revision=30;
+
+
+	public:
+		Nullptr(std::string file);
+		~Nullptr(void);
+
+		void Work(void);
+	};
+}
\ No newline at end of file

--- a/nullptr/open.cpp
+++ b/nullptr/open.cpp
@@ -1,5 +1,5 @@
 #include"nullptr.h"
-
+#include"nullptrInterpreter.h"
 int main(void)
 {
 	VOSystemsNullptr::Nullptr npr("test.nullptr");