[Expat-checkins] expat/lib xmltok.h,1.3,1.4

Fri May 17 12:14:02 2002

Update of /cvsroot/expat/expat/lib
In directory usw-pr-cvs1:/tmp/cvs-serv14821/lib

Modified Files:
	xmltok.h 
Log Message:
Code hygiene edits.

Index: xmltok.h
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmltok.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** xmltok.h	28 Sep 2000 17:53:00 -0000	1.3
--- xmltok.h	17 May 2002 19:12:54 -0000	1.4
***************
*** 1,5 ****
! /*
! Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file COPYING for copying permission.
  */

--- 1,4 ----
! /* Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
!    See the file COPYING for copying permission.
  */

***************
*** 12,28 ****

  /* The following token may be returned by XmlContentTok */
! #define XML_TOK_TRAILING_RSQB -5 /* ] or ]] at the end of the scan; might be start of
!                                     illegal ]]> sequence */
! /* The following tokens may be returned by both XmlPrologTok and XmlContentTok */
! #define XML_TOK_NONE -4    /* The string to be scanned is empty */
! #define XML_TOK_TRAILING_CR -3 /* A CR at the end of the scan;
!                                   might be part of CRLF sequence */ 
! #define XML_TOK_PARTIAL_CHAR -2 /* only part of a multibyte sequence */
! #define XML_TOK_PARTIAL -1 /* only part of a token */
  #define XML_TOK_INVALID 0

  /* The following tokens are returned by XmlContentTok; some are also
!   returned by XmlAttributeValueTok, XmlEntityTok, XmlCdataSectionTok */
! 
  #define XML_TOK_START_TAG_WITH_ATTS 1
  #define XML_TOK_START_TAG_NO_ATTS 2
--- 11,29 ----

  /* The following token may be returned by XmlContentTok */
! #define XML_TOK_TRAILING_RSQB -5 /* ] or ]] at the end of the scan; might be
!                                     start of illegal ]]> sequence */
! /* The following tokens may be returned by both XmlPrologTok and
!    XmlContentTok.
! */
! #define XML_TOK_NONE -4          /* The string to be scanned is empty */
! #define XML_TOK_TRAILING_CR -3   /* A CR at the end of the scan;
!                                     might be part of CRLF sequence */ 
! #define XML_TOK_PARTIAL_CHAR -2  /* only part of a multibyte sequence */
! #define XML_TOK_PARTIAL -1       /* only part of a token */
  #define XML_TOK_INVALID 0

  /* The following tokens are returned by XmlContentTok; some are also
!    returned by XmlAttributeValueTok, XmlEntityTok, XmlCdataSectionTok.
! */
  #define XML_TOK_START_TAG_WITH_ATTS 1
  #define XML_TOK_START_TAG_NO_ATTS 2
***************
*** 34,53 ****
  #define XML_TOK_CDATA_SECT_OPEN 8
  #define XML_TOK_ENTITY_REF 9
! #define XML_TOK_CHAR_REF 10     /* numeric character reference */

! /* The following tokens may be returned by both XmlPrologTok and XmlContentTok */
! #define XML_TOK_PI 11      /* processing instruction */
! #define XML_TOK_XML_DECL 12 /* XML decl or text decl */
  #define XML_TOK_COMMENT 13
! #define XML_TOK_BOM 14     /* Byte order mark */

  /* The following tokens are returned only by XmlPrologTok */
  #define XML_TOK_PROLOG_S 15
! #define XML_TOK_DECL_OPEN 16 /* <!foo */
! #define XML_TOK_DECL_CLOSE 17 /* > */
  #define XML_TOK_NAME 18
  #define XML_TOK_NMTOKEN 19
! #define XML_TOK_POUND_NAME 20 /* #name */
! #define XML_TOK_OR 21 /* | */
  #define XML_TOK_PERCENT 22
  #define XML_TOK_OPEN_PAREN 23
--- 35,56 ----
  #define XML_TOK_CDATA_SECT_OPEN 8
  #define XML_TOK_ENTITY_REF 9
! #define XML_TOK_CHAR_REF 10               /* numeric character reference */

! /* The following tokens may be returned by both XmlPrologTok and
!    XmlContentTok.
! */
! #define XML_TOK_PI 11                     /* processing instruction */
! #define XML_TOK_XML_DECL 12               /* XML decl or text decl */
  #define XML_TOK_COMMENT 13
! #define XML_TOK_BOM 14                    /* Byte order mark */

  /* The following tokens are returned only by XmlPrologTok */
  #define XML_TOK_PROLOG_S 15
