mirror of
https://github.com/fish-shell/fish-shell
synced 2024-11-14 17:07:44 +00:00
[muparser] Remove muParserStack.h
This was a silly data structure that didn't carry its weight. Replace it with a wrapper around std::vector that doesn't explicitly throw exceptions. It's unclear if muparser relied on the exception throwing behavior of ParserStack, and it seems there's no way to find out except removing it and seeing what breaks. The tests pass for what that's worth!
This commit is contained in:
ridiculousfish
parent
e2b798cda3
commit
cad9bbd2a2
5 changed files with 21 additions and 112 deletions
2
muparser-2.2.5/Makefile.in
vendored
2
muparser-2.2.5/Makefile.in
vendored
|
|
@ -64,7 +64,6 @@ MUPARSER_LIB_HEADERS = \
|
|||
include/muParserError.h \
|
||||
include/muParserFixes.h \
|
||||
include/muParserInt.h \
|
||||
include/muParserStack.h \
|
||||
include/muParserTemplateMagic.h \
|
||||
include/muParserTest.h \
|
||||
include/muParserToken.h \
|
||||
|
|
@ -91,7 +90,6 @@ MUPARSER_DLL_HEADERS = \
|
|||
include/muParserError.h \
|
||||
include/muParserFixes.h \
|
||||
include/muParserInt.h \
|
||||
include/muParserStack.h \
|
||||
include/muParserTemplateMagic.h \
|
||||
include/muParserTest.h \
|
||||
include/muParserToken.h \
|
||||
|
|
|
|||
|
|
@ -38,7 +38,6 @@
|
|||
#include "muParserBytecode.h"
|
||||
#include "muParserDef.h"
|
||||
#include "muParserError.h"
|
||||
#include "muParserStack.h"
|
||||
#include "muParserTokenReader.h"
|
||||
|
||||
namespace mu {
|
||||
|
|
@ -286,6 +285,6 @@ class ParserBase {
|
|||
m_vStackBuffer; ///< This is merely a buffer used for the stack in the cmd parsing routine
|
||||
mutable int m_nFinalResultIdx;
|
||||
};
|
||||
} // namespace mu
|
||||
} // namespace mu
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@
|
|||
#include <map>
|
||||
#include <sstream>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#include "muParserFixes.h"
|
||||
|
||||
|
|
@ -120,6 +121,22 @@ inline std::istream& console_in() { return std::cin; }
|
|||
|
||||
#endif
|
||||
|
||||
/// Our stack type.
|
||||
template <typename T>
|
||||
class ParserStack : public std::vector<T> {
|
||||
public:
|
||||
// Convenience to get the top value and pop it.
|
||||
T pop() {
|
||||
T val = std::move(this->back());
|
||||
this->pop_back();
|
||||
return val;
|
||||
}
|
||||
|
||||
T& top() { return this->back(); }
|
||||
|
||||
void push(T val) { this->push_back(std::move(val)); }
|
||||
};
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
/** \brief Bytecode values.
|
||||
|
||||
|
|
@ -163,7 +180,7 @@ enum ECmdCode {
|
|||
cmFUNC, ///< Code for a generic function item
|
||||
cmFUNC_STR, ///< Code for a function with a string parameter
|
||||
cmFUNC_BULK, ///< Special callbacks for Bulk mode with an additional parameter for the bulk
|
||||
///index
|
||||
/// index
|
||||
cmSTRING, ///< Code for a string token
|
||||
cmOPRT_BIN, ///< user defined binary operator
|
||||
cmOPRT_POSTFIX, ///< code for postfix operators
|
||||
|
|
|
|||
|
|
@ -1,104 +0,0 @@
|
|||
/*
|
||||
__________
|
||||
_____ __ __\______ \_____ _______ ______ ____ _______
|
||||
/ \ | | \| ___/\__ \ \_ __ \/ ___/_/ __ \\_ __ \
|
||||
| Y Y \| | /| | / __ \_| | \/\___ \ \ ___/ | | \/
|
||||
|__|_| /|____/ |____| (____ /|__| /____ > \___ >|__|
|
||||
\/ \/ \/ \/
|
||||
Copyright (C) 2004-2011 Ingo Berg
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy of this
|
||||
software and associated documentation files (the "Software"), to deal in the Software
|
||||
without restriction, including without limitation the rights to use, copy, modify,
|
||||
merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
|
||||
permit persons to whom the Software is furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all copies or
|
||||
substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
|
||||
NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
|
||||
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#ifndef MU_PARSER_STACK_H
|
||||
#define MU_PARSER_STACK_H
|
||||
|
||||
#include <cassert>
|
||||
#include <stack>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#include "muParserError.h"
|
||||
#include "muParserToken.h"
|
||||
|
||||
/** \file
|
||||
\brief This file defines the stack used by muparser.
|
||||
*/
|
||||
|
||||
namespace mu {
|
||||
|
||||
/** \brief Parser stack implementation.
|
||||
|
||||
Stack implementation based on a std::stack. The behaviour of pop() had been
|
||||
slightly changed in order to get an error code if the stack is empty.
|
||||
The stack is used within the Parser both as a value stack and as an operator stack.
|
||||
|
||||
\author (C) 2004-2011 Ingo Berg
|
||||
*/
|
||||
template <typename TValueType>
|
||||
class ParserStack {
|
||||
private:
|
||||
/** \brief Type of the underlying stack implementation. */
|
||||
typedef std::stack<TValueType, std::vector<TValueType> > impl_type;
|
||||
|
||||
impl_type m_Stack; ///< This is the actual stack.
|
||||
|
||||
public:
|
||||
//---------------------------------------------------------------------------
|
||||
ParserStack() : m_Stack() {}
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
virtual ~ParserStack() {}
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
/** \brief Pop a value from the stack.
|
||||
|
||||
Unlike the standard implementation this function will return the value that
|
||||
is going to be taken from the stack.
|
||||
|
||||
\throw ParserException in case the stack is empty.
|
||||
\sa pop(int &a_iErrc)
|
||||
*/
|
||||
TValueType pop() {
|
||||
if (empty()) throw ParserError(_T("stack is empty."));
|
||||
|
||||
TValueType el = top();
|
||||
m_Stack.pop();
|
||||
return el;
|
||||
}
|
||||
|
||||
/** \brief Push an object into the stack.
|
||||
|
||||
\param a_Val object to push into the stack.
|
||||
\throw nothrow
|
||||
*/
|
||||
void push(const TValueType& a_Val) { m_Stack.push(a_Val); }
|
||||
|
||||
/** \brief Return the number of stored elements. */
|
||||
unsigned size() const { return (unsigned)m_Stack.size(); }
|
||||
|
||||
/** \brief Returns true if stack is empty false otherwise. */
|
||||
bool empty() const { return m_Stack.empty(); }
|
||||
|
||||
/** \brief Return reference to the top object in the stack.
|
||||
|
||||
The top object is the one pushed most recently.
|
||||
*/
|
||||
TValueType& top() { return m_Stack.top(); }
|
||||
};
|
||||
} // namespace MathUtils
|
||||
|
||||
#endif
|
||||
|
|
@ -34,7 +34,6 @@
|
|||
|
||||
#include "muParserDef.h"
|
||||
#include "muParserError.h"
|
||||
#include "muParserStack.h"
|
||||
#include "muParserTemplateMagic.h"
|
||||
#include "muParserToken.h"
|
||||
|
||||
|
|
@ -436,11 +435,11 @@ void ParserByteCode::Finalize() {
|
|||
for (int i = 0; i < (int)m_vRPN.size(); ++i) {
|
||||
switch (m_vRPN[i].Cmd) {
|
||||
case cmIF:
|
||||
stIf.push(i);
|
||||
stIf.push_back(i);
|
||||
break;
|
||||
|
||||
case cmELSE:
|
||||
stElse.push(i);
|
||||
stElse.push_back(i);
|
||||
idx = stIf.pop();
|
||||
m_vRPN[idx].Oprt.offset = i - idx;
|
||||
break;
|
||||
|
|
|
|||
Loading…
Reference in a new issue