Lil-Ran/pycdc_fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Activity

Use less conflicting filenames

Browse Source
This commit is contained in:
Michael Hansen
2011-10-23 17:48:10 -07:00
parent 99662d8119
commit c474d368a1
20 changed files with 95 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ASTNode.h
View File

@@ -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... *

2
ASTree.cpp
View File

@@ -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) */

43
Makefile
View File

@@ -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 $@

2
bytecode.cpp
View File

@@ -1,5 +1,5 @@
#include "pyc_numeric.h"
#include "bytecode.h"
#include "numeric.h"
#ifdef _MSC_VER
#define snprintf _snprintf

4
bytecode.h
View File

@@ -1,5 +1,5 @@
#include "code.h"
#include "module.h"
#include "pyc_code.h"
#include "pyc_module.h"
#include "data.h"
namespace Pyc {

4
code.cpp → pyc_code.cpp
View File

@@ -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)
{

4
code.h → pyc_code.h
View File

@@ -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:

2
module.cpp → pyc_module.cpp
View File

@@ -1,4 +1,4 @@
#include "module.h"
#include "pyc_module.h"
#include "data.h"
PycModule::PycModule()

2
module.h → pyc_module.h
View File

@@ -1,7 +1,7 @@
#ifndef _PYC_MODULE_H
#define _PYC_MODULE_H
#include "code.h"
#include "pyc_code.h"
#include <list>
enum PycMagic {

4
numeric.cpp → pyc_numeric.cpp
View File

@@ -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

2
numeric.h → pyc_numeric.h
View File

@@ -1,7 +1,7 @@
#ifndef _PYC_NUMERIC_H
#define _PYC_NUMERIC_H
#include "object.h"
#include "pyc_object.h"
#include <list>
#include <string>

11
object.cpp → pyc_object.cpp
View File

@@ -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);

0
object.h → pyc_object.h
View File

4
sequence.cpp → pyc_sequence.cpp
View File

@@ -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)

2
sequence.h → pyc_sequence.h
View File

@@ -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>

4
string.cpp → pyc_string.cpp
View File

@@ -1,6 +1,6 @@
#include "string.h"
#include "pyc_string.h"
#include "pyc_module.h"
#include "data.h"
#include "module.h"
#include <cstring>
/* PycString */

2
string.h → pyc_string.h
View File

@@ -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 {

4
pycdas.cpp
View File

@@ -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 '\\'

60
pycdas.vcproj
View File

@@ -261,14 +261,6 @@
RelativePath=".\bytecode.h"
>
</File>
<File
RelativePath=".\code.cpp"
>
</File>
<File
RelativePath=".\code.h"
>
</File>
<File
RelativePath=".\data.cpp"
>
@@ -282,49 +274,57 @@
>
</File>
<File
RelativePath=".\module.cpp"
RelativePath=".\pyc_code.cpp"
>
</File>
<File
RelativePath=".\module.h"
RelativePath=".\pyc_code.h"
>
</File>
<File
RelativePath=".\numeric.cpp"
RelativePath=".\pyc_module.cpp"
>
</File>
<File
RelativePath=".\numeric.h"
RelativePath=".\pyc_module.h"
>
</File>
<File
RelativePath=".\object.cpp"
RelativePath=".\pyc_numeric.cpp"
>
</File>
<File
RelativePath=".\object.h"
RelativePath=".\pyc_numeric.h"
>
</File>
<File
RelativePath=".\pyc_object.cpp"
>
</File>
<File
RelativePath=".\pyc_object.h"
>
</File>
<File
RelativePath=".\pyc_sequence.cpp"
>
</File>
<File
RelativePath=".\pyc_sequence.h"
>
</File>
<File
RelativePath=".\pyc_string.cpp"
>
</File>
<File
RelativePath=".\pyc_string.h"
>
</File>
<File
RelativePath=".\pycdas.cpp"
>
</File>
<File
RelativePath=".\sequence.cpp"
>
</File>
<File
RelativePath=".\sequence.h"
>
</File>
<File
RelativePath=".\string.cpp"
>
</File>
<File
RelativePath=".\string.h"
>
</File>
</Files>
<Globals>
</Globals>

60
pycdc.vcproj
View File

@@ -261,14 +261,6 @@
RelativePath=".\bytecode.h"
>
</File>
<File
RelativePath=".\code.cpp"
>
</File>
<File
RelativePath=".\code.h"
>
</File>
<File
RelativePath=".\data.cpp"
>
@@ -282,49 +274,57 @@
>
</File>
<File
RelativePath=".\module.cpp"
RelativePath=".\pyc_code.cpp"
>
</File>
<File
RelativePath=".\module.h"
RelativePath=".\pyc_code.h"
>
</File>
<File
RelativePath=".\numeric.cpp"
RelativePath=".\pyc_module.cpp"
>
</File>
<File
RelativePath=".\numeric.h"
RelativePath=".\pyc_module.h"
>
</File>
<File
RelativePath=".\object.cpp"
RelativePath=".\pyc_numeric.cpp"
>
</File>
<File
RelativePath=".\object.h"
RelativePath=".\pyc_numeric.h"
>
</File>
<File
RelativePath=".\pyc_object.cpp"
>
</File>
<File
RelativePath=".\pyc_object.h"
>
</File>
<File
RelativePath=".\pyc_sequence.cpp"
>
</File>
<File
RelativePath=".\pyc_sequence.h"
>
</File>
<File
RelativePath=".\pyc_string.cpp"
>
</File>
<File
RelativePath=".\pyc_string.h"
>
</File>
<File
RelativePath=".\pycdc.cpp"
>
</File>
<File
RelativePath=".\sequence.cpp"
>
</File>
<File
RelativePath=".\sequence.h"
>
</File>
<File
RelativePath=".\string.cpp"
>
</File>
<File
RelativePath=".\string.h"
>
</File>
</Files>
<Globals>
</Globals>