diff -Nru wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/common/javacc/ParseException.java wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/common/javacc/ParseException.java --- wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/common/javacc/ParseException.java 2010-07-26 21:55:40.671875000 +0700 +++ wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/common/javacc/ParseException.java 2010-07-27 19:11:19.359375000 +0700 @@ -194,4 +194,4 @@ } } -/* JavaCC - OriginalChecksum=ad29ab3d7ace0f26265a09b885f5982a (do not edit this line) */ +/* JavaCC - OriginalChecksum=f98fddf64ea95cebdba4c6e68c3d5bbf (do not edit this line) */ diff -Nru wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/common/javacc/SimpleCharStream.java wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/common/javacc/SimpleCharStream.java --- wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/common/javacc/SimpleCharStream.java 2010-07-26 21:55:40.671875000 +0700 +++ wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/common/javacc/SimpleCharStream.java 2010-07-27 19:11:19.359375000 +0700 @@ -478,4 +478,4 @@ } } -/* JavaCC - OriginalChecksum=5e47621a5253d359154e7c2c05be2618 (do not edit this line) */ +/* JavaCC - OriginalChecksum=3297bcdf228efae6b4c5eeb309d604a9 (do not edit this line) */ diff -Nru wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/common/javacc/Token.java wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/common/javacc/Token.java --- wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/common/javacc/Token.java 2010-07-26 21:55:40.656250000 +0700 +++ wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/common/javacc/Token.java 2010-07-27 19:11:19.359375000 +0700 @@ -138,4 +138,4 @@ } } -/* JavaCC - OriginalChecksum=0d71c4c90fb7172baa930f276d7d1964 (do not edit this line) */ +/* JavaCC - OriginalChecksum=d9865164c0e451ec74b152715cf07437 (do not edit this line) */ diff -Nru wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/common/javacc/TokenMgrError.java wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/common/javacc/TokenMgrError.java --- wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/common/javacc/TokenMgrError.java 2010-07-26 21:55:40.656250000 +0700 +++ wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/common/javacc/TokenMgrError.java 2010-07-27 19:11:19.343750000 +0700 @@ -154,4 +154,4 @@ this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason); } } -/* JavaCC - OriginalChecksum=905e59232b41cd31b5166df19104740e (do not edit this line) */ +/* JavaCC - OriginalChecksum=ceb6020e5541722493cef19c3c69f1de (do not edit this line) */ diff -Nru wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/confluence/javacc/ParseException.java wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/confluence/javacc/ParseException.java --- wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/confluence/javacc/ParseException.java 2010-07-26 21:55:34.546875000 +0700 +++ wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/confluence/javacc/ParseException.java 2010-07-27 19:11:23.515625000 +0700 @@ -194,4 +194,4 @@ } } -/* JavaCC - OriginalChecksum=e3ef2fba3e58c3a4d07d4e79fcaac580 (do not edit this line) */ +/* JavaCC - OriginalChecksum=0904ad3569c5e1f5afddfb684c88f15b (do not edit this line) */ diff -Nru wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/confluence/javacc/SimpleCharStream.java wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/confluence/javacc/SimpleCharStream.java --- wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/confluence/javacc/SimpleCharStream.java 2010-07-26 21:55:34.531250000 +0700 +++ wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/confluence/javacc/SimpleCharStream.java 2010-07-27 19:11:23.531250000 +0700 @@ -478,4 +478,4 @@ } } -/* JavaCC - OriginalChecksum=a06e0bd7105705447fd673ec90d3e04e (do not edit this line) */ +/* JavaCC - OriginalChecksum=4086258942aab9ca48de14fde4d0b3b7 (do not edit this line) */ diff -Nru wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/confluence/javacc/Token.java wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/confluence/javacc/Token.java --- wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/confluence/javacc/Token.java 2010-07-26 21:55:34.531250000 +0700 +++ wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/confluence/javacc/Token.java 2010-07-27 19:11:23.531250000 +0700 @@ -138,4 +138,4 @@ } } -/* JavaCC - OriginalChecksum=1a7d2be7d9a9557ab300423d44d2f560 (do not edit this line) */ +/* JavaCC - OriginalChecksum=6212cbfe8f0e97304f8e8e125d929aab (do not edit this line) */ diff -Nru wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/confluence/javacc/TokenMgrError.java wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/confluence/javacc/TokenMgrError.java --- wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/confluence/javacc/TokenMgrError.java 2010-07-26 21:55:34.531250000 +0700 +++ wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/confluence/javacc/TokenMgrError.java 2010-07-27 19:11:23.515625000 +0700 @@ -154,4 +154,4 @@ this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason); } } -/* JavaCC - OriginalChecksum=f868045810b898685f71478bdcf61493 (do not edit this line) */ +/* JavaCC - OriginalChecksum=383d24d31f8dd9b61eac8e99038afaec (do not edit this line) */ diff -Nru wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/creole/javacc/ParseException.java wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/creole/javacc/ParseException.java --- wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/creole/javacc/ParseException.java 2010-07-26 21:55:45.671875000 +0700 +++ wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/creole/javacc/ParseException.java 2010-07-27 19:11:25.203125000 +0700 @@ -194,4 +194,4 @@ } } -/* JavaCC - OriginalChecksum=f5aa5b8bf7201130bedf7c1969def20d (do not edit this line) */ +/* JavaCC - OriginalChecksum=541c3b8a0ab90ba2b17685a25b4d3f77 (do not edit this line) */ diff -Nru wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/creole/javacc/SimpleCharStream.java wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/creole/javacc/SimpleCharStream.java --- wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/creole/javacc/SimpleCharStream.java 2010-07-26 21:55:45.656250000 +0700 +++ wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/creole/javacc/SimpleCharStream.java 2010-07-27 19:11:25.218750000 +0700 @@ -478,4 +478,4 @@ } } -/* JavaCC - OriginalChecksum=da5f0aca90d3afe391b85a4a6bb6a958 (do not edit this line) */ +/* JavaCC - OriginalChecksum=4ac24bd7e9896659e70d4a407964efc3 (do not edit this line) */ diff -Nru wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/creole/javacc/Token.java wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/creole/javacc/Token.java --- wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/creole/javacc/Token.java 2010-07-26 21:55:45.656250000 +0700 +++ wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/creole/javacc/Token.java 2010-07-27 19:11:25.218750000 +0700 @@ -138,4 +138,4 @@ } } -/* JavaCC - OriginalChecksum=eb03e2aa4df1b03a773f0061b3137795 (do not edit this line) */ +/* JavaCC - OriginalChecksum=48ffd8947abcf206a48699d2a0a90ff8 (do not edit this line) */ diff -Nru wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/creole/javacc/TokenMgrError.java wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/creole/javacc/TokenMgrError.java --- wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/creole/javacc/TokenMgrError.java 2010-07-26 21:55:45.656250000 +0700 +++ wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/creole/javacc/TokenMgrError.java 2010-07-27 19:11:25.203125000 +0700 @@ -154,4 +154,4 @@ this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason); } } -/* JavaCC - OriginalChecksum=a23ce6898ec3b6b8ac028eec9b777e16 (do not edit this line) */ +/* JavaCC - OriginalChecksum=4fb9ae421768dcb6bd40b9b599547c8f (do not edit this line) */ diff -Nru wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/gwiki/javacc/ParseException.java wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/gwiki/javacc/ParseException.java --- wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/gwiki/javacc/ParseException.java 2010-07-26 21:55:37.968750000 +0700 +++ wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/gwiki/javacc/ParseException.java 2010-07-27 19:11:26.812500000 +0700 @@ -194,4 +194,4 @@ } } -/* JavaCC - OriginalChecksum=25112d194f85bf31386e1291deba1786 (do not edit this line) */ +/* JavaCC - OriginalChecksum=2e0b3228ab8dec6a6c52c7a99bed76bd (do not edit this line) */ diff -Nru wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/gwiki/javacc/SimpleCharStream.java wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/gwiki/javacc/SimpleCharStream.java --- wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/gwiki/javacc/SimpleCharStream.java 2010-07-26 21:55:37.953125000 +0700 +++ wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/gwiki/javacc/SimpleCharStream.java 2010-07-27 19:11:26.828125000 +0700 @@ -478,4 +478,4 @@ } } -/* JavaCC - OriginalChecksum=48c46a4078169becda605f21bf79704e (do not edit this line) */ +/* JavaCC - OriginalChecksum=396866642b0488f3bc742bca65c5c6d9 (do not edit this line) */ diff -Nru wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/gwiki/javacc/Token.java wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/gwiki/javacc/Token.java --- wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/gwiki/javacc/Token.java 2010-07-26 21:55:37.953125000 +0700 +++ wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/gwiki/javacc/Token.java 2010-07-27 19:11:26.812500000 +0700 @@ -138,4 +138,4 @@ } } -/* JavaCC - OriginalChecksum=c5b8c781654065c5ae8be91abe5dad08 (do not edit this line) */ +/* JavaCC - OriginalChecksum=bef5c432aaad9e0399057752cc3a2e22 (do not edit this line) */ diff -Nru wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/gwiki/javacc/TokenMgrError.java wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/gwiki/javacc/TokenMgrError.java --- wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/gwiki/javacc/TokenMgrError.java 2010-07-26 21:55:37.953125000 +0700 +++ wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/gwiki/javacc/TokenMgrError.java 2010-07-27 19:11:26.796875000 +0700 @@ -154,4 +154,4 @@ this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason); } } -/* JavaCC - OriginalChecksum=26042707bf7c77d8bb9538ec0c6df262 (do not edit this line) */ +/* JavaCC - OriginalChecksum=82ccaeef3b347460f9b5b546b50b1ad0 (do not edit this line) */ diff -Nru wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/jspwiki/javacc/ParseException.java wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/jspwiki/javacc/ParseException.java --- wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/jspwiki/javacc/ParseException.java 2010-07-26 21:55:38.734375000 +0700 +++ wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/jspwiki/javacc/ParseException.java 2010-07-27 19:11:28.453125000 +0700 @@ -194,4 +194,4 @@ } } -/* JavaCC - OriginalChecksum=b91c756353f7b0359fd78ae4538738d9 (do not edit this line) */ +/* JavaCC - OriginalChecksum=6b48fc7a4dfbcba52da0ed63fca40258 (do not edit this line) */ diff -Nru wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/jspwiki/javacc/SimpleCharStream.java wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/jspwiki/javacc/SimpleCharStream.java --- wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/jspwiki/javacc/SimpleCharStream.java 2010-07-26 21:55:38.718750000 +0700 +++ wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/jspwiki/javacc/SimpleCharStream.java 2010-07-27 19:11:28.468750000 +0700 @@ -478,4 +478,4 @@ } } -/* JavaCC - OriginalChecksum=88e72236bc56b84247055818d4c5e08b (do not edit this line) */ +/* JavaCC - OriginalChecksum=25974fb6637b47e4ba6bb6559a4e071a (do not edit this line) */ diff -Nru wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/jspwiki/javacc/Token.java wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/jspwiki/javacc/Token.java --- wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/jspwiki/javacc/Token.java 2010-07-26 21:55:38.718750000 +0700 +++ wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/jspwiki/javacc/Token.java 2010-07-27 19:11:28.453125000 +0700 @@ -138,4 +138,4 @@ } } -/* JavaCC - OriginalChecksum=04b93895f640935ac9563d5067dee608 (do not edit this line) */ +/* JavaCC - OriginalChecksum=479dc4b4a9695bf18e594b8bbd707f22 (do not edit this line) */ diff -Nru wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/jspwiki/javacc/TokenMgrError.java wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/jspwiki/javacc/TokenMgrError.java --- wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/jspwiki/javacc/TokenMgrError.java 2010-07-26 21:55:38.718750000 +0700 +++ wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/jspwiki/javacc/TokenMgrError.java 2010-07-27 19:11:28.453125000 +0700 @@ -154,4 +154,4 @@ this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason); } } -/* JavaCC - OriginalChecksum=f481f2fea9f8ca1f3a3982f88b8cbf53 (do not edit this line) */ +/* JavaCC - OriginalChecksum=f6ba82ce36952670583bcbfbc282be84 (do not edit this line) */ diff -Nru wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/mediawiki/javacc/ParseException.java wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/mediawiki/javacc/ParseException.java --- wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/mediawiki/javacc/ParseException.java 2010-07-26 21:55:45.000000000 +0700 +++ wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/mediawiki/javacc/ParseException.java 2010-07-27 19:11:30.796875000 +0700 @@ -194,4 +194,4 @@ } } -/* JavaCC - OriginalChecksum=ab8e438581ae1a9267fe356898b5bacb (do not edit this line) */ +/* JavaCC - OriginalChecksum=8d0e78723d90374b32e3b9e9a04d0469 (do not edit this line) */ diff -Nru wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/mediawiki/javacc/SimpleCharStream.java wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/mediawiki/javacc/SimpleCharStream.java --- wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/mediawiki/javacc/SimpleCharStream.java 2010-07-26 21:55:45.000000000 +0700 +++ wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/mediawiki/javacc/SimpleCharStream.java 2010-07-27 19:11:30.812500000 +0700 @@ -478,4 +478,4 @@ } } -/* JavaCC - OriginalChecksum=6e1e4547950f7969c043c1fa0a5ff264 (do not edit this line) */ +/* JavaCC - OriginalChecksum=153c7c894edc4a7e44df061a9e650834 (do not edit this line) */ diff -Nru wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/mediawiki/javacc/Token.java wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/mediawiki/javacc/Token.java --- wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/mediawiki/javacc/Token.java 2010-07-26 21:55:44.984375000 +0700 +++ wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/mediawiki/javacc/Token.java 2010-07-27 19:11:30.796875000 +0700 @@ -138,4 +138,4 @@ } } -/* JavaCC - OriginalChecksum=b5ed4622b7ea82ae128e36b0589f3086 (do not edit this line) */ +/* JavaCC - OriginalChecksum=f96cfe71ea9b0659a36e64d9d12ea872 (do not edit this line) */ diff -Nru wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/mediawiki/javacc/TokenMgrError.java wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/mediawiki/javacc/TokenMgrError.java --- wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/mediawiki/javacc/TokenMgrError.java 2010-07-26 21:55:44.984375000 +0700 +++ wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/mediawiki/javacc/TokenMgrError.java 2010-07-27 19:11:30.781250000 +0700 @@ -154,4 +154,4 @@ this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason); } } -/* JavaCC - OriginalChecksum=808bd1b8e10a506fa781ec3b555cbff7 (do not edit this line) */ +/* JavaCC - OriginalChecksum=ba6f49ea1301ac2467e92c3da5842550 (do not edit this line) */ diff -Nru wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/mediawiki/MediaWikiReferenceParser.java wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/mediawiki/MediaWikiReferenceParser.java --- wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/mediawiki/MediaWikiReferenceParser.java 2010-07-26 21:55:45.015625000 +0700 +++ wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/mediawiki/MediaWikiReferenceParser.java 2010-07-27 19:21:46.390625000 +0700 @@ -58,7 +58,7 @@ // External link with label // Case: [http://mediawiki.org MediaWiki] - else if (-1 != str.trim().indexOf(' ') && (str.contains("://") || str.contains("mailto:"))) { + else if (-1 != str.trim().indexOf(' ') && (str.contains("://") || str.contains("mailto:") || str.contains("xmpp:") || str.contains("magnet:") || str.contains("freenet:"))) { String link = str.substring(0, str.indexOf(' ')).trim(); String label = str.substring(str.indexOf(' ') + 1).trim(); wikiReference = new WikiReference(link, label); diff -Nru wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki20/javacc/ParseException.java wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki20/javacc/ParseException.java --- wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki20/javacc/ParseException.java 2010-07-26 21:55:42.046875000 +0700 +++ wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki20/javacc/ParseException.java 2010-07-27 19:13:42.531250000 +0700 @@ -194,4 +194,4 @@ } } -/* JavaCC - OriginalChecksum=f9e0ad0de44f8a52450572f41921b8c0 (do not edit this line) */ +/* JavaCC - OriginalChecksum=1c1ff5e8452c758a2e88b58649520f6e (do not edit this line) */ diff -Nru wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki20/javacc/SimpleCharStream.java wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki20/javacc/SimpleCharStream.java --- wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki20/javacc/SimpleCharStream.java 2010-07-26 21:55:42.031250000 +0700 +++ wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki20/javacc/SimpleCharStream.java 2010-07-27 19:13:42.546875000 +0700 @@ -478,4 +478,4 @@ } } -/* JavaCC - OriginalChecksum=3d633de4b81c8297df71218ac6814735 (do not edit this line) */ +/* JavaCC - OriginalChecksum=810fb0377245bc687ac6e5a98454eef7 (do not edit this line) */ diff -Nru wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki20/javacc/Token.java wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki20/javacc/Token.java --- wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki20/javacc/Token.java 2010-07-26 21:55:42.031250000 +0700 +++ wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki20/javacc/Token.java 2010-07-27 19:13:42.531250000 +0700 @@ -138,4 +138,4 @@ } } -/* JavaCC - OriginalChecksum=3e53df6f09d05ecd3774001dfa0a08b7 (do not edit this line) */ +/* JavaCC - OriginalChecksum=047ed493b4eaec03b7e2b254e31c05d7 (do not edit this line) */ diff -Nru wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki20/javacc/TokenMgrError.java wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki20/javacc/TokenMgrError.java --- wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki20/javacc/TokenMgrError.java 2010-07-26 21:55:42.031250000 +0700 +++ wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki20/javacc/TokenMgrError.java 2010-07-27 19:13:42.531250000 +0700 @@ -154,4 +154,4 @@ this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason); } } -/* JavaCC - OriginalChecksum=190f8f3aedabfe41cf786af343fd3a4d (do not edit this line) */ +/* JavaCC - OriginalChecksum=2f5ae5fb69a31f4faf2e5402854df33f (do not edit this line) */ diff -Nru wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki20/javacc/XWikiScanner.jj wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki20/javacc/XWikiScanner.jj --- wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki20/javacc/XWikiScanner.jj 2010-07-26 21:55:42.046875000 +0700 +++ wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki20/javacc/XWikiScanner.jj 2010-07-27 19:10:32.625000000 +0700 @@ -383,8 +383,9 @@ | <#IMAGE: "image:" ("~" ~[] | | )* > | <#ATTACH: "attach:" ("~" ~[] | | )* > - | <#XWIKI_URI: ( ( ( | ) ) | "://" ) ("?" )? ("#" )? > - | <#XWIKI_URI_URIS: "mailto:" > + | <#XWIKI_URI: ( ( ( | ) ) | | "://" ) ("?" )? ("#" )? > + | <#XWIKI_URI_URIS: ( "mailto:" | "xmpp:" ) > + | <#XWIKI_URI_MAGNET: "magnet:?" ("#" )? > | <#XWIKI_CHAR: | "~" > | <#EMPTY_LINE: > // diff -Nru wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki20/javacc/XWikiScannerConstants.java wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki20/javacc/XWikiScannerConstants.java --- wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki20/javacc/XWikiScannerConstants.java 2010-07-26 21:55:42.031250000 +0700 +++ wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki20/javacc/XWikiScannerConstants.java 2010-07-27 19:13:42.546875000 +0700 @@ -81,123 +81,125 @@ /** RegularExpression Id. */ int XWIKI_URI_URIS = 32; /** RegularExpression Id. */ - int XWIKI_CHAR = 33; + int XWIKI_URI_MAGNET = 33; /** RegularExpression Id. */ - int EMPTY_LINE = 34; + int XWIKI_CHAR = 34; /** RegularExpression Id. */ - int NEW_LINE = 35; + int EMPTY_LINE = 35; /** RegularExpression Id. */ - int SPACE = 36; + int NEW_LINE = 36; /** RegularExpression Id. */ - int SPECIAL_SYMBOL = 37; + int SPACE = 37; /** RegularExpression Id. */ - int CHAR = 38; + int SPECIAL_SYMBOL = 38; /** RegularExpression Id. */ - int URI = 39; + int CHAR = 39; /** RegularExpression Id. */ - int ALPHA = 40; + int URI = 40; /** RegularExpression Id. */ - int DIGIT = 41; + int ALPHA = 41; /** RegularExpression Id. */ - int HEXDIG = 42; + int DIGIT = 42; /** RegularExpression Id. */ - int URI_GEN_DELIMS = 43; + int HEXDIG = 43; /** RegularExpression Id. */ - int URI_SUB_DELIMS = 44; + int URI_GEN_DELIMS = 44; /** RegularExpression Id. */ - int URI_UNRESERVED = 45; + int URI_SUB_DELIMS = 45; /** RegularExpression Id. */ - int URI_RESERVED = 46; + int URI_UNRESERVED = 46; /** RegularExpression Id. */ - int URI_SCHEME = 47; + int URI_RESERVED = 47; /** RegularExpression Id. */ - int URI_SCHEME_COMPOSITE = 48; + int URI_SCHEME = 48; /** RegularExpression Id. */ - int URI_PCT_ENCODED = 49; + int URI_SCHEME_COMPOSITE = 49; /** RegularExpression Id. */ - int URI_PCHAR_FIRST = 50; + int URI_PCT_ENCODED = 50; /** RegularExpression Id. */ - int URI_PCHAR = 51; + int URI_PCHAR_FIRST = 51; /** RegularExpression Id. */ - int URI_QUERY = 52; + int URI_PCHAR = 52; /** RegularExpression Id. */ - int URI_FRAGMENT = 53; + int URI_QUERY = 53; /** RegularExpression Id. */ - int URI_HIER_PART = 54; + int URI_FRAGMENT = 54; /** RegularExpression Id. */ - int URI_AUTHORITY = 55; + int URI_HIER_PART = 55; /** RegularExpression Id. */ - int URI_USERINFO = 56; + int URI_AUTHORITY = 56; /** RegularExpression Id. */ - int URI_PATH_ABEMPTY = 57; + int URI_USERINFO = 57; /** RegularExpression Id. */ - int URI_PATH_ABSOLUTE = 58; + int URI_PATH_ABEMPTY = 58; /** RegularExpression Id. */ - int URI_PATH_ROOTLESS = 59; + int URI_PATH_ABSOLUTE = 59; /** RegularExpression Id. */ - int URI_SEGMENT = 60; + int URI_PATH_ROOTLESS = 60; /** RegularExpression Id. */ - int URI_SEGMENT_NZ = 61; + int URI_SEGMENT = 61; /** RegularExpression Id. */ - int URI_SEGMENT_NZ_NC = 62; + int URI_SEGMENT_NZ = 62; /** RegularExpression Id. */ - int URI_PORT = 63; + int URI_SEGMENT_NZ_NC = 63; /** RegularExpression Id. */ - int URI_HOST = 64; + int URI_PORT = 64; /** RegularExpression Id. */ - int URI_REG_NAME = 65; + int URI_HOST = 65; /** RegularExpression Id. */ - int DOC_PARAMETERS = 66; + int URI_REG_NAME = 66; /** RegularExpression Id. */ - int INLINE_PARAMETERS = 67; + int DOC_PARAMETERS = 67; /** RegularExpression Id. */ - int DOC_BEGIN = 68; + int INLINE_PARAMETERS = 68; /** RegularExpression Id. */ - int D_REFERENCE = 69; + int DOC_BEGIN = 69; /** RegularExpression Id. */ - int VERBATIM_START = 70; + int D_REFERENCE = 70; /** RegularExpression Id. */ - int MACRO_EMPTY = 71; + int VERBATIM_START = 71; /** RegularExpression Id. */ - int MACRO_START = 72; + int MACRO_EMPTY = 72; /** RegularExpression Id. */ - int STRONG = 73; + int MACRO_START = 73; /** RegularExpression Id. */ - int EM = 74; + int STRONG = 74; /** RegularExpression Id. */ - int STRIKE = 75; + int EM = 75; /** RegularExpression Id. */ - int INS = 76; + int STRIKE = 76; /** RegularExpression Id. */ - int SUP = 77; + int INS = 77; /** RegularExpression Id. */ - int SUB = 78; + int SUP = 78; /** RegularExpression Id. */ - int MONO = 79; + int SUB = 79; /** RegularExpression Id. */ - int D_IMAGE = 80; + int MONO = 80; /** RegularExpression Id. */ - int D_ATTACH = 81; + int D_IMAGE = 81; /** RegularExpression Id. */ - int BR = 82; + int D_ATTACH = 82; /** RegularExpression Id. */ - int D_XWIKI_URI = 83; + int BR = 83; /** RegularExpression Id. */ - int XWIKI_SPACE = 84; + int D_XWIKI_URI = 84; /** RegularExpression Id. */ - int DOC_END = 85; + int XWIKI_SPACE = 85; /** RegularExpression Id. */ - int NL = 86; + int DOC_END = 86; /** RegularExpression Id. */ - int WORD = 87; + int NL = 87; /** RegularExpression Id. */ - int XWIKI_SPECIAL_SYMBOL = 88; + int WORD = 88; /** RegularExpression Id. */ - int TABLE_END_EMPTY_LINE = 89; + int XWIKI_SPECIAL_SYMBOL = 89; /** RegularExpression Id. */ - int HEADER_END_EMPTY_LINE = 90; + int TABLE_END_EMPTY_LINE = 90; /** RegularExpression Id. */ - int BLOCK_END = 91; + int HEADER_END_EMPTY_LINE = 91; + /** RegularExpression Id. */ + int BLOCK_END = 92; /** Lexical state. */ int DEFAULT = 0; @@ -248,7 +250,8 @@ "", "", "", - "\"mailto:\"", + "", + "", "", "", "", diff -Nru wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki20/javacc/XWikiScannerTokenManager.java wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki20/javacc/XWikiScannerTokenManager.java --- wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki20/javacc/XWikiScannerTokenManager.java 2010-07-26 21:55:42.031250000 +0700 +++ wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki20/javacc/XWikiScannerTokenManager.java 2010-07-27 19:13:42.484375000 +0700 @@ -416,8 +416,8 @@ jjCheckNAddTwoStates(55, 58); break; case 56: - if (curChar == 40 && kind > 66) - kind = 66; + if (curChar == 40 && kind > 67) + kind = 67; break; case 57: if (curChar == 40) @@ -549,35 +549,35 @@ switch (pos) { case 0: - if ((active1 & 0x4fe00L) != 0L) + if ((active1 & 0x9fc00L) != 0L) { - jjmatchedKind = 88; + jjmatchedKind = 89; return -1; } - if ((active1 & 0x40L) != 0L) + if ((active1 & 0x80L) != 0L) { - jjmatchedKind = 88; - return 152; + jjmatchedKind = 89; + return 172; } return -1; case 1: - if ((active1 & 0x4fe00L) != 0L) + if ((active1 & 0x9fc00L) != 0L) { if (jjmatchedPos == 0) { - jjmatchedKind = 88; + jjmatchedKind = 89; jjmatchedPos = 0; } return -1; } - if ((active1 & 0x40L) != 0L) + if ((active1 & 0x80L) != 0L) { if (jjmatchedPos == 0) { - jjmatchedKind = 88; + jjmatchedKind = 89; jjmatchedPos = 0; } - return 187; + return 207; } return -1; default : @@ -599,23 +599,23 @@ switch(curChar) { case 35: - return jjMoveStringLiteralDfa1_6(0x8000L); + return jjMoveStringLiteralDfa1_6(0x10000L); case 42: - return jjMoveStringLiteralDfa1_6(0x200L); + return jjMoveStringLiteralDfa1_6(0x400L); case 44: - return jjMoveStringLiteralDfa1_6(0x4000L); + return jjMoveStringLiteralDfa1_6(0x8000L); case 45: - return jjMoveStringLiteralDfa1_6(0x800L); + return jjMoveStringLiteralDfa1_6(0x1000L); case 47: - return jjMoveStringLiteralDfa1_6(0x400L); + return jjMoveStringLiteralDfa1_6(0x800L); case 92: - return jjMoveStringLiteralDfa1_6(0x40000L); + return jjMoveStringLiteralDfa1_6(0x80000L); case 94: - return jjMoveStringLiteralDfa1_6(0x2000L); + return jjMoveStringLiteralDfa1_6(0x4000L); case 95: - return jjMoveStringLiteralDfa1_6(0x1000L); + return jjMoveStringLiteralDfa1_6(0x2000L); case 123: - return jjMoveStringLiteralDfa1_6(0x40L); + return jjMoveStringLiteralDfa1_6(0x80L); default : return jjMoveNfa_6(21, 0); } @@ -630,39 +630,39 @@ switch(curChar) { case 35: - if ((active1 & 0x8000L) != 0L) - return jjStopAtPos(1, 79); + if ((active1 & 0x10000L) != 0L) + return jjStopAtPos(1, 80); break; case 42: - if ((active1 & 0x200L) != 0L) - return jjStopAtPos(1, 73); + if ((active1 & 0x400L) != 0L) + return jjStopAtPos(1, 74); break; case 44: - if ((active1 & 0x4000L) != 0L) - return jjStopAtPos(1, 78); + if ((active1 & 0x8000L) != 0L) + return jjStopAtPos(1, 79); break; case 45: - if ((active1 & 0x800L) != 0L) - return jjStopAtPos(1, 75); + if ((active1 & 0x1000L) != 0L) + return jjStopAtPos(1, 76); break; case 47: - if ((active1 & 0x400L) != 0L) - return jjStopAtPos(1, 74); + if ((active1 & 0x800L) != 0L) + return jjStopAtPos(1, 75); break; case 92: - if ((active1 & 0x40000L) != 0L) - return jjStopAtPos(1, 82); + if ((active1 & 0x80000L) != 0L) + return jjStopAtPos(1, 83); break; case 94: - if ((active1 & 0x2000L) != 0L) - return jjStopAtPos(1, 77); + if ((active1 & 0x4000L) != 0L) + return jjStopAtPos(1, 78); break; case 95: - if ((active1 & 0x1000L) != 0L) - return jjStopAtPos(1, 76); + if ((active1 & 0x2000L) != 0L) + return jjStopAtPos(1, 77); break; case 123: - return jjMoveStringLiteralDfa2_6(active1, 0x40L); + return jjMoveStringLiteralDfa2_6(active1, 0x80L); default : break; } @@ -680,8 +680,8 @@ switch(curChar) { case 123: - if ((active1 & 0x40L) != 0L) - return jjStopAtPos(2, 70); + if ((active1 & 0x80L) != 0L) + return jjStopAtPos(2, 71); break; default : break; @@ -691,7 +691,7 @@ private int jjMoveNfa_6(int startState, int curPos) { int startsAt = 0; - jjnewStateCnt = 187; + jjnewStateCnt = 207; int i = 1; jjstateSet[0] = startState; int kind = 0x7fffffff; @@ -706,42 +706,42 @@ { switch(jjstateSet[--i]) { + case 207: + if ((0x3ff0000ffffd9ffL & l) != 0L) + jjCheckNAddStates(40, 44); + if ((0x3ff0000ffffd9ffL & l) != 0L) + jjCheckNAddStates(45, 49); + break; case 21: if ((0x3ff0000ffffd9ffL & l) != 0L) { - if (kind > 87) - kind = 87; - jjCheckNAddTwoStates(114, 115); + if (kind > 88) + kind = 88; + jjCheckNAddTwoStates(112, 113); } else if ((0xfc00fffe00000000L & l) != 0L) { - if (kind > 88) - kind = 88; + if (kind > 89) + kind = 89; } else if ((0x2400L & l) != 0L) { - if (kind > 86) - kind = 86; - jjCheckNAddTwoStates(184, 185); + if (kind > 87) + kind = 87; + jjCheckNAddTwoStates(204, 205); } else if ((0x100000200L & l) != 0L) { - if (kind > 84) - kind = 84; - jjCheckNAddStates(40, 45); + if (kind > 85) + kind = 85; + jjCheckNAddStates(50, 55); } if (curChar == 13) - jjAddStates(46, 47); + jjAddStates(56, 57); else if (curChar == 40) - jjCheckNAddStates(48, 50); + jjCheckNAddStates(58, 60); else if (curChar == 41) - jjstateSet[jjnewStateCnt++] = 112; - break; - case 187: - if ((0x3ff0000ffffd9ffL & l) != 0L) - jjCheckNAddStates(51, 55); - if ((0x3ff0000ffffd9ffL & l) != 0L) - jjCheckNAddStates(56, 60); + jjstateSet[jjnewStateCnt++] = 110; break; case 1: if (curChar == 58) @@ -758,67 +758,67 @@ case 22: if (curChar != 58) break; - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(23, 24); break; case 23: if ((0xfffffffeffffd9ffL & l) == 0L) break; - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(23, 24); break; case 25: - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(23, 24); break; case 26: if ((0x3ff0000ffffd9ffL & l) == 0L) break; - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(23, 24); break; case 27: if ((0xfc00fffe00000000L & l) == 0L) break; - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(23, 24); break; case 33: if (curChar != 58) break; - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(34, 35); break; case 34: if ((0xfffffffeffffd9ffL & l) == 0L) break; - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(34, 35); break; case 36: - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(34, 35); break; case 37: if ((0x3ff0000ffffd9ffL & l) == 0L) break; - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(34, 35); break; case 38: if ((0xfc00fffe00000000L & l) == 0L) break; - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(34, 35); break; case 45: @@ -828,15 +828,15 @@ case 46: if (curChar != 47) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(73, 76); break; case 47: if ((0x2fff6fd200000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(77, 81); break; case 48: @@ -850,22 +850,22 @@ case 50: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(77, 81); break; case 51: if (curChar != 47) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(82, 86); break; case 52: if ((0x2fff6fd200000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(82, 86); break; case 53: @@ -879,22 +879,22 @@ case 55: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(82, 86); break; case 56: if (curChar != 63) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(87, 89); break; case 57: if ((0xafffefd200000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(87, 89); break; case 58: @@ -908,22 +908,22 @@ case 60: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(87, 89); break; case 61: if (curChar != 35) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddTwoStates(62, 63); break; case 62: if ((0xafffefd200000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddTwoStates(62, 63); break; case 63: @@ -937,8 +937,8 @@ case 65: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddTwoStates(62, 63); break; case 66: @@ -964,29 +964,29 @@ case 71: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(90, 94); break; case 72: if ((0x2bff6fd200000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(90, 94); break; case 73: if (curChar != 47) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(95, 99); break; case 74: if ((0x2fff6fd200000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(95, 99); break; case 75: @@ -1000,364 +1000,426 @@ case 77: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(95, 99); break; case 78: if ((0x2bff6fd200000000L & l) != 0L) jjCheckNAddTwoStates(69, 72); break; - case 86: + case 84: if ((0x3ff680000000000L & l) != 0L) jjCheckNAddStates(100, 102); break; - case 87: + case 85: if (curChar == 58) - jjstateSet[jjnewStateCnt++] = 88; + jjstateSet[jjnewStateCnt++] = 86; break; - case 89: + case 87: if ((0x3ff680000000000L & l) != 0L) jjCheckNAddStates(103, 105); break; - case 90: + case 88: if (curChar != 47) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(106, 113); break; - case 91: + case 89: if ((0x2fff6fd200000000L & l) != 0L) jjCheckNAddStates(114, 116); break; - case 92: + case 90: if (curChar == 37) - jjCheckNAdd(93); + jjCheckNAdd(91); break; - case 93: + case 91: if ((0x3ff000000000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 94; + jjstateSet[jjnewStateCnt++] = 92; break; - case 94: + case 92: if ((0x3ff000000000000L & l) != 0L) jjCheckNAddStates(114, 116); break; - case 96: + case 94: if (curChar == 37) - jjCheckNAdd(97); + jjCheckNAdd(95); break; - case 97: + case 95: if ((0x3ff000000000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 98; + jjstateSet[jjnewStateCnt++] = 96; break; - case 98: + case 96: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(117, 122); break; - case 99: + case 97: if ((0x2bff6fd200000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(117, 122); break; - case 100: + case 98: if (curChar == 58) - jjCheckNAdd(101); + jjCheckNAdd(99); break; - case 101: + case 99: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(123, 126); break; - case 102: + case 100: if (curChar != 47) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(127, 131); break; - case 103: + case 101: if ((0x2fff6fd200000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(127, 131); break; - case 104: + case 102: if (curChar == 37) - jjstateSet[jjnewStateCnt++] = 105; + jjstateSet[jjnewStateCnt++] = 103; break; - case 105: + case 103: if ((0x3ff000000000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 106; + jjstateSet[jjnewStateCnt++] = 104; break; - case 106: + case 104: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(127, 131); break; - case 107: + case 105: if (curChar == 37) - jjCheckNAddTwoStates(93, 97); + jjCheckNAddTwoStates(91, 95); break; - case 108: + case 106: if (curChar == 47) - jjstateSet[jjnewStateCnt++] = 90; + jjstateSet[jjnewStateCnt++] = 88; break; - case 109: + case 107: if (curChar == 58) - jjstateSet[jjnewStateCnt++] = 108; + jjstateSet[jjnewStateCnt++] = 106; break; - case 110: + case 108: if (curChar != 41) break; - if (kind > 85) - kind = 85; - jjCheckNAdd(111); + if (kind > 86) + kind = 86; + jjCheckNAdd(109); break; - case 111: + case 109: if ((0x100000200L & l) == 0L) break; - if (kind > 85) - kind = 85; - jjCheckNAdd(111); + if (kind > 86) + kind = 86; + jjCheckNAdd(109); break; - case 112: + case 110: if (curChar == 41) - jjstateSet[jjnewStateCnt++] = 110; + jjstateSet[jjnewStateCnt++] = 108; break; - case 113: + case 111: if (curChar == 41) - jjstateSet[jjnewStateCnt++] = 112; + jjstateSet[jjnewStateCnt++] = 110; break; - case 114: + case 112: if ((0x3ff0000ffffd9ffL & l) == 0L) break; - if (kind > 87) - kind = 87; - jjCheckNAddTwoStates(114, 115); - break; - case 116: - if ((0xfc00fffe00000000L & l) != 0L && kind > 88) + if (kind > 88) kind = 88; + jjCheckNAddTwoStates(112, 113); break; - case 117: - if (curChar == 40) - jjCheckNAddStates(48, 50); - break; - case 118: - if (curChar == 37) - jjCheckNAddStates(132, 135); - break; - case 120: - jjCheckNAddStates(132, 135); + case 114: + if ((0xfc00fffe00000000L & l) != 0L && kind > 89) + kind = 89; break; case 121: - if ((0xffffffdfffffffffL & l) != 0L) - jjCheckNAddStates(132, 135); + if (curChar != 63) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(132, 135); break; case 122: - if (curChar == 37) - jjstateSet[jjnewStateCnt++] = 123; + if ((0xafffefd200000000L & l) == 0L) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(132, 135); break; case 123: - if ((0xfffffdffffffffffL & l) != 0L) - jjCheckNAddStates(132, 135); + if (curChar == 37) + jjstateSet[jjnewStateCnt++] = 124; break; case 124: - if (curChar == 41) - jjCheckNAddStates(136, 139); + if ((0x3ff000000000000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 125; break; case 125: - if ((0x100000200L & l) != 0L) - jjCheckNAddStates(136, 139); + if ((0x3ff000000000000L & l) == 0L) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(132, 135); break; case 126: - if (curChar == 10) - jjCheckNAddTwoStates(127, 130); + if (curChar != 35) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(136, 141); break; case 127: - if ((0x100000200L & l) != 0L) - jjCheckNAddTwoStates(127, 130); + if ((0xafffefd200000000L & l) == 0L) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(142, 145); break; case 128: - if (curChar == 40 && kind > 66) - kind = 66; + if (curChar == 37) + jjstateSet[jjnewStateCnt++] = 129; break; case 129: - if (curChar == 40) - jjstateSet[jjnewStateCnt++] = 128; + if ((0x3ff000000000000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 130; break; case 130: - if (curChar == 40) - jjstateSet[jjnewStateCnt++] = 129; + if ((0x3ff000000000000L & l) == 0L) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(142, 145); break; case 131: - if (curChar == 13) - jjstateSet[jjnewStateCnt++] = 126; - break; - case 132: - if ((0x2400L & l) != 0L) - jjCheckNAddTwoStates(127, 130); + if (curChar == 58) + jjstateSet[jjnewStateCnt++] = 121; break; - case 133: - if (curChar == 37) - jjstateSet[jjnewStateCnt++] = 124; + case 137: + if (curChar == 40) + jjCheckNAddStates(58, 60); break; - case 134: + case 138: if (curChar == 37) - jjCheckNAddStates(140, 143); + jjCheckNAddStates(146, 149); break; - case 136: - jjCheckNAddStates(140, 143); + case 140: + jjCheckNAddStates(146, 149); break; - case 137: + case 141: if ((0xffffffdfffffffffL & l) != 0L) - jjCheckNAddStates(140, 143); + jjCheckNAddStates(146, 149); break; - case 138: + case 142: if (curChar == 37) - jjstateSet[jjnewStateCnt++] = 139; + jjstateSet[jjnewStateCnt++] = 143; break; - case 139: + case 143: if ((0xfffffdffffffffffL & l) != 0L) - jjCheckNAddStates(140, 143); + jjCheckNAddStates(146, 149); break; - case 140: - if (curChar == 41 && kind > 67) + case 144: + if (curChar == 41) + jjCheckNAddStates(150, 153); + break; + case 145: + if ((0x100000200L & l) != 0L) + jjCheckNAddStates(150, 153); + break; + case 146: + if (curChar == 10) + jjCheckNAddTwoStates(147, 150); + break; + case 147: + if ((0x100000200L & l) != 0L) + jjCheckNAddTwoStates(147, 150); + break; + case 148: + if (curChar == 40 && kind > 67) kind = 67; break; - case 141: + case 149: + if (curChar == 40) + jjstateSet[jjnewStateCnt++] = 148; + break; + case 150: + if (curChar == 40) + jjstateSet[jjnewStateCnt++] = 149; + break; + case 151: + if (curChar == 13) + jjstateSet[jjnewStateCnt++] = 146; + break; + case 152: + if ((0x2400L & l) != 0L) + jjCheckNAddTwoStates(147, 150); + break; + case 153: if (curChar == 37) - jjstateSet[jjnewStateCnt++] = 140; + jjstateSet[jjnewStateCnt++] = 144; break; - case 142: + case 154: + if (curChar == 37) + jjCheckNAddStates(154, 157); + break; + case 156: + jjCheckNAddStates(154, 157); + break; + case 157: + if ((0xffffffdfffffffffL & l) != 0L) + jjCheckNAddStates(154, 157); + break; + case 158: + if (curChar == 37) + jjstateSet[jjnewStateCnt++] = 159; + break; + case 159: + if ((0xfffffdffffffffffL & l) != 0L) + jjCheckNAddStates(154, 157); + break; + case 160: + if (curChar == 41 && kind > 68) + kind = 68; + break; + case 161: + if (curChar == 37) + jjstateSet[jjnewStateCnt++] = 160; + break; + case 162: if (curChar != 40) break; - if (kind > 68) - kind = 68; - jjCheckNAdd(143); + if (kind > 69) + kind = 69; + jjCheckNAdd(163); break; - case 143: + case 163: if ((0x100000200L & l) == 0L) break; - if (kind > 68) - kind = 68; - jjCheckNAdd(143); + if (kind > 69) + kind = 69; + jjCheckNAdd(163); break; - case 144: + case 164: if (curChar == 40) - jjstateSet[jjnewStateCnt++] = 142; + jjstateSet[jjnewStateCnt++] = 162; break; - case 145: + case 165: if ((0x100000200L & l) == 0L) break; - if (kind > 84) - kind = 84; - jjCheckNAddStates(40, 45); + if (kind > 85) + kind = 85; + jjCheckNAddStates(50, 55); break; - case 146: + case 166: if ((0x100000200L & l) != 0L) - jjCheckNAddTwoStates(146, 147); + jjCheckNAddTwoStates(166, 167); break; - case 147: + case 167: if (curChar == 40) - jjCheckNAdd(144); + jjCheckNAdd(164); break; - case 148: + case 168: if ((0x100000200L & l) == 0L) break; - if (kind > 84) - kind = 84; - jjCheckNAddTwoStates(148, 149); + if (kind > 85) + kind = 85; + jjCheckNAddTwoStates(168, 169); break; - case 150: + case 170: if ((0x100000200L & l) != 0L) - jjCheckNAddTwoStates(150, 113); + jjCheckNAddTwoStates(170, 111); break; - case 153: + case 173: if ((0x3ff0000ffffd9ffL & l) != 0L) - jjCheckNAddStates(56, 60); + jjCheckNAddStates(45, 49); break; - case 155: + case 175: if ((0x400600000000000L & l) != 0L) - jjCheckNAddTwoStates(156, 157); + jjCheckNAddTwoStates(176, 177); break; - case 156: + case 176: if ((0x3ff0000ffffd9ffL & l) != 0L) - jjCheckNAddStates(144, 148); + jjCheckNAddStates(158, 162); break; - case 158: + case 178: if ((0x100000200L & l) != 0L) - jjCheckNAddStates(149, 152); + jjCheckNAddStates(163, 166); break; - case 160: - case 161: - jjCheckNAddStates(149, 152); + case 180: + case 181: + jjCheckNAddStates(163, 166); break; - case 165: + case 185: if (curChar == 47) - jjstateSet[jjnewStateCnt++] = 164; + jjstateSet[jjnewStateCnt++] = 184; break; - case 167: + case 187: if ((0x3ff0000ffffd9ffL & l) != 0L) - jjCheckNAddStates(51, 55); + jjCheckNAddStates(40, 44); break; - case 169: + case 189: if ((0x400600000000000L & l) != 0L) - jjCheckNAddTwoStates(170, 171); + jjCheckNAddTwoStates(190, 191); break; - case 170: + case 190: if ((0x3ff0000ffffd9ffL & l) != 0L) - jjCheckNAddStates(153, 157); + jjCheckNAddStates(167, 171); break; - case 172: + case 192: if ((0x100000200L & l) != 0L) - jjCheckNAddStates(158, 161); + jjCheckNAddStates(172, 175); break; - case 174: - case 175: - jjCheckNAddStates(158, 161); + case 194: + case 195: + jjCheckNAddStates(172, 175); break; - case 180: + case 200: if (curChar == 13) - jjAddStates(46, 47); + jjAddStates(56, 57); break; - case 181: - if (curChar == 10 && kind > 86) - kind = 86; + case 201: + if (curChar == 10 && kind > 87) + kind = 87; break; - case 182: + case 202: if (curChar == 10) - jjCheckNAddTwoStates(184, 185); + jjCheckNAddTwoStates(204, 205); break; - case 183: - if (curChar == 10 && kind > 91) - kind = 91; + case 203: + if (curChar == 10 && kind > 92) + kind = 92; break; - case 184: + case 204: if (curChar == 13) - jjstateSet[jjnewStateCnt++] = 183; + jjstateSet[jjnewStateCnt++] = 203; break; - case 185: - if ((0x2400L & l) != 0L && kind > 91) - kind = 91; + case 205: + if ((0x2400L & l) != 0L && kind > 92) + kind = 92; break; - case 186: + case 206: if ((0x2400L & l) == 0L) break; - if (kind > 86) - kind = 86; - jjCheckNAddTwoStates(184, 185); + if (kind > 87) + kind = 87; + jjCheckNAddTwoStates(204, 205); break; default : break; } @@ -1370,48 +1432,50 @@ { switch(jjstateSet[--i]) { + case 207: + if ((0x87fffffe07fffffeL & l) != 0L) + jjCheckNAddStates(40, 44); + else if (curChar == 126) + jjCheckNAdd(187); + if ((0x87fffffe07fffffeL & l) != 0L) + jjCheckNAddStates(45, 49); + else if (curChar == 126) + jjCheckNAdd(173); + break; case 21: if ((0x87fffffe07fffffeL & l) != 0L) { - if (kind > 87) - kind = 87; - jjCheckNAddTwoStates(114, 115); + if (kind > 88) + kind = 88; + jjCheckNAddTwoStates(112, 113); } else if ((0x78000001f8000001L & l) != 0L) { - if (kind > 88) - kind = 88; + if (kind > 89) + kind = 89; } if ((0x7fffffe07fffffeL & l) != 0L) jjCheckNAddStates(100, 102); else if (curChar == 126) - jjCheckNAddStates(162, 164); + jjCheckNAddStates(176, 178); else if (curChar == 123) - jjAddStates(165, 166); + jjAddStates(179, 180); else if (curChar == 91) jjstateSet[jjnewStateCnt++] = 0; if (curChar == 109) - jjstateSet[jjnewStateCnt++] = 83; + jjAddStates(181, 182); + else if (curChar == 120) + jjstateSet[jjnewStateCnt++] = 81; else if (curChar == 97) jjstateSet[jjnewStateCnt++] = 43; else if (curChar == 105) jjstateSet[jjnewStateCnt++] = 31; break; - case 152: + case 172: if (curChar == 123) - jjCheckNAddTwoStates(167, 168); + jjCheckNAddTwoStates(187, 188); if (curChar == 123) - jjCheckNAddTwoStates(153, 154); - break; - case 187: - if ((0x87fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(51, 55); - else if (curChar == 126) - jjCheckNAdd(167); - if ((0x87fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(56, 60); - else if (curChar == 126) - jjCheckNAdd(153); + jjCheckNAddTwoStates(173, 174); break; case 0: if (curChar == 91) @@ -1480,8 +1544,8 @@ jjCheckNAdd(16); break; case 18: - if (curChar == 93 && kind > 69) - kind = 69; + if (curChar == 93 && kind > 70) + kind = 70; break; case 19: if (curChar == 93) @@ -1493,26 +1557,26 @@ break; case 23: case 25: - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(23, 24); break; case 24: if (curChar == 126) - jjAddStates(167, 169); + jjAddStates(183, 185); break; case 26: if ((0x87fffffe07fffffeL & l) == 0L) break; - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(23, 24); break; case 27: if ((0x78000001f8000001L & l) == 0L) break; - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(23, 24); break; case 28: @@ -1537,26 +1601,26 @@ break; case 34: case 36: - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(34, 35); break; case 35: if (curChar == 126) - jjAddStates(170, 172); + jjAddStates(186, 188); break; case 37: if ((0x87fffffe07fffffeL & l) == 0L) break; - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(34, 35); break; case 38: if ((0x78000001f8000001L & l) == 0L) break; - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(34, 35); break; case 39: @@ -1586,8 +1650,8 @@ case 47: if ((0x47fffffe87ffffffL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(77, 81); break; case 49: @@ -1597,15 +1661,15 @@ case 50: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(77, 81); break; case 52: if ((0x47fffffe87ffffffL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(82, 86); break; case 54: @@ -1615,15 +1679,15 @@ case 55: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(82, 86); break; case 57: if ((0x47fffffe87ffffffL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(87, 89); break; case 59: @@ -1633,15 +1697,15 @@ case 60: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(87, 89); break; case 62: if ((0x47fffffe87ffffffL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddTwoStates(62, 63); break; case 64: @@ -1651,8 +1715,8 @@ case 65: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddTwoStates(62, 63); break; case 67: @@ -1670,22 +1734,22 @@ case 71: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(90, 94); break; case 72: if ((0x47fffffe87ffffffL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(90, 94); break; case 74: if ((0x47fffffe87ffffffL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(95, 99); break; case 76: @@ -1695,8 +1759,8 @@ case 77: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(95, 99); break; case 78: @@ -1704,228 +1768,300 @@ jjCheckNAddTwoStates(69, 72); break; case 79: - if (curChar == 111) - jjstateSet[jjnewStateCnt++] = 45; + if (curChar == 112) + jjCheckNAdd(45); break; case 80: - if (curChar == 116) + if (curChar == 112) jjstateSet[jjnewStateCnt++] = 79; break; case 81: - if (curChar == 108) + if (curChar == 109) jjstateSet[jjnewStateCnt++] = 80; break; case 82: - if (curChar == 105) + if (curChar == 120) jjstateSet[jjnewStateCnt++] = 81; break; case 83: - if (curChar == 97) - jjstateSet[jjnewStateCnt++] = 82; - break; case 84: - if (curChar == 109) - jjstateSet[jjnewStateCnt++] = 83; - break; - case 85: - case 86: if ((0x7fffffe07fffffeL & l) != 0L) jjCheckNAddStates(100, 102); break; - case 88: - case 89: + case 86: + case 87: if ((0x7fffffe07fffffeL & l) != 0L) jjCheckNAddStates(103, 105); break; - case 91: + case 89: if ((0x47fffffe87fffffeL & l) != 0L) jjCheckNAddStates(114, 116); break; - case 93: + case 91: if ((0x7e0000007eL & l) != 0L) - jjstateSet[jjnewStateCnt++] = 94; + jjstateSet[jjnewStateCnt++] = 92; break; - case 94: + case 92: if ((0x7e0000007eL & l) != 0L) jjCheckNAddStates(114, 116); break; - case 95: + case 93: if (curChar != 64) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(117, 122); break; - case 97: + case 95: if ((0x7e0000007eL & l) != 0L) - jjstateSet[jjnewStateCnt++] = 98; + jjstateSet[jjnewStateCnt++] = 96; break; - case 98: + case 96: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(117, 122); break; - case 99: + case 97: if ((0x47fffffe87fffffeL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(117, 122); break; - case 103: + case 101: if ((0x47fffffe87ffffffL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(127, 131); break; - case 105: + case 103: if ((0x7e0000007eL & l) != 0L) - jjstateSet[jjnewStateCnt++] = 106; + jjstateSet[jjnewStateCnt++] = 104; break; - case 106: + case 104: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(127, 131); break; - case 114: + case 112: if ((0x87fffffe07fffffeL & l) == 0L) break; - if (kind > 87) - kind = 87; - jjCheckNAddTwoStates(114, 115); + if (kind > 88) + kind = 88; + jjCheckNAddTwoStates(112, 113); break; - case 115: + case 113: if (curChar == 126) - jjCheckNAdd(114); + jjCheckNAdd(112); break; - case 116: - if ((0x78000001f8000001L & l) != 0L && kind > 88) - kind = 88; + case 114: + if ((0x78000001f8000001L & l) != 0L && kind > 89) + kind = 89; + break; + case 115: + if (curChar == 109) + jjAddStates(181, 182); + break; + case 116: + if (curChar == 111) + jjCheckNAdd(45); + break; + case 117: + if (curChar == 116) + jjstateSet[jjnewStateCnt++] = 116; + break; + case 118: + if (curChar == 108) + jjstateSet[jjnewStateCnt++] = 117; break; case 119: - if (curChar == 126) - jjstateSet[jjnewStateCnt++] = 120; + if (curChar == 105) + jjstateSet[jjnewStateCnt++] = 118; break; case 120: - case 121: - case 123: + if (curChar == 97) + jjstateSet[jjnewStateCnt++] = 119; + break; + case 122: + if ((0x47fffffe87ffffffL & l) == 0L) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(132, 135); + break; + case 124: + if ((0x7e0000007eL & l) != 0L) + jjstateSet[jjnewStateCnt++] = 125; + break; + case 125: + if ((0x7e0000007eL & l) == 0L) + break; + if (kind > 84) + kind = 84; jjCheckNAddStates(132, 135); break; + case 127: + if ((0x47fffffe87ffffffL & l) == 0L) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(142, 145); + break; + case 129: + if ((0x7e0000007eL & l) != 0L) + jjstateSet[jjnewStateCnt++] = 130; + break; + case 130: + if ((0x7e0000007eL & l) == 0L) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(142, 145); + break; + case 132: + if (curChar == 116) + jjstateSet[jjnewStateCnt++] = 131; + break; + case 133: + if (curChar == 101) + jjstateSet[jjnewStateCnt++] = 132; + break; + case 134: + if (curChar == 110) + jjstateSet[jjnewStateCnt++] = 133; + break; case 135: - if (curChar == 126) - jjstateSet[jjnewStateCnt++] = 136; + if (curChar == 103) + jjstateSet[jjnewStateCnt++] = 134; break; case 136: - case 137: + if (curChar == 97) + jjstateSet[jjnewStateCnt++] = 135; + break; case 139: - jjCheckNAddStates(140, 143); + if (curChar == 126) + jjstateSet[jjnewStateCnt++] = 140; break; - case 149: + case 140: + case 141: + case 143: + jjCheckNAddStates(146, 149); + break; + case 155: if (curChar == 126) - jjCheckNAdd(148); + jjstateSet[jjnewStateCnt++] = 156; break; - case 151: + case 156: + case 157: + case 159: + jjCheckNAddStates(154, 157); + break; + case 169: + if (curChar == 126) + jjCheckNAdd(168); + break; + case 171: if (curChar == 123) - jjAddStates(165, 166); + jjAddStates(179, 180); break; - case 153: + case 173: if ((0x87fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(56, 60); + jjCheckNAddStates(45, 49); break; - case 154: + case 174: if (curChar == 126) - jjCheckNAdd(153); + jjCheckNAdd(173); break; - case 155: + case 175: if (curChar == 95) - jjCheckNAddTwoStates(156, 157); + jjCheckNAddTwoStates(176, 177); break; - case 156: + case 176: if ((0x87fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(144, 148); + jjCheckNAddStates(158, 162); break; - case 157: + case 177: if (curChar == 126) - jjCheckNAdd(156); + jjCheckNAdd(176); break; - case 159: + case 179: if (curChar == 126) - jjstateSet[jjnewStateCnt++] = 160; + jjstateSet[jjnewStateCnt++] = 180; break; - case 160: - jjCheckNAddStates(149, 152); + case 180: + jjCheckNAddStates(163, 166); break; - case 161: + case 181: if ((0xdfffffffffffffffL & l) != 0L) - jjCheckNAddStates(149, 152); + jjCheckNAddStates(163, 166); break; - case 162: + case 182: if (curChar == 125) - jjCheckNAdd(161); + jjCheckNAdd(181); break; - case 163: - if (curChar == 125 && kind > 71) - kind = 71; + case 183: + if (curChar == 125 && kind > 72) + kind = 72; break; - case 164: + case 184: if (curChar == 125) - jjstateSet[jjnewStateCnt++] = 163; + jjstateSet[jjnewStateCnt++] = 183; break; - case 166: + case 186: if (curChar == 123) - jjCheckNAddTwoStates(167, 168); + jjCheckNAddTwoStates(187, 188); break; - case 167: + case 187: if ((0x87fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(51, 55); + jjCheckNAddStates(40, 44); break; - case 168: + case 188: if (curChar == 126) - jjCheckNAdd(167); + jjCheckNAdd(187); break; - case 169: + case 189: if (curChar == 95) - jjCheckNAddTwoStates(170, 171); + jjCheckNAddTwoStates(190, 191); break; - case 170: + case 190: if ((0x87fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(153, 157); + jjCheckNAddStates(167, 171); break; - case 171: + case 191: if (curChar == 126) - jjCheckNAdd(170); + jjCheckNAdd(190); break; - case 173: + case 193: if (curChar == 126) - jjstateSet[jjnewStateCnt++] = 174; + jjstateSet[jjnewStateCnt++] = 194; break; - case 174: - jjCheckNAddStates(158, 161); + case 194: + jjCheckNAddStates(172, 175); break; - case 175: + case 195: if ((0xdfffffffffffffffL & l) != 0L) - jjCheckNAddStates(158, 161); + jjCheckNAddStates(172, 175); break; - case 176: + case 196: if (curChar == 125) - jjCheckNAdd(175); + jjCheckNAdd(195); break; - case 177: - if (curChar == 125 && kind > 72) - kind = 72; + case 197: + if (curChar == 125 && kind > 73) + kind = 73; break; - case 178: + case 198: if (curChar == 125) - jjstateSet[jjnewStateCnt++] = 177; + jjstateSet[jjnewStateCnt++] = 197; break; - case 179: + case 199: if (curChar == 126) - jjCheckNAddStates(162, 164); + jjCheckNAddStates(176, 178); break; default : break; } @@ -1942,19 +2078,19 @@ { switch(jjstateSet[--i]) { + case 207: + if (jjCanMove_0(hiByte, i1, i2, l1, l2)) + jjCheckNAddStates(45, 49); + if (jjCanMove_0(hiByte, i1, i2, l1, l2)) + jjCheckNAddStates(40, 44); + break; case 21: - case 114: + case 112: if (!jjCanMove_0(hiByte, i1, i2, l1, l2)) break; - if (kind > 87) - kind = 87; - jjCheckNAddTwoStates(114, 115); - break; - case 187: - if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(56, 60); - if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(51, 55); + if (kind > 88) + kind = 88; + jjCheckNAddTwoStates(112, 113); break; case 3: case 4: @@ -1971,8 +2107,8 @@ case 26: if (!jjCanMove_0(hiByte, i1, i2, l1, l2)) break; - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(23, 24); break; case 34: @@ -1980,47 +2116,47 @@ case 37: if (!jjCanMove_0(hiByte, i1, i2, l1, l2)) break; - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(34, 35); break; - case 120: - case 121: - case 123: + case 140: + case 141: + case 143: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(132, 135); + jjCheckNAddStates(146, 149); break; - case 136: - case 137: - case 139: + case 156: + case 157: + case 159: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(140, 143); + jjCheckNAddStates(154, 157); break; - case 153: + case 173: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(56, 60); + jjCheckNAddStates(45, 49); break; - case 156: + case 176: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(144, 148); + jjCheckNAddStates(158, 162); break; - case 160: - case 161: + case 180: + case 181: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(149, 152); + jjCheckNAddStates(163, 166); break; - case 167: + case 187: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(51, 55); + jjCheckNAddStates(40, 44); break; - case 170: + case 190: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(153, 157); + jjCheckNAddStates(167, 171); break; - case 174: - case 175: + case 194: + case 195: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(158, 161); + jjCheckNAddStates(172, 175); break; default : break; } @@ -2033,7 +2169,7 @@ kind = 0x7fffffff; } ++curPos; - if ((i = jjnewStateCnt) == (startsAt = 187 - (jjnewStateCnt = startsAt))) + if ((i = jjnewStateCnt) == (startsAt = 207 - (jjnewStateCnt = startsAt))) return curPos; try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { return curPos; } @@ -2085,7 +2221,7 @@ break; case 8: if ((0x3ff0000ffffd9ffL & l) != 0L) - jjCheckNAddStates(173, 177); + jjCheckNAddStates(189, 193); break; case 10: if ((0x400600000000000L & l) != 0L) @@ -2093,15 +2229,15 @@ break; case 11: if ((0x3ff0000ffffd9ffL & l) != 0L) - jjCheckNAddStates(178, 182); + jjCheckNAddStates(194, 198); break; case 13: if ((0x100000200L & l) != 0L) - jjCheckNAddStates(183, 186); + jjCheckNAddStates(199, 202); break; case 15: case 16: - jjCheckNAddStates(183, 186); + jjCheckNAddStates(199, 202); break; case 20: if (curChar == 47) @@ -2109,7 +2245,7 @@ break; case 21: if ((0x3ff0000ffffd9ffL & l) != 0L) - jjCheckNAddStates(187, 191); + jjCheckNAddStates(203, 207); break; case 23: if ((0x400600000000000L & l) != 0L) @@ -2117,7 +2253,7 @@ break; case 24: if ((0x3ff0000ffffd9ffL & l) != 0L) - jjCheckNAddStates(192, 196); + jjCheckNAddStates(208, 212); break; case 26: if ((0x100000200L & l) != 0L) @@ -2138,13 +2274,13 @@ if (kind > 20) kind = 20; if (curChar == 123) - jjAddStates(197, 198); + jjAddStates(213, 214); else if (curChar == 126) - jjAddStates(199, 200); + jjAddStates(215, 216); break; case 3: if (curChar == 126) - jjAddStates(199, 200); + jjAddStates(215, 216); break; case 4: if ((0x87fffffe07fffffeL & l) != 0L && kind > 20) @@ -2156,7 +2292,7 @@ break; case 6: if (curChar == 123) - jjAddStates(197, 198); + jjAddStates(213, 214); break; case 7: if (curChar == 123) @@ -2164,7 +2300,7 @@ break; case 8: if ((0x87fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(173, 177); + jjCheckNAddStates(189, 193); break; case 9: if (curChar == 126) @@ -2176,7 +2312,7 @@ break; case 11: if ((0x87fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(178, 182); + jjCheckNAddStates(194, 198); break; case 12: if (curChar == 126) @@ -2187,11 +2323,11 @@ jjstateSet[jjnewStateCnt++] = 15; break; case 15: - jjCheckNAddStates(183, 186); + jjCheckNAddStates(199, 202); break; case 16: if ((0xdfffffffffffffffL & l) != 0L) - jjCheckNAddStates(183, 186); + jjCheckNAddStates(199, 202); break; case 17: if (curChar == 125) @@ -2207,7 +2343,7 @@ break; case 21: if ((0x87fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(187, 191); + jjCheckNAddStates(203, 207); break; case 22: if (curChar == 126) @@ -2219,7 +2355,7 @@ break; case 24: if ((0x87fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(192, 196); + jjCheckNAddStates(208, 212); break; case 25: if (curChar == 126) @@ -2259,24 +2395,24 @@ break; case 8: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(173, 177); + jjCheckNAddStates(189, 193); break; case 11: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(178, 182); + jjCheckNAddStates(194, 198); break; case 15: case 16: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(183, 186); + jjCheckNAddStates(199, 202); break; case 21: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(187, 191); + jjCheckNAddStates(203, 207); break; case 24: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(192, 196); + jjCheckNAddStates(208, 212); break; default : break; } @@ -2385,13 +2521,13 @@ case 8: if (kind > 17) kind = 17; - jjCheckNAddStates(201, 206); + jjCheckNAddStates(217, 222); break; case 11: case 2: if (kind > 17) kind = 17; - jjCheckNAddStates(201, 206); + jjCheckNAddStates(217, 222); break; default : break; } @@ -2409,7 +2545,7 @@ { if (kind > 17) kind = 17; - jjCheckNAddStates(201, 206); + jjCheckNAddStates(217, 222); } else if (curChar == 125) jjCheckNAdd(4); @@ -2419,7 +2555,7 @@ { if (kind > 17) kind = 17; - jjCheckNAddStates(201, 206); + jjCheckNAddStates(217, 222); } else if (curChar == 123) jjCheckNAddTwoStates(13, 9); @@ -2439,14 +2575,14 @@ case 1: if (kind > 17) kind = 17; - jjCheckNAddStates(201, 206); + jjCheckNAddStates(217, 222); break; case 2: if ((0x97ffffffffffffffL & l) == 0L) break; if (kind > 17) kind = 17; - jjCheckNAddStates(201, 206); + jjCheckNAddStates(217, 222); break; case 3: if (curChar == 125) @@ -2457,7 +2593,7 @@ break; if (kind > 17) kind = 17; - jjCheckNAddStates(201, 206); + jjCheckNAddStates(217, 222); break; case 6: if (curChar == 125) @@ -2473,7 +2609,7 @@ break; if (kind > 17) kind = 17; - jjCheckNAddStates(201, 206); + jjCheckNAddStates(217, 222); break; case 10: if (curChar == 123) @@ -2510,7 +2646,7 @@ break; if (kind > 17) kind = 17; - jjCheckNAddStates(201, 206); + jjCheckNAddStates(217, 222); break; case 11: case 2: @@ -2518,7 +2654,7 @@ break; if (kind > 17) kind = 17; - jjCheckNAddStates(201, 206); + jjCheckNAddStates(217, 222); break; default : break; } @@ -2542,35 +2678,35 @@ switch (pos) { case 0: - if ((active1 & 0x4fe00L) != 0L) + if ((active1 & 0x9fc00L) != 0L) { - jjmatchedKind = 88; + jjmatchedKind = 89; return -1; } - if ((active1 & 0x40L) != 0L) + if ((active1 & 0x80L) != 0L) { - jjmatchedKind = 88; - return 171; + jjmatchedKind = 89; + return 191; } return -1; case 1: - if ((active1 & 0x4fe00L) != 0L) + if ((active1 & 0x9fc00L) != 0L) { if (jjmatchedPos == 0) { - jjmatchedKind = 88; + jjmatchedKind = 89; jjmatchedPos = 0; } return -1; } - if ((active1 & 0x40L) != 0L) + if ((active1 & 0x80L) != 0L) { if (jjmatchedPos == 0) { - jjmatchedKind = 88; + jjmatchedKind = 89; jjmatchedPos = 0; } - return 199; + return 219; } return -1; default : @@ -2586,23 +2722,23 @@ switch(curChar) { case 35: - return jjMoveStringLiteralDfa1_3(0x8000L); + return jjMoveStringLiteralDfa1_3(0x10000L); case 42: - return jjMoveStringLiteralDfa1_3(0x200L); + return jjMoveStringLiteralDfa1_3(0x400L); case 44: - return jjMoveStringLiteralDfa1_3(0x4000L); + return jjMoveStringLiteralDfa1_3(0x8000L); case 45: - return jjMoveStringLiteralDfa1_3(0x800L); + return jjMoveStringLiteralDfa1_3(0x1000L); case 47: - return jjMoveStringLiteralDfa1_3(0x400L); + return jjMoveStringLiteralDfa1_3(0x800L); case 92: - return jjMoveStringLiteralDfa1_3(0x40000L); + return jjMoveStringLiteralDfa1_3(0x80000L); case 94: - return jjMoveStringLiteralDfa1_3(0x2000L); + return jjMoveStringLiteralDfa1_3(0x4000L); case 95: - return jjMoveStringLiteralDfa1_3(0x1000L); + return jjMoveStringLiteralDfa1_3(0x2000L); case 123: - return jjMoveStringLiteralDfa1_3(0x40L); + return jjMoveStringLiteralDfa1_3(0x80L); default : return jjMoveNfa_3(21, 0); } @@ -2617,39 +2753,39 @@ switch(curChar) { case 35: - if ((active1 & 0x8000L) != 0L) - return jjStopAtPos(1, 79); + if ((active1 & 0x10000L) != 0L) + return jjStopAtPos(1, 80); break; case 42: - if ((active1 & 0x200L) != 0L) - return jjStopAtPos(1, 73); + if ((active1 & 0x400L) != 0L) + return jjStopAtPos(1, 74); break; case 44: - if ((active1 & 0x4000L) != 0L) - return jjStopAtPos(1, 78); + if ((active1 & 0x8000L) != 0L) + return jjStopAtPos(1, 79); break; case 45: - if ((active1 & 0x800L) != 0L) - return jjStopAtPos(1, 75); + if ((active1 & 0x1000L) != 0L) + return jjStopAtPos(1, 76); break; case 47: - if ((active1 & 0x400L) != 0L) - return jjStopAtPos(1, 74); + if ((active1 & 0x800L) != 0L) + return jjStopAtPos(1, 75); break; case 92: - if ((active1 & 0x40000L) != 0L) - return jjStopAtPos(1, 82); + if ((active1 & 0x80000L) != 0L) + return jjStopAtPos(1, 83); break; case 94: - if ((active1 & 0x2000L) != 0L) - return jjStopAtPos(1, 77); + if ((active1 & 0x4000L) != 0L) + return jjStopAtPos(1, 78); break; case 95: - if ((active1 & 0x1000L) != 0L) - return jjStopAtPos(1, 76); + if ((active1 & 0x2000L) != 0L) + return jjStopAtPos(1, 77); break; case 123: - return jjMoveStringLiteralDfa2_3(active1, 0x40L); + return jjMoveStringLiteralDfa2_3(active1, 0x80L); default : break; } @@ -2667,8 +2803,8 @@ switch(curChar) { case 123: - if ((active1 & 0x40L) != 0L) - return jjStopAtPos(2, 70); + if ((active1 & 0x80L) != 0L) + return jjStopAtPos(2, 71); break; default : break; @@ -2678,7 +2814,7 @@ private int jjMoveNfa_3(int startState, int curPos) { int startsAt = 0; - jjnewStateCnt = 199; + jjnewStateCnt = 219; int i = 1; jjstateSet[0] = startState; int kind = 0x7fffffff; @@ -2693,48 +2829,48 @@ { switch(jjstateSet[--i]) { - case 199: + case 219: if ((0x3ff0000ffffd9ffL & l) != 0L) - jjCheckNAddStates(207, 211); + jjCheckNAddStates(223, 227); if ((0x3ff0000ffffd9ffL & l) != 0L) - jjCheckNAddStates(212, 216); + jjCheckNAddStates(228, 232); break; case 21: if ((0x3ff0000ffffd9ffL & l) != 0L) { - if (kind > 87) - kind = 87; - jjCheckNAddTwoStates(114, 115); + if (kind > 88) + kind = 88; + jjCheckNAddTwoStates(112, 113); } else if ((0xfc00fffe00000000L & l) != 0L) { - if (kind > 88) - kind = 88; + if (kind > 89) + kind = 89; } else if ((0x2400L & l) != 0L) { - if (kind > 86) - kind = 86; - jjCheckNAddStates(217, 220); + if (kind > 87) + kind = 87; + jjCheckNAddStates(233, 236); } else if ((0x100000200L & l) != 0L) { - if (kind > 84) - kind = 84; - jjCheckNAddStates(221, 230); + if (kind > 85) + kind = 85; + jjCheckNAddStates(237, 246); } if (curChar == 40) - jjCheckNAddStates(231, 233); + jjCheckNAddStates(247, 249); else if (curChar == 13) - jjAddStates(234, 236); + jjAddStates(250, 252); else if (curChar == 61) { if (kind > 13) kind = 13; - jjCheckNAddStates(237, 240); + jjCheckNAddStates(253, 256); } else if (curChar == 41) - jjstateSet[jjnewStateCnt++] = 112; + jjstateSet[jjnewStateCnt++] = 110; break; case 1: if (curChar == 58) @@ -2751,67 +2887,67 @@ case 22: if (curChar != 58) break; - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(23, 24); break; case 23: if ((0xfffffffeffffd9ffL & l) == 0L) break; - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(23, 24); break; case 25: - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(23, 24); break; case 26: if ((0x3ff0000ffffd9ffL & l) == 0L) break; - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(23, 24); break; case 27: if ((0xfc00fffe00000000L & l) == 0L) break; - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(23, 24); break; case 33: if (curChar != 58) break; - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(34, 35); break; case 34: if ((0xfffffffeffffd9ffL & l) == 0L) break; - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(34, 35); break; case 36: - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(34, 35); break; case 37: if ((0x3ff0000ffffd9ffL & l) == 0L) break; - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(34, 35); break; case 38: if ((0xfc00fffe00000000L & l) == 0L) break; - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(34, 35); break; case 45: @@ -2821,15 +2957,15 @@ case 46: if (curChar != 47) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(73, 76); break; case 47: if ((0x2fff6fd200000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(77, 81); break; case 48: @@ -2843,22 +2979,22 @@ case 50: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(77, 81); break; case 51: if (curChar != 47) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(82, 86); break; case 52: if ((0x2fff6fd200000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(82, 86); break; case 53: @@ -2872,22 +3008,22 @@ case 55: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(82, 86); break; case 56: if (curChar != 63) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(87, 89); break; case 57: if ((0xafffefd200000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(87, 89); break; case 58: @@ -2901,22 +3037,22 @@ case 60: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(87, 89); break; case 61: if (curChar != 35) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddTwoStates(62, 63); break; case 62: if ((0xafffefd200000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddTwoStates(62, 63); break; case 63: @@ -2930,8 +3066,8 @@ case 65: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddTwoStates(62, 63); break; case 66: @@ -2957,29 +3093,29 @@ case 71: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(90, 94); break; case 72: if ((0x2bff6fd200000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(90, 94); break; case 73: if (curChar != 47) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(95, 99); break; case 74: if ((0x2fff6fd200000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(95, 99); break; case 75: @@ -2993,424 +3129,486 @@ case 77: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(95, 99); break; case 78: if ((0x2bff6fd200000000L & l) != 0L) jjCheckNAddTwoStates(69, 72); break; - case 86: + case 84: if ((0x3ff680000000000L & l) != 0L) jjCheckNAddStates(100, 102); break; - case 87: + case 85: if (curChar == 58) - jjstateSet[jjnewStateCnt++] = 88; + jjstateSet[jjnewStateCnt++] = 86; break; - case 89: + case 87: if ((0x3ff680000000000L & l) != 0L) jjCheckNAddStates(103, 105); break; - case 90: + case 88: if (curChar != 47) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(106, 113); break; - case 91: + case 89: if ((0x2fff6fd200000000L & l) != 0L) jjCheckNAddStates(114, 116); break; - case 92: + case 90: if (curChar == 37) - jjCheckNAdd(93); + jjCheckNAdd(91); break; - case 93: + case 91: if ((0x3ff000000000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 94; + jjstateSet[jjnewStateCnt++] = 92; break; - case 94: + case 92: if ((0x3ff000000000000L & l) != 0L) jjCheckNAddStates(114, 116); break; - case 96: + case 94: if (curChar == 37) - jjCheckNAdd(97); + jjCheckNAdd(95); break; - case 97: + case 95: if ((0x3ff000000000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 98; + jjstateSet[jjnewStateCnt++] = 96; break; - case 98: + case 96: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(117, 122); break; - case 99: + case 97: if ((0x2bff6fd200000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(117, 122); break; - case 100: + case 98: if (curChar == 58) - jjCheckNAdd(101); + jjCheckNAdd(99); break; - case 101: + case 99: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(123, 126); break; - case 102: + case 100: if (curChar != 47) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(127, 131); break; - case 103: + case 101: if ((0x2fff6fd200000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(127, 131); break; - case 104: + case 102: if (curChar == 37) - jjstateSet[jjnewStateCnt++] = 105; + jjstateSet[jjnewStateCnt++] = 103; break; - case 105: + case 103: if ((0x3ff000000000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 106; + jjstateSet[jjnewStateCnt++] = 104; break; - case 106: + case 104: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(127, 131); break; - case 107: + case 105: if (curChar == 37) - jjCheckNAddTwoStates(93, 97); + jjCheckNAddTwoStates(91, 95); break; - case 108: + case 106: if (curChar == 47) - jjstateSet[jjnewStateCnt++] = 90; + jjstateSet[jjnewStateCnt++] = 88; break; - case 109: + case 107: if (curChar == 58) - jjstateSet[jjnewStateCnt++] = 108; + jjstateSet[jjnewStateCnt++] = 106; break; - case 110: + case 108: if (curChar != 41) break; - if (kind > 85) - kind = 85; - jjCheckNAdd(111); + if (kind > 86) + kind = 86; + jjCheckNAdd(109); break; - case 111: + case 109: if ((0x100000200L & l) == 0L) break; - if (kind > 85) - kind = 85; - jjCheckNAdd(111); + if (kind > 86) + kind = 86; + jjCheckNAdd(109); break; - case 112: + case 110: if (curChar == 41) - jjstateSet[jjnewStateCnt++] = 110; + jjstateSet[jjnewStateCnt++] = 108; break; - case 113: + case 111: if (curChar == 41) - jjstateSet[jjnewStateCnt++] = 112; + jjstateSet[jjnewStateCnt++] = 110; break; - case 114: + case 112: if ((0x3ff0000ffffd9ffL & l) == 0L) break; - if (kind > 87) - kind = 87; - jjCheckNAddTwoStates(114, 115); - break; - case 116: - if ((0xfc00fffe00000000L & l) != 0L && kind > 88) + if (kind > 88) kind = 88; + jjCheckNAddTwoStates(112, 113); break; - case 117: - if ((0x100000200L & l) == 0L) + case 114: + if ((0xfc00fffe00000000L & l) != 0L && kind > 89) + kind = 89; + break; + case 121: + if (curChar != 63) break; if (kind > 84) kind = 84; - jjCheckNAddStates(221, 230); + jjCheckNAddStates(132, 135); break; - case 118: + case 122: + if ((0xafffefd200000000L & l) == 0L) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(132, 135); + break; + case 123: + if (curChar == 37) + jjstateSet[jjnewStateCnt++] = 124; + break; + case 124: + if ((0x3ff000000000000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 125; + break; + case 125: + if ((0x3ff000000000000L & l) == 0L) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(132, 135); + break; + case 126: + if (curChar != 35) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(136, 141); + break; + case 127: + if ((0xafffefd200000000L & l) == 0L) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(142, 145); + break; + case 128: + if (curChar == 37) + jjstateSet[jjnewStateCnt++] = 129; + break; + case 129: + if ((0x3ff000000000000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 130; + break; + case 130: + if ((0x3ff000000000000L & l) == 0L) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(142, 145); + break; + case 131: + if (curChar == 58) + jjstateSet[jjnewStateCnt++] = 121; + break; + case 137: + if ((0x100000200L & l) == 0L) + break; + if (kind > 85) + kind = 85; + jjCheckNAddStates(237, 246); + break; + case 138: if ((0x100000200L & l) != 0L) - jjCheckNAddTwoStates(118, 119); + jjCheckNAddTwoStates(138, 139); break; - case 119: + case 139: if (curChar == 61) - jjCheckNAddStates(241, 243); + jjCheckNAddStates(257, 259); break; - case 120: + case 140: if (curChar == 10 && kind > 12) kind = 12; break; - case 121: + case 141: if (curChar == 13) - jjstateSet[jjnewStateCnt++] = 120; + jjstateSet[jjnewStateCnt++] = 140; break; - case 122: + case 142: if ((0x2400L & l) != 0L && kind > 12) kind = 12; break; - case 123: + case 143: if ((0x100000200L & l) != 0L) - jjCheckNAddTwoStates(123, 124); + jjCheckNAddTwoStates(143, 144); break; - case 124: + case 144: if (curChar != 61) break; if (kind > 13) kind = 13; - jjCheckNAdd(124); + jjCheckNAdd(144); break; - case 125: + case 145: if ((0x100000200L & l) != 0L) - jjCheckNAddTwoStates(125, 129); + jjCheckNAddTwoStates(145, 149); break; - case 126: + case 146: if (curChar != 40) break; - if (kind > 68) - kind = 68; - jjCheckNAdd(127); + if (kind > 69) + kind = 69; + jjCheckNAdd(147); break; - case 127: + case 147: if ((0x100000200L & l) == 0L) break; - if (kind > 68) - kind = 68; - jjCheckNAdd(127); + if (kind > 69) + kind = 69; + jjCheckNAdd(147); break; - case 128: + case 148: if (curChar == 40) - jjstateSet[jjnewStateCnt++] = 126; + jjstateSet[jjnewStateCnt++] = 146; break; - case 129: + case 149: if (curChar == 40) - jjCheckNAdd(128); + jjCheckNAdd(148); break; - case 130: + case 150: if ((0x100000200L & l) == 0L) break; - if (kind > 84) - kind = 84; - jjCheckNAddTwoStates(130, 131); + if (kind > 85) + kind = 85; + jjCheckNAddTwoStates(150, 151); break; - case 132: + case 152: if ((0x100000200L & l) != 0L) - jjCheckNAddTwoStates(132, 113); + jjCheckNAddTwoStates(152, 111); break; - case 133: + case 153: if (curChar != 61) break; if (kind > 13) kind = 13; - jjCheckNAddStates(237, 240); + jjCheckNAddStates(253, 256); break; - case 134: + case 154: if (curChar == 13) - jjAddStates(234, 236); + jjAddStates(250, 252); break; - case 135: + case 155: if (curChar == 10) - jjCheckNAddTwoStates(136, 137); + jjCheckNAddTwoStates(156, 157); break; - case 136: + case 156: if ((0x100000200L & l) != 0L) - jjCheckNAddTwoStates(136, 137); + jjCheckNAddTwoStates(156, 157); break; - case 137: + case 157: if (curChar != 61) break; if (kind > 14) kind = 14; - jjCheckNAddTwoStates(137, 138); + jjCheckNAddTwoStates(157, 158); break; - case 138: + case 158: if ((0x100000200L & l) == 0L) break; if (kind > 14) kind = 14; - jjCheckNAdd(138); + jjCheckNAdd(158); break; - case 139: - if (curChar == 10 && kind > 86) - kind = 86; + case 159: + if (curChar == 10 && kind > 87) + kind = 87; break; - case 140: + case 160: if (curChar == 10) - jjCheckNAddTwoStates(142, 143); + jjCheckNAddTwoStates(162, 163); break; - case 141: - if (curChar == 10 && kind > 90) - kind = 90; + case 161: + if (curChar == 10 && kind > 91) + kind = 91; break; - case 142: + case 162: if (curChar == 13) - jjstateSet[jjnewStateCnt++] = 141; + jjstateSet[jjnewStateCnt++] = 161; break; - case 143: - if ((0x2400L & l) != 0L && kind > 90) - kind = 90; + case 163: + if ((0x2400L & l) != 0L && kind > 91) + kind = 91; break; - case 144: + case 164: if ((0x2400L & l) == 0L) break; - if (kind > 86) - kind = 86; - jjCheckNAddStates(217, 220); + if (kind > 87) + kind = 87; + jjCheckNAddStates(233, 236); break; - case 145: + case 165: if (curChar == 40) - jjCheckNAddStates(231, 233); + jjCheckNAddStates(247, 249); break; - case 146: + case 166: if (curChar == 37) - jjCheckNAddStates(244, 247); + jjCheckNAddStates(260, 263); break; - case 148: - jjCheckNAddStates(244, 247); + case 168: + jjCheckNAddStates(260, 263); break; - case 149: + case 169: if ((0xffffffdfffffffffL & l) != 0L) - jjCheckNAddStates(244, 247); + jjCheckNAddStates(260, 263); break; - case 150: + case 170: if (curChar == 37) - jjstateSet[jjnewStateCnt++] = 151; + jjstateSet[jjnewStateCnt++] = 171; break; - case 151: + case 171: if ((0xfffffdffffffffffL & l) != 0L) - jjCheckNAddStates(244, 247); + jjCheckNAddStates(260, 263); break; - case 152: + case 172: if (curChar == 41) - jjCheckNAddStates(248, 251); + jjCheckNAddStates(264, 267); break; - case 153: + case 173: if ((0x100000200L & l) != 0L) - jjCheckNAddStates(248, 251); + jjCheckNAddStates(264, 267); break; - case 154: + case 174: if (curChar == 10) - jjCheckNAddTwoStates(155, 158); + jjCheckNAddTwoStates(175, 178); break; - case 155: + case 175: if ((0x100000200L & l) != 0L) - jjCheckNAddTwoStates(155, 158); + jjCheckNAddTwoStates(175, 178); break; - case 156: - if (curChar == 40 && kind > 66) - kind = 66; + case 176: + if (curChar == 40 && kind > 67) + kind = 67; break; - case 157: + case 177: if (curChar == 40) - jjstateSet[jjnewStateCnt++] = 156; + jjstateSet[jjnewStateCnt++] = 176; break; - case 158: + case 178: if (curChar == 40) - jjstateSet[jjnewStateCnt++] = 157; + jjstateSet[jjnewStateCnt++] = 177; break; - case 159: + case 179: if (curChar == 13) - jjstateSet[jjnewStateCnt++] = 154; + jjstateSet[jjnewStateCnt++] = 174; break; - case 160: + case 180: if ((0x2400L & l) != 0L) - jjCheckNAddTwoStates(155, 158); + jjCheckNAddTwoStates(175, 178); break; - case 161: + case 181: if (curChar == 37) - jjstateSet[jjnewStateCnt++] = 152; + jjstateSet[jjnewStateCnt++] = 172; break; - case 162: + case 182: if (curChar == 37) - jjCheckNAddStates(252, 255); + jjCheckNAddStates(268, 271); break; - case 164: - jjCheckNAddStates(252, 255); + case 184: + jjCheckNAddStates(268, 271); break; - case 165: + case 185: if ((0xffffffdfffffffffL & l) != 0L) - jjCheckNAddStates(252, 255); + jjCheckNAddStates(268, 271); break; - case 166: + case 186: if (curChar == 37) - jjstateSet[jjnewStateCnt++] = 167; + jjstateSet[jjnewStateCnt++] = 187; break; - case 167: + case 187: if ((0xfffffdffffffffffL & l) != 0L) - jjCheckNAddStates(252, 255); + jjCheckNAddStates(268, 271); break; - case 168: - if (curChar == 41 && kind > 67) - kind = 67; + case 188: + if (curChar == 41 && kind > 68) + kind = 68; break; - case 169: + case 189: if (curChar == 37) - jjstateSet[jjnewStateCnt++] = 168; + jjstateSet[jjnewStateCnt++] = 188; break; - case 172: + case 192: if ((0x3ff0000ffffd9ffL & l) != 0L) - jjCheckNAddStates(212, 216); + jjCheckNAddStates(228, 232); break; - case 174: + case 194: if ((0x400600000000000L & l) != 0L) - jjCheckNAddTwoStates(175, 176); + jjCheckNAddTwoStates(195, 196); break; - case 175: + case 195: if ((0x3ff0000ffffd9ffL & l) != 0L) - jjCheckNAddStates(256, 260); + jjCheckNAddStates(272, 276); break; - case 177: + case 197: if ((0x100000200L & l) != 0L) - jjCheckNAddStates(261, 264); + jjCheckNAddStates(277, 280); break; - case 179: - case 180: - jjCheckNAddStates(261, 264); + case 199: + case 200: + jjCheckNAddStates(277, 280); break; - case 184: + case 204: if (curChar == 47) - jjstateSet[jjnewStateCnt++] = 183; + jjstateSet[jjnewStateCnt++] = 203; break; - case 186: + case 206: if ((0x3ff0000ffffd9ffL & l) != 0L) - jjCheckNAddStates(207, 211); + jjCheckNAddStates(223, 227); break; - case 188: + case 208: if ((0x400600000000000L & l) != 0L) - jjCheckNAddTwoStates(189, 190); + jjCheckNAddTwoStates(209, 210); break; - case 189: + case 209: if ((0x3ff0000ffffd9ffL & l) != 0L) - jjCheckNAddStates(265, 269); + jjCheckNAddStates(281, 285); break; - case 191: + case 211: if ((0x100000200L & l) != 0L) - jjCheckNAddStates(270, 273); + jjCheckNAddStates(286, 289); break; - case 193: - case 194: - jjCheckNAddStates(270, 273); + case 213: + case 214: + jjCheckNAddStates(286, 289); break; default : break; } @@ -3423,44 +3621,46 @@ { switch(jjstateSet[--i]) { - case 171: - if (curChar == 123) - jjCheckNAddTwoStates(186, 187); - if (curChar == 123) - jjCheckNAddTwoStates(172, 173); - break; - case 199: + case 219: if ((0x87fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(207, 211); + jjCheckNAddStates(223, 227); else if (curChar == 126) - jjCheckNAdd(186); + jjCheckNAdd(206); if ((0x87fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(212, 216); + jjCheckNAddStates(228, 232); else if (curChar == 126) - jjCheckNAdd(172); + jjCheckNAdd(192); + break; + case 191: + if (curChar == 123) + jjCheckNAddTwoStates(206, 207); + if (curChar == 123) + jjCheckNAddTwoStates(192, 193); break; case 21: if ((0x87fffffe07fffffeL & l) != 0L) { - if (kind > 87) - kind = 87; - jjCheckNAddTwoStates(114, 115); + if (kind > 88) + kind = 88; + jjCheckNAddTwoStates(112, 113); } else if ((0x78000001f8000001L & l) != 0L) { - if (kind > 88) - kind = 88; + if (kind > 89) + kind = 89; } if ((0x7fffffe07fffffeL & l) != 0L) jjCheckNAddStates(100, 102); else if (curChar == 126) - jjCheckNAddStates(274, 276); + jjCheckNAddStates(290, 292); else if (curChar == 123) - jjAddStates(277, 278); + jjAddStates(293, 294); else if (curChar == 91) jjstateSet[jjnewStateCnt++] = 0; if (curChar == 109) - jjstateSet[jjnewStateCnt++] = 83; + jjAddStates(181, 182); + else if (curChar == 120) + jjstateSet[jjnewStateCnt++] = 81; else if (curChar == 97) jjstateSet[jjnewStateCnt++] = 43; else if (curChar == 105) @@ -3533,8 +3733,8 @@ jjCheckNAdd(16); break; case 18: - if (curChar == 93 && kind > 69) - kind = 69; + if (curChar == 93 && kind > 70) + kind = 70; break; case 19: if (curChar == 93) @@ -3546,26 +3746,26 @@ break; case 23: case 25: - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(23, 24); break; case 24: if (curChar == 126) - jjAddStates(167, 169); + jjAddStates(183, 185); break; case 26: if ((0x87fffffe07fffffeL & l) == 0L) break; - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(23, 24); break; case 27: if ((0x78000001f8000001L & l) == 0L) break; - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(23, 24); break; case 28: @@ -3590,26 +3790,26 @@ break; case 34: case 36: - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(34, 35); break; case 35: if (curChar == 126) - jjAddStates(170, 172); + jjAddStates(186, 188); break; case 37: if ((0x87fffffe07fffffeL & l) == 0L) break; - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(34, 35); break; case 38: if ((0x78000001f8000001L & l) == 0L) break; - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(34, 35); break; case 39: @@ -3639,8 +3839,8 @@ case 47: if ((0x47fffffe87ffffffL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(77, 81); break; case 49: @@ -3650,15 +3850,15 @@ case 50: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(77, 81); break; case 52: if ((0x47fffffe87ffffffL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(82, 86); break; case 54: @@ -3668,15 +3868,15 @@ case 55: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(82, 86); break; case 57: if ((0x47fffffe87ffffffL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(87, 89); break; case 59: @@ -3686,15 +3886,15 @@ case 60: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(87, 89); break; case 62: if ((0x47fffffe87ffffffL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddTwoStates(62, 63); break; case 64: @@ -3704,8 +3904,8 @@ case 65: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddTwoStates(62, 63); break; case 67: @@ -3723,22 +3923,22 @@ case 71: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(90, 94); break; case 72: if ((0x47fffffe87ffffffL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(90, 94); break; case 74: if ((0x47fffffe87ffffffL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(95, 99); break; case 76: @@ -3748,8 +3948,8 @@ case 77: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(95, 99); break; case 78: @@ -3757,228 +3957,300 @@ jjCheckNAddTwoStates(69, 72); break; case 79: - if (curChar == 111) - jjstateSet[jjnewStateCnt++] = 45; + if (curChar == 112) + jjCheckNAdd(45); break; case 80: - if (curChar == 116) + if (curChar == 112) jjstateSet[jjnewStateCnt++] = 79; break; case 81: - if (curChar == 108) + if (curChar == 109) jjstateSet[jjnewStateCnt++] = 80; break; case 82: - if (curChar == 105) + if (curChar == 120) jjstateSet[jjnewStateCnt++] = 81; break; case 83: - if (curChar == 97) - jjstateSet[jjnewStateCnt++] = 82; - break; case 84: - if (curChar == 109) - jjstateSet[jjnewStateCnt++] = 83; - break; - case 85: - case 86: if ((0x7fffffe07fffffeL & l) != 0L) jjCheckNAddStates(100, 102); break; - case 88: - case 89: + case 86: + case 87: if ((0x7fffffe07fffffeL & l) != 0L) jjCheckNAddStates(103, 105); break; - case 91: + case 89: if ((0x47fffffe87fffffeL & l) != 0L) jjCheckNAddStates(114, 116); break; - case 93: + case 91: if ((0x7e0000007eL & l) != 0L) - jjstateSet[jjnewStateCnt++] = 94; + jjstateSet[jjnewStateCnt++] = 92; break; - case 94: + case 92: if ((0x7e0000007eL & l) != 0L) jjCheckNAddStates(114, 116); break; - case 95: + case 93: if (curChar != 64) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(117, 122); break; - case 97: + case 95: if ((0x7e0000007eL & l) != 0L) - jjstateSet[jjnewStateCnt++] = 98; + jjstateSet[jjnewStateCnt++] = 96; break; - case 98: + case 96: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(117, 122); break; - case 99: + case 97: if ((0x47fffffe87fffffeL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(117, 122); break; - case 103: + case 101: if ((0x47fffffe87ffffffL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(127, 131); break; - case 105: + case 103: if ((0x7e0000007eL & l) != 0L) - jjstateSet[jjnewStateCnt++] = 106; + jjstateSet[jjnewStateCnt++] = 104; break; - case 106: + case 104: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(127, 131); break; - case 114: + case 112: if ((0x87fffffe07fffffeL & l) == 0L) break; - if (kind > 87) - kind = 87; - jjCheckNAddTwoStates(114, 115); + if (kind > 88) + kind = 88; + jjCheckNAddTwoStates(112, 113); break; - case 115: + case 113: if (curChar == 126) - jjCheckNAdd(114); + jjCheckNAdd(112); + break; + case 114: + if ((0x78000001f8000001L & l) != 0L && kind > 89) + kind = 89; + break; + case 115: + if (curChar == 109) + jjAddStates(181, 182); break; case 116: - if ((0x78000001f8000001L & l) != 0L && kind > 88) - kind = 88; + if (curChar == 111) + jjCheckNAdd(45); break; - case 131: + case 117: + if (curChar == 116) + jjstateSet[jjnewStateCnt++] = 116; + break; + case 118: + if (curChar == 108) + jjstateSet[jjnewStateCnt++] = 117; + break; + case 119: + if (curChar == 105) + jjstateSet[jjnewStateCnt++] = 118; + break; + case 120: + if (curChar == 97) + jjstateSet[jjnewStateCnt++] = 119; + break; + case 122: + if ((0x47fffffe87ffffffL & l) == 0L) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(132, 135); + break; + case 124: + if ((0x7e0000007eL & l) != 0L) + jjstateSet[jjnewStateCnt++] = 125; + break; + case 125: + if ((0x7e0000007eL & l) == 0L) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(132, 135); + break; + case 127: + if ((0x47fffffe87ffffffL & l) == 0L) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(142, 145); + break; + case 129: + if ((0x7e0000007eL & l) != 0L) + jjstateSet[jjnewStateCnt++] = 130; + break; + case 130: + if ((0x7e0000007eL & l) == 0L) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(142, 145); + break; + case 132: + if (curChar == 116) + jjstateSet[jjnewStateCnt++] = 131; + break; + case 133: + if (curChar == 101) + jjstateSet[jjnewStateCnt++] = 132; + break; + case 134: + if (curChar == 110) + jjstateSet[jjnewStateCnt++] = 133; + break; + case 135: + if (curChar == 103) + jjstateSet[jjnewStateCnt++] = 134; + break; + case 136: + if (curChar == 97) + jjstateSet[jjnewStateCnt++] = 135; + break; + case 151: if (curChar == 126) - jjCheckNAdd(130); + jjCheckNAdd(150); break; - case 147: + case 167: if (curChar == 126) - jjstateSet[jjnewStateCnt++] = 148; + jjstateSet[jjnewStateCnt++] = 168; break; - case 148: - case 149: - case 151: - jjCheckNAddStates(244, 247); + case 168: + case 169: + case 171: + jjCheckNAddStates(260, 263); break; - case 163: + case 183: if (curChar == 126) - jjstateSet[jjnewStateCnt++] = 164; + jjstateSet[jjnewStateCnt++] = 184; break; - case 164: - case 165: - case 167: - jjCheckNAddStates(252, 255); + case 184: + case 185: + case 187: + jjCheckNAddStates(268, 271); break; - case 170: + case 190: if (curChar == 123) - jjAddStates(277, 278); + jjAddStates(293, 294); break; - case 172: + case 192: if ((0x87fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(212, 216); + jjCheckNAddStates(228, 232); break; - case 173: + case 193: if (curChar == 126) - jjCheckNAdd(172); + jjCheckNAdd(192); break; - case 174: + case 194: if (curChar == 95) - jjCheckNAddTwoStates(175, 176); + jjCheckNAddTwoStates(195, 196); break; - case 175: + case 195: if ((0x87fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(256, 260); + jjCheckNAddStates(272, 276); break; - case 176: + case 196: if (curChar == 126) - jjCheckNAdd(175); + jjCheckNAdd(195); break; - case 178: + case 198: if (curChar == 126) - jjstateSet[jjnewStateCnt++] = 179; + jjstateSet[jjnewStateCnt++] = 199; break; - case 179: - jjCheckNAddStates(261, 264); + case 199: + jjCheckNAddStates(277, 280); break; - case 180: + case 200: if ((0xdfffffffffffffffL & l) != 0L) - jjCheckNAddStates(261, 264); + jjCheckNAddStates(277, 280); break; - case 181: + case 201: if (curChar == 125) - jjCheckNAdd(180); + jjCheckNAdd(200); break; - case 182: - if (curChar == 125 && kind > 71) - kind = 71; + case 202: + if (curChar == 125 && kind > 72) + kind = 72; break; - case 183: + case 203: if (curChar == 125) - jjstateSet[jjnewStateCnt++] = 182; + jjstateSet[jjnewStateCnt++] = 202; break; - case 185: + case 205: if (curChar == 123) - jjCheckNAddTwoStates(186, 187); + jjCheckNAddTwoStates(206, 207); break; - case 186: + case 206: if ((0x87fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(207, 211); + jjCheckNAddStates(223, 227); break; - case 187: + case 207: if (curChar == 126) - jjCheckNAdd(186); + jjCheckNAdd(206); break; - case 188: + case 208: if (curChar == 95) - jjCheckNAddTwoStates(189, 190); + jjCheckNAddTwoStates(209, 210); break; - case 189: + case 209: if ((0x87fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(265, 269); + jjCheckNAddStates(281, 285); break; - case 190: + case 210: if (curChar == 126) - jjCheckNAdd(189); + jjCheckNAdd(209); break; - case 192: + case 212: if (curChar == 126) - jjstateSet[jjnewStateCnt++] = 193; + jjstateSet[jjnewStateCnt++] = 213; break; - case 193: - jjCheckNAddStates(270, 273); + case 213: + jjCheckNAddStates(286, 289); break; - case 194: + case 214: if ((0xdfffffffffffffffL & l) != 0L) - jjCheckNAddStates(270, 273); + jjCheckNAddStates(286, 289); break; - case 195: + case 215: if (curChar == 125) - jjCheckNAdd(194); + jjCheckNAdd(214); break; - case 196: - if (curChar == 125 && kind > 72) - kind = 72; + case 216: + if (curChar == 125 && kind > 73) + kind = 73; break; - case 197: + case 217: if (curChar == 125) - jjstateSet[jjnewStateCnt++] = 196; + jjstateSet[jjnewStateCnt++] = 216; break; - case 198: + case 218: if (curChar == 126) - jjCheckNAddStates(274, 276); + jjCheckNAddStates(290, 292); break; default : break; } @@ -3995,19 +4267,19 @@ { switch(jjstateSet[--i]) { - case 199: + case 219: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(212, 216); + jjCheckNAddStates(228, 232); if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(207, 211); + jjCheckNAddStates(223, 227); break; case 21: - case 114: + case 112: if (!jjCanMove_0(hiByte, i1, i2, l1, l2)) break; - if (kind > 87) - kind = 87; - jjCheckNAddTwoStates(114, 115); + if (kind > 88) + kind = 88; + jjCheckNAddTwoStates(112, 113); break; case 3: case 4: @@ -4024,8 +4296,8 @@ case 26: if (!jjCanMove_0(hiByte, i1, i2, l1, l2)) break; - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(23, 24); break; case 34: @@ -4033,47 +4305,47 @@ case 37: if (!jjCanMove_0(hiByte, i1, i2, l1, l2)) break; - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(34, 35); break; - case 148: - case 149: - case 151: + case 168: + case 169: + case 171: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(244, 247); + jjCheckNAddStates(260, 263); break; - case 164: - case 165: - case 167: + case 184: + case 185: + case 187: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(252, 255); + jjCheckNAddStates(268, 271); break; - case 172: + case 192: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(212, 216); + jjCheckNAddStates(228, 232); break; - case 175: + case 195: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(256, 260); + jjCheckNAddStates(272, 276); break; - case 179: - case 180: + case 199: + case 200: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(261, 264); + jjCheckNAddStates(277, 280); break; - case 186: + case 206: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(207, 211); + jjCheckNAddStates(223, 227); break; - case 189: + case 209: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(265, 269); + jjCheckNAddStates(281, 285); break; - case 193: - case 194: + case 213: + case 214: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(270, 273); + jjCheckNAddStates(286, 289); break; default : break; } @@ -4086,7 +4358,7 @@ kind = 0x7fffffff; } ++curPos; - if ((i = jjnewStateCnt) == (startsAt = 199 - (jjnewStateCnt = startsAt))) + if ((i = jjnewStateCnt) == (startsAt = 219 - (jjnewStateCnt = startsAt))) return curPos; try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { return curPos; } @@ -4097,35 +4369,35 @@ switch (pos) { case 0: - if ((active1 & 0x4fe00L) != 0L) + if ((active1 & 0x9fc00L) != 0L) { - jjmatchedKind = 88; + jjmatchedKind = 89; return -1; } - if ((active1 & 0x40L) != 0L) + if ((active1 & 0x80L) != 0L) { - jjmatchedKind = 88; - return 157; + jjmatchedKind = 89; + return 177; } return -1; case 1: - if ((active1 & 0x4fe00L) != 0L) + if ((active1 & 0x9fc00L) != 0L) { if (jjmatchedPos == 0) { - jjmatchedKind = 88; + jjmatchedKind = 89; jjmatchedPos = 0; } return -1; } - if ((active1 & 0x40L) != 0L) + if ((active1 & 0x80L) != 0L) { if (jjmatchedPos == 0) { - jjmatchedKind = 88; + jjmatchedKind = 89; jjmatchedPos = 0; } - return 192; + return 212; } return -1; default : @@ -4141,23 +4413,23 @@ switch(curChar) { case 35: - return jjMoveStringLiteralDfa1_2(0x8000L); + return jjMoveStringLiteralDfa1_2(0x10000L); case 42: - return jjMoveStringLiteralDfa1_2(0x200L); + return jjMoveStringLiteralDfa1_2(0x400L); case 44: - return jjMoveStringLiteralDfa1_2(0x4000L); + return jjMoveStringLiteralDfa1_2(0x8000L); case 45: - return jjMoveStringLiteralDfa1_2(0x800L); + return jjMoveStringLiteralDfa1_2(0x1000L); case 47: - return jjMoveStringLiteralDfa1_2(0x400L); + return jjMoveStringLiteralDfa1_2(0x800L); case 92: - return jjMoveStringLiteralDfa1_2(0x40000L); + return jjMoveStringLiteralDfa1_2(0x80000L); case 94: - return jjMoveStringLiteralDfa1_2(0x2000L); + return jjMoveStringLiteralDfa1_2(0x4000L); case 95: - return jjMoveStringLiteralDfa1_2(0x1000L); + return jjMoveStringLiteralDfa1_2(0x2000L); case 123: - return jjMoveStringLiteralDfa1_2(0x40L); + return jjMoveStringLiteralDfa1_2(0x80L); default : return jjMoveNfa_2(1, 0); } @@ -4172,39 +4444,39 @@ switch(curChar) { case 35: - if ((active1 & 0x8000L) != 0L) - return jjStopAtPos(1, 79); + if ((active1 & 0x10000L) != 0L) + return jjStopAtPos(1, 80); break; case 42: - if ((active1 & 0x200L) != 0L) - return jjStopAtPos(1, 73); + if ((active1 & 0x400L) != 0L) + return jjStopAtPos(1, 74); break; case 44: - if ((active1 & 0x4000L) != 0L) - return jjStopAtPos(1, 78); + if ((active1 & 0x8000L) != 0L) + return jjStopAtPos(1, 79); break; case 45: - if ((active1 & 0x800L) != 0L) - return jjStopAtPos(1, 75); + if ((active1 & 0x1000L) != 0L) + return jjStopAtPos(1, 76); break; case 47: - if ((active1 & 0x400L) != 0L) - return jjStopAtPos(1, 74); + if ((active1 & 0x800L) != 0L) + return jjStopAtPos(1, 75); break; case 92: - if ((active1 & 0x40000L) != 0L) - return jjStopAtPos(1, 82); + if ((active1 & 0x80000L) != 0L) + return jjStopAtPos(1, 83); break; case 94: - if ((active1 & 0x2000L) != 0L) - return jjStopAtPos(1, 77); + if ((active1 & 0x4000L) != 0L) + return jjStopAtPos(1, 78); break; case 95: - if ((active1 & 0x1000L) != 0L) - return jjStopAtPos(1, 76); + if ((active1 & 0x2000L) != 0L) + return jjStopAtPos(1, 77); break; case 123: - return jjMoveStringLiteralDfa2_2(active1, 0x40L); + return jjMoveStringLiteralDfa2_2(active1, 0x80L); default : break; } @@ -4222,8 +4494,8 @@ switch(curChar) { case 123: - if ((active1 & 0x40L) != 0L) - return jjStopAtPos(2, 70); + if ((active1 & 0x80L) != 0L) + return jjStopAtPos(2, 71); break; default : break; @@ -4233,7 +4505,7 @@ private int jjMoveNfa_2(int startState, int curPos) { int startsAt = 0; - jjnewStateCnt = 192; + jjnewStateCnt = 212; int i = 1; jjstateSet[0] = startState; int kind = 0x7fffffff; @@ -4248,44 +4520,44 @@ { switch(jjstateSet[--i]) { - case 192: + case 212: if ((0x3ff0000ffffd9ffL & l) != 0L) - jjCheckNAddStates(279, 283); + jjCheckNAddStates(295, 299); if ((0x3ff0000ffffd9ffL & l) != 0L) - jjCheckNAddStates(284, 288); + jjCheckNAddStates(300, 304); break; case 1: if ((0x3ff0000ffffd9ffL & l) != 0L) { - if (kind > 87) - kind = 87; - jjCheckNAddTwoStates(117, 118); + if (kind > 88) + kind = 88; + jjCheckNAddTwoStates(115, 116); } else if ((0xfc00fffe00000000L & l) != 0L) { - if (kind > 88) - kind = 88; + if (kind > 89) + kind = 89; } else if ((0x2400L & l) != 0L) { - if (kind > 86) - kind = 86; - jjCheckNAddTwoStates(189, 190); + if (kind > 87) + kind = 87; + jjCheckNAddTwoStates(209, 210); } else if ((0x100000200L & l) != 0L) { - if (kind > 84) - kind = 84; - jjCheckNAddStates(289, 294); + if (kind > 85) + kind = 85; + jjCheckNAddStates(305, 310); } if (curChar == 13) - jjAddStates(295, 296); + jjAddStates(311, 312); else if (curChar == 40) - jjCheckNAddStates(297, 299); + jjCheckNAddStates(313, 315); else if (curChar == 33) - jjAddStates(300, 301); + jjAddStates(316, 317); else if (curChar == 41) - jjstateSet[jjnewStateCnt++] = 115; + jjstateSet[jjnewStateCnt++] = 113; break; case 0: if (curChar == 61 && kind > 10) @@ -4293,99 +4565,99 @@ break; case 4: if (curChar == 58) - jjCheckNAddStates(302, 305); + jjCheckNAddStates(318, 321); break; case 6: case 7: - jjCheckNAddStates(302, 305); + jjCheckNAddStates(318, 321); break; case 18: case 19: - jjCheckNAddStates(306, 310); + jjCheckNAddStates(322, 326); break; case 25: if (curChar != 58) break; - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(26, 27); break; case 26: if ((0xfffffffeffffd9ffL & l) == 0L) break; - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(26, 27); break; case 28: - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(26, 27); break; case 29: if ((0x3ff0000ffffd9ffL & l) == 0L) break; - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(26, 27); break; case 30: if ((0xfc00fffe00000000L & l) == 0L) break; - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(26, 27); break; case 36: if (curChar != 58) break; - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(37, 38); break; case 37: if ((0xfffffffeffffd9ffL & l) == 0L) break; - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(37, 38); break; case 39: - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(37, 38); break; case 40: if ((0x3ff0000ffffd9ffL & l) == 0L) break; - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(37, 38); break; case 41: if ((0xfc00fffe00000000L & l) == 0L) break; - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(37, 38); break; case 48: if (curChar == 58) - jjAddStates(311, 313); + jjAddStates(327, 329); break; case 49: if (curChar != 47) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(314, 317); + if (kind > 84) + kind = 84; + jjCheckNAddStates(330, 333); break; case 50: if ((0x2fff6fd200000000L & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(318, 322); + if (kind > 84) + kind = 84; + jjCheckNAddStates(334, 338); break; case 51: if (curChar == 37) @@ -4398,23 +4670,23 @@ case 53: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(318, 322); + if (kind > 84) + kind = 84; + jjCheckNAddStates(334, 338); break; case 54: if (curChar != 47) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(323, 327); + if (kind > 84) + kind = 84; + jjCheckNAddStates(339, 343); break; case 55: if ((0x2fff6fd200000000L & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(323, 327); + if (kind > 84) + kind = 84; + jjCheckNAddStates(339, 343); break; case 56: if (curChar == 37) @@ -4427,23 +4699,23 @@ case 58: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(323, 327); + if (kind > 84) + kind = 84; + jjCheckNAddStates(339, 343); break; case 59: if (curChar != 63) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(328, 330); + if (kind > 84) + kind = 84; + jjCheckNAddStates(344, 346); break; case 60: if ((0xafffefd200000000L & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(328, 330); + if (kind > 84) + kind = 84; + jjCheckNAddStates(344, 346); break; case 61: if (curChar == 37) @@ -4456,22 +4728,22 @@ case 63: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(328, 330); + if (kind > 84) + kind = 84; + jjCheckNAddStates(344, 346); break; case 64: if (curChar != 35) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddTwoStates(65, 66); break; case 65: if ((0xafffefd200000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddTwoStates(65, 66); break; case 66: @@ -4485,8 +4757,8 @@ case 68: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddTwoStates(65, 66); break; case 69: @@ -4512,30 +4784,30 @@ case 74: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(331, 335); + if (kind > 84) + kind = 84; + jjCheckNAddStates(347, 351); break; case 75: if ((0x2bff6fd200000000L & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(331, 335); + if (kind > 84) + kind = 84; + jjCheckNAddStates(347, 351); break; case 76: if (curChar != 47) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(336, 340); + if (kind > 84) + kind = 84; + jjCheckNAddStates(352, 356); break; case 77: if ((0x2fff6fd200000000L & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(336, 340); + if (kind > 84) + kind = 84; + jjCheckNAddStates(352, 356); break; case 78: if (curChar == 37) @@ -4548,372 +4820,434 @@ case 80: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(336, 340); + if (kind > 84) + kind = 84; + jjCheckNAddStates(352, 356); break; case 81: if ((0x2bff6fd200000000L & l) != 0L) jjCheckNAddTwoStates(72, 75); break; - case 89: + case 87: if ((0x3ff680000000000L & l) != 0L) - jjCheckNAddStates(341, 343); + jjCheckNAddStates(357, 359); break; - case 90: + case 88: if (curChar == 58) - jjstateSet[jjnewStateCnt++] = 91; + jjstateSet[jjnewStateCnt++] = 89; break; - case 92: + case 90: if ((0x3ff680000000000L & l) != 0L) - jjCheckNAddStates(344, 346); + jjCheckNAddStates(360, 362); break; - case 93: + case 91: if (curChar != 47) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(347, 354); + if (kind > 84) + kind = 84; + jjCheckNAddStates(363, 370); break; - case 94: + case 92: if ((0x2fff6fd200000000L & l) != 0L) - jjCheckNAddStates(355, 357); + jjCheckNAddStates(371, 373); break; - case 95: + case 93: if (curChar == 37) - jjCheckNAdd(96); + jjCheckNAdd(94); break; - case 96: + case 94: + if ((0x3ff000000000000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 95; + break; + case 95: if ((0x3ff000000000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 97; + jjCheckNAddStates(371, 373); break; case 97: + if (curChar == 37) + jjCheckNAdd(98); + break; + case 98: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(355, 357); + jjstateSet[jjnewStateCnt++] = 99; break; case 99: - if (curChar == 37) - jjCheckNAdd(100); + if ((0x3ff000000000000L & l) == 0L) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(374, 379); break; case 100: - if ((0x3ff000000000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 101; + if ((0x2bff6fd200000000L & l) == 0L) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(374, 379); break; case 101: + if (curChar == 58) + jjCheckNAdd(102); + break; + case 102: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(358, 363); + if (kind > 84) + kind = 84; + jjCheckNAddStates(380, 383); break; - case 102: - if ((0x2bff6fd200000000L & l) == 0L) + case 103: + if (curChar != 47) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(384, 388); + break; + case 104: + if ((0x2fff6fd200000000L & l) == 0L) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(384, 388); + break; + case 105: + if (curChar == 37) + jjstateSet[jjnewStateCnt++] = 106; + break; + case 106: + if ((0x3ff000000000000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 107; + break; + case 107: + if ((0x3ff000000000000L & l) == 0L) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(384, 388); + break; + case 108: + if (curChar == 37) + jjCheckNAddTwoStates(94, 98); + break; + case 109: + if (curChar == 47) + jjstateSet[jjnewStateCnt++] = 91; + break; + case 110: + if (curChar == 58) + jjstateSet[jjnewStateCnt++] = 109; + break; + case 111: + if (curChar != 41) + break; + if (kind > 86) + kind = 86; + jjCheckNAdd(112); + break; + case 112: + if ((0x100000200L & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(358, 363); + if (kind > 86) + kind = 86; + jjCheckNAdd(112); + break; + case 113: + if (curChar == 41) + jjstateSet[jjnewStateCnt++] = 111; break; - case 103: - if (curChar == 58) - jjCheckNAdd(104); + case 114: + if (curChar == 41) + jjstateSet[jjnewStateCnt++] = 113; break; - case 104: - if ((0x3ff000000000000L & l) == 0L) + case 115: + if ((0x3ff0000ffffd9ffL & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(364, 367); + if (kind > 88) + kind = 88; + jjCheckNAddTwoStates(115, 116); break; - case 105: - if (curChar != 47) + case 117: + if ((0xfc00fffe00000000L & l) != 0L && kind > 89) + kind = 89; + break; + case 124: + if (curChar != 63) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(368, 372); + if (kind > 84) + kind = 84; + jjCheckNAddStates(389, 392); break; - case 106: - if ((0x2fff6fd200000000L & l) == 0L) + case 125: + if ((0xafffefd200000000L & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(368, 372); + if (kind > 84) + kind = 84; + jjCheckNAddStates(389, 392); break; - case 107: + case 126: if (curChar == 37) - jjstateSet[jjnewStateCnt++] = 108; + jjstateSet[jjnewStateCnt++] = 127; break; - case 108: + case 127: if ((0x3ff000000000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 109; + jjstateSet[jjnewStateCnt++] = 128; break; - case 109: + case 128: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(368, 372); - break; - case 110: - if (curChar == 37) - jjCheckNAddTwoStates(96, 100); - break; - case 111: - if (curChar == 47) - jjstateSet[jjnewStateCnt++] = 93; - break; - case 112: - if (curChar == 58) - jjstateSet[jjnewStateCnt++] = 111; + if (kind > 84) + kind = 84; + jjCheckNAddStates(389, 392); break; - case 113: - if (curChar != 41) + case 129: + if (curChar != 35) break; - if (kind > 85) - kind = 85; - jjCheckNAdd(114); + if (kind > 84) + kind = 84; + jjCheckNAddStates(393, 398); break; - case 114: - if ((0x100000200L & l) == 0L) + case 130: + if ((0xafffefd200000000L & l) == 0L) break; - if (kind > 85) - kind = 85; - jjCheckNAdd(114); + if (kind > 84) + kind = 84; + jjCheckNAddStates(399, 402); break; - case 115: - if (curChar == 41) - jjstateSet[jjnewStateCnt++] = 113; + case 131: + if (curChar == 37) + jjstateSet[jjnewStateCnt++] = 132; break; - case 116: - if (curChar == 41) - jjstateSet[jjnewStateCnt++] = 115; + case 132: + if ((0x3ff000000000000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 133; break; - case 117: - if ((0x3ff0000ffffd9ffL & l) == 0L) + case 133: + if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 87) - kind = 87; - jjCheckNAddTwoStates(117, 118); + if (kind > 84) + kind = 84; + jjCheckNAddStates(399, 402); break; - case 119: - if ((0xfc00fffe00000000L & l) != 0L && kind > 88) - kind = 88; + case 134: + if (curChar == 58) + jjstateSet[jjnewStateCnt++] = 124; break; - case 120: + case 140: if (curChar == 33) - jjAddStates(300, 301); + jjAddStates(316, 317); break; - case 121: + case 141: if (curChar == 33 && kind > 11) kind = 11; break; - case 122: + case 142: if (curChar == 40) - jjCheckNAddStates(297, 299); + jjCheckNAddStates(313, 315); break; - case 123: + case 143: if (curChar == 37) - jjCheckNAddStates(373, 376); + jjCheckNAddStates(403, 406); break; - case 125: - jjCheckNAddStates(373, 376); + case 145: + jjCheckNAddStates(403, 406); break; - case 126: + case 146: if ((0xffffffdfffffffffL & l) != 0L) - jjCheckNAddStates(373, 376); + jjCheckNAddStates(403, 406); break; - case 127: + case 147: if (curChar == 37) - jjstateSet[jjnewStateCnt++] = 128; + jjstateSet[jjnewStateCnt++] = 148; break; - case 128: + case 148: if ((0xfffffdffffffffffL & l) != 0L) - jjCheckNAddStates(373, 376); + jjCheckNAddStates(403, 406); break; - case 129: + case 149: if (curChar == 41) - jjCheckNAddStates(377, 380); + jjCheckNAddStates(407, 410); break; - case 130: + case 150: if ((0x100000200L & l) != 0L) - jjCheckNAddStates(377, 380); + jjCheckNAddStates(407, 410); break; - case 131: + case 151: if (curChar == 10) - jjCheckNAddTwoStates(132, 135); + jjCheckNAddTwoStates(152, 155); break; - case 132: + case 152: if ((0x100000200L & l) != 0L) - jjCheckNAddTwoStates(132, 135); + jjCheckNAddTwoStates(152, 155); break; - case 133: - if (curChar == 40 && kind > 66) - kind = 66; + case 153: + if (curChar == 40 && kind > 67) + kind = 67; break; - case 134: + case 154: if (curChar == 40) - jjstateSet[jjnewStateCnt++] = 133; + jjstateSet[jjnewStateCnt++] = 153; break; - case 135: + case 155: if (curChar == 40) - jjstateSet[jjnewStateCnt++] = 134; + jjstateSet[jjnewStateCnt++] = 154; break; - case 136: + case 156: if (curChar == 13) - jjstateSet[jjnewStateCnt++] = 131; + jjstateSet[jjnewStateCnt++] = 151; break; - case 137: + case 157: if ((0x2400L & l) != 0L) - jjCheckNAddTwoStates(132, 135); + jjCheckNAddTwoStates(152, 155); break; - case 138: + case 158: if (curChar == 37) - jjstateSet[jjnewStateCnt++] = 129; + jjstateSet[jjnewStateCnt++] = 149; break; - case 139: + case 159: if (curChar == 37) - jjCheckNAddStates(381, 384); + jjCheckNAddStates(411, 414); break; - case 141: - jjCheckNAddStates(381, 384); + case 161: + jjCheckNAddStates(411, 414); break; - case 142: + case 162: if ((0xffffffdfffffffffL & l) != 0L) - jjCheckNAddStates(381, 384); + jjCheckNAddStates(411, 414); break; - case 143: + case 163: if (curChar == 37) - jjstateSet[jjnewStateCnt++] = 144; + jjstateSet[jjnewStateCnt++] = 164; break; - case 144: + case 164: if ((0xfffffdffffffffffL & l) != 0L) - jjCheckNAddStates(381, 384); + jjCheckNAddStates(411, 414); break; - case 145: - if (curChar == 41 && kind > 67) - kind = 67; + case 165: + if (curChar == 41 && kind > 68) + kind = 68; break; - case 146: + case 166: if (curChar == 37) - jjstateSet[jjnewStateCnt++] = 145; + jjstateSet[jjnewStateCnt++] = 165; break; - case 147: + case 167: if (curChar != 40) break; - if (kind > 68) - kind = 68; - jjCheckNAdd(148); + if (kind > 69) + kind = 69; + jjCheckNAdd(168); break; - case 148: + case 168: if ((0x100000200L & l) == 0L) break; - if (kind > 68) - kind = 68; - jjCheckNAdd(148); + if (kind > 69) + kind = 69; + jjCheckNAdd(168); break; - case 149: + case 169: if (curChar == 40) - jjstateSet[jjnewStateCnt++] = 147; + jjstateSet[jjnewStateCnt++] = 167; break; - case 150: + case 170: if ((0x100000200L & l) == 0L) break; - if (kind > 84) - kind = 84; - jjCheckNAddStates(289, 294); + if (kind > 85) + kind = 85; + jjCheckNAddStates(305, 310); break; - case 151: + case 171: if ((0x100000200L & l) != 0L) - jjCheckNAddTwoStates(151, 152); + jjCheckNAddTwoStates(171, 172); break; - case 152: + case 172: if (curChar == 40) - jjCheckNAdd(149); + jjCheckNAdd(169); break; - case 153: + case 173: if ((0x100000200L & l) == 0L) break; - if (kind > 84) - kind = 84; - jjCheckNAddTwoStates(153, 154); + if (kind > 85) + kind = 85; + jjCheckNAddTwoStates(173, 174); break; - case 155: + case 175: if ((0x100000200L & l) != 0L) - jjCheckNAddTwoStates(155, 116); + jjCheckNAddTwoStates(175, 114); break; - case 158: + case 178: if ((0x3ff0000ffffd9ffL & l) != 0L) - jjCheckNAddStates(284, 288); + jjCheckNAddStates(300, 304); break; - case 160: + case 180: if ((0x400600000000000L & l) != 0L) - jjCheckNAddTwoStates(161, 162); + jjCheckNAddTwoStates(181, 182); break; - case 161: + case 181: if ((0x3ff0000ffffd9ffL & l) != 0L) - jjCheckNAddStates(385, 389); + jjCheckNAddStates(415, 419); break; - case 163: + case 183: if ((0x100000200L & l) != 0L) - jjCheckNAddStates(390, 393); + jjCheckNAddStates(420, 423); break; - case 165: - case 166: - jjCheckNAddStates(390, 393); + case 185: + case 186: + jjCheckNAddStates(420, 423); break; - case 170: + case 190: if (curChar == 47) - jjstateSet[jjnewStateCnt++] = 169; + jjstateSet[jjnewStateCnt++] = 189; break; - case 172: + case 192: if ((0x3ff0000ffffd9ffL & l) != 0L) - jjCheckNAddStates(279, 283); + jjCheckNAddStates(295, 299); break; - case 174: + case 194: if ((0x400600000000000L & l) != 0L) - jjCheckNAddTwoStates(175, 176); + jjCheckNAddTwoStates(195, 196); break; - case 175: + case 195: if ((0x3ff0000ffffd9ffL & l) != 0L) - jjCheckNAddStates(394, 398); + jjCheckNAddStates(424, 428); break; - case 177: + case 197: if ((0x100000200L & l) != 0L) - jjCheckNAddStates(399, 402); + jjCheckNAddStates(429, 432); break; - case 179: - case 180: - jjCheckNAddStates(399, 402); + case 199: + case 200: + jjCheckNAddStates(429, 432); break; - case 185: + case 205: if (curChar == 13) - jjAddStates(295, 296); + jjAddStates(311, 312); break; - case 186: - if (curChar == 10 && kind > 86) - kind = 86; + case 206: + if (curChar == 10 && kind > 87) + kind = 87; break; - case 187: + case 207: if (curChar == 10) - jjCheckNAddTwoStates(189, 190); + jjCheckNAddTwoStates(209, 210); break; - case 188: - if (curChar == 10 && kind > 89) - kind = 89; + case 208: + if (curChar == 10 && kind > 90) + kind = 90; break; - case 189: + case 209: if (curChar == 13) - jjstateSet[jjnewStateCnt++] = 188; + jjstateSet[jjnewStateCnt++] = 208; break; - case 190: - if ((0x2400L & l) != 0L && kind > 89) - kind = 89; + case 210: + if ((0x2400L & l) != 0L && kind > 90) + kind = 90; break; - case 191: + case 211: if ((0x2400L & l) == 0L) break; - if (kind > 86) - kind = 86; - jjCheckNAddTwoStates(189, 190); + if (kind > 87) + kind = 87; + jjCheckNAddTwoStates(209, 210); break; default : break; } @@ -4926,40 +5260,40 @@ { switch(jjstateSet[--i]) { - case 157: + case 177: if (curChar == 123) - jjCheckNAddTwoStates(172, 173); + jjCheckNAddTwoStates(192, 193); if (curChar == 123) - jjCheckNAddTwoStates(158, 159); + jjCheckNAddTwoStates(178, 179); break; - case 192: + case 212: if ((0x87fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(279, 283); + jjCheckNAddStates(295, 299); else if (curChar == 126) - jjCheckNAdd(172); + jjCheckNAdd(192); if ((0x87fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(284, 288); + jjCheckNAddStates(300, 304); else if (curChar == 126) - jjCheckNAdd(158); + jjCheckNAdd(178); break; case 1: if ((0x87fffffe07fffffeL & l) != 0L) { - if (kind > 87) - kind = 87; - jjCheckNAddTwoStates(117, 118); + if (kind > 88) + kind = 88; + jjCheckNAddTwoStates(115, 116); } else if ((0x78000001f8000001L & l) != 0L) { - if (kind > 88) - kind = 88; + if (kind > 89) + kind = 89; } if ((0x7fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(341, 343); + jjCheckNAddStates(357, 359); else if (curChar == 126) - jjCheckNAddStates(403, 405); + jjCheckNAddStates(433, 435); else if (curChar == 123) - jjAddStates(406, 407); + jjAddStates(436, 437); else if (curChar == 91) jjstateSet[jjnewStateCnt++] = 3; else if (curChar == 124) @@ -4968,7 +5302,9 @@ kind = 11; } if (curChar == 109) - jjstateSet[jjnewStateCnt++] = 86; + jjAddStates(438, 439); + else if (curChar == 120) + jjstateSet[jjnewStateCnt++] = 84; else if (curChar == 97) jjstateSet[jjnewStateCnt++] = 46; else if (curChar == 105) @@ -4982,18 +5318,18 @@ break; case 3: if (curChar == 91) - jjCheckNAddStates(306, 310); + jjCheckNAddStates(322, 326); break; case 5: if (curChar == 126) jjstateSet[jjnewStateCnt++] = 6; break; case 6: - jjCheckNAddStates(302, 305); + jjCheckNAddStates(318, 321); break; case 7: if ((0xffffffffdfffffffL & l) != 0L) - jjCheckNAddStates(302, 305); + jjCheckNAddStates(318, 321); break; case 8: if (curChar == 93) @@ -5001,7 +5337,7 @@ break; case 9: if (curChar == 93) - jjCheckNAddStates(306, 310); + jjCheckNAddStates(322, 326); break; case 10: if (curChar == 101) @@ -5036,19 +5372,19 @@ jjstateSet[jjnewStateCnt++] = 18; break; case 18: - jjCheckNAddStates(306, 310); + jjCheckNAddStates(322, 326); break; case 19: if ((0xffffffffdfffffffL & l) != 0L) - jjCheckNAddStates(306, 310); + jjCheckNAddStates(322, 326); break; case 20: if (curChar == 93) jjCheckNAdd(19); break; case 21: - if (curChar == 93 && kind > 69) - kind = 69; + if (curChar == 93 && kind > 70) + kind = 70; break; case 22: if (curChar == 93) @@ -5064,26 +5400,26 @@ break; case 26: case 28: - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(26, 27); break; case 27: if (curChar == 126) - jjAddStates(408, 410); + jjAddStates(440, 442); break; case 29: if ((0x87fffffe07fffffeL & l) == 0L) break; - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(26, 27); break; case 30: if ((0x78000001f8000001L & l) == 0L) break; - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(26, 27); break; case 31: @@ -5108,26 +5444,26 @@ break; case 37: case 39: - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(37, 38); break; case 38: if (curChar == 126) - jjAddStates(411, 413); + jjAddStates(443, 445); break; case 40: if ((0x87fffffe07fffffeL & l) == 0L) break; - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(37, 38); break; case 41: if ((0x78000001f8000001L & l) == 0L) break; - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(37, 38); break; case 42: @@ -5157,9 +5493,9 @@ case 50: if ((0x47fffffe87ffffffL & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(318, 322); + if (kind > 84) + kind = 84; + jjCheckNAddStates(334, 338); break; case 52: if ((0x7e0000007eL & l) != 0L) @@ -5168,16 +5504,16 @@ case 53: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(318, 322); + if (kind > 84) + kind = 84; + jjCheckNAddStates(334, 338); break; case 55: if ((0x47fffffe87ffffffL & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(323, 327); + if (kind > 84) + kind = 84; + jjCheckNAddStates(339, 343); break; case 57: if ((0x7e0000007eL & l) != 0L) @@ -5186,16 +5522,16 @@ case 58: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(323, 327); + if (kind > 84) + kind = 84; + jjCheckNAddStates(339, 343); break; case 60: if ((0x47fffffe87ffffffL & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(328, 330); + if (kind > 84) + kind = 84; + jjCheckNAddStates(344, 346); break; case 62: if ((0x7e0000007eL & l) != 0L) @@ -5204,15 +5540,15 @@ case 63: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(328, 330); + if (kind > 84) + kind = 84; + jjCheckNAddStates(344, 346); break; case 65: if ((0x47fffffe87ffffffL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddTwoStates(65, 66); break; case 67: @@ -5222,8 +5558,8 @@ case 68: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddTwoStates(65, 66); break; case 70: @@ -5241,23 +5577,23 @@ case 74: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(331, 335); + if (kind > 84) + kind = 84; + jjCheckNAddStates(347, 351); break; case 75: if ((0x47fffffe87ffffffL & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(331, 335); + if (kind > 84) + kind = 84; + jjCheckNAddStates(347, 351); break; case 77: if ((0x47fffffe87ffffffL & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(336, 340); + if (kind > 84) + kind = 84; + jjCheckNAddStates(352, 356); break; case 79: if ((0x7e0000007eL & l) != 0L) @@ -5266,237 +5602,309 @@ case 80: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(336, 340); + if (kind > 84) + kind = 84; + jjCheckNAddStates(352, 356); break; case 81: if ((0x47fffffe87fffffeL & l) != 0L) jjCheckNAddTwoStates(72, 75); break; case 82: - if (curChar == 111) - jjstateSet[jjnewStateCnt++] = 48; + if (curChar == 112) + jjCheckNAdd(48); break; case 83: - if (curChar == 116) + if (curChar == 112) jjstateSet[jjnewStateCnt++] = 82; break; case 84: - if (curChar == 108) + if (curChar == 109) jjstateSet[jjnewStateCnt++] = 83; break; case 85: - if (curChar == 105) + if (curChar == 120) jjstateSet[jjnewStateCnt++] = 84; break; case 86: - if (curChar == 97) - jjstateSet[jjnewStateCnt++] = 85; - break; case 87: - if (curChar == 109) - jjstateSet[jjnewStateCnt++] = 86; + if ((0x7fffffe07fffffeL & l) != 0L) + jjCheckNAddStates(357, 359); break; - case 88: case 89: + case 90: if ((0x7fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(341, 343); + jjCheckNAddStates(360, 362); break; - case 91: case 92: - if ((0x7fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(344, 346); - break; - case 94: if ((0x47fffffe87fffffeL & l) != 0L) - jjCheckNAddStates(355, 357); + jjCheckNAddStates(371, 373); break; - case 96: + case 94: if ((0x7e0000007eL & l) != 0L) - jjstateSet[jjnewStateCnt++] = 97; + jjstateSet[jjnewStateCnt++] = 95; break; - case 97: + case 95: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(355, 357); + jjCheckNAddStates(371, 373); break; - case 98: + case 96: if (curChar != 64) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(358, 363); + if (kind > 84) + kind = 84; + jjCheckNAddStates(374, 379); break; - case 100: + case 98: if ((0x7e0000007eL & l) != 0L) - jjstateSet[jjnewStateCnt++] = 101; + jjstateSet[jjnewStateCnt++] = 99; break; - case 101: + case 99: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(358, 363); + if (kind > 84) + kind = 84; + jjCheckNAddStates(374, 379); break; - case 102: + case 100: if ((0x47fffffe87fffffeL & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(358, 363); + if (kind > 84) + kind = 84; + jjCheckNAddStates(374, 379); break; - case 106: + case 104: if ((0x47fffffe87ffffffL & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(368, 372); + if (kind > 84) + kind = 84; + jjCheckNAddStates(384, 388); break; - case 108: + case 106: if ((0x7e0000007eL & l) != 0L) - jjstateSet[jjnewStateCnt++] = 109; + jjstateSet[jjnewStateCnt++] = 107; break; - case 109: + case 107: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(368, 372); + if (kind > 84) + kind = 84; + jjCheckNAddStates(384, 388); break; - case 117: + case 115: if ((0x87fffffe07fffffeL & l) == 0L) break; - if (kind > 87) - kind = 87; - jjCheckNAddTwoStates(117, 118); + if (kind > 88) + kind = 88; + jjCheckNAddTwoStates(115, 116); break; - case 118: + case 116: if (curChar == 126) - jjCheckNAdd(117); + jjCheckNAdd(115); + break; + case 117: + if ((0x78000001f8000001L & l) != 0L && kind > 89) + kind = 89; + break; + case 118: + if (curChar == 109) + jjAddStates(438, 439); break; case 119: - if ((0x78000001f8000001L & l) != 0L && kind > 88) - kind = 88; + if (curChar == 111) + jjCheckNAdd(48); break; - case 124: - if (curChar == 126) - jjstateSet[jjnewStateCnt++] = 125; + case 120: + if (curChar == 116) + jjstateSet[jjnewStateCnt++] = 119; + break; + case 121: + if (curChar == 108) + jjstateSet[jjnewStateCnt++] = 120; + break; + case 122: + if (curChar == 105) + jjstateSet[jjnewStateCnt++] = 121; + break; + case 123: + if (curChar == 97) + jjstateSet[jjnewStateCnt++] = 122; break; case 125: - case 126: + if ((0x47fffffe87ffffffL & l) == 0L) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(389, 392); + break; + case 127: + if ((0x7e0000007eL & l) != 0L) + jjstateSet[jjnewStateCnt++] = 128; + break; case 128: - jjCheckNAddStates(373, 376); + if ((0x7e0000007eL & l) == 0L) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(389, 392); break; - case 140: - if (curChar == 126) - jjstateSet[jjnewStateCnt++] = 141; + case 130: + if ((0x47fffffe87ffffffL & l) == 0L) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(399, 402); + break; + case 132: + if ((0x7e0000007eL & l) != 0L) + jjstateSet[jjnewStateCnt++] = 133; + break; + case 133: + if ((0x7e0000007eL & l) == 0L) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(399, 402); + break; + case 135: + if (curChar == 116) + jjstateSet[jjnewStateCnt++] = 134; + break; + case 136: + if (curChar == 101) + jjstateSet[jjnewStateCnt++] = 135; + break; + case 137: + if (curChar == 110) + jjstateSet[jjnewStateCnt++] = 136; + break; + case 138: + if (curChar == 103) + jjstateSet[jjnewStateCnt++] = 137; + break; + case 139: + if (curChar == 97) + jjstateSet[jjnewStateCnt++] = 138; break; - case 141: - case 142: case 144: - jjCheckNAddStates(381, 384); + if (curChar == 126) + jjstateSet[jjnewStateCnt++] = 145; break; - case 154: + case 145: + case 146: + case 148: + jjCheckNAddStates(403, 406); + break; + case 160: if (curChar == 126) - jjCheckNAdd(153); + jjstateSet[jjnewStateCnt++] = 161; break; - case 156: + case 161: + case 162: + case 164: + jjCheckNAddStates(411, 414); + break; + case 174: + if (curChar == 126) + jjCheckNAdd(173); + break; + case 176: if (curChar == 123) - jjAddStates(406, 407); + jjAddStates(436, 437); break; - case 158: + case 178: if ((0x87fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(284, 288); + jjCheckNAddStates(300, 304); break; - case 159: + case 179: if (curChar == 126) - jjCheckNAdd(158); + jjCheckNAdd(178); break; - case 160: + case 180: if (curChar == 95) - jjCheckNAddTwoStates(161, 162); + jjCheckNAddTwoStates(181, 182); break; - case 161: + case 181: if ((0x87fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(385, 389); + jjCheckNAddStates(415, 419); break; - case 162: + case 182: if (curChar == 126) - jjCheckNAdd(161); + jjCheckNAdd(181); break; - case 164: + case 184: if (curChar == 126) - jjstateSet[jjnewStateCnt++] = 165; + jjstateSet[jjnewStateCnt++] = 185; break; - case 165: - jjCheckNAddStates(390, 393); + case 185: + jjCheckNAddStates(420, 423); break; - case 166: + case 186: if ((0xdfffffffffffffffL & l) != 0L) - jjCheckNAddStates(390, 393); + jjCheckNAddStates(420, 423); break; - case 167: + case 187: if (curChar == 125) - jjCheckNAdd(166); + jjCheckNAdd(186); break; - case 168: - if (curChar == 125 && kind > 71) - kind = 71; + case 188: + if (curChar == 125 && kind > 72) + kind = 72; break; - case 169: + case 189: if (curChar == 125) - jjstateSet[jjnewStateCnt++] = 168; + jjstateSet[jjnewStateCnt++] = 188; break; - case 171: + case 191: if (curChar == 123) - jjCheckNAddTwoStates(172, 173); + jjCheckNAddTwoStates(192, 193); break; - case 172: + case 192: if ((0x87fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(279, 283); + jjCheckNAddStates(295, 299); break; - case 173: + case 193: if (curChar == 126) - jjCheckNAdd(172); + jjCheckNAdd(192); break; - case 174: + case 194: if (curChar == 95) - jjCheckNAddTwoStates(175, 176); + jjCheckNAddTwoStates(195, 196); break; - case 175: + case 195: if ((0x87fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(394, 398); + jjCheckNAddStates(424, 428); break; - case 176: + case 196: if (curChar == 126) - jjCheckNAdd(175); + jjCheckNAdd(195); break; - case 178: + case 198: if (curChar == 126) - jjstateSet[jjnewStateCnt++] = 179; + jjstateSet[jjnewStateCnt++] = 199; break; - case 179: - jjCheckNAddStates(399, 402); + case 199: + jjCheckNAddStates(429, 432); break; - case 180: + case 200: if ((0xdfffffffffffffffL & l) != 0L) - jjCheckNAddStates(399, 402); + jjCheckNAddStates(429, 432); break; - case 181: + case 201: if (curChar == 125) - jjCheckNAdd(180); + jjCheckNAdd(200); break; - case 182: - if (curChar == 125 && kind > 72) - kind = 72; + case 202: + if (curChar == 125 && kind > 73) + kind = 73; break; - case 183: + case 203: if (curChar == 125) - jjstateSet[jjnewStateCnt++] = 182; + jjstateSet[jjnewStateCnt++] = 202; break; - case 184: + case 204: if (curChar == 126) - jjCheckNAddStates(403, 405); + jjCheckNAddStates(433, 435); break; default : break; } @@ -5513,37 +5921,37 @@ { switch(jjstateSet[--i]) { - case 192: + case 212: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(284, 288); + jjCheckNAddStates(300, 304); if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(279, 283); + jjCheckNAddStates(295, 299); break; case 1: - case 117: + case 115: if (!jjCanMove_0(hiByte, i1, i2, l1, l2)) break; - if (kind > 87) - kind = 87; - jjCheckNAddTwoStates(117, 118); + if (kind > 88) + kind = 88; + jjCheckNAddTwoStates(115, 116); break; case 6: case 7: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(302, 305); + jjCheckNAddStates(318, 321); break; case 18: case 19: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(306, 310); + jjCheckNAddStates(322, 326); break; case 26: case 28: case 29: if (!jjCanMove_0(hiByte, i1, i2, l1, l2)) break; - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(26, 27); break; case 37: @@ -5551,47 +5959,47 @@ case 40: if (!jjCanMove_0(hiByte, i1, i2, l1, l2)) break; - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(37, 38); break; - case 125: - case 126: - case 128: + case 145: + case 146: + case 148: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(373, 376); + jjCheckNAddStates(403, 406); break; - case 141: - case 142: - case 144: + case 161: + case 162: + case 164: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(381, 384); + jjCheckNAddStates(411, 414); break; - case 158: + case 178: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(284, 288); + jjCheckNAddStates(300, 304); break; - case 161: + case 181: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(385, 389); + jjCheckNAddStates(415, 419); break; - case 165: - case 166: + case 185: + case 186: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(390, 393); + jjCheckNAddStates(420, 423); break; - case 172: + case 192: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(279, 283); + jjCheckNAddStates(295, 299); break; - case 175: + case 195: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(394, 398); + jjCheckNAddStates(424, 428); break; - case 179: - case 180: + case 199: + case 200: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(399, 402); + jjCheckNAddStates(429, 432); break; default : break; } @@ -5604,7 +6012,7 @@ kind = 0x7fffffff; } ++curPos; - if ((i = jjnewStateCnt) == (startsAt = 192 - (jjnewStateCnt = startsAt))) + if ((i = jjnewStateCnt) == (startsAt = 212 - (jjnewStateCnt = startsAt))) return curPos; try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { return curPos; } @@ -5613,30 +6021,32 @@ static final int[] jjnextStates = { 23, 0, 24, 2, 5, 8, 26, 35, 46, 13, 21, 2, 3, 4, 24, 2, 5, 8, 27, 29, 30, 34, 33, 14, 15, 20, 36, 38, 39, 45, 43, 44, - 47, 49, 50, 61, 53, 59, 60, 58, 146, 147, 148, 149, 150, 113, 181, 182, - 118, 134, 144, 167, 168, 169, 172, 178, 153, 154, 155, 158, 165, 2, 4, 5, + 47, 49, 50, 61, 53, 59, 60, 58, 187, 188, 189, 192, 198, 173, 174, 175, + 178, 185, 166, 167, 168, 169, 170, 111, 201, 202, 138, 154, 164, 2, 4, 5, 20, 13, 14, 16, 17, 19, 46, 66, 78, 47, 48, 56, 61, 47, 48, 51, 56, 61, 51, 52, 53, 56, 61, 57, 58, 61, 69, 72, 73, 56, 61, 73, - 74, 75, 56, 61, 86, 87, 109, 87, 89, 109, 91, 95, 99, 100, 102, 56, - 61, 107, 92, 91, 95, 96, 99, 100, 102, 56, 61, 101, 102, 56, 61, 102, - 103, 104, 56, 61, 119, 121, 122, 133, 125, 131, 132, 130, 135, 137, 138, 141, - 155, 156, 157, 158, 165, 159, 161, 162, 165, 169, 170, 171, 172, 178, 173, 175, - 176, 178, 148, 114, 116, 152, 166, 25, 26, 27, 36, 37, 38, 8, 9, 10, + 74, 75, 56, 61, 84, 85, 107, 85, 87, 107, 89, 93, 97, 98, 100, 56, + 61, 105, 90, 89, 93, 94, 97, 98, 100, 56, 61, 99, 100, 56, 61, 100, + 101, 102, 56, 61, 122, 123, 56, 126, 127, 128, 56, 61, 62, 63, 127, 128, + 56, 61, 139, 141, 142, 153, 145, 151, 152, 150, 155, 157, 158, 161, 175, 176, + 177, 178, 185, 179, 181, 182, 185, 189, 190, 191, 192, 198, 193, 195, 196, 198, + 168, 112, 114, 172, 186, 120, 136, 25, 26, 27, 36, 37, 38, 8, 9, 10, 13, 19, 10, 11, 12, 13, 19, 14, 16, 17, 19, 21, 22, 23, 26, 28, - 23, 24, 25, 26, 28, 7, 29, 4, 5, 0, 2, 3, 6, 7, 10, 186, - 187, 188, 191, 197, 172, 173, 174, 177, 184, 136, 137, 142, 143, 118, 119, 123, - 124, 125, 129, 130, 131, 132, 113, 146, 162, 128, 135, 139, 140, 119, 121, 122, - 124, 119, 121, 122, 147, 149, 150, 161, 153, 159, 160, 158, 163, 165, 166, 169, - 174, 175, 176, 177, 184, 178, 180, 181, 184, 188, 189, 190, 191, 197, 192, 194, - 195, 197, 130, 114, 116, 171, 185, 172, 173, 174, 177, 183, 158, 159, 160, 163, - 170, 151, 152, 153, 154, 155, 116, 186, 187, 123, 139, 149, 0, 121, 5, 7, + 23, 24, 25, 26, 28, 7, 29, 4, 5, 0, 2, 3, 6, 7, 10, 206, + 207, 208, 211, 217, 192, 193, 194, 197, 204, 156, 157, 162, 163, 138, 139, 143, + 144, 145, 149, 150, 151, 152, 111, 166, 182, 148, 155, 159, 160, 139, 141, 142, + 144, 139, 141, 142, 167, 169, 170, 181, 173, 179, 180, 178, 183, 185, 186, 189, + 194, 195, 196, 197, 204, 198, 200, 201, 204, 208, 209, 210, 211, 217, 212, 214, + 215, 217, 150, 112, 114, 191, 205, 192, 193, 194, 197, 203, 178, 179, 180, 183, + 190, 171, 172, 173, 174, 175, 114, 206, 207, 143, 159, 169, 0, 141, 5, 7, 8, 23, 16, 17, 19, 20, 22, 49, 69, 81, 50, 51, 59, 64, 50, 51, 54, 59, 64, 54, 55, 56, 59, 64, 60, 61, 64, 72, 75, 76, 59, 64, - 76, 77, 78, 59, 64, 89, 90, 112, 90, 92, 112, 94, 98, 102, 103, 105, - 59, 64, 110, 95, 94, 98, 99, 102, 103, 105, 59, 64, 104, 105, 59, 64, - 105, 106, 107, 59, 64, 124, 126, 127, 138, 130, 136, 137, 135, 140, 142, 143, - 146, 160, 161, 162, 163, 170, 164, 166, 167, 170, 174, 175, 176, 177, 183, 178, - 180, 181, 183, 153, 117, 119, 157, 171, 28, 29, 30, 39, 40, 41, + 76, 77, 78, 59, 64, 87, 88, 110, 88, 90, 110, 92, 96, 100, 101, 103, + 59, 64, 108, 93, 92, 96, 97, 100, 101, 103, 59, 64, 102, 103, 59, 64, + 103, 104, 105, 59, 64, 125, 126, 59, 129, 130, 131, 59, 64, 65, 66, 130, + 131, 59, 64, 144, 146, 147, 158, 150, 156, 157, 155, 160, 162, 163, 166, 180, + 181, 182, 183, 190, 184, 186, 187, 190, 194, 195, 196, 197, 203, 198, 200, 201, + 203, 173, 115, 117, 177, 191, 123, 139, 28, 29, 30, 39, 40, 41, }; private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, long l2) { @@ -5658,7 +6068,7 @@ null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, -null, null, null, "\173\173\173", null, null, "\52\52", "\57\57", "\55\55", +null, null, null, null, "\173\173\173", null, null, "\52\52", "\57\57", "\55\55", "\137\137", "\136\136", "\54\54", "\43\43", null, null, "\134\134", null, null, null, null, null, null, null, null, null, }; @@ -5677,18 +6087,18 @@ public static final int[] jjnewLexState = { -1, 1, -1, 6, 6, -1, -1, -1, 6, -1, -1, -1, 1, 6, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 1, -1, 4, -1, 5, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 1, -1, -1, 1, 1, 1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 1, -1, 4, -1, 5, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 1, -1, -1, 1, 1, 1, }; static final long[] jjtoToken = { - 0x1ffdfdL, 0xffffffcL, + 0x1ffdfdL, 0x1ffffff8L, }; static final long[] jjtoSkip = { 0x202L, 0x0L, }; protected SimpleCharStream input_stream; -private final int[] jjrounds = new int[199]; -private final int[] jjstateSet = new int[398]; +private final int[] jjrounds = new int[219]; +private final int[] jjstateSet = new int[438]; private final StringBuilder jjimage = new StringBuilder(); private StringBuilder image = jjimage; private int jjimageLen; @@ -5719,7 +6129,7 @@ { int i; jjround = 0x80000001; - for (i = 199; i-- > 0;) + for (i = 219; i-- > 0;) jjrounds[i] = 0x80000000; } @@ -6011,24 +6421,24 @@ } } break; - case 66 : + case 67 : image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))); input_stream.backup("(((".length()); break; - case 68 : + case 69 : image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))); pushControlState(); break; - case 70 : - image.append(jjstrLiteralImages[70]); - lengthOfMatch = jjstrLiteralImages[70].length(); + case 71 : + image.append(jjstrLiteralImages[71]); + lengthOfMatch = jjstrLiteralImages[71].length(); verbatimBlockDepth++; break; - case 72 : + case 73 : image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))); initMacro(image); break; - case 85 : + case 86 : image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))); if (inEmbeddedDocument()) { popControlState(); @@ -6051,11 +6461,11 @@ } } break; - case 89 : + case 90 : image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))); clearBlockState(); break; - case 90 : + case 91 : image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))); clearBlockState(); break; diff -Nru wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki21/javacc/ParseException.java wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki21/javacc/ParseException.java --- wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki21/javacc/ParseException.java 2010-07-26 21:55:43.281250000 +0700 +++ wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki21/javacc/ParseException.java 2010-07-27 19:15:51.500000000 +0700 @@ -194,4 +194,4 @@ } } -/* JavaCC - OriginalChecksum=d50bbbf0353ef89c787b179d2b4069a8 (do not edit this line) */ +/* JavaCC - OriginalChecksum=e76796fbc0213ef864d46509284bd9db (do not edit this line) */ diff -Nru wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki21/javacc/SimpleCharStream.java wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki21/javacc/SimpleCharStream.java --- wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki21/javacc/SimpleCharStream.java 2010-07-26 21:55:43.265625000 +0700 +++ wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki21/javacc/SimpleCharStream.java 2010-07-27 19:15:51.515625000 +0700 @@ -478,4 +478,4 @@ } } -/* JavaCC - OriginalChecksum=09accf1053acbf7eb06ab411c1c8b13b (do not edit this line) */ +/* JavaCC - OriginalChecksum=a9d127b0997ecd3fd3134a528b323293 (do not edit this line) */ diff -Nru wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki21/javacc/Token.java wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki21/javacc/Token.java --- wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki21/javacc/Token.java 2010-07-26 21:55:43.234375000 +0700 +++ wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki21/javacc/Token.java 2010-07-27 19:15:51.500000000 +0700 @@ -138,4 +138,4 @@ } } -/* JavaCC - OriginalChecksum=dc117d73d92280c0a6827fafcb6df83e (do not edit this line) */ +/* JavaCC - OriginalChecksum=d43efa2c74692140554983782d91461f (do not edit this line) */ diff -Nru wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki21/javacc/TokenMgrError.java wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki21/javacc/TokenMgrError.java --- wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki21/javacc/TokenMgrError.java 2010-07-26 21:55:43.250000000 +0700 +++ wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki21/javacc/TokenMgrError.java 2010-07-27 19:15:51.484375000 +0700 @@ -154,4 +154,4 @@ this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason); } } -/* JavaCC - OriginalChecksum=cdc557d3f00f7777d4cef5a9f690506e (do not edit this line) */ +/* JavaCC - OriginalChecksum=e21f74016d31074ef9883a1289b92557 (do not edit this line) */ diff -Nru wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki21/javacc/XWikiScanner.jj wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki21/javacc/XWikiScanner.jj --- wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki21/javacc/XWikiScanner.jj 2010-07-26 21:55:43.281250000 +0700 +++ wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki21/javacc/XWikiScanner.jj 2010-07-27 19:11:02.453125000 +0700 @@ -383,8 +383,9 @@ | <#IMAGE: "image:" ("~" ~[] | | )* > | <#ATTACH: "attach:" ("~" ~[] | | )* > - | <#XWIKI_URI: ( ( ( | ) ) | "://" ) ("?" )? ("#" )? > - | <#XWIKI_URI_URIS: "mailto:" > + | <#XWIKI_URI: ( ( ( | ) ) | | "://" ) ("?" )? ("#" )? > + | <#XWIKI_URI_URIS: ( "mailto:" | "xmpp:" ) > + | <#XWIKI_URI_MAGNET: "magnet:?" ("#" )? > | <#XWIKI_CHAR: | "~" > | <#EMPTY_LINE: > // diff -Nru wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki21/javacc/XWikiScannerConstants.java wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki21/javacc/XWikiScannerConstants.java --- wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki21/javacc/XWikiScannerConstants.java 2010-07-26 21:55:43.265625000 +0700 +++ wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki21/javacc/XWikiScannerConstants.java 2010-07-27 19:15:51.515625000 +0700 @@ -81,123 +81,125 @@ /** RegularExpression Id. */ int XWIKI_URI_URIS = 32; /** RegularExpression Id. */ - int XWIKI_CHAR = 33; + int XWIKI_URI_MAGNET = 33; /** RegularExpression Id. */ - int EMPTY_LINE = 34; + int XWIKI_CHAR = 34; /** RegularExpression Id. */ - int NEW_LINE = 35; + int EMPTY_LINE = 35; /** RegularExpression Id. */ - int SPACE = 36; + int NEW_LINE = 36; /** RegularExpression Id. */ - int SPECIAL_SYMBOL = 37; + int SPACE = 37; /** RegularExpression Id. */ - int CHAR = 38; + int SPECIAL_SYMBOL = 38; /** RegularExpression Id. */ - int URI = 39; + int CHAR = 39; /** RegularExpression Id. */ - int ALPHA = 40; + int URI = 40; /** RegularExpression Id. */ - int DIGIT = 41; + int ALPHA = 41; /** RegularExpression Id. */ - int HEXDIG = 42; + int DIGIT = 42; /** RegularExpression Id. */ - int URI_GEN_DELIMS = 43; + int HEXDIG = 43; /** RegularExpression Id. */ - int URI_SUB_DELIMS = 44; + int URI_GEN_DELIMS = 44; /** RegularExpression Id. */ - int URI_UNRESERVED = 45; + int URI_SUB_DELIMS = 45; /** RegularExpression Id. */ - int URI_RESERVED = 46; + int URI_UNRESERVED = 46; /** RegularExpression Id. */ - int URI_SCHEME = 47; + int URI_RESERVED = 47; /** RegularExpression Id. */ - int URI_SCHEME_COMPOSITE = 48; + int URI_SCHEME = 48; /** RegularExpression Id. */ - int URI_PCT_ENCODED = 49; + int URI_SCHEME_COMPOSITE = 49; /** RegularExpression Id. */ - int URI_PCHAR_FIRST = 50; + int URI_PCT_ENCODED = 50; /** RegularExpression Id. */ - int URI_PCHAR = 51; + int URI_PCHAR_FIRST = 51; /** RegularExpression Id. */ - int URI_QUERY = 52; + int URI_PCHAR = 52; /** RegularExpression Id. */ - int URI_FRAGMENT = 53; + int URI_QUERY = 53; /** RegularExpression Id. */ - int URI_HIER_PART = 54; + int URI_FRAGMENT = 54; /** RegularExpression Id. */ - int URI_AUTHORITY = 55; + int URI_HIER_PART = 55; /** RegularExpression Id. */ - int URI_USERINFO = 56; + int URI_AUTHORITY = 56; /** RegularExpression Id. */ - int URI_PATH_ABEMPTY = 57; + int URI_USERINFO = 57; /** RegularExpression Id. */ - int URI_PATH_ABSOLUTE = 58; + int URI_PATH_ABEMPTY = 58; /** RegularExpression Id. */ - int URI_PATH_ROOTLESS = 59; + int URI_PATH_ABSOLUTE = 59; /** RegularExpression Id. */ - int URI_SEGMENT = 60; + int URI_PATH_ROOTLESS = 60; /** RegularExpression Id. */ - int URI_SEGMENT_NZ = 61; + int URI_SEGMENT = 61; /** RegularExpression Id. */ - int URI_SEGMENT_NZ_NC = 62; + int URI_SEGMENT_NZ = 62; /** RegularExpression Id. */ - int URI_PORT = 63; + int URI_SEGMENT_NZ_NC = 63; /** RegularExpression Id. */ - int URI_HOST = 64; + int URI_PORT = 64; /** RegularExpression Id. */ - int URI_REG_NAME = 65; + int URI_HOST = 65; /** RegularExpression Id. */ - int DOC_PARAMETERS = 66; + int URI_REG_NAME = 66; /** RegularExpression Id. */ - int INLINE_PARAMETERS = 67; + int DOC_PARAMETERS = 67; /** RegularExpression Id. */ - int DOC_BEGIN = 68; + int INLINE_PARAMETERS = 68; /** RegularExpression Id. */ - int D_REFERENCE = 69; + int DOC_BEGIN = 69; /** RegularExpression Id. */ - int VERBATIM_START = 70; + int D_REFERENCE = 70; /** RegularExpression Id. */ - int MACRO_EMPTY = 71; + int VERBATIM_START = 71; /** RegularExpression Id. */ - int MACRO_START = 72; + int MACRO_EMPTY = 72; /** RegularExpression Id. */ - int STRONG = 73; + int MACRO_START = 73; /** RegularExpression Id. */ - int EM = 74; + int STRONG = 74; /** RegularExpression Id. */ - int STRIKE = 75; + int EM = 75; /** RegularExpression Id. */ - int INS = 76; + int STRIKE = 76; /** RegularExpression Id. */ - int SUP = 77; + int INS = 77; /** RegularExpression Id. */ - int SUB = 78; + int SUP = 78; /** RegularExpression Id. */ - int MONO = 79; + int SUB = 79; /** RegularExpression Id. */ - int D_IMAGE = 80; + int MONO = 80; /** RegularExpression Id. */ - int D_ATTACH = 81; + int D_IMAGE = 81; /** RegularExpression Id. */ - int BR = 82; + int D_ATTACH = 82; /** RegularExpression Id. */ - int D_XWIKI_URI = 83; + int BR = 83; /** RegularExpression Id. */ - int XWIKI_SPACE = 84; + int D_XWIKI_URI = 84; /** RegularExpression Id. */ - int DOC_END = 85; + int XWIKI_SPACE = 85; /** RegularExpression Id. */ - int NL = 86; + int DOC_END = 86; /** RegularExpression Id. */ - int WORD = 87; + int NL = 87; /** RegularExpression Id. */ - int XWIKI_SPECIAL_SYMBOL = 88; + int WORD = 88; /** RegularExpression Id. */ - int TABLE_END_EMPTY_LINE = 89; + int XWIKI_SPECIAL_SYMBOL = 89; /** RegularExpression Id. */ - int HEADER_END_EMPTY_LINE = 90; + int TABLE_END_EMPTY_LINE = 90; /** RegularExpression Id. */ - int BLOCK_END = 91; + int HEADER_END_EMPTY_LINE = 91; + /** RegularExpression Id. */ + int BLOCK_END = 92; /** Lexical state. */ int DEFAULT = 0; @@ -248,7 +250,8 @@ "", "", "", - "\"mailto:\"", + "", + "", "", "", "", diff -Nru wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki21/javacc/XWikiScannerTokenManager.java wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki21/javacc/XWikiScannerTokenManager.java --- wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki21/javacc/XWikiScannerTokenManager.java 2010-07-26 21:55:43.265625000 +0700 +++ wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki21/javacc/XWikiScannerTokenManager.java 2010-07-27 19:15:51.453125000 +0700 @@ -416,8 +416,8 @@ jjCheckNAddTwoStates(55, 58); break; case 56: - if (curChar == 40 && kind > 66) - kind = 66; + if (curChar == 40 && kind > 67) + kind = 67; break; case 57: if (curChar == 40) @@ -549,35 +549,35 @@ switch (pos) { case 0: - if ((active1 & 0x4fe00L) != 0L) + if ((active1 & 0x9fc00L) != 0L) { - jjmatchedKind = 88; + jjmatchedKind = 89; return -1; } - if ((active1 & 0x40L) != 0L) + if ((active1 & 0x80L) != 0L) { - jjmatchedKind = 88; - return 152; + jjmatchedKind = 89; + return 172; } return -1; case 1: - if ((active1 & 0x4fe00L) != 0L) + if ((active1 & 0x9fc00L) != 0L) { if (jjmatchedPos == 0) { - jjmatchedKind = 88; + jjmatchedKind = 89; jjmatchedPos = 0; } return -1; } - if ((active1 & 0x40L) != 0L) + if ((active1 & 0x80L) != 0L) { if (jjmatchedPos == 0) { - jjmatchedKind = 88; + jjmatchedKind = 89; jjmatchedPos = 0; } - return 187; + return 207; } return -1; default : @@ -599,23 +599,23 @@ switch(curChar) { case 35: - return jjMoveStringLiteralDfa1_6(0x8000L); + return jjMoveStringLiteralDfa1_6(0x10000L); case 42: - return jjMoveStringLiteralDfa1_6(0x200L); + return jjMoveStringLiteralDfa1_6(0x400L); case 44: - return jjMoveStringLiteralDfa1_6(0x4000L); + return jjMoveStringLiteralDfa1_6(0x8000L); case 45: - return jjMoveStringLiteralDfa1_6(0x800L); + return jjMoveStringLiteralDfa1_6(0x1000L); case 47: - return jjMoveStringLiteralDfa1_6(0x400L); + return jjMoveStringLiteralDfa1_6(0x800L); case 92: - return jjMoveStringLiteralDfa1_6(0x40000L); + return jjMoveStringLiteralDfa1_6(0x80000L); case 94: - return jjMoveStringLiteralDfa1_6(0x2000L); + return jjMoveStringLiteralDfa1_6(0x4000L); case 95: - return jjMoveStringLiteralDfa1_6(0x1000L); + return jjMoveStringLiteralDfa1_6(0x2000L); case 123: - return jjMoveStringLiteralDfa1_6(0x40L); + return jjMoveStringLiteralDfa1_6(0x80L); default : return jjMoveNfa_6(21, 0); } @@ -630,39 +630,39 @@ switch(curChar) { case 35: - if ((active1 & 0x8000L) != 0L) - return jjStopAtPos(1, 79); + if ((active1 & 0x10000L) != 0L) + return jjStopAtPos(1, 80); break; case 42: - if ((active1 & 0x200L) != 0L) - return jjStopAtPos(1, 73); + if ((active1 & 0x400L) != 0L) + return jjStopAtPos(1, 74); break; case 44: - if ((active1 & 0x4000L) != 0L) - return jjStopAtPos(1, 78); + if ((active1 & 0x8000L) != 0L) + return jjStopAtPos(1, 79); break; case 45: - if ((active1 & 0x800L) != 0L) - return jjStopAtPos(1, 75); + if ((active1 & 0x1000L) != 0L) + return jjStopAtPos(1, 76); break; case 47: - if ((active1 & 0x400L) != 0L) - return jjStopAtPos(1, 74); + if ((active1 & 0x800L) != 0L) + return jjStopAtPos(1, 75); break; case 92: - if ((active1 & 0x40000L) != 0L) - return jjStopAtPos(1, 82); + if ((active1 & 0x80000L) != 0L) + return jjStopAtPos(1, 83); break; case 94: - if ((active1 & 0x2000L) != 0L) - return jjStopAtPos(1, 77); + if ((active1 & 0x4000L) != 0L) + return jjStopAtPos(1, 78); break; case 95: - if ((active1 & 0x1000L) != 0L) - return jjStopAtPos(1, 76); + if ((active1 & 0x2000L) != 0L) + return jjStopAtPos(1, 77); break; case 123: - return jjMoveStringLiteralDfa2_6(active1, 0x40L); + return jjMoveStringLiteralDfa2_6(active1, 0x80L); default : break; } @@ -680,8 +680,8 @@ switch(curChar) { case 123: - if ((active1 & 0x40L) != 0L) - return jjStopAtPos(2, 70); + if ((active1 & 0x80L) != 0L) + return jjStopAtPos(2, 71); break; default : break; @@ -691,7 +691,7 @@ private int jjMoveNfa_6(int startState, int curPos) { int startsAt = 0; - jjnewStateCnt = 187; + jjnewStateCnt = 207; int i = 1; jjstateSet[0] = startState; int kind = 0x7fffffff; @@ -706,42 +706,42 @@ { switch(jjstateSet[--i]) { + case 207: + if ((0x3ff0000ffffd9ffL & l) != 0L) + jjCheckNAddStates(40, 44); + if ((0x3ff0000ffffd9ffL & l) != 0L) + jjCheckNAddStates(45, 49); + break; case 21: if ((0x3ff0000ffffd9ffL & l) != 0L) { - if (kind > 87) - kind = 87; - jjCheckNAddTwoStates(114, 115); + if (kind > 88) + kind = 88; + jjCheckNAddTwoStates(112, 113); } else if ((0xfc00fffe00000000L & l) != 0L) { - if (kind > 88) - kind = 88; + if (kind > 89) + kind = 89; } else if ((0x2400L & l) != 0L) { - if (kind > 86) - kind = 86; - jjCheckNAddTwoStates(184, 185); + if (kind > 87) + kind = 87; + jjCheckNAddTwoStates(204, 205); } else if ((0x100000200L & l) != 0L) { - if (kind > 84) - kind = 84; - jjCheckNAddStates(40, 45); + if (kind > 85) + kind = 85; + jjCheckNAddStates(50, 55); } if (curChar == 13) - jjAddStates(46, 47); + jjAddStates(56, 57); else if (curChar == 40) - jjCheckNAddStates(48, 50); + jjCheckNAddStates(58, 60); else if (curChar == 41) - jjstateSet[jjnewStateCnt++] = 112; - break; - case 187: - if ((0x3ff0000ffffd9ffL & l) != 0L) - jjCheckNAddStates(51, 55); - if ((0x3ff0000ffffd9ffL & l) != 0L) - jjCheckNAddStates(56, 60); + jjstateSet[jjnewStateCnt++] = 110; break; case 1: if (curChar == 58) @@ -758,67 +758,67 @@ case 22: if (curChar != 58) break; - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(23, 24); break; case 23: if ((0xfffffffeffffd9ffL & l) == 0L) break; - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(23, 24); break; case 25: - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(23, 24); break; case 26: if ((0x3ff0000ffffd9ffL & l) == 0L) break; - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(23, 24); break; case 27: if ((0xfc00fffe00000000L & l) == 0L) break; - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(23, 24); break; case 33: if (curChar != 58) break; - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(34, 35); break; case 34: if ((0xfffffffeffffd9ffL & l) == 0L) break; - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(34, 35); break; case 36: - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(34, 35); break; case 37: if ((0x3ff0000ffffd9ffL & l) == 0L) break; - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(34, 35); break; case 38: if ((0xfc00fffe00000000L & l) == 0L) break; - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(34, 35); break; case 45: @@ -828,15 +828,15 @@ case 46: if (curChar != 47) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(73, 76); break; case 47: if ((0x2fff6fd200000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(77, 81); break; case 48: @@ -850,22 +850,22 @@ case 50: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(77, 81); break; case 51: if (curChar != 47) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(82, 86); break; case 52: if ((0x2fff6fd200000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(82, 86); break; case 53: @@ -879,22 +879,22 @@ case 55: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(82, 86); break; case 56: if (curChar != 63) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(87, 89); break; case 57: if ((0xafffefd200000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(87, 89); break; case 58: @@ -908,22 +908,22 @@ case 60: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(87, 89); break; case 61: if (curChar != 35) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddTwoStates(62, 63); break; case 62: if ((0xafffefd200000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddTwoStates(62, 63); break; case 63: @@ -937,8 +937,8 @@ case 65: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddTwoStates(62, 63); break; case 66: @@ -964,29 +964,29 @@ case 71: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(90, 94); break; case 72: if ((0x2bff6fd200000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(90, 94); break; case 73: if (curChar != 47) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(95, 99); break; case 74: if ((0x2fff6fd200000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(95, 99); break; case 75: @@ -1000,364 +1000,426 @@ case 77: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(95, 99); break; case 78: if ((0x2bff6fd200000000L & l) != 0L) jjCheckNAddTwoStates(69, 72); break; - case 86: + case 84: if ((0x3ff680000000000L & l) != 0L) jjCheckNAddStates(100, 102); break; - case 87: + case 85: if (curChar == 58) - jjstateSet[jjnewStateCnt++] = 88; + jjstateSet[jjnewStateCnt++] = 86; break; - case 89: + case 87: if ((0x3ff680000000000L & l) != 0L) jjCheckNAddStates(103, 105); break; - case 90: + case 88: if (curChar != 47) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(106, 113); break; - case 91: + case 89: if ((0x2fff6fd200000000L & l) != 0L) jjCheckNAddStates(114, 116); break; - case 92: + case 90: if (curChar == 37) - jjCheckNAdd(93); + jjCheckNAdd(91); break; - case 93: + case 91: if ((0x3ff000000000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 94; + jjstateSet[jjnewStateCnt++] = 92; break; - case 94: + case 92: if ((0x3ff000000000000L & l) != 0L) jjCheckNAddStates(114, 116); break; - case 96: + case 94: if (curChar == 37) - jjCheckNAdd(97); + jjCheckNAdd(95); break; - case 97: + case 95: if ((0x3ff000000000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 98; + jjstateSet[jjnewStateCnt++] = 96; break; - case 98: + case 96: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(117, 122); break; - case 99: + case 97: if ((0x2bff6fd200000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(117, 122); break; - case 100: + case 98: if (curChar == 58) - jjCheckNAdd(101); + jjCheckNAdd(99); break; - case 101: + case 99: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(123, 126); break; - case 102: + case 100: if (curChar != 47) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(127, 131); break; - case 103: + case 101: if ((0x2fff6fd200000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(127, 131); break; - case 104: + case 102: if (curChar == 37) - jjstateSet[jjnewStateCnt++] = 105; + jjstateSet[jjnewStateCnt++] = 103; break; - case 105: + case 103: if ((0x3ff000000000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 106; + jjstateSet[jjnewStateCnt++] = 104; break; - case 106: + case 104: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(127, 131); break; - case 107: + case 105: if (curChar == 37) - jjCheckNAddTwoStates(93, 97); + jjCheckNAddTwoStates(91, 95); break; - case 108: + case 106: if (curChar == 47) - jjstateSet[jjnewStateCnt++] = 90; + jjstateSet[jjnewStateCnt++] = 88; break; - case 109: + case 107: if (curChar == 58) - jjstateSet[jjnewStateCnt++] = 108; + jjstateSet[jjnewStateCnt++] = 106; break; - case 110: + case 108: if (curChar != 41) break; - if (kind > 85) - kind = 85; - jjCheckNAdd(111); + if (kind > 86) + kind = 86; + jjCheckNAdd(109); break; - case 111: + case 109: if ((0x100000200L & l) == 0L) break; - if (kind > 85) - kind = 85; - jjCheckNAdd(111); + if (kind > 86) + kind = 86; + jjCheckNAdd(109); break; - case 112: + case 110: if (curChar == 41) - jjstateSet[jjnewStateCnt++] = 110; + jjstateSet[jjnewStateCnt++] = 108; break; - case 113: + case 111: if (curChar == 41) - jjstateSet[jjnewStateCnt++] = 112; + jjstateSet[jjnewStateCnt++] = 110; break; - case 114: + case 112: if ((0x3ff0000ffffd9ffL & l) == 0L) break; - if (kind > 87) - kind = 87; - jjCheckNAddTwoStates(114, 115); - break; - case 116: - if ((0xfc00fffe00000000L & l) != 0L && kind > 88) + if (kind > 88) kind = 88; + jjCheckNAddTwoStates(112, 113); break; - case 117: - if (curChar == 40) - jjCheckNAddStates(48, 50); - break; - case 118: - if (curChar == 37) - jjCheckNAddStates(132, 135); - break; - case 120: - jjCheckNAddStates(132, 135); + case 114: + if ((0xfc00fffe00000000L & l) != 0L && kind > 89) + kind = 89; break; case 121: - if ((0xffffffdfffffffffL & l) != 0L) - jjCheckNAddStates(132, 135); + if (curChar != 63) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(132, 135); break; case 122: - if (curChar == 37) - jjstateSet[jjnewStateCnt++] = 123; + if ((0xafffefd200000000L & l) == 0L) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(132, 135); break; case 123: - if ((0xfffffdffffffffffL & l) != 0L) - jjCheckNAddStates(132, 135); + if (curChar == 37) + jjstateSet[jjnewStateCnt++] = 124; break; case 124: - if (curChar == 41) - jjCheckNAddStates(136, 139); + if ((0x3ff000000000000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 125; break; case 125: - if ((0x100000200L & l) != 0L) - jjCheckNAddStates(136, 139); + if ((0x3ff000000000000L & l) == 0L) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(132, 135); break; case 126: - if (curChar == 10) - jjCheckNAddTwoStates(127, 130); + if (curChar != 35) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(136, 141); break; case 127: - if ((0x100000200L & l) != 0L) - jjCheckNAddTwoStates(127, 130); + if ((0xafffefd200000000L & l) == 0L) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(142, 145); break; case 128: - if (curChar == 40 && kind > 66) - kind = 66; + if (curChar == 37) + jjstateSet[jjnewStateCnt++] = 129; break; case 129: - if (curChar == 40) - jjstateSet[jjnewStateCnt++] = 128; + if ((0x3ff000000000000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 130; break; case 130: - if (curChar == 40) - jjstateSet[jjnewStateCnt++] = 129; + if ((0x3ff000000000000L & l) == 0L) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(142, 145); break; case 131: - if (curChar == 13) - jjstateSet[jjnewStateCnt++] = 126; - break; - case 132: - if ((0x2400L & l) != 0L) - jjCheckNAddTwoStates(127, 130); + if (curChar == 58) + jjstateSet[jjnewStateCnt++] = 121; break; - case 133: - if (curChar == 37) - jjstateSet[jjnewStateCnt++] = 124; + case 137: + if (curChar == 40) + jjCheckNAddStates(58, 60); break; - case 134: + case 138: if (curChar == 37) - jjCheckNAddStates(140, 143); + jjCheckNAddStates(146, 149); break; - case 136: - jjCheckNAddStates(140, 143); + case 140: + jjCheckNAddStates(146, 149); break; - case 137: + case 141: if ((0xffffffdfffffffffL & l) != 0L) - jjCheckNAddStates(140, 143); + jjCheckNAddStates(146, 149); break; - case 138: + case 142: if (curChar == 37) - jjstateSet[jjnewStateCnt++] = 139; + jjstateSet[jjnewStateCnt++] = 143; break; - case 139: + case 143: if ((0xfffffdffffffffffL & l) != 0L) - jjCheckNAddStates(140, 143); + jjCheckNAddStates(146, 149); break; - case 140: - if (curChar == 41 && kind > 67) + case 144: + if (curChar == 41) + jjCheckNAddStates(150, 153); + break; + case 145: + if ((0x100000200L & l) != 0L) + jjCheckNAddStates(150, 153); + break; + case 146: + if (curChar == 10) + jjCheckNAddTwoStates(147, 150); + break; + case 147: + if ((0x100000200L & l) != 0L) + jjCheckNAddTwoStates(147, 150); + break; + case 148: + if (curChar == 40 && kind > 67) kind = 67; break; - case 141: + case 149: + if (curChar == 40) + jjstateSet[jjnewStateCnt++] = 148; + break; + case 150: + if (curChar == 40) + jjstateSet[jjnewStateCnt++] = 149; + break; + case 151: + if (curChar == 13) + jjstateSet[jjnewStateCnt++] = 146; + break; + case 152: + if ((0x2400L & l) != 0L) + jjCheckNAddTwoStates(147, 150); + break; + case 153: if (curChar == 37) - jjstateSet[jjnewStateCnt++] = 140; + jjstateSet[jjnewStateCnt++] = 144; break; - case 142: + case 154: + if (curChar == 37) + jjCheckNAddStates(154, 157); + break; + case 156: + jjCheckNAddStates(154, 157); + break; + case 157: + if ((0xffffffdfffffffffL & l) != 0L) + jjCheckNAddStates(154, 157); + break; + case 158: + if (curChar == 37) + jjstateSet[jjnewStateCnt++] = 159; + break; + case 159: + if ((0xfffffdffffffffffL & l) != 0L) + jjCheckNAddStates(154, 157); + break; + case 160: + if (curChar == 41 && kind > 68) + kind = 68; + break; + case 161: + if (curChar == 37) + jjstateSet[jjnewStateCnt++] = 160; + break; + case 162: if (curChar != 40) break; - if (kind > 68) - kind = 68; - jjCheckNAdd(143); + if (kind > 69) + kind = 69; + jjCheckNAdd(163); break; - case 143: + case 163: if ((0x100000200L & l) == 0L) break; - if (kind > 68) - kind = 68; - jjCheckNAdd(143); + if (kind > 69) + kind = 69; + jjCheckNAdd(163); break; - case 144: + case 164: if (curChar == 40) - jjstateSet[jjnewStateCnt++] = 142; + jjstateSet[jjnewStateCnt++] = 162; break; - case 145: + case 165: if ((0x100000200L & l) == 0L) break; - if (kind > 84) - kind = 84; - jjCheckNAddStates(40, 45); + if (kind > 85) + kind = 85; + jjCheckNAddStates(50, 55); break; - case 146: + case 166: if ((0x100000200L & l) != 0L) - jjCheckNAddTwoStates(146, 147); + jjCheckNAddTwoStates(166, 167); break; - case 147: + case 167: if (curChar == 40) - jjCheckNAdd(144); + jjCheckNAdd(164); break; - case 148: + case 168: if ((0x100000200L & l) == 0L) break; - if (kind > 84) - kind = 84; - jjCheckNAddTwoStates(148, 149); + if (kind > 85) + kind = 85; + jjCheckNAddTwoStates(168, 169); break; - case 150: + case 170: if ((0x100000200L & l) != 0L) - jjCheckNAddTwoStates(150, 113); + jjCheckNAddTwoStates(170, 111); break; - case 153: + case 173: if ((0x3ff0000ffffd9ffL & l) != 0L) - jjCheckNAddStates(56, 60); + jjCheckNAddStates(45, 49); break; - case 155: + case 175: if ((0x400600000000000L & l) != 0L) - jjCheckNAddTwoStates(156, 157); + jjCheckNAddTwoStates(176, 177); break; - case 156: + case 176: if ((0x3ff0000ffffd9ffL & l) != 0L) - jjCheckNAddStates(144, 148); + jjCheckNAddStates(158, 162); break; - case 158: + case 178: if ((0x100000200L & l) != 0L) - jjCheckNAddStates(149, 152); + jjCheckNAddStates(163, 166); break; - case 160: - case 161: - jjCheckNAddStates(149, 152); + case 180: + case 181: + jjCheckNAddStates(163, 166); break; - case 165: + case 185: if (curChar == 47) - jjstateSet[jjnewStateCnt++] = 164; + jjstateSet[jjnewStateCnt++] = 184; break; - case 167: + case 187: if ((0x3ff0000ffffd9ffL & l) != 0L) - jjCheckNAddStates(51, 55); + jjCheckNAddStates(40, 44); break; - case 169: + case 189: if ((0x400600000000000L & l) != 0L) - jjCheckNAddTwoStates(170, 171); + jjCheckNAddTwoStates(190, 191); break; - case 170: + case 190: if ((0x3ff0000ffffd9ffL & l) != 0L) - jjCheckNAddStates(153, 157); + jjCheckNAddStates(167, 171); break; - case 172: + case 192: if ((0x100000200L & l) != 0L) - jjCheckNAddStates(158, 161); + jjCheckNAddStates(172, 175); break; - case 174: - case 175: - jjCheckNAddStates(158, 161); + case 194: + case 195: + jjCheckNAddStates(172, 175); break; - case 180: + case 200: if (curChar == 13) - jjAddStates(46, 47); + jjAddStates(56, 57); break; - case 181: - if (curChar == 10 && kind > 86) - kind = 86; + case 201: + if (curChar == 10 && kind > 87) + kind = 87; break; - case 182: + case 202: if (curChar == 10) - jjCheckNAddTwoStates(184, 185); + jjCheckNAddTwoStates(204, 205); break; - case 183: - if (curChar == 10 && kind > 91) - kind = 91; + case 203: + if (curChar == 10 && kind > 92) + kind = 92; break; - case 184: + case 204: if (curChar == 13) - jjstateSet[jjnewStateCnt++] = 183; + jjstateSet[jjnewStateCnt++] = 203; break; - case 185: - if ((0x2400L & l) != 0L && kind > 91) - kind = 91; + case 205: + if ((0x2400L & l) != 0L && kind > 92) + kind = 92; break; - case 186: + case 206: if ((0x2400L & l) == 0L) break; - if (kind > 86) - kind = 86; - jjCheckNAddTwoStates(184, 185); + if (kind > 87) + kind = 87; + jjCheckNAddTwoStates(204, 205); break; default : break; } @@ -1370,48 +1432,50 @@ { switch(jjstateSet[--i]) { + case 207: + if ((0x87fffffe07fffffeL & l) != 0L) + jjCheckNAddStates(40, 44); + else if (curChar == 126) + jjCheckNAdd(187); + if ((0x87fffffe07fffffeL & l) != 0L) + jjCheckNAddStates(45, 49); + else if (curChar == 126) + jjCheckNAdd(173); + break; case 21: if ((0x87fffffe07fffffeL & l) != 0L) { - if (kind > 87) - kind = 87; - jjCheckNAddTwoStates(114, 115); + if (kind > 88) + kind = 88; + jjCheckNAddTwoStates(112, 113); } else if ((0x78000001f8000001L & l) != 0L) { - if (kind > 88) - kind = 88; + if (kind > 89) + kind = 89; } if ((0x7fffffe07fffffeL & l) != 0L) jjCheckNAddStates(100, 102); else if (curChar == 126) - jjCheckNAddStates(162, 164); + jjCheckNAddStates(176, 178); else if (curChar == 123) - jjAddStates(165, 166); + jjAddStates(179, 180); else if (curChar == 91) jjstateSet[jjnewStateCnt++] = 0; if (curChar == 109) - jjstateSet[jjnewStateCnt++] = 83; + jjAddStates(181, 182); + else if (curChar == 120) + jjstateSet[jjnewStateCnt++] = 81; else if (curChar == 97) jjstateSet[jjnewStateCnt++] = 43; else if (curChar == 105) jjstateSet[jjnewStateCnt++] = 31; break; - case 152: + case 172: if (curChar == 123) - jjCheckNAddTwoStates(167, 168); + jjCheckNAddTwoStates(187, 188); if (curChar == 123) - jjCheckNAddTwoStates(153, 154); - break; - case 187: - if ((0x87fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(51, 55); - else if (curChar == 126) - jjCheckNAdd(167); - if ((0x87fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(56, 60); - else if (curChar == 126) - jjCheckNAdd(153); + jjCheckNAddTwoStates(173, 174); break; case 0: if (curChar == 91) @@ -1480,8 +1544,8 @@ jjCheckNAdd(16); break; case 18: - if (curChar == 93 && kind > 69) - kind = 69; + if (curChar == 93 && kind > 70) + kind = 70; break; case 19: if (curChar == 93) @@ -1493,26 +1557,26 @@ break; case 23: case 25: - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(23, 24); break; case 24: if (curChar == 126) - jjAddStates(167, 169); + jjAddStates(183, 185); break; case 26: if ((0x87fffffe07fffffeL & l) == 0L) break; - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(23, 24); break; case 27: if ((0x78000001f8000001L & l) == 0L) break; - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(23, 24); break; case 28: @@ -1537,26 +1601,26 @@ break; case 34: case 36: - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(34, 35); break; case 35: if (curChar == 126) - jjAddStates(170, 172); + jjAddStates(186, 188); break; case 37: if ((0x87fffffe07fffffeL & l) == 0L) break; - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(34, 35); break; case 38: if ((0x78000001f8000001L & l) == 0L) break; - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(34, 35); break; case 39: @@ -1586,8 +1650,8 @@ case 47: if ((0x47fffffe87ffffffL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(77, 81); break; case 49: @@ -1597,15 +1661,15 @@ case 50: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(77, 81); break; case 52: if ((0x47fffffe87ffffffL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(82, 86); break; case 54: @@ -1615,15 +1679,15 @@ case 55: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(82, 86); break; case 57: if ((0x47fffffe87ffffffL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(87, 89); break; case 59: @@ -1633,15 +1697,15 @@ case 60: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(87, 89); break; case 62: if ((0x47fffffe87ffffffL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddTwoStates(62, 63); break; case 64: @@ -1651,8 +1715,8 @@ case 65: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddTwoStates(62, 63); break; case 67: @@ -1670,22 +1734,22 @@ case 71: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(90, 94); break; case 72: if ((0x47fffffe87ffffffL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(90, 94); break; case 74: if ((0x47fffffe87ffffffL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(95, 99); break; case 76: @@ -1695,8 +1759,8 @@ case 77: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(95, 99); break; case 78: @@ -1704,228 +1768,300 @@ jjCheckNAddTwoStates(69, 72); break; case 79: - if (curChar == 111) - jjstateSet[jjnewStateCnt++] = 45; + if (curChar == 112) + jjCheckNAdd(45); break; case 80: - if (curChar == 116) + if (curChar == 112) jjstateSet[jjnewStateCnt++] = 79; break; case 81: - if (curChar == 108) + if (curChar == 109) jjstateSet[jjnewStateCnt++] = 80; break; case 82: - if (curChar == 105) + if (curChar == 120) jjstateSet[jjnewStateCnt++] = 81; break; case 83: - if (curChar == 97) - jjstateSet[jjnewStateCnt++] = 82; - break; case 84: - if (curChar == 109) - jjstateSet[jjnewStateCnt++] = 83; - break; - case 85: - case 86: if ((0x7fffffe07fffffeL & l) != 0L) jjCheckNAddStates(100, 102); break; - case 88: - case 89: + case 86: + case 87: if ((0x7fffffe07fffffeL & l) != 0L) jjCheckNAddStates(103, 105); break; - case 91: + case 89: if ((0x47fffffe87fffffeL & l) != 0L) jjCheckNAddStates(114, 116); break; - case 93: + case 91: if ((0x7e0000007eL & l) != 0L) - jjstateSet[jjnewStateCnt++] = 94; + jjstateSet[jjnewStateCnt++] = 92; break; - case 94: + case 92: if ((0x7e0000007eL & l) != 0L) jjCheckNAddStates(114, 116); break; - case 95: + case 93: if (curChar != 64) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(117, 122); break; - case 97: + case 95: if ((0x7e0000007eL & l) != 0L) - jjstateSet[jjnewStateCnt++] = 98; + jjstateSet[jjnewStateCnt++] = 96; break; - case 98: + case 96: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(117, 122); break; - case 99: + case 97: if ((0x47fffffe87fffffeL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(117, 122); break; - case 103: + case 101: if ((0x47fffffe87ffffffL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(127, 131); break; - case 105: + case 103: if ((0x7e0000007eL & l) != 0L) - jjstateSet[jjnewStateCnt++] = 106; + jjstateSet[jjnewStateCnt++] = 104; break; - case 106: + case 104: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(127, 131); break; - case 114: + case 112: if ((0x87fffffe07fffffeL & l) == 0L) break; - if (kind > 87) - kind = 87; - jjCheckNAddTwoStates(114, 115); + if (kind > 88) + kind = 88; + jjCheckNAddTwoStates(112, 113); break; - case 115: + case 113: if (curChar == 126) - jjCheckNAdd(114); + jjCheckNAdd(112); break; - case 116: - if ((0x78000001f8000001L & l) != 0L && kind > 88) - kind = 88; + case 114: + if ((0x78000001f8000001L & l) != 0L && kind > 89) + kind = 89; + break; + case 115: + if (curChar == 109) + jjAddStates(181, 182); + break; + case 116: + if (curChar == 111) + jjCheckNAdd(45); + break; + case 117: + if (curChar == 116) + jjstateSet[jjnewStateCnt++] = 116; + break; + case 118: + if (curChar == 108) + jjstateSet[jjnewStateCnt++] = 117; break; case 119: - if (curChar == 126) - jjstateSet[jjnewStateCnt++] = 120; + if (curChar == 105) + jjstateSet[jjnewStateCnt++] = 118; break; case 120: - case 121: - case 123: + if (curChar == 97) + jjstateSet[jjnewStateCnt++] = 119; + break; + case 122: + if ((0x47fffffe87ffffffL & l) == 0L) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(132, 135); + break; + case 124: + if ((0x7e0000007eL & l) != 0L) + jjstateSet[jjnewStateCnt++] = 125; + break; + case 125: + if ((0x7e0000007eL & l) == 0L) + break; + if (kind > 84) + kind = 84; jjCheckNAddStates(132, 135); break; + case 127: + if ((0x47fffffe87ffffffL & l) == 0L) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(142, 145); + break; + case 129: + if ((0x7e0000007eL & l) != 0L) + jjstateSet[jjnewStateCnt++] = 130; + break; + case 130: + if ((0x7e0000007eL & l) == 0L) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(142, 145); + break; + case 132: + if (curChar == 116) + jjstateSet[jjnewStateCnt++] = 131; + break; + case 133: + if (curChar == 101) + jjstateSet[jjnewStateCnt++] = 132; + break; + case 134: + if (curChar == 110) + jjstateSet[jjnewStateCnt++] = 133; + break; case 135: - if (curChar == 126) - jjstateSet[jjnewStateCnt++] = 136; + if (curChar == 103) + jjstateSet[jjnewStateCnt++] = 134; break; case 136: - case 137: + if (curChar == 97) + jjstateSet[jjnewStateCnt++] = 135; + break; case 139: - jjCheckNAddStates(140, 143); + if (curChar == 126) + jjstateSet[jjnewStateCnt++] = 140; break; - case 149: + case 140: + case 141: + case 143: + jjCheckNAddStates(146, 149); + break; + case 155: if (curChar == 126) - jjCheckNAdd(148); + jjstateSet[jjnewStateCnt++] = 156; break; - case 151: + case 156: + case 157: + case 159: + jjCheckNAddStates(154, 157); + break; + case 169: + if (curChar == 126) + jjCheckNAdd(168); + break; + case 171: if (curChar == 123) - jjAddStates(165, 166); + jjAddStates(179, 180); break; - case 153: + case 173: if ((0x87fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(56, 60); + jjCheckNAddStates(45, 49); break; - case 154: + case 174: if (curChar == 126) - jjCheckNAdd(153); + jjCheckNAdd(173); break; - case 155: + case 175: if (curChar == 95) - jjCheckNAddTwoStates(156, 157); + jjCheckNAddTwoStates(176, 177); break; - case 156: + case 176: if ((0x87fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(144, 148); + jjCheckNAddStates(158, 162); break; - case 157: + case 177: if (curChar == 126) - jjCheckNAdd(156); + jjCheckNAdd(176); break; - case 159: + case 179: if (curChar == 126) - jjstateSet[jjnewStateCnt++] = 160; + jjstateSet[jjnewStateCnt++] = 180; break; - case 160: - jjCheckNAddStates(149, 152); + case 180: + jjCheckNAddStates(163, 166); break; - case 161: + case 181: if ((0xdfffffffffffffffL & l) != 0L) - jjCheckNAddStates(149, 152); + jjCheckNAddStates(163, 166); break; - case 162: + case 182: if (curChar == 125) - jjCheckNAdd(161); + jjCheckNAdd(181); break; - case 163: - if (curChar == 125 && kind > 71) - kind = 71; + case 183: + if (curChar == 125 && kind > 72) + kind = 72; break; - case 164: + case 184: if (curChar == 125) - jjstateSet[jjnewStateCnt++] = 163; + jjstateSet[jjnewStateCnt++] = 183; break; - case 166: + case 186: if (curChar == 123) - jjCheckNAddTwoStates(167, 168); + jjCheckNAddTwoStates(187, 188); break; - case 167: + case 187: if ((0x87fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(51, 55); + jjCheckNAddStates(40, 44); break; - case 168: + case 188: if (curChar == 126) - jjCheckNAdd(167); + jjCheckNAdd(187); break; - case 169: + case 189: if (curChar == 95) - jjCheckNAddTwoStates(170, 171); + jjCheckNAddTwoStates(190, 191); break; - case 170: + case 190: if ((0x87fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(153, 157); + jjCheckNAddStates(167, 171); break; - case 171: + case 191: if (curChar == 126) - jjCheckNAdd(170); + jjCheckNAdd(190); break; - case 173: + case 193: if (curChar == 126) - jjstateSet[jjnewStateCnt++] = 174; + jjstateSet[jjnewStateCnt++] = 194; break; - case 174: - jjCheckNAddStates(158, 161); + case 194: + jjCheckNAddStates(172, 175); break; - case 175: + case 195: if ((0xdfffffffffffffffL & l) != 0L) - jjCheckNAddStates(158, 161); + jjCheckNAddStates(172, 175); break; - case 176: + case 196: if (curChar == 125) - jjCheckNAdd(175); + jjCheckNAdd(195); break; - case 177: - if (curChar == 125 && kind > 72) - kind = 72; + case 197: + if (curChar == 125 && kind > 73) + kind = 73; break; - case 178: + case 198: if (curChar == 125) - jjstateSet[jjnewStateCnt++] = 177; + jjstateSet[jjnewStateCnt++] = 197; break; - case 179: + case 199: if (curChar == 126) - jjCheckNAddStates(162, 164); + jjCheckNAddStates(176, 178); break; default : break; } @@ -1942,19 +2078,19 @@ { switch(jjstateSet[--i]) { + case 207: + if (jjCanMove_0(hiByte, i1, i2, l1, l2)) + jjCheckNAddStates(45, 49); + if (jjCanMove_0(hiByte, i1, i2, l1, l2)) + jjCheckNAddStates(40, 44); + break; case 21: - case 114: + case 112: if (!jjCanMove_0(hiByte, i1, i2, l1, l2)) break; - if (kind > 87) - kind = 87; - jjCheckNAddTwoStates(114, 115); - break; - case 187: - if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(56, 60); - if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(51, 55); + if (kind > 88) + kind = 88; + jjCheckNAddTwoStates(112, 113); break; case 3: case 4: @@ -1971,8 +2107,8 @@ case 26: if (!jjCanMove_0(hiByte, i1, i2, l1, l2)) break; - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(23, 24); break; case 34: @@ -1980,47 +2116,47 @@ case 37: if (!jjCanMove_0(hiByte, i1, i2, l1, l2)) break; - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(34, 35); break; - case 120: - case 121: - case 123: + case 140: + case 141: + case 143: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(132, 135); + jjCheckNAddStates(146, 149); break; - case 136: - case 137: - case 139: + case 156: + case 157: + case 159: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(140, 143); + jjCheckNAddStates(154, 157); break; - case 153: + case 173: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(56, 60); + jjCheckNAddStates(45, 49); break; - case 156: + case 176: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(144, 148); + jjCheckNAddStates(158, 162); break; - case 160: - case 161: + case 180: + case 181: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(149, 152); + jjCheckNAddStates(163, 166); break; - case 167: + case 187: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(51, 55); + jjCheckNAddStates(40, 44); break; - case 170: + case 190: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(153, 157); + jjCheckNAddStates(167, 171); break; - case 174: - case 175: + case 194: + case 195: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(158, 161); + jjCheckNAddStates(172, 175); break; default : break; } @@ -2033,7 +2169,7 @@ kind = 0x7fffffff; } ++curPos; - if ((i = jjnewStateCnt) == (startsAt = 187 - (jjnewStateCnt = startsAt))) + if ((i = jjnewStateCnt) == (startsAt = 207 - (jjnewStateCnt = startsAt))) return curPos; try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { return curPos; } @@ -2085,7 +2221,7 @@ break; case 8: if ((0x3ff0000ffffd9ffL & l) != 0L) - jjCheckNAddStates(173, 177); + jjCheckNAddStates(189, 193); break; case 10: if ((0x400600000000000L & l) != 0L) @@ -2093,15 +2229,15 @@ break; case 11: if ((0x3ff0000ffffd9ffL & l) != 0L) - jjCheckNAddStates(178, 182); + jjCheckNAddStates(194, 198); break; case 13: if ((0x100000200L & l) != 0L) - jjCheckNAddStates(183, 186); + jjCheckNAddStates(199, 202); break; case 15: case 16: - jjCheckNAddStates(183, 186); + jjCheckNAddStates(199, 202); break; case 20: if (curChar == 47) @@ -2109,7 +2245,7 @@ break; case 21: if ((0x3ff0000ffffd9ffL & l) != 0L) - jjCheckNAddStates(187, 191); + jjCheckNAddStates(203, 207); break; case 23: if ((0x400600000000000L & l) != 0L) @@ -2117,7 +2253,7 @@ break; case 24: if ((0x3ff0000ffffd9ffL & l) != 0L) - jjCheckNAddStates(192, 196); + jjCheckNAddStates(208, 212); break; case 26: if ((0x100000200L & l) != 0L) @@ -2138,13 +2274,13 @@ if (kind > 20) kind = 20; if (curChar == 123) - jjAddStates(197, 198); + jjAddStates(213, 214); else if (curChar == 126) - jjAddStates(199, 200); + jjAddStates(215, 216); break; case 3: if (curChar == 126) - jjAddStates(199, 200); + jjAddStates(215, 216); break; case 4: if ((0x87fffffe07fffffeL & l) != 0L && kind > 20) @@ -2156,7 +2292,7 @@ break; case 6: if (curChar == 123) - jjAddStates(197, 198); + jjAddStates(213, 214); break; case 7: if (curChar == 123) @@ -2164,7 +2300,7 @@ break; case 8: if ((0x87fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(173, 177); + jjCheckNAddStates(189, 193); break; case 9: if (curChar == 126) @@ -2176,7 +2312,7 @@ break; case 11: if ((0x87fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(178, 182); + jjCheckNAddStates(194, 198); break; case 12: if (curChar == 126) @@ -2187,11 +2323,11 @@ jjstateSet[jjnewStateCnt++] = 15; break; case 15: - jjCheckNAddStates(183, 186); + jjCheckNAddStates(199, 202); break; case 16: if ((0xdfffffffffffffffL & l) != 0L) - jjCheckNAddStates(183, 186); + jjCheckNAddStates(199, 202); break; case 17: if (curChar == 125) @@ -2207,7 +2343,7 @@ break; case 21: if ((0x87fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(187, 191); + jjCheckNAddStates(203, 207); break; case 22: if (curChar == 126) @@ -2219,7 +2355,7 @@ break; case 24: if ((0x87fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(192, 196); + jjCheckNAddStates(208, 212); break; case 25: if (curChar == 126) @@ -2259,24 +2395,24 @@ break; case 8: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(173, 177); + jjCheckNAddStates(189, 193); break; case 11: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(178, 182); + jjCheckNAddStates(194, 198); break; case 15: case 16: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(183, 186); + jjCheckNAddStates(199, 202); break; case 21: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(187, 191); + jjCheckNAddStates(203, 207); break; case 24: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(192, 196); + jjCheckNAddStates(208, 212); break; default : break; } @@ -2385,13 +2521,13 @@ case 8: if (kind > 17) kind = 17; - jjCheckNAddStates(201, 206); + jjCheckNAddStates(217, 222); break; case 11: case 2: if (kind > 17) kind = 17; - jjCheckNAddStates(201, 206); + jjCheckNAddStates(217, 222); break; default : break; } @@ -2409,7 +2545,7 @@ { if (kind > 17) kind = 17; - jjCheckNAddStates(201, 206); + jjCheckNAddStates(217, 222); } else if (curChar == 125) jjCheckNAdd(4); @@ -2419,7 +2555,7 @@ { if (kind > 17) kind = 17; - jjCheckNAddStates(201, 206); + jjCheckNAddStates(217, 222); } else if (curChar == 123) jjCheckNAddTwoStates(13, 9); @@ -2439,14 +2575,14 @@ case 1: if (kind > 17) kind = 17; - jjCheckNAddStates(201, 206); + jjCheckNAddStates(217, 222); break; case 2: if ((0x97ffffffffffffffL & l) == 0L) break; if (kind > 17) kind = 17; - jjCheckNAddStates(201, 206); + jjCheckNAddStates(217, 222); break; case 3: if (curChar == 125) @@ -2457,7 +2593,7 @@ break; if (kind > 17) kind = 17; - jjCheckNAddStates(201, 206); + jjCheckNAddStates(217, 222); break; case 6: if (curChar == 125) @@ -2473,7 +2609,7 @@ break; if (kind > 17) kind = 17; - jjCheckNAddStates(201, 206); + jjCheckNAddStates(217, 222); break; case 10: if (curChar == 123) @@ -2510,7 +2646,7 @@ break; if (kind > 17) kind = 17; - jjCheckNAddStates(201, 206); + jjCheckNAddStates(217, 222); break; case 11: case 2: @@ -2518,7 +2654,7 @@ break; if (kind > 17) kind = 17; - jjCheckNAddStates(201, 206); + jjCheckNAddStates(217, 222); break; default : break; } @@ -2542,35 +2678,35 @@ switch (pos) { case 0: - if ((active1 & 0x4fe00L) != 0L) + if ((active1 & 0x9fc00L) != 0L) { - jjmatchedKind = 88; + jjmatchedKind = 89; return -1; } - if ((active1 & 0x40L) != 0L) + if ((active1 & 0x80L) != 0L) { - jjmatchedKind = 88; - return 171; + jjmatchedKind = 89; + return 191; } return -1; case 1: - if ((active1 & 0x4fe00L) != 0L) + if ((active1 & 0x9fc00L) != 0L) { if (jjmatchedPos == 0) { - jjmatchedKind = 88; + jjmatchedKind = 89; jjmatchedPos = 0; } return -1; } - if ((active1 & 0x40L) != 0L) + if ((active1 & 0x80L) != 0L) { if (jjmatchedPos == 0) { - jjmatchedKind = 88; + jjmatchedKind = 89; jjmatchedPos = 0; } - return 199; + return 219; } return -1; default : @@ -2586,23 +2722,23 @@ switch(curChar) { case 35: - return jjMoveStringLiteralDfa1_3(0x8000L); + return jjMoveStringLiteralDfa1_3(0x10000L); case 42: - return jjMoveStringLiteralDfa1_3(0x200L); + return jjMoveStringLiteralDfa1_3(0x400L); case 44: - return jjMoveStringLiteralDfa1_3(0x4000L); + return jjMoveStringLiteralDfa1_3(0x8000L); case 45: - return jjMoveStringLiteralDfa1_3(0x800L); + return jjMoveStringLiteralDfa1_3(0x1000L); case 47: - return jjMoveStringLiteralDfa1_3(0x400L); + return jjMoveStringLiteralDfa1_3(0x800L); case 92: - return jjMoveStringLiteralDfa1_3(0x40000L); + return jjMoveStringLiteralDfa1_3(0x80000L); case 94: - return jjMoveStringLiteralDfa1_3(0x2000L); + return jjMoveStringLiteralDfa1_3(0x4000L); case 95: - return jjMoveStringLiteralDfa1_3(0x1000L); + return jjMoveStringLiteralDfa1_3(0x2000L); case 123: - return jjMoveStringLiteralDfa1_3(0x40L); + return jjMoveStringLiteralDfa1_3(0x80L); default : return jjMoveNfa_3(21, 0); } @@ -2617,39 +2753,39 @@ switch(curChar) { case 35: - if ((active1 & 0x8000L) != 0L) - return jjStopAtPos(1, 79); + if ((active1 & 0x10000L) != 0L) + return jjStopAtPos(1, 80); break; case 42: - if ((active1 & 0x200L) != 0L) - return jjStopAtPos(1, 73); + if ((active1 & 0x400L) != 0L) + return jjStopAtPos(1, 74); break; case 44: - if ((active1 & 0x4000L) != 0L) - return jjStopAtPos(1, 78); + if ((active1 & 0x8000L) != 0L) + return jjStopAtPos(1, 79); break; case 45: - if ((active1 & 0x800L) != 0L) - return jjStopAtPos(1, 75); + if ((active1 & 0x1000L) != 0L) + return jjStopAtPos(1, 76); break; case 47: - if ((active1 & 0x400L) != 0L) - return jjStopAtPos(1, 74); + if ((active1 & 0x800L) != 0L) + return jjStopAtPos(1, 75); break; case 92: - if ((active1 & 0x40000L) != 0L) - return jjStopAtPos(1, 82); + if ((active1 & 0x80000L) != 0L) + return jjStopAtPos(1, 83); break; case 94: - if ((active1 & 0x2000L) != 0L) - return jjStopAtPos(1, 77); + if ((active1 & 0x4000L) != 0L) + return jjStopAtPos(1, 78); break; case 95: - if ((active1 & 0x1000L) != 0L) - return jjStopAtPos(1, 76); + if ((active1 & 0x2000L) != 0L) + return jjStopAtPos(1, 77); break; case 123: - return jjMoveStringLiteralDfa2_3(active1, 0x40L); + return jjMoveStringLiteralDfa2_3(active1, 0x80L); default : break; } @@ -2667,8 +2803,8 @@ switch(curChar) { case 123: - if ((active1 & 0x40L) != 0L) - return jjStopAtPos(2, 70); + if ((active1 & 0x80L) != 0L) + return jjStopAtPos(2, 71); break; default : break; @@ -2678,7 +2814,7 @@ private int jjMoveNfa_3(int startState, int curPos) { int startsAt = 0; - jjnewStateCnt = 199; + jjnewStateCnt = 219; int i = 1; jjstateSet[0] = startState; int kind = 0x7fffffff; @@ -2693,48 +2829,48 @@ { switch(jjstateSet[--i]) { - case 199: + case 219: if ((0x3ff0000ffffd9ffL & l) != 0L) - jjCheckNAddStates(207, 211); + jjCheckNAddStates(223, 227); if ((0x3ff0000ffffd9ffL & l) != 0L) - jjCheckNAddStates(212, 216); + jjCheckNAddStates(228, 232); break; case 21: if ((0x3ff0000ffffd9ffL & l) != 0L) { - if (kind > 87) - kind = 87; - jjCheckNAddTwoStates(114, 115); + if (kind > 88) + kind = 88; + jjCheckNAddTwoStates(112, 113); } else if ((0xfc00fffe00000000L & l) != 0L) { - if (kind > 88) - kind = 88; + if (kind > 89) + kind = 89; } else if ((0x2400L & l) != 0L) { - if (kind > 86) - kind = 86; - jjCheckNAddStates(217, 220); + if (kind > 87) + kind = 87; + jjCheckNAddStates(233, 236); } else if ((0x100000200L & l) != 0L) { - if (kind > 84) - kind = 84; - jjCheckNAddStates(221, 230); + if (kind > 85) + kind = 85; + jjCheckNAddStates(237, 246); } if (curChar == 40) - jjCheckNAddStates(231, 233); + jjCheckNAddStates(247, 249); else if (curChar == 13) - jjAddStates(234, 236); + jjAddStates(250, 252); else if (curChar == 61) { if (kind > 13) kind = 13; - jjCheckNAddStates(237, 240); + jjCheckNAddStates(253, 256); } else if (curChar == 41) - jjstateSet[jjnewStateCnt++] = 112; + jjstateSet[jjnewStateCnt++] = 110; break; case 1: if (curChar == 58) @@ -2751,67 +2887,67 @@ case 22: if (curChar != 58) break; - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(23, 24); break; case 23: if ((0xfffffffeffffd9ffL & l) == 0L) break; - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(23, 24); break; case 25: - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(23, 24); break; case 26: if ((0x3ff0000ffffd9ffL & l) == 0L) break; - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(23, 24); break; case 27: if ((0xfc00fffe00000000L & l) == 0L) break; - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(23, 24); break; case 33: if (curChar != 58) break; - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(34, 35); break; case 34: if ((0xfffffffeffffd9ffL & l) == 0L) break; - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(34, 35); break; case 36: - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(34, 35); break; case 37: if ((0x3ff0000ffffd9ffL & l) == 0L) break; - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(34, 35); break; case 38: if ((0xfc00fffe00000000L & l) == 0L) break; - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(34, 35); break; case 45: @@ -2821,15 +2957,15 @@ case 46: if (curChar != 47) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(73, 76); break; case 47: if ((0x2fff6fd200000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(77, 81); break; case 48: @@ -2843,22 +2979,22 @@ case 50: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(77, 81); break; case 51: if (curChar != 47) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(82, 86); break; case 52: if ((0x2fff6fd200000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(82, 86); break; case 53: @@ -2872,22 +3008,22 @@ case 55: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(82, 86); break; case 56: if (curChar != 63) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(87, 89); break; case 57: if ((0xafffefd200000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(87, 89); break; case 58: @@ -2901,22 +3037,22 @@ case 60: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(87, 89); break; case 61: if (curChar != 35) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddTwoStates(62, 63); break; case 62: if ((0xafffefd200000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddTwoStates(62, 63); break; case 63: @@ -2930,8 +3066,8 @@ case 65: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddTwoStates(62, 63); break; case 66: @@ -2957,29 +3093,29 @@ case 71: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(90, 94); break; case 72: if ((0x2bff6fd200000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(90, 94); break; case 73: if (curChar != 47) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(95, 99); break; case 74: if ((0x2fff6fd200000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(95, 99); break; case 75: @@ -2993,424 +3129,486 @@ case 77: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(95, 99); break; case 78: if ((0x2bff6fd200000000L & l) != 0L) jjCheckNAddTwoStates(69, 72); break; - case 86: + case 84: if ((0x3ff680000000000L & l) != 0L) jjCheckNAddStates(100, 102); break; - case 87: + case 85: if (curChar == 58) - jjstateSet[jjnewStateCnt++] = 88; + jjstateSet[jjnewStateCnt++] = 86; break; - case 89: + case 87: if ((0x3ff680000000000L & l) != 0L) jjCheckNAddStates(103, 105); break; - case 90: + case 88: if (curChar != 47) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(106, 113); break; - case 91: + case 89: if ((0x2fff6fd200000000L & l) != 0L) jjCheckNAddStates(114, 116); break; - case 92: + case 90: if (curChar == 37) - jjCheckNAdd(93); + jjCheckNAdd(91); break; - case 93: + case 91: if ((0x3ff000000000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 94; + jjstateSet[jjnewStateCnt++] = 92; break; - case 94: + case 92: if ((0x3ff000000000000L & l) != 0L) jjCheckNAddStates(114, 116); break; - case 96: + case 94: if (curChar == 37) - jjCheckNAdd(97); + jjCheckNAdd(95); break; - case 97: + case 95: if ((0x3ff000000000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 98; + jjstateSet[jjnewStateCnt++] = 96; break; - case 98: + case 96: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(117, 122); break; - case 99: + case 97: if ((0x2bff6fd200000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(117, 122); break; - case 100: + case 98: if (curChar == 58) - jjCheckNAdd(101); + jjCheckNAdd(99); break; - case 101: + case 99: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(123, 126); break; - case 102: + case 100: if (curChar != 47) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(127, 131); break; - case 103: + case 101: if ((0x2fff6fd200000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(127, 131); break; - case 104: + case 102: if (curChar == 37) - jjstateSet[jjnewStateCnt++] = 105; + jjstateSet[jjnewStateCnt++] = 103; break; - case 105: + case 103: if ((0x3ff000000000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 106; + jjstateSet[jjnewStateCnt++] = 104; break; - case 106: + case 104: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(127, 131); break; - case 107: + case 105: if (curChar == 37) - jjCheckNAddTwoStates(93, 97); + jjCheckNAddTwoStates(91, 95); break; - case 108: + case 106: if (curChar == 47) - jjstateSet[jjnewStateCnt++] = 90; + jjstateSet[jjnewStateCnt++] = 88; break; - case 109: + case 107: if (curChar == 58) - jjstateSet[jjnewStateCnt++] = 108; + jjstateSet[jjnewStateCnt++] = 106; break; - case 110: + case 108: if (curChar != 41) break; - if (kind > 85) - kind = 85; - jjCheckNAdd(111); + if (kind > 86) + kind = 86; + jjCheckNAdd(109); break; - case 111: + case 109: if ((0x100000200L & l) == 0L) break; - if (kind > 85) - kind = 85; - jjCheckNAdd(111); + if (kind > 86) + kind = 86; + jjCheckNAdd(109); break; - case 112: + case 110: if (curChar == 41) - jjstateSet[jjnewStateCnt++] = 110; + jjstateSet[jjnewStateCnt++] = 108; break; - case 113: + case 111: if (curChar == 41) - jjstateSet[jjnewStateCnt++] = 112; + jjstateSet[jjnewStateCnt++] = 110; break; - case 114: + case 112: if ((0x3ff0000ffffd9ffL & l) == 0L) break; - if (kind > 87) - kind = 87; - jjCheckNAddTwoStates(114, 115); - break; - case 116: - if ((0xfc00fffe00000000L & l) != 0L && kind > 88) + if (kind > 88) kind = 88; + jjCheckNAddTwoStates(112, 113); break; - case 117: - if ((0x100000200L & l) == 0L) + case 114: + if ((0xfc00fffe00000000L & l) != 0L && kind > 89) + kind = 89; + break; + case 121: + if (curChar != 63) break; if (kind > 84) kind = 84; - jjCheckNAddStates(221, 230); + jjCheckNAddStates(132, 135); break; - case 118: + case 122: + if ((0xafffefd200000000L & l) == 0L) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(132, 135); + break; + case 123: + if (curChar == 37) + jjstateSet[jjnewStateCnt++] = 124; + break; + case 124: + if ((0x3ff000000000000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 125; + break; + case 125: + if ((0x3ff000000000000L & l) == 0L) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(132, 135); + break; + case 126: + if (curChar != 35) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(136, 141); + break; + case 127: + if ((0xafffefd200000000L & l) == 0L) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(142, 145); + break; + case 128: + if (curChar == 37) + jjstateSet[jjnewStateCnt++] = 129; + break; + case 129: + if ((0x3ff000000000000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 130; + break; + case 130: + if ((0x3ff000000000000L & l) == 0L) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(142, 145); + break; + case 131: + if (curChar == 58) + jjstateSet[jjnewStateCnt++] = 121; + break; + case 137: + if ((0x100000200L & l) == 0L) + break; + if (kind > 85) + kind = 85; + jjCheckNAddStates(237, 246); + break; + case 138: if ((0x100000200L & l) != 0L) - jjCheckNAddTwoStates(118, 119); + jjCheckNAddTwoStates(138, 139); break; - case 119: + case 139: if (curChar == 61) - jjCheckNAddStates(241, 243); + jjCheckNAddStates(257, 259); break; - case 120: + case 140: if (curChar == 10 && kind > 12) kind = 12; break; - case 121: + case 141: if (curChar == 13) - jjstateSet[jjnewStateCnt++] = 120; + jjstateSet[jjnewStateCnt++] = 140; break; - case 122: + case 142: if ((0x2400L & l) != 0L && kind > 12) kind = 12; break; - case 123: + case 143: if ((0x100000200L & l) != 0L) - jjCheckNAddTwoStates(123, 124); + jjCheckNAddTwoStates(143, 144); break; - case 124: + case 144: if (curChar != 61) break; if (kind > 13) kind = 13; - jjCheckNAdd(124); + jjCheckNAdd(144); break; - case 125: + case 145: if ((0x100000200L & l) != 0L) - jjCheckNAddTwoStates(125, 129); + jjCheckNAddTwoStates(145, 149); break; - case 126: + case 146: if (curChar != 40) break; - if (kind > 68) - kind = 68; - jjCheckNAdd(127); + if (kind > 69) + kind = 69; + jjCheckNAdd(147); break; - case 127: + case 147: if ((0x100000200L & l) == 0L) break; - if (kind > 68) - kind = 68; - jjCheckNAdd(127); + if (kind > 69) + kind = 69; + jjCheckNAdd(147); break; - case 128: + case 148: if (curChar == 40) - jjstateSet[jjnewStateCnt++] = 126; + jjstateSet[jjnewStateCnt++] = 146; break; - case 129: + case 149: if (curChar == 40) - jjCheckNAdd(128); + jjCheckNAdd(148); break; - case 130: + case 150: if ((0x100000200L & l) == 0L) break; - if (kind > 84) - kind = 84; - jjCheckNAddTwoStates(130, 131); + if (kind > 85) + kind = 85; + jjCheckNAddTwoStates(150, 151); break; - case 132: + case 152: if ((0x100000200L & l) != 0L) - jjCheckNAddTwoStates(132, 113); + jjCheckNAddTwoStates(152, 111); break; - case 133: + case 153: if (curChar != 61) break; if (kind > 13) kind = 13; - jjCheckNAddStates(237, 240); + jjCheckNAddStates(253, 256); break; - case 134: + case 154: if (curChar == 13) - jjAddStates(234, 236); + jjAddStates(250, 252); break; - case 135: + case 155: if (curChar == 10) - jjCheckNAddTwoStates(136, 137); + jjCheckNAddTwoStates(156, 157); break; - case 136: + case 156: if ((0x100000200L & l) != 0L) - jjCheckNAddTwoStates(136, 137); + jjCheckNAddTwoStates(156, 157); break; - case 137: + case 157: if (curChar != 61) break; if (kind > 14) kind = 14; - jjCheckNAddTwoStates(137, 138); + jjCheckNAddTwoStates(157, 158); break; - case 138: + case 158: if ((0x100000200L & l) == 0L) break; if (kind > 14) kind = 14; - jjCheckNAdd(138); + jjCheckNAdd(158); break; - case 139: - if (curChar == 10 && kind > 86) - kind = 86; + case 159: + if (curChar == 10 && kind > 87) + kind = 87; break; - case 140: + case 160: if (curChar == 10) - jjCheckNAddTwoStates(142, 143); + jjCheckNAddTwoStates(162, 163); break; - case 141: - if (curChar == 10 && kind > 90) - kind = 90; + case 161: + if (curChar == 10 && kind > 91) + kind = 91; break; - case 142: + case 162: if (curChar == 13) - jjstateSet[jjnewStateCnt++] = 141; + jjstateSet[jjnewStateCnt++] = 161; break; - case 143: - if ((0x2400L & l) != 0L && kind > 90) - kind = 90; + case 163: + if ((0x2400L & l) != 0L && kind > 91) + kind = 91; break; - case 144: + case 164: if ((0x2400L & l) == 0L) break; - if (kind > 86) - kind = 86; - jjCheckNAddStates(217, 220); + if (kind > 87) + kind = 87; + jjCheckNAddStates(233, 236); break; - case 145: + case 165: if (curChar == 40) - jjCheckNAddStates(231, 233); + jjCheckNAddStates(247, 249); break; - case 146: + case 166: if (curChar == 37) - jjCheckNAddStates(244, 247); + jjCheckNAddStates(260, 263); break; - case 148: - jjCheckNAddStates(244, 247); + case 168: + jjCheckNAddStates(260, 263); break; - case 149: + case 169: if ((0xffffffdfffffffffL & l) != 0L) - jjCheckNAddStates(244, 247); + jjCheckNAddStates(260, 263); break; - case 150: + case 170: if (curChar == 37) - jjstateSet[jjnewStateCnt++] = 151; + jjstateSet[jjnewStateCnt++] = 171; break; - case 151: + case 171: if ((0xfffffdffffffffffL & l) != 0L) - jjCheckNAddStates(244, 247); + jjCheckNAddStates(260, 263); break; - case 152: + case 172: if (curChar == 41) - jjCheckNAddStates(248, 251); + jjCheckNAddStates(264, 267); break; - case 153: + case 173: if ((0x100000200L & l) != 0L) - jjCheckNAddStates(248, 251); + jjCheckNAddStates(264, 267); break; - case 154: + case 174: if (curChar == 10) - jjCheckNAddTwoStates(155, 158); + jjCheckNAddTwoStates(175, 178); break; - case 155: + case 175: if ((0x100000200L & l) != 0L) - jjCheckNAddTwoStates(155, 158); + jjCheckNAddTwoStates(175, 178); break; - case 156: - if (curChar == 40 && kind > 66) - kind = 66; + case 176: + if (curChar == 40 && kind > 67) + kind = 67; break; - case 157: + case 177: if (curChar == 40) - jjstateSet[jjnewStateCnt++] = 156; + jjstateSet[jjnewStateCnt++] = 176; break; - case 158: + case 178: if (curChar == 40) - jjstateSet[jjnewStateCnt++] = 157; + jjstateSet[jjnewStateCnt++] = 177; break; - case 159: + case 179: if (curChar == 13) - jjstateSet[jjnewStateCnt++] = 154; + jjstateSet[jjnewStateCnt++] = 174; break; - case 160: + case 180: if ((0x2400L & l) != 0L) - jjCheckNAddTwoStates(155, 158); + jjCheckNAddTwoStates(175, 178); break; - case 161: + case 181: if (curChar == 37) - jjstateSet[jjnewStateCnt++] = 152; + jjstateSet[jjnewStateCnt++] = 172; break; - case 162: + case 182: if (curChar == 37) - jjCheckNAddStates(252, 255); + jjCheckNAddStates(268, 271); break; - case 164: - jjCheckNAddStates(252, 255); + case 184: + jjCheckNAddStates(268, 271); break; - case 165: + case 185: if ((0xffffffdfffffffffL & l) != 0L) - jjCheckNAddStates(252, 255); + jjCheckNAddStates(268, 271); break; - case 166: + case 186: if (curChar == 37) - jjstateSet[jjnewStateCnt++] = 167; + jjstateSet[jjnewStateCnt++] = 187; break; - case 167: + case 187: if ((0xfffffdffffffffffL & l) != 0L) - jjCheckNAddStates(252, 255); + jjCheckNAddStates(268, 271); break; - case 168: - if (curChar == 41 && kind > 67) - kind = 67; + case 188: + if (curChar == 41 && kind > 68) + kind = 68; break; - case 169: + case 189: if (curChar == 37) - jjstateSet[jjnewStateCnt++] = 168; + jjstateSet[jjnewStateCnt++] = 188; break; - case 172: + case 192: if ((0x3ff0000ffffd9ffL & l) != 0L) - jjCheckNAddStates(212, 216); + jjCheckNAddStates(228, 232); break; - case 174: + case 194: if ((0x400600000000000L & l) != 0L) - jjCheckNAddTwoStates(175, 176); + jjCheckNAddTwoStates(195, 196); break; - case 175: + case 195: if ((0x3ff0000ffffd9ffL & l) != 0L) - jjCheckNAddStates(256, 260); + jjCheckNAddStates(272, 276); break; - case 177: + case 197: if ((0x100000200L & l) != 0L) - jjCheckNAddStates(261, 264); + jjCheckNAddStates(277, 280); break; - case 179: - case 180: - jjCheckNAddStates(261, 264); + case 199: + case 200: + jjCheckNAddStates(277, 280); break; - case 184: + case 204: if (curChar == 47) - jjstateSet[jjnewStateCnt++] = 183; + jjstateSet[jjnewStateCnt++] = 203; break; - case 186: + case 206: if ((0x3ff0000ffffd9ffL & l) != 0L) - jjCheckNAddStates(207, 211); + jjCheckNAddStates(223, 227); break; - case 188: + case 208: if ((0x400600000000000L & l) != 0L) - jjCheckNAddTwoStates(189, 190); + jjCheckNAddTwoStates(209, 210); break; - case 189: + case 209: if ((0x3ff0000ffffd9ffL & l) != 0L) - jjCheckNAddStates(265, 269); + jjCheckNAddStates(281, 285); break; - case 191: + case 211: if ((0x100000200L & l) != 0L) - jjCheckNAddStates(270, 273); + jjCheckNAddStates(286, 289); break; - case 193: - case 194: - jjCheckNAddStates(270, 273); + case 213: + case 214: + jjCheckNAddStates(286, 289); break; default : break; } @@ -3423,44 +3621,46 @@ { switch(jjstateSet[--i]) { - case 171: - if (curChar == 123) - jjCheckNAddTwoStates(186, 187); - if (curChar == 123) - jjCheckNAddTwoStates(172, 173); - break; - case 199: + case 219: if ((0x87fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(207, 211); + jjCheckNAddStates(223, 227); else if (curChar == 126) - jjCheckNAdd(186); + jjCheckNAdd(206); if ((0x87fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(212, 216); + jjCheckNAddStates(228, 232); else if (curChar == 126) - jjCheckNAdd(172); + jjCheckNAdd(192); + break; + case 191: + if (curChar == 123) + jjCheckNAddTwoStates(206, 207); + if (curChar == 123) + jjCheckNAddTwoStates(192, 193); break; case 21: if ((0x87fffffe07fffffeL & l) != 0L) { - if (kind > 87) - kind = 87; - jjCheckNAddTwoStates(114, 115); + if (kind > 88) + kind = 88; + jjCheckNAddTwoStates(112, 113); } else if ((0x78000001f8000001L & l) != 0L) { - if (kind > 88) - kind = 88; + if (kind > 89) + kind = 89; } if ((0x7fffffe07fffffeL & l) != 0L) jjCheckNAddStates(100, 102); else if (curChar == 126) - jjCheckNAddStates(274, 276); + jjCheckNAddStates(290, 292); else if (curChar == 123) - jjAddStates(277, 278); + jjAddStates(293, 294); else if (curChar == 91) jjstateSet[jjnewStateCnt++] = 0; if (curChar == 109) - jjstateSet[jjnewStateCnt++] = 83; + jjAddStates(181, 182); + else if (curChar == 120) + jjstateSet[jjnewStateCnt++] = 81; else if (curChar == 97) jjstateSet[jjnewStateCnt++] = 43; else if (curChar == 105) @@ -3533,8 +3733,8 @@ jjCheckNAdd(16); break; case 18: - if (curChar == 93 && kind > 69) - kind = 69; + if (curChar == 93 && kind > 70) + kind = 70; break; case 19: if (curChar == 93) @@ -3546,26 +3746,26 @@ break; case 23: case 25: - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(23, 24); break; case 24: if (curChar == 126) - jjAddStates(167, 169); + jjAddStates(183, 185); break; case 26: if ((0x87fffffe07fffffeL & l) == 0L) break; - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(23, 24); break; case 27: if ((0x78000001f8000001L & l) == 0L) break; - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(23, 24); break; case 28: @@ -3590,26 +3790,26 @@ break; case 34: case 36: - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(34, 35); break; case 35: if (curChar == 126) - jjAddStates(170, 172); + jjAddStates(186, 188); break; case 37: if ((0x87fffffe07fffffeL & l) == 0L) break; - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(34, 35); break; case 38: if ((0x78000001f8000001L & l) == 0L) break; - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(34, 35); break; case 39: @@ -3639,8 +3839,8 @@ case 47: if ((0x47fffffe87ffffffL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(77, 81); break; case 49: @@ -3650,15 +3850,15 @@ case 50: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(77, 81); break; case 52: if ((0x47fffffe87ffffffL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(82, 86); break; case 54: @@ -3668,15 +3868,15 @@ case 55: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(82, 86); break; case 57: if ((0x47fffffe87ffffffL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(87, 89); break; case 59: @@ -3686,15 +3886,15 @@ case 60: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(87, 89); break; case 62: if ((0x47fffffe87ffffffL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddTwoStates(62, 63); break; case 64: @@ -3704,8 +3904,8 @@ case 65: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddTwoStates(62, 63); break; case 67: @@ -3723,22 +3923,22 @@ case 71: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(90, 94); break; case 72: if ((0x47fffffe87ffffffL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(90, 94); break; case 74: if ((0x47fffffe87ffffffL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(95, 99); break; case 76: @@ -3748,8 +3948,8 @@ case 77: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(95, 99); break; case 78: @@ -3757,228 +3957,300 @@ jjCheckNAddTwoStates(69, 72); break; case 79: - if (curChar == 111) - jjstateSet[jjnewStateCnt++] = 45; + if (curChar == 112) + jjCheckNAdd(45); break; case 80: - if (curChar == 116) + if (curChar == 112) jjstateSet[jjnewStateCnt++] = 79; break; case 81: - if (curChar == 108) + if (curChar == 109) jjstateSet[jjnewStateCnt++] = 80; break; case 82: - if (curChar == 105) + if (curChar == 120) jjstateSet[jjnewStateCnt++] = 81; break; case 83: - if (curChar == 97) - jjstateSet[jjnewStateCnt++] = 82; - break; case 84: - if (curChar == 109) - jjstateSet[jjnewStateCnt++] = 83; - break; - case 85: - case 86: if ((0x7fffffe07fffffeL & l) != 0L) jjCheckNAddStates(100, 102); break; - case 88: - case 89: + case 86: + case 87: if ((0x7fffffe07fffffeL & l) != 0L) jjCheckNAddStates(103, 105); break; - case 91: + case 89: if ((0x47fffffe87fffffeL & l) != 0L) jjCheckNAddStates(114, 116); break; - case 93: + case 91: if ((0x7e0000007eL & l) != 0L) - jjstateSet[jjnewStateCnt++] = 94; + jjstateSet[jjnewStateCnt++] = 92; break; - case 94: + case 92: if ((0x7e0000007eL & l) != 0L) jjCheckNAddStates(114, 116); break; - case 95: + case 93: if (curChar != 64) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(117, 122); break; - case 97: + case 95: if ((0x7e0000007eL & l) != 0L) - jjstateSet[jjnewStateCnt++] = 98; + jjstateSet[jjnewStateCnt++] = 96; break; - case 98: + case 96: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(117, 122); break; - case 99: + case 97: if ((0x47fffffe87fffffeL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(117, 122); break; - case 103: + case 101: if ((0x47fffffe87ffffffL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(127, 131); break; - case 105: + case 103: if ((0x7e0000007eL & l) != 0L) - jjstateSet[jjnewStateCnt++] = 106; + jjstateSet[jjnewStateCnt++] = 104; break; - case 106: + case 104: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddStates(127, 131); break; - case 114: + case 112: if ((0x87fffffe07fffffeL & l) == 0L) break; - if (kind > 87) - kind = 87; - jjCheckNAddTwoStates(114, 115); + if (kind > 88) + kind = 88; + jjCheckNAddTwoStates(112, 113); break; - case 115: + case 113: if (curChar == 126) - jjCheckNAdd(114); + jjCheckNAdd(112); + break; + case 114: + if ((0x78000001f8000001L & l) != 0L && kind > 89) + kind = 89; + break; + case 115: + if (curChar == 109) + jjAddStates(181, 182); break; case 116: - if ((0x78000001f8000001L & l) != 0L && kind > 88) - kind = 88; + if (curChar == 111) + jjCheckNAdd(45); break; - case 131: + case 117: + if (curChar == 116) + jjstateSet[jjnewStateCnt++] = 116; + break; + case 118: + if (curChar == 108) + jjstateSet[jjnewStateCnt++] = 117; + break; + case 119: + if (curChar == 105) + jjstateSet[jjnewStateCnt++] = 118; + break; + case 120: + if (curChar == 97) + jjstateSet[jjnewStateCnt++] = 119; + break; + case 122: + if ((0x47fffffe87ffffffL & l) == 0L) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(132, 135); + break; + case 124: + if ((0x7e0000007eL & l) != 0L) + jjstateSet[jjnewStateCnt++] = 125; + break; + case 125: + if ((0x7e0000007eL & l) == 0L) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(132, 135); + break; + case 127: + if ((0x47fffffe87ffffffL & l) == 0L) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(142, 145); + break; + case 129: + if ((0x7e0000007eL & l) != 0L) + jjstateSet[jjnewStateCnt++] = 130; + break; + case 130: + if ((0x7e0000007eL & l) == 0L) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(142, 145); + break; + case 132: + if (curChar == 116) + jjstateSet[jjnewStateCnt++] = 131; + break; + case 133: + if (curChar == 101) + jjstateSet[jjnewStateCnt++] = 132; + break; + case 134: + if (curChar == 110) + jjstateSet[jjnewStateCnt++] = 133; + break; + case 135: + if (curChar == 103) + jjstateSet[jjnewStateCnt++] = 134; + break; + case 136: + if (curChar == 97) + jjstateSet[jjnewStateCnt++] = 135; + break; + case 151: if (curChar == 126) - jjCheckNAdd(130); + jjCheckNAdd(150); break; - case 147: + case 167: if (curChar == 126) - jjstateSet[jjnewStateCnt++] = 148; + jjstateSet[jjnewStateCnt++] = 168; break; - case 148: - case 149: - case 151: - jjCheckNAddStates(244, 247); + case 168: + case 169: + case 171: + jjCheckNAddStates(260, 263); break; - case 163: + case 183: if (curChar == 126) - jjstateSet[jjnewStateCnt++] = 164; + jjstateSet[jjnewStateCnt++] = 184; break; - case 164: - case 165: - case 167: - jjCheckNAddStates(252, 255); + case 184: + case 185: + case 187: + jjCheckNAddStates(268, 271); break; - case 170: + case 190: if (curChar == 123) - jjAddStates(277, 278); + jjAddStates(293, 294); break; - case 172: + case 192: if ((0x87fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(212, 216); + jjCheckNAddStates(228, 232); break; - case 173: + case 193: if (curChar == 126) - jjCheckNAdd(172); + jjCheckNAdd(192); break; - case 174: + case 194: if (curChar == 95) - jjCheckNAddTwoStates(175, 176); + jjCheckNAddTwoStates(195, 196); break; - case 175: + case 195: if ((0x87fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(256, 260); + jjCheckNAddStates(272, 276); break; - case 176: + case 196: if (curChar == 126) - jjCheckNAdd(175); + jjCheckNAdd(195); break; - case 178: + case 198: if (curChar == 126) - jjstateSet[jjnewStateCnt++] = 179; + jjstateSet[jjnewStateCnt++] = 199; break; - case 179: - jjCheckNAddStates(261, 264); + case 199: + jjCheckNAddStates(277, 280); break; - case 180: + case 200: if ((0xdfffffffffffffffL & l) != 0L) - jjCheckNAddStates(261, 264); + jjCheckNAddStates(277, 280); break; - case 181: + case 201: if (curChar == 125) - jjCheckNAdd(180); + jjCheckNAdd(200); break; - case 182: - if (curChar == 125 && kind > 71) - kind = 71; + case 202: + if (curChar == 125 && kind > 72) + kind = 72; break; - case 183: + case 203: if (curChar == 125) - jjstateSet[jjnewStateCnt++] = 182; + jjstateSet[jjnewStateCnt++] = 202; break; - case 185: + case 205: if (curChar == 123) - jjCheckNAddTwoStates(186, 187); + jjCheckNAddTwoStates(206, 207); break; - case 186: + case 206: if ((0x87fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(207, 211); + jjCheckNAddStates(223, 227); break; - case 187: + case 207: if (curChar == 126) - jjCheckNAdd(186); + jjCheckNAdd(206); break; - case 188: + case 208: if (curChar == 95) - jjCheckNAddTwoStates(189, 190); + jjCheckNAddTwoStates(209, 210); break; - case 189: + case 209: if ((0x87fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(265, 269); + jjCheckNAddStates(281, 285); break; - case 190: + case 210: if (curChar == 126) - jjCheckNAdd(189); + jjCheckNAdd(209); break; - case 192: + case 212: if (curChar == 126) - jjstateSet[jjnewStateCnt++] = 193; + jjstateSet[jjnewStateCnt++] = 213; break; - case 193: - jjCheckNAddStates(270, 273); + case 213: + jjCheckNAddStates(286, 289); break; - case 194: + case 214: if ((0xdfffffffffffffffL & l) != 0L) - jjCheckNAddStates(270, 273); + jjCheckNAddStates(286, 289); break; - case 195: + case 215: if (curChar == 125) - jjCheckNAdd(194); + jjCheckNAdd(214); break; - case 196: - if (curChar == 125 && kind > 72) - kind = 72; + case 216: + if (curChar == 125 && kind > 73) + kind = 73; break; - case 197: + case 217: if (curChar == 125) - jjstateSet[jjnewStateCnt++] = 196; + jjstateSet[jjnewStateCnt++] = 216; break; - case 198: + case 218: if (curChar == 126) - jjCheckNAddStates(274, 276); + jjCheckNAddStates(290, 292); break; default : break; } @@ -3995,19 +4267,19 @@ { switch(jjstateSet[--i]) { - case 199: + case 219: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(212, 216); + jjCheckNAddStates(228, 232); if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(207, 211); + jjCheckNAddStates(223, 227); break; case 21: - case 114: + case 112: if (!jjCanMove_0(hiByte, i1, i2, l1, l2)) break; - if (kind > 87) - kind = 87; - jjCheckNAddTwoStates(114, 115); + if (kind > 88) + kind = 88; + jjCheckNAddTwoStates(112, 113); break; case 3: case 4: @@ -4024,8 +4296,8 @@ case 26: if (!jjCanMove_0(hiByte, i1, i2, l1, l2)) break; - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(23, 24); break; case 34: @@ -4033,47 +4305,47 @@ case 37: if (!jjCanMove_0(hiByte, i1, i2, l1, l2)) break; - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(34, 35); break; - case 148: - case 149: - case 151: + case 168: + case 169: + case 171: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(244, 247); + jjCheckNAddStates(260, 263); break; - case 164: - case 165: - case 167: + case 184: + case 185: + case 187: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(252, 255); + jjCheckNAddStates(268, 271); break; - case 172: + case 192: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(212, 216); + jjCheckNAddStates(228, 232); break; - case 175: + case 195: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(256, 260); + jjCheckNAddStates(272, 276); break; - case 179: - case 180: + case 199: + case 200: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(261, 264); + jjCheckNAddStates(277, 280); break; - case 186: + case 206: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(207, 211); + jjCheckNAddStates(223, 227); break; - case 189: + case 209: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(265, 269); + jjCheckNAddStates(281, 285); break; - case 193: - case 194: + case 213: + case 214: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(270, 273); + jjCheckNAddStates(286, 289); break; default : break; } @@ -4086,7 +4358,7 @@ kind = 0x7fffffff; } ++curPos; - if ((i = jjnewStateCnt) == (startsAt = 199 - (jjnewStateCnt = startsAt))) + if ((i = jjnewStateCnt) == (startsAt = 219 - (jjnewStateCnt = startsAt))) return curPos; try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { return curPos; } @@ -4097,35 +4369,35 @@ switch (pos) { case 0: - if ((active1 & 0x4fe00L) != 0L) + if ((active1 & 0x9fc00L) != 0L) { - jjmatchedKind = 88; + jjmatchedKind = 89; return -1; } - if ((active1 & 0x40L) != 0L) + if ((active1 & 0x80L) != 0L) { - jjmatchedKind = 88; - return 157; + jjmatchedKind = 89; + return 177; } return -1; case 1: - if ((active1 & 0x4fe00L) != 0L) + if ((active1 & 0x9fc00L) != 0L) { if (jjmatchedPos == 0) { - jjmatchedKind = 88; + jjmatchedKind = 89; jjmatchedPos = 0; } return -1; } - if ((active1 & 0x40L) != 0L) + if ((active1 & 0x80L) != 0L) { if (jjmatchedPos == 0) { - jjmatchedKind = 88; + jjmatchedKind = 89; jjmatchedPos = 0; } - return 192; + return 212; } return -1; default : @@ -4141,23 +4413,23 @@ switch(curChar) { case 35: - return jjMoveStringLiteralDfa1_2(0x8000L); + return jjMoveStringLiteralDfa1_2(0x10000L); case 42: - return jjMoveStringLiteralDfa1_2(0x200L); + return jjMoveStringLiteralDfa1_2(0x400L); case 44: - return jjMoveStringLiteralDfa1_2(0x4000L); + return jjMoveStringLiteralDfa1_2(0x8000L); case 45: - return jjMoveStringLiteralDfa1_2(0x800L); + return jjMoveStringLiteralDfa1_2(0x1000L); case 47: - return jjMoveStringLiteralDfa1_2(0x400L); + return jjMoveStringLiteralDfa1_2(0x800L); case 92: - return jjMoveStringLiteralDfa1_2(0x40000L); + return jjMoveStringLiteralDfa1_2(0x80000L); case 94: - return jjMoveStringLiteralDfa1_2(0x2000L); + return jjMoveStringLiteralDfa1_2(0x4000L); case 95: - return jjMoveStringLiteralDfa1_2(0x1000L); + return jjMoveStringLiteralDfa1_2(0x2000L); case 123: - return jjMoveStringLiteralDfa1_2(0x40L); + return jjMoveStringLiteralDfa1_2(0x80L); default : return jjMoveNfa_2(1, 0); } @@ -4172,39 +4444,39 @@ switch(curChar) { case 35: - if ((active1 & 0x8000L) != 0L) - return jjStopAtPos(1, 79); + if ((active1 & 0x10000L) != 0L) + return jjStopAtPos(1, 80); break; case 42: - if ((active1 & 0x200L) != 0L) - return jjStopAtPos(1, 73); + if ((active1 & 0x400L) != 0L) + return jjStopAtPos(1, 74); break; case 44: - if ((active1 & 0x4000L) != 0L) - return jjStopAtPos(1, 78); + if ((active1 & 0x8000L) != 0L) + return jjStopAtPos(1, 79); break; case 45: - if ((active1 & 0x800L) != 0L) - return jjStopAtPos(1, 75); + if ((active1 & 0x1000L) != 0L) + return jjStopAtPos(1, 76); break; case 47: - if ((active1 & 0x400L) != 0L) - return jjStopAtPos(1, 74); + if ((active1 & 0x800L) != 0L) + return jjStopAtPos(1, 75); break; case 92: - if ((active1 & 0x40000L) != 0L) - return jjStopAtPos(1, 82); + if ((active1 & 0x80000L) != 0L) + return jjStopAtPos(1, 83); break; case 94: - if ((active1 & 0x2000L) != 0L) - return jjStopAtPos(1, 77); + if ((active1 & 0x4000L) != 0L) + return jjStopAtPos(1, 78); break; case 95: - if ((active1 & 0x1000L) != 0L) - return jjStopAtPos(1, 76); + if ((active1 & 0x2000L) != 0L) + return jjStopAtPos(1, 77); break; case 123: - return jjMoveStringLiteralDfa2_2(active1, 0x40L); + return jjMoveStringLiteralDfa2_2(active1, 0x80L); default : break; } @@ -4222,8 +4494,8 @@ switch(curChar) { case 123: - if ((active1 & 0x40L) != 0L) - return jjStopAtPos(2, 70); + if ((active1 & 0x80L) != 0L) + return jjStopAtPos(2, 71); break; default : break; @@ -4233,7 +4505,7 @@ private int jjMoveNfa_2(int startState, int curPos) { int startsAt = 0; - jjnewStateCnt = 192; + jjnewStateCnt = 212; int i = 1; jjstateSet[0] = startState; int kind = 0x7fffffff; @@ -4248,44 +4520,44 @@ { switch(jjstateSet[--i]) { - case 192: + case 212: if ((0x3ff0000ffffd9ffL & l) != 0L) - jjCheckNAddStates(279, 283); + jjCheckNAddStates(295, 299); if ((0x3ff0000ffffd9ffL & l) != 0L) - jjCheckNAddStates(284, 288); + jjCheckNAddStates(300, 304); break; case 1: if ((0x3ff0000ffffd9ffL & l) != 0L) { - if (kind > 87) - kind = 87; - jjCheckNAddTwoStates(117, 118); + if (kind > 88) + kind = 88; + jjCheckNAddTwoStates(115, 116); } else if ((0xfc00fffe00000000L & l) != 0L) { - if (kind > 88) - kind = 88; + if (kind > 89) + kind = 89; } else if ((0x2400L & l) != 0L) { - if (kind > 86) - kind = 86; - jjCheckNAddTwoStates(189, 190); + if (kind > 87) + kind = 87; + jjCheckNAddTwoStates(209, 210); } else if ((0x100000200L & l) != 0L) { - if (kind > 84) - kind = 84; - jjCheckNAddStates(289, 294); + if (kind > 85) + kind = 85; + jjCheckNAddStates(305, 310); } if (curChar == 13) - jjAddStates(295, 296); + jjAddStates(311, 312); else if (curChar == 40) - jjCheckNAddStates(297, 299); + jjCheckNAddStates(313, 315); else if (curChar == 33) - jjAddStates(300, 301); + jjAddStates(316, 317); else if (curChar == 41) - jjstateSet[jjnewStateCnt++] = 115; + jjstateSet[jjnewStateCnt++] = 113; break; case 0: if (curChar == 61 && kind > 10) @@ -4293,99 +4565,99 @@ break; case 4: if (curChar == 58) - jjCheckNAddStates(302, 305); + jjCheckNAddStates(318, 321); break; case 6: case 7: - jjCheckNAddStates(302, 305); + jjCheckNAddStates(318, 321); break; case 18: case 19: - jjCheckNAddStates(306, 310); + jjCheckNAddStates(322, 326); break; case 25: if (curChar != 58) break; - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(26, 27); break; case 26: if ((0xfffffffeffffd9ffL & l) == 0L) break; - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(26, 27); break; case 28: - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(26, 27); break; case 29: if ((0x3ff0000ffffd9ffL & l) == 0L) break; - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(26, 27); break; case 30: if ((0xfc00fffe00000000L & l) == 0L) break; - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(26, 27); break; case 36: if (curChar != 58) break; - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(37, 38); break; case 37: if ((0xfffffffeffffd9ffL & l) == 0L) break; - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(37, 38); break; case 39: - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(37, 38); break; case 40: if ((0x3ff0000ffffd9ffL & l) == 0L) break; - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(37, 38); break; case 41: if ((0xfc00fffe00000000L & l) == 0L) break; - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(37, 38); break; case 48: if (curChar == 58) - jjAddStates(311, 313); + jjAddStates(327, 329); break; case 49: if (curChar != 47) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(314, 317); + if (kind > 84) + kind = 84; + jjCheckNAddStates(330, 333); break; case 50: if ((0x2fff6fd200000000L & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(318, 322); + if (kind > 84) + kind = 84; + jjCheckNAddStates(334, 338); break; case 51: if (curChar == 37) @@ -4398,23 +4670,23 @@ case 53: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(318, 322); + if (kind > 84) + kind = 84; + jjCheckNAddStates(334, 338); break; case 54: if (curChar != 47) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(323, 327); + if (kind > 84) + kind = 84; + jjCheckNAddStates(339, 343); break; case 55: if ((0x2fff6fd200000000L & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(323, 327); + if (kind > 84) + kind = 84; + jjCheckNAddStates(339, 343); break; case 56: if (curChar == 37) @@ -4427,23 +4699,23 @@ case 58: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(323, 327); + if (kind > 84) + kind = 84; + jjCheckNAddStates(339, 343); break; case 59: if (curChar != 63) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(328, 330); + if (kind > 84) + kind = 84; + jjCheckNAddStates(344, 346); break; case 60: if ((0xafffefd200000000L & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(328, 330); + if (kind > 84) + kind = 84; + jjCheckNAddStates(344, 346); break; case 61: if (curChar == 37) @@ -4456,22 +4728,22 @@ case 63: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(328, 330); + if (kind > 84) + kind = 84; + jjCheckNAddStates(344, 346); break; case 64: if (curChar != 35) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddTwoStates(65, 66); break; case 65: if ((0xafffefd200000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddTwoStates(65, 66); break; case 66: @@ -4485,8 +4757,8 @@ case 68: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddTwoStates(65, 66); break; case 69: @@ -4512,30 +4784,30 @@ case 74: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(331, 335); + if (kind > 84) + kind = 84; + jjCheckNAddStates(347, 351); break; case 75: if ((0x2bff6fd200000000L & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(331, 335); + if (kind > 84) + kind = 84; + jjCheckNAddStates(347, 351); break; case 76: if (curChar != 47) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(336, 340); + if (kind > 84) + kind = 84; + jjCheckNAddStates(352, 356); break; case 77: if ((0x2fff6fd200000000L & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(336, 340); + if (kind > 84) + kind = 84; + jjCheckNAddStates(352, 356); break; case 78: if (curChar == 37) @@ -4548,372 +4820,434 @@ case 80: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(336, 340); + if (kind > 84) + kind = 84; + jjCheckNAddStates(352, 356); break; case 81: if ((0x2bff6fd200000000L & l) != 0L) jjCheckNAddTwoStates(72, 75); break; - case 89: + case 87: if ((0x3ff680000000000L & l) != 0L) - jjCheckNAddStates(341, 343); + jjCheckNAddStates(357, 359); break; - case 90: + case 88: if (curChar == 58) - jjstateSet[jjnewStateCnt++] = 91; + jjstateSet[jjnewStateCnt++] = 89; break; - case 92: + case 90: if ((0x3ff680000000000L & l) != 0L) - jjCheckNAddStates(344, 346); + jjCheckNAddStates(360, 362); break; - case 93: + case 91: if (curChar != 47) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(347, 354); + if (kind > 84) + kind = 84; + jjCheckNAddStates(363, 370); break; - case 94: + case 92: if ((0x2fff6fd200000000L & l) != 0L) - jjCheckNAddStates(355, 357); + jjCheckNAddStates(371, 373); break; - case 95: + case 93: if (curChar == 37) - jjCheckNAdd(96); + jjCheckNAdd(94); break; - case 96: + case 94: + if ((0x3ff000000000000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 95; + break; + case 95: if ((0x3ff000000000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 97; + jjCheckNAddStates(371, 373); break; case 97: + if (curChar == 37) + jjCheckNAdd(98); + break; + case 98: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(355, 357); + jjstateSet[jjnewStateCnt++] = 99; break; case 99: - if (curChar == 37) - jjCheckNAdd(100); + if ((0x3ff000000000000L & l) == 0L) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(374, 379); break; case 100: - if ((0x3ff000000000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 101; + if ((0x2bff6fd200000000L & l) == 0L) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(374, 379); break; case 101: + if (curChar == 58) + jjCheckNAdd(102); + break; + case 102: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(358, 363); + if (kind > 84) + kind = 84; + jjCheckNAddStates(380, 383); break; - case 102: - if ((0x2bff6fd200000000L & l) == 0L) + case 103: + if (curChar != 47) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(384, 388); + break; + case 104: + if ((0x2fff6fd200000000L & l) == 0L) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(384, 388); + break; + case 105: + if (curChar == 37) + jjstateSet[jjnewStateCnt++] = 106; + break; + case 106: + if ((0x3ff000000000000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 107; + break; + case 107: + if ((0x3ff000000000000L & l) == 0L) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(384, 388); + break; + case 108: + if (curChar == 37) + jjCheckNAddTwoStates(94, 98); + break; + case 109: + if (curChar == 47) + jjstateSet[jjnewStateCnt++] = 91; + break; + case 110: + if (curChar == 58) + jjstateSet[jjnewStateCnt++] = 109; + break; + case 111: + if (curChar != 41) + break; + if (kind > 86) + kind = 86; + jjCheckNAdd(112); + break; + case 112: + if ((0x100000200L & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(358, 363); + if (kind > 86) + kind = 86; + jjCheckNAdd(112); + break; + case 113: + if (curChar == 41) + jjstateSet[jjnewStateCnt++] = 111; break; - case 103: - if (curChar == 58) - jjCheckNAdd(104); + case 114: + if (curChar == 41) + jjstateSet[jjnewStateCnt++] = 113; break; - case 104: - if ((0x3ff000000000000L & l) == 0L) + case 115: + if ((0x3ff0000ffffd9ffL & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(364, 367); + if (kind > 88) + kind = 88; + jjCheckNAddTwoStates(115, 116); break; - case 105: - if (curChar != 47) + case 117: + if ((0xfc00fffe00000000L & l) != 0L && kind > 89) + kind = 89; + break; + case 124: + if (curChar != 63) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(368, 372); + if (kind > 84) + kind = 84; + jjCheckNAddStates(389, 392); break; - case 106: - if ((0x2fff6fd200000000L & l) == 0L) + case 125: + if ((0xafffefd200000000L & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(368, 372); + if (kind > 84) + kind = 84; + jjCheckNAddStates(389, 392); break; - case 107: + case 126: if (curChar == 37) - jjstateSet[jjnewStateCnt++] = 108; + jjstateSet[jjnewStateCnt++] = 127; break; - case 108: + case 127: if ((0x3ff000000000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 109; + jjstateSet[jjnewStateCnt++] = 128; break; - case 109: + case 128: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(368, 372); - break; - case 110: - if (curChar == 37) - jjCheckNAddTwoStates(96, 100); - break; - case 111: - if (curChar == 47) - jjstateSet[jjnewStateCnt++] = 93; - break; - case 112: - if (curChar == 58) - jjstateSet[jjnewStateCnt++] = 111; + if (kind > 84) + kind = 84; + jjCheckNAddStates(389, 392); break; - case 113: - if (curChar != 41) + case 129: + if (curChar != 35) break; - if (kind > 85) - kind = 85; - jjCheckNAdd(114); + if (kind > 84) + kind = 84; + jjCheckNAddStates(393, 398); break; - case 114: - if ((0x100000200L & l) == 0L) + case 130: + if ((0xafffefd200000000L & l) == 0L) break; - if (kind > 85) - kind = 85; - jjCheckNAdd(114); + if (kind > 84) + kind = 84; + jjCheckNAddStates(399, 402); break; - case 115: - if (curChar == 41) - jjstateSet[jjnewStateCnt++] = 113; + case 131: + if (curChar == 37) + jjstateSet[jjnewStateCnt++] = 132; break; - case 116: - if (curChar == 41) - jjstateSet[jjnewStateCnt++] = 115; + case 132: + if ((0x3ff000000000000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 133; break; - case 117: - if ((0x3ff0000ffffd9ffL & l) == 0L) + case 133: + if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 87) - kind = 87; - jjCheckNAddTwoStates(117, 118); + if (kind > 84) + kind = 84; + jjCheckNAddStates(399, 402); break; - case 119: - if ((0xfc00fffe00000000L & l) != 0L && kind > 88) - kind = 88; + case 134: + if (curChar == 58) + jjstateSet[jjnewStateCnt++] = 124; break; - case 120: + case 140: if (curChar == 33) - jjAddStates(300, 301); + jjAddStates(316, 317); break; - case 121: + case 141: if (curChar == 33 && kind > 11) kind = 11; break; - case 122: + case 142: if (curChar == 40) - jjCheckNAddStates(297, 299); + jjCheckNAddStates(313, 315); break; - case 123: + case 143: if (curChar == 37) - jjCheckNAddStates(373, 376); + jjCheckNAddStates(403, 406); break; - case 125: - jjCheckNAddStates(373, 376); + case 145: + jjCheckNAddStates(403, 406); break; - case 126: + case 146: if ((0xffffffdfffffffffL & l) != 0L) - jjCheckNAddStates(373, 376); + jjCheckNAddStates(403, 406); break; - case 127: + case 147: if (curChar == 37) - jjstateSet[jjnewStateCnt++] = 128; + jjstateSet[jjnewStateCnt++] = 148; break; - case 128: + case 148: if ((0xfffffdffffffffffL & l) != 0L) - jjCheckNAddStates(373, 376); + jjCheckNAddStates(403, 406); break; - case 129: + case 149: if (curChar == 41) - jjCheckNAddStates(377, 380); + jjCheckNAddStates(407, 410); break; - case 130: + case 150: if ((0x100000200L & l) != 0L) - jjCheckNAddStates(377, 380); + jjCheckNAddStates(407, 410); break; - case 131: + case 151: if (curChar == 10) - jjCheckNAddTwoStates(132, 135); + jjCheckNAddTwoStates(152, 155); break; - case 132: + case 152: if ((0x100000200L & l) != 0L) - jjCheckNAddTwoStates(132, 135); + jjCheckNAddTwoStates(152, 155); break; - case 133: - if (curChar == 40 && kind > 66) - kind = 66; + case 153: + if (curChar == 40 && kind > 67) + kind = 67; break; - case 134: + case 154: if (curChar == 40) - jjstateSet[jjnewStateCnt++] = 133; + jjstateSet[jjnewStateCnt++] = 153; break; - case 135: + case 155: if (curChar == 40) - jjstateSet[jjnewStateCnt++] = 134; + jjstateSet[jjnewStateCnt++] = 154; break; - case 136: + case 156: if (curChar == 13) - jjstateSet[jjnewStateCnt++] = 131; + jjstateSet[jjnewStateCnt++] = 151; break; - case 137: + case 157: if ((0x2400L & l) != 0L) - jjCheckNAddTwoStates(132, 135); + jjCheckNAddTwoStates(152, 155); break; - case 138: + case 158: if (curChar == 37) - jjstateSet[jjnewStateCnt++] = 129; + jjstateSet[jjnewStateCnt++] = 149; break; - case 139: + case 159: if (curChar == 37) - jjCheckNAddStates(381, 384); + jjCheckNAddStates(411, 414); break; - case 141: - jjCheckNAddStates(381, 384); + case 161: + jjCheckNAddStates(411, 414); break; - case 142: + case 162: if ((0xffffffdfffffffffL & l) != 0L) - jjCheckNAddStates(381, 384); + jjCheckNAddStates(411, 414); break; - case 143: + case 163: if (curChar == 37) - jjstateSet[jjnewStateCnt++] = 144; + jjstateSet[jjnewStateCnt++] = 164; break; - case 144: + case 164: if ((0xfffffdffffffffffL & l) != 0L) - jjCheckNAddStates(381, 384); + jjCheckNAddStates(411, 414); break; - case 145: - if (curChar == 41 && kind > 67) - kind = 67; + case 165: + if (curChar == 41 && kind > 68) + kind = 68; break; - case 146: + case 166: if (curChar == 37) - jjstateSet[jjnewStateCnt++] = 145; + jjstateSet[jjnewStateCnt++] = 165; break; - case 147: + case 167: if (curChar != 40) break; - if (kind > 68) - kind = 68; - jjCheckNAdd(148); + if (kind > 69) + kind = 69; + jjCheckNAdd(168); break; - case 148: + case 168: if ((0x100000200L & l) == 0L) break; - if (kind > 68) - kind = 68; - jjCheckNAdd(148); + if (kind > 69) + kind = 69; + jjCheckNAdd(168); break; - case 149: + case 169: if (curChar == 40) - jjstateSet[jjnewStateCnt++] = 147; + jjstateSet[jjnewStateCnt++] = 167; break; - case 150: + case 170: if ((0x100000200L & l) == 0L) break; - if (kind > 84) - kind = 84; - jjCheckNAddStates(289, 294); + if (kind > 85) + kind = 85; + jjCheckNAddStates(305, 310); break; - case 151: + case 171: if ((0x100000200L & l) != 0L) - jjCheckNAddTwoStates(151, 152); + jjCheckNAddTwoStates(171, 172); break; - case 152: + case 172: if (curChar == 40) - jjCheckNAdd(149); + jjCheckNAdd(169); break; - case 153: + case 173: if ((0x100000200L & l) == 0L) break; - if (kind > 84) - kind = 84; - jjCheckNAddTwoStates(153, 154); + if (kind > 85) + kind = 85; + jjCheckNAddTwoStates(173, 174); break; - case 155: + case 175: if ((0x100000200L & l) != 0L) - jjCheckNAddTwoStates(155, 116); + jjCheckNAddTwoStates(175, 114); break; - case 158: + case 178: if ((0x3ff0000ffffd9ffL & l) != 0L) - jjCheckNAddStates(284, 288); + jjCheckNAddStates(300, 304); break; - case 160: + case 180: if ((0x400600000000000L & l) != 0L) - jjCheckNAddTwoStates(161, 162); + jjCheckNAddTwoStates(181, 182); break; - case 161: + case 181: if ((0x3ff0000ffffd9ffL & l) != 0L) - jjCheckNAddStates(385, 389); + jjCheckNAddStates(415, 419); break; - case 163: + case 183: if ((0x100000200L & l) != 0L) - jjCheckNAddStates(390, 393); + jjCheckNAddStates(420, 423); break; - case 165: - case 166: - jjCheckNAddStates(390, 393); + case 185: + case 186: + jjCheckNAddStates(420, 423); break; - case 170: + case 190: if (curChar == 47) - jjstateSet[jjnewStateCnt++] = 169; + jjstateSet[jjnewStateCnt++] = 189; break; - case 172: + case 192: if ((0x3ff0000ffffd9ffL & l) != 0L) - jjCheckNAddStates(279, 283); + jjCheckNAddStates(295, 299); break; - case 174: + case 194: if ((0x400600000000000L & l) != 0L) - jjCheckNAddTwoStates(175, 176); + jjCheckNAddTwoStates(195, 196); break; - case 175: + case 195: if ((0x3ff0000ffffd9ffL & l) != 0L) - jjCheckNAddStates(394, 398); + jjCheckNAddStates(424, 428); break; - case 177: + case 197: if ((0x100000200L & l) != 0L) - jjCheckNAddStates(399, 402); + jjCheckNAddStates(429, 432); break; - case 179: - case 180: - jjCheckNAddStates(399, 402); + case 199: + case 200: + jjCheckNAddStates(429, 432); break; - case 185: + case 205: if (curChar == 13) - jjAddStates(295, 296); + jjAddStates(311, 312); break; - case 186: - if (curChar == 10 && kind > 86) - kind = 86; + case 206: + if (curChar == 10 && kind > 87) + kind = 87; break; - case 187: + case 207: if (curChar == 10) - jjCheckNAddTwoStates(189, 190); + jjCheckNAddTwoStates(209, 210); break; - case 188: - if (curChar == 10 && kind > 89) - kind = 89; + case 208: + if (curChar == 10 && kind > 90) + kind = 90; break; - case 189: + case 209: if (curChar == 13) - jjstateSet[jjnewStateCnt++] = 188; + jjstateSet[jjnewStateCnt++] = 208; break; - case 190: - if ((0x2400L & l) != 0L && kind > 89) - kind = 89; + case 210: + if ((0x2400L & l) != 0L && kind > 90) + kind = 90; break; - case 191: + case 211: if ((0x2400L & l) == 0L) break; - if (kind > 86) - kind = 86; - jjCheckNAddTwoStates(189, 190); + if (kind > 87) + kind = 87; + jjCheckNAddTwoStates(209, 210); break; default : break; } @@ -4926,40 +5260,40 @@ { switch(jjstateSet[--i]) { - case 157: + case 177: if (curChar == 123) - jjCheckNAddTwoStates(172, 173); + jjCheckNAddTwoStates(192, 193); if (curChar == 123) - jjCheckNAddTwoStates(158, 159); + jjCheckNAddTwoStates(178, 179); break; - case 192: + case 212: if ((0x87fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(279, 283); + jjCheckNAddStates(295, 299); else if (curChar == 126) - jjCheckNAdd(172); + jjCheckNAdd(192); if ((0x87fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(284, 288); + jjCheckNAddStates(300, 304); else if (curChar == 126) - jjCheckNAdd(158); + jjCheckNAdd(178); break; case 1: if ((0x87fffffe07fffffeL & l) != 0L) { - if (kind > 87) - kind = 87; - jjCheckNAddTwoStates(117, 118); + if (kind > 88) + kind = 88; + jjCheckNAddTwoStates(115, 116); } else if ((0x78000001f8000001L & l) != 0L) { - if (kind > 88) - kind = 88; + if (kind > 89) + kind = 89; } if ((0x7fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(341, 343); + jjCheckNAddStates(357, 359); else if (curChar == 126) - jjCheckNAddStates(403, 405); + jjCheckNAddStates(433, 435); else if (curChar == 123) - jjAddStates(406, 407); + jjAddStates(436, 437); else if (curChar == 91) jjstateSet[jjnewStateCnt++] = 3; else if (curChar == 124) @@ -4968,7 +5302,9 @@ kind = 11; } if (curChar == 109) - jjstateSet[jjnewStateCnt++] = 86; + jjAddStates(438, 439); + else if (curChar == 120) + jjstateSet[jjnewStateCnt++] = 84; else if (curChar == 97) jjstateSet[jjnewStateCnt++] = 46; else if (curChar == 105) @@ -4982,18 +5318,18 @@ break; case 3: if (curChar == 91) - jjCheckNAddStates(306, 310); + jjCheckNAddStates(322, 326); break; case 5: if (curChar == 126) jjstateSet[jjnewStateCnt++] = 6; break; case 6: - jjCheckNAddStates(302, 305); + jjCheckNAddStates(318, 321); break; case 7: if ((0xffffffffdfffffffL & l) != 0L) - jjCheckNAddStates(302, 305); + jjCheckNAddStates(318, 321); break; case 8: if (curChar == 93) @@ -5001,7 +5337,7 @@ break; case 9: if (curChar == 93) - jjCheckNAddStates(306, 310); + jjCheckNAddStates(322, 326); break; case 10: if (curChar == 101) @@ -5036,19 +5372,19 @@ jjstateSet[jjnewStateCnt++] = 18; break; case 18: - jjCheckNAddStates(306, 310); + jjCheckNAddStates(322, 326); break; case 19: if ((0xffffffffdfffffffL & l) != 0L) - jjCheckNAddStates(306, 310); + jjCheckNAddStates(322, 326); break; case 20: if (curChar == 93) jjCheckNAdd(19); break; case 21: - if (curChar == 93 && kind > 69) - kind = 69; + if (curChar == 93 && kind > 70) + kind = 70; break; case 22: if (curChar == 93) @@ -5064,26 +5400,26 @@ break; case 26: case 28: - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(26, 27); break; case 27: if (curChar == 126) - jjAddStates(408, 410); + jjAddStates(440, 442); break; case 29: if ((0x87fffffe07fffffeL & l) == 0L) break; - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(26, 27); break; case 30: if ((0x78000001f8000001L & l) == 0L) break; - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(26, 27); break; case 31: @@ -5108,26 +5444,26 @@ break; case 37: case 39: - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(37, 38); break; case 38: if (curChar == 126) - jjAddStates(411, 413); + jjAddStates(443, 445); break; case 40: if ((0x87fffffe07fffffeL & l) == 0L) break; - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(37, 38); break; case 41: if ((0x78000001f8000001L & l) == 0L) break; - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(37, 38); break; case 42: @@ -5157,9 +5493,9 @@ case 50: if ((0x47fffffe87ffffffL & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(318, 322); + if (kind > 84) + kind = 84; + jjCheckNAddStates(334, 338); break; case 52: if ((0x7e0000007eL & l) != 0L) @@ -5168,16 +5504,16 @@ case 53: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(318, 322); + if (kind > 84) + kind = 84; + jjCheckNAddStates(334, 338); break; case 55: if ((0x47fffffe87ffffffL & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(323, 327); + if (kind > 84) + kind = 84; + jjCheckNAddStates(339, 343); break; case 57: if ((0x7e0000007eL & l) != 0L) @@ -5186,16 +5522,16 @@ case 58: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(323, 327); + if (kind > 84) + kind = 84; + jjCheckNAddStates(339, 343); break; case 60: if ((0x47fffffe87ffffffL & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(328, 330); + if (kind > 84) + kind = 84; + jjCheckNAddStates(344, 346); break; case 62: if ((0x7e0000007eL & l) != 0L) @@ -5204,15 +5540,15 @@ case 63: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(328, 330); + if (kind > 84) + kind = 84; + jjCheckNAddStates(344, 346); break; case 65: if ((0x47fffffe87ffffffL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddTwoStates(65, 66); break; case 67: @@ -5222,8 +5558,8 @@ case 68: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAddTwoStates(65, 66); break; case 70: @@ -5241,23 +5577,23 @@ case 74: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(331, 335); + if (kind > 84) + kind = 84; + jjCheckNAddStates(347, 351); break; case 75: if ((0x47fffffe87ffffffL & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(331, 335); + if (kind > 84) + kind = 84; + jjCheckNAddStates(347, 351); break; case 77: if ((0x47fffffe87ffffffL & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(336, 340); + if (kind > 84) + kind = 84; + jjCheckNAddStates(352, 356); break; case 79: if ((0x7e0000007eL & l) != 0L) @@ -5266,237 +5602,309 @@ case 80: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(336, 340); + if (kind > 84) + kind = 84; + jjCheckNAddStates(352, 356); break; case 81: if ((0x47fffffe87fffffeL & l) != 0L) jjCheckNAddTwoStates(72, 75); break; case 82: - if (curChar == 111) - jjstateSet[jjnewStateCnt++] = 48; + if (curChar == 112) + jjCheckNAdd(48); break; case 83: - if (curChar == 116) + if (curChar == 112) jjstateSet[jjnewStateCnt++] = 82; break; case 84: - if (curChar == 108) + if (curChar == 109) jjstateSet[jjnewStateCnt++] = 83; break; case 85: - if (curChar == 105) + if (curChar == 120) jjstateSet[jjnewStateCnt++] = 84; break; case 86: - if (curChar == 97) - jjstateSet[jjnewStateCnt++] = 85; - break; case 87: - if (curChar == 109) - jjstateSet[jjnewStateCnt++] = 86; + if ((0x7fffffe07fffffeL & l) != 0L) + jjCheckNAddStates(357, 359); break; - case 88: case 89: + case 90: if ((0x7fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(341, 343); + jjCheckNAddStates(360, 362); break; - case 91: case 92: - if ((0x7fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(344, 346); - break; - case 94: if ((0x47fffffe87fffffeL & l) != 0L) - jjCheckNAddStates(355, 357); + jjCheckNAddStates(371, 373); break; - case 96: + case 94: if ((0x7e0000007eL & l) != 0L) - jjstateSet[jjnewStateCnt++] = 97; + jjstateSet[jjnewStateCnt++] = 95; break; - case 97: + case 95: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(355, 357); + jjCheckNAddStates(371, 373); break; - case 98: + case 96: if (curChar != 64) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(358, 363); + if (kind > 84) + kind = 84; + jjCheckNAddStates(374, 379); break; - case 100: + case 98: if ((0x7e0000007eL & l) != 0L) - jjstateSet[jjnewStateCnt++] = 101; + jjstateSet[jjnewStateCnt++] = 99; break; - case 101: + case 99: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(358, 363); + if (kind > 84) + kind = 84; + jjCheckNAddStates(374, 379); break; - case 102: + case 100: if ((0x47fffffe87fffffeL & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(358, 363); + if (kind > 84) + kind = 84; + jjCheckNAddStates(374, 379); break; - case 106: + case 104: if ((0x47fffffe87ffffffL & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(368, 372); + if (kind > 84) + kind = 84; + jjCheckNAddStates(384, 388); break; - case 108: + case 106: if ((0x7e0000007eL & l) != 0L) - jjstateSet[jjnewStateCnt++] = 109; + jjstateSet[jjnewStateCnt++] = 107; break; - case 109: + case 107: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(368, 372); + if (kind > 84) + kind = 84; + jjCheckNAddStates(384, 388); break; - case 117: + case 115: if ((0x87fffffe07fffffeL & l) == 0L) break; - if (kind > 87) - kind = 87; - jjCheckNAddTwoStates(117, 118); + if (kind > 88) + kind = 88; + jjCheckNAddTwoStates(115, 116); break; - case 118: + case 116: if (curChar == 126) - jjCheckNAdd(117); + jjCheckNAdd(115); + break; + case 117: + if ((0x78000001f8000001L & l) != 0L && kind > 89) + kind = 89; + break; + case 118: + if (curChar == 109) + jjAddStates(438, 439); break; case 119: - if ((0x78000001f8000001L & l) != 0L && kind > 88) - kind = 88; + if (curChar == 111) + jjCheckNAdd(48); break; - case 124: - if (curChar == 126) - jjstateSet[jjnewStateCnt++] = 125; + case 120: + if (curChar == 116) + jjstateSet[jjnewStateCnt++] = 119; + break; + case 121: + if (curChar == 108) + jjstateSet[jjnewStateCnt++] = 120; + break; + case 122: + if (curChar == 105) + jjstateSet[jjnewStateCnt++] = 121; + break; + case 123: + if (curChar == 97) + jjstateSet[jjnewStateCnt++] = 122; break; case 125: - case 126: + if ((0x47fffffe87ffffffL & l) == 0L) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(389, 392); + break; + case 127: + if ((0x7e0000007eL & l) != 0L) + jjstateSet[jjnewStateCnt++] = 128; + break; case 128: - jjCheckNAddStates(373, 376); + if ((0x7e0000007eL & l) == 0L) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(389, 392); break; - case 140: - if (curChar == 126) - jjstateSet[jjnewStateCnt++] = 141; + case 130: + if ((0x47fffffe87ffffffL & l) == 0L) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(399, 402); + break; + case 132: + if ((0x7e0000007eL & l) != 0L) + jjstateSet[jjnewStateCnt++] = 133; + break; + case 133: + if ((0x7e0000007eL & l) == 0L) + break; + if (kind > 84) + kind = 84; + jjCheckNAddStates(399, 402); + break; + case 135: + if (curChar == 116) + jjstateSet[jjnewStateCnt++] = 134; + break; + case 136: + if (curChar == 101) + jjstateSet[jjnewStateCnt++] = 135; + break; + case 137: + if (curChar == 110) + jjstateSet[jjnewStateCnt++] = 136; + break; + case 138: + if (curChar == 103) + jjstateSet[jjnewStateCnt++] = 137; + break; + case 139: + if (curChar == 97) + jjstateSet[jjnewStateCnt++] = 138; break; - case 141: - case 142: case 144: - jjCheckNAddStates(381, 384); + if (curChar == 126) + jjstateSet[jjnewStateCnt++] = 145; break; - case 154: + case 145: + case 146: + case 148: + jjCheckNAddStates(403, 406); + break; + case 160: if (curChar == 126) - jjCheckNAdd(153); + jjstateSet[jjnewStateCnt++] = 161; break; - case 156: + case 161: + case 162: + case 164: + jjCheckNAddStates(411, 414); + break; + case 174: + if (curChar == 126) + jjCheckNAdd(173); + break; + case 176: if (curChar == 123) - jjAddStates(406, 407); + jjAddStates(436, 437); break; - case 158: + case 178: if ((0x87fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(284, 288); + jjCheckNAddStates(300, 304); break; - case 159: + case 179: if (curChar == 126) - jjCheckNAdd(158); + jjCheckNAdd(178); break; - case 160: + case 180: if (curChar == 95) - jjCheckNAddTwoStates(161, 162); + jjCheckNAddTwoStates(181, 182); break; - case 161: + case 181: if ((0x87fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(385, 389); + jjCheckNAddStates(415, 419); break; - case 162: + case 182: if (curChar == 126) - jjCheckNAdd(161); + jjCheckNAdd(181); break; - case 164: + case 184: if (curChar == 126) - jjstateSet[jjnewStateCnt++] = 165; + jjstateSet[jjnewStateCnt++] = 185; break; - case 165: - jjCheckNAddStates(390, 393); + case 185: + jjCheckNAddStates(420, 423); break; - case 166: + case 186: if ((0xdfffffffffffffffL & l) != 0L) - jjCheckNAddStates(390, 393); + jjCheckNAddStates(420, 423); break; - case 167: + case 187: if (curChar == 125) - jjCheckNAdd(166); + jjCheckNAdd(186); break; - case 168: - if (curChar == 125 && kind > 71) - kind = 71; + case 188: + if (curChar == 125 && kind > 72) + kind = 72; break; - case 169: + case 189: if (curChar == 125) - jjstateSet[jjnewStateCnt++] = 168; + jjstateSet[jjnewStateCnt++] = 188; break; - case 171: + case 191: if (curChar == 123) - jjCheckNAddTwoStates(172, 173); + jjCheckNAddTwoStates(192, 193); break; - case 172: + case 192: if ((0x87fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(279, 283); + jjCheckNAddStates(295, 299); break; - case 173: + case 193: if (curChar == 126) - jjCheckNAdd(172); + jjCheckNAdd(192); break; - case 174: + case 194: if (curChar == 95) - jjCheckNAddTwoStates(175, 176); + jjCheckNAddTwoStates(195, 196); break; - case 175: + case 195: if ((0x87fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(394, 398); + jjCheckNAddStates(424, 428); break; - case 176: + case 196: if (curChar == 126) - jjCheckNAdd(175); + jjCheckNAdd(195); break; - case 178: + case 198: if (curChar == 126) - jjstateSet[jjnewStateCnt++] = 179; + jjstateSet[jjnewStateCnt++] = 199; break; - case 179: - jjCheckNAddStates(399, 402); + case 199: + jjCheckNAddStates(429, 432); break; - case 180: + case 200: if ((0xdfffffffffffffffL & l) != 0L) - jjCheckNAddStates(399, 402); + jjCheckNAddStates(429, 432); break; - case 181: + case 201: if (curChar == 125) - jjCheckNAdd(180); + jjCheckNAdd(200); break; - case 182: - if (curChar == 125 && kind > 72) - kind = 72; + case 202: + if (curChar == 125 && kind > 73) + kind = 73; break; - case 183: + case 203: if (curChar == 125) - jjstateSet[jjnewStateCnt++] = 182; + jjstateSet[jjnewStateCnt++] = 202; break; - case 184: + case 204: if (curChar == 126) - jjCheckNAddStates(403, 405); + jjCheckNAddStates(433, 435); break; default : break; } @@ -5513,37 +5921,37 @@ { switch(jjstateSet[--i]) { - case 192: + case 212: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(284, 288); + jjCheckNAddStates(300, 304); if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(279, 283); + jjCheckNAddStates(295, 299); break; case 1: - case 117: + case 115: if (!jjCanMove_0(hiByte, i1, i2, l1, l2)) break; - if (kind > 87) - kind = 87; - jjCheckNAddTwoStates(117, 118); + if (kind > 88) + kind = 88; + jjCheckNAddTwoStates(115, 116); break; case 6: case 7: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(302, 305); + jjCheckNAddStates(318, 321); break; case 18: case 19: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(306, 310); + jjCheckNAddStates(322, 326); break; case 26: case 28: case 29: if (!jjCanMove_0(hiByte, i1, i2, l1, l2)) break; - if (kind > 80) - kind = 80; + if (kind > 81) + kind = 81; jjCheckNAddTwoStates(26, 27); break; case 37: @@ -5551,47 +5959,47 @@ case 40: if (!jjCanMove_0(hiByte, i1, i2, l1, l2)) break; - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAddTwoStates(37, 38); break; - case 125: - case 126: - case 128: + case 145: + case 146: + case 148: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(373, 376); + jjCheckNAddStates(403, 406); break; - case 141: - case 142: - case 144: + case 161: + case 162: + case 164: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(381, 384); + jjCheckNAddStates(411, 414); break; - case 158: + case 178: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(284, 288); + jjCheckNAddStates(300, 304); break; - case 161: + case 181: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(385, 389); + jjCheckNAddStates(415, 419); break; - case 165: - case 166: + case 185: + case 186: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(390, 393); + jjCheckNAddStates(420, 423); break; - case 172: + case 192: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(279, 283); + jjCheckNAddStates(295, 299); break; - case 175: + case 195: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(394, 398); + jjCheckNAddStates(424, 428); break; - case 179: - case 180: + case 199: + case 200: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(399, 402); + jjCheckNAddStates(429, 432); break; default : break; } @@ -5604,7 +6012,7 @@ kind = 0x7fffffff; } ++curPos; - if ((i = jjnewStateCnt) == (startsAt = 192 - (jjnewStateCnt = startsAt))) + if ((i = jjnewStateCnt) == (startsAt = 212 - (jjnewStateCnt = startsAt))) return curPos; try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { return curPos; } @@ -5613,30 +6021,32 @@ static final int[] jjnextStates = { 23, 0, 24, 2, 5, 8, 26, 35, 46, 13, 21, 2, 3, 4, 24, 2, 5, 8, 27, 29, 30, 34, 33, 14, 15, 20, 36, 38, 39, 45, 43, 44, - 47, 49, 50, 61, 53, 59, 60, 58, 146, 147, 148, 149, 150, 113, 181, 182, - 118, 134, 144, 167, 168, 169, 172, 178, 153, 154, 155, 158, 165, 2, 4, 5, + 47, 49, 50, 61, 53, 59, 60, 58, 187, 188, 189, 192, 198, 173, 174, 175, + 178, 185, 166, 167, 168, 169, 170, 111, 201, 202, 138, 154, 164, 2, 4, 5, 20, 13, 14, 16, 17, 19, 46, 66, 78, 47, 48, 56, 61, 47, 48, 51, 56, 61, 51, 52, 53, 56, 61, 57, 58, 61, 69, 72, 73, 56, 61, 73, - 74, 75, 56, 61, 86, 87, 109, 87, 89, 109, 91, 95, 99, 100, 102, 56, - 61, 107, 92, 91, 95, 96, 99, 100, 102, 56, 61, 101, 102, 56, 61, 102, - 103, 104, 56, 61, 119, 121, 122, 133, 125, 131, 132, 130, 135, 137, 138, 141, - 155, 156, 157, 158, 165, 159, 161, 162, 165, 169, 170, 171, 172, 178, 173, 175, - 176, 178, 148, 114, 116, 152, 166, 25, 26, 27, 36, 37, 38, 8, 9, 10, + 74, 75, 56, 61, 84, 85, 107, 85, 87, 107, 89, 93, 97, 98, 100, 56, + 61, 105, 90, 89, 93, 94, 97, 98, 100, 56, 61, 99, 100, 56, 61, 100, + 101, 102, 56, 61, 122, 123, 56, 126, 127, 128, 56, 61, 62, 63, 127, 128, + 56, 61, 139, 141, 142, 153, 145, 151, 152, 150, 155, 157, 158, 161, 175, 176, + 177, 178, 185, 179, 181, 182, 185, 189, 190, 191, 192, 198, 193, 195, 196, 198, + 168, 112, 114, 172, 186, 120, 136, 25, 26, 27, 36, 37, 38, 8, 9, 10, 13, 19, 10, 11, 12, 13, 19, 14, 16, 17, 19, 21, 22, 23, 26, 28, - 23, 24, 25, 26, 28, 7, 29, 4, 5, 0, 2, 3, 6, 7, 10, 186, - 187, 188, 191, 197, 172, 173, 174, 177, 184, 136, 137, 142, 143, 118, 119, 123, - 124, 125, 129, 130, 131, 132, 113, 146, 162, 128, 135, 139, 140, 119, 121, 122, - 124, 119, 121, 122, 147, 149, 150, 161, 153, 159, 160, 158, 163, 165, 166, 169, - 174, 175, 176, 177, 184, 178, 180, 181, 184, 188, 189, 190, 191, 197, 192, 194, - 195, 197, 130, 114, 116, 171, 185, 172, 173, 174, 177, 183, 158, 159, 160, 163, - 170, 151, 152, 153, 154, 155, 116, 186, 187, 123, 139, 149, 0, 121, 5, 7, + 23, 24, 25, 26, 28, 7, 29, 4, 5, 0, 2, 3, 6, 7, 10, 206, + 207, 208, 211, 217, 192, 193, 194, 197, 204, 156, 157, 162, 163, 138, 139, 143, + 144, 145, 149, 150, 151, 152, 111, 166, 182, 148, 155, 159, 160, 139, 141, 142, + 144, 139, 141, 142, 167, 169, 170, 181, 173, 179, 180, 178, 183, 185, 186, 189, + 194, 195, 196, 197, 204, 198, 200, 201, 204, 208, 209, 210, 211, 217, 212, 214, + 215, 217, 150, 112, 114, 191, 205, 192, 193, 194, 197, 203, 178, 179, 180, 183, + 190, 171, 172, 173, 174, 175, 114, 206, 207, 143, 159, 169, 0, 141, 5, 7, 8, 23, 16, 17, 19, 20, 22, 49, 69, 81, 50, 51, 59, 64, 50, 51, 54, 59, 64, 54, 55, 56, 59, 64, 60, 61, 64, 72, 75, 76, 59, 64, - 76, 77, 78, 59, 64, 89, 90, 112, 90, 92, 112, 94, 98, 102, 103, 105, - 59, 64, 110, 95, 94, 98, 99, 102, 103, 105, 59, 64, 104, 105, 59, 64, - 105, 106, 107, 59, 64, 124, 126, 127, 138, 130, 136, 137, 135, 140, 142, 143, - 146, 160, 161, 162, 163, 170, 164, 166, 167, 170, 174, 175, 176, 177, 183, 178, - 180, 181, 183, 153, 117, 119, 157, 171, 28, 29, 30, 39, 40, 41, + 76, 77, 78, 59, 64, 87, 88, 110, 88, 90, 110, 92, 96, 100, 101, 103, + 59, 64, 108, 93, 92, 96, 97, 100, 101, 103, 59, 64, 102, 103, 59, 64, + 103, 104, 105, 59, 64, 125, 126, 59, 129, 130, 131, 59, 64, 65, 66, 130, + 131, 59, 64, 144, 146, 147, 158, 150, 156, 157, 155, 160, 162, 163, 166, 180, + 181, 182, 183, 190, 184, 186, 187, 190, 194, 195, 196, 197, 203, 198, 200, 201, + 203, 173, 115, 117, 177, 191, 123, 139, 28, 29, 30, 39, 40, 41, }; private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, long l2) { @@ -5658,7 +6068,7 @@ null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, -null, null, null, "\173\173\173", null, null, "\52\52", "\57\57", "\55\55", +null, null, null, null, "\173\173\173", null, null, "\52\52", "\57\57", "\55\55", "\137\137", "\136\136", "\54\54", "\43\43", null, null, "\134\134", null, null, null, null, null, null, null, null, null, }; @@ -5677,18 +6087,18 @@ public static final int[] jjnewLexState = { -1, 1, -1, 6, 6, -1, -1, -1, 6, -1, -1, -1, 1, 6, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 1, -1, 4, -1, 5, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 1, -1, -1, 1, 1, 1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 1, -1, 4, -1, 5, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 1, -1, -1, 1, 1, 1, }; static final long[] jjtoToken = { - 0x1ffdfdL, 0xffffffcL, + 0x1ffdfdL, 0x1ffffff8L, }; static final long[] jjtoSkip = { 0x202L, 0x0L, }; protected SimpleCharStream input_stream; -private final int[] jjrounds = new int[199]; -private final int[] jjstateSet = new int[398]; +private final int[] jjrounds = new int[219]; +private final int[] jjstateSet = new int[438]; private final StringBuilder jjimage = new StringBuilder(); private StringBuilder image = jjimage; private int jjimageLen; @@ -5719,7 +6129,7 @@ { int i; jjround = 0x80000001; - for (i = 199; i-- > 0;) + for (i = 219; i-- > 0;) jjrounds[i] = 0x80000000; } @@ -6011,24 +6421,24 @@ } } break; - case 66 : + case 67 : image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))); input_stream.backup("(((".length()); break; - case 68 : + case 69 : image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))); pushControlState(); break; - case 70 : - image.append(jjstrLiteralImages[70]); - lengthOfMatch = jjstrLiteralImages[70].length(); + case 71 : + image.append(jjstrLiteralImages[71]); + lengthOfMatch = jjstrLiteralImages[71].length(); verbatimBlockDepth++; break; - case 72 : + case 73 : image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))); initMacro(image); break; - case 85 : + case 86 : image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))); if (inEmbeddedDocument()) { popControlState(); @@ -6051,11 +6461,11 @@ } } break; - case 89 : + case 90 : image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))); clearBlockState(); break; - case 90 : + case 91 : image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))); clearBlockState(); break; diff -Nru wem-r477/org.wikimodel.wem/src/test/java/org/wikimodel/wem/test/MediawikiParserTest.java wem-r477-fixed/org.wikimodel.wem/src/test/java/org/wikimodel/wem/test/MediawikiParserTest.java --- wem-r477/org.wikimodel.wem/src/test/java/org/wikimodel/wem/test/MediawikiParserTest.java 2010-07-26 21:55:32.218750000 +0700 +++ wem-r477-fixed/org.wikimodel.wem/src/test/java/org/wikimodel/wem/test/MediawikiParserTest.java 2010-07-27 19:33:48.125000000 +0700 @@ -330,6 +330,8 @@ test("[http://mediawiki.org MediaWiki]", "

