214416 Dot char is not escaped in XML10Names.jFlex
diff --git a/bundles/org.eclipse.wst.sse.core/DevTimeSupport/HeadParsers/XML10Names/XML10Names.jFlex b/bundles/org.eclipse.wst.sse.core/DevTimeSupport/HeadParsers/XML10Names/XML10Names.jFlex
index a5dd0f4..be78e6a 100644
--- a/bundles/org.eclipse.wst.sse.core/DevTimeSupport/HeadParsers/XML10Names/XML10Names.jFlex
+++ b/bundles/org.eclipse.wst.sse.core/DevTimeSupport/HeadParsers/XML10Names/XML10Names.jFlex
@@ -1,15 +1,16 @@
/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
+ * Copyright (c) 2004,2008 IBM Corporation, and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Common Public License v1.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
+ * http://www.eclipse.org/legal/cpl-v10.html
+ *
* Contributors:
* IBM Corporation - initial API and implementation
+ * kb.huang - Bug 214416 Dot char is not escaped in XML10Names.jFlex
*******************************************************************************/
/*nlsXXX*/
-package org.eclipse.wst.sse.core.xml.internal.parser;
+package org.eclipse.wst.xml.core.internal.parser;
@@ -26,8 +27,6 @@
%buffer 2048
%apiprivate
-S = (\x20 | \x09 | \x0D | \x0A)
-
BaseChar = [\u0041-\u005A\u0061-\u007A\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF\u0100-\u0131\u0134-\u013E\u0141-\u0148\u014A-\u017E\u0180-\u01C3\u01CD-\u01F0\u01F4-\u01F5\u01FA-\u0217\u0250-\u02A8\u02BB-\u02C1\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03CE\u03D0-\u03D6\u03DA\u03DC\u03DE\u03E0\u03E2-\u03F3\u0401-\u040C\u040E-\u044F\u0451-\u045C\u045E-\u0481\u0490-\u04C4\u04C7-\u04C8\u04CB-\u04CC\u04D0-\u04EB\u04EE-\u04F5\u04F8-\u04F9\u0531-\u0556\u0559\u0561-\u0586\u05D0-\u05EA\u05F0-\u05F2\u0621-\u063A\u0641-\u064A\u0671-\u06B7\u06BA-\u06BE\u06C0-\u06CE\u06D0-\u06D3\u06D5\u06E5-\u06E6\u0905-\u0939\u093D\u0958-\u0961\u0985-\u098C\u098F-\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09DC-\u09DD\u09DF-\u09E1\u09F0-\u09F1\u0A05-\u0A0A\u0A0F-\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32-\u0A33\u0A35-\u0A36\u0A38-\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8B\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2-\u0AB3\u0AB5-\u0AB9\u0ABD\u0AE0\u0B05-\u0B0C\u0B0F-\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32-\u0B33\u0B36-\u0B39\u0B3D\u0B5C-\u0B5D\u0B5F-\u0B61\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99-\u0B9A\u0B9C\u0B9E-\u0B9F\u0BA3-\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB5\u0BB7-\u0BB9\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C33\u0C35-\u0C39\u0C60-\u0C61\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CDE\u0CE0-\u0CE1\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D28\u0D2A-\u0D39\u0D60-\u0D61\u0E01-\u0E2E\u0E30\u0E32-\u0E33\u0E40-\u0E45\u0E81-\u0E82\u0E84\u0E87-\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA-\u0EAB\u0EAD-\u0EAE\u0EB0\u0EB2-\u0EB3\u0EBD\u0EC0-\u0EC4\u0F40-\u0F47\u0F49-\u0F69\u10A0-\u10C5\u10D0-\u10F6\u1100\u1102-\u1103\u1105-\u1107\u1109\u110B-\u110C\u110E-\u1112\u113C\u113E\u1140\u114C\u114E\u1150\u1154-\u1155\u1159\u115F-\u1161\u1163\u1165\u1167\u1169\u116D-\u116E\u1172-\u1173\u1175\u119E\u11A8\u11AB\u11AE-\u11AF\u11B7-\u11B8\u11BA\u11BC-\u11C2\u11EB\u11F0\u11F9\u1E00-\u1E9B\u1EA0-\u1EF9\u1F00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2126\u212A-\u212B\u212E\u2180-\u2182\u3041-\u3094\u30A1-\u30FA\u3105-\u312C\uAC00-\uD7A3]
Ideographic = [\u4E00-\u9FA5\u3007\u3021-\u3029]
@@ -40,34 +39,34 @@
Letter = ({BaseChar} | {Ideographic})
-NameChar = ({Letter} | {Digit} | . | - | _ | : | {CombiningChar} | {Extender})
+NameChar = ({Letter} | {Digit} | "." | "-" | "_" | ":" | {CombiningChar} | {Extender})
-Name = ({Letter} | _ | : ) ({NameChar})*
+Name = ({Letter} | "_" | ":" ) ({NameChar})*
%{
+ boolean result;
+ /**
+ * Creates a new scanner
+ */
+ public XML10Names() {
+ this.zzReader = null;
+ }
- /**
- * Creates a new scanner
- */
- public XML10Names() {
- this.zzReader = null;
- }
-
- public boolean isValidXML10Name(String stringToCheck) {
- boolean result = false;
- yyreset(new java.io.StringReader(stringToCheck));
- try {
- result = isValidXML10Name();
- }
- catch (java.io.IOException e) {
- // should be impossible with strings, but if occurs, just means
- // "not"
- result = false;
- }
- return result;
- }
+ public boolean isValidXML10Name(String stringToCheck) {
+ boolean result = false;
+ yyreset(new java.io.StringReader(stringToCheck));
+ try {
+ result = isValidXML10Name();
+ }
+ catch (java.io.IOException e) {
+ // should be impossible with strings, but if occurs, just means
+ // "not"
+ result = false;
+ }
+ return result;
+ }
%}
@@ -79,14 +78,13 @@
<YYINITIAL>
{
- // don't match if contains trailing or embedded space
- {Name} {S}+ {return false;}
- {Name} {S}+ {Name} {return false;}
+ // name must be whole line (input), not partial
+ // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=214416
+ {Name} {return true; /* exact name */}
+ {Name}.+ {return false; /* more than name */}
- {Name} {return true;}
-
- // match anything should come last
- . {return false;}
+ // match anything (else) should normally come last
+ . {return false; /* matched wild */}
}
@@ -94,7 +92,7 @@
// this rule always in effect
<<EOF>>
{
- {return false;}
+ {return false; /* hit end with no match */}
}
diff --git a/bundles/org.eclipse.wst.sse.core/DevTimeSupport/HeadParsers/XML10Names/XML10Names.java b/bundles/org.eclipse.wst.sse.core/DevTimeSupport/HeadParsers/XML10Names/XML10Names.java
index 07bdcf2..2bc49ef 100644
--- a/bundles/org.eclipse.wst.sse.core/DevTimeSupport/HeadParsers/XML10Names/XML10Names.java
+++ b/bundles/org.eclipse.wst.sse.core/DevTimeSupport/HeadParsers/XML10Names/XML10Names.java
@@ -1,19 +1,18 @@
+/* The following code was generated by JFlex 1.4 on 2/25/08 10:25 AM */
+
/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
+ * Copyright (c) 2004,2008 IBM Corporation, and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Common Public License v1.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
+ * http://www.eclipse.org/legal/cpl-v10.html
+ *
* Contributors:
* IBM Corporation - initial API and implementation
- * Jens Lukowski/Innoopract - initial renaming/restructuring
- *
+ * kb.huang - Bug 214416 Dot char is not escaped in XML10Names.jFlex
*******************************************************************************/
-/* The following code was generated by JFlex 1.4 on 7/17/04 3:43 AM */
-
/*nlsXXX*/
-package org.eclipse.wst.sse.core.xml.internal.parser;
+package org.eclipse.wst.xml.core.internal.parser;
@@ -21,7 +20,7 @@
/**
* This class is a scanner generated by
* <a href="http://www.jflex.de/">JFlex</a> 1.4
- * on 7/17/04 3:43 AM from the specification file
+ * on 2/25/08 10:25 AM from the specification file
* <tt>XML10Names.jflex</tt>
*/
public final class XML10Names {
@@ -39,68 +38,67 @@
* Translates characters to character classes
*/
private static final String ZZ_CMAP_PACKED =
- "\11\0\1\1\1\2\2\0\1\1\22\0\1\1\14\0\1\0\2\0"+
- "\12\0\1\3\6\0\32\3\4\0\1\3\1\0\32\3\74\0\1\0"+
- "\10\0\27\3\1\0\37\3\1\0\72\3\2\0\13\3\2\0\10\3"+
- "\1\0\65\3\1\0\104\3\11\0\44\3\3\0\2\3\4\0\36\3"+
- "\70\0\131\3\22\0\7\3\16\0\2\0\56\0\106\0\32\0\2\0"+
- "\44\0\1\3\1\0\3\3\1\0\1\3\1\0\24\3\1\0\54\3"+
- "\1\0\7\3\3\0\1\3\1\0\1\3\1\0\1\3\1\0\1\3"+
- "\1\0\22\3\15\0\14\3\1\0\102\3\1\0\14\3\1\0\44\3"+
- "\1\0\4\0\11\0\65\3\2\0\2\3\2\0\2\3\3\0\34\3"+
- "\2\0\10\3\2\0\2\3\67\0\46\3\2\0\1\3\7\0\46\3"+
- "\12\0\21\0\1\0\27\0\1\0\3\0\1\0\1\0\1\0\2\0"+
- "\1\0\1\0\13\0\33\3\5\0\3\3\56\0\32\3\5\0\1\0"+
- "\12\3\10\0\15\0\12\0\6\0\1\0\107\3\2\0\5\3\1\0"+
- "\17\3\1\0\4\3\1\0\1\3\17\0\2\3\2\0\1\0\4\0"+
- "\2\0\12\0\u0207\0\3\0\1\0\65\3\2\0\1\0\1\3\20\0"+
- "\3\0\4\0\3\0\12\3\2\0\2\0\12\0\21\0\3\0\1\0"+
- "\10\3\2\0\2\3\2\0\26\3\1\0\7\3\1\0\1\3\3\0"+
- "\4\3\2\0\1\0\1\0\7\0\2\0\2\0\2\0\3\0\11\0"+
- "\1\0\4\0\2\3\1\0\3\3\2\0\2\0\12\0\2\3\20\0"+
- "\1\0\2\0\6\3\4\0\2\3\2\0\26\3\1\0\7\3\1\0"+
- "\2\3\1\0\2\3\1\0\2\3\2\0\1\0\1\0\5\0\4\0"+
- "\2\0\2\0\3\0\13\0\4\3\1\0\1\3\7\0\12\0\2\0"+
- "\3\3\14\0\3\0\1\0\7\3\1\0\1\3\1\0\3\3\1\0"+
- "\26\3\1\0\7\3\1\0\2\3\1\0\5\3\2\0\1\0\1\3"+
- "\10\0\1\0\3\0\1\0\3\0\22\0\1\3\5\0\12\0\21\0"+
- "\3\0\1\0\10\3\2\0\2\3\2\0\26\3\1\0\7\3\1\0"+
- "\2\3\2\0\4\3\2\0\1\0\1\3\6\0\3\0\2\0\2\0"+
- "\3\0\10\0\2\0\4\0\2\3\1\0\3\3\4\0\12\0\22\0"+
- "\2\0\1\0\6\3\3\0\3\3\1\0\4\3\3\0\2\3\1\0"+
- "\1\3\1\0\2\3\3\0\2\3\3\0\3\3\3\0\10\3\1\0"+
- "\3\3\4\0\5\0\3\0\3\0\1\0\4\0\11\0\1\0\17\0"+
- "\11\0\21\0\3\0\1\0\10\3\1\0\3\3\1\0\27\3\1\0"+
- "\12\3\1\0\5\3\4\0\7\0\1\0\3\0\1\0\4\0\7\0"+
- "\2\0\11\0\2\3\4\0\12\0\22\0\2\0\1\0\10\3\1\0"+
- "\3\3\1\0\27\3\1\0\12\3\1\0\5\3\4\0\7\0\1\0"+
- "\3\0\1\0\4\0\7\0\2\0\7\0\1\3\1\0\2\3\4\0"+
- "\12\0\22\0\2\0\1\0\10\3\1\0\3\3\1\0\27\3\1\0"+
- "\20\3\4\0\6\0\2\0\3\0\1\0\4\0\11\0\1\0\10\0"+
- "\2\3\4\0\12\0\221\0\56\3\1\0\1\3\1\0\2\3\7\0"+
- "\5\0\6\3\1\0\10\0\1\0\12\0\47\0\2\3\1\0\1\3"+
- "\2\0\2\3\1\0\1\3\2\0\1\3\6\0\4\3\1\0\7\3"+
- "\1\0\3\3\1\0\1\3\1\0\1\3\2\0\2\3\1\0\2\3"+
- "\1\0\1\3\1\0\2\3\6\0\1\0\2\0\1\3\2\0\5\3"+
- "\1\0\1\0\1\0\6\0\2\0\12\0\76\0\2\0\6\0\12\0"+
- "\13\0\1\0\1\0\1\0\1\0\1\0\4\0\2\0\10\3\1\0"+
- "\41\3\7\0\24\0\1\0\6\0\4\0\6\0\1\0\1\0\1\0"+
- "\25\0\3\0\7\0\1\0\1\0\346\0\46\3\12\0\47\3\11\0"+
- "\1\3\1\0\2\3\1\0\3\3\1\0\1\3\1\0\2\3\1\0"+
- "\5\3\51\0\1\3\1\0\1\3\1\0\1\3\13\0\1\3\1\0"+
- "\1\3\1\0\1\3\3\0\2\3\3\0\1\3\5\0\3\3\1\0"+
- "\1\3\1\0\1\3\1\0\1\3\1\0\1\3\3\0\2\3\3\0"+
- "\2\3\1\0\1\3\50\0\1\3\11\0\1\3\2\0\1\3\2\0"+
- "\2\3\7\0\2\3\1\0\1\3\1\0\7\3\50\0\1\3\4\0"+
- "\1\3\10\0\1\3\u0c06\0\234\3\4\0\132\3\6\0\26\3\2\0"+
- "\6\3\2\0\46\3\2\0\6\3\2\0\10\3\1\0\1\3\1\0"+
- "\1\3\1\0\1\3\1\0\37\3\2\0\65\3\1\0\7\3\1\0"+
- "\1\3\3\0\3\3\1\0\7\3\3\0\4\3\2\0\6\3\4\0"+
- "\15\3\5\0\3\3\1\0\7\3\323\0\15\0\4\0\1\0\104\0"+
- "\1\3\3\0\2\3\2\0\1\3\121\0\3\3\u0e82\0\1\0\1\0"+
- "\1\3\31\0\11\3\6\0\1\0\5\0\13\0\124\3\4\0\2\0"+
- "\2\0\2\0\2\0\132\3\1\0\3\0\6\0\50\3\u1cd3\0\u51a6\3"+
- "\u0c5a\0\u2ba4\3\u285c\0";
+ "\12\0\1\3\42\0\1\2\1\2\1\0\12\2\1\1\6\0\32\1"+
+ "\4\0\1\1\1\0\32\1\74\0\1\2\10\0\27\1\1\0\37\1"+
+ "\1\0\72\1\2\0\13\1\2\0\10\1\1\0\65\1\1\0\104\1"+
+ "\11\0\44\1\3\0\2\1\4\0\36\1\70\0\131\1\22\0\7\1"+
+ "\16\0\2\2\56\0\106\2\32\0\2\2\44\0\1\1\1\2\3\1"+
+ "\1\0\1\1\1\0\24\1\1\0\54\1\1\0\7\1\3\0\1\1"+
+ "\1\0\1\1\1\0\1\1\1\0\1\1\1\0\22\1\15\0\14\1"+
+ "\1\0\102\1\1\0\14\1\1\0\44\1\1\0\4\2\11\0\65\1"+
+ "\2\0\2\1\2\0\2\1\3\0\34\1\2\0\10\1\2\0\2\1"+
+ "\67\0\46\1\2\0\1\1\7\0\46\1\12\0\21\2\1\0\27\2"+
+ "\1\0\3\2\1\0\1\2\1\0\2\2\1\0\1\2\13\0\33\1"+
+ "\5\0\3\1\56\0\32\1\5\0\1\2\12\1\10\2\15\0\12\2"+
+ "\6\0\1\2\107\1\2\0\5\1\1\0\17\1\1\0\4\1\1\0"+
+ "\1\1\17\2\2\1\2\2\1\0\4\2\2\0\12\2\u0207\0\3\2"+
+ "\1\0\65\1\2\0\1\2\1\1\20\2\3\0\4\2\3\0\12\1"+
+ "\2\2\2\0\12\2\21\0\3\2\1\0\10\1\2\0\2\1\2\0"+
+ "\26\1\1\0\7\1\1\0\1\1\3\0\4\1\2\0\1\2\1\0"+
+ "\7\2\2\0\2\2\2\0\3\2\11\0\1\2\4\0\2\1\1\0"+
+ "\3\1\2\2\2\0\12\2\2\1\20\0\1\2\2\0\6\1\4\0"+
+ "\2\1\2\0\26\1\1\0\7\1\1\0\2\1\1\0\2\1\1\0"+
+ "\2\1\2\0\1\2\1\0\5\2\4\0\2\2\2\0\3\2\13\0"+
+ "\4\1\1\0\1\1\7\0\12\2\2\2\3\1\14\0\3\2\1\0"+
+ "\7\1\1\0\1\1\1\0\3\1\1\0\26\1\1\0\7\1\1\0"+
+ "\2\1\1\0\5\1\2\0\1\2\1\1\10\2\1\0\3\2\1\0"+
+ "\3\2\22\0\1\1\5\0\12\2\21\0\3\2\1\0\10\1\2\0"+
+ "\2\1\2\0\26\1\1\0\7\1\1\0\2\1\2\0\4\1\2\0"+
+ "\1\2\1\1\6\2\3\0\2\2\2\0\3\2\10\0\2\2\4\0"+
+ "\2\1\1\0\3\1\4\0\12\2\22\0\2\2\1\0\6\1\3\0"+
+ "\3\1\1\0\4\1\3\0\2\1\1\0\1\1\1\0\2\1\3\0"+
+ "\2\1\3\0\3\1\3\0\10\1\1\0\3\1\4\0\5\2\3\0"+
+ "\3\2\1\0\4\2\11\0\1\2\17\0\11\2\21\0\3\2\1\0"+
+ "\10\1\1\0\3\1\1\0\27\1\1\0\12\1\1\0\5\1\4\0"+
+ "\7\2\1\0\3\2\1\0\4\2\7\0\2\2\11\0\2\1\4\0"+
+ "\12\2\22\0\2\2\1\0\10\1\1\0\3\1\1\0\27\1\1\0"+
+ "\12\1\1\0\5\1\4\0\7\2\1\0\3\2\1\0\4\2\7\0"+
+ "\2\2\7\0\1\1\1\0\2\1\4\0\12\2\22\0\2\2\1\0"+
+ "\10\1\1\0\3\1\1\0\27\1\1\0\20\1\4\0\6\2\2\0"+
+ "\3\2\1\0\4\2\11\0\1\2\10\0\2\1\4\0\12\2\221\0"+
+ "\56\1\1\0\1\1\1\2\2\1\7\2\5\0\6\1\1\2\10\2"+
+ "\1\0\12\2\47\0\2\1\1\0\1\1\2\0\2\1\1\0\1\1"+
+ "\2\0\1\1\6\0\4\1\1\0\7\1\1\0\3\1\1\0\1\1"+
+ "\1\0\1\1\2\0\2\1\1\0\2\1\1\0\1\1\1\2\2\1"+
+ "\6\2\1\0\2\2\1\1\2\0\5\1\1\0\1\2\1\0\6\2"+
+ "\2\0\12\2\76\0\2\2\6\0\12\2\13\0\1\2\1\0\1\2"+
+ "\1\0\1\2\4\0\2\2\10\1\1\0\41\1\7\0\24\2\1\0"+
+ "\6\2\4\0\6\2\1\0\1\2\1\0\25\2\3\0\7\2\1\0"+
+ "\1\2\346\0\46\1\12\0\47\1\11\0\1\1\1\0\2\1\1\0"+
+ "\3\1\1\0\1\1\1\0\2\1\1\0\5\1\51\0\1\1\1\0"+
+ "\1\1\1\0\1\1\13\0\1\1\1\0\1\1\1\0\1\1\3\0"+
+ "\2\1\3\0\1\1\5\0\3\1\1\0\1\1\1\0\1\1\1\0"+
+ "\1\1\1\0\1\1\3\0\2\1\3\0\2\1\1\0\1\1\50\0"+
+ "\1\1\11\0\1\1\2\0\1\1\2\0\2\1\7\0\2\1\1\0"+
+ "\1\1\1\0\7\1\50\0\1\1\4\0\1\1\10\0\1\1\u0c06\0"+
+ "\234\1\4\0\132\1\6\0\26\1\2\0\6\1\2\0\46\1\2\0"+
+ "\6\1\2\0\10\1\1\0\1\1\1\0\1\1\1\0\1\1\1\0"+
+ "\37\1\2\0\65\1\1\0\7\1\1\0\1\1\3\0\3\1\1\0"+
+ "\7\1\3\0\4\1\2\0\6\1\4\0\15\1\5\0\3\1\1\0"+
+ "\7\1\323\0\15\2\4\0\1\2\104\0\1\1\3\0\2\1\2\0"+
+ "\1\1\121\0\3\1\u0e82\0\1\2\1\0\1\1\31\0\11\1\6\2"+
+ "\1\0\5\2\13\0\124\1\4\0\2\2\2\0\2\2\2\0\132\1"+
+ "\1\0\3\2\6\0\50\1\u1cd3\0\u51a6\1\u0c5a\0\u2ba4\1\u285c\0";
/**
* Translates characters to character classes
@@ -113,10 +111,10 @@
private static final int [] ZZ_ACTION = zzUnpackAction();
private static final String ZZ_ACTION_PACKED_0 =
- "\1\0\1\1\1\2\4\1";
+ "\1\0\1\1\1\2\1\3";
private static int [] zzUnpackAction() {
- int [] result = new int[7];
+ int [] result = new int[4];
int offset = 0;
offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);
return result;
@@ -141,10 +139,10 @@
private static final int [] ZZ_ROWMAP = zzUnpackRowMap();
private static final String ZZ_ROWMAP_PACKED_0 =
- "\0\0\0\4\0\10\0\14\0\20\0\24\0\30";
+ "\0\0\0\4\0\10\0\14";
private static int [] zzUnpackRowMap() {
- int [] result = new int[7];
+ int [] result = new int[4];
int offset = 0;
offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result);
return result;
@@ -165,9 +163,8 @@
* The transition table of the DFA
*/
private static final int ZZ_TRANS [] = {
- 1, 1, -1, 2, -1, -1, -1, -1, 2, 3,
- 4, 2, 2, 3, 4, 5, -1, 4, 4, 6,
- 5, 5, 4, 5, 6, 6, -1, 6,
+ 1, 2, 1, -1, -1, -1, -1, -1, 3, 2,
+ 2, -1, 3, 3, 3, -1
};
/* error codes */
@@ -188,10 +185,10 @@
private static final int [] ZZ_ATTRIBUTE = zzUnpackAttribute();
private static final String ZZ_ATTRIBUTE_PACKED_0 =
- "\1\0\1\11\5\1";
+ "\1\0\1\11\2\1";
private static int [] zzUnpackAttribute() {
- int [] result = new int[7];
+ int [] result = new int[4];
int offset = 0;
offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result);
return result;
@@ -259,27 +256,27 @@
private boolean zzAtEOF;
/* user code: */
+ boolean result;
+ /**
+ * Creates a new scanner
+ */
+ public XML10Names() {
+ this.zzReader = null;
+ }
- /**
- * Creates a new scanner
- */
- public XML10Names() {
- this.zzReader = null;
- }
-
- public boolean isValidXML10Name(String stringToCheck) {
- boolean result = false;
- yyreset(new java.io.StringReader(stringToCheck));
- try {
- result = isValidXML10Name();
- }
- catch (java.io.IOException e) {
- // should be impossible with strings, but if occurs, just means
- // "not"
- result = false;
- }
- return result;
- }
+ public boolean isValidXML10Name(String stringToCheck) {
+ boolean result = false;
+ yyreset(new java.io.StringReader(stringToCheck));
+ try {
+ result = isValidXML10Name();
+ }
+ catch (java.io.IOException e) {
+ // should be impossible with strings, but if occurs, just means
+ // "not"
+ result = false;
+ }
+ return result;
+ }
@@ -313,7 +310,7 @@
char [] map = new char[0x10000];
int i = 0; /* index in packed string */
int j = 0; /* index in unpacked array */
- while (i < 1226) {
+ while (i < 1218) {
int count = packed.charAt(i++);
char value = packed.charAt(i++);
do map[j++] = value; while (--count > 0);
@@ -571,17 +568,21 @@
switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) {
case 1:
- { return false;
- }
- case 3: break;
- case 2:
- { return true;
+ { return false; /* matched wild */
}
case 4: break;
+ case 2:
+ { return true; /* exact name */
+ }
+ case 5: break;
+ case 3:
+ { return false; /* more than name */
+ }
+ case 6: break;
default:
if (zzInput == YYEOF && zzStartRead == zzCurrentPos) {
zzAtEOF = true;
- { {return false;} }
+ { {return false; /* hit end with no match */} }
}
else {
zzScanError(ZZ_NO_MATCH);
diff --git a/bundles/org.eclipse.wst.sse.core/DevTimeSupport/HeadParsers/XML10Names/XML10NamesGenJava.cmd b/bundles/org.eclipse.wst.sse.core/DevTimeSupport/HeadParsers/XML10Names/XML10NamesGenJava.cmd
deleted file mode 100644
index 2477d14..0000000
--- a/bundles/org.eclipse.wst.sse.core/DevTimeSupport/HeadParsers/XML10Names/XML10NamesGenJava.cmd
+++ /dev/null
@@ -1,25 +0,0 @@
-@echo on
-
-rem The following variables need to be set/specified for each "development machine"
-set PATH=%PATH%;D:\JDKs\j2sdk1.4.2_03\bin
-set WORKSPACE_LOCATION=D:\builds\Workspaces\RC2
-set JFLEX_LIB_LOCATION=D:\DevTimeSupport\JFlex-1.4\lib
-
-rem The following variables differ from project to project, but should be otherwise constant
-set MAIN_NAME=XML10Names
-
-set PROJECT_SRC=\org.eclipse.wst.sse.core.xml\src\
-set PACKAGE_DIR=com\ibm\sse\model\xml\internal\parser\
-
-
-rem Given the above "framework" and the command themselves, these variables should never need to be modified
-set JAVA_FILE=%MAIN_NAME%.java
-set JFLEX_RULES=%MAIN_NAME%.jflex
-set SKELETON_FILE=%MAIN_NAME%.skeleton
-
-IF EXIST %JAVA_FILE% del %JAVA_FILE%
-rem java -Xmx470000000 -cp %JFLEX_LIB_LOCATION%\sed-jflex.jar;. JFlex.Main %JFLEX_RULES% -skel %SKELETON_FILE% 1>jflexout.txt 2>jflexerr.txt
-java -Xmx470000000 -cp %JFLEX_LIB_LOCATION%\sed-jflex.jar;. JFlex.Main %JFLEX_RULES% 1>jflexout.txt 2>jflexerr.txt
-IF EXIST %JAVA_FILE% copy %JAVA_FILE% %WORKSPACE_LOCATION%%PROJECT_SRC%%PACKAGE_DIR%%JAVA_FILE%
-
-pause
diff --git a/bundles/org.eclipse.wst.sse.core/DevTimeSupport/HeadParsers/XML10Names/XML10NamesGenJavaJFlex14.cmd b/bundles/org.eclipse.wst.sse.core/DevTimeSupport/HeadParsers/XML10Names/XML10NamesGenJavaJFlex14.cmd
index aafbf61..7c816d0 100644
--- a/bundles/org.eclipse.wst.sse.core/DevTimeSupport/HeadParsers/XML10Names/XML10NamesGenJavaJFlex14.cmd
+++ b/bundles/org.eclipse.wst.sse.core/DevTimeSupport/HeadParsers/XML10Names/XML10NamesGenJavaJFlex14.cmd
@@ -1,15 +1,15 @@
@echo on
rem The following variables need to be set/specified for each "development machine"
-set PATH=%PATH%;D:\JDKs\j2sdk1.4.2_03\bin
-set WORKSPACE_LOCATION=D:\builds\Workspaces\RC2
+set PATH=%PATH%;D:\JDKs\ibm-java2-sdk-50-win-i386\bin
+set WORKSPACE_LOCATION=D:\builds\Workspaces\newWTPpurehead
set JFLEX_LIB_LOCATION=D:\DevTimeSupport\JFlex-1.4\lib
rem The following variables differ from project to project, but should be otherwise constant
set MAIN_NAME=XML10Names
-set PROJECT_SRC=\org.eclipse.wst.sse.core.xml\src\
-set PACKAGE_DIR=com\ibm\sse\model\xml\internal\parser\
+set PROJECT_SRC=\org.eclipse.wst.xml.core\src\
+set PACKAGE_DIR=org\eclipse\wst\xml\core\internal\parser\
rem Given the above "framework" and the command themselves, these variables should never need to be modified
diff --git a/bundles/org.eclipse.wst.sse.core/DevTimeSupport/HeadParsers/XML10Names/jflexout.txt b/bundles/org.eclipse.wst.sse.core/DevTimeSupport/HeadParsers/XML10Names/jflexout.txt
index 6e960b5..c336f12 100644
--- a/bundles/org.eclipse.wst.sse.core/DevTimeSupport/HeadParsers/XML10Names/jflexout.txt
+++ b/bundles/org.eclipse.wst.sse.core/DevTimeSupport/HeadParsers/XML10Names/jflexout.txt
@@ -1,6 +1,6 @@
Reading "XML10Names.jflex"
-Constructing NFA : 36 states in NFA
+Constructing NFA : 84 states in NFA
Converting NFA to DFA :
-...........
-13 states before minimization, 7 states in minimized DFA
+............
+14 states before minimization, 4 states in minimized DFA
Writing code to "XML10Names.java"
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/XML10Names.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/XML10Names.java
index 79b2663..bbc7836 100644
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/XML10Names.java
+++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/XML10Names.java
@@ -1,12 +1,15 @@
+/* The following code was generated by JFlex 1.4 on 2/25/08 10:25 AM */
+
/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
+ * Copyright (c) 2004,2008 IBM Corporation, and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Common Public License v1.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/cpl-v10.html
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * kb.huang - Bug 214416 Dot char is not escaped in XML10Names.jFlex
*******************************************************************************/
/*nlsXXX*/
package org.eclipse.wst.xml.core.internal.parser;
@@ -17,8 +20,8 @@
/**
* This class is a scanner generated by
* <a href="http://www.jflex.de/">JFlex</a> 1.4
- * on 7/5/05 1:40 AM from the specification file
- * <tt>D:/builds/Workspaces/PureHeadWTP_M7/org.eclipse.wst.xml.core/DevTimeSupport/HeadParsers/XML10Names.jFlex</tt>
+ * on 2/25/08 10:25 AM from the specification file
+ * <tt>XML10Names.jflex</tt>
*/
public final class XML10Names {
@@ -35,68 +38,67 @@
* Translates characters to character classes
*/
private static final String ZZ_CMAP_PACKED =
- "\11\0\1\1\1\2\2\0\1\1\22\0\1\1\14\0\1\0\2\0"+
- "\12\0\1\3\6\0\32\3\4\0\1\3\1\0\32\3\74\0\1\0"+
- "\10\0\27\3\1\0\37\3\1\0\72\3\2\0\13\3\2\0\10\3"+
- "\1\0\65\3\1\0\104\3\11\0\44\3\3\0\2\3\4\0\36\3"+
- "\70\0\131\3\22\0\7\3\16\0\2\0\56\0\106\0\32\0\2\0"+
- "\44\0\1\3\1\0\3\3\1\0\1\3\1\0\24\3\1\0\54\3"+
- "\1\0\7\3\3\0\1\3\1\0\1\3\1\0\1\3\1\0\1\3"+
- "\1\0\22\3\15\0\14\3\1\0\102\3\1\0\14\3\1\0\44\3"+
- "\1\0\4\0\11\0\65\3\2\0\2\3\2\0\2\3\3\0\34\3"+
- "\2\0\10\3\2\0\2\3\67\0\46\3\2\0\1\3\7\0\46\3"+
- "\12\0\21\0\1\0\27\0\1\0\3\0\1\0\1\0\1\0\2\0"+
- "\1\0\1\0\13\0\33\3\5\0\3\3\56\0\32\3\5\0\1\0"+
- "\12\3\10\0\15\0\12\0\6\0\1\0\107\3\2\0\5\3\1\0"+
- "\17\3\1\0\4\3\1\0\1\3\17\0\2\3\2\0\1\0\4\0"+
- "\2\0\12\0\u0207\0\3\0\1\0\65\3\2\0\1\0\1\3\20\0"+
- "\3\0\4\0\3\0\12\3\2\0\2\0\12\0\21\0\3\0\1\0"+
- "\10\3\2\0\2\3\2\0\26\3\1\0\7\3\1\0\1\3\3\0"+
- "\4\3\2\0\1\0\1\0\7\0\2\0\2\0\2\0\3\0\11\0"+
- "\1\0\4\0\2\3\1\0\3\3\2\0\2\0\12\0\2\3\20\0"+
- "\1\0\2\0\6\3\4\0\2\3\2\0\26\3\1\0\7\3\1\0"+
- "\2\3\1\0\2\3\1\0\2\3\2\0\1\0\1\0\5\0\4\0"+
- "\2\0\2\0\3\0\13\0\4\3\1\0\1\3\7\0\12\0\2\0"+
- "\3\3\14\0\3\0\1\0\7\3\1\0\1\3\1\0\3\3\1\0"+
- "\26\3\1\0\7\3\1\0\2\3\1\0\5\3\2\0\1\0\1\3"+
- "\10\0\1\0\3\0\1\0\3\0\22\0\1\3\5\0\12\0\21\0"+
- "\3\0\1\0\10\3\2\0\2\3\2\0\26\3\1\0\7\3\1\0"+
- "\2\3\2\0\4\3\2\0\1\0\1\3\6\0\3\0\2\0\2\0"+
- "\3\0\10\0\2\0\4\0\2\3\1\0\3\3\4\0\12\0\22\0"+
- "\2\0\1\0\6\3\3\0\3\3\1\0\4\3\3\0\2\3\1\0"+
- "\1\3\1\0\2\3\3\0\2\3\3\0\3\3\3\0\10\3\1\0"+
- "\3\3\4\0\5\0\3\0\3\0\1\0\4\0\11\0\1\0\17\0"+
- "\11\0\21\0\3\0\1\0\10\3\1\0\3\3\1\0\27\3\1\0"+
- "\12\3\1\0\5\3\4\0\7\0\1\0\3\0\1\0\4\0\7\0"+
- "\2\0\11\0\2\3\4\0\12\0\22\0\2\0\1\0\10\3\1\0"+
- "\3\3\1\0\27\3\1\0\12\3\1\0\5\3\4\0\7\0\1\0"+
- "\3\0\1\0\4\0\7\0\2\0\7\0\1\3\1\0\2\3\4\0"+
- "\12\0\22\0\2\0\1\0\10\3\1\0\3\3\1\0\27\3\1\0"+
- "\20\3\4\0\6\0\2\0\3\0\1\0\4\0\11\0\1\0\10\0"+
- "\2\3\4\0\12\0\221\0\56\3\1\0\1\3\1\0\2\3\7\0"+
- "\5\0\6\3\1\0\10\0\1\0\12\0\47\0\2\3\1\0\1\3"+
- "\2\0\2\3\1\0\1\3\2\0\1\3\6\0\4\3\1\0\7\3"+
- "\1\0\3\3\1\0\1\3\1\0\1\3\2\0\2\3\1\0\2\3"+
- "\1\0\1\3\1\0\2\3\6\0\1\0\2\0\1\3\2\0\5\3"+
- "\1\0\1\0\1\0\6\0\2\0\12\0\76\0\2\0\6\0\12\0"+
- "\13\0\1\0\1\0\1\0\1\0\1\0\4\0\2\0\10\3\1\0"+
- "\41\3\7\0\24\0\1\0\6\0\4\0\6\0\1\0\1\0\1\0"+
- "\25\0\3\0\7\0\1\0\1\0\346\0\46\3\12\0\47\3\11\0"+
- "\1\3\1\0\2\3\1\0\3\3\1\0\1\3\1\0\2\3\1\0"+
- "\5\3\51\0\1\3\1\0\1\3\1\0\1\3\13\0\1\3\1\0"+
- "\1\3\1\0\1\3\3\0\2\3\3\0\1\3\5\0\3\3\1\0"+
- "\1\3\1\0\1\3\1\0\1\3\1\0\1\3\3\0\2\3\3\0"+
- "\2\3\1\0\1\3\50\0\1\3\11\0\1\3\2\0\1\3\2\0"+
- "\2\3\7\0\2\3\1\0\1\3\1\0\7\3\50\0\1\3\4\0"+
- "\1\3\10\0\1\3\u0c06\0\234\3\4\0\132\3\6\0\26\3\2\0"+
- "\6\3\2\0\46\3\2\0\6\3\2\0\10\3\1\0\1\3\1\0"+
- "\1\3\1\0\1\3\1\0\37\3\2\0\65\3\1\0\7\3\1\0"+
- "\1\3\3\0\3\3\1\0\7\3\3\0\4\3\2\0\6\3\4\0"+
- "\15\3\5\0\3\3\1\0\7\3\323\0\15\0\4\0\1\0\104\0"+
- "\1\3\3\0\2\3\2\0\1\3\121\0\3\3\u0e82\0\1\0\1\0"+
- "\1\3\31\0\11\3\6\0\1\0\5\0\13\0\124\3\4\0\2\0"+
- "\2\0\2\0\2\0\132\3\1\0\3\0\6\0\50\3\u1cd3\0\u51a6\3"+
- "\u0c5a\0\u2ba4\3\u285c\0";
+ "\12\0\1\3\42\0\1\2\1\2\1\0\12\2\1\1\6\0\32\1"+
+ "\4\0\1\1\1\0\32\1\74\0\1\2\10\0\27\1\1\0\37\1"+
+ "\1\0\72\1\2\0\13\1\2\0\10\1\1\0\65\1\1\0\104\1"+
+ "\11\0\44\1\3\0\2\1\4\0\36\1\70\0\131\1\22\0\7\1"+
+ "\16\0\2\2\56\0\106\2\32\0\2\2\44\0\1\1\1\2\3\1"+
+ "\1\0\1\1\1\0\24\1\1\0\54\1\1\0\7\1\3\0\1\1"+
+ "\1\0\1\1\1\0\1\1\1\0\1\1\1\0\22\1\15\0\14\1"+
+ "\1\0\102\1\1\0\14\1\1\0\44\1\1\0\4\2\11\0\65\1"+
+ "\2\0\2\1\2\0\2\1\3\0\34\1\2\0\10\1\2\0\2\1"+
+ "\67\0\46\1\2\0\1\1\7\0\46\1\12\0\21\2\1\0\27\2"+
+ "\1\0\3\2\1\0\1\2\1\0\2\2\1\0\1\2\13\0\33\1"+
+ "\5\0\3\1\56\0\32\1\5\0\1\2\12\1\10\2\15\0\12\2"+
+ "\6\0\1\2\107\1\2\0\5\1\1\0\17\1\1\0\4\1\1\0"+
+ "\1\1\17\2\2\1\2\2\1\0\4\2\2\0\12\2\u0207\0\3\2"+
+ "\1\0\65\1\2\0\1\2\1\1\20\2\3\0\4\2\3\0\12\1"+
+ "\2\2\2\0\12\2\21\0\3\2\1\0\10\1\2\0\2\1\2\0"+
+ "\26\1\1\0\7\1\1\0\1\1\3\0\4\1\2\0\1\2\1\0"+
+ "\7\2\2\0\2\2\2\0\3\2\11\0\1\2\4\0\2\1\1\0"+
+ "\3\1\2\2\2\0\12\2\2\1\20\0\1\2\2\0\6\1\4\0"+
+ "\2\1\2\0\26\1\1\0\7\1\1\0\2\1\1\0\2\1\1\0"+
+ "\2\1\2\0\1\2\1\0\5\2\4\0\2\2\2\0\3\2\13\0"+
+ "\4\1\1\0\1\1\7\0\12\2\2\2\3\1\14\0\3\2\1\0"+
+ "\7\1\1\0\1\1\1\0\3\1\1\0\26\1\1\0\7\1\1\0"+
+ "\2\1\1\0\5\1\2\0\1\2\1\1\10\2\1\0\3\2\1\0"+
+ "\3\2\22\0\1\1\5\0\12\2\21\0\3\2\1\0\10\1\2\0"+
+ "\2\1\2\0\26\1\1\0\7\1\1\0\2\1\2\0\4\1\2\0"+
+ "\1\2\1\1\6\2\3\0\2\2\2\0\3\2\10\0\2\2\4\0"+
+ "\2\1\1\0\3\1\4\0\12\2\22\0\2\2\1\0\6\1\3\0"+
+ "\3\1\1\0\4\1\3\0\2\1\1\0\1\1\1\0\2\1\3\0"+
+ "\2\1\3\0\3\1\3\0\10\1\1\0\3\1\4\0\5\2\3\0"+
+ "\3\2\1\0\4\2\11\0\1\2\17\0\11\2\21\0\3\2\1\0"+
+ "\10\1\1\0\3\1\1\0\27\1\1\0\12\1\1\0\5\1\4\0"+
+ "\7\2\1\0\3\2\1\0\4\2\7\0\2\2\11\0\2\1\4\0"+
+ "\12\2\22\0\2\2\1\0\10\1\1\0\3\1\1\0\27\1\1\0"+
+ "\12\1\1\0\5\1\4\0\7\2\1\0\3\2\1\0\4\2\7\0"+
+ "\2\2\7\0\1\1\1\0\2\1\4\0\12\2\22\0\2\2\1\0"+
+ "\10\1\1\0\3\1\1\0\27\1\1\0\20\1\4\0\6\2\2\0"+
+ "\3\2\1\0\4\2\11\0\1\2\10\0\2\1\4\0\12\2\221\0"+
+ "\56\1\1\0\1\1\1\2\2\1\7\2\5\0\6\1\1\2\10\2"+
+ "\1\0\12\2\47\0\2\1\1\0\1\1\2\0\2\1\1\0\1\1"+
+ "\2\0\1\1\6\0\4\1\1\0\7\1\1\0\3\1\1\0\1\1"+
+ "\1\0\1\1\2\0\2\1\1\0\2\1\1\0\1\1\1\2\2\1"+
+ "\6\2\1\0\2\2\1\1\2\0\5\1\1\0\1\2\1\0\6\2"+
+ "\2\0\12\2\76\0\2\2\6\0\12\2\13\0\1\2\1\0\1\2"+
+ "\1\0\1\2\4\0\2\2\10\1\1\0\41\1\7\0\24\2\1\0"+
+ "\6\2\4\0\6\2\1\0\1\2\1\0\25\2\3\0\7\2\1\0"+
+ "\1\2\346\0\46\1\12\0\47\1\11\0\1\1\1\0\2\1\1\0"+
+ "\3\1\1\0\1\1\1\0\2\1\1\0\5\1\51\0\1\1\1\0"+
+ "\1\1\1\0\1\1\13\0\1\1\1\0\1\1\1\0\1\1\3\0"+
+ "\2\1\3\0\1\1\5\0\3\1\1\0\1\1\1\0\1\1\1\0"+
+ "\1\1\1\0\1\1\3\0\2\1\3\0\2\1\1\0\1\1\50\0"+
+ "\1\1\11\0\1\1\2\0\1\1\2\0\2\1\7\0\2\1\1\0"+
+ "\1\1\1\0\7\1\50\0\1\1\4\0\1\1\10\0\1\1\u0c06\0"+
+ "\234\1\4\0\132\1\6\0\26\1\2\0\6\1\2\0\46\1\2\0"+
+ "\6\1\2\0\10\1\1\0\1\1\1\0\1\1\1\0\1\1\1\0"+
+ "\37\1\2\0\65\1\1\0\7\1\1\0\1\1\3\0\3\1\1\0"+
+ "\7\1\3\0\4\1\2\0\6\1\4\0\15\1\5\0\3\1\1\0"+
+ "\7\1\323\0\15\2\4\0\1\2\104\0\1\1\3\0\2\1\2\0"+
+ "\1\1\121\0\3\1\u0e82\0\1\2\1\0\1\1\31\0\11\1\6\2"+
+ "\1\0\5\2\13\0\124\1\4\0\2\2\2\0\2\2\2\0\132\1"+
+ "\1\0\3\2\6\0\50\1\u1cd3\0\u51a6\1\u0c5a\0\u2ba4\1\u285c\0";
/**
* Translates characters to character classes
@@ -109,10 +111,10 @@
private static final int [] ZZ_ACTION = zzUnpackAction();
private static final String ZZ_ACTION_PACKED_0 =
- "\1\0\1\1\1\2\4\1";
+ "\1\0\1\1\1\2\1\3";
private static int [] zzUnpackAction() {
- int [] result = new int[7];
+ int [] result = new int[4];
int offset = 0;
offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);
return result;
@@ -137,10 +139,10 @@
private static final int [] ZZ_ROWMAP = zzUnpackRowMap();
private static final String ZZ_ROWMAP_PACKED_0 =
- "\0\0\0\4\0\10\0\14\0\20\0\24\0\30";
+ "\0\0\0\4\0\10\0\14";
private static int [] zzUnpackRowMap() {
- int [] result = new int[7];
+ int [] result = new int[4];
int offset = 0;
offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result);
return result;
@@ -161,15 +163,14 @@
* The transition table of the DFA
*/
private static final int ZZ_TRANS [] = {
- 1, 1, -1, 2, -1, -1, -1, -1, 2, 3,
- 4, 2, 2, 3, 4, 5, -1, 4, 4, 6,
- 5, 5, 4, 5, 6, 6, -1, 6,
+ 1, 2, 1, -1, -1, -1, -1, -1, 3, 2,
+ 2, -1, 3, 3, 3, -1
};
/* error codes */
private static final int ZZ_UNKNOWN_ERROR = 0;
private static final int ZZ_NO_MATCH = 1;
- //private static final int ZZ_PUSHBACK_2BIG = 2;
+// private static final int ZZ_PUSHBACK_2BIG = 2;
/* error messages for the codes above */
private static final String ZZ_ERROR_MSG[] = {
@@ -184,10 +185,10 @@
private static final int [] ZZ_ATTRIBUTE = zzUnpackAttribute();
private static final String ZZ_ATTRIBUTE_PACKED_0 =
- "\1\0\1\11\5\1";
+ "\1\0\1\11\2\1";
private static int [] zzUnpackAttribute() {
- int [] result = new int[7];
+ int [] result = new int[4];
int offset = 0;
offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result);
return result;
@@ -235,47 +236,47 @@
private int zzEndRead;
/** number of newlines encountered up to the start of the matched text */
- //private int yyline;
+// private int yyline;
/** the number of characters up to the start of the matched text */
- //private int yychar;
+// private int yychar;
/**
* the number of characters from the last newline up to the start of the
* matched text
*/
- //private int yycolumn;
+// private int yycolumn;
/**
* zzAtBOL == true <=> the scanner is currently at the beginning of a line
*/
- //private boolean zzAtBOL = true;
+// private boolean zzAtBOL = true;
/** zzAtEOF == true <=> the scanner is at the EOF */
private boolean zzAtEOF;
/* user code: */
+ boolean result;
+ /**
+ * Creates a new scanner
+ */
+ public XML10Names() {
+ this.zzReader = null;
+ }
- /**
- * Creates a new scanner
- */
- public XML10Names() {
- this.zzReader = null;
- }
-
- public boolean isValidXML10Name(String stringToCheck) {
- boolean result = false;
- yyreset(new java.io.StringReader(stringToCheck));
- try {
- result = isValidXML10Name();
- }
- catch (java.io.IOException e) {
- // should be impossible with strings, but if occurs, just means
- // "not"
- result = false;
- }
- return result;
- }
+ public boolean isValidXML10Name(String stringToCheck) {
+ boolean result = false;
+ yyreset(new java.io.StringReader(stringToCheck));
+ try {
+ result = isValidXML10Name();
+ }
+ catch (java.io.IOException e) {
+ // should be impossible with strings, but if occurs, just means
+ // "not"
+ result = false;
+ }
+ return result;
+ }
@@ -309,7 +310,7 @@
char [] map = new char[0x10000];
int i = 0; /* index in packed string */
int j = 0; /* index in unpacked array */
- while (i < 1226) {
+ while (i < 1218) {
int count = packed.charAt(i++);
char value = packed.charAt(i++);
do map[j++] = value; while (--count > 0);
@@ -567,17 +568,21 @@
switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) {
case 1:
- { return false;
- }
- case 3: break;
- case 2:
- { return true;
+ { return false; /* matched wild */
}
case 4: break;
+ case 2:
+ { return true; /* exact name */
+ }
+ case 5: break;
+ case 3:
+ { return false; /* more than name */
+ }
+ case 6: break;
default:
if (zzInput == YYEOF && zzStartRead == zzCurrentPos) {
zzAtEOF = true;
- { {return false;} }
+ { {return false; /* hit end with no match */} }
}
else {
zzScanError(ZZ_NO_MATCH);
