1
0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-01-05 09:17:38 +03:00
Commit Graph

93 Commits

Author SHA1 Message Date
Kasimier T. Buchcik
5dd55d950a Fixed strict/lax element wildcards: the children of elements for which a
* xmlschemas.c: Fixed strict/lax element wildcards: the children
  of elements for which a declaration existed were still processed
  by the wildcard mechanism (reported by philippe ventrillon to the
  mailing list).
  Changed the import and include machanism to share dictionaries.
2004-11-26 12:35:21 +00:00
Kasimier T. Buchcik
8b41817d58 tiny enhancement for content model error reports (#157190, #143948).
* xmlschemas.c: tiny enhancement for content model error reports (#157190, #143948).
  Removed abbreviations: CT, ST and WC (#157190, reported by Frans  Englich).
  Initial: no report of local components.
* result/schemas/all* result/schemas/any3_0_0.err result/schemas/choice*
  result/schemas/cos-st-restricts-1-2-err_0_0.err result/schemas/derivation-ok-extension-err_0_0.err
  result/schemas/derivation-ok-extension_0_0.err result/schemas/derivation-ok-restriction-2-1-1_0_0.err
  result/schemas/derivation-ok-restriction-4-1-err_0_0.err result/schemas/deter0_0_0.err
  result/schemas/extension1_0_2.err result/schemas/facet-unionST-err1_0_0.err
  result/schemas/hexbinary_0_1.err result/schemas/list* result/schemas/restriction-attr1_0_0.err
  result/schemas/vdv-first4_0_1.err result/schemas/vdv-first4_0_2.err: Adapted output.
2004-11-17 13:14:27 +00:00
Kasimier T. Buchcik
b884124c34 Moved execution of xmlSchemaCheckDefaults to xmlSchemaTypeFixup; this
* xmlschemas.c: Moved execution of xmlSchemaCheckDefaults to
  xmlSchemaTypeFixup; this ensures facets of inherited types to be checked
  prior to facets of derived types - which caused a seg fault otherwise
  (bug #158216, reported by Frans Englich).
2004-11-15 12:11:56 +00:00
Kasimier T. Buchcik
48307f432a Un-commented a TODO in xmlSchemaParseElement.
* xmlschemas.c: Un-commented a TODO in xmlSchemaParseElement.
2004-11-12 15:16:25 +00:00
Kasimier T. Buchcik
91feaf8477 Correct symbol space for 'all' and 'choice'. Added 'replace' normalization
* xmlschemas.c: Correct symbol space for 'all' and 'choice'.
* xmlschemastypes.c include/xmlschemastypes.h: Added 'replace'
  normalization for 'normalizedString'.
  Added xmlSchemaWhiteSpaceReplace to the API.
2004-11-12 14:04:58 +00:00
Daniel Veillard
ce682bc24b autogenerate a minimal NULL value sequence for unknown pointer types This
* gentest.py testapi.c: autogenerate a minimal NULL value sequence
  for unknown pointer types
* HTMLparser.c SAX2.c chvalid.c encoding.c entities.c parser.c
  parserInternals.c relaxng.c valid.c xmlIO.c xmlreader.c
  xmlsave.c xmlschemas.c xmlschemastypes.c xmlstring.c xpath.c
  xpointer.c: This uncovered an impressive amount of entry points
  not checking for NULL pointers when they ought to, closing all
  the open gaps.
Daniel
2004-11-05 17:22:25 +00:00
Daniel Veillard
6927b10615 preparing release 2.6.15 cleanups Daniel
* ChangeLog NEWS configure.in doc/*: preparing release 2.6.15
* debugXML.c nanoftp.c xmlschemas.c xmlschemastypes.c: cleanups
Daniel
2004-10-27 17:29:04 +00:00
Daniel Veillard
1a380b8924 fixed a memory bug added test from Graham Bennett and regenerated the
* xmlschemas.c: fixed a memory bug
* doc/examples/reader4.c doc/examples/*: added test from Graham Bennett
  and regenerated the directory
Daniel
2004-10-21 16:00:06 +00:00
Kasimier T. Buchcik
87876407ce Parsing of <complexContent> - handle attribute 'mixed', catch illegal
* xmlschemas.c include/libxml/xmlerror.h include/libxml/xmlschemas.h
  include/libxml/schemasInternals.h: Parsing of <complexContent>
  - handle attribute 'mixed', catch illegal attributes.
  Parsing of <complexType> - handle attributes 'abstract',
  'final' and 'block', catch illegal attributes.
  Validation of complex types - handle abstract types.
  Added handling of default/fixed attributes and element values.
  Per validation option attribute nodes/text nodes are created
  on the instance.
  Added the corresponding constraints for fixed/default.
  Added xmlSchemaSetValidOptions, xmlSchemaGetValidOptions
  to the external API.
  Extended element declaration constraints.
  Got rid of perseverative creation of temporery validation/parser
  contexts.
  Added handling of xsi:schemaLocation and
  xsi:noNamespaceSchemaLocation.
  Fixed xsi:type component resolution if using non-prefixed
  QNames.
* xmlregexp.c xmlschemas.c include/libxml/xmlautomata.h:
  Enabled namespace awareness of the content model if using the
  model group "all".
* test/schemas/bug152470_1.xsd: Removed an "abstract" attribute,
  which broke the test.
* xstc/xstc.py:  Workaround to accomodate case insensitive
  test definitions in ms-test.def.xml (was missing in a previous
  commit).
2004-09-29 13:29:03 +00:00
Daniel Veillard
c7e3cc49ba another patch from Malcolm Tredinnick fixing warning generated by the
* acconfig.h config.h.in configure.in xmlIO.c xmlregexp.c xmlschemas.c
  xmlschemastypes.c: another patch from Malcolm Tredinnick fixing
  warning generated by the Nonstop Kernel Open System Services
  compiler #151710
Daniel
2004-09-28 12:33:52 +00:00
Daniel Veillard
079f6a7559 more memory related code cleanups. Daniel
* HTMLparser.c parser.c relaxng.c xmlschemas.c: more memory related
  code cleanups.
Daniel
2004-09-23 13:15:03 +00:00
Kasimier T. Buchcik
876a6db193 Simpified attribute wildcard creation and assignment to get rid of memory
* xmlschemas.c include/libxml/schemasInternals.h
  test/schemas/bug152470_1.* result/schemas/bug152470_1_1*:
  Simpified attribute wildcard creation and assignment to get rid
  of memory leaks.
  Restructured the validation process.
  Restructured and expanded parsing of <attributeGroup>.
  Added initial handing of xsi:type.
  Advanced handling of xsi:nil (should work now for simple types).
  Added construction of schemata using xsi:schemaLocation and
  xsi:noNamespaceSchemaLocation; this is not enabled, since
  no corresponding API exists yet.
  Moved the content model to complex type components.
  Resolution of types for attributes will look for simple types
  only (incl. all the built-in simple types).
  Extended parsing of 'anyAttribute'.
  Fixed content-type type for complex types if derived from
  'anyType' using the short-hand form (see bug # 152470,
  submitted by Thilo Jeremias).
* include/libxml/xmlschematypes.h: Cleaned up some comments.
* xstc/xstc.py: Workaround to accomodate case insensitive
  test definitions in ms-test.def.xml.
* result/schemas/deter0_0_0.err result/schemas/ns0_0_2.err
  result/schemas/ns0_1_2.err: Adapted.
2004-09-16 11:31:52 +00:00
Kasimier T. Buchcik
5eba91f2d9 Added the function xmlSchemaValidateOneElement to the XML Schema
* xmlschemas.c include/libxml/xmlschemas.h: Added the function
  xmlSchemaValidateOneElement to the XML Schema validation API,
  as proposed by Jeffrey Fink - see bug # 152073.
2004-09-08 09:17:27 +00:00
Kasimier T. Buchcik
383434b2f7 Fixed a seg fault in xmlGetQNameProp: a format argument was missing. Fixed
* xmlschemas.c include/libxml/schemasInternals.h
  include/libxml/xmlerror.h: Fixed a seg fault in xmlGetQNameProp:
  a format argument was missing.
  Fixed wrong assignment of the owner of a wildcard in
  xmlSchemaBuildAttributeValidation (in the shorthandform of
  <complexType>; this caused a seg fault, due to a double-free
  of the wildcard.
  Added a check for circular attribute group references.
  Added a check for circular model group definition references.
  Fixed a dublicate xmlParserErrors enum value - see bug #151738.
2004-09-03 18:55:35 +00:00
Kasimier T. Buchcik
b4a9e64f75 Fixed a bug in xmlSchemasCheckFacet, which did not create a computed value
* xmlschemas.c: Fixed a bug in xmlSchemasCheckFacet, which did
  not create a computed value on a facet and thus crashed during
  validation of instances.
  Expanded validity checks for min/maxOccurs attributes.
  Expanded validity checks for the value of the attribute "form".
2004-08-30 10:56:53 +00:00
Kasimier T. Buchcik
bea2354a33 Added missing test file. Substituted the obsolete xmlSchemaValidError(s)
* test/schemas/import-bad-1_0.imp: Added missing test file.
* xmlschemas.c include/libxml/xmlerror.h include/libxml/xmlschemas.h:
  Substituted the obsolete xmlSchemaValidError(s) for xmlParserErrors
  - see #150840.
  Changed the import of schemas to allow failure of location
  of a resource to be imported.
* result/schemas/all_* result/schemas/any3_0_0.err
  result/schemas/choice_* result/schemas/import1_0_0.err
  result/schemas/list0_0_1.err result/schemas/list0_1_0.err
  result/schemas/list0_1_1.err result/schemas/ns0_0_2.err
  result/schemas/ns0_1_2.err: Adapted regression test results.
2004-08-25 20:35:45 +00:00
William M. Brack
2f2a66324d modified parsing of <list>, <union>, <restriction>, <sequence>, <choice>,
* xmlschemas.c: modified parsing of <list>, <union>, <restriction>,
  <sequence>, <choice>, <include>, <import>.
  Fixed schema defaults (elementFormDefault, etc.) for included
  schemas.
  Fixed a bug which reported attributes as invalid on
  elements declarations with the built-in type 'anyType'.
  Added "lax" validation of the content of elements of type
  'anyType'.
  Fixed: element declarations with the same name were treated
  as duplicate if located in the subtree of <choice> -> <sequence>.
  (This was bug 150623, submitted by Roland Lezuo)
  Fixed cleanup of error codes in xmlSchemaValidateDoc as proposed
  by Igor Kapitanker. (This was bug 150647, submitted by Igor
  Kapitanker)
* xmlschemastypes.c: Changed the type of anyType to
  XML_SCHEMAS_ANYTYPE.
* include/libxml/xmlerror.h: Added schema parser errors.
* result/schemas/bug145246_0_0*
  result/schemas/extension1_0_2.err: Changed test results.
* result/schemas/ct-sc-nobase_0_0*
  result/schemas/facet-whiteSpace_0_0*
  result/schemas/import1_0_0* result/schemas/import2_0_0*
  result/schemas/include2_0_0* result/schemas/include3_0_0*
  result/schemas/restriction-attr1_0_0*
  result/schemas/seq-dubl-elem1_0_0*
  result/schemas/xsd-list-itemType_0_0*: Added new rest results.
  test/schemas/bug145246.xsd.imp test/schemas/ct-sc-nobase_0*
  test/schemas/facet-whiteSpace_0* test/schemas/import1_0*
  test/schemas/import2_0* test/schemas/include2_0*
  test/schemas/include3_0* test/schemas/restriction-attr1_0*
  test/schemas/seq-dubl-elem1_0* test/schemas/xml.xsd
  test/schemas/xsd-list-itemType_0*: Added new tests and missing
  files.
2004-08-20 23:09:47 +00:00
Daniel Veillard
259f0dfa8b Applied patch from Torkel Lyng to add Schemas support to the Python
* xmlschemas.c include/libxml/xmlschemas.h python/generator.py
  python/libxml.c python/libxml_wrap.h python/types.c
  python/tests/schema.py python/tests/Makefile.am: Applied patch
  from Torkel Lyng to add Schemas support to the Python bindings
  and extend the schemas error API, registered a new test.
* doc/* elfgcchack.h: rebuilt to regenerate the bindings
Daniel
2004-08-18 09:13:18 +00:00
Daniel Veillard
da3b29a5c4 added a dumb rule to able to compile tst.c when people submit a sample
* Makefile.am: added a dumb rule to able to compile tst.c
  when people submit a sample test program
* xmlschemas.c: applied small patch from Eric Haszlakiewicz
  to document xmlSchemasSetValidErrors() limitations, #141827
* error.c: Add information in generic and structured error
  setter functions that this need to be done per thread #144308
* xmlsave.c: fixed bug whith missing NOTATION(s) serialization
  bug #144162
* doc/xmllint.xml: typo fix #144840
Daniel
2004-08-14 11:15:13 +00:00
Daniel Veillard
c0826a7709 applied Schemas patches from Kasimier Buchcik lot of new tests for things
* configure.in xmlregexp.c xmlschemas.c xmlschemastypes.c
  include/libxml/schemasInternals.h include/libxml/xmlerror.h
  include/libxml/xmlschemastypes.h: applied Schemas patches
  from Kasimier Buchcik
* test/ result/ bug141333* annot-err* any[1-4]* bug145246*
  element-err* element-minmax-err* include1* restrict-CT-attr-ref*:
  lot of new tests for things fixed by the patch
Daniel
2004-08-10 14:17:33 +00:00
Daniel Veillard
f4b05d0a22 applied patch from Kasimier to fix some Relax-NG datatype facet problem
* xmlschemas.c: applied patch from Kasimier to fix some Relax-NG
  datatype facet problem with recent changes.
Daniel
2004-07-05 13:10:37 +00:00
William M. Brack
96d2effc73 warning message cleanup. Now compiles warning-free, all tests passed.
* xmlschemas.c, xmlschemastypes.c: warning message cleanup.
  Now compiles warning-free, all tests passed.
* SAX2.c: small change to comments for documentation.
  No change to logic.
2004-06-30 11:48:47 +00:00
Daniel Veillard
b7c6ac44ec more fixes with Kasimier, looks far cleaner :-) Daniel
* xmlschemas.c: more fixes with Kasimier, looks far cleaner :-)
Daniel
2004-06-29 22:01:27 +00:00
Daniel Veillard
4e5d665212 Kasimier Buchcik fixed the memory access and allocation problem Daniel
* xmlschemas.c: Kasimier Buchcik fixed the memory access and
  allocation problem
Daniel
2004-06-29 21:01:12 +00:00
Daniel Veillard
01fa6156e5 applied Schemas patches from Kasimier Buchcik, there is still one open
* xmlschemas.c xmlschemastypes.c include/libxml/xmlerror.h
  include/libxml/schemasInternals.h include/libxml/xmlschemastypes.h:
  applied Schemas patches from Kasimier Buchcik, there is still
  one open issue about referencing freed memory.
* test/schemas/* result/schemas/*: updated with new tests from
  Kasimier
Daniel
2004-06-29 17:04:39 +00:00
Daniel Veillard
50355f0041 applied another patch from Kasimier Buchcik for Schema Component
* xmlschemas.c include/libxml/xmlerror.h: applied another patch
  from Kasimier Buchcik for Schema Component Constraints
* test/schemas/* result/schemas/*: added the regression tests
Daniel
2004-06-08 17:52:16 +00:00
Daniel Veillard
8acdfbf53c new patch from Kasimier Buchcik for processContents of wildcards attribute
* xmlschemas.c: new patch from  Kasimier Buchcik for processContents
  of wildcards attribute handling
* test/schemas/anyAttr-* result/schemas/anyAttr-*: added specific
  regression tests
Daniel
2004-06-03 16:00:59 +00:00
William M. Brack
767265dd9c small change to xmlSchemaValidateAttributes, also corrected typo on error
* xmlschemas.c: small change to xmlSchemaValidateAttributes,
  also corrected typo on error code enum.
* include/libxml/xmlerror.h: corrected typo on schema error
  code enum
2004-06-03 10:50:29 +00:00
William M. Brack
803812b9fe minor cosmetic changes, no change to logic. regenerated added a newline at
* xmlschemas.c: minor cosmetic changes, no change to logic.
* result/schemas/attruse_0_[12].err: regenerated
* globals.c: added a newline at end to make gcc happy
2004-06-03 02:11:24 +00:00
Daniel Veillard
3646d6463d applied a patch from Kasimier Buchcik implementing attribute uses and
* xmlschemas.c include/libxml/schemasInternals.h
  include/libxml/xmlerror.h: applied a patch from Kasimier Buchcik
  implementing attribute uses and wildcards.
* test/schemas/* result/schemas/*: added/fixed a bunch of tests
Daniel
2004-06-02 19:19:14 +00:00
William M. Brack
9989c7daf4 added code in xmlSchemaBuildAContentModel to handle element reference
* xmlschemas.c: added code in xmlSchemaBuildAContentModel to handle
  element reference within the xs:all construct (bug 139897)
2004-05-12 14:39:38 +00:00
William M. Brack
29aa772d65 added code in xmlSchemaBuildContentModel to allow ref in group definition
* xmlschemas.c: added code in xmlSchemaBuildContentModel to
  allow ref in group definition (bug 134411).  Also fixed
  misc compilation warning messages.
* result/schema/group0_0_0, result/schema/group0_0_0.err:
  regenerated (now no error reported).
2004-05-12 00:27:56 +00:00
William M. Brack
e709195e35 Applied patches supplied by Kasimier Buchcik. changed test to account for
* xmlschemas.c, include/libxml/schemasInternals.h,
  include/libxml/xmlerror.h: Applied patches supplied by
  Kasimier Buchcik.
* test/schemas/po1_0.xml, test/schemas/po1_0.xsd:
  changed test to account for above patch.
2004-05-11 15:09:58 +00:00
Daniel Veillard
f762755fd7 tiny path fixes the "xmlConvertCRNGFile" function name from Kasimier
* rngparser.c: tiny path fixes the "xmlConvertCRNGFile" function name
  from Kasimier Buchcik
* xmlschemas.c: recursive xs:extension fix from taihei goi
Daniel
2004-04-22 07:15:40 +00:00
Daniel Veillard
2582a338bf work around Microsoft compiler NaN bug raise reported by Mark Vakoc fixed
* xpath.c: work around Microsoft compiler NaN bug raise reported
  by Mark Vakoc
* xmlschemas.c include/libxml/schemasInternals.h
  include/libxml/xmlerror.h: fixed a recusive expection schemas
  compilation error raised by taihei goi
Daniel
2004-04-18 19:49:46 +00:00
William M. Brack
87640d5f14 minor warning cleanup (no change to logic) fixed return value for internal
* xmlschemas.c, xmlwriter.c, doc/examples/parse4.c,
  doc/examples/io2.c: minor warning cleanup (no change to logic)
* xinclude: fixed return value for internal function
  xmlXIncludeLoadFallback (now always 0 or -1)
2004-04-17 14:58:15 +00:00
Daniel Veillard
c85d0fec52 applied patches from Kasimier Buchcik for the attribute use support added
* xmlschemas.c include/libxml/schemasInternals.h
  include/libxml/xmlerror.h: applied patches from Kasimier Buchcik
  for the attribute use support
* test/schemas/attruse* result/schemas/attruse*: added the
  tests to the regression suite.
Daniel
2004-04-16 16:46:51 +00:00
Daniel Veillard
377e1a9059 move the TODO as comments as the function while not finished are usable
* xmlsave.c: move the TODO as comments as the function while not
  finished are usable as-is
* xmlschemas.c include/libxml/xmlerror.h: patch from Kasimier Buchcik
  implementing union
* test/schemas/union_0_0.x* result/schemas/union_0_0*: added example
* python/Makefile.am: applied fix from Mike Hommey
Daniel
2004-04-16 16:30:05 +00:00
Daniel Veillard
ba0153a68a small signed-ness patch from Steve Little Daniel
* xmlschemas.c: small signed-ness patch from Steve Little
Daniel
2004-04-01 10:42:31 +00:00
Daniel Veillard
500a1de533 applied patch from Alfred Mickautsch for better DTD support. fixed bug
* xmlwriter.c include/libxml/xmlwriter.h doc/* : applied patch from
  Alfred Mickautsch for better DTD support.
* SAX2.c HTMLparser.c parser.c xinclude.c xmllint.c xmlreader.c
  xmlschemas.c: fixed bug #137867 i.e. fixed properly the way
  reference counting is handled in the XML parser which had the
  side effect of removing a lot of hazardous cruft added to try
  to fix the problems associated as they popped up.
* xmlIO.c: FILE * close fixup for stderr/stdout
Daniel
2004-03-22 15:22:58 +00:00
Daniel Veillard
ebcdebd638 QName handling fixes for the XML Schemas support from Adam Dickmeiss also
* xmlschemas.c: QName handling fixes for the XML Schemas
  support from Adam Dickmeiss
* test/schemas/po1_0.xsd: also fix the schemas
* test/schemas/ns[12]* result/schemas/ns[12]*: added the specific
  regression tests
Daniel
2004-03-05 00:15:50 +00:00
Daniel Veillard
1aefc862f3 applied patch from Adam Dickmeiss for mixed content added his regression
* xmlschemas.c: applied patch from Adam Dickmeiss for mixed content
* test/schemas/mixed* result/schemas/mixed*: added his regression
  tests too.
Daniel
2004-03-04 11:40:48 +00:00
Daniel Veillard
dda22c15d5 applied patch from Steve Ball to avoid a double-free. Daniel
* include/libxml/schemasInternals.h xmlschemas.c: applied patch from
  Steve Ball to avoid a double-free.
Daniel
2004-01-24 08:31:30 +00:00
Daniel Veillard
65765284fb removed a memory leak remaining from the switch to a dictionnary for
* xmlschemas.c: removed a memory leak remaining from the switch
  to a dictionnary for string allocations c.f. #130891
Daniel
2004-01-08 16:59:30 +00:00
William M. Brack
72ee48d55f Fixed memory leak reported by Dave Beckett Removed spurious comment
* parser.c, xmlmemory.c, include/libxml/xmlmemory.h: Fixed
  memory leak reported by Dave Beckett
* xmlschemas.c: Removed spurious comment reported on the mailing
  list
* xinclude.c, xpath.c, xpointer.c, libxml/include/xpointer.h:
  Further work on Bug 129967 concerning xpointer range handling
  and range-to function; much better, but still not complete
2003-12-30 08:30:19 +00:00
William M. Brack
081719182d edited a couple of comments in accordance with posting on the mailing list
* xmlschemas.c: edited a couple of comments in accordance with
  posting on the mailing list (no logic change)
* xpointer.c: working on Bug 129967, added check for NULL
  nodeset to prevent crash.  Further work required.
* xpath.c: working on Bug 129967, added code to handle
  XPATH_LOCATIONSET in RANGETO code, also added code to
  handle it in xmlXPathEvaluatePredicateResult.  Further
  work required.
2003-12-29 02:52:11 +00:00
William M. Brack
b15351e54d added tests for xs:all to assure minOccurs and maxOccurs <= 1 (Bug 130020)
* xmlschemas.c: added tests for xs:all to assure minOccurs
  and maxOccurs <= 1 (Bug 130020)
2003-12-27 04:34:42 +00:00
William M. Brack
cf9eadf7f9 fixed missing dictionaries for Memory and Doc parser contexts (problem
* xmlschemas.c: fixed missing dictionaries for Memory and Doc
  parser contexts (problem reported on mailing list)
* doc/apibuild.py: small change to prevent duplicate lines
  on API functions list.  It will take effect the next time
  the docs are rebuilt.
2003-12-25 13:24:05 +00:00
Daniel Veillard
b0f397e108 types might be redefined in includes, quick fix to allow this but lacks
* xmlschemas.c include/libxml/schemasInternals.h: types might be
  redefined in includes, quick fix to allow this but lacks the
  equality of the redefinition test.
Daniel
2003-12-23 23:30:53 +00:00
Daniel Veillard
bd2904b9c3 added xsd:include support, fixed testSchemas behaviour when a schemas
* include/libxml/schemasInternals.h include/libxml/xmlerror.h
  testSchemas.c xmlschemas.c: added xsd:include support, fixed
  testSchemas behaviour when a schemas failed to parse.
* test/schemas/vdv-* result/schemas/vdv-first5_0_0*: added one
  test for xsd:include from Eric Van der Vlist
Daniel
2003-11-25 15:38:59 +00:00