@dbml/core 2.3.0 → 2.4.1

package/lib/parse/dbmlParser.js

@@ -5,17 +5,21 @@
  */
 "use strict";
 
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _nonIterableSpread(); }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance"); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 
-function _iterableToArray(iter) { if (Symbol.iterator in Object(iter) || Object.prototype.toString.call(iter) === "[object Arguments]") return Array.from(iter); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = new Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && Symbol.iterator in Object(iter)) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
@@ -255,9 +259,10 @@ function peg$parse(input, options) {
       value: value.value
     };
   },
-      peg$c21 = function peg$c21(name, body) {
+      peg$c21 = function peg$c21(schemaName, name, body) {
     return {
       name: name,
+      schemaName: schemaName,
       tables: body,
       token: location()
     };
@@ -265,12 +270,16 @@ function peg$parse(input, options) {
       peg$c22 = function peg$c22(tables) {
     return tables.map(function (t) {
       return {
-        name: t[0]
+        name: t[1],
+        schemaName: t[0]
       };
     });
   },
       peg$c23 = function peg$c23(r) {
-    return r;
+    var schemaName = r.endpoints[0].schemaName;
+    return _objectSpread(_objectSpread({}, r), {}, {
+      schemaName: schemaName
+    });
   },
       peg$c24 = function peg$c24(name, body) {
     var ref = {
@@ -281,17 +290,17 @@ function peg$parse(input, options) {
     Object.assign(ref, body.settings);
     return ref;
   },
-      peg$c25 = ".",
-      peg$c26 = peg$literalExpectation(".", false),
-      peg$c27 = function peg$c27(table1, field1, relation, table2, field2, ref_settings) {
+      peg$c25 = function peg$c25(field1, relation, field2, ref_settings) {
     var endpoints = [{
-      tableName: table1,
-      fieldNames: field1,
+      schemaName: field1.schemaName,
+      tableName: field1.tableName,
+      fieldNames: field1.fieldNames,
       relation: relation === ">" ? "*" : "1",
       token: location()
     }, {
-      tableName: table2,
-      fieldNames: field2,
+      schemaName: field2.schemaName,
+      tableName: field2.tableName,
+      fieldNames: field2.fieldNames,
       relation: relation === "<" ? "*" : "1",
       token: location()
     }];
@@ -300,28 +309,28 @@ function peg$parse(input, options) {
       settings: ref_settings
     };
   },
-      peg$c28 = function peg$c28(field) {
+      peg$c26 = function peg$c26(field) {
     if (typeof field === "string") field = [field];
     return field;
   },
-      peg$c29 = function peg$c29(field) {
+      peg$c27 = function peg$c27(field) {
     return field;
   },
-      peg$c30 = "(",
-      peg$c31 = peg$literalExpectation("(", false),
-      peg$c32 = ")",
-      peg$c33 = peg$literalExpectation(")", false),
-      peg$c34 = function peg$c34(first, rest) {
+      peg$c28 = "(",
+      peg$c29 = peg$literalExpectation("(", false),
+      peg$c30 = ")",
+      peg$c31 = peg$literalExpectation(")", false),
+      peg$c32 = function peg$c32(first, rest) {
     var arrField = [first].concat(rest.map(function (el) {
       return el[3];
     }));
     return arrField;
   },
-      peg$c35 = "[",
-      peg$c36 = peg$literalExpectation("[", false),
-      peg$c37 = "]",
-      peg$c38 = peg$literalExpectation("]", false),
-      peg$c39 = function peg$c39(first, rest) {
+      peg$c33 = "[",
+      peg$c34 = peg$literalExpectation("[", false),
+      peg$c35 = "]",
+      peg$c36 = peg$literalExpectation("]", false),
+      peg$c37 = function peg$c37(first, rest) {
     var arrSettings = [first].concat(rest.map(function (el) {
       return el[1];
     }));
@@ -337,26 +346,26 @@ function peg$parse(input, options) {
     });
     return res;
   },
-      peg$c40 = function peg$c40(v) {
+      peg$c38 = function peg$c38(v) {
     return {
       type: 'update',
       value: v
     };
   },
-      peg$c41 = function peg$c41(v) {
+      peg$c39 = function peg$c39(v) {
     return {
       type: 'delete',
       value: v
     };
   },
-      peg$c42 = "update:",
-      peg$c43 = peg$literalExpectation("update:", true),
-      peg$c44 = function peg$c44(val) {
+      peg$c40 = "update:",
+      peg$c41 = peg$literalExpectation("update:", true),
+      peg$c42 = function peg$c42(val) {
     return val;
   },
-      peg$c45 = "delete:",
-      peg$c46 = peg$literalExpectation("delete:", true),
-      peg$c47 = function peg$c47(name, alias, table_settings, body) {
+      peg$c43 = "delete:",
+      peg$c44 = peg$literalExpectation("delete:", true),
+      peg$c45 = function peg$c45(schemaName, name, alias, table_settings, body) {
     var fields = body.fields || [];
     var indexes = body.indexes || []; // Handle list of partial inline_refs
 
@@ -364,17 +373,20 @@ function peg$parse(input, options) {
     fields.forEach(function (field) {
       (field.inline_refs || []).forEach(function (iref) {
         var endpoints = [{
+          schemaName: iref.schemaName,
           tableName: iref.tableName,
           fieldNames: iref.fieldNames,
           relation: iref.relation === "<" ? "*" : "1",
           token: iref.token
         }, {
+          schemaName: schemaName,
           tableName: name,
           fieldNames: [field.name],
           relation: iref.relation === ">" ? "*" : "1",
           token: iref.token
         }];
         var ref = {
+          schemaName: schemaName,
           name: null,
           // no name
           endpoints: endpoints,
@@ -384,8 +396,23 @@ function peg$parse(input, options) {
       });
     });
 
+    if (alias) {
+      if (data.aliases.find(function (a) {
+        return a.name === alias;
+      })) error("Alias \"".concat(alias, "\" is already defined"));
+      data.aliases.push({
+        name: alias,
+        kind: 'table',
+        value: {
+          tableName: name,
+          schemaName: schemaName
+        }
+      });
+    }
+
     var res = _objectSpread({
       name: name,
+      schemaName: schemaName,
       alias: alias,
       fields: fields,
       token: location(),
@@ -393,14 +420,14 @@ function peg$parse(input, options) {
     }, table_settings);
 
     if (body.note) {
-      res = _objectSpread({}, res, {
+      res = _objectSpread(_objectSpread({}, res), {}, {
         note: body.note
       });
     }
 
     return res;
   },
-      peg$c48 = function peg$c48(fields, elements) {
+      peg$c46 = function peg$c46(fields, elements) {
     // concat all indexes
     var indexes = _.flatMap(elements.filter(function (ele) {
       return ele.type === 'indexes';
@@ -444,16 +471,18 @@ function peg$parse(input, options) {
       note: note ? note.value : null
     };
   },
-      peg$c49 = function peg$c49(indexes) {
+      peg$c47 = function peg$c47(indexes) {
     return {
       type: 'indexes',
       value: indexes
     };
   },
-      peg$c50 = function peg$c50(name, type, constrains, field_settings) {
+      peg$c48 = function peg$c48(name, typeSchemaName, type, constrains, field_settings) {
     var field = {
       name: name,
-      type: type,
+      type: _objectSpread({
+        schemaName: typeSchemaName
+      }, type),
       token: location(),
       inline_refs: []
     };
@@ -467,19 +496,20 @@ function peg$parse(input, options) {
 
     return field;
   },
-      peg$c51 = function peg$c51(name, body) {
+      peg$c49 = function peg$c49(schemaName, name, body) {
     return {
       name: name,
+      schemaName: schemaName,
       token: location(),
       values: body.enum_values
     };
   },
-      peg$c52 = function peg$c52(enum_values) {
+      peg$c50 = function peg$c50(enum_values) {
     return {
       enum_values: enum_values
     };
   },
-      peg$c53 = function peg$c53(name, enum_setting) {
+      peg$c51 = function peg$c51(name, enum_setting) {
     var enum_value = {
       name: name,
       token: location()
@@ -487,12 +517,12 @@ function peg$parse(input, options) {
     Object.assign(enum_value, enum_setting);
     return enum_value;
   },
-      peg$c54 = function peg$c54(v) {
+      peg$c52 = function peg$c52(v) {
     return {
       note: v
     };
   },
-      peg$c55 = function peg$c55(first, rest) {
+      peg$c53 = function peg$c53(first, rest) {
     var arrSettings = [first].concat(rest.map(function (el) {
       return el[1];
     }));
@@ -536,7 +566,7 @@ function peg$parse(input, options) {
     });
     return res;
   },
-      peg$c56 = function peg$c56(first, rest) {
+      peg$c54 = function peg$c54(first, rest) {
     var settings = [first].concat(_toConsumableArray(rest.map(function (el) {
       return el[1];
     })));
@@ -554,52 +584,52 @@ function peg$parse(input, options) {
     });
     return result;
   },
-      peg$c57 = function peg$c57(v) {
+      peg$c55 = function peg$c55(v) {
     return {
       type: 'note',
       value: v
     };
   },
-      peg$c58 = function peg$c58(c) {
+      peg$c56 = function peg$c56(c) {
     return c;
   },
-      peg$c59 = "not null",
-      peg$c60 = peg$literalExpectation("not null", true),
-      peg$c61 = function peg$c61(a) {
+      peg$c57 = "not null",
+      peg$c58 = peg$literalExpectation("not null", true),
+      peg$c59 = function peg$c59(a) {
     return a;
   },
-      peg$c62 = "null",
-      peg$c63 = peg$literalExpectation("null", true),
-      peg$c64 = "primary key",
-      peg$c65 = peg$literalExpectation("primary key", true),
-      peg$c66 = "pk",
-      peg$c67 = peg$literalExpectation("pk", true),
-      peg$c68 = "unique",
-      peg$c69 = peg$literalExpectation("unique", true),
-      peg$c70 = "increment",
-      peg$c71 = peg$literalExpectation("increment", false),
-      peg$c72 = function peg$c72(v) {
+      peg$c60 = "null",
+      peg$c61 = peg$literalExpectation("null", true),
+      peg$c62 = "primary key",
+      peg$c63 = peg$literalExpectation("primary key", true),
+      peg$c64 = "pk",
+      peg$c65 = peg$literalExpectation("pk", true),
+      peg$c66 = "unique",
+      peg$c67 = peg$literalExpectation("unique", true),
+      peg$c68 = "increment",
+      peg$c69 = peg$literalExpectation("increment", false),
+      peg$c70 = function peg$c70(v) {
     return {
       type: 'ref_inline',
       value: v
     };
   },
-      peg$c73 = function peg$c73(v) {
+      peg$c71 = function peg$c71(v) {
     return {
       type: 'default',
       value: v
     };
   },
-      peg$c74 = function peg$c74(body) {
+      peg$c72 = function peg$c72(body) {
     return body;
   },
-      peg$c75 = function peg$c75(index) {
+      peg$c73 = function peg$c73(index) {
     return index;
   },
-      peg$c76 = function peg$c76(index) {
+      peg$c74 = function peg$c74(index) {
     return index;
   },
-      peg$c77 = function peg$c77(syntax, index_settings) {
+      peg$c75 = function peg$c75(syntax, index_settings) {
     var index = {
       columns: [syntax],
       token: location()
@@ -607,7 +637,7 @@ function peg$parse(input, options) {
     Object.assign(index, index_settings);
     return index;
   },
-      peg$c78 = function peg$c78(syntax, index_settings) {
+      peg$c76 = function peg$c76(syntax, index_settings) {
     var index = {
       columns: syntax,
       token: location()
@@ -615,35 +645,35 @@ function peg$parse(input, options) {
     Object.assign(index, index_settings);
     return index;
   },
-      peg$c79 = function peg$c79(column) {
+      peg$c77 = function peg$c77(column) {
     var singleIndex = {
       value: column,
       type: 'column'
     };
     return singleIndex;
   },
-      peg$c80 = "`",
-      peg$c81 = peg$literalExpectation("`", false),
-      peg$c82 = /^[^`]/,
-      peg$c83 = peg$classExpectation(["`"], true, false),
-      peg$c84 = function peg$c84(text) {
+      peg$c78 = "`",
+      peg$c79 = peg$literalExpectation("`", false),
+      peg$c80 = /^[^`]/,
+      peg$c81 = peg$classExpectation(["`"], true, false),
+      peg$c82 = function peg$c82(text) {
     return {
       value: text.join(""),
       type: 'expression'
     };
   },
-      peg$c85 = function peg$c85(first, rest) {
+      peg$c83 = function peg$c83(first, rest) {
     var arrIndex = [first].concat(rest.map(function (el) {
       return el[2];
     }));
     return arrIndex;
   },
-      peg$c86 = function peg$c86() {
+      peg$c84 = function peg$c84() {
     return {
       pk: true
     };
   },
-      peg$c87 = function peg$c87(first, rest) {
+      peg$c85 = function peg$c85(first, rest) {
     var arrSettings = [first].concat(rest.map(function (el) {
       return el[1];
     }));
@@ -657,120 +687,155 @@ function peg$parse(input, options) {
     });
     return res;
   },
-      peg$c88 = function peg$c88(v) {
+      peg$c86 = function peg$c86(v) {
     return {
       type: 'name',
       value: v
     };
   },
-      peg$c89 = function peg$c89(v) {
+      peg$c87 = function peg$c87(v) {
     return {
       type: 'type',
       value: v
     };
   },
-      peg$c90 = "name:",
-      peg$c91 = peg$literalExpectation("name:", true),
-      peg$c92 = function peg$c92(val) {
+      peg$c88 = "name:",
+      peg$c89 = peg$literalExpectation("name:", true),
+      peg$c90 = function peg$c90(val) {
     return val.value;
   },
-      peg$c93 = function peg$c93(note) {
+      peg$c91 = function peg$c91(note) {
     return note;
   },
-      peg$c94 = "note",
-      peg$c95 = peg$literalExpectation("note", true),
-      peg$c96 = "note:",
-      peg$c97 = peg$literalExpectation("note:", true),
-      peg$c98 = "type:",
-      peg$c99 = peg$literalExpectation("type:", true),
-      peg$c100 = "ref:",
-      peg$c101 = peg$literalExpectation("ref:", false),
-      peg$c102 = function peg$c102(relation, table2, field2) {
+      peg$c92 = "note",
+      peg$c93 = peg$literalExpectation("note", true),
+      peg$c94 = "note:",
+      peg$c95 = peg$literalExpectation("note:", true),
+      peg$c96 = "type:",
+      peg$c97 = peg$literalExpectation("type:", true),
+      peg$c98 = "ref:",
+      peg$c99 = peg$literalExpectation("ref:", false),
+      peg$c100 = function peg$c100(relation, field) {
     return {
-      tableName: table2,
-      fieldNames: [field2],
+      schemaName: field.schemaName,
+      tableName: field.tableName,
+      fieldNames: [field.fieldName],
       relation: relation,
       token: location()
     };
   },
-      peg$c103 = "default:",
-      peg$c104 = peg$literalExpectation("default:", true),
-      peg$c105 = function peg$c105(val) {
+      peg$c101 = "default:",
+      peg$c102 = peg$literalExpectation("default:", true),
+      peg$c103 = function peg$c103(val) {
     return val;
   },
-      peg$c106 = "as",
-      peg$c107 = peg$literalExpectation("as", false),
-      peg$c108 = function peg$c108(alias) {
+      peg$c104 = "as",
+      peg$c105 = peg$literalExpectation("as", false),
+      peg$c106 = function peg$c106(alias) {
     return alias;
   },
-      peg$c109 = function peg$c109(s, color) {
+      peg$c107 = function peg$c107(s, color) {
     return s + color.join('');
   },
-      peg$c110 = peg$otherExpectation("project"),
-      peg$c111 = "project",
-      peg$c112 = peg$literalExpectation("project", true),
-      peg$c113 = peg$otherExpectation("table"),
-      peg$c114 = "table",
-      peg$c115 = peg$literalExpectation("table", true),
-      peg$c116 = peg$literalExpectation("as", true),
-      peg$c117 = peg$otherExpectation("references"),
-      peg$c118 = "ref",
-      peg$c119 = peg$literalExpectation("ref", true),
-      peg$c120 = peg$otherExpectation("unique"),
-      peg$c121 = function peg$c121() {
+      peg$c108 = peg$otherExpectation("project"),
+      peg$c109 = "project",
+      peg$c110 = peg$literalExpectation("project", true),
+      peg$c111 = peg$otherExpectation("table"),
+      peg$c112 = "table",
+      peg$c113 = peg$literalExpectation("table", true),
+      peg$c114 = peg$literalExpectation("as", true),
+      peg$c115 = peg$otherExpectation("references"),
+      peg$c116 = "ref",
+      peg$c117 = peg$literalExpectation("ref", true),
+      peg$c118 = peg$otherExpectation("unique"),
+      peg$c119 = function peg$c119() {
     return {
       unique: true
     };
   },
-      peg$c122 = peg$otherExpectation("PK"),
-      peg$c123 = function peg$c123() {
+      peg$c120 = peg$otherExpectation("PK"),
+      peg$c121 = function peg$c121() {
     return {
       pk: true
     };
   },
-      peg$c124 = peg$otherExpectation("indexes"),
-      peg$c125 = "indexes",
-      peg$c126 = peg$literalExpectation("indexes", true),
-      peg$c127 = peg$otherExpectation("btree"),
-      peg$c128 = "btree",
-      peg$c129 = peg$literalExpectation("btree", true),
-      peg$c130 = peg$otherExpectation("hash"),
-      peg$c131 = "hash",
-      peg$c132 = peg$literalExpectation("hash", true),
-      peg$c133 = peg$otherExpectation("enum"),
-      peg$c134 = "enum",
-      peg$c135 = peg$literalExpectation("enum", true),
-      peg$c136 = "headercolor",
-      peg$c137 = peg$literalExpectation("headercolor", true),
-      peg$c138 = peg$otherExpectation("Table Group"),
-      peg$c139 = "tablegroup",
-      peg$c140 = peg$literalExpectation("TableGroup", true),
-      peg$c141 = peg$otherExpectation("no action"),
-      peg$c142 = "no action",
-      peg$c143 = peg$literalExpectation("no action", true),
-      peg$c144 = peg$otherExpectation("restrict"),
-      peg$c145 = "restrict",
-      peg$c146 = peg$literalExpectation("restrict", true),
-      peg$c147 = peg$otherExpectation("cascade"),
-      peg$c148 = "cascade",
-      peg$c149 = peg$literalExpectation("cascade", true),
-      peg$c150 = peg$otherExpectation("set null"),
-      peg$c151 = "set null",
-      peg$c152 = peg$literalExpectation("set null", true),
-      peg$c153 = peg$otherExpectation("set default"),
-      peg$c154 = "set default",
-      peg$c155 = peg$literalExpectation("set default", true),
-      peg$c156 = peg$otherExpectation(">, - or <"),
-      peg$c157 = /^[>\-<]/,
-      peg$c158 = peg$classExpectation([">", "-", "<"], false, false),
-      peg$c159 = peg$otherExpectation("valid name"),
-      peg$c160 = function peg$c160(c) {
+      peg$c122 = peg$otherExpectation("indexes"),
+      peg$c123 = "indexes",
+      peg$c124 = peg$literalExpectation("indexes", true),
+      peg$c125 = peg$otherExpectation("btree"),
+      peg$c126 = "btree",
+      peg$c127 = peg$literalExpectation("btree", true),
+      peg$c128 = peg$otherExpectation("hash"),
+      peg$c129 = "hash",
+      peg$c130 = peg$literalExpectation("hash", true),
+      peg$c131 = peg$otherExpectation("enum"),
+      peg$c132 = "enum",
+      peg$c133 = peg$literalExpectation("enum", true),
+      peg$c134 = "headercolor",
+      peg$c135 = peg$literalExpectation("headercolor", true),
+      peg$c136 = peg$otherExpectation("Table Group"),
+      peg$c137 = "tablegroup",
+      peg$c138 = peg$literalExpectation("TableGroup", true),
+      peg$c139 = peg$otherExpectation("no action"),
+      peg$c140 = "no action",
+      peg$c141 = peg$literalExpectation("no action", true),
+      peg$c142 = peg$otherExpectation("restrict"),
+      peg$c143 = "restrict",
+      peg$c144 = peg$literalExpectation("restrict", true),
+      peg$c145 = peg$otherExpectation("cascade"),
+      peg$c146 = "cascade",
+      peg$c147 = peg$literalExpectation("cascade", true),
+      peg$c148 = peg$otherExpectation("set null"),
+      peg$c149 = "set null",
+      peg$c150 = peg$literalExpectation("set null", true),
+      peg$c151 = peg$otherExpectation("set default"),
+      peg$c152 = "set default",
+      peg$c153 = peg$literalExpectation("set default", true),
+      peg$c154 = peg$otherExpectation(">, - or <"),
+      peg$c155 = /^[>\-<]/,
+      peg$c156 = peg$classExpectation([">", "-", "<"], false, false),
+      peg$c157 = peg$otherExpectation("valid name"),
+      peg$c158 = function peg$c158(c) {
     return c.join("");
   },
-      peg$c161 = /^[^"\n]/,
-      peg$c162 = peg$classExpectation(["\"", "\n"], true, false),
-      peg$c163 = peg$otherExpectation("type"),
-      peg$c164 = function peg$c164(type_name, args) {
+      peg$c159 = /^[^"\n]/,
+      peg$c160 = peg$classExpectation(["\"", "\n"], true, false),
+      peg$c161 = peg$otherExpectation("schema name"),
+      peg$c162 = ".",
+      peg$c163 = peg$literalExpectation(".", false),
+      peg$c164 = function peg$c164(name) {
+    return name;
+  },
+      peg$c165 = function peg$c165(schemaName, tableName, fieldNames) {
+    return {
+      schemaName: schemaName,
+      tableName: tableName,
+      fieldNames: fieldNames
+    };
+  },
+      peg$c166 = function peg$c166(tableName, fieldNames) {
+    return {
+      schemaName: null,
+      tableName: tableName,
+      fieldNames: fieldNames
+    };
+  },
+      peg$c167 = function peg$c167(schemaName, tableName, fieldName) {
+    return {
+      schemaName: schemaName,
+      tableName: tableName,
+      fieldName: fieldName
+    };
+  },
+      peg$c168 = function peg$c168(tableName, fieldName) {
+    return {
+      schemaName: null,
+      tableName: tableName,
+      fieldName: fieldName
+    };
+  },
+      peg$c169 = peg$otherExpectation("type"),
+      peg$c170 = function peg$c170(type_name, args) {
     args = args ? args[3] : null;
 
     if (type_name.toLowerCase() !== 'enum') {
@@ -782,72 +847,76 @@ function peg$parse(input, options) {
       args: args
     };
   },
-      peg$c165 = peg$otherExpectation("expression"),
-      peg$c166 = function peg$c166(factors) {
+      peg$c171 = peg$otherExpectation("expression"),
+      peg$c172 = function peg$c172(factors) {
     return _.flattenDeep(factors).join("");
   },
-      peg$c167 = ",",
-      peg$c168 = peg$literalExpectation(",", false),
-      peg$c169 = ");",
-      peg$c170 = peg$literalExpectation(");", false),
-      peg$c171 = peg$anyExpectation(),
-      peg$c172 = function peg$c172(factors) {
+      peg$c173 = ",",
+      peg$c174 = peg$literalExpectation(",", false),
+      peg$c175 = ");",
+      peg$c176 = peg$literalExpectation(");", false),
+      peg$c177 = peg$anyExpectation(),
+      peg$c178 = function peg$c178(factors) {
     return _.flattenDeep(factors).join("");
   },
-      peg$c173 = /^[',.a-z0-9_+-`]/i,
-      peg$c174 = peg$classExpectation(["'", ",", ".", ["a", "z"], ["0", "9"], "_", ["+", "`"]], false, true),
-      peg$c175 = /^['.a-z0-9_+\-]/i,
-      peg$c176 = peg$classExpectation(["'", ".", ["a", "z"], ["0", "9"], "_", "+", "-"], false, true),
-      peg$c177 = function peg$c177() {
+      peg$c179 = /^[',.a-z0-9_+-`]/i,
+      peg$c180 = peg$classExpectation(["'", ",", ".", ["a", "z"], ["0", "9"], "_", ["+", "`"]], false, true),
+      peg$c181 = /^['.a-z0-9_+\-]/i,
+      peg$c182 = peg$classExpectation(["'", ".", ["a", "z"], ["0", "9"], "_", "+", "-"], false, true),
+      peg$c183 = function peg$c183() {
     return text();
   },
-      peg$c178 = /^[[\]]/,
-      peg$c179 = peg$classExpectation(["[", "]"], false, false),
-      peg$c180 = peg$otherExpectation("letter, number or underscore"),
-      peg$c181 = /^[a-z0-9_]/i,
-      peg$c182 = peg$classExpectation([["a", "z"], ["0", "9"], "_"], false, true),
-      peg$c183 = /^[0-9a-fA-F]/,
-      peg$c184 = peg$classExpectation([["0", "9"], ["a", "f"], ["A", "F"]], false, false),
-      peg$c185 = function peg$c185(c) {
+      peg$c184 = /^[[\]]/,
+      peg$c185 = peg$classExpectation(["[", "]"], false, false),
+      peg$c186 = peg$otherExpectation("letter, number or underscore"),
+      peg$c187 = /^[a-z0-9_]/i,
+      peg$c188 = peg$classExpectation([["a", "z"], ["0", "9"], "_"], false, true),
+      peg$c189 = /^[0-9a-fA-F]/,
+      peg$c190 = peg$classExpectation([["0", "9"], ["a", "f"], ["A", "F"]], false, false),
+      peg$c191 = function peg$c191(c) {
     return c.toLowerCase();
   },
-      peg$c186 = "\"",
-      peg$c187 = peg$literalExpectation("\"", false),
-      peg$c188 = peg$otherExpectation("endline"),
-      peg$c189 = "\t",
-      peg$c190 = peg$literalExpectation("\t", false),
-      peg$c191 = peg$otherExpectation("comment"),
-      peg$c192 = "//",
-      peg$c193 = peg$literalExpectation("//", false),
-      peg$c194 = /^[^\n]/,
-      peg$c195 = peg$classExpectation(["\n"], true, false),
-      peg$c196 = peg$otherExpectation("newline"),
-      peg$c197 = "\r\n",
-      peg$c198 = peg$literalExpectation("\r\n", false),
-      peg$c199 = "\n",
-      peg$c200 = peg$literalExpectation("\n", false),
-      peg$c201 = peg$otherExpectation("whitespace"),
-      peg$c202 = /^[ \t\r\n\r]/,
-      peg$c203 = peg$classExpectation([" ", "\t", "\r", "\n", "\r"], false, false),
-      peg$c204 = /^[ \t\r\n\r"]/,
-      peg$c205 = peg$classExpectation([" ", "\t", "\r", "\n", "\r", "\""], false, false),
-      peg$c206 = " ",
-      peg$c207 = peg$literalExpectation(" ", false),
-      peg$c208 = "#",
-      peg$c209 = peg$literalExpectation("#", false),
-      peg$c210 = function peg$c210() {
+      peg$c192 = "\"",
+      peg$c193 = peg$literalExpectation("\"", false),
+      peg$c194 = peg$otherExpectation("endline"),
+      peg$c195 = "\t",
+      peg$c196 = peg$literalExpectation("\t", false),
+      peg$c197 = "//",
+      peg$c198 = peg$literalExpectation("//", false),
+      peg$c199 = /^[^\n]/,
+      peg$c200 = peg$classExpectation(["\n"], true, false),
+      peg$c201 = "/*",
+      peg$c202 = peg$literalExpectation("/*", false),
+      peg$c203 = "*/",
+      peg$c204 = peg$literalExpectation("*/", false),
+      peg$c205 = peg$otherExpectation("comment"),
+      peg$c206 = peg$otherExpectation("newline"),
+      peg$c207 = "\r\n",
+      peg$c208 = peg$literalExpectation("\r\n", false),
+      peg$c209 = "\n",
+      peg$c210 = peg$literalExpectation("\n", false),
+      peg$c211 = peg$otherExpectation("whitespace"),
+      peg$c212 = /^[ \t\r\n\r]/,
+      peg$c213 = peg$classExpectation([" ", "\t", "\r", "\n", "\r"], false, false),
+      peg$c214 = /^[ \t\r\n\r"]/,
+      peg$c215 = peg$classExpectation([" ", "\t", "\r", "\n", "\r", "\""], false, false),
+      peg$c216 = " ",
+      peg$c217 = peg$literalExpectation(" ", false),
+      peg$c218 = "#",
+      peg$c219 = peg$literalExpectation("#", false),
+      peg$c220 = function peg$c220() {
     return "#";
   },
-      peg$c211 = peg$otherExpectation("string"),
-      peg$c212 = function peg$c212(chars) {
+      peg$c221 = peg$otherExpectation("string"),
+      peg$c222 = function peg$c222(chars) {
     return {
       value: chars.join(''),
       type: 'string'
     };
   },
-      peg$c213 = "'''",
-      peg$c214 = peg$literalExpectation("'''", false),
-      peg$c215 = function peg$c215(chars) {
+      peg$c223 = "'''",
+      peg$c224 = peg$literalExpectation("'''", false),
+      peg$c225 = function peg$c225(chars) {
     var str = chars.join(''); // // replace line continuation using look around, but this is not compatible with firefox, safari.
     // str = str.replace(/(?<!\\)\\(?!\\)(?:\n|\r\n)?/g, ''); 
     // str = str.replace(/\\\\/, '\\');
@@ -891,53 +960,55 @@ function peg$parse(input, options) {
       type: 'string'
     };
   },
-      peg$c216 = "'",
-      peg$c217 = peg$literalExpectation("'", false),
-      peg$c218 = "\\",
-      peg$c219 = peg$literalExpectation("\\", false),
-      peg$c220 = function peg$c220() {
+      peg$c226 = "'",
+      peg$c227 = peg$literalExpectation("'", false),
+      peg$c228 = "\\",
+      peg$c229 = peg$literalExpectation("\\", false),
+      peg$c230 = function peg$c230() {
     return '"';
   },
-      peg$c221 = function peg$c221() {
+      peg$c231 = function peg$c231() {
     return text();
   },
-      peg$c222 = "\\'",
-      peg$c223 = peg$literalExpectation("\\'", false),
-      peg$c224 = function peg$c224() {
+      peg$c232 = "\\'",
+      peg$c233 = peg$literalExpectation("\\'", false),
+      peg$c234 = function peg$c234() {
     return "'";
   },
-      peg$c225 = function peg$c225(bl) {
+      peg$c235 = function peg$c235(bl) {
     // escape character \. \\n => \n. Remove one backslash in the result string.
     return bl.join('');
   },
-      peg$c226 = function peg$c226() {
+      peg$c236 = function peg$c236() {
     // replace line continuation
     return '';
   },
-      peg$c227 = /^[0-9]/,
-      peg$c228 = peg$classExpectation([["0", "9"]], false, false),
-      peg$c229 = "=",
-      peg$c230 = peg$literalExpectation("=", false),
-      peg$c231 = "true",
-      peg$c232 = peg$literalExpectation("true", true),
-      peg$c233 = "false",
-      peg$c234 = peg$literalExpectation("false", true),
-      peg$c235 = function peg$c235(_boolean) {
+      peg$c237 = /^[0-9]/,
+      peg$c238 = peg$classExpectation([["0", "9"]], false, false),
+      peg$c239 = "=",
+      peg$c240 = peg$literalExpectation("=", false),
+      peg$c241 = "true",
+      peg$c242 = peg$literalExpectation("true", true),
+      peg$c243 = "false",
+      peg$c244 = peg$literalExpectation("false", true),
+      peg$c245 = function peg$c245(_boolean) {
     return {
       type: 'boolean',
       value: _boolean
     };
   },
-      peg$c236 = function peg$c236(number) {
+      peg$c246 = "-",
+      peg$c247 = peg$literalExpectation("-", false),
+      peg$c248 = function peg$c248(minus, number) {
     return {
       type: 'number',
-      value: number
+      value: minus ? -number : number
     };
   },
-      peg$c237 = function peg$c237(left, right) {
+      peg$c249 = function peg$c249(left, right) {
     return parseFloat(left.join("") + "." + right.join(""));
   },
-      peg$c238 = function peg$c238(digits) {
+      peg$c250 = function peg$c250(digits) {
     return parseInt(digits.join(""), 10);
   },
       peg$currPos = 0,
@@ -1533,7 +1604,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseTableGroupSyntax() {
-    var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9;
+    var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10;
     s0 = peg$currPos;
     s1 = peg$parsetable_group();
 
@@ -1551,48 +1622,59 @@ function peg$parse(input, options) {
       }
 
       if (s2 !== peg$FAILED) {
-        s3 = peg$parsename();
+        s3 = peg$parseschema_name();
+
+        if (s3 === peg$FAILED) {
+          s3 = null;
+        }
 
         if (s3 !== peg$FAILED) {
-          s4 = peg$parse_();
+          s4 = peg$parsename();
 
           if (s4 !== peg$FAILED) {
-            if (input.charCodeAt(peg$currPos) === 123) {
-              s5 = peg$c6;
-              peg$currPos++;
-            } else {
-              s5 = peg$FAILED;
-
-              if (peg$silentFails === 0) {
-                peg$fail(peg$c7);
-              }
-            }
+            s5 = peg$parse_();
 
             if (s5 !== peg$FAILED) {
-              s6 = peg$parse_();
+              if (input.charCodeAt(peg$currPos) === 123) {
+                s6 = peg$c6;
+                peg$currPos++;
+              } else {
+                s6 = peg$FAILED;
+
+                if (peg$silentFails === 0) {
+                  peg$fail(peg$c7);
+                }
+              }
 
               if (s6 !== peg$FAILED) {
-                s7 = peg$parsetable_group_body();
+                s7 = peg$parse_();
 
                 if (s7 !== peg$FAILED) {
-                  s8 = peg$parse_();
+                  s8 = peg$parsetable_group_body();
 
                   if (s8 !== peg$FAILED) {
-                    if (input.charCodeAt(peg$currPos) === 125) {
-                      s9 = peg$c8;
-                      peg$currPos++;
-                    } else {
-                      s9 = peg$FAILED;
+                    s9 = peg$parse_();
 
-                      if (peg$silentFails === 0) {
-                        peg$fail(peg$c9);
+                    if (s9 !== peg$FAILED) {
+                      if (input.charCodeAt(peg$currPos) === 125) {
+                        s10 = peg$c8;
+                        peg$currPos++;
+                      } else {
+                        s10 = peg$FAILED;
+
+                        if (peg$silentFails === 0) {
+                          peg$fail(peg$c9);
+                        }
                       }
-                    }
 
-                    if (s9 !== peg$FAILED) {
-                      peg$savedPos = s0;
-                      s1 = peg$c21(s3, s7);
-                      s0 = s1;
+                      if (s10 !== peg$FAILED) {
+                        peg$savedPos = s0;
+                        s1 = peg$c21(s3, s4, s8);
+                        s0 = s1;
+                      } else {
+                        peg$currPos = s0;
+                        s0 = peg$FAILED;
+                      }
                     } else {
                       peg$currPos = s0;
                       s0 = peg$FAILED;
@@ -1634,18 +1716,29 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetable_group_body() {
-    var s0, s1, s2, s3, s4;
+    var s0, s1, s2, s3, s4, s5;
     s0 = peg$currPos;
     s1 = [];
     s2 = peg$currPos;
-    s3 = peg$parsename();
+    s3 = peg$parseschema_name();
+
+    if (s3 === peg$FAILED) {
+      s3 = null;
+    }
 
     if (s3 !== peg$FAILED) {
-      s4 = peg$parse__();
+      s4 = peg$parsename();
 
       if (s4 !== peg$FAILED) {
-        s3 = [s3, s4];
-        s2 = s3;
+        s5 = peg$parse__();
+
+        if (s5 !== peg$FAILED) {
+          s3 = [s3, s4, s5];
+          s2 = s3;
+        } else {
+          peg$currPos = s2;
+          s2 = peg$FAILED;
+        }
       } else {
         peg$currPos = s2;
         s2 = peg$FAILED;
@@ -1658,14 +1751,25 @@ function peg$parse(input, options) {
     while (s2 !== peg$FAILED) {
       s1.push(s2);
       s2 = peg$currPos;
-      s3 = peg$parsename();
+      s3 = peg$parseschema_name();
+
+      if (s3 === peg$FAILED) {
+        s3 = null;
+      }
 
       if (s3 !== peg$FAILED) {
-        s4 = peg$parse__();
+        s4 = peg$parsename();
 
         if (s4 !== peg$FAILED) {
-          s3 = [s3, s4];
-          s2 = s3;
+          s5 = peg$parse__();
+
+          if (s5 !== peg$FAILED) {
+            s3 = [s3, s4, s5];
+            s2 = s3;
+          } else {
+            peg$currPos = s2;
+            s2 = peg$FAILED;
+          }
         } else {
           peg$currPos = s2;
           s2 = peg$FAILED;
@@ -1911,24 +2015,25 @@ function peg$parse(input, options) {
   }
 
   function peg$parseref_body() {
-    var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11;
+    var s0, s1, s2, s3, s4, s5, s6, s7;
     s0 = peg$currPos;
-    s1 = peg$parsename();
+    s1 = peg$parsefield_identifier();
 
     if (s1 !== peg$FAILED) {
-      if (input.charCodeAt(peg$currPos) === 46) {
-        s2 = peg$c25;
-        peg$currPos++;
-      } else {
-        s2 = peg$FAILED;
+      s2 = [];
+      s3 = peg$parsesp();
 
-        if (peg$silentFails === 0) {
-          peg$fail(peg$c26);
+      if (s3 !== peg$FAILED) {
+        while (s3 !== peg$FAILED) {
+          s2.push(s3);
+          s3 = peg$parsesp();
         }
+      } else {
+        s2 = peg$FAILED;
       }
 
       if (s2 !== peg$FAILED) {
-        s3 = peg$parseRefField();
+        s3 = peg$parserelation();
 
         if (s3 !== peg$FAILED) {
           s4 = [];
@@ -1944,75 +2049,28 @@ function peg$parse(input, options) {
           }
 
           if (s4 !== peg$FAILED) {
-            s5 = peg$parserelation();
+            s5 = peg$parsefield_identifier();
 
             if (s5 !== peg$FAILED) {
               s6 = [];
               s7 = peg$parsesp();
 
-              if (s7 !== peg$FAILED) {
-                while (s7 !== peg$FAILED) {
-                  s6.push(s7);
-                  s7 = peg$parsesp();
-                }
-              } else {
-                s6 = peg$FAILED;
+              while (s7 !== peg$FAILED) {
+                s6.push(s7);
+                s7 = peg$parsesp();
               }
 
               if (s6 !== peg$FAILED) {
-                s7 = peg$parsename();
-
-                if (s7 !== peg$FAILED) {
-                  if (input.charCodeAt(peg$currPos) === 46) {
-                    s8 = peg$c25;
-                    peg$currPos++;
-                  } else {
-                    s8 = peg$FAILED;
-
-                    if (peg$silentFails === 0) {
-                      peg$fail(peg$c26);
-                    }
-                  }
-
-                  if (s8 !== peg$FAILED) {
-                    s9 = peg$parseRefField();
-
-                    if (s9 !== peg$FAILED) {
-                      s10 = [];
-                      s11 = peg$parsesp();
-
-                      while (s11 !== peg$FAILED) {
-                        s10.push(s11);
-                        s11 = peg$parsesp();
-                      }
-
-                      if (s10 !== peg$FAILED) {
-                        s11 = peg$parseRefSettings();
+                s7 = peg$parseRefSettings();
 
-                        if (s11 === peg$FAILED) {
-                          s11 = null;
-                        }
+                if (s7 === peg$FAILED) {
+                  s7 = null;
+                }
 
-                        if (s11 !== peg$FAILED) {
-                          peg$savedPos = s0;
-                          s1 = peg$c27(s1, s3, s5, s7, s9, s11);
-                          s0 = s1;
-                        } else {
-                          peg$currPos = s0;
-                          s0 = peg$FAILED;
-                        }
-                      } else {
-                        peg$currPos = s0;
-                        s0 = peg$FAILED;
-                      }
-                    } else {
-                      peg$currPos = s0;
-                      s0 = peg$FAILED;
-                    }
-                  } else {
-                    peg$currPos = s0;
-                    s0 = peg$FAILED;
-                  }
+                if (s7 !== peg$FAILED) {
+                  peg$savedPos = s0;
+                  s1 = peg$c25(s1, s3, s5, s7);
+                  s0 = s1;
                 } else {
                   peg$currPos = s0;
                   s0 = peg$FAILED;
@@ -2056,7 +2114,7 @@ function peg$parse(input, options) {
 
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$c28(s1);
+      s1 = peg$c26(s1);
     }
 
     s0 = s1;
@@ -2070,7 +2128,7 @@ function peg$parse(input, options) {
 
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$c29(s1);
+      s1 = peg$c27(s1);
     }
 
     s0 = s1;
@@ -2082,13 +2140,13 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
 
     if (input.charCodeAt(peg$currPos) === 40) {
-      s1 = peg$c30;
+      s1 = peg$c28;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c31);
+        peg$fail(peg$c29);
       }
     }
 
@@ -2208,19 +2266,19 @@ function peg$parse(input, options) {
 
             if (s5 !== peg$FAILED) {
               if (input.charCodeAt(peg$currPos) === 41) {
-                s6 = peg$c32;
+                s6 = peg$c30;
                 peg$currPos++;
               } else {
                 s6 = peg$FAILED;
 
                 if (peg$silentFails === 0) {
-                  peg$fail(peg$c33);
+                  peg$fail(peg$c31);
                 }
               }
 
               if (s6 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s1 = peg$c34(s3, s4);
+                s1 = peg$c32(s3, s4);
                 s0 = s1;
               } else {
                 peg$currPos = s0;
@@ -2255,13 +2313,13 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
 
     if (input.charCodeAt(peg$currPos) === 91) {
-      s1 = peg$c35;
+      s1 = peg$c33;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c36);
+        peg$fail(peg$c34);
       }
     }
 
@@ -2311,19 +2369,19 @@ function peg$parse(input, options) {
 
         if (s3 !== peg$FAILED) {
           if (input.charCodeAt(peg$currPos) === 93) {
-            s4 = peg$c37;
+            s4 = peg$c35;
             peg$currPos++;
           } else {
             s4 = peg$FAILED;
 
             if (peg$silentFails === 0) {
-              peg$fail(peg$c38);
+              peg$fail(peg$c36);
             }
           }
 
           if (s4 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$c39(s2, s3);
+            s1 = peg$c37(s2, s3);
             s0 = s1;
           } else {
             peg$currPos = s0;
@@ -2358,7 +2416,7 @@ function peg$parse(input, options) {
 
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$c40(s2);
+          s1 = peg$c38(s2);
           s0 = s1;
         } else {
           peg$currPos = s0;
@@ -2385,7 +2443,7 @@ function peg$parse(input, options) {
 
           if (s3 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$c41(s2);
+            s1 = peg$c39(s2);
             s0 = s1;
           } else {
             peg$currPos = s0;
@@ -2408,14 +2466,14 @@ function peg$parse(input, options) {
     var s0, s1, s2, s3;
     s0 = peg$currPos;
 
-    if (input.substr(peg$currPos, 7).toLowerCase() === peg$c42) {
+    if (input.substr(peg$currPos, 7).toLowerCase() === peg$c40) {
       s1 = input.substr(peg$currPos, 7);
       peg$currPos += 7;
     } else {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c43);
+        peg$fail(peg$c41);
       }
     }
 
@@ -2443,7 +2501,7 @@ function peg$parse(input, options) {
 
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$c44(s3);
+          s1 = peg$c42(s3);
           s0 = s1;
         } else {
           peg$currPos = s0;
@@ -2465,14 +2523,14 @@ function peg$parse(input, options) {
     var s0, s1, s2, s3;
     s0 = peg$currPos;
 
-    if (input.substr(peg$currPos, 7).toLowerCase() === peg$c45) {
+    if (input.substr(peg$currPos, 7).toLowerCase() === peg$c43) {
       s1 = input.substr(peg$currPos, 7);
       peg$currPos += 7;
     } else {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c46);
+        peg$fail(peg$c44);
       }
     }
 
@@ -2500,7 +2558,7 @@ function peg$parse(input, options) {
 
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$c44(s3);
+          s1 = peg$c42(s3);
           s0 = s1;
         } else {
           peg$currPos = s0;
@@ -2519,7 +2577,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseTableSyntax() {
-    var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10;
+    var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11;
     s0 = peg$currPos;
     s1 = peg$parsetable();
 
@@ -2537,65 +2595,76 @@ function peg$parse(input, options) {
       }
 
       if (s2 !== peg$FAILED) {
-        s3 = peg$parsename();
+        s3 = peg$parseschema_name();
 
-        if (s3 !== peg$FAILED) {
-          s4 = peg$parsealias_def();
+        if (s3 === peg$FAILED) {
+          s3 = null;
+        }
 
-          if (s4 === peg$FAILED) {
-            s4 = null;
-          }
+        if (s3 !== peg$FAILED) {
+          s4 = peg$parsename();
 
           if (s4 !== peg$FAILED) {
-            s5 = [];
-            s6 = peg$parsesp();
+            s5 = peg$parsealias_def();
 
-            while (s6 !== peg$FAILED) {
-              s5.push(s6);
-              s6 = peg$parsesp();
+            if (s5 === peg$FAILED) {
+              s5 = null;
             }
 
             if (s5 !== peg$FAILED) {
-              s6 = peg$parseTableSettings();
+              s6 = [];
+              s7 = peg$parsesp();
 
-              if (s6 === peg$FAILED) {
-                s6 = null;
+              while (s7 !== peg$FAILED) {
+                s6.push(s7);
+                s7 = peg$parsesp();
               }
 
               if (s6 !== peg$FAILED) {
-                s7 = peg$parse_();
+                s7 = peg$parseTableSettings();
 
-                if (s7 !== peg$FAILED) {
-                  if (input.charCodeAt(peg$currPos) === 123) {
-                    s8 = peg$c6;
-                    peg$currPos++;
-                  } else {
-                    s8 = peg$FAILED;
+                if (s7 === peg$FAILED) {
+                  s7 = null;
+                }
 
-                    if (peg$silentFails === 0) {
-                      peg$fail(peg$c7);
-                    }
-                  }
+                if (s7 !== peg$FAILED) {
+                  s8 = peg$parse_();
 
                   if (s8 !== peg$FAILED) {
-                    s9 = peg$parseTableBody();
+                    if (input.charCodeAt(peg$currPos) === 123) {
+                      s9 = peg$c6;
+                      peg$currPos++;
+                    } else {
+                      s9 = peg$FAILED;
+
+                      if (peg$silentFails === 0) {
+                        peg$fail(peg$c7);
+                      }
+                    }
 
                     if (s9 !== peg$FAILED) {
-                      if (input.charCodeAt(peg$currPos) === 125) {
-                        s10 = peg$c8;
-                        peg$currPos++;
-                      } else {
-                        s10 = peg$FAILED;
+                      s10 = peg$parseTableBody();
 
-                        if (peg$silentFails === 0) {
-                          peg$fail(peg$c9);
+                      if (s10 !== peg$FAILED) {
+                        if (input.charCodeAt(peg$currPos) === 125) {
+                          s11 = peg$c8;
+                          peg$currPos++;
+                        } else {
+                          s11 = peg$FAILED;
+
+                          if (peg$silentFails === 0) {
+                            peg$fail(peg$c9);
+                          }
                         }
-                      }
 
-                      if (s10 !== peg$FAILED) {
-                        peg$savedPos = s0;
-                        s1 = peg$c47(s3, s4, s6, s9);
-                        s0 = s1;
+                        if (s11 !== peg$FAILED) {
+                          peg$savedPos = s0;
+                          s1 = peg$c45(s3, s4, s5, s7, s10);
+                          s0 = s1;
+                        } else {
+                          peg$currPos = s0;
+                          s0 = peg$FAILED;
+                        }
                       } else {
                         peg$currPos = s0;
                         s0 = peg$FAILED;
@@ -2675,7 +2744,7 @@ function peg$parse(input, options) {
 
             if (s5 !== peg$FAILED) {
               peg$savedPos = s0;
-              s1 = peg$c48(s2, s4);
+              s1 = peg$c46(s2, s4);
               s0 = s1;
             } else {
               peg$currPos = s0;
@@ -2714,7 +2783,7 @@ function peg$parse(input, options) {
 
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$c49(s2);
+          s1 = peg$c47(s2);
           s0 = s1;
         } else {
           peg$currPos = s0;
@@ -2761,7 +2830,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseField() {
-    var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9;
+    var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10;
     s0 = peg$currPos;
     s1 = peg$parse_();
 
@@ -2782,125 +2851,136 @@ function peg$parse(input, options) {
         }
 
         if (s3 !== peg$FAILED) {
-          s4 = peg$parsetype();
+          s4 = peg$parseschema_name();
+
+          if (s4 === peg$FAILED) {
+            s4 = null;
+          }
 
           if (s4 !== peg$FAILED) {
-            s5 = [];
-            s6 = peg$currPos;
-            s7 = [];
-            s8 = peg$parsesp();
+            s5 = peg$parsetype();
 
-            if (s8 !== peg$FAILED) {
-              while (s8 !== peg$FAILED) {
-                s7.push(s8);
-                s8 = peg$parsesp();
-              }
-            } else {
-              s7 = peg$FAILED;
-            }
+            if (s5 !== peg$FAILED) {
+              s6 = [];
+              s7 = peg$currPos;
+              s8 = [];
+              s9 = peg$parsesp();
 
-            if (s7 !== peg$FAILED) {
-              s8 = peg$parseconstrain();
+              if (s9 !== peg$FAILED) {
+                while (s9 !== peg$FAILED) {
+                  s8.push(s9);
+                  s9 = peg$parsesp();
+                }
+              } else {
+                s8 = peg$FAILED;
+              }
 
               if (s8 !== peg$FAILED) {
-                s7 = [s7, s8];
-                s6 = s7;
+                s9 = peg$parseconstrain();
+
+                if (s9 !== peg$FAILED) {
+                  s8 = [s8, s9];
+                  s7 = s8;
+                } else {
+                  peg$currPos = s7;
+                  s7 = peg$FAILED;
+                }
               } else {
-                peg$currPos = s6;
-                s6 = peg$FAILED;
+                peg$currPos = s7;
+                s7 = peg$FAILED;
               }
-            } else {
-              peg$currPos = s6;
-              s6 = peg$FAILED;
-            }
 
-            while (s6 !== peg$FAILED) {
-              s5.push(s6);
-              s6 = peg$currPos;
-              s7 = [];
-              s8 = peg$parsesp();
+              while (s7 !== peg$FAILED) {
+                s6.push(s7);
+                s7 = peg$currPos;
+                s8 = [];
+                s9 = peg$parsesp();
 
-              if (s8 !== peg$FAILED) {
-                while (s8 !== peg$FAILED) {
-                  s7.push(s8);
-                  s8 = peg$parsesp();
+                if (s9 !== peg$FAILED) {
+                  while (s9 !== peg$FAILED) {
+                    s8.push(s9);
+                    s9 = peg$parsesp();
+                  }
+                } else {
+                  s8 = peg$FAILED;
                 }
-              } else {
-                s7 = peg$FAILED;
-              }
-
-              if (s7 !== peg$FAILED) {
-                s8 = peg$parseconstrain();
 
                 if (s8 !== peg$FAILED) {
-                  s7 = [s7, s8];
-                  s6 = s7;
+                  s9 = peg$parseconstrain();
+
+                  if (s9 !== peg$FAILED) {
+                    s8 = [s8, s9];
+                    s7 = s8;
+                  } else {
+                    peg$currPos = s7;
+                    s7 = peg$FAILED;
+                  }
                 } else {
-                  peg$currPos = s6;
-                  s6 = peg$FAILED;
+                  peg$currPos = s7;
+                  s7 = peg$FAILED;
                 }
-              } else {
-                peg$currPos = s6;
-                s6 = peg$FAILED;
               }
-            }
 
-            if (s5 !== peg$FAILED) {
-              s6 = peg$currPos;
-              s7 = [];
-              s8 = peg$parsesp();
+              if (s6 !== peg$FAILED) {
+                s7 = peg$currPos;
+                s8 = [];
+                s9 = peg$parsesp();
 
-              if (s8 !== peg$FAILED) {
-                while (s8 !== peg$FAILED) {
-                  s7.push(s8);
-                  s8 = peg$parsesp();
+                if (s9 !== peg$FAILED) {
+                  while (s9 !== peg$FAILED) {
+                    s8.push(s9);
+                    s9 = peg$parsesp();
+                  }
+                } else {
+                  s8 = peg$FAILED;
                 }
-              } else {
-                s7 = peg$FAILED;
-              }
-
-              if (s7 !== peg$FAILED) {
-                s8 = peg$parseFieldSettings();
 
                 if (s8 !== peg$FAILED) {
-                  s7 = [s7, s8];
-                  s6 = s7;
+                  s9 = peg$parseFieldSettings();
+
+                  if (s9 !== peg$FAILED) {
+                    s8 = [s8, s9];
+                    s7 = s8;
+                  } else {
+                    peg$currPos = s7;
+                    s7 = peg$FAILED;
+                  }
                 } else {
-                  peg$currPos = s6;
-                  s6 = peg$FAILED;
+                  peg$currPos = s7;
+                  s7 = peg$FAILED;
                 }
-              } else {
-                peg$currPos = s6;
-                s6 = peg$FAILED;
-              }
-
-              if (s6 === peg$FAILED) {
-                s6 = null;
-              }
 
-              if (s6 !== peg$FAILED) {
-                s7 = [];
-                s8 = peg$parsesp();
-
-                while (s8 !== peg$FAILED) {
-                  s7.push(s8);
-                  s8 = peg$parsesp();
+                if (s7 === peg$FAILED) {
+                  s7 = null;
                 }
 
                 if (s7 !== peg$FAILED) {
-                  s8 = peg$parsecomment();
+                  s8 = [];
+                  s9 = peg$parsesp();
 
-                  if (s8 === peg$FAILED) {
-                    s8 = null;
+                  while (s9 !== peg$FAILED) {
+                    s8.push(s9);
+                    s9 = peg$parsesp();
                   }
 
                   if (s8 !== peg$FAILED) {
-                    s9 = peg$parsenewline();
+                    s9 = peg$parsecomment();
+
+                    if (s9 === peg$FAILED) {
+                      s9 = null;
+                    }
 
                     if (s9 !== peg$FAILED) {
-                      peg$savedPos = s0;
-                      s1 = peg$c50(s2, s4, s5, s6);
-                      s0 = s1;
+                      s10 = peg$parsenewline();
+
+                      if (s10 !== peg$FAILED) {
+                        peg$savedPos = s0;
+                        s1 = peg$c48(s2, s4, s5, s6, s7);
+                        s0 = s1;
+                      } else {
+                        peg$currPos = s0;
+                        s0 = peg$FAILED;
+                      }
                     } else {
                       peg$currPos = s0;
                       s0 = peg$FAILED;
@@ -2942,7 +3022,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseEnumSyntax() {
-    var s0, s1, s2, s3, s4, s5, s6, s7;
+    var s0, s1, s2, s3, s4, s5, s6, s7, s8;
     s0 = peg$currPos;
     s1 = peg$parseenum();
 
@@ -2960,42 +3040,53 @@ function peg$parse(input, options) {
       }
 
       if (s2 !== peg$FAILED) {
-        s3 = peg$parsename();
+        s3 = peg$parseschema_name();
+
+        if (s3 === peg$FAILED) {
+          s3 = null;
+        }
 
         if (s3 !== peg$FAILED) {
-          s4 = peg$parse_();
+          s4 = peg$parsename();
 
           if (s4 !== peg$FAILED) {
-            if (input.charCodeAt(peg$currPos) === 123) {
-              s5 = peg$c6;
-              peg$currPos++;
-            } else {
-              s5 = peg$FAILED;
-
-              if (peg$silentFails === 0) {
-                peg$fail(peg$c7);
-              }
-            }
+            s5 = peg$parse_();
 
             if (s5 !== peg$FAILED) {
-              s6 = peg$parseEnumBody();
+              if (input.charCodeAt(peg$currPos) === 123) {
+                s6 = peg$c6;
+                peg$currPos++;
+              } else {
+                s6 = peg$FAILED;
+
+                if (peg$silentFails === 0) {
+                  peg$fail(peg$c7);
+                }
+              }
 
               if (s6 !== peg$FAILED) {
-                if (input.charCodeAt(peg$currPos) === 125) {
-                  s7 = peg$c8;
-                  peg$currPos++;
-                } else {
-                  s7 = peg$FAILED;
+                s7 = peg$parseEnumBody();
 
-                  if (peg$silentFails === 0) {
-                    peg$fail(peg$c9);
+                if (s7 !== peg$FAILED) {
+                  if (input.charCodeAt(peg$currPos) === 125) {
+                    s8 = peg$c8;
+                    peg$currPos++;
+                  } else {
+                    s8 = peg$FAILED;
+
+                    if (peg$silentFails === 0) {
+                      peg$fail(peg$c9);
+                    }
                   }
-                }
 
-                if (s7 !== peg$FAILED) {
-                  peg$savedPos = s0;
-                  s1 = peg$c51(s3, s6);
-                  s0 = s1;
+                  if (s8 !== peg$FAILED) {
+                    peg$savedPos = s0;
+                    s1 = peg$c49(s3, s4, s7);
+                    s0 = s1;
+                  } else {
+                    peg$currPos = s0;
+                    s0 = peg$FAILED;
+                  }
                 } else {
                   peg$currPos = s0;
                   s0 = peg$FAILED;
@@ -3051,7 +3142,7 @@ function peg$parse(input, options) {
 
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$c52(s2);
+          s1 = peg$c50(s2);
           s0 = s1;
         } else {
           peg$currPos = s0;
@@ -3114,7 +3205,7 @@ function peg$parse(input, options) {
 
                 if (s7 !== peg$FAILED) {
                   peg$savedPos = s0;
-                  s1 = peg$c53(s2, s4);
+                  s1 = peg$c51(s2, s4);
                   s0 = s1;
                 } else {
                   peg$currPos = s0;
@@ -3153,13 +3244,13 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
 
     if (input.charCodeAt(peg$currPos) === 91) {
-      s1 = peg$c35;
+      s1 = peg$c33;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c36);
+        peg$fail(peg$c34);
       }
     }
 
@@ -3174,19 +3265,19 @@ function peg$parse(input, options) {
 
           if (s4 !== peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 93) {
-              s5 = peg$c37;
+              s5 = peg$c35;
               peg$currPos++;
             } else {
               s5 = peg$FAILED;
 
               if (peg$silentFails === 0) {
-                peg$fail(peg$c38);
+                peg$fail(peg$c36);
               }
             }
 
             if (s5 !== peg$FAILED) {
               peg$savedPos = s0;
-              s1 = peg$c54(s3);
+              s1 = peg$c52(s3);
               s0 = s1;
             } else {
               peg$currPos = s0;
@@ -3217,13 +3308,13 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
 
     if (input.charCodeAt(peg$currPos) === 91) {
-      s1 = peg$c35;
+      s1 = peg$c33;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c36);
+        peg$fail(peg$c34);
       }
     }
 
@@ -3273,19 +3364,19 @@ function peg$parse(input, options) {
 
         if (s3 !== peg$FAILED) {
           if (input.charCodeAt(peg$currPos) === 93) {
-            s4 = peg$c37;
+            s4 = peg$c35;
             peg$currPos++;
           } else {
             s4 = peg$FAILED;
 
             if (peg$silentFails === 0) {
-              peg$fail(peg$c38);
+              peg$fail(peg$c36);
             }
           }
 
           if (s4 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$c55(s2, s3);
+            s1 = peg$c53(s2, s3);
             s0 = s1;
           } else {
             peg$currPos = s0;
@@ -3312,13 +3403,13 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
 
     if (input.charCodeAt(peg$currPos) === 91) {
-      s1 = peg$c35;
+      s1 = peg$c33;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c36);
+        peg$fail(peg$c34);
       }
     }
 
@@ -3368,19 +3459,19 @@ function peg$parse(input, options) {
 
         if (s3 !== peg$FAILED) {
           if (input.charCodeAt(peg$currPos) === 93) {
-            s4 = peg$c37;
+            s4 = peg$c35;
             peg$currPos++;
           } else {
             s4 = peg$FAILED;
 
             if (peg$silentFails === 0) {
-              peg$fail(peg$c38);
+              peg$fail(peg$c36);
             }
           }
 
           if (s4 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$c56(s2, s3);
+            s1 = peg$c54(s2, s3);
             s0 = s1;
           } else {
             peg$currPos = s0;
@@ -3415,7 +3506,7 @@ function peg$parse(input, options) {
 
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$c57(s2);
+          s1 = peg$c55(s2);
           s0 = s1;
         } else {
           peg$currPos = s0;
@@ -3442,7 +3533,7 @@ function peg$parse(input, options) {
 
           if (s3 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$c58(s2);
+            s1 = peg$c56(s2);
             s0 = s1;
           } else {
             peg$currPos = s0;
@@ -3467,14 +3558,14 @@ function peg$parse(input, options) {
     s1 = peg$parse_();
 
     if (s1 !== peg$FAILED) {
-      if (input.substr(peg$currPos, 8).toLowerCase() === peg$c59) {
+      if (input.substr(peg$currPos, 8).toLowerCase() === peg$c57) {
         s2 = input.substr(peg$currPos, 8);
         peg$currPos += 8;
       } else {
         s2 = peg$FAILED;
 
         if (peg$silentFails === 0) {
-          peg$fail(peg$c60);
+          peg$fail(peg$c58);
         }
       }
 
@@ -3483,7 +3574,7 @@ function peg$parse(input, options) {
 
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$c61(s2);
+          s1 = peg$c59(s2);
           s0 = s1;
         } else {
           peg$currPos = s0;
@@ -3503,14 +3594,14 @@ function peg$parse(input, options) {
       s1 = peg$parse_();
 
       if (s1 !== peg$FAILED) {
-        if (input.substr(peg$currPos, 4).toLowerCase() === peg$c62) {
+        if (input.substr(peg$currPos, 4).toLowerCase() === peg$c60) {
           s2 = input.substr(peg$currPos, 4);
           peg$currPos += 4;
         } else {
           s2 = peg$FAILED;
 
           if (peg$silentFails === 0) {
-            peg$fail(peg$c63);
+            peg$fail(peg$c61);
           }
         }
 
@@ -3519,7 +3610,7 @@ function peg$parse(input, options) {
 
           if (s3 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$c61(s2);
+            s1 = peg$c59(s2);
             s0 = s1;
           } else {
             peg$currPos = s0;
@@ -3539,14 +3630,14 @@ function peg$parse(input, options) {
         s1 = peg$parse_();
 
         if (s1 !== peg$FAILED) {
-          if (input.substr(peg$currPos, 11).toLowerCase() === peg$c64) {
+          if (input.substr(peg$currPos, 11).toLowerCase() === peg$c62) {
             s2 = input.substr(peg$currPos, 11);
             peg$currPos += 11;
           } else {
             s2 = peg$FAILED;
 
             if (peg$silentFails === 0) {
-              peg$fail(peg$c65);
+              peg$fail(peg$c63);
             }
           }
 
@@ -3555,7 +3646,7 @@ function peg$parse(input, options) {
 
             if (s3 !== peg$FAILED) {
               peg$savedPos = s0;
-              s1 = peg$c61(s2);
+              s1 = peg$c59(s2);
               s0 = s1;
             } else {
               peg$currPos = s0;
@@ -3575,14 +3666,14 @@ function peg$parse(input, options) {
           s1 = peg$parse_();
 
           if (s1 !== peg$FAILED) {
-            if (input.substr(peg$currPos, 2).toLowerCase() === peg$c66) {
+            if (input.substr(peg$currPos, 2).toLowerCase() === peg$c64) {
               s2 = input.substr(peg$currPos, 2);
               peg$currPos += 2;
             } else {
               s2 = peg$FAILED;
 
               if (peg$silentFails === 0) {
-                peg$fail(peg$c67);
+                peg$fail(peg$c65);
               }
             }
 
@@ -3591,7 +3682,7 @@ function peg$parse(input, options) {
 
               if (s3 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s1 = peg$c61(s2);
+                s1 = peg$c59(s2);
                 s0 = s1;
               } else {
                 peg$currPos = s0;
@@ -3611,14 +3702,14 @@ function peg$parse(input, options) {
             s1 = peg$parse_();
 
             if (s1 !== peg$FAILED) {
-              if (input.substr(peg$currPos, 6).toLowerCase() === peg$c68) {
+              if (input.substr(peg$currPos, 6).toLowerCase() === peg$c66) {
                 s2 = input.substr(peg$currPos, 6);
                 peg$currPos += 6;
               } else {
                 s2 = peg$FAILED;
 
                 if (peg$silentFails === 0) {
-                  peg$fail(peg$c69);
+                  peg$fail(peg$c67);
                 }
               }
 
@@ -3627,7 +3718,7 @@ function peg$parse(input, options) {
 
                 if (s3 !== peg$FAILED) {
                   peg$savedPos = s0;
-                  s1 = peg$c61(s2);
+                  s1 = peg$c59(s2);
                   s0 = s1;
                 } else {
                   peg$currPos = s0;
@@ -3647,14 +3738,14 @@ function peg$parse(input, options) {
               s1 = peg$parse_();
 
               if (s1 !== peg$FAILED) {
-                if (input.substr(peg$currPos, 9) === peg$c70) {
-                  s2 = peg$c70;
+                if (input.substr(peg$currPos, 9) === peg$c68) {
+                  s2 = peg$c68;
                   peg$currPos += 9;
                 } else {
                   s2 = peg$FAILED;
 
                   if (peg$silentFails === 0) {
-                    peg$fail(peg$c71);
+                    peg$fail(peg$c69);
                   }
                 }
 
@@ -3663,7 +3754,7 @@ function peg$parse(input, options) {
 
                   if (s3 !== peg$FAILED) {
                     peg$savedPos = s0;
-                    s1 = peg$c61(s2);
+                    s1 = peg$c59(s2);
                     s0 = s1;
                   } else {
                     peg$currPos = s0;
@@ -3690,7 +3781,7 @@ function peg$parse(input, options) {
 
                     if (s3 !== peg$FAILED) {
                       peg$savedPos = s0;
-                      s1 = peg$c57(s2);
+                      s1 = peg$c55(s2);
                       s0 = s1;
                     } else {
                       peg$currPos = s0;
@@ -3713,9 +3804,16 @@ function peg$parse(input, options) {
                     s2 = peg$parseRefInline();
 
                     if (s2 !== peg$FAILED) {
-                      peg$savedPos = s0;
-                      s1 = peg$c72(s2);
-                      s0 = s1;
+                      s3 = peg$parse_();
+
+                      if (s3 !== peg$FAILED) {
+                        peg$savedPos = s0;
+                        s1 = peg$c70(s2);
+                        s0 = s1;
+                      } else {
+                        peg$currPos = s0;
+                        s0 = peg$FAILED;
+                      }
                     } else {
                       peg$currPos = s0;
                       s0 = peg$FAILED;
@@ -3737,7 +3835,7 @@ function peg$parse(input, options) {
 
                         if (s3 !== peg$FAILED) {
                           peg$savedPos = s0;
-                          s1 = peg$c73(s2);
+                          s1 = peg$c71(s2);
                           s0 = s1;
                         } else {
                           peg$currPos = s0;
@@ -3803,7 +3901,7 @@ function peg$parse(input, options) {
 
               if (s6 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s1 = peg$c74(s5);
+                s1 = peg$c72(s5);
                 s0 = s1;
               } else {
                 peg$currPos = s0;
@@ -3856,7 +3954,7 @@ function peg$parse(input, options) {
 
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$c75(s2);
+          s1 = peg$c73(s2);
           s0 = s1;
         } else {
           peg$currPos = s0;
@@ -3891,7 +3989,7 @@ function peg$parse(input, options) {
 
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$c76(s2);
+          s1 = peg$c74(s2);
           s0 = s1;
         } else {
           peg$currPos = s0;
@@ -3935,7 +4033,7 @@ function peg$parse(input, options) {
 
           if (s4 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$c77(s2, s4);
+            s1 = peg$c75(s2, s4);
             s0 = s1;
           } else {
             peg$currPos = s0;
@@ -3983,7 +4081,7 @@ function peg$parse(input, options) {
 
           if (s4 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$c78(s2, s4);
+            s1 = peg$c76(s2, s4);
             s0 = s1;
           } else {
             peg$currPos = s0;
@@ -4021,7 +4119,7 @@ function peg$parse(input, options) {
 
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$c79(s1);
+        s1 = peg$c77(s1);
         s0 = s1;
       } else {
         peg$currPos = s0;
@@ -4044,60 +4142,60 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
 
     if (input.charCodeAt(peg$currPos) === 96) {
-      s1 = peg$c80;
+      s1 = peg$c78;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c81);
+        peg$fail(peg$c79);
       }
     }
 
     if (s1 !== peg$FAILED) {
       s2 = [];
 
-      if (peg$c82.test(input.charAt(peg$currPos))) {
+      if (peg$c80.test(input.charAt(peg$currPos))) {
         s3 = input.charAt(peg$currPos);
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
 
         if (peg$silentFails === 0) {
-          peg$fail(peg$c83);
+          peg$fail(peg$c81);
         }
       }
 
       while (s3 !== peg$FAILED) {
         s2.push(s3);
 
-        if (peg$c82.test(input.charAt(peg$currPos))) {
+        if (peg$c80.test(input.charAt(peg$currPos))) {
           s3 = input.charAt(peg$currPos);
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
 
           if (peg$silentFails === 0) {
-            peg$fail(peg$c83);
+            peg$fail(peg$c81);
           }
         }
       }
 
       if (s2 !== peg$FAILED) {
         if (input.charCodeAt(peg$currPos) === 96) {
-          s3 = peg$c80;
+          s3 = peg$c78;
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
 
           if (peg$silentFails === 0) {
-            peg$fail(peg$c81);
+            peg$fail(peg$c79);
           }
         }
 
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$c84(s2);
+          s1 = peg$c82(s2);
           s0 = s1;
         } else {
           peg$currPos = s0;
@@ -4120,13 +4218,13 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
 
     if (input.charCodeAt(peg$currPos) === 40) {
-      s1 = peg$c30;
+      s1 = peg$c28;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c31);
+        peg$fail(peg$c29);
       }
     }
 
@@ -4211,19 +4309,19 @@ function peg$parse(input, options) {
 
           if (s4 !== peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 41) {
-              s5 = peg$c32;
+              s5 = peg$c30;
               peg$currPos++;
             } else {
               s5 = peg$FAILED;
 
               if (peg$silentFails === 0) {
-                peg$fail(peg$c33);
+                peg$fail(peg$c31);
               }
             }
 
             if (s5 !== peg$FAILED) {
               peg$savedPos = s0;
-              s1 = peg$c85(s3, s4);
+              s1 = peg$c83(s3, s4);
               s0 = s1;
             } else {
               peg$currPos = s0;
@@ -4254,13 +4352,13 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
 
     if (input.charCodeAt(peg$currPos) === 91) {
-      s1 = peg$c35;
+      s1 = peg$c33;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c36);
+        peg$fail(peg$c34);
       }
     }
 
@@ -4287,19 +4385,19 @@ function peg$parse(input, options) {
 
           if (s4 !== peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 93) {
-              s5 = peg$c37;
+              s5 = peg$c35;
               peg$currPos++;
             } else {
               s5 = peg$FAILED;
 
               if (peg$silentFails === 0) {
-                peg$fail(peg$c38);
+                peg$fail(peg$c36);
               }
             }
 
             if (s5 !== peg$FAILED) {
               peg$savedPos = s0;
-              s1 = peg$c86();
+              s1 = peg$c84();
               s0 = s1;
             } else {
               peg$currPos = s0;
@@ -4326,13 +4424,13 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
 
       if (input.charCodeAt(peg$currPos) === 91) {
-        s1 = peg$c35;
+        s1 = peg$c33;
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
 
         if (peg$silentFails === 0) {
-          peg$fail(peg$c36);
+          peg$fail(peg$c34);
         }
       }
 
@@ -4382,19 +4480,19 @@ function peg$parse(input, options) {
 
           if (s3 !== peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 93) {
-              s4 = peg$c37;
+              s4 = peg$c35;
               peg$currPos++;
             } else {
               s4 = peg$FAILED;
 
               if (peg$silentFails === 0) {
-                peg$fail(peg$c38);
+                peg$fail(peg$c36);
               }
             }
 
             if (s4 !== peg$FAILED) {
               peg$savedPos = s0;
-              s1 = peg$c87(s2, s3);
+              s1 = peg$c85(s2, s3);
               s0 = s1;
             } else {
               peg$currPos = s0;
@@ -4423,14 +4521,14 @@ function peg$parse(input, options) {
     s1 = peg$parse_();
 
     if (s1 !== peg$FAILED) {
-      if (input.substr(peg$currPos, 6).toLowerCase() === peg$c68) {
+      if (input.substr(peg$currPos, 6).toLowerCase() === peg$c66) {
         s2 = input.substr(peg$currPos, 6);
         peg$currPos += 6;
       } else {
         s2 = peg$FAILED;
 
         if (peg$silentFails === 0) {
-          peg$fail(peg$c69);
+          peg$fail(peg$c67);
         }
       }
 
@@ -4439,7 +4537,7 @@ function peg$parse(input, options) {
 
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$c61(s2);
+          s1 = peg$c59(s2);
           s0 = s1;
         } else {
           peg$currPos = s0;
@@ -4466,7 +4564,7 @@ function peg$parse(input, options) {
 
           if (s3 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$c88(s2);
+            s1 = peg$c86(s2);
             s0 = s1;
           } else {
             peg$currPos = s0;
@@ -4493,7 +4591,7 @@ function peg$parse(input, options) {
 
             if (s3 !== peg$FAILED) {
               peg$savedPos = s0;
-              s1 = peg$c89(s2);
+              s1 = peg$c87(s2);
               s0 = s1;
             } else {
               peg$currPos = s0;
@@ -4520,7 +4618,7 @@ function peg$parse(input, options) {
 
               if (s3 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s1 = peg$c57(s2);
+                s1 = peg$c55(s2);
                 s0 = s1;
               } else {
                 peg$currPos = s0;
@@ -4545,14 +4643,14 @@ function peg$parse(input, options) {
     var s0, s1, s2, s3;
     s0 = peg$currPos;
 
-    if (input.substr(peg$currPos, 5).toLowerCase() === peg$c90) {
+    if (input.substr(peg$currPos, 5).toLowerCase() === peg$c88) {
       s1 = input.substr(peg$currPos, 5);
       peg$currPos += 5;
     } else {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c91);
+        peg$fail(peg$c89);
       }
     }
 
@@ -4564,7 +4662,7 @@ function peg$parse(input, options) {
 
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$c92(s3);
+          s1 = peg$c90(s3);
           s0 = s1;
         } else {
           peg$currPos = s0;
@@ -4589,7 +4687,7 @@ function peg$parse(input, options) {
 
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$c93(s1);
+      s1 = peg$c91(s1);
     }
 
     s0 = s1;
@@ -4597,14 +4695,14 @@ function peg$parse(input, options) {
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
 
-      if (input.substr(peg$currPos, 4).toLowerCase() === peg$c94) {
+      if (input.substr(peg$currPos, 4).toLowerCase() === peg$c92) {
         s1 = input.substr(peg$currPos, 4);
         peg$currPos += 4;
       } else {
         s1 = peg$FAILED;
 
         if (peg$silentFails === 0) {
-          peg$fail(peg$c95);
+          peg$fail(peg$c93);
         }
       }
 
@@ -4646,7 +4744,7 @@ function peg$parse(input, options) {
 
                   if (s7 !== peg$FAILED) {
                     peg$savedPos = s0;
-                    s1 = peg$c92(s5);
+                    s1 = peg$c90(s5);
                     s0 = s1;
                   } else {
                     peg$currPos = s0;
@@ -4685,14 +4783,14 @@ function peg$parse(input, options) {
     var s0, s1, s2, s3;
     s0 = peg$currPos;
 
-    if (input.substr(peg$currPos, 5).toLowerCase() === peg$c96) {
+    if (input.substr(peg$currPos, 5).toLowerCase() === peg$c94) {
       s1 = input.substr(peg$currPos, 5);
       peg$currPos += 5;
     } else {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c97);
+        peg$fail(peg$c95);
       }
     }
 
@@ -4704,7 +4802,7 @@ function peg$parse(input, options) {
 
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$c92(s3);
+          s1 = peg$c90(s3);
           s0 = s1;
         } else {
           peg$currPos = s0;
@@ -4726,14 +4824,14 @@ function peg$parse(input, options) {
     var s0, s1, s2, s3;
     s0 = peg$currPos;
 
-    if (input.substr(peg$currPos, 5).toLowerCase() === peg$c98) {
+    if (input.substr(peg$currPos, 5).toLowerCase() === peg$c96) {
       s1 = input.substr(peg$currPos, 5);
       peg$currPos += 5;
     } else {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c99);
+        peg$fail(peg$c97);
       }
     }
 
@@ -4749,7 +4847,7 @@ function peg$parse(input, options) {
 
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$c44(s3);
+          s1 = peg$c42(s3);
           s0 = s1;
         } else {
           peg$currPos = s0;
@@ -4768,17 +4866,17 @@ function peg$parse(input, options) {
   }
 
   function peg$parseRefInline() {
-    var s0, s1, s2, s3, s4, s5, s6, s7;
+    var s0, s1, s2, s3, s4, s5;
     s0 = peg$currPos;
 
-    if (input.substr(peg$currPos, 4) === peg$c100) {
-      s1 = peg$c100;
+    if (input.substr(peg$currPos, 4) === peg$c98) {
+      s1 = peg$c98;
       peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c101);
+        peg$fail(peg$c99);
       }
     }
 
@@ -4808,35 +4906,12 @@ function peg$parse(input, options) {
           }
 
           if (s4 !== peg$FAILED) {
-            s5 = peg$parsename();
+            s5 = peg$parseinline_field_identifier();
 
             if (s5 !== peg$FAILED) {
-              if (input.charCodeAt(peg$currPos) === 46) {
-                s6 = peg$c25;
-                peg$currPos++;
-              } else {
-                s6 = peg$FAILED;
-
-                if (peg$silentFails === 0) {
-                  peg$fail(peg$c26);
-                }
-              }
-
-              if (s6 !== peg$FAILED) {
-                s7 = peg$parsename();
-
-                if (s7 !== peg$FAILED) {
-                  peg$savedPos = s0;
-                  s1 = peg$c102(s3, s5, s7);
-                  s0 = s1;
-                } else {
-                  peg$currPos = s0;
-                  s0 = peg$FAILED;
-                }
-              } else {
-                peg$currPos = s0;
-                s0 = peg$FAILED;
-              }
+              peg$savedPos = s0;
+              s1 = peg$c100(s3, s5);
+              s0 = s1;
             } else {
               peg$currPos = s0;
               s0 = peg$FAILED;
@@ -4865,14 +4940,14 @@ function peg$parse(input, options) {
     var s0, s1, s2, s3;
     s0 = peg$currPos;
 
-    if (input.substr(peg$currPos, 8).toLowerCase() === peg$c103) {
+    if (input.substr(peg$currPos, 8).toLowerCase() === peg$c101) {
       s1 = input.substr(peg$currPos, 8);
       peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c104);
+        peg$fail(peg$c102);
       }
     }
 
@@ -4884,7 +4959,7 @@ function peg$parse(input, options) {
 
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$c105(s3);
+          s1 = peg$c103(s3);
           s0 = s1;
         } else {
           peg$currPos = s0;
@@ -4937,14 +5012,14 @@ function peg$parse(input, options) {
     }
 
     if (s1 !== peg$FAILED) {
-      if (input.substr(peg$currPos, 2) === peg$c106) {
-        s2 = peg$c106;
+      if (input.substr(peg$currPos, 2) === peg$c104) {
+        s2 = peg$c104;
         peg$currPos += 2;
       } else {
         s2 = peg$FAILED;
 
         if (peg$silentFails === 0) {
-          peg$fail(peg$c107);
+          peg$fail(peg$c105);
         }
       }
 
@@ -4966,7 +5041,7 @@ function peg$parse(input, options) {
 
           if (s4 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$c108(s4);
+            s1 = peg$c106(s4);
             s0 = s1;
           } else {
             peg$currPos = s0;
@@ -5022,7 +5097,7 @@ function peg$parse(input, options) {
 
                 if (s7 !== peg$FAILED) {
                   peg$savedPos = s0;
-                  s1 = peg$c109(s5, s6);
+                  s1 = peg$c107(s5, s6);
                   s0 = s1;
                 } else {
                   peg$currPos = s0;
@@ -5163,14 +5238,14 @@ function peg$parse(input, options) {
     var s0, s1;
     peg$silentFails++;
 
-    if (input.substr(peg$currPos, 7).toLowerCase() === peg$c111) {
+    if (input.substr(peg$currPos, 7).toLowerCase() === peg$c109) {
       s0 = input.substr(peg$currPos, 7);
       peg$currPos += 7;
     } else {
       s0 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c112);
+        peg$fail(peg$c110);
       }
     }
 
@@ -5180,7 +5255,7 @@ function peg$parse(input, options) {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c110);
+        peg$fail(peg$c108);
       }
     }
 
@@ -5191,14 +5266,14 @@ function peg$parse(input, options) {
     var s0, s1;
     peg$silentFails++;
 
-    if (input.substr(peg$currPos, 5).toLowerCase() === peg$c114) {
+    if (input.substr(peg$currPos, 5).toLowerCase() === peg$c112) {
       s0 = input.substr(peg$currPos, 5);
       peg$currPos += 5;
     } else {
       s0 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c115);
+        peg$fail(peg$c113);
       }
     }
 
@@ -5208,7 +5283,7 @@ function peg$parse(input, options) {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c113);
+        peg$fail(peg$c111);
       }
     }
 
@@ -5218,14 +5293,14 @@ function peg$parse(input, options) {
   function peg$parseas() {
     var s0;
 
-    if (input.substr(peg$currPos, 2).toLowerCase() === peg$c106) {
+    if (input.substr(peg$currPos, 2).toLowerCase() === peg$c104) {
       s0 = input.substr(peg$currPos, 2);
       peg$currPos += 2;
     } else {
       s0 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c116);
+        peg$fail(peg$c114);
       }
     }
 
@@ -5236,14 +5311,14 @@ function peg$parse(input, options) {
     var s0, s1;
     peg$silentFails++;
 
-    if (input.substr(peg$currPos, 3).toLowerCase() === peg$c118) {
+    if (input.substr(peg$currPos, 3).toLowerCase() === peg$c116) {
       s0 = input.substr(peg$currPos, 3);
       peg$currPos += 3;
     } else {
       s0 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c119);
+        peg$fail(peg$c117);
       }
     }
 
@@ -5253,7 +5328,7 @@ function peg$parse(input, options) {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c117);
+        peg$fail(peg$c115);
       }
     }
 
@@ -5265,20 +5340,20 @@ function peg$parse(input, options) {
     peg$silentFails++;
     s0 = peg$currPos;
 
-    if (input.substr(peg$currPos, 6).toLowerCase() === peg$c68) {
+    if (input.substr(peg$currPos, 6).toLowerCase() === peg$c66) {
       s1 = input.substr(peg$currPos, 6);
       peg$currPos += 6;
     } else {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c69);
+        peg$fail(peg$c67);
       }
     }
 
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$c121();
+      s1 = peg$c119();
     }
 
     s0 = s1;
@@ -5288,7 +5363,7 @@ function peg$parse(input, options) {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c120);
+        peg$fail(peg$c118);
       }
     }
 
@@ -5300,20 +5375,20 @@ function peg$parse(input, options) {
     peg$silentFails++;
     s0 = peg$currPos;
 
-    if (input.substr(peg$currPos, 2).toLowerCase() === peg$c66) {
+    if (input.substr(peg$currPos, 2).toLowerCase() === peg$c64) {
       s1 = input.substr(peg$currPos, 2);
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c67);
+        peg$fail(peg$c65);
       }
     }
 
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$c123();
+      s1 = peg$c121();
     }
 
     s0 = s1;
@@ -5323,7 +5398,7 @@ function peg$parse(input, options) {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c122);
+        peg$fail(peg$c120);
       }
     }
 
@@ -5334,14 +5409,14 @@ function peg$parse(input, options) {
     var s0, s1;
     peg$silentFails++;
 
-    if (input.substr(peg$currPos, 7).toLowerCase() === peg$c125) {
+    if (input.substr(peg$currPos, 7).toLowerCase() === peg$c123) {
       s0 = input.substr(peg$currPos, 7);
       peg$currPos += 7;
     } else {
       s0 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c126);
+        peg$fail(peg$c124);
       }
     }
 
@@ -5351,7 +5426,7 @@ function peg$parse(input, options) {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c124);
+        peg$fail(peg$c122);
       }
     }
 
@@ -5362,14 +5437,14 @@ function peg$parse(input, options) {
     var s0, s1;
     peg$silentFails++;
 
-    if (input.substr(peg$currPos, 5).toLowerCase() === peg$c128) {
+    if (input.substr(peg$currPos, 5).toLowerCase() === peg$c126) {
       s0 = input.substr(peg$currPos, 5);
       peg$currPos += 5;
     } else {
       s0 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c129);
+        peg$fail(peg$c127);
       }
     }
 
@@ -5379,7 +5454,7 @@ function peg$parse(input, options) {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c127);
+        peg$fail(peg$c125);
       }
     }
 
@@ -5390,14 +5465,14 @@ function peg$parse(input, options) {
     var s0, s1;
     peg$silentFails++;
 
-    if (input.substr(peg$currPos, 4).toLowerCase() === peg$c131) {
+    if (input.substr(peg$currPos, 4).toLowerCase() === peg$c129) {
       s0 = input.substr(peg$currPos, 4);
       peg$currPos += 4;
     } else {
       s0 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c132);
+        peg$fail(peg$c130);
       }
     }
 
@@ -5407,7 +5482,7 @@ function peg$parse(input, options) {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c130);
+        peg$fail(peg$c128);
       }
     }
 
@@ -5418,14 +5493,14 @@ function peg$parse(input, options) {
     var s0, s1;
     peg$silentFails++;
 
-    if (input.substr(peg$currPos, 4).toLowerCase() === peg$c134) {
+    if (input.substr(peg$currPos, 4).toLowerCase() === peg$c132) {
       s0 = input.substr(peg$currPos, 4);
       peg$currPos += 4;
     } else {
       s0 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c135);
+        peg$fail(peg$c133);
       }
     }
 
@@ -5435,7 +5510,7 @@ function peg$parse(input, options) {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c133);
+        peg$fail(peg$c131);
       }
     }
 
@@ -5445,14 +5520,14 @@ function peg$parse(input, options) {
   function peg$parseheader_color() {
     var s0;
 
-    if (input.substr(peg$currPos, 11).toLowerCase() === peg$c136) {
+    if (input.substr(peg$currPos, 11).toLowerCase() === peg$c134) {
       s0 = input.substr(peg$currPos, 11);
       peg$currPos += 11;
     } else {
       s0 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c137);
+        peg$fail(peg$c135);
       }
     }
 
@@ -5463,14 +5538,14 @@ function peg$parse(input, options) {
     var s0, s1;
     peg$silentFails++;
 
-    if (input.substr(peg$currPos, 10).toLowerCase() === peg$c139) {
+    if (input.substr(peg$currPos, 10).toLowerCase() === peg$c137) {
       s0 = input.substr(peg$currPos, 10);
       peg$currPos += 10;
     } else {
       s0 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c140);
+        peg$fail(peg$c138);
       }
     }
 
@@ -5480,7 +5555,7 @@ function peg$parse(input, options) {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c138);
+        peg$fail(peg$c136);
       }
     }
 
@@ -5491,14 +5566,14 @@ function peg$parse(input, options) {
     var s0, s1;
     peg$silentFails++;
 
-    if (input.substr(peg$currPos, 9).toLowerCase() === peg$c142) {
+    if (input.substr(peg$currPos, 9).toLowerCase() === peg$c140) {
       s0 = input.substr(peg$currPos, 9);
       peg$currPos += 9;
     } else {
       s0 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c143);
+        peg$fail(peg$c141);
       }
     }
 
@@ -5508,7 +5583,7 @@ function peg$parse(input, options) {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c141);
+        peg$fail(peg$c139);
       }
     }
 
@@ -5519,14 +5594,14 @@ function peg$parse(input, options) {
     var s0, s1;
     peg$silentFails++;
 
-    if (input.substr(peg$currPos, 8).toLowerCase() === peg$c145) {
+    if (input.substr(peg$currPos, 8).toLowerCase() === peg$c143) {
       s0 = input.substr(peg$currPos, 8);
       peg$currPos += 8;
     } else {
       s0 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c146);
+        peg$fail(peg$c144);
       }
     }
 
@@ -5536,7 +5611,7 @@ function peg$parse(input, options) {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c144);
+        peg$fail(peg$c142);
       }
     }
 
@@ -5547,14 +5622,14 @@ function peg$parse(input, options) {
     var s0, s1;
     peg$silentFails++;
 
-    if (input.substr(peg$currPos, 7).toLowerCase() === peg$c148) {
+    if (input.substr(peg$currPos, 7).toLowerCase() === peg$c146) {
       s0 = input.substr(peg$currPos, 7);
       peg$currPos += 7;
     } else {
       s0 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c149);
+        peg$fail(peg$c147);
       }
     }
 
@@ -5564,7 +5639,7 @@ function peg$parse(input, options) {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c147);
+        peg$fail(peg$c145);
       }
     }
 
@@ -5575,14 +5650,14 @@ function peg$parse(input, options) {
     var s0, s1;
     peg$silentFails++;
 
-    if (input.substr(peg$currPos, 8).toLowerCase() === peg$c151) {
+    if (input.substr(peg$currPos, 8).toLowerCase() === peg$c149) {
       s0 = input.substr(peg$currPos, 8);
       peg$currPos += 8;
     } else {
       s0 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c152);
+        peg$fail(peg$c150);
       }
     }
 
@@ -5592,7 +5667,7 @@ function peg$parse(input, options) {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c150);
+        peg$fail(peg$c148);
       }
     }
 
@@ -5603,14 +5678,14 @@ function peg$parse(input, options) {
     var s0, s1;
     peg$silentFails++;
 
-    if (input.substr(peg$currPos, 11).toLowerCase() === peg$c154) {
+    if (input.substr(peg$currPos, 11).toLowerCase() === peg$c152) {
       s0 = input.substr(peg$currPos, 11);
       peg$currPos += 11;
     } else {
       s0 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c155);
+        peg$fail(peg$c153);
       }
     }
 
@@ -5620,7 +5695,7 @@ function peg$parse(input, options) {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c153);
+        peg$fail(peg$c151);
       }
     }
 
@@ -5631,14 +5706,14 @@ function peg$parse(input, options) {
     var s0, s1;
     peg$silentFails++;
 
-    if (peg$c157.test(input.charAt(peg$currPos))) {
+    if (peg$c155.test(input.charAt(peg$currPos))) {
       s0 = input.charAt(peg$currPos);
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c158);
+        peg$fail(peg$c156);
       }
     }
 
@@ -5648,7 +5723,7 @@ function peg$parse(input, options) {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c156);
+        peg$fail(peg$c154);
       }
     }
 
@@ -5673,7 +5748,7 @@ function peg$parse(input, options) {
 
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$c160(s1);
+      s1 = peg$c158(s1);
     }
 
     s0 = s1;
@@ -5685,14 +5760,14 @@ function peg$parse(input, options) {
       if (s1 !== peg$FAILED) {
         s2 = [];
 
-        if (peg$c161.test(input.charAt(peg$currPos))) {
+        if (peg$c159.test(input.charAt(peg$currPos))) {
           s3 = input.charAt(peg$currPos);
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
 
           if (peg$silentFails === 0) {
-            peg$fail(peg$c162);
+            peg$fail(peg$c160);
           }
         }
 
@@ -5700,14 +5775,14 @@ function peg$parse(input, options) {
           while (s3 !== peg$FAILED) {
             s2.push(s3);
 
-            if (peg$c161.test(input.charAt(peg$currPos))) {
+            if (peg$c159.test(input.charAt(peg$currPos))) {
               s3 = input.charAt(peg$currPos);
               peg$currPos++;
             } else {
               s3 = peg$FAILED;
 
               if (peg$silentFails === 0) {
-                peg$fail(peg$c162);
+                peg$fail(peg$c160);
               }
             }
           }
@@ -5720,7 +5795,7 @@ function peg$parse(input, options) {
 
           if (s3 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$c160(s2);
+            s1 = peg$c158(s2);
             s0 = s1;
           } else {
             peg$currPos = s0;
@@ -5742,66 +5817,310 @@ function peg$parse(input, options) {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c159);
+        peg$fail(peg$c157);
       }
     }
 
     return s0;
   }
 
-  function peg$parsetype_name() {
-    var s0, s1, s2, s3;
+  function peg$parseschema_name() {
+    var s0, s1, s2;
     peg$silentFails++;
     s0 = peg$currPos;
-    s1 = [];
-    s2 = peg$parsetype_character();
+    s1 = peg$parsename();
 
-    if (s2 !== peg$FAILED) {
-      while (s2 !== peg$FAILED) {
-        s1.push(s2);
-        s2 = peg$parsetype_character();
+    if (s1 !== peg$FAILED) {
+      if (input.charCodeAt(peg$currPos) === 46) {
+        s2 = peg$c162;
+        peg$currPos++;
+      } else {
+        s2 = peg$FAILED;
+
+        if (peg$silentFails === 0) {
+          peg$fail(peg$c163);
+        }
       }
-    } else {
-      s1 = peg$FAILED;
-    }
 
-    if (s1 !== peg$FAILED) {
-      peg$savedPos = s0;
-      s1 = peg$c160(s1);
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s1 = peg$c164(s1);
+        s0 = s1;
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
     }
 
-    s0 = s1;
+    peg$silentFails--;
 
     if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      s1 = peg$parsequote();
-
-      if (s1 !== peg$FAILED) {
-        s2 = [];
+      s1 = peg$FAILED;
 
-        if (peg$c161.test(input.charAt(peg$currPos))) {
-          s3 = input.charAt(peg$currPos);
-          peg$currPos++;
-        } else {
-          s3 = peg$FAILED;
+      if (peg$silentFails === 0) {
+        peg$fail(peg$c161);
+      }
+    }
 
-          if (peg$silentFails === 0) {
-            peg$fail(peg$c162);
-          }
-        }
+    return s0;
+  }
+
+  function peg$parsefield_identifier() {
+    var s0, s1, s2, s3, s4, s5;
+    s0 = peg$currPos;
+    s1 = peg$parsename();
+
+    if (s1 !== peg$FAILED) {
+      if (input.charCodeAt(peg$currPos) === 46) {
+        s2 = peg$c162;
+        peg$currPos++;
+      } else {
+        s2 = peg$FAILED;
+
+        if (peg$silentFails === 0) {
+          peg$fail(peg$c163);
+        }
+      }
+
+      if (s2 !== peg$FAILED) {
+        s3 = peg$parsename();
+
+        if (s3 !== peg$FAILED) {
+          if (input.charCodeAt(peg$currPos) === 46) {
+            s4 = peg$c162;
+            peg$currPos++;
+          } else {
+            s4 = peg$FAILED;
+
+            if (peg$silentFails === 0) {
+              peg$fail(peg$c163);
+            }
+          }
+
+          if (s4 !== peg$FAILED) {
+            s5 = peg$parseRefField();
+
+            if (s5 !== peg$FAILED) {
+              peg$savedPos = s0;
+              s1 = peg$c165(s1, s3, s5);
+              s0 = s1;
+            } else {
+              peg$currPos = s0;
+              s0 = peg$FAILED;
+            }
+          } else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      s1 = peg$parsename();
+
+      if (s1 !== peg$FAILED) {
+        if (input.charCodeAt(peg$currPos) === 46) {
+          s2 = peg$c162;
+          peg$currPos++;
+        } else {
+          s2 = peg$FAILED;
+
+          if (peg$silentFails === 0) {
+            peg$fail(peg$c163);
+          }
+        }
+
+        if (s2 !== peg$FAILED) {
+          s3 = peg$parseRefField();
+
+          if (s3 !== peg$FAILED) {
+            peg$savedPos = s0;
+            s1 = peg$c166(s1, s3);
+            s0 = s1;
+          } else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    }
+
+    return s0;
+  }
+
+  function peg$parseinline_field_identifier() {
+    var s0, s1, s2, s3, s4, s5;
+    s0 = peg$currPos;
+    s1 = peg$parsename();
+
+    if (s1 !== peg$FAILED) {
+      if (input.charCodeAt(peg$currPos) === 46) {
+        s2 = peg$c162;
+        peg$currPos++;
+      } else {
+        s2 = peg$FAILED;
+
+        if (peg$silentFails === 0) {
+          peg$fail(peg$c163);
+        }
+      }
+
+      if (s2 !== peg$FAILED) {
+        s3 = peg$parsename();
+
+        if (s3 !== peg$FAILED) {
+          if (input.charCodeAt(peg$currPos) === 46) {
+            s4 = peg$c162;
+            peg$currPos++;
+          } else {
+            s4 = peg$FAILED;
+
+            if (peg$silentFails === 0) {
+              peg$fail(peg$c163);
+            }
+          }
+
+          if (s4 !== peg$FAILED) {
+            s5 = peg$parsename();
+
+            if (s5 !== peg$FAILED) {
+              peg$savedPos = s0;
+              s1 = peg$c167(s1, s3, s5);
+              s0 = s1;
+            } else {
+              peg$currPos = s0;
+              s0 = peg$FAILED;
+            }
+          } else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      s1 = peg$parsename();
+
+      if (s1 !== peg$FAILED) {
+        if (input.charCodeAt(peg$currPos) === 46) {
+          s2 = peg$c162;
+          peg$currPos++;
+        } else {
+          s2 = peg$FAILED;
+
+          if (peg$silentFails === 0) {
+            peg$fail(peg$c163);
+          }
+        }
+
+        if (s2 !== peg$FAILED) {
+          s3 = peg$parsename();
+
+          if (s3 !== peg$FAILED) {
+            peg$savedPos = s0;
+            s1 = peg$c168(s1, s3);
+            s0 = s1;
+          } else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    }
+
+    return s0;
+  }
+
+  function peg$parsetype_name() {
+    var s0, s1, s2, s3;
+    peg$silentFails++;
+    s0 = peg$currPos;
+    s1 = [];
+    s2 = peg$parsetype_character();
+
+    if (s2 !== peg$FAILED) {
+      while (s2 !== peg$FAILED) {
+        s1.push(s2);
+        s2 = peg$parsetype_character();
+      }
+    } else {
+      s1 = peg$FAILED;
+    }
+
+    if (s1 !== peg$FAILED) {
+      peg$savedPos = s0;
+      s1 = peg$c158(s1);
+    }
+
+    s0 = s1;
+
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      s1 = peg$parsequote();
+
+      if (s1 !== peg$FAILED) {
+        s2 = [];
+
+        if (peg$c159.test(input.charAt(peg$currPos))) {
+          s3 = input.charAt(peg$currPos);
+          peg$currPos++;
+        } else {
+          s3 = peg$FAILED;
+
+          if (peg$silentFails === 0) {
+            peg$fail(peg$c160);
+          }
+        }
 
         if (s3 !== peg$FAILED) {
           while (s3 !== peg$FAILED) {
             s2.push(s3);
 
-            if (peg$c161.test(input.charAt(peg$currPos))) {
+            if (peg$c159.test(input.charAt(peg$currPos))) {
               s3 = input.charAt(peg$currPos);
               peg$currPos++;
             } else {
               s3 = peg$FAILED;
 
               if (peg$silentFails === 0) {
-                peg$fail(peg$c162);
+                peg$fail(peg$c160);
               }
             }
           }
@@ -5814,7 +6133,7 @@ function peg$parse(input, options) {
 
           if (s3 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$c160(s2);
+            s1 = peg$c158(s2);
             s0 = s1;
           } else {
             peg$currPos = s0;
@@ -5836,7 +6155,7 @@ function peg$parse(input, options) {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c159);
+        peg$fail(peg$c157);
       }
     }
 
@@ -5861,13 +6180,13 @@ function peg$parse(input, options) {
 
       if (s3 !== peg$FAILED) {
         if (input.charCodeAt(peg$currPos) === 40) {
-          s4 = peg$c30;
+          s4 = peg$c28;
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
 
           if (peg$silentFails === 0) {
-            peg$fail(peg$c31);
+            peg$fail(peg$c29);
           }
         }
 
@@ -5894,13 +6213,13 @@ function peg$parse(input, options) {
 
               if (s7 !== peg$FAILED) {
                 if (input.charCodeAt(peg$currPos) === 41) {
-                  s8 = peg$c32;
+                  s8 = peg$c30;
                   peg$currPos++;
                 } else {
                   s8 = peg$FAILED;
 
                   if (peg$silentFails === 0) {
-                    peg$fail(peg$c33);
+                    peg$fail(peg$c31);
                   }
                 }
 
@@ -5938,7 +6257,7 @@ function peg$parse(input, options) {
 
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$c164(s1, s2);
+        s1 = peg$c170(s1, s2);
         s0 = s1;
       } else {
         peg$currPos = s0;
@@ -5955,7 +6274,7 @@ function peg$parse(input, options) {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c163);
+        peg$fail(peg$c169);
       }
     }
 
@@ -5976,7 +6295,7 @@ function peg$parse(input, options) {
 
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$c166(s1);
+      s1 = peg$c172(s1);
     }
 
     s0 = s1;
@@ -5986,7 +6305,7 @@ function peg$parse(input, options) {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c165);
+        peg$fail(peg$c171);
       }
     }
 
@@ -6020,13 +6339,13 @@ function peg$parse(input, options) {
 
       if (s3 !== peg$FAILED) {
         if (input.charCodeAt(peg$currPos) === 40) {
-          s4 = peg$c30;
+          s4 = peg$c28;
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
 
           if (peg$silentFails === 0) {
-            peg$fail(peg$c31);
+            peg$fail(peg$c29);
           }
         }
 
@@ -6035,13 +6354,13 @@ function peg$parse(input, options) {
 
           if (s5 !== peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 41) {
-              s6 = peg$c32;
+              s6 = peg$c30;
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
 
               if (peg$silentFails === 0) {
-                peg$fail(peg$c33);
+                peg$fail(peg$c31);
               }
             }
 
@@ -6073,13 +6392,13 @@ function peg$parse(input, options) {
       s1 = peg$currPos;
 
       if (input.charCodeAt(peg$currPos) === 40) {
-        s2 = peg$c30;
+        s2 = peg$c28;
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
 
         if (peg$silentFails === 0) {
-          peg$fail(peg$c31);
+          peg$fail(peg$c29);
         }
       }
 
@@ -6088,13 +6407,13 @@ function peg$parse(input, options) {
 
         if (s3 !== peg$FAILED) {
           if (input.charCodeAt(peg$currPos) === 41) {
-            s4 = peg$c32;
+            s4 = peg$c30;
             peg$currPos++;
           } else {
             s4 = peg$FAILED;
 
             if (peg$silentFails === 0) {
-              peg$fail(peg$c33);
+              peg$fail(peg$c31);
             }
           }
 
@@ -6141,25 +6460,25 @@ function peg$parse(input, options) {
 
           if (s4 === peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 44) {
-              s4 = peg$c167;
+              s4 = peg$c173;
               peg$currPos++;
             } else {
               s4 = peg$FAILED;
 
               if (peg$silentFails === 0) {
-                peg$fail(peg$c168);
+                peg$fail(peg$c174);
               }
             }
 
             if (s4 === peg$FAILED) {
-              if (input.substr(peg$currPos, 2) === peg$c169) {
-                s4 = peg$c169;
+              if (input.substr(peg$currPos, 2) === peg$c175) {
+                s4 = peg$c175;
                 peg$currPos += 2;
               } else {
                 s4 = peg$FAILED;
 
                 if (peg$silentFails === 0) {
-                  peg$fail(peg$c170);
+                  peg$fail(peg$c176);
                 }
               }
 
@@ -6168,14 +6487,14 @@ function peg$parse(input, options) {
                 s5 = peg$parseendline();
 
                 if (s5 !== peg$FAILED) {
-                  if (input.substr(peg$currPos, 2) === peg$c169) {
-                    s6 = peg$c169;
+                  if (input.substr(peg$currPos, 2) === peg$c175) {
+                    s6 = peg$c175;
                     peg$currPos += 2;
                   } else {
                     s6 = peg$FAILED;
 
                     if (peg$silentFails === 0) {
-                      peg$fail(peg$c170);
+                      peg$fail(peg$c176);
                     }
                   }
 
@@ -6240,7 +6559,7 @@ function peg$parse(input, options) {
               s4 = peg$FAILED;
 
               if (peg$silentFails === 0) {
-                peg$fail(peg$c171);
+                peg$fail(peg$c177);
               }
             }
 
@@ -6270,7 +6589,7 @@ function peg$parse(input, options) {
 
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$c172(s1);
+      s1 = peg$c178(s1);
     }
 
     s0 = s1;
@@ -6280,14 +6599,14 @@ function peg$parse(input, options) {
   function peg$parseexprChar() {
     var s0;
 
-    if (peg$c173.test(input.charAt(peg$currPos))) {
+    if (peg$c179.test(input.charAt(peg$currPos))) {
       s0 = input.charAt(peg$currPos);
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c174);
+        peg$fail(peg$c180);
       }
     }
 
@@ -6309,14 +6628,14 @@ function peg$parse(input, options) {
   function peg$parseexprCharNoCommaSpace() {
     var s0;
 
-    if (peg$c175.test(input.charAt(peg$currPos))) {
+    if (peg$c181.test(input.charAt(peg$currPos))) {
       s0 = input.charAt(peg$currPos);
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c176);
+        peg$fail(peg$c182);
       }
     }
 
@@ -6374,13 +6693,13 @@ function peg$parse(input, options) {
         s2 = peg$FAILED;
 
         if (peg$silentFails === 0) {
-          peg$fail(peg$c171);
+          peg$fail(peg$c177);
         }
       }
 
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$c177();
+        s1 = peg$c183();
         s0 = s1;
       } else {
         peg$currPos = s0;
@@ -6399,14 +6718,14 @@ function peg$parse(input, options) {
     s0 = peg$parsecharacter();
 
     if (s0 === peg$FAILED) {
-      if (peg$c178.test(input.charAt(peg$currPos))) {
+      if (peg$c184.test(input.charAt(peg$currPos))) {
         s0 = input.charAt(peg$currPos);
         peg$currPos++;
       } else {
         s0 = peg$FAILED;
 
         if (peg$silentFails === 0) {
-          peg$fail(peg$c179);
+          peg$fail(peg$c185);
         }
       }
     }
@@ -6418,14 +6737,14 @@ function peg$parse(input, options) {
     var s0, s1;
     peg$silentFails++;
 
-    if (peg$c181.test(input.charAt(peg$currPos))) {
+    if (peg$c187.test(input.charAt(peg$currPos))) {
       s0 = input.charAt(peg$currPos);
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c182);
+        peg$fail(peg$c188);
       }
     }
 
@@ -6435,7 +6754,7 @@ function peg$parse(input, options) {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c180);
+        peg$fail(peg$c186);
       }
     }
 
@@ -6446,20 +6765,20 @@ function peg$parse(input, options) {
     var s0, s1;
     s0 = peg$currPos;
 
-    if (peg$c183.test(input.charAt(peg$currPos))) {
+    if (peg$c189.test(input.charAt(peg$currPos))) {
       s1 = input.charAt(peg$currPos);
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c184);
+        peg$fail(peg$c190);
       }
     }
 
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$c185(s1);
+      s1 = peg$c191(s1);
     }
 
     s0 = s1;
@@ -6470,13 +6789,13 @@ function peg$parse(input, options) {
     var s0;
 
     if (input.charCodeAt(peg$currPos) === 34) {
-      s0 = peg$c186;
+      s0 = peg$c192;
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c187);
+        peg$fail(peg$c193);
       }
     }
 
@@ -6562,7 +6881,7 @@ function peg$parse(input, options) {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c188);
+        peg$fail(peg$c194);
       }
     }
 
@@ -6573,60 +6892,59 @@ function peg$parse(input, options) {
     var s0;
 
     if (input.charCodeAt(peg$currPos) === 9) {
-      s0 = peg$c189;
+      s0 = peg$c195;
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c190);
+        peg$fail(peg$c196);
       }
     }
 
     return s0;
   }
 
-  function peg$parsecomment() {
+  function peg$parsesingle_line_comment() {
     var s0, s1, s2, s3;
-    peg$silentFails++;
     s0 = peg$currPos;
 
-    if (input.substr(peg$currPos, 2) === peg$c192) {
-      s1 = peg$c192;
+    if (input.substr(peg$currPos, 2) === peg$c197) {
+      s1 = peg$c197;
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c193);
+        peg$fail(peg$c198);
       }
     }
 
     if (s1 !== peg$FAILED) {
       s2 = [];
 
-      if (peg$c194.test(input.charAt(peg$currPos))) {
+      if (peg$c199.test(input.charAt(peg$currPos))) {
         s3 = input.charAt(peg$currPos);
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
 
         if (peg$silentFails === 0) {
-          peg$fail(peg$c195);
+          peg$fail(peg$c200);
         }
       }
 
       while (s3 !== peg$FAILED) {
         s2.push(s3);
 
-        if (peg$c194.test(input.charAt(peg$currPos))) {
+        if (peg$c199.test(input.charAt(peg$currPos))) {
           s3 = input.charAt(peg$currPos);
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
 
           if (peg$silentFails === 0) {
-            peg$fail(peg$c195);
+            peg$fail(peg$c200);
           }
         }
       }
@@ -6643,13 +6961,172 @@ function peg$parse(input, options) {
       s0 = peg$FAILED;
     }
 
+    return s0;
+  }
+
+  function peg$parsemulti_lime_comment() {
+    var s0, s1, s2, s3, s4, s5;
+    s0 = peg$currPos;
+
+    if (input.substr(peg$currPos, 2) === peg$c201) {
+      s1 = peg$c201;
+      peg$currPos += 2;
+    } else {
+      s1 = peg$FAILED;
+
+      if (peg$silentFails === 0) {
+        peg$fail(peg$c202);
+      }
+    }
+
+    if (s1 !== peg$FAILED) {
+      s2 = [];
+      s3 = peg$currPos;
+      s4 = peg$currPos;
+      peg$silentFails++;
+
+      if (input.substr(peg$currPos, 2) === peg$c203) {
+        s5 = peg$c203;
+        peg$currPos += 2;
+      } else {
+        s5 = peg$FAILED;
+
+        if (peg$silentFails === 0) {
+          peg$fail(peg$c204);
+        }
+      }
+
+      peg$silentFails--;
+
+      if (s5 === peg$FAILED) {
+        s4 = void 0;
+      } else {
+        peg$currPos = s4;
+        s4 = peg$FAILED;
+      }
+
+      if (s4 !== peg$FAILED) {
+        if (input.length > peg$currPos) {
+          s5 = input.charAt(peg$currPos);
+          peg$currPos++;
+        } else {
+          s5 = peg$FAILED;
+
+          if (peg$silentFails === 0) {
+            peg$fail(peg$c177);
+          }
+        }
+
+        if (s5 !== peg$FAILED) {
+          s4 = [s4, s5];
+          s3 = s4;
+        } else {
+          peg$currPos = s3;
+          s3 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s3;
+        s3 = peg$FAILED;
+      }
+
+      while (s3 !== peg$FAILED) {
+        s2.push(s3);
+        s3 = peg$currPos;
+        s4 = peg$currPos;
+        peg$silentFails++;
+
+        if (input.substr(peg$currPos, 2) === peg$c203) {
+          s5 = peg$c203;
+          peg$currPos += 2;
+        } else {
+          s5 = peg$FAILED;
+
+          if (peg$silentFails === 0) {
+            peg$fail(peg$c204);
+          }
+        }
+
+        peg$silentFails--;
+
+        if (s5 === peg$FAILED) {
+          s4 = void 0;
+        } else {
+          peg$currPos = s4;
+          s4 = peg$FAILED;
+        }
+
+        if (s4 !== peg$FAILED) {
+          if (input.length > peg$currPos) {
+            s5 = input.charAt(peg$currPos);
+            peg$currPos++;
+          } else {
+            s5 = peg$FAILED;
+
+            if (peg$silentFails === 0) {
+              peg$fail(peg$c177);
+            }
+          }
+
+          if (s5 !== peg$FAILED) {
+            s4 = [s4, s5];
+            s3 = s4;
+          } else {
+            peg$currPos = s3;
+            s3 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s3;
+          s3 = peg$FAILED;
+        }
+      }
+
+      if (s2 !== peg$FAILED) {
+        if (input.substr(peg$currPos, 2) === peg$c203) {
+          s3 = peg$c203;
+          peg$currPos += 2;
+        } else {
+          s3 = peg$FAILED;
+
+          if (peg$silentFails === 0) {
+            peg$fail(peg$c204);
+          }
+        }
+
+        if (s3 !== peg$FAILED) {
+          s1 = [s1, s2, s3];
+          s0 = s1;
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parsecomment() {
+    var s0, s1;
+    peg$silentFails++;
+    s0 = peg$parsesingle_line_comment();
+
+    if (s0 === peg$FAILED) {
+      s0 = peg$parsemulti_lime_comment();
+    }
+
     peg$silentFails--;
 
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c191);
+        peg$fail(peg$c205);
       }
     }
 
@@ -6660,26 +7137,26 @@ function peg$parse(input, options) {
     var s0, s1;
     peg$silentFails++;
 
-    if (input.substr(peg$currPos, 2) === peg$c197) {
-      s0 = peg$c197;
+    if (input.substr(peg$currPos, 2) === peg$c207) {
+      s0 = peg$c207;
       peg$currPos += 2;
     } else {
       s0 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c198);
+        peg$fail(peg$c208);
       }
     }
 
     if (s0 === peg$FAILED) {
       if (input.charCodeAt(peg$currPos) === 10) {
-        s0 = peg$c199;
+        s0 = peg$c209;
         peg$currPos++;
       } else {
         s0 = peg$FAILED;
 
         if (peg$silentFails === 0) {
-          peg$fail(peg$c200);
+          peg$fail(peg$c210);
         }
       }
     }
@@ -6690,7 +7167,7 @@ function peg$parse(input, options) {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c196);
+        peg$fail(peg$c206);
       }
     }
 
@@ -6701,14 +7178,14 @@ function peg$parse(input, options) {
     var s0, s1;
     peg$silentFails++;
 
-    if (peg$c202.test(input.charAt(peg$currPos))) {
+    if (peg$c212.test(input.charAt(peg$currPos))) {
       s0 = input.charAt(peg$currPos);
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c203);
+        peg$fail(peg$c213);
       }
     }
 
@@ -6718,7 +7195,7 @@ function peg$parse(input, options) {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c201);
+        peg$fail(peg$c211);
       }
     }
 
@@ -6729,14 +7206,14 @@ function peg$parse(input, options) {
     var s0, s1;
     peg$silentFails++;
 
-    if (peg$c204.test(input.charAt(peg$currPos))) {
+    if (peg$c214.test(input.charAt(peg$currPos))) {
       s0 = input.charAt(peg$currPos);
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c205);
+        peg$fail(peg$c215);
       }
     }
 
@@ -6746,7 +7223,7 @@ function peg$parse(input, options) {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c201);
+        peg$fail(peg$c211);
       }
     }
 
@@ -6757,13 +7234,13 @@ function peg$parse(input, options) {
     var s0;
 
     if (input.charCodeAt(peg$currPos) === 32) {
-      s0 = peg$c206;
+      s0 = peg$c216;
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c207);
+        peg$fail(peg$c217);
       }
     }
 
@@ -6774,13 +7251,13 @@ function peg$parse(input, options) {
     var s0;
 
     if (input.charCodeAt(peg$currPos) === 44) {
-      s0 = peg$c167;
+      s0 = peg$c173;
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c168);
+        peg$fail(peg$c174);
       }
     }
 
@@ -6792,19 +7269,19 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
 
     if (input.charCodeAt(peg$currPos) === 35) {
-      s1 = peg$c208;
+      s1 = peg$c218;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c209);
+        peg$fail(peg$c219);
       }
     }
 
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$c210();
+      s1 = peg$c220();
     }
 
     s0 = s1;
@@ -6817,13 +7294,13 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
 
     if (input.charCodeAt(peg$currPos) === 34) {
-      s1 = peg$c186;
+      s1 = peg$c192;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c187);
+        peg$fail(peg$c193);
       }
     }
 
@@ -6838,19 +7315,19 @@ function peg$parse(input, options) {
 
       if (s2 !== peg$FAILED) {
         if (input.charCodeAt(peg$currPos) === 34) {
-          s3 = peg$c186;
+          s3 = peg$c192;
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
 
           if (peg$silentFails === 0) {
-            peg$fail(peg$c187);
+            peg$fail(peg$c193);
           }
         }
 
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$c212(s2);
+          s1 = peg$c222(s2);
           s0 = s1;
         } else {
           peg$currPos = s0;
@@ -6868,14 +7345,14 @@ function peg$parse(input, options) {
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
 
-      if (input.substr(peg$currPos, 3) === peg$c213) {
-        s1 = peg$c213;
+      if (input.substr(peg$currPos, 3) === peg$c223) {
+        s1 = peg$c223;
         peg$currPos += 3;
       } else {
         s1 = peg$FAILED;
 
         if (peg$silentFails === 0) {
-          peg$fail(peg$c214);
+          peg$fail(peg$c224);
         }
       }
 
@@ -6889,20 +7366,20 @@ function peg$parse(input, options) {
         }
 
         if (s2 !== peg$FAILED) {
-          if (input.substr(peg$currPos, 3) === peg$c213) {
-            s3 = peg$c213;
+          if (input.substr(peg$currPos, 3) === peg$c223) {
+            s3 = peg$c223;
             peg$currPos += 3;
           } else {
             s3 = peg$FAILED;
 
             if (peg$silentFails === 0) {
-              peg$fail(peg$c214);
+              peg$fail(peg$c224);
             }
           }
 
           if (s3 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$c215(s2);
+            s1 = peg$c225(s2);
             s0 = s1;
           } else {
             peg$currPos = s0;
@@ -6921,13 +7398,13 @@ function peg$parse(input, options) {
         s0 = peg$currPos;
 
         if (input.charCodeAt(peg$currPos) === 39) {
-          s1 = peg$c216;
+          s1 = peg$c226;
           peg$currPos++;
         } else {
           s1 = peg$FAILED;
 
           if (peg$silentFails === 0) {
-            peg$fail(peg$c217);
+            peg$fail(peg$c227);
           }
         }
 
@@ -6942,19 +7419,19 @@ function peg$parse(input, options) {
 
           if (s2 !== peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 39) {
-              s3 = peg$c216;
+              s3 = peg$c226;
               peg$currPos++;
             } else {
               s3 = peg$FAILED;
 
               if (peg$silentFails === 0) {
-                peg$fail(peg$c217);
+                peg$fail(peg$c227);
               }
             }
 
             if (s3 !== peg$FAILED) {
               peg$savedPos = s0;
-              s1 = peg$c212(s2);
+              s1 = peg$c222(s2);
               s0 = s1;
             } else {
               peg$currPos = s0;
@@ -6977,7 +7454,7 @@ function peg$parse(input, options) {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c211);
+        peg$fail(peg$c221);
       }
     }
 
@@ -6989,31 +7466,31 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
 
     if (input.charCodeAt(peg$currPos) === 92) {
-      s1 = peg$c218;
+      s1 = peg$c228;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c219);
+        peg$fail(peg$c229);
       }
     }
 
     if (s1 !== peg$FAILED) {
       if (input.charCodeAt(peg$currPos) === 34) {
-        s2 = peg$c186;
+        s2 = peg$c192;
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
 
         if (peg$silentFails === 0) {
-          peg$fail(peg$c187);
+          peg$fail(peg$c193);
         }
       }
 
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$c220();
+        s1 = peg$c230();
         s0 = s1;
       } else {
         peg$currPos = s0;
@@ -7030,13 +7507,13 @@ function peg$parse(input, options) {
       peg$silentFails++;
 
       if (input.charCodeAt(peg$currPos) === 34) {
-        s2 = peg$c186;
+        s2 = peg$c192;
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
 
         if (peg$silentFails === 0) {
-          peg$fail(peg$c187);
+          peg$fail(peg$c193);
         }
       }
 
@@ -7054,7 +7531,7 @@ function peg$parse(input, options) {
 
         if (s2 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$c221();
+          s1 = peg$c231();
           s0 = s1;
         } else {
           peg$currPos = s0;
@@ -7073,20 +7550,20 @@ function peg$parse(input, options) {
     var s0, s1, s2;
     s0 = peg$currPos;
 
-    if (input.substr(peg$currPos, 2) === peg$c222) {
-      s1 = peg$c222;
+    if (input.substr(peg$currPos, 2) === peg$c232) {
+      s1 = peg$c232;
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c223);
+        peg$fail(peg$c233);
       }
     }
 
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$c224();
+      s1 = peg$c234();
     }
 
     s0 = s1;
@@ -7097,13 +7574,13 @@ function peg$parse(input, options) {
       peg$silentFails++;
 
       if (input.charCodeAt(peg$currPos) === 39) {
-        s2 = peg$c216;
+        s2 = peg$c226;
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
 
         if (peg$silentFails === 0) {
-          peg$fail(peg$c217);
+          peg$fail(peg$c227);
         }
       }
 
@@ -7121,7 +7598,7 @@ function peg$parse(input, options) {
 
         if (s2 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$c221();
+          s1 = peg$c231();
           s0 = s1;
         } else {
           peg$currPos = s0;
@@ -7140,20 +7617,20 @@ function peg$parse(input, options) {
     var s0, s1, s2, s3;
     s0 = peg$currPos;
 
-    if (input.substr(peg$currPos, 2) === peg$c222) {
-      s1 = peg$c222;
+    if (input.substr(peg$currPos, 2) === peg$c232) {
+      s1 = peg$c232;
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c223);
+        peg$fail(peg$c233);
       }
     }
 
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$c224();
+      s1 = peg$c234();
     }
 
     s0 = s1;
@@ -7162,13 +7639,13 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
 
       if (input.charCodeAt(peg$currPos) === 92) {
-        s1 = peg$c218;
+        s1 = peg$c228;
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
 
         if (peg$silentFails === 0) {
-          peg$fail(peg$c219);
+          peg$fail(peg$c229);
         }
       }
 
@@ -7176,13 +7653,13 @@ function peg$parse(input, options) {
         s2 = [];
 
         if (input.charCodeAt(peg$currPos) === 92) {
-          s3 = peg$c218;
+          s3 = peg$c228;
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
 
           if (peg$silentFails === 0) {
-            peg$fail(peg$c219);
+            peg$fail(peg$c229);
           }
         }
 
@@ -7191,13 +7668,13 @@ function peg$parse(input, options) {
             s2.push(s3);
 
             if (input.charCodeAt(peg$currPos) === 92) {
-              s3 = peg$c218;
+              s3 = peg$c228;
               peg$currPos++;
             } else {
               s3 = peg$FAILED;
 
               if (peg$silentFails === 0) {
-                peg$fail(peg$c219);
+                peg$fail(peg$c229);
               }
             }
           }
@@ -7207,7 +7684,7 @@ function peg$parse(input, options) {
 
         if (s2 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$c225(s2);
+          s1 = peg$c235(s2);
           s0 = s1;
         } else {
           peg$currPos = s0;
@@ -7222,25 +7699,25 @@ function peg$parse(input, options) {
         s0 = peg$currPos;
 
         if (input.charCodeAt(peg$currPos) === 92) {
-          s1 = peg$c218;
+          s1 = peg$c228;
           peg$currPos++;
         } else {
           s1 = peg$FAILED;
 
           if (peg$silentFails === 0) {
-            peg$fail(peg$c219);
+            peg$fail(peg$c229);
           }
         }
 
         if (s1 !== peg$FAILED) {
           if (input.charCodeAt(peg$currPos) === 10) {
-            s2 = peg$c199;
+            s2 = peg$c209;
             peg$currPos++;
           } else {
             s2 = peg$FAILED;
 
             if (peg$silentFails === 0) {
-              peg$fail(peg$c200);
+              peg$fail(peg$c210);
             }
           }
 
@@ -7250,7 +7727,7 @@ function peg$parse(input, options) {
 
           if (s2 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$c226();
+            s1 = peg$c236();
             s0 = s1;
           } else {
             peg$currPos = s0;
@@ -7266,14 +7743,14 @@ function peg$parse(input, options) {
           s1 = peg$currPos;
           peg$silentFails++;
 
-          if (input.substr(peg$currPos, 3) === peg$c213) {
-            s2 = peg$c213;
+          if (input.substr(peg$currPos, 3) === peg$c223) {
+            s2 = peg$c223;
             peg$currPos += 3;
           } else {
             s2 = peg$FAILED;
 
             if (peg$silentFails === 0) {
-              peg$fail(peg$c214);
+              peg$fail(peg$c224);
             }
           }
 
@@ -7291,7 +7768,7 @@ function peg$parse(input, options) {
 
             if (s2 !== peg$FAILED) {
               peg$savedPos = s0;
-              s1 = peg$c221();
+              s1 = peg$c231();
               s0 = s1;
             } else {
               peg$currPos = s0;
@@ -7318,7 +7795,7 @@ function peg$parse(input, options) {
       s0 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c171);
+        peg$fail(peg$c177);
       }
     }
 
@@ -7328,14 +7805,14 @@ function peg$parse(input, options) {
   function peg$parsedigit() {
     var s0;
 
-    if (peg$c227.test(input.charAt(peg$currPos))) {
+    if (peg$c237.test(input.charAt(peg$currPos))) {
       s0 = input.charAt(peg$currPos);
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c228);
+        peg$fail(peg$c238);
       }
     }
 
@@ -7346,13 +7823,13 @@ function peg$parse(input, options) {
     var s0;
 
     if (input.charCodeAt(peg$currPos) === 61) {
-      s0 = peg$c229;
+      s0 = peg$c239;
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c230);
+        peg$fail(peg$c240);
       }
     }
 
@@ -7363,13 +7840,13 @@ function peg$parse(input, options) {
     var s0;
 
     if (input.charCodeAt(peg$currPos) === 46) {
-      s0 = peg$c25;
+      s0 = peg$c162;
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c26);
+        peg$fail(peg$c163);
       }
     }
 
@@ -7380,38 +7857,38 @@ function peg$parse(input, options) {
     var s0, s1;
     s0 = peg$currPos;
 
-    if (input.substr(peg$currPos, 4).toLowerCase() === peg$c231) {
+    if (input.substr(peg$currPos, 4).toLowerCase() === peg$c241) {
       s1 = input.substr(peg$currPos, 4);
       peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c232);
+        peg$fail(peg$c242);
       }
     }
 
     if (s1 === peg$FAILED) {
-      if (input.substr(peg$currPos, 5).toLowerCase() === peg$c233) {
+      if (input.substr(peg$currPos, 5).toLowerCase() === peg$c243) {
         s1 = input.substr(peg$currPos, 5);
         peg$currPos += 5;
       } else {
         s1 = peg$FAILED;
 
         if (peg$silentFails === 0) {
-          peg$fail(peg$c234);
+          peg$fail(peg$c244);
         }
       }
 
       if (s1 === peg$FAILED) {
-        if (input.substr(peg$currPos, 4).toLowerCase() === peg$c62) {
+        if (input.substr(peg$currPos, 4).toLowerCase() === peg$c60) {
           s1 = input.substr(peg$currPos, 4);
           peg$currPos += 4;
         } else {
           s1 = peg$FAILED;
 
           if (peg$silentFails === 0) {
-            peg$fail(peg$c63);
+            peg$fail(peg$c61);
           }
         }
       }
@@ -7419,7 +7896,7 @@ function peg$parse(input, options) {
 
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$c235(s1);
+      s1 = peg$c245(s1);
     }
 
     s0 = s1;
@@ -7427,20 +7904,44 @@ function peg$parse(input, options) {
   }
 
   function peg$parseNumberLiteral() {
-    var s0, s1;
+    var s0, s1, s2;
     s0 = peg$currPos;
-    s1 = peg$parsefloat();
+
+    if (input.charCodeAt(peg$currPos) === 45) {
+      s1 = peg$c246;
+      peg$currPos++;
+    } else {
+      s1 = peg$FAILED;
+
+      if (peg$silentFails === 0) {
+        peg$fail(peg$c247);
+      }
+    }
 
     if (s1 === peg$FAILED) {
-      s1 = peg$parseinteger();
+      s1 = null;
     }
 
     if (s1 !== peg$FAILED) {
-      peg$savedPos = s0;
-      s1 = peg$c236(s1);
+      s2 = peg$parsefloat();
+
+      if (s2 === peg$FAILED) {
+        s2 = peg$parseinteger();
+      }
+
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s1 = peg$c248(s1, s2);
+        s0 = s1;
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
     }
 
-    s0 = s1;
     return s0;
   }
 
@@ -7449,14 +7950,14 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
     s1 = [];
 
-    if (peg$c227.test(input.charAt(peg$currPos))) {
+    if (peg$c237.test(input.charAt(peg$currPos))) {
       s2 = input.charAt(peg$currPos);
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c228);
+        peg$fail(peg$c238);
       }
     }
 
@@ -7464,14 +7965,14 @@ function peg$parse(input, options) {
       while (s2 !== peg$FAILED) {
         s1.push(s2);
 
-        if (peg$c227.test(input.charAt(peg$currPos))) {
+        if (peg$c237.test(input.charAt(peg$currPos))) {
           s2 = input.charAt(peg$currPos);
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
 
           if (peg$silentFails === 0) {
-            peg$fail(peg$c228);
+            peg$fail(peg$c238);
           }
         }
       }
@@ -7481,27 +7982,27 @@ function peg$parse(input, options) {
 
     if (s1 !== peg$FAILED) {
       if (input.charCodeAt(peg$currPos) === 46) {
-        s2 = peg$c25;
+        s2 = peg$c162;
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
 
         if (peg$silentFails === 0) {
-          peg$fail(peg$c26);
+          peg$fail(peg$c163);
         }
       }
 
       if (s2 !== peg$FAILED) {
         s3 = [];
 
-        if (peg$c227.test(input.charAt(peg$currPos))) {
+        if (peg$c237.test(input.charAt(peg$currPos))) {
           s4 = input.charAt(peg$currPos);
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
 
           if (peg$silentFails === 0) {
-            peg$fail(peg$c228);
+            peg$fail(peg$c238);
           }
         }
 
@@ -7509,14 +8010,14 @@ function peg$parse(input, options) {
           while (s4 !== peg$FAILED) {
             s3.push(s4);
 
-            if (peg$c227.test(input.charAt(peg$currPos))) {
+            if (peg$c237.test(input.charAt(peg$currPos))) {
               s4 = input.charAt(peg$currPos);
               peg$currPos++;
             } else {
               s4 = peg$FAILED;
 
               if (peg$silentFails === 0) {
-                peg$fail(peg$c228);
+                peg$fail(peg$c238);
               }
             }
           }
@@ -7526,7 +8027,7 @@ function peg$parse(input, options) {
 
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$c237(s1, s3);
+          s1 = peg$c249(s1, s3);
           s0 = s1;
         } else {
           peg$currPos = s0;
@@ -7549,14 +8050,14 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
     s1 = [];
 
-    if (peg$c227.test(input.charAt(peg$currPos))) {
+    if (peg$c237.test(input.charAt(peg$currPos))) {
       s2 = input.charAt(peg$currPos);
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c228);
+        peg$fail(peg$c238);
       }
     }
 
@@ -7564,14 +8065,14 @@ function peg$parse(input, options) {
       while (s2 !== peg$FAILED) {
         s1.push(s2);
 
-        if (peg$c227.test(input.charAt(peg$currPos))) {
+        if (peg$c237.test(input.charAt(peg$currPos))) {
           s2 = input.charAt(peg$currPos);
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
 
           if (peg$silentFails === 0) {
-            peg$fail(peg$c228);
+            peg$fail(peg$c238);
           }
         }
       }
@@ -7581,7 +8082,7 @@ function peg$parse(input, options) {
 
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$c238(s1);
+      s1 = peg$c250(s1);
     }
 
     s0 = s1;
@@ -7594,6 +8095,7 @@ function peg$parse(input, options) {
     refs: [],
     enums: [],
     tableGroups: [],
+    aliases: [],
     project: {}
   };
   var projectCnt = 0;