Skip to content

Commit dfb0a0d

Browse files
DrupDrup
committed
Version 4.0.1
* Fix handling of comments in the ppx. * Fix printing of utf8 in attributes. * Properly flush ppx errors. This bug was causing some blank error messages. * Fix handling of whitespaces in <select> in the ppx.
1 parent fe9e8fb commit dfb0a0d

25 files changed

+11171
-95
lines changed

‎.jenkins.sh

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎_tags

Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,120 @@
11
# OASIS_START
2+
# DO NOT EDIT (digest: d07a4f5df8ed9187d90150fece42e278)
3+
# Ignore VCS directories, you can use the same kind of rule outside
4+
# OASIS_START/STOP if you want to exclude directories that contains
5+
# useless stuff for the build process
6+
true: annot, bin_annot
7+
<**/.svn>: -traverse
8+
<**/.svn>: not_hygienic
9+
".bzr": -traverse
10+
".bzr": not_hygienic
11+
".hg": -traverse
12+
".hg": not_hygienic
13+
".git": -traverse
14+
".git": not_hygienic
15+
"_darcs": -traverse
16+
"_darcs": not_hygienic
17+
# Library tyxml_f
18+
"lib/tyxml_f.cmxs": use_tyxml_f
19+
<lib/*.ml{,i,y}>: package(re)
20+
<lib/*.ml{,i,y}>: package(uutf)
21+
# Library tyxml
22+
"implem/tyxml.cmxs": use_tyxml
23+
<implem/*.ml{,i,y}>: package(re)
24+
<implem/*.ml{,i,y}>: package(uutf)
25+
<implem/*.ml{,i,y}>: use_tyxml_f
26+
# Library tyxml_top
27+
"implem/top/tyxml_top.cmxs": use_tyxml_top
28+
<implem/top/*.ml{,i,y}>: package(compiler-libs.toplevel)
29+
# Library tyxml_tools
30+
"tools/tyxml_tools.cmxs": use_tyxml_tools
31+
# Executable autoname
32+
"tools/autoname.byte": package(bytes)
33+
"tools/autoname.byte": use_tyxml_tools
34+
<tools/*.ml{,i,y}>: package(bytes)
35+
<tools/*.ml{,i,y}>: use_tyxml_tools
36+
# Library pa_tyxml
37+
"syntax/pa_tyxml.cmxs": use_pa_tyxml
38+
<syntax/*.ml{,i,y}>: package(camlp4)
39+
# Library tymlx_p
40+
"syntax/tymlx_p.cmxs": use_tymlx_p
41+
<syntax/*.ml{,i,y}>: package(bytes)
42+
<syntax/*.ml{,i,y}>: package(camlp4.lib)
43+
# Library ppx
44+
"ppx/ppx.cmxs": use_ppx
45+
# Library ppx_internal
46+
"ppx/ppx_internal.cmxs": use_ppx_internal
47+
# Executable ppx_tyxml
48+
<ppx/ppx_tyxml_ex.{native,byte}>: package(bytes)
49+
<ppx/ppx_tyxml_ex.{native,byte}>: package(markup)
50+
<ppx/ppx_tyxml_ex.{native,byte}>: package(ppx_tools.metaquot)
51+
<ppx/ppx_tyxml_ex.{native,byte}>: package(re.str)
52+
<ppx/ppx_tyxml_ex.{native,byte}>: use_ppx_internal
53+
<ppx/ppx_tyxml_ex.{native,byte}>: use_tyxml_tools
54+
<ppx/*.ml{,i,y}>: package(markup)
55+
<ppx/*.ml{,i,y}>: package(re.str)
56+
<ppx/*.ml{,i,y}>: use_ppx_internal
57+
# Executable ppx_reflect
58+
<ppx/ppx_reflect.{native,byte}>: package(bytes)
59+
<ppx/ppx_reflect.{native,byte}>: package(ppx_tools.metaquot)
60+
<ppx/ppx_reflect.{native,byte}>: use_tyxml_tools
61+
<ppx/*.ml{,i,y}>: package(bytes)
62+
<ppx/*.ml{,i,y}>: package(ppx_tools.metaquot)
63+
<ppx/*.ml{,i,y}>: use_tyxml_tools
64+
# Executable emit_big
65+
<test/emitbig.{native,byte}>: package(re)
66+
<test/emitbig.{native,byte}>: package(unix)
67+
<test/emitbig.{native,byte}>: package(uutf)
68+
<test/emitbig.{native,byte}>: use_tyxml
69+
<test/emitbig.{native,byte}>: use_tyxml_f
70+
<test/*.ml{,i,y}>: package(unix)
71+
# Executable main_test
72+
"test/main_test.byte": package(alcotest)
73+
"test/main_test.byte": package(re)
74+
"test/main_test.byte": package(uutf)
75+
"test/main_test.byte": use_tyxml
76+
"test/main_test.byte": use_tyxml_f
77+
<test/*.ml{,i,y}>: package(alcotest)
78+
<test/*.ml{,i,y}>: package(re)
79+
<test/*.ml{,i,y}>: package(uutf)
80+
<test/*.ml{,i,y}>: use_tyxml
81+
<test/*.ml{,i,y}>: use_tyxml_f
82+
# Executable basic_website
83+
<examples/basic_website/site_html.{native,byte}>: package(re)
84+
<examples/basic_website/site_html.{native,byte}>: package(uutf)
85+
<examples/basic_website/site_html.{native,byte}>: use_tyxml
86+
<examples/basic_website/site_html.{native,byte}>: use_tyxml_f
87+
<examples/basic_website/*.ml{,i,y}>: package(re)
88+
<examples/basic_website/*.ml{,i,y}>: package(uutf)
89+
<examples/basic_website/*.ml{,i,y}>: use_tyxml
90+
<examples/basic_website/*.ml{,i,y}>: use_tyxml_f
91+
# Executable basic_website_ppx
92+
<examples/basic_website_ppx/site_html.{native,byte}>: package(re)
93+
<examples/basic_website_ppx/site_html.{native,byte}>: package(uutf)
94+
<examples/basic_website_ppx/site_html.{native,byte}>: use_tyxml
95+
<examples/basic_website_ppx/site_html.{native,byte}>: use_tyxml_f
96+
<examples/basic_website_ppx/*.ml{,i,y}>: package(re)
97+
<examples/basic_website_ppx/*.ml{,i,y}>: package(uutf)
98+
<examples/basic_website_ppx/*.ml{,i,y}>: use_tyxml
99+
<examples/basic_website_ppx/*.ml{,i,y}>: use_tyxml_f
100+
# Executable mini_website
101+
<examples/mini_website/minihtml.{native,byte}>: package(re)
102+
<examples/mini_website/minihtml.{native,byte}>: package(uutf)
103+
<examples/mini_website/minihtml.{native,byte}>: use_tyxml
104+
<examples/mini_website/minihtml.{native,byte}>: use_tyxml_f
105+
<examples/mini_website/*.ml{,i,y}>: package(re)
106+
<examples/mini_website/*.ml{,i,y}>: package(uutf)
107+
<examples/mini_website/*.ml{,i,y}>: use_tyxml
108+
<examples/mini_website/*.ml{,i,y}>: use_tyxml_f
109+
# Executable mini_website_ppx
110+
<examples/mini_website_ppx/minihtml.{native,byte}>: package(re)
111+
<examples/mini_website_ppx/minihtml.{native,byte}>: package(uutf)
112+
<examples/mini_website_ppx/minihtml.{native,byte}>: use_tyxml
113+
<examples/mini_website_ppx/minihtml.{native,byte}>: use_tyxml_f
114+
<examples/mini_website_ppx/*.ml{,i,y}>: package(re)
115+
<examples/mini_website_ppx/*.ml{,i,y}>: package(uutf)
116+
<examples/mini_website_ppx/*.ml{,i,y}>: use_tyxml
117+
<examples/mini_website_ppx/*.ml{,i,y}>: use_tyxml_f
2118
# OASIS_STOP
3119
"syntax/basic_types.ml": camlp4rf
4120
"syntax/xhtmlparser.ml": camlp4rf

‎dist.sh

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎implem/META

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
# OASIS_START
2+
# DO NOT EDIT (digest: c6ec0eb7c6ec4d2ff7716e168d21e65a)
3+
version = "4.0.1"
4+
description = "Statically correct HTML and SVG documents"
5+
requires = "tyxml.functor re uutf"
6+
archive(byte) = "tyxml.cma"
7+
archive(byte, plugin) = "tyxml.cma"
8+
archive(native) = "tyxml.cmxa"
9+
archive(native, plugin) = "tyxml.cmxs"
10+
archive(byte,toploop) += "tyxml_top.cma"
11+
exists_if = "tyxml.cma"
12+
package "top" (
13+
version = "4.0.1"
14+
description = "Toplevel printers for HTML, SVG and XML"
15+
requires = "tyxml"
16+
archive(byte) = "tyxml_top.cma"
17+
archive(byte, plugin) = "tyxml_top.cma"
18+
archive(native) = "tyxml_top.cmxa"
19+
archive(native, plugin) = "tyxml_top.cmxs"
20+
exists_if = "tyxml_top.cma"
21+
)
22+
23+
package "tools" (
24+
version = "4.0.1"
25+
description = "Statically correct HTML and SVG documents"
26+
requires = "bytes"
27+
archive(byte) = "tyxml_tools.cma"
28+
archive(byte, plugin) = "tyxml_tools.cma"
29+
archive(native) = "tyxml_tools.cmxa"
30+
archive(native, plugin) = "tyxml_tools.cmxs"
31+
exists_if = "tyxml_tools.cma"
32+
)
33+
34+
package "syntax" (
35+
version = "4.0.1"
36+
description = "HTML and SVG syntax extension"
37+
requires = "bytes camlp4"
38+
archive(syntax, preprocessor) = "pa_tyxml.cma"
39+
archive(syntax, toploop) = "pa_tyxml.cma"
40+
archive(syntax, preprocessor, native) = "pa_tyxml.cmxa"
41+
archive(syntax, preprocessor, native, plugin) = "pa_tyxml.cmxs"
42+
requires(toploop) = "tyxml"
43+
exists_if = "pa_tyxml.cma"
44+
)
45+
46+
package "ppx" (
47+
version = "4.0.1"
48+
description = "HTML and SVG syntax extension (ppx)"
49+
requires = "tyxml"
50+
archive(byte) = "ppx.cma"
51+
archive(byte, plugin) = "ppx.cma"
52+
archive(native) = "ppx.cmxa"
53+
archive(native, plugin) = "ppx.cmxs"
54+
ppx = "ppx_tyxml"
55+
exists_if = "ppx.cma"
56+
package "internal" (
57+
version = "4.0.1"
58+
description = "HTML and SVG ppx library"
59+
requires = "re.str ppx_tools.metaquot markup tyxml.tools"
60+
archive(byte) = "ppx_internal.cma"
61+
archive(byte, plugin) = "ppx_internal.cma"
62+
archive(native) = "ppx_internal.cmxa"
63+
archive(native, plugin) = "ppx_internal.cmxs"
64+
exists_if = "ppx_internal.cma"
65+
)
66+
)
67+
68+
package "parser" (
69+
version = "4.0.1"
70+
description = "Simple XML parser"
71+
requires = "bytes camlp4.lib"
72+
archive(byte) = "tymlx_p.cma"
73+
archive(byte, plugin) = "tymlx_p.cma"
74+
archive(native) = "tymlx_p.cmxa"
75+
archive(native, plugin) = "tymlx_p.cmxs"
76+
exists_if = "tymlx_p.cma"
77+
)
78+
79+
package "functor" (
80+
version = "4.0.1"
81+
description = "Statically correct HTML and SVG documents (Functor version)"
82+
requires = "uutf re"
83+
archive(byte) = "tyxml_f.cma"
84+
archive(byte, plugin) = "tyxml_f.cma"
85+
archive(native) = "tyxml_f.cmxa"
86+
archive(native, plugin) = "tyxml_f.cmxs"
87+
exists_if = "tyxml_f.cma"
88+
)
89+
# OASIS_STOP
90+

‎implem/top/tyxml_top.mldylib

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# OASIS_START
2+
# DO NOT EDIT (digest: 9985bb6292efdb2ccd3212f66f8621c5)
3+
Tyxml_top
4+
# OASIS_STOP

‎implem/top/tyxml_top.mllib

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# OASIS_START
2+
# DO NOT EDIT (digest: 9985bb6292efdb2ccd3212f66f8621c5)
3+
Tyxml_top
4+
# OASIS_STOP

‎implem/tyxml.mldylib

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# OASIS_START
2+
# DO NOT EDIT (digest: 0ad0ea7a03e5bb86e515b481bcbc79ed)
3+
Tyxml_xml
4+
Tyxml_svg
5+
Tyxml_html
6+
Tyxml
7+
# OASIS_STOP

‎implem/tyxml.mllib

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# OASIS_START
2+
# DO NOT EDIT (digest: 0ad0ea7a03e5bb86e515b481bcbc79ed)
3+
Tyxml_xml
4+
Tyxml_svg
5+
Tyxml_html
6+
Tyxml
7+
# OASIS_STOP

‎lib/tyxml_f.mldylib

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# OASIS_START
2+
# DO NOT EDIT (digest: c50b31e7fcf48d4e470776748ce82005)
3+
Xml_iter
4+
Xml_wrap
5+
Xml_print
6+
Svg_f
7+
Html_f
8+
# OASIS_STOP

‎lib/tyxml_f.mllib

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# OASIS_START
2+
# DO NOT EDIT (digest: c50b31e7fcf48d4e470776748ce82005)
3+
Xml_iter
4+
Xml_wrap
5+
Xml_print
6+
Svg_f
7+
Html_f
8+
# OASIS_STOP

0 commit comments

Comments
 (0)