1
diff -dPNur vtd-xml/binaryExpr.c vtd-xml-ds/binaryExpr.c
2
--- vtd-xml/binaryExpr.c 2009-06-23 18:40:20.000000000 +0200
3
+++ vtd-xml-ds/binaryExpr.c 2009-09-25 09:11:47.000000000 +0200
5
* along with this program; if not, write to the Free Software
6
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
9
+#define _wcsdup wcsdup
19
+static Boolean compEmptyNodeSet(opType op, UCSChar *s);
21
static Boolean compStringNodeSet(binaryExpr *be, expr* left, expr* right, VTDNav *vn, opType op){
24
diff -dPNur vtd-xml/example/FragmentTest.c vtd-xml-ds/example/FragmentTest.c
25
--- vtd-xml/example/FragmentTest.c 2007-10-18 17:38:06.000000000 +0200
26
+++ vtd-xml-ds/example/FragmentTest.c 2009-09-25 09:21:57.000000000 +0200
29
#include <sys/types.h>
33
#include "../xpath1.h"
34
#include "../helper.h"
35
#include "../vtdGen.h"
36
diff -dPNur vtd-xml/example/testBookMark.c vtd-xml-ds/example/testBookMark.c
37
--- vtd-xml/example/testBookMark.c 2007-06-18 20:08:20.000000000 +0200
38
+++ vtd-xml-ds/example/testBookMark.c 2009-09-25 09:21:33.000000000 +0200
41
#include <sys/types.h>
45
#include "../xpath1.h"
46
#include "../helper.h"
47
#include "../vtdGen.h"
48
diff -dPNur vtd-xml/example/testNodeRecorder.c vtd-xml-ds/example/testNodeRecorder.c
49
--- vtd-xml/example/testNodeRecorder.c 2007-02-20 17:56:06.000000000 +0100
50
+++ vtd-xml-ds/example/testNodeRecorder.c 2009-09-25 09:36:44.000000000 +0200
54
#include "../vtdGen.h"
55
-#include "../AutoPilot.h"
56
+#include "../autoPilot.h"
57
#include "../nodeRecorder.h"
58
struct exception_context the_exception_context[1];
59
// this example shows you how to use nodeRecorder
60
diff -dPNur vtd-xml/funcExpr.c vtd-xml-ds/funcExpr.c
61
--- vtd-xml/funcExpr.c 2009-01-10 19:31:10.000000000 +0100
62
+++ vtd-xml-ds/funcExpr.c 2009-09-25 09:11:59.000000000 +0200
64
* along with this program; if not, write to the Free Software
65
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
68
+#define _wcsdup wcsdup
73
static double sum(funcExpr *fne, VTDNav *vn);
75
static Boolean isWS(UCSChar c);
76
static Boolean lang(funcExpr *fne, VTDNav *vn, UCSChar* s);
77
static inline UCSChar* normalize(UCSChar *s);
78
-static double round(double v);
79
+/*static double round(double v);
80
static double round(double v)
82
return (v>0.0) ? floor(v+0.5) : ceil(v-0.5);
87
static UCSChar *fname(funcExpr *fne,funcName i);
88
diff -dPNur vtd-xml/lex.yy.c vtd-xml-ds/lex.yy.c
89
--- vtd-xml/lex.yy.c 2009-01-20 20:55:38.000000000 +0100
90
+++ vtd-xml-ds/lex.yy.c 2009-09-25 09:12:44.000000000 +0200
92
* $Header: /cvsroot/vtd-xml/ximple-dev_c/vtd-xml/lex.yy.c,v 1.7 2009/01/21 03:55:37 jzhang2004 Exp $
96
+#define _wcsdup wcsdup
100
#define YY_FLEX_MAJOR_VERSION 2
101
#define YY_FLEX_MINOR_VERSION 5
102
diff -dPNur vtd-xml/literalExpr.c vtd-xml-ds/literalExpr.c
103
--- vtd-xml/literalExpr.c 2009-01-10 19:31:10.000000000 +0100
104
+++ vtd-xml-ds/literalExpr.c 2009-09-25 09:11:36.000000000 +0200
106
* along with this program; if not, write to the Free Software
107
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
110
+#define _wcsdup wcsdup
114
literalExpr *createLiteralExpr(UCSChar *st){
115
diff -dPNur vtd-xml/makefile vtd-xml-ds/makefile
116
--- vtd-xml/makefile 2009-02-14 21:06:52.000000000 +0100
117
+++ vtd-xml-ds/makefile 2009-09-25 09:36:56.000000000 +0200
121
-CFLAGS= -c -O3 -Wall -fomit-frame-pointer -fforce-addr -frerun-cse-after-loop -fexpensive-optimizations -fregmove -frerun-loop-opt -fmerge-all-constants -fno-branch-count-reg -funroll-loops -fpeephole -march=i686
122
+#CFLAGS= -c -O3 -Wall -fomit-frame-pointer -fforce-addr -frerun-cse-after-loop -fexpensive-optimizations -fregmove -frerun-loop-opt -fmerge-all-constants -fno-branch-count-reg -funroll-loops -fpeephole -march=nocona
124
LDFLAGS = -O3 -fomit-frame-pointer -fforce-addr -frerun-cse-after-loop -fexpensive-optimizations -fregmove -frerun-loop-opt -march=pentium -lm
127
-all : vtd-xml RSSReader stats soap benchmark_vtdxml update indexWriter indexReader testNodeRecorder testOverwrite testBookMark FragmentTest ModifyXML SeparateIndex
128
+all : vtd-xml RSSReader stats soap benchmark_vtdxml update indexWriter indexReader testOverwrite testBookMark testNodeRecorder FragmentTest ModifyXML
132
+libvtdxml.a: arrayList.o fastIntBuffer.o fastLongBuffer.o contextBuffer.o vtdNav.o vtdGen.o autoPilot.o XMLChar.o helper.o lex.yy.o l8.tab.o literalExpr.o numberExpr.o pathExpr.o filterExpr.o binaryExpr.o unaryExpr.o funcExpr.o locationPathExpr.o intHash.o unionExpr.o decoder.o XMLModifier.o nodeRecorder.o indexHandler.o bookMark.o elementFragmentNs.o transcoder.o textIter.o
133
+ ar -r libvtdxml.a arrayList.o fastIntBuffer.o fastLongBuffer.o contextBuffer.o vtdNav.o vtdGen.o autoPilot.o XMLChar.o helper.o lex.yy.o l8.tab.o literalExpr.o numberExpr.o pathExpr.o filterExpr.o binaryExpr.o unaryExpr.o funcExpr.o locationPathExpr.o intHash.o unionExpr.o decoder.o XMLModifier.o nodeRecorder.o indexHandler.o bookMark.o elementFragmentNs.o transcoder.o textIter.o
135
benchmark_vtdxml: benchmark_vtdxml.o arrayList.o fastIntBuffer.o fastLongBuffer.o contextBuffer.o vtdNav.o vtdGen.o autoPilot.o XMLChar.o helper.o lex.yy.o l8.tab.o literalExpr.o numberExpr.o pathExpr.o filterExpr.o binaryExpr.o unaryExpr.o funcExpr.o locationPathExpr.o intHash.o unionExpr.o decoder.o XMLModifier.o nodeRecorder.o indexHandler.o bookMark.o elementFragmentNs.o transcoder.o textIter.o
137
diff -dPNur vtd-xml/numberExpr.c vtd-xml-ds/numberExpr.c
138
--- vtd-xml/numberExpr.c 2009-01-10 19:31:10.000000000 +0100
139
+++ vtd-xml-ds/numberExpr.c 2009-09-25 09:11:21.000000000 +0200
141
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
145
+#define _wcsdup wcsdup
149
numberExpr *createNumberExpr (double d){