Update of /cvsroot/monetdb/pathfinder/compiler/include
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24396/include
Modified Files:
functions.h string_utils.h subtyping.h xml2lalg.h
xml2lalg_converters.h xml2lalg_xpath_utils.h
Log Message:
-- Remove pathfinder.h includes from header files.
Index: functions.h
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/include/functions.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- functions.h 11 Jan 2008 10:47:06 -0000 1.19
+++ functions.h 15 Feb 2008 11:52:35 -0000 1.20
@@ -39,7 +39,6 @@
#define FUNCTIONS_H
-#include "pathfinder.h"
/* PFty_t */
#include "types.h"
/* PFenv_t */
Index: subtyping.h
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/include/subtyping.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- subtyping.h 11 Jan 2008 10:47:09 -0000 1.18
+++ subtyping.h 15 Feb 2008 11:52:35 -0000 1.19
@@ -35,8 +35,6 @@
#ifndef SUBTYPING_H
#define SUBTYPING_H
-#include "pathfinder.h"
-
#include "types.h"
/**
Index: xml2lalg_converters.h
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/include/xml2lalg_converters.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- xml2lalg_converters.h 31 Jan 2008 12:39:45 -0000 1.4
+++ xml2lalg_converters.h 15 Feb 2008 11:52:35 -0000 1.5
@@ -38,10 +38,6 @@
#ifndef XML2LALG_CONVERTERS_H
#define XML2LALG_CONVERTERS_H
-
-
-#include "pathfinder.h"
-
#include <stdio.h>
#ifdef HAVE_STDBOOL_H
#include <stdbool.h>
@@ -51,15 +47,10 @@
#include <assert.h>
#include <stdlib.h>
-
-
#include "algebra.h"
#include "logical.h"
#include "logical_mnemonic.h"
-
-
-
PFla_op_kind_t
PFxml2la_conv_2PFLA_OpKind(const char* s);
@@ -68,16 +59,13 @@
PFalg_att_t
PFxml2la_conv_2PFLA_attributeName_unq(const char* s);
-
PFalg_simple_type_t
PFxml2la_conv_2PFLA_atomType(char* typeString);
-
PFalg_atom_t
PFxml2la_conv_2PFLA_atom(PFalg_simple_type_t,
char *prefix, char *uri, char* valueString);
-
PFalg_comp_t
PFxml2la_conv_2PFLA_comparisonType(char* s);
Index: string_utils.h
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/include/string_utils.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- string_utils.h 11 Jan 2008 10:47:08 -0000 1.2
+++ string_utils.h 15 Feb 2008 11:52:35 -0000 1.3
@@ -36,8 +36,6 @@
#ifndef STRING_UTILS_H
#define STRING_UTILS_H
-#include "pathfinder.h"
-
#include <stdio.h>
#ifdef HAVE_STDBOOL_H
#include <stdbool.h>
Index: xml2lalg.h
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/include/xml2lalg.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- xml2lalg.h 11 Jan 2008 10:47:09 -0000 1.3
+++ xml2lalg.h 15 Feb 2008 11:52:35 -0000 1.4
@@ -32,35 +32,21 @@
* $Id$
*/
-
-
-
#ifndef XML2ALG_H
#define XML2ALG_H
-
-#include "pathfinder.h"
-
-
#include "logical.h"
#include "array.h"
-
typedef struct XML2LALGContext XML2LALGContext;
-
struct XML2LALGContext {
-
- PFarray_t* nodeStore;
-
- void* docXPathCtx;
-
+ PFarray_t* nodeStore;
+ void* docXPathCtx;
PFalg_att_t (*convert2PFLA_attributeName)(const char* s);
};
-
-
XML2LALGContext*
PFxml2la_xml2lalgContext(void);
@@ -70,7 +56,4 @@
PFla_op_t*
PFxml2la_importXMLFromMemory(XML2LALGContext* ctx, const char* xml, int size);
-
-
#endif
-
Index: xml2lalg_xpath_utils.h
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/include/xml2lalg_xpath_utils.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- xml2lalg_xpath_utils.h 11 Jan 2008 10:47:09 -0000 1.3
+++ xml2lalg_xpath_utils.h 15 Feb 2008 11:52:35 -0000 1.4
@@ -38,16 +38,11 @@
#ifndef LIBXML_XPATH_UTILS_H
#define LIBXML_XPATH_UTILS_H
-#include "pathfinder.h"
-
-
#include <stdio.h>
#ifdef HAVE_STDBOOL_H
#include <stdbool.h>
#endif
-
-
/* SAX parser interface (libxml2) */
#include <libxml/parser.h>
#include <libxml/parserInternals.h>
@@ -55,10 +50,6 @@
#include <libxml/xpath.h>
#include <libxml/xpathInternals.h>
-
-
-
-
xmlXPathObjectPtr
PFxml2la_xpath_evalXPathFromDocCtx(xmlXPathContextPtr xpathCtx,
const char* xpathExpression);
@@ -68,7 +59,6 @@
xmlNodePtr nodeXpathCtx,
const char* xpathExpression);
-
int
PFxml2la_xpath_getNodeCount(xmlXPathObjectPtr xpathObjPtr);
@@ -90,7 +80,6 @@
char*
PFxml2la_xpath_getElementValue(xmlNodePtr nodePtr);
-
int
PFxml2la_xpath_getIntValue(char* s);
@@ -100,7 +89,4 @@
bool
PFxml2la_xpath_getBoolValue(char* s);
-
-
#endif
-
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
