[r2003-07-03 17:56:51 by cvscast] Release 0.0.92

Original author: cvscast Date: 2003-07-03 17:56:52+00:00

[r2003-07-03 17:56:51 by cvscast] Release 0.0.92
Original author: cvscast Date: 2003-07-03 17:56:52+00:00
645f941c · Pietro Abate · d03a27cd · 645f941c · 645f941c · 645f941c
Commit 645f941c authored Oct 05, 2007 by Pietro Abate
--- a/CHANGES
+++ b/CHANGES
+0.0.92
+  * Support for XML Namespaces
  * Better support for expat; clean Makefile
  * Get rid of ;; and let fun in examples
+  * Optional ; for record in attribute position (values and types/patterns)
  * Split --dump into --load and --save
  * Better handling of strings (specific node in AST)
  * Map, transform: tail-recursive implementation

--- a/Makefile
+++ b/Makefile
@@ -27,12 +27,12 @@ profile:

 cedre_build:
 	rsh cedre ". .env; cd IMPLEM/CDUCE; make webiface webpages PHP=true"
-	scp web/www/*.php web/cduce.css cduce@iris:public_html/
+	scp CHANGES web/www/*.php web/cduce.css cduce@iris:public_html/
 	scp webiface cduce@iris:cgi-bin/cduce

 install_web_distant:
 	make webpages PHP=true
-	scp web/www/*.php web/cduce.css cduce@iris:public_html/
+	scp CHANGES web/www/*.php web/cduce.css cduce@iris:public_html/
 	scp webiface cduce@iris:cgi-bin/cduce

 # Packaging

--- a/Makefile.distrib
+++ b/Makefile.distrib
 include Makefile.conf
-VERSION = 0.0.91
+VERSION = 0.0.92

 PACKAGES = pxp-engine pxp-lex-iso88591 wlexing camlp4 num cgi pcre netstring
 ifeq ($(PXP_WLEX), true)
@@ -165,6 +165,7 @@ website: webpages webiface

 install_web: website
 	cp  web/www/*$(WEB_EXT) web/cduce.css  $(HTML_DIR)/
+	cp CHANGES $(HTML_DIR)/
 	cp webiface $(CGI_DIR)/cduce
 	if test ! -d "$(HTML_DIR)/img" ; then \
 	  mkdir $(HTML_DIR)/img; \

--- a/driver/examples.ml
+++ b/driver/examples.ml
@@ -2,9 +2,15 @@
 let examples = [ "xml","(* Syntax for XML elements *)

 type A = <a x=String y=?String>[ B* ]
-type B = <b>[ A? ]
-
-let x : A = <a x=\"Bla\" y=\"Blo\">[ <b>[] <b>[ <a x=\"Foo\">[] ] ]
+type B = <b>[ PCDATA A? PCDATA ]
+
+let x : A = 
+ <a x=\"Bla\" y=\"Blo\">[ 
+   <b>[ 'blabla' ]
+   <b>[ 
+     <a x=\"Foo\">[] 'bla' 'bla' 
+   ] 
+ ]
 ";"functions","(* Simple functions can be defined this way: *)
 let f1 (x : Int) : Int = x + 3
 ;;

--- a/expat/expat.ml
+++ b/expat/expat.ml
@@ -5,47 +5,57 @@
 (* LICENCE for details.                                                *)
 (***********************************************************************)

-(* $Id: expat.ml,v 1.3 2003/06/12 13:15:57 cvscast Exp $ *)
+(* $Id: expat.ml,v 1.4 2003/07/03 17:56:52 cvscast Exp $ *)

 type expat_parser

 type xml_error =
-    XML_ERROR_NONE
-  | XML_ERROR_NO_MEMORY
-  | XML_ERROR_SYNTAX
-  | XML_ERROR_NO_ELEMENTS
-  | XML_ERROR_INVALID_TOKEN
-  | XML_ERROR_UNCLOSED_TOKEN
-  | XML_ERROR_PARTIAL_CHAR
-  | XML_ERROR_TAG_MISMATCH
-  | XML_ERROR_DUPLICATE_ATTRIBUTE
-  | XML_ERROR_JUNK_AFTER_DOC_ELEMENT
-  | XML_ERROR_PARAM_ENTITY_REF
-  | XML_ERROR_UNDEFINED_ENTITY
-  | XML_ERROR_RECURSIVE_ENTITY_REF
-  | XML_ERROR_ASYNC_ENTITY
-  | XML_ERROR_BAD_CHAR_REF
-  | XML_ERROR_BINARY_ENTITY_REF
-  | XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF
-  | XML_ERROR_MISPLACED_XML_PI
-  | XML_ERROR_UNKNOWN_ENCODING
-  | XML_ERROR_INCORRECT_ENCODING
-  | XML_ERROR_UNCLOSED_CDATA_SECTION
-  | XML_ERROR_EXTERNAL_ENTITY_HANDLING
-  | XML_ERROR_NOT_STANDALONE
-  | XML_ERROR_UNEXPECTED_STATE
-  | XML_ERROR_ENTITY_DECLARED_IN_PE
-  | XML_ERROR_FEATURE_REQUIRES_XML_DTD
-  | XML_ERROR_CANT_CHANGE_FEATURE_ONCE_PARSING
+    NONE
+  | NO_MEMORY
+  | SYNTAX
+  | NO_ELEMENTS
+  | INVALID_TOKEN
+  | UNCLOSED_TOKEN
+  | PARTIAL_CHAR
+  | TAG_MISMATCH
+  | DUPLICATE_ATTRIBUTE
+  | JUNK_AFTER_DOC_ELEMENT
+  | PARAM_ENTITY_REF
+  | UNDEFINED_ENTITY
+  | RECURSIVE_ENTITY_REF
+  | ASYNC_ENTITY
+  | BAD_CHAR_REF
+  | BINARY_ENTITY_REF
+  | ATTRIBUTE_EXTERNAL_ENTITY_REF
+  | MISPLACED_XML_PI
+  | UNKNOWN_ENCODING
+  | INCORRECT_ENCODING
+  | UNCLOSED_CDATA_SECTION
+  | EXTERNAL_ENTITY_HANDLING
+  | NOT_STANDALONE
+  | UNEXPECTED_STATE
+  | ENTITY_DECLARED_IN_PE
+  | FEATURE_REQUIRES_XML_DTD
+  | CANT_CHANGE_FEATURE_ONCE_PARSING

 exception Expat_error of xml_error

 external xml_error_to_string : xml_error -> string = "expat_XML_ErrorString"

 (* exception is currently too minimalistic, but it's a start *)
-let _ = Callback.register_exception "expat_error" 
-    (Expat_error XML_ERROR_NONE) 
+let _ = Callback.register_exception "expat_error" (Expat_error NONE) 

+(* param entity handling *)
+type xml_param_entity_parsing_choice =
+    NEVER
+  | UNLESS_STANDALONE
+  | ALWAYS
+
+external set_param_entity_parsing : expat_parser -> 
+  xml_param_entity_parsing_choice -> bool =
+    "expat_XML_SetParamEntityParsing"
+
+(* return the version number of the expat library *)
 external expat_version : unit -> string = "expat_XML_ExpatVersion"

 (* calls to create a parser *)
@@ -110,6 +120,13 @@ external set_default_handler : expat_parser -> (string -> unit) -> unit =
 external reset_default_handler : expat_parser -> unit =
  "expat_XML_ResetDefaultHandler"

+(* external entity ref handler *)
+external set_external_entity_ref_handler : expat_parser -> 
+  (string option -> string option -> string -> string option -> unit) -> 
+    unit = "expat_XML_SetExternalEntityRefHandler"
+external reset_external_entity_ref_handler : expat_parser -> unit =
+  "expat_XML_ResetDefaultHandler"
+
 (* some general parser query calls *)
 external get_current_byte_index : expat_parser -> int = 
  "expat_XML_GetCurrentByteIndex"

--- a/expat/expat.mli
+++ b/expat/expat.mli
@@ -5,7 +5,7 @@
 (* LICENCE for details.                                                *)
 (***********************************************************************)

-(* $Id: expat.mli,v 1.4 2003/06/12 13:15:57 cvscast Exp $ *)
+(* $Id: expat.mli,v 1.5 2003/07/03 17:56:52 cvscast Exp $ *)

 (** The Ocaml Expat library provides an interface to the Expat XML Parser.

@@ -95,6 +95,14 @@ val reset_end_cdata_handler : expat_parser -> unit
 val set_default_handler : expat_parser -> (string -> unit) -> unit
 val reset_default_handler : expat_parser -> unit

+(** {6 External Entity Ref Handler setting and resetting} *)
+
+val set_external_entity_ref_handler : 
+    expat_parser -> 
+      (string option -> string option -> string -> string option -> unit) -> 
+	unit
+val reset_external_entity_ref_handler : expat_parser -> unit
+
 (** {5 Parse Position Functions} *)

 val get_current_byte_index : expat_parser -> int
@@ -105,33 +113,33 @@ val get_current_byte_count : expat_parser -> int
 (** {5 Error Reporting} *)

 type xml_error =
-    XML_ERROR_NONE 
-  | XML_ERROR_NO_MEMORY
-  | XML_ERROR_SYNTAX
-  | XML_ERROR_NO_ELEMENTS
-  | XML_ERROR_INVALID_TOKEN
-  | XML_ERROR_UNCLOSED_TOKEN
-  | XML_ERROR_PARTIAL_CHAR
-  | XML_ERROR_TAG_MISMATCH
-  | XML_ERROR_DUPLICATE_ATTRIBUTE
-  | XML_ERROR_JUNK_AFTER_DOC_ELEMENT
-  | XML_ERROR_PARAM_ENTITY_REF
-  | XML_ERROR_UNDEFINED_ENTITY
-  | XML_ERROR_RECURSIVE_ENTITY_REF
-  | XML_ERROR_ASYNC_ENTITY
-  | XML_ERROR_BAD_CHAR_REF
-  | XML_ERROR_BINARY_ENTITY_REF
-  | XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF
-  | XML_ERROR_MISPLACED_XML_PI
-  | XML_ERROR_UNKNOWN_ENCODING
-  | XML_ERROR_INCORRECT_ENCODING
-  | XML_ERROR_UNCLOSED_CDATA_SECTION
-  | XML_ERROR_EXTERNAL_ENTITY_HANDLING
-  | XML_ERROR_NOT_STANDALONE
-  | XML_ERROR_UNEXPECTED_STATE
-  | XML_ERROR_ENTITY_DECLARED_IN_PE
-  | XML_ERROR_FEATURE_REQUIRES_XML_DTD
-  | XML_ERROR_CANT_CHANGE_FEATURE_ONCE_PARSING
+    NONE 
+  | NO_MEMORY
+  | SYNTAX
+  | NO_ELEMENTS
+  | INVALID_TOKEN
+  | UNCLOSED_TOKEN
+  | PARTIAL_CHAR
+  | TAG_MISMATCH
+  | DUPLICATE_ATTRIBUTE
+  | JUNK_AFTER_DOC_ELEMENT
+  | PARAM_ENTITY_REF
+  | UNDEFINED_ENTITY
+  | RECURSIVE_ENTITY_REF
+  | ASYNC_ENTITY
+  | BAD_CHAR_REF
+  | BINARY_ENTITY_REF
+  | ATTRIBUTE_EXTERNAL_ENTITY_REF
+  | MISPLACED_XML_PI
+  | UNKNOWN_ENCODING
+  | INCORRECT_ENCODING
+  | UNCLOSED_CDATA_SECTION
+  | EXTERNAL_ENTITY_HANDLING
+  | NOT_STANDALONE
+  | UNEXPECTED_STATE
+  | ENTITY_DECLARED_IN_PE
+  | FEATURE_REQUIRES_XML_DTD
+  | CANT_CHANGE_FEATURE_ONCE_PARSING

 (** Exception raised by parse function to report error conditions *)
 exception Expat_error of xml_error
@@ -141,6 +149,16 @@ val xml_error_to_string : xml_error -> string

 (** {5 Miscellaneous Functions} *)

+(** Parameter entity handling types *)
+type xml_param_entity_parsing_choice =
+    NEVER
+  | UNLESS_STANDALONE
+  | ALWAYS
+
+(** Enable the parsing of parameter entities *)
+val set_param_entity_parsing : 
+    expat_parser -> xml_param_entity_parsing_choice -> bool
+
 (** Return the Expat library version as a string (e.g. "expat_1.95.1" *)
 val expat_version : unit -> string


--- a/web/download.xml
+++ b/web/download.xml
@@ -3,16 +3,20 @@

 <title>Download</title>

-<box title="Alpha-release" link="alpha">
+<box title="Beta-release" link="beta">

 <p>
-The only available version for download is an alpha release.
+The only available version for download is a beta release.
 </p>

 <ul>
-<li><a href="download/cduce-0.0.91.tar.gz">Version 0.0.91</a></li>
+<li><a href="download/cduce-0.0.92.tar.gz">Version 0.0.92</a></li>
 </ul>

+<p>
+See <a href="CHANGES">recent changes</a>.
+</p>
+
 </box>

 </page>
--- a/web/index.xml
+++ b/web/index.xml
@@ -68,9 +68,9 @@ you can play with the <local href="proto">online prototype</local>,
 try the examples and modify them. We also have some 
 <local href="examples">larger examples</local>. </p>

-<p>We are planning to distribute a first public release in the next
-few weeks. To help us prepare this release, you can download an
-<local href="download">alpha version</local>, and send your comments.
+<p>We are planning to distribute a stable release in the next
+few weeks. To help us prepare this release, you can download a
+<local href="download">beta version</local>, and send your comments.
 </p>

 </section>