OSDN Git Service

removed some warning messages
authorleo <leo@ae02f08e-27ec-0310-ae8c-8ba02fe2eafd>
Tue, 7 Jul 2009 04:36:09 +0000 (04:36 +0000)
committerleo <leo@ae02f08e-27ec-0310-ae8c-8ba02fe2eafd>
Tue, 7 Jul 2009 04:36:09 +0000 (04:36 +0000)
git-svn-id: http://www.xerial.org/svn/project/XerialJ/trunk/xerial-core@3449 ae02f08e-27ec-0310-ae8c-8ba02fe2eafd

13 files changed:
src/main/java/org/xerial/json/JSONObject.java
src/main/java/org/xerial/json/JSONValueBase.java
src/main/java/org/xerial/silk/schema/impl/SilkSchemaLexer.java
src/main/java/org/xerial/util/bean/BeanUpdator.java
src/main/java/org/xerial/util/bean/impl/Appender.java
src/main/java/org/xerial/util/bean/impl/ArraySetter.java
src/main/java/org/xerial/util/bean/impl/BeanUtilImpl.java
src/main/java/org/xerial/util/bean/impl/CollectionAdder.java
src/main/java/org/xerial/util/bean/impl/CollectionSetter.java
src/main/java/org/xerial/util/bean/impl/KeyValuePair.java
src/main/java/org/xerial/util/bean/impl/MapPutter.java
src/main/java/org/xerial/util/bean/impl/MapSetter.java
src/main/java/org/xerial/util/bean/impl/Setter.java

index 726b3c3..d7aee4d 100644 (file)
@@ -48,12 +48,10 @@ import org.xerial.json.impl.JSONWalker;
  * @author leo\r
  * \r
  */\r
-public class JSONObject extends JSONValueBase\r
-{\r
+public class JSONObject extends JSONValueBase {\r
 \r
     @SuppressWarnings("serial")\r
-    class JSONObjectContent extends LinkedHashMap<String, JSONValue>\r
-    {\r
+    class JSONObjectContent extends LinkedHashMap<String, JSONValue> {\r
     }\r
 \r
     JSONObjectContent content = new JSONObjectContent();\r
@@ -61,26 +59,21 @@ public class JSONObject extends JSONValueBase
     /**\r
      * \r
      */\r
-    public JSONObject()\r
-    {\r
+    public JSONObject() {\r
 \r
     }\r
 \r
-    public JSONObject(JSONTokenizer x) throws JSONException\r
-    {\r
+    public JSONObject(JSONTokenizer x) throws JSONException {\r
         this();\r
         char c;\r
         String key;\r
 \r
-        if (x.nextClean() != '{')\r
-        {\r
+        if (x.nextClean() != '{') {\r
             throw x.syntaxError("A JSONObject text must begin with '{'");\r
         }\r
-        for (;;)\r
-        {\r
+        for (;;) {\r
             c = x.nextClean();\r
-            switch (c)\r
-            {\r
+            switch (c) {\r
             case 0:\r
                 throw x.syntaxError("A JSONObject text must end with '}'");\r
             case '}':\r
@@ -95,15 +88,12 @@ public class JSONObject extends JSONValueBase
              */\r
 \r
             c = x.nextClean();\r
-            if (c == '=')\r
-            {\r
-                if (x.next() != '>')\r
-                {\r
+            if (c == '=') {\r
+                if (x.next() != '>') {\r
                     x.back();\r
                 }\r
             }\r
-            else if (c != ':')\r
-            {\r
+            else if (c != ':') {\r
                 throw x.syntaxError("Expected a ':' after a key");\r
             }\r
             put(key, x.nextValue());\r
@@ -112,12 +102,10 @@ public class JSONObject extends JSONValueBase
              * Pairs are separated by ','. We will also tolerate ';'.\r
              */\r
 \r
-            switch (x.nextClean())\r
-            {\r
+            switch (x.nextClean()) {\r
             case ';':\r
             case ',':\r
-                if (x.nextClean() == '}')\r
-                {\r
+                if (x.nextClean() == '}') {\r
                     return;\r
                 }\r
                 x.back();\r
@@ -130,20 +118,17 @@ public class JSONObject extends JSONValueBase
         }\r
     }\r
 \r
-    public JSONObject(String jsonStr) throws JSONException\r
-    {\r
-        try\r
-        {\r
+    public JSONObject(String jsonStr) throws JSONException {\r
+        try {\r
             CommonTree t = parse(jsonStr);\r
             CommonTreeNodeStream ts = new CommonTreeNodeStream(t);\r
             JSONWalker walker = new JSONWalker(ts);\r
             JSONObject obj = walker.jsonObject();\r
             this.content = obj.content;\r
         }\r
-        catch (RecognitionException e)\r
-        {\r
-            throw new JSONException(JSONErrorCode.InvalidJSONData, jsonStr + ": line=" + e.line + "("\r
-                    + e.charPositionInLine + ")");\r
+        catch (RecognitionException e) {\r
+            throw new JSONException(JSONErrorCode.InvalidJSONData, jsonStr + ": line=" + e.line\r
+                    + "(" + e.charPositionInLine + ")");\r
         }\r
     }\r
 \r
@@ -216,55 +201,47 @@ public class JSONObject extends JSONValueBase
     }\r
     */\r
 \r
-    public static CommonTree parse(String jsonStr) throws JSONException\r
-    {\r
+    public static CommonTree parse(String jsonStr) throws JSONException {\r
         JSONLexer lexer = new JSONLexer(new ANTLRStringStream(jsonStr));\r
         CommonTokenStream tokens = new CommonTokenStream(lexer);\r
         JSONParser parser = new JSONParser(tokens);\r
 \r
-        try\r
-        {\r
+        try {\r
             JSONParser.jsonObject_return r = parser.jsonObject();\r
             return (CommonTree) r.getTree();\r
         }\r
-        catch (RecognitionException e)\r
-        {\r
-            throw new JSONException(JSONErrorCode.InvalidJSONData, jsonStr + ": line=" + e.line + "("\r
-                    + e.charPositionInLine + ")");\r
+        catch (RecognitionException e) {\r
+            throw new JSONException(JSONErrorCode.InvalidJSONData, jsonStr + ": line=" + e.line\r
+                    + "(" + e.charPositionInLine + ")");\r
         }\r
     }\r
 \r
-    public JSONObject(List<JSONElement> elemList)\r
-    {\r
+    public JSONObject(List<JSONElement> elemList) {\r
         for (JSONElement e : elemList)\r
             put(e.getKey(), e.getValue());\r
     }\r
 \r
-    public void put(String key, JSONValue obj)\r
-    {\r
+    public void put(String key, JSONValue obj) {\r
         content.put(key, obj);\r
     }\r
 \r
-    public void put(String key, Object value) throws JSONException\r
-    {\r
+    public void put(String key, Object value) throws JSONException {\r
         content.put(key, translateAsJSONValue(value));\r
     }\r
 \r
-    public String toString()\r
-    {\r
+    public String toString() {\r
         return toJSONString();\r
     }\r
 \r
-    public String toJSONString()\r
-    {\r
+    public String toJSONString() {\r
         StringBuilder jsonBuilder = new StringBuilder();\r
         jsonBuilder.append("{");\r
         ArrayList<String> elementList = new ArrayList<String>();\r
-        for (Iterator<Entry<String, JSONValue>> it = content.entrySet().iterator(); it.hasNext();)\r
-        {\r
+        for (Iterator<Entry<String, JSONValue>> it = content.entrySet().iterator(); it.hasNext();) {\r
             Entry<String, JSONValue> entry = it.next();\r
             String jsonKey = "\"" + entry.getKey() + "\"";\r
-            String jsonValue = (entry.getValue() == null) ? "null" : entry.getValue().toJSONString();\r
+            String jsonValue = (entry.getValue() == null) ? "null" : entry.getValue()\r
+                    .toJSONString();\r
             elementList.add(jsonKey + ":" + jsonValue);\r
         }\r
         jsonBuilder.append(join(elementList, ","));\r
@@ -272,36 +249,31 @@ public class JSONObject extends JSONValueBase
         return jsonBuilder.toString();\r
     }\r
 \r
-    public int elementSize()\r
-    {\r
+    public int elementSize() {\r
         return content.size();\r
     }\r
 \r
-    public JSONValue get(String key)\r
-    {\r
+    public JSONValue get(String key) {\r
         return content.get(key);\r
     }\r
 \r
-    public Set<String> keys()\r
-    {\r
+    public Set<String> keys() {\r
         return content.keySet();\r
     }\r
 \r
-    public int getInt(String key) throws JSONException\r
-    {\r
+    public int getInt(String key) throws JSONException {\r
         JSONValue v = get(key);\r
         if (v == null)\r
             throw new JSONException(JSONErrorCode.KeyIsNotFound, key);\r
 \r
         JSONNumber n = v.getJSONNumber();\r
         if (n == null)\r
-            throw new JSONException(JSONErrorCode.NotAJSONNumber, n.toString());\r
+            throw new JSONException(JSONErrorCode.NotAJSONNumber, v.toString());\r
 \r
         return n.getIntValue();\r
     }\r
 \r
-    public String getString(String key) throws JSONException\r
-    {\r
+    public String getString(String key) throws JSONException {\r
         JSONValue v = get(key);\r
         if (v == null)\r
             throw new JSONException(JSONErrorCode.KeyIsNotFound, key);\r
@@ -313,13 +285,11 @@ public class JSONObject extends JSONValueBase
     }\r
 \r
     @Override\r
-    public JSONObject getJSONObject()\r
-    {\r
+    public JSONObject getJSONObject() {\r
         return this;\r
     }\r
 \r
-    public JSONArray getJSONArray(String key)\r
-    {\r
+    public JSONArray getJSONArray(String key) {\r
         JSONValue v = get(key);\r
         if (v == null)\r
             return null;\r
@@ -330,18 +300,15 @@ public class JSONObject extends JSONValueBase
         return a;\r
     }\r
 \r
-    public boolean hasKey(String key)\r
-    {\r
+    public boolean hasKey(String key) {\r
         return content.containsKey(key);\r
     }\r
 \r
-    public Map<String, JSONValue> getKeyValueMap()\r
-    {\r
+    public Map<String, JSONValue> getKeyValueMap() {\r
         return content;\r
     }\r
 \r
-    public JSONObject getJSONObject(String key) throws JSONException\r
-    {\r
+    public JSONObject getJSONObject(String key) throws JSONException {\r
         JSONValue v = get(key);\r
         if (v == null)\r
             throw new JSONException(JSONErrorCode.KeyIsNotFound, key);\r
@@ -351,13 +318,11 @@ public class JSONObject extends JSONValueBase
         return o;\r
     }\r
 \r
-    public JSONValueType getValueType()\r
-    {\r
+    public JSONValueType getValueType() {\r
         return JSONValueType.Object;\r
     }\r
 \r
-    public void remove(String nodeName)\r
-    {\r
+    public void remove(String nodeName) {\r
         content.remove(nodeName);\r
     }\r
 }\r
index 63ed999..b12c8fa 100644 (file)
@@ -27,60 +27,66 @@ package org.xerial.json;
 import java.util.Collection;\r
 import java.util.Iterator;\r
 \r
+/**\r
+ * Base implementation of the JSONValue\r
+ * \r
+ * @author leo\r
+ * \r
+ */\r
 public abstract class JSONValueBase implements JSONValue {\r
 \r
-       public JSONArray getJSONArray() {\r
-               return null;\r
-       }\r
+    public JSONArray getJSONArray() {\r
+        return null;\r
+    }\r
 \r
-       public JSONBoolean getJSONBoolean() {\r
-               return null;\r
-       }\r
+    public JSONBoolean getJSONBoolean() {\r
+        return null;\r
+    }\r
 \r
-       public JSONNull getJSONNull() {\r
-               return null;\r
-       }\r
+    public JSONNull getJSONNull() {\r
+        return null;\r
+    }\r
 \r
-       public JSONNumber getJSONNumber() {\r
-               return null;\r
-       }\r
+    public JSONNumber getJSONNumber() {\r
+        return null;\r
+    }\r
 \r
-       public JSONObject getJSONObject() {\r
-               return null;\r
-       }\r
+    public JSONObject getJSONObject() {\r
+        return null;\r
+    }\r
+\r
+    public JSONString getJSONString() {\r
+        return null;\r
+    }\r
 \r
-       public JSONString getJSONString() {\r
-               return null;\r
-       }\r
+    public JSONValue translateAsJSONValue(Object value) throws JSONException {\r
+        return JSONUtil.toJSONValue(value);\r
+    }\r
 \r
-       \r
-       public JSONValue translateAsJSONValue(Object value) throws JSONException\r
-       {\r
-               return JSONUtil.toJSONValue(value);\r
-       }\r
+    public String toJSONString() {\r
+        return this.toString();\r
+    }\r
 \r
-       public String toJSONString() {\r
-               return this.toString();\r
-       }\r
-       \r
     /**\r
-     * Concatinates all elements in the given collection c into a single string with the separator\r
-     * @param c a collection of elements to concatenate\r
-     * @param concatinator a concatenator: ex. ", ", "." etc.  \r
+     * Concatenates all elements in the given collection c into a single string\r
+     * with the separator\r
+     * \r
+     * @param c\r
+     *            collection of elements to concatenate\r
+     * @param concatinator\r
+     *            string for concatenating elements: e.g., ", ", "." etc.\r
      * @return a concatenated string\r
      */\r
-    protected static String join(Collection c, String concatinator)\r
-    {\r
-        if(c == null)\r
+    protected static String join(Collection< ? > c, String concatinator) {\r
+        if (c == null)\r
             return "";\r
         int size = c.size();\r
-        if(size == 0)\r
+        if (size == 0)\r
             return "";\r
-        \r
-        Iterator it = c.iterator();\r
-        StringBuilder buf = new StringBuilder();    \r
-        for(int i=0; it.hasNext() && i<size-1; i++)\r
-        {\r
+\r
+        Iterator< ? > it = c.iterator();\r
+        StringBuilder buf = new StringBuilder();\r
+        for (int i = 0; it.hasNext() && i < size - 1; i++) {\r
             Object data = it.next();\r
             buf.append(data.toString());\r
             buf.append(concatinator);\r
@@ -90,7 +96,3 @@ public abstract class JSONValueBase implements JSONValue {
         return buf.toString();\r
     }\r
 }\r
-\r
-\r
-\r
-\r
index 8fb247c..29140c3 100644 (file)
 // Since: Jun 28, 2009 1:00:02 PM\r
 //\r
 //--------------------------------------\r
-\r
 package org.xerial.silk.schema.impl;\r
 \r
+import org.antlr.runtime.BaseRecognizer;\r
+import org.antlr.runtime.CharStream;\r
+import org.antlr.runtime.CommonToken;\r
+import org.antlr.runtime.DFA;\r
+import org.antlr.runtime.EarlyExitException;\r
+import org.antlr.runtime.FailedPredicateException;\r
+import org.antlr.runtime.IntStream;\r
+import org.antlr.runtime.Lexer;\r
+import org.antlr.runtime.MismatchedSetException;\r
+import org.antlr.runtime.NoViableAltException;\r
+import org.antlr.runtime.RecognitionException;\r
+import org.antlr.runtime.RecognizerSharedState;\r
+import org.antlr.runtime.Token;\r
 \r
-\r
-import org.antlr.runtime.*;\r
-import java.util.Stack;\r
-import java.util.List;\r
-import java.util.ArrayList;\r
-import java.util.Map;\r
-import java.util.HashMap;\r
 public class SilkSchemaLexer extends Lexer {\r
-    public static final int Includes=46;\r
-    public static final int RBrace=31;\r
-    public static final int NonWhiteSpaceChar=42;\r
-    public static final int LBracket=32;\r
-    public static final int Class=45;\r
-    public static final int SymbolChars=43;\r
-    public static final int Digit=18;\r
-    public static final int Frac=27;\r
-    public static final int HexDigit=20;\r
-    public static final int Symbol=44;\r
-    public static final int Index=49;\r
-    public static final int Module=5;\r
-    public static final int Letter=19;\r
-    public static final int Comma=37;\r
-    public static final int Attribute=10;\r
-    public static final int Schema=4;\r
-    public static final int Dot=36;\r
-    public static final int End=47;\r
-    public static final int EscapeSequence=22;\r
-    public static final int DefaultValue=13;\r
-    public static final int Integer=26;\r
-    public static final int Relation=48;\r
-    public static final int Mixin=9;\r
-    public static final int WhiteSpace=56;\r
-    public static final int ClassDef=6;\r
-    public static final int LineComment=16;\r
-    public static final int ModuleName=53;\r
-    public static final int BelongsTo=50;\r
-    public static final int SafeFirstLetter=51;\r
-    public static final int Star=40;\r
-    public static final int Eq=35;\r
-    public static final int Preamble=15;\r
-    public static final int Exp=28;\r
-    public static final int QNameChar=57;\r
-    public static final int RParen=39;\r
-    public static final int UnicodeChar=21;\r
-    public static final int StringChar=23;\r
-    public static final int LineBreak=17;\r
-    public static final int Name=7;\r
-    public static final int LParen=38;\r
-    public static final int ModuleDef=55;\r
-    public static final int String=25;\r
-    public static final int SafeLetter=52;\r
-    public static final int LineBreakChar=14;\r
-    public static final int IsArray=11;\r
-    public static final int QName=58;\r
-    public static final int EOF=-1;\r
-    public static final int StringChar_s=24;\r
-    public static final int UnsafeUnicodeChar=41;\r
-    public static final int LBrace=30;\r
-    public static final int Double=29;\r
-    public static final int Lt=34;\r
-    public static final int RBracket=33;\r
-    public static final int Parent=8;\r
-    public static final int TypeName=12;\r
-    public static final int WhiteSpaces=54;\r
-\r
-      \r
-\r
+    public static final int Includes = 46;\r
+    public static final int RBrace = 31;\r
+    public static final int NonWhiteSpaceChar = 42;\r
+    public static final int LBracket = 32;\r
+    public static final int Class = 45;\r
+    public static final int SymbolChars = 43;\r
+    public static final int Digit = 18;\r
+    public static final int Frac = 27;\r
+    public static final int HexDigit = 20;\r
+    public static final int Symbol = 44;\r
+    public static final int Index = 49;\r
+    public static final int Module = 5;\r
+    public static final int Letter = 19;\r
+    public static final int Comma = 37;\r
+    public static final int Attribute = 10;\r
+    public static final int Schema = 4;\r
+    public static final int Dot = 36;\r
+    public static final int End = 47;\r
+    public static final int EscapeSequence = 22;\r
+    public static final int DefaultValue = 13;\r
+    public static final int Integer = 26;\r
+    public static final int Relation = 48;\r
+    public static final int Mixin = 9;\r
+    public static final int WhiteSpace = 56;\r
+    public static final int ClassDef = 6;\r
+    public static final int LineComment = 16;\r
+    public static final int ModuleName = 53;\r
+    public static final int BelongsTo = 50;\r
+    public static final int SafeFirstLetter = 51;\r
+    public static final int Star = 40;\r
+    public static final int Eq = 35;\r
+    public static final int Preamble = 15;\r
+    public static final int Exp = 28;\r
+    public static final int QNameChar = 57;\r
+    public static final int RParen = 39;\r
+    public static final int UnicodeChar = 21;\r
+    public static final int StringChar = 23;\r
+    public static final int LineBreak = 17;\r
+    public static final int Name = 7;\r
+    public static final int LParen = 38;\r
+    public static final int ModuleDef = 55;\r
+    public static final int String = 25;\r
+    public static final int SafeLetter = 52;\r
+    public static final int LineBreakChar = 14;\r
+    public static final int IsArray = 11;\r
+    public static final int QName = 58;\r
+    public static final int EOF = -1;\r
+    public static final int StringChar_s = 24;\r
+    public static final int UnsafeUnicodeChar = 41;\r
+    public static final int LBrace = 30;\r
+    public static final int Double = 29;\r
+    public static final int Lt = 34;\r
+    public static final int RBracket = 33;\r
+    public static final int Parent = 8;\r
+    public static final int TypeName = 12;\r
+    public static final int WhiteSpaces = 54;\r
 \r
     // delegates\r
     // delegators\r
 \r
-    public SilkSchemaLexer() {;} \r
+    public SilkSchemaLexer() {\r
+        ;\r
+    }\r
+\r
     public SilkSchemaLexer(CharStream input) {\r
         this(input, new RecognizerSharedState());\r
     }\r
+\r
     public SilkSchemaLexer(CharStream input, RecognizerSharedState state) {\r
-        super(input,state);\r
+        super(input, state);\r
+\r
+    }\r
 \r
+    public String getGrammarFileName() {\r
+        return "SilkSchema.g";\r
     }\r
-    public String getGrammarFileName() { return "SilkSchema.g"; }\r
 \r
     // $ANTLR start "Preamble"\r
     public final void mPreamble() throws RecognitionException {\r
@@ -115,54 +124,64 @@ public class SilkSchemaLexer extends Lexer {
             // SilkSchema.g:109:9: ({...}? => '%' (~ ( LineBreakChar ) )* )\r
             // SilkSchema.g:109:11: {...}? => '%' (~ ( LineBreakChar ) )*\r
             {\r
-            if ( !(( getCharPositionInLine() == 0 )) ) {\r
-                if (state.backtracking>0) {state.failed=true; return ;}\r
-                throw new FailedPredicateException(input, "Preamble", " getCharPositionInLine() == 0 ");\r
-            }\r
-            match('%'); if (state.failed) return ;\r
-            // SilkSchema.g:109:52: (~ ( LineBreakChar ) )*\r
-            loop1:\r
-            do {\r
-                int alt1=2;\r
-                int LA1_0 = input.LA(1);\r
-\r
-                if ( ((LA1_0>='\u0000' && LA1_0<='\t')||(LA1_0>='\u000B' && LA1_0<='\f')||(LA1_0>='\u000E' && LA1_0<='\uFFFF')) ) {\r
-                    alt1=1;\r
+                if (!((getCharPositionInLine() == 0))) {\r
+                    if (state.backtracking > 0) {\r
+                        state.failed = true;\r
+                        return;\r
+                    }\r
+                    throw new FailedPredicateException(input, "Preamble",\r
+                            " getCharPositionInLine() == 0 ");\r
                 }\r
+                match('%');\r
+                if (state.failed)\r
+                    return;\r
+                // SilkSchema.g:109:52: (~ ( LineBreakChar ) )*\r
+                loop1: do {\r
+                    int alt1 = 2;\r
+                    int LA1_0 = input.LA(1);\r
+\r
+                    if (((LA1_0 >= '\u0000' && LA1_0 <= '\t')\r
+                            || (LA1_0 >= '\u000B' && LA1_0 <= '\f') || (LA1_0 >= '\u000E' && LA1_0 <= '\uFFFF'))) {\r
+                        alt1 = 1;\r
+                    }\r
 \r
+                    switch (alt1) {\r
+                    case 1:\r
+                        // SilkSchema.g:109:52: ~ ( LineBreakChar )\r
+                    {\r
+                        if ((input.LA(1) >= '\u0000' && input.LA(1) <= '\t')\r
+                                || (input.LA(1) >= '\u000B' && input.LA(1) <= '\f')\r
+                                || (input.LA(1) >= '\u000E' && input.LA(1) <= '\uFFFF')) {\r
+                            input.consume();\r
+                            state.failed = false;\r
+                        }\r
+                        else {\r
+                            if (state.backtracking > 0) {\r
+                                state.failed = true;\r
+                                return;\r
+                            }\r
+                            MismatchedSetException mse = new MismatchedSetException(null, input);\r
+                            recover(mse);\r
+                            throw mse;\r
+                        }\r
 \r
-                switch (alt1) {\r
-               case 1 :\r
-                   // SilkSchema.g:109:52: ~ ( LineBreakChar )\r
-                   {\r
-                   if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {\r
-                       input.consume();\r
-                   state.failed=false;\r
-                   }\r
-                   else {\r
-                       if (state.backtracking>0) {state.failed=true; return ;}\r
-                       MismatchedSetException mse = new MismatchedSetException(null,input);\r
-                       recover(mse);\r
-                       throw mse;}\r
-\r
-\r
-                   }\r
-                   break;\r
+                    }\r
+                        break;\r
 \r
-               default :\r
-                   break loop1;\r
+                    default:\r
+                        break loop1;\r
+                    }\r
                 }\r
-            } while (true);\r
-\r
+                while (true);\r
 \r
             }\r
 \r
             state.type = _type;\r
             state.channel = _channel;\r
         }\r
-        finally {\r
-        }\r
+        finally {}\r
     }\r
+\r
     // $ANTLR end "Preamble"\r
 \r
     // $ANTLR start "LineBreakChar"\r
@@ -171,23 +190,26 @@ public class SilkSchemaLexer extends Lexer {
             // SilkSchema.g:112:23: ( '\\n' | '\\r' )\r
             // SilkSchema.g:\r
             {\r
-            if ( input.LA(1)=='\n'||input.LA(1)=='\r' ) {\r
-                input.consume();\r
-            state.failed=false;\r
-            }\r
-            else {\r
-                if (state.backtracking>0) {state.failed=true; return ;}\r
-                MismatchedSetException mse = new MismatchedSetException(null,input);\r
-                recover(mse);\r
-                throw mse;}\r
-\r
+                if (input.LA(1) == '\n' || input.LA(1) == '\r') {\r
+                    input.consume();\r
+                    state.failed = false;\r
+                }\r
+                else {\r
+                    if (state.backtracking > 0) {\r
+                        state.failed = true;\r
+                        return;\r
+                    }\r
+                    MismatchedSetException mse = new MismatchedSetException(null, input);\r
+                    recover(mse);\r
+                    throw mse;\r
+                }\r
 \r
             }\r
 \r
         }\r
-        finally {\r
-        }\r
+        finally {}\r
     }\r
+\r
     // $ANTLR end "LineBreakChar"\r
 \r
     // $ANTLR start "LineComment"\r
@@ -198,53 +220,60 @@ public class SilkSchemaLexer extends Lexer {
             // SilkSchema.g:113:12: ( '#' (~ ( LineBreakChar ) )* )\r
             // SilkSchema.g:113:14: '#' (~ ( LineBreakChar ) )*\r
             {\r
-            match('#'); if (state.failed) return ;\r
-            // SilkSchema.g:113:18: (~ ( LineBreakChar ) )*\r
-            loop2:\r
-            do {\r
-                int alt2=2;\r
-                int LA2_0 = input.LA(1);\r
-\r
-                if ( ((LA2_0>='\u0000' && LA2_0<='\t')||(LA2_0>='\u000B' && LA2_0<='\f')||(LA2_0>='\u000E' && LA2_0<='\uFFFF')) ) {\r
-                    alt2=1;\r
-                }\r
-\r
-\r
-                switch (alt2) {\r
-               case 1 :\r
-                   // SilkSchema.g:113:18: ~ ( LineBreakChar )\r
-                   {\r
-                   if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {\r
-                       input.consume();\r
-                   state.failed=false;\r
-                   }\r
-                   else {\r
-                       if (state.backtracking>0) {state.failed=true; return ;}\r
-                       MismatchedSetException mse = new MismatchedSetException(null,input);\r
-                       recover(mse);\r
-                       throw mse;}\r
+                match('#');\r
+                if (state.failed)\r
+                    return;\r
+                // SilkSchema.g:113:18: (~ ( LineBreakChar ) )*\r
+                loop2: do {\r
+                    int alt2 = 2;\r
+                    int LA2_0 = input.LA(1);\r
+\r
+                    if (((LA2_0 >= '\u0000' && LA2_0 <= '\t')\r
+                            || (LA2_0 >= '\u000B' && LA2_0 <= '\f') || (LA2_0 >= '\u000E' && LA2_0 <= '\uFFFF'))) {\r
+                        alt2 = 1;\r
+                    }\r
 \r
+                    switch (alt2) {\r
+                    case 1:\r
+                        // SilkSchema.g:113:18: ~ ( LineBreakChar )\r
+                    {\r
+                        if ((input.LA(1) >= '\u0000' && input.LA(1) <= '\t')\r
+                                || (input.LA(1) >= '\u000B' && input.LA(1) <= '\f')\r
+                                || (input.LA(1) >= '\u000E' && input.LA(1) <= '\uFFFF')) {\r
+                            input.consume();\r
+                            state.failed = false;\r
+                        }\r
+                        else {\r
+                            if (state.backtracking > 0) {\r
+                                state.failed = true;\r
+                                return;\r
+                            }\r
+                            MismatchedSetException mse = new MismatchedSetException(null, input);\r
+                            recover(mse);\r
+                            throw mse;\r
+                        }\r
 \r
-                   }\r
-                   break;\r
+                    }\r
+                        break;\r
 \r
-               default :\r
-                   break loop2;\r
+                    default:\r
+                        break loop2;\r
+                    }\r
                 }\r
-            } while (true);\r
+                while (true);\r
 \r
-            if ( state.backtracking==0 ) {\r
-               _channel = HIDDEN; \r
-            }\r
+                if (state.backtracking == 0) {\r
+                    _channel = HIDDEN;\r
+                }\r
 \r
             }\r
 \r
             state.type = _type;\r
             state.channel = _channel;\r
         }\r
-        finally {\r
-        }\r
+        finally {}\r
     }\r
+\r
     // $ANTLR end "LineComment"\r
 \r
     // $ANTLR start "LineBreak"\r
@@ -255,67 +284,78 @@ public class SilkSchemaLexer extends Lexer {
             // SilkSchema.g:116:10: ( ( '\\r' '\\n' | '\\r' | '\\n' ) )\r
             // SilkSchema.g:116:12: ( '\\r' '\\n' | '\\r' | '\\n' )\r
             {\r
-            // SilkSchema.g:116:12: ( '\\r' '\\n' | '\\r' | '\\n' )\r
-            int alt3=3;\r
-            int LA3_0 = input.LA(1);\r
+                // SilkSchema.g:116:12: ( '\\r' '\\n' | '\\r' | '\\n' )\r
+                int alt3 = 3;\r
+                int LA3_0 = input.LA(1);\r
 \r
-            if ( (LA3_0=='\r') ) {\r
-                int LA3_1 = input.LA(2);\r
+                if ((LA3_0 == '\r')) {\r
+                    int LA3_1 = input.LA(2);\r
 \r
-                if ( (LA3_1=='\n') ) {\r
-                    alt3=1;\r
+                    if ((LA3_1 == '\n')) {\r
+                        alt3 = 1;\r
+                    }\r
+                    else {\r
+                        alt3 = 2;\r
+                    }\r
+                }\r
+                else if ((LA3_0 == '\n')) {\r
+                    alt3 = 3;\r
                 }\r
                 else {\r
-                    alt3=2;}\r
-            }\r
-            else if ( (LA3_0=='\n') ) {\r
-                alt3=3;\r
-            }\r
-            else {\r
-                if (state.backtracking>0) {state.failed=true; return ;}\r
-                NoViableAltException nvae =\r
-                    new NoViableAltException("", 3, 0, input);\r
+                    if (state.backtracking > 0) {\r
+                        state.failed = true;\r
+                        return;\r
+                    }\r
+                    NoViableAltException nvae = new NoViableAltException("", 3, 0, input);\r
 \r
-                throw nvae;\r
-            }\r
-            switch (alt3) {\r
-                case 1 :\r
+                    throw nvae;\r
+                }\r
+                switch (alt3) {\r
+                case 1:\r
                     // SilkSchema.g:116:13: '\\r' '\\n'\r
-                    {\r
-                    match('\r'); if (state.failed) return ;\r
-                    match('\n'); if (state.failed) return ;\r
+                {\r
+                    match('\r');\r
+                    if (state.failed)\r
+                        return;\r
+                    match('\n');\r
+                    if (state.failed)\r
+                        return;\r
 \r
-                    }\r
+                }\r
                     break;\r
-                case 2 :\r
+                case 2:\r
                     // SilkSchema.g:116:25: '\\r'\r
-                    {\r
-                    match('\r'); if (state.failed) return ;\r
+                {\r
+                    match('\r');\r
+                    if (state.failed)\r
+                        return;\r
 \r
-                    }\r
+                }\r
                     break;\r
-                case 3 :\r
+                case 3:\r
                     // SilkSchema.g:116:32: '\\n'\r
-                    {\r
-                    match('\n'); if (state.failed) return ;\r
+                {\r
+                    match('\n');\r
+                    if (state.failed)\r
+                        return;\r
 \r
-                    }\r
+                }\r
                     break;\r
 \r
-            }\r
+                }\r
 \r
-            if ( state.backtracking==0 ) {\r
-               _channel = HIDDEN; \r
-            }\r
+                if (state.backtracking == 0) {\r
+                    _channel = HIDDEN;\r
+                }\r
 \r
             }\r
 \r
             state.type = _type;\r
             state.channel = _channel;\r
         }\r
-        finally {\r
-        }\r
+        finally {}\r
     }\r
+\r
     // $ANTLR end "LineBreak"\r
 \r
     // $ANTLR start "Digit"\r
@@ -324,14 +364,16 @@ public class SilkSchemaLexer extends Lexer {
             // SilkSchema.g:119:15: ( '0' .. '9' )\r
             // SilkSchema.g:119:17: '0' .. '9'\r
             {\r
-            matchRange('0','9'); if (state.failed) return ;\r
+                matchRange('0', '9');\r
+                if (state.failed)\r
+                    return;\r
 \r
             }\r
 \r
         }\r
-        finally {\r
-        }\r
+        finally {}\r
     }\r
+\r
     // $ANTLR end "Digit"\r
 \r
     // $ANTLR start "Letter"\r
@@ -340,23 +382,27 @@ public class SilkSchemaLexer extends Lexer {
             // SilkSchema.g:120:16: ( 'A' .. 'F' | 'a' .. 'f' )\r
             // SilkSchema.g:\r
             {\r
-            if ( (input.LA(1)>='A' && input.LA(1)<='F')||(input.LA(1)>='a' && input.LA(1)<='f') ) {\r
-                input.consume();\r
-            state.failed=false;\r
-            }\r
-            else {\r
-                if (state.backtracking>0) {state.failed=true; return ;}\r
-                MismatchedSetException mse = new MismatchedSetException(null,input);\r
-                recover(mse);\r
-                throw mse;}\r
-\r
+                if ((input.LA(1) >= 'A' && input.LA(1) <= 'F')\r
+                        || (input.LA(1) >= 'a' && input.LA(1) <= 'f')) {\r
+                    input.consume();\r
+                    state.failed = false;\r
+                }\r
+                else {\r
+                    if (state.backtracking > 0) {\r
+                        state.failed = true;\r
+                        return;\r
+                    }\r
+                    MismatchedSetException mse = new MismatchedSetException(null, input);\r
+                    recover(mse);\r
+                    throw mse;\r
+                }\r
 \r
             }\r
 \r
         }\r
-        finally {\r
-        }\r
+        finally {}\r
     }\r
+\r
     // $ANTLR end "Letter"\r
 \r
     // $ANTLR start "HexDigit"\r
@@ -365,23 +411,28 @@ public class SilkSchemaLexer extends Lexer {
             // SilkSchema.g:121:18: ( Digit | Letter )\r
             // SilkSchema.g:\r
             {\r
-            if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='F')||(input.LA(1)>='a' && input.LA(1)<='f') ) {\r
-                input.consume();\r
-            state.failed=false;\r
-            }\r
-            else {\r
-                if (state.backtracking>0) {state.failed=true; return ;}\r
-                MismatchedSetException mse = new MismatchedSetException(null,input);\r
-                recover(mse);\r
-                throw mse;}\r
-\r
+                if ((input.LA(1) >= '0' && input.LA(1) <= '9')\r
+                        || (input.LA(1) >= 'A' && input.LA(1) <= 'F')\r
+                        || (input.LA(1) >= 'a' && input.LA(1) <= 'f')) {\r
+                    input.consume();\r
+                    state.failed = false;\r
+                }\r
+                else {\r
+                    if (state.backtracking > 0) {\r
+                        state.failed = true;\r
+                        return;\r
+                    }\r
+                    MismatchedSetException mse = new MismatchedSetException(null, input);\r
+                    recover(mse);\r
+                    throw mse;\r
+                }\r
 \r
             }\r
 \r
         }\r
-        finally {\r
-        }\r
+        finally {}\r
     }\r
+\r
     // $ANTLR end "HexDigit"\r
 \r
     // $ANTLR start "UnicodeChar"\r
@@ -390,23 +441,28 @@ public class SilkSchemaLexer extends Lexer {
             // SilkSchema.g:122:21: (~ ( '\"' | '\\\\' ) )\r
             // SilkSchema.g:122:23: ~ ( '\"' | '\\\\' )\r
             {\r
-            if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {\r
-                input.consume();\r
-            state.failed=false;\r
-            }\r
-            else {\r
-                if (state.backtracking>0) {state.failed=true; return ;}\r
-                MismatchedSetException mse = new MismatchedSetException(null,input);\r
-                recover(mse);\r
-                throw mse;}\r
-\r
+                if ((input.LA(1) >= '\u0000' && input.LA(1) <= '!')\r
+                        || (input.LA(1) >= '#' && input.LA(1) <= '[')\r
+                        || (input.LA(1) >= ']' && input.LA(1) <= '\uFFFF')) {\r
+                    input.consume();\r
+                    state.failed = false;\r
+                }\r
+                else {\r
+                    if (state.backtracking > 0) {\r
+                        state.failed = true;\r
+                        return;\r
+                    }\r
+                    MismatchedSetException mse = new MismatchedSetException(null, input);\r
+                    recover(mse);\r
+                    throw mse;\r
+                }\r
 \r
             }\r
 \r
         }\r
-        finally {\r
-        }\r
+        finally {}\r
     }\r
+\r
     // $ANTLR end "UnicodeChar"\r
 \r
     // $ANTLR start "EscapeSequence"\r
@@ -415,184 +471,210 @@ public class SilkSchemaLexer extends Lexer {
             // SilkSchema.g:124:3: ( '\\\\' ( '\\\"' | '\\\\' | '/' | 'b' | 'f' | 'n' | 'r' | 't' | 'u' HexDigit HexDigit HexDigit HexDigit ) )\r
             // SilkSchema.g:124:5: '\\\\' ( '\\\"' | '\\\\' | '/' | 'b' | 'f' | 'n' | 'r' | 't' | 'u' HexDigit HexDigit HexDigit HexDigit )\r
             {\r
-            match('\\'); if (state.failed) return ;\r
-            // SilkSchema.g:124:10: ( '\\\"' | '\\\\' | '/' | 'b' | 'f' | 'n' | 'r' | 't' | 'u' HexDigit HexDigit HexDigit HexDigit )\r
-            int alt4=9;\r
-            switch ( input.LA(1) ) {\r
-            case '\"':\r
-                {\r
-                alt4=1;\r
+                match('\\');\r
+                if (state.failed)\r
+                    return;\r
+                // SilkSchema.g:124:10: ( '\\\"' | '\\\\' | '/' | 'b' | 'f' | 'n' | 'r' | 't' | 'u' HexDigit HexDigit HexDigit HexDigit )\r
+                int alt4 = 9;\r
+                switch (input.LA(1)) {\r
+                case '\"': {\r
+                    alt4 = 1;\r
                 }\r
-                break;\r
-            case '\\':\r
-                {\r
-                alt4=2;\r
+                    break;\r
+                case '\\': {\r
+                    alt4 = 2;\r
                 }\r
-                break;\r
-            case '/':\r
-                {\r
-                alt4=3;\r
+                    break;\r
+                case '/': {\r
+                    alt4 = 3;\r
                 }\r
-                break;\r
-            case 'b':\r
-                {\r
-                alt4=4;\r
+                    break;\r
+                case 'b': {\r
+                    alt4 = 4;\r
                 }\r
-                break;\r
-            case 'f':\r
-                {\r
-                alt4=5;\r
+                    break;\r
+                case 'f': {\r
+                    alt4 = 5;\r
                 }\r
-                break;\r
-            case 'n':\r
-                {\r
-                alt4=6;\r
+                    break;\r
+                case 'n': {\r
+                    alt4 = 6;\r
                 }\r
-                break;\r
-            case 'r':\r
-                {\r
-                alt4=7;\r
+                    break;\r
+                case 'r': {\r
+                    alt4 = 7;\r
                 }\r
-                break;\r
-            case 't':\r
-                {\r
-                alt4=8;\r
+                    break;\r
+                case 't': {\r
+                    alt4 = 8;\r
                 }\r
-                break;\r
-            case 'u':\r
-                {\r
-                alt4=9;\r
+                    break;\r
+                case 'u': {\r
+                    alt4 = 9;\r
                 }\r
-                break;\r
-            default:\r
-                if (state.backtracking>0) {state.failed=true; return ;}\r
-                NoViableAltException nvae =\r
-                    new NoViableAltException("", 4, 0, input);\r
+                    break;\r
+                default:\r
+                    if (state.backtracking > 0) {\r
+                        state.failed = true;\r
+                        return;\r
+                    }\r
+                    NoViableAltException nvae = new NoViableAltException("", 4, 0, input);\r
 \r
-                throw nvae;\r
-            }\r
+                    throw nvae;\r
+                }\r
 \r
-            switch (alt4) {\r
-                case 1 :\r
+                switch (alt4) {\r
+                case 1:\r
                     // SilkSchema.g:124:11: '\\\"'\r
-                    {\r
-                    match('\"'); if (state.failed) return ;\r
+                {\r
+                    match('\"');\r
+                    if (state.failed)\r
+                        return;\r
 \r
-                    }\r
+                }\r
                     break;\r
-                case 2 :\r
+                case 2:\r
                     // SilkSchema.g:124:18: '\\\\'\r
-                    {\r
-                    match('\\'); if (state.failed) return ;\r
+                {\r
+                    match('\\');\r
+                    if (state.failed)\r
+                        return;\r
 \r
-                    }\r
+                }\r
                     break;\r
-                case 3 :\r
+                case 3:\r
                     // SilkSchema.g:124:25: '/'\r
-                    {\r
-                    match('/'); if (state.failed) return ;\r
+                {\r
+                    match('/');\r
+                    if (state.failed)\r
+                        return;\r
 \r
-                    }\r
+                }\r
                     break;\r
-                case 4 :\r
+                case 4:\r
                     // SilkSchema.g:124:31: 'b'\r
-                    {\r
-                    match('b'); if (state.failed) return ;\r
+                {\r
+                    match('b');\r
+                    if (state.failed)\r
+                        return;\r
 \r
-                    }\r
+                }\r
                     break;\r
-                case 5 :\r
+                case 5:\r
                     // SilkSchema.g:124:37: 'f'\r
-                    {\r
-                    match('f'); if (state.failed) return ;\r
+                {\r
+                    match('f');\r
+                    if (state.failed)\r
+                        return;\r
 \r
-                    }\r
+                }\r
                     break;\r
-                case 6 :\r
+                case 6:\r
                     // SilkSchema.g:124:43: 'n'\r
-                    {\r
-                    match('n'); if (state.failed) return ;\r
+                {\r
+                    match('n');\r
+                    if (state.failed)\r
+                        return;\r
 \r
-                    }\r
+                }\r
                     break;\r
-                case 7 :\r
+                case 7:\r
                     // SilkSchema.g:124:49: 'r'\r
-                    {\r
-                    match('r'); if (state.failed) return ;\r
+                {\r
+                    match('r');\r
+                    if (state.failed)\r
+                        return;\r
 \r
-                    }\r
+                }\r
                     break;\r
-                case 8 :\r
+                case 8:\r
                     // SilkSchema.g:124:55: 't'\r
-                    {\r
-                    match('t'); if (state.failed) return ;\r
+                {\r
+                    match('t');\r
+                    if (state.failed)\r
+                        return;\r
 \r
-                    }\r
+                }\r
                     break;\r
-                case 9 :\r
+                case 9:\r
                     // SilkSchema.g:124:61: 'u' HexDigit HexDigit HexDigit HexDigit\r
-                    {\r
-                    match('u'); if (state.failed) return ;\r
-                    mHexDigit(); if (state.failed) return ;\r
-                    mHexDigit(); if (state.failed) return ;\r
-                    mHexDigit(); if (state.failed) return ;\r
-                    mHexDigit(); if (state.failed) return ;\r
+                {\r
+                    match('u');\r
+                    if (state.failed)\r
+                        return;\r
+                    mHexDigit();\r
+                    if (state.failed)\r
+                        return;\r
+                    mHexDigit();\r
+                    if (state.failed)\r
+                        return;\r
+                    mHexDigit();\r
+                    if (state.failed)\r
+                        return;\r
+                    mHexDigit();\r
+                    if (state.failed)\r
+                        return;\r
 \r
-                    }\r
+                }\r
                     break;\r
 \r
-            }\r
-\r
+                }\r
 \r
             }\r
 \r
         }\r
-        finally {\r
-        }\r
+        finally {}\r
     }\r
+\r
     // $ANTLR end "EscapeSequence"\r
 \r
     // $ANTLR start "StringChar"\r
     public final void mStringChar() throws RecognitionException {\r
         try {\r
             // SilkSchema.g:127:21: ( UnicodeChar | EscapeSequence )\r
-            int alt5=2;\r
+            int alt5 = 2;\r
             int LA5_0 = input.LA(1);\r
 \r
-            if ( ((LA5_0>='\u0000' && LA5_0<='!')||(LA5_0>='#' && LA5_0<='[')||(LA5_0>=']' && LA5_0<='\uFFFF')) ) {\r
-                alt5=1;\r
+            if (((LA5_0 >= '\u0000' && LA5_0 <= '!') || (LA5_0 >= '#' && LA5_0 <= '[') || (LA5_0 >= ']' && LA5_0 <= '\uFFFF'))) {\r
+                alt5 = 1;\r
             }\r
-            else if ( (LA5_0=='\\') ) {\r
-                alt5=2;\r
+            else if ((LA5_0 == '\\')) {\r
+                alt5 = 2;\r
             }\r
             else {\r
-                if (state.backtracking>0) {state.failed=true; return ;}\r
-                NoViableAltException nvae =\r
-                    new NoViableAltException("", 5, 0, input);\r
+                if (state.backtracking > 0) {\r
+                    state.failed = true;\r
+                    return;\r
+                }\r
+                NoViableAltException nvae = new NoViableAltException("", 5, 0, input);\r
 \r
                 throw nvae;\r
             }\r
             switch (alt5) {\r
-                case 1 :\r
-                    // SilkSchema.g:127:24: UnicodeChar\r
-                    {\r
-                    mUnicodeChar(); if (state.failed) return ;\r
+            case 1:\r
+                // SilkSchema.g:127:24: UnicodeChar\r
+            {\r
+                mUnicodeChar();\r
+                if (state.failed)\r
+                    return;\r
 \r
-                    }\r
-                    break;\r
-                case 2 :\r
-                    // SilkSchema.g:127:38: EscapeSequence\r
-                    {\r
-                    mEscapeSequence(); if (state.failed) return ;\r
+            }\r
+                break;\r
+            case 2:\r
+                // SilkSchema.g:127:38: EscapeSequence\r
+            {\r
+                mEscapeSequence();\r
+                if (state.failed)\r
+                    return;\r
 \r
-                    }\r
-                    break;\r
+            }\r
+                break;\r
 \r
             }\r
         }\r
-        finally {\r
-        }\r
+        finally {}\r
     }\r
+\r
     // $ANTLR end "StringChar"\r
 \r
     // $ANTLR start "StringChar_s"\r
@@ -601,38 +683,38 @@ public class SilkSchemaLexer extends Lexer {
             // SilkSchema.g:128:22: ( ( StringChar )* )\r
             // SilkSchema.g:128:24: ( StringChar )*\r
             {\r
-            // SilkSchema.g:128:24: ( StringChar )*\r
-            loop6:\r
-            do {\r
-                int alt6=2;\r
-                int LA6_0 = input.LA(1);\r
-\r
-                if ( ((LA6_0>='\u0000' && LA6_0<='!')||(LA6_0>='#' && LA6_0<='\uFFFF')) ) {\r
-                    alt6=1;\r
-                }\r
+                // SilkSchema.g:128:24: ( StringChar )*\r
+                loop6: do {\r
+                    int alt6 = 2;\r
+                    int LA6_0 = input.LA(1);\r
 \r
+                    if (((LA6_0 >= '\u0000' && LA6_0 <= '!') || (LA6_0 >= '#' && LA6_0 <= '\uFFFF'))) {\r
+                        alt6 = 1;\r
+                    }\r
 \r
-                switch (alt6) {\r
-               case 1 :\r
-                   // SilkSchema.g:128:24: StringChar\r
-                   {\r
-                   mStringChar(); if (state.failed) return ;\r
+                    switch (alt6) {\r
+                    case 1:\r
+                        // SilkSchema.g:128:24: StringChar\r
+                    {\r
+                        mStringChar();\r
+                        if (state.failed)\r
+                            return;\r
 \r
-                   }\r
-                   break;\r
+                    }\r
+                        break;\r
 \r
-               default :\r
-                   break loop6;\r
+                    default:\r
+                        break loop6;\r
+                    }\r
                 }\r
-            } while (true);\r
-\r
+                while (true);\r
 \r
             }\r
 \r
         }\r
-        finally {\r
-        }\r
+        finally {}\r
     }\r
+\r
     // $ANTLR end "StringChar_s"\r
 \r
     // $ANTLR start "String"\r
@@ -640,28 +722,35 @@ public class SilkSchemaLexer extends Lexer {
         try {\r
             int _type = String;\r
             int _channel = DEFAULT_TOKEN_CHANNEL;\r
-            Token s=null;\r
+            Token s = null;\r
 \r
             // SilkSchema.g:130:7: ( '\"' s= StringChar_s '\"' )\r
             // SilkSchema.g:130:9: '\"' s= StringChar_s '\"'\r
             {\r
-            match('\"'); if (state.failed) return ;\r
-            int sStart264 = getCharIndex();\r
-            mStringChar_s(); if (state.failed) return ;\r
-            s = new CommonToken(input, Token.INVALID_TOKEN_TYPE, Token.DEFAULT_CHANNEL, sStart264, getCharIndex()-1);\r
-            match('\"'); if (state.failed) return ;\r
-            if ( state.backtracking==0 ) {\r
-               setText((s!=null?s.getText():null)); \r
-            }\r
+                match('\"');\r
+                if (state.failed)\r
+                    return;\r
+                int sStart264 = getCharIndex();\r
+                mStringChar_s();\r
+                if (state.failed)\r
+                    return;\r
+                s = new CommonToken(input, Token.INVALID_TOKEN_TYPE, Token.DEFAULT_CHANNEL,\r
+                        sStart264, getCharIndex() - 1);\r
+                match('\"');\r
+                if (state.failed)\r
+                    return;\r
+                if (state.backtracking == 0) {\r
+                    setText((s != null ? s.getText() : null));\r
+                }\r
 \r
             }\r
 \r
             state.type = _type;\r
             state.channel = _channel;\r
         }\r
-        finally {\r
-        }\r
+        finally {}\r
     }\r
+\r
     // $ANTLR end "String"\r
 \r
     // $ANTLR start "Integer"\r
@@ -672,93 +761,100 @@ public class SilkSchemaLexer extends Lexer {
             // SilkSchema.g:133:8: ( ( '-' )? ( '0' | '1' .. '9' ( Digit )* ) )\r
             // SilkSchema.g:133:10: ( '-' )? ( '0' | '1' .. '9' ( Digit )* )\r
             {\r
-            // SilkSchema.g:133:10: ( '-' )?\r
-            int alt7=2;\r
-            int LA7_0 = input.LA(1);\r
+                // SilkSchema.g:133:10: ( '-' )?\r
+                int alt7 = 2;\r
+                int LA7_0 = input.LA(1);\r
 \r
-            if ( (LA7_0=='-') ) {\r
-                alt7=1;\r
-            }\r
-            switch (alt7) {\r
-                case 1 :\r
+                if ((LA7_0 == '-')) {\r
+                    alt7 = 1;\r
+                }\r
+                switch (alt7) {\r
+                case 1:\r
                     // SilkSchema.g:133:10: '-'\r
-                    {\r
-                    match('-'); if (state.failed) return ;\r
+                {\r
+                    match('-');\r
+                    if (state.failed)\r
+                        return;\r
 \r
-                    }\r
+                }\r
                     break;\r
 \r
-            }\r
+                }\r
 \r
-            // SilkSchema.g:133:15: ( '0' | '1' .. '9' ( Digit )* )\r
-            int alt9=2;\r
-            int LA9_0 = input.LA(1);\r
+                // SilkSchema.g:133:15: ( '0' | '1' .. '9' ( Digit )* )\r
+                int alt9 = 2;\r
+                int LA9_0 = input.LA(1);\r
 \r
-            if ( (LA9_0=='0') ) {\r
-                alt9=1;\r
-            }\r
-            else if ( ((LA9_0>='1' && LA9_0<='9')) ) {\r
-                alt9=2;\r
-            }\r
-            else {\r
-                if (state.backtracking>0) {state.failed=true; return ;}\r
-                NoViableAltException nvae =\r
-                    new NoViableAltException("", 9, 0, input);\r
+                if ((LA9_0 == '0')) {\r
+                    alt9 = 1;\r
+                }\r
+                else if (((LA9_0 >= '1' && LA9_0 <= '9'))) {\r
+                    alt9 = 2;\r
+                }\r
+                else {\r
+                    if (state.backtracking > 0) {\r
+                        state.failed = true;\r
+                        return;\r
+                    }\r
+                    NoViableAltException nvae = new NoViableAltException("", 9, 0, input);\r
 \r
-                throw nvae;\r
-            }\r
-            switch (alt9) {\r
-                case 1 :\r
+                    throw nvae;\r
+                }\r
+                switch (alt9) {\r
+                case 1:\r
                     // SilkSchema.g:133:16: '0'\r
-                    {\r
-                    match('0'); if (state.failed) return ;\r
+                {\r
+                    match('0');\r
+                    if (state.failed)\r
+                        return;\r
 \r
-                    }\r
+                }\r
                     break;\r
-                case 2 :\r
+                case 2:\r
                     // SilkSchema.g:133:22: '1' .. '9' ( Digit )*\r
-                    {\r
-                    matchRange('1','9'); if (state.failed) return ;\r
+                {\r
+                    matchRange('1', '9');\r
+                    if (state.failed)\r
+                        return;\r
                     // SilkSchema.g:133:31: ( Digit )*\r
-                    loop8:\r
-                    do {\r
-                        int alt8=2;\r
+                    loop8: do {\r
+                        int alt8 = 2;\r
                         int LA8_0 = input.LA(1);\r
 \r
-                        if ( ((LA8_0>='0' && LA8_0<='9')) ) {\r
-                            alt8=1;\r
+                        if (((LA8_0 >= '0' && LA8_0 <= '9'))) {\r
+                            alt8 = 1;\r
                         }\r
 \r
-\r
                         switch (alt8) {\r
-                       case 1 :\r
-                           // SilkSchema.g:133:31: Digit\r
-                           {\r
-                           mDigit(); if (state.failed) return ;\r
-\r
-                           }\r
-                           break;\r
+                        case 1:\r
+                            // SilkSchema.g:133:31: Digit\r
+                        {\r
+                            mDigit();\r
+                            if (state.failed)\r
+                                return;\r
 \r
-                       default :\r
-                           break loop8;\r
                         }\r
-                    } while (true);\r
-\r
+                            break;\r
 \r
+                        default:\r
+                            break loop8;\r
+                        }\r
                     }\r
-                    break;\r
+                    while (true);\r
 \r
-            }\r
+                }\r
+                    break;\r
 \r
+                }\r
 \r
             }\r
 \r
             state.type = _type;\r
             state.channel = _channel;\r
         }\r
-        finally {\r
-        }\r
+        finally {}\r
     }\r
+\r
     // $ANTLR end "Integer"\r
 \r
     // $ANTLR start "Frac"\r
@@ -767,45 +863,50 @@ public class SilkSchemaLexer extends Lexer {
             // SilkSchema.g:134:14: ( '.' ( Digit )+ )\r
             // SilkSchema.g:134:16: '.' ( Digit )+\r
             {\r
-            match('.'); if (state.failed) return ;\r
-            // SilkSchema.g:134:20: ( Digit )+\r
-            int cnt10=0;\r
-            loop10:\r
-            do {\r
-                int alt10=2;\r
-                int LA10_0 = input.LA(1);\r
-\r
-                if ( ((LA10_0>='0' && LA10_0<='9')) ) {\r
-                    alt10=1;\r
-                }\r
-\r
+                match('.');\r
+                if (state.failed)\r
+                    return;\r
+                // SilkSchema.g:134:20: ( Digit )+\r
+                int cnt10 = 0;\r
+                loop10: do {\r
+                    int alt10 = 2;\r
+                    int LA10_0 = input.LA(1);\r
+\r
+                    if (((LA10_0 >= '0' && LA10_0 <= '9'))) {\r
+                        alt10 = 1;\r
+                    }\r
 \r
-                switch (alt10) {\r
-               case 1 :\r
-                   // SilkSchema.g:134:20: Digit\r
-                   {\r
-                   mDigit(); if (state.failed) return ;\r
+                    switch (alt10) {\r
+                    case 1:\r
+                        // SilkSchema.g:134:20: Digit\r
+                    {\r
+                        mDigit();\r
+                        if (state.failed)\r
+                            return;\r
 \r
-                   }\r
-                   break;\r
+                    }\r
+                        break;\r
 \r
-               default :\r
-                   if ( cnt10 >= 1 ) break loop10;\r
-                   if (state.backtracking>0) {state.failed=true; return ;}\r
-                        EarlyExitException eee =\r
-                            new EarlyExitException(10, input);\r
+                    default:\r
+                        if (cnt10 >= 1)\r
+                            break loop10;\r
+                        if (state.backtracking > 0) {\r
+                            state.failed = true;\r
+                            return;\r
+                        }\r
+                        EarlyExitException eee = new EarlyExitException(10, input);\r
                         throw eee;\r
+                    }\r
+                    cnt10++;\r
                 }\r
-                cnt10++;\r
-            } while (true);\r
-\r
+                while (true);\r
 \r
             }\r
 \r
         }\r
-        finally {\r
-        }\r
+        finally {}\r
     }\r
+\r
     // $ANTLR end "Frac"\r
 \r
     // $ANTLR start "Exp"\r
@@ -814,81 +915,91 @@ public class SilkSchemaLexer extends Lexer {
             // SilkSchema.g:135:13: ( ( 'e' | 'E' ) ( '+' | '-' )? ( Digit )+ )\r
             // SilkSchema.g:135:15: ( 'e' | 'E' ) ( '+' | '-' )? ( Digit )+\r
             {\r
-            if ( input.LA(1)=='E'||input.LA(1)=='e' ) {\r
-                input.consume();\r
-            state.failed=false;\r
-            }\r
-            else {\r
-                if (state.backtracking>0) {state.failed=true; return ;}\r
-                MismatchedSetException mse = new MismatchedSetException(null,input);\r
-                recover(mse);\r
-                throw mse;}\r
+                if (input.LA(1) == 'E' || input.LA(1) == 'e') {\r
+                    input.consume();\r
+                    state.failed = false;\r
+                }\r
+                else {\r
+                    if (state.backtracking > 0) {\r
+                        state.failed = true;\r
+                        return;\r
+                    }\r
+                    MismatchedSetException mse = new MismatchedSetException(null, input);\r
+                    recover(mse);\r
+                    throw mse;\r
+                }\r
 \r
-            // SilkSchema.g:135:27: ( '+' | '-' )?\r
-            int alt11=2;\r
-            int LA11_0 = input.LA(1);\r
+                // SilkSchema.g:135:27: ( '+' | '-' )?\r
+                int alt11 = 2;\r
+                int LA11_0 = input.LA(1);\r
 \r
-            if ( (LA11_0=='+'||LA11_0=='-') ) {\r
-                alt11=1;\r
-            }\r
-            switch (alt11) {\r
-                case 1 :\r
+                if ((LA11_0 == '+' || LA11_0 == '-')) {\r
+                    alt11 = 1;\r
+                }\r
+                switch (alt11) {\r
+                case 1:\r
                     // SilkSchema.g:\r
-                    {\r
-                    if ( input.LA(1)=='+'||input.LA(1)=='-' ) {\r
+                {\r
+                    if (input.LA(1) == '+' || input.LA(1) == '-') {\r
                         input.consume();\r
-                    state.failed=false;\r
+                        state.failed = false;\r
                     }\r
                     else {\r
-                        if (state.backtracking>0) {state.failed=true; return ;}\r
-                        MismatchedSetException mse = new MismatchedSetException(null,input);\r
+                        if (state.backtracking > 0) {\r
+                            state.failed = true;\r
+                            return;\r
+                        }\r
+                        MismatchedSetException mse = new MismatchedSetException(null, input);\r
                         recover(mse);\r
-                        throw mse;}\r
-\r
-\r
+                        throw mse;\r
                     }\r
-                    break;\r
-\r
-            }\r
 \r
-            // SilkSchema.g:135:40: ( Digit )+\r
-            int cnt12=0;\r
-            loop12:\r
-            do {\r
-                int alt12=2;\r
-                int LA12_0 = input.LA(1);\r
+                }\r
+                    break;\r
 \r
-                if ( ((LA12_0>='0' && LA12_0<='9')) ) {\r
-                    alt12=1;\r
                 }\r
 \r
+                // SilkSchema.g:135:40: ( Digit )+\r
+                int cnt12 = 0;\r
+                loop12: do {\r
+                    int alt12 = 2;\r
+                    int LA12_0 = input.LA(1);\r
+\r
+                    if (((LA12_0 >= '0' && LA12_0 <= '9'))) {\r
+                        alt12 = 1;\r
+                    }\r
 \r
-                switch (alt12) {\r
-               case 1 :\r
-                   // SilkSchema.g:135:40: Digit\r
-                   {\r
-                   mDigit(); if (state.failed) return ;\r
+                    switch (alt12) {\r
+                    case 1:\r
+                        // SilkSchema.g:135:40: Digit\r
+                    {\r
+                        mDigit();\r
+                        if (state.failed)\r
+                            return;\r
 \r
-                   }\r
-                   break;\r
+                    }\r
+                        break;\r
 \r
-               default :\r
-                   if ( cnt12 >= 1 ) break loop12;\r
-                   if (state.backtracking>0) {state.failed=true; return ;}\r
-                        EarlyExitException eee =\r
-                            new EarlyExitException(12, input);\r
+                    default:\r
+                        if (cnt12 >= 1)\r
+                            break loop12;\r
+                        if (state.backtracking > 0) {\r
+                            state.failed = true;\r
+                            return;\r
+                        }\r
+                        EarlyExitException eee = new EarlyExitException(12, input);\r
                         throw eee;\r
+                    }\r
+                    cnt12++;\r
                 }\r
-                cnt12++;\r
-            } while (true);\r
-\r
+                while (true);\r
 \r
             }\r
 \r
         }\r
-        finally {\r
-        }\r
+        finally {}\r
     }\r
+\r
     // $ANTLR end "Exp"\r
 \r
     // $ANTLR start "Double"\r
@@ -899,69 +1010,77 @@ public class SilkSchemaLexer extends Lexer {
             // SilkSchema.g:136:7: ( Integer ( Frac ( Exp )? | Exp ) )\r
             // SilkSchema.g:136:9: Integer ( Frac ( Exp )? | Exp )\r
             {\r
-            mInteger(); if (state.failed) return ;\r
-            // SilkSchema.g:136:17: ( Frac ( Exp )? | Exp )\r
-            int alt14=2;\r
-            int LA14_0 = input.LA(1);\r
-\r
-            if ( (LA14_0=='.') ) {\r
-                alt14=1;\r
-            }\r
-            else if ( (LA14_0=='E'||LA14_0=='e') ) {\r
-                alt14=2;\r
-            }\r
-            else {\r
-                if (state.backtracking>0) {state.failed=true; return ;}\r
-                NoViableAltException nvae =\r
-                    new NoViableAltException("", 14, 0, input);\r
+                mInteger();\r
+                if (state.failed)\r
+                    return;\r
+                // SilkSchema.g:136:17: ( Frac ( Exp )? | Exp )\r
+                int alt14 = 2;\r
+                int LA14_0 = input.LA(1);\r
+\r
+                if ((LA14_0 == '.')) {\r
+                    alt14 = 1;\r
+                }\r
+                else if ((LA14_0 == 'E' || LA14_0 == 'e')) {\r
+                    alt14 = 2;\r
+                }\r
+                else {\r
+                    if (state.backtracking > 0) {\r
+                        state.failed = true;\r
+                        return;\r
+                    }\r
+                    NoViableAltException nvae = new NoViableAltException("", 14, 0, input);\r
 \r
-                throw nvae;\r
-            }\r
-            switch (alt14) {\r
-                case 1 :\r
+                    throw nvae;\r
+                }\r
+                switch (alt14) {\r
+                case 1:\r
                     // SilkSchema.g:136:18: Frac ( Exp )?\r
-                    {\r
-                    mFrac(); if (state.failed) return ;\r
+                {\r
+                    mFrac();\r
+                    if (state.failed)\r
+                        return;\r
                     // SilkSchema.g:136:23: ( Exp )?\r
-                    int alt13=2;\r
+                    int alt13 = 2;\r
                     int LA13_0 = input.LA(1);\r
 \r
-                    if ( (LA13_0=='E'||LA13_0=='e') ) {\r
-                        alt13=1;\r
+                    if ((LA13_0 == 'E' || LA13_0 == 'e')) {\r
+                        alt13 = 1;\r
                     }\r
                     switch (alt13) {\r
-                        case 1 :\r
-                            // SilkSchema.g:136:23: Exp\r
-                            {\r
-                            mExp(); if (state.failed) return ;\r
-\r
-                            }\r
-                            break;\r
+                    case 1:\r
+                        // SilkSchema.g:136:23: Exp\r
+                    {\r
+                        mExp();\r
+                        if (state.failed)\r
+                            return;\r
 \r
                     }\r
-\r
+                        break;\r
 \r
                     }\r
+\r
+                }\r
                     break;\r
-                case 2 :\r
+                case 2:\r
                     // SilkSchema.g:136:30: Exp\r
-                    {\r
-                    mExp(); if (state.failed) return ;\r
+                {\r
+                    mExp();\r
+                    if (state.failed)\r
+                        return;\r
 \r
-                    }\r
+                }\r
                     break;\r
 \r
-            }\r
-\r
+                }\r
 \r
             }\r
 \r
             state.type = _type;\r
             state.channel = _channel;\r
         }\r
-        finally {\r
-        }\r
+        finally {}\r
     }\r
+\r
     // $ANTLR end "Double"\r
 \r
     // $ANTLR start "LBrace"\r
@@ -972,16 +1091,18 @@ public class SilkSchemaLexer extends Lexer {
             // SilkSchema.g:138:7: ( '{' )\r
             // SilkSchema.g:138:9: '{'\r
             {\r
-            match('{'); if (state.failed) return ;\r
+                match('{');\r
+                if (state.failed)\r
+                    return;\r
 \r
             }\r
 \r
             state.type = _type;\r
             state.channel = _channel;\r
         }\r
-        finally {\r
-        }\r
+        finally {}\r
     }\r
+\r
     // $ANTLR end "LBrace"\r
 \r
     // $ANTLR start "RBrace"\r
@@ -992,16 +1113,18 @@ public class SilkSchemaLexer extends Lexer {
             // SilkSchema.g:139:7: ( '}' )\r
             // SilkSchema.g:139:9: '}'\r
             {\r
-            match('}'); if (state.failed) return ;\r
+                match('}');\r
+                if (state.failed)\r
+                    return;\r
 \r
             }\r
 \r
             state.type = _type;\r
             state.channel = _channel;\r
         }\r
-        finally {\r
-        }\r
+        finally {}\r
     }\r
+\r
     // $ANTLR end "RBrace"\r
 \r
     // $ANTLR start "LBracket"\r
@@ -1012,16 +1135,18 @@ public class SilkSchemaLexer extends Lexer {
             // SilkSchema.g:140:9: ( '[' )\r
             // SilkSchema.g:140:11: '['\r
             {\r
-            match('['); if (state.failed) return ;\r
+                match('[');\r
+                if (state.failed)\r
+                    return;\r
 \r
             }\r
 \r
             state.type = _type;\r
             state.channel = _channel;\r
         }\r
-        finally {\r
-        }\r
+        finally {}\r
     }\r
+\r
     // $ANTLR end "LBracket"\r
 \r
     // $ANTLR start "RBracket"\r
@@ -1032,16 +1157,18 @@ public class SilkSchemaLexer extends Lexer {
             // SilkSchema.g:141:9: ( ']' )\r
             // SilkSchema.g:141:11: ']'\r
             {\r
-            match(']'); if (state.failed) return ;\r
+                match(']');\r
+                if (state.failed)\r
+                    return;\r
 \r
             }\r
 \r
             state.type = _type;\r
             state.channel = _channel;\r
         }\r
-        finally {\r
-        }\r
+        finally {}\r
     }\r
+\r
     // $ANTLR end "RBracket"\r
 \r
     // $ANTLR start "Lt"\r
@@ -1052,16 +1179,18 @@ public class SilkSchemaLexer extends Lexer {
             // SilkSchema.g:143:3: ( '<' )\r
             // SilkSchema.g:143:5: '<'\r
             {\r
-            match('<'); if (state.failed) return ;\r
+                match('<');\r
+                if (state.failed)\r
+                    return;\r
 \r
             }\r
 \r
             state.type = _type;\r
             state.channel = _channel;\r
         }\r
-        finally {\r
-        }\r
+        finally {}\r
     }\r
+\r
     // $ANTLR end "Lt"\r
 \r
     // $ANTLR start "Eq"\r
@@ -1072,16 +1201,18 @@ public class SilkSchemaLexer extends Lexer {
             // SilkSchema.g:144:3: ( '=' )\r
             // SilkSchema.g:144:5: '='\r
             {\r
-            match('='); if (state.failed) return ;\r
+                match('=');\r
+                if (state.failed)\r
+                    return;\r
 \r
             }\r
 \r
             state.type = _type;\r
             state.channel = _channel;\r
         }\r
-        finally {\r
-        }\r
+        finally {}\r
     }\r
+\r
     // $ANTLR end "Eq"\r
 \r
     // $ANTLR start "Dot"\r
@@ -1092,16 +1223,18 @@ public class SilkSchemaLexer extends Lexer {
             // SilkSchema.g:145:4: ( '.' )\r
             // SilkSchema.g:145:6: '.'\r
             {\r
-            match('.'); if (state.failed) return ;\r
+                match('.');\r
+                if (state.failed)\r
+                    return;\r
 \r
             }\r
 \r
             state.type = _type;\r
             state.channel = _channel;\r
         }\r
-        finally {\r
-        }\r
+        finally {}\r
     }\r
+\r
     // $ANTLR end "Dot"\r
 \r
     // $ANTLR start "Comma"\r
@@ -1112,16 +1245,18 @@ public class SilkSchemaLexer extends Lexer {
             // SilkSchema.g:146:6: ( ',' )\r
             // SilkSchema.g:146:8: ','\r
             {\r
-            match(','); if (state.failed) return ;\r
+                match(',');\r
+                if (state.failed)\r
+                    return;\r
 \r
             }\r
 \r
             state.type = _type;\r
             state.channel = _channel;\r
         }\r
-        finally {\r
-        }\r
+        finally {}\r
     }\r
+\r
     // $ANTLR end "Comma"\r
 \r
     // $ANTLR start "LParen"\r
@@ -1132,16 +1267,18 @@ public class SilkSchemaLexer extends Lexer {
             // SilkSchema.g:148:7: ( '(' )\r
             // SilkSchema.g:148:9: '('\r
             {\r
-            match('('); if (state.failed) return ;\r
+                match('(');\r
+                if (state.failed)\r
+                    return;\r
 \r
             }\r
 \r
             state.type = _type;\r
             state.channel = _channel;\r
         }\r
-        finally {\r
-        }\r
+        finally {}\r
     }\r
+\r
     // $ANTLR end "LParen"\r
 \r
     // $ANTLR start "RParen"\r
@@ -1152,16 +1289,18 @@ public class SilkSchemaLexer extends Lexer {
             // SilkSchema.g:149:7: ( ')' )\r
             // SilkSchema.g:149:9: ')'\r
             {\r
-            match(')'); if (state.failed) return ;\r
+                match(')');\r
+                if (state.failed)\r
+                    return;\r
 \r
             }\r
 \r
             state.type = _type;\r
             state.channel = _channel;\r
         }\r
-        finally {\r
-        }\r
+        finally {}\r
     }\r
+\r
     // $ANTLR end "RParen"\r
 \r
     // $ANTLR start "Star"\r
@@ -1172,16 +1311,18 @@ public class SilkSchemaLexer extends Lexer {
             // SilkSchema.g:151:5: ( '*' )\r
             // SilkSchema.g:151:7: '*'\r
             {\r
-            match('*'); if (state.failed) return ;\r
+                match('*');\r
+                if (state.failed)\r
+                    return;\r
 \r
             }\r
 \r
             state.type = _type;\r
             state.channel = _channel;\r
         }\r
-        finally {\r
-        }\r
+        finally {}\r
     }\r
+\r
     // $ANTLR end "Star"\r
 \r
     // $ANTLR start "UnsafeUnicodeChar"\r
@@ -1190,23 +1331,31 @@ public class SilkSchemaLexer extends Lexer {
             // SilkSchema.g:154:18: ( '(' | ')' | '[' | ']' | '{' | '}' | ',' | ':' | '#' | '<' | '>' | '|' | '*' | '\\'' | '\"' | '@' | '%' | '\\\\' | '.' | '-' )\r
             // SilkSchema.g:\r
             {\r
-            if ( (input.LA(1)>='\"' && input.LA(1)<='#')||input.LA(1)=='%'||(input.LA(1)>='\'' && input.LA(1)<='*')||(input.LA(1)>=',' && input.LA(1)<='.')||input.LA(1)==':'||input.LA(1)=='<'||input.LA(1)=='>'||input.LA(1)=='@'||(input.LA(1)>='[' && input.LA(1)<=']')||(input.LA(1)>='{' && input.LA(1)<='}') ) {\r
-                input.consume();\r
-            state.failed=false;\r
-            }\r
-            else {\r
-                if (state.backtracking>0) {state.failed=true; return ;}\r
-                MismatchedSetException mse = new MismatchedSetException(null,input);\r
-                recover(mse);\r
-                throw mse;}\r
-\r
+                if ((input.LA(1) >= '\"' && input.LA(1) <= '#') || input.LA(1) == '%'\r
+                        || (input.LA(1) >= '\'' && input.LA(1) <= '*')\r
+                        || (input.LA(1) >= ',' && input.LA(1) <= '.') || input.LA(1) == ':'\r
+                        || input.LA(1) == '<' || input.LA(1) == '>' || input.LA(1) == '@'\r
+                        || (input.LA(1) >= '[' && input.LA(1) <= ']')\r
+                        || (input.LA(1) >= '{' && input.LA(1) <= '}')) {\r
+                    input.consume();\r
+                    state.failed = false;\r
+                }\r
+                else {\r
+                    if (state.backtracking > 0) {\r
+                        state.failed = true;\r
+                        return;\r
+                    }\r
+                    MismatchedSetException mse = new MismatchedSetException(null, input);\r
+                    recover(mse);\r
+                    throw mse;\r
+                }\r
 \r
             }\r
 \r
         }\r
-        finally {\r
-        }\r
+        finally {}\r
     }\r
+\r
     // $ANTLR end "UnsafeUnicodeChar"\r
 \r
     // $ANTLR start "NonWhiteSpaceChar"\r
@@ -1215,23 +1364,33 @@ public class SilkSchemaLexer extends Lexer {
             // SilkSchema.g:157:18: (~ ( UnsafeUnicodeChar | '\\r' | '\\n' | ' ' | '\\t' | '\\u000C' ) )\r
             // SilkSchema.g:157:20: ~ ( UnsafeUnicodeChar | '\\r' | '\\n' | ' ' | '\\t' | '\\u000C' )\r
             {\r
-            if ( (input.LA(1)>='\u0000' && input.LA(1)<='\b')||input.LA(1)=='\u000B'||(input.LA(1)>='\u000E' && input.LA(1)<='\u001F')||input.LA(1)=='!'||input.LA(1)=='$'||input.LA(1)=='&'||input.LA(1)=='+'||(input.LA(1)>='/' && input.LA(1)<='9')||input.LA(1)==';'||input.LA(1)=='='||input.LA(1)=='?'||(input.LA(1)>='A' && input.LA(1)<='Z')||(input.LA(1)>='^' && input.LA(1)<='z')||(input.LA(1)>='~' && input.LA(1)<='\uFFFF') ) {\r
-                input.consume();\r
-            state.failed=false;\r
-            }\r
-            else {\r
-                if (state.backtracking>0) {state.failed=true; return ;}\r
-                MismatchedSetException mse = new MismatchedSetException(null,input);\r
-                recover(mse);\r
-                throw mse;}\r
-\r
+                if ((input.LA(1) >= '\u0000' && input.LA(1) <= '\b') || input.LA(1) == '\u000B'\r
+                        || (input.LA(1) >= '\u000E' && input.LA(1) <= '\u001F')\r
+                        || input.LA(1) == '!' || input.LA(1) == '$' || input.LA(1) == '&'\r
+                        || input.LA(1) == '+' || (input.LA(1) >= '/' && input.LA(1) <= '9')\r
+                        || input.LA(1) == ';' || input.LA(1) == '=' || input.LA(1) == '?'\r
+                        || (input.LA(1) >= 'A' && input.LA(1) <= 'Z')\r
+                        || (input.LA(1) >= '^' && input.LA(1) <= 'z')\r
+                        || (input.LA(1) >= '~' && input.LA(1) <= '\uFFFF')) {\r
+                    input.consume();\r
+                    state.failed = false;\r
+                }\r
+                else {\r
+                    if (state.backtracking > 0) {\r
+                        state.failed = true;\r
+                        return;\r
+                    }\r
+                    MismatchedSetException mse = new MismatchedSetException(null, input);\r
+                    recover(mse);\r
+                    throw mse;\r
+                }\r
 \r
             }\r
 \r
         }\r
-        finally {\r
-        }\r
+        finally {}\r
     }\r
+\r
     // $ANTLR end "NonWhiteSpaceChar"\r
 \r
     // $ANTLR start "SymbolChars"\r
@@ -1240,44 +1399,52 @@ public class SilkSchemaLexer extends Lexer {
             // SilkSchema.g:159:21: ( ( NonWhiteSpaceChar )+ )\r
             // SilkSchema.g:159:23: ( NonWhiteSpaceChar )+\r
             {\r
-            // SilkSchema.g:159:23: ( NonWhiteSpaceChar )+\r
-            int cnt15=0;\r
-            loop15:\r
-            do {\r
-                int alt15=2;\r
-                int LA15_0 = input.LA(1);\r
-\r
-                if ( ((LA15_0>='\u0000' && LA15_0<='\b')||LA15_0=='\u000B'||(LA15_0>='\u000E' && LA15_0<='\u001F')||LA15_0=='!'||LA15_0=='$'||LA15_0=='&'||LA15_0=='+'||(LA15_0>='/' && LA15_0<='9')||LA15_0==';'||LA15_0=='='||LA15_0=='?'||(LA15_0>='A' && LA15_0<='Z')||(LA15_0>='^' && LA15_0<='z')||(LA15_0>='~' && LA15_0<='\uFFFF')) ) {\r
-                    alt15=1;\r
-                }\r
-\r
+                // SilkSchema.g:159:23: ( NonWhiteSpaceChar )+\r
+                int cnt15 = 0;\r
+                loop15: do {\r
+                    int alt15 = 2;\r
+                    int LA15_0 = input.LA(1);\r
+\r
+                    if (((LA15_0 >= '\u0000' && LA15_0 <= '\b') || LA15_0 == '\u000B'\r
+                            || (LA15_0 >= '\u000E' && LA15_0 <= '\u001F') || LA15_0 == '!'\r
+                            || LA15_0 == '$' || LA15_0 == '&' || LA15_0 == '+'\r
+                            || (LA15_0 >= '/' && LA15_0 <= '9') || LA15_0 == ';' || LA15_0 == '='\r
+                            || LA15_0 == '?' || (LA15_0 >= 'A' && LA15_0 <= 'Z')\r
+                            || (LA15_0 >= '^' && LA15_0 <= 'z') || (LA15_0 >= '~' && LA15_0 <= '\uFFFF'))) {\r
+                        alt15 = 1;\r
+                    }\r
 \r
-                switch (alt15) {\r
-               case 1 :\r
-                   // SilkSchema.g:159:23: NonWhiteSpaceChar\r
-                   {\r
-                   mNonWhiteSpaceChar(); if (state.failed) return ;\r
+                    switch (alt15) {\r
+                    case 1:\r
+                        // SilkSchema.g:159:23: NonWhiteSpaceChar\r
+                    {\r
+                        mNonWhiteSpaceChar();\r
+                        if (state.failed)\r
+                            return;\r
 \r
-                   }\r
-                   break;\r
+                    }\r
+                        break;\r
 \r
-               default :\r
-                   if ( cnt15 >= 1 ) break loop15;\r
-                   if (state.backtracking>0) {state.failed=true; return ;}\r
-                        EarlyExitException eee =\r
-                            new EarlyExitException(15, input);\r
+                    default:\r
+                        if (cnt15 >= 1)\r
+                            break loop15;\r
+                        if (state.backtracking > 0) {\r
+                            state.failed = true;\r
+                            return;\r
+                        }\r
+                        EarlyExitException eee = new EarlyExitException(15, input);\r
                         throw eee;\r
+                    }\r
+                    cnt15++;\r
                 }\r
-                cnt15++;\r
-            } while (true);\r
-\r
+                while (true);\r
 \r
             }\r
 \r
         }\r
-        finally {\r
-        }\r
+        finally {}\r
     }\r
+\r
     // $ANTLR end "SymbolChars"\r
 \r
     // $ANTLR start "Symbol"\r
@@ -1285,27 +1452,32 @@ public class SilkSchemaLexer extends Lexer {
         try {\r
             int _type = Symbol;\r
             int _channel = DEFAULT_TOKEN_CHANNEL;\r
-            Token s=null;\r
+            Token s = null;\r
 \r
             // SilkSchema.g:160:7: ( ( ':' NonWhiteSpaceChar )=> ':' s= SymbolChars )\r
             // SilkSchema.g:160:9: ( ':' NonWhiteSpaceChar )=> ':' s= SymbolChars\r
             {\r
-            match(':'); if (state.failed) return ;\r
-            int sStart586 = getCharIndex();\r
-            mSymbolChars(); if (state.failed) return ;\r
-            s = new CommonToken(input, Token.INVALID_TOKEN_TYPE, Token.DEFAULT_CHANNEL, sStart586, getCharIndex()-1);\r
-            if ( state.backtracking==0 ) {\r
-               setText((s!=null?s.getText():null)); \r
-            }\r
+                match(':');\r
+                if (state.failed)\r
+                    return;\r
+                int sStart586 = getCharIndex();\r
+                mSymbolChars();\r
+                if (state.failed)\r
+                    return;\r
+                s = new CommonToken(input, Token.INVALID_TOKEN_TYPE, Token.DEFAULT_CHANNEL,\r
+                        sStart586, getCharIndex() - 1);\r
+                if (state.backtracking == 0) {\r
+                    setText((s != null ? s.getText() : null));\r
+                }\r
 \r
             }\r
 \r
             state.type = _type;\r
             state.channel = _channel;\r
         }\r
-        finally {\r
-        }\r
+        finally {}\r
     }\r
+\r
     // $ANTLR end "Symbol"\r
 \r
     // $ANTLR start "Class"\r
@@ -1316,17 +1488,18 @@ public class SilkSchemaLexer extends Lexer {
             // SilkSchema.g:162:6: ( 'class' )\r
             // SilkSchema.g:162:8: 'class'\r
             {\r
-            match("class"); if (state.failed) return ;\r
-\r
+                match("class");\r
+                if (state.failed)\r
+                    return;\r
 \r
             }\r
 \r
             state.type = _type;\r
             state.channel = _channel;\r
         }\r
-        finally {\r
-        }\r
+        finally {}\r
     }\r
+\r
     // $ANTLR end "Class"\r
 \r
     // $ANTLR start "Includes"\r
@@ -1337,17 +1510,18 @@ public class SilkSchemaLexer extends Lexer {
             // SilkSchema.g:163:9: ( 'includes' )\r
             // SilkSchema.g:163:11: 'includes'\r
             {\r
-            match("includes"); if (state.failed) return ;\r
-\r
+                match("includes");\r
+                if (state.failed)\r
+                    return;\r
 \r
             }\r
 \r
             state.type = _type;\r
             state.channel = _channel;\r
         }\r
-        finally {\r
-        }\r
+        finally {}\r
     }\r
+\r
     // $ANTLR end "Includes"\r
 \r
     // $ANTLR start "End"\r
@@ -1358,17 +1532,18 @@ public class SilkSchemaLexer extends Lexer {
             // SilkSchema.g:164:4: ( 'end' )\r
             // SilkSchema.g:164:6: 'end'\r
             {\r
-            match("end"); if (state.failed) return ;\r
-\r
+                match("end");\r
+                if (state.failed)\r
+                    return;\r
 \r
             }\r
 \r
             state.type = _type;\r
             state.channel = _channel;\r
         }\r
-        finally {\r
-        }\r
+        finally {}\r
     }\r
+\r
     // $ANTLR end "End"\r
 \r
     // $ANTLR start "Relation"\r
@@ -1379,17 +1554,18 @@ public class SilkSchemaLexer extends Lexer {
             // SilkSchema.g:165:9: ( 'relation' )\r
             // SilkSchema.g:165:11: 'relation'\r
             {\r
-            match("relation"); if (state.failed) return ;\r
-\r
+                match("relation");\r
+                if (state.failed)\r
+                    return;\r
 \r
             }\r
 \r
             state.type = _type;\r
             state.channel = _channel;\r
         }\r
-        finally {\r
-        }\r
+        finally {}\r
     }\r
+\r
     // $ANTLR end "Relation"\r
 \r
     // $ANTLR start "Index"\r
@@ -1400,17 +1576,18 @@ public class SilkSchemaLexer extends Lexer {
             // SilkSchema.g:166:6: ( 'index' )\r
             // SilkSchema.g:166:8: 'index'\r
             {\r
-            match("index"); if (state.failed) return ;\r
-\r
+                match("index");\r
+                if (state.failed)\r
+                    return;\r
 \r
             }\r
 \r
             state.type = _type;\r
             state.channel = _channel;\r
         }\r
-        finally {\r
-        }\r
+        finally {}\r
     }\r
+\r
     // $ANTLR end "Index"\r
 \r
     // $ANTLR start "BelongsTo"\r
@@ -1421,17 +1598,18 @@ public class SilkSchemaLexer extends Lexer {
             // SilkSchema.g:167:10: ( 'belongs_to' )\r
             // SilkSchema.g:167:12: 'belongs_to'\r
             {\r
-            match("belongs_to"); if (state.failed) return ;\r
-\r
+                match("belongs_to");\r
+                if (state.failed)\r
+                    return;\r
 \r
             }\r
 \r
             state.type = _type;\r
             state.channel = _channel;\r
         }\r
-        finally {\r
-        }\r
+        finally {}\r
     }\r
+\r
     // $ANTLR end "BelongsTo"\r
 \r
     // $ANTLR start "SafeFirstLetter"\r
@@ -1440,23 +1618,27 @@ public class SilkSchemaLexer extends Lexer {
             // SilkSchema.g:169:25: ( 'A' .. 'Z' | 'a' .. 'z' )\r
             // SilkSchema.g:\r
             {\r
-            if ( (input.LA(1)>='A' && input.LA(1)<='Z')||(input.LA(1)>='a' && input.LA(1)<='z') ) {\r
-                input.consume();\r
-            state.failed=false;\r
-            }\r
-            else {\r
-                if (state.backtracking>0) {state.failed=true; return ;}\r
-                MismatchedSetException mse = new MismatchedSetException(null,input);\r
-                recover(mse);\r
-                throw mse;}\r
-\r
+                if ((input.LA(1) >= 'A' && input.LA(1) <= 'Z')\r
+                        || (input.LA(1) >= 'a' && input.LA(1) <= 'z')) {\r
+                    input.consume();\r
+                    state.failed = false;\r
+                }\r
+                else {\r
+                    if (state.backtracking > 0) {\r
+                        state.failed = true;\r
+                        return;\r
+                    }\r
+                    MismatchedSetException mse = new MismatchedSetException(null, input);\r
+                    recover(mse);\r
+                    throw mse;\r
+                }\r
 \r
             }\r
 \r
         }\r
-        finally {\r
-        }\r
+        finally {}\r
     }\r
+\r
     // $ANTLR end "SafeFirstLetter"\r
 \r
     // $ANTLR start "SafeLetter"\r
@@ -1465,23 +1647,28 @@ public class SilkSchemaLexer extends Lexer {
             // SilkSchema.g:170:20: ( SafeFirstLetter | '0' .. '9' | '-' | '_' )\r
             // SilkSchema.g:\r
             {\r
-            if ( input.LA(1)=='-'||(input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {\r
-                input.consume();\r
-            state.failed=false;\r
-            }\r
-            else {\r
-                if (state.backtracking>0) {state.failed=true; return ;}\r
-                MismatchedSetException mse = new MismatchedSetException(null,input);\r
-                recover(mse);\r
-                throw mse;}\r
-\r
+                if (input.LA(1) == '-' || (input.LA(1) >= '0' && input.LA(1) <= '9')\r
+                        || (input.LA(1) >= 'A' && input.LA(1) <= 'Z') || input.LA(1) == '_'\r
+                        || (input.LA(1) >= 'a' && input.LA(1) <= 'z')) {\r
+                    input.consume();\r
+                    state.failed = false;\r
+                }\r
+                else {\r
+                    if (state.backtracking > 0) {\r
+                        state.failed = true;\r
+                        return;\r
+                    }\r
+                    MismatchedSetException mse = new MismatchedSetException(null, input);\r
+                    recover(mse);\r
+                    throw mse;\r
+                }\r
 \r
             }\r
 \r
         }\r
-        finally {\r
-        }\r
+        finally {}\r
     }\r
+\r
     // $ANTLR end "SafeLetter"\r
 \r
     // $ANTLR start "ModuleName"\r
@@ -1490,90 +1677,97 @@ public class SilkSchemaLexer extends Lexer {
             // SilkSchema.g:172:20: ( SafeFirstLetter ( SafeLetter )* ( '.' SafeFirstLetter ( SafeLetter )* )* )\r
             // SilkSchema.g:172:22: SafeFirstLetter ( SafeLetter )* ( '.' SafeFirstLetter ( SafeLetter )* )*\r
             {\r
-            mSafeFirstLetter(); if (state.failed) return ;\r
-            // SilkSchema.g:172:38: ( SafeLetter )*\r
-            loop16:\r
-            do {\r
-                int alt16=2;\r
-                int LA16_0 = input.LA(1);\r
-\r
-                if ( (LA16_0=='-'||(LA16_0>='0' && LA16_0<='9')||(LA16_0>='A' && LA16_0<='Z')||LA16_0=='_'||(LA16_0>='a' && LA16_0<='z')) ) {\r
-                    alt16=1;\r
-                }\r
-\r
-\r
-                switch (alt16) {\r
-               case 1 :\r
-                   // SilkSchema.g:172:38: SafeLetter\r
-                   {\r
-                   mSafeLetter(); if (state.failed) return ;\r
-\r
-                   }\r
-                   break;\r
+                mSafeFirstLetter();\r
+                if (state.failed)\r
+                    return;\r
+                // SilkSchema.g:172:38: ( SafeLetter )*\r
+                loop16: do {\r
+                    int alt16 = 2;\r
+                    int LA16_0 = input.LA(1);\r
+\r
+                    if ((LA16_0 == '-' || (LA16_0 >= '0' && LA16_0 <= '9')\r
+                            || (LA16_0 >= 'A' && LA16_0 <= 'Z') || LA16_0 == '_' || (LA16_0 >= 'a' && LA16_0 <= 'z'))) {\r
+                        alt16 = 1;\r
+                    }\r
 \r
-               default :\r
-                   break loop16;\r
-                }\r
-            } while (true);\r
+                    switch (alt16) {\r
+                    case 1:\r
+                        // SilkSchema.g:172:38: SafeLetter\r
+                    {\r
+                        mSafeLetter();\r
+                        if (state.failed)\r
+                            return;\r
 \r
-            // SilkSchema.g:172:50: ( '.' SafeFirstLetter ( SafeLetter )* )*\r
-            loop18:\r
-            do {\r
-                int alt18=2;\r
-                int LA18_0 = input.LA(1);\r
+                    }\r
+                        break;\r
 \r
-                if ( (LA18_0=='.') ) {\r
-                    alt18=1;\r
+                    default:\r
+                        break loop16;\r
+                    }\r
                 }\r
+                while (true);\r
 \r
+                // SilkSchema.g:172:50: ( '.' SafeFirstLetter ( SafeLetter )* )*\r
+                loop18: do {\r
+                    int alt18 = 2;\r
+                    int LA18_0 = input.LA(1);\r
 \r
-                switch (alt18) {\r
-               case 1 :\r
-                   // SilkSchema.g:172:51: '.' SafeFirstLetter ( SafeLetter )*\r
-                   {\r
-                   match('.'); if (state.failed) return ;\r
-                   mSafeFirstLetter(); if (state.failed) return ;\r
-                   // SilkSchema.g:172:71: ( SafeLetter )*\r
-                   loop17:\r
-                   do {\r
-                       int alt17=2;\r
-                       int LA17_0 = input.LA(1);\r
-\r
-                       if ( (LA17_0=='-'||(LA17_0>='0' && LA17_0<='9')||(LA17_0>='A' && LA17_0<='Z')||LA17_0=='_'||(LA17_0>='a' && LA17_0<='z')) ) {\r
-                           alt17=1;\r
-                       }\r
-\r
+                    if ((LA18_0 == '.')) {\r
+                        alt18 = 1;\r
+                    }\r
 \r
-                       switch (alt17) {\r
-                       case 1 :\r
-                           // SilkSchema.g:172:71: SafeLetter\r
-                           {\r
-                           mSafeLetter(); if (state.failed) return ;\r
+                    switch (alt18) {\r
+                    case 1:\r
+                        // SilkSchema.g:172:51: '.' SafeFirstLetter ( SafeLetter )*\r
+                    {\r
+                        match('.');\r
+                        if (state.failed)\r
+                            return;\r
+                        mSafeFirstLetter();\r
+                        if (state.failed)\r
+                            return;\r
+                        // SilkSchema.g:172:71: ( SafeLetter )*\r
+                        loop17: do {\r
+                            int alt17 = 2;\r
+                            int LA17_0 = input.LA(1);\r
+\r
+                            if ((LA17_0 == '-' || (LA17_0 >= '0' && LA17_0 <= '9')\r
+                                    || (LA17_0 >= 'A' && LA17_0 <= 'Z') || LA17_0 == '_' || (LA17_0 >= 'a' && LA17_0 <= 'z'))) {\r
+                                alt17 = 1;\r
+                            }\r
 \r
-                           }\r
-                           break;\r
+                            switch (alt17) {\r
+                            case 1:\r
+                                // SilkSchema.g:172:71: SafeLetter\r
+                            {\r
+                                mSafeLetter();\r
+                                if (state.failed)\r
+                                    return;\r
 \r
-                       default :\r
-                           break loop17;\r
-                       }\r
-                   } while (true);\r
+                            }\r
+                                break;\r
 \r
+                            default:\r
+                                break loop17;\r
+                            }\r
+                        }\r
+                        while (true);\r
 \r
-                   }\r
-                   break;\r
+                    }\r
+                        break;\r
 \r
-               default :\r
-                   break loop18;\r
+                    default:\r
+                        break loop18;\r
+                    }\r
                 }\r
-            } while (true);\r
-\r
+                while (true);\r
 \r
             }\r
 \r
         }\r
-        finally {\r
-        }\r
+        finally {}\r
     }\r
+\r
     // $ANTLR end "ModuleName"\r
 \r
     // $ANTLR start "ModuleDef"\r
@@ -1581,29 +1775,36 @@ public class SilkSchemaLexer extends Lexer {
         try {\r
             int _type = ModuleDef;\r
             int _channel = DEFAULT_TOKEN_CHANNEL;\r
-            Token s=null;\r
+            Token s = null;\r
 \r
             // SilkSchema.g:173:10: ( 'module' WhiteSpaces s= ModuleName )\r
             // SilkSchema.g:173:12: 'module' WhiteSpaces s= ModuleName\r
             {\r
-            match("module"); if (state.failed) return ;\r
-\r
-            mWhiteSpaces(); if (state.failed) return ;\r
-            int sStart715 = getCharIndex();\r
-            mModuleName(); if (state.failed) return ;\r
-            s = new CommonToken(input, Token.INVALID_TOKEN_TYPE, Token.DEFAULT_CHANNEL, sStart715, getCharIndex()-1);\r
-            if ( state.backtracking==0 ) {\r
-               setText((s!=null?s.getText():null)); \r
-            }\r
+                match("module");\r
+                if (state.failed)\r
+                    return;\r
+\r
+                mWhiteSpaces();\r
+                if (state.failed)\r
+                    return;\r
+                int sStart715 = getCharIndex();\r
+                mModuleName();\r
+                if (state.failed)\r
+                    return;\r
+                s = new CommonToken(input, Token.INVALID_TOKEN_TYPE, Token.DEFAULT_CHANNEL,\r
+                        sStart715, getCharIndex() - 1);\r
+                if (state.backtracking == 0) {\r
+                    setText((s != null ? s.getText() : null));\r
+                }\r
 \r
             }\r
 \r
             state.type = _type;\r
             state.channel = _channel;\r
         }\r
-        finally {\r
-        }\r
+        finally {}\r
     }\r
+\r
     // $ANTLR end "ModuleDef"\r
 \r
     // $ANTLR start "QNameChar"\r
@@ -1612,23 +1813,34 @@ public class SilkSchemaLexer extends Lexer {
             // SilkSchema.g:175:19: (~ ( LineBreakChar | UnsafeUnicodeChar | WhiteSpace ) )\r
             // SilkSchema.g:175:21: ~ ( LineBreakChar | UnsafeUnicodeChar | WhiteSpace )\r
             {\r
-            if ( (input.LA(1)>='\u0000' && input.LA(1)<='\b')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\u001F')||input.LA(1)=='!'||input.LA(1)=='$'||input.LA(1)=='&'||input.LA(1)=='+'||(input.LA(1)>='/' && input.LA(1)<='9')||input.LA(1)==';'||input.LA(1)=='='||input.LA(1)=='?'||(input.LA(1)>='A' && input.LA(1)<='Z')||(input.LA(1)>='^' && input.LA(1)<='z')||(input.LA(1)>='~' && input.LA(1)<='\uFFFF') ) {\r
-                input.consume();\r
-            state.failed=false;\r
-            }\r
-            else {\r
-                if (state.backtracking>0) {state.failed=true; return ;}\r
-                MismatchedSetException mse = new MismatchedSetException(null,input);\r
-                recover(mse);\r
-                throw mse;}\r
-\r
+                if ((input.LA(1) >= '\u0000' && input.LA(1) <= '\b')\r
+                        || (input.LA(1) >= '\u000B' && input.LA(1) <= '\f')\r
+                        || (input.LA(1) >= '\u000E' && input.LA(1) <= '\u001F')\r
+                        || input.LA(1) == '!' || input.LA(1) == '$' || input.LA(1) == '&'\r
+                        || input.LA(1) == '+' || (input.LA(1) >= '/' && input.LA(1) <= '9')\r
+                        || input.LA(1) == ';' || input.LA(1) == '=' || input.LA(1) == '?'\r
+                        || (input.LA(1) >= 'A' && input.LA(1) <= 'Z')\r
+                        || (input.LA(1) >= '^' && input.LA(1) <= 'z')\r
+                        || (input.LA(1) >= '~' && input.LA(1) <= '\uFFFF')) {\r
+                    input.consume();\r
+                    state.failed = false;\r
+                }\r
+                else {\r
+                    if (state.backtracking > 0) {\r
+                        state.failed = true;\r
+                        return;\r
+                    }\r
+                    MismatchedSetException mse = new MismatchedSetException(null, input);\r
+                    recover(mse);\r
+                    throw mse;\r
+                }\r
 \r
             }\r
 \r
         }\r
-        finally {\r
-        }\r
+        finally {}\r
     }\r
+\r
     // $ANTLR end "QNameChar"\r
 \r
     // $ANTLR start "QName"\r
@@ -1639,102 +1851,122 @@ public class SilkSchemaLexer extends Lexer {
             // SilkSchema.g:176:6: ( ( QNameChar )+ ( Dot ( QNameChar )+ )* )\r
             // SilkSchema.g:176:8: ( QNameChar )+ ( Dot ( QNameChar )+ )*\r
             {\r
-            // SilkSchema.g:176:8: ( QNameChar )+\r
-            int cnt19=0;\r
-            loop19:\r
-            do {\r
-                int alt19=2;\r
-                int LA19_0 = input.LA(1);\r
-\r
-                if ( ((LA19_0>='\u0000' && LA19_0<='\b')||(LA19_0>='\u000B' && LA19_0<='\f')||(LA19_0>='\u000E' && LA19_0<='\u001F')||LA19_0=='!'||LA19_0=='$'||LA19_0=='&'||LA19_0=='+'||(LA19_0>='/' && LA19_0<='9')||LA19_0==';'||LA19_0=='='||LA19_0=='?'||(LA19_0>='A' && LA19_0<='Z')||(LA19_0>='^' && LA19_0<='z')||(LA19_0>='~' && LA19_0<='\uFFFF')) ) {\r
-                    alt19=1;\r
-                }\r
-\r
+                // SilkSchema.g:176:8: ( QNameChar )+\r
+                int cnt19 = 0;\r
+                loop19: do {\r
+                    int alt19 = 2;\r
+                    int LA19_0 = input.LA(1);\r
+\r
+                    if (((LA19_0 >= '\u0000' && LA19_0 <= '\b')\r
+                            || (LA19_0 >= '\u000B' && LA19_0 <= '\f')\r
+                            || (LA19_0 >= '\u000E' && LA19_0 <= '\u001F') || LA19_0 == '!'\r
+                            || LA19_0 == '$' || LA19_0 == '&' || LA19_0 == '+'\r
+                            || (LA19_0 >= '/' && LA19_0 <= '9') || LA19_0 == ';' || LA19_0 == '='\r
+                            || LA19_0 == '?' || (LA19_0 >= 'A' && LA19_0 <= 'Z')\r
+                            || (LA19_0 >= '^' && LA19_0 <= 'z') || (LA19_0 >= '~' && LA19_0 <= '\uFFFF'))) {\r
+                        alt19 = 1;\r
+                    }\r
 \r
-                switch (alt19) {\r
-               case 1 :\r
-                   // SilkSchema.g:176:8: QNameChar\r
-                   {\r
-                   mQNameChar(); if (state.failed) return ;\r
+                    switch (alt19) {\r
+                    case 1:\r
+                        // SilkSchema.g:176:8: QNameChar\r
+                    {\r
+                        mQNameChar();\r
+                        if (state.failed)\r
+                            return;\r
 \r
-                   }\r
-                   break;\r
+                    }\r
+                        break;\r
 \r
-               default :\r
-                   if ( cnt19 >= 1 ) break loop19;\r
-                   if (state.backtracking>0) {state.failed=true; return ;}\r
-                        EarlyExitException eee =\r
-                            new EarlyExitException(19, input);\r
+                    default:\r
+                        if (cnt19 >= 1)\r
+                            break loop19;\r
+                        if (state.backtracking > 0) {\r
+                            state.failed = true;\r
+                            return;\r
+                        }\r
+                        EarlyExitException eee = new EarlyExitException(19, input);\r
                         throw eee;\r
+                    }\r
+                    cnt19++;\r
                 }\r
-                cnt19++;\r
-            } while (true);\r
-\r
-            // SilkSchema.g:176:19: ( Dot ( QNameChar )+ )*\r
-            loop21:\r
-            do {\r
-                int alt21=2;\r
-                int LA21_0 = input.LA(1);\r
-\r
-                if ( (LA21_0=='.') ) {\r
-                    alt21=1;\r
-                }\r
+                while (true);\r
 \r
+                // SilkSchema.g:176:19: ( Dot ( QNameChar )+ )*\r
+                loop21: do {\r
+                    int alt21 = 2;\r
+                    int LA21_0 = input.LA(1);\r
 \r
-                switch (alt21) {\r
-               case 1 :\r
-                   // SilkSchema.g:176:20: Dot ( QNameChar )+\r
-                   {\r
-                   mDot(); if (state.failed) return ;\r
-                   // SilkSchema.g:176:24: ( QNameChar )+\r
-                   int cnt20=0;\r
-                   loop20:\r
-                   do {\r
-                       int alt20=2;\r
-                       int LA20_0 = input.LA(1);\r
-\r
-                       if ( ((LA20_0>='\u0000' && LA20_0<='\b')||(LA20_0>='\u000B' && LA20_0<='\f')||(LA20_0>='\u000E' && LA20_0<='\u001F')||LA20_0=='!'||LA20_0=='$'||LA20_0=='&'||LA20_0=='+'||(LA20_0>='/' && LA20_0<='9')||LA20_0==';'||LA20_0=='='||LA20_0=='?'||(LA20_0>='A' && LA20_0<='Z')||(LA20_0>='^' && LA20_0<='z')||(LA20_0>='~' && LA20_0<='\uFFFF')) ) {\r
-                           alt20=1;\r
-                       }\r
-\r
-\r
-                       switch (alt20) {\r
-                       case 1 :\r
-                           // SilkSchema.g:176:24: QNameChar\r
-                           {\r
-                           mQNameChar(); if (state.failed) return ;\r
+                    if ((LA21_0 == '.')) {\r
+                        alt21 = 1;\r
+                    }\r
 \r
-                           }\r
-                           break;\r
+                    switch (alt21) {\r
+                    case 1:\r
+                        // SilkSchema.g:176:20: Dot ( QNameChar )+\r
+                    {\r
+                        mDot();\r
+                        if (state.failed)\r
+                            return;\r
+                        // SilkSchema.g:176:24: ( QNameChar )+\r
+                        int cnt20 = 0;\r
+                        loop20: do {\r
+                            int alt20 = 2;\r
+                            int LA20_0 = input.LA(1);\r
+\r
+                            if (((LA20_0 >= '\u0000' && LA20_0 <= '\b')\r
+                                    || (LA20_0 >= '\u000B' && LA20_0 <= '\f')\r
+                                    || (LA20_0 >= '\u000E' && LA20_0 <= '\u001F') || LA20_0 == '!'\r
+                                    || LA20_0 == '$' || LA20_0 == '&' || LA20_0 == '+'\r
+                                    || (LA20_0 >= '/' && LA20_0 <= '9') || LA20_0 == ';'\r
+                                    || LA20_0 == '=' || LA20_0 == '?'\r
+                                    || (LA20_0 >= 'A' && LA20_0 <= 'Z')\r
+                                    || (LA20_0 >= '^' && LA20_0 <= 'z') || (LA20_0 >= '~' && LA20_0 <= '\uFFFF'))) {\r
+                                alt20 = 1;\r
+                            }\r
 \r
-                       default :\r
-                           if ( cnt20 >= 1 ) break loop20;\r
-                           if (state.backtracking>0) {state.failed=true; return ;}\r
-                               EarlyExitException eee =\r
-                                   new EarlyExitException(20, input);\r
-                               throw eee;\r
-                       }\r
-                       cnt20++;\r
-                   } while (true);\r
+                            switch (alt20) {\r
+                            case 1:\r
+                                // SilkSchema.g:176:24: QNameChar\r
+                            {\r
+                                mQNameChar();\r
+                                if (state.failed)\r
+                                    return;\r
 \r
+                            }\r
+                                break;\r
+\r
+                            default:\r
+                                if (cnt20 >= 1)\r
+                                    break loop20;\r
+                                if (state.backtracking > 0) {\r
+                                    state.failed = true;\r
+                                    return;\r
+                                }\r
+                                EarlyExitException eee = new EarlyExitException(20, input);\r
+                                throw eee;\r
+                            }\r
+                            cnt20++;\r
+                        }\r
+                        while (true);\r
 \r
-                   }\r
-                   break;\r
+                    }\r
+                        break;\r
 \r
-               default :\r
-                   break loop21;\r
+                    default:\r
+                        break loop21;\r
+                    }\r
                 }\r
-            } while (true);\r
-\r
+                while (true);\r
 \r
             }\r
 \r
             state.type = _type;\r
             state.channel = _channel;\r
         }\r
-        finally {\r
-        }\r
+        finally {}\r
     }\r
+\r
     // $ANTLR end "QName"\r
 \r
     // $ANTLR start "WhiteSpace"\r
@@ -1743,23 +1975,26 @@ public class SilkSchemaLexer extends Lexer {
             // SilkSchema.g:179:11: ( ' ' | '\\t' )\r
             // SilkSchema.g:\r
             {\r
-            if ( input.LA(1)=='\t'||input.LA(1)==' ' ) {\r
-                input.consume();\r
-            state.failed=false;\r
-            }\r
-            else {\r
-                if (state.backtracking>0) {state.failed=true; return ;}\r
-                MismatchedSetException mse = new MismatchedSetException(null,input);\r
-                recover(mse);\r
-                throw mse;}\r
-\r
+                if (input.LA(1) == '\t' || input.LA(1) == ' ') {\r
+                    input.consume();\r
+                    state.failed = false;\r
+                }\r
+                else {\r
+                    if (state.backtracking > 0) {\r
+                        state.failed = true;\r
+                        return;\r
+                    }\r
+                    MismatchedSetException mse = new MismatchedSetException(null, input);\r
+                    recover(mse);\r
+                    throw mse;\r
+                }\r
 \r
             }\r
 \r
         }\r
-        finally {\r
-        }\r
+        finally {}\r
     }\r
+\r
     // $ANTLR end "WhiteSpace"\r
 \r
     // $ANTLR start "WhiteSpaces"\r
@@ -1770,311 +2005,361 @@ public class SilkSchemaLexer extends Lexer {
             // SilkSchema.g:181:12: ( ( WhiteSpace )+ )\r
             // SilkSchema.g:181:14: ( WhiteSpace )+\r
             {\r
-            // SilkSchema.g:181:14: ( WhiteSpace )+\r
-            int cnt22=0;\r
-            loop22:\r
-            do {\r
-                int alt22=2;\r
-                int LA22_0 = input.LA(1);\r
-\r
-                if ( (LA22_0=='\t'||LA22_0==' ') ) {\r
-                    alt22=1;\r
-                }\r
-\r
+                // SilkSchema.g:181:14: ( WhiteSpace )+\r
+                int cnt22 = 0;\r
+                loop22: do {\r
+                    int alt22 = 2;\r
+                    int LA22_0 = input.LA(1);\r
+\r
+                    if ((LA22_0 == '\t' || LA22_0 == ' ')) {\r
+                        alt22 = 1;\r
+                    }\r
 \r
-                switch (alt22) {\r
-               case 1 :\r
-                   // SilkSchema.g:181:14: WhiteSpace\r
-                   {\r
-                   mWhiteSpace(); if (state.failed) return ;\r
+                    switch (alt22) {\r
+                    case 1:\r
+                        // SilkSchema.g:181:14: WhiteSpace\r
+                    {\r
+                        mWhiteSpace();\r
+                        if (state.failed)\r
+                            return;\r
 \r
-                   }\r
-                   break;\r
+                    }\r
+                        break;\r
 \r
-               default :\r
-                   if ( cnt22 >= 1 ) break loop22;\r
-                   if (state.backtracking>0) {state.failed=true; return ;}\r
-                        EarlyExitException eee =\r
-                            new EarlyExitException(22, input);\r
+                    default:\r
+                        if (cnt22 >= 1)\r
+                            break loop22;\r
+                        if (state.backtracking > 0) {\r
+                            state.failed = true;\r
+                            return;\r
+                        }\r
+                        EarlyExitException eee = new EarlyExitException(22, input);\r
                         throw eee;\r
+                    }\r
+                    cnt22++;\r
                 }\r
-                cnt22++;\r
-            } while (true);\r
+                while (true);\r
 \r
-            if ( state.backtracking==0 ) {\r
-               _channel = HIDDEN; \r
-            }\r
+                if (state.backtracking == 0) {\r
+                    _channel = HIDDEN;\r
+                }\r
 \r
             }\r
 \r
             state.type = _type;\r
             state.channel = _channel;\r
         }\r
-        finally {\r
-        }\r
+        finally {}\r
     }\r
+\r
     // $ANTLR end "WhiteSpaces"\r
 \r
     public void mTokens() throws RecognitionException {\r
         // SilkSchema.g:1:8: ( Preamble | LineComment | LineBreak | String | Integer | Double | LBrace | RBrace | LBracket | RBracket | Lt | Eq | Dot | Comma | LParen | RParen | Star | Symbol | Class | Includes | End | Relation | Index | BelongsTo | ModuleDef | QName | WhiteSpaces )\r
-        int alt23=27;\r
+        int alt23 = 27;\r
         alt23 = dfa23.predict(input);\r
         switch (alt23) {\r
-            case 1 :\r
-                // SilkSchema.g:1:10: Preamble\r
-                {\r
-                mPreamble(); if (state.failed) return ;\r
-\r
-                }\r
-                break;\r
-            case 2 :\r
-                // SilkSchema.g:1:19: LineComment\r
-                {\r
-                mLineComment(); if (state.failed) return ;\r
-\r
-                }\r
-                break;\r
-            case 3 :\r
-                // SilkSchema.g:1:31: LineBreak\r
-                {\r
-                mLineBreak(); if (state.failed) return ;\r
-\r
-                }\r
-                break;\r
-            case 4 :\r
-                // SilkSchema.g:1:41: String\r
-                {\r
-                mString(); if (state.failed) return ;\r
-\r
-                }\r
-                break;\r
-            case 5 :\r
-                // SilkSchema.g:1:48: Integer\r
-                {\r
-                mInteger(); if (state.failed) return ;\r
-\r
-                }\r
-                break;\r
-            case 6 :\r
-                // SilkSchema.g:1:56: Double\r
-                {\r
-                mDouble(); if (state.failed) return ;\r
-\r
-                }\r
-                break;\r
-            case 7 :\r
-                // SilkSchema.g:1:63: LBrace\r
-                {\r
-                mLBrace(); if (state.failed) return ;\r
-\r
-                }\r
-                break;\r
-            case 8 :\r
-                // SilkSchema.g:1:70: RBrace\r
-                {\r
-                mRBrace(); if (state.failed) return ;\r
-\r
-                }\r
-                break;\r
-            case 9 :\r
-                // SilkSchema.g:1:77: LBracket\r
-                {\r
-                mLBracket(); if (state.failed) return ;\r
-\r
-                }\r
-                break;\r
-            case 10 :\r
-                // SilkSchema.g:1:86: RBracket\r
-                {\r
-                mRBracket(); if (state.failed) return ;\r
-\r
-                }\r
-                break;\r
-            case 11 :\r
-                // SilkSchema.g:1:95: Lt\r
-                {\r
-                mLt(); if (state.failed) return ;\r
-\r
-                }\r
-                break;\r
-            case 12 :\r
-                // SilkSchema.g:1:98: Eq\r
-                {\r
-                mEq(); if (state.failed) return ;\r
-\r
-                }\r
-                break;\r
-            case 13 :\r
-                // SilkSchema.g:1:101: Dot\r
-                {\r
-                mDot(); if (state.failed) return ;\r
-\r
-                }\r
-                break;\r
-            case 14 :\r
-                // SilkSchema.g:1:105: Comma\r
-                {\r
-                mComma(); if (state.failed) return ;\r
-\r
-                }\r
-                break;\r
-            case 15 :\r
-                // SilkSchema.g:1:111: LParen\r
-                {\r
-                mLParen(); if (state.failed) return ;\r
-\r
-                }\r
-                break;\r
-            case 16 :\r
-                // SilkSchema.g:1:118: RParen\r
-                {\r
-                mRParen(); if (state.failed) return ;\r
-\r
-                }\r
-                break;\r
-            case 17 :\r
-                // SilkSchema.g:1:125: Star\r
-                {\r
-                mStar(); if (state.failed) return ;\r
-\r
-                }\r
-                break;\r
-            case 18 :\r
-                // SilkSchema.g:1:130: Symbol\r
-                {\r
-                mSymbol(); if (state.failed) return ;\r
-\r
-                }\r
-                break;\r
-            case 19 :\r
-                // SilkSchema.g:1:137: Class\r
-                {\r
-                mClass(); if (state.failed) return ;\r
-\r
-                }\r
-                break;\r
-            case 20 :\r
-                // SilkSchema.g:1:143: Includes\r
-                {\r
-                mIncludes(); if (state.failed) return ;\r
-\r
-                }\r
-                break;\r
-            case 21 :\r
-                // SilkSchema.g:1:152: End\r
-                {\r
-                mEnd(); if (state.failed) return ;\r
-\r
-                }\r
-                break;\r
-            case 22 :\r
-                // SilkSchema.g:1:156: Relation\r
-                {\r
-                mRelation(); if (state.failed) return ;\r
+        case 1:\r
+            // SilkSchema.g:1:10: Preamble\r
+        {\r
+            mPreamble();\r
+            if (state.failed)\r
+                return;\r
+\r
+        }\r
+            break;\r
+        case 2:\r
+            // SilkSchema.g:1:19: LineComment\r
+        {\r
+            mLineComment();\r
+            if (state.failed)\r
+                return;\r
+\r
+        }\r
+            break;\r
+        case 3:\r
+            // SilkSchema.g:1:31: LineBreak\r
+        {\r
+            mLineBreak();\r
+            if (state.failed)\r
+                return;\r
+\r
+        }\r
+            break;\r
+        case 4:\r
+            // SilkSchema.g:1:41: String\r
+        {\r
+            mString();\r
+            if (state.failed)\r
+                return;\r
+\r
+        }\r
+            break;\r
+        case 5:\r
+            // SilkSchema.g:1:48: Integer\r
+        {\r
+            mInteger();\r
+            if (state.failed)\r
+                return;\r
+\r
+        }\r
+            break;\r
+        case 6:\r
+            // SilkSchema.g:1:56: Double\r
+        {\r
+            mDouble();\r
+            if (state.failed)\r
+                return;\r
+\r
+        }\r
+            break;\r
+        case 7:\r
+            // SilkSchema.g:1:63: LBrace\r
+        {\r
+            mLBrace();\r
+            if (state.failed)\r
+                return;\r
+\r
+        }\r
+            break;\r
+        case 8:\r
+            // SilkSchema.g:1:70: RBrace\r
+        {\r
+            mRBrace();\r
+            if (state.failed)\r
+                return;\r
+\r
+        }\r
+            break;\r
+        case 9:\r
+            // SilkSchema.g:1:77: LBracket\r
+        {\r
+            mLBracket();\r
+            if (state.failed)\r
+                return;\r
+\r
+        }\r
+            break;\r
+        case 10:\r
+            // SilkSchema.g:1:86: RBracket\r
+        {\r
+            mRBracket();\r
+            if (state.failed)\r
+                return;\r
+\r
+        }\r
+            break;\r
+        case 11:\r
+            // SilkSchema.g:1:95: Lt\r
+        {\r
+            mLt();\r
+            if (state.failed)\r
+                return;\r
+\r
+        }\r
+            break;\r
+        case 12:\r
+            // SilkSchema.g:1:98: Eq\r
+        {\r
+            mEq();\r
+            if (state.failed)\r
+                return;\r
+\r
+        }\r
+            break;\r
+        case 13:\r
+            // SilkSchema.g:1:101: Dot\r
+        {\r
+            mDot();\r
+            if (state.failed)\r
+                return;\r
+\r
+        }\r
+            break;\r
+        case 14:\r
+            // SilkSchema.g:1:105: Comma\r
+        {\r
+            mComma();\r
+            if (state.failed)\r
+                return;\r
+\r
+        }\r
+            break;\r
+        case 15:\r
+            // SilkSchema.g:1:111: LParen\r
+        {\r
+            mLParen();\r
+            if (state.failed)\r
+                return;\r
+\r
+        }\r
+            break;\r
+        case 16:\r
+            // SilkSchema.g:1:118: RParen\r
+        {\r
+            mRParen();\r
+            if (state.failed)\r
+                return;\r
+\r
+        }\r
+            break;\r
+        case 17:\r
+            // SilkSchema.g:1:125: Star\r
+        {\r
+            mStar();\r
+            if (state.failed)\r
+                return;\r
+\r
+        }\r
+            break;\r
+        case 18:\r
+            // SilkSchema.g:1:130: Symbol\r
+        {\r
+            mSymbol();\r
+            if (state.failed)\r
+                return;\r
+\r
+        }\r
+            break;\r
+        case 19:\r
+            // SilkSchema.g:1:137: Class\r
+        {\r
+            mClass();\r
+            if (state.failed)\r
+                return;\r
+\r
+        }\r
+            break;\r
+        case 20:\r
+            // SilkSchema.g:1:143: Includes\r
+        {\r
+            mIncludes();\r
+            if (state.failed)\r
+                return;\r
+\r
+        }\r
+            break;\r
+        case 21:\r
+            // SilkSchema.g:1:152: End\r
+        {\r
+            mEnd();\r
+            if (state.failed)\r
+                return;\r
+\r
+        }\r
+            break;\r
+        case 22:\r
+            // SilkSchema.g:1:156: Relation\r
+        {\r
+            mRelation();\r
+            if (state.failed)\r
+                return;\r
 \r
-                }\r
-                break;\r
-            case 23 :\r
-                // SilkSchema.g:1:165: Index\r
-                {\r
-                mIndex(); if (state.failed) return ;\r
+        }\r
+            break;\r
+        case 23:\r
+            // SilkSchema.g:1:165: Index\r
+        {\r
+            mIndex();\r
+            if (state.failed)\r
+                return;\r
 \r
-                }\r
-                break;\r
-            case 24 :\r
-                // SilkSchema.g:1:171: BelongsTo\r
-                {\r
-                mBelongsTo(); if (state.failed) return ;\r
+        }\r
+            break;\r
+        case 24:\r
+            // SilkSchema.g:1:171: BelongsTo\r
+        {\r
+            mBelongsTo();\r
+            if (state.failed)\r
+                return;\r
 \r
-                }\r
-                break;\r
-            case 25 :\r
-                // SilkSchema.g:1:181: ModuleDef\r
-                {\r
-                mModuleDef(); if (state.failed) return ;\r
+        }\r
+            break;\r
+        case 25:\r
+            // SilkSchema.g:1:181: ModuleDef\r
+        {\r
+            mModuleDef();\r
+            if (state.failed)\r
+                return;\r
 \r
-                }\r
-                break;\r
-            case 26 :\r
-                // SilkSchema.g:1:191: QName\r
-                {\r
-                mQName(); if (state.failed) return ;\r
+        }\r
+            break;\r
+        case 26:\r
+            // SilkSchema.g:1:191: QName\r
+        {\r
+            mQName();\r
+            if (state.failed)\r
+                return;\r
 \r
-                }\r
-                break;\r
-            case 27 :\r
-                // SilkSchema.g:1:197: WhiteSpaces\r
-                {\r
-                mWhiteSpaces(); if (state.failed) return ;\r
+        }\r
+            break;\r
+        case 27:\r
+            // SilkSchema.g:1:197: WhiteSpaces\r
+        {\r
+            mWhiteSpaces();\r
+            if (state.failed)\r
+                return;\r
 \r
-                }\r
-                break;\r
+        }\r
+            break;\r
 \r
         }\r
 \r
     }\r
 \r
-\r
     protected DFA23 dfa23 = new DFA23(this);\r
-    static final String DFA23_eotS =\r
-        "\6\uffff\2\36\5\uffff\1\42\6\uffff\6\32\2\uffff\2\36\2\uffff\1"+\r
-        "\32\1\36\1\uffff\6\32\1\uffff\1\36\1\51\1\32\1\51\3\32\1\71\7\32"+\r
-        "\1\uffff\4\32\1\51\1\105\1\32\1\107\3\32\1\uffff\1\32\1\uffff\6"+\r
-        "\32\1\uffff\1\122\1\123\1\32\2\uffff\1\32\1\126\1\uffff";\r
-    static final String DFA23_eofS =\r
-        "\127\uffff";\r
-    static final String DFA23_minS =\r
-        "\1\0\4\uffff\1\60\2\0\5\uffff\1\0\6\uffff\1\154\2\156\2\145\1\157"+\r
-        "\2\uffff\2\56\1\uffff\1\0\1\53\1\0\1\uffff\1\141\1\143\1\144\2\154"+\r
-        "\1\144\1\uffff\1\56\1\0\1\60\1\0\1\163\1\154\1\145\1\0\1\141\1\157"+\r
-        "\1\165\1\53\1\163\1\165\1\170\1\uffff\1\164\1\156\1\154\1\60\2\0"+\r
-        "\1\144\1\0\1\151\1\147\1\145\1\uffff\1\145\1\uffff\1\157\1\163\1"+\r
-        "\11\1\163\1\156\1\137\1\uffff\2\0\1\164\2\uffff\1\157\1\0\1\uffff";\r
-    static final String DFA23_maxS =\r
-        "\1\uffff\4\uffff\1\71\2\uffff\5\uffff\1\uffff\6\uffff\1\154\2\156"+\r
-        "\2\145\1\157\2\uffff\2\145\1\uffff\1\uffff\1\71\1\uffff\1\uffff"+\r
-        "\1\141\2\144\2\154\1\144\1\uffff\1\145\1\uffff\1\71\1\uffff\1\163"+\r
-        "\1\154\1\145\1\uffff\1\141\1\157\1\165\1\71\1\163\1\165\1\170\1"+\r
-        "\uffff\1\164\1\156\1\154\1\71\2\uffff\1\144\1\uffff\1\151\1\147"+\r
-        "\1\145\1\uffff\1\145\1\uffff\1\157\1\163\1\40\1\163\1\156\1\137"+\r
-        "\1\uffff\2\uffff\1\164\2\uffff\1\157\1\uffff\1\uffff";\r
-    static final String DFA23_acceptS =\r
-        "\1\uffff\1\1\1\2\1\3\1\4\3\uffff\1\7\1\10\1\11\1\12\1\13\1\uffff"+\r
-        "\1\15\1\16\1\17\1\20\1\21\1\22\6\uffff\1\32\1\33\2\uffff\1\5\3\uffff"+\r
-        "\1\14\6\uffff\1\6\17\uffff\1\25\13\uffff\1\23\1\uffff\1\27\6\uffff"+\r
-        "\1\31\3\uffff\1\24\1\26\2\uffff\1\30";\r
-    static final String DFA23_specialS =\r
-        "\1\7\5\uffff\1\4\1\14\5\uffff\1\12\21\uffff\1\3\1\uffff\1\10\11"+\r
-        "\uffff\1\1\1\uffff\1\11\3\uffff\1\15\14\uffff\1\5\1\13\1\uffff\1"+\r
-        "\6\15\uffff\1\2\1\0\4\uffff\1\16\1\uffff}>";\r
+    static final String DFA23_eotS = "\6\uffff\2\36\5\uffff\1\42\6\uffff\6\32\2\uffff\2\36\2\uffff\1"\r
+            + "\32\1\36\1\uffff\6\32\1\uffff\1\36\1\51\1\32\1\51\3\32\1\71\7\32"\r
+            + "\1\uffff\4\32\1\51\1\105\1\32\1\107\3\32\1\uffff\1\32\1\uffff\6"\r
+            + "\32\1\uffff\1\122\1\123\1\32\2\uffff\1\32\1\126\1\uffff";\r
+    static final String DFA23_eofS = "\127\uffff";\r
+    static final String DFA23_minS = "\1\0\4\uffff\1\60\2\0\5\uffff\1\0\6\uffff\1\154\2\156\2\145\1\157"\r
+            + "\2\uffff\2\56\1\uffff\1\0\1\53\1\0\1\uffff\1\141\1\143\1\144\2\154"\r
+            + "\1\144\1\uffff\1\56\1\0\1\60\1\0\1\163\1\154\1\145\1\0\1\141\1\157"\r
+            + "\1\165\1\53\1\163\1\165\1\170\1\uffff\1\164\1\156\1\154\1\60\2\0"\r
+            + "\1\144\1\0\1\151\1\147\1\145\1\uffff\1\145\1\uffff\1\157\1\163\1"\r
+            + "\11\1\163\1\156\1\137\1\uffff\2\0\1\164\2\uffff\1\157\1\0\1\uffff";\r
+    static final String DFA23_maxS = "\1\uffff\4\uffff\1\71\2\uffff\5\uffff\1\uffff\6\uffff\1\154\2\156"\r
+            + "\2\145\1\157\2\uffff\2\145\1\uffff\1\uffff\1\71\1\uffff\1\uffff"\r
+            + "\1\141\2\144\2\154\1\144\1\uffff\1\145\1\uffff\1\71\1\uffff\1\163"\r
+            + "\1\154\1\145\1\uffff\1\141\1\157\1\165\1\71\1\163\1\165\1\170\1"\r
+            + "\uffff\1\164\1\156\1\154\1\71\2\uffff\1\144\1\uffff\1\151\1\147"\r
+            + "\1\145\1\uffff\1\145\1\uffff\1\157\1\163\1\40\1\163\1\156\1\137"\r
+            + "\1\uffff\2\uffff\1\164\2\uffff\1\157\1\uffff\1\uffff";\r
+    static final String DFA23_acceptS = "\1\uffff\1\1\1\2\1\3\1\4\3\uffff\1\7\1\10\1\11\1\12\1\13\1\uffff"\r
+            + "\1\15\1\16\1\17\1\20\1\21\1\22\6\uffff\1\32\1\33\2\uffff\1\5\3\uffff"\r
+            + "\1\14\6\uffff\1\6\17\uffff\1\25\13\uffff\1\23\1\uffff\1\27\6\uffff"\r
+            + "\1\31\3\uffff\1\24\1\26\2\uffff\1\30";\r
+    static final String DFA23_specialS = "\1\7\5\uffff\1\4\1\14\5\uffff\1\12\21\uffff\1\3\1\uffff\1\10\11"\r
+            + "\uffff\1\1\1\uffff\1\11\3\uffff\1\15\14\uffff\1\5\1\13\1\uffff\1"\r
+            + "\6\15\uffff\1\2\1\0\4\uffff\1\16\1\uffff}>";\r
     static final String[] DFA23_transitionS = {\r
-            "\11\32\1\33\1\3\2\32\1\3\22\32\1\33\1\32\1\4\1\2\1\32\1\1\1"+\r
-            "\32\1\uffff\1\20\1\21\1\22\1\32\1\17\1\5\1\16\1\32\1\6\11\7"+\r
-            "\1\23\1\32\1\14\1\15\1\uffff\1\32\1\uffff\32\32\1\12\1\uffff"+\r
-            "\1\13\4\32\1\30\1\24\1\32\1\26\3\32\1\25\3\32\1\31\4\32\1\27"+\r
-            "\10\32\1\10\1\uffff\1\11\uff82\32",\r
+            "\11\32\1\33\1\3\2\32\1\3\22\32\1\33\1\32\1\4\1\2\1\32\1\1\1"\r
+                    + "\32\1\uffff\1\20\1\21\1\22\1\32\1\17\1\5\1\16\1\32\1\6\11\7"\r
+                    + "\1\23\1\32\1\14\1\15\1\uffff\1\32\1\uffff\32\32\1\12\1\uffff"\r
+                    + "\1\13\4\32\1\30\1\24\1\32\1\26\3\32\1\25\3\32\1\31\4\32\1\27"\r
+                    + "\10\32\1\10\1\uffff\1\11\uff82\32",\r
             "",\r
             "",\r
             "",\r
             "",\r
             "\1\34\11\35",\r
-            "\11\32\2\uffff\2\32\1\uffff\22\32\1\uffff\1\32\2\uffff\1\32"+\r
-            "\1\uffff\1\32\4\uffff\1\32\2\uffff\1\37\13\32\1\uffff\1\32\1"+\r
-            "\uffff\1\32\1\uffff\1\32\1\uffff\4\32\1\40\25\32\3\uffff\7\32"+\r
-            "\1\40\25\32\3\uffff\uff82\32",\r
-            "\11\32\2\uffff\2\32\1\uffff\22\32\1\uffff\1\32\2\uffff\1\32"+\r
-            "\1\uffff\1\32\4\uffff\1\32\2\uffff\1\37\1\32\12\41\1\uffff\1"+\r
-            "\32\1\uffff\1\32\1\uffff\1\32\1\uffff\4\32\1\40\25\32\3\uffff"+\r
-            "\7\32\1\40\25\32\3\uffff\uff82\32",\r
+            "\11\32\2\uffff\2\32\1\uffff\22\32\1\uffff\1\32\2\uffff\1\32"\r
+                    + "\1\uffff\1\32\4\uffff\1\32\2\uffff\1\37\13\32\1\uffff\1\32\1"\r
+                    + "\uffff\1\32\1\uffff\1\32\1\uffff\4\32\1\40\25\32\3\uffff\7\32"\r
+                    + "\1\40\25\32\3\uffff\uff82\32",\r
+            "\11\32\2\uffff\2\32\1\uffff\22\32\1\uffff\1\32\2\uffff\1\32"\r
+                    + "\1\uffff\1\32\4\uffff\1\32\2\uffff\1\37\1\32\12\41\1\uffff\1"\r
+                    + "\32\1\uffff\1\32\1\uffff\1\32\1\uffff\4\32\1\40\25\32\3\uffff"\r
+                    + "\7\32\1\40\25\32\3\uffff\uff82\32",\r
             "",\r
             "",\r
             "",\r
             "",\r
             "",\r
-            "\11\32\2\uffff\2\32\1\uffff\22\32\1\uffff\1\32\2\uffff\1\32"+\r
-            "\1\uffff\1\32\4\uffff\1\32\2\uffff\14\32\1\uffff\1\32\1\uffff"+\r
-            "\1\32\1\uffff\1\32\1\uffff\32\32\3\uffff\35\32\3\uffff\uff82"+\r
-            "\32",\r
+            "\11\32\2\uffff\2\32\1\uffff\22\32\1\uffff\1\32\2\uffff\1\32"\r
+                    + "\1\uffff\1\32\4\uffff\1\32\2\uffff\14\32\1\uffff\1\32\1\uffff"\r
+                    + "\1\32\1\uffff\1\32\1\uffff\32\32\3\uffff\35\32\3\uffff\uff82" + "\32",\r
             "",\r
             "",\r
             "",\r
@@ -2092,15 +2377,14 @@ public class SilkSchemaLexer extends Lexer {
             "\1\51\26\uffff\1\51\37\uffff\1\51",\r
             "\1\51\1\uffff\12\52\13\uffff\1\51\37\uffff\1\51",\r
             "",\r
-            "\11\32\2\uffff\2\32\1\uffff\22\32\1\uffff\1\32\2\uffff\1\32"+\r
-            "\1\uffff\1\32\4\uffff\1\32\3\uffff\1\32\12\53\1\uffff\1\32\1"+\r
-            "\uffff\1\32\1\uffff\1\32\1\uffff\32\32\3\uffff\35\32\3\uffff"+\r
-            "\uff82\32",\r
+            "\11\32\2\uffff\2\32\1\uffff\22\32\1\uffff\1\32\2\uffff\1\32"\r
+                    + "\1\uffff\1\32\4\uffff\1\32\3\uffff\1\32\12\53\1\uffff\1\32\1"\r
+                    + "\uffff\1\32\1\uffff\1\32\1\uffff\32\32\3\uffff\35\32\3\uffff" + "\uff82\32",\r
             "\1\54\1\uffff\1\51\2\uffff\12\55",\r
-            "\11\32\2\uffff\2\32\1\uffff\22\32\1\uffff\1\32\2\uffff\1\32"+\r
-            "\1\uffff\1\32\4\uffff\1\32\2\uffff\1\37\1\32\12\41\1\uffff\1"+\r
-            "\32\1\uffff\1\32\1\uffff\1\32\1\uffff\4\32\1\40\25\32\3\uffff"+\r
-            "\7\32\1\40\25\32\3\uffff\uff82\32",\r
+            "\11\32\2\uffff\2\32\1\uffff\22\32\1\uffff\1\32\2\uffff\1\32"\r
+                    + "\1\uffff\1\32\4\uffff\1\32\2\uffff\1\37\1\32\12\41\1\uffff\1"\r
+                    + "\32\1\uffff\1\32\1\uffff\1\32\1\uffff\4\32\1\40\25\32\3\uffff"\r
+                    + "\7\32\1\40\25\32\3\uffff\uff82\32",\r
             "",\r
             "\1\56",\r
             "\1\57\1\60",\r
@@ -2110,22 +2394,20 @@ public class SilkSchemaLexer extends Lexer {
             "\1\64",\r
             "",\r
             "\1\51\1\uffff\12\52\13\uffff\1\51\37\uffff\1\51",\r
-            "\11\32\2\uffff\2\32\1\uffff\22\32\1\uffff\1\32\2\uffff\1\32"+\r
-            "\1\uffff\1\32\4\uffff\1\32\2\uffff\2\32\12\53\1\uffff\1\32\1"+\r
-            "\uffff\1\32\1\uffff\1\32\1\uffff\4\32\1\65\25\32\3\uffff\7\32"+\r
-            "\1\65\25\32\3\uffff\uff82\32",\r
+            "\11\32\2\uffff\2\32\1\uffff\22\32\1\uffff\1\32\2\uffff\1\32"\r
+                    + "\1\uffff\1\32\4\uffff\1\32\2\uffff\2\32\12\53\1\uffff\1\32\1"\r
+                    + "\uffff\1\32\1\uffff\1\32\1\uffff\4\32\1\65\25\32\3\uffff\7\32"\r
+                    + "\1\65\25\32\3\uffff\uff82\32",\r
             "\12\55",\r
-            "\11\32\2\uffff\2\32\1\uffff\22\32\1\uffff\1\32\2\uffff\1\32"+\r
-            "\1\uffff\1\32\4\uffff\1\32\2\uffff\2\32\12\55\1\uffff\1\32\1"+\r
-            "\uffff\1\32\1\uffff\1\32\1\uffff\32\32\3\uffff\35\32\3\uffff"+\r
-            "\uff82\32",\r
+            "\11\32\2\uffff\2\32\1\uffff\22\32\1\uffff\1\32\2\uffff\1\32"\r
+                    + "\1\uffff\1\32\4\uffff\1\32\2\uffff\2\32\12\55\1\uffff\1\32\1"\r
+                    + "\uffff\1\32\1\uffff\1\32\1\uffff\32\32\3\uffff\35\32\3\uffff" + "\uff82\32",\r
             "\1\66",\r
             "\1\67",\r
             "\1\70",\r
-            "\11\32\2\uffff\2\32\1\uffff\22\32\1\uffff\1\32\2\uffff\1\32"+\r
-            "\1\uffff\1\32\4\uffff\1\32\2\uffff\14\32\1\uffff\1\32\1\uffff"+\r
-            "\1\32\1\uffff\1\32\1\uffff\32\32\3\uffff\35\32\3\uffff\uff82"+\r
-            "\32",\r
+            "\11\32\2\uffff\2\32\1\uffff\22\32\1\uffff\1\32\2\uffff\1\32"\r
+                    + "\1\uffff\1\32\4\uffff\1\32\2\uffff\14\32\1\uffff\1\32\1\uffff"\r
+                    + "\1\32\1\uffff\1\32\1\uffff\32\32\3\uffff\35\32\3\uffff\uff82" + "\32",\r
             "\1\72",\r
             "\1\73",\r
             "\1\74",\r
@@ -2138,19 +2420,16 @@ public class SilkSchemaLexer extends Lexer {
             "\1\103",\r
             "\1\104",\r
             "\12\76",\r
-            "\11\32\2\uffff\2\32\1\uffff\22\32\1\uffff\1\32\2\uffff\1\32"+\r
-            "\1\uffff\1\32\4\uffff\1\32\2\uffff\2\32\12\76\1\uffff\1\32\1"+\r
-            "\uffff\1\32\1\uffff\1\32\1\uffff\32\32\3\uffff\35\32\3\uffff"+\r
-            "\uff82\32",\r
-            "\11\32\2\uffff\2\32\1\uffff\22\32\1\uffff\1\32\2\uffff\1\32"+\r
-            "\1\uffff\1\32\4\uffff\1\32\2\uffff\14\32\1\uffff\1\32\1\uffff"+\r
-            "\1\32\1\uffff\1\32\1\uffff\32\32\3\uffff\35\32\3\uffff\uff82"+\r
-            "\32",\r
+            "\11\32\2\uffff\2\32\1\uffff\22\32\1\uffff\1\32\2\uffff\1\32"\r
+                    + "\1\uffff\1\32\4\uffff\1\32\2\uffff\2\32\12\76\1\uffff\1\32\1"\r
+                    + "\uffff\1\32\1\uffff\1\32\1\uffff\32\32\3\uffff\35\32\3\uffff" + "\uff82\32",\r
+            "\11\32\2\uffff\2\32\1\uffff\22\32\1\uffff\1\32\2\uffff\1\32"\r
+                    + "\1\uffff\1\32\4\uffff\1\32\2\uffff\14\32\1\uffff\1\32\1\uffff"\r
+                    + "\1\32\1\uffff\1\32\1\uffff\32\32\3\uffff\35\32\3\uffff\uff82" + "\32",\r
             "\1\106",\r
-            "\11\32\2\uffff\2\32\1\uffff\22\32\1\uffff\1\32\2\uffff\1\32"+\r
-            "\1\uffff\1\32\4\uffff\1\32\2\uffff\14\32\1\uffff\1\32\1\uffff"+\r
-            "\1\32\1\uffff\1\32\1\uffff\32\32\3\uffff\35\32\3\uffff\uff82"+\r
-            "\32",\r
+            "\11\32\2\uffff\2\32\1\uffff\22\32\1\uffff\1\32\2\uffff\1\32"\r
+                    + "\1\uffff\1\32\4\uffff\1\32\2\uffff\14\32\1\uffff\1\32\1\uffff"\r
+                    + "\1\32\1\uffff\1\32\1\uffff\32\32\3\uffff\35\32\3\uffff\uff82" + "\32",\r
             "\1\110",\r
             "\1\111",\r
             "\1\112",\r
@@ -2164,24 +2443,19 @@ public class SilkSchemaLexer extends Lexer {
             "\1\120",\r
             "\1\121",\r
             "",\r
-            "\11\32\2\uffff\2\32\1\uffff\22\32\1\uffff\1\32\2\uffff\1\32"+\r
-            "\1\uffff\1\32\4\uffff\1\32\2\uffff\14\32\1\uffff\1\32\1\uffff"+\r
-            "\1\32\1\uffff\1\32\1\uffff\32\32\3\uffff\35\32\3\uffff\uff82"+\r
-            "\32",\r
-            "\11\32\2\uffff\2\32\1\uffff\22\32\1\uffff\1\32\2\uffff\1\32"+\r
-            "\1\uffff\1\32\4\uffff\1\32\2\uffff\14\32\1\uffff\1\32\1\uffff"+\r
-            "\1\32\1\uffff\1\32\1\uffff\32\32\3\uffff\35\32\3\uffff\uff82"+\r
-            "\32",\r
+            "\11\32\2\uffff\2\32\1\uffff\22\32\1\uffff\1\32\2\uffff\1\32"\r
+                    + "\1\uffff\1\32\4\uffff\1\32\2\uffff\14\32\1\uffff\1\32\1\uffff"\r
+                    + "\1\32\1\uffff\1\32\1\uffff\32\32\3\uffff\35\32\3\uffff\uff82" + "\32",\r
+            "\11\32\2\uffff\2\32\1\uffff\22\32\1\uffff\1\32\2\uffff\1\32"\r
+                    + "\1\uffff\1\32\4\uffff\1\32\2\uffff\14\32\1\uffff\1\32\1\uffff"\r
+                    + "\1\32\1\uffff\1\32\1\uffff\32\32\3\uffff\35\32\3\uffff\uff82" + "\32",\r
             "\1\124",\r
             "",\r
             "",\r
             "\1\125",\r
-            "\11\32\2\uffff\2\32\1\uffff\22\32\1\uffff\1\32\2\uffff\1\32"+\r
-            "\1\uffff\1\32\4\uffff\1\32\2\uffff\14\32\1\uffff\1\32\1\uffff"+\r
-            "\1\32\1\uffff\1\32\1\uffff\32\32\3\uffff\35\32\3\uffff\uff82"+\r
-            "\32",\r
-            ""\r
-    };\r
+            "\11\32\2\uffff\2\32\1\uffff\22\32\1\uffff\1\32\2\uffff\1\32"\r
+                    + "\1\uffff\1\32\4\uffff\1\32\2\uffff\14\32\1\uffff\1\32\1\uffff"\r
+                    + "\1\32\1\uffff\1\32\1\uffff\32\32\3\uffff\35\32\3\uffff\uff82" + "\32", "" };\r
 \r
     static final short[] DFA23_eot = DFA.unpackEncodedString(DFA23_eotS);\r
     static final short[] DFA23_eof = DFA.unpackEncodedString(DFA23_eofS);\r
@@ -2194,7 +2468,7 @@ public class SilkSchemaLexer extends Lexer {
     static {\r
         int numStates = DFA23_transitionS.length;\r
         DFA23_transition = new short[numStates][];\r
-        for (int i=0; i<numStates; i++) {\r
+        for (int i = 0; i < numStates; i++) {\r
             DFA23_transition[i] = DFA.unpackEncodedString(DFA23_transitionS[i]);\r
         }\r
     }\r
@@ -2212,250 +2486,479 @@ public class SilkSchemaLexer extends Lexer {
             this.special = DFA23_special;\r
             this.transition = DFA23_transition;\r
         }\r
+\r
         public String getDescription() {\r
             return "1:1: Tokens : ( Preamble | LineComment | LineBreak | String | Integer | Double | LBrace | RBrace | LBracket | RBracket | Lt | Eq | Dot | Comma | LParen | RParen | Star | Symbol | Class | Includes | End | Relation | Index | BelongsTo | ModuleDef | QName | WhiteSpaces );";\r
         }\r
+\r
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {\r
             IntStream input = _input;\r
-               int _s = s;\r
-            switch ( s ) {\r
-                    case 0 : \r
-                        int LA23_80 = input.LA(1);\r
-\r
-                        s = -1;\r
-                        if ( ((LA23_80>='\u0000' && LA23_80<='\b')||(LA23_80>='\u000B' && LA23_80<='\f')||(LA23_80>='\u000E' && LA23_80<='\u001F')||LA23_80=='!'||LA23_80=='$'||LA23_80=='&'||LA23_80=='+'||(LA23_80>='.' && LA23_80<='9')||LA23_80==';'||LA23_80=='='||LA23_80=='?'||(LA23_80>='A' && LA23_80<='Z')||(LA23_80>='^' && LA23_80<='z')||(LA23_80>='~' && LA23_80<='\uFFFF')) ) {s = 26;}\r
-\r
-                        else s = 83;\r
-\r
-                        if ( s>=0 ) return s;\r
-                        break;\r
-                    case 1 : \r
-                        int LA23_43 = input.LA(1);\r
-\r
-                        s = -1;\r
-                        if ( ((LA23_43>='\u0000' && LA23_43<='\b')||(LA23_43>='\u000B' && LA23_43<='\f')||(LA23_43>='\u000E' && LA23_43<='\u001F')||LA23_43=='!'||LA23_43=='$'||LA23_43=='&'||LA23_43=='+'||(LA23_43>='.' && LA23_43<='/')||LA23_43==';'||LA23_43=='='||LA23_43=='?'||(LA23_43>='A' && LA23_43<='D')||(LA23_43>='F' && LA23_43<='Z')||(LA23_43>='^' && LA23_43<='d')||(LA23_43>='f' && LA23_43<='z')||(LA23_43>='~' && LA23_43<='\uFFFF')) ) {s = 26;}\r
-\r
-                        else if ( (LA23_43=='E'||LA23_43=='e') ) {s = 53;}\r
-\r
-                        else if ( ((LA23_43>='0' && LA23_43<='9')) ) {s = 43;}\r
-\r
-                        else s = 41;\r
-\r
-                        if ( s>=0 ) return s;\r
-                        break;\r
-                    case 2 : \r
-                        int LA23_79 = input.LA(1);\r
-\r
-                        s = -1;\r
-                        if ( ((LA23_79>='\u0000' && LA23_79<='\b')||(LA23_79>='\u000B' && LA23_79<='\f')||(LA23_79>='\u000E' && LA23_79<='\u001F')||LA23_79=='!'||LA23_79=='$'||LA23_79=='&'||LA23_79=='+'||(LA23_79>='.' && LA23_79<='9')||LA23_79==';'||LA23_79=='='||LA23_79=='?'||(LA23_79>='A' && LA23_79<='Z')||(LA23_79>='^' && LA23_79<='z')||(LA23_79>='~' && LA23_79<='\uFFFF')) ) {s = 26;}\r
-\r
-                        else s = 82;\r
+            int _s = s;\r
+            switch (s) {\r
+            case 0:\r
+                int LA23_80 = input.LA(1);\r
+\r
+                s = -1;\r
+                if (((LA23_80 >= '\u0000' && LA23_80 <= '\b')\r
+                        || (LA23_80 >= '\u000B' && LA23_80 <= '\f')\r
+                        || (LA23_80 >= '\u000E' && LA23_80 <= '\u001F') || LA23_80 == '!'\r
+                        || LA23_80 == '$' || LA23_80 == '&' || LA23_80 == '+'\r
+                        || (LA23_80 >= '.' && LA23_80 <= '9') || LA23_80 == ';' || LA23_80 == '='\r
+                        || LA23_80 == '?' || (LA23_80 >= 'A' && LA23_80 <= 'Z')\r
+                        || (LA23_80 >= '^' && LA23_80 <= 'z') || (LA23_80 >= '~' && LA23_80 <= '\uFFFF'))) {\r
+                    s = 26;\r
+                }\r
 \r
-                        if ( s>=0 ) return s;\r
-                        break;\r
-                    case 3 : \r
-                        int LA23_31 = input.LA(1);\r
+                else\r
+                    s = 83;\r
 \r
-                        s = -1;\r
-                        if ( ((LA23_31>='0' && LA23_31<='9')) ) {s = 43;}\r
+                if (s >= 0)\r
+                    return s;\r
+                break;\r
+            case 1:\r
+                int LA23_43 = input.LA(1);\r
+\r
+                s = -1;\r
+                if (((LA23_43 >= '\u0000' && LA23_43 <= '\b')\r
+                        || (LA23_43 >= '\u000B' && LA23_43 <= '\f')\r
+                        || (LA23_43 >= '\u000E' && LA23_43 <= '\u001F') || LA23_43 == '!'\r
+                        || LA23_43 == '$' || LA23_43 == '&' || LA23_43 == '+'\r
+                        || (LA23_43 >= '.' && LA23_43 <= '/') || LA23_43 == ';' || LA23_43 == '='\r
+                        || LA23_43 == '?' || (LA23_43 >= 'A' && LA23_43 <= 'D')\r
+                        || (LA23_43 >= 'F' && LA23_43 <= 'Z') || (LA23_43 >= '^' && LA23_43 <= 'd')\r
+                        || (LA23_43 >= 'f' && LA23_43 <= 'z') || (LA23_43 >= '~' && LA23_43 <= '\uFFFF'))) {\r
+                    s = 26;\r
+                }\r
 \r
-                        else if ( ((LA23_31>='\u0000' && LA23_31<='\b')||(LA23_31>='\u000B' && LA23_31<='\f')||(LA23_31>='\u000E' && LA23_31<='\u001F')||LA23_31=='!'||LA23_31=='$'||LA23_31=='&'||LA23_31=='+'||LA23_31=='/'||LA23_31==';'||LA23_31=='='||LA23_31=='?'||(LA23_31>='A' && LA23_31<='Z')||(LA23_31>='^' && LA23_31<='z')||(LA23_31>='~' && LA23_31<='\uFFFF')) ) {s = 26;}\r
+                else if ((LA23_43 == 'E' || LA23_43 == 'e')) {\r
+                    s = 53;\r
+                }\r
 \r
-                        if ( s>=0 ) return s;\r
-                        break;\r
-                    case 4 : \r
-                        int LA23_6 = input.LA(1);\r
+                else if (((LA23_43 >= '0' && LA23_43 <= '9'))) {\r
+                    s = 43;\r
+                }\r
 \r
-                        s = -1;\r
-                        if ( (LA23_6=='.') ) {s = 31;}\r
+                else\r
+                    s = 41;\r
 \r
-                        else if ( (LA23_6=='E'||LA23_6=='e') ) {s = 32;}\r
+                if (s >= 0)\r
+                    return s;\r
+                break;\r
+            case 2:\r
+                int LA23_79 = input.LA(1);\r
+\r
+                s = -1;\r
+                if (((LA23_79 >= '\u0000' && LA23_79 <= '\b')\r
+                        || (LA23_79 >= '\u000B' && LA23_79 <= '\f')\r
+                        || (LA23_79 >= '\u000E' && LA23_79 <= '\u001F') || LA23_79 == '!'\r
+                        || LA23_79 == '$' || LA23_79 == '&' || LA23_79 == '+'\r
+                        || (LA23_79 >= '.' && LA23_79 <= '9') || LA23_79 == ';' || LA23_79 == '='\r
+                        || LA23_79 == '?' || (LA23_79 >= 'A' && LA23_79 <= 'Z')\r
+                        || (LA23_79 >= '^' && LA23_79 <= 'z') || (LA23_79 >= '~' && LA23_79 <= '\uFFFF'))) {\r
+                    s = 26;\r
+                }\r
 \r
-                        else if ( ((LA23_6>='\u0000' && LA23_6<='\b')||(LA23_6>='\u000B' && LA23_6<='\f')||(LA23_6>='\u000E' && LA23_6<='\u001F')||LA23_6=='!'||LA23_6=='$'||LA23_6=='&'||LA23_6=='+'||(LA23_6>='/' && LA23_6<='9')||LA23_6==';'||LA23_6=='='||LA23_6=='?'||(LA23_6>='A' && LA23_6<='D')||(LA23_6>='F' && LA23_6<='Z')||(LA23_6>='^' && LA23_6<='d')||(LA23_6>='f' && LA23_6<='z')||(LA23_6>='~' && LA23_6<='\uFFFF')) ) {s = 26;}\r
+                else\r
+                    s = 82;\r
 \r
-                        else s = 30;\r
+                if (s >= 0)\r
+                    return s;\r
+                break;\r
+            case 3:\r
+                int LA23_31 = input.LA(1);\r
 \r
-                        if ( s>=0 ) return s;\r
-                        break;\r
-                    case 5 : \r
-                        int LA23_62 = input.LA(1);\r
+                s = -1;\r
+                if (((LA23_31 >= '0' && LA23_31 <= '9'))) {\r
+                    s = 43;\r
+                }\r
 \r
-                        s = -1;\r
-                        if ( ((LA23_62>='\u0000' && LA23_62<='\b')||(LA23_62>='\u000B' && LA23_62<='\f')||(LA23_62>='\u000E' && LA23_62<='\u001F')||LA23_62=='!'||LA23_62=='$'||LA23_62=='&'||LA23_62=='+'||(LA23_62>='.' && LA23_62<='/')||LA23_62==';'||LA23_62=='='||LA23_62=='?'||(LA23_62>='A' && LA23_62<='Z')||(LA23_62>='^' && LA23_62<='z')||(LA23_62>='~' && LA23_62<='\uFFFF')) ) {s = 26;}\r
+                else if (((LA23_31 >= '\u0000' && LA23_31 <= '\b')\r
+                        || (LA23_31 >= '\u000B' && LA23_31 <= '\f')\r
+                        || (LA23_31 >= '\u000E' && LA23_31 <= '\u001F') || LA23_31 == '!'\r
+                        || LA23_31 == '$' || LA23_31 == '&' || LA23_31 == '+' || LA23_31 == '/'\r
+                        || LA23_31 == ';' || LA23_31 == '=' || LA23_31 == '?'\r
+                        || (LA23_31 >= 'A' && LA23_31 <= 'Z') || (LA23_31 >= '^' && LA23_31 <= 'z') || (LA23_31 >= '~' && LA23_31 <= '\uFFFF'))) {\r
+                    s = 26;\r
+                }\r
 \r
-                        else if ( ((LA23_62>='0' && LA23_62<='9')) ) {s = 62;}\r
+                if (s >= 0)\r
+                    return s;\r
+                break;\r
+            case 4:\r
+                int LA23_6 = input.LA(1);\r
 \r
-                        else s = 41;\r
+                s = -1;\r
+                if ((LA23_6 == '.')) {\r
+                    s = 31;\r
+                }\r
 \r
-                        if ( s>=0 ) return s;\r
-                        break;\r
-                    case 6 : \r
-                        int LA23_65 = input.LA(1);\r
+                else if ((LA23_6 == 'E' || LA23_6 == 'e')) {\r
+                    s = 32;\r
+                }\r
 \r
-                        s = -1;\r
-                        if ( ((LA23_65>='\u0000' && LA23_65<='\b')||(LA23_65>='\u000B' && LA23_65<='\f')||(LA23_65>='\u000E' && LA23_65<='\u001F')||LA23_65=='!'||LA23_65=='$'||LA23_65=='&'||LA23_65=='+'||(LA23_65>='.' && LA23_65<='9')||LA23_65==';'||LA23_65=='='||LA23_65=='?'||(LA23_65>='A' && LA23_65<='Z')||(LA23_65>='^' && LA23_65<='z')||(LA23_65>='~' && LA23_65<='\uFFFF')) ) {s = 26;}\r
+                else if (((LA23_6 >= '\u0000' && LA23_6 <= '\b')\r
+                        || (LA23_6 >= '\u000B' && LA23_6 <= '\f')\r
+                        || (LA23_6 >= '\u000E' && LA23_6 <= '\u001F') || LA23_6 == '!'\r
+                        || LA23_6 == '$' || LA23_6 == '&' || LA23_6 == '+'\r
+                        || (LA23_6 >= '/' && LA23_6 <= '9') || LA23_6 == ';' || LA23_6 == '='\r
+                        || LA23_6 == '?' || (LA23_6 >= 'A' && LA23_6 <= 'D')\r
+                        || (LA23_6 >= 'F' && LA23_6 <= 'Z') || (LA23_6 >= '^' && LA23_6 <= 'd')\r
+                        || (LA23_6 >= 'f' && LA23_6 <= 'z') || (LA23_6 >= '~' && LA23_6 <= '\uFFFF'))) {\r
+                    s = 26;\r
+                }\r
 \r
-                        else s = 71;\r
+                else\r
+                    s = 30;\r
 \r
-                        if ( s>=0 ) return s;\r
-                        break;\r
-                    case 7 : \r
-                        int LA23_0 = input.LA(1);\r
+                if (s >= 0)\r
+                    return s;\r
+                break;\r
+            case 5:\r
+                int LA23_62 = input.LA(1);\r
+\r
+                s = -1;\r
+                if (((LA23_62 >= '\u0000' && LA23_62 <= '\b')\r
+                        || (LA23_62 >= '\u000B' && LA23_62 <= '\f')\r
+                        || (LA23_62 >= '\u000E' && LA23_62 <= '\u001F') || LA23_62 == '!'\r
+                        || LA23_62 == '$' || LA23_62 == '&' || LA23_62 == '+'\r
+                        || (LA23_62 >= '.' && LA23_62 <= '/') || LA23_62 == ';' || LA23_62 == '='\r
+                        || LA23_62 == '?' || (LA23_62 >= 'A' && LA23_62 <= 'Z')\r
+                        || (LA23_62 >= '^' && LA23_62 <= 'z') || (LA23_62 >= '~' && LA23_62 <= '\uFFFF'))) {\r
+                    s = 26;\r
+                }\r
 \r
-                         \r
-                        int index23_0 = input.index();\r
-                        input.rewind();\r
-                        s = -1;\r
-                        if ( (LA23_0=='%') && (( getCharPositionInLine() == 0 ))) {s = 1;}\r
+                else if (((LA23_62 >= '0' && LA23_62 <= '9'))) {\r
+                    s = 62;\r
+                }\r
 \r
-                        else if ( (LA23_0=='#') ) {s = 2;}\r
+                else\r
+                    s = 41;\r
 \r
-                        else if ( (LA23_0=='\n'||LA23_0=='\r') ) {s = 3;}\r
+                if (s >= 0)\r
+                    return s;\r
+                break;\r
+            case 6:\r
+                int LA23_65 = input.LA(1);\r
+\r
+                s = -1;\r
+                if (((LA23_65 >= '\u0000' && LA23_65 <= '\b')\r
+                        || (LA23_65 >= '\u000B' && LA23_65 <= '\f')\r
+                        || (LA23_65 >= '\u000E' && LA23_65 <= '\u001F') || LA23_65 == '!'\r
+                        || LA23_65 == '$' || LA23_65 == '&' || LA23_65 == '+'\r
+                        || (LA23_65 >= '.' && LA23_65 <= '9') || LA23_65 == ';' || LA23_65 == '='\r
+                        || LA23_65 == '?' || (LA23_65 >= 'A' && LA23_65 <= 'Z')\r
+                        || (LA23_65 >= '^' && LA23_65 <= 'z') || (LA23_65 >= '~' && LA23_65 <= '\uFFFF'))) {\r
+                    s = 26;\r
+                }\r
 \r
-                        else if ( (LA23_0=='\"') ) {s = 4;}\r
+                else\r
+                    s = 71;\r
 \r
-                        else if ( (LA23_0=='-') ) {s = 5;}\r
+                if (s >= 0)\r
+                    return s;\r
+                break;\r
+            case 7:\r
+                int LA23_0 = input.LA(1);\r
+\r
+                int index23_0 = input.index();\r
+                input.rewind();\r
+                s = -1;\r
+                if ((LA23_0 == '%') && ((getCharPositionInLine() == 0))) {\r
+                    s = 1;\r
+                }\r
 \r
-                        else if ( (LA23_0=='0') ) {s = 6;}\r
+                else if ((LA23_0 == '#')) {\r
+                    s = 2;\r
+                }\r
 \r
-                        else if ( ((LA23_0>='1' && LA23_0<='9')) ) {s = 7;}\r
+                else if ((LA23_0 == '\n' || LA23_0 == '\r')) {\r
+                    s = 3;\r
+                }\r
 \r
-                        else if ( (LA23_0=='{') ) {s = 8;}\r
+                else if ((LA23_0 == '\"')) {\r
+                    s = 4;\r
+                }\r
 \r
-                        else if ( (LA23_0=='}') ) {s = 9;}\r
+                else if ((LA23_0 == '-')) {\r
+                    s = 5;\r
+                }\r
 \r
-                        else if ( (LA23_0=='[') ) {s = 10;}\r
+                else if ((LA23_0 == '0')) {\r
+                    s = 6;\r
+                }\r
 \r
-                        else if ( (LA23_0==']') ) {s = 11;}\r
+                else if (((LA23_0 >= '1' && LA23_0 <= '9'))) {\r
+                    s = 7;\r
+                }\r
 \r
-                        else if ( (LA23_0=='<') ) {s = 12;}\r
+                else if ((LA23_0 == '{')) {\r
+                    s = 8;\r
+                }\r
 \r
-                        else if ( (LA23_0=='=') ) {s = 13;}\r
+                else if ((LA23_0 == '}')) {\r
+                    s = 9;\r
+                }\r
 \r
-                        else if ( (LA23_0=='.') ) {s = 14;}\r
+                else if ((LA23_0 == '[')) {\r
+                    s = 10;\r
+                }\r
 \r
-                        else if ( (LA23_0==',') ) {s = 15;}\r
+                else if ((LA23_0 == ']')) {\r
+                    s = 11;\r
+                }\r
 \r
-                        else if ( (LA23_0=='(') ) {s = 16;}\r
+                else if ((LA23_0 == '<')) {\r
+                    s = 12;\r
+                }\r
 \r
-                        else if ( (LA23_0==')') ) {s = 17;}\r
+                else if ((LA23_0 == '=')) {\r
+                    s = 13;\r
+                }\r
 \r
-                        else if ( (LA23_0=='*') ) {s = 18;}\r
+                else if ((LA23_0 == '.')) {\r
+                    s = 14;\r
+                }\r
 \r
-                        else if ( (LA23_0==':') ) {s = 19;}\r
+                else if ((LA23_0 == ',')) {\r
+                    s = 15;\r
+                }\r
 \r
-                        else if ( (LA23_0=='c') ) {s = 20;}\r
+                else if ((LA23_0 == '(')) {\r
+                    s = 16;\r
+                }\r
 \r
-                        else if ( (LA23_0=='i') ) {s = 21;}\r
+                else if ((LA23_0 == ')')) {\r
+                    s = 17;\r
+                }\r
 \r
-                        else if ( (LA23_0=='e') ) {s = 22;}\r
+                else if ((LA23_0 == '*')) {\r
+                    s = 18;\r
+                }\r
 \r
-                        else if ( (LA23_0=='r') ) {s = 23;}\r
+                else if ((LA23_0 == ':')) {\r
+                    s = 19;\r
+                }\r
 \r
-                        else if ( (LA23_0=='b') ) {s = 24;}\r
+                else if ((LA23_0 == 'c')) {\r
+                    s = 20;\r
+                }\r
 \r
-                        else if ( (LA23_0=='m') ) {s = 25;}\r
+                else if ((LA23_0 == 'i')) {\r
+                    s = 21;\r
+                }\r
 \r
-                        else if ( ((LA23_0>='\u0000' && LA23_0<='\b')||(LA23_0>='\u000B' && LA23_0<='\f')||(LA23_0>='\u000E' && LA23_0<='\u001F')||LA23_0=='!'||LA23_0=='$'||LA23_0=='&'||LA23_0=='+'||LA23_0=='/'||LA23_0==';'||LA23_0=='?'||(LA23_0>='A' && LA23_0<='Z')||(LA23_0>='^' && LA23_0<='a')||LA23_0=='d'||(LA23_0>='f' && LA23_0<='h')||(LA23_0>='j' && LA23_0<='l')||(LA23_0>='n' && LA23_0<='q')||(LA23_0>='s' && LA23_0<='z')||(LA23_0>='~' && LA23_0<='\uFFFF')) ) {s = 26;}\r
+                else if ((LA23_0 == 'e')) {\r
+                    s = 22;\r
+                }\r
 \r
-                        else if ( (LA23_0=='\t'||LA23_0==' ') ) {s = 27;}\r
+                else if ((LA23_0 == 'r')) {\r
+                    s = 23;\r
+                }\r
 \r
-                         \r
-                        input.seek(index23_0);\r
-                        if ( s>=0 ) return s;\r
-                        break;\r
-                    case 8 : \r
-                        int LA23_33 = input.LA(1);\r
+                else if ((LA23_0 == 'b')) {\r
+                    s = 24;\r
+                }\r
 \r
-                        s = -1;\r
-                        if ( (LA23_33=='.') ) {s = 31;}\r
+                else if ((LA23_0 == 'm')) {\r
+                    s = 25;\r
+                }\r
 \r
-                        else if ( (LA23_33=='E'||LA23_33=='e') ) {s = 32;}\r
+                else if (((LA23_0 >= '\u0000' && LA23_0 <= '\b')\r
+                        || (LA23_0 >= '\u000B' && LA23_0 <= '\f')\r
+                        || (LA23_0 >= '\u000E' && LA23_0 <= '\u001F') || LA23_0 == '!'\r
+                        || LA23_0 == '$' || LA23_0 == '&' || LA23_0 == '+' || LA23_0 == '/'\r
+                        || LA23_0 == ';' || LA23_0 == '?' || (LA23_0 >= 'A' && LA23_0 <= 'Z')\r
+                        || (LA23_0 >= '^' && LA23_0 <= 'a') || LA23_0 == 'd'\r
+                        || (LA23_0 >= 'f' && LA23_0 <= 'h') || (LA23_0 >= 'j' && LA23_0 <= 'l')\r
+                        || (LA23_0 >= 'n' && LA23_0 <= 'q') || (LA23_0 >= 's' && LA23_0 <= 'z') || (LA23_0 >= '~' && LA23_0 <= '\uFFFF'))) {\r
+                    s = 26;\r
+                }\r
 \r
-                        else if ( ((LA23_33>='0' && LA23_33<='9')) ) {s = 33;}\r
+                else if ((LA23_0 == '\t' || LA23_0 == ' ')) {\r
+                    s = 27;\r
+                }\r
 \r
-                        else if ( ((LA23_33>='\u0000' && LA23_33<='\b')||(LA23_33>='\u000B' && LA23_33<='\f')||(LA23_33>='\u000E' && LA23_33<='\u001F')||LA23_33=='!'||LA23_33=='$'||LA23_33=='&'||LA23_33=='+'||LA23_33=='/'||LA23_33==';'||LA23_33=='='||LA23_33=='?'||(LA23_33>='A' && LA23_33<='D')||(LA23_33>='F' && LA23_33<='Z')||(LA23_33>='^' && LA23_33<='d')||(LA23_33>='f' && LA23_33<='z')||(LA23_33>='~' && LA23_33<='\uFFFF')) ) {s = 26;}\r
+                input.seek(index23_0);\r
+                if (s >= 0)\r
+                    return s;\r
+                break;\r
+            case 8:\r
+                int LA23_33 = input.LA(1);\r
 \r
-                        else s = 30;\r
+                s = -1;\r
+                if ((LA23_33 == '.')) {\r
+                    s = 31;\r
+                }\r
 \r
-                        if ( s>=0 ) return s;\r
-                        break;\r
-                    case 9 : \r
-                        int LA23_45 = input.LA(1);\r
+                else if ((LA23_33 == 'E' || LA23_33 == 'e')) {\r
+                    s = 32;\r
+                }\r
 \r
-                        s = -1;\r
-                        if ( ((LA23_45>='0' && LA23_45<='9')) ) {s = 45;}\r
+                else if (((LA23_33 >= '0' && LA23_33 <= '9'))) {\r
+                    s = 33;\r
+                }\r
 \r
-                        else if ( ((LA23_45>='\u0000' && LA23_45<='\b')||(LA23_45>='\u000B' && LA23_45<='\f')||(LA23_45>='\u000E' && LA23_45<='\u001F')||LA23_45=='!'||LA23_45=='$'||LA23_45=='&'||LA23_45=='+'||(LA23_45>='.' && LA23_45<='/')||LA23_45==';'||LA23_45=='='||LA23_45=='?'||(LA23_45>='A' && LA23_45<='Z')||(LA23_45>='^' && LA23_45<='z')||(LA23_45>='~' && LA23_45<='\uFFFF')) ) {s = 26;}\r
+                else if (((LA23_33 >= '\u0000' && LA23_33 <= '\b')\r
+                        || (LA23_33 >= '\u000B' && LA23_33 <= '\f')\r
+                        || (LA23_33 >= '\u000E' && LA23_33 <= '\u001F') || LA23_33 == '!'\r
+                        || LA23_33 == '$' || LA23_33 == '&' || LA23_33 == '+' || LA23_33 == '/'\r
+                        || LA23_33 == ';' || LA23_33 == '=' || LA23_33 == '?'\r
+                        || (LA23_33 >= 'A' && LA23_33 <= 'D') || (LA23_33 >= 'F' && LA23_33 <= 'Z')\r
+                        || (LA23_33 >= '^' && LA23_33 <= 'd') || (LA23_33 >= 'f' && LA23_33 <= 'z') || (LA23_33 >= '~' && LA23_33 <= '\uFFFF'))) {\r
+                    s = 26;\r
+                }\r
 \r
-                        else s = 41;\r
+                else\r
+                    s = 30;\r
 \r
-                        if ( s>=0 ) return s;\r
-                        break;\r
-                    case 10 : \r
-                        int LA23_13 = input.LA(1);\r
+                if (s >= 0)\r
+                    return s;\r
+                break;\r
+            case 9:\r
+                int LA23_45 = input.LA(1);\r
 \r
-                        s = -1;\r
-                        if ( ((LA23_13>='\u0000' && LA23_13<='\b')||(LA23_13>='\u000B' && LA23_13<='\f')||(LA23_13>='\u000E' && LA23_13<='\u001F')||LA23_13=='!'||LA23_13=='$'||LA23_13=='&'||LA23_13=='+'||(LA23_13>='.' && LA23_13<='9')||LA23_13==';'||LA23_13=='='||LA23_13=='?'||(LA23_13>='A' && LA23_13<='Z')||(LA23_13>='^' && LA23_13<='z')||(LA23_13>='~' && LA23_13<='\uFFFF')) ) {s = 26;}\r
+                s = -1;\r
+                if (((LA23_45 >= '0' && LA23_45 <= '9'))) {\r
+                    s = 45;\r
+                }\r
 \r
-                        else s = 34;\r
+                else if (((LA23_45 >= '\u0000' && LA23_45 <= '\b')\r
+                        || (LA23_45 >= '\u000B' && LA23_45 <= '\f')\r
+                        || (LA23_45 >= '\u000E' && LA23_45 <= '\u001F') || LA23_45 == '!'\r
+                        || LA23_45 == '$' || LA23_45 == '&' || LA23_45 == '+'\r
+                        || (LA23_45 >= '.' && LA23_45 <= '/') || LA23_45 == ';' || LA23_45 == '='\r
+                        || LA23_45 == '?' || (LA23_45 >= 'A' && LA23_45 <= 'Z')\r
+                        || (LA23_45 >= '^' && LA23_45 <= 'z') || (LA23_45 >= '~' && LA23_45 <= '\uFFFF'))) {\r
+                    s = 26;\r
+                }\r
 \r
-                        if ( s>=0 ) return s;\r
-                        break;\r
-                    case 11 : \r
-                        int LA23_63 = input.LA(1);\r
+                else\r
+                    s = 41;\r
 \r
-                        s = -1;\r
-                        if ( ((LA23_63>='\u0000' && LA23_63<='\b')||(LA23_63>='\u000B' && LA23_63<='\f')||(LA23_63>='\u000E' && LA23_63<='\u001F')||LA23_63=='!'||LA23_63=='$'||LA23_63=='&'||LA23_63=='+'||(LA23_63>='.' && LA23_63<='9')||LA23_63==';'||LA23_63=='='||LA23_63=='?'||(LA23_63>='A' && LA23_63<='Z')||(LA23_63>='^' && LA23_63<='z')||(LA23_63>='~' && LA23_63<='\uFFFF')) ) {s = 26;}\r
+                if (s >= 0)\r
+                    return s;\r
+                break;\r
+            case 10:\r
+                int LA23_13 = input.LA(1);\r
+\r
+                s = -1;\r
+                if (((LA23_13 >= '\u0000' && LA23_13 <= '\b')\r
+                        || (LA23_13 >= '\u000B' && LA23_13 <= '\f')\r
+                        || (LA23_13 >= '\u000E' && LA23_13 <= '\u001F') || LA23_13 == '!'\r
+                        || LA23_13 == '$' || LA23_13 == '&' || LA23_13 == '+'\r
+                        || (LA23_13 >= '.' && LA23_13 <= '9') || LA23_13 == ';' || LA23_13 == '='\r
+                        || LA23_13 == '?' || (LA23_13 >= 'A' && LA23_13 <= 'Z')\r
+                        || (LA23_13 >= '^' && LA23_13 <= 'z') || (LA23_13 >= '~' && LA23_13 <= '\uFFFF'))) {\r
+                    s = 26;\r
+                }\r
 \r
-                        else s = 69;\r
+                else\r
+                    s = 34;\r
 \r
-                        if ( s>=0 ) return s;\r
-                        break;\r
-                    case 12 : \r
-                        int LA23_7 = input.LA(1);\r
+                if (s >= 0)\r
+                    return s;\r
+                break;\r
+            case 11:\r
+                int LA23_63 = input.LA(1);\r
+\r
+                s = -1;\r
+                if (((LA23_63 >= '\u0000' && LA23_63 <= '\b')\r
+                        || (LA23_63 >= '\u000B' && LA23_63 <= '\f')\r
+                        || (LA23_63 >= '\u000E' && LA23_63 <= '\u001F') || LA23_63 == '!'\r
+                        || LA23_63 == '$' || LA23_63 == '&' || LA23_63 == '+'\r
+                        || (LA23_63 >= '.' && LA23_63 <= '9') || LA23_63 == ';' || LA23_63 == '='\r
+                        || LA23_63 == '?' || (LA23_63 >= 'A' && LA23_63 <= 'Z')\r
+                        || (LA23_63 >= '^' && LA23_63 <= 'z') || (LA23_63 >= '~' && LA23_63 <= '\uFFFF'))) {\r
+                    s = 26;\r
+                }\r
 \r
-                        s = -1;\r
-                        if ( ((LA23_7>='0' && LA23_7<='9')) ) {s = 33;}\r
+                else\r
+                    s = 69;\r
 \r
-                        else if ( (LA23_7=='.') ) {s = 31;}\r
+                if (s >= 0)\r
+                    return s;\r
+                break;\r
+            case 12:\r
+                int LA23_7 = input.LA(1);\r
 \r
-                        else if ( (LA23_7=='E'||LA23_7=='e') ) {s = 32;}\r
+                s = -1;\r
+                if (((LA23_7 >= '0' && LA23_7 <= '9'))) {\r
+                    s = 33;\r
+                }\r
 \r
-                        else if ( ((LA23_7>='\u0000' && LA23_7<='\b')||(LA23_7>='\u000B' && LA23_7<='\f')||(LA23_7>='\u000E' && LA23_7<='\u001F')||LA23_7=='!'||LA23_7=='$'||LA23_7=='&'||LA23_7=='+'||LA23_7=='/'||LA23_7==';'||LA23_7=='='||LA23_7=='?'||(LA23_7>='A' && LA23_7<='D')||(LA23_7>='F' && LA23_7<='Z')||(LA23_7>='^' && LA23_7<='d')||(LA23_7>='f' && LA23_7<='z')||(LA23_7>='~' && LA23_7<='\uFFFF')) ) {s = 26;}\r
+                else if ((LA23_7 == '.')) {\r
+                    s = 31;\r
+                }\r
 \r
-                        else s = 30;\r
+                else if ((LA23_7 == 'E' || LA23_7 == 'e')) {\r
+                    s = 32;\r
+                }\r
 \r
-                        if ( s>=0 ) return s;\r
-                        break;\r
-                    case 13 : \r
-                        int LA23_49 = input.LA(1);\r
+                else if (((LA23_7 >= '\u0000' && LA23_7 <= '\b')\r
+                        || (LA23_7 >= '\u000B' && LA23_7 <= '\f')\r
+                        || (LA23_7 >= '\u000E' && LA23_7 <= '\u001F') || LA23_7 == '!'\r
+                        || LA23_7 == '$' || LA23_7 == '&' || LA23_7 == '+' || LA23_7 == '/'\r
+                        || LA23_7 == ';' || LA23_7 == '=' || LA23_7 == '?'\r
+                        || (LA23_7 >= 'A' && LA23_7 <= 'D') || (LA23_7 >= 'F' && LA23_7 <= 'Z')\r
+                        || (LA23_7 >= '^' && LA23_7 <= 'd') || (LA23_7 >= 'f' && LA23_7 <= 'z') || (LA23_7 >= '~' && LA23_7 <= '\uFFFF'))) {\r
+                    s = 26;\r
+                }\r
 \r
-                        s = -1;\r
-                        if ( ((LA23_49>='\u0000' && LA23_49<='\b')||(LA23_49>='\u000B' && LA23_49<='\f')||(LA23_49>='\u000E' && LA23_49<='\u001F')||LA23_49=='!'||LA23_49=='$'||LA23_49=='&'||LA23_49=='+'||(LA23_49>='.' && LA23_49<='9')||LA23_49==';'||LA23_49=='='||LA23_49=='?'||(LA23_49>='A' && LA23_49<='Z')||(LA23_49>='^' && LA23_49<='z')||(LA23_49>='~' && LA23_49<='\uFFFF')) ) {s = 26;}\r
+                else\r
+                    s = 30;\r
 \r
-                        else s = 57;\r
+                if (s >= 0)\r
+                    return s;\r
+                break;\r
+            case 13:\r
+                int LA23_49 = input.LA(1);\r
+\r
+                s = -1;\r
+                if (((LA23_49 >= '\u0000' && LA23_49 <= '\b')\r
+                        || (LA23_49 >= '\u000B' && LA23_49 <= '\f')\r
+                        || (LA23_49 >= '\u000E' && LA23_49 <= '\u001F') || LA23_49 == '!'\r
+                        || LA23_49 == '$' || LA23_49 == '&' || LA23_49 == '+'\r
+                        || (LA23_49 >= '.' && LA23_49 <= '9') || LA23_49 == ';' || LA23_49 == '='\r
+                        || LA23_49 == '?' || (LA23_49 >= 'A' && LA23_49 <= 'Z')\r
+                        || (LA23_49 >= '^' && LA23_49 <= 'z') || (LA23_49 >= '~' && LA23_49 <= '\uFFFF'))) {\r
+                    s = 26;\r
+                }\r
 \r
-                        if ( s>=0 ) return s;\r
-                        break;\r
-                    case 14 : \r
-                        int LA23_85 = input.LA(1);\r
+                else\r
+                    s = 57;\r
 \r
-                        s = -1;\r
-                        if ( ((LA23_85>='\u0000' && LA23_85<='\b')||(LA23_85>='\u000B' && LA23_85<='\f')||(LA23_85>='\u000E' && LA23_85<='\u001F')||LA23_85=='!'||LA23_85=='$'||LA23_85=='&'||LA23_85=='+'||(LA23_85>='.' && LA23_85<='9')||LA23_85==';'||LA23_85=='='||LA23_85=='?'||(LA23_85>='A' && LA23_85<='Z')||(LA23_85>='^' && LA23_85<='z')||(LA23_85>='~' && LA23_85<='\uFFFF')) ) {s = 26;}\r
+                if (s >= 0)\r
+                    return s;\r
+                break;\r
+            case 14:\r
+                int LA23_85 = input.LA(1);\r
+\r
+                s = -1;\r
+                if (((LA23_85 >= '\u0000' && LA23_85 <= '\b')\r
+                        || (LA23_85 >= '\u000B' && LA23_85 <= '\f')\r
+                        || (LA23_85 >= '\u000E' && LA23_85 <= '\u001F') || LA23_85 == '!'\r
+                        || LA23_85 == '$' || LA23_85 == '&' || LA23_85 == '+'\r
+                        || (LA23_85 >= '.' && LA23_85 <= '9') || LA23_85 == ';' || LA23_85 == '='\r
+                        || LA23_85 == '?' || (LA23_85 >= 'A' && LA23_85 <= 'Z')\r
+                        || (LA23_85 >= '^' && LA23_85 <= 'z') || (LA23_85 >= '~' && LA23_85 <= '\uFFFF'))) {\r
+                    s = 26;\r
+                }\r
 \r
-                        else s = 86;\r
+                else\r
+                    s = 86;\r
 \r
-                        if ( s>=0 ) return s;\r
-                        break;\r
+                if (s >= 0)\r
+                    return s;\r
+                break;\r
+            }\r
+            if (state.backtracking > 0) {\r
+                state.failed = true;\r
+                return -1;\r
             }\r
-            if (state.backtracking>0) {state.failed=true; return -1;}\r
-            NoViableAltException nvae =\r
-                new NoViableAltException(getDescription(), 23, _s, input);\r
+            NoViableAltException nvae = new NoViableAltException(getDescription(), 23, _s, input);\r
             error(nvae);\r
             throw nvae;\r
         }\r
     }\r
\r
 \r
 }
\ No newline at end of file
index cc2575d..3bce896 100644 (file)
@@ -26,11 +26,10 @@ package org.xerial.util.bean;
 
 import java.lang.reflect.Method;
 
-public interface BeanUpdator
-{
+public interface BeanUpdator {
     public BeanUpdatorType getType();
 
-    public Class getInputType();
+    public Class< ? > getInputType();
 
     public Method getMethod();
 }
index 32307d4..64a3b74 100644 (file)
@@ -36,23 +36,19 @@ import org.xerial.util.bean.BeanUpdatorType;
  * @author leo
  * 
  */
-public class Appender extends BeanBinderBase implements BeanUpdator
-{
+public class Appender extends BeanBinderBase implements BeanUpdator {
     private final Class< ? > inputType;
 
-    public Appender(Class< ? > inputType, Method appender, String parameterName)
-    {
+    public Appender(Class< ? > inputType, Method appender, String parameterName) {
         super(appender, parameterName);
         this.inputType = inputType;
     }
 
-    public Class getInputType()
-    {
+    public Class< ? > getInputType() {
         return inputType;
     }
 
-    public BeanUpdatorType getType()
-    {
+    public BeanUpdatorType getType() {
         return BeanUpdatorType.APPENDER;
     }
 
index e84c892..a85bb74 100644 (file)
 //--------------------------------------
 package org.xerial.util.bean.impl;
 
-import java.lang.reflect.Array;
 import java.lang.reflect.Method;
 
-import org.xerial.json.JSONArray;
-import org.xerial.util.bean.BeanException;
-import org.xerial.util.bean.BeanUtil;
-
 public class ArraySetter extends BeanBinderBase {
-    Class componentType;
+    Class< ? > componentType;
 
-    public ArraySetter(Method method, String parameterName, Class componentType) {
+    public ArraySetter(Method method, String parameterName, Class< ? > componentType) {
         super(method, parameterName);
         this.componentType = componentType;
     }
 
 }
\ No newline at end of file
index 5be3cda..716877b 100644 (file)
@@ -45,8 +45,7 @@ import org.xerial.util.xml.XMLTreeWalker;
  * @author leo
  * 
  */
-public class BeanUtilImpl
-{
+public class BeanUtilImpl {
     /**
      * Create a bean of the specified type from the tree walker input
      * 
@@ -66,8 +65,8 @@ public class BeanUtilImpl
      * @return
      * @throws XerialException
      */
-    protected static <E> E createTypedBean(TreeWalker treeWalker, Class<E> beanType) throws XerialException
-    {
+    protected static <E> E createTypedBean(TreeWalker treeWalker, Class<E> beanType)
+            throws XerialException {
         return beanType.cast(createBean(treeWalker, new BeanBindingProcess(beanType)));
         //return new ObjectMapper().map(beanType, treeWalker);
     }
@@ -81,83 +80,76 @@ public class BeanUtilImpl
      * @throws XerialException
      */
     @SuppressWarnings("unchecked")
-    protected static <E> E createBean(TreeWalker treeWalker, E bean) throws XerialException
-    {
+    protected static <E> E createBean(TreeWalker treeWalker, E bean) throws XerialException {
         return (E) createBean(treeWalker, new BeanBindingProcess(bean));
         //return new ObjectMapper().map(bean, treeWalker);
     }
 
     protected static Object createBean(TreeWalker treeWalker, BeanBindingProcess beanBindingVisitor)
-            throws XerialException
-    {
+            throws XerialException {
         treeWalker.walk(beanBindingVisitor);
         return beanBindingVisitor.getResultBean();
     }
 
     // Silk Stream
-    public static <E> E createBeanFromSilk(Class<E> beanType, URL silkFileAddress) throws XerialException, IOException
-    {
+    public static <E> E createBeanFromSilk(Class<E> beanType, URL silkFileAddress)
+            throws XerialException, IOException {
         return createTypedBean(new SilkWalker(silkFileAddress), beanType);
     }
 
-    @SuppressWarnings("unchecked")
-    public static <E> E populateBeanWithSilk(E bean, URL silkFileAddress) throws XerialException, IOException
-    {
+    public static <E> E populateBeanWithSilk(E bean, URL silkFileAddress) throws XerialException,
+            IOException {
         return (E) createBean(new SilkWalker(silkFileAddress), bean);
     }
 
     // XML Stream
-    public static <E> E createBeanFromXML(Class<E> beanType, Reader xmlReader) throws XerialException
-    {
+    public static <E> E createBeanFromXML(Class<E> beanType, Reader xmlReader)
+            throws XerialException {
         return createTypedBean(new XMLTreeWalker(xmlReader), beanType);
     }
 
-    public static Object populateBeanWithXML(Object bean, Reader xmlReader) throws XerialException
-    {
+    public static Object populateBeanWithXML(Object bean, Reader xmlReader) throws XerialException {
         return createBean(new XMLTreeWalker(xmlReader), bean);
     }
 
     // XML DOM
-    public static <E> E createBeanFromXML(Class<E> beanType, Element xmlElement) throws XerialException
-    {
+    public static <E> E createBeanFromXML(Class<E> beanType, Element xmlElement)
+            throws XerialException {
         return createTypedBean(new XMLTreeWalker(xmlElement), beanType);
     }
 
-    public static Object populateBeanWithXML(Object bean, Element xmlElement) throws XerialException
-    {
+    public static Object populateBeanWithXML(Object bean, Element xmlElement)
+            throws XerialException {
         return createBean(new XMLTreeWalker(xmlElement), new BeanBindingProcess(bean));
     }
 
     // ANTLR ParseTree
-    public static <E> E createBeanFromParseTree(Class<E> beanType, Tree parseTree, final String[] parserTokenNames)
-            throws XerialException
-    {
+    public static <E> E createBeanFromParseTree(Class<E> beanType, Tree parseTree,
+            final String[] parserTokenNames) throws XerialException {
         return createTypedBean(new ANTLRWalker(parserTokenNames, parseTree), beanType);
     }
 
-    public static <E> E populateBeanWithParseTree(E bean, Tree parseTree, final String[] parserTokenNames)
-            throws XerialException
-    {
+    public static <E> E populateBeanWithParseTree(E bean, Tree parseTree,
+            final String[] parserTokenNames) throws XerialException {
         return createBean(new ANTLRWalker(parserTokenNames, parseTree), bean);
     }
 
-    public static <E> E createBeanFromJSON(Class<E> beanType, Reader jsonReader) throws IOException, XerialException
-    {
+    public static <E> E createBeanFromJSON(Class<E> beanType, Reader jsonReader)
+            throws IOException, XerialException {
         return createTypedBean(new JSONStreamWalker(jsonReader), beanType);
     }
 
-    public static Object populateBeanWithJSON(Object bean, Reader jsonReader) throws IOException, XerialException
-    {
+    public static Object populateBeanWithJSON(Object bean, Reader jsonReader) throws IOException,
+            XerialException {
         return createBean(new JSONStreamWalker(jsonReader), bean);
     }
 
-    public static <E> E createBeanFromMap(Class<E> beanType, Map< ? , ? > map) throws XerialException
-    {
+    public static <E> E createBeanFromMap(Class<E> beanType, Map< ? , ? > map)
+            throws XerialException {
         return createTypedBean(new MapWalker(map), beanType);
     }
 
-    public static Object populateBeanWithMap(Object bean, Map< ? , ? > map) throws XerialException
-    {
+    public static Object populateBeanWithMap(Object bean, Map< ? , ? > map) throws XerialException {
         return createBean(new MapWalker(map), bean);
     }
 
index 08f2355..e3be3e6 100644 (file)
@@ -26,32 +26,26 @@ package org.xerial.util.bean.impl;
 
 import java.lang.reflect.Method;
 
-import org.xerial.json.JSONArray;
 import org.xerial.util.bean.BeanException;
 import org.xerial.util.bean.BeanUpdator;
 import org.xerial.util.bean.BeanUpdatorType;
-import org.xerial.util.bean.BeanUtil;
 
-public class CollectionAdder extends BeanBinderBase implements BeanUpdator
-{
-    Class elementType;
+public class CollectionAdder extends BeanBinderBase implements BeanUpdator {
+    Class< ? > elementType;
 
-    public CollectionAdder(Method method, String parameterName, Class elementType) throws BeanException
-    {
+    public CollectionAdder(Method method, String parameterName, Class< ? > elementType)
+            throws BeanException {
         super(method, parameterName);
         this.elementType = elementType;
 
         constractableTest(elementType);
     }
 
-
-    public Class getInputType()
-    {
+    public Class< ? > getInputType() {
         return elementType;
     }
 
-    public BeanUpdatorType getType()
-    {
+    public BeanUpdatorType getType() {
         return BeanUpdatorType.COLLECTION_ADDER;
     }
 
index 6e05083..52777bd 100644 (file)
 package org.xerial.util.bean.impl;
 
 import java.lang.reflect.Method;
-import java.util.Collection;
 
-import org.xerial.json.JSONArray;
 import org.xerial.util.bean.BeanException;
-import org.xerial.util.bean.BeanUtil;
 import org.xerial.util.bean.TypeInfo;
 
-
 public class CollectionSetter extends BeanBinderBase {
-    Class collectionType;
+    Class< ? > collectionType;
 
-    Class elementType;
+    Class< ? > elementType;
 
-    public CollectionSetter(Method method, String parameterName, Class collectionType, Class elementType) throws BeanException {
+    public CollectionSetter(Method method, String parameterName, Class< ? > collectionType,
+            Class< ? > elementType) throws BeanException {
         super(method, parameterName);
         this.collectionType = collectionType;
         this.elementType = elementType;
@@ -49,6 +46,4 @@ public class CollectionSetter extends BeanBinderBase {
         assert (TypeInfo.isCollection(collectionType));
     }
 
-
-
 }
index 3509c05..9c7f045 100644 (file)
@@ -32,75 +32,63 @@ import java.lang.reflect.Method;
  * @author leo
  * 
  */
-public class KeyValuePair
-{
+public class KeyValuePair {
     public final MapPutter mapPutter;
 
     private Object key = null;
     private Object value = null;
 
-    private final Class keyClass;
-    private final Class valueClass;
+    private final Class< ? > keyClass;
+    private final Class< ? > valueClass;
 
     private int setterCount = 0;
 
-    public KeyValuePair(MapPutter mapPutter)
-    {
+    public KeyValuePair(MapPutter mapPutter) {
         this.mapPutter = mapPutter;
         this.keyClass = mapPutter.getKeyType();
         this.valueClass = mapPutter.getValueType();
     }
 
-    public KeyValuePair(MapPutter mapPutter, Class keyType, Class valueType)
-    {
+    public KeyValuePair(MapPutter mapPutter, Class< ? > keyType, Class< ? > valueType) {
         this.mapPutter = mapPutter;
         this.keyClass = keyType;
         this.valueClass = valueType;
     }
 
     @Override
-    public String toString()
-    {
+    public String toString() {
         return String.format("%s=>%s", key, value);
     }
 
-    public boolean hasKeyAndValue()
-    {
+    public boolean hasKeyAndValue() {
         return key != null && value != null;
     }
 
-    public Class keyType()
-    {
+    public Class< ? > keyType() {
         return keyClass;
     }
 
-    public Class valueType()
-    {
+    public Class< ? > valueType() {
         return valueClass;
     }
 
-    public Method putter()
-    {
+    public Method putter() {
         return mapPutter.getMethod();
     }
 
-    public Object getKey()
-    {
+    public Object getKey() {
         return key;
     }
 
-    public void setKey(Object key)
-    {
+    public void setKey(Object key) {
         this.key = key;
     }
 
-    public Object getValue()
-    {
+    public Object getValue() {
         return value;
     }
 
-    public void setValue(Object value)
-    {
+    public void setValue(Object value) {
         this.value = value;
     }
 
index 4ec5994..cd40784 100644 (file)
@@ -26,20 +26,17 @@ package org.xerial.util.bean.impl;
 
 import java.lang.reflect.Method;
 
-import org.xerial.json.JSONArray;
 import org.xerial.util.bean.BeanException;
 import org.xerial.util.bean.BeanUpdator;
 import org.xerial.util.bean.BeanUpdatorType;
-import org.xerial.util.bean.BeanUtil;
 
-public class MapPutter extends BeanBinderBase implements BeanUpdator
-{
-    Class keyType;
+public class MapPutter extends BeanBinderBase implements BeanUpdator {
+    Class< ? > keyType;
 
-    Class valueType;
+    Class< ? > valueType;
 
-    public MapPutter(Method method, String parameterName, Class keyType, Class valueType) throws BeanException
-    {
+    public MapPutter(Method method, String parameterName, Class< ? > keyType, Class< ? > valueType)
+            throws BeanException {
         super(method, parameterName);
         this.keyType = keyType;
         this.valueType = valueType;
@@ -48,38 +45,21 @@ public class MapPutter extends BeanBinderBase implements BeanUpdator
         constractableTest(valueType);
     }
 
-    public Class getInputType()
-    {
-        throw new UnsupportedOperationException("getElementType() for MapPutter is not supported yet");
+    public Class< ? > getInputType() {
+        throw new UnsupportedOperationException(
+                "getElementType() for MapPutter is not supported yet");
     }
 
-    public BeanUpdatorType getType()
-    {
+    public BeanUpdatorType getType() {
         return BeanUpdatorType.MAP_PUTTER;
     }
 
-    public Class getKeyType()
-    {
+    public Class< ? > getKeyType() {
         return keyType;
     }
 
-    public Class getValueType()
-    {
+    public Class< ? > getValueType() {
         return valueType;
     }
 
-    // @Override
-    // public void setXMLData(Object bean, Object xmlData) throws BeanException
-    // {
-    // if(!TypeInformation.isDOMElement(xmlData.getClass()))
-    // return;
-    //        
-    // Element mapEntryElement = (Element) xmlData;
-    // // TODO support for complex putter argument such as putSomething(String
-    // key, Map value);
-    // String key = mapEntryElement.getAttribute("key");
-    // Object value = BeanUtil.createXMLBean(valueType, mapEntryElement);
-    // invokeMethod(bean, new Object[] { key, value } );
-    // }
-
 }
index 202c282..a3e0383 100644 (file)
 package org.xerial.util.bean.impl;
 
 import java.lang.reflect.Method;
-import java.util.Map;
 
-import org.xerial.json.JSONArray;
 import org.xerial.util.bean.BeanException;
-import org.xerial.util.bean.BeanUtil;
 import org.xerial.util.bean.TypeInfo;
 
-
 public class MapSetter extends BeanBinderBase {
-    Class mapType;
+    Class< ? > mapType;
 
-    Class keyType;
+    Class< ? > keyType;
 
-    Class valueType;
+    Class< ? > valueType;
 
-    public MapSetter(Method method, String parameterName, Class mapType, Class keyType, Class valueType) throws BeanException {
+    public MapSetter(Method method, String parameterName, Class< ? > mapType, Class< ? > keyType,
+            Class< ? > valueType) throws BeanException {
         super(method, parameterName);
         this.mapType = mapType;
         this.keyType = keyType;
index a3dd252..2c2cc58 100644 (file)
@@ -26,28 +26,22 @@ package org.xerial.util.bean.impl;
 
 import java.lang.reflect.Method;
 
-import org.xerial.util.bean.BeanException;
 import org.xerial.util.bean.BeanUpdator;
 import org.xerial.util.bean.BeanUpdatorType;
-import org.xerial.util.bean.BeanUtil;
 
-public class Setter extends BeanBinderBase implements BeanUpdator
-{
-    Class valueType;
+public class Setter extends BeanBinderBase implements BeanUpdator {
+    Class< ? > valueType;
 
-    public Setter(Method method, String parameterName, Class valueType)
-    {
+    public Setter(Method method, String parameterName, Class< ? > valueType) {
         super(method, parameterName);
         this.valueType = valueType;
     }
 
-    public Class getInputType()
-    {
+    public Class< ? > getInputType() {
         return valueType;
     }
 
-    public BeanUpdatorType getType()
-    {
+    public BeanUpdatorType getType() {
         return BeanUpdatorType.SETTER;
     }