From 733dfffe757f153c3b62588542e9d814797ecb4e Mon Sep 17 00:00:00 2001 From: Thomas Ave Date: Sat, 28 May 2016 14:35:26 +0200 Subject: [PATCH] Changed regexes to make use of inverse character classes --- examples/SyntaxHighlighter/attributelexer.lxs | 6 ++-- examples/SyntaxHighlighter/example.xml | 8 ++--- .../SyntaxHighlighter/src/AttributeLexer.cpp | 30 +++++++++---------- examples/SyntaxHighlighter/src/XMLLexer.cpp | 12 ++++---- examples/SyntaxHighlighter/xmllexer.lxs | 4 +-- 5 files changed, 30 insertions(+), 30 deletions(-) diff --git a/examples/SyntaxHighlighter/attributelexer.lxs b/examples/SyntaxHighlighter/attributelexer.lxs index 8c16faa..cb83d91 100644 --- a/examples/SyntaxHighlighter/attributelexer.lxs +++ b/examples/SyntaxHighlighter/attributelexer.lxs @@ -1,6 +1,6 @@ ELEMENT = ] +ATTRIBUTE_CONTENT_DOUBLE_QUOTES = [ ]*"[^<>"]*" +ATTRIBUTE_CONTENT_SINGLE_QUOTES = [ ]*'[^<>']*' +BRACKET = [] diff --git a/examples/SyntaxHighlighter/example.xml b/examples/SyntaxHighlighter/example.xml index b748729..f3e715b 100644 --- a/examples/SyntaxHighlighter/example.xml +++ b/examples/SyntaxHighlighter/example.xml @@ -3,17 +3,17 @@ - Thomas Ave + Thomas Avé - - + +
There's currently not a lot to see here, I'm working on it...
    -
  • My name is Thomas Ave
    • +
  • My name is Thomas Avé
  • My email is email@thomasave.be
  • My phone number is
    +32 (0)4 951 128 57
  • You can also find me in the PlayStore and on GitHub |
    • diff --git a/examples/SyntaxHighlighter/src/AttributeLexer.cpp b/examples/SyntaxHighlighter/src/AttributeLexer.cpp index 2ef7ad1..453d4c0 100644 --- a/examples/SyntaxHighlighter/src/AttributeLexer.cpp +++ b/examples/SyntaxHighlighter/src/AttributeLexer.cpp @@ -8,34 +8,34 @@ namespace { //The automaton data State REJECT = 13; - unsigned char TRANS_IDX[256] = { (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)1, (unsigned char)2, (unsigned char)3, (unsigned char)2, (unsigned char)2, (unsigned char)2, (unsigned char)2, (unsigned char)4, (unsigned char)2, (unsigned char)2, (unsigned char)2, (unsigned char)2, (unsigned char)2, (unsigned char)2, (unsigned char)2, (unsigned char)5, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)2, (unsigned char)2, (unsigned char)7, (unsigned char)8, (unsigned char)9, (unsigned char)2, (unsigned char)2, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)0, (unsigned char)2, (unsigned char)0, (unsigned char)2, (unsigned char)2, (unsigned char)2, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)6, (unsigned char)2, (unsigned char)2, (unsigned char)2, (unsigned char)2, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, }; + unsigned char TRANS_IDX[256] = { (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)1, (unsigned char)0, (unsigned char)2, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)3, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)4, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)0, (unsigned char)0, (unsigned char)6, (unsigned char)7, (unsigned char)8, (unsigned char)0, (unsigned char)0, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)5, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, }; - State TABLE[14 - 1][10] = { - { 13, 4, 13, 8, 10, 13, 5, 1, 7, 12, }, + State TABLE[14 - 1][9] = { + { 13, 4, 8, 10, 12, 5, 1, 7, 12, }, - { 13, 2, 13, 13, 13, 2, 3, 13, 13, 13, }, + { 13, 2, 13, 13, 2, 3, 13, 13, 13, }, - { 13, 2, 13, 13, 13, 13, 3, 13, 13, 13, }, + { 13, 2, 13, 13, 13, 3, 13, 13, 13, }, - { 13, 13, 13, 13, 13, 13, 3, 13, 13, 13, }, + { 13, 13, 13, 13, 13, 3, 13, 13, 13, }, - { 13, 4, 13, 8, 10, 13, 13, 13, 7, 13, }, + { 13, 4, 8, 10, 13, 13, 13, 7, 13, }, - { 13, 6, 13, 13, 13, 13, 5, 13, 7, 13, }, + { 13, 6, 13, 13, 13, 5, 13, 7, 13, }, - { 13, 6, 13, 13, 13, 13, 13, 13, 7, 13, }, + { 13, 6, 13, 13, 13, 13, 13, 7, 13, }, - { 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, }, + { 13, 13, 13, 13, 13, 13, 13, 13, 13, }, - { 13, 8, 8, 9, 8, 8, 8, 13, 8, 13, }, + { 8, 8, 9, 8, 8, 8, 13, 8, 13, }, - { 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, }, + { 13, 13, 13, 13, 13, 13, 13, 13, 13, }, - { 13, 10, 10, 10, 11, 10, 10, 13, 10, 13, }, + { 10, 10, 10, 11, 10, 10, 13, 10, 13, }, - { 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, }, + { 13, 13, 13, 13, 13, 13, 13, 13, 13, }, - { 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, }, + { 13, 13, 13, 13, 13, 13, 13, 13, 13, }, }; AttributeLexer::TokenType TOKENS[14] = { AttributeLexer::WHITESPACE, AttributeLexer::ELEMENT, AttributeLexer::ELEMENT, AttributeLexer::ELEMENT, AttributeLexer::WHITESPACE, AttributeLexer::nonmatching, AttributeLexer::nonmatching, AttributeLexer::ATTRIBUTE, AttributeLexer::nonmatching, AttributeLexer::ATTRIBUTE_CONTENT_DOUBLE_QUOTES, AttributeLexer::nonmatching, AttributeLexer::ATTRIBUTE_CONTENT_SINGLE_QUOTES, AttributeLexer::BRACKET, AttributeLexer::nonmatching, }; diff --git a/examples/SyntaxHighlighter/src/XMLLexer.cpp b/examples/SyntaxHighlighter/src/XMLLexer.cpp index 5227fc6..cfc8363 100644 --- a/examples/SyntaxHighlighter/src/XMLLexer.cpp +++ b/examples/SyntaxHighlighter/src/XMLLexer.cpp @@ -8,16 +8,16 @@ namespace { //The automaton data State REJECT = 4; - unsigned char TRANS_IDX[256] = { (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)2, (unsigned char)1, (unsigned char)3, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)0, (unsigned char)1, (unsigned char)0, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)1, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, }; + unsigned char TRANS_IDX[256] = { (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)1, (unsigned char)0, (unsigned char)2, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, (unsigned char)0, }; - State TABLE[5 - 1][4] = { - { 4, 3, 1, 4, }, + State TABLE[5 - 1][3] = { + { 3, 1, 4, }, - { 4, 1, 4, 2, }, + { 1, 4, 2, }, - { 4, 4, 4, 4, }, + { 4, 4, 4, }, - { 4, 3, 4, 4, }, + { 3, 4, 4, }, }; XMLLexer::TokenType TOKENS[5] = { XMLLexer::CONTENT, XMLLexer::nonmatching, XMLLexer::TAG, XMLLexer::CONTENT, XMLLexer::nonmatching, }; diff --git a/examples/SyntaxHighlighter/xmllexer.lxs b/examples/SyntaxHighlighter/xmllexer.lxs index a985b20..8acd753 100644 --- a/examples/SyntaxHighlighter/xmllexer.lxs +++ b/examples/SyntaxHighlighter/xmllexer.lxs @@ -1,2 +1,2 @@ -TAG = -CONTENT = [-a-zA-Z0-9 '!"@#$%^&*()_={}|\;:/?.,`~+]* +TAG = ]*> +CONTENT = [^<>]*