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
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
|
diff -ru maude-2.1.1/src/Core/argVec.hh maude-2.1.1-new/src/Core/argVec.hh
--- maude-2.1.1/src/Core/argVec.hh 2003-06-01 06:50:02.000000000 +0200
+++ maude-2.1.1-new/src/Core/argVec.hh 2004-10-09 01:12:28.000000000 +0200
@@ -41,6 +41,7 @@
//
#ifndef _argVec_hh_
#define _argVec_hh_
+#include <dagNode.hh>
template<class T>
class ArgVec
diff -ru maude-2.1.1/src/Core/checkedArgVecConstIterator.hh maude-2.1.1-new/src/Core/checkedArgVecConstIterator.hh
--- maude-2.1.1/src/Core/checkedArgVecConstIterator.hh 2003-06-01 06:50:02.000000000 +0200
+++ maude-2.1.1-new/src/Core/checkedArgVecConstIterator.hh 2004-10-09 01:10:37.000000000 +0200
@@ -205,7 +205,7 @@
inline typename ArgVec<T>::const_iterator
ArgVec<T>::const_iterator::operator++(int)
{
- ArgVec::const_iterator tmp(*this);
+ typename ArgVec::const_iterator tmp(*this);
operator++();
return tmp;
}
@@ -225,7 +225,7 @@
inline typename ArgVec<T>::const_iterator
ArgVec<T>::const_iterator::operator--(int)
{
- ArgVec::const_iterator tmp(*this);
+ typename ArgVec::const_iterator tmp(*this);
operator--();
return tmp;
}
@@ -245,7 +245,7 @@
inline typename ArgVec<T>::const_iterator
ArgVec<T>::const_iterator::operator+(difference_type delta) const
{
- ArgVec::const_iterator tmp(*this);
+ typename ArgVec::const_iterator tmp(*this);
return tmp += delta;
}
@@ -264,7 +264,7 @@
inline typename ArgVec<T>::const_iterator
ArgVec<T>::const_iterator::operator-(difference_type delta) const
{
- ArgVec::const_iterator tmp(*this);
+ typename ArgVec::const_iterator tmp(*this);
return tmp -= delta;
}
diff -ru maude-2.1.1/src/Core/checkedArgVecIterator.hh maude-2.1.1-new/src/Core/checkedArgVecIterator.hh
--- maude-2.1.1/src/Core/checkedArgVecIterator.hh 2003-06-01 06:50:02.000000000 +0200
+++ maude-2.1.1-new/src/Core/checkedArgVecIterator.hh 2004-10-09 01:10:37.000000000 +0200
@@ -194,7 +194,7 @@
inline typename ArgVec<T>::iterator
ArgVec<T>::iterator::operator++(int)
{
- ArgVec::iterator tmp(*this);
+ typename ArgVec::iterator tmp(*this);
operator++();
return tmp;
}
@@ -214,7 +214,7 @@
inline typename ArgVec<T>::iterator
ArgVec<T>::iterator::operator--(int)
{
- ArgVec::iterator tmp(*this);
+ typename ArgVec::iterator tmp(*this);
operator--();
return tmp;
}
@@ -234,7 +234,7 @@
inline typename ArgVec<T>::iterator
ArgVec<T>::iterator::operator+(difference_type delta) const
{
- ArgVec::iterator tmp(*this);
+ typename ArgVec::iterator tmp(*this);
return tmp += delta;
}
@@ -253,7 +253,7 @@
inline typename ArgVec<T>::iterator
ArgVec<T>::iterator::operator-(difference_type delta) const
{
- ArgVec::iterator tmp(*this);
+ typename ArgVec::iterator tmp(*this);
return tmp -= delta;
}
diff -ru maude-2.1.1/src/FreeTheory/freeDagNode.hh maude-2.1.1-new/src/FreeTheory/freeDagNode.hh
--- maude-2.1.1/src/FreeTheory/freeDagNode.hh 2003-06-01 06:49:16.000000000 +0200
+++ maude-2.1.1-new/src/FreeTheory/freeDagNode.hh 2004-10-09 01:11:44.000000000 +0200
@@ -87,7 +87,7 @@
if (nrArgs > nrWords)
{
setCallDtor(); // need our dtor called when garbage collected so we can free arg array
- external = new (DagNode*)[nrArgs];
+ external = new DagNode*[nrArgs];
}
}
diff -ru maude-2.1.1/src/Interface/dagNode.hh maude-2.1.1-new/src/Interface/dagNode.hh
--- maude-2.1.1/src/Interface/dagNode.hh 2004-02-06 02:13:02.000000000 +0100
+++ maude-2.1.1-new/src/Interface/dagNode.hh 2004-10-09 01:13:10.000000000 +0200
@@ -25,6 +25,7 @@
//
#ifndef _dagNode_hh_
#define _dagNode_hh_
+#include "symbol.hh"
#include "redexPosition.hh"
class DagNode
diff -ru maude-2.1.1/src/Mixfix/lexer.cc maude-2.1.1-new/src/Mixfix/lexer.cc
--- maude-2.1.1/src/Mixfix/lexer.cc 2004-05-26 04:04:40.000000000 +0200
+++ maude-2.1.1-new/src/Mixfix/lexer.cc 2004-10-09 01:26:59.000000000 +0200
@@ -9,6 +9,7 @@
#define YY_FLEX_MINOR_VERSION 5
#include <stdio.h>
+#include <unistd.h>
/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
@@ -22,7 +23,6 @@
#ifdef __cplusplus
#include <stdlib.h>
-#include <unistd.h>
/* Use prototypes in function declarations. */
#define YY_USE_PROTOS
@@ -2000,7 +2000,7 @@
YY_DECL
{
register yy_state_type yy_current_state;
- register char *yy_cp, *yy_bp;
+ register char *yy_cp = NULL, *yy_bp = NULL;
register int yy_act;
#line 83 "../../../src/Mixfix/lexer.ll"
@@ -3367,6 +3367,7 @@
#endif /* ifndef YY_NO_UNPUT */
+#ifndef YY_NO_INPUT
#ifdef __cplusplus
static int yyinput()
#else
@@ -3438,7 +3439,7 @@
return c;
}
-
+#endif /* YY_NO_INPUT */
#ifdef YY_USE_PROTOS
void yyrestart( FILE *input_file )
@@ -3549,11 +3550,6 @@
}
-#ifndef YY_ALWAYS_INTERACTIVE
-#ifndef YY_NEVER_INTERACTIVE
-extern int isatty YY_PROTO(( int ));
-#endif
-#endif
#ifdef YY_USE_PROTOS
void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )
diff -ru maude-2.1.1/src/Utility/checkedConstIterator.hh maude-2.1.1-new/src/Utility/checkedConstIterator.hh
--- maude-2.1.1/src/Utility/checkedConstIterator.hh 2003-06-01 06:29:22.000000000 +0200
+++ maude-2.1.1-new/src/Utility/checkedConstIterator.hh 2004-10-09 01:08:34.000000000 +0200
@@ -209,7 +209,7 @@
inline typename Vector<T>::const_iterator
Vector<T>::const_iterator::operator++(int)
{
- Vector::const_iterator tmp(*this);
+ typename Vector::const_iterator tmp(*this);
operator++();
return tmp;
}
@@ -229,7 +229,7 @@
inline typename Vector<T>::const_iterator
Vector<T>::const_iterator::operator--(int)
{
- Vector::const_iterator tmp(*this);
+ typename Vector::const_iterator tmp(*this);
operator--();
return tmp;
}
@@ -249,7 +249,7 @@
inline typename Vector<T>::const_iterator
Vector<T>::const_iterator::operator+(difference_type delta) const
{
- Vector::const_iterator tmp(*this);
+ typename Vector::const_iterator tmp(*this);
return tmp += delta;
}
@@ -268,7 +268,7 @@
inline typename Vector<T>::const_iterator
Vector<T>::const_iterator::operator-(difference_type delta) const
{
- Vector::const_iterator tmp(*this);
+ typename Vector::const_iterator tmp(*this);
return tmp -= delta;
}
diff -ru maude-2.1.1/src/Utility/checkedIterator.hh maude-2.1.1-new/src/Utility/checkedIterator.hh
--- maude-2.1.1/src/Utility/checkedIterator.hh 2003-06-01 06:29:22.000000000 +0200
+++ maude-2.1.1-new/src/Utility/checkedIterator.hh 2004-10-09 01:08:34.000000000 +0200
@@ -198,7 +198,7 @@
inline typename Vector<T>::iterator
Vector<T>::iterator::operator++(int)
{
- Vector::iterator tmp(*this);
+ typename Vector::iterator tmp(*this);
operator++();
return tmp;
}
@@ -218,7 +218,7 @@
inline typename Vector<T>::iterator
Vector<T>::iterator::operator--(int)
{
- Vector::iterator tmp(*this);
+ typename Vector::iterator tmp(*this);
operator--();
return tmp;
}
@@ -238,7 +238,7 @@
inline typename Vector<T>::iterator
Vector<T>::iterator::operator+(difference_type delta) const
{
- Vector::iterator tmp(*this);
+ typename Vector::iterator tmp(*this);
return tmp += delta;
}
@@ -257,7 +257,7 @@
inline typename Vector<T>::iterator
Vector<T>::iterator::operator-(difference_type delta) const
{
- Vector::iterator tmp(*this);
+ typename Vector::iterator tmp(*this);
return tmp -= delta;
}
diff -ru maude-2.1.1/src/Utility/indexedSet.hh maude-2.1.1-new/src/Utility/indexedSet.hh
--- maude-2.1.1/src/Utility/indexedSet.hh 2003-06-01 06:29:22.000000000 +0200
+++ maude-2.1.1-new/src/Utility/indexedSet.hh 2004-10-09 01:08:34.000000000 +0200
@@ -79,7 +79,7 @@
IndexedSet<T>::insert(const T& element)
{
pair<typename EltMap::iterator, bool> p =
- eltMap.insert(EltMap::value_type(element, indexMap.size()));
+ eltMap.insert(typename EltMap::value_type(element, indexMap.size()));
if (p.second)
indexMap.push_back(p.first);
return p.first->second;
|
GitWeb