summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--ext/syck/syck.c1
-rw-r--r--ext/syck/token.c2
-rw-r--r--lib/yaml/baseemitter.rb32
-rw-r--r--lib/yaml/rubytypes.rb4
5 files changed, 24 insertions, 25 deletions
diff --git a/ChangeLog b/ChangeLog
index ccecdfcf6c4..e8b641446d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Wed May 26 00:00:00 2004 why the lucky stiff <why@ruby-lang.org>
+
+ * ext/syck/syck.c (syck_new_parser): clear parser on init.
+ thanks, ts. [ruby-core:02931]
+
+ * ext/syck/token.c (sycklex_yaml_utf8): buffer underflow.
+ thanks, ts. [ruby-core:02929]
+
+ * lib/yaml/baseemitter.rb (indent_text): simpler flow block code.
+
Tue May 25 11:54:13 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (rb_yield_0, proc_invoke, proc_arity): allow passing a block
diff --git a/ext/syck/syck.c b/ext/syck/syck.c
index a4a3bd0c01f..5a15ab4947b 100644
--- a/ext/syck/syck.c
+++ b/ext/syck/syck.c
@@ -159,6 +159,7 @@ syck_new_parser()
{
SyckParser *p;
p = S_ALLOC( SyckParser );
+ S_MEMZERO( p, SyckParser, 1 );
p->lvl_capa = ALLOC_CT;
p->levels = S_ALLOC_N( SyckLevel, p->lvl_capa );
p->input_type = syck_yaml_utf8;
diff --git a/ext/syck/token.c b/ext/syck/token.c
index ac9986f5645..ff192f24e16 100644
--- a/ext/syck/token.c
+++ b/ext/syck/token.c
@@ -2297,7 +2297,7 @@ yy215:
#line 938
{ if ( YYTOKEN == YYLINEPTR )
{
- if ( blockType == BLOCK_FOLD )
+ if ( blockType == BLOCK_FOLD && qidx > 0 )
{
qidx -= 1;
}
diff --git a/lib/yaml/baseemitter.rb b/lib/yaml/baseemitter.rb
index da908d98dca..2881d424b44 100644
--- a/lib/yaml/baseemitter.rb
+++ b/lib/yaml/baseemitter.rb
@@ -45,9 +45,13 @@ module YAML
else
'>'
end
- if valx =~ /\A[ \t#]/
- block += options(:Indent).to_s
+
+ indt = $&.to_i if block =~ /\d+/
+ if valx =~ /(\A[ \t#]|^---\s+)/
+ indt = options(:Indent) unless indt.to_i > 0
+ block += indt.to_s
end
+
block +=
if valx =~ /\n\Z\n/
"+"
@@ -63,8 +67,6 @@ module YAML
if block[0] == ?>
valx = fold( valx )
end
- indt = nil
- indt = $&.to_i if block =~ /\d+/
#p [block, indt]
self << block + indent_text( valx, indt ) + "\n"
end
@@ -125,25 +127,9 @@ module YAML
# Folding paragraphs within a column
#
def fold( value )
- value.gsub!( /\A\n+/, '' )
- folded = $&.to_s
- width = (0..options(:BestWidth))
- while not value.empty?
- last = value.index( /(\n+)/ )
- chop_s = false
- if width.include?( last )
- last += $1.length - 1
- elsif width.include?( value.length )
- last = value.length
- else
- last = value.rindex( /[ \t]/, options(:BestWidth) )
- chop_s = true
- end
- folded += value.slice!( 0, width.include?( last ) ? last + 1 : options(:BestWidth) )
- folded.chop! if chop_s
- folded += "\n" unless value.empty?
- end
- folded
+ value.gsub( /(^[ \t]+.*$)|(\S.{0,#{options(:BestWidth) - 1}})(?:[ \t]+|(\n+(?=[ \t]))|$)/ ) do |s|
+ $1 || $2 + ( $3 || "\n" )
+ end
end
#
diff --git a/lib/yaml/rubytypes.rb b/lib/yaml/rubytypes.rb
index 239688a6b2e..f73eaf2dcd4 100644
--- a/lib/yaml/rubytypes.rb
+++ b/lib/yaml/rubytypes.rb
@@ -392,7 +392,9 @@ class Range
end
def to_yaml( opts = {} )
YAML::quick_emit( self.object_id, opts ) { |out|
- if self.begin.is_complex_yaml? or self.end.is_complex_yaml? or not to_yaml_properties.empty?
+ if self.begin.is_complex_yaml? or self.begin.respond_to? :to_str or
+ self.end.is_complex_yaml? or self.end.respond_to? :to_str or
+ not to_yaml_properties.empty?
out.map( to_yaml_type ) { |map|
map.add( 'begin', self.begin )
map.add( 'end', self.end )