diff options
Diffstat (limited to 'dist')
25 files changed, 202 insertions, 3 deletions
diff --git a/dist/build/config.make b/dist/build/config.make index 33b6a8e..e7e9aaa 100644 --- a/dist/build/config.make +++ b/dist/build/config.make @@ -23,6 +23,7 @@ XSDE_LONGLONG := $(strip $(XSDE_LONGLONG)) XSDE_SNPRINTF := $(strip $(XSDE_SNPRINTF)) XSDE_PARSER_VALIDATION := $(strip $(XSDE_PARSER_VALIDATION)) XSDE_SERIALIZER_VALIDATION := $(strip $(XSDE_SERIALIZER_VALIDATION)) +XSDE_REGEXP := $(strip $(XSDE_REGEXP)) XSDE_REUSE_STYLE := $(strip $(XSDE_REUSE_STYLE)) XSDE_CUSTOM_ALLOCATOR := $(strip $(XSDE_CUSTOM_ALLOCATOR)) XSDE_DEFAULT_ALLOCATOR := $(strip $(XSDE_DEFAULT_ALLOCATOR)) diff --git a/dist/config/config.make b/dist/config/config.make index 95dc46f..426384e 100644 --- a/dist/config/config.make +++ b/dist/config/config.make @@ -108,6 +108,15 @@ XSDE_PARSER_VALIDATION := y XSDE_SERIALIZER_VALIDATION := y +# Set to 'y' if you would like to have support for regular expressions in +# the XSD/e runtime. If the regexp support is enabled, then the parser and +# serializer validation code will use it to validate the xs:pattern facet. +# If the regexp support is disabled, then this facet will be ignored. The +# regexp support increases the resulting executable size by about 30-50Kb. +# +XSDE_REGEXP := n + + # Base parser/serializer implementation reuse style. Valid values are: # # 'mixin' - virtual inheritance-based reuse (specify --reuse-style-mixin) diff --git a/dist/config/config.nmake b/dist/config/config.nmake index 3e23c25..24a267f 100644 --- a/dist/config/config.nmake +++ b/dist/config/config.nmake @@ -107,6 +107,15 @@ XSDE_PARSER_VALIDATION = y XSDE_SERIALIZER_VALIDATION = y +# Set to 'y' if you would like to have support for regular expressions in +# the XSD/e runtime. If the regexp support is enabled, then the parser and +# serializer validation code will use it to validate the xs:pattern facet. +# If the regexp support is disabled, then this facet will be ignored. The +# regexp support increases the resulting executable size by about 30-50Kb. +# +XSDE_REGEXP = n + + # Base parser/serializer implementation reuse style. Valid values are: # # 'mixin' - virtual inheritance-based reuse (specify --reuse-style-mixin) diff --git a/dist/etc/evc-4.0/config.nmake b/dist/etc/evc-4.0/config.nmake index 825c909..e5b9a56 100644 --- a/dist/etc/evc-4.0/config.nmake +++ b/dist/etc/evc-4.0/config.nmake @@ -110,6 +110,15 @@ XSDE_PARSER_VALIDATION = y XSDE_SERIALIZER_VALIDATION = y +# Set to 'y' if you would like to have support for regular expressions in +# the XSD/e runtime. If the regexp support is enabled, then the parser and +# serializer validation code will use it to validate the xs:pattern facet. +# If the regexp support is disabled, then this facet will be ignored. The +# regexp support increases the resulting executable size by about 30-50Kb. +# +XSDE_REGEXP = n + + # Base parser/serializer implementation reuse style. Valid values are: # # 'mixin' - virtual inheritance-based reuse (specify --reuse-style-mixin) diff --git a/dist/etc/integrity/config.make b/dist/etc/integrity/config.make index 943b208..5755056 100644 --- a/dist/etc/integrity/config.make +++ b/dist/etc/integrity/config.make @@ -113,6 +113,15 @@ XSDE_PARSER_VALIDATION := y XSDE_SERIALIZER_VALIDATION := y +# Set to 'y' if you would like to have support for regular expressions in +# the XSD/e runtime. If the regexp support is enabled, then the parser and +# serializer validation code will use it to validate the xs:pattern facet. +# If the regexp support is disabled, then this facet will be ignored. The +# regexp support increases the resulting executable size by about 30-50Kb. +# +XSDE_REGEXP := n + + # Base parser/serializer implementation reuse style. Valid values are: # # 'mixin' - virtual inheritance-based reuse (specify --reuse-style-mixin) diff --git a/dist/etc/iphone/config-device.make b/dist/etc/iphone/config-device.make index 8d11943..9b98c36 100644 --- a/dist/etc/iphone/config-device.make +++ b/dist/etc/iphone/config-device.make @@ -115,6 +115,15 @@ XSDE_PARSER_VALIDATION := y XSDE_SERIALIZER_VALIDATION := y +# Set to 'y' if you would like to have support for regular expressions in +# the XSD/e runtime. If the regexp support is enabled, then the parser and +# serializer validation code will use it to validate the xs:pattern facet. +# If the regexp support is disabled, then this facet will be ignored. The +# regexp support increases the resulting executable size by about 30-50Kb. +# +XSDE_REGEXP := n + + # Base parser/serializer implementation reuse style. Valid values are: # # 'mixin' - virtual inheritance-based reuse (specify --reuse-style-mixin) diff --git a/dist/etc/iphone/config-simulator.make b/dist/etc/iphone/config-simulator.make index 48f0652..2fa5632 100644 --- a/dist/etc/iphone/config-simulator.make +++ b/dist/etc/iphone/config-simulator.make @@ -115,6 +115,15 @@ XSDE_PARSER_VALIDATION := y XSDE_SERIALIZER_VALIDATION := y +# Set to 'y' if you would like to have support for regular expressions in +# the XSD/e runtime. If the regexp support is enabled, then the parser and +# serializer validation code will use it to validate the xs:pattern facet. +# If the regexp support is disabled, then this facet will be ignored. The +# regexp support increases the resulting executable size by about 30-50Kb. +# +XSDE_REGEXP := n + + # Base parser/serializer implementation reuse style. Valid values are: # # 'mixin' - virtual inheritance-based reuse (specify --reuse-style-mixin) diff --git a/dist/etc/lynxos/config-4.2.make b/dist/etc/lynxos/config-4.2.make index d1b1b68..1215121 100644 --- a/dist/etc/lynxos/config-4.2.make +++ b/dist/etc/lynxos/config-4.2.make @@ -114,6 +114,15 @@ XSDE_PARSER_VALIDATION := y XSDE_SERIALIZER_VALIDATION := y +# Set to 'y' if you would like to have support for regular expressions in +# the XSD/e runtime. If the regexp support is enabled, then the parser and +# serializer validation code will use it to validate the xs:pattern facet. +# If the regexp support is disabled, then this facet will be ignored. The +# regexp support increases the resulting executable size by about 30-50Kb. +# +XSDE_REGEXP := n + + # Base parser/serializer implementation reuse style. Valid values are: # # 'mixin' - virtual inheritance-based reuse (specify --reuse-style-mixin) diff --git a/dist/etc/lynxos/config-5.0.make b/dist/etc/lynxos/config-5.0.make index b61ade3..d0a22bb 100644 --- a/dist/etc/lynxos/config-5.0.make +++ b/dist/etc/lynxos/config-5.0.make @@ -114,6 +114,15 @@ XSDE_PARSER_VALIDATION := y XSDE_SERIALIZER_VALIDATION := y +# Set to 'y' if you would like to have support for regular expressions in +# the XSD/e runtime. If the regexp support is enabled, then the parser and +# serializer validation code will use it to validate the xs:pattern facet. +# If the regexp support is disabled, then this facet will be ignored. The +# regexp support increases the resulting executable size by about 30-50Kb. +# +XSDE_REGEXP := n + + # Base parser/serializer implementation reuse style. Valid values are: # # 'mixin' - virtual inheritance-based reuse (specify --reuse-style-mixin) diff --git a/dist/etc/qnx/config-6.3-gcc-2.95.make b/dist/etc/qnx/config-6.3-gcc-2.95.make index 1228db2..6a4a7e3 100644 --- a/dist/etc/qnx/config-6.3-gcc-2.95.make +++ b/dist/etc/qnx/config-6.3-gcc-2.95.make @@ -113,6 +113,15 @@ XSDE_PARSER_VALIDATION := y XSDE_SERIALIZER_VALIDATION := y +# Set to 'y' if you would like to have support for regular expressions in +# the XSD/e runtime. If the regexp support is enabled, then the parser and +# serializer validation code will use it to validate the xs:pattern facet. +# If the regexp support is disabled, then this facet will be ignored. The +# regexp support increases the resulting executable size by about 30-50Kb. +# +XSDE_REGEXP := n + + # Base parser/serializer implementation reuse style. Valid values are: # # 'mixin' - virtual inheritance-based reuse (specify --reuse-style-mixin) diff --git a/dist/etc/qnx/config-6.3-gcc-3.3.make b/dist/etc/qnx/config-6.3-gcc-3.3.make index fe39d31..915fe6c 100644 --- a/dist/etc/qnx/config-6.3-gcc-3.3.make +++ b/dist/etc/qnx/config-6.3-gcc-3.3.make @@ -113,6 +113,15 @@ XSDE_PARSER_VALIDATION := y XSDE_SERIALIZER_VALIDATION := y +# Set to 'y' if you would like to have support for regular expressions in +# the XSD/e runtime. If the regexp support is enabled, then the parser and +# serializer validation code will use it to validate the xs:pattern facet. +# If the regexp support is disabled, then this facet will be ignored. The +# regexp support increases the resulting executable size by about 30-50Kb. +# +XSDE_REGEXP := n + + # Base parser/serializer implementation reuse style. Valid values are: # # 'mixin' - virtual inheritance-based reuse (specify --reuse-style-mixin) diff --git a/dist/etc/qnx/config-6.4.make b/dist/etc/qnx/config-6.4.make index 33d3658..c8603cb 100644 --- a/dist/etc/qnx/config-6.4.make +++ b/dist/etc/qnx/config-6.4.make @@ -113,6 +113,15 @@ XSDE_PARSER_VALIDATION := y XSDE_SERIALIZER_VALIDATION := y +# Set to 'y' if you would like to have support for regular expressions in +# the XSD/e runtime. If the regexp support is enabled, then the parser and +# serializer validation code will use it to validate the xs:pattern facet. +# If the regexp support is disabled, then this facet will be ignored. The +# regexp support increases the resulting executable size by about 30-50Kb. +# +XSDE_REGEXP := n + + # Base parser/serializer implementation reuse style. Valid values are: # # 'mixin' - virtual inheritance-based reuse (specify --reuse-style-mixin) diff --git a/dist/etc/vc-8.0/config-max.nmake b/dist/etc/vc-8.0/config-max.nmake index 07a7c0a..ce2b95e 100644 --- a/dist/etc/vc-8.0/config-max.nmake +++ b/dist/etc/vc-8.0/config-max.nmake @@ -111,6 +111,15 @@ XSDE_PARSER_VALIDATION = y XSDE_SERIALIZER_VALIDATION = y +# Set to 'y' if you would like to have support for regular expressions in +# the XSD/e runtime. If the regexp support is enabled, then the parser and +# serializer validation code will use it to validate the xs:pattern facet. +# If the regexp support is disabled, then this facet will be ignored. The +# regexp support increases the resulting executable size by about 30-50Kb. +# +XSDE_REGEXP = n + + # Base parser/serializer implementation reuse style. Valid values are: # # 'mixin' - virtual inheritance-based reuse (specify --reuse-style-mixin) diff --git a/dist/etc/vc-8.0/config-min.nmake b/dist/etc/vc-8.0/config-min.nmake index 1177d58..a6f8e16 100644 --- a/dist/etc/vc-8.0/config-min.nmake +++ b/dist/etc/vc-8.0/config-min.nmake @@ -111,6 +111,15 @@ XSDE_PARSER_VALIDATION = y XSDE_SERIALIZER_VALIDATION = y +# Set to 'y' if you would like to have support for regular expressions in +# the XSD/e runtime. If the regexp support is enabled, then the parser and +# serializer validation code will use it to validate the xs:pattern facet. +# If the regexp support is disabled, then this facet will be ignored. The +# regexp support increases the resulting executable size by about 30-50Kb. +# +XSDE_REGEXP = n + + # Base parser/serializer implementation reuse style. Valid values are: # # 'mixin' - virtual inheritance-based reuse (specify --reuse-style-mixin) diff --git a/dist/etc/vc-9.0/config-max.nmake b/dist/etc/vc-9.0/config-max.nmake index 6d39a73..8b6a71d 100644 --- a/dist/etc/vc-9.0/config-max.nmake +++ b/dist/etc/vc-9.0/config-max.nmake @@ -111,6 +111,15 @@ XSDE_PARSER_VALIDATION = y XSDE_SERIALIZER_VALIDATION = y +# Set to 'y' if you would like to have support for regular expressions in +# the XSD/e runtime. If the regexp support is enabled, then the parser and +# serializer validation code will use it to validate the xs:pattern facet. +# If the regexp support is disabled, then this facet will be ignored. The +# regexp support increases the resulting executable size by about 30-50Kb. +# +XSDE_REGEXP = n + + # Base parser/serializer implementation reuse style. Valid values are: # # 'mixin' - virtual inheritance-based reuse (specify --reuse-style-mixin) diff --git a/dist/etc/vc-9.0/config-min.nmake b/dist/etc/vc-9.0/config-min.nmake index 337369f..f33f298 100644 --- a/dist/etc/vc-9.0/config-min.nmake +++ b/dist/etc/vc-9.0/config-min.nmake @@ -111,6 +111,15 @@ XSDE_PARSER_VALIDATION = y XSDE_SERIALIZER_VALIDATION = y +# Set to 'y' if you would like to have support for regular expressions in +# the XSD/e runtime. If the regexp support is enabled, then the parser and +# serializer validation code will use it to validate the xs:pattern facet. +# If the regexp support is disabled, then this facet will be ignored. The +# regexp support increases the resulting executable size by about 30-50Kb. +# +XSDE_REGEXP = n + + # Base parser/serializer implementation reuse style. Valid values are: # # 'mixin' - virtual inheritance-based reuse (specify --reuse-style-mixin) diff --git a/dist/etc/vxworks/config-5.5.1.make b/dist/etc/vxworks/config-5.5.1.make index df7549e..c94dc3f 100644 --- a/dist/etc/vxworks/config-5.5.1.make +++ b/dist/etc/vxworks/config-5.5.1.make @@ -114,6 +114,15 @@ XSDE_PARSER_VALIDATION := y XSDE_SERIALIZER_VALIDATION := y +# Set to 'y' if you would like to have support for regular expressions in +# the XSD/e runtime. If the regexp support is enabled, then the parser and +# serializer validation code will use it to validate the xs:pattern facet. +# If the regexp support is disabled, then this facet will be ignored. The +# regexp support increases the resulting executable size by about 30-50Kb. +# +XSDE_REGEXP := n + + # Base parser/serializer implementation reuse style. Valid values are: # # 'mixin' - virtual inheritance-based reuse (specify --reuse-style-mixin) diff --git a/dist/etc/vxworks/config-6.4-max.make b/dist/etc/vxworks/config-6.4-max.make index 835ba84..1811b38 100644 --- a/dist/etc/vxworks/config-6.4-max.make +++ b/dist/etc/vxworks/config-6.4-max.make @@ -126,6 +126,15 @@ XSDE_PARSER_VALIDATION := y XSDE_SERIALIZER_VALIDATION := y +# Set to 'y' if you would like to have support for regular expressions in +# the XSD/e runtime. If the regexp support is enabled, then the parser and +# serializer validation code will use it to validate the xs:pattern facet. +# If the regexp support is disabled, then this facet will be ignored. The +# regexp support increases the resulting executable size by about 30-50Kb. +# +XSDE_REGEXP := n + + # Base parser/serializer implementation reuse style. Valid values are: # # 'mixin' - virtual inheritance-based reuse (specify --reuse-style-mixin) diff --git a/dist/etc/vxworks/config-6.4-min.make b/dist/etc/vxworks/config-6.4-min.make index 2ac5ef3..4116c10 100644 --- a/dist/etc/vxworks/config-6.4-min.make +++ b/dist/etc/vxworks/config-6.4-min.make @@ -113,6 +113,15 @@ XSDE_PARSER_VALIDATION := y XSDE_SERIALIZER_VALIDATION := y +# Set to 'y' if you would like to have support for regular expressions in +# the XSD/e runtime. If the regexp support is enabled, then the parser and +# serializer validation code will use it to validate the xs:pattern facet. +# If the regexp support is disabled, then this facet will be ignored. The +# regexp support increases the resulting executable size by about 30-50Kb. +# +XSDE_REGEXP := n + + # Base parser/serializer implementation reuse style. Valid values are: # # 'mixin' - virtual inheritance-based reuse (specify --reuse-style-mixin) diff --git a/dist/etc/vxworks/config-6.7-max.make b/dist/etc/vxworks/config-6.7-max.make index 30e7347..77ad171 100644 --- a/dist/etc/vxworks/config-6.7-max.make +++ b/dist/etc/vxworks/config-6.7-max.make @@ -126,6 +126,15 @@ XSDE_PARSER_VALIDATION := y XSDE_SERIALIZER_VALIDATION := y +# Set to 'y' if you would like to have support for regular expressions in +# the XSD/e runtime. If the regexp support is enabled, then the parser and +# serializer validation code will use it to validate the xs:pattern facet. +# If the regexp support is disabled, then this facet will be ignored. The +# regexp support increases the resulting executable size by about 30-50Kb. +# +XSDE_REGEXP := n + + # Base parser/serializer implementation reuse style. Valid values are: # # 'mixin' - virtual inheritance-based reuse (specify --reuse-style-mixin) diff --git a/dist/etc/vxworks/config-6.7-min.make b/dist/etc/vxworks/config-6.7-min.make index b624c8c..babc9f3 100644 --- a/dist/etc/vxworks/config-6.7-min.make +++ b/dist/etc/vxworks/config-6.7-min.make @@ -113,6 +113,15 @@ XSDE_PARSER_VALIDATION := y XSDE_SERIALIZER_VALIDATION := y +# Set to 'y' if you would like to have support for regular expressions in +# the XSD/e runtime. If the regexp support is enabled, then the parser and +# serializer validation code will use it to validate the xs:pattern facet. +# If the regexp support is disabled, then this facet will be ignored. The +# regexp support increases the resulting executable size by about 30-50Kb. +# +XSDE_REGEXP := n + + # Base parser/serializer implementation reuse style. Valid values are: # # 'mixin' - virtual inheritance-based reuse (specify --reuse-style-mixin) diff --git a/dist/libxsde/xsde/makefile b/dist/libxsde/xsde/makefile index a134d29..1e3db26 100644 --- a/dist/libxsde/xsde/makefile +++ b/dist/libxsde/xsde/makefile @@ -9,6 +9,12 @@ EXTRA_CPPFLAGS := -I.. src := c/expat/xmlparse.c c/expat/xmlrole.c c/expat/xmltok.c src += c/genx/genx.c c/genx/char-props.c +ifneq ($(XSDE_PARSER_VALIDATION)$(XSDE_SERIALIZER_VALIDATION),nn) +ifeq ($(XSDE_REGEXP),y) +src += c/regexp/chvalid.c c/regexp/xmlunicode.c c/regexp/xmlregexp.c +endif +endif + ifeq ($(XSDE_CUSTOM_ALLOCATOR),y) ifeq ($(XSDE_DEFAULT_ALLOCATOR),y) src += allocator.c @@ -563,6 +569,9 @@ endif ifeq ($(XSDE_SERIALIZER_VALIDATION),y) @echo $(h)define XSDE_SERIALIZER_VALIDATION >>$@ endif +ifeq ($(XSDE_REGEXP),y) + @echo $(h)define XSDE_REGEXP >>$@ +endif ifeq ($(XSDE_REUSE_STYLE),mixin) @echo $(h)define XSDE_REUSE_STYLE_MIXIN >>$@ else diff --git a/dist/libxsde/xsde/nmakefile b/dist/libxsde/xsde/nmakefile index 9eb9aea..da40ece 100644 --- a/dist/libxsde/xsde/nmakefile +++ b/dist/libxsde/xsde/nmakefile @@ -11,6 +11,12 @@ EXTRA_CPPFLAGS = /I.. src = c\expat\xmlparse.c c\expat\xmlrole.c c\expat\xmltok.c src = $(src) c\genx\genx.c c\genx\char-props.c +!if "$(XSDE_PARSER_VALIDATION)$(XSDE_SERIALIZER_VALIDATION)" != "nn" +!if "$(XSDE_REGEXP)" == "n" +src = $(src) c\regexp\chvalid.c c\regexp\xmlunicode.c c\regexp\xmlregexp.c +!endif +!endif + !if "$(XSDE_CUSTOM_ALLOCATOR)" == "y" !if "$(XSDE_DEFAULT_ALLOCATOR)" == "y" src = $(src) allocator.c @@ -562,7 +568,9 @@ config.h: !if "$(XSDE_SERIALIZER_VALIDATION)" == "y" @echo #define XSDE_SERIALIZER_VALIDATION >>$@ !endif - +!if "$(XSDE_REGEXP)" == "y" + @echo #define REGEXP >>$@ +!endif !if "$(XSDE_REUSE_STYLE)" == "mixin" @echo #define XSDE_REUSE_STYLE_MIXIN >>$@ !else @@ -619,6 +627,7 @@ cleanobj: -del xsde.lib config.h -del c\expat\*.obj -del c\genx\*.obj + -del c\regexp\*.obj -del cxx\*.obj -del cxx\parser\*.obj -del cxx\parser\expat\*.obj diff --git a/dist/tests/cxx/hybrid/makefile b/dist/tests/cxx/hybrid/makefile index 62bbc1e..9b5fea2 100644 --- a/dist/tests/cxx/hybrid/makefile +++ b/dist/tests/cxx/hybrid/makefile @@ -15,7 +15,7 @@ endif endif ifeq ($(XSDE_IOSTREAM),y) -dirs += built-in default enumeration list test-template union +dirs += built-in default enumeration list test-template union pattern ifeq ($(XSDE_ENCODING),iso8859-1) dirs += iso8859-1 diff --git a/dist/tests/cxx/hybrid/nmakefile b/dist/tests/cxx/hybrid/nmakefile index 61097dd..560f0b1 100644 --- a/dist/tests/cxx/hybrid/nmakefile +++ b/dist/tests/cxx/hybrid/nmakefile @@ -15,7 +15,7 @@ dirs = $(dirs) iterator !endif !if "$(XSDE_IOSTREAM)" == "y" -dirs = $(dirs) built-in default enumeration list test-template union +dirs = $(dirs) built-in default enumeration list test-template union pattern !if "$(XSDE_ENCODING)" == "iso8859-1" dirs = $(dirs) iso8859-1 |