diff options
author | aamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-09-14 11:27:36 +0000 |
---|---|---|
committer | aamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-09-14 11:27:36 +0000 |
commit | d3bce8cb5a9c44eb4413aca819bfa4dfeceda221 (patch) | |
tree | f8aa91fcc45b24d858c07096b6996309185209fe /ext/ripper/lib | |
parent | 26a828a605a6738db2388b6487c6ddef4a48088a (diff) | |
download | ruby-d3bce8cb5a9c44eb4413aca819bfa4dfeceda221.tar.gz |
* parse.y [ripper]: space event is on__sp, not on__lwsp. [ruby-dev:24257]
* ext/ripper/eventids2.c: ditto.
* ext/ripper/lib/ripper.rb: ditto.
* ext/ripper/depend (ripper.o): No action is needed. [ruby-dev:24260]
* ext/ripper/depend: Borland make does not accept pipes in Makefile rules. [ruby-dev:24589]
* ext/ripper/depend: separate rules for developpers.
* ext/ripper/Makefile.dev: new file.
* ext/ripper/MANIFEST: add Makefile.dev.
* ext/ripper/tools/generate-eventids1.rb: read from file, not stdin.
* ext/ripper/extconf.rb: clean ripper.E.
* ext/ripper/tools/generate-ripper_rb.rb: #include ids1/ids2 function was lost.
* ext/ripper/tools/generate-ripper_rb.rb: SCANNER_EVENTS wrongly contained parser events.
* ext/ripper/lib/ripper.rb: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6907 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/ripper/lib')
-rw-r--r-- | ext/ripper/lib/ripper.rb | 174 |
1 files changed, 50 insertions, 124 deletions
diff --git a/ext/ripper/lib/ripper.rb b/ext/ripper/lib/ripper.rb index b34147ee2a..15a05aaddc 100644 --- a/ext/ripper/lib/ripper.rb +++ b/ext/ripper/lib/ripper.rb @@ -28,6 +28,7 @@ class Ripper end PARSER_EVENTS = [ + :BEGIN, :END, :alias, @@ -151,126 +152,51 @@ class Ripper ] SCANNER_EVENTS = [ - :BEGIN, - :END, - :alias, - :alias_error, - :aref, - :aref_field, - :arg_ambiguous, - :arg_paren, - :arglist_add, - :arglist_add_block, - :arglist_add_star, - :arglist_new, - :arglist_prepend, - :array, - :assign, - :assign_error, - :assoc_new, - :assoclist_from_args, - :bare_assoc_hash, - :begin, - :binary, - :blockvar_add_block, - :blockvar_add_star, - :blockvar_new, - :bodystmt, - :brace_block, - :break, - :call, - :case, - :class, - :class_name_error, - :command, - :command_call, - :const_ref, - :constpath_field, - :constpath_ref, - :def, - :defined, - :defs, - :do_block, - :dot2, - :dot3, - :dyna_symbol, - :else, - :elsif, - :ensure, - :fcall, - :field, - :for, - :hash, - :if, - :if_mod, - :ifop, - :iter_block, - :massign, - :method_add_arg, - :mlhs_add, - :mlhs_add_star, - :mlhs_new, - :mlhs_paren, - :module, - :mrhs_add, - :mrhs_add_star, - :mrhs_new, - :mrhs_new_from_arglist, - :next, - :opassign, - :param_error, - :params, - :paren, - :parse_error, - :program, - :qwords_add, - :qwords_new, - :redo, - :regexp_literal, - :rescue, - :rescue_mod, - :restparam, - :retry, - :return, - :return0, - :sclass, - :space, - :stmts_add, - :stmts_new, - :string_add, - :string_concat, - :string_content, - :string_dvar, - :string_embexpr, - :string_literal, - :super, - :symbol, - :symbol_literal, - :topconst_field, - :topconst_ref, - :unary, - :undef, - :unless, - :unless_mod, - :until, - :until_mod, - :var_alias, - :var_field, - :var_ref, - :void_stmt, - :when, - :while, - :while_mod, - :word_add, - :word_new, - :words_add, - :words_new, - :xstring_add, - :xstring_literal, - :xstring_new, - :yield, - :yield0, - :zsuper + + :CHAR, + :__end__, + :backref, + :backtick, + :comma, + :comment, + :const, + :cvar, + :embdoc, + :embdoc_beg, + :embdoc_end, + :embexpr_beg, + :embexpr_end, + :embvar, + :float, + :gvar, + :heredoc_beg, + :heredoc_content, + :heredoc_end, + :ident, + :ignored_nl, + :int, + :ivar, + :kw, + :lbrace, + :lbracket, + :lparen, + :nl, + :op, + :period, + :qwords_beg, + :rbrace, + :rbracket, + :regexp_beg, + :regexp_end, + :rparen, + :semicolon, + :sp, + :symbeg, + :tstring_beg, + :tstring_content, + :tstring_end, + :words_beg, + :words_sep ] LEXER_EVENTS = SCANNER_EVENTS @@ -875,10 +801,6 @@ class Ripper token end - def on__lwsp(token) - token - end - def on__nl(token) token end @@ -919,6 +841,10 @@ class Ripper token end + def on__sp(token) + token + end + def on__symbeg(token) token end |