[llvm-commits] [test-suite] r53838 - in /test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/city: direction.cpp direction.h intersection.cpp intersection.h roadlet.cpp roadlet.h vehicle.h
Nick Lewycky
nicholas at mxc.ca
Sun Jul 20 23:00:58 PDT 2008
Author: nicholas
Date: Mon Jul 21 01:00:57 2008
New Revision: 53838
URL: http://llvm.org/viewvc/llvm-project?rev=53838&view=rev
Log:
Add missing include.
Const correct this code. "foo" is const-qualified.
Modified:
test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/city/direction.cpp
test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/city/direction.h
test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/city/intersection.cpp
test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/city/intersection.h
test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/city/roadlet.cpp
test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/city/roadlet.h
test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/city/vehicle.h
Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/city/direction.cpp
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C%2B%2B/city/direction.cpp?rev=53838&r1=53837&r2=53838&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/city/direction.cpp (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/city/direction.cpp Mon Jul 21 01:00:57 2008
@@ -2,10 +2,10 @@
#include "direction.h"
-char *direction::as_string()
+const char *direction::as_string()
{
- char *dirs[] = { "N", "NE", "E", "SE", "S", "SW", "W", "NW",
- "No direction"};
+ const char *dirs[] = { "N", "NE", "E", "SE", "S", "SW", "W", "NW",
+ "No direction"};
return(dirs[dir]);
}
int operator== (direction d1, direction d2)
Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/city/direction.h
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C%2B%2B/city/direction.h?rev=53838&r1=53837&r2=53838&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/city/direction.h (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/city/direction.h Mon Jul 21 01:00:57 2008
@@ -15,7 +15,7 @@
direction(int i) {dir = i % 9;};
int as_int() {return (dir);};
- char *as_string();
+ const char *as_string();
direction right_front() {return(direction((dir + 1) % 8));};
direction right() {return(direction((dir + 2) % 8));};
direction right_back() {return(direction((dir + 3) % 8));};
Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/city/intersection.cpp
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C%2B%2B/city/intersection.cpp?rev=53838&r1=53837&r2=53838&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/city/intersection.cpp (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/city/intersection.cpp Mon Jul 21 01:00:57 2008
@@ -2,7 +2,7 @@
#include "intersection.h"
#include <cstdlib>
-
+#include <cstring>
void intersection_4x4::connectNin (roadlet *leftlane, roadlet *rightlane)
{
@@ -50,7 +50,7 @@
}
-intersection_4x4::intersection_4x4(char *name)
+intersection_4x4::intersection_4x4(const char *name)
{
char *buff;
Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/city/intersection.h
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C%2B%2B/city/intersection.h?rev=53838&r1=53837&r2=53838&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/city/intersection.h (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/city/intersection.h Mon Jul 21 01:00:57 2008
@@ -36,7 +36,7 @@
roadlet *roadlets[4][4];
public:
- intersection_4x4(char *name);
+ intersection_4x4(const char *name);
void connectSin(roadlet*, roadlet*) ;
void connectNout(roadlet*, roadlet*);
void connectNin(roadlet*, roadlet*);
Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/city/roadlet.cpp
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C%2B%2B/city/roadlet.cpp?rev=53838&r1=53837&r2=53838&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/city/roadlet.cpp (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/city/roadlet.cpp Mon Jul 21 01:00:57 2008
@@ -3,7 +3,7 @@
#include <iostream>
#include "roadlet.h"
-void roadlet::init(char *n)
+void roadlet::init(const char *n)
{
occupant = 0;
neighbors[0] = neighbors[1] = neighbors[2] = neighbors[3] = 0;
Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/city/roadlet.h
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C%2B%2B/city/roadlet.h?rev=53838&r1=53837&r2=53838&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/city/roadlet.h (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/city/roadlet.h Mon Jul 21 01:00:57 2008
@@ -15,10 +15,10 @@
class roadlet
{
private:
- void init(char *n);
+ void init(const char *n);
protected:
- char *name;
+ const char *name;
vehicle *occupant;
roadlet *neighbors[8];
move_function the_moves[8];
@@ -27,7 +27,7 @@
roadlet() {
init("unnamed");
};
- roadlet(char *n) {
+ roadlet(const char *n) {
init(n);
};
int occupied() { return(occupiedby() != NULL);};
@@ -52,7 +52,7 @@
light *l;
public:
- intersection_roadlet(char *name, light *alight) : roadlet(name) {l = alight;} ;
+ intersection_roadlet(const char *name, light *alight) : roadlet(name) {l = alight;} ;
light *get_light() { return(l);};
};
Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/city/vehicle.h
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C%2B%2B/city/vehicle.h?rev=53838&r1=53837&r2=53838&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/city/vehicle.h (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/city/vehicle.h Mon Jul 21 01:00:57 2008
@@ -10,10 +10,10 @@
private:
enum { DEFAULT_SPEED = 100 };
roadlet *location;
- char *name;
+ const char *name;
int speed;
int move_points; // move units accumulated towards moving
- void init(roadlet *l, char *n, int s)
+ void init(roadlet *l, const char *n, int s)
{plan=-1,location=l, name=n, speed=s, move_points=0, dir = N;};
protected:
@@ -23,7 +23,7 @@
public:
vehicle() {init(NULL, NULL, DEFAULT_SPEED);};
- vehicle(char *n) {init(NULL, n, DEFAULT_SPEED);};
+ vehicle(const char *n) {init(NULL, n, DEFAULT_SPEED);};
vehicle(roadlet *r, char *n) {init(r, n, DEFAULT_SPEED);};
vehicle(roadlet *r, char *n, int s) {init(r, n, s);};
// others include: r, s, rs, sr, ....
@@ -42,7 +42,7 @@
{
public:
car() : vehicle() { };
- car(char *n) : vehicle(n) { };
+ car(const char *n) : vehicle(n) { };
friend ostream& operator<< (ostream&, car);
};
More information about the llvm-commits
mailing list