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/eventids2.c | |
| 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/eventids2.c')
| -rw-r--r-- | ext/ripper/eventids2.c | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/ext/ripper/eventids2.c b/ext/ripper/eventids2.c index 28519eb8e6..cab4b45657 100644 --- a/ext/ripper/eventids2.c +++ b/ext/ripper/eventids2.c @@ -1,14 +1,14 @@ -#define tIGNORED_NL (tLAST_TOKEN + 1) -#define tCOMMENT (tLAST_TOKEN + 2) -#define tEMBDOC_BEG (tLAST_TOKEN + 3) -#define tEMBDOC (tLAST_TOKEN + 4) -#define tEMBDOC_END (tLAST_TOKEN + 5) -#define tLWSP (tLAST_TOKEN + 6) -#define tHEREDOC_BEG (tLAST_TOKEN + 7) +#define tIGNORED_NL (tLAST_TOKEN + 1) +#define tCOMMENT (tLAST_TOKEN + 2) +#define tEMBDOC_BEG (tLAST_TOKEN + 3) +#define tEMBDOC (tLAST_TOKEN + 4) +#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 + 9) +#define k__END__ (tLAST_TOKEN + 10) +#define tCHAR (tLAST_TOKEN + 11) static ID ripper_id_scan; @@ -51,7 +51,7 @@ static ID ripper_id_comment; static ID ripper_id_embdoc_beg; static ID ripper_id_embdoc; static ID ripper_id_embdoc_end; -static ID ripper_id_lwsp; +static ID ripper_id_sp; static ID ripper_id_heredoc_beg; static ID ripper_id_heredoc_content; static ID ripper_id_heredoc_end; @@ -102,7 +102,7 @@ ripper_init_eventids2() ripper_id_embdoc_beg = rb_intern("on__embdoc_beg"); ripper_id_embdoc = rb_intern("on__embdoc"); ripper_id_embdoc_end = rb_intern("on__embdoc_end"); - ripper_id_lwsp = rb_intern("on__sp"); + 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"); @@ -241,13 +241,14 @@ static struct token_assoc { {tUPLUS, &ripper_id_op}, {tWORDS_BEG, &ripper_id_words_beg}, {tXSTRING_BEG, &ripper_id_backtick}, -/* ripper specific tokens */ + + /* ripper specific tokens */ {tIGNORED_NL, &ripper_id_ignored_nl}, {tCOMMENT, &ripper_id_comment}, {tEMBDOC_BEG, &ripper_id_embdoc_beg}, {tEMBDOC, &ripper_id_embdoc}, {tEMBDOC_END, &ripper_id_embdoc_end}, - {tLWSP, &ripper_id_lwsp}, + {tSP, &ripper_id_sp}, {tHEREDOC_BEG, &ripper_id_heredoc_beg}, {tHEREDOC_CONTENT, &ripper_id_heredoc_content}, {tHEREDOC_END, &ripper_id_heredoc_end}, |