diff options
author | aamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-09-20 05:40:23 +0000 |
---|---|---|
committer | aamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-09-20 05:40:23 +0000 |
commit | 144339d4bce9a8e91d44ee9942dc31d7fd27c239 (patch) | |
tree | c3ea3b92d704c3b0be7514c84fec0c032eeb8198 /ext/ripper/eventids2.c | |
parent | 9f18c235727fc3875b4423bd1ad7eba69f9520e9 (diff) |
* parse.y [ripper]: adjust lineno and columns for multi-line strings.
* parse.y [ripper]: delay heredocument events until seeing end-of-line.
* parse.y [ripper]: event on__heredoc_contentn -> on__tstring_content.
* ext/ripper/eventids2.c: ditto.
* ext/ripper/lib/ripper.rb: sync with eventids2.c.
* test/ripper/test_scanner_events.rb: test it.
* ext/ripper/tools/generate-ripper_rb.rb: show basename of input.
* ext/ripper/Makefile.dev: support objdir build.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6931 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/ripper/eventids2.c')
-rw-r--r-- | ext/ripper/eventids2.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/ext/ripper/eventids2.c b/ext/ripper/eventids2.c index cab4b45657..f26b5f8433 100644 --- a/ext/ripper/eventids2.c +++ b/ext/ripper/eventids2.c @@ -5,10 +5,9 @@ #define tEMBDOC_END (tLAST_TOKEN + 5) #define tSP (tLAST_TOKEN + 6) #define tHEREDOC_BEG (tLAST_TOKEN + 7) -#define tHEREDOC_CONTENT (tLAST_TOKEN + 8) -#define tHEREDOC_END (tLAST_TOKEN + 9) -#define k__END__ (tLAST_TOKEN + 10) -#define tCHAR (tLAST_TOKEN + 11) +#define tHEREDOC_END (tLAST_TOKEN + 8) +#define k__END__ (tLAST_TOKEN + 9) +#define tCHAR (tLAST_TOKEN + 10) static ID ripper_id_scan; @@ -53,7 +52,6 @@ static ID ripper_id_embdoc; static ID ripper_id_embdoc_end; static ID ripper_id_sp; static ID ripper_id_heredoc_beg; -static ID ripper_id_heredoc_content; static ID ripper_id_heredoc_end; static ID ripper_id___end__; static ID ripper_id_CHAR; @@ -104,7 +102,6 @@ ripper_init_eventids2() ripper_id_embdoc_end = rb_intern("on__embdoc_end"); ripper_id_sp = rb_intern("on__sp"); ripper_id_heredoc_beg = rb_intern("on__heredoc_beg"); - ripper_id_heredoc_content = rb_intern("on__heredoc_content"); ripper_id_heredoc_end = rb_intern("on__heredoc_end"); ripper_id___end__ = rb_intern("on____end__"); ripper_id_CHAR = rb_intern("on__CHAR"); @@ -250,7 +247,6 @@ static struct token_assoc { {tEMBDOC_END, &ripper_id_embdoc_end}, {tSP, &ripper_id_sp}, {tHEREDOC_BEG, &ripper_id_heredoc_beg}, - {tHEREDOC_CONTENT, &ripper_id_heredoc_content}, {tHEREDOC_END, &ripper_id_heredoc_end}, {k__END__, &ripper_id___end__}, {0, NULL} |