Hi,
Now the patch is well designed as well. I support it.
Kornél
----- Original Message -----
From: "Atsushi Eno" <[EMAIL PROTECTED]>
To: "Kornél Pál" <[EMAIL PROTECTED]>
Cc: "mono-devel mailing list" <[email protected]>; "Marek
Safar" <[EMAIL PROTECTED]>
Sent: Wednesday, August 24, 2005 5:16 AM
Subject: Re: [Mono-dev] mcs patch for default encoding
Hello,
I attached revised one based on your suggestions ...
I think /codepage:restore should be named /codepage:default and
/codepage:utf8 should be /codepage:utf-8. csc.exe does not support named
code pages but this may cause incompatiblity with older mcs version.
... while I left them as is (needs separate design decision).
And there is no use to comment out lines in UTF8Encoding. Old version
will
be available in SVN.
Yeah, it's just for patch readability.
Thanks Kornél.
Atsushi Eno
--------------------------------------------------------------------------------
Index: mcs/support.cs
===================================================================
--- mcs/support.cs (revision 48738)
+++ mcs/support.cs (working copy)
@@ -359,36 +359,8 @@
// Let the StreamWriter autodetect the encoder
reader.Peek ();
- reader.BaseStream.Position = 0;
Encoding enc = reader.CurrentEncoding;
- // First of all, get at least a char
-
- byte[] auxb = new byte [50];
- int num_bytes = 0;
- int num_chars = 0;
- int br = 0;
- do {
- br = reader.BaseStream.Read (auxb, num_bytes, auxb.Length - num_bytes);
- num_bytes += br;
- num_chars = enc.GetCharCount (auxb, 0, num_bytes);
- }
- while (num_chars == 0 && br > 0);
-
- if (num_chars != 0)
- {
- // Now, check which bytes at the beginning have no effect in the
- // char count
-
- int p = 0;
- while (enc.GetCharCount (auxb, p, num_bytes-p) >= num_chars)
- p++;
-
- preamble_size = p - 1;
- reader.BaseStream.Position = 0;
- reader.DiscardBufferedData ();
-
- buffer_start = preamble_size;
- }
+ preamble_size = (int) reader.BaseStream.Position;
}
public SeekableStreamReader (Stream stream, Encoding encoding, bool
detect_encoding_from_bytemarks)
Index: mcs/driver.cs
===================================================================
--- mcs/driver.cs (revision 48738)
+++ mcs/driver.cs (working copy)
@@ -91,16 +91,11 @@
static DateTime last_time, first_time;
//
- // Encoding: ISO-Latin1 is 28591
+ // Encoding.
//
static Encoding encoding;
- //
- // Whether the user has specified a different encoder manually
- //
- static bool using_default_encoder = true;
-
static public void Reset ()
{
want_debugging_support = false;
@@ -114,7 +109,6 @@
defines = null;
output_file = null;
encoding = null;
- using_default_encoder = true;
first_source = null;
}
@@ -158,7 +152,7 @@
}
using (input){
- SeekableStreamReader reader = new SeekableStreamReader (input, encoding,
using_default_encoder);
+ SeekableStreamReader reader = new SeekableStreamReader (input, encoding,
true);
Tokenizer lexer = new Tokenizer (reader, file, defines);
int token, tokens = 0, errors = 0;
@@ -186,7 +180,7 @@
return;
}
- SeekableStreamReader reader = new SeekableStreamReader (input, encoding,
using_default_encoder);
+ SeekableStreamReader reader = new SeekableStreamReader (input, encoding,
true);
// Check 'MZ' header
if (reader.Read () == 77 && reader.Read () == 90) {
@@ -1304,28 +1298,22 @@
return true;
case "/codepage":
- int cp = -1;
-
- if (value == "utf8"){
+ switch (value) {
+ case "utf8":
encoding = new UTF8Encoding();
- using_default_encoder = false;
- return true;
+ break;
+ case "reset":
+ encoding = Encoding.Default;
+ break;
+ default:
+ try {
+ encoding = Encoding.GetEncoding (
+ Int32.Parse (value));
+ } catch {
+ Report.Error (2016, "Code page `{0}' is invalid or not installed",
value);
+ }
+ break;
}
- if (value == "reset"){
- //
- // 28591 is the code page for ISO-8859-1 encoding.
- //
- cp = 28591;
- using_default_encoder = true;
- }
-
- try {
- cp = Int32.Parse (value);
- encoding = Encoding.GetEncoding (cp);
- using_default_encoder = false;
- } catch {
- Report.Error (2016, "Code page `{0}' is invalid or not installed",
value);
- }
return true;
}
@@ -1373,13 +1361,8 @@
int i;
bool parsing_options = true;
- try {
- encoding = Encoding.GetEncoding (28591);
- } catch {
- Console.WriteLine ("Error: could not load encoding 28591, trying 1252");
- encoding = Encoding.GetEncoding (1252);
- }
-
+ encoding = Encoding.Default;
+
references = new ArrayList ();
soft_references = new ArrayList ();
modules = new ArrayList ();
Index: class/corlib/System.Text/UTF8Encoding.cs
===================================================================
--- class/corlib/System.Text/UTF8Encoding.cs (revision 48738)
+++ class/corlib/System.Text/UTF8Encoding.cs (working copy)
@@ -426,33 +426,31 @@
if (++leftSoFar >= leftSize) {
// We have a complete character now.
if (leftBits < (uint)0x10000) {
- if (leftBits != (uint)0xFEFF) {
- // is it an overlong ?
- bool overlong = false;
- switch (leftSize) {
- case 2:
- overlong = (leftBits <= 0x7F);
- break;
- case 3:
- overlong = (leftBits <= 0x07FF);
- break;
- case 4:
- overlong = (leftBits <= 0xFFFF);
- break;
- case 5:
- overlong = (leftBits <= 0x1FFFFF);
- break;
- case 6:
- overlong = (leftBits <= 0x03FFFFFF);
- break;
- }
- if (overlong) {
- if (throwOnInvalid)
- throw new ArgumentException (_("Overlong"), leftBits.ToString ());
- }
- else
- ++length;
+ // is it an overlong ?
+ bool overlong = false;
+ switch (leftSize) {
+ case 2:
+ overlong = (leftBits <= 0x7F);
+ break;
+ case 3:
+ overlong = (leftBits <= 0x07FF);
+ break;
+ case 4:
+ overlong = (leftBits <= 0xFFFF);
+ break;
+ case 5:
+ overlong = (leftBits <= 0x1FFFFF);
+ break;
+ case 6:
+ overlong = (leftBits <= 0x03FFFFFF);
+ break;
}
+ if (overlong) {
+ if (throwOnInvalid)
+ throw new ArgumentException (_("Overlong"), leftBits.ToString ());
+ }
+ else
+ ++length;
} else if (leftBits < (uint)0x110000) {
length += 2;
} else if (throwOnInvalid) {
@@ -571,37 +569,35 @@
if (++leftSoFar >= leftSize) {
// We have a complete character now.
if (leftBits < (uint)0x10000) {
- if (leftBits != (uint)0xFEFF) {
- // is it an overlong ?
- bool overlong = false;
- switch (leftSize) {
- case 2:
- overlong = (leftBits <= 0x7F);
- break;
- case 3:
- overlong = (leftBits <= 0x07FF);
- break;
- case 4:
- overlong = (leftBits <= 0xFFFF);
- break;
- case 5:
- overlong = (leftBits <= 0x1FFFFF);
- break;
- case 6:
- overlong = (leftBits <= 0x03FFFFFF);
- break;
+ // is it an overlong ?
+ bool overlong = false;
+ switch (leftSize) {
+ case 2:
+ overlong = (leftBits <= 0x7F);
+ break;
+ case 3:
+ overlong = (leftBits <= 0x07FF);
+ break;
+ case 4:
+ overlong = (leftBits <= 0xFFFF);
+ break;
+ case 5:
+ overlong = (leftBits <= 0x1FFFFF);
+ break;
+ case 6:
+ overlong = (leftBits <= 0x03FFFFFF);
+ break;
+ }
+ if (overlong) {
+ if (throwOnInvalid)
+ throw new ArgumentException (_("Overlong"), leftBits.ToString ());
+ }
+ else {
+ if (posn >= length) {
+ throw new ArgumentException
+ (_("Arg_InsufficientSpace"), "chars");
}
- if (overlong) {
- if (throwOnInvalid)
- throw new ArgumentException (_("Overlong"), leftBits.ToString ());
- }
- else {
- if (posn >= length) {
- throw new ArgumentException
- (_("Arg_InsufficientSpace"), "chars");
- }
- chars[posn++] = (char)leftBits;
- }
+ chars[posn++] = (char)leftBits;
}
} else if (leftBits < (uint)0x110000) {
if ((posn + 2) > length) {
_______________________________________________
Mono-devel-list mailing list
[email protected]
http://lists.ximian.com/mailman/listinfo/mono-devel-list
