(file) Return to XmlParser.h CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/XmlParser.h between version 1.20 and 1.34

version 1.20, 2004/10/17 20:39:18 version 1.34, 2008/12/02 09:00:53
Line 1 
Line 1 
 //%2004////////////////////////////////////////////////////////////////////////  //%LICENSE////////////////////////////////////////////////////////////////
 // //
 // Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development  // Licensed to The Open Group (TOG) under one or more contributor license
 // Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.  // agreements.  Refer to the OpenPegasusNOTICE.txt file distributed with
 // Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.;  // this work for additional information regarding copyright ownership.
 // IBM Corp.; EMC Corporation, The Open Group.  // Each contributor licenses this file to you under the OpenPegasus Open
 // Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;  // Source License; you may not use this file except in compliance with the
 // IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.  // License.
 //  //
 // Permission is hereby granted, free of charge, to any person obtaining a copy  // Permission is hereby granted, free of charge, to any person obtaining a
 // of this software and associated documentation files (the "Software"), to  // copy of this software and associated documentation files (the "Software"),
 // deal in the Software without restriction, including without limitation the  // to deal in the Software without restriction, including without limitation
 // rights to use, copy, modify, merge, publish, distribute, sublicense, and/or  // the rights to use, copy, modify, merge, publish, distribute, sublicense,
 // sell copies of the Software, and to permit persons to whom the Software is  // and/or sell copies of the Software, and to permit persons to whom the
 // furnished to do so, subject to the following conditions:  // Software is furnished to do so, subject to the following conditions:
 //  //
 // THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN  // The above copyright notice and this permission notice shall be included
 // ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED  // in all copies or substantial portions of the Software.
 // "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT  //
 // LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR  // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 // PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT  // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 // HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN  // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
 // ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION  // IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  // CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
   // TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
   // SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // //
 //==============================================================================  //////////////////////////////////////////////////////////////////////////
 //  
 // Author: Mike Brasher (mbrasher@bmc.com)  
 //  
 // Modified By:  
 // //
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
Line 39 
Line 37 
 #include <Pegasus/Common/InternalException.h> #include <Pegasus/Common/InternalException.h>
 #include <Pegasus/Common/Stack.h> #include <Pegasus/Common/Stack.h>
 #include <Pegasus/Common/Linkage.h> #include <Pegasus/Common/Linkage.h>
   #include <Pegasus/Common/Buffer.h>
  
 PEGASUS_NAMESPACE_BEGIN PEGASUS_NAMESPACE_BEGIN
  
Line 57 
Line 56 
         UNTERMINATED_COMMENT,         UNTERMINATED_COMMENT,
         UNTERMINATED_CDATA,         UNTERMINATED_CDATA,
         UNTERMINATED_DOCTYPE,         UNTERMINATED_DOCTYPE,
         TOO_MANY_ATTRIBUTES,  
         MALFORMED_REFERENCE,         MALFORMED_REFERENCE,
         EXPECTED_COMMENT_OR_CDATA,         EXPECTED_COMMENT_OR_CDATA,
         START_END_MISMATCH,         START_END_MISMATCH,
         UNCLOSED_TAGS,         UNCLOSED_TAGS,
         MULTIPLE_ROOTS,         MULTIPLE_ROOTS,
         VALIDATION_ERROR,         VALIDATION_ERROR,
         SEMANTIC_ERROR          SEMANTIC_ERROR,
           UNDECLARED_NAMESPACE
     };     };
  
  
