lexer: Add '!' (bang) as symbol.

SFTtech · Oct 5, 2020 · ef6cf3b · ef6cf3b
1 parent 2d6fba8
commit ef6cf3b
Show file tree

Hide file tree

Showing 6 changed files with 68 additions and 3 deletions.
diff --git a/nyan/ast.cpp b/nyan/ast.cpp
@@ -74,7 +74,10 @@ const std::vector<ASTImport> &AST::get_imports() const {
 AST::AST(TokenStream &tokens) {
 	while (tokens.full()) {
 		auto token = tokens.next();
-		if (token->type == token_type::IMPORT) {
+		if (token->type == token_type::BANG) {
+			this->args.emplace_back(tokens);
+		}
+		else if (token->type == token_type::IMPORT) {
 			this->imports.emplace_back(tokens);
 		}
 		else if (token->type == token_type::ID) {
@@ -96,6 +99,33 @@ AST::AST(TokenStream &tokens) {
 }
 
 
+ASTArgument::ASTArgument(TokenStream &tokens) {
+	auto token = tokens.next();
+
+	if (token->type == token_type::ID) {
+		this->arg = IDToken{*token, tokens};
+		token = tokens.next();
+	} else {
+		throw ASTError("expected parameter keyword, encountered", *token);
+	}
+
+	while (token->type != token_type::ENDLINE) {
+		this->params.emplace_back(*token, tokens);
+		token = tokens.next();
+	}
+}
+
+
+const IDToken &ASTArgument::get_arg() const {
+	return this->arg;
+}
+
+
+const std::vector<IDToken> &ASTArgument::get_params() const {
+	return this->params;
+}
+
+
 ASTImport::ASTImport(TokenStream &tokens) {
 	auto token = tokens.next();
 
@@ -560,6 +590,12 @@ void AST::strb(std::ostringstream &builder, int indentlevel) const {
 	}
 }
 
+void ASTArgument::strb(std::ostringstream &builder, int /*indentlevel*/) const {
+	builder << "!" << this->arg.str();
+	for (auto &param : this->params) {
+		builder << " " << param.str();
+	}
+}
 
 void ASTImport::strb(std::ostringstream &builder, int /*indentlevel*/) const {
 	builder << "import " << this->namespace_name.str();

diff --git a/nyan/ast.h b/nyan/ast.h
@@ -116,6 +116,27 @@ class ASTMember : public ASTBase {
 };
 
 
+/**
+ * The abstract syntax tree representation of an argument.
+ */
+class ASTArgument : public ASTBase {
+public:
+	ASTArgument(TokenStream &tokens);
+
+	void strb(std::ostringstream &builder, int indentlevel=0) const override;
+
+	/** return the payload */
+	const IDToken &get_arg() const;
+
+	/** return the payload */
+	const std::vector<IDToken> &get_params() const;
+
+protected:
+	IDToken arg;
+	std::vector<IDToken> params;
+};
+
+
 /**
  * An import in a nyan file is represented by this AST entry.
  * Used for the `import ... (as ...)` statement.
@@ -142,7 +163,7 @@ class ASTImport : public ASTBase {
 
 
 /**
- * Inheritance chang
+ * Inheritance change
  */
 class ASTInheritanceChange : public ASTBase {
 	friend class Database;
@@ -200,6 +221,7 @@ class AST : public ASTBase {
 	const std::vector<ASTImport> &get_imports() const;
 
 protected:
+	std::vector<ASTArgument> args;
 	std::vector<ASTImport> imports;
 	std::vector<ASTObject> objects;
 };

diff --git a/nyan/basic_type.h b/nyan/basic_type.h
@@ -22,7 +22,7 @@ enum class primitive_t {
 	INT,
 	FLOAT,
 	CONTAINER,
-	OBJECT
+	OBJECT,
 };
 
 
@@ -34,6 +34,7 @@ enum class container_t {
 	SINGLE,
 	SET,
 	ORDEREDSET,
+	DICT,
 };
 
 
@@ -122,6 +123,7 @@ constexpr const char *container_type_to_string(container_t type) {
 	case container_t::SINGLE:        return "single_value";
 	case container_t::SET:           return "set";
 	case container_t::ORDEREDSET:    return "orderedset";
+	case container_t::DICT:          return "dict";
 	}
 
 	return "unhandled container_t";

diff --git a/nyan/lexer/flex.lpp b/nyan/lexer/flex.lpp
@@ -65,6 +65,7 @@ float          -?({digit}+\.{digit}*|{digit}*\.{digit}+)
 "{"                     { impl->token(nyan::token_type::LBRACE); }
 "}"                     { impl->token(nyan::token_type::RBRACE); }
 "@"                     { impl->token(nyan::token_type::AT); }
+"!"                     { impl->token(nyan::token_type::BANG); }
 
 "pass"                  { impl->token(nyan::token_type::PASS); }
 "..."                   { impl->token(nyan::token_type::ELLIPSIS); }

diff --git a/nyan/token.h b/nyan/token.h
@@ -17,6 +17,7 @@ class File;
 enum class token_type {
 	AS,
 	AT,
+	BANG,
 	COLON,
 	COMMA,
 	DEDENT,
@@ -65,6 +66,7 @@ constexpr const char *token_type_str(token_type type) {
 	switch (type) {
 	case token_type::AS:             return "as";
 	case token_type::AT:             return "@";
+	case token_type::BANG:           return "!";
 	case token_type::COLON:          return "colon";
 	case token_type::COMMA:          return "comma";
 	case token_type::DEDENT:         return "dedentation";

diff --git a/test/test.nyan b/test/test.nyan
@@ -1,4 +1,6 @@
 # test nyan file
+!version 1
+!arg 1 2 3 "Test"
 
 Dummy():
     ...