Use less conflicting filenames

ahaensler · Oct 24, 2011 · c474d36 · c474d36
1 parent 99662d8
commit c474d36
Show file tree

Hide file tree

Showing 20 changed files with 67 additions and 95 deletions.
diff --git a/ASTNode.h b/ASTNode.h
@@ -1,7 +1,7 @@
 #ifndef _PYC_ASTNODE_H
 #define _PYC_ASTNODE_H
 
-#include "module.h"
+#include "pyc_module.h"
 #include <list>
 
 /* Similar interface to PycObject, so PycRef can work on it... *

diff --git a/ASTree.cpp b/ASTree.cpp
@@ -1,7 +1,7 @@
 #include "ASTree.h"
 #include "FastStack.h"
+#include "pyc_numeric.h"
 #include "bytecode.h"
-#include "numeric.h"
 
 /* Use this to determine if an error occurred (and therefore, if we should
  * avoid cleaning the output tree) */

diff --git a/Makefile b/Makefile
@@ -5,14 +5,14 @@ LDFLAGS =
 #LDFLAGS += -lgcov
 
 COMMON = \
-	out/module.o \
 	out/data.o \
 	out/bytecode.o \
-	out/object.o \
-	out/numeric.o \
-	out/code.o \
-	out/sequence.o \
-	out/string.o \
+	out/pyc_module.o \
+	out/pyc_object.o \
+	out/pyc_numeric.o \
+	out/pyc_code.o \
+	out/pyc_sequence.o \
+	out/pyc_string.o \
 	out/ASTree.o \
 	out/ASTNode.o \
 
@@ -79,35 +79,8 @@ bin/pycdas: pycdas.cpp $(COMMON) $(BYTES)
 bin/pycdc: pycdc.cpp $(COMMON) $(BYTES)
 	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(COMMON) $(BYTES) pycdc.cpp -o $@
 
-out/module.o: module.h module.cpp
-	$(CXX) $(CXXFLAGS) -c module.cpp -o $@
-
-out/data.o: data.h data.cpp
-	$(CXX) $(CXXFLAGS) -c data.cpp -o $@
-
-out/bytecode.o: bytecode.h bytecode.cpp
-	$(CXX) $(CXXFLAGS) -c bytecode.cpp -o $@
-
-out/object.o: object.h object.cpp
-	$(CXX) $(CXXFLAGS) -c object.cpp -o $@
-
-out/numeric.o: numeric.h numeric.cpp
-	$(CXX) $(CXXFLAGS) -c numeric.cpp -o $@
-
-out/code.o: code.h code.cpp
-	$(CXX) $(CXXFLAGS) -c code.cpp -o $@
-
-out/sequence.o: sequence.h sequence.cpp
-	$(CXX) $(CXXFLAGS) -c sequence.cpp -o $@
-
-out/string.o: string.h string.cpp
-	$(CXX) $(CXXFLAGS) -c string.cpp -o $@
-
-out/ASTree.o: ASTree.h ASTree.cpp
-	$(CXX) $(CXXFLAGS) -c ASTree.cpp -o $@
-
-out/ASTNode.o: ASTNode.h ASTNode.cpp
-	$(CXX) $(CXXFLAGS) -c ASTNode.cpp -o $@
+out/%.o: %.cpp %.h
+	$(CXX) $(CXXFLAGS) -c $< -o $@
 
 out/python_%.o: bytes/python_%.cpp
 	$(CXX) $(CXXFLAGS) -c $< -o $@

diff --git a/bytecode.cpp b/bytecode.cpp
@@ -1,5 +1,5 @@
+#include "pyc_numeric.h"
 #include "bytecode.h"
-#include "numeric.h"
 
 #ifdef _MSC_VER
 #define snprintf _snprintf

