r10694 - trunk/libraries/xml-parser

Author: hannes
Date: Tue Apr 18 02:10:34 2006
New Revision: 10694

Modified:
   trunk/libraries/xml-parser/library.dylan
   trunk/libraries/xml-parser/simple-xml.dylan
   trunk/libraries/xml-parser/xml-parser.lid
Log:
Bug: 7306
*removed with-open-file from xml-parser.lid (does not exist in our repo)
*rename escape-html to escape-xml


Modified: trunk/libraries/xml-parser/library.dylan
==============================================================================
--- trunk/libraries/xml-parser/library.dylan    (original)
+++ trunk/libraries/xml-parser/library.dylan    Tue Apr 18 02:10:34 2006
@@ -118,7 +118,7 @@
   use format;
   //use multimap;
   use anaphora;
-  use file-system, import: { file-exists? };
+  use file-system, import: { with-open-file, file-exists? };
   use print;
 
   use meta;

Modified: trunk/libraries/xml-parser/simple-xml.dylan
==============================================================================
--- trunk/libraries/xml-parser/simple-xml.dylan (original)
+++ trunk/libraries/xml-parser/simple-xml.dylan Tue Apr 18 02:10:34 2006
@@ -122,7 +122,7 @@
   element:
    { ?:name } => { list(make(<element>, name: ?"name")) }
    { text ( ?value:expression ) } => { list(make(<char-string>,
-                                                 text: escape-html(?value))) }
+                                                 text: escape-xml(?value))) }
    { do(?:body) }
     => { begin
            let res = make(<stretchy-vector>);
@@ -154,12 +154,12 @@
    { ?:name ( ?value:expression ) }
     => { list(make(<element>,
                    children: list(make(<char-string>,
-                                       text: escape-html(?value))),
+                                       text: escape-xml(?value))),
                    name: ?"name")) }
    { ?:name ( ?value:expression, ?attribute-list ) }
     => { list(make(<element>,
                    children: list(make(<char-string>,
-                                       text: escape-html(?value))),
+                                       text: escape-xml(?value))),
                    name: ?"name",
                    attributes: vector(?attribute-list))) }
    { ?:name ( ?attribute-list ) }

Modified: trunk/libraries/xml-parser/xml-parser.lid
==============================================================================
--- trunk/libraries/xml-parser/xml-parser.lid   (original)
+++ trunk/libraries/xml-parser/xml-parser.lid   Tue Apr 18 02:10:34 2006
@@ -7,4 +7,3 @@
        collect
        productions
        simple-xml
-  with-open-file
-- 
Gd-chatter mailing list
Gd-chatter@xxxxxxxxxxxxxxxx
https://www.gwydiondylan.org/mailman/listinfo/gd-chatter