2003-05-13 02:34:18 -04:00
|
|
|
/*
|
|
|
|
* node.c
|
|
|
|
*
|
|
|
|
* $Author$
|
|
|
|
*
|
|
|
|
* Copyright (C) 2003 why the lucky stiff
|
|
|
|
*/
|
2003-05-09 17:25:50 -04:00
|
|
|
|
2007-06-09 23:06:15 -04:00
|
|
|
#include "ruby/ruby.h"
|
2004-05-06 02:29:56 -04:00
|
|
|
#include "syck.h"
|
2003-05-09 17:25:50 -04:00
|
|
|
|
2003-05-13 02:34:18 -04:00
|
|
|
/*
|
|
|
|
* Node allocation functions
|
|
|
|
*/
|
2003-05-09 17:25:50 -04:00
|
|
|
SyckNode *
|
|
|
|
syck_alloc_node( enum syck_kind_tag type )
|
|
|
|
{
|
|
|
|
SyckNode *s;
|
|
|
|
|
|
|
|
s = S_ALLOC( SyckNode );
|
|
|
|
s->kind = type;
|
2003-05-13 02:34:18 -04:00
|
|
|
s->id = 0;
|
2003-05-09 17:25:50 -04:00
|
|
|
s->type_id = NULL;
|
|
|
|
s->anchor = NULL;
|
2003-05-14 16:01:09 -04:00
|
|
|
s->shortcut = NULL;
|
2003-05-09 17:25:50 -04:00
|
|
|
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
syck_free_node( SyckNode *n )
|
|
|
|
{
|
|
|
|
syck_free_members( n );
|
|
|
|
if ( n->type_id != NULL )
|
2005-09-12 23:58:33 -04:00
|
|
|
{
|
2003-05-09 17:25:50 -04:00
|
|
|
S_FREE( n->type_id );
|
2005-09-12 23:58:33 -04:00
|
|
|
n->type_id = NULL;
|
|
|
|
}
|
2003-05-09 17:25:50 -04:00
|
|
|
if ( n->anchor != NULL )
|
2005-09-12 23:58:33 -04:00
|
|
|
{
|
2003-05-09 17:25:50 -04:00
|
|
|
S_FREE( n->anchor );
|
2005-09-12 23:58:33 -04:00
|
|
|
n->anchor = NULL;
|
|
|
|
}
|
2003-05-09 17:25:50 -04:00
|
|
|
S_FREE( n );
|
|
|
|
}
|
|
|
|
|
|
|
|
SyckNode *
|
2007-03-18 23:58:57 -04:00
|
|
|
syck_alloc_map(void)
|
2003-05-09 17:25:50 -04:00
|
|
|
{
|
|
|
|
SyckNode *n;
|
|
|
|
struct SyckMap *m;
|
|
|
|
|
|
|
|
m = S_ALLOC( struct SyckMap );
|
2005-09-12 23:58:33 -04:00
|
|
|
m->style = map_none;
|
2003-05-09 17:25:50 -04:00
|
|
|
m->idx = 0;
|
|
|
|
m->capa = ALLOC_CT;
|
|
|
|
m->keys = S_ALLOC_N( SYMID, m->capa );
|
|
|
|
m->values = S_ALLOC_N( SYMID, m->capa );
|
|
|
|
|
|
|
|
n = syck_alloc_node( syck_map_kind );
|
|
|
|
n->data.pairs = m;
|
|
|
|
|
|
|
|
return n;
|
|
|
|
}
|
|
|
|
|
|
|
|
SyckNode *
|
2007-03-18 23:58:57 -04:00
|
|
|
syck_alloc_seq(void)
|
2003-05-09 17:25:50 -04:00
|
|
|
{
|
|
|
|
SyckNode *n;
|
|
|
|
struct SyckSeq *s;
|
|
|
|
|
|
|
|
s = S_ALLOC( struct SyckSeq );
|
2005-09-12 23:58:33 -04:00
|
|
|
s->style = seq_none;
|
2003-05-09 17:25:50 -04:00
|
|
|
s->idx = 0;
|
|
|
|
s->capa = ALLOC_CT;
|
|
|
|
s->items = S_ALLOC_N( SYMID, s->capa );
|
|
|
|
|
|
|
|
n = syck_alloc_node( syck_seq_kind );
|
|
|
|
n->data.list = s;
|
|
|
|
|
|
|
|
return n;
|
|
|
|
}
|
|
|
|
|
|
|
|
SyckNode *
|
2007-03-18 23:58:57 -04:00
|
|
|
syck_alloc_str(void)
|
2003-05-09 17:25:50 -04:00
|
|
|
{
|
|
|
|
SyckNode *n;
|
|
|
|
struct SyckStr *s;
|
|
|
|
|
|
|
|
s = S_ALLOC( struct SyckStr );
|
|
|
|
s->len = 0;
|
|
|
|
s->ptr = NULL;
|
2004-05-14 23:11:28 -04:00
|
|
|
s->style = scalar_none;
|
2003-05-09 17:25:50 -04:00
|
|
|
|
|
|
|
n = syck_alloc_node( syck_str_kind );
|
|
|
|
n->data.str = s;
|
|
|
|
|
|
|
|
return n;
|
|
|
|
}
|
|
|
|
|
|
|
|
SyckNode *
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-09 17:20:17 -04:00
|
|
|
syck_new_str( const char *str, enum scalar_style style )
|
2003-05-09 17:25:50 -04:00
|
|
|
{
|
2004-05-14 23:11:28 -04:00
|
|
|
return syck_new_str2( str, strlen( str ), style );
|
2003-05-09 17:25:50 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
SyckNode *
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-09 17:20:17 -04:00
|
|
|
syck_new_str2( const char *str, long len, enum scalar_style style )
|
2003-05-09 17:25:50 -04:00
|
|
|
{
|
|
|
|
SyckNode *n;
|
|
|
|
|
|
|
|
n = syck_alloc_str();
|
|
|
|
n->data.str->ptr = S_ALLOC_N( char, len + 1 );
|
|
|
|
n->data.str->len = len;
|
2004-05-14 23:11:28 -04:00
|
|
|
n->data.str->style = style;
|
2003-05-09 17:25:50 -04:00
|
|
|
memcpy( n->data.str->ptr, str, len );
|
|
|
|
n->data.str->ptr[len] = '\0';
|
|
|
|
|
|
|
|
return n;
|
|
|
|
}
|
|
|
|
|
2005-09-12 23:58:33 -04:00
|
|
|
void
|
|
|
|
syck_replace_str( SyckNode *n, char *str, enum scalar_style style )
|
|
|
|
{
|
2005-09-16 05:37:45 -04:00
|
|
|
syck_replace_str2( n, str, strlen( str ), style );
|
2005-09-12 23:58:33 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
syck_replace_str2( SyckNode *n, char *str, long len, enum scalar_style style )
|
|
|
|
{
|
|
|
|
if ( n->data.str != NULL )
|
|
|
|
{
|
|
|
|
S_FREE( n->data.str->ptr );
|
|
|
|
n->data.str->ptr = NULL;
|
|
|
|
n->data.str->len = 0;
|
|
|
|
}
|
|
|
|
n->data.str->ptr = S_ALLOC_N( char, len + 1 );
|
|
|
|
n->data.str->len = len;
|
|
|
|
n->data.str->style = style;
|
|
|
|
memcpy( n->data.str->ptr, str, len );
|
|
|
|
n->data.str->ptr[len] = '\0';
|
|
|
|
}
|
|
|
|
|
2003-05-09 17:25:50 -04:00
|
|
|
void
|
|
|
|
syck_str_blow_away_commas( SyckNode *n )
|
|
|
|
{
|
|
|
|
char *go, *end;
|
|
|
|
|
|
|
|
go = n->data.str->ptr;
|
|
|
|
end = go + n->data.str->len;
|
|
|
|
while ( *(++go) != '\0' )
|
|
|
|
{
|
|
|
|
if ( *go == ',' )
|
|
|
|
{
|
|
|
|
n->data.str->len -= 1;
|
|
|
|
memmove( go, go + 1, end - go );
|
|
|
|
end -= 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
char *
|
|
|
|
syck_str_read( SyckNode *n )
|
|
|
|
{
|
|
|
|
ASSERT( n != NULL );
|
|
|
|
return n->data.str->ptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
SyckNode *
|
|
|
|
syck_new_map( SYMID key, SYMID value )
|
|
|
|
{
|
|
|
|
SyckNode *n;
|
|
|
|
|
|
|
|
n = syck_alloc_map();
|
|
|
|
syck_map_add( n, key, value );
|
|
|
|
|
|
|
|
return n;
|
|
|
|
}
|
|
|
|
|
2005-09-12 23:58:33 -04:00
|
|
|
void
|
|
|
|
syck_map_empty( SyckNode *n )
|
|
|
|
{
|
|
|
|
struct SyckMap *m;
|
|
|
|
ASSERT( n != NULL );
|
|
|
|
ASSERT( n->data.list != NULL );
|
|
|
|
|
|
|
|
S_FREE( n->data.pairs->keys );
|
|
|
|
S_FREE( n->data.pairs->values );
|
|
|
|
m = n->data.pairs;
|
|
|
|
m->idx = 0;
|
|
|
|
m->capa = ALLOC_CT;
|
|
|
|
m->keys = S_ALLOC_N( SYMID, m->capa );
|
|
|
|
m->values = S_ALLOC_N( SYMID, m->capa );
|
|
|
|
}
|
|
|
|
|
2003-05-09 17:25:50 -04:00
|
|
|
void
|
|
|
|
syck_map_add( SyckNode *map, SYMID key, SYMID value )
|
|
|
|
{
|
|
|
|
struct SyckMap *m;
|
|
|
|
long idx;
|
|
|
|
|
|
|
|
ASSERT( map != NULL );
|
|
|
|
ASSERT( map->data.pairs != NULL );
|
|
|
|
|
|
|
|
m = map->data.pairs;
|
|
|
|
idx = m->idx;
|
|
|
|
m->idx += 1;
|
|
|
|
if ( m->idx > m->capa )
|
|
|
|
{
|
|
|
|
m->capa += ALLOC_CT;
|
|
|
|
S_REALLOC_N( m->keys, SYMID, m->capa );
|
|
|
|
S_REALLOC_N( m->values, SYMID, m->capa );
|
|
|
|
}
|
|
|
|
m->keys[idx] = key;
|
|
|
|
m->values[idx] = value;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
syck_map_update( SyckNode *map1, SyckNode *map2 )
|
|
|
|
{
|
|
|
|
struct SyckMap *m1, *m2;
|
|
|
|
long new_idx, new_capa;
|
|
|
|
ASSERT( map1 != NULL );
|
|
|
|
ASSERT( map2 != NULL );
|
|
|
|
|
|
|
|
m1 = map1->data.pairs;
|
|
|
|
m2 = map2->data.pairs;
|
|
|
|
if ( m2->idx < 1 ) return;
|
|
|
|
|
|
|
|
new_idx = m1->idx;
|
|
|
|
new_idx += m2->idx;
|
|
|
|
new_capa = m1->capa;
|
|
|
|
while ( new_idx > new_capa )
|
|
|
|
{
|
|
|
|
new_capa += ALLOC_CT;
|
|
|
|
}
|
|
|
|
if ( new_capa > m1->capa )
|
|
|
|
{
|
|
|
|
m1->capa = new_capa;
|
|
|
|
S_REALLOC_N( m1->keys, SYMID, m1->capa );
|
|
|
|
S_REALLOC_N( m1->values, SYMID, m1->capa );
|
|
|
|
}
|
|
|
|
for ( new_idx = 0; new_idx < m2->idx; m1->idx++, new_idx++ )
|
|
|
|
{
|
|
|
|
m1->keys[m1->idx] = m2->keys[new_idx];
|
|
|
|
m1->values[m1->idx] = m2->values[new_idx];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
long
|
|
|
|
syck_map_count( SyckNode *map )
|
|
|
|
{
|
|
|
|
ASSERT( map != NULL );
|
|
|
|
ASSERT( map->data.pairs != NULL );
|
|
|
|
return map->data.pairs->idx;
|
|
|
|
}
|
|
|
|
|
2003-05-14 16:01:09 -04:00
|
|
|
void
|
|
|
|
syck_map_assign( SyckNode *map, enum map_part p, long idx, SYMID id )
|
|
|
|
{
|
|
|
|
struct SyckMap *m;
|
|
|
|
|
|
|
|
ASSERT( map != NULL );
|
|
|
|
m = map->data.pairs;
|
|
|
|
ASSERT( m != NULL );
|
|
|
|
if ( p == map_key )
|
|
|
|
{
|
|
|
|
m->keys[idx] = id;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
m->values[idx] = id;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-05-09 17:25:50 -04:00
|
|
|
SYMID
|
|
|
|
syck_map_read( SyckNode *map, enum map_part p, long idx )
|
|
|
|
{
|
|
|
|
struct SyckMap *m;
|
|
|
|
|
|
|
|
ASSERT( map != NULL );
|
|
|
|
m = map->data.pairs;
|
|
|
|
ASSERT( m != NULL );
|
|
|
|
if ( p == map_key )
|
|
|
|
{
|
|
|
|
return m->keys[idx];
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
return m->values[idx];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
SyckNode *
|
|
|
|
syck_new_seq( SYMID value )
|
|
|
|
{
|
|
|
|
SyckNode *n;
|
|
|
|
|
|
|
|
n = syck_alloc_seq();
|
|
|
|
syck_seq_add( n, value );
|
|
|
|
|
|
|
|
return n;
|
|
|
|
}
|
|
|
|
|
2005-09-12 23:58:33 -04:00
|
|
|
void
|
|
|
|
syck_seq_empty( SyckNode *n )
|
|
|
|
{
|
|
|
|
struct SyckSeq *s;
|
|
|
|
ASSERT( n != NULL );
|
|
|
|
ASSERT( n->data.list != NULL );
|
|
|
|
|
|
|
|
S_FREE( n->data.list->items );
|
|
|
|
s = n->data.list;
|
|
|
|
s->idx = 0;
|
|
|
|
s->capa = ALLOC_CT;
|
|
|
|
s->items = S_ALLOC_N( SYMID, s->capa );
|
|
|
|
}
|
|
|
|
|
2003-05-09 17:25:50 -04:00
|
|
|
void
|
|
|
|
syck_seq_add( SyckNode *arr, SYMID value )
|
|
|
|
{
|
|
|
|
struct SyckSeq *s;
|
|
|
|
long idx;
|
|
|
|
|
|
|
|
ASSERT( arr != NULL );
|
|
|
|
ASSERT( arr->data.list != NULL );
|
|
|
|
|
|
|
|
s = arr->data.list;
|
|
|
|
idx = s->idx;
|
|
|
|
s->idx += 1;
|
|
|
|
if ( s->idx > s->capa )
|
|
|
|
{
|
|
|
|
s->capa += ALLOC_CT;
|
|
|
|
S_REALLOC_N( s->items, SYMID, s->capa );
|
|
|
|
}
|
|
|
|
s->items[idx] = value;
|
|
|
|
}
|
|
|
|
|
|
|
|
long
|
|
|
|
syck_seq_count( SyckNode *seq )
|
|
|
|
{
|
|
|
|
ASSERT( seq != NULL );
|
|
|
|
ASSERT( seq->data.list != NULL );
|
|
|
|
return seq->data.list->idx;
|
|
|
|
}
|
|
|
|
|
2005-09-12 23:58:33 -04:00
|
|
|
void
|
|
|
|
syck_seq_assign( SyckNode *seq, long idx, SYMID id )
|
|
|
|
{
|
|
|
|
struct SyckSeq *s;
|
|
|
|
|
|
|
|
ASSERT( map != NULL );
|
|
|
|
s = seq->data.list;
|
|
|
|
ASSERT( m != NULL );
|
|
|
|
s->items[idx] = id;
|
|
|
|
}
|
|
|
|
|
2003-05-09 17:25:50 -04:00
|
|
|
SYMID
|
|
|
|
syck_seq_read( SyckNode *seq, long idx )
|
|
|
|
{
|
|
|
|
struct SyckSeq *s;
|
|
|
|
|
|
|
|
ASSERT( seq != NULL );
|
|
|
|
s = seq->data.list;
|
|
|
|
ASSERT( s != NULL );
|
|
|
|
return s->items[idx];
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
syck_free_members( SyckNode *n )
|
|
|
|
{
|
2004-04-26 19:24:46 -04:00
|
|
|
if ( n == NULL ) return;
|
|
|
|
|
2003-05-09 17:25:50 -04:00
|
|
|
switch ( n->kind )
|
|
|
|
{
|
|
|
|
case syck_str_kind:
|
2004-04-26 19:24:46 -04:00
|
|
|
if ( n->data.str != NULL )
|
2003-05-09 17:25:50 -04:00
|
|
|
{
|
|
|
|
S_FREE( n->data.str->ptr );
|
|
|
|
n->data.str->ptr = NULL;
|
|
|
|
n->data.str->len = 0;
|
|
|
|
S_FREE( n->data.str );
|
2004-04-26 19:24:46 -04:00
|
|
|
n->data.str = NULL;
|
2003-05-09 17:25:50 -04:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case syck_seq_kind:
|
2004-04-26 19:24:46 -04:00
|
|
|
if ( n->data.list != NULL )
|
|
|
|
{
|
|
|
|
S_FREE( n->data.list->items );
|
|
|
|
S_FREE( n->data.list );
|
|
|
|
n->data.list = NULL;
|
|
|
|
}
|
2003-05-09 17:25:50 -04:00
|
|
|
break;
|
|
|
|
|
|
|
|
case syck_map_kind:
|
2004-04-26 19:24:46 -04:00
|
|
|
if ( n->data.pairs != NULL )
|
|
|
|
{
|
|
|
|
S_FREE( n->data.pairs->keys );
|
|
|
|
S_FREE( n->data.pairs->values );
|
|
|
|
S_FREE( n->data.pairs );
|
|
|
|
n->data.pairs = NULL;
|
|
|
|
}
|
2003-05-09 17:25:50 -04:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|