- removed "header_code", since we already have Include().

Bruno da Silva de Oliveira · Bruno da Silva de Oliveira · commit dc7ae9ed20f6 · 2003-08-17T21:11:07.000Z
[SVN r19670]
diff --git a/pyste/src/Pyste/IncludeExporter.py b/pyste/src/Pyste/IncludeExporter.py
diff --git a/pyste/src/Pyste/infos.py b/pyste/src/Pyste/infos.py
@@ -81,20 +81,6 @@ def __init__(self, name, include, tail=None, otherInfo=None):
         exporter.interface_file = exporters.current_interface 
         
 
-#==============================================================================
-# IncludeInfo
-#==============================================================================
-class IncludeInfo(DeclarationInfo):
-
-    def __init__(self, include):
-        DeclarationInfo.__init__(self)
-        self._Attribute('include', include)
-        exporter = IncludeExporter(InfoWrapper(self))
-        if exporter not in exporters.exporters: 
-            exporters.exporters.append(exporter)        
-        exporter.interface_file = exporters.current_interface 
-
-
 #==============================================================================
 # templates
 #==============================================================================
diff --git a/pyste/src/Pyste/pyste.py b/pyste/src/Pyste/pyste.py
@@ -43,7 +43,7 @@
 import time
 from declarations import Typedef
 
-__version__ = '0.9.15'
+__version__ = '0.9.16'
 
 def RecursiveIncludes(include):
     'Return a list containg the include dir and all its subdirectories'
@@ -167,7 +167,7 @@ def CreateContext():
     # infos
     context['Function'] = infos.FunctionInfo
     context['Class'] = infos.ClassInfo
-    context['Include'] = infos.IncludeInfo
+    context['Include'] = lambda header: infos.CodeInfo('#include <%s>\n' % header, 'include')
     context['Template'] = infos.ClassTemplateInfo
     context['Enum'] = infos.EnumInfo
     context['AllFromHeader'] = infos.HeaderInfo
@@ -193,7 +193,6 @@ def CreateContext():
     context['manage_new_object'] = manage_new_object
     # utils
     context['Wrapper'] = exporterutils.FunctionWrapper
-    context['header_code'] = lambda code: infos.CodeInfo(code, 'include')
     context['declaration_code'] = lambda code: infos.CodeInfo(code, 'declaration')
     context['global_declaration_code'] = lambda code: infos.CodeInfo(code, 'declaration-outside')
     context['module_code'] = lambda code: infos.CodeInfo(code, 'module')
diff --git a/pyste/tests/code_test.pyste b/pyste/tests/code_test.pyste
@@ -1,5 +1,5 @@
 Class('A', 'code_test.h')
-header_code('#include <string>\n')
+Include('string')
 global_declaration_code('''
 int get(A& a) { return a.x; }
 
