Many changes starting to work on the interperter

DMS/DMS.cpp

@@ -1,8 +1,32 @@
 #include "dms.h"
+#include "Handlers.h"
+#include "utils.h"
+#include <iostream>
 using namespace dms;
+// You can use your own choice handler!
+class myChoi : public choiceHandler {
+    uint8_t manageChoice(dms_state* state, dms_args choices) const override {
+        uint8_t count = choices.args.size();
+        uint8_t pos;
+        std::string prompt = choices.args[0]->s->getValue();
+        for (size_t i = 1; i < count; i++)
+            std::cout << i << ": " << choices.args[i]->s->getValue() << std::endl;
+        std::cout << prompt;
+        std::cin >> pos;
+        return pos;
+    }
+};
 int main()
 {
     LineParser parser = LineParser("test.dms");
     dms_state* state = parser.Parse();
-    state->dump();
+    try {
+        //state->setChoiceHandler(new myChoi);
+    }
+    catch (std::exception& e) {
+        std::cout << e.what() << '\n';
+        return -1;
+    }
+    state->dump();
+    state->run();
 }

DMS/DMS.vcxproj

@@ -142,6 +142,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="Handlers.cpp" />
     <ClCompile Include="chunk.cpp" />
     <ClCompile Include="cmd.cpp" />
     <ClCompile Include="codes.cpp" />
@@ -159,6 +160,7 @@
     <ClCompile Include="value.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="Handlers.h" />
     <ClInclude Include="chunk.h" />
     <ClInclude Include="cmd.h" />
     <ClInclude Include="codes.h" />

DMS/DMS.vcxproj.filters

@@ -66,6 +66,9 @@
     <ClCompile Include="dms_state_interpret.cpp">
       <Filter>Source Files\DMS</Filter>
     </ClCompile>
+    <ClCompile Include="Handlers.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="value.h">
@@ -107,5 +110,8 @@
     <ClInclude Include="token.h">
       <Filter>Header Files\DMS</Filter>
     </ClInclude>
+    <ClInclude Include="Handlers.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

DMS/Handlers.cpp

@@ -0,0 +1,13 @@
+#include "Handlers.h"
+namespace dms {
+	uint8_t choiceHandler::manageChoice(dms_state* state, dms_args choices) const {
+		uint8_t count = choices.args.size();
+		std::string pos;
+		std::string prompt = choices.args[0]->s->getValue();
+		for (size_t i = 1; i < count; i++)
+			std::cout << i << ": " << choices.args[i]->s->getValue() << std::endl;
+		std::cout << prompt << " ";
+		std::cin >> pos;
+		return std::stoi(pos)-1;
+	}
+}

DMS/Handlers.h

@@ -0,0 +1,10 @@
+#pragma once
+#include "value.h"
+#include "utils.h"
+#include <iostream>
+namespace dms {
+	struct choiceHandler
+	{
+		virtual uint8_t manageChoice(dms_state* state, dms_args choices) const;
+	};
+}

DMS/LineParserMatchProcess.cpp

