From 8a7d756c01d63761226725288caba0a1563389b0 Mon Sep 17 00:00:00 2001 From: Robin Haberkorn Date: Wed, 7 Nov 2012 08:10:47 +0100 Subject: expression stack fixes and some arithmetic commands --- expressions.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'expressions.cpp') diff --git a/expressions.cpp b/expressions.cpp index 1e48d3e..8c8fb0c 100644 --- a/expressions.cpp +++ b/expressions.cpp @@ -23,7 +23,7 @@ Expressions::set_radix(gint r) gint64 Expressions::push(gint64 number) { - while (numbers.peek() == G_MAXINT64) + while (numbers.items() > 0 && numbers.peek() == G_MAXINT64) pop_num(); push(OP_NUMBER); @@ -87,8 +87,10 @@ Expressions::push(Expressions::Operator op) Expressions::Operator Expressions::push_calc(Expressions::Operator op) { + int first = first_op(); + /* calculate if op has lower precedence than op on stack */ - if (operators.peek(first_op()) <= op) + if (first && operators.peek(first) <= op) calc(); return push(op); -- cgit v1.2.3