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
|
diff -aur -bZwB cadabra-1.33.old/gui/Makefile.in cadabra-1.33/gui/Makefile.in
--- cadabra-1.33.old/gui/Makefile.in 2016-03-02 07:13:04.277941346 -0500
+++ cadabra-1.33/gui/Makefile.in 2016-03-02 07:13:08.864580761 -0500
@@ -14,7 +14,7 @@
TIMESTAMP = -D"RELEASE=\"${RELEASE}\"" -D"DATETIME=\"`date | sed -e 's/ / /'`\"" -DHOSTNAME=\"`hostname`\"
%.o: %.cc
- @CXX@ -Wall @CFLAGS@ -D"DESTDIR=\"@prefix@\"" ${TIMESTAMP} ${CFLAGS} -c -o $@ $<
+ @CXX@ -Wall @CXXFLAGS@ -D"DESTDIR=\"@prefix@\"" ${TIMESTAMP} ${CFLAGS} -c -o $@ $<
main.o: $(OBJS) Makefile
@@ -50,7 +50,7 @@
.depend:
rm -f .depend
for i in ${SRCS}; \
- do g++ -E -MM -MT `echo $$i | sed -e 's/\.\///' -e 's/\.cc/\.o/'` ${CFLAGS} $$i >> .depend; \
+ do @CXX@ @CXXFLAGS@ -E -MM -MT `echo $$i | sed -e 's/\.\///' -e 's/\.cc/\.o/'` ${CFLAGS} $$i >> .depend; \
done
include .depend
diff -aur -bZwB cadabra-1.33.old/src/Makefile.in cadabra-1.33/src/Makefile.in
--- cadabra-1.33.old/src/Makefile.in 2016-03-02 07:13:04.277941346 -0500
+++ cadabra-1.33/src/Makefile.in 2016-03-02 07:13:08.864580761 -0500
@@ -27,7 +27,7 @@
%.o: %.cc
- @CXX@ ${MCFLAGS} ${TIMESTAMP} -c -o $@ $<
+ @CXX@ @CXXFLAGS@ ${MCFLAGS} ${TIMESTAMP} -c -o $@ $<
modules/xperm.o: modules/xperm.c
@CC@ @NESTED@ ${MCFLAGS} ${TIMESTAMP} -c -o $@ $<
@@ -53,7 +53,7 @@
cadabra_static: $(OBJS) $(MOBJS)
rm -f main.o
- @CXX@ -Wall -g ${MCFLAGS} ${TIMESTAMP} -DSTATICBUILD -c -o main.o main.cc
+ @CXX@ @CXXFLAGS@ -Wall -g ${MCFLAGS} ${TIMESTAMP} -DSTATICBUILD -c -o main.o main.cc
ifeq ($(strip $(MACTEST)),)
@CXX@ -o cadabra -static $+ ${LDFLAGS} `pkg-config modglue --libs` -lmodglue \
-lgmpxx -lgmp -lpcrecpp -lpcre \
@@ -170,7 +170,7 @@
.depend:
rm -f .depend
for i in ${SRCS}; \
- do @CXX@ ${MCFLAGS} -E -MM -MT `echo $$i | sed -e 's/\.\///' -e 's/\.cc/\.o/'` ${CFLAGS} $$i >> .depend; \
+ do @CXX@ @CXXFLAGS@ ${MCFLAGS} -E -MM -MT `echo $$i | sed -e 's/\.\///' -e 's/\.cc/\.o/'` ${CFLAGS} $$i >> .depend; \
done
include .depend
diff -aur -bZwB cadabra-1.33.old/src/manipulator.cc cadabra-1.33/src/manipulator.cc
--- cadabra-1.33.old/src/manipulator.cc 2016-03-02 07:13:04.277941346 -0500
+++ cadabra-1.33/src/manipulator.cc 2016-03-02 07:14:09.617682321 -0500
@@ -283,7 +283,7 @@
if(getline_precut_buffer.size()==0 || getline_was_eof) {
std::string input_now;
getline_was_eof=false;
- if(std::getline(str, input_now)==false)
+ if(std::getline(str, input_now).fail())
return false;
getline_precut_buffer+=input_now;
}
diff -aur -bZwB cadabra-1.33.old/src/manipulator.hh cadabra-1.33/src/manipulator.hh
--- cadabra-1.33.old/src/manipulator.hh 2016-03-02 07:13:04.277941346 -0500
+++ cadabra-1.33/src/manipulator.hh 2016-03-02 07:13:08.864580761 -0500
@@ -21,17 +21,17 @@
#ifndef manipulator_hh_
#define manipulator_hh_
-#include "storage.hh"
#include "algorithm.hh"
#include "display.hh"
-#include <string>
-#include <map>
-#include <iostream>
+#include "storage.hh"
#include <fstream>
-#include <utility>
-#include <stack>
-#include <sigc++/object.h>
+#include <iostream>
+#include <map>
#include <modglue/pipe.hh>
+#include <sigc++/sigc++.h>
+#include <stack>
+#include <string>
+#include <utility>
// These are initiated in main.cc
extern std::ostream *real_txtout;
@@ -65,8 +65,8 @@
exit_exception();
};
-
-/// Singleton object which pulls in data from the input streams, handles switching
+/// Singleton object which pulls in data from the input streams, handles
+/// switching
/// between streams, feeds data to the parser, and calls the algorithm objects
/// to perform action on the expression tree.
class manipulator : public sigc::trackable {
@@ -109,15 +109,18 @@
std::stack<std::istream *> streamstack;
- void output_comment(const std::string& comment) const; // wrap in xml nodes if necessary
+ void output_comment(
+ const std::string &comment) const; // wrap in xml nodes if necessary
void output_status() const;
void read_program_file();
- /// Cleans up the stream at the top of streamstack. If it derives from ifstream,
+ /// Cleans up the stream at the top of streamstack. If it derives from
+ /// ifstream,
/// will call close on it as well. Pops the stream off the stack.
void cleanup_stream();
- /// Replace \\argv[n] in the input with the n-th command line argument as stored
+ /// Replace \\argv[n] in the input with the n-th command line argument as
+ /// stored
/// in the global cmdline_arguments vector.
void replace_cmdline_args(std::string& oneline);
@@ -140,7 +143,8 @@
exptree::iterator apply_post_default_rules_(exptree::iterator);
void extract_properties_(exptree::iterator);
exptree::iterator run_procedure(exptree::iterator, long);
- bool handle_external_commands_(exptree::iterator&, exptree::iterator, exptree::iterator&);
+ bool handle_external_commands_(exptree::iterator &, exptree::iterator,
+ exptree::iterator &);
std::string texify(const std::string&) const;
/// Class to hold information about a dynamically added algorithm class.
Only in cadabra-1.33/src: manipulator.hh.orig
diff -aur -bZwB cadabra-1.33.old/src/modules/substitute.cc cadabra-1.33/src/modules/substitute.cc
--- cadabra-1.33.old/src/modules/substitute.cc 2016-03-02 07:13:04.277941346 -0500
+++ cadabra-1.33/src/modules/substitute.cc 2016-03-02 07:13:56.064395400 -0500
@@ -876,7 +876,7 @@
}
std::string nm=*to_->name + fnd->first.begin()->name->substr(from_->name->size());
nset_t::iterator to_it=name_set.insert(nm).first;
- to_rename.insert(std::make_pair(to_it, fnd->second));
+ to_rename.insert(index_map_t::value_type((const exptree)to_it, fnd->second));
}
++fnd;
}
@@ -885,7 +885,7 @@
std::pair<index_map_t::iterator, index_map_t::iterator> eq=ind_free.equal_range(exptree(from_));
index_map_t::iterator fnd=eq.first;
while(fnd!=eq.second) {
- to_rename.insert(std::make_pair(to_->name, fnd->second));
+ to_rename.insert(index_map_t::value_type((const exptree)to_->name, fnd->second));
++fnd;
}
}
|