cariboujs 2.0.4 → 2.0.6

package/vhdl/vhdl2008/vhdl2008Visitor.js

@@ -1422,6 +1422,12 @@ export default class vhdl2008Visitor extends antlr4.tree.ParseTreeVisitor {
 	}
 
 
+	// Visit a parse tree produced by vhdl2008Parser#signature.
+	visitSignature(ctx) {
+	  return this.visitChildren(ctx);
+	}
+
+
 	// Visit a parse tree produced by vhdl2008Parser#simple_expression.
 	visitSimple_expression(ctx) {
 	  return this.visitChildren(ctx);

package/wkt/wktLexer.js

@@ -3,131 +3,151 @@
 import antlr4 from 'antlr4';
 
 
-const serializedATN = [4,0,24,396,6,-1,2,0,7,0,2,1,7,1,2,2,7,2,2,3,7,3,2,
+const serializedATN = [4,0,31,459,6,-1,2,0,7,0,2,1,7,1,2,2,7,2,2,3,7,3,2,
 4,7,4,2,5,7,5,2,6,7,6,2,7,7,7,2,8,7,8,2,9,7,9,2,10,7,10,2,11,7,11,2,12,7,
 12,2,13,7,13,2,14,7,14,2,15,7,15,2,16,7,16,2,17,7,17,2,18,7,18,2,19,7,19,
 2,20,7,20,2,21,7,21,2,22,7,22,2,23,7,23,2,24,7,24,2,25,7,25,2,26,7,26,2,
 27,7,27,2,28,7,28,2,29,7,29,2,30,7,30,2,31,7,31,2,32,7,32,2,33,7,33,2,34,
 7,34,2,35,7,35,2,36,7,36,2,37,7,37,2,38,7,38,2,39,7,39,2,40,7,40,2,41,7,
 41,2,42,7,42,2,43,7,43,2,44,7,44,2,45,7,45,2,46,7,46,2,47,7,47,2,48,7,48,
-2,49,7,49,2,50,7,50,2,51,7,51,2,52,7,52,1,0,3,0,109,8,0,1,0,1,0,1,0,1,0,
-3,0,115,8,0,1,1,1,1,1,1,5,1,120,8,1,10,1,12,1,123,9,1,3,1,125,8,1,1,2,4,
-2,128,8,2,11,2,12,2,129,1,3,1,3,3,3,134,8,3,1,4,1,4,1,5,1,5,1,6,1,6,1,7,
-1,7,1,8,1,8,1,9,1,9,1,9,1,9,1,9,1,9,1,10,1,10,1,10,1,10,1,10,1,10,1,10,1,
-10,1,10,1,10,1,10,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,12,1,12,1,12,
-1,12,1,12,1,12,1,12,1,12,1,12,1,12,1,12,1,13,1,13,1,13,1,13,1,13,1,13,1,
-13,1,13,1,13,1,13,1,13,1,13,1,13,1,13,1,13,1,13,1,14,1,14,1,14,1,14,1,14,
-1,14,1,14,1,14,1,14,1,14,1,14,1,14,1,14,1,15,1,15,1,15,1,15,1,15,1,15,1,
-15,1,15,1,15,1,15,1,15,1,15,1,15,1,15,1,15,1,15,1,15,1,15,1,15,1,16,1,16,
-1,16,1,16,1,16,1,16,1,17,1,17,1,17,1,17,1,17,1,17,1,17,1,17,1,17,1,17,1,
-17,1,17,1,17,1,17,1,17,1,18,1,18,1,18,1,18,1,18,1,18,1,18,1,18,1,18,1,18,
-1,18,1,18,1,18,1,18,1,19,1,19,1,19,1,19,1,19,1,19,1,19,1,19,1,19,1,19,1,
-19,1,19,1,19,1,20,1,20,1,20,1,20,1,20,1,20,1,20,1,20,1,20,1,20,1,20,1,20,
-1,20,1,21,1,21,1,21,1,21,1,21,1,21,1,21,1,21,1,21,1,21,1,21,1,22,1,22,1,
-22,1,22,1,22,1,22,1,22,1,22,1,22,1,23,1,23,1,23,1,23,1,24,1,24,1,24,1,24,
-1,24,1,24,1,24,1,24,1,24,1,24,1,24,1,24,1,24,1,24,1,24,1,24,1,24,1,24,1,
-25,1,25,1,26,1,26,1,27,1,27,1,28,1,28,1,29,1,29,1,30,1,30,1,31,1,31,1,32,
-1,32,1,33,1,33,1,34,1,34,1,35,1,35,1,36,1,36,1,37,1,37,1,38,1,38,1,39,1,
-39,1,40,1,40,1,41,1,41,1,42,1,42,1,43,1,43,1,44,1,44,1,45,1,45,1,46,1,46,
-1,47,1,47,1,48,1,48,1,49,1,49,1,50,1,50,1,51,4,51,386,8,51,11,51,12,51,387,
-1,52,4,52,391,8,52,11,52,12,52,392,1,52,1,52,0,0,53,1,1,3,2,5,3,7,0,9,0,
-11,0,13,4,15,5,17,6,19,7,21,8,23,9,25,10,27,11,29,12,31,13,33,14,35,15,37,
-16,39,17,41,18,43,19,45,20,47,21,49,22,51,0,53,0,55,0,57,0,59,0,61,0,63,
-0,65,0,67,0,69,0,71,0,73,0,75,0,77,0,79,0,81,0,83,0,85,0,87,0,89,0,91,0,
-93,0,95,0,97,0,99,0,101,0,103,23,105,24,1,0,29,1,0,49,57,2,0,65,65,97,97,
-2,0,66,66,98,98,2,0,67,67,99,99,2,0,68,68,100,100,2,0,69,69,101,101,2,0,
-70,70,102,102,2,0,71,71,103,103,2,0,72,72,104,104,2,0,73,73,105,105,2,0,
-74,74,106,106,2,0,75,75,107,107,2,0,76,76,108,108,2,0,77,77,109,109,2,0,
-78,78,110,110,2,0,79,79,111,111,2,0,80,80,112,112,2,0,81,81,113,113,2,0,
-82,82,114,114,2,0,83,83,115,115,2,0,84,84,116,116,2,0,85,85,117,117,2,0,
-86,86,118,118,2,0,87,87,119,119,2,0,88,88,120,120,2,0,89,89,121,121,2,0,
-90,90,122,122,2,0,65,90,97,122,3,0,9,10,13,13,32,32,374,0,1,1,0,0,0,0,3,
-1,0,0,0,0,5,1,0,0,0,0,13,1,0,0,0,0,15,1,0,0,0,0,17,1,0,0,0,0,19,1,0,0,0,
-0,21,1,0,0,0,0,23,1,0,0,0,0,25,1,0,0,0,0,27,1,0,0,0,0,29,1,0,0,0,0,31,1,
-0,0,0,0,33,1,0,0,0,0,35,1,0,0,0,0,37,1,0,0,0,0,39,1,0,0,0,0,41,1,0,0,0,0,
-43,1,0,0,0,0,45,1,0,0,0,0,47,1,0,0,0,0,49,1,0,0,0,0,103,1,0,0,0,0,105,1,
-0,0,0,1,108,1,0,0,0,3,124,1,0,0,0,5,127,1,0,0,0,7,133,1,0,0,0,9,135,1,0,
-0,0,11,137,1,0,0,0,13,139,1,0,0,0,15,141,1,0,0,0,17,143,1,0,0,0,19,145,1,
-0,0,0,21,151,1,0,0,0,23,162,1,0,0,0,25,170,1,0,0,0,27,181,1,0,0,0,29,197,
-1,0,0,0,31,210,1,0,0,0,33,229,1,0,0,0,35,235,1,0,0,0,37,250,1,0,0,0,39,264,
-1,0,0,0,41,277,1,0,0,0,43,290,1,0,0,0,45,301,1,0,0,0,47,310,1,0,0,0,49,314,
-1,0,0,0,51,332,1,0,0,0,53,334,1,0,0,0,55,336,1,0,0,0,57,338,1,0,0,0,59,340,
-1,0,0,0,61,342,1,0,0,0,63,344,1,0,0,0,65,346,1,0,0,0,67,348,1,0,0,0,69,350,
-1,0,0,0,71,352,1,0,0,0,73,354,1,0,0,0,75,356,1,0,0,0,77,358,1,0,0,0,79,360,
-1,0,0,0,81,362,1,0,0,0,83,364,1,0,0,0,85,366,1,0,0,0,87,368,1,0,0,0,89,370,
-1,0,0,0,91,372,1,0,0,0,93,374,1,0,0,0,95,376,1,0,0,0,97,378,1,0,0,0,99,380,
-1,0,0,0,101,382,1,0,0,0,103,385,1,0,0,0,105,390,1,0,0,0,107,109,5,45,0,0,
-108,107,1,0,0,0,108,109,1,0,0,0,109,110,1,0,0,0,110,114,3,3,1,0,111,112,
-3,11,5,0,112,113,3,5,2,0,113,115,1,0,0,0,114,111,1,0,0,0,114,115,1,0,0,0,
-115,2,1,0,0,0,116,125,5,48,0,0,117,121,3,9,4,0,118,120,3,7,3,0,119,118,1,
-0,0,0,120,123,1,0,0,0,121,119,1,0,0,0,121,122,1,0,0,0,122,125,1,0,0,0,123,
-121,1,0,0,0,124,116,1,0,0,0,124,117,1,0,0,0,125,4,1,0,0,0,126,128,3,7,3,
-0,127,126,1,0,0,0,128,129,1,0,0,0,129,127,1,0,0,0,129,130,1,0,0,0,130,6,
-1,0,0,0,131,134,5,48,0,0,132,134,3,9,4,0,133,131,1,0,0,0,133,132,1,0,0,0,
-134,8,1,0,0,0,135,136,7,0,0,0,136,10,1,0,0,0,137,138,5,46,0,0,138,12,1,0,
-0,0,139,140,5,44,0,0,140,14,1,0,0,0,141,142,5,40,0,0,142,16,1,0,0,0,143,
-144,5,41,0,0,144,18,1,0,0,0,145,146,3,81,40,0,146,147,3,79,39,0,147,148,
-3,67,33,0,148,149,3,77,38,0,149,150,3,89,44,0,150,20,1,0,0,0,151,152,3,73,
-36,0,152,153,3,67,33,0,153,154,3,77,38,0,154,155,3,59,29,0,155,156,3,87,
-43,0,156,157,3,89,44,0,157,158,3,85,42,0,158,159,3,67,33,0,159,160,3,77,
-38,0,160,161,3,63,31,0,161,22,1,0,0,0,162,163,3,81,40,0,163,164,3,79,39,
-0,164,165,3,73,36,0,165,166,3,99,49,0,166,167,3,63,31,0,167,168,3,79,39,
-0,168,169,3,77,38,0,169,24,1,0,0,0,170,171,3,75,37,0,171,172,3,91,45,0,172,
-173,3,73,36,0,173,174,3,89,44,0,174,175,3,67,33,0,175,176,3,81,40,0,176,
-177,3,79,39,0,177,178,3,67,33,0,178,179,3,77,38,0,179,180,3,89,44,0,180,
-26,1,0,0,0,181,182,3,75,37,0,182,183,3,91,45,0,183,184,3,73,36,0,184,185,
-3,89,44,0,185,186,3,67,33,0,186,187,3,73,36,0,187,188,3,67,33,0,188,189,
-3,77,38,0,189,190,3,59,29,0,190,191,3,87,43,0,191,192,3,89,44,0,192,193,
-3,85,42,0,193,194,3,67,33,0,194,195,3,77,38,0,195,196,3,63,31,0,196,28,1,
-0,0,0,197,198,3,75,37,0,198,199,3,91,45,0,199,200,3,73,36,0,200,201,3,89,
-44,0,201,202,3,67,33,0,202,203,3,81,40,0,203,204,3,79,39,0,204,205,3,73,
-36,0,205,206,3,99,49,0,206,207,3,63,31,0,207,208,3,79,39,0,208,209,3,77,
-38,0,209,30,1,0,0,0,210,211,3,63,31,0,211,212,3,59,29,0,212,213,3,79,39,
-0,213,214,3,75,37,0,214,215,3,59,29,0,215,216,3,89,44,0,216,217,3,85,42,
-0,217,218,3,99,49,0,218,219,3,55,27,0,219,220,3,79,39,0,220,221,3,73,36,
-0,221,222,3,73,36,0,222,223,3,59,29,0,223,224,3,55,27,0,224,225,3,89,44,
-0,225,226,3,67,33,0,226,227,3,79,39,0,227,228,3,77,38,0,228,32,1,0,0,0,229,
-230,3,59,29,0,230,231,3,75,37,0,231,232,3,81,40,0,232,233,3,89,44,0,233,
-234,3,99,49,0,234,34,1,0,0,0,235,236,3,55,27,0,236,237,3,67,33,0,237,238,
-3,85,42,0,238,239,3,55,27,0,239,240,3,91,45,0,240,241,3,73,36,0,241,242,
-3,51,25,0,242,243,3,85,42,0,243,244,3,87,43,0,244,245,3,89,44,0,245,246,
-3,85,42,0,246,247,3,67,33,0,247,248,3,77,38,0,248,249,3,63,31,0,249,36,1,
-0,0,0,250,251,3,55,27,0,251,252,3,79,39,0,252,253,3,75,37,0,253,254,3,81,
-40,0,254,255,3,79,39,0,255,256,3,91,45,0,256,257,3,77,38,0,257,258,3,57,
-28,0,258,259,3,55,27,0,259,260,3,91,45,0,260,261,3,85,42,0,261,262,3,93,
-46,0,262,263,3,59,29,0,263,38,1,0,0,0,264,265,3,75,37,0,265,266,3,91,45,
-0,266,267,3,73,36,0,267,268,3,89,44,0,268,269,3,67,33,0,269,270,3,87,43,
-0,270,271,3,91,45,0,271,272,3,85,42,0,272,273,3,61,30,0,273,274,3,51,25,
-0,274,275,3,55,27,0,275,276,3,59,29,0,276,40,1,0,0,0,277,278,3,55,27,0,278,
-279,3,91,45,0,279,280,3,85,42,0,280,281,3,93,46,0,281,282,3,59,29,0,282,
-283,3,81,40,0,283,284,3,79,39,0,284,285,3,73,36,0,285,286,3,99,49,0,286,
-287,3,63,31,0,287,288,3,79,39,0,288,289,3,77,38,0,289,42,1,0,0,0,290,291,
-3,75,37,0,291,292,3,91,45,0,292,293,3,73,36,0,293,294,3,89,44,0,294,295,
-3,67,33,0,295,296,3,55,27,0,296,297,3,91,45,0,297,298,3,85,42,0,298,299,
-3,93,46,0,299,300,3,59,29,0,300,44,1,0,0,0,301,302,3,89,44,0,302,303,3,85,
-42,0,303,304,3,67,33,0,304,305,3,51,25,0,305,306,3,77,38,0,306,307,3,63,
-31,0,307,308,3,73,36,0,308,309,3,59,29,0,309,46,1,0,0,0,310,311,3,89,44,
-0,311,312,3,67,33,0,312,313,3,77,38,0,313,48,1,0,0,0,314,315,3,81,40,0,315,
-316,3,79,39,0,316,317,3,73,36,0,317,318,3,99,49,0,318,319,3,65,32,0,319,
-320,3,59,29,0,320,321,3,57,28,0,321,322,3,85,42,0,322,323,3,51,25,0,323,
-324,3,73,36,0,324,325,3,87,43,0,325,326,3,91,45,0,326,327,3,85,42,0,327,
-328,3,61,30,0,328,329,3,51,25,0,329,330,3,55,27,0,330,331,3,59,29,0,331,
-50,1,0,0,0,332,333,7,1,0,0,333,52,1,0,0,0,334,335,7,2,0,0,335,54,1,0,0,0,
-336,337,7,3,0,0,337,56,1,0,0,0,338,339,7,4,0,0,339,58,1,0,0,0,340,341,7,
-5,0,0,341,60,1,0,0,0,342,343,7,6,0,0,343,62,1,0,0,0,344,345,7,7,0,0,345,
-64,1,0,0,0,346,347,7,8,0,0,347,66,1,0,0,0,348,349,7,9,0,0,349,68,1,0,0,0,
-350,351,7,10,0,0,351,70,1,0,0,0,352,353,7,11,0,0,353,72,1,0,0,0,354,355,
-7,12,0,0,355,74,1,0,0,0,356,357,7,13,0,0,357,76,1,0,0,0,358,359,7,14,0,0,
-359,78,1,0,0,0,360,361,7,15,0,0,361,80,1,0,0,0,362,363,7,16,0,0,363,82,1,
-0,0,0,364,365,7,17,0,0,365,84,1,0,0,0,366,367,7,18,0,0,367,86,1,0,0,0,368,
-369,7,19,0,0,369,88,1,0,0,0,370,371,7,20,0,0,371,90,1,0,0,0,372,373,7,21,
-0,0,373,92,1,0,0,0,374,375,7,22,0,0,375,94,1,0,0,0,376,377,7,23,0,0,377,
-96,1,0,0,0,378,379,7,24,0,0,379,98,1,0,0,0,380,381,7,25,0,0,381,100,1,0,
-0,0,382,383,7,26,0,0,383,102,1,0,0,0,384,386,7,27,0,0,385,384,1,0,0,0,386,
-387,1,0,0,0,387,385,1,0,0,0,387,388,1,0,0,0,388,104,1,0,0,0,389,391,7,28,
-0,0,390,389,1,0,0,0,391,392,1,0,0,0,392,390,1,0,0,0,392,393,1,0,0,0,393,
-394,1,0,0,0,394,395,6,52,0,0,395,106,1,0,0,0,9,0,108,114,121,124,129,133,
-387,392,1,6,0,0];
+2,49,7,49,2,50,7,50,2,51,7,51,2,52,7,52,2,53,7,53,2,54,7,54,2,55,7,55,2,
+56,7,56,2,57,7,57,2,58,7,58,2,59,7,59,2,60,7,60,1,0,3,0,125,8,0,1,0,1,0,
+1,0,1,0,3,0,131,8,0,1,0,3,0,134,8,0,1,1,1,1,1,1,5,1,139,8,1,10,1,12,1,142,
+9,1,3,1,144,8,1,1,2,4,2,147,8,2,11,2,12,2,148,1,3,1,3,3,3,153,8,3,1,3,4,
+3,156,8,3,11,3,12,3,157,1,4,1,4,3,4,162,8,4,1,5,1,5,1,6,1,6,1,7,1,7,1,8,
+1,8,1,9,1,9,1,10,1,10,1,10,1,10,1,10,1,10,1,11,1,11,1,11,1,11,1,11,1,11,
+1,11,1,11,1,11,1,11,1,11,1,12,1,12,1,12,1,12,1,12,1,12,1,12,1,12,1,12,1,
+12,1,12,1,13,1,13,1,13,1,13,1,13,1,13,1,13,1,13,1,14,1,14,1,14,1,14,1,14,
+1,14,1,14,1,14,1,14,1,15,1,15,1,15,1,15,1,15,1,15,1,15,1,15,1,15,1,15,1,
+15,1,16,1,16,1,16,1,16,1,16,1,16,1,16,1,16,1,16,1,16,1,16,1,16,1,16,1,16,
+1,16,1,16,1,17,1,17,1,17,1,17,1,17,1,17,1,17,1,17,1,17,1,17,1,17,1,17,1,
+17,1,18,1,18,1,18,1,18,1,18,1,18,1,18,1,18,1,18,1,18,1,18,1,18,1,18,1,18,
+1,18,1,18,1,18,1,18,1,18,1,19,1,19,1,19,1,19,1,19,1,19,1,19,1,19,1,19,1,
+19,1,19,1,19,1,19,1,19,1,19,1,20,1,20,1,20,1,20,1,20,1,20,1,20,1,20,1,20,
+1,20,1,20,1,20,1,20,1,20,1,21,1,21,1,21,1,21,1,21,1,21,1,21,1,21,1,21,1,
+22,1,22,1,22,1,22,1,22,1,22,1,22,1,22,1,22,1,22,1,22,1,22,1,22,1,23,1,23,
+1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,24,1,24,1,24,1,24,1,24,1,
+24,1,24,1,24,1,24,1,24,1,24,1,24,1,24,1,25,1,25,1,25,1,25,1,25,1,25,1,25,
+1,25,1,25,1,25,1,25,1,25,1,25,1,25,1,25,1,25,1,25,1,25,1,26,1,26,1,26,1,
+26,1,27,1,27,1,27,1,27,1,27,1,27,1,28,1,28,1,28,1,29,1,29,1,30,1,30,1,31,
+1,31,1,31,1,31,1,32,1,32,1,32,1,32,1,32,1,33,1,33,1,33,1,33,1,34,1,34,1,
+35,1,35,1,36,1,36,1,37,1,37,1,38,1,38,1,39,1,39,1,40,1,40,1,41,1,41,1,42,
+1,42,1,43,1,43,1,44,1,44,1,45,1,45,1,46,1,46,1,47,1,47,1,48,1,48,1,49,1,
+49,1,50,1,50,1,51,1,51,1,52,1,52,1,53,1,53,1,54,1,54,1,55,1,55,1,56,1,56,
+1,57,1,57,1,58,1,58,1,59,1,59,1,60,4,60,454,8,60,11,60,12,60,455,1,60,1,
+60,0,0,61,1,1,3,2,5,3,7,0,9,0,11,0,13,0,15,4,17,5,19,6,21,7,23,8,25,9,27,
+10,29,11,31,12,33,13,35,14,37,15,39,16,41,17,43,18,45,19,47,20,49,21,51,
+22,53,23,55,24,57,25,59,26,61,27,63,28,65,29,67,30,69,0,71,0,73,0,75,0,77,
+0,79,0,81,0,83,0,85,0,87,0,89,0,91,0,93,0,95,0,97,0,99,0,101,0,103,0,105,
+0,107,0,109,0,111,0,113,0,115,0,117,0,119,0,121,31,1,0,29,2,0,69,69,101,
+101,2,0,43,43,45,45,1,0,49,57,2,0,65,65,97,97,2,0,66,66,98,98,2,0,67,67,
+99,99,2,0,68,68,100,100,2,0,70,70,102,102,2,0,71,71,103,103,2,0,72,72,104,
+104,2,0,73,73,105,105,2,0,74,74,106,106,2,0,75,75,107,107,2,0,76,76,108,
+108,2,0,77,77,109,109,2,0,78,78,110,110,2,0,79,79,111,111,2,0,80,80,112,
+112,2,0,81,81,113,113,2,0,82,82,114,114,2,0,83,83,115,115,2,0,84,84,116,
+116,2,0,85,85,117,117,2,0,86,86,118,118,2,0,87,87,119,119,2,0,88,88,120,
+120,2,0,89,89,121,121,2,0,90,90,122,122,3,0,9,10,13,13,32,32,438,0,1,1,0,
+0,0,0,3,1,0,0,0,0,5,1,0,0,0,0,15,1,0,0,0,0,17,1,0,0,0,0,19,1,0,0,0,0,21,
+1,0,0,0,0,23,1,0,0,0,0,25,1,0,0,0,0,27,1,0,0,0,0,29,1,0,0,0,0,31,1,0,0,0,
+0,33,1,0,0,0,0,35,1,0,0,0,0,37,1,0,0,0,0,39,1,0,0,0,0,41,1,0,0,0,0,43,1,
+0,0,0,0,45,1,0,0,0,0,47,1,0,0,0,0,49,1,0,0,0,0,51,1,0,0,0,0,53,1,0,0,0,0,
+55,1,0,0,0,0,57,1,0,0,0,0,59,1,0,0,0,0,61,1,0,0,0,0,63,1,0,0,0,0,65,1,0,
+0,0,0,67,1,0,0,0,0,121,1,0,0,0,1,124,1,0,0,0,3,143,1,0,0,0,5,146,1,0,0,0,
+7,150,1,0,0,0,9,161,1,0,0,0,11,163,1,0,0,0,13,165,1,0,0,0,15,167,1,0,0,0,
+17,169,1,0,0,0,19,171,1,0,0,0,21,173,1,0,0,0,23,179,1,0,0,0,25,190,1,0,0,
+0,27,201,1,0,0,0,29,209,1,0,0,0,31,218,1,0,0,0,33,229,1,0,0,0,35,245,1,0,
+0,0,37,258,1,0,0,0,39,277,1,0,0,0,41,292,1,0,0,0,43,306,1,0,0,0,45,315,1,
+0,0,0,47,328,1,0,0,0,49,339,1,0,0,0,51,352,1,0,0,0,53,370,1,0,0,0,55,374,
+1,0,0,0,57,380,1,0,0,0,59,383,1,0,0,0,61,385,1,0,0,0,63,387,1,0,0,0,65,391,
+1,0,0,0,67,396,1,0,0,0,69,400,1,0,0,0,71,402,1,0,0,0,73,404,1,0,0,0,75,406,
+1,0,0,0,77,408,1,0,0,0,79,410,1,0,0,0,81,412,1,0,0,0,83,414,1,0,0,0,85,416,
+1,0,0,0,87,418,1,0,0,0,89,420,1,0,0,0,91,422,1,0,0,0,93,424,1,0,0,0,95,426,
+1,0,0,0,97,428,1,0,0,0,99,430,1,0,0,0,101,432,1,0,0,0,103,434,1,0,0,0,105,
+436,1,0,0,0,107,438,1,0,0,0,109,440,1,0,0,0,111,442,1,0,0,0,113,444,1,0,
+0,0,115,446,1,0,0,0,117,448,1,0,0,0,119,450,1,0,0,0,121,453,1,0,0,0,123,
+125,5,45,0,0,124,123,1,0,0,0,124,125,1,0,0,0,125,126,1,0,0,0,126,130,3,3,
+1,0,127,128,3,13,6,0,128,129,3,5,2,0,129,131,1,0,0,0,130,127,1,0,0,0,130,
+131,1,0,0,0,131,133,1,0,0,0,132,134,3,7,3,0,133,132,1,0,0,0,133,134,1,0,
+0,0,134,2,1,0,0,0,135,144,5,48,0,0,136,140,3,11,5,0,137,139,3,9,4,0,138,
+137,1,0,0,0,139,142,1,0,0,0,140,138,1,0,0,0,140,141,1,0,0,0,141,144,1,0,
+0,0,142,140,1,0,0,0,143,135,1,0,0,0,143,136,1,0,0,0,144,4,1,0,0,0,145,147,
+3,9,4,0,146,145,1,0,0,0,147,148,1,0,0,0,148,146,1,0,0,0,148,149,1,0,0,0,
+149,6,1,0,0,0,150,152,7,0,0,0,151,153,7,1,0,0,152,151,1,0,0,0,152,153,1,
+0,0,0,153,155,1,0,0,0,154,156,3,9,4,0,155,154,1,0,0,0,156,157,1,0,0,0,157,
+155,1,0,0,0,157,158,1,0,0,0,158,8,1,0,0,0,159,162,5,48,0,0,160,162,3,11,
+5,0,161,159,1,0,0,0,161,160,1,0,0,0,162,10,1,0,0,0,163,164,7,2,0,0,164,12,
+1,0,0,0,165,166,5,46,0,0,166,14,1,0,0,0,167,168,5,44,0,0,168,16,1,0,0,0,
+169,170,5,40,0,0,170,18,1,0,0,0,171,172,5,41,0,0,172,20,1,0,0,0,173,174,
+3,99,49,0,174,175,3,97,48,0,175,176,3,85,42,0,176,177,3,95,47,0,177,178,
+3,107,53,0,178,22,1,0,0,0,179,180,3,91,45,0,180,181,3,85,42,0,181,182,3,
+95,47,0,182,183,3,77,38,0,183,184,3,105,52,0,184,185,3,107,53,0,185,186,
+3,103,51,0,186,187,3,85,42,0,187,188,3,95,47,0,188,189,3,81,40,0,189,24,
+1,0,0,0,190,191,3,91,45,0,191,192,3,85,42,0,192,193,3,95,47,0,193,194,3,
+77,38,0,194,195,3,69,34,0,195,196,3,103,51,0,196,197,3,103,51,0,197,198,
+3,85,42,0,198,199,3,95,47,0,199,200,3,81,40,0,200,26,1,0,0,0,201,202,3,99,
+49,0,202,203,3,97,48,0,203,204,3,91,45,0,204,205,3,117,58,0,205,206,3,81,
+40,0,206,207,3,97,48,0,207,208,3,95,47,0,208,28,1,0,0,0,209,210,3,107,53,
+0,210,211,3,103,51,0,211,212,3,85,42,0,212,213,3,69,34,0,213,214,3,95,47,
+0,214,215,3,81,40,0,215,216,3,91,45,0,216,217,3,77,38,0,217,30,1,0,0,0,218,
+219,3,93,46,0,219,220,3,109,54,0,220,221,3,91,45,0,221,222,3,107,53,0,222,
+223,3,85,42,0,223,224,3,99,49,0,224,225,3,97,48,0,225,226,3,85,42,0,226,
+227,3,95,47,0,227,228,3,107,53,0,228,32,1,0,0,0,229,230,3,93,46,0,230,231,
+3,109,54,0,231,232,3,91,45,0,232,233,3,107,53,0,233,234,3,85,42,0,234,235,
+3,91,45,0,235,236,3,85,42,0,236,237,3,95,47,0,237,238,3,77,38,0,238,239,
+3,105,52,0,239,240,3,107,53,0,240,241,3,103,51,0,241,242,3,85,42,0,242,243,
+3,95,47,0,243,244,3,81,40,0,244,34,1,0,0,0,245,246,3,93,46,0,246,247,3,109,
+54,0,247,248,3,91,45,0,248,249,3,107,53,0,249,250,3,85,42,0,250,251,3,99,
+49,0,251,252,3,97,48,0,252,253,3,91,45,0,253,254,3,117,58,0,254,255,3,81,
+40,0,255,256,3,97,48,0,256,257,3,95,47,0,257,36,1,0,0,0,258,259,3,81,40,
+0,259,260,3,77,38,0,260,261,3,97,48,0,261,262,3,93,46,0,262,263,3,77,38,
+0,263,264,3,107,53,0,264,265,3,103,51,0,265,266,3,117,58,0,266,267,3,73,
+36,0,267,268,3,97,48,0,268,269,3,91,45,0,269,270,3,91,45,0,270,271,3,77,
+38,0,271,272,3,73,36,0,272,273,3,107,53,0,273,274,3,85,42,0,274,275,3,97,
+48,0,275,276,3,95,47,0,276,38,1,0,0,0,277,278,3,73,36,0,278,279,3,85,42,
+0,279,280,3,103,51,0,280,281,3,73,36,0,281,282,3,109,54,0,282,283,3,91,45,
+0,283,284,3,69,34,0,284,285,3,103,51,0,285,286,3,105,52,0,286,287,3,107,
+53,0,287,288,3,103,51,0,288,289,3,85,42,0,289,290,3,95,47,0,290,291,3,81,
+40,0,291,40,1,0,0,0,292,293,3,73,36,0,293,294,3,97,48,0,294,295,3,93,46,
+0,295,296,3,99,49,0,296,297,3,97,48,0,297,298,3,109,54,0,298,299,3,95,47,
+0,299,300,3,75,37,0,300,301,3,73,36,0,301,302,3,109,54,0,302,303,3,103,51,
+0,303,304,3,111,55,0,304,305,3,77,38,0,305,42,1,0,0,0,306,307,3,73,36,0,
+307,308,3,91,45,0,308,309,3,97,48,0,309,310,3,107,53,0,310,311,3,83,41,0,
+311,312,3,97,48,0,312,313,3,85,42,0,313,314,3,75,37,0,314,44,1,0,0,0,315,
+316,3,73,36,0,316,317,3,109,54,0,317,318,3,103,51,0,318,319,3,111,55,0,319,
+320,3,77,38,0,320,321,3,99,49,0,321,322,3,97,48,0,322,323,3,91,45,0,323,
+324,3,117,58,0,324,325,3,81,40,0,325,326,3,97,48,0,326,327,3,95,47,0,327,
+46,1,0,0,0,328,329,3,93,46,0,329,330,3,109,54,0,330,331,3,91,45,0,331,332,
+3,107,53,0,332,333,3,85,42,0,333,334,3,73,36,0,334,335,3,109,54,0,335,336,
+3,103,51,0,336,337,3,111,55,0,337,338,3,77,38,0,338,48,1,0,0,0,339,340,3,
+93,46,0,340,341,3,109,54,0,341,342,3,91,45,0,342,343,3,107,53,0,343,344,
+3,85,42,0,344,345,3,105,52,0,345,346,3,109,54,0,346,347,3,103,51,0,347,348,
+3,79,39,0,348,349,3,69,34,0,349,350,3,73,36,0,350,351,3,77,38,0,351,50,1,
+0,0,0,352,353,3,99,49,0,353,354,3,97,48,0,354,355,3,91,45,0,355,356,3,117,
+58,0,356,357,3,83,41,0,357,358,3,77,38,0,358,359,3,75,37,0,359,360,3,103,
+51,0,360,361,3,69,34,0,361,362,3,91,45,0,362,363,3,105,52,0,363,364,3,109,
+54,0,364,365,3,103,51,0,365,366,3,79,39,0,366,367,3,69,34,0,367,368,3,73,
+36,0,368,369,3,77,38,0,369,52,1,0,0,0,370,371,3,107,53,0,371,372,3,85,42,
+0,372,373,3,95,47,0,373,54,1,0,0,0,374,375,3,77,38,0,375,376,3,93,46,0,376,
+377,3,99,49,0,377,378,3,107,53,0,378,379,3,117,58,0,379,56,1,0,0,0,380,381,
+3,119,59,0,381,382,3,93,46,0,382,58,1,0,0,0,383,384,3,119,59,0,384,60,1,
+0,0,0,385,386,3,93,46,0,386,62,1,0,0,0,387,388,3,95,47,0,388,389,3,69,34,
+0,389,390,3,95,47,0,390,64,1,0,0,0,391,392,5,45,0,0,392,393,3,85,42,0,393,
+394,3,95,47,0,394,395,3,79,39,0,395,66,1,0,0,0,396,397,3,85,42,0,397,398,
+3,95,47,0,398,399,3,79,39,0,399,68,1,0,0,0,400,401,7,3,0,0,401,70,1,0,0,
+0,402,403,7,4,0,0,403,72,1,0,0,0,404,405,7,5,0,0,405,74,1,0,0,0,406,407,
+7,6,0,0,407,76,1,0,0,0,408,409,7,0,0,0,409,78,1,0,0,0,410,411,7,7,0,0,411,
+80,1,0,0,0,412,413,7,8,0,0,413,82,1,0,0,0,414,415,7,9,0,0,415,84,1,0,0,0,
+416,417,7,10,0,0,417,86,1,0,0,0,418,419,7,11,0,0,419,88,1,0,0,0,420,421,
+7,12,0,0,421,90,1,0,0,0,422,423,7,13,0,0,423,92,1,0,0,0,424,425,7,14,0,0,
+425,94,1,0,0,0,426,427,7,15,0,0,427,96,1,0,0,0,428,429,7,16,0,0,429,98,1,
+0,0,0,430,431,7,17,0,0,431,100,1,0,0,0,432,433,7,18,0,0,433,102,1,0,0,0,
+434,435,7,19,0,0,435,104,1,0,0,0,436,437,7,20,0,0,437,106,1,0,0,0,438,439,
+7,21,0,0,439,108,1,0,0,0,440,441,7,22,0,0,441,110,1,0,0,0,442,443,7,23,0,
+0,443,112,1,0,0,0,444,445,7,24,0,0,445,114,1,0,0,0,446,447,7,25,0,0,447,
+116,1,0,0,0,448,449,7,26,0,0,449,118,1,0,0,0,450,451,7,27,0,0,451,120,1,
+0,0,0,452,454,7,28,0,0,453,452,1,0,0,0,454,455,1,0,0,0,455,453,1,0,0,0,455,
+456,1,0,0,0,456,457,1,0,0,0,457,458,6,60,0,0,458,122,1,0,0,0,11,0,124,130,
+133,140,143,148,152,157,161,455,1,6,0,0];
 
 
 const atn = new antlr4.atn.ATNDeserializer().deserialize(serializedATN);
@@ -142,20 +162,22 @@ export default class wktLexer extends antlr4.Lexer {
 	static literalNames = [ null, null, null, null, "','", "'('", "')'" ];
 	static symbolicNames = [ null, "DECIMAL", "INTEGERPART", "DECIMALPART", 
                           "COMMA", "LPAR", "RPAR", "POINT", "LINESTRING", 
-                          "POLYGON", "MULTIPOINT", "MULTILINESTRING", "MULTIPOLYGON", 
-                          "GEOMETRYCOLLECTION", "EMPTY_", "CIRCULARSTRING", 
-                          "COMPOUNDCURVE", "MULTISURFACE", "CURVEPOLYGON", 
-                          "MULTICURVE", "TRIANGLE", "TIN", "POLYHEDRALSURFACE", 
-                          "STRING", "WS" ];
-	static ruleNames = [ "DECIMAL", "INTEGERPART", "DECIMALPART", "DIGIT", 
-                      "NONZERODIGIT", "DOT", "COMMA", "LPAR", "RPAR", "POINT", 
-                      "LINESTRING", "POLYGON", "MULTIPOINT", "MULTILINESTRING", 
-                      "MULTIPOLYGON", "GEOMETRYCOLLECTION", "EMPTY_", "CIRCULARSTRING", 
-                      "COMPOUNDCURVE", "MULTISURFACE", "CURVEPOLYGON", "MULTICURVE", 
-                      "TRIANGLE", "TIN", "POLYHEDRALSURFACE", "A", "B", 
-                      "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", 
-                      "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", 
-                      "W", "X", "Y", "Z", "STRING", "WS" ];
+                          "LINEARRING", "POLYGON", "TRIANGLE", "MULTIPOINT", 
+                          "MULTILINESTRING", "MULTIPOLYGON", "GEOMETRYCOLLECTION", 
+                          "CIRCULARSTRING", "COMPOUNDCURVE", "CLOTHOID", 
+                          "CURVEPOLYGON", "MULTICURVE", "MULTISURFACE", 
+                          "POLYHEDRALSURFACE", "TIN", "EMPTY_", "ZM_", "Z_", 
+                          "M_", "NAN_", "NEG_INF_", "INF_", "WS" ];
+	static ruleNames = [ "DECIMAL", "INTEGERPART", "DECIMALPART", "EXPONENT", 
+                      "DIGIT", "NONZERODIGIT", "DOT", "COMMA", "LPAR", "RPAR", 
+                      "POINT", "LINESTRING", "LINEARRING", "POLYGON", "TRIANGLE", 
+                      "MULTIPOINT", "MULTILINESTRING", "MULTIPOLYGON", "GEOMETRYCOLLECTION", 
+                      "CIRCULARSTRING", "COMPOUNDCURVE", "CLOTHOID", "CURVEPOLYGON", 
+                      "MULTICURVE", "MULTISURFACE", "POLYHEDRALSURFACE", 
+                      "TIN", "EMPTY_", "ZM_", "Z_", "M_", "NAN_", "NEG_INF_", 
+                      "INF_", "A", "B", "C", "D", "E", "F", "G", "H", "I", 
+                      "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", 
+                      "T", "U", "V", "W", "X", "Y", "Z", "WS" ];
 
     constructor(input) {
         super(input)
@@ -172,22 +194,29 @@ wktLexer.LPAR = 5;
 wktLexer.RPAR = 6;
 wktLexer.POINT = 7;
 wktLexer.LINESTRING = 8;
-wktLexer.POLYGON = 9;
-wktLexer.MULTIPOINT = 10;
-wktLexer.MULTILINESTRING = 11;
-wktLexer.MULTIPOLYGON = 12;
-wktLexer.GEOMETRYCOLLECTION = 13;
-wktLexer.EMPTY_ = 14;
-wktLexer.CIRCULARSTRING = 15;
-wktLexer.COMPOUNDCURVE = 16;
-wktLexer.MULTISURFACE = 17;
-wktLexer.CURVEPOLYGON = 18;
-wktLexer.MULTICURVE = 19;
-wktLexer.TRIANGLE = 20;
-wktLexer.TIN = 21;
+wktLexer.LINEARRING = 9;
+wktLexer.POLYGON = 10;
+wktLexer.TRIANGLE = 11;
+wktLexer.MULTIPOINT = 12;
+wktLexer.MULTILINESTRING = 13;
+wktLexer.MULTIPOLYGON = 14;
+wktLexer.GEOMETRYCOLLECTION = 15;
+wktLexer.CIRCULARSTRING = 16;
+wktLexer.COMPOUNDCURVE = 17;
+wktLexer.CLOTHOID = 18;
+wktLexer.CURVEPOLYGON = 19;
+wktLexer.MULTICURVE = 20;
+wktLexer.MULTISURFACE = 21;
 wktLexer.POLYHEDRALSURFACE = 22;
-wktLexer.STRING = 23;
-wktLexer.WS = 24;
+wktLexer.TIN = 23;
+wktLexer.EMPTY_ = 24;
+wktLexer.ZM_ = 25;
+wktLexer.Z_ = 26;
+wktLexer.M_ = 27;
+wktLexer.NAN_ = 28;
+wktLexer.NEG_INF_ = 29;
+wktLexer.INF_ = 30;
+wktLexer.WS = 31;