diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-04-08 13:05:59 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-04-08 13:05:59 +0000 |
| commit | 31b0396db09affd8e5c7042f2c568aa220f78269 (patch) | |
| tree | b838b6ee3091c46c4cab84ec352f7544ef645d89 /math/fityk/files/patch-src__eparser.cpp | |
| parent | Fix heimdal. (diff) | |
Support stage
Fix build with clang
Switch to wxGTK 3.0
Convert to USES=libtools
Notes
Notes:
svn path=/head/; revision=350607
Diffstat (limited to 'math/fityk/files/patch-src__eparser.cpp')
| -rw-r--r-- | math/fityk/files/patch-src__eparser.cpp | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/math/fityk/files/patch-src__eparser.cpp b/math/fityk/files/patch-src__eparser.cpp new file mode 100644 index 000000000000..8ba44d0b687c --- /dev/null +++ b/math/fityk/files/patch-src__eparser.cpp @@ -0,0 +1,29 @@ +--- ./src/eparser.cpp.orig 2011-06-03 19:15:42.000000000 +0200 ++++ ./src/eparser.cpp 2014-04-08 14:55:51.807605460 +0200 +@@ -139,7 +139,7 @@ + } + } + +-bool is_function(int op) ++bool my_is_function(int op) + { + return (bool) get_function_narg(op); + } +@@ -812,7 +812,7 @@ + // check if this is closing bracket of func() + if (!opstack_.empty()) { + int top = opstack_.back(); +- if (is_function(top)) { ++ if (my_is_function(top)) { + pop_onto_que(); + int n = arg_cnt_.back() + 1; + int expected_n = get_function_narg(top); +@@ -846,7 +846,7 @@ + lex.throw_syntax_error("unexpected ',' after '?'"); + // if we are here, opstack_.back() == OP_OPEN_ROUND + else if (opstack_.size() < 2 || +- !is_function(*(opstack_.end() - 2))) ++ !my_is_function(*(opstack_.end() - 2))) + lex.throw_syntax_error("',' outside of function"); + else + // don't pop OP_OPEN_ROUND from the stack |