From 2fd34fa328bfe2da203d719a217dc158a6e0c1f3 Mon Sep 17 00:00:00 2001
From: kazu <kazu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 24 Dec 2015 14:30:13 +0000
Subject: [PATCH] fix typos

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53283 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 2 +-
 parse.y   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 809f3189b2..f4a56b75ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,7 +8,7 @@ Thu Dec 24 18:43:19 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	  (rb_compile_bug): deprecate internal functions.
 
 	* parse.y (parser_yyerror): construct exception message with
-	  source code and carret.
+	  source code and caret.
 
 Thu Dec 24 17:25:42 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
diff --git a/parse.y b/parse.y
index b0c5bd9e78..fdb84f8512 100644
--- a/parse.y
+++ b/parse.y
@@ -5410,7 +5410,7 @@ parser_yyerror(struct parser_params *parser, const char *msg)
     const int max_line_margin = 30;
     const char *p, *pe;
     const char *pre = "", *post = "";
-    const char *code = "", *carret = "", *newline = "";
+    const char *code = "", *caret = "", *newline = "";
     char *buf;
     long len;
     int i;
@@ -5446,7 +5446,7 @@ parser_yyerror(struct parser_params *parser, const char *msg)
 	i = (int)(lex_p - p);
 	buf = ALLOCA_N(char, i+2);
 	code = p;
-	carret = p2 = buf;
+	caret = p2 = buf;
 	while (i-- > 0) {
 	    *p2++ = *p++ == '\t' ? '\t' : ' ';
 	}
@@ -5460,7 +5460,7 @@ parser_yyerror(struct parser_params *parser, const char *msg)
     compile_error(PARSER_ARG "%s%s""%s%.*s%s%s""%s%s",
 		  msg, newline,
 		  pre, (int)len, code, post, newline,
-		  pre, carret);
+		  pre, caret);
 #else
     dispatch1(parse_error, STR_NEW2(msg));
     ripper_error();