[gcalctool] Removed ce_ prefixes
- From: Robert Ancell <rancell src gnome org>
- To: svn-commits-list gnome org
- Subject: [gcalctool] Removed ce_ prefixes
- Date: Sun, 10 May 2009 22:02:44 -0400 (EDT)
commit d4d6710ffd888aaa7a6ba6fef9c1e663009d75a2
Author: Robert Ancell <robert ancell gmail com>
Date: Mon May 11 12:02:36 2009 +1000
Removed ce_ prefixes
---
src/calctool.c | 2 +-
src/display.c | 8 ++++----
src/functions.c | 2 +-
src/mp-equation.c | 12 ++++++------
src/mp-equation.h | 8 ++++----
src/unittest.c | 2 +-
6 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/calctool.c b/src/calctool.c
index ee72b16..661a3bd 100644
--- a/src/calctool.c
+++ b/src/calctool.c
@@ -141,7 +141,7 @@ solve(const char *equation)
v->wordlen = 32;
v->accuracy = 9;
- error = ce_parse(equation, &result);
+ error = mp_equation_parse(equation, &result);
if(error != 0) {
fprintf(stderr, "Error %d\n", error);
exit(1);
diff --git a/src/display.c b/src/display.c
index 11de36a..e40b328 100644
--- a/src/display.c
+++ b/src/display.c
@@ -30,7 +30,7 @@
#include "mp.h"
#include "functions.h"
#include "ui.h"
-#include "mp-equation.h" // For ce_parse()
+#include "mp-equation.h" // For mp_equation_parse()
#include "register.h"
static const char *display_types[] = { "ENG", "FIX", "SCI", NULL };
@@ -542,9 +542,9 @@ gboolean
display_is_usable_number(GCDisplay *display, MPNumber *MPnum)
{
if (display_is_empty(display)) {
- return ce_parse("0", MPnum);
+ return mp_equation_parse("0", MPnum);
} else {
- return ce_parse(display_get_text(display), MPnum);
+ return mp_equation_parse(display_get_text(display), MPnum);
}
}
@@ -628,7 +628,7 @@ display_solve(GCDisplay *display, MPNumber *result)
int errorCode;
text = display_get_text(display);
- errorCode = ce_parse(text, result);
+ errorCode = mp_equation_parse(text, result);
return errorCode;
}
diff --git a/src/functions.c b/src/functions.c
index f15cd9e..15a4212 100644
--- a/src/functions.c
+++ b/src/functions.c
@@ -177,7 +177,7 @@ do_function(int index)
assert(index >= 0);
assert(index <= 9);
- ret = ce_udf_parse(function_get_value(index));
+ ret = mp_equation_udf_parse(function_get_value(index));
if (!ret) {
ui_set_statusbar("", "");
} else {
diff --git a/src/mp-equation.c b/src/mp-equation.c
index bc4a00a..2a2132e 100644
--- a/src/mp-equation.c
+++ b/src/mp-equation.c
@@ -26,7 +26,7 @@
struct parser_state parser_state;
int
-ce_parse_(const char *expression, MPNumber *result, int flags)
+mp_equation_parse_(const char *expression, MPNumber *result, int flags)
{
int ret = 0;
@@ -67,15 +67,15 @@ ce_parse_(const char *expression, MPNumber *result, int flags)
int
-ce_parse(const char *expression, MPNumber *result)
+mp_equation_parse(const char *expression, MPNumber *result)
{
- return(ce_parse_(expression, result, ANS));
+ return(mp_equation_parse_(expression, result, ANS));
}
int
-ce_udf_parse(const char *expression)
+mp_equation_udf_parse(const char *expression)
{
- MPNumber temp;
- return(ce_parse_(expression, &temp, 0));
+ MPNumber t;
+ return(mp_equation_parse_(expression, &t, 0));
}
diff --git a/src/mp-equation.h b/src/mp-equation.h
index f369b3a..f698c30 100644
--- a/src/mp-equation.h
+++ b/src/mp-equation.h
@@ -19,8 +19,8 @@
* 02111-1307, USA.
*/
-#ifndef CE_PARSER_H
-#define CE_PARSER_H
+#ifndef MP_EQUATION_H
+#define MP_EQUATION_H
#include <stdio.h>
#include <stdlib.h>
@@ -61,8 +61,8 @@ struct parser_state {
extern struct parser_state parser_state;
-int ce_parse(const char *expression, MPNumber *result);
-int ce_udf_parse(const char *expression);
+int mp_equation_parse(const char *expression, MPNumber *result);
+int mp_equation_udf_parse(const char *expression);
int celex();
int ceerror(); /* dummy definition TODO: this is a douple */
diff --git a/src/unittest.c b/src/unittest.c
index 9e82f7b..115baa9 100644
--- a/src/unittest.c
+++ b/src/unittest.c
@@ -69,7 +69,7 @@ test(char *expression, char *expected, int expected_error)
MPNumber result;
char result_str[MAXLINE] = "";
- error = ce_parse(expression, &result);
+ error = mp_equation_parse(expression, &result);
if(error == 0) {
mp_cast_to_string(&result, basevals[v->base], 9, result_str, MAXLINE);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]