h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-21 11:31:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

[muparser] Begin adopting ValueOrError

Browse Source 
Switch custom function types to return ValueOrError, which will
enable us to remove exceptions.
This commit is contained in:
ridiculousfish
2017-11-22 10:25:52 -08:00
parent 5655f255ef
commit bfd70880a5
2 changed files with 68 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
muparser-2.2.5/include/muParserBase.h
View File

@@ -65,7 +65,7 @@ class ParserBase {
the function pointer to the parser function depending on
which state it is in. (i.e. bytecode parser vs. string parser)
*/
typedef value_type (ParserBase::*ParseFunction)() const;
typedef ValueOrError (ParserBase::*ParseFunction)() const;
/** \brief Type used for storing an array of values. */
typedef std::vector<value_type> valbuf_type;
@@ -236,9 +236,10 @@ class ParserBase {
void CreateRPN() const;
value_type ParseString() const;
value_type ParseCmdCode() const;
value_type ParseCmdCodeBulk(int nOffset, int nThreadID) const;
ValueOrError ParseString() const;
ValueOrError ParseCmdCode() const;
ValueOrError ParseCmdCodeBulk(int nOffset, int nThreadID) const;
ValueOrError InvokeFunction(generic_fun_type func, const value_type *args, int argCount) const;
void CheckName(const string_type &a_strName, const string_type &a_CharSet) const;
void CheckOprt(const string_type &a_sName, const ParserCallback &a_Callback,