From 961c5e99e1191f44fb192d226119877f695a84ce Mon Sep 17 00:00:00 2001 From: Siu Kwan Lam Date: Sun, 3 Feb 2013 15:09:07 -0600 Subject: [PATCH] Re-organize --- newbinding/Makefile | 6 +++--- newbinding/{ => gen}/binding.py | 0 newbinding/{ => gen}/codegen.py | 0 newbinding/{ => gen}/gen.py | 4 ++-- newbinding/src/{ => ADT}/SmallVector.py | 2 +- newbinding/src/{ => ADT}/StringRef.py | 2 +- newbinding/src/{ => ADT}/Triple.py | 2 +- newbinding/src/ADT/__init__.py | 10 ++++++++++ .../AssemblyAnnotationWriter.py | 2 +- newbinding/src/Assembly/__init__.py | 10 ++++++++++ newbinding/src/BasicBlock.py | 2 +- .../src/{ => CodeGen}/MachineCodeInfo.py | 2 +- newbinding/src/CodeGen/__init__.py | 10 ++++++++++ newbinding/src/DataLayout.py | 4 ++-- newbinding/src/DerivedTypes.py | 2 +- newbinding/src/EngineBuilder.py | 10 +++++----- .../{ => ExecutionEngine}/ExecutionEngine.py | 20 +++++++++---------- newbinding/src/ExecutionEngine/__init__.py | 10 ++++++++++ newbinding/src/IRBuilder.py | 4 ++-- newbinding/src/Module.py | 6 +++--- newbinding/src/Pass.py | 2 +- newbinding/src/{ => Support}/CodeGen.py | 2 +- newbinding/src/Support/MemoryBuffer.py | 9 +++++++++ newbinding/src/{ => Support}/Target.py | 4 ++-- newbinding/src/{ => Support}/TargetSelect.py | 4 ++-- newbinding/src/Support/__init__.py | 10 ++++++++++ newbinding/src/{ => Support}/raw_ostream.py | 6 +++--- .../src/{ => Target}/TargetLibraryInfo.py | 8 ++++---- newbinding/src/{ => Target}/TargetMachine.py | 16 +++++++-------- newbinding/src/Target/__init__.py | 10 ++++++++++ newbinding/src/TargetTransformInfo.py | 2 ++ newbinding/src/Transforms/IPO.py | 2 +- .../{ => Transforms}/PassManagerBuilder.py | 8 ++++---- newbinding/src/Type.py | 4 ++-- newbinding/src/Value.py | 6 +++--- newbinding/src/__init__.py | 2 +- newbinding/{ => src}/namespace.py | 0 37 files changed, 137 insertions(+), 66 deletions(-) rename newbinding/{ => gen}/binding.py (100%) rename newbinding/{ => gen}/codegen.py (100%) rename newbinding/{ => gen}/gen.py (98%) rename newbinding/src/{ => ADT}/SmallVector.py (92%) rename newbinding/src/{ => ADT}/StringRef.py (76%) rename newbinding/src/{ => ADT}/Triple.py (98%) create mode 100644 newbinding/src/ADT/__init__.py rename newbinding/src/{ => Assembly}/AssemblyAnnotationWriter.py (81%) create mode 100644 newbinding/src/Assembly/__init__.py rename newbinding/src/{ => CodeGen}/MachineCodeInfo.py (91%) create mode 100644 newbinding/src/CodeGen/__init__.py rename newbinding/src/{ => ExecutionEngine}/ExecutionEngine.py (89%) create mode 100644 newbinding/src/ExecutionEngine/__init__.py rename newbinding/src/{ => Support}/CodeGen.py (93%) create mode 100644 newbinding/src/Support/MemoryBuffer.py rename newbinding/src/{ => Support}/Target.py (89%) rename newbinding/src/{ => Support}/TargetSelect.py (54%) create mode 100644 newbinding/src/Support/__init__.py rename newbinding/src/{ => Support}/raw_ostream.py (73%) rename newbinding/src/{ => Target}/TargetLibraryInfo.py (95%) rename newbinding/src/{ => Target}/TargetMachine.py (72%) create mode 100644 newbinding/src/Target/__init__.py rename newbinding/src/{ => Transforms}/PassManagerBuilder.py (88%) rename newbinding/{ => src}/namespace.py (100%) diff --git a/newbinding/Makefile b/newbinding/Makefile index 8573235..0e7924f 100644 --- a/newbinding/Makefile +++ b/newbinding/Makefile @@ -5,15 +5,15 @@ all: _api.so _capsule.so _api.so _capsule.so: api.cpp capsule.cpp $(PYTHON) setup.py build_ext --inplace -api.cpp api.py: src/*.py include/llvm_binding/*.h gen.py binding.py - $(PYTHON) gen.py api src +api.cpp api.py: src/*.py include/llvm_binding/*.h gen/gen.py gen/binding.py + $(PYTHON) gen/gen.py api src clean: cleantemp rm -f _api.so _capsule.so cleantemp: rm -f api.cpp api.py - rm -f src/*.pyc src/Transforms/*.pyc + rm -f src/*.pyc src/Transforms/*.pyc src/ADT/*.pyc src/Assembly/*.pyc src/CodeGen/*.pyc src/ExecutionEngine/*.pyc src/Target/*.pyc src/Transforms/*.pyc check: _api.so api.py diff --git a/newbinding/binding.py b/newbinding/gen/binding.py similarity index 100% rename from newbinding/binding.py rename to newbinding/gen/binding.py diff --git a/newbinding/codegen.py b/newbinding/gen/codegen.py similarity index 100% rename from newbinding/codegen.py rename to newbinding/gen/codegen.py diff --git a/newbinding/gen.py b/newbinding/gen/gen.py similarity index 98% rename from newbinding/gen.py rename to newbinding/gen/gen.py index 7c56452..89399f3 100644 --- a/newbinding/gen.py +++ b/newbinding/gen/gen.py @@ -1,4 +1,4 @@ -import sys +import sys, os from binding import * import codegen @@ -59,7 +59,7 @@ def wrap_println_from_file(file): def main(): outputfilename = sys.argv[1] entry_modname = sys.argv[2] - + sys.path += [os.path.dirname(os.curdir)] entry_module = __import__(entry_modname) units = [] diff --git a/newbinding/src/SmallVector.py b/newbinding/src/ADT/SmallVector.py similarity index 92% rename from newbinding/src/SmallVector.py rename to newbinding/src/ADT/SmallVector.py index 5b48aba..f52ff60 100644 --- a/newbinding/src/SmallVector.py +++ b/newbinding/src/ADT/SmallVector.py @@ -1,5 +1,5 @@ from binding import * -from namespace import llvm +from ..namespace import llvm @llvm.Class() class SmallVector_Type: diff --git a/newbinding/src/StringRef.py b/newbinding/src/ADT/StringRef.py similarity index 76% rename from newbinding/src/StringRef.py rename to newbinding/src/ADT/StringRef.py index fb3b896..e6fc8f2 100644 --- a/newbinding/src/StringRef.py +++ b/newbinding/src/ADT/StringRef.py @@ -1,5 +1,5 @@ from binding import * -from namespace import llvm +from ..namespace import llvm @llvm.Class() class StringRef: diff --git a/newbinding/src/Triple.py b/newbinding/src/ADT/Triple.py similarity index 98% rename from newbinding/src/Triple.py rename to newbinding/src/ADT/Triple.py index 0fd894e..82de57e 100644 --- a/newbinding/src/Triple.py +++ b/newbinding/src/ADT/Triple.py @@ -1,5 +1,5 @@ from binding import * -from namespace import llvm +from ..namespace import llvm from StringRef import StringRef Triple = llvm.Class() diff --git a/newbinding/src/ADT/__init__.py b/newbinding/src/ADT/__init__.py new file mode 100644 index 0000000..da0beed --- /dev/null +++ b/newbinding/src/ADT/__init__.py @@ -0,0 +1,10 @@ +import os.path, importlib + +def _init(): + for fname in os.listdir(os.path.dirname(__file__)): + if ((fname.endswith('.py') or fname.endswith('.pyc')) and + not fname.startswith('__init__')): + modname = os.path.basename(fname).rsplit('.', 1)[0] + importlib.import_module('.' + modname, __name__) + +_init() diff --git a/newbinding/src/AssemblyAnnotationWriter.py b/newbinding/src/Assembly/AssemblyAnnotationWriter.py similarity index 81% rename from newbinding/src/AssemblyAnnotationWriter.py rename to newbinding/src/Assembly/AssemblyAnnotationWriter.py index d2b5a5d..6b4d694 100644 --- a/newbinding/src/AssemblyAnnotationWriter.py +++ b/newbinding/src/Assembly/AssemblyAnnotationWriter.py @@ -1,5 +1,5 @@ from binding import * -from namespace import llvm +from ..namespace import llvm @llvm.Class() class AssemblyAnnotationWriter: diff --git a/newbinding/src/Assembly/__init__.py b/newbinding/src/Assembly/__init__.py new file mode 100644 index 0000000..da0beed --- /dev/null +++ b/newbinding/src/Assembly/__init__.py @@ -0,0 +1,10 @@ +import os.path, importlib + +def _init(): + for fname in os.listdir(os.path.dirname(__file__)): + if ((fname.endswith('.py') or fname.endswith('.pyc')) and + not fname.startswith('__init__')): + modname = os.path.basename(fname).rsplit('.', 1)[0] + importlib.import_module('.' + modname, __name__) + +_init() diff --git a/newbinding/src/BasicBlock.py b/newbinding/src/BasicBlock.py index b0716cd..61a09d7 100644 --- a/newbinding/src/BasicBlock.py +++ b/newbinding/src/BasicBlock.py @@ -3,7 +3,7 @@ from namespace import llvm from Value import Function, BasicBlock from Instruction import Instruction, TerminatorInst from LLVMContext import LLVMContext -from StringRef import StringRef +from ADT.StringRef import StringRef @BasicBlock class BasicBlock: diff --git a/newbinding/src/MachineCodeInfo.py b/newbinding/src/CodeGen/MachineCodeInfo.py similarity index 91% rename from newbinding/src/MachineCodeInfo.py rename to newbinding/src/CodeGen/MachineCodeInfo.py index 5d91e3a..fc3a1b6 100644 --- a/newbinding/src/MachineCodeInfo.py +++ b/newbinding/src/CodeGen/MachineCodeInfo.py @@ -1,5 +1,5 @@ from binding import * -from namespace import llvm +from ..namespace import llvm MachineCodeInfo = llvm.Class() diff --git a/newbinding/src/CodeGen/__init__.py b/newbinding/src/CodeGen/__init__.py new file mode 100644 index 0000000..da0beed --- /dev/null +++ b/newbinding/src/CodeGen/__init__.py @@ -0,0 +1,10 @@ +import os.path, importlib + +def _init(): + for fname in os.listdir(os.path.dirname(__file__)): + if ((fname.endswith('.py') or fname.endswith('.pyc')) and + not fname.startswith('__init__')): + modname = os.path.basename(fname).rsplit('.', 1)[0] + importlib.import_module('.' + modname, __name__) + +_init() diff --git a/newbinding/src/DataLayout.py b/newbinding/src/DataLayout.py index 74d1ad0..704c4b1 100644 --- a/newbinding/src/DataLayout.py +++ b/newbinding/src/DataLayout.py @@ -1,10 +1,10 @@ from binding import * from namespace import llvm from LLVMContext import LLVMContext -from StringRef import StringRef +from ADT.StringRef import StringRef from Module import Module from Type import Type, IntegerType, StructType -from SmallVector import SmallVector_Value +from ADT.SmallVector import SmallVector_Value from GlobalVariable import GlobalVariable from Pass import ImmutablePass diff --git a/newbinding/src/DerivedTypes.py b/newbinding/src/DerivedTypes.py index efce8b8..af9e757 100644 --- a/newbinding/src/DerivedTypes.py +++ b/newbinding/src/DerivedTypes.py @@ -2,7 +2,7 @@ from binding import * from namespace import llvm from LLVMContext import LLVMContext from Type import Type -from SmallVector import SmallVector_Type +from ADT.SmallVector import SmallVector_Type FunctionType = llvm.Class(Type) diff --git a/newbinding/src/EngineBuilder.py b/newbinding/src/EngineBuilder.py index d9594f0..4b68a25 100644 --- a/newbinding/src/EngineBuilder.py +++ b/newbinding/src/EngineBuilder.py @@ -2,11 +2,11 @@ from binding import * from namespace import llvm from Module import Module from JITMemoryManager import JITMemoryManager -from CodeGen import CodeGenOpt, Reloc, CodeModel -from StringRef import StringRef -from ExecutionEngine import ExecutionEngine -from TargetMachine import TargetMachine -from Triple import Triple +from Support.CodeGen import CodeGenOpt, Reloc, CodeModel +from ADT.StringRef import StringRef +from ExecutionEngine.ExecutionEngine import ExecutionEngine +from Target.TargetMachine import TargetMachine +from ADT.Triple import Triple EngineBuilder = llvm.Class() diff --git a/newbinding/src/ExecutionEngine.py b/newbinding/src/ExecutionEngine/ExecutionEngine.py similarity index 89% rename from newbinding/src/ExecutionEngine.py rename to newbinding/src/ExecutionEngine/ExecutionEngine.py index 5a95a16..f4bdb14 100644 --- a/newbinding/src/ExecutionEngine.py +++ b/newbinding/src/ExecutionEngine/ExecutionEngine.py @@ -1,14 +1,14 @@ from binding import * -from namespace import llvm -from Module import Module -from JITMemoryManager import JITMemoryManager -from CodeGen import CodeGenOpt, Reloc, CodeModel -from DataLayout import DataLayout -from Value import Function, GlobalValue, BasicBlock, Constant -from GlobalVariable import GlobalVariable -from MachineCodeInfo import MachineCodeInfo -from GenericValue import GenericValue -from Type import Type +from ..namespace import llvm +from ..Module import Module +from ..JITMemoryManager import JITMemoryManager +from ..Support.CodeGen import CodeGenOpt, Reloc, CodeModel +from ..DataLayout import DataLayout +from ..Value import Function, GlobalValue, BasicBlock, Constant +from ..GlobalVariable import GlobalVariable +from ..CodeGen.MachineCodeInfo import MachineCodeInfo +from ..GenericValue import GenericValue +from ..Type import Type ExecutionEngine = llvm.Class() diff --git a/newbinding/src/ExecutionEngine/__init__.py b/newbinding/src/ExecutionEngine/__init__.py new file mode 100644 index 0000000..da0beed --- /dev/null +++ b/newbinding/src/ExecutionEngine/__init__.py @@ -0,0 +1,10 @@ +import os.path, importlib + +def _init(): + for fname in os.listdir(os.path.dirname(__file__)): + if ((fname.endswith('.py') or fname.endswith('.pyc')) and + not fname.startswith('__init__')): + modname = os.path.basename(fname).rsplit('.', 1)[0] + importlib.import_module('.' + modname, __name__) + +_init() diff --git a/newbinding/src/IRBuilder.py b/newbinding/src/IRBuilder.py index cea94ce..61dd99b 100644 --- a/newbinding/src/IRBuilder.py +++ b/newbinding/src/IRBuilder.py @@ -8,8 +8,8 @@ from Instruction import UnreachableInst, AllocaInst, LoadInst, StoreInst from Instruction import FenceInst, AtomicCmpXchgInst, AtomicRMWInst, CmpInst from Instruction import LandingPadInst, VAArgInst from Instruction import AtomicOrdering, SynchronizationScope -from SmallVector import SmallVector_Value, SmallVector_Unsigned -from StringRef import StringRef +from ADT.SmallVector import SmallVector_Value, SmallVector_Unsigned +from ADT.StringRef import StringRef from Value import Value, MDNode from Type import Type, IntegerType diff --git a/newbinding/src/Module.py b/newbinding/src/Module.py index 9b392ca..539c486 100644 --- a/newbinding/src/Module.py +++ b/newbinding/src/Module.py @@ -1,12 +1,12 @@ from binding import * from namespace import llvm from LLVMContext import LLVMContext -from StringRef import StringRef +from ADT.StringRef import StringRef from Constant import Constant from Function import Function from DerivedTypes import FunctionType -from raw_ostream import raw_ostream -from AssemblyAnnotationWriter import AssemblyAnnotationWriter +from Support.raw_ostream import raw_ostream +from Assembly.AssemblyAnnotationWriter import AssemblyAnnotationWriter @llvm.Class() class Module: diff --git a/newbinding/src/Pass.py b/newbinding/src/Pass.py index 5842232..39e894b 100644 --- a/newbinding/src/Pass.py +++ b/newbinding/src/Pass.py @@ -1,6 +1,6 @@ from binding import * from namespace import llvm -from StringRef import StringRef +from ADT.StringRef import StringRef from Module import Module from Function import Function diff --git a/newbinding/src/CodeGen.py b/newbinding/src/Support/CodeGen.py similarity index 93% rename from newbinding/src/CodeGen.py rename to newbinding/src/Support/CodeGen.py index 7afcd49..013caa1 100644 --- a/newbinding/src/CodeGen.py +++ b/newbinding/src/Support/CodeGen.py @@ -1,5 +1,5 @@ from binding import * -from namespace import llvm +from ..namespace import llvm @llvm.Class() class Reloc: diff --git a/newbinding/src/Support/MemoryBuffer.py b/newbinding/src/Support/MemoryBuffer.py new file mode 100644 index 0000000..b960fe6 --- /dev/null +++ b/newbinding/src/Support/MemoryBuffer.py @@ -0,0 +1,9 @@ +from binding import * +from ..namespace import llvm + +MemoryBuffer = llvm.Class() + +@MemoryBuffer +class MemoryBuffer: + _include_ = 'llvm/Support/MemoryBuffer.h' + diff --git a/newbinding/src/Target.py b/newbinding/src/Support/Target.py similarity index 89% rename from newbinding/src/Target.py rename to newbinding/src/Support/Target.py index 3c2a0e1..bdaeff5 100644 --- a/newbinding/src/Target.py +++ b/newbinding/src/Support/Target.py @@ -1,6 +1,6 @@ from binding import * -from namespace import llvm -from StringRef import StringRef +from ..namespace import llvm +from ..ADT.StringRef import StringRef Target = llvm.Class() @Target diff --git a/newbinding/src/TargetSelect.py b/newbinding/src/Support/TargetSelect.py similarity index 54% rename from newbinding/src/TargetSelect.py rename to newbinding/src/Support/TargetSelect.py index cb2eb96..4a2b171 100644 --- a/newbinding/src/TargetSelect.py +++ b/newbinding/src/Support/TargetSelect.py @@ -1,8 +1,8 @@ from binding import * -from namespace import llvm +from ..namespace import llvm llvm.includes.add('llvm/Support/TargetSelect.h') -llvm.Function('InitializeNativeTarget') +InitializeNativeTarget = llvm.Function('InitializeNativeTarget') #llvm.Function('InitializeAllTargets') diff --git a/newbinding/src/Support/__init__.py b/newbinding/src/Support/__init__.py new file mode 100644 index 0000000..da0beed --- /dev/null +++ b/newbinding/src/Support/__init__.py @@ -0,0 +1,10 @@ +import os.path, importlib + +def _init(): + for fname in os.listdir(os.path.dirname(__file__)): + if ((fname.endswith('.py') or fname.endswith('.pyc')) and + not fname.startswith('__init__')): + modname = os.path.basename(fname).rsplit('.', 1)[0] + importlib.import_module('.' + modname, __name__) + +_init() diff --git a/newbinding/src/raw_ostream.py b/newbinding/src/Support/raw_ostream.py similarity index 73% rename from newbinding/src/raw_ostream.py rename to newbinding/src/Support/raw_ostream.py index 2f5a6f5..ecf3614 100644 --- a/newbinding/src/raw_ostream.py +++ b/newbinding/src/Support/raw_ostream.py @@ -1,7 +1,7 @@ from binding import * -from namespace import llvm -from LLVMContext import LLVMContext -from StringRef import StringRef +from ..namespace import llvm +from ..LLVMContext import LLVMContext +from ..ADT.StringRef import StringRef @llvm.Class() class raw_ostream: diff --git a/newbinding/src/TargetLibraryInfo.py b/newbinding/src/Target/TargetLibraryInfo.py similarity index 95% rename from newbinding/src/TargetLibraryInfo.py rename to newbinding/src/Target/TargetLibraryInfo.py index a5ba28d..b90c619 100644 --- a/newbinding/src/TargetLibraryInfo.py +++ b/newbinding/src/Target/TargetLibraryInfo.py @@ -1,8 +1,8 @@ from binding import * -from namespace import llvm -from Triple import Triple -from Pass import ImmutablePass -from StringRef import StringRef +from ..namespace import llvm +from ..ADT.Triple import Triple +from ..Pass import ImmutablePass +from ..ADT.StringRef import StringRef TargetLibraryInfo = llvm.Class(ImmutablePass) diff --git a/newbinding/src/TargetMachine.py b/newbinding/src/Target/TargetMachine.py similarity index 72% rename from newbinding/src/TargetMachine.py rename to newbinding/src/Target/TargetMachine.py index 5910585..3fc16e2 100644 --- a/newbinding/src/TargetMachine.py +++ b/newbinding/src/Target/TargetMachine.py @@ -1,12 +1,12 @@ from binding import * -from namespace import llvm -from StringRef import StringRef -from CodeGen import CodeModel, TLSModel, CodeGenOpt, Reloc -from GlobalValue import GlobalValue -from Target import Target -from DataLayout import DataLayout -from TargetTransformInfo import (ScalarTargetTransformInfo, - VectorTargetTransformInfo) +from ..namespace import llvm +from ..ADT.StringRef import StringRef +from ..Support.CodeGen import CodeModel, TLSModel, CodeGenOpt, Reloc +from ..GlobalValue import GlobalValue +from ..Support.Target import Target +from ..DataLayout import DataLayout +from ..TargetTransformInfo import (ScalarTargetTransformInfo, + VectorTargetTransformInfo) TargetMachine = llvm.Class() diff --git a/newbinding/src/Target/__init__.py b/newbinding/src/Target/__init__.py new file mode 100644 index 0000000..da0beed --- /dev/null +++ b/newbinding/src/Target/__init__.py @@ -0,0 +1,10 @@ +import os.path, importlib + +def _init(): + for fname in os.listdir(os.path.dirname(__file__)): + if ((fname.endswith('.py') or fname.endswith('.pyc')) and + not fname.startswith('__init__')): + modname = os.path.basename(fname).rsplit('.', 1)[0] + importlib.import_module('.' + modname, __name__) + +_init() diff --git a/newbinding/src/TargetTransformInfo.py b/newbinding/src/TargetTransformInfo.py index 8e3c17e..5761281 100644 --- a/newbinding/src/TargetTransformInfo.py +++ b/newbinding/src/TargetTransformInfo.py @@ -1,6 +1,8 @@ from binding import * from namespace import llvm +llvm.includes.add('llvm/TargetTransformInfo.h') + ScalarTargetTransformInfo = llvm.Class() VectorTargetTransformInfo = llvm.Class() diff --git a/newbinding/src/Transforms/IPO.py b/newbinding/src/Transforms/IPO.py index 6c2fc26..48b34f9 100644 --- a/newbinding/src/Transforms/IPO.py +++ b/newbinding/src/Transforms/IPO.py @@ -1,5 +1,5 @@ from binding import * -from namespace import llvm +from ..namespace import llvm from ..Pass import Pass llvm.includes.add('llvm/Transforms/IPO.h') diff --git a/newbinding/src/PassManagerBuilder.py b/newbinding/src/Transforms/PassManagerBuilder.py similarity index 88% rename from newbinding/src/PassManagerBuilder.py rename to newbinding/src/Transforms/PassManagerBuilder.py index 11fedfb..a95b6df 100644 --- a/newbinding/src/PassManagerBuilder.py +++ b/newbinding/src/Transforms/PassManagerBuilder.py @@ -1,8 +1,8 @@ from binding import * -from namespace import llvm -from PassManager import PassManagerBase, FunctionPassManager -from TargetLibraryInfo import TargetLibraryInfo -from Pass import Pass +from ..namespace import llvm +from ..PassManager import PassManagerBase, FunctionPassManager +from ..Target.TargetLibraryInfo import TargetLibraryInfo +from ..Pass import Pass @llvm.Class() class PassManagerBuilder: diff --git a/newbinding/src/Type.py b/newbinding/src/Type.py index bf51b9d..8e6b381 100644 --- a/newbinding/src/Type.py +++ b/newbinding/src/Type.py @@ -1,8 +1,8 @@ from binding import * from namespace import llvm from LLVMContext import LLVMContext -from raw_ostream import raw_ostream -from StringRef import StringRef +from Support.raw_ostream import raw_ostream +from ADT.StringRef import StringRef Type = llvm.Class() IntegerType = llvm.Class(Type) diff --git a/newbinding/src/Value.py b/newbinding/src/Value.py index 7460c90..5841746 100644 --- a/newbinding/src/Value.py +++ b/newbinding/src/Value.py @@ -1,10 +1,10 @@ from binding import * from namespace import llvm -from raw_ostream import raw_ostream -from AssemblyAnnotationWriter import AssemblyAnnotationWriter +from Support.raw_ostream import raw_ostream +from Assembly.AssemblyAnnotationWriter import AssemblyAnnotationWriter from Type import Type from LLVMContext import LLVMContext -from StringRef import StringRef +from ADT.StringRef import StringRef Value = llvm.Class() # forward declarations diff --git a/newbinding/src/__init__.py b/newbinding/src/__init__.py index f67a3c4..8a1b356 100644 --- a/newbinding/src/__init__.py +++ b/newbinding/src/__init__.py @@ -9,4 +9,4 @@ def _init(): _init() -import Transforms \ No newline at end of file +import Transforms, ADT, Support, Assembly, ExecutionEngine, CodeGen, Target diff --git a/newbinding/namespace.py b/newbinding/src/namespace.py similarity index 100% rename from newbinding/namespace.py rename to newbinding/src/namespace.py