@@ -246,7 +246,6 @@ namespace dms {
 			c->opcode = codes::ASGN;
 			c->args.push(var);
 			value* ref = buildVariable();
-			print(stream->peek());
 			if (match_process_standard(stream,ref)) {
 				c->args.push(ref);
 				current_chunk->addCmd(c);

DMS/LineParserParse.cpp

@@ -331,7 +331,15 @@ namespace dms {
 		token current = stream->next();
 		createBlock("$INIT", blocktype::bt_block);
 		cmd* flagcmd = new cmd;
+		size_t current_line = 0;
 		while (stream->peek().type != tokens::eof) {
+			if (stream->peek().line_num != current_line) {
+				current_line = stream->peek().line_num;
+				cmd* ln = new cmd;
+				ln->opcode = codes::LINE;
+				ln->args.push(buildValue((int)current_line+1));
+				current_chunk->addCmd(ln);
+			}
 			if (current.type == tokens::flag) {
 				temp = stream->next(tokens::newline);
 				stream->prev(); // Unconsume the newline piece

DMS/LineParserUtils.cpp

@@ -228,7 +228,7 @@ namespace dms {
 				else if (bk_name == "$END") {
 					cmd* c = new cmd;
 					c->opcode = codes::JUMP;
-					c->args.push(buildVariable("$END"));
+					c->args.push(buildValue("$END"));
 					current_chunk->addCmd(c);
 					state->push_chunk(current_chunk->name, current_chunk);
 					current_chunk = state->chunks["$END"];
@@ -245,16 +245,16 @@ namespace dms {
 		if (state->isEnabled("leaking") && (current_chunk != nullptr && current_chunk->name != "$INIT")) {
 			cmd* c = new cmd;
 			c->opcode = codes::JUMP;
-			c->args.push(buildVariable(bk_name));
+			c->args.push(buildValue(bk_name));
 			current_chunk->addCmd(c);
 		}
 		if (current_chunk!= nullptr && current_chunk->name == "$INIT") {
 			cmd* c = new cmd;
 			c->opcode = codes::JUMP;
 			if(state->entry!="$undefined")
-				c->args.push(buildVariable(state->entry));
+				c->args.push(buildValue(state->entry));
 			else
-				c->args.push(buildVariable(bk_name));
+				c->args.push(buildValue(bk_name));
 			current_chunk->addCmd(c);
 		}
 		if (current_chunk != nullptr && current_chunk->name == "$END") {
@@ -263,7 +263,7 @@ namespace dms {
 			if (state->entry != "$undefined")
 				c->args.push(buildValue(0));
 			else
-				c->args.push(buildVariable(bk_name));
+				c->args.push(buildValue(bk_name));
 			current_chunk->addCmd(c);
 		}
 		current_chunk = new chunk;

DMS/codes.cpp

@@ -43,5 +43,6 @@ const std::string dms::codes::list[] = {
 	"DIV",
 	"POW",
 	"MOD",
-	"LIST"
+	"LIST",
+	"LINE"
 };

DMS/codes.h

@@ -46,6 +46,7 @@ namespace dms::codes {
 		POW,
 		MOD,
 		LIST,
+		LINE
 	};
 	extern const std::string list[];
 	static bool isControl(const op code) {

DMS/dms_exceptions.h

@@ -1,10 +1,15 @@
 #pragma once
 #include <exception>
 namespace dms::exceptions {
-	struct StringBoundsExeception : public std::exception {
+	struct StringBoundsException : public std::exception {
 		const char* what() const throw () {
 			return "Attempt to sub outside of the bounds of the string!";
 		}
 	};
+	struct BadChoiceHandlerException : public std::exception {
+		const char* what() const throw () {
+			return "ChoiceHandler Expected got ???";
+		}
+	};
 }
 

DMS/dms_state.cpp

@@ -1,4 +1,5 @@
 #include "dms_state.h"
+#include "Handlers.h"
 namespace dms {
 	dms_state::dms_state() {
 		// We should define the defaults for the enables
@@ -15,6 +16,7 @@ namespace dms {
 		cc->args.push(buildValue(0));
 		c->addCmd(cc);
 		push_chunk("$END", c);
+		setChoiceHandler(new choiceHandler); // Use the default implementation
 	}
 	void dms_state::enable(std::string flag) {
 		enables[flag] = true;

DMS/dms_state.h

@@ -1,18 +1,26 @@
 #pragma once
 #include "errors.h"
 #include "chunk.h"
+#include "dms_exceptions.h"
 #include <fstream>
 #include <string>
 #include <iostream>
 #include <map>
 #include <unordered_map>
+// Threading Stuff
+#include <thread>
+#include <mutex>
+#include <chrono>
 namespace dms {
 	struct dms_state
 	{
+		void* choi = nullptr;
 		std::unordered_map<std::string, value*> memory;
 		std::map<std::string, chunk*> chunks;
 		std::string entry = "$undefined";
 		std::map<std::string, bool> enables;
+		const double Iversion = 1.0;
+		double Cversion; // The version of
 		errors::error err;
 		bool stop = false;
 
@@ -22,10 +30,16 @@ namespace dms {
 		void push_error(errors::error err);
 		void push_warning(errors::error err);
 		void push_chunk(std::string s, chunk* c);
-		bool run(std::string instance = "Main");
+		bool run(std::string instance);
 		double version=1.0;
 		void enable(std::string flag);
 		void disable(std::string flag);
 		bool isEnabled(std::string flag);
+		void setChoiceHandler(void* choi);
+		bool run();
+	private:
+		// From what I gathered
+		//std::mutex memory_mutex;
+		void init(chunk* chunk, size_t &pos,size_t &max, std::vector<cmd*>& cmds);
 	};
 }

DMS/dms_state_interpret.cpp

@@ -1,18 +1,110 @@
 #include "dms_state.h"
+#include "utils.h"
+#include "Handlers.h"
+using namespace dms::utils;
+using namespace dms::exceptions;
+using namespace dms::codes;
 namespace dms {
+	// This is a pointer to a choicehandler! dms_state and utils have codepedencies, so I have to do this.
+	void dms_state::setChoiceHandler(void* choi) {
+		this->choi = choi;
+	}
+	void dms_state::init(chunk* chunk, size_t& pos, size_t& max, std::vector<cmd*>& cmds) {
+		pos = 0;
+		max = chunk->cmds.size();
+		cmds = chunk->cmds;
+	}
 	// Instance, multiple instances can allow different code to work side by side
 	bool dms_state::run(std::string instance) {
 		codes::op code;
+		//Spawn thread and run
+		return true;
+	}
+	bool dms_state::run() {
+		codes::op code;
+		cmd* c = nullptr;
+		bool halt = false;
+		size_t pos=0;
+		size_t max = 0;
+		std::vector<cmd*> cmds;
+		if (chunks[entry] == NULL) {
+			push_error(errors::error{errors::non_existing_block ,utils::concat("Attempted to Jump to a non existing block <",entry,">")});
+			return false;
+		}
+		init(chunks["$INIT"],pos,max,cmds);
+
 		//TODO: parse the cmds and do stuff
-
+		// If this is running in a thread then stop will force this loop to stop
-		/*switch (code)
+		size_t ln = 0;
+		while (!stop || !halt) {
+			c = cmds[pos++];
+			code = c->opcode;
+			utils::print("> ",*c);
+			//utils::wait();
+			switch (code)
 			{
-		case codes::NOOP:
+				// Handle flags here
-
+				case ENTR:
+					// When reading code from a file the flags are compiled and we need to load them
+					entry = c->args.args[0]->s->getValue();
+					break;
+				case ENAB:
+					enable(c->args.args[0]->s->getValue());
+					break;
+				case DISA:
+					disable(c->args.args[0]->s->getValue());
+					break;
+				case LOAD:
+					// Nothing needs to be done here
+					break;
+				case VERN:
+					Cversion = c->args.args[0]->n->getValue();
+					break;
+				case USIN:
+					// How we add modules into the code. This is the code that actually loads that data!
+					break;
+				// Flags handled
+				case LINE:
+					ln = c->args.args[0]->n->getValue();
+					break;
+				case NOOP:
+					break;
+				case CHOI:
+					if (utils::valueassertall(c->args, memory, datatypes::string)) {
+						//Because we are using void* we must cast our pointers
+						//The implementation of this however should mean that you only ever have to deal with one "ChoiceHandler. One annoying void*"
+						pos += 2*(*(choiceHandler*)choi).manageChoice(this, c->args);
+					}
+					break;
+				case JUMP:
+					value* v1;
+					// Value assert resolves the data so a variable must eventually equal a string
+					if (utils::valueassert(c->args, memory, datatypes::string)) {
+						std::string block = c->args.args[0]->resolve(memory)->s->getValue();
+						if (chunks[block] == NULL) {
+							push_error(errors::error{ errors::non_existing_block ,utils::concat("Attempted to Jump to a non existing block <",block,">") });
+							return false;
+						}
+						else {
+							init(chunks[block], pos, max, cmds);
+						}
+					}
+					else {
+						datatypes set = c->args.args[0]->resolve(memory)->type;
+						push_error(errors::error{ errors::invalid_arguments, utils::concat("String expected got ",set), true,ln });
+						return false;
+					}
 					break;
 				default:
 				break;
-		}*/
+			}
+			if (pos == max) {
+				// How did we get here? The end of a block?
+				break;
+			}
+		}
+	END:
+
 		return true;
 	}
 }

DMS/dump.txt

@@ -2,7 +2,7 @@ Token Dump:
 Line <1> newline 		 
 Line <1> newline 		 
 Line <1> flag 		 
-Line <1> name 		 test
+Line <1> name 		 main
 Line <1> newline 		 
 Line <2> flag 		 
 Line <2> name 		 warnings
@@ -12,9 +12,6 @@ Line <3> flag
 Line <3> name 		 omniscient
 Line <3> newline 		 
 Line <3> newline 		 
-Line <4> flag 		 
-Line <4> name 		 leaking
-Line <4> newline 		 
 Line <4> newline 		 
 Line <5> flag 		 
 Line <5> name 		 debugging
@@ -91,34 +88,34 @@ Line <24> string 		 What do you want to do?
 Line <24> cbracketo 		 {
 Line <24> newline 		 
 Line <24> newline 		 
-Line <25> string 		 option 0
+Line <25> string 		 option 1
 Line <25> name 		 test2
 Line <25> parao 		 (
 Line <25> string 		 testing
 Line <25> parac 		 )
 Line <25> newline 		 
 Line <25> newline 		 
-Line <26> string 		 option 1
+Line <26> string 		 option 2
 Line <26> jump 		 
-Line <26> string 		 here
+Line <26> string 		 test
 Line <26> newline 		 
 Line <26> newline 		 
-Line <27> string 		 option 2
+Line <27> string 		 option 3
 Line <27> jump 		 
 Line <27> name 		 there
 Line <27> newline 		 
 Line <27> newline 		 
-Line <28> string 		 option 3
+Line <28> string 		 option 4
 Line <28> gotoo 		 
 Line <28> string 		 o3
 Line <28> newline 		 
 Line <28> newline 		 
-Line <29> string 		 option 4
+Line <29> string 		 option 5
 Line <29> gotoo 		 
 Line <29> name 		 here
 Line <29> newline 		 
 Line <29> newline 		 
-Line <30> string 		 option 5
+Line <30> string 		 option 6
 Line <30> name 		 test
 Line <30> parao 		 (
 Line <30> string 		 here
@@ -131,49 +128,64 @@ Line <31> newline
 Line <32> newline 		 
 Line <32> newline 		 
 Line <33> bracketo 		 [
-Line <33> name 		 Bob
+Line <33> name 		 test
-Line <33> colon 		 :
-Line <33> name 		 char
 Line <33> bracketc 		 ]
 Line <33> newline 		 
 Line <33> newline 		 
-Line <34> name 		 age
+Line <34> name 		 Ryan
-Line <34> equal 		 =
+Line <34> colon 		 :
-Line <34> number 		 .24
+Line <34> string 		 We are here now!
 Line <34> newline 		 
 Line <34> newline 		 
-Line <35> name 		 money
+Line <35> string 		 hehe
-Line <35> equal 		 =
-Line <35> number 		 100
 Line <35> newline 		 
 Line <35> newline 		 
-Line <36> name 		 excited
-Line <36> colon 		 :
-Line <36> string 		 path/to/file
-Line <36> name 		 function
 Line <36> newline 		 
 Line <36> newline 		 
+Line <37> bracketo 		 [
+Line <37> name 		 Bob
+Line <37> colon 		 :
+Line <37> name 		 char
+Line <37> bracketc 		 ]
 Line <37> newline 		 
 Line <37> newline 		 
-Line <38> bracketo 		 [
+Line <38> name 		 age
-Line <38> name 		 newblock
+Line <38> equal 		 =
-Line <38> colon 		 :
+Line <38> number 		 .24
-Line <38> name 		 function
-Line <38> parao 		 (
-Line <38> parac 		 )
-Line <38> bracketc 		 ]
 Line <38> newline 		 
 Line <38> newline 		 
-Line <39> string 		 Test #2
+Line <39> name 		 money
+Line <39> equal 		 =
+Line <39> number 		 100
 Line <39> newline 		 
 Line <39> newline 		 
-Line <40> string 		 Does it parse this part properly?
+Line <40> name 		 excited
+Line <40> colon 		 :
+Line <40> string 		 path/to/file
+Line <40> name 		 function
 Line <40> newline 		 
 Line <40> newline 		 
-Line <41> string 		 huh
 Line <41> newline 		 
 Line <41> newline 		 
-Line <41> eof 		 
+Line <42> bracketo 		 [
+Line <42> name 		 newblock
+Line <42> colon 		 :
+Line <42> name 		 function
+Line <42> parao 		 (
+Line <42> parac 		 )
+Line <42> bracketc 		 ]
+Line <42> newline 		 
+Line <42> newline 		 
+Line <43> string 		 Test #2
+Line <43> newline 		 
+Line <43> newline 		 
+Line <44> string 		 Does it parse this part properly?
+Line <44> newline 		 
+Line <44> newline 		 
+Line <45> string 		 huh
+Line <45> newline 		 
+Line <45> newline 		 
+Line <45> eof 		 
 Line <1> newline 		 
 Line <1> newline 		 
 Line <1> bracketo 		 [

DMS/errors.h

@@ -12,7 +12,8 @@ namespace dms::errors {
 		block_already_defined,
 		choice_unknown,
 		nested_function,
-		disp_unknown
+		disp_unknown,
+		non_existing_block
 	};
 	struct error {
 		errortype code=unknown;

DMS/test.dms

@@ -1,7 +1,7 @@
-entry test // Will either start the first block seen or the block supplied by you!
+entry main // Will either start the first block seen or the block supplied by you!
 enable warnings
 disable omniscient
-enable leaking
+//enable leaking
 enable debugging
 loadfile "loadtest.dms"
 version 1.2
@@ -22,14 +22,18 @@ using extendedDefine
 	Bob: "Testing..."
 	
 	choice "What do you want to do?" {
-		"option 0" test2("testing")
+		"option 1" test2("testing")
-		"option 1" jump "here"
+		"option 2" jump "test"
-		"option 2" jump there
+		"option 3" jump there
-		"option 3" goto "o3"
+		"option 4" goto "o3"
-		"option 4" goto here
+		"option 5" goto here
-		"option 5" test("here")
+		"option 6" test("here")
 	}
 
+[test]
+	Ryan: "We are here now!"
+	"hehe"
+
 [Bob:char]
 	age = .24
 	money = 100

DMS/utils.cpp

@@ -36,6 +36,35 @@ namespace dms::utils {
 		std::generate_n(str.begin(), length, randchar);
 		return str;
 	}
+	bool valueassert(dms_args args, std::unordered_map<std::string, value*> memory, datatypes t1, datatypes t2, datatypes t3, datatypes t4, datatypes t5, datatypes t6, datatypes t7, datatypes t8, datatypes t9, datatypes t10, datatypes t11, datatypes t12) {
+		size_t size = args.args.size();
+		datatypes types[12] = { t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12 };
+		if (size >= 4)
+			for (size_t i = 0; i < 4; i++) {
+				if (args.args[i]->resolve(memory)->type != types[i])
+					return false;
+			}
+		else
+			for (size_t i = 0; i < size; i++) {
+				if (args.args[i]->resolve(memory)->type != types[i])
+					return false;
+			}
+		return true;
+	}
+	bool valueassertall(dms_args args, std::unordered_map<std::string, value*> memory, datatypes t1) {
+		size_t size = args.args.size();
+		if (size >= 4)
+			for (size_t i = 0; i < 4; i++) {
+				if (args.args[i]->resolve(memory)->type != t1)
+					return false;
+			}
+		else
+			for (size_t i = 0; i < size; i++) {
+				if (args.args[i]->resolve(memory)->type != t1)
+					return false;
+			}
+		return true;
+	}
 	bool typeassert(dms_args args, datatypes t1, datatypes t2, datatypes t3, datatypes t4, datatypes t5, datatypes t6, datatypes t7, datatypes t8, datatypes t9, datatypes t10, datatypes t11, datatypes t12) {
 		size_t size = args.args.size();
 		datatypes types[12] = { t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12 };

DMS/utils.h

@@ -5,6 +5,7 @@
 #include <string>
 #include <algorithm>
 #include "value.h"
+#include <unordered_map>
 #include "dms_state.h"
 namespace dms::utils {
 	template<class... Args>
@@ -20,6 +21,8 @@ namespace dms::utils {
 	std::string random_string(size_t length);
 	bool typeassert(dms_args args, datatypes t1=nil, datatypes t2 = nil, datatypes t3 = nil, datatypes t4 = nil, datatypes t5 = nil, datatypes t6 = nil, datatypes t7 = nil, datatypes t8 = nil, datatypes t9 = nil, datatypes t10 = nil, datatypes t11 = nil, datatypes t12 = nil); //Type asserting is mostly an internal thing for build in methods. It's not needed for dms code!
 	bool typeassert(dms_state* state, dms_args args, datatypes t1 = nil, datatypes t2 = nil, datatypes t3 = nil, datatypes t4 = nil, datatypes t5 = nil, datatypes t6 = nil, datatypes t7 = nil, datatypes t8 = nil, datatypes t9 = nil, datatypes t10 = nil, datatypes t11 = nil, datatypes t12 = nil);
+	bool valueassert(dms_args args, std::unordered_map<std::string, value*> memory, datatypes t1 = nil, datatypes t2 = nil, datatypes t3 = nil, datatypes t4 = nil, datatypes t5 = nil, datatypes t6 = nil, datatypes t7 = nil, datatypes t8 = nil, datatypes t9 = nil, datatypes t10 = nil, datatypes t11 = nil, datatypes t12 = nil);
+	bool valueassertall(dms_args args, std::unordered_map<std::string, value*> memory, datatypes t1);
 	std::string resolveTypes(datatypes t1 = nil, datatypes t2 = nil, datatypes t3 = nil, datatypes t4 = nil, datatypes t5 = nil, datatypes t6 = nil, datatypes t7 = nil, datatypes t8 = nil, datatypes t9 = nil, datatypes t10 = nil, datatypes t11 = nil, datatypes t12 = nil);
 	bool isalphanum(std::string str);
 	bool isalpha(std::string str);

DMS/value.cpp

@@ -2,6 +2,7 @@
 #include "utils.h"
 #include "string"
 namespace dms {
+	const std::string datatype[] = { "nil", "number", "boolean", "env", "string", "custom", "variable", "block" };
 	std::vector<value*> _VALUES;
 	value::value() {
 		_VALUES.push_back(this); // Used for the interperter! In the end everything is a value

DMS/value.h

@@ -7,6 +7,9 @@
 
 namespace dms {
 	struct dms_env;
+	struct value;
+	struct dms_args;
+	extern const std::string datatype[];
 	enum datatypes { nil, number, boolean, env, string, custom, variable, block };
 	struct dms_number {
 		double val;
@@ -35,8 +38,20 @@ namespace dms {
 			return out;
 		};
 	};
+	// Custom data that you can work with by overriding this code
 	struct dms_custom {
-
+		virtual value* Index(value* data);
+		virtual bool NewIndex(value* var, value* val);
+		virtual value* Call(dms_args* args);
+		virtual value* ToString();
+		virtual value* ADD(value* left, value* right);
+		virtual value* SUB(value* left, value* right);
+		virtual value* MUL(value* left, value* right);
+		virtual value* DIV(value* left, value* right);
+		virtual value* POW(value* left, value* right);
+		virtual value* EQUAL(value* left, value* right);
+		virtual value* LESS_THAN(value* left, value* right);
+		virtual value* GREATER_THAN(value* left, value* right);
 	};
 	dms_string* buildString(std::string str);
 	dms_boolean* buildBool(bool b);

README.md

@@ -1,2 +1,9 @@
 # DMS
 The Dialogue Management Script's goal is to provide a nice and simple way to have dialogue for games. 
+
+# Todo
+- Implement bytecode for if/else if/else statements
+- Implement bytecode for for/while loops
+- Implement bytecode for concatenation 
+- Interpert all the bytecode
+- Finish implementing custom datatype!