[svn:parrot] r42241 - in trunk: . config/gen/call_list config/gen/makefiles runtime/parrot/library/YAML/Parser t/library
barney at svn.parrot.org
barney at svn.parrot.org
Tue Nov 3 19:37:24 UTC 2009
Author: barney
Date: Tue Nov 3 19:37:23 2009
New Revision: 42241
URL: https://trac.parrot.org/parrot/changeset/42241
Log:
Removed runtime/parrot/library/YAML/Parser/Syck.pir, nobody needs it
Deleted:
trunk/runtime/parrot/library/YAML/Parser/Syck.pir
trunk/t/library/yaml_parser_syck.t
Modified:
trunk/MANIFEST
trunk/config/gen/call_list/misc.in
trunk/config/gen/makefiles/root.in
Modified: trunk/MANIFEST
==============================================================================
--- trunk/MANIFEST Tue Nov 3 19:09:04 2009 (r42240)
+++ trunk/MANIFEST Tue Nov 3 19:37:23 2009 (r42241)
@@ -1225,7 +1225,6 @@
runtime/parrot/library/YAML/Dumper.pir [library]
runtime/parrot/library/YAML/Dumper/Base.pir [library]
runtime/parrot/library/YAML/Dumper/Default.pir [library]
-runtime/parrot/library/YAML/Parser/Syck.pir [library]
runtime/parrot/library/dumper.pir [library]
runtime/parrot/library/libpcre.pir [library]
runtime/parrot/library/ncurses.declarations [library]
@@ -1681,7 +1680,6 @@
t/library/test_more.t [test]
t/library/uuid.t [test]
t/library/yaml_dumper.t [test]
-t/library/yaml_parser_syck.t [test]
t/manifest/01-basic.t [test]
t/manifest/02-regenerate_file.t [test]
t/manifest/03-regenerate_skip.t [test]
Modified: trunk/config/gen/call_list/misc.in
==============================================================================
--- trunk/config/gen/call_list/misc.in Tue Nov 3 19:09:04 2009 (r42240)
+++ trunk/config/gen/call_list/misc.in Tue Nov 3 19:37:23 2009 (r42241)
@@ -32,7 +32,7 @@
v illllllll
v l
v p
-v pbip # for libsyck
+v pbip
v pi
v piiii
v pl
Modified: trunk/config/gen/makefiles/root.in
==============================================================================
--- trunk/config/gen/makefiles/root.in Tue Nov 3 19:09:04 2009 (r42240)
+++ trunk/config/gen/makefiles/root.in Tue Nov 3 19:37:23 2009 (r42241)
@@ -313,7 +313,6 @@
$(LIBRARY_DIR)/YAML/Dumper/Base.pbc \
$(LIBRARY_DIR)/YAML/Dumper/Default.pbc \
$(LIBRARY_DIR)/YAML/Dumper.pbc \
- $(LIBRARY_DIR)/YAML/Parser/Syck.pbc \
$(LIBRARY_DIR)/STM.pbc \
$(LIBRARY_DIR)/libpcre.pbc \
$(LIBRARY_DIR)/postgres.pbc
Deleted: trunk/runtime/parrot/library/YAML/Parser/Syck.pir
==============================================================================
--- trunk/runtime/parrot/library/YAML/Parser/Syck.pir Tue Nov 3 19:37:23 2009 (r42240)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,228 +0,0 @@
-# Copyright (C) 2005-2008, Parrot Foundation.
-# $Id$
-
-=head1 NAME
-
-YAML/Parser/Syck.pir - Interface to libsyck
-
-=head1 SYNOPSIS
-
-This won't work yet with a standard libsyck, as libsyck needs to be
-aware of Parrot.
-
-=head1 DESCRIPTION
-
-Ask libsyck to do some work.
-Uses the native call interface.
-Needs synchronous callbacks.
-
-=head1 METHODS
-
-=cut
-
-=head2 load
-
-Parses a YAML string and returns a data structure.
-
-=cut
-
-.include "datatypes.pasm"
-
-.sub load
- .param string yaml_string
-
- # prepare user data
- .local pmc user_data
- user_data = new 'String'
-
- .local string library_name
- library_name = 'libsyck'
- .local pmc libsyck
- libsyck = loadlib library_name
- unless libsyck goto NOT_LOADED
-
- .local int is_defined
-
- # getting a handle on a YAML parser
- .local pmc syck_new_parser
- syck_new_parser = dlfunc libsyck, "syck_new_parser", "p"
- .local pmc parser
- ( parser ) = syck_new_parser( )
- is_defined = defined parser
- unless is_defined goto NOT_DEFINED
-
- # A Sub that can be given to the library
- # this callback function will eventually by called by the library
- .const 'Sub' yaml_handler = "_yaml_handler"
- .local pmc yaml_handler_wrapped
- yaml_handler_wrapped = new_callback yaml_handler, user_data, "vUp" # Z in pdd16
-
- .local pmc synchronous
- synchronous = new 'Integer'
- synchronous = 1
- setprop user_data, "_synchronous", synchronous
-
- # call syck_parser_handler
- .local pmc syck_parser_handler
- syck_parser_handler = dlfunc libsyck, "syck_parser_handler", "vpp"
- syck_parser_handler( parser, yaml_handler_wrapped )
-
- # tell about the user_data
- .local pmc syck_parser_bonus
- syck_parser_bonus = dlfunc libsyck, "syck_parser_bonus", "vpP"
- syck_parser_bonus( parser, user_data )
-
- # tell about the string
- .local pmc syck_parser_str, read
- read = new 'UnManagedStruct'
- pin yaml_string
- syck_parser_str = dlfunc libsyck, "syck_parser_str", "vpbip"
- .local int yaml_string_len
- yaml_string_len = length yaml_string
- syck_parser_str( parser, yaml_string, yaml_string_len, read )
-
- # call syck_parse
- .local pmc syck_parse
- .local int sym_id
- syck_parse = dlfunc libsyck, "syck_parse", "ip"
- ( sym_id ) = syck_parse( parser )
-
- # cleaning up a handle on a YAML parser
- .local pmc syck_free_parser
- syck_free_parser = dlfunc libsyck, "syck_free_parser", "vp"
- syck_free_parser( parser )
-
-NOT_DEFINED:
-NOT_LOADED:
- .return( user_data )
-.end
-
-
-.sub _yaml_handler
- .param pmc user_data
- .param pmc external_data
-
- # struct _syck_node {
- # /* Symbol table ID */
- # SYMID id;
- # /* Underlying kind */
- # enum syck_kind_tag kind;
- # /* Fully qualified tag-uri for type */
- # char *type_id;
- # /* Anchor name */
- # char *anchor;
- # union {
- # /* Storage for map data */
- # struct SyckMap {
- # SYMID *keys;
- # SYMID *values;
- # long capa;
- # long idx;
- # } *pairs;
- # /* Storage for sequence data */
- # struct SyckSeq {
- # SYMID *items;
- # long capa;
- # long idx;
- # } *list;
- # /* Storage for string data */
- # struct SyckStr {
- # enum scalar_style style;
- # char *ptr;
- # long len;
- # } *str;
- # } data;
- # /* Shortcut node */
- # void *shortcut;
- # };
-
-
- # external_data is an UnManagedStruct PMC containing node info
- .local pmc external_data_decl, data_str_decl, data_str
- external_data_decl = new 'ResizablePMCArray'
- data_str_decl = new 'ResizablePMCArray'
-
- # id
- push external_data_decl, .DATATYPE_INT
- push external_data_decl, 0
- push external_data_decl, 0
- # kind
- push external_data_decl, .DATATYPE_INT
- push external_data_decl, 0
- push external_data_decl, 0
- # type_id
- push external_data_decl, .DATATYPE_CSTR
- push external_data_decl, 0
- push external_data_decl, 0
- # anchor
- push external_data_decl, .DATATYPE_CSTR
- push external_data_decl, 0
- push external_data_decl, 0
-
- # style
- push data_str_decl, .DATATYPE_INT
- push data_str_decl, 0
- push data_str_decl, 0
- # ptr
- push data_str_decl, .DATATYPE_CSTR
- push data_str_decl, 0
- push data_str_decl, 0
- # len
- push data_str_decl, .DATATYPE_INT
- push data_str_decl, 0
- push data_str_decl, 0
- data_str = new 'UnManagedStruct', data_str_decl
-
- push external_data_decl, .DATATYPE_STRUCT_PTR
- $P9 = external_data_decl[-1]
- setprop $P9, "_struct", data_str
- push external_data_decl, 0
- push external_data_decl, 0
-
- assign external_data, external_data_decl
-
- .local int id, kind, data_str_len
- .local string type_id, anchor, data_str_ptr
- .local string cloned
- id = external_data[0]
- kind = external_data[1]
- # type_id = external_data[2] # This might be NULL
- # anchor = external_data[3] # This might be NULL
- data_str_len = external_data[4;2]
-
- # For now just save all the strings
- unless kind == 2 goto IGNORE_NON_STRING
- data_str_ptr = external_data[4;1]
- concat user_data, user_data, data_str_ptr
- concat user_data, user_data, "\n"
-IGNORE_NON_STRING:
-
- # debug output
- print user_data
- print "\n"
-
- .return()
-.end
-
-=head1 TODO
-
-Do some object stuff.
-Be nice and put stuff into a namespace.
-Provide a patch for libsyck.
-
-=head1 AUTHOR
-
-Bernhard Schmalhofer - <Bernhard.Schmalhofer at gmx.de>
-
-=head1 SEE ALSO
-
- YAML::Parser::Syck.pm
- yaml.kwiki.org
-
-=cut
-
-# Local Variables:
-# mode: pir
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4 ft=pir:
Deleted: trunk/t/library/yaml_parser_syck.t
==============================================================================
--- trunk/t/library/yaml_parser_syck.t Tue Nov 3 19:37:23 2009 (r42240)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,175 +0,0 @@
-#!perl
-# Copyright (C) 2001-2006, Parrot Foundation.
-# $Id$
-
-use strict;
-use warnings;
-use lib qw( t . lib ../lib ../../lib );
-
-use Test::More;
-use Parrot::Test tests => 1;
-
-=head1 NAME
-
-t/library/yaml_parser_syck.t - testing library/YAML/Parser/Syck.pir
-
-=head1 SYNOPSIS
-
- % prove t/library/yaml_parser_syck.t
-
-=head1 DESCRIPTION
-
-Try to parse a YAML document.
-
-=cut
-
-TODO: {
-
- local $TODO = 'Not properly implemented yet';
-
- pir_output_is( << 'CODE', << 'OUT', "basic parsing" );
-
-.sub test :main
- load_bytecode "YAML/Parser/Syck.pbc"
- load_bytecode "dumper.pbc"
-
- .local pmc loaded
- ( loaded ) = load( "---\n- key1: val1\n key2: val2\n- elem1\n- elem12\n- elem123\n- elem1234\n- elem12345\n- elem123456\n- elem1234567\n- elem12345678\n" )
- _dumper( "loaded", loaded )
-
- end
-.end
-CODE
-val1
-
-val1
-key1
-
-val1
-key1
-val2
-
-val1
-key1
-val2
-key2
-
-val1
-key1
-val2
-key2
-
-val1
-key1
-val2
-key2
-elem1
-
-val1
-key1
-val2
-key2
-elem1
-elem12
-
-val1
-key1
-val2
-key2
-elem1
-elem12
-elem123
-
-val1
-key1
-val2
-key2
-elem1
-elem12
-elem123
-elem1234
-
-val1
-key1
-val2
-key2
-elem1
-elem12
-elem123
-elem1234
-elem12345
-
-val1
-key1
-val2
-key2
-elem1
-elem12
-elem123
-elem1234
-elem12345
-elem123456
-
-val1
-key1
-val2
-key2
-elem1
-elem12
-elem123
-elem1234
-elem12345
-elem123456
-elem1234567
-
-val1
-key1
-val2
-key2
-elem1
-elem12
-elem123
-elem1234
-elem12345
-elem123456
-elem1234567
-elem12345678
-
-val1
-key1
-val2
-key2
-elem1
-elem12
-elem123
-elem1234
-elem12345
-elem123456
-elem1234567
-elem12345678
-
-"loaded" => "val1\nkey1\nval2\nkey2\nelem1\nelem12\nelem123\nelem1234\nelem12345\nelem123456\nelem1234567\nelem12345678\n" with-properties: Hash {
- "_interpreter" => PMC 'ParrotInterpreter' { ... },
- "_signature" => "Up",
- "_sub" => sub { ... },
- "_synchronous" => 1
-}
-OUT
-}
-
-=head1 AUTHOR
-
-Bernhard Schmalhofer - <Bernhard.Schmalhofer at gmx.de>
-
-=head1 SEE ALSO
-
-F<runtime/parrot/library/YAML/Parser/Syck.pir>
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
More information about the parrot-commits
mailing list