Merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba

Proposed by Paul J. Lucas on 2013-05-15
Status: Merged
Approved by: Paul J. Lucas on 2013-05-15
Approved revision: 11213
Merged at revision: 11453
Proposed branch: lp:~paul-lucas/zorba/pjl-misc
Merge into: lp:zorba
Diff against target: 341 lines (+30/-30)
25 files modified
src/api/item.cpp (+1/-1)
src/api/itemfactoryimpl.cpp (+1/-1)
src/capi/csequence.cpp (+1/-1)
src/compiler/expression/expr.cpp (+1/-1)
src/compiler/parser/symbol_table.cpp (+1/-1)
src/compiler/parsetree/parsenodes.h (+1/-1)
src/compiler/translator/translator.cpp (+1/-1)
src/runtime/numerics/format_number.cpp (+1/-1)
src/runtime/sequences/SequencesImpl.cpp (+4/-4)
src/store/naive/atomic_items.h (+1/-1)
src/store/naive/simple_index_general.cpp (+1/-1)
src/types/casting.cpp (+1/-1)
src/types/schema/XercesParseUtils.cpp (+1/-1)
src/zorbaserialization/serialize_basic_types.cpp (+1/-1)
src/zorbaserialization/serialize_template_types.h (+1/-1)
src/zorbaserialization/serialize_zorba_types.cpp (+1/-1)
src/zorbaserialization/serialize_zorba_types.h (+1/-1)
src/zorbatypes/CMakeLists.txt (+1/-1)
src/zorbatypes/datetime/duration.cpp (+1/-1)
src/zorbatypes/decimal.cpp (+1/-1)
src/zorbatypes/float.cpp (+1/-1)
src/zorbatypes/float.h (+3/-3)
src/zorbatypes/integer.cpp (+1/-1)
src/zorbatypes/numconversions.cpp (+1/-1)
src/zorbatypes/numeric_types.cpp (+1/-1)
To merge this branch: bzr merge lp:~paul-lucas/zorba/pjl-misc
Reviewer Review Type Date Requested Status
Juan Zacarias 2013-05-15 Approve on 2013-05-15
Paul J. Lucas Approve on 2013-05-15
Review via email: mp+164051@code.launchpad.net

Commit message

Renamed floatimpl.h/.cpp to float.h/.cpp. Why it had impl in the name by decimal and integer didn't isn't clear. I've been meaning to do this for a while.

Description of the change

Renamed floatimpl.h/.cpp to float.h/.cpp. Why it had impl in the name by decimal and integer didn't isn't clear. I've been meaning to do this for a while.

