Commit b326553a authored by gerd's avatar gerd

New release


git-svn-id: https://godirepo.camlcity.org/svn/lib-pxp/trunk@658 dbe99aee-44db-0310-b2b3-d33182c8eb97
parent 8222ad4d
#! /bin/sh
# $Id: configure,v 1.20 2003/10/03 20:59:44 gerd Exp $
# $Id: configure,v 1.21 2003/11/04 22:44:40 gerd Exp $
# defaults:
with_lex=1
with_wlex=1
with_wlex_compat=1
lexlist="utf8,iso88591,iso88592,iso88593,iso88594,iso88595,iso88596,iso88597,iso88598,iso88599,iso885910,iso885913,iso885914,iso885915"
version="1.1.94.1"
version="1.1.94.2"
exec_suffix=""
help_lex="Enable/disable ocamllex-based lexical analyzer for the -lexlist encodings"
......
......@@ -51,6 +51,10 @@ for PXP; if you are looking for the stable distribution, please go
<title>Version History</title>
<ul>
<li><p><em>1.1.94.2:</em> Again fixes for the combination of
3.07/wlex</p>
</li>
<li><p><em>1.1.94.1:</em> Fixes for 3.07 concerning the
pregenerated wlexers. - New: Pxp_document.build_node_tree</p>
</li>
......
......@@ -835,7 +835,7 @@ and scan_pi_string engine lexbuf =
0 -> (
# 203 "pxp_wlex_utf8_01.mll"
let len =
Pxp_lexing.lexeme_end lexbuf - Pxp_lexing.lexeme_start lexbuf in
Pxp_lexing.lexeme_len lexbuf in
Some (Pxp_lexing.sub_lexeme lexbuf 0 (len-2))
)
| 1 -> (
......@@ -1242,7 +1242,7 @@ and scan_content engine lexbuf =
Comment_begin dummy_entity, (Comment Content) )
| 2 -> (
# 541 "pxp_wlex_utf8_01.mll"
let l = Lexing.lexeme_end lexbuf - Lexing.lexeme_start lexbuf in
let l = Pxp_lexing.lexeme_len lexbuf in
if Lexing.lexeme_char lexbuf 1 = '/' then
Tag_end (Pxp_lexing.sub_lexeme lexbuf 2 (l-2), dummy_entity),
Within_tag_entry
......@@ -1252,7 +1252,7 @@ and scan_content engine lexbuf =
)
| 3 -> (
# 550 "pxp_wlex_utf8_01.mll"
let l = Lexing.lexeme_end lexbuf - Lexing.lexeme_start lexbuf in
let l = Pxp_lexing.lexeme_len lexbuf in
Cdata (Pxp_lexing.sub_lexeme lexbuf 9 (l-12)), Content )
| 4 -> (
# 553 "pxp_wlex_utf8_01.mll"
......@@ -1264,15 +1264,15 @@ and scan_content engine lexbuf =
)
| 6 -> (
# 559 "pxp_wlex_utf8_01.mll"
let l = Lexing.lexeme_end lexbuf - Lexing.lexeme_start lexbuf in
let l = Pxp_lexing.lexeme_len lexbuf in
CRef (int_of_string (Pxp_lexing.sub_lexeme lexbuf 2 (l-3))), Content )
| 7 -> (
# 562 "pxp_wlex_utf8_01.mll"
let l = Lexing.lexeme_end lexbuf - Lexing.lexeme_start lexbuf in
let l = Pxp_lexing.lexeme_len lexbuf in
CRef (int_of_string ("0x" ^ Pxp_lexing.sub_lexeme lexbuf 3 (l-4))), Content )
| 8 -> (
# 565 "pxp_wlex_utf8_01.mll"
let l = Lexing.lexeme_end lexbuf - Lexing.lexeme_start lexbuf in
let l = Pxp_lexing.lexeme_len lexbuf in
ERef (Pxp_lexing.sub_lexeme lexbuf 1 (l-2)), Content )
| 9 -> (
# 568 "pxp_wlex_utf8_01.mll"
......@@ -1344,7 +1344,7 @@ and scan_within_tag engine lexbuf =
tok_Eq__Within_tag )
| 6 -> (
# 626 "pxp_wlex_utf8_01.mll"
let l = Lexing.lexeme_end lexbuf - Lexing.lexeme_start lexbuf in
let l = Pxp_lexing.lexeme_len lexbuf in
let v = Pxp_lexing.sub_lexeme lexbuf 1 (l-2) in
Attval v, Within_tag )
| 7 -> (
......@@ -1353,7 +1353,7 @@ and scan_within_tag engine lexbuf =
)
| 8 -> (
# 633 "pxp_wlex_utf8_01.mll"
let l = Lexing.lexeme_end lexbuf - Lexing.lexeme_start lexbuf in
let l = Pxp_lexing.lexeme_len lexbuf in
let v = Pxp_lexing.sub_lexeme lexbuf 1 (l-2) in
Attval v, Within_tag )
| 9 -> (
......
......@@ -816,7 +816,7 @@ and scan_pi_string engine lexbuf =
| 0 ->
# 203 "pxp_wlex_utf8_01.mll"
( let len =
Pxp_lexing.lexeme_end lexbuf - Pxp_lexing.lexeme_start lexbuf in
Pxp_lexing.lexeme_len lexbuf in
Some (Pxp_lexing.sub_lexeme lexbuf 0 (len-2))
)
# 823 "pxp_wlex_utf8_01.ml"
......@@ -1415,7 +1415,7 @@ and scan_content engine lexbuf =
| 2 ->
# 541 "pxp_wlex_utf8_01.mll"
( let l = Lexing.lexeme_end lexbuf - Lexing.lexeme_start lexbuf in
( let l = Pxp_lexing.lexeme_len lexbuf in
if Lexing.lexeme_char lexbuf 1 = '/' then
Tag_end (Pxp_lexing.sub_lexeme lexbuf 2 (l-2), dummy_entity),
Within_tag_entry
......@@ -1427,7 +1427,7 @@ and scan_content engine lexbuf =
| 3 ->
# 550 "pxp_wlex_utf8_01.mll"
( let l = Lexing.lexeme_end lexbuf - Lexing.lexeme_start lexbuf in
( let l = Pxp_lexing.lexeme_len lexbuf in
Cdata (Pxp_lexing.sub_lexeme lexbuf 9 (l-12)), Content )
# 1433 "pxp_wlex_utf8_01.ml"
......@@ -1445,19 +1445,19 @@ and scan_content engine lexbuf =
| 6 ->
# 559 "pxp_wlex_utf8_01.mll"
( let l = Lexing.lexeme_end lexbuf - Lexing.lexeme_start lexbuf in
( let l = Pxp_lexing.lexeme_len lexbuf in
CRef (int_of_string (Pxp_lexing.sub_lexeme lexbuf 2 (l-3))), Content )
# 1451 "pxp_wlex_utf8_01.ml"
| 7 ->
# 562 "pxp_wlex_utf8_01.mll"
( let l = Lexing.lexeme_end lexbuf - Lexing.lexeme_start lexbuf in
( let l = Pxp_lexing.lexeme_len lexbuf in
CRef (int_of_string ("0x" ^ Pxp_lexing.sub_lexeme lexbuf 3 (l-4))), Content )
# 1457 "pxp_wlex_utf8_01.ml"
| 8 ->
# 565 "pxp_wlex_utf8_01.mll"
( let l = Lexing.lexeme_end lexbuf - Lexing.lexeme_start lexbuf in
( let l = Pxp_lexing.lexeme_len lexbuf in
ERef (Pxp_lexing.sub_lexeme lexbuf 1 (l-2)), Content )
# 1463 "pxp_wlex_utf8_01.ml"
......@@ -1571,7 +1571,7 @@ and scan_within_tag engine lexbuf =
| 6 ->
# 626 "pxp_wlex_utf8_01.mll"
( let l = Lexing.lexeme_end lexbuf - Lexing.lexeme_start lexbuf in
( let l = Pxp_lexing.lexeme_len lexbuf in
let v = Pxp_lexing.sub_lexeme lexbuf 1 (l-2) in
Attval v, Within_tag )
# 1578 "pxp_wlex_utf8_01.ml"
......@@ -1584,7 +1584,7 @@ and scan_within_tag engine lexbuf =
| 8 ->
# 633 "pxp_wlex_utf8_01.mll"
( let l = Lexing.lexeme_end lexbuf - Lexing.lexeme_start lexbuf in
( let l = Pxp_lexing.lexeme_len lexbuf in
let v = Pxp_lexing.sub_lexeme lexbuf 1 (l-2) in
Attval v, Within_tag )
# 1591 "pxp_wlex_utf8_01.ml"
......
......@@ -201,7 +201,7 @@ and
scan_pi_string = parse
pi_string "?>"
{ let len =
Pxp_lexing.lexeme_end lexbuf - Pxp_lexing.lexeme_start lexbuf in
Pxp_lexing.lexeme_len lexbuf in
Some (Pxp_lexing.sub_lexeme lexbuf 0 (len-2))
}
| ""
......@@ -538,7 +538,7 @@ scan_content = parse
{ Comment_begin dummy_entity, (Comment Content) }
| '<' '/'? name
(* One rule for Tag_beg and Tag_end saves transitions. *)
{ let l = Lexing.lexeme_end lexbuf - Lexing.lexeme_start lexbuf in
{ let l = Pxp_lexing.lexeme_len lexbuf in
if Lexing.lexeme_char lexbuf 1 = '/' then
Tag_end (Pxp_lexing.sub_lexeme lexbuf 2 (l-2), dummy_entity),
Within_tag_entry
......@@ -547,7 +547,7 @@ scan_content = parse
Within_tag_entry
}
| "<![CDATA[" cdata_string "]]>"
{ let l = Lexing.lexeme_end lexbuf - Lexing.lexeme_start lexbuf in
{ let l = Pxp_lexing.lexeme_len lexbuf in
Cdata (Pxp_lexing.sub_lexeme lexbuf 9 (l-12)), Content }
| "<!"
{ raise (WF_error "Declaration either malformed or not allowed in this context")
......@@ -556,13 +556,13 @@ scan_content = parse
{ raise (WF_error ("The left angle bracket '<' must be written as '&lt;'"))
}
| "&#" ascii_digit+ ";"
{ let l = Lexing.lexeme_end lexbuf - Lexing.lexeme_start lexbuf in
{ let l = Pxp_lexing.lexeme_len lexbuf in
CRef (int_of_string (Pxp_lexing.sub_lexeme lexbuf 2 (l-3))), Content }
| "&#x" ascii_hexdigit+ ";"
{ let l = Lexing.lexeme_end lexbuf - Lexing.lexeme_start lexbuf in
{ let l = Pxp_lexing.lexeme_len lexbuf in
CRef (int_of_string ("0x" ^ Pxp_lexing.sub_lexeme lexbuf 3 (l-4))), Content }
| "&" name ";"
{ let l = Lexing.lexeme_end lexbuf - Lexing.lexeme_start lexbuf in
{ let l = Pxp_lexing.lexeme_len lexbuf in
ERef (Pxp_lexing.sub_lexeme lexbuf 1 (l-2)), Content }
| "&"
{ raise (WF_error ("The ampersand '&' must be written as '&amp;'"))
......@@ -623,14 +623,14 @@ scan_within_tag = parse
| '='
{ tok_Eq__Within_tag }
| '"' char_but_quot* '"'
{ let l = Lexing.lexeme_end lexbuf - Lexing.lexeme_start lexbuf in
{ let l = Pxp_lexing.lexeme_len lexbuf in
let v = Pxp_lexing.sub_lexeme lexbuf 1 (l-2) in
Attval v, Within_tag }
| '"'
{ raise (WF_error ("Cannot find the second quotation mark"))
}
| "'" char_but_apos* "'"
{ let l = Lexing.lexeme_end lexbuf - Lexing.lexeme_start lexbuf in
{ let l = Pxp_lexing.lexeme_len lexbuf in
let v = Pxp_lexing.sub_lexeme lexbuf 1 (l-2) in
Attval v, Within_tag }
| "'"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment