From cf1438eda007ee8ad39fe2028eb7f05f73c6b0ed Mon Sep 17 00:00:00 2001 From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz> Date: Wed, 2 Aug 2017 14:23:44 +0200 Subject: [PATCH] rename ImmediateParam to ImmediateValueParam --- .../params/{ImmediateParam.h => ImmediateValueParam.h} | 10 +++++----- alib2cli/src/parser/Parser.cpp | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) rename alib2cli/src/ast/params/{ImmediateParam.h => ImmediateValueParam.h} (68%) diff --git a/alib2cli/src/ast/params/ImmediateParam.h b/alib2cli/src/ast/params/ImmediateValueParam.h similarity index 68% rename from alib2cli/src/ast/params/ImmediateParam.h rename to alib2cli/src/ast/params/ImmediateValueParam.h index 62058952f4..475fae25cf 100644 --- a/alib2cli/src/ast/params/ImmediateParam.h +++ b/alib2cli/src/ast/params/ImmediateValueParam.h @@ -1,5 +1,5 @@ -#ifndef _IMMEDIATE_PARAM_H_ -#define _IMMEDIATE_PARAM_H_ +#ifndef _IMMEDIATE_VALUE_PARAM_H_ +#define _IMMEDIATE_VALUE_PARAM_H_ #include <ast/Param.h> #include <abstraction/ImmediateValueAbstraction.hpp> @@ -7,11 +7,11 @@ namespace cli { template < class Type > -class ImmediateParam : public Param { +class ImmediateValueParam : public Param { Type m_data; public: - ImmediateParam ( Type value ) : m_data ( value ) { + ImmediateValueParam ( Type value ) : m_data ( value ) { } virtual std::shared_ptr < abstraction::OperationAbstraction > translateAndEval ( const std::shared_ptr < abstraction::OperationAbstraction > &, Environment & ) const override { @@ -22,4 +22,4 @@ public: } /* namespace cli */ -#endif /* _IMMEDIATE_PARAM_H_ */ +#endif /* _IMMEDIATE_VALUE_PARAM_H_ */ diff --git a/alib2cli/src/parser/Parser.cpp b/alib2cli/src/parser/Parser.cpp index 3d38178c31..61b57dbf4e 100644 --- a/alib2cli/src/parser/Parser.cpp +++ b/alib2cli/src/parser/Parser.cpp @@ -12,7 +12,7 @@ #include <ast/params/ImmediateFileParam.h> #include <ast/params/BindedFileParam.h> #include <ast/params/PreviousResultParam.h> -#include <ast/params/ImmediateParam.h> +#include <ast/params/ImmediateValueParam.h> #include <ast/params/BindedValueParam.h> #include <ast/params/BindedVariableParam.h> #include <ast/params/CastParam.h> @@ -52,10 +52,10 @@ std::unique_ptr < Param > Parser::param ( ) { return in_redirect_param ( ); } else if ( check ( cli::Lexer::TokenType::IDENTIFIER ) ) { std::string value = matchIdentifier ( ); - return std::make_unique < ImmediateParam < std::string > > ( value ); + return std::make_unique < ImmediateValueParam < std::string > > ( value ); } else if ( check ( cli::Lexer::TokenType::INTEGER ) ) { int value = matchInteger ( ); - return std::make_unique < ImmediateParam < int > > ( value ); + return std::make_unique < ImmediateValueParam < int > > ( value ); } else if ( check ( cli::Lexer::TokenType::LEFT_PAREN ) ) { match ( cli::Lexer::TokenType::LEFT_PAREN ); std::string type = matchIdentifier ( ); -- GitLab