Line 103 
Line 102 
     XmlSemanticError(Uint32 lineNumber, MessageLoaderParms& msgParms);     XmlSemanticError(Uint32 lineNumber, MessageLoaderParms& msgParms);
 }; };
  
   struct XmlNamespace
   {
       const char* localName;
       const char* extendedName;
       int type;
       Uint32 scopeLevel;
   };
   
 struct XmlAttribute struct XmlAttribute
 { {
       int nsType;
     const char* name;     const char* name;
       const char* localName;
     const char* value;     const char* value;
 }; };
  
 struct PEGASUS_COMMON_LINKAGE XmlEntry struct PEGASUS_COMMON_LINKAGE XmlEntry
 { {
     enum CIMType      enum XmlEntryType
     {     {
         XML_DECLARATION,         XML_DECLARATION,
         START_TAG,         START_TAG,
Line 123 
Line 132 
         CONTENT         CONTENT
     };     };
  
     enum { MAX_ATTRIBUTES = 10 };      XmlEntryType type;
   
     CIMType type;  
     const char* text;     const char* text;
     XmlAttribute attributes[MAX_ATTRIBUTES];      int nsType;            // Only applies to START_TAG, EMPTY_TAG, and END_TAG
     Uint32 attributeCount;      const char* localName; // Only applies to START_TAG, EMPTY_TAG, and END_TAG
       Array<XmlAttribute> attributes;
  
     void print() const;     void print() const;
  
     const XmlAttribute* findAttribute(const char* name) const;     const XmlAttribute* findAttribute(const char* name) const;
  
       const XmlAttribute* findAttribute(int attrNsType, const char* name) const;
   
     Boolean getAttributeValue(const char* name, Uint32& value) const;     Boolean getAttributeValue(const char* name, Uint32& value) const;
  
     Boolean getAttributeValue(const char* name, Real32& value) const;     Boolean getAttributeValue(const char* name, Real32& value) const;
Line 148 
Line 158 
     return 0;     return 0;
 } }
  
 #define PEGASUS_ARRAY_T XmlEntry  
 # include <Pegasus/Common/ArrayInter.h>  
 #undef PEGASUS_ARRAY_T  
   
 class PEGASUS_COMMON_LINKAGE XmlParser class PEGASUS_COMMON_LINKAGE XmlParser
 { {
 public: public:
  
     // Warning: this constructor modifies the text.     // Warning: this constructor modifies the text.
  
     XmlParser(char* text);      XmlParser(char* text, XmlNamespace* ns = 0);
  
     Boolean next(XmlEntry& entry);      /** Comments are returned with entry if includeComment is true else
           XmlParser ignores comments. Default is false.
       */
       Boolean next(XmlEntry& entry, Boolean includeComment = false);
  
     void putBack(XmlEntry& entry);     void putBack(XmlEntry& entry);
  
Line 170 
Line 179 
  
     Uint32 getLine() const { return _line; }     Uint32 getLine() const { return _line; }
  
 private:      XmlNamespace* getNamespace(int nsType);
   
     void _skipWhitespace(char*& p);  
  
     Boolean _getElementName(char*& p);  private:
  
     Boolean _getOpenElementName(char*& p, Boolean& openCloseElement);      Boolean _getElementName(char*& p, const char*& localName);
  
     void _getAttributeNameAndEqual(char*& p);      Boolean _getOpenElementName(
           char*& p,
           const char*& localName,
           Boolean& openCloseElement);
  
     void _getAttributeValue(char*& p);      void _getAttributeNameAndEqual(char*& p, const char*& localName);
  
     void _getComment(char*& p);     void _getComment(char*& p);
  
Line 188 
Line 198 
  
     void _getDocType(char*& p);     void _getDocType(char*& p);
  
     void _getContent(char*& p);      void _getElement(char*& p, XmlEntry& entry);
  
     void _substituteReferences(char* text);      int _getNamespaceType(const char* tag);
  
     void _getElement(char*& p, XmlEntry& entry);      int _getSupportedNamespaceType(const char* extendedName);
  
     Uint32 _line;     Uint32 _line;
     char* _text;  
     char* _current;     char* _current;
     char _restoreChar;     char _restoreChar;
     Stack<char*> _stack;     Stack<char*> _stack;
     Boolean _foundRoot;     Boolean _foundRoot;
     Stack<XmlEntry> _putBackStack;     Stack<XmlEntry> _putBackStack;
   
       XmlNamespace* _supportedNamespaces;
       Stack<XmlNamespace> _nameSpaces;
       int _currentUnsupportedNSType;
 }; };
  
 PEGASUS_COMMON_LINKAGE void XmlAppendCString( PEGASUS_COMMON_LINKAGE void XmlAppendCString(
     Array<Sint8>& out,      Buffer& out,
     const char* str);     const char* str);
  
 PEGASUS_NAMESPACE_END PEGASUS_NAMESPACE_END


Legend:
Removed from v.1.20  
changed lines
  Added in v.1.34

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2