! #define XML_TOK_DECL_OPEN 16              /* <!foo */
! #define XML_TOK_DECL_CLOSE 17             /* > */
  #define XML_TOK_NAME 18
  #define XML_TOK_NMTOKEN 19
! #define XML_TOK_POUND_NAME 20             /* #name */
! #define XML_TOK_OR 21                     /* | */
  #define XML_TOK_PERCENT 22
  #define XML_TOK_OPEN_PAREN 23
***************
*** 60,71 ****

  /* The following occur only in element type declarations */
! #define XML_TOK_NAME_QUESTION 30 /* name? */
! #define XML_TOK_NAME_ASTERISK 31 /* name* */
! #define XML_TOK_NAME_PLUS 32 /* name+ */
! #define XML_TOK_COND_SECT_OPEN 33 /* <![ */
! #define XML_TOK_COND_SECT_CLOSE 34 /* ]]> */
! #define XML_TOK_CLOSE_PAREN_QUESTION 35 /* )? */
! #define XML_TOK_CLOSE_PAREN_ASTERISK 36 /* )* */
! #define XML_TOK_CLOSE_PAREN_PLUS 37 /* )+ */
  #define XML_TOK_COMMA 38

--- 63,74 ----

  /* The following occur only in element type declarations */
! #define XML_TOK_NAME_QUESTION 30          /* name? */
! #define XML_TOK_NAME_ASTERISK 31          /* name* */
! #define XML_TOK_NAME_PLUS 32              /* name+ */
! #define XML_TOK_COND_SECT_OPEN 33         /* <![ */
! #define XML_TOK_COND_SECT_CLOSE 34        /* ]]> */
! #define XML_TOK_CLOSE_PAREN_QUESTION 35   /* )? */
! #define XML_TOK_CLOSE_PAREN_ASTERISK 36   /* )* */
! #define XML_TOK_CLOSE_PAREN_PLUS 37       /* )+ */
  #define XML_TOK_COMMA 38

***************
*** 76,81 ****
  #define XML_TOK_CDATA_SECT_CLOSE 40

! /* With namespace processing this is returned by XmlPrologTok
!    for a name with a colon. */
  #define XML_TOK_PREFIXED_NAME 41

--- 79,85 ----
  #define XML_TOK_CDATA_SECT_CLOSE 40

! /* With namespace processing this is returned by XmlPrologTok for a
!    name with a colon.
! */
  #define XML_TOK_PREFIXED_NAME 41

***************
*** 162,183 ****
  };

! /*
! Scan the string starting at ptr until the end of the next complete token,
! but do not scan past eptr.  Return an integer giving the type of token.

! Return XML_TOK_NONE when ptr == eptr; nextTokPtr will not be set.

! Return XML_TOK_PARTIAL when the string does not contain a complete token;
! nextTokPtr will not be set.

! Return XML_TOK_INVALID when the string does not start a valid token; nextTokPtr
! will be set to point to the character which made the token invalid.

! Otherwise the string starts with a valid token; nextTokPtr will be set to point
! to the character following the end of that token.

! Each data character counts as a single token, but adjacent data characters
! may be returned together.  Similarly for characters in the prolog outside
! literals, comments and processing instructions.
  */

--- 166,188 ----
  };

! /* Scan the string starting at ptr until the end of the next complete
!    token, but do not scan past eptr.  Return an integer giving the
!    type of token.

!    Return XML_TOK_NONE when ptr == eptr; nextTokPtr will not be set.

!    Return XML_TOK_PARTIAL when the string does not contain a complete
!    token; nextTokPtr will not be set.

!    Return XML_TOK_INVALID when the string does not start a valid
!    token; nextTokPtr will be set to point to the character which made
!    the token invalid.

!    Otherwise the string starts with a valid token; nextTokPtr will be
!    set to point to the character following the end of that token.

!    Each data character counts as a single token, but adjacent data
!    characters may be returned together.  Similarly for characters in
!    the prolog outside literals, comments and processing instructions.
  */

***************
*** 202,208 ****
  #endif /* XML_DTD */

! /* This is used for performing a 2nd-level tokenization on
! the content of a literal that has already been returned by XmlTok. */ 
! 
  #define XmlLiteralTok(enc, literalType, ptr, end, nextTokPtr) \
    (((enc)->literalScanners[literalType])(enc, ptr, end, nextTokPtr))
--- 207,213 ----
  #endif /* XML_DTD */

! /* This is used for performing a 2nd-level tokenization on the content
!    of a literal that has already been returned by XmlTok.
! */
  #define XmlLiteralTok(enc, literalType, ptr, end, nextTokPtr) \
    (((enc)->literalScanners[literalType])(enc, ptr, end, nextTokPtr))