Group Fixes

Author: TheRealMichaelWang

src/Source.cpp

@@ -50,12 +50,12 @@ int main(int argc, char** argv) {
 	interpreter.new_constant("E", new value(VALUE_TYPE_NUMERICAL, new long double(2.71828182)));
 
 	interpreter.import_func("quit", quit_repl);
-	interpreter.import_func("sin", sine);
-	interpreter.import_func("cos", cosine);
-	interpreter.import_func("tan", tangent);
-	interpreter.import_func("asin", inverse_sine);
-	interpreter.import_func("acos", inverse_cosine);
-	interpreter.import_func("atan", inverse_tan);
+	interpreter.import_func("sin@math", sine);
+	interpreter.import_func("cos@math", cosine);
+	interpreter.import_func("tan@math", tangent);
+	interpreter.import_func("asin@math", inverse_sine);
+	interpreter.import_func("acos@math", inverse_cosine);
+	interpreter.import_func("atan@math", inverse_tan);
 
 	if (argc > 1) {
 		std::ifstream infile(argv[1], std::ifstream::binary);

src/lexer.cpp

@@ -55,14 +55,15 @@ inline function_call_token* print_encapsulate(token* token) {
 	return new function_call_token(new identifier_token("print"), args);
 }
 
-lexer::lexer(const char* source, unsigned long source_length, std::map<unsigned long, value*>* constants) {
+lexer::lexer(const char* source, unsigned long source_length, std::map<unsigned long, value*>* constants, std::set<unsigned long>* group_excluded_ids) {
 	this->source = source;
 	this->source_length = source_length;
 	this->position = 0;
 	this->last_char = 0;
 	this->last_tok = nullptr;
 
 	this->constants = constants;
+	this->group_excluded_ids = group_excluded_ids;
 
 	read_char();
 	read_token();
@@ -324,7 +325,6 @@ token* lexer::tokenize_statement(bool interactive_mode) {
 		identifier_token* id = (identifier_token*)last_tok;
 		id->no_delete();
 		group_stack.push_back((char*)id->get_identifier());
-		group_defined_ids.push_back(std::set<unsigned long>());
 		delete id;
 		read_token();
 		return nullptr;
@@ -335,7 +335,11 @@ token* lexer::tokenize_statement(bool interactive_mode) {
 		}
 		delete[] group_stack.back();
 		group_stack.pop_back();
-		group_defined_ids.pop_back();
+		for (auto i = to_exclude.begin(); i != to_exclude.end(); ++i)
+		{
+			group_excluded_ids->insert(*i);
+		}
+		to_exclude.clear();
 		read_token();
 		return nullptr; 
 	case TOKEN_CONST_KW: {
@@ -535,11 +539,18 @@ variable_access_token* lexer::tokenize_var_access(identifier_token* identifier)
 }
 
 identifier_token* lexer::apply_groups(identifier_token* id, bool creating) {
-	if (group_stack.empty() || (!creating && !group_defined_ids.back().count(id->id_hash)))
+	if (group_stack.empty()) {
+		if (creating) {
+			group_excluded_ids->insert(id->id_hash);
+		}
+		return id;
+	}
+	else if(group_excluded_ids->count(id->id_hash)) {
 		return id;
+	}
+
 	char* base_id = (char*)id->get_identifier();
 	id->no_delete();
-	group_defined_ids.back().insert(id->id_hash);
 	delete id;
 
 	std::list<char> chars;
@@ -559,7 +570,12 @@ identifier_token* lexer::apply_groups(identifier_token* id, bool creating) {
 		id_buf[i++] = (*it);
 	id_buf[i] = 0;
 
-	return new identifier_token(id_buf, insecure_hash(id_buf));
+	identifier_token* new_id = new identifier_token(id_buf, insecure_hash(id_buf));
+
+	if (creating)
+		to_exclude.push_back(new_id->id_hash);
+
+	return new_id;
 }
 
 token* lexer::tokenize_value() {

src/lexer.h

@@ -7,11 +7,12 @@
 #include <set>
 #include <map>
 
+#include "builtins.h"
 #include "tokens.h"
 
 class lexer {
 public:
-	lexer(const char* source, unsigned long source_length, std::map<unsigned long, value*>* constants);
+	lexer(const char* source, unsigned long source_length, std::map<unsigned long, value*>* constants, std::set<unsigned long>* group_excluded_ids);
 	~lexer();
 
 	inline bool eos() {
@@ -32,7 +33,8 @@ class lexer {
 
 	std::map<unsigned long, value*>* constants;
 	std::list<char*> group_stack;
-	std::list<std::set<unsigned long>> group_defined_ids;
+	std::set<unsigned long>* group_excluded_ids;
+	std::list<unsigned long> to_exclude;
 
 	//reads the next availible character.
 	char read_char();

src/runtime.cpp

@@ -64,7 +64,7 @@ long double interpreter::run(const char* source, bool interactive_mode) {
 	lexer* lexer = nullptr;
 	std::list<token*> to_execute;
 	try {
-		lexer = new class lexer(source, std::strlen(source), &constants);
+		lexer = new class lexer(source, std::strlen(source), &constants, &group_excluded_ids);
 		to_execute = lexer->tokenize(interactive_mode);
 		delete lexer;
 	}
@@ -145,6 +145,7 @@ void interpreter::import_func(const char* identifier, built_in_function function
 	if (built_in_functions.count(id_hash))
 		throw ERROR_FUNCTION_PROTO_ALREADY_DEFINED;
 	built_in_functions[id_hash] = function;
+	group_excluded_ids.insert(id_hash);
 }
 
 void interpreter::set_ref(variable_access_token* access, reference_apartment* reference) {

src/runtime.h

@@ -108,6 +108,8 @@ class interpreter {
 	std::set<unsigned long> included_files;
 	std::map<unsigned long, value*> constants;
 
+	std::set<unsigned long> group_excluded_ids;
+
 	bool break_mode;
 
 	void set_ref(variable_access_token* access, reference_apartment* reference);