ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/antlr/CharScanner.hpp
(Generate patch)

Comparing branches/development/src/antlr/CharScanner.hpp (file contents):
Revision 1465 by chuckv, Fri Jul 9 23:08:25 2010 UTC vs.
Revision 1653 by gezelter, Wed Sep 28 19:37:06 2011 UTC

# Line 9 | Line 9
9   */
10  
11   #include <antlr/config.hpp>
12
13 #include <map>
12   #include <cstdio>
13 + #include <map>
14 + #include <cstring>
15  
16   #ifdef HAS_NOT_CCTYPE_H
17   #include <ctype.h>
# Line 41 | Line 41 | ANTLR_C_USING(tolower)
41  
42   ANTLR_C_USING(tolower)
43  
44 < #if !defined(HAVE_STRCASECMP) && defined(HAVE_STRICMP) && !defined(stricmp)
45 < #define strcasecmp stricmp
46 < #endif
47 < #if !defined(HAVE_STRNCASECMP) && defined(HAVE_STRNICMP) && !defined(strnicmp)
48 < #define strncasecmp strnicmp
49 < #endif
50 <
51 <
52 < #if !defined(HAVE_STRCASECMP) && !defined(HAVE_STRICMP)
44 > #ifdef ANTLR_REALLY_NO_STRCASECMP
45 > // Apparently, neither strcasecmp nor stricmp is standard, and Codewarrior
46 > // on the mac has neither...
47   inline int strcasecmp(const char *s1, const char *s2)
48   {
49          while (true)
# Line 61 | Line 55 | inline int strcasecmp(const char *s1, const char *s2)
55                  if (c1 == 0) return 0;
56          }
57   }
58 + #else
59 + #ifdef NO_STRCASECMP
60 + ANTLR_C_USING(stricmp)
61 + #else
62 + ANTLR_C_USING(strcasecmp)
63   #endif
64 + #endif
65  
66   /** Functor for the literals map
67   */
# Line 122 | Line 122 | class ANTLR_API CharScanner : public TokenStream { (pu
122                  inputState->getInput().commit();
123          }
124  
125 +        /** called by the generated lexer to do error recovery, override to
126 +         * customize the behaviour.
127 +         */
128 +        virtual void recover(const RecognitionException& ex, const BitSet& tokenSet)
129 +        {
130 +                consume();
131 +                consumeUntil(tokenSet);
132 +        }
133 +
134          virtual void consume()
135          {
136                  if (inputState->guessing == 0)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines