diff options
| author | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-04-03 21:50:47 +0000 |
|---|---|---|
| committer | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-04-03 21:50:47 +0000 |
| commit | eb71e5cd67f4ce4da5ba331f93a8e36c65457b94 (patch) | |
| tree | 1df66113ae7340e2b928839b3f09dbf8dcfb3d73 /ext/syck/rubyext.c | |
| parent | ca926ad017a804817b9a2e5389196f9acf9d9b68 (diff) | |
* lib/yaml: Moved to ext/syck/lib, Syck only uses Syck constant.
* lib/yaml.rb: Added an engine manager for choosing YAML engine.
* ext/syck/lib/syck/rubytypes.rb: squashed warnings when using Psych
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27212 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/syck/rubyext.c')
| -rw-r--r-- | ext/syck/rubyext.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/ext/syck/rubyext.c b/ext/syck/rubyext.c index 2f78b6ddaf..da741d687c 100644 --- a/ext/syck/rubyext.c +++ b/ext/syck/rubyext.c @@ -2111,9 +2111,7 @@ syck_out_scalar(int argc, VALUE *argv, VALUE self) void Init_syck() { - VALUE rb_yaml = rb_define_module( "YAML" ); - VALUE rb_syck = rb_define_module_under( rb_yaml, "Syck" ); - rb_define_const( rb_syck, "VERSION", rb_str_new2( SYCK_VERSION ) ); + VALUE rb_syck = rb_define_module_under( rb_cObject, "Syck" ); rb_define_module_function( rb_syck, "compile", rb_syck_compile, 1 ); /* @@ -2258,7 +2256,7 @@ Init_syck() /* * Define YAML::PrivateType class */ - cPrivateType = rb_define_class_under( rb_yaml, "PrivateType", rb_cObject ); + cPrivateType = rb_define_class_under( rb_syck, "PrivateType", rb_cObject ); rb_define_attr( cPrivateType, "type_id", 1, 1 ); rb_define_attr( cPrivateType, "value", 1, 1 ); rb_define_method( cPrivateType, "initialize", syck_privatetype_initialize, 2); @@ -2266,7 +2264,7 @@ Init_syck() /* * Define YAML::DomainType class */ - cDomainType = rb_define_class_under( rb_yaml, "DomainType", rb_cObject ); + cDomainType = rb_define_class_under( rb_syck, "DomainType", rb_cObject ); rb_define_attr( cDomainType, "domain", 1, 1 ); rb_define_attr( cDomainType, "type_id", 1, 1 ); rb_define_attr( cDomainType, "value", 1, 1 ); @@ -2275,7 +2273,7 @@ Init_syck() /* * Define YAML::Object class */ - cYObject = rb_define_class_under( rb_yaml, "Object", rb_cObject ); + cYObject = rb_define_class_under( rb_syck, "Object", rb_cObject ); rb_define_attr( cYObject, "class", 1, 1 ); rb_define_attr( cYObject, "ivars", 1, 1 ); rb_define_method( cYObject, "initialize", syck_yobject_initialize, 2); |