[r2004-07-06 14:27:21 by afrisch] Empty log message

Original author: afrisch
Date: 2004-07-06 14:27:22+00:00

types/builtin.ml

@@ -174,19 +174,19 @@ unary_op_cst "string_of"
      Value.string_latin1 (Buffer.contents b)
   );;
 
-unary_op_cst "load_xml" 
-  string any
+unary_op_warning "load_xml"
+  string string_latin1 any
   (fun v -> Load_xml.load_xml (Value.get_string_latin1 v));;
   
-unary_op_cst "load_html" 
-  string Sequence.any
+unary_op_warning "load_html"
+  string string_latin1 Sequence.any
   (fun v -> Load_xml.load_html  (Value.get_string_latin1 v));;
 
-unary_op_cst "load_file_utf8" 
-  string string
+unary_op_warning "load_file_utf8" 
+  string string_latin1 string
   (eval_load_file ~utf8:true);;
 
-unary_op_cst "load_file" string string_latin1
+unary_op_warning "load_file" string string_latin1 string_latin1
   (eval_load_file ~utf8:false);;
 
 

web/manual/expressions.xml

@@ -447,10 +447,18 @@ file system; the argument gives the filename:</p>
 load_xml %%e%%
 ]]></sample>
 
+<p>
+The argument to <code>load_xml</code> is a Latin1 string (the type
+system will issue a warning if the argument is of type
+<code>String</code> but not <code>Latin1</code>, and an
+exception might be raised at runtime).
+</p>
+
 <p>
 If the support for netclient or curl is available, it is also
 possible to fetch an XML file from an URL, e.g.:
-<code>load_xml "http://..."</code>.
+<code>load_xml "http://..."</code>. A special <code>string://</code>
+is always supported: the string following the scheme is parsed as it.
 </p>
 
 <p>

web/memento.xml

@@ -59,16 +59,16 @@ _" character,  starting by a capitalized letter or underscore.</li>
      <br/> <code>not</code>: Bool -> Bool
    </li>
    <li>Prefix:
-        <br/><code>load_xml</code> : String -> Any,
-        <br/><code>load_html</code> : String -> [ Any* ],
-        <br/><code>load_file</code> : String -> Latin1,
-        <br/><code>load_file_utf8</code> : String -> String,
+        <br/><code>load_xml</code> : Latin1 -> Any,
+        <br/><code>load_html</code> : Latin1 -> [ Any* ],
+        <br/><code>load_file</code> : Latin1 -> Latin1,
+        <br/><code>load_file_utf8</code> : Latin1 -> String,
         <br/><code>argv</code> : [] -> [ String* ],
-        <br/><code>dump_to_file</code> : String -> String -> [],
-        <br/><code>dump_to_file_utf8</code> : String -> String -> [],
+        <br/><code>dump_to_file</code> : Latin1 -> String -> [],
+        <br/><code>dump_to_file_utf8</code> : Latin1 -> String -> [],
         <br/><code>print_xml</code> : Any -> Latin1,
         <br/><code>print_xml_utf8</code> : Any -> String,
-        <br/><code>print</code> : String -> [],
+        <br/><code>print</code> : Latin1 -> [],
         <br/><code>int_of</code> : String -> Integer,
         <br/><code>string_of</code> : Any -> Latin1,
         <br/><code>atom_of</code> : String -> Atom

web/site.cd

@@ -68,12 +68,12 @@ type InlineText =
 
 (* Recursive inclusion of XML files and verbatim text files *)
 
-let load_include (String -> [Any*])
+let load_include (Latin1 -> [Any*])
  name ->
 (*   let _ = print [ 'Loading ' !name '... \n' ] in *)
    xtransform [ (load_xml name) ] with 
-   | <include file=(s & String)>[] -> load_include s
-   | <include-verbatim file=(s & String)>[] -> load_file s 
+   | <include file=(s & Latin1)>[] -> load_include s
+   | <include-verbatim file=(s & Latin1)>[] -> load_file s 
 
 (* Highlighting text between {{...}} *)