* class.c (rb_make_metaclass): obj.meta.super.meta should be equal

  to obj.meta.meta.super (ruby-bugs-ja:PR#324).

* parse.y (yylex): the warning message "invalid
  character syntax" was never issued.

* marshal.c (r_bytes): do not use alloca (ruby-bugs:PR#382).


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2787 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 13 insertions, 7 deletions

diff --git a/parse.y b/parse.y
index 661188e95d..702252acf0 100644
--- a/parse.y
+++ b/parse.y
@@ -3345,23 +3345,29 @@ yylex()
 	}
 	if (ISSPACE(c)){
 	    if (!IS_ARG()){
-		int c = 0;
+		int c2 = 0;
 		switch (c) {
 		  case ' ':
-		    c = 's';
+		    c2 = 's';
 		    break;
 		  case '\n':
-		    c = 'n';
+		    c2 = 'n';
 		    break;
 		  case '\t':
-		    c = 't';
+		    c2 = 't';
 		    break;
 		  case '\v':
-		    c = 'v';
+		    c2 = 'v';
+		    break;
+		  case '\r':
+		    c2 = 'r';
+		    break;
+		  case '\f':
+		    c2 = 'f';
 		    break;
 		}
-		if (c) {
-		    rb_warn("invalid character syntax; use ?\\%c", c);
+		if (c2) {
+		    rb_warn("invalid character syntax; use ?\\%c", c2);
 		}
 	    }
 	  ternary: