lexer: Fix dates and include dict type.

SFTtech · Oct 12, 2020 · e017655 · e017655
1 parent ec687e0
commit e017655
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/nyan/ast.cpp b/nyan/ast.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016-2019 the nyan authors, LGPLv3+. See copying.md for legal info.
+// Copyright 2016-2020 the nyan authors, LGPLv3+. See copying.md for legal info.
 
 #include "ast.h"
 
@@ -129,7 +129,7 @@ ASTArgument::ASTArgument(TokenStream &tokens) {
 		throw ASTError("expected argument keyword, encountered", *token);
 	}
 
-	while (token->type != token_type::ENDLINE) {
+	while (not token->is_endmarker()) {
 		if (token->is_content()) {
 			this->params.emplace_back(*token, tokens);
 			token = tokens.next();
@@ -566,6 +566,7 @@ ASTMemberValue::ASTMemberValue(container_t type,
 	switch (this->container_type) {
 	case container_t::SET:
 	case container_t::ORDEREDSET:
+	case container_t::DICT:
 		end_token = token_type::RBRACE; break;
 
 	default:
@@ -731,6 +732,7 @@ void ASTMemberValue::strb(std::ostringstream &builder, int /*indentlevel*/) cons
 		return;
 
 	case container_t::SET:
+	case container_t::DICT:
 		builder << "{"; break;
 
 	case container_t::ORDEREDSET:
@@ -752,6 +754,7 @@ void ASTMemberValue::strb(std::ostringstream &builder, int /*indentlevel*/) cons
 	switch (this->container_type) {
 	case container_t::SET:
 	case container_t::ORDEREDSET:
+	case container_t::DICT:
 		builder << "}"; break;
 
 	default:

diff --git a/nyan/ast.h b/nyan/ast.h
@@ -1,4 +1,4 @@
-// Copyright 2016-2019 the nyan authors, LGPLv3+. See copying.md for legal info.
+// Copyright 2016-2020 the nyan authors, LGPLv3+. See copying.md for legal info.
 #pragma once
 
 

diff --git a/nyan/basic_type.cpp b/nyan/basic_type.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016-2018 the nyan authors, LGPLv3+. See copying.md for legal info.
+// Copyright 2016-2020 the nyan authors, LGPLv3+. See copying.md for legal info.
 
 #include "basic_type.h"
 
@@ -56,7 +56,8 @@ BasicType BasicType::from_type_token(const IDToken &tok) {
 	// container type name map
 	static const std::unordered_map<std::string, container_t> container_types = {
 		{"set", container_t::SET},
-		{"orderedset", container_t::ORDEREDSET}
+		{"orderedset", container_t::ORDEREDSET},
+		{"dict", container_t::DICT}
 	};
 
 

diff --git a/nyan/value/set.h b/nyan/value/set.h
@@ -1,4 +1,4 @@
-// Copyright 2016-2019 the nyan authors, LGPLv3+. See copying.md for legal info.
+// Copyright 2016-2020 the nyan authors, LGPLv3+. See copying.md for legal info.
 #pragma once
 
 
@@ -11,12 +11,12 @@
 
 namespace nyan {
 
-/** datatype used for ordered set storage */
+/** datatype used for unordered set storage */
 using set_t = std::unordered_set<ValueHolder>;
 
 
 /**
- * Value to store a unordered set of things.
+ * Nyan value to store a unordered set of things.
  */
 class Set
 	: public SetBase<set_t> {