[Python-checkins] python/dist/src/Tools/framer/framer __init__.py,
1.1, 1.2 bases.py, 1.1, 1.2 function.py, 1.1, 1.2 struct.py,
1.1, 1.2 structparse.py, 1.1, 1.2 template.py, 1.2, 1.3
tim_one at users.sourceforge.net
tim_one at users.sourceforge.net
Sun Jul 18 08:02:07 CEST 2004
Update of /cvsroot/python/python/dist/src/Tools/framer/framer
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29862/framer/framer
Modified Files:
__init__.py bases.py function.py struct.py structparse.py
template.py
Log Message:
Whitespace normalization, via reindent.py.
Index: __init__.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/framer/framer/__init__.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** __init__.py 5 Aug 2002 18:29:45 -0000 1.1
--- __init__.py 18 Jul 2004 06:02:03 -0000 1.2
***************
*** 5,8 ****
takes a more declarative approach to generating code.
"""
-
-
--- 5,6 ----
Index: bases.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/framer/framer/bases.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** bases.py 5 Aug 2002 18:29:45 -0000 1.1
--- bases.py 18 Jul 2004 06:02:03 -0000 1.2
***************
*** 65,69 ****
if obj.has_members():
self.__members = True
!
def initvars(self):
v = self.__vars = {}
--- 65,69 ----
if obj.has_members():
self.__members = True
!
def initvars(self):
v = self.__vars = {}
***************
*** 84,88 ****
p(template.member_include)
print >> f
!
if self.__doc__:
p(template.module_doc)
--- 84,88 ----
p(template.member_include)
print >> f
!
if self.__doc__:
p(template.module_doc)
***************
*** 99,103 ****
for name, type in sortitems(self.__types):
type.dump_init(f)
!
p("}")
--- 99,103 ----
for name, type in sortitems(self.__types):
type.dump_init(f)
!
p("}")
***************
*** 122,126 ****
for name, func in sortitems(self.__methods):
func.dump(f)
!
self.dump_methoddef(f, self.__methods, self.__vars)
self.dump_memberdef(f)
--- 122,126 ----
for name, func in sortitems(self.__methods):
func.dump(f)
!
self.dump_methoddef(f, self.__methods, self.__vars)
self.dump_memberdef(f)
***************
*** 200,204 ****
if self.struct:
! p(template.dealloc_func, {"name" : self.__slots[TP_DEALLOC]})
p(template.type_struct_start)
--- 200,204 ----
if self.struct:
! p(template.dealloc_func, {"name" : self.__slots[TP_DEALLOC]})
p(template.type_struct_start)
***************
*** 219,221 ****
class Type:
__metaclass__ = TypeMetaclass
-
--- 219,220 ----
Index: function.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/framer/framer/function.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** function.py 5 Aug 2002 18:29:45 -0000 1.1
--- function.py 18 Jul 2004 06:02:03 -0000 1.2
***************
*** 56,60 ****
def dump_decls(self, f):
pass
!
class NoArgs(_ArgumentList):
--- 56,60 ----
def dump_decls(self, f):
pass
!
class NoArgs(_ArgumentList):
***************
*** 68,72 ****
class OneArg(_ArgumentList):
!
def __init__(self, args):
assert len(args) == 1
--- 68,72 ----
class OneArg(_ArgumentList):
!
def __init__(self, args):
assert len(args) == 1
***************
*** 140,144 ****
if self.__doc__:
p(template.docstring)
!
d = {"name" : self.vars["CName"],
"args" : self.args.c_args(),
--- 140,144 ----
if self.__doc__:
p(template.docstring)
!
d = {"name" : self.vars["CName"],
"args" : self.args.c_args(),
***************
*** 150,154 ****
if self.args.ml_meth == METH_VARARGS:
p(template.varargs)
!
p(template.funcdef_end)
--- 150,154 ----
if self.args.ml_meth == METH_VARARGS:
p(template.varargs)
!
p(template.funcdef_end)
***************
*** 156,160 ****
self.__doc__ = self._func.__doc__
self.args = ArgumentList(self._func, self.method)
!
def initvars(self):
v = self.vars = {}
--- 156,160 ----
self.__doc__ = self._func.__doc__
self.args = ArgumentList(self._func, self.method)
!
def initvars(self):
v = self.vars = {}
Index: struct.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/framer/framer/struct.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** struct.py 5 Aug 2002 18:29:45 -0000 1.1
--- struct.py 18 Jul 2004 06:02:03 -0000 1.2
***************
*** 36,40 ****
if line.startswith("}"):
break
!
assert line.endswith(";")
line = line[:-1]
--- 36,40 ----
if line.startswith("}"):
break
!
assert line.endswith(";")
line = line[:-1]
Index: structparse.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/framer/framer/structparse.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** structparse.py 5 Aug 2002 18:29:45 -0000 1.1
--- structparse.py 18 Jul 2004 06:02:03 -0000 1.2
***************
*** 30,34 ****
if line.startswith("}"):
break
!
assert line.endswith(";")
line = line[:-1]
--- 30,34 ----
if line.startswith("}"):
break
!
assert line.endswith(";")
line = line[:-1]
Index: template.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/framer/framer/template.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** template.py 24 Oct 2003 20:09:23 -0000 1.2
--- template.py 18 Jul 2004 06:02:03 -0000 1.3
***************
*** 21,29 ****
methoddef_def = """\
{"%(PythonName)s", (PyCFunction)%(CName)s, %(MethType)s},"""
!
methoddef_def_doc = """\
{"%(PythonName)s", (PyCFunction)%(CName)s, %(MethType)s,
%(DocstringVar)s},"""
!
methoddef_end = """\
{NULL, NULL}
--- 21,29 ----
methoddef_def = """\
{"%(PythonName)s", (PyCFunction)%(CName)s, %(MethType)s},"""
!
methoddef_def_doc = """\
{"%(PythonName)s", (PyCFunction)%(CName)s, %(MethType)s,
%(DocstringVar)s},"""
!
methoddef_end = """\
{NULL, NULL}
***************
*** 97,101 ****
static PyTypeObject %(CTypeName)s = {
PyObject_HEAD_INIT(0)"""
!
type_struct_end = """\
};
--- 97,101 ----
static PyTypeObject %(CTypeName)s = {
PyObject_HEAD_INIT(0)"""
!
type_struct_end = """\
};
More information about the Python-checkins
mailing list