Commit: master - nullptr (git)

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

Commit MetaInfo

• Revision: 3fe66ee3ed4c9b6729ac53759a7112cbee4b171d (tree)
• Time: 2015-08-15 00:27:41
• Author: VOSystems <diverge.vosystems@gmai...>
• Commiter: VOSystems

Log Message

Preprocesor is almost finished. NEXT->Interpreter

Change Summary

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

Incremental Difference

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

--- a/nullptr/Preprocessor.cpp
+++ b/nullptr/Preprocessor.cpp
@@ -175,6 +175,33 @@ void Preprocessor::LoadLib(Library& module)
 	}
 }
 
+void RegID(VOSystemsNullptr::System::IdentifierList& idlist, uint8_t type, const VOSystemsNullptr::System::FileOperator& fope, string line)
+{
+	VOSystemsNullptr::System::Identifier id;
+	id.type=type;
+	id.pos=fope.GetStreamOffset();
+	
+	string::iterator start,end;
+	switch(type){
+	case VOSystemsNullptr::System::NotFound:
+	default:
+		break;
+
+	case VOSystemsNullptr::System::IntType:
+		start=line.begin()+4;
+		break;
+	case VOSystemsNullptr::System::StringType:
+		start=line.begin()+7;
+	case VOSystemsNullptr::System::BoolType:
+		start=line.begin()+5;
+	}
+	id.name=string(start,line.begin()+line.find_first_of('('));
+
+	idlist.push_back(id);
+
+	return;
+}
+
 void Preprocessor::LoadId(System::IdentifierList& list)
 {
 	regex 
@@ -184,19 +211,17 @@ void Preprocessor::LoadId(System::IdentifierList& list)
 
 	System::FileOperator fope(m_src,";");
 	string line;
-	System::Identifier id;
-
 	do{
 		line=fope();
 
 		if(regex_match(line,bool_regex)){
-			id.type=System::BoolType;
+			RegID(list,System::BoolType,fope,line);
 
 		}else if(regex_match(line,int_regex)){
-			id.type=System::IntType;
+			RegID(list,System::IntType,fope,line);
 
 		}else if(regex_match(line,str_regex)){
-			id.type=System::StringType;
+			RegID(list,System::StringType,fope,line);
 
 		}
 

--- a/nullptr/nullptr.h
+++ b/nullptr/nullptr.h
@@ -111,6 +111,8 @@ namespace VOSystemsNullptr
 			std::string operator()(void);
 			std::string operator()(size_t startpoint);
 			std::string operator=(std::string source);
+
+			streamoff GetStreamOffset(void) const;
 		};
 
 		class StringModule