summaryrefslogtreecommitdiffstats
path: root/keywords
diff options
context:
space:
mode:
authoraamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-09-19 18:48:29 +0000
committeraamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-09-19 18:48:29 +0000
commit128b459e768c83a18fc7075f44c320b089893c46 (patch)
treedb69adc6e49ab76aba51a7cb4cf76f74f3784039 /keywords
parent9c049381fd55ff6e4ebec3728cd49c6163b8a12d (diff)
downloadruby-128b459e768c83a18fc7075f44c320b089893c46.tar.gz
ruby-128b459e768c83a18fc7075f44c320b089893c46.tar.xz
ruby-128b459e768c83a18fc7075f44c320b089893c46.zip
* parse.y [ripper]: spaces before heredoc marker was lost.
* keywords: rb_reserved_word() should be defined only in ruby core. * lex.c: sync with keywords. * ext/ripper/ripper.rb.in (parse): fix typo. * ext/ripper/lib/ripper.rb: sync with ripper.rb.in. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@6924 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'keywords')
-rw-r--r--keywords5
1 files changed, 5 insertions, 0 deletions
diff --git a/keywords b/keywords
index d79af7198..06f1f011f 100644
--- a/keywords
+++ b/keywords
@@ -1,4 +1,7 @@
struct kwtable {char *name; int id[2]; enum lex_state_e state;};
+struct kwtable *rb_reserved_word _((const char *, unsigned int));
+#ifndef RIPPER
+
%%
__LINE__, {k__LINE__, k__LINE__}, EXPR_END
__FILE__, {k__FILE__, k__FILE__}, EXPR_END
@@ -40,3 +43,5 @@ until, {kUNTIL, kUNTIL_MOD}, EXPR_BEG
when, {kWHEN, kWHEN}, EXPR_BEG
while, {kWHILE, kWHILE_MOD}, EXPR_BEG
yield, {kYIELD, kYIELD}, EXPR_ARG
+%%
+#endif