1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
|
--- ragel-6.7.orig/aapl/avlcommon.h 2011-02-10 23:14:44.000000000 -0500
+++ ragel-6.7/aapl/avlcommon.h 2012-12-30 00:53:33.879074778 -0500
@@ -881,9 +881,9 @@
}
#ifdef AVL_BASIC
- keyRelation = compare( *element, *curEl );
+ keyRelation = this->compare( *element, *curEl );
#else
- keyRelation = compare( element->BASEKEY(getKey()),
+ keyRelation = this->compare( element->BASEKEY(getKey()),
curEl->BASEKEY(getKey()) );
#endif
@@ -920,7 +920,7 @@
long keyRelation;
while (curEl) {
- keyRelation = compare( *element, *curEl );
+ keyRelation = this->compare( *element, *curEl );
/* Do we go left? */
if ( keyRelation < 0 )
@@ -969,7 +969,7 @@
return element;
}
- keyRelation = compare( key, curEl->BASEKEY(getKey()) );
+ keyRelation = this->compare( key, curEl->BASEKEY(getKey()) );
/* Do we go left? */
if ( keyRelation < 0 ) {
@@ -1023,7 +1023,7 @@
return element;
}
- keyRelation = compare(key, curEl->getKey());
+ keyRelation = this->compare(key, curEl->getKey());
/* Do we go left? */
if ( keyRelation < 0 ) {
@@ -1058,7 +1058,7 @@
long keyRelation;
while (curEl) {
- keyRelation = compare( key, curEl->BASEKEY(getKey()) );
+ keyRelation = this->compare( key, curEl->BASEKEY(getKey()) );
/* Do we go left? */
if ( keyRelation < 0 )
--- ragel-6.7.orig/aapl/bstcommon.h 2011-02-10 23:14:44.000000000 -0500
+++ ragel-6.7/aapl/bstcommon.h 2012-12-30 00:56:22.903385157 -0500
@@ -361,7 +361,7 @@
}
mid = lower + ((upper-lower)>>1);
- keyRelation = compare(key, GET_KEY(*mid));
+ keyRelation = this->compare(key, GET_KEY(*mid));
if ( keyRelation < 0 )
upper = mid - 1;
@@ -373,12 +373,12 @@
lower = mid - 1;
while ( lower != lowEnd &&
- compare(key, GET_KEY(*lower)) == 0 )
+ this->compare(key, GET_KEY(*lower)) == 0 )
lower--;
upper = mid + 1;
while ( upper != highEnd &&
- compare(key, GET_KEY(*upper)) == 0 )
+ this->compare(key, GET_KEY(*upper)) == 0 )
upper++;
low = (Element*)lower + 1;
@@ -419,7 +419,7 @@
}
mid = lower + ((upper-lower)>>1);
- keyRelation = compare(key, GET_KEY(*mid));
+ keyRelation = this->compare(key, GET_KEY(*mid));
if ( keyRelation < 0 )
upper = mid - 1;
@@ -457,7 +457,7 @@
}
mid = lower + ((upper-lower)>>1);
- keyRelation = compare(key, GET_KEY(*mid));
+ keyRelation = this->compare(key, GET_KEY(*mid));
if ( keyRelation < 0 )
upper = mid - 1;
@@ -508,7 +508,7 @@
}
mid = lower + ((upper-lower)>>1);
- keyRelation = compare(key, GET_KEY(*mid));
+ keyRelation = this->compare(key, GET_KEY(*mid));
if ( keyRelation < 0 )
upper = mid - 1;
@@ -603,7 +603,7 @@
}
mid = lower + ((upper-lower)>>1);
- keyRelation = compare(GET_KEY(el), GET_KEY(*mid));
+ keyRelation = this->compare(GET_KEY(el), GET_KEY(*mid));
if ( keyRelation < 0 )
upper = mid - 1;
@@ -662,7 +662,7 @@
}
mid = lower + ((upper-lower)>>1);
- keyRelation = compare(GET_KEY(el), GET_KEY(*mid));
+ keyRelation = this->compare(GET_KEY(el), GET_KEY(*mid));
if ( keyRelation < 0 )
upper = mid - 1;
--- ragel-6.7.orig/aapl/mergesort.h 2011-02-10 23:14:44.000000000 -0500
+++ ragel-6.7/aapl/mergesort.h 2012-12-30 00:57:00.423165601 -0500
@@ -110,7 +110,7 @@
}
else {
/* Both upper and lower left. */
- if ( compare(*lower, *upper) <= 0 )
+ if ( this->compare(*lower, *upper) <= 0 )
memcpy( dest++, lower++, sizeof(T) );
else
memcpy( dest++, upper++, sizeof(T) );
--- ragel-6.7.orig/aapl/bubblesort.h 2011-02-10 23:14:44.000000000 -0500
+++ ragel-6.7/aapl/bubblesort.h 2012-12-30 00:58:36.667806744 -0500
@@ -72,7 +72,7 @@
changed = false;
for ( long i = 0; i < len-pass; i++ ) {
/* Do we swap pos with the next one? */
- if ( compare( data[i], data[i+1] ) > 0 ) {
+ if ( this->compare( data[i], data[i+1] ) > 0 ) {
char tmp[sizeof(T)];
/* Swap the two items. */
|
