prepare for user generated tables

meepen · Jul 8, 2021 · db85c3e · db85c3e
1 parent 3a4df93
commit db85c3e
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 18 deletions.
diff --git a/src/parser/expressions.hpp b/src/parser/expressions.hpp
@@ -154,7 +154,8 @@ namespace lorelai {
 				bool accept(visitor &visit, std::shared_ptr<node> &container) override;
 				string tostring() override;
 			public:
-				std::vector<std::pair<std::shared_ptr<node>, std::shared_ptr<node>>> tabledata;
+				std::vector<std::shared_ptr<node>> arraypart;
+				std::vector<std::pair<std::shared_ptr<node>, std::shared_ptr<node>>> hashpart;
 			};
 
 

diff --git a/src/parser/expressions/table.cpp b/src/parser/expressions/table.cpp
@@ -27,7 +27,7 @@ tableexpression::tableexpression(lexer &lex) {
 		do {
 			word = lex.lookahead().value_or("");
 
-			if (word == "[") {
+			if (word == "[") { // TODO: maybe make this a sub-expression?
 				// `[` exp `]` `=` exp
 				// consume `[`
 				lex.read();
@@ -44,7 +44,7 @@ tableexpression::tableexpression(lexer &lex) {
 					lex.wasexpected("<expression>", "table constructor");
 				}
 
-				tabledata.push_back(std::make_pair(key, value));
+				hashpart.push_back(std::make_pair(key, value));
 				children.push_back(key);
 				children.push_back(value);
 			}
@@ -72,7 +72,7 @@ tableexpression::tableexpression(lexer &lex) {
 				}
 
 				children.push_back(value);
-				tabledata.push_back(std::make_pair(key, value));
+				arraypart.push_back(value);
 			}
 		}
 		while (lex.read(",") || lex.read(";"));
@@ -98,7 +98,7 @@ bool tableexpression::accept(visitor &visit, std::shared_ptr<node> &container) {
 			}
 		}
 
-		for (auto &pair : tabledata) {
+		for (auto &pair : hashpart) {
 			auto firstdeleted = std::find(deleted.begin(), deleted.end(), pair.first);
 			auto seconddeleted = std::find(deleted.begin(), deleted.end(), pair.second);
 
@@ -115,10 +115,11 @@ bool tableexpression::accept(visitor &visit, std::shared_ptr<node> &container) {
 		}
 
 		for (auto &key : keys) {
-			tabledata.erase(std::remove(tabledata.begin(), tabledata.end(), key), tabledata.end());
+			hashpart.erase(std::remove(hashpart.begin(), hashpart.end(), key), hashpart.end());
 		}
 
 		for (auto &del : deleted) {
+			arraypart.erase(std::remove(arraypart.begin(), arraypart.end(), del));
 			children.erase(std::remove(children.begin(), children.end(), del), children.end());
 		}
 

diff --git a/src/vm/bytecode/expressions.cpp b/src/vm/bytecode/expressions.cpp
@@ -316,6 +316,7 @@ std::unordered_map<std::type_index, expressiongenerator> bytecode::expressionmap
 	ADD(binopexpression),
 	ADD(unopexpression),
 	// ADD(functioncallexpression),
+	ADD(tableexpression),
 	ADD(indexexpression),
 	ADD(dotexpression),
 	ADD(nameexpression),

diff --git a/src/vm/proto/src/bytecode.proto b/src/vm/proto/src/bytecode.proto
@@ -2,13 +2,6 @@ syntax = "proto3";
 
 package lorelai.bytecode;
 
-message debugdata {
-	uint32 linenumber = 1;
-	uint32 linecolumn = 2;
-	optional string filename = 3;
-	optional string note = 4;
-}
-
 message instruction {
 	enum opcode {
 
@@ -73,13 +66,11 @@ message instruction {
 	optional uint32 a = 2;
 	optional uint32 b = 3;
 	optional uint32 c = 4;
-
-	optional debugdata debug = 5;
 }
 
 message tablevalue {
 	enum valuetype {
-		NIL = 0;
+		CONSTANT = 0;
 		NUMBER = 1;
 		STRING = 2;
 		TABLE = 3;
@@ -89,14 +80,14 @@ message tablevalue {
 	optional uint32 index = 2;
 }
 
-message tablekeyvalue {
+message hashpartvalue {
 	tablevalue key = 1;
 	tablevalue value = 2;
 }
 
 message table {
 	repeated tablevalue arraypart = 1;
-	repeated tablevalue keyvaluepart = 2;
+	repeated hashpartvalue hashpart = 2;
 }
 
 message upvaluereference {

diff --git a/tests/test.lua b/tests/test.lua
@@ -0,0 +1,4 @@
+local t = {}
+t.a = 1
+
+print(t.a)