MediaWiki

"); test("[http://mediawiki.org]", "

http://mediawiki.org

"); test("[mailto:info@example.org email me]", "

email me

"); + test("[xmpp:info@example.org chat with me]", "

chat with me

"); + test("[magnet:?xt=urn:tree:tiger:ECSCCPON43XR3KRQHK7FN2MW52SF5PLUT3ZEFSQ&xl=28257011&dn=gnat-gpl-2010-jvm-bin.exe Play with Ada]", "

Play with Ada

"); } /** diff -Nru wem-r477/org.wikimodel.wem/src/test/java/org/wikimodel/wem/test/XWiki20ParserTest.java wem-r477-fixed/org.wikimodel.wem/src/test/java/org/wikimodel/wem/test/XWiki20ParserTest.java --- wem-r477/org.wikimodel.wem/src/test/java/org/wikimodel/wem/test/XWiki20ParserTest.java 2010-07-26 21:55:32.203125000 +0700 +++ wem-r477-fixed/org.wikimodel.wem/src/test/java/org/wikimodel/wem/test/XWiki20ParserTest.java 2010-07-27 19:16:15.250000000 +0700 @@ -522,6 +522,9 @@ test("before [[ [toto] [tata] ]] after", "

before [toto] [tata] after

"); test("before wiki:Hello after", "

before wiki:Hello after

"); test("before mailto:Hello after", "

before mailto:Hello after

"); + test("before xmpp:Hello after", "

before xmpp:Hello after

"); + test("before magnet:?xt=urn:tree:tiger:ECSCCPON43XR3KRQHK7FN2MW52SF5PLUT3ZEFSQ&xl=28257011&dn=gnat-gpl-2010-jvm-bin.exe after", "

before magnet:?xt=urn:tree:tiger:ECSCCPON43XR3KRQHK7FN2MW52SF5PLUT3ZEFSQ&xl=28257011&dn=gnat-gpl-2010-jvm-bin.exe after

"); + test("before wiki~:Hello after", "

before wiki:Hello after

"); // Not a reference