mbeckerle commented on a change in pull request #422: URL: https://github.com/apache/incubator-daffodil/pull/422#discussion_r497840101
########## File path: daffodil-runtime2/src/main/c/xml_reader.c ########## @@ -0,0 +1,186 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "xml_reader.h" +#include <errno.h> // for errno, ERANGE +#include <limits.h> // for LONG_MAX, LONG_MIN +#include <mxml.h> // for mxmlWalkNext, mxmlGetElement, mxmlGetType, ... +#include <stdint.h> // for int32_t, INT32_MAX, INT32_MIN +#include <stdlib.h> // for NULL, strtol +#include <string.h> // for strcmp, strerror + +// Read XML data from file before walking infoset + +static const char * +xmlStartDocument(XMLReader *reader) +{ + // Load the XML data into memory + reader->xml = mxmlLoadFile(NULL, reader->stream, MXML_OPAQUE_CALLBACK); + reader->node = reader->xml; + if (reader->node == NULL) { + return "Unable to read XML data from input file"; + } + + // Consume the <?xml line if there is one + const char *name = mxmlGetElement(reader->node); + if (name && strncmp(name, "?xml", strlen("?xml")) == 0) { + do + { + reader->node = mxmlWalkNext(reader->node, reader->xml, MXML_DESCEND); + } while (mxmlGetType(reader->node) == MXML_OPAQUE); + name = mxmlGetElement(reader->node); + } + + // Consume a comment if there is one + if (name && strncmp(name, "!--", strlen("!--")) == 0) { + do + { + reader->node = mxmlWalkNext(reader->node, reader->xml, MXML_DESCEND); + } while (mxmlGetType(reader->node) == MXML_OPAQUE); + } + + return reader->node ? NULL : "Ran out of XML data"; +} + +// Delete XML data after walking infoset + +static const char * +xmlEndDocument(XMLReader *reader) +{ + // Consume any remaining newlines or whitespace + while (mxmlGetType(reader->node) == MXML_OPAQUE) { + reader->node = mxmlWalkNext(reader->node, reader->xml, MXML_DESCEND); + } + + // Check whether we have consumed all of the XML data + if (reader->node != NULL) { + // This code path exits the program - no need to call mxmlDelete + return "Did not consume all of the XML data"; + } + + // Free the storage allocated to hold the XML data + mxmlDelete(reader->xml); + reader->xml = NULL; + reader->node = NULL; + return NULL; +} + +// Continue walking both XML data and infoset in lockstep + +static const char * +xmlStartComplex(XMLReader *reader, const InfosetBase *base) +{ + // Consume any newlines or whitespace before the element + while (mxmlGetType(reader->node) == MXML_OPAQUE) { + reader->node = mxmlWalkNext(reader->node, reader->xml, MXML_DESCEND); + } + + // Get the element and consume it + const char *name_from_xml = mxmlGetElement(reader->node); + const char *name_from_infoset = base->erd->namedQName.name; + reader->node = mxmlWalkNext(reader->node, reader->xml, MXML_DESCEND); + + // Check whether we are walking both XML data and infoset in lockstep + if (name_from_xml && name_from_infoset) + { + return strcmp(name_from_xml, name_from_infoset) == 0 + ? NULL + : "Found mismatch between XML data and infoset"; + } + else + { + return "Ran out of XML data"; + } +} + +// Consume XML data only on start events, not end events + +static const char * +xmlEndComplex(XMLReader *reader, const InfosetBase *base) +{ + (void)reader; + (void)base; + return NULL; +} + +// Read 32-bit integer value from XML data + +static const char * +xmlInt32Elem(XMLReader *reader, const ERD *erd, int32_t *location) +{ + // Consume any newlines or whitespace before the element + while (mxmlGetType(reader->node) == MXML_OPAQUE) { + reader->node = mxmlWalkNext(reader->node, reader->xml, MXML_DESCEND); + } + + // Get the element and consume it + const char *name_from_xml = mxmlGetElement(reader->node); + const char *number_from_xml = mxmlGetOpaque(reader->node); Review comment: Ok, I read some of the mxml doc. Yeah, no mxmlGetTYPE calls. Surprising. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected]
