* prj-conf.ads, prj-conf.adb: Switch to GPLv3.

[pf3gnuchains/gcc-fork.git] / gcc / ada / g-byorma.adb

diff --git a/gcc/ada/g-byorma.adb b/gcc/ada/g-byorma.adb
index 9cc6f08..27138b4 100755 (executable)
--- a/gcc/ada/g-byorma.adb
+++ b/gcc/ada/g-byorma.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---                     Copyright (C) 2006-2007, AdaCore                     --
+--                     Copyright (C) 2006-2008, AdaCore                     --
 --                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -31,6 +31,8 @@
 --                                                                          --
 ------------------------------------------------------------------------------
 
+pragma Compiler_Unit;
+
 package body GNAT.Byte_Order_Mark is
 
    --------------
@@ -44,27 +46,13 @@ package body GNAT.Byte_Order_Mark is
       XML_Support : Boolean := False)
    is
    begin
-      --  UTF-16 (big-endian)
-
-      if Str'Length >= 2
-        and then Str (Str'First) = Character'Val (16#FE#)
-        and then Str (Str'First + 1) = Character'Val (16#FF#)
-      then
-         Len := 2;
-         BOM := UTF16_BE;
-
-      --  UTF-16 (little-endian)
-
-      elsif Str'Length >= 2
-        and then Str (Str'First) = Character'Val (16#FF#)
-        and then Str (Str'First + 1) = Character'Val (16#FE#)
-      then
-         Len := 2;
-         BOM := UTF16_LE;
+      --  Note: the order of these tests is important, because in some cases
+      --  one sequence is a prefix of a longer sequence, and we must test for
+      --  the longer sequence first
 
       --  UTF-32 (big-endian)
 
-      elsif Str'Length >= 4
+      if Str'Length >= 4
         and then Str (Str'First)     = Character'Val (16#00#)
         and then Str (Str'First + 1) = Character'Val (16#00#)
         and then Str (Str'First + 2) = Character'Val (16#FE#)
@@ -84,6 +72,24 @@ package body GNAT.Byte_Order_Mark is
          Len := 4;
          BOM := UTF32_LE;
 
+      --  UTF-16 (big-endian)
+
+      elsif Str'Length >= 2
+        and then Str (Str'First) = Character'Val (16#FE#)
+        and then Str (Str'First + 1) = Character'Val (16#FF#)
+      then
+         Len := 2;
+         BOM := UTF16_BE;
+
+      --  UTF-16 (little-endian)
+
+      elsif Str'Length >= 2
+        and then Str (Str'First) = Character'Val (16#FF#)
+        and then Str (Str'First + 1) = Character'Val (16#FE#)
+      then
+         Len := 2;
+         BOM := UTF16_LE;
+
       --  UTF-8 (endian-independent)
 
       elsif Str'Length >= 3
@@ -175,7 +181,7 @@ package body GNAT.Byte_Order_Mark is
         and then Str (Str'First + 2) = Character'Val (16#78#)
         and then Str (Str'First + 3) = Character'Val (16#6D#)
       then
-         --  Utf8, ASCII, some part of ISO8859, Shift-JIS, EUC,...
+         --  UTF-8, ASCII, some part of ISO8859, Shift-JIS, EUC,...
 
          Len := 0;
          BOM := Unknown;