To post a comment you must log in.
Paul J. Lucas (paul-lucas) :
review: Approve
Juan Zacarias (juan457) :
review: Approve
Zorba Build Bot (zorba-buildbot) wrote :
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job pjl-misc-2013-05-15T23-35-51.47Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/api/item.cpp'
2--- src/api/item.cpp 2013-05-08 20:14:47 +0000
3+++ src/api/item.cpp 2013-05-15 23:28:28 +0000
4@@ -38,7 +38,7 @@
5 #include "store/api/iterator.h"
6 #include "store/api/collection.h"
7
8-#include "zorbatypes/floatimpl.h"
9+#include "zorbatypes/float.h"
10 #include "zorbatypes/integer.h"
11 #include "zorbatypes/numconversions.h"
12
13
14=== modified file 'src/api/itemfactoryimpl.cpp'
15--- src/api/itemfactoryimpl.cpp 2013-05-08 20:14:47 +0000
16+++ src/api/itemfactoryimpl.cpp 2013-05-15 23:28:28 +0000
17@@ -26,7 +26,7 @@
18 #include "api/itemfactoryimpl.h"
19
20 #include "zorbatypes/decimal.h"
21-#include "zorbatypes/floatimpl.h"
22+#include "zorbatypes/float.h"
23 #include "zorbatypes/integer.h"
24 #include "zorbatypes/schema_types.h"
25
26
27=== modified file 'src/capi/csequence.cpp'
28--- src/capi/csequence.cpp 2013-05-08 20:14:47 +0000
29+++ src/capi/csequence.cpp 2013-05-15 23:28:28 +0000
30@@ -27,7 +27,7 @@
31
32 #include "util/string_util.h"
33 #include "zorbamisc/ns_consts.h"
34-#include "zorbatypes/floatimpl.h"
35+#include "zorbatypes/float.h"
36 #include "zorbatypes/numconversions.h"
37
38 #include "error.h"
39
40=== modified file 'src/compiler/expression/expr.cpp'
41--- src/compiler/expression/expr.cpp 2013-05-08 20:14:47 +0000
42+++ src/compiler/expression/expr.cpp 2013-05-15 23:28:28 +0000
43@@ -50,7 +50,7 @@
44 #include "store/api/store.h"
45 #include "store/api/item_factory.h"
46 #include "zorbatypes/decimal.h"
47-#include "zorbatypes/floatimpl.h"
48+#include "zorbatypes/float.h"
49 #include "zorbatypes/integer.h"
50
51
52
53=== modified file 'src/compiler/parser/symbol_table.cpp'
54--- src/compiler/parser/symbol_table.cpp 2013-05-15 17:14:35 +0000
55+++ src/compiler/parser/symbol_table.cpp 2013-05-15 23:28:28 +0000
56@@ -16,7 +16,7 @@
57 #include "stdafx.h"
58
59 #include "zorbatypes/decimal.h"
60-#include "zorbatypes/floatimpl.h"
61+#include "zorbatypes/float.h"
62 #include "zorbatypes/integer.h"
63 #include "zorbatypes/numconversions.h"
64
65
66=== modified file 'src/compiler/parsetree/parsenodes.h'
67--- src/compiler/parsetree/parsenodes.h 2013-05-11 12:22:50 +0000
68+++ src/compiler/parsetree/parsenodes.h 2013-05-15 23:28:28 +0000
69@@ -34,7 +34,7 @@
70
71 #include "zorbatypes/decimal.h"
72 #include "zorbatypes/integer.h"
73-#include "zorbatypes/floatimpl.h"
74+#include "zorbatypes/float.h"
75 #include "zorbatypes/rchandle.h"
76 #include "zorbatypes/schema_types.h"
77 #include "zorbatypes/zstring.h"
78
79=== modified file 'src/compiler/translator/translator.cpp'
80--- src/compiler/translator/translator.cpp 2013-05-15 10:58:40 +0000
81+++ src/compiler/translator/translator.cpp 2013-05-15 23:28:28 +0000
82@@ -90,7 +90,7 @@
83
84 #include "zorbamisc/ns_consts.h"
85 #include "zorbatypes/decimal.h"
86-#include "zorbatypes/floatimpl.h"
87+#include "zorbatypes/float.h"
88 #include "zorbatypes/integer.h"
89 #include "zorbatypes/numconversions.h"
90 #include "zorbatypes/URI.h"
91
92=== modified file 'src/runtime/numerics/format_number.cpp'
93--- src/runtime/numerics/format_number.cpp 2013-05-09 00:21:51 +0000
94+++ src/runtime/numerics/format_number.cpp 2013-05-15 23:28:28 +0000
95@@ -31,7 +31,7 @@
96 #include "types/typeconstants.h"
97 #include "types/typeops.h"
98 #include "util/xml_util.h"
99-#include "zorbatypes/floatimpl.h"
100+#include "zorbatypes/float.h"
101 #include "zorbatypes/integer.h"
102
103 namespace zorba {
104
105=== modified file 'src/runtime/sequences/SequencesImpl.cpp'
106--- src/runtime/sequences/SequencesImpl.cpp 2013-05-02 00:18:56 +0000
107+++ src/runtime/sequences/SequencesImpl.cpp 2013-05-15 23:28:28 +0000
108@@ -28,10 +28,10 @@
109 #include "zorbatypes/URI.h"
110
111 // For timing
112-#include <zorbatypes/zorbatypes_decl.h>
113-#include <zorbatypes/datetime.h>
114-#include <zorbatypes/duration.h>
115-#include <zorbatypes/floatimpl.h>
116+#include "zorbatypes/zorbatypes_decl.h"
117+#include "zorbatypes/datetime.h"
118+#include "zorbatypes/duration.h"
119+#include "zorbatypes/float.h"
120
121 #include "compiler/api/compilercb.h"
122
123
124=== modified file 'src/store/naive/atomic_items.h'
125--- src/store/naive/atomic_items.h 2013-05-08 20:14:47 +0000
126+++ src/store/naive/atomic_items.h 2013-05-15 23:28:28 +0000
127@@ -40,7 +40,7 @@
128
129 #include "zorbatypes/datetime.h"
130 #include "zorbatypes/decimal.h"
131-#include "zorbatypes/floatimpl.h"
132+#include "zorbatypes/float.h"
133 #include "zorbatypes/integer.h"
134 #include "zorbatypes/schema_types.h"
135
136
137=== modified file 'src/store/naive/simple_index_general.cpp'
138--- src/store/naive/simple_index_general.cpp 2013-03-24 20:40:03 +0000
139+++ src/store/naive/simple_index_general.cpp 2013-05-15 23:28:28 +0000
140@@ -23,7 +23,7 @@
141 #include "diagnostics/assert.h"
142 #include "diagnostics/util_macros.h"
143
144-#include "zorbatypes/floatimpl.h"
145+#include "zorbatypes/float.h"
146
147 namespace zorba
148 {
149
150=== modified file 'src/types/casting.cpp'
151--- src/types/casting.cpp 2013-05-14 03:55:56 +0000
152+++ src/types/casting.cpp 2013-05-15 23:28:28 +0000
153@@ -21,7 +21,7 @@
154 #include "zorbatypes/datetime.h"
155 #include "zorbatypes/decimal.h"
156 #include "zorbatypes/duration.h"
157-#include "zorbatypes/floatimpl.h"
158+#include "zorbatypes/float.h"
159 #include "zorbatypes/integer.h"
160 #include "zorbatypes/numconversions.h"
161 #include "zorbatypes/URI.h"
162
163=== modified file 'src/types/schema/XercesParseUtils.cpp'
164--- src/types/schema/XercesParseUtils.cpp 2013-05-09 00:21:51 +0000
165+++ src/types/schema/XercesParseUtils.cpp 2013-05-15 23:28:28 +0000
166@@ -37,7 +37,7 @@
167 #include "zorbatypes/datetime.h"
168 #include "zorbatypes/decimal.h"
169 #include "zorbatypes/duration.h"
170-#include "zorbatypes/floatimpl.h"
171+#include "zorbatypes/float.h"
172 #include "zorbatypes/integer.h"
173 #include "zorbatypes/numconversions.h"
174
175
176=== modified file 'src/zorbaserialization/serialize_basic_types.cpp'
177--- src/zorbaserialization/serialize_basic_types.cpp 2013-05-08 20:14:47 +0000
178+++ src/zorbaserialization/serialize_basic_types.cpp 2013-05-15 23:28:28 +0000
179@@ -23,7 +23,7 @@
180 #include "zorbaserialization/base64impl.h"
181
182 #include "zorbatypes/m_apm.h"
183-#include "zorbatypes/floatimpl.h"
184+#include "zorbatypes/float.h"
185
186 #include "diagnostics/xquery_diagnostics.h"
187 #include "diagnostics/util_macros.h"
188
189=== modified file 'src/zorbaserialization/serialize_template_types.h'
190--- src/zorbaserialization/serialize_template_types.h 2013-04-08 00:44:26 +0000
191+++ src/zorbaserialization/serialize_template_types.h 2013-05-15 23:28:28 +0000
192@@ -32,7 +32,7 @@
193 #include "diagnostics/assert.h"
194
195 #include "zorbatypes/zstring.h"
196-#include "zorbatypes/floatimpl.h"
197+#include "zorbatypes/float.h"
198
199 #include "zorbautils/checked_vector.h"
200
201
202=== modified file 'src/zorbaserialization/serialize_zorba_types.cpp'
203--- src/zorbaserialization/serialize_zorba_types.cpp 2013-05-02 18:34:01 +0000
204+++ src/zorbaserialization/serialize_zorba_types.cpp 2013-05-15 23:28:28 +0000
205@@ -40,7 +40,7 @@
206 #include "zorbatypes/datetime.h"
207 #include "zorbatypes/collation_manager.h"
208 #include "zorbatypes/integer.h"
209-#include "zorbatypes/floatimpl.h"
210+#include "zorbatypes/float.h"
211 #include "zorbatypes/binary.h"
212 #include "zorbatypes/decimal.h"
213
214
215=== modified file 'src/zorbaserialization/serialize_zorba_types.h'
216--- src/zorbaserialization/serialize_zorba_types.h 2013-04-28 05:21:15 +0000
217+++ src/zorbaserialization/serialize_zorba_types.h 2013-05-15 23:28:28 +0000
218@@ -22,7 +22,7 @@
219
220 #include "zorbatypes/rchandle.h"
221 #include "zorbatypes/m_apm.h"
222-#include "zorbatypes/floatimpl.h"
223+#include "zorbatypes/float.h"
224 #include "zorbatypes/zorbatypes_decl.h"
225
226 #include "zorbautils/checked_vector.h"
227
228=== modified file 'src/zorbatypes/CMakeLists.txt'
229--- src/zorbatypes/CMakeLists.txt 2013-04-29 14:39:04 +0000
230+++ src/zorbatypes/CMakeLists.txt 2013-05-15 23:28:28 +0000
231@@ -14,7 +14,7 @@
232
233 SET(ZORBATYPES_SRCS
234 decimal.cpp
235- floatimpl.cpp
236+ float.cpp
237 integer.cpp
238 numconversions.cpp
239 numeric_types.cpp
240
241=== modified file 'src/zorbatypes/datetime/duration.cpp'
242--- src/zorbatypes/datetime/duration.cpp 2013-05-09 00:21:51 +0000
243+++ src/zorbatypes/datetime/duration.cpp 2013-05-15 23:28:28 +0000
244@@ -23,7 +23,7 @@
245 #include "zorbatypes/datetime/parse.h"
246 #include "zorbatypes/decimal.h"
247 #include "zorbatypes/duration.h"
248-#include "zorbatypes/floatimpl.h"
249+#include "zorbatypes/float.h"
250 #include "zorbatypes/integer.h"
251 #include "zorbatypes/numconversions.h"
252 #include "zorbautils/hashfun.h"
253
254=== modified file 'src/zorbatypes/decimal.cpp'
255--- src/zorbatypes/decimal.cpp 2013-05-14 20:55:33 +0000
256+++ src/zorbatypes/decimal.cpp 2013-05-15 23:28:28 +0000
257@@ -23,7 +23,7 @@
258 #include "util/ascii_util.h"
259
260 #include "decimal.h"
261-#include "floatimpl.h"
262+#include "float.h"
263 #include "integer.h"
264 #include "numconversions.h"
265
266
267=== renamed file 'src/zorbatypes/floatimpl.cpp' => 'src/zorbatypes/float.cpp'
268--- src/zorbatypes/floatimpl.cpp 2013-05-14 17:37:12 +0000
269+++ src/zorbatypes/float.cpp 2013-05-15 23:28:28 +0000
270@@ -24,7 +24,7 @@
271 #include "util/ascii_util.h"
272
273 #include "decimal.h"
274-#include "floatimpl.h"
275+#include "float.h"
276 #include "integer.h"
277
278 #include "zorbaserialization/serialize_zorba_types.h"
279
280=== renamed file 'src/zorbatypes/floatimpl.h' => 'src/zorbatypes/float.h'
281--- src/zorbatypes/floatimpl.h 2013-05-04 17:29:21 +0000
282+++ src/zorbatypes/float.h 2013-05-15 23:28:28 +0000
283@@ -15,8 +15,8 @@
284 */
285
286 #pragma once
287-#ifndef ZORBA_FLOATIMPL_H
288-#define ZORBA_FLOATIMPL_H
289+#ifndef ZORBA_FLOAT_H
290+#define ZORBA_FLOAT_H
291
292 #include <cmath>
293 #include <limits>
294@@ -989,7 +989,7 @@
295
296 } // namespace zorba
297
298-#endif // ZORBA_FLOATIMPL_H
299+#endif // ZORBA_FLOAT_H
300 /*
301 * Local variables:
302 * mode: c++
303
304=== modified file 'src/zorbatypes/integer.cpp'
305--- src/zorbatypes/integer.cpp 2013-05-14 03:55:56 +0000
306+++ src/zorbatypes/integer.cpp 2013-05-15 23:28:28 +0000
307@@ -27,7 +27,7 @@
308
309 // local
310 #include "decimal.h"
311-#include "floatimpl.h"
312+#include "float.h"
313 #include "integer.h"
314 #include "numconversions.h"
315
316
317=== modified file 'src/zorbatypes/numconversions.cpp'
318--- src/zorbatypes/numconversions.cpp 2013-05-08 20:14:47 +0000
319+++ src/zorbatypes/numconversions.cpp 2013-05-15 23:28:28 +0000
320@@ -24,7 +24,7 @@
321
322 // local
323 #include "decimal.h"
324-#include "floatimpl.h"
325+#include "float.h"
326 #include "integer.h"
327 #include "numconversions.h"
328
329
330=== modified file 'src/zorbatypes/numeric_types.cpp'
331--- src/zorbatypes/numeric_types.cpp 2013-04-29 14:39:04 +0000
332+++ src/zorbatypes/numeric_types.cpp 2013-05-15 23:28:28 +0000
333@@ -18,7 +18,7 @@
334
335 // local
336 #include "decimal.h"
337-#include "floatimpl.h"
338+#include "float.h"
339 #include "integer.h"
340
341 using namespace std;

Subscribers

People subscribed via source and target branches