2003-05-13 02:34:18 -04:00
|
|
|
/*
|
|
|
|
* syck.c
|
|
|
|
*
|
|
|
|
* $Author$
|
|
|
|
* $Date$
|
|
|
|
*
|
|
|
|
* Copyright (C) 2003 why the lucky stiff
|
|
|
|
*/
|
2007-06-09 23:06:15 -04:00
|
|
|
#include "ruby/ruby.h"
|
2004-05-06 02:29:56 -04:00
|
|
|
|
2003-05-09 17:25:50 -04:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <string.h>
|
|
|
|
|
2003-10-14 19:15:19 -04:00
|
|
|
#include "syck.h"
|
2003-05-09 17:25:50 -04:00
|
|
|
|
2003-05-14 20:52:28 -04:00
|
|
|
void syck_parser_pop_level( SyckParser * );
|
|
|
|
|
2003-05-13 02:34:18 -04:00
|
|
|
/*
|
|
|
|
* Custom assert
|
|
|
|
*/
|
2003-05-09 17:25:50 -04:00
|
|
|
void
|
|
|
|
syck_assert( char *file_name, unsigned line_num )
|
|
|
|
{
|
|
|
|
fflush( NULL );
|
|
|
|
fprintf( stderr, "\nAssertion failed: %s, line %u\n",
|
|
|
|
file_name, line_num );
|
|
|
|
fflush( stderr );
|
|
|
|
abort();
|
|
|
|
}
|
|
|
|
|
2003-07-11 18:52:14 -04:00
|
|
|
/*
|
|
|
|
* Allocates and copies a string
|
|
|
|
*/
|
2003-05-09 17:25:50 -04:00
|
|
|
char *
|
* 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_strndup( const char *buf, long len )
|
2003-05-09 17:25:50 -04:00
|
|
|
{
|
|
|
|
char *new = S_ALLOC_N( char, len + 1 );
|
|
|
|
S_MEMZERO( new, char, len + 1 );
|
|
|
|
S_MEMCPY( new, buf, char, len );
|
2003-05-14 20:52:28 -04:00
|
|
|
return new;
|
2003-05-09 17:25:50 -04:00
|
|
|
}
|
|
|
|
|
2003-05-13 02:34:18 -04:00
|
|
|
/*
|
2003-07-11 18:52:14 -04:00
|
|
|
* Default FILE IO function
|
2003-05-13 02:34:18 -04:00
|
|
|
*/
|
2003-05-09 17:25:50 -04:00
|
|
|
long
|
|
|
|
syck_io_file_read( char *buf, SyckIoFile *file, long max_size, long skip )
|
|
|
|
{
|
|
|
|
long len = 0;
|
|
|
|
|
|
|
|
ASSERT( file != NULL );
|
|
|
|
|
|
|
|
max_size -= skip;
|
2003-08-19 12:38:02 -04:00
|
|
|
len = fread( buf + skip, sizeof( char ), max_size, file->ptr );
|
2003-05-09 17:25:50 -04:00
|
|
|
len += skip;
|
|
|
|
buf[len] = '\0';
|
2003-07-11 18:52:14 -04:00
|
|
|
|
2003-05-09 17:25:50 -04:00
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
2003-07-11 18:52:14 -04:00
|
|
|
/*
|
|
|
|
* Default string IO function
|
|
|
|
*/
|
2003-05-09 17:25:50 -04:00
|
|
|
long
|
|
|
|
syck_io_str_read( char *buf, SyckIoStr *str, long max_size, long skip )
|
|
|
|
{
|
|
|
|
char *beg;
|
|
|
|
long len = 0;
|
|
|
|
|
|
|
|
ASSERT( str != NULL );
|
|
|
|
beg = str->ptr;
|
|
|
|
if ( max_size >= 0 )
|
|
|
|
{
|
|
|
|
max_size -= skip;
|
2003-11-25 14:51:38 -05:00
|
|
|
if ( max_size <= 0 ) max_size = 0;
|
2003-12-01 10:45:54 -05:00
|
|
|
else str->ptr += max_size;
|
2003-05-09 17:25:50 -04:00
|
|
|
|
|
|
|
if ( str->ptr > str->end )
|
|
|
|
{
|
|
|
|
str->ptr = str->end;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2003-07-04 08:51:42 -04:00
|
|
|
/* Use exact string length */
|
2003-05-09 17:25:50 -04:00
|
|
|
while ( str->ptr < str->end ) {
|
|
|
|
if (*(str->ptr++) == '\n') break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if ( beg < str->ptr )
|
|
|
|
{
|
2003-12-08 01:03:35 -05:00
|
|
|
len = ( str->ptr - beg );
|
2003-05-09 17:25:50 -04:00
|
|
|
S_MEMCPY( buf + skip, beg, char, len );
|
|
|
|
}
|
|
|
|
len += skip;
|
|
|
|
buf[len] = '\0';
|
2003-07-11 18:52:14 -04:00
|
|
|
|
2003-05-09 17:25:50 -04:00
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
syck_parser_reset_levels( SyckParser *p )
|
|
|
|
{
|
2003-05-14 16:01:09 -04:00
|
|
|
while ( p->lvl_idx > 1 )
|
|
|
|
{
|
|
|
|
syck_parser_pop_level( p );
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( p->lvl_idx < 1 )
|
|
|
|
{
|
|
|
|
p->lvl_idx = 1;
|
|
|
|
p->levels[0].spaces = -1;
|
2003-10-14 19:15:19 -04:00
|
|
|
p->levels[0].ncount = 0;
|
2003-05-15 03:38:10 -04:00
|
|
|
p->levels[0].domain = syck_strndup( "", 0 );
|
2003-05-14 16:01:09 -04:00
|
|
|
}
|
2003-05-15 17:46:47 -04:00
|
|
|
p->levels[0].status = syck_lvl_header;
|
2003-05-09 17:25:50 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
syck_parser_reset_cursor( SyckParser *p )
|
|
|
|
{
|
|
|
|
if ( p->buffer == NULL )
|
|
|
|
{
|
|
|
|
p->buffer = S_ALLOC_N( char, p->bufsize );
|
2003-05-15 17:46:47 -04:00
|
|
|
S_MEMZERO( p->buffer, char, p->bufsize );
|
2003-05-09 17:25:50 -04:00
|
|
|
}
|
|
|
|
p->buffer[0] = '\0';
|
|
|
|
|
|
|
|
p->cursor = NULL;
|
|
|
|
p->lineptr = NULL;
|
2003-05-19 12:37:20 -04:00
|
|
|
p->linectptr = NULL;
|
2003-05-09 17:25:50 -04:00
|
|
|
p->token = NULL;
|
|
|
|
p->toktmp = NULL;
|
|
|
|
p->marker = NULL;
|
|
|
|
p->limit = NULL;
|
|
|
|
|
2003-05-15 17:46:47 -04:00
|
|
|
p->root = 0;
|
|
|
|
p->root_on_error = 0;
|
2003-05-09 17:25:50 -04:00
|
|
|
p->linect = 0;
|
|
|
|
p->eof = 0;
|
|
|
|
p->last_token = 0;
|
|
|
|
p->force_token = 0;
|
|
|
|
}
|
|
|
|
|
2003-07-11 18:52:14 -04:00
|
|
|
/*
|
|
|
|
* Value to return on a parse error
|
|
|
|
*/
|
2003-05-15 17:46:47 -04:00
|
|
|
void
|
|
|
|
syck_parser_set_root_on_error( SyckParser *p, SYMID roer )
|
|
|
|
{
|
|
|
|
p->root_on_error = roer;
|
|
|
|
}
|
|
|
|
|
2003-05-13 02:34:18 -04:00
|
|
|
/*
|
|
|
|
* Allocate the parser
|
|
|
|
*/
|
2003-05-09 17:25:50 -04:00
|
|
|
SyckParser *
|
2007-03-18 23:58:57 -04:00
|
|
|
syck_new_parser(void)
|
2003-05-09 17:25:50 -04:00
|
|
|
{
|
|
|
|
SyckParser *p;
|
|
|
|
p = S_ALLOC( SyckParser );
|
2004-05-25 10:57:25 -04:00
|
|
|
S_MEMZERO( p, SyckParser, 1 );
|
2003-05-09 17:25:50 -04:00
|
|
|
p->lvl_capa = ALLOC_CT;
|
|
|
|
p->levels = S_ALLOC_N( SyckLevel, p->lvl_capa );
|
2003-10-14 19:15:19 -04:00
|
|
|
p->input_type = syck_yaml_utf8;
|
2003-05-09 17:25:50 -04:00
|
|
|
p->io_type = syck_io_str;
|
|
|
|
p->io.str = NULL;
|
|
|
|
p->syms = NULL;
|
2003-06-05 00:43:05 -04:00
|
|
|
p->anchors = NULL;
|
2003-06-17 12:55:54 -04:00
|
|
|
p->bad_anchors = NULL;
|
2003-05-09 17:25:50 -04:00
|
|
|
p->implicit_typing = 1;
|
|
|
|
p->taguri_expansion = 0;
|
|
|
|
p->bufsize = SYCK_BUFFERSIZE;
|
|
|
|
p->buffer = NULL;
|
2003-05-14 16:01:09 -04:00
|
|
|
p->lvl_idx = 0;
|
2003-05-09 17:25:50 -04:00
|
|
|
syck_parser_reset_levels( p );
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
syck_add_sym( SyckParser *p, char *data )
|
|
|
|
{
|
|
|
|
SYMID id = 0;
|
|
|
|
if ( p->syms == NULL )
|
|
|
|
{
|
|
|
|
p->syms = st_init_numtable();
|
|
|
|
}
|
2003-08-19 12:38:02 -04:00
|
|
|
id = p->syms->num_entries + 1;
|
2003-05-20 02:48:04 -04:00
|
|
|
st_insert( p->syms, id, (st_data_t)data );
|
2003-05-09 17:25:50 -04:00
|
|
|
return id;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
syck_lookup_sym( SyckParser *p, SYMID id, char **data )
|
|
|
|
{
|
|
|
|
if ( p->syms == NULL ) return 0;
|
2003-05-20 02:48:04 -04:00
|
|
|
return st_lookup( p->syms, id, (st_data_t *)data );
|
2003-05-09 17:25:50 -04:00
|
|
|
}
|
|
|
|
|
2003-05-20 02:48:04 -04:00
|
|
|
int
|
2003-05-09 17:25:50 -04:00
|
|
|
syck_st_free_nodes( char *key, SyckNode *n, char *arg )
|
|
|
|
{
|
2004-04-26 19:24:46 -04:00
|
|
|
if ( n != (void *)1 ) syck_free_node( n );
|
|
|
|
n = NULL;
|
2003-05-09 17:25:50 -04:00
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2003-06-05 00:43:05 -04:00
|
|
|
syck_st_free( SyckParser *p )
|
2003-05-09 17:25:50 -04:00
|
|
|
{
|
2003-07-04 08:51:42 -04:00
|
|
|
/*
|
|
|
|
* Free the anchor tables
|
|
|
|
*/
|
2003-06-05 00:43:05 -04:00
|
|
|
if ( p->anchors != NULL )
|
|
|
|
{
|
|
|
|
st_foreach( p->anchors, syck_st_free_nodes, 0 );
|
|
|
|
st_free_table( p->anchors );
|
|
|
|
p->anchors = NULL;
|
|
|
|
}
|
2003-06-17 12:55:54 -04:00
|
|
|
|
|
|
|
if ( p->bad_anchors != NULL )
|
|
|
|
{
|
|
|
|
st_foreach( p->bad_anchors, syck_st_free_nodes, 0 );
|
|
|
|
st_free_table( p->bad_anchors );
|
|
|
|
p->bad_anchors = NULL;
|
|
|
|
}
|
2003-06-05 00:43:05 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
syck_free_parser( SyckParser *p )
|
|
|
|
{
|
2005-09-12 23:58:33 -04:00
|
|
|
/*
|
|
|
|
* Free the adhoc symbol table
|
|
|
|
*/
|
|
|
|
if ( p->syms != NULL )
|
|
|
|
{
|
|
|
|
st_free_table( p->syms );
|
|
|
|
p->syms = NULL;
|
|
|
|
}
|
|
|
|
|
2003-07-04 08:51:42 -04:00
|
|
|
/*
|
|
|
|
* Free tables, levels
|
|
|
|
*/
|
2003-06-05 00:43:05 -04:00
|
|
|
syck_st_free( p );
|
2003-05-14 16:01:09 -04:00
|
|
|
syck_parser_reset_levels( p );
|
2003-05-15 03:38:10 -04:00
|
|
|
S_FREE( p->levels[0].domain );
|
2003-05-09 17:25:50 -04:00
|
|
|
S_FREE( p->levels );
|
2003-05-14 16:01:09 -04:00
|
|
|
|
2003-05-09 17:25:50 -04:00
|
|
|
if ( p->buffer != NULL )
|
|
|
|
{
|
|
|
|
S_FREE( p->buffer );
|
|
|
|
}
|
|
|
|
free_any_io( p );
|
|
|
|
S_FREE( p );
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
syck_parser_handler( SyckParser *p, SyckNodeHandler hdlr )
|
|
|
|
{
|
|
|
|
ASSERT( p != NULL );
|
|
|
|
p->handler = hdlr;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
syck_parser_implicit_typing( SyckParser *p, int flag )
|
|
|
|
{
|
|
|
|
p->implicit_typing = ( flag == 0 ? 0 : 1 );
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
syck_parser_taguri_expansion( SyckParser *p, int flag )
|
|
|
|
{
|
|
|
|
p->taguri_expansion = ( flag == 0 ? 0 : 1 );
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
syck_parser_error_handler( SyckParser *p, SyckErrorHandler hdlr )
|
|
|
|
{
|
|
|
|
ASSERT( p != NULL );
|
|
|
|
p->error_handler = hdlr;
|
|
|
|
}
|
|
|
|
|
2003-06-17 12:55:54 -04:00
|
|
|
void
|
|
|
|
syck_parser_bad_anchor_handler( SyckParser *p, SyckBadAnchorHandler hdlr )
|
|
|
|
{
|
|
|
|
ASSERT( p != NULL );
|
|
|
|
p->bad_anchor_handler = hdlr;
|
|
|
|
}
|
|
|
|
|
2003-10-14 19:15:19 -04:00
|
|
|
void
|
|
|
|
syck_parser_set_input_type( SyckParser *p, enum syck_parser_input input_type )
|
|
|
|
{
|
|
|
|
ASSERT( p != NULL );
|
|
|
|
p->input_type = input_type;
|
|
|
|
}
|
|
|
|
|
2003-05-09 17:25:50 -04:00
|
|
|
void
|
|
|
|
syck_parser_file( SyckParser *p, FILE *fp, SyckIoFileRead read )
|
|
|
|
{
|
|
|
|
ASSERT( p != NULL );
|
|
|
|
free_any_io( p );
|
|
|
|
syck_parser_reset_cursor( p );
|
|
|
|
p->io_type = syck_io_file;
|
|
|
|
p->io.file = S_ALLOC( SyckIoFile );
|
|
|
|
p->io.file->ptr = fp;
|
|
|
|
if ( read != NULL )
|
|
|
|
{
|
|
|
|
p->io.file->read = read;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
p->io.file->read = syck_io_file_read;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
syck_parser_str( SyckParser *p, char *ptr, long len, SyckIoStrRead read )
|
|
|
|
{
|
|
|
|
ASSERT( p != NULL );
|
|
|
|
free_any_io( p );
|
|
|
|
syck_parser_reset_cursor( p );
|
|
|
|
p->io_type = syck_io_str;
|
|
|
|
p->io.str = S_ALLOC( SyckIoStr );
|
|
|
|
p->io.str->beg = ptr;
|
|
|
|
p->io.str->ptr = ptr;
|
|
|
|
p->io.str->end = ptr + len;
|
|
|
|
if ( read != NULL )
|
|
|
|
{
|
|
|
|
p->io.str->read = read;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
p->io.str->read = syck_io_str_read;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
syck_parser_str_auto( SyckParser *p, char *ptr, SyckIoStrRead read )
|
|
|
|
{
|
|
|
|
syck_parser_str( p, ptr, strlen( ptr ), read );
|
|
|
|
}
|
|
|
|
|
|
|
|
SyckLevel *
|
|
|
|
syck_parser_current_level( SyckParser *p )
|
|
|
|
{
|
|
|
|
return &p->levels[p->lvl_idx-1];
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
syck_parser_pop_level( SyckParser *p )
|
|
|
|
{
|
|
|
|
ASSERT( p != NULL );
|
|
|
|
|
2003-07-04 08:51:42 -04:00
|
|
|
/* The root level should never be popped */
|
2003-05-09 17:25:50 -04:00
|
|
|
if ( p->lvl_idx <= 1 ) return;
|
|
|
|
|
|
|
|
p->lvl_idx -= 1;
|
2003-05-13 02:34:18 -04:00
|
|
|
free( p->levels[p->lvl_idx].domain );
|
2003-05-09 17:25:50 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
syck_parser_add_level( SyckParser *p, int len, enum syck_level_status status )
|
|
|
|
{
|
|
|
|
ASSERT( p != NULL );
|
|
|
|
if ( p->lvl_idx + 1 > p->lvl_capa )
|
|
|
|
{
|
|
|
|
p->lvl_capa += ALLOC_CT;
|
|
|
|
S_REALLOC_N( p->levels, SyckLevel, p->lvl_capa );
|
|
|
|
}
|
|
|
|
|
|
|
|
ASSERT( len > p->levels[p->lvl_idx-1].spaces );
|
|
|
|
p->levels[p->lvl_idx].spaces = len;
|
2003-10-14 19:15:19 -04:00
|
|
|
p->levels[p->lvl_idx].ncount = 0;
|
2003-05-13 02:34:18 -04:00
|
|
|
p->levels[p->lvl_idx].domain = syck_strndup( p->levels[p->lvl_idx-1].domain, strlen( p->levels[p->lvl_idx-1].domain ) );
|
2003-05-09 17:25:50 -04:00
|
|
|
p->levels[p->lvl_idx].status = status;
|
|
|
|
p->lvl_idx += 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
free_any_io( SyckParser *p )
|
|
|
|
{
|
|
|
|
ASSERT( p != NULL );
|
|
|
|
switch ( p->io_type )
|
|
|
|
{
|
|
|
|
case syck_io_str:
|
|
|
|
if ( p->io.str != NULL )
|
|
|
|
{
|
|
|
|
S_FREE( p->io.str );
|
|
|
|
p->io.str = NULL;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case syck_io_file:
|
|
|
|
if ( p->io.file != NULL )
|
|
|
|
{
|
|
|
|
S_FREE( p->io.file );
|
|
|
|
p->io.file = NULL;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
long
|
|
|
|
syck_move_tokens( SyckParser *p )
|
|
|
|
{
|
|
|
|
long count, skip;
|
|
|
|
ASSERT( p->buffer != NULL );
|
|
|
|
|
|
|
|
if ( p->token == NULL )
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
skip = p->limit - p->token;
|
|
|
|
if ( ( count = p->token - p->buffer ) )
|
|
|
|
{
|
2006-08-07 05:01:27 -04:00
|
|
|
if (skip > 0)
|
|
|
|
S_MEMMOVE( p->buffer, p->token, char, skip );
|
2003-05-09 17:25:50 -04:00
|
|
|
p->token = p->buffer;
|
|
|
|
p->marker -= count;
|
|
|
|
p->cursor -= count;
|
|
|
|
p->toktmp -= count;
|
|
|
|
p->limit -= count;
|
|
|
|
p->lineptr -= count;
|
2003-05-19 12:37:20 -04:00
|
|
|
p->linectptr -= count;
|
2003-05-09 17:25:50 -04:00
|
|
|
}
|
|
|
|
return skip;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
syck_check_limit( SyckParser *p, long len )
|
|
|
|
{
|
|
|
|
if ( p->cursor == NULL )
|
|
|
|
{
|
|
|
|
p->cursor = p->buffer;
|
|
|
|
p->lineptr = p->buffer;
|
2003-05-19 12:37:20 -04:00
|
|
|
p->linectptr = p->buffer;
|
2003-05-09 17:25:50 -04:00
|
|
|
p->marker = p->buffer;
|
|
|
|
}
|
|
|
|
p->limit = p->buffer + len;
|
|
|
|
}
|
|
|
|
|
|
|
|
long
|
|
|
|
syck_parser_read( SyckParser *p )
|
|
|
|
{
|
|
|
|
long len = 0;
|
|
|
|
long skip = 0;
|
|
|
|
ASSERT( p != NULL );
|
|
|
|
switch ( p->io_type )
|
|
|
|
{
|
|
|
|
case syck_io_str:
|
|
|
|
skip = syck_move_tokens( p );
|
|
|
|
len = (p->io.str->read)( p->buffer, p->io.str, SYCK_BUFFERSIZE - 1, skip );
|
|
|
|
break;
|
|
|
|
|
|
|
|
case syck_io_file:
|
|
|
|
skip = syck_move_tokens( p );
|
|
|
|
len = (p->io.file->read)( p->buffer, p->io.file, SYCK_BUFFERSIZE - 1, skip );
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
syck_check_limit( p, len );
|
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
|
|
|
long
|
|
|
|
syck_parser_readlen( SyckParser *p, long max_size )
|
|
|
|
{
|
|
|
|
long len = 0;
|
|
|
|
long skip = 0;
|
|
|
|
ASSERT( p != NULL );
|
|
|
|
switch ( p->io_type )
|
|
|
|
{
|
|
|
|
case syck_io_str:
|
|
|
|
skip = syck_move_tokens( p );
|
|
|
|
len = (p->io.str->read)( p->buffer, p->io.str, max_size, skip );
|
|
|
|
break;
|
|
|
|
|
|
|
|
case syck_io_file:
|
|
|
|
skip = syck_move_tokens( p );
|
|
|
|
len = (p->io.file->read)( p->buffer, p->io.file, max_size, skip );
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
syck_check_limit( p, len );
|
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
|
|
|
SYMID
|
|
|
|
syck_parse( SyckParser *p )
|
|
|
|
{
|
|
|
|
ASSERT( p != NULL );
|
|
|
|
|
2003-06-05 00:43:05 -04:00
|
|
|
syck_st_free( p );
|
2003-05-09 17:25:50 -04:00
|
|
|
syck_parser_reset_levels( p );
|
2003-07-28 15:27:42 -04:00
|
|
|
syckparse( p );
|
2003-05-09 17:25:50 -04:00
|
|
|
return p->root;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
syck_default_error_handler( SyckParser *p, char *msg )
|
|
|
|
{
|
|
|
|
printf( "Error at [Line %d, Col %d]: %s\n",
|
|
|
|
p->linect,
|
|
|
|
p->cursor - p->lineptr,
|
|
|
|
msg );
|
|
|
|
}
|
|
|
|
|