2000-05-01 05:42:38 -04:00
|
|
|
/**********************************************************************
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
node.h -
|
|
|
|
|
|
|
|
$Author$
|
|
|
|
created at: Fri May 28 15:14:02 JST 1993
|
|
|
|
|
* encoding.c: provide basic features for M17N.
* parse.y: encoding aware parsing.
* parse.y (pragma_encoding): encoding specification pragma.
* parse.y (rb_intern3): encoding specified symbols.
* string.c (rb_str_length): length based on characters.
for older behavior, bytesize method added.
* string.c (rb_str_index_m): index based on characters. rindex as
well.
* string.c (succ_char): encoding aware succeeding string.
* string.c (rb_str_reverse): reverse based on characters.
* string.c (rb_str_inspect): encoding aware string description.
* string.c (rb_str_upcase_bang): encoding aware case conversion.
downcase, capitalize, swapcase as well.
* string.c (rb_str_tr_bang): tr based on characters. delete,
squeeze, tr_s, count as well.
* string.c (rb_str_split_m): split based on characters.
* string.c (rb_str_each_line): encoding aware each_line.
* string.c (rb_str_each_char): added. iteration based on
characters.
* string.c (rb_str_strip_bang): encoding aware whitespace
stripping. lstrip, rstrip as well.
* string.c (rb_str_justify): encoding aware justifying (ljust,
rjust, center).
* string.c (str_encoding): get encoding attribute from a string.
* re.c (rb_reg_initialize): encoding aware regular expression
* sprintf.c (rb_str_format): formatting (i.e. length count) based
on characters.
* io.c (rb_io_getc): getc to return one-character string.
for older behavior, getbyte method added.
* ext/stringio/stringio.c (strio_getc): ditto.
* io.c (rb_io_ungetc): allow pushing arbitrary string at the
current reading point.
* ext/stringio/stringio.c (strio_ungetc): ditto.
* ext/strscan/strscan.c: encoding support.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13261 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-08-24 23:29:39 -04:00
|
|
|
Copyright (C) 1993-2007 Yukihiro Matsumoto
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2000-05-01 05:42:38 -04:00
|
|
|
**********************************************************************/
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2007-06-09 23:06:15 -04:00
|
|
|
#ifndef RUBY_NODE_H
|
|
|
|
#define RUBY_NODE_H 1
|
1998-01-16 07:13:05 -05:00
|
|
|
|
1999-10-29 05:25:48 -04:00
|
|
|
#if defined(__cplusplus)
|
|
|
|
extern "C" {
|
2007-06-09 23:06:15 -04:00
|
|
|
#if 0
|
|
|
|
} /* satisfy cc-mode */
|
|
|
|
#endif
|
1999-10-29 05:25:48 -04:00
|
|
|
#endif
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
enum node_type {
|
|
|
|
NODE_SCOPE,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_SCOPE NODE_SCOPE
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_BLOCK,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_BLOCK NODE_BLOCK
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_IF,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_IF NODE_IF
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_CASE,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_CASE NODE_CASE
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_WHEN,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_WHEN NODE_WHEN
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_OPT_N,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_OPT_N NODE_OPT_N
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_WHILE,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_WHILE NODE_WHILE
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_UNTIL,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_UNTIL NODE_UNTIL
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_ITER,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_ITER NODE_ITER
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_FOR,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_FOR NODE_FOR
|
1998-01-16 07:19:22 -05:00
|
|
|
NODE_BREAK,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_BREAK NODE_BREAK
|
1998-01-16 07:19:22 -05:00
|
|
|
NODE_NEXT,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_NEXT NODE_NEXT
|
1998-01-16 07:19:22 -05:00
|
|
|
NODE_REDO,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_REDO NODE_REDO
|
1998-01-16 07:19:22 -05:00
|
|
|
NODE_RETRY,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_RETRY NODE_RETRY
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_BEGIN,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_BEGIN NODE_BEGIN
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_RESCUE,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_RESCUE NODE_RESCUE
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_RESBODY,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_RESBODY NODE_RESBODY
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_ENSURE,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_ENSURE NODE_ENSURE
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_AND,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_AND NODE_AND
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_OR,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_OR NODE_OR
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_MASGN,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_MASGN NODE_MASGN
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_LASGN,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_LASGN NODE_LASGN
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_DASGN,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_DASGN NODE_DASGN
|
2000-01-31 22:12:21 -05:00
|
|
|
NODE_DASGN_CURR,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_DASGN_CURR NODE_DASGN_CURR
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_GASGN,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_GASGN NODE_GASGN
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_IASGN,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_IASGN NODE_IASGN
|
2007-02-04 14:17:33 -05:00
|
|
|
NODE_IASGN2,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_IASGN2 NODE_IASGN2
|
1999-11-17 02:30:37 -05:00
|
|
|
NODE_CDECL,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_CDECL NODE_CDECL
|
2000-11-21 09:26:25 -05:00
|
|
|
NODE_CVASGN,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_CVASGN NODE_CVASGN
|
2000-03-23 03:37:35 -05:00
|
|
|
NODE_CVDECL,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_CVDECL NODE_CVDECL
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_OP_ASGN1,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_OP_ASGN1 NODE_OP_ASGN1
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_OP_ASGN2,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_OP_ASGN2 NODE_OP_ASGN2
|
1999-01-19 23:59:39 -05:00
|
|
|
NODE_OP_ASGN_AND,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_OP_ASGN_AND NODE_OP_ASGN_AND
|
1999-01-19 23:59:39 -05:00
|
|
|
NODE_OP_ASGN_OR,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_OP_ASGN_OR NODE_OP_ASGN_OR
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_CALL,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_CALL NODE_CALL
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_FCALL,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_FCALL NODE_FCALL
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_VCALL,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_VCALL NODE_VCALL
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_SUPER,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_SUPER NODE_SUPER
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_ZSUPER,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_ZSUPER NODE_ZSUPER
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_ARRAY,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_ARRAY NODE_ARRAY
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_ZARRAY,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_ZARRAY NODE_ZARRAY
|
2004-05-07 04:44:24 -04:00
|
|
|
NODE_VALUES,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_VALUES NODE_VALUES
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_HASH,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_HASH NODE_HASH
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_RETURN,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_RETURN NODE_RETURN
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_YIELD,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_YIELD NODE_YIELD
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_LVAR,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_LVAR NODE_LVAR
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_DVAR,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_DVAR NODE_DVAR
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_GVAR,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_GVAR NODE_GVAR
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_IVAR,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_IVAR NODE_IVAR
|
2000-03-23 03:37:35 -05:00
|
|
|
NODE_CONST,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_CONST NODE_CONST
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_CVAR,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_CVAR NODE_CVAR
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_NTH_REF,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_NTH_REF NODE_NTH_REF
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_BACK_REF,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_BACK_REF NODE_BACK_REF
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_MATCH,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_MATCH NODE_MATCH
|
1998-01-16 07:19:22 -05:00
|
|
|
NODE_MATCH2,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_MATCH2 NODE_MATCH2
|
1998-01-16 07:19:22 -05:00
|
|
|
NODE_MATCH3,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_MATCH3 NODE_MATCH3
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_LIT,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_LIT NODE_LIT
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_STR,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_STR NODE_STR
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_DSTR,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_DSTR NODE_DSTR
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_XSTR,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_XSTR NODE_XSTR
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_DXSTR,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_DXSTR NODE_DXSTR
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_EVSTR,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_EVSTR NODE_EVSTR
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_DREGX,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_DREGX NODE_DREGX
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_DREGX_ONCE,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_DREGX_ONCE NODE_DREGX_ONCE
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_ARGS,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_ARGS NODE_ARGS
|
* parse.y, node.h, compile.c: change node tree structure. a purpose
of this change is to unify argument structure of method and block.
this change prohibits duplicate block parameter name.
new argument infromation:
NODE_ARGS [m: int, o: NODE_OPT_ARG, ->]
NODE_ARGS_AUX [r: ID, b: ID, ->]
NODE_ARGS_AUX [Pst: id, Plen: int, init: NODE*]
optarg information:
NODE_OPT_ARGS [idx, expr, ->]
* vm_macro.def: ditto.
* gc.c: ditto.
* iseq.c: ditto.
* compile.h: fix debug function name.
* test/ripper/test_scanner_events.rb: |_,_,foo| -> |_1,_2,foo|
* test/ruby/test_lambda.rb: disalbe test temporarily.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11840 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-23 21:07:05 -05:00
|
|
|
NODE_ARGS_AUX,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_ARGS_AUX NODE_ARGS_AUX
|
* parse.y, node.h, compile.c: change node tree structure. a purpose
of this change is to unify argument structure of method and block.
this change prohibits duplicate block parameter name.
new argument infromation:
NODE_ARGS [m: int, o: NODE_OPT_ARG, ->]
NODE_ARGS_AUX [r: ID, b: ID, ->]
NODE_ARGS_AUX [Pst: id, Plen: int, init: NODE*]
optarg information:
NODE_OPT_ARGS [idx, expr, ->]
* vm_macro.def: ditto.
* gc.c: ditto.
* iseq.c: ditto.
* compile.h: fix debug function name.
* test/ripper/test_scanner_events.rb: |_,_,foo| -> |_1,_2,foo|
* test/ruby/test_lambda.rb: disalbe test temporarily.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11840 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-23 21:07:05 -05:00
|
|
|
NODE_OPT_ARG,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_OPT_ARG NODE_OPT_ARG
|
2011-12-26 09:20:03 -05:00
|
|
|
NODE_KW_ARG,
|
|
|
|
#define NODE_KW_ARG NODE_KW_ARG
|
* 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
|
|
|
NODE_POSTARG,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_POSTARG NODE_POSTARG
|
1999-01-19 23:59:39 -05:00
|
|
|
NODE_ARGSCAT,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_ARGSCAT NODE_ARGSCAT
|
2000-01-17 03:37:53 -05:00
|
|
|
NODE_ARGSPUSH,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_ARGSPUSH NODE_ARGSPUSH
|
2003-03-26 02:01:14 -05:00
|
|
|
NODE_SPLAT,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_SPLAT NODE_SPLAT
|
2003-10-06 13:59:53 -04:00
|
|
|
NODE_TO_ARY,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_TO_ARY NODE_TO_ARY
|
1999-01-19 23:59:39 -05:00
|
|
|
NODE_BLOCK_ARG,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_BLOCK_ARG NODE_BLOCK_ARG
|
1999-01-19 23:59:39 -05:00
|
|
|
NODE_BLOCK_PASS,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_BLOCK_PASS NODE_BLOCK_PASS
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_DEFN,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_DEFN NODE_DEFN
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_DEFS,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_DEFS NODE_DEFS
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_ALIAS,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_ALIAS NODE_ALIAS
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_VALIAS,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_VALIAS NODE_VALIAS
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_UNDEF,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_UNDEF NODE_UNDEF
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_CLASS,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_CLASS NODE_CLASS
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_MODULE,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_MODULE NODE_MODULE
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_SCLASS,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_SCLASS NODE_SCLASS
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_COLON2,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_COLON2 NODE_COLON2
|
1999-01-19 23:59:39 -05:00
|
|
|
NODE_COLON3,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_COLON3 NODE_COLON3
|
2012-08-02 07:34:19 -04:00
|
|
|
NODE_CREF,
|
|
|
|
#define NODE_CREF NODE_CREF
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_DOT2,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_DOT2 NODE_DOT2
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_DOT3,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_DOT3 NODE_DOT3
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_FLIP2,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_FLIP2 NODE_FLIP2
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_FLIP3,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_FLIP3 NODE_FLIP3
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_SELF,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_SELF NODE_SELF
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_NIL,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_NIL NODE_NIL
|
1998-01-16 07:19:22 -05:00
|
|
|
NODE_TRUE,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_TRUE NODE_TRUE
|
1998-01-16 07:19:22 -05:00
|
|
|
NODE_FALSE,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_FALSE NODE_FALSE
|
2004-01-22 03:31:33 -05:00
|
|
|
NODE_ERRINFO,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_ERRINFO NODE_ERRINFO
|
1998-01-16 07:13:05 -05:00
|
|
|
NODE_DEFINED,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_DEFINED NODE_DEFINED
|
1998-01-16 07:19:22 -05:00
|
|
|
NODE_POSTEXE,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_POSTEXE NODE_POSTEXE
|
1999-01-19 23:59:39 -05:00
|
|
|
NODE_ALLOCA,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_ALLOCA NODE_ALLOCA
|
2000-12-05 04:36:54 -05:00
|
|
|
NODE_BMETHOD,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_BMETHOD NODE_BMETHOD
|
2000-01-17 03:37:53 -05:00
|
|
|
NODE_MEMO,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_MEMO NODE_MEMO
|
2001-01-09 02:26:21 -05:00
|
|
|
NODE_IFUNC,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_IFUNC NODE_IFUNC
|
2002-10-23 06:17:30 -04:00
|
|
|
NODE_DSYM,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_DSYM NODE_DSYM
|
2002-12-17 05:34:30 -05:00
|
|
|
NODE_ATTRASGN,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_ATTRASGN NODE_ATTRASGN
|
2004-09-21 20:19:15 -04:00
|
|
|
NODE_PRELUDE,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_PRELUDE NODE_PRELUDE
|
2005-03-01 22:21:31 -05:00
|
|
|
NODE_LAMBDA,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_LAMBDA NODE_LAMBDA
|
2006-12-31 10:02:22 -05:00
|
|
|
NODE_OPTBLOCK,
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_OPTBLOCK NODE_OPTBLOCK
|
2000-05-01 05:42:38 -04:00
|
|
|
NODE_LAST
|
2007-07-04 21:42:09 -04:00
|
|
|
#define NODE_LAST NODE_LAST
|
1998-01-16 07:13:05 -05:00
|
|
|
};
|
|
|
|
|
|
|
|
typedef struct RNode {
|
2010-12-15 18:04:50 -05:00
|
|
|
VALUE flags;
|
|
|
|
VALUE nd_reserved; /* ex nd_file */
|
1998-01-16 07:13:05 -05:00
|
|
|
union {
|
|
|
|
struct RNode *node;
|
|
|
|
ID id;
|
|
|
|
VALUE value;
|
2001-05-02 00:22:21 -04:00
|
|
|
VALUE (*cfunc)(ANYARGS);
|
1998-01-16 07:13:05 -05:00
|
|
|
ID *tbl;
|
|
|
|
} u1;
|
|
|
|
union {
|
|
|
|
struct RNode *node;
|
|
|
|
ID id;
|
2002-12-31 14:24:29 -05:00
|
|
|
long argc;
|
1998-01-16 07:13:05 -05:00
|
|
|
VALUE value;
|
|
|
|
} u2;
|
|
|
|
union {
|
|
|
|
struct RNode *node;
|
|
|
|
ID id;
|
2000-05-24 00:34:26 -04:00
|
|
|
long state;
|
2009-07-15 20:01:06 -04:00
|
|
|
struct rb_global_entry *entry;
|
2011-12-26 09:19:58 -05:00
|
|
|
struct rb_args_info *args;
|
2000-05-24 00:34:26 -04:00
|
|
|
long cnt;
|
1998-01-16 07:13:05 -05:00
|
|
|
VALUE value;
|
|
|
|
} u3;
|
|
|
|
} NODE;
|
|
|
|
|
|
|
|
#define RNODE(obj) (R_CAST(RNode)(obj))
|
|
|
|
|
2012-08-02 07:34:19 -04:00
|
|
|
/* 0..4:T_TYPES, 5:reserved, 6:NODE_FL_CREF_OMOD_SHARED, 7:NODE_FL_NEWLINE */
|
2008-02-18 00:33:01 -05:00
|
|
|
#define NODE_FL_NEWLINE (((VALUE)1)<<7)
|
2009-12-03 13:25:57 -05:00
|
|
|
#define NODE_FL_CREF_PUSHED_BY_EVAL NODE_FL_NEWLINE
|
2012-08-02 07:34:19 -04:00
|
|
|
#define NODE_FL_CREF_OMOD_SHARED (((VALUE)1)<<6)
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2007-10-07 09:03:05 -04:00
|
|
|
#define NODE_TYPESHIFT 8
|
|
|
|
#define NODE_TYPEMASK (((VALUE)0x7f)<<NODE_TYPESHIFT)
|
2004-11-16 21:27:38 -05:00
|
|
|
|
|
|
|
#define nd_type(n) ((int) (((RNODE(n))->flags & NODE_TYPEMASK)>>NODE_TYPESHIFT))
|
2004-10-27 05:29:26 -04:00
|
|
|
#define nd_set_type(n,t) \
|
2011-01-20 09:59:59 -05:00
|
|
|
RNODE(n)->flags=((RNODE(n)->flags&~NODE_TYPEMASK)|((((unsigned long)(t))<<NODE_TYPESHIFT)&NODE_TYPEMASK))
|
2004-01-21 11:47:23 -05:00
|
|
|
|
2007-10-07 09:03:05 -04:00
|
|
|
#define NODE_LSHIFT (NODE_TYPESHIFT+7)
|
|
|
|
#define NODE_LMASK (((SIGNED_VALUE)1<<(sizeof(VALUE)*CHAR_BIT-NODE_LSHIFT))-1)
|
2009-09-14 03:39:16 -04:00
|
|
|
#define nd_line(n) (int)(RNODE(n)->flags>>NODE_LSHIFT)
|
1998-01-16 07:13:05 -05:00
|
|
|
#define nd_set_line(n,l) \
|
1999-01-19 23:59:39 -05:00
|
|
|
RNODE(n)->flags=((RNODE(n)->flags&~(-1<<NODE_LSHIFT))|(((l)&NODE_LMASK)<<NODE_LSHIFT))
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2012-08-02 07:34:19 -04:00
|
|
|
#define nd_omod nd_reserved
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
#define nd_head u1.node
|
|
|
|
#define nd_alen u2.argc
|
|
|
|
#define nd_next u3.node
|
|
|
|
|
|
|
|
#define nd_cond u1.node
|
|
|
|
#define nd_body u2.node
|
|
|
|
#define nd_else u3.node
|
|
|
|
|
|
|
|
#define nd_orig u3.value
|
|
|
|
|
|
|
|
#define nd_resq u2.node
|
|
|
|
#define nd_ensr u3.node
|
|
|
|
|
|
|
|
#define nd_1st u1.node
|
|
|
|
#define nd_2nd u2.node
|
|
|
|
|
|
|
|
#define nd_stts u1.node
|
|
|
|
|
|
|
|
#define nd_entry u3.entry
|
|
|
|
#define nd_vid u1.id
|
|
|
|
#define nd_cflag u2.id
|
|
|
|
#define nd_cval u3.value
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
#define nd_oid u1.id
|
1998-01-16 07:13:05 -05:00
|
|
|
#define nd_cnt u3.cnt
|
|
|
|
#define nd_tbl u1.tbl
|
|
|
|
|
|
|
|
#define nd_var u1.node
|
|
|
|
#define nd_iter u3.node
|
|
|
|
|
|
|
|
#define nd_value u2.node
|
|
|
|
#define nd_aid u3.id
|
|
|
|
|
|
|
|
#define nd_lit u1.value
|
|
|
|
|
* parse.y, node.h, compile.c: change node tree structure. a purpose
of this change is to unify argument structure of method and block.
this change prohibits duplicate block parameter name.
new argument infromation:
NODE_ARGS [m: int, o: NODE_OPT_ARG, ->]
NODE_ARGS_AUX [r: ID, b: ID, ->]
NODE_ARGS_AUX [Pst: id, Plen: int, init: NODE*]
optarg information:
NODE_OPT_ARGS [idx, expr, ->]
* vm_macro.def: ditto.
* gc.c: ditto.
* iseq.c: ditto.
* compile.h: fix debug function name.
* test/ripper/test_scanner_events.rb: |_,_,foo| -> |_1,_2,foo|
* test/ruby/test_lambda.rb: disalbe test temporarily.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11840 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-23 21:07:05 -05:00
|
|
|
#define nd_frml u2.argc
|
|
|
|
#define nd_rest u1.id
|
1998-01-16 07:13:05 -05:00
|
|
|
#define nd_opt u1.node
|
* parse.y, node.h, compile.c: change node tree structure. a purpose
of this change is to unify argument structure of method and block.
this change prohibits duplicate block parameter name.
new argument infromation:
NODE_ARGS [m: int, o: NODE_OPT_ARG, ->]
NODE_ARGS_AUX [r: ID, b: ID, ->]
NODE_ARGS_AUX [Pst: id, Plen: int, init: NODE*]
optarg information:
NODE_OPT_ARGS [idx, expr, ->]
* vm_macro.def: ditto.
* gc.c: ditto.
* iseq.c: ditto.
* compile.h: fix debug function name.
* test/ripper/test_scanner_events.rb: |_,_,foo| -> |_1,_2,foo|
* test/ruby/test_lambda.rb: disalbe test temporarily.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11840 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-23 21:07:05 -05:00
|
|
|
#define nd_pid u1.id
|
|
|
|
#define nd_plen u2.argc
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
#define nd_recv u1.node
|
|
|
|
#define nd_mid u2.id
|
|
|
|
#define nd_args u3.node
|
2011-12-26 09:19:58 -05:00
|
|
|
#define nd_ainfo u3.args
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
#define nd_noex u3.id
|
1998-01-16 07:13:05 -05:00
|
|
|
#define nd_defn u3.node
|
|
|
|
|
|
|
|
#define nd_cfnc u1.cfunc
|
|
|
|
#define nd_argc u2.argc
|
|
|
|
|
2003-02-19 04:27:49 -05:00
|
|
|
#define nd_cpath u1.node
|
1998-01-16 07:19:22 -05:00
|
|
|
#define nd_super u3.node
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
#define nd_modl u1.id
|
|
|
|
#define nd_clss u1.value
|
|
|
|
|
|
|
|
#define nd_beg u1.node
|
|
|
|
#define nd_end u2.node
|
|
|
|
#define nd_state u3.state
|
1999-01-19 23:59:39 -05:00
|
|
|
#define nd_rval u2.value
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
#define nd_nth u2.argc
|
|
|
|
|
|
|
|
#define nd_tag u1.id
|
|
|
|
#define nd_tval u2.value
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
#define nd_visi u2.argc
|
|
|
|
|
2003-07-04 11:30:35 -04:00
|
|
|
#define NEW_NODE(t,a0,a1,a2) rb_node_newnode((t),(VALUE)(a0),(VALUE)(a1),(VALUE)(a2))
|
|
|
|
|
* compile.c, parse.y, eval.c, intern.h, iseq.c, lex.c, node.h,
proc.c, vm.c, vm_macro.def, vm_macro.def, yarvcore.c, yarvcore.h,
debug.c, debug.h: merge half-baked-1.9 changes. The biggest change
is to change node structure around NODE_SCOPE, NODE_ARGS. Every
scope (method/class/block) has own NODE_SCOPE node and NODE_ARGS
represents more details of arguments information. I'll write a
document about detail of node structure.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12117 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-03-21 07:15:15 -04:00
|
|
|
#define NEW_DEFN(i,a,d,p) NEW_NODE(NODE_DEFN,0,i,NEW_SCOPE(a,d))
|
|
|
|
#define NEW_DEFS(r,i,a,d) NEW_NODE(NODE_DEFS,r,i,NEW_SCOPE(a,d))
|
2003-07-04 11:30:35 -04:00
|
|
|
#define NEW_IFUNC(f,c) NEW_NODE(NODE_IFUNC,f,c,0)
|
* compile.c, parse.y, eval.c, intern.h, iseq.c, lex.c, node.h,
proc.c, vm.c, vm_macro.def, vm_macro.def, yarvcore.c, yarvcore.h,
debug.c, debug.h: merge half-baked-1.9 changes. The biggest change
is to change node structure around NODE_SCOPE, NODE_ARGS. Every
scope (method/class/block) has own NODE_SCOPE node and NODE_ARGS
represents more details of arguments information. I'll write a
document about detail of node structure.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12117 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-03-21 07:15:15 -04:00
|
|
|
#define NEW_SCOPE(a,b) NEW_NODE(NODE_SCOPE,local_tbl(),b,a)
|
2003-07-04 11:30:35 -04:00
|
|
|
#define NEW_BLOCK(a) NEW_NODE(NODE_BLOCK,a,0,0)
|
|
|
|
#define NEW_IF(c,t,e) NEW_NODE(NODE_IF,c,t,e)
|
1999-01-19 23:59:39 -05:00
|
|
|
#define NEW_UNLESS(c,t,e) NEW_IF(c,e,t)
|
2003-07-04 11:30:35 -04:00
|
|
|
#define NEW_CASE(h,b) NEW_NODE(NODE_CASE,h,b,0)
|
|
|
|
#define NEW_WHEN(c,t,e) NEW_NODE(NODE_WHEN,c,t,e)
|
|
|
|
#define NEW_OPT_N(b) NEW_NODE(NODE_OPT_N,0,b,0)
|
|
|
|
#define NEW_WHILE(c,b,n) NEW_NODE(NODE_WHILE,c,b,n)
|
|
|
|
#define NEW_UNTIL(c,b,n) NEW_NODE(NODE_UNTIL,c,b,n)
|
|
|
|
#define NEW_FOR(v,i,b) NEW_NODE(NODE_FOR,v,b,i)
|
* compile.c, parse.y, eval.c, intern.h, iseq.c, lex.c, node.h,
proc.c, vm.c, vm_macro.def, vm_macro.def, yarvcore.c, yarvcore.h,
debug.c, debug.h: merge half-baked-1.9 changes. The biggest change
is to change node structure around NODE_SCOPE, NODE_ARGS. Every
scope (method/class/block) has own NODE_SCOPE node and NODE_ARGS
represents more details of arguments information. I'll write a
document about detail of node structure.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12117 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-03-21 07:15:15 -04:00
|
|
|
#define NEW_ITER(a,b) NEW_NODE(NODE_ITER,0,NEW_SCOPE(a,b),0)
|
2011-12-26 09:19:52 -05:00
|
|
|
#define NEW_LAMBDA(a,b) NEW_NODE(NODE_LAMBDA,0,NEW_SCOPE(a,b),0)
|
2003-07-04 11:30:35 -04:00
|
|
|
#define NEW_BREAK(s) NEW_NODE(NODE_BREAK,s,0,0)
|
|
|
|
#define NEW_NEXT(s) NEW_NODE(NODE_NEXT,s,0,0)
|
|
|
|
#define NEW_REDO() NEW_NODE(NODE_REDO,0,0,0)
|
|
|
|
#define NEW_RETRY() NEW_NODE(NODE_RETRY,0,0,0)
|
|
|
|
#define NEW_BEGIN(b) NEW_NODE(NODE_BEGIN,0,b,0)
|
|
|
|
#define NEW_RESCUE(b,res,e) NEW_NODE(NODE_RESCUE,b,res,e)
|
|
|
|
#define NEW_RESBODY(a,ex,n) NEW_NODE(NODE_RESBODY,n,ex,a)
|
|
|
|
#define NEW_ENSURE(b,en) NEW_NODE(NODE_ENSURE,b,0,en)
|
|
|
|
#define NEW_RETURN(s) NEW_NODE(NODE_RETURN,s,0,0)
|
2012-03-12 01:56:57 -04:00
|
|
|
#define NEW_YIELD(a) NEW_NODE(NODE_YIELD,a,0,0)
|
1998-01-16 07:13:05 -05:00
|
|
|
#define NEW_LIST(a) NEW_ARRAY(a)
|
2003-07-04 11:30:35 -04:00
|
|
|
#define NEW_ARRAY(a) NEW_NODE(NODE_ARRAY,a,1,0)
|
|
|
|
#define NEW_ZARRAY() NEW_NODE(NODE_ZARRAY,0,0,0)
|
|
|
|
#define NEW_HASH(a) NEW_NODE(NODE_HASH,a,0,0)
|
|
|
|
#define NEW_MASGN(l,r) NEW_NODE(NODE_MASGN,l,0,r)
|
|
|
|
#define NEW_GASGN(v,val) NEW_NODE(NODE_GASGN,v,val,rb_global_entry(v))
|
* compile.c, parse.y, eval.c, intern.h, iseq.c, lex.c, node.h,
proc.c, vm.c, vm_macro.def, vm_macro.def, yarvcore.c, yarvcore.h,
debug.c, debug.h: merge half-baked-1.9 changes. The biggest change
is to change node structure around NODE_SCOPE, NODE_ARGS. Every
scope (method/class/block) has own NODE_SCOPE node and NODE_ARGS
represents more details of arguments information. I'll write a
document about detail of node structure.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12117 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-03-21 07:15:15 -04:00
|
|
|
#define NEW_LASGN(v,val) NEW_NODE(NODE_LASGN,v,val,0)
|
2003-07-04 11:30:35 -04:00
|
|
|
#define NEW_DASGN(v,val) NEW_NODE(NODE_DASGN,v,val,0)
|
|
|
|
#define NEW_DASGN_CURR(v,val) NEW_NODE(NODE_DASGN_CURR,v,val,0)
|
|
|
|
#define NEW_IASGN(v,val) NEW_NODE(NODE_IASGN,v,val,0)
|
2007-02-04 14:17:33 -05:00
|
|
|
#define NEW_IASGN2(v,val) NEW_NODE(NODE_IASGN2,v,val,0)
|
2003-07-04 11:30:35 -04:00
|
|
|
#define NEW_CDECL(v,val,path) NEW_NODE(NODE_CDECL,v,val,path)
|
|
|
|
#define NEW_CVASGN(v,val) NEW_NODE(NODE_CVASGN,v,val,0)
|
|
|
|
#define NEW_CVDECL(v,val) NEW_NODE(NODE_CVDECL,v,val,0)
|
|
|
|
#define NEW_OP_ASGN1(p,id,a) NEW_NODE(NODE_OP_ASGN1,p,id,a)
|
|
|
|
#define NEW_OP_ASGN2(r,i,o,val) NEW_NODE(NODE_OP_ASGN2,r,val,NEW_OP_ASGN22(i,o))
|
|
|
|
#define NEW_OP_ASGN22(i,o) NEW_NODE(NODE_OP_ASGN2,i,o,rb_id_attrset(i))
|
|
|
|
#define NEW_OP_ASGN_OR(i,val) NEW_NODE(NODE_OP_ASGN_OR,i,val,0)
|
|
|
|
#define NEW_OP_ASGN_AND(i,val) NEW_NODE(NODE_OP_ASGN_AND,i,val,0)
|
|
|
|
#define NEW_GVAR(v) NEW_NODE(NODE_GVAR,v,0,rb_global_entry(v))
|
* compile.c, parse.y, eval.c, intern.h, iseq.c, lex.c, node.h,
proc.c, vm.c, vm_macro.def, vm_macro.def, yarvcore.c, yarvcore.h,
debug.c, debug.h: merge half-baked-1.9 changes. The biggest change
is to change node structure around NODE_SCOPE, NODE_ARGS. Every
scope (method/class/block) has own NODE_SCOPE node and NODE_ARGS
represents more details of arguments information. I'll write a
document about detail of node structure.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12117 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-03-21 07:15:15 -04:00
|
|
|
#define NEW_LVAR(v) NEW_NODE(NODE_LVAR,v,0,0)
|
2004-10-02 07:34:13 -04:00
|
|
|
#define NEW_DVAR(v) NEW_NODE(NODE_DVAR,v,0,0)
|
2003-07-04 11:30:35 -04:00
|
|
|
#define NEW_IVAR(v) NEW_NODE(NODE_IVAR,v,0,0)
|
|
|
|
#define NEW_CONST(v) NEW_NODE(NODE_CONST,v,0,0)
|
|
|
|
#define NEW_CVAR(v) NEW_NODE(NODE_CVAR,v,0,0)
|
* compile.c, parse.y, eval.c, intern.h, iseq.c, lex.c, node.h,
proc.c, vm.c, vm_macro.def, vm_macro.def, yarvcore.c, yarvcore.h,
debug.c, debug.h: merge half-baked-1.9 changes. The biggest change
is to change node structure around NODE_SCOPE, NODE_ARGS. Every
scope (method/class/block) has own NODE_SCOPE node and NODE_ARGS
represents more details of arguments information. I'll write a
document about detail of node structure.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12117 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-03-21 07:15:15 -04:00
|
|
|
#define NEW_NTH_REF(n) NEW_NODE(NODE_NTH_REF,0,n,0)
|
|
|
|
#define NEW_BACK_REF(n) NEW_NODE(NODE_BACK_REF,0,n,0)
|
2003-07-04 11:30:35 -04:00
|
|
|
#define NEW_MATCH(c) NEW_NODE(NODE_MATCH,c,0,0)
|
|
|
|
#define NEW_MATCH2(n1,n2) NEW_NODE(NODE_MATCH2,n1,n2,0)
|
|
|
|
#define NEW_MATCH3(r,n2) NEW_NODE(NODE_MATCH3,r,n2,0)
|
|
|
|
#define NEW_LIT(l) NEW_NODE(NODE_LIT,l,0,0)
|
|
|
|
#define NEW_STR(s) NEW_NODE(NODE_STR,s,0,0)
|
2004-05-18 01:00:58 -04:00
|
|
|
#define NEW_DSTR(s) NEW_NODE(NODE_DSTR,s,1,0)
|
2003-07-04 11:30:35 -04:00
|
|
|
#define NEW_XSTR(s) NEW_NODE(NODE_XSTR,s,0,0)
|
|
|
|
#define NEW_DXSTR(s) NEW_NODE(NODE_DXSTR,s,0,0)
|
|
|
|
#define NEW_DSYM(s) NEW_NODE(NODE_DSYM,s,0,0)
|
|
|
|
#define NEW_EVSTR(n) NEW_NODE(NODE_EVSTR,0,(n),0)
|
|
|
|
#define NEW_CALL(r,m,a) NEW_NODE(NODE_CALL,r,m,a)
|
|
|
|
#define NEW_FCALL(m,a) NEW_NODE(NODE_FCALL,0,m,a)
|
|
|
|
#define NEW_VCALL(m) NEW_NODE(NODE_VCALL,0,m,0)
|
|
|
|
#define NEW_SUPER(a) NEW_NODE(NODE_SUPER,0,0,a)
|
|
|
|
#define NEW_ZSUPER() NEW_NODE(NODE_ZSUPER,0,0,0)
|
* parse.y, node.h, compile.c: change node tree structure. a purpose
of this change is to unify argument structure of method and block.
this change prohibits duplicate block parameter name.
new argument infromation:
NODE_ARGS [m: int, o: NODE_OPT_ARG, ->]
NODE_ARGS_AUX [r: ID, b: ID, ->]
NODE_ARGS_AUX [Pst: id, Plen: int, init: NODE*]
optarg information:
NODE_OPT_ARGS [idx, expr, ->]
* vm_macro.def: ditto.
* gc.c: ditto.
* iseq.c: ditto.
* compile.h: fix debug function name.
* test/ripper/test_scanner_events.rb: |_,_,foo| -> |_1,_2,foo|
* test/ruby/test_lambda.rb: disalbe test temporarily.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11840 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-23 21:07:05 -05:00
|
|
|
#define NEW_ARGS_AUX(r,b) NEW_NODE(NODE_ARGS_AUX,r,b,0)
|
|
|
|
#define NEW_OPT_ARG(i,v) NEW_NODE(NODE_OPT_ARG,i,v,0)
|
2011-12-26 09:20:03 -05:00
|
|
|
#define NEW_KW_ARG(i,v) NEW_NODE(NODE_KW_ARG,i,v,0)
|
* parse.y, node.h, compile.c: change node tree structure. a purpose
of this change is to unify argument structure of method and block.
this change prohibits duplicate block parameter name.
new argument infromation:
NODE_ARGS [m: int, o: NODE_OPT_ARG, ->]
NODE_ARGS_AUX [r: ID, b: ID, ->]
NODE_ARGS_AUX [Pst: id, Plen: int, init: NODE*]
optarg information:
NODE_OPT_ARGS [idx, expr, ->]
* vm_macro.def: ditto.
* gc.c: ditto.
* iseq.c: ditto.
* compile.h: fix debug function name.
* test/ripper/test_scanner_events.rb: |_,_,foo| -> |_1,_2,foo|
* test/ruby/test_lambda.rb: disalbe test temporarily.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11840 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-23 21:07:05 -05:00
|
|
|
#define NEW_POSTARG(i,v) NEW_NODE(NODE_POSTARG,i,v,0)
|
2003-07-04 11:30:35 -04:00
|
|
|
#define NEW_ARGSCAT(a,b) NEW_NODE(NODE_ARGSCAT,a,b,0)
|
|
|
|
#define NEW_ARGSPUSH(a,b) NEW_NODE(NODE_ARGSPUSH,a,b,0)
|
|
|
|
#define NEW_SPLAT(a) NEW_NODE(NODE_SPLAT,a,0,0)
|
2003-10-06 13:59:53 -04:00
|
|
|
#define NEW_TO_ARY(a) NEW_NODE(NODE_TO_ARY,a,0,0)
|
2003-07-04 11:30:35 -04:00
|
|
|
#define NEW_BLOCK_ARG(v) NEW_NODE(NODE_BLOCK_ARG,v,0,local_cnt(v))
|
|
|
|
#define NEW_BLOCK_PASS(b) NEW_NODE(NODE_BLOCK_PASS,0,b,0)
|
2004-10-30 02:56:18 -04:00
|
|
|
#define NEW_ALIAS(n,o) NEW_NODE(NODE_ALIAS,n,o,0)
|
|
|
|
#define NEW_VALIAS(n,o) NEW_NODE(NODE_VALIAS,n,o,0)
|
2003-07-04 11:30:35 -04:00
|
|
|
#define NEW_UNDEF(i) NEW_NODE(NODE_UNDEF,0,i,0)
|
* compile.c, parse.y, eval.c, intern.h, iseq.c, lex.c, node.h,
proc.c, vm.c, vm_macro.def, vm_macro.def, yarvcore.c, yarvcore.h,
debug.c, debug.h: merge half-baked-1.9 changes. The biggest change
is to change node structure around NODE_SCOPE, NODE_ARGS. Every
scope (method/class/block) has own NODE_SCOPE node and NODE_ARGS
represents more details of arguments information. I'll write a
document about detail of node structure.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12117 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-03-21 07:15:15 -04:00
|
|
|
#define NEW_CLASS(n,b,s) NEW_NODE(NODE_CLASS,n,NEW_SCOPE(0,b),(s))
|
|
|
|
#define NEW_SCLASS(r,b) NEW_NODE(NODE_SCLASS,r,NEW_SCOPE(0,b),0)
|
|
|
|
#define NEW_MODULE(n,b) NEW_NODE(NODE_MODULE,n,NEW_SCOPE(0,b),0)
|
2003-07-04 11:30:35 -04:00
|
|
|
#define NEW_COLON2(c,i) NEW_NODE(NODE_COLON2,c,i,0)
|
|
|
|
#define NEW_COLON3(i) NEW_NODE(NODE_COLON3,0,i,0)
|
2012-08-02 07:34:19 -04:00
|
|
|
#define NEW_CREF(a) NEW_NODE(NODE_CREF,a,0,0)
|
2003-07-04 11:30:35 -04:00
|
|
|
#define NEW_DOT2(b,e) NEW_NODE(NODE_DOT2,b,e,0)
|
|
|
|
#define NEW_DOT3(b,e) NEW_NODE(NODE_DOT3,b,e,0)
|
|
|
|
#define NEW_SELF() NEW_NODE(NODE_SELF,0,0,0)
|
|
|
|
#define NEW_NIL() NEW_NODE(NODE_NIL,0,0,0)
|
|
|
|
#define NEW_TRUE() NEW_NODE(NODE_TRUE,0,0,0)
|
|
|
|
#define NEW_FALSE() NEW_NODE(NODE_FALSE,0,0,0)
|
2004-01-22 03:31:33 -05:00
|
|
|
#define NEW_ERRINFO() NEW_NODE(NODE_ERRINFO,0,0,0)
|
2003-07-04 11:30:35 -04:00
|
|
|
#define NEW_DEFINED(e) NEW_NODE(NODE_DEFINED,e,0,0)
|
1998-01-16 07:19:22 -05:00
|
|
|
#define NEW_PREEXE(b) NEW_SCOPE(b)
|
2006-02-03 04:15:42 -05:00
|
|
|
#define NEW_POSTEXE(b) NEW_NODE(NODE_POSTEXE,0,b,0)
|
2003-07-04 11:30:35 -04:00
|
|
|
#define NEW_BMETHOD(b) NEW_NODE(NODE_BMETHOD,0,0,b)
|
|
|
|
#define NEW_ATTRASGN(r,m,a) NEW_NODE(NODE_ATTRASGN,r,m,a)
|
2004-09-21 20:19:15 -04:00
|
|
|
#define NEW_PRELUDE(p,b) NEW_NODE(NODE_PRELUDE,p,b,0)
|
2006-12-31 10:02:22 -05:00
|
|
|
#define NEW_OPTBLOCK(a) NEW_NODE(NODE_OPTBLOCK,a,0,0)
|
2012-03-14 06:29:25 -04:00
|
|
|
#define NEW_MEMO(a,b,c) NEW_NODE(NODE_MEMO,a,b,c)
|
|
|
|
|
|
|
|
#define roomof(x, y) ((sizeof(x) + sizeof(y) - 1) / sizeof(y))
|
|
|
|
#define MEMO_FOR(type, value) ((type *)RARRAY_PTR(value))
|
|
|
|
#define NEW_MEMO_FOR(type, value) \
|
|
|
|
(rb_ary_set_len(((value) = rb_ary_tmp_new(roomof(type, VALUE))), \
|
|
|
|
roomof(type, VALUE)), \
|
|
|
|
MEMO_FOR(type, value))
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2010-08-11 16:58:11 -04:00
|
|
|
#if defined __GNUC__ && __GNUC__ >= 4
|
|
|
|
#pragma GCC visibility push(default)
|
|
|
|
#endif
|
|
|
|
|
* bignum.c: changed `foo _((boo))' to `foo(boo)`. [ruby-dev:27056]
* defines.h, dir.c, dln.h, enumerator.c, env.h, error.c, eval.c, file.c,
gc.c, hash.c, inits.c, intern.h, io.c, lex.c, marshal.c, missing.h,
node.h, numeric.c, pack.c, process.c, re.h, ruby.c, ruby.h, rubyio.h,
rubysig.h, signal.c, sprintf.c, st.h, string.c, struct.c, time.c,
util.c, util.h, variable.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9155 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-14 02:32:32 -04:00
|
|
|
VALUE rb_parser_new(void);
|
|
|
|
VALUE rb_parser_end_seen_p(VALUE);
|
2007-10-16 16:07:20 -04:00
|
|
|
VALUE rb_parser_encoding(VALUE);
|
2010-08-11 16:58:11 -04:00
|
|
|
VALUE rb_parser_get_yydebug(VALUE);
|
|
|
|
VALUE rb_parser_set_yydebug(VALUE, VALUE);
|
* internal.h: declare internal functions here.
* node.h: declare NODE dependent internal functions here.
* iseq.h: declare rb_iseq_t dependent internal functions here.
* vm_core.h: declare rb_thread_t dependent internal functions here.
* bignum.c, class.c, compile.c, complex.c, cont.c, dir.c, encoding.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c, io.c,
iseq.c, load.c, marshal.c, math.c, numeric.c, object.c, parse.y,
proc.c, process.c, range.c, rational.c, re.c, ruby.c, string.c,
thread.c, time.c, transcode.c, variable.c, vm.c,
tool/compile_prelude.rb: don't declare internal functions declared
in above headers. include above headers if required.
Note that rb_thread_mark() was declared as
void rb_thread_mark(rb_thread_t *th) in cont.c but defined as
void rb_thread_mark(void *ptr) in vm.c. Now it is declared as
the later in internal.h.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32156 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-06-17 18:43:38 -04:00
|
|
|
VALUE rb_parser_dump_tree(NODE *node, int comment);
|
|
|
|
NODE *rb_parser_append_print(VALUE, NODE *);
|
|
|
|
NODE *rb_parser_while_loop(VALUE, NODE *, int, int);
|
2005-07-13 09:44:21 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
NODE *rb_parser_compile_cstr(volatile VALUE, const char*, const char*, int, int);
|
|
|
|
NODE *rb_parser_compile_string(volatile VALUE, const char*, VALUE, int);
|
|
|
|
NODE *rb_parser_compile_file(volatile VALUE, const char*, VALUE, int);
|
2005-07-13 09:44:21 -04:00
|
|
|
|
* bignum.c: changed `foo _((boo))' to `foo(boo)`. [ruby-dev:27056]
* defines.h, dir.c, dln.h, enumerator.c, env.h, error.c, eval.c, file.c,
gc.c, hash.c, inits.c, intern.h, io.c, lex.c, marshal.c, missing.h,
node.h, numeric.c, pack.c, process.c, re.h, ruby.c, ruby.h, rubyio.h,
rubysig.h, signal.c, sprintf.c, st.h, string.c, struct.c, time.c,
util.c, util.h, variable.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9155 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-14 02:32:32 -04:00
|
|
|
NODE *rb_compile_cstr(const char*, const char*, int, int);
|
|
|
|
NODE *rb_compile_string(const char*, VALUE, int);
|
|
|
|
NODE *rb_compile_file(const char*, VALUE, int);
|
1998-01-16 07:19:22 -05:00
|
|
|
|
* bignum.c: changed `foo _((boo))' to `foo(boo)`. [ruby-dev:27056]
* defines.h, dir.c, dln.h, enumerator.c, env.h, error.c, eval.c, file.c,
gc.c, hash.c, inits.c, intern.h, io.c, lex.c, marshal.c, missing.h,
node.h, numeric.c, pack.c, process.c, re.h, ruby.c, ruby.h, rubyio.h,
rubysig.h, signal.c, sprintf.c, st.h, string.c, struct.c, time.c,
util.c, util.h, variable.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9155 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-14 02:32:32 -04:00
|
|
|
NODE *rb_node_newnode(enum node_type,VALUE,VALUE,VALUE);
|
2009-05-13 10:08:26 -04:00
|
|
|
NODE *rb_node_newnode_longlife(enum node_type,VALUE,VALUE,VALUE);
|
1998-01-16 07:19:22 -05:00
|
|
|
|
2009-07-15 20:01:06 -04:00
|
|
|
struct rb_global_entry {
|
|
|
|
struct rb_global_variable *var;
|
|
|
|
ID id;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct rb_global_entry *rb_global_entry(ID);
|
|
|
|
VALUE rb_gvar_get(struct rb_global_entry *);
|
|
|
|
VALUE rb_gvar_set(struct rb_global_entry *, VALUE);
|
|
|
|
VALUE rb_gvar_defined(struct rb_global_entry *);
|
2010-08-11 16:58:11 -04:00
|
|
|
const struct kwtable *rb_reserved_word(const char *, unsigned int);
|
|
|
|
|
2011-12-26 09:19:58 -05:00
|
|
|
struct rb_args_info {
|
|
|
|
NODE *pre_init;
|
|
|
|
NODE *post_init;
|
2011-12-27 07:17:36 -05:00
|
|
|
|
|
|
|
int pre_args_num; /* count of mandatory pre-arguments */
|
|
|
|
int post_args_num; /* count of mandatory post-arguments */
|
|
|
|
|
2011-12-26 09:19:58 -05:00
|
|
|
ID first_post_arg;
|
|
|
|
|
|
|
|
ID rest_arg;
|
|
|
|
ID block_arg;
|
|
|
|
|
2011-12-26 09:20:03 -05:00
|
|
|
NODE *kw_args;
|
|
|
|
NODE *kw_rest_arg;
|
|
|
|
|
2011-12-26 09:19:58 -05:00
|
|
|
NODE *opt_args;
|
|
|
|
};
|
|
|
|
|
2010-08-14 00:20:59 -04:00
|
|
|
struct parser_params;
|
|
|
|
void *rb_parser_malloc(struct parser_params *, size_t);
|
|
|
|
void *rb_parser_realloc(struct parser_params *, void *, size_t);
|
|
|
|
void *rb_parser_calloc(struct parser_params *, size_t, size_t);
|
|
|
|
void rb_parser_free(struct parser_params *, void *);
|
|
|
|
|
2010-08-11 16:58:11 -04:00
|
|
|
#if defined __GNUC__ && __GNUC__ >= 4
|
|
|
|
#pragma GCC visibility pop
|
|
|
|
#endif
|
2009-07-15 20:01:06 -04:00
|
|
|
|
1999-10-29 05:25:48 -04:00
|
|
|
#if defined(__cplusplus)
|
2007-06-09 23:06:15 -04:00
|
|
|
#if 0
|
|
|
|
{ /* satisfy cc-mode */
|
|
|
|
#endif
|
1999-10-29 05:25:48 -04:00
|
|
|
} /* extern "C" { */
|
|
|
|
#endif
|
|
|
|
|
2007-06-09 23:06:15 -04:00
|
|
|
#endif /* RUBY_NODE_H */
|