From efd7504d44078af85a2ca6c632c18569bc562928 Mon Sep 17 00:00:00 2001
From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 27 Dec 2007 08:27:19 +0000
Subject: [PATCH] * parse.y, transcode_data.h, transcode.c: change "illegal" to
   "invalid" in a context which doesn' t against a law.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14735 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog        |  5 +++++
 parse.y          |  2 +-
 transcode.c      | 16 ++++++++--------
 transcode_data.h |  2 +-
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6ba45bed6a..26f5606c58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec 27 17:25:27 2007  Tanaka Akira  <akr@fsij.org>
+
+	* parse.y, transcode_data.h, transcode.c: change "illegal" to
+	  "invalid" in a context which doesn' t against a law.
+
 Thu Dec 27 16:37:06 2007  Tanaka Akira  <akr@fsij.org>
 
 	* re.c (rb_reg_s_union): show encodings in error message.
diff --git a/parse.y b/parse.y
index 9e0c8b18e2..7b1b36ded8 100644
--- a/parse.y
+++ b/parse.y
@@ -6621,7 +6621,7 @@ parser_yylex(struct parser_params *parser)
 		    }
 		}
 		if (c > '7' && c <= '9') {
-		    yyerror("Illegal octal digit");
+		    yyerror("Invalid octal digit");
 		}
 		else if (c == '.' || c == 'e' || c == 'E') {
 		    tokadd('0');
diff --git a/transcode.c b/transcode.c
index ec05629347..259d27ad19 100644
--- a/transcode.c
+++ b/transcode.c
@@ -183,14 +183,14 @@ transcode_loop(char **in_pos, char **out_pos,
 	    if (in_p >= in_stop) {
 		/* todo: deal with the case of backtracking */
 		/* todo: deal with incomplete input (streaming) */
-		goto illegal;
+		goto invalid;
 	    }
 	    next_byte = (unsigned char)*in_p++;
 	    if (from_utf8) {
 		if ((next_byte&0xC0) == 0x80)
 		    next_byte -= 0x80;
 		else
-		    goto illegal;
+		    goto invalid;
 	    }
 	    next_table = next_table->info[next_offset];
 	    goto follow_byte;
@@ -211,18 +211,18 @@ transcode_loop(char **in_pos, char **out_pos,
 	    *out_p++ = getBT2(next_info);
 	    *out_p++ = getBT3(next_info);
 	    continue;
-	  case ILLEGAL:
-	    goto illegal;
+	  case INVALID:
+	    goto invalid;
 	  case UNDEF:
 	    /* todo: add code for alternative behaviors */
-	    rb_raise(rb_eRuntimeError /*@@@change exception*/, "conversion undefined for byte sequence (maybe illegal byte sequence)");
+	    rb_raise(rb_eRuntimeError /*@@@change exception*/, "conversion undefined for byte sequence (maybe invalid byte sequence)");
 	    continue;
 	}
 	continue;
-      illegal:
-	/* deal with illegal byte sequence */
+      invalid:
+	/* deal with invalid byte sequence */
 	/* todo: add code for alternative behaviors */
-	rb_raise(rb_eRuntimeError /*change exception*/, "illegal byte sequence");
+	rb_raise(rb_eRuntimeError /*change exception*/, "invalid byte sequence");
 	continue;
     }
     /* cleanup */
diff --git a/transcode_data.h b/transcode_data.h
index add954ef74..862e37eae5 100644
--- a/transcode_data.h
+++ b/transcode_data.h
@@ -32,7 +32,7 @@ typedef struct byte_lookup {
 #define TWObt   (0x03)   /* two bytes payload */
 #define THREEbt (0x05)   /* three bytes payload */
 #define FOURbt  (0x06)   /* four bytes payload, UTF-8 only, macros start at getBT0 */
-#define ILLEGAL (PType 0x07)   /* illegal byte sequence */
+#define INVALID (PType 0x07)   /* invalid byte sequence */
 #define UNDEF   (PType 0x09)   /* legal but undefined */
 #define ZERObt  (PType 0x0A)   /* zero bytes of payload, i.e. remove */