Changeset 1044

Timestamp:

11/05/07 23:41:40 (10 months ago)

Author:

teqdruid

Message:

Fix for #29 as well as moving an inside function to outside, to avoid crashing arm-linux-gdc

Files:

• trunk/mango/xml/sax/parser/teqXML.d (modified) (2 diffs)

trunk/mango/xml/sax/parser/teqXML.d

@@ -631 +631 @@
-    }
-
+    void parseAttr()
+    {
+        static bool isWSorEQ(T wc)
+        {
+            return (wc == '=' || isWhiteSpace(wc));
+        }
+        
+        end.skipFunc!(isWhiteSpace)();
+        start.moveTo(end);
+        end.advanceToFunc!(isWSorEQ)();
+        /*We need to copy the name, since a memmove of the buffer could occure before we send the
+          string to the client, so let's copy it into stack space-- it's quicker
+        */
+        T[] name = start.sliceTo(end);
+        T[] nameSCpy = (cast(T*)alloca(T.sizeof*name.length))[0 .. name.length];
+        nameSCpy[] = name[];
+        
+        end.skipFunc!(isWhiteSpace)();
+        if (end.read() != '=')
+            throw new TeqXMLException("Expected '=' in attribute");
+        end.skipFunc!(isWhiteSpace)();
+        T quote = end.read();
+        if (quote != '"' && quote != '\'')
+            throw new TeqXMLException("Expected '\"' or \"'\" surrounding attribute values"); //"
+        start.moveTo(end);
+        end.advanceTo(quote);
+        T[] value = start.sliceTo(end);
+        T[] ueValue = null;
+        int ampIndx = Text.locate!(T)(value, '&');
+        int last = 0;
+        while (ampIndx < value.length)
+        {
+            int scIndx = Text.locate!(T)(value, ';', ampIndx);
+            if (scIndx >= value.length)
+                break;
+            
+            T[] entVal = entities[value[ampIndx+1..scIndx]];
+            ueValue ~= value[last..ampIndx] ~ entVal;
+            
+            last = scIndx + 1;
+            ampIndx = Text.locate!(T)(value, '&', last);
+        }
+        
+        ueValue ~= value[last .. value.length];
+
+        myHandler.addAttribute(nameSCpy, ueValue);
+        end++;
+    }
+    
-    void parseAttrs()
-    {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        start.moveTo(end);
-        end.skipFunc!(isWhiteSpace)();
@@ -1145 +1147 @@
-        {
-            gained = a.length;
-getE
+e
-            case Encoding.Unknown:
-            case Encoding.UTF_8: