Últimos retoques.

[z.facultad/75.42/calculadora.git] / parser_equation.c

diff --git a/parser_equation.c b/parser_equation.c
index d76bd1dff577d8f3049541b4b72fb86b65578311..abf55ce25eb06e2ad8a2a402d09f8940493d9994 100644 (file)
--- a/parser_equation.c
+++ b/parser_equation.c
@@ -16,45 +16,15 @@
 
 #include "bool.h"
 #include "equation.h"
+#include "equation_list.h"
+#include "parser_common.h"
 #include "parseerror.h"
 #include "dllist.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 
-bool is_space(char c) {
-    return (c == ' ') || (c == '\t');
-}
-
-bool is_number(char c) {
-    return ('0' <= c) && (c <= '9');
-}
-
-bool is_alpha(char c) {
-    return (c == '_') || (('a' <= c) && (c <= 'z')) || (('A' <= c) && (c <= 'Z'));
-}
-
-bool is_alpha_num(c) {
-    return is_number(c) || is_alpha(c);
-}
-
-size_t DLList_equation_print(DLList* l, FILE* fp) {
-    size_t cant = 0;
-    Equation* eq;
-    for (eq = DLList_begin(l); DLList_have_more(l); eq = DLList_next(l)) {
-        cant += Equation_print(eq, fp);
-    }
-    return cant;
-}
-
-void DLList_equation_delete(DLList* l) {
-    if (l) {
-        while (!DLList_empty(l)) {
-            Equation_delete((Equation*)DLList_pop(l));
-        }
-    }
-    DLList_delete(l);
-}
+#include "memdebug_debugger.h"
 
 #define PARSE_ERROR(str) ParseError_set_pos_message(error, str, i + 1, c)