From c7adce78166fbf551bd526717ddeab4ad38ae7f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Tr=C3=A1vn=C3=AD=C4=8Dek?= <jan.travnicek@fit.cvut.cz>
Date: Tue, 25 Jan 2022 11:05:15 +0100
Subject: [PATCH] cli: remove not needed template params from file statement
---
alib2cli/src/ast/statements/FileStatement.cpp | 2 +-
alib2cli/src/ast/statements/FileStatement.h | 3 +--
alib2cli/src/parser/Parser.cpp | 6 +-----
3 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/alib2cli/src/ast/statements/FileStatement.cpp b/alib2cli/src/ast/statements/FileStatement.cpp
index e74810bde8..8b1b698ba9 100644
--- a/alib2cli/src/ast/statements/FileStatement.cpp
+++ b/alib2cli/src/ast/statements/FileStatement.cpp
@@ -9,7 +9,7 @@
namespace cli {
-FileStatement::FileStatement ( std::unique_ptr < Arg > file, std::unique_ptr < Arg > fileType, std::unique_ptr < TypeOption > type, ext::vector < std::unique_ptr < cli::Arg > > templateParams ) : m_file ( std::move ( file ) ), m_fileType ( std::move ( fileType ) ), m_type ( std::move ( type ) ), m_templateParams ( std::move ( templateParams ) ) { //FIXME remove templateParams from the parser
+FileStatement::FileStatement ( std::unique_ptr < Arg > file, std::unique_ptr < Arg > fileType, std::unique_ptr < TypeOption > type ) : m_file ( std::move ( file ) ), m_fileType ( std::move ( fileType ) ), m_type ( std::move ( type ) ) {
}
std::shared_ptr < abstraction::Value > FileStatement::translateAndEval ( const std::shared_ptr < abstraction::Value > &, Environment & environment ) const {
diff --git a/alib2cli/src/ast/statements/FileStatement.h b/alib2cli/src/ast/statements/FileStatement.h
index 9a2af7b1e0..25f70e54a0 100644
--- a/alib2cli/src/ast/statements/FileStatement.h
+++ b/alib2cli/src/ast/statements/FileStatement.h
@@ -9,10 +9,9 @@ class FileStatement final : public Statement {
std::unique_ptr < cli::Arg > m_file;
std::unique_ptr < Arg > m_fileType;
std::unique_ptr < TypeOption > m_type;
- ext::vector < std::unique_ptr < cli::Arg > > m_templateParams;
public:
- FileStatement ( std::unique_ptr < Arg > file, std::unique_ptr < Arg > fileType, std::unique_ptr < TypeOption > type, ext::vector < std::unique_ptr < cli::Arg > > templateParams );
+ FileStatement ( std::unique_ptr < Arg > file, std::unique_ptr < Arg > fileType, std::unique_ptr < TypeOption > type );
std::shared_ptr < abstraction::Value > translateAndEval ( const std::shared_ptr < abstraction::Value > &, Environment & environment ) const override;
diff --git a/alib2cli/src/parser/Parser.cpp b/alib2cli/src/parser/Parser.cpp
index 38b5219d5e..51a8c205bf 100644
--- a/alib2cli/src/parser/Parser.cpp
+++ b/alib2cli/src/parser/Parser.cpp
@@ -158,11 +158,7 @@ std::shared_ptr < Statement > Parser::in_redirect ( ) {
}
std::unique_ptr < TypeOption > type = optional_type_option ( );
- ext::vector < std::unique_ptr < cli::Arg > > templateArgs;
- while ( check ( cli::Lexer::TokenType::AT_SIGN ) )
- templateArgs.emplace_back ( template_arg ( ) );
-
- return std::make_shared < FileStatement > ( file ( ), std::move ( fileType ), std::move ( type ), std::move ( templateArgs ) );
+ return std::make_shared < FileStatement > ( file ( ), std::move ( fileType ), std::move ( type ) );
}
}
--
GitLab