Skip to content

Commit

Permalink
Initial cut of _read_hash.
Browse files Browse the repository at this point in the history
  • Loading branch information
@bacek
bacek committed Jan 30, 2011
1 parent 110c566 commit a696543
Showing 1 changed file with 83 additions and 64 deletions.
147 changes: 83 additions & 64 deletions lib/YAML/Tiny.pm
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -74,7 +74,9 @@ method read_string($string) {
@lines.shift() if +@lines && @lines[0] ~~ /^^ \%YAML <[: ]> .* $/; @lines.shift() if +@lines && @lines[0] ~~ /^^ \%YAML <[: ]> .* $/;


# A nibbling parser # A nibbling parser
while ( @lines ) { while +@lines {
debug("Handling", @lines[0]);

# Do we have a document header? # Do we have a document header?
if my $match := @lines[0] ~~ /^^\-\-\-\s*[(.+)\s*]?$/ { if my $match := @lines[0] ~~ /^^\-\-\-\s*[(.+)\s*]?$/ {
debug("Scalar", $match); debug("Scalar", $match);
Expand Down Expand Up @@ -106,14 +108,16 @@ method read_string($string) {
@result.push($document); @result.push($document);
self._read_array( $document, [ 0 ], @lines ); self._read_array( $document, [ 0 ], @lines );


} elsif my $m := @lines[0] ~~ /^(\s*)\S/ { }
elsif my $m := @lines[0] ~~ /^(\s*)\S/ {
debug("Hash", $match); debug("Hash", $match);
# A hash at the root # A hash at the root
my $document := { }; my %document;
@result.push($document); @result.push(%document);
self._read_hash( $document, [ length($m[0][0]) ], @lines ); self._read_hash( %document, [ length($m[0][0]) ], @lines );

debug("Got hash", %document);
} else { }
else {
pir::die("YAML::Tiny failed to classify the line '{ @lines[0] }'"); pir::die("YAML::Tiny failed to classify the line '{ @lines[0] }'");
} }
} }
Expand All @@ -126,11 +130,14 @@ method read_string($string) {
### } ### }
### ###
### return $self; ### return $self;
debug("RESULT", @result);

@result; @result;
} }


# Deparse a scalar string to the actual scalar # Deparse a scalar string to the actual scalar
method _read_scalar($string, $indent, @lines) { method _read_scalar($string, $indent, @lines) {
debug("Scalar", $string);
# Trim trailing whitespace # Trim trailing whitespace
$string := subst($string, /\s*$/, ''); $string := subst($string, /\s*$/, '');


Expand Down Expand Up @@ -229,6 +236,7 @@ method _read_array(@array, @indent, @lines) {
if $m := @lines[0] ~~ /^ (\s*\-\s+) <-[\'\"]> \S*\s* ':' [\s+|$]/ { if $m := @lines[0] ~~ /^ (\s*\-\s+) <-[\'\"]> \S*\s* ':' [\s+|$]/ {
# Inline nested hash # Inline nested hash
debug("Inline nested hash", $m);
my $indent2 := length($m[0]); my $indent2 := length($m[0]);
subst(@lines[0], /'-'/, ' '); subst(@lines[0], /'-'/, ' ');
@array.push(hash()); @array.push(hash());
Expand Down Expand Up @@ -284,63 +292,74 @@ method _read_array(@array, @indent, @lines) {
} }
# Parse an array # Parse an array
method _read_hash($hash, $indent, @lines) { method _read_hash(%hash, @indent, @lines) {
pir::die("_read_hash not implemented");
### while +@lines {
### while ( @$lines ) { # Check for a new document
### # Check for a new document if @lines[0] ~~ /^['---'| '...' ]/ {
### if ( $lines->[0] =~ /^(?:---|\.\.\.)/ ) { while @lines && !(@lines[0] ~~ /^'---'/ ) {
### while ( @$lines and $lines->[0] !~ /^---/ ) { @lines.shift;
### shift @$lines; }
### } return 1;
### return 1; }
### }
### # Check the indent level
### # Check the indent level my $m := @lines[0] ~~ /^(\s*)/;
### $lines->[0] =~ /^(\s*)/; if length($m[0]) < @indent[-1] {
### if ( length($1) < $indent->[-1] ) { return 1;
### return 1; }
### } elsif ( length($1) > $indent->[-1] ) { elsif length($m[0]) > @indent[-1] {
### pir::die \"YAML::Tiny found bad indenting in line '$lines->[0]'"; pir::die("YAML::Tiny found bad indenting in line '{ @lines[0] }'");
### } }
###
### # Get the key # Get the key
### unless ( $lines->[0] =~ s/^\s*([^\'\" ][^\n]*?)\s*:(\s+(?:\#.*)?|$)// ) { $m := @lines[0] ~~ /^\s* (<-[\'\"\ ]>\N*?) \s* ':' [\s+[\#.*]?|$]/;
### if ( $lines->[0] =~ /^\s*[?\'\"]/ ) { #unless ( $lines->[0] =~ s/^\s*([^\'\" ][^\n]*?)\s*:(\s+(?:\#.*)?|$)// ) {
### pir::die \"YAML::Tiny does not support a feature in line '$lines->[0]'"; # if ( $lines->[0] =~ /^\s*[?\'\"]/ ) {
### } # pir::die \"YAML::Tiny does not support a feature in line '$lines->[0]'";
### pir::die \"YAML::Tiny failed to classify line '$lines->[0]'"; # }
### } # pir::die \"YAML::Tiny failed to classify line '$lines->[0]'";
### my $key = $1; #}
### debug("Match", @lines[0], $m);
### # Do we have a value? @lines[0] := subst(@lines[0], /^\s* (<-[\'\"]>\N*?) \s* ':' (\s+[\#.*]?|$)/, '');
### if ( length $lines->[0] ) { debug("Line", @lines[0]);
### # Yes
### $hash->{$key} = $self->_read_scalar( shift(@$lines), [ @$indent, undef ], $lines ); my $key := ~$m[0];
### } else {
### # An indent # Do we have a value?
### shift @$lines; if length(@lines[0]) {
### unless ( @$lines ) { # Yes
### $hash->{$key} = undef; debug("Reading scalar", @lines[0]);
### return 1; %hash{$key} := self._read_scalar( @lines.shift, [ @indent, undef ], @lines );
### } debug("Done", %hash);
### if ( $lines->[0] =~ /^(\s*)-/ ) { }
### $hash->{$key} = []; else {
### $self->_read_array( $hash->{$key}, [ @$indent, length($1) ], $lines ); # An indent
### } elsif ( $lines->[0] =~ /^(\s*)./ ) { @lines.shift;
### my $indent2 = length("$1"); unless @lines {
### if ( $indent->[-1] >= $indent2 ) { %hash{$key} := undef;
### # Null hash entry return 1;
### $hash->{$key} = undef; }
### } else {
### $hash->{$key} = {}; if $m := @lines[0] ~~ /^(\s*)\-/ {
### $self->_read_hash( $hash->{$key}, [ @$indent, length($1) ], $lines ); %hash{$key} := list();
### } self._read_array( %hash{$key}, [ @indent, length($m[0]) ], @lines );
### } }
### } elsif @lines[0] ~~ /^(\s*)./ {
### } my $indent2 := length($m[0]);
### if ( @indent[-1] >= $indent2 ) {
### return 1; # Null hash entry
%hash{$key} := undef;
}
else {
%hash{$key} := {};
self._read_hash( %hash{$key}, [ @indent, length($m[0]) ], @lines );
}
}
}
}
1;
} }
sub debug($message, *@params) { sub debug($message, *@params) {
Expand Down

0 comments on commit a696543

Please sign in to comment.