summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxi <xi@18f92427-320e-0410-9341-c67f048884a3>2008-12-31 11:04:28 +0000
committerxi <xi@18f92427-320e-0410-9341-c67f048884a3>2008-12-31 11:04:28 +0000
commit9f0f135caa6ac2ffbbe4068de5e14023a5f023db (patch)
tree63cfaf11dc90a570c22abfba811d06d2681ffc95
parent6b8c3cf43f6450df1517aa93524d7bee1114c182 (diff)
downloadpyyaml-9f0f135caa6ac2ffbbe4068de5e14023a5f023db.tar.gz
Restored Mark implementation in C as using the Python class causes a significant performance hit.
git-svn-id: http://svn.pyyaml.org/pyyaml/trunk@343 18f92427-320e-0410-9341-c67f048884a3
-rw-r--r--ext/_yaml.pyx36
1 files changed, 18 insertions, 18 deletions
diff --git a/ext/_yaml.pyx b/ext/_yaml.pyx
index 91c7274..547d312 100644
--- a/ext/_yaml.pyx
+++ b/ext/_yaml.pyx
@@ -14,7 +14,7 @@ def get_version():
yaml_get_version(&major, &minor, &patch)
return (major, minor, patch)
-Mark = yaml.error.Mark
+#Mark = yaml.error.Mark
YAMLError = yaml.error.YAMLError
ReaderError = yaml.reader.ReaderError
ScannerError = yaml.scanner.ScannerError
@@ -61,23 +61,23 @@ ScalarNode = yaml.nodes.ScalarNode
SequenceNode = yaml.nodes.SequenceNode
MappingNode = yaml.nodes.MappingNode
-#cdef class Mark:
-# cdef readonly object name
-# cdef readonly int index
-# cdef readonly int line
-# cdef readonly int column
-# cdef readonly buffer
-# cdef readonly pointer
-#
-# def __init__(self, object name, int index, int line, int column,
-# object buffer, object pointer):
-# self.name = name
-# self.index = index
-# self.line = line
-# self.column = column
-# self.buffer = buffer
-# self.pointer = pointer
-#
+cdef class Mark:
+ cdef readonly object name
+ cdef readonly int index
+ cdef readonly int line
+ cdef readonly int column
+ cdef readonly buffer
+ cdef readonly pointer
+
+ def __init__(self, object name, int index, int line, int column,
+ object buffer, object pointer):
+ self.name = name
+ self.index = index
+ self.line = line
+ self.column = column
+ self.buffer = buffer
+ self.pointer = pointer
+
# def get_snippet(self):
# return None
#