Zorba

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

  1. pjl-misc
  2. Merge into trunk
Proposed by Paul J. Lucas
Status: Merged
Approved by: Paul J. Lucas
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 Approve
Paul J. Lucas Approve
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.
Revision history for this message
Paul J. Lucas (paul-lucas) :
review: Approve
Revision history for this message
Juan Zacarias (juan457) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-05-15T23-35-51.47Z/log.html

Revision history for this message
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
=== modified file 'src/api/item.cpp'
--- src/api/item.cpp 2013-05-08 20:14:47 +0000
+++ src/api/item.cpp 2013-05-15 23:28:28 +0000
@@ -38,7 +38,7 @@
38#include "store/api/iterator.h"38#include "store/api/iterator.h"
39#include "store/api/collection.h"39#include "store/api/collection.h"
4040
41#include "zorbatypes/floatimpl.h"41#include "zorbatypes/float.h"
42#include "zorbatypes/integer.h"42#include "zorbatypes/integer.h"
43#include "zorbatypes/numconversions.h"43#include "zorbatypes/numconversions.h"
4444
4545
=== modified file 'src/api/itemfactoryimpl.cpp'
--- src/api/itemfactoryimpl.cpp 2013-05-08 20:14:47 +0000
+++ src/api/itemfactoryimpl.cpp 2013-05-15 23:28:28 +0000
@@ -26,7 +26,7 @@
26#include "api/itemfactoryimpl.h"26#include "api/itemfactoryimpl.h"
2727
28#include "zorbatypes/decimal.h"28#include "zorbatypes/decimal.h"
29#include "zorbatypes/floatimpl.h"29#include "zorbatypes/float.h"
30#include "zorbatypes/integer.h"30#include "zorbatypes/integer.h"
31#include "zorbatypes/schema_types.h"31#include "zorbatypes/schema_types.h"
3232
3333
=== modified file 'src/capi/csequence.cpp'
--- src/capi/csequence.cpp 2013-05-08 20:14:47 +0000
+++ src/capi/csequence.cpp 2013-05-15 23:28:28 +0000
@@ -27,7 +27,7 @@
2727
28#include "util/string_util.h"28#include "util/string_util.h"
29#include "zorbamisc/ns_consts.h"29#include "zorbamisc/ns_consts.h"
30#include "zorbatypes/floatimpl.h"30#include "zorbatypes/float.h"
31#include "zorbatypes/numconversions.h"31#include "zorbatypes/numconversions.h"
3232
33#include "error.h"33#include "error.h"
3434
=== modified file 'src/compiler/expression/expr.cpp'
--- src/compiler/expression/expr.cpp 2013-05-08 20:14:47 +0000
+++ src/compiler/expression/expr.cpp 2013-05-15 23:28:28 +0000
@@ -50,7 +50,7 @@
50#include "store/api/store.h"50#include "store/api/store.h"
51#include "store/api/item_factory.h"51#include "store/api/item_factory.h"
52#include "zorbatypes/decimal.h"52#include "zorbatypes/decimal.h"
53#include "zorbatypes/floatimpl.h"53#include "zorbatypes/float.h"
54#include "zorbatypes/integer.h"54#include "zorbatypes/integer.h"
5555
5656
5757
=== modified file 'src/compiler/parser/symbol_table.cpp'
--- src/compiler/parser/symbol_table.cpp 2013-05-15 17:14:35 +0000
+++ src/compiler/parser/symbol_table.cpp 2013-05-15 23:28:28 +0000
@@ -16,7 +16,7 @@
16#include "stdafx.h"16#include "stdafx.h"
1717
18#include "zorbatypes/decimal.h"18#include "zorbatypes/decimal.h"
19#include "zorbatypes/floatimpl.h"19#include "zorbatypes/float.h"
20#include "zorbatypes/integer.h"20#include "zorbatypes/integer.h"
21#include "zorbatypes/numconversions.h"21#include "zorbatypes/numconversions.h"
2222
2323
=== modified file 'src/compiler/parsetree/parsenodes.h'
--- src/compiler/parsetree/parsenodes.h 2013-05-11 12:22:50 +0000
+++ src/compiler/parsetree/parsenodes.h 2013-05-15 23:28:28 +0000
@@ -34,7 +34,7 @@
3434
35#include "zorbatypes/decimal.h"35#include "zorbatypes/decimal.h"
36#include "zorbatypes/integer.h"36#include "zorbatypes/integer.h"
37#include "zorbatypes/floatimpl.h"37#include "zorbatypes/float.h"
38#include "zorbatypes/rchandle.h"38#include "zorbatypes/rchandle.h"
39#include "zorbatypes/schema_types.h"39#include "zorbatypes/schema_types.h"
40#include "zorbatypes/zstring.h"40#include "zorbatypes/zstring.h"
4141
=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp 2013-05-15 10:58:40 +0000
+++ src/compiler/translator/translator.cpp 2013-05-15 23:28:28 +0000
@@ -90,7 +90,7 @@
9090
91#include "zorbamisc/ns_consts.h"91#include "zorbamisc/ns_consts.h"
92#include "zorbatypes/decimal.h"92#include "zorbatypes/decimal.h"
93#include "zorbatypes/floatimpl.h"93#include "zorbatypes/float.h"
94#include "zorbatypes/integer.h"94#include "zorbatypes/integer.h"
95#include "zorbatypes/numconversions.h"95#include "zorbatypes/numconversions.h"
96#include "zorbatypes/URI.h"96#include "zorbatypes/URI.h"
9797
=== modified file 'src/runtime/numerics/format_number.cpp'
--- src/runtime/numerics/format_number.cpp 2013-05-09 00:21:51 +0000
+++ src/runtime/numerics/format_number.cpp 2013-05-15 23:28:28 +0000
@@ -31,7 +31,7 @@
31#include "types/typeconstants.h"31#include "types/typeconstants.h"
32#include "types/typeops.h"32#include "types/typeops.h"
33#include "util/xml_util.h"33#include "util/xml_util.h"
34#include "zorbatypes/floatimpl.h"34#include "zorbatypes/float.h"
35#include "zorbatypes/integer.h"35#include "zorbatypes/integer.h"
3636
37namespace zorba {37namespace zorba {
3838
=== modified file 'src/runtime/sequences/SequencesImpl.cpp'
--- src/runtime/sequences/SequencesImpl.cpp 2013-05-02 00:18:56 +0000
+++ src/runtime/sequences/SequencesImpl.cpp 2013-05-15 23:28:28 +0000
@@ -28,10 +28,10 @@
28#include "zorbatypes/URI.h"28#include "zorbatypes/URI.h"
2929
30// For timing30// For timing
31#include <zorbatypes/zorbatypes_decl.h>31#include "zorbatypes/zorbatypes_decl.h"
32#include <zorbatypes/datetime.h>32#include "zorbatypes/datetime.h"
33#include <zorbatypes/duration.h>33#include "zorbatypes/duration.h"
34#include <zorbatypes/floatimpl.h>34#include "zorbatypes/float.h"
3535
36#include "compiler/api/compilercb.h"36#include "compiler/api/compilercb.h"
3737
3838
=== modified file 'src/store/naive/atomic_items.h'
--- src/store/naive/atomic_items.h 2013-05-08 20:14:47 +0000
+++ src/store/naive/atomic_items.h 2013-05-15 23:28:28 +0000
@@ -40,7 +40,7 @@
4040
41#include "zorbatypes/datetime.h"41#include "zorbatypes/datetime.h"
42#include "zorbatypes/decimal.h"42#include "zorbatypes/decimal.h"
43#include "zorbatypes/floatimpl.h"43#include "zorbatypes/float.h"
44#include "zorbatypes/integer.h"44#include "zorbatypes/integer.h"
45#include "zorbatypes/schema_types.h"45#include "zorbatypes/schema_types.h"
4646
4747
=== modified file 'src/store/naive/simple_index_general.cpp'
--- src/store/naive/simple_index_general.cpp 2013-03-24 20:40:03 +0000
+++ src/store/naive/simple_index_general.cpp 2013-05-15 23:28:28 +0000
@@ -23,7 +23,7 @@
23#include "diagnostics/assert.h"23#include "diagnostics/assert.h"
24#include "diagnostics/util_macros.h"24#include "diagnostics/util_macros.h"
2525
26#include "zorbatypes/floatimpl.h"26#include "zorbatypes/float.h"
2727
28namespace zorba 28namespace zorba
29{ 29{
3030
=== modified file 'src/types/casting.cpp'
--- src/types/casting.cpp 2013-05-14 03:55:56 +0000
+++ src/types/casting.cpp 2013-05-15 23:28:28 +0000
@@ -21,7 +21,7 @@
21#include "zorbatypes/datetime.h"21#include "zorbatypes/datetime.h"
22#include "zorbatypes/decimal.h"22#include "zorbatypes/decimal.h"
23#include "zorbatypes/duration.h"23#include "zorbatypes/duration.h"
24#include "zorbatypes/floatimpl.h"24#include "zorbatypes/float.h"
25#include "zorbatypes/integer.h"25#include "zorbatypes/integer.h"
26#include "zorbatypes/numconversions.h"26#include "zorbatypes/numconversions.h"
27#include "zorbatypes/URI.h"27#include "zorbatypes/URI.h"
2828
=== modified file 'src/types/schema/XercesParseUtils.cpp'
--- src/types/schema/XercesParseUtils.cpp 2013-05-09 00:21:51 +0000
+++ src/types/schema/XercesParseUtils.cpp 2013-05-15 23:28:28 +0000
@@ -37,7 +37,7 @@
37#include "zorbatypes/datetime.h"37#include "zorbatypes/datetime.h"
38#include "zorbatypes/decimal.h"38#include "zorbatypes/decimal.h"
39#include "zorbatypes/duration.h"39#include "zorbatypes/duration.h"
40#include "zorbatypes/floatimpl.h"40#include "zorbatypes/float.h"
41#include "zorbatypes/integer.h"41#include "zorbatypes/integer.h"
42#include "zorbatypes/numconversions.h"42#include "zorbatypes/numconversions.h"
4343
4444
=== modified file 'src/zorbaserialization/serialize_basic_types.cpp'
--- src/zorbaserialization/serialize_basic_types.cpp 2013-05-08 20:14:47 +0000
+++ src/zorbaserialization/serialize_basic_types.cpp 2013-05-15 23:28:28 +0000
@@ -23,7 +23,7 @@
23#include "zorbaserialization/base64impl.h"23#include "zorbaserialization/base64impl.h"
2424
25#include "zorbatypes/m_apm.h"25#include "zorbatypes/m_apm.h"
26#include "zorbatypes/floatimpl.h"26#include "zorbatypes/float.h"
2727
28#include "diagnostics/xquery_diagnostics.h"28#include "diagnostics/xquery_diagnostics.h"
29#include "diagnostics/util_macros.h"29#include "diagnostics/util_macros.h"
3030
=== modified file 'src/zorbaserialization/serialize_template_types.h'
--- src/zorbaserialization/serialize_template_types.h 2013-04-08 00:44:26 +0000
+++ src/zorbaserialization/serialize_template_types.h 2013-05-15 23:28:28 +0000
@@ -32,7 +32,7 @@
32#include "diagnostics/assert.h"32#include "diagnostics/assert.h"
3333
34#include "zorbatypes/zstring.h"34#include "zorbatypes/zstring.h"
35#include "zorbatypes/floatimpl.h"35#include "zorbatypes/float.h"
3636
37#include "zorbautils/checked_vector.h"37#include "zorbautils/checked_vector.h"
3838
3939
=== modified file 'src/zorbaserialization/serialize_zorba_types.cpp'
--- src/zorbaserialization/serialize_zorba_types.cpp 2013-05-02 18:34:01 +0000
+++ src/zorbaserialization/serialize_zorba_types.cpp 2013-05-15 23:28:28 +0000
@@ -40,7 +40,7 @@
40#include "zorbatypes/datetime.h"40#include "zorbatypes/datetime.h"
41#include "zorbatypes/collation_manager.h"41#include "zorbatypes/collation_manager.h"
42#include "zorbatypes/integer.h"42#include "zorbatypes/integer.h"
43#include "zorbatypes/floatimpl.h"43#include "zorbatypes/float.h"
44#include "zorbatypes/binary.h"44#include "zorbatypes/binary.h"
45#include "zorbatypes/decimal.h"45#include "zorbatypes/decimal.h"
4646
4747
=== modified file 'src/zorbaserialization/serialize_zorba_types.h'
--- src/zorbaserialization/serialize_zorba_types.h 2013-04-28 05:21:15 +0000
+++ src/zorbaserialization/serialize_zorba_types.h 2013-05-15 23:28:28 +0000
@@ -22,7 +22,7 @@
2222
23#include "zorbatypes/rchandle.h"23#include "zorbatypes/rchandle.h"
24#include "zorbatypes/m_apm.h"24#include "zorbatypes/m_apm.h"
25#include "zorbatypes/floatimpl.h"25#include "zorbatypes/float.h"
26#include "zorbatypes/zorbatypes_decl.h"26#include "zorbatypes/zorbatypes_decl.h"
2727
28#include "zorbautils/checked_vector.h"28#include "zorbautils/checked_vector.h"
2929
=== modified file 'src/zorbatypes/CMakeLists.txt'
--- src/zorbatypes/CMakeLists.txt 2013-04-29 14:39:04 +0000
+++ src/zorbatypes/CMakeLists.txt 2013-05-15 23:28:28 +0000
@@ -14,7 +14,7 @@
1414
15SET(ZORBATYPES_SRCS 15SET(ZORBATYPES_SRCS
16 decimal.cpp16 decimal.cpp
17 floatimpl.cpp17 float.cpp
18 integer.cpp18 integer.cpp
19 numconversions.cpp19 numconversions.cpp
20 numeric_types.cpp20 numeric_types.cpp
2121
=== modified file 'src/zorbatypes/datetime/duration.cpp'
--- src/zorbatypes/datetime/duration.cpp 2013-05-09 00:21:51 +0000
+++ src/zorbatypes/datetime/duration.cpp 2013-05-15 23:28:28 +0000
@@ -23,7 +23,7 @@
23#include "zorbatypes/datetime/parse.h"23#include "zorbatypes/datetime/parse.h"
24#include "zorbatypes/decimal.h"24#include "zorbatypes/decimal.h"
25#include "zorbatypes/duration.h"25#include "zorbatypes/duration.h"
26#include "zorbatypes/floatimpl.h"26#include "zorbatypes/float.h"
27#include "zorbatypes/integer.h"27#include "zorbatypes/integer.h"
28#include "zorbatypes/numconversions.h"28#include "zorbatypes/numconversions.h"
29#include "zorbautils/hashfun.h"29#include "zorbautils/hashfun.h"
3030
=== modified file 'src/zorbatypes/decimal.cpp'
--- src/zorbatypes/decimal.cpp 2013-05-14 20:55:33 +0000
+++ src/zorbatypes/decimal.cpp 2013-05-15 23:28:28 +0000
@@ -23,7 +23,7 @@
23#include "util/ascii_util.h"23#include "util/ascii_util.h"
2424
25#include "decimal.h"25#include "decimal.h"
26#include "floatimpl.h"26#include "float.h"
27#include "integer.h"27#include "integer.h"
28#include "numconversions.h"28#include "numconversions.h"
2929
3030
=== renamed file 'src/zorbatypes/floatimpl.cpp' => 'src/zorbatypes/float.cpp'
--- src/zorbatypes/floatimpl.cpp 2013-05-14 17:37:12 +0000
+++ src/zorbatypes/float.cpp 2013-05-15 23:28:28 +0000
@@ -24,7 +24,7 @@
24#include "util/ascii_util.h"24#include "util/ascii_util.h"
2525
26#include "decimal.h"26#include "decimal.h"
27#include "floatimpl.h"27#include "float.h"
28#include "integer.h"28#include "integer.h"
2929
30#include "zorbaserialization/serialize_zorba_types.h"30#include "zorbaserialization/serialize_zorba_types.h"
3131
=== renamed file 'src/zorbatypes/floatimpl.h' => 'src/zorbatypes/float.h'
--- src/zorbatypes/floatimpl.h 2013-05-04 17:29:21 +0000
+++ src/zorbatypes/float.h 2013-05-15 23:28:28 +0000
@@ -15,8 +15,8 @@
15 */15 */
1616
17#pragma once17#pragma once
18#ifndef ZORBA_FLOATIMPL_H18#ifndef ZORBA_FLOAT_H
19#define ZORBA_FLOATIMPL_H19#define ZORBA_FLOAT_H
2020
21#include <cmath>21#include <cmath>
22#include <limits>22#include <limits>
@@ -989,7 +989,7 @@
989989
990} // namespace zorba990} // namespace zorba
991991
992#endif // ZORBA_FLOATIMPL_H992#endif // ZORBA_FLOAT_H
993/*993/*
994 * Local variables:994 * Local variables:
995 * mode: c++995 * mode: c++
996996
=== modified file 'src/zorbatypes/integer.cpp'
--- src/zorbatypes/integer.cpp 2013-05-14 03:55:56 +0000
+++ src/zorbatypes/integer.cpp 2013-05-15 23:28:28 +0000
@@ -27,7 +27,7 @@
2727
28// local28// local
29#include "decimal.h"29#include "decimal.h"
30#include "floatimpl.h"30#include "float.h"
31#include "integer.h"31#include "integer.h"
32#include "numconversions.h"32#include "numconversions.h"
3333
3434
=== modified file 'src/zorbatypes/numconversions.cpp'
--- src/zorbatypes/numconversions.cpp 2013-05-08 20:14:47 +0000
+++ src/zorbatypes/numconversions.cpp 2013-05-15 23:28:28 +0000
@@ -24,7 +24,7 @@
2424
25// local25// local
26#include "decimal.h"26#include "decimal.h"
27#include "floatimpl.h"27#include "float.h"
28#include "integer.h"28#include "integer.h"
29#include "numconversions.h"29#include "numconversions.h"
3030
3131
=== modified file 'src/zorbatypes/numeric_types.cpp'
--- src/zorbatypes/numeric_types.cpp 2013-04-29 14:39:04 +0000
+++ src/zorbatypes/numeric_types.cpp 2013-05-15 23:28:28 +0000
@@ -18,7 +18,7 @@
1818
19// local19// local
20#include "decimal.h"20#include "decimal.h"
21#include "floatimpl.h"21#include "float.h"
22#include "integer.h"22#include "integer.h"
2323
24using namespace std;24using namespace std;

Subscribers

People subscribed via source and target branches