diff --git a/bytecode.h b/bytecode.h
@@ -1,5 +1,5 @@
-#include "code.h"
-#include "module.h"
+#include "pyc_code.h"
+#include "pyc_module.h"
 #include "data.h"
 
 namespace Pyc {

diff --git a/code.cpp → pyc_code.cpp b/code.cpp → pyc_code.cpp
@@ -1,6 +1,6 @@
-#include "code.h"
+#include "pyc_code.h"
+#include "pyc_module.h"
 #include "data.h"
-#include "module.h"
 
 void PycCode::load(PycData* stream, PycModule* mod)
 {

diff --git a/code.h → pyc_code.h b/code.h → pyc_code.h
@@ -1,8 +1,8 @@
 #ifndef _PYC_CODE_H
 #define _PYC_CODE_H
 
-#include "sequence.h"
-#include "string.h"
+#include "pyc_sequence.h"
+#include "pyc_string.h"
 
 class PycCode : public PycObject {
 public:

diff --git a/module.cpp → pyc_module.cpp b/module.cpp → pyc_module.cpp
@@ -1,4 +1,4 @@
-#include "module.h"
+#include "pyc_module.h"
 #include "data.h"
 
 PycModule::PycModule()

diff --git a/module.h → pyc_module.h b/module.h → pyc_module.h
@@ -1,7 +1,7 @@
 #ifndef _PYC_MODULE_H
 #define _PYC_MODULE_H
 
-#include "code.h"
+#include "pyc_code.h"
 #include <list>
 
 enum PycMagic {

diff --git a/numeric.cpp → pyc_numeric.cpp b/numeric.cpp → pyc_numeric.cpp
@@ -1,6 +1,6 @@
-#include "numeric.h"
+#include "pyc_numeric.h"
+#include "pyc_module.h"
 #include "data.h"
-#include "module.h"
 #include <cstring>
 
 #ifdef _MSC_VER

diff --git a/numeric.h → pyc_numeric.h b/numeric.h → pyc_numeric.h
@@ -1,7 +1,7 @@
 #ifndef _PYC_NUMERIC_H
 #define _PYC_NUMERIC_H
 
-#include "object.h"
+#include "pyc_object.h"
 #include <list>
 #include <string>
 

diff --git a/object.cpp → pyc_object.cpp b/object.cpp → pyc_object.cpp
@@ -1,10 +1,9 @@
-#include "object.h"
-
-#include <cstdio>
+#include "pyc_object.h"
+#include "pyc_module.h"
+#include "pyc_numeric.h"
+#include "pyc_code.h"
 #include "data.h"
-#include "module.h"
-#include "numeric.h"
-#include "code.h"
+#include <cstdio>
 
 PycRef<PycObject> Pyc_NULL = (PycObject*)0;
 PycRef<PycObject> Pyc_None = new PycObject(PycObject::TYPE_NONE);

diff --git a/object.h → pyc_object.h b/object.h → pyc_object.h
diff --git a/sequence.cpp → pyc_sequence.cpp b/sequence.cpp → pyc_sequence.cpp
@@ -1,6 +1,6 @@
-#include "sequence.h"
+#include "pyc_sequence.h"
+#include "pyc_module.h"
 #include "data.h"
-#include "module.h"
 
 /* PycTuple */
 void PycTuple::load(PycData* stream, PycModule* mod)

diff --git a/sequence.h → pyc_sequence.h b/sequence.h → pyc_sequence.h
@@ -1,7 +1,7 @@
 #ifndef _PYC_SEQUENCE_H
 #define _PYC_SEQUENCE_H
 
-#include "object.h"
+#include "pyc_object.h"
 #include <vector>
 #include <list>
 #include <set>

diff --git a/string.cpp → pyc_string.cpp b/string.cpp → pyc_string.cpp
@@ -1,6 +1,6 @@
-#include "string.h"
+#include "pyc_string.h"
+#include "pyc_module.h"
 #include "data.h"
-#include "module.h"
 #include <cstring>
 
 /* PycString */

diff --git a/string.h → pyc_string.h b/string.h → pyc_string.h
@@ -1,7 +1,7 @@
 #ifndef _PYC_STRING_H
 #define _PYC_STRING_H
 
-#include "object.h"
+#include "pyc_object.h"
 #include <cstdio>
 
 class PycString : public PycObject {

diff --git a/pycdas.cpp b/pycdas.cpp
@@ -1,9 +1,9 @@
 #include <cstdio>
 #include <cstring>
 #include <cstdarg>
-#include "module.h"
+#include "pyc_module.h"
+#include "pyc_numeric.h"
 #include "bytecode.h"
-#include "numeric.h"
 
 #ifdef WIN32
 #  define PATHSEP '\\'

diff --git a/pycdas.vcproj b/pycdas.vcproj
@@ -262,67 +262,67 @@
 			>
 		</File>
 		<File
-			RelativePath=".\code.cpp"
+			RelativePath=".\data.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\code.h"
+			RelativePath=".\data.h"
 			>
 		</File>
 		<File
-			RelativePath=".\data.cpp"
+			RelativePath=".\FastStack.h"
 			>
 		</File>
 		<File
-			RelativePath=".\data.h"
+			RelativePath=".\pyc_code.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\FastStack.h"
+			RelativePath=".\pyc_code.h"
 			>
 		</File>
 		<File
-			RelativePath=".\module.cpp"
+			RelativePath=".\pyc_module.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\module.h"
+			RelativePath=".\pyc_module.h"
 			>
 		</File>
 		<File
-			RelativePath=".\numeric.cpp"
+			RelativePath=".\pyc_numeric.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\numeric.h"
+			RelativePath=".\pyc_numeric.h"
 			>
 		</File>
 		<File
-			RelativePath=".\object.cpp"
+			RelativePath=".\pyc_object.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\object.h"
+			RelativePath=".\pyc_object.h"
 			>
 		</File>
 		<File
-			RelativePath=".\pycdas.cpp"
+			RelativePath=".\pyc_sequence.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\sequence.cpp"
+			RelativePath=".\pyc_sequence.h"
 			>
 		</File>
 		<File
-			RelativePath=".\sequence.h"
+			RelativePath=".\pyc_string.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\string.cpp"
+			RelativePath=".\pyc_string.h"
 			>
 		</File>
 		<File
-			RelativePath=".\string.h"
+			RelativePath=".\pycdas.cpp"
 			>
 		</File>
 	</Files>

diff --git a/pycdc.vcproj b/pycdc.vcproj
@@ -262,67 +262,67 @@
 			>
 		</File>
 		<File
-			RelativePath=".\code.cpp"
+			RelativePath=".\data.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\code.h"
+			RelativePath=".\data.h"
 			>
 		</File>
 		<File
-			RelativePath=".\data.cpp"
+			RelativePath=".\FastStack.h"
 			>
 		</File>
 		<File
-			RelativePath=".\data.h"
+			RelativePath=".\pyc_code.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\FastStack.h"
+			RelativePath=".\pyc_code.h"
 			>
 		</File>
 		<File
-			RelativePath=".\module.cpp"
+			RelativePath=".\pyc_module.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\module.h"
+			RelativePath=".\pyc_module.h"
 			>
 		</File>
 		<File
-			RelativePath=".\numeric.cpp"
+			RelativePath=".\pyc_numeric.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\numeric.h"
+			RelativePath=".\pyc_numeric.h"
 			>
 		</File>
 		<File
-			RelativePath=".\object.cpp"
+			RelativePath=".\pyc_object.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\object.h"
+			RelativePath=".\pyc_object.h"
 			>
 		</File>
 		<File
-			RelativePath=".\pycdc.cpp"
+			RelativePath=".\pyc_sequence.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\sequence.cpp"
+			RelativePath=".\pyc_sequence.h"
 			>
 		</File>
 		<File
-			RelativePath=".\sequence.h"
+			RelativePath=".\pyc_string.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\string.cpp"
+			RelativePath=".\pyc_string.h"
 			>
 		</File>
 		<File
-			RelativePath=".\string.h"
+			RelativePath=".\pycdc.cpp"
 			>
 		</File>
 	</Files>