cariboujs 2.0.4 → 2.0.6

package/plantUML/PlantUMLParser.js

@@ -1,141 +1,67 @@
-// Generated from PlantUML.g4 by ANTLR 4.13.2
+// Generated from PlantUMLParser.g4 by ANTLR 4.13.2
 // jshint ignore: start
 import antlr4 from 'antlr4';
-import PlantUMLListener from './PlantUMLListener.js';
-import PlantUMLVisitor from './PlantUMLVisitor.js';
+import PlantUMLParserListener from './PlantUMLParserListener.js';
+import PlantUMLParserVisitor from './PlantUMLParserVisitor.js';
 
-const serializedATN = [4,1,79,399,2,0,7,0,2,1,7,1,2,2,7,2,2,3,7,3,2,4,7,
+const serializedATN = [4,1,51,183,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,1,0,1,0,5,0,63,8,0,10,0,12,0,66,9,0,1,0,1,0,1,0,
-1,1,1,1,1,1,3,1,74,8,1,1,1,3,1,77,8,1,1,1,1,1,1,1,3,1,82,8,1,1,1,3,1,85,
-8,1,1,1,1,1,1,1,1,1,3,1,91,8,1,1,1,3,1,94,8,1,1,1,1,1,1,1,3,1,99,8,1,1,1,
-3,1,102,8,1,1,1,1,1,1,1,3,1,107,8,1,1,1,3,1,110,8,1,1,1,1,1,1,1,3,1,115,
-8,1,1,1,3,1,118,8,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,3,1,129,8,1,1,2,
-1,2,5,2,133,8,2,10,2,12,2,136,9,2,1,2,1,2,1,3,1,3,3,3,142,8,3,1,4,1,4,4,
-4,146,8,4,11,4,12,4,147,1,4,1,4,1,5,1,5,1,5,1,5,3,5,156,8,5,1,5,1,5,1,6,
-1,6,1,6,1,6,3,6,164,8,6,1,6,3,6,167,8,6,1,6,3,6,170,8,6,1,6,1,6,1,6,1,6,
-1,6,3,6,177,8,6,1,6,3,6,180,8,6,1,6,1,6,1,6,1,6,3,6,186,8,6,1,7,1,7,1,7,
-3,7,191,8,7,1,7,1,7,1,7,3,7,196,8,7,1,7,1,7,1,8,1,8,1,8,1,8,3,8,204,8,8,
-1,8,3,8,207,8,8,1,8,3,8,210,8,8,1,8,1,8,1,8,3,8,215,8,8,1,8,1,8,1,8,1,8,
-1,8,1,8,3,8,223,8,8,1,8,3,8,226,8,8,1,8,1,8,1,8,3,8,231,8,8,1,8,1,8,1,8,
-1,8,3,8,237,8,8,1,9,1,9,1,9,5,9,242,8,9,10,9,12,9,245,9,9,1,9,1,9,1,10,1,
-10,1,10,1,10,1,11,1,11,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,13,1,13,1,13,1,13,1,13,1,13,1,
-13,1,13,1,13,1,13,1,13,1,13,3,13,285,8,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,13,1,13,1,13,1,13,1,13,1,
-13,1,13,1,13,1,13,3,13,311,8,13,1,14,1,14,1,14,3,14,316,8,14,1,14,1,14,1,
-15,1,15,1,16,1,16,1,17,1,17,3,17,326,8,17,1,17,1,17,3,17,330,8,17,1,17,1,
-17,3,17,334,8,17,1,18,1,18,1,19,1,19,3,19,340,8,19,1,19,1,19,3,19,344,8,
-19,1,19,1,19,3,19,348,8,19,1,20,1,20,1,21,1,21,3,21,354,8,21,1,21,1,21,3,
-21,358,8,21,1,21,1,21,3,21,362,8,21,1,22,1,22,1,23,1,23,3,23,368,8,23,1,
-23,1,23,3,23,372,8,23,1,23,1,23,3,23,376,8,23,1,24,1,24,1,25,1,25,3,25,382,
-8,25,1,25,1,25,1,25,1,25,1,25,3,25,389,8,25,1,26,1,26,1,27,1,27,1,28,1,28,
-1,29,1,29,1,29,0,0,30,0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30,32,34,36,
-38,40,42,44,46,48,50,52,54,56,58,0,10,1,0,17,20,2,0,5,5,21,22,1,0,33,37,
-1,0,38,42,2,0,18,18,43,48,1,0,49,52,1,0,53,60,1,0,61,66,1,0,67,68,1,0,70,
-71,440,0,60,1,0,0,0,2,128,1,0,0,0,4,130,1,0,0,0,6,141,1,0,0,0,8,143,1,0,
-0,0,10,151,1,0,0,0,12,185,1,0,0,0,14,187,1,0,0,0,16,236,1,0,0,0,18,243,1,
-0,0,0,20,248,1,0,0,0,22,252,1,0,0,0,24,254,1,0,0,0,26,310,1,0,0,0,28,312,
-1,0,0,0,30,319,1,0,0,0,32,321,1,0,0,0,34,323,1,0,0,0,36,335,1,0,0,0,38,337,
-1,0,0,0,40,349,1,0,0,0,42,351,1,0,0,0,44,363,1,0,0,0,46,365,1,0,0,0,48,377,
-1,0,0,0,50,388,1,0,0,0,52,390,1,0,0,0,54,392,1,0,0,0,56,394,1,0,0,0,58,396,
-1,0,0,0,60,64,5,1,0,0,61,63,3,2,1,0,62,61,1,0,0,0,63,66,1,0,0,0,64,62,1,
-0,0,0,64,65,1,0,0,0,65,67,1,0,0,0,66,64,1,0,0,0,67,68,5,2,0,0,68,69,5,0,
-0,1,69,1,1,0,0,0,70,71,5,3,0,0,71,73,3,54,27,0,72,74,3,20,10,0,73,72,1,0,
-0,0,73,74,1,0,0,0,74,76,1,0,0,0,75,77,3,4,2,0,76,75,1,0,0,0,76,77,1,0,0,
-0,77,129,1,0,0,0,78,79,5,4,0,0,79,81,3,54,27,0,80,82,3,20,10,0,81,80,1,0,
-0,0,81,82,1,0,0,0,82,84,1,0,0,0,83,85,3,4,2,0,84,83,1,0,0,0,84,85,1,0,0,
-0,85,129,1,0,0,0,86,87,5,5,0,0,87,88,5,3,0,0,88,90,3,54,27,0,89,91,3,20,
-10,0,90,89,1,0,0,0,90,91,1,0,0,0,91,93,1,0,0,0,92,94,3,4,2,0,93,92,1,0,0,
-0,93,94,1,0,0,0,94,129,1,0,0,0,95,96,5,5,0,0,96,98,3,54,27,0,97,99,3,20,
-10,0,98,97,1,0,0,0,98,99,1,0,0,0,99,101,1,0,0,0,100,102,3,4,2,0,101,100,
-1,0,0,0,101,102,1,0,0,0,102,129,1,0,0,0,103,104,5,6,0,0,104,106,3,54,27,
-0,105,107,3,20,10,0,106,105,1,0,0,0,106,107,1,0,0,0,107,109,1,0,0,0,108,
-110,3,4,2,0,109,108,1,0,0,0,109,110,1,0,0,0,110,129,1,0,0,0,111,112,5,7,
-0,0,112,114,3,54,27,0,113,115,3,20,10,0,114,113,1,0,0,0,114,115,1,0,0,0,
-115,117,1,0,0,0,116,118,3,8,4,0,117,116,1,0,0,0,117,118,1,0,0,0,118,129,
-1,0,0,0,119,120,5,8,0,0,120,129,3,54,27,0,121,129,3,28,14,0,122,129,3,34,
-17,0,123,129,3,38,19,0,124,129,3,10,5,0,125,129,3,42,21,0,126,129,3,46,23,
-0,127,129,3,14,7,0,128,70,1,0,0,0,128,78,1,0,0,0,128,86,1,0,0,0,128,95,1,
-0,0,0,128,103,1,0,0,0,128,111,1,0,0,0,128,119,1,0,0,0,128,121,1,0,0,0,128,
-122,1,0,0,0,128,123,1,0,0,0,128,124,1,0,0,0,128,125,1,0,0,0,128,126,1,0,
-0,0,128,127,1,0,0,0,129,3,1,0,0,0,130,134,5,9,0,0,131,133,3,6,3,0,132,131,
-1,0,0,0,133,136,1,0,0,0,134,132,1,0,0,0,134,135,1,0,0,0,135,137,1,0,0,0,
-136,134,1,0,0,0,137,138,5,10,0,0,138,5,1,0,0,0,139,142,3,16,8,0,140,142,
-3,12,6,0,141,139,1,0,0,0,141,140,1,0,0,0,142,7,1,0,0,0,143,145,5,9,0,0,144,
-146,3,54,27,0,145,144,1,0,0,0,146,147,1,0,0,0,147,145,1,0,0,0,147,148,1,
-0,0,0,148,149,1,0,0,0,149,150,5,10,0,0,150,9,1,0,0,0,151,152,3,54,27,0,152,
-153,5,11,0,0,153,155,3,26,13,0,154,156,3,22,11,0,155,154,1,0,0,0,155,156,
-1,0,0,0,156,157,1,0,0,0,157,158,3,54,27,0,158,11,1,0,0,0,159,160,5,9,0,0,
-160,161,3,24,12,0,161,162,5,10,0,0,162,164,1,0,0,0,163,159,1,0,0,0,163,164,
-1,0,0,0,164,166,1,0,0,0,165,167,3,26,13,0,166,165,1,0,0,0,166,167,1,0,0,
-0,167,169,1,0,0,0,168,170,3,22,11,0,169,168,1,0,0,0,169,170,1,0,0,0,170,
-171,1,0,0,0,171,186,3,54,27,0,172,173,5,9,0,0,173,174,3,24,12,0,174,175,
-5,10,0,0,175,177,1,0,0,0,176,172,1,0,0,0,176,177,1,0,0,0,177,179,1,0,0,0,
-178,180,3,22,11,0,179,178,1,0,0,0,179,180,1,0,0,0,180,181,1,0,0,0,181,182,
-3,54,27,0,182,183,5,11,0,0,183,184,3,26,13,0,184,186,1,0,0,0,185,163,1,0,
-0,0,185,176,1,0,0,0,186,13,1,0,0,0,187,188,3,54,27,0,188,190,5,11,0,0,189,
-191,3,22,11,0,190,189,1,0,0,0,190,191,1,0,0,0,191,192,1,0,0,0,192,193,3,
-54,27,0,193,195,5,12,0,0,194,196,3,18,9,0,195,194,1,0,0,0,195,196,1,0,0,
-0,196,197,1,0,0,0,197,198,5,13,0,0,198,15,1,0,0,0,199,200,5,9,0,0,200,201,
-3,24,12,0,201,202,5,10,0,0,202,204,1,0,0,0,203,199,1,0,0,0,203,204,1,0,0,
-0,204,206,1,0,0,0,205,207,3,26,13,0,206,205,1,0,0,0,206,207,1,0,0,0,207,
-209,1,0,0,0,208,210,3,22,11,0,209,208,1,0,0,0,209,210,1,0,0,0,210,211,1,
-0,0,0,211,212,3,54,27,0,212,214,5,12,0,0,213,215,3,18,9,0,214,213,1,0,0,
-0,214,215,1,0,0,0,215,216,1,0,0,0,216,217,5,13,0,0,217,237,1,0,0,0,218,219,
-5,9,0,0,219,220,3,24,12,0,220,221,5,10,0,0,221,223,1,0,0,0,222,218,1,0,0,
-0,222,223,1,0,0,0,223,225,1,0,0,0,224,226,3,22,11,0,225,224,1,0,0,0,225,
-226,1,0,0,0,226,227,1,0,0,0,227,228,3,54,27,0,228,230,5,12,0,0,229,231,3,
-18,9,0,230,229,1,0,0,0,230,231,1,0,0,0,231,232,1,0,0,0,232,233,5,13,0,0,
-233,234,5,11,0,0,234,235,3,26,13,0,235,237,1,0,0,0,236,203,1,0,0,0,236,222,
-1,0,0,0,237,17,1,0,0,0,238,239,3,54,27,0,239,240,5,14,0,0,240,242,1,0,0,
-0,241,238,1,0,0,0,242,245,1,0,0,0,243,241,1,0,0,0,243,244,1,0,0,0,244,246,
-1,0,0,0,245,243,1,0,0,0,246,247,3,54,27,0,247,19,1,0,0,0,248,249,5,15,0,
-0,249,250,3,54,27,0,250,251,5,16,0,0,251,21,1,0,0,0,252,253,7,0,0,0,253,
-23,1,0,0,0,254,255,7,1,0,0,255,25,1,0,0,0,256,257,5,23,0,0,257,258,5,12,
-0,0,258,259,3,26,13,0,259,260,5,13,0,0,260,311,1,0,0,0,261,262,5,24,0,0,
-262,263,5,12,0,0,263,264,3,26,13,0,264,265,5,13,0,0,265,311,1,0,0,0,266,
-267,5,25,0,0,267,268,5,12,0,0,268,269,3,26,13,0,269,270,5,13,0,0,270,311,
-1,0,0,0,271,272,5,26,0,0,272,273,5,12,0,0,273,274,3,26,13,0,274,275,5,13,
-0,0,275,311,1,0,0,0,276,277,5,27,0,0,277,278,5,12,0,0,278,279,3,26,13,0,
-279,280,5,13,0,0,280,311,1,0,0,0,281,282,3,54,27,0,282,284,5,28,0,0,283,
-285,3,58,29,0,284,283,1,0,0,0,284,285,1,0,0,0,285,286,1,0,0,0,286,287,5,
-29,0,0,287,311,1,0,0,0,288,289,5,30,0,0,289,290,5,12,0,0,290,291,3,26,13,
-0,291,292,5,14,0,0,292,293,3,26,13,0,293,294,5,13,0,0,294,311,1,0,0,0,295,
-296,5,31,0,0,296,297,5,12,0,0,297,298,3,26,13,0,298,299,5,14,0,0,299,300,
-3,26,13,0,300,301,5,13,0,0,301,311,1,0,0,0,302,303,5,32,0,0,303,304,5,12,
-0,0,304,305,3,26,13,0,305,306,5,14,0,0,306,307,3,26,13,0,307,308,5,13,0,
-0,308,311,1,0,0,0,309,311,3,54,27,0,310,256,1,0,0,0,310,261,1,0,0,0,310,
-266,1,0,0,0,310,271,1,0,0,0,310,276,1,0,0,0,310,281,1,0,0,0,310,288,1,0,
-0,0,310,295,1,0,0,0,310,302,1,0,0,0,310,309,1,0,0,0,311,27,1,0,0,0,312,315,
-3,54,27,0,313,316,3,30,15,0,314,316,3,32,16,0,315,313,1,0,0,0,315,314,1,
-0,0,0,316,317,1,0,0,0,317,318,3,54,27,0,318,29,1,0,0,0,319,320,7,2,0,0,320,
-31,1,0,0,0,321,322,7,3,0,0,322,33,1,0,0,0,323,325,3,54,27,0,324,326,3,56,
-28,0,325,324,1,0,0,0,325,326,1,0,0,0,326,327,1,0,0,0,327,329,3,36,18,0,328,
-330,3,56,28,0,329,328,1,0,0,0,329,330,1,0,0,0,330,331,1,0,0,0,331,333,3,
-54,27,0,332,334,3,50,25,0,333,332,1,0,0,0,333,334,1,0,0,0,334,35,1,0,0,0,
-335,336,7,4,0,0,336,37,1,0,0,0,337,339,3,54,27,0,338,340,3,56,28,0,339,338,
-1,0,0,0,339,340,1,0,0,0,340,341,1,0,0,0,341,343,3,40,20,0,342,344,3,56,28,
-0,343,342,1,0,0,0,343,344,1,0,0,0,344,345,1,0,0,0,345,347,3,54,27,0,346,
-348,3,50,25,0,347,346,1,0,0,0,347,348,1,0,0,0,348,39,1,0,0,0,349,350,7,5,
-0,0,350,41,1,0,0,0,351,353,3,54,27,0,352,354,3,56,28,0,353,352,1,0,0,0,353,
-354,1,0,0,0,354,355,1,0,0,0,355,357,3,44,22,0,356,358,3,56,28,0,357,356,
-1,0,0,0,357,358,1,0,0,0,358,359,1,0,0,0,359,361,3,54,27,0,360,362,3,50,25,
-0,361,360,1,0,0,0,361,362,1,0,0,0,362,43,1,0,0,0,363,364,7,6,0,0,364,45,
-1,0,0,0,365,367,3,54,27,0,366,368,3,56,28,0,367,366,1,0,0,0,367,368,1,0,
-0,0,368,369,1,0,0,0,369,371,3,48,24,0,370,372,3,56,28,0,371,370,1,0,0,0,
-371,372,1,0,0,0,372,373,1,0,0,0,373,375,3,54,27,0,374,376,3,50,25,0,375,
-374,1,0,0,0,375,376,1,0,0,0,376,47,1,0,0,0,377,378,7,7,0,0,378,49,1,0,0,
-0,379,381,5,11,0,0,380,382,3,52,26,0,381,380,1,0,0,0,381,382,1,0,0,0,382,
-383,1,0,0,0,383,389,3,54,27,0,384,385,5,11,0,0,385,386,3,54,27,0,386,387,
-3,52,26,0,387,389,1,0,0,0,388,379,1,0,0,0,388,384,1,0,0,0,389,51,1,0,0,0,
-390,391,7,8,0,0,391,53,1,0,0,0,392,393,5,78,0,0,393,55,1,0,0,0,394,395,7,
-9,0,0,395,57,1,0,0,0,396,397,5,77,0,0,397,59,1,0,0,0,52,64,73,76,81,84,90,
-93,98,101,106,109,114,117,128,134,141,147,155,163,166,169,176,179,185,190,
-195,203,206,209,214,222,225,230,236,243,284,310,315,325,329,333,339,343,
-347,353,357,361,367,371,375,381,388];
+2,13,7,13,2,14,7,14,2,15,7,15,2,16,7,16,2,17,7,17,1,0,1,0,1,0,1,1,5,1,41,
+8,1,10,1,12,1,44,9,1,1,1,1,1,3,1,48,8,1,1,1,1,1,1,1,1,1,1,1,1,1,5,1,56,8,
+1,10,1,12,1,59,9,1,1,1,1,1,5,1,63,8,1,10,1,12,1,66,9,1,1,2,3,2,69,8,2,1,
+2,1,2,1,2,3,2,74,8,2,1,2,3,2,77,8,2,1,2,3,2,80,8,2,1,2,3,2,83,8,2,1,3,1,
+3,5,3,87,8,3,10,3,12,3,90,9,3,1,3,1,3,1,4,1,4,1,4,1,4,1,4,3,4,99,8,4,1,5,
+1,5,5,5,103,8,5,10,5,12,5,106,9,5,1,5,1,5,1,6,1,6,1,7,1,7,1,8,1,8,1,8,1,
+9,1,9,1,10,1,10,1,10,3,10,122,8,10,1,10,3,10,125,8,10,1,11,1,11,1,11,1,11,
+3,11,131,8,11,1,11,3,11,134,8,11,1,12,3,12,137,8,12,1,12,5,12,140,8,12,10,
+12,12,12,143,9,12,1,12,3,12,146,8,12,1,13,1,13,3,13,150,8,13,1,14,3,14,153,
+8,14,1,14,1,14,1,15,1,15,1,16,1,16,1,17,1,17,1,17,1,17,1,17,1,17,1,17,1,
+17,3,17,169,8,17,1,17,1,17,1,17,1,17,1,17,1,17,1,17,1,17,3,17,179,8,17,3,
+17,181,8,17,1,17,0,0,18,0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30,32,34,
+0,4,2,0,37,37,39,39,1,0,5,6,2,0,15,15,17,22,1,0,16,17,196,0,36,1,0,0,0,2,
+42,1,0,0,0,4,68,1,0,0,0,6,84,1,0,0,0,8,98,1,0,0,0,10,100,1,0,0,0,12,109,
+1,0,0,0,14,111,1,0,0,0,16,113,1,0,0,0,18,116,1,0,0,0,20,118,1,0,0,0,22,126,
+1,0,0,0,24,136,1,0,0,0,26,147,1,0,0,0,28,152,1,0,0,0,30,156,1,0,0,0,32,158,
+1,0,0,0,34,180,1,0,0,0,36,37,3,2,1,0,37,38,5,0,0,1,38,1,1,0,0,0,39,41,7,
+0,0,0,40,39,1,0,0,0,41,44,1,0,0,0,42,40,1,0,0,0,42,43,1,0,0,0,43,45,1,0,
+0,0,44,42,1,0,0,0,45,47,5,3,0,0,46,48,5,42,0,0,47,46,1,0,0,0,47,48,1,0,0,
+0,48,57,1,0,0,0,49,56,5,37,0,0,50,56,3,4,2,0,51,56,3,20,10,0,52,56,3,22,
+11,0,53,56,3,34,17,0,54,56,5,39,0,0,55,49,1,0,0,0,55,50,1,0,0,0,55,51,1,
+0,0,0,55,52,1,0,0,0,55,53,1,0,0,0,55,54,1,0,0,0,56,59,1,0,0,0,57,55,1,0,
+0,0,57,58,1,0,0,0,58,60,1,0,0,0,59,57,1,0,0,0,60,64,5,4,0,0,61,63,7,0,0,
+0,62,61,1,0,0,0,63,66,1,0,0,0,64,62,1,0,0,0,64,65,1,0,0,0,65,3,1,0,0,0,66,
+64,1,0,0,0,67,69,3,12,6,0,68,67,1,0,0,0,68,69,1,0,0,0,69,70,1,0,0,0,70,71,
+5,2,0,0,71,73,3,18,9,0,72,74,3,14,7,0,73,72,1,0,0,0,73,74,1,0,0,0,74,76,
+1,0,0,0,75,77,3,16,8,0,76,75,1,0,0,0,76,77,1,0,0,0,77,82,1,0,0,0,78,80,5,
+37,0,0,79,78,1,0,0,0,79,80,1,0,0,0,80,81,1,0,0,0,81,83,3,6,3,0,82,79,1,0,
+0,0,82,83,1,0,0,0,83,5,1,0,0,0,84,88,5,31,0,0,85,87,3,8,4,0,86,85,1,0,0,
+0,87,90,1,0,0,0,88,86,1,0,0,0,88,89,1,0,0,0,89,91,1,0,0,0,90,88,1,0,0,0,
+91,92,5,45,0,0,92,7,1,0,0,0,93,99,5,43,0,0,94,99,5,44,0,0,95,99,5,46,0,0,
+96,99,5,47,0,0,97,99,3,10,5,0,98,93,1,0,0,0,98,94,1,0,0,0,98,95,1,0,0,0,
+98,96,1,0,0,0,98,97,1,0,0,0,99,9,1,0,0,0,100,104,5,44,0,0,101,103,3,8,4,
+0,102,101,1,0,0,0,103,106,1,0,0,0,104,102,1,0,0,0,104,105,1,0,0,0,105,107,
+1,0,0,0,106,104,1,0,0,0,107,108,5,45,0,0,108,11,1,0,0,0,109,110,7,1,0,0,
+110,13,1,0,0,0,111,112,5,32,0,0,112,15,1,0,0,0,113,114,5,9,0,0,114,115,3,
+18,9,0,115,17,1,0,0,0,116,117,5,42,0,0,117,19,1,0,0,0,118,119,5,1,0,0,119,
+121,3,18,9,0,120,122,3,14,7,0,121,120,1,0,0,0,121,122,1,0,0,0,122,124,1,
+0,0,0,123,125,3,6,3,0,124,123,1,0,0,0,124,125,1,0,0,0,125,21,1,0,0,0,126,
+133,3,26,13,0,127,128,3,24,12,0,128,130,3,28,14,0,129,131,3,32,16,0,130,
+129,1,0,0,0,130,131,1,0,0,0,131,134,1,0,0,0,132,134,3,32,16,0,133,127,1,
+0,0,0,133,132,1,0,0,0,134,23,1,0,0,0,135,137,5,13,0,0,136,135,1,0,0,0,136,
+137,1,0,0,0,137,141,1,0,0,0,138,140,7,2,0,0,139,138,1,0,0,0,140,143,1,0,
+0,0,141,139,1,0,0,0,141,142,1,0,0,0,142,145,1,0,0,0,143,141,1,0,0,0,144,
+146,5,12,0,0,145,144,1,0,0,0,145,146,1,0,0,0,146,25,1,0,0,0,147,149,3,18,
+9,0,148,150,3,30,15,0,149,148,1,0,0,0,149,150,1,0,0,0,150,27,1,0,0,0,151,
+153,3,30,15,0,152,151,1,0,0,0,152,153,1,0,0,0,153,154,1,0,0,0,154,155,3,
+18,9,0,155,29,1,0,0,0,156,157,5,33,0,0,157,31,1,0,0,0,158,159,5,36,0,0,159,
+33,1,0,0,0,160,161,5,24,0,0,161,162,3,18,9,0,162,163,5,23,0,0,163,164,3,
+18,9,0,164,165,5,25,0,0,165,166,7,3,0,0,166,168,3,18,9,0,167,169,3,32,16,
+0,168,167,1,0,0,0,168,169,1,0,0,0,169,181,1,0,0,0,170,171,3,18,9,0,171,172,
+7,3,0,0,172,173,5,24,0,0,173,174,3,18,9,0,174,175,5,23,0,0,175,176,3,18,
+9,0,176,178,5,25,0,0,177,179,3,32,16,0,178,177,1,0,0,0,178,179,1,0,0,0,179,
+181,1,0,0,0,180,160,1,0,0,0,180,170,1,0,0,0,181,35,1,0,0,0,25,42,47,55,57,
+64,68,73,76,79,82,88,98,104,121,124,130,133,136,141,145,149,152,168,178,
+180];
 
 
 const atn = new antlr4.atn.ATNDeserializer().deserialize(serializedATN);
@@ -146,44 +72,34 @@ const sharedContextCache = new antlr4.atn.PredictionContextCache();
 
 export default class PlantUMLParser extends antlr4.Parser {
 
-    static grammarFileName = "PlantUML.g4";
-    static literalNames = [ null, "'@startuml'", "'@enduml'", "'class'", 
-                            "'interface'", "'abstract'", "'entity'", "'enum'", 
-                            "'annotation'", "'{'", "'}'", "':'", "'('", 
-                            "')'", "','", "'<<'", "'>>'", "'+'", "'-'", 
-                            "'#'", "'~'", "'static'", "'classifier'", "'Sequence'", 
-                            "'Set'", "'Bag'", "'OrderedSet'", "'SortedSet'", 
-                            "'['", "']'", "'Map'", "'SortedMap'", "'Function'", 
-                            "'<|--'", "'<|-'", "'<|---'", "'<|..'", "'^--'", 
-                            "'--|>'", "'-|>'", "'---|>'", "'..|>'", "'--^'", 
-                            "'--'", "'---'", "'-->'", "'->'", "'<--'", "'<-'", 
-                            "'o--'", "'--o'", "'o-->'", "'<--o'", "'*--'", 
-                            "'*-'", "'--*'", "'-*'", "'*-->'", "'*->'", 
-                            "'<--*'", "'<-*'", "'..'", "'..>'", "'<..'", 
-                            "'...'", "'...>'", "'<...'", "'>'", "'<'", null, 
-                            null, null, "'null'", null, "'\\u222B'", "'\\u2211'" ];
-    static symbolicNames = [ null, null, null, null, null, null, null, null, 
-                             null, null, null, null, null, null, null, null, 
-                             null, null, null, null, null, null, null, null, 
-                             null, null, null, null, null, null, null, null, 
-                             null, null, null, null, null, null, null, null, 
-                             null, null, null, null, null, null, null, null, 
-                             null, null, null, null, null, null, null, null, 
-                             null, null, null, null, null, null, null, null, 
-                             null, null, null, null, null, "FLOAT_LITERAL", 
-                             "STRING1_LITERAL", "STRING2_LITERAL", "NULL_LITERAL", 
-                             "MULTILINE_COMMENT", "INTEGRAL", "SIGMA", "NEWLINE", 
-                             "INT", "ID", "WS" ];
-    static ruleNames = [ "classDiagram", "cdelement", "classDefinition", 
-                         "classElement", "enumDefinition", "attribute", 
-                         "internalAttribute", "method", "internalMethod", 
-                         "parameters", "stereotype", "visibility", "modifier", 
-                         "type", "inheritance", "leftAncestorSymbol", "rightAncestorSymbol", 
-                         "association", "associationSymbol", "aggregation", 
-                         "aggregationSymbol", "composition", "compositionSymbol", 
-                         "dependency", "dependencySymbol", "lineAnnotation", 
-                         "direction", "identifier", "stringExpression", 
-                         "integerLiteral" ];
+    static grammarFileName = "PlantUMLParser.g4";
+    static literalNames = [ null, "'enum'", "'class'", "'@startuml'", "'@enduml'", 
+                            "'interface'", "'abstract'", "'many'", "'one'", 
+                            "'extends'", "'static'", "'List'", "'>'", "'<'", 
+                            "'+'", "'-'", "'.'", "'..'", "'*'", "'o'", "'^'", 
+                            "'|>'", "'<|'", "','", "'('", "')'", "'['", 
+                            "']'", "'#'", "'='", "'null'", null, null, null, 
+                            null, null, null, null, null, null, null, null, 
+                            null, null, null, "'}'", null, null, "'>>'", 
+                            null, "'\"'" ];
+    static symbolicNames = [ null, "ENUM", "CLASS", "STARTUML", "ENDUML", 
+                             "INTERFACE", "ABSTRACT", "MANY", "ONE", "EXTENDS", 
+                             "STATIC", "LIST", "GT", "LT", "PLUS", "DASH", 
+                             "DOT", "DOUBLE_DOT", "STAR", "O", "CARET", 
+                             "PIPE_GT", "LT_PIPE", "COMMA", "LPAREN", "RPAREN", 
+                             "LBRACK", "RBRACK", "AMP", "EQUALS", "NULL_LITERAL", 
+                             "CLASS_BODY_START", "STEREOTYPE_TEXT", "ASSOC_DETAIL", 
+                             "NOTE", "DIAMOND", "AFTER_COLON_TEXT", "NEWLINE", 
+                             "WS", "COMMENT", "FLOAT_LITERAL", "NUMBER", 
+                             "IDENT", "BODY_INLINE_BRACES", "BODY_OPEN", 
+                             "BODY_CLOSE", "BODY_CONTENT", "BODY_NL", "ENUM_FREE_TEXT_CLOSE", 
+                             "ENUM_FREE_TEXT_CONTENT", "ASSOC_DETAIL_TEXT_CLOSE", 
+                             "ASSOC_DETAIL_TEXT_CONTENT" ];
+    static ruleNames = [ "entry_", "uml", "class_dclr", "class_body", "body_content", 
+                         "nested_body", "class_type", "stereotype", "extension_dclr", 
+                         "ident", "enum_dclr", "association_dclr", "relation", 
+                         "association_left", "association_right", "association_detail", 
+                         "association_name", "associative_class_dclr" ];
 
     constructor(input) {
         super(input);
@@ -195,27 +111,14 @@ export default class PlantUMLParser extends antlr4.Parser {
 
 
 
-	classDiagram() {
-	    let localctx = new ClassDiagramContext(this, this._ctx, this.state);
-	    this.enterRule(localctx, 0, PlantUMLParser.RULE_classDiagram);
-	    var _la = 0;
+	entry_() {
+	    let localctx = new Entry_Context(this, this._ctx, this.state);
+	    this.enterRule(localctx, 0, PlantUMLParser.RULE_entry_);
 	    try {
 	        this.enterOuterAlt(localctx, 1);
-	        this.state = 60;
-	        this.match(PlantUMLParser.T__0);
-	        this.state = 64;
-	        this._errHandler.sync(this);
-	        _la = this._input.LA(1);
-	        while((((_la) & ~0x1f) === 0 && ((1 << _la) & 504) !== 0) || _la===78) {
-	            this.state = 61;
-	            this.cdelement();
-	            this.state = 66;
-	            this._errHandler.sync(this);
-	            _la = this._input.LA(1);
-	        }
-	        this.state = 67;
-	        this.match(PlantUMLParser.T__1);
-	        this.state = 68;
+	        this.state = 36;
+	        this.uml();
+	        this.state = 37;
 	        this.match(PlantUMLParser.EOF);
 	    } catch (re) {
 	    	if(re instanceof antlr4.error.RecognitionException) {
@@ -233,210 +136,165 @@ export default class PlantUMLParser extends antlr4.Parser {
 
 
 
-	cdelement() {
-	    let localctx = new CdelementContext(this, this._ctx, this.state);
-	    this.enterRule(localctx, 2, PlantUMLParser.RULE_cdelement);
+	uml() {
+	    let localctx = new UmlContext(this, this._ctx, this.state);
+	    this.enterRule(localctx, 2, PlantUMLParser.RULE_uml);
 	    var _la = 0;
 	    try {
-	        this.state = 128;
+	        this.enterOuterAlt(localctx, 1);
+	        this.state = 42;
 	        this._errHandler.sync(this);
-	        var la_ = this._interp.adaptivePredict(this._input,13,this._ctx);
-	        switch(la_) {
-	        case 1:
-	            this.enterOuterAlt(localctx, 1);
-	            this.state = 70;
-	            this.match(PlantUMLParser.T__2);
-	            this.state = 71;
-	            this.identifier();
-	            this.state = 73;
-	            this._errHandler.sync(this);
+	        _la = this._input.LA(1);
+	        while(_la===37 || _la===39) {
+	            this.state = 39;
 	            _la = this._input.LA(1);
-	            if(_la===15) {
-	                this.state = 72;
-	                this.stereotype();
+	            if(!(_la===37 || _la===39)) {
+	            this._errHandler.recoverInline(this);
 	            }
-
-	            this.state = 76;
-	            this._errHandler.sync(this);
-	            _la = this._input.LA(1);
-	            if(_la===9) {
-	                this.state = 75;
-	                this.classDefinition();
+	            else {
+	            	this._errHandler.reportMatch(this);
+	                this.consume();
 	            }
-
-	            break;
-
-	        case 2:
-	            this.enterOuterAlt(localctx, 2);
-	            this.state = 78;
-	            this.match(PlantUMLParser.T__3);
-	            this.state = 79;
-	            this.identifier();
-	            this.state = 81;
+	            this.state = 44;
 	            this._errHandler.sync(this);
 	            _la = this._input.LA(1);
-	            if(_la===15) {
-	                this.state = 80;
-	                this.stereotype();
-	            }
+	        }
+	        this.state = 45;
+	        this.match(PlantUMLParser.STARTUML);
+	        this.state = 47;
+	        this._errHandler.sync(this);
+	        var la_ = this._interp.adaptivePredict(this._input,1,this._ctx);
+	        if(la_===1) {
+	            this.state = 46;
+	            this.match(PlantUMLParser.IDENT);
 
-	            this.state = 84;
+	        }
+	        this.state = 57;
+	        this._errHandler.sync(this);
+	        _la = this._input.LA(1);
+	        while((((_la) & ~0x1f) === 0 && ((1 << _la) & 16777318) !== 0) || ((((_la - 37)) & ~0x1f) === 0 && ((1 << (_la - 37)) & 37) !== 0)) {
+	            this.state = 55;
 	            this._errHandler.sync(this);
-	            _la = this._input.LA(1);
-	            if(_la===9) {
-	                this.state = 83;
-	                this.classDefinition();
-	            }
-
-	            break;
+	            var la_ = this._interp.adaptivePredict(this._input,2,this._ctx);
+	            switch(la_) {
+	            case 1:
+	                this.state = 49;
+	                this.match(PlantUMLParser.NEWLINE);
+	                break;
+
+	            case 2:
+	                this.state = 50;
+	                this.class_dclr();
+	                break;
+
+	            case 3:
+	                this.state = 51;
+	                this.enum_dclr();
+	                break;
+
+	            case 4:
+	                this.state = 52;
+	                this.association_dclr();
+	                break;
+
+	            case 5:
+	                this.state = 53;
+	                this.associative_class_dclr();
+	                break;
+
+	            case 6:
+	                this.state = 54;
+	                this.match(PlantUMLParser.COMMENT);
+	                break;
 
-	        case 3:
-	            this.enterOuterAlt(localctx, 3);
-	            this.state = 86;
-	            this.match(PlantUMLParser.T__4);
-	            this.state = 87;
-	            this.match(PlantUMLParser.T__2);
-	            this.state = 88;
-	            this.identifier();
-	            this.state = 90;
-	            this._errHandler.sync(this);
-	            _la = this._input.LA(1);
-	            if(_la===15) {
-	                this.state = 89;
-	                this.stereotype();
 	            }
-
-	            this.state = 93;
+	            this.state = 59;
 	            this._errHandler.sync(this);
 	            _la = this._input.LA(1);
-	            if(_la===9) {
-	                this.state = 92;
-	                this.classDefinition();
-	            }
-
-	            break;
-
-	        case 4:
-	            this.enterOuterAlt(localctx, 4);
-	            this.state = 95;
-	            this.match(PlantUMLParser.T__4);
-	            this.state = 96;
-	            this.identifier();
-	            this.state = 98;
-	            this._errHandler.sync(this);
+	        }
+	        this.state = 60;
+	        this.match(PlantUMLParser.ENDUML);
+	        this.state = 64;
+	        this._errHandler.sync(this);
+	        _la = this._input.LA(1);
+	        while(_la===37 || _la===39) {
+	            this.state = 61;
 	            _la = this._input.LA(1);
-	            if(_la===15) {
-	                this.state = 97;
-	                this.stereotype();
+	            if(!(_la===37 || _la===39)) {
+	            this._errHandler.recoverInline(this);
 	            }
-
-	            this.state = 101;
+	            else {
+	            	this._errHandler.reportMatch(this);
+	                this.consume();
+	            }
+	            this.state = 66;
 	            this._errHandler.sync(this);
 	            _la = this._input.LA(1);
-	            if(_la===9) {
-	                this.state = 100;
-	                this.classDefinition();
-	            }
+	        }
+	    } catch (re) {
+	    	if(re instanceof antlr4.error.RecognitionException) {
+		        localctx.exception = re;
+		        this._errHandler.reportError(this, re);
+		        this._errHandler.recover(this, re);
+		    } else {
+		    	throw re;
+		    }
+	    } finally {
+	        this.exitRule();
+	    }
+	    return localctx;
+	}
 
-	            break;
 
-	        case 5:
-	            this.enterOuterAlt(localctx, 5);
-	            this.state = 103;
-	            this.match(PlantUMLParser.T__5);
-	            this.state = 104;
-	            this.identifier();
-	            this.state = 106;
-	            this._errHandler.sync(this);
-	            _la = this._input.LA(1);
-	            if(_la===15) {
-	                this.state = 105;
-	                this.stereotype();
-	            }
 
-	            this.state = 109;
-	            this._errHandler.sync(this);
-	            _la = this._input.LA(1);
-	            if(_la===9) {
-	                this.state = 108;
-	                this.classDefinition();
-	            }
+	class_dclr() {
+	    let localctx = new Class_dclrContext(this, this._ctx, this.state);
+	    this.enterRule(localctx, 4, PlantUMLParser.RULE_class_dclr);
+	    var _la = 0;
+	    try {
+	        this.enterOuterAlt(localctx, 1);
+	        this.state = 68;
+	        this._errHandler.sync(this);
+	        _la = this._input.LA(1);
+	        if(_la===5 || _la===6) {
+	            this.state = 67;
+	            this.class_type();
+	        }
 
-	            break;
+	        this.state = 70;
+	        this.match(PlantUMLParser.CLASS);
+	        this.state = 71;
+	        this.ident();
+	        this.state = 73;
+	        this._errHandler.sync(this);
+	        _la = this._input.LA(1);
+	        if(_la===32) {
+	            this.state = 72;
+	            this.stereotype();
+	        }
 
-	        case 6:
-	            this.enterOuterAlt(localctx, 6);
-	            this.state = 111;
-	            this.match(PlantUMLParser.T__6);
-	            this.state = 112;
-	            this.identifier();
-	            this.state = 114;
-	            this._errHandler.sync(this);
-	            _la = this._input.LA(1);
-	            if(_la===15) {
-	                this.state = 113;
-	                this.stereotype();
-	            }
+	        this.state = 76;
+	        this._errHandler.sync(this);
+	        _la = this._input.LA(1);
+	        if(_la===9) {
+	            this.state = 75;
+	            this.extension_dclr();
+	        }
 
-	            this.state = 117;
+	        this.state = 82;
+	        this._errHandler.sync(this);
+	        var la_ = this._interp.adaptivePredict(this._input,9,this._ctx);
+	        if(la_===1) {
+	            this.state = 79;
 	            this._errHandler.sync(this);
 	            _la = this._input.LA(1);
-	            if(_la===9) {
-	                this.state = 116;
-	                this.enumDefinition();
+	            if(_la===37) {
+	                this.state = 78;
+	                this.match(PlantUMLParser.NEWLINE);
 	            }
 
-	            break;
-
-	        case 7:
-	            this.enterOuterAlt(localctx, 7);
-	            this.state = 119;
-	            this.match(PlantUMLParser.T__7);
-	            this.state = 120;
-	            this.identifier();
-	            break;
-
-	        case 8:
-	            this.enterOuterAlt(localctx, 8);
-	            this.state = 121;
-	            this.inheritance();
-	            break;
-
-	        case 9:
-	            this.enterOuterAlt(localctx, 9);
-	            this.state = 122;
-	            this.association();
-	            break;
-
-	        case 10:
-	            this.enterOuterAlt(localctx, 10);
-	            this.state = 123;
-	            this.aggregation();
-	            break;
-
-	        case 11:
-	            this.enterOuterAlt(localctx, 11);
-	            this.state = 124;
-	            this.attribute();
-	            break;
-
-	        case 12:
-	            this.enterOuterAlt(localctx, 12);
-	            this.state = 125;
-	            this.composition();
-	            break;
-
-	        case 13:
-	            this.enterOuterAlt(localctx, 13);
-	            this.state = 126;
-	            this.dependency();
-	            break;
-
-	        case 14:
-	            this.enterOuterAlt(localctx, 14);
-	            this.state = 127;
-	            this.method();
-	            break;
+	            this.state = 81;
+	            this.class_body();
 
 	        }
 	    } catch (re) {
@@ -455,26 +313,26 @@ export default class PlantUMLParser extends antlr4.Parser {
 
 
 
-	classDefinition() {
-	    let localctx = new ClassDefinitionContext(this, this._ctx, this.state);
-	    this.enterRule(localctx, 4, PlantUMLParser.RULE_classDefinition);
+	class_body() {
+	    let localctx = new Class_bodyContext(this, this._ctx, this.state);
+	    this.enterRule(localctx, 6, PlantUMLParser.RULE_class_body);
 	    var _la = 0;
 	    try {
 	        this.enterOuterAlt(localctx, 1);
-	        this.state = 130;
-	        this.match(PlantUMLParser.T__8);
-	        this.state = 134;
+	        this.state = 84;
+	        this.match(PlantUMLParser.CLASS_BODY_START);
+	        this.state = 88;
 	        this._errHandler.sync(this);
 	        _la = this._input.LA(1);
-	        while(((((_la - 9)) & ~0x1f) === 0 && ((1 << (_la - 9)) & 15191809) !== 0) || _la===78) {
-	            this.state = 131;
-	            this.classElement();
-	            this.state = 136;
+	        while(((((_la - 43)) & ~0x1f) === 0 && ((1 << (_la - 43)) & 27) !== 0)) {
+	            this.state = 85;
+	            this.body_content();
+	            this.state = 90;
 	            this._errHandler.sync(this);
 	            _la = this._input.LA(1);
 	        }
-	        this.state = 137;
-	        this.match(PlantUMLParser.T__9);
+	        this.state = 91;
+	        this.match(PlantUMLParser.BODY_CLOSE);
 	    } catch (re) {
 	    	if(re instanceof antlr4.error.RecognitionException) {
 		        localctx.exception = re;
@@ -491,24 +349,42 @@ export default class PlantUMLParser extends antlr4.Parser {
 
 
 
-	classElement() {
-	    let localctx = new ClassElementContext(this, this._ctx, this.state);
-	    this.enterRule(localctx, 6, PlantUMLParser.RULE_classElement);
+	body_content() {
+	    let localctx = new Body_contentContext(this, this._ctx, this.state);
+	    this.enterRule(localctx, 8, PlantUMLParser.RULE_body_content);
 	    try {
-	        this.state = 141;
+	        this.state = 98;
 	        this._errHandler.sync(this);
-	        var la_ = this._interp.adaptivePredict(this._input,15,this._ctx);
+	        var la_ = this._interp.adaptivePredict(this._input,11,this._ctx);
 	        switch(la_) {
 	        case 1:
 	            this.enterOuterAlt(localctx, 1);
-	            this.state = 139;
-	            this.internalMethod();
+	            this.state = 93;
+	            this.match(PlantUMLParser.BODY_INLINE_BRACES);
 	            break;
 
 	        case 2:
 	            this.enterOuterAlt(localctx, 2);
-	            this.state = 140;
-	            this.internalAttribute();
+	            this.state = 94;
+	            this.match(PlantUMLParser.BODY_OPEN);
+	            break;
+
+	        case 3:
+	            this.enterOuterAlt(localctx, 3);
+	            this.state = 95;
+	            this.match(PlantUMLParser.BODY_CONTENT);
+	            break;
+
+	        case 4:
+	            this.enterOuterAlt(localctx, 4);
+	            this.state = 96;
+	            this.match(PlantUMLParser.BODY_NL);
+	            break;
+
+	        case 5:
+	            this.enterOuterAlt(localctx, 5);
+	            this.state = 97;
+	            this.nested_body();
 	            break;
 
 	        }
@@ -528,26 +404,26 @@ export default class PlantUMLParser extends antlr4.Parser {
 
 
 
-	enumDefinition() {
-	    let localctx = new EnumDefinitionContext(this, this._ctx, this.state);
-	    this.enterRule(localctx, 8, PlantUMLParser.RULE_enumDefinition);
+	nested_body() {
+	    let localctx = new Nested_bodyContext(this, this._ctx, this.state);
+	    this.enterRule(localctx, 10, PlantUMLParser.RULE_nested_body);
 	    var _la = 0;
 	    try {
 	        this.enterOuterAlt(localctx, 1);
-	        this.state = 143;
-	        this.match(PlantUMLParser.T__8);
-	        this.state = 145; 
+	        this.state = 100;
+	        this.match(PlantUMLParser.BODY_OPEN);
+	        this.state = 104;
 	        this._errHandler.sync(this);
 	        _la = this._input.LA(1);
-	        do {
-	            this.state = 144;
-	            this.identifier();
-	            this.state = 147; 
+	        while(((((_la - 43)) & ~0x1f) === 0 && ((1 << (_la - 43)) & 27) !== 0)) {
+	            this.state = 101;
+	            this.body_content();
+	            this.state = 106;
 	            this._errHandler.sync(this);
 	            _la = this._input.LA(1);
-	        } while(_la===78);
-	        this.state = 149;
-	        this.match(PlantUMLParser.T__9);
+	        }
+	        this.state = 107;
+	        this.match(PlantUMLParser.BODY_CLOSE);
 	    } catch (re) {
 	    	if(re instanceof antlr4.error.RecognitionException) {
 		        localctx.exception = re;
@@ -564,28 +440,21 @@ export default class PlantUMLParser extends antlr4.Parser {
 
 
 
-	attribute() {
-	    let localctx = new AttributeContext(this, this._ctx, this.state);
-	    this.enterRule(localctx, 10, PlantUMLParser.RULE_attribute);
+	class_type() {
+	    let localctx = new Class_typeContext(this, this._ctx, this.state);
+	    this.enterRule(localctx, 12, PlantUMLParser.RULE_class_type);
 	    var _la = 0;
 	    try {
 	        this.enterOuterAlt(localctx, 1);
-	        this.state = 151;
-	        this.identifier();
-	        this.state = 152;
-	        this.match(PlantUMLParser.T__10);
-	        this.state = 153;
-	        this.type();
-	        this.state = 155;
-	        this._errHandler.sync(this);
+	        this.state = 109;
 	        _la = this._input.LA(1);
-	        if((((_la) & ~0x1f) === 0 && ((1 << _la) & 1966080) !== 0)) {
-	            this.state = 154;
-	            this.visibility();
+	        if(!(_la===5 || _la===6)) {
+	        this._errHandler.recoverInline(this);
+	        }
+	        else {
+	        	this._errHandler.reportMatch(this);
+	            this.consume();
 	        }
-
-	        this.state = 157;
-	        this.identifier();
 	    } catch (re) {
 	    	if(re instanceof antlr4.error.RecognitionException) {
 		        localctx.exception = re;
@@ -602,80 +471,61 @@ export default class PlantUMLParser extends antlr4.Parser {
 
 
 
-	internalAttribute() {
-	    let localctx = new InternalAttributeContext(this, this._ctx, this.state);
-	    this.enterRule(localctx, 12, PlantUMLParser.RULE_internalAttribute);
-	    var _la = 0;
+	stereotype() {
+	    let localctx = new StereotypeContext(this, this._ctx, this.state);
+	    this.enterRule(localctx, 14, PlantUMLParser.RULE_stereotype);
 	    try {
-	        this.state = 185;
-	        this._errHandler.sync(this);
-	        var la_ = this._interp.adaptivePredict(this._input,23,this._ctx);
-	        switch(la_) {
-	        case 1:
-	            this.enterOuterAlt(localctx, 1);
-	            this.state = 163;
-	            this._errHandler.sync(this);
-	            _la = this._input.LA(1);
-	            if(_la===9) {
-	                this.state = 159;
-	                this.match(PlantUMLParser.T__8);
-	                this.state = 160;
-	                this.modifier();
-	                this.state = 161;
-	                this.match(PlantUMLParser.T__9);
-	            }
-
-	            this.state = 166;
-	            this._errHandler.sync(this);
-	            var la_ = this._interp.adaptivePredict(this._input,19,this._ctx);
-	            if(la_===1) {
-	                this.state = 165;
-	                this.type();
+	        this.enterOuterAlt(localctx, 1);
+	        this.state = 111;
+	        this.match(PlantUMLParser.STEREOTYPE_TEXT);
+	    } catch (re) {
+	    	if(re instanceof antlr4.error.RecognitionException) {
+		        localctx.exception = re;
+		        this._errHandler.reportError(this, re);
+		        this._errHandler.recover(this, re);
+		    } else {
+		    	throw re;
+		    }
+	    } finally {
+	        this.exitRule();
+	    }
+	    return localctx;
+	}
 
-	            }
-	            this.state = 169;
-	            this._errHandler.sync(this);
-	            _la = this._input.LA(1);
-	            if((((_la) & ~0x1f) === 0 && ((1 << _la) & 1966080) !== 0)) {
-	                this.state = 168;
-	                this.visibility();
-	            }
 
-	            this.state = 171;
-	            this.identifier();
-	            break;
 
-	        case 2:
-	            this.enterOuterAlt(localctx, 2);
-	            this.state = 176;
-	            this._errHandler.sync(this);
-	            _la = this._input.LA(1);
-	            if(_la===9) {
-	                this.state = 172;
-	                this.match(PlantUMLParser.T__8);
-	                this.state = 173;
-	                this.modifier();
-	                this.state = 174;
-	                this.match(PlantUMLParser.T__9);
-	            }
+	extension_dclr() {
+	    let localctx = new Extension_dclrContext(this, this._ctx, this.state);
+	    this.enterRule(localctx, 16, PlantUMLParser.RULE_extension_dclr);
+	    try {
+	        this.enterOuterAlt(localctx, 1);
+	        this.state = 113;
+	        this.match(PlantUMLParser.EXTENDS);
+	        this.state = 114;
+	        this.ident();
+	    } catch (re) {
+	    	if(re instanceof antlr4.error.RecognitionException) {
+		        localctx.exception = re;
+		        this._errHandler.reportError(this, re);
+		        this._errHandler.recover(this, re);
+		    } else {
+		    	throw re;
+		    }
+	    } finally {
+	        this.exitRule();
+	    }
+	    return localctx;
+	}
 
-	            this.state = 179;
-	            this._errHandler.sync(this);
-	            _la = this._input.LA(1);
-	            if((((_la) & ~0x1f) === 0 && ((1 << _la) & 1966080) !== 0)) {
-	                this.state = 178;
-	                this.visibility();
-	            }
 
-	            this.state = 181;
-	            this.identifier();
-	            this.state = 182;
-	            this.match(PlantUMLParser.T__10);
-	            this.state = 183;
-	            this.type();
-	            break;
 
-	        }
+	ident() {
+	    let localctx = new IdentContext(this, this._ctx, this.state);
+	    this.enterRule(localctx, 18, PlantUMLParser.RULE_ident);
+	    try {
+	        this.enterOuterAlt(localctx, 1);
+	        this.state = 116;
+	        this.match(PlantUMLParser.IDENT);
 	    } catch (re) {
 	    	if(re instanceof antlr4.error.RecognitionException) {
 		        localctx.exception = re;
@@ -692,38 +542,32 @@ export default class PlantUMLParser extends antlr4.Parser {
 
 
 
-	method() {
-	    let localctx = new MethodContext(this, this._ctx, this.state);
-	    this.enterRule(localctx, 14, PlantUMLParser.RULE_method);
+	enum_dclr() {
+	    let localctx = new Enum_dclrContext(this, this._ctx, this.state);
+	    this.enterRule(localctx, 20, PlantUMLParser.RULE_enum_dclr);
 	    var _la = 0;
 	    try {
 	        this.enterOuterAlt(localctx, 1);
-	        this.state = 187;
-	        this.identifier();
-	        this.state = 188;
-	        this.match(PlantUMLParser.T__10);
-	        this.state = 190;
+	        this.state = 118;
+	        this.match(PlantUMLParser.ENUM);
+	        this.state = 119;
+	        this.ident();
+	        this.state = 121;
 	        this._errHandler.sync(this);
 	        _la = this._input.LA(1);
-	        if((((_la) & ~0x1f) === 0 && ((1 << _la) & 1966080) !== 0)) {
-	            this.state = 189;
-	            this.visibility();
+	        if(_la===32) {
+	            this.state = 120;
+	            this.stereotype();
 	        }
 
-	        this.state = 192;
-	        this.identifier();
-	        this.state = 193;
-	        this.match(PlantUMLParser.T__11);
-	        this.state = 195;
+	        this.state = 124;
 	        this._errHandler.sync(this);
 	        _la = this._input.LA(1);
-	        if(_la===78) {
-	            this.state = 194;
-	            this.parameters();
+	        if(_la===31) {
+	            this.state = 123;
+	            this.class_body();
 	        }
 
-	        this.state = 197;
-	        this.match(PlantUMLParser.T__12);
 	    } catch (re) {
 	    	if(re instanceof antlr4.error.RecognitionException) {
 		        localctx.exception = re;
@@ -740,199 +584,47 @@ export default class PlantUMLParser extends antlr4.Parser {
 
 
 
-	internalMethod() {
-	    let localctx = new InternalMethodContext(this, this._ctx, this.state);
-	    this.enterRule(localctx, 16, PlantUMLParser.RULE_internalMethod);
+	association_dclr() {
+	    let localctx = new Association_dclrContext(this, this._ctx, this.state);
+	    this.enterRule(localctx, 22, PlantUMLParser.RULE_association_dclr);
 	    var _la = 0;
 	    try {
-	        this.state = 236;
+	        this.enterOuterAlt(localctx, 1);
+	        this.state = 126;
+	        this.association_left();
+	        this.state = 133;
 	        this._errHandler.sync(this);
-	        var la_ = this._interp.adaptivePredict(this._input,33,this._ctx);
-	        switch(la_) {
-	        case 1:
-	            this.enterOuterAlt(localctx, 1);
-	            this.state = 203;
-	            this._errHandler.sync(this);
-	            _la = this._input.LA(1);
-	            if(_la===9) {
-	                this.state = 199;
-	                this.match(PlantUMLParser.T__8);
-	                this.state = 200;
-	                this.modifier();
-	                this.state = 201;
-	                this.match(PlantUMLParser.T__9);
-	            }
-
-	            this.state = 206;
-	            this._errHandler.sync(this);
-	            var la_ = this._interp.adaptivePredict(this._input,27,this._ctx);
-	            if(la_===1) {
-	                this.state = 205;
-	                this.type();
-
-	            }
-	            this.state = 209;
-	            this._errHandler.sync(this);
-	            _la = this._input.LA(1);
-	            if((((_la) & ~0x1f) === 0 && ((1 << _la) & 1966080) !== 0)) {
-	                this.state = 208;
-	                this.visibility();
-	            }
-
-	            this.state = 211;
-	            this.identifier();
-	            this.state = 212;
-	            this.match(PlantUMLParser.T__11);
-	            this.state = 214;
+	        switch(this._input.LA(1)) {
+	        case 12:
+	        case 13:
+	        case 15:
+	        case 17:
+	        case 18:
+	        case 19:
+	        case 20:
+	        case 21:
+	        case 22:
+	        case 33:
+	        case 42:
+	            this.state = 127;
+	            this.relation();
+	            this.state = 128;
+	            this.association_right();
+	            this.state = 130;
 	            this._errHandler.sync(this);
 	            _la = this._input.LA(1);
-	            if(_la===78) {
-	                this.state = 213;
-	                this.parameters();
+	            if(_la===36) {
+	                this.state = 129;
+	                this.association_name();
 	            }
 
-	            this.state = 216;
-	            this.match(PlantUMLParser.T__12);
 	            break;
-
-	        case 2:
-	            this.enterOuterAlt(localctx, 2);
-	            this.state = 222;
-	            this._errHandler.sync(this);
-	            _la = this._input.LA(1);
-	            if(_la===9) {
-	                this.state = 218;
-	                this.match(PlantUMLParser.T__8);
-	                this.state = 219;
-	                this.modifier();
-	                this.state = 220;
-	                this.match(PlantUMLParser.T__9);
-	            }
-
-	            this.state = 225;
-	            this._errHandler.sync(this);
-	            _la = this._input.LA(1);
-	            if((((_la) & ~0x1f) === 0 && ((1 << _la) & 1966080) !== 0)) {
-	                this.state = 224;
-	                this.visibility();
-	            }
-
-	            this.state = 227;
-	            this.identifier();
-	            this.state = 228;
-	            this.match(PlantUMLParser.T__11);
-	            this.state = 230;
-	            this._errHandler.sync(this);
-	            _la = this._input.LA(1);
-	            if(_la===78) {
-	                this.state = 229;
-	                this.parameters();
-	            }
-
-	            this.state = 232;
-	            this.match(PlantUMLParser.T__12);
-	            this.state = 233;
-	            this.match(PlantUMLParser.T__10);
-	            this.state = 234;
-	            this.type();
+	        case 36:
+	            this.state = 132;
+	            this.association_name();
 	            break;
-
-	        }
-	    } catch (re) {
-	    	if(re instanceof antlr4.error.RecognitionException) {
-		        localctx.exception = re;
-		        this._errHandler.reportError(this, re);
-		        this._errHandler.recover(this, re);
-		    } else {
-		    	throw re;
-		    }
-	    } finally {
-	        this.exitRule();
-	    }
-	    return localctx;
-	}
-
-
-
-	parameters() {
-	    let localctx = new ParametersContext(this, this._ctx, this.state);
-	    this.enterRule(localctx, 18, PlantUMLParser.RULE_parameters);
-	    try {
-	        this.enterOuterAlt(localctx, 1);
-	        this.state = 243;
-	        this._errHandler.sync(this);
-	        var _alt = this._interp.adaptivePredict(this._input,34,this._ctx)
-	        while(_alt!=2 && _alt!=antlr4.atn.ATN.INVALID_ALT_NUMBER) {
-	            if(_alt===1) {
-	                this.state = 238;
-	                this.identifier();
-	                this.state = 239;
-	                this.match(PlantUMLParser.T__13); 
-	            }
-	            this.state = 245;
-	            this._errHandler.sync(this);
-	            _alt = this._interp.adaptivePredict(this._input,34,this._ctx);
-	        }
-
-	        this.state = 246;
-	        this.identifier();
-	    } catch (re) {
-	    	if(re instanceof antlr4.error.RecognitionException) {
-		        localctx.exception = re;
-		        this._errHandler.reportError(this, re);
-		        this._errHandler.recover(this, re);
-		    } else {
-		    	throw re;
-		    }
-	    } finally {
-	        this.exitRule();
-	    }
-	    return localctx;
-	}
-
-
-
-	stereotype() {
-	    let localctx = new StereotypeContext(this, this._ctx, this.state);
-	    this.enterRule(localctx, 20, PlantUMLParser.RULE_stereotype);
-	    try {
-	        this.enterOuterAlt(localctx, 1);
-	        this.state = 248;
-	        this.match(PlantUMLParser.T__14);
-	        this.state = 249;
-	        this.identifier();
-	        this.state = 250;
-	        this.match(PlantUMLParser.T__15);
-	    } catch (re) {
-	    	if(re instanceof antlr4.error.RecognitionException) {
-		        localctx.exception = re;
-		        this._errHandler.reportError(this, re);
-		        this._errHandler.recover(this, re);
-		    } else {
-		    	throw re;
-		    }
-	    } finally {
-	        this.exitRule();
-	    }
-	    return localctx;
-	}
-
-
-
-	visibility() {
-	    let localctx = new VisibilityContext(this, this._ctx, this.state);
-	    this.enterRule(localctx, 22, PlantUMLParser.RULE_visibility);
-	    var _la = 0;
-	    try {
-	        this.enterOuterAlt(localctx, 1);
-	        this.state = 252;
-	        _la = this._input.LA(1);
-	        if(!((((_la) & ~0x1f) === 0 && ((1 << _la) & 1966080) !== 0))) {
-	        this._errHandler.recoverInline(this);
-	        }
-	        else {
-	        	this._errHandler.reportMatch(this);
-	            this.consume();
+	        default:
+	            throw new antlr4.error.NoViableAltException(this);
 	        }
 	    } catch (re) {
 	    	if(re instanceof antlr4.error.RecognitionException) {
@@ -950,226 +642,45 @@ export default class PlantUMLParser extends antlr4.Parser {
 
 
 
-	modifier() {
-	    let localctx = new ModifierContext(this, this._ctx, this.state);
-	    this.enterRule(localctx, 24, PlantUMLParser.RULE_modifier);
+	relation() {
+	    let localctx = new RelationContext(this, this._ctx, this.state);
+	    this.enterRule(localctx, 24, PlantUMLParser.RULE_relation);
 	    var _la = 0;
 	    try {
 	        this.enterOuterAlt(localctx, 1);
-	        this.state = 254;
+	        this.state = 136;
+	        this._errHandler.sync(this);
 	        _la = this._input.LA(1);
-	        if(!((((_la) & ~0x1f) === 0 && ((1 << _la) & 6291488) !== 0))) {
-	        this._errHandler.recoverInline(this);
-	        }
-	        else {
-	        	this._errHandler.reportMatch(this);
-	            this.consume();
+	        if(_la===13) {
+	            this.state = 135;
+	            this.match(PlantUMLParser.LT);
 	        }
-	    } catch (re) {
-	    	if(re instanceof antlr4.error.RecognitionException) {
-		        localctx.exception = re;
-		        this._errHandler.reportError(this, re);
-		        this._errHandler.recover(this, re);
-		    } else {
-		    	throw re;
-		    }
-	    } finally {
-	        this.exitRule();
-	    }
-	    return localctx;
-	}
 
-
-
-	type() {
-	    let localctx = new TypeContext(this, this._ctx, this.state);
-	    this.enterRule(localctx, 26, PlantUMLParser.RULE_type);
-	    var _la = 0;
-	    try {
-	        this.state = 310;
+	        this.state = 141;
 	        this._errHandler.sync(this);
-	        var la_ = this._interp.adaptivePredict(this._input,36,this._ctx);
-	        switch(la_) {
-	        case 1:
-	            this.enterOuterAlt(localctx, 1);
-	            this.state = 256;
-	            this.match(PlantUMLParser.T__22);
-	            this.state = 257;
-	            this.match(PlantUMLParser.T__11);
-	            this.state = 258;
-	            this.type();
-	            this.state = 259;
-	            this.match(PlantUMLParser.T__12);
-	            break;
-
-	        case 2:
-	            this.enterOuterAlt(localctx, 2);
-	            this.state = 261;
-	            this.match(PlantUMLParser.T__23);
-	            this.state = 262;
-	            this.match(PlantUMLParser.T__11);
-	            this.state = 263;
-	            this.type();
-	            this.state = 264;
-	            this.match(PlantUMLParser.T__12);
-	            break;
-
-	        case 3:
-	            this.enterOuterAlt(localctx, 3);
-	            this.state = 266;
-	            this.match(PlantUMLParser.T__24);
-	            this.state = 267;
-	            this.match(PlantUMLParser.T__11);
-	            this.state = 268;
-	            this.type();
-	            this.state = 269;
-	            this.match(PlantUMLParser.T__12);
-	            break;
-
-	        case 4:
-	            this.enterOuterAlt(localctx, 4);
-	            this.state = 271;
-	            this.match(PlantUMLParser.T__25);
-	            this.state = 272;
-	            this.match(PlantUMLParser.T__11);
-	            this.state = 273;
-	            this.type();
-	            this.state = 274;
-	            this.match(PlantUMLParser.T__12);
-	            break;
-
-	        case 5:
-	            this.enterOuterAlt(localctx, 5);
-	            this.state = 276;
-	            this.match(PlantUMLParser.T__26);
-	            this.state = 277;
-	            this.match(PlantUMLParser.T__11);
-	            this.state = 278;
-	            this.type();
-	            this.state = 279;
-	            this.match(PlantUMLParser.T__12);
-	            break;
-
-	        case 6:
-	            this.enterOuterAlt(localctx, 6);
-	            this.state = 281;
-	            this.identifier();
-	            this.state = 282;
-	            this.match(PlantUMLParser.T__27);
-	            this.state = 284;
-	            this._errHandler.sync(this);
+	        _la = this._input.LA(1);
+	        while((((_la) & ~0x1f) === 0 && ((1 << _la) & 8290304) !== 0)) {
+	            this.state = 138;
 	            _la = this._input.LA(1);
-	            if(_la===77) {
-	                this.state = 283;
-	                this.integerLiteral();
+	            if(!((((_la) & ~0x1f) === 0 && ((1 << _la) & 8290304) !== 0))) {
+	            this._errHandler.recoverInline(this);
 	            }
-
-	            this.state = 286;
-	            this.match(PlantUMLParser.T__28);
-	            break;
-
-	        case 7:
-	            this.enterOuterAlt(localctx, 7);
-	            this.state = 288;
-	            this.match(PlantUMLParser.T__29);
-	            this.state = 289;
-	            this.match(PlantUMLParser.T__11);
-	            this.state = 290;
-	            this.type();
-	            this.state = 291;
-	            this.match(PlantUMLParser.T__13);
-	            this.state = 292;
-	            this.type();
-	            this.state = 293;
-	            this.match(PlantUMLParser.T__12);
-	            break;
-
-	        case 8:
-	            this.enterOuterAlt(localctx, 8);
-	            this.state = 295;
-	            this.match(PlantUMLParser.T__30);
-	            this.state = 296;
-	            this.match(PlantUMLParser.T__11);
-	            this.state = 297;
-	            this.type();
-	            this.state = 298;
-	            this.match(PlantUMLParser.T__13);
-	            this.state = 299;
-	            this.type();
-	            this.state = 300;
-	            this.match(PlantUMLParser.T__12);
-	            break;
-
-	        case 9:
-	            this.enterOuterAlt(localctx, 9);
-	            this.state = 302;
-	            this.match(PlantUMLParser.T__31);
-	            this.state = 303;
-	            this.match(PlantUMLParser.T__11);
-	            this.state = 304;
-	            this.type();
-	            this.state = 305;
-	            this.match(PlantUMLParser.T__13);
-	            this.state = 306;
-	            this.type();
-	            this.state = 307;
-	            this.match(PlantUMLParser.T__12);
-	            break;
-
-	        case 10:
-	            this.enterOuterAlt(localctx, 10);
-	            this.state = 309;
-	            this.identifier();
-	            break;
-
+	            else {
+	            	this._errHandler.reportMatch(this);
+	                this.consume();
+	            }
+	            this.state = 143;
+	            this._errHandler.sync(this);
+	            _la = this._input.LA(1);
 	        }
-	    } catch (re) {
-	    	if(re instanceof antlr4.error.RecognitionException) {
-		        localctx.exception = re;
-		        this._errHandler.reportError(this, re);
-		        this._errHandler.recover(this, re);
-		    } else {
-		    	throw re;
-		    }
-	    } finally {
-	        this.exitRule();
-	    }
-	    return localctx;
-	}
-
-
-
-	inheritance() {
-	    let localctx = new InheritanceContext(this, this._ctx, this.state);
-	    this.enterRule(localctx, 28, PlantUMLParser.RULE_inheritance);
-	    try {
-	        this.enterOuterAlt(localctx, 1);
-	        this.state = 312;
-	        this.identifier();
-	        this.state = 315;
+	        this.state = 145;
 	        this._errHandler.sync(this);
-	        switch(this._input.LA(1)) {
-	        case 33:
-	        case 34:
-	        case 35:
-	        case 36:
-	        case 37:
-	            this.state = 313;
-	            this.leftAncestorSymbol();
-	            break;
-	        case 38:
-	        case 39:
-	        case 40:
-	        case 41:
-	        case 42:
-	            this.state = 314;
-	            this.rightAncestorSymbol();
-	            break;
-	        default:
-	            throw new antlr4.error.NoViableAltException(this);
+	        _la = this._input.LA(1);
+	        if(_la===12) {
+	            this.state = 144;
+	            this.match(PlantUMLParser.GT);
 	        }
-	        this.state = 317;
-	        this.identifier();
+
 	    } catch (re) {
 	    	if(re instanceof antlr4.error.RecognitionException) {
 		        localctx.exception = re;
@@ -1186,20 +697,20 @@ export default class PlantUMLParser extends antlr4.Parser {
 
 
 
-	leftAncestorSymbol() {
-	    let localctx = new LeftAncestorSymbolContext(this, this._ctx, this.state);
-	    this.enterRule(localctx, 30, PlantUMLParser.RULE_leftAncestorSymbol);
-	    var _la = 0;
+	association_left() {
+	    let localctx = new Association_leftContext(this, this._ctx, this.state);
+	    this.enterRule(localctx, 26, PlantUMLParser.RULE_association_left);
 	    try {
 	        this.enterOuterAlt(localctx, 1);
-	        this.state = 319;
-	        _la = this._input.LA(1);
-	        if(!(((((_la - 33)) & ~0x1f) === 0 && ((1 << (_la - 33)) & 31) !== 0))) {
-	        this._errHandler.recoverInline(this);
-	        }
-	        else {
-	        	this._errHandler.reportMatch(this);
-	            this.consume();
+	        this.state = 147;
+	        this.ident();
+	        this.state = 149;
+	        this._errHandler.sync(this);
+	        var la_ = this._interp.adaptivePredict(this._input,20,this._ctx);
+	        if(la_===1) {
+	            this.state = 148;
+	            this.association_detail();
+
 	        }
 	    } catch (re) {
 	    	if(re instanceof antlr4.error.RecognitionException) {
@@ -1217,21 +728,22 @@ export default class PlantUMLParser extends antlr4.Parser {
 
 
 
-	rightAncestorSymbol() {
-	    let localctx = new RightAncestorSymbolContext(this, this._ctx, this.state);
-	    this.enterRule(localctx, 32, PlantUMLParser.RULE_rightAncestorSymbol);
+	association_right() {
+	    let localctx = new Association_rightContext(this, this._ctx, this.state);
+	    this.enterRule(localctx, 28, PlantUMLParser.RULE_association_right);
 	    var _la = 0;
 	    try {
 	        this.enterOuterAlt(localctx, 1);
-	        this.state = 321;
+	        this.state = 152;
+	        this._errHandler.sync(this);
 	        _la = this._input.LA(1);
-	        if(!(((((_la - 38)) & ~0x1f) === 0 && ((1 << (_la - 38)) & 31) !== 0))) {
-	        this._errHandler.recoverInline(this);
-	        }
-	        else {
-	        	this._errHandler.reportMatch(this);
-	            this.consume();
+	        if(_la===33) {
+	            this.state = 151;
+	            this.association_detail();
 	        }
+
+	        this.state = 154;
+	        this.ident();
 	    } catch (re) {
 	    	if(re instanceof antlr4.error.RecognitionException) {
 		        localctx.exception = re;
@@ -1248,42 +760,13 @@ export default class PlantUMLParser extends antlr4.Parser {
 
 
 
-	association() {
-	    let localctx = new AssociationContext(this, this._ctx, this.state);
-	    this.enterRule(localctx, 34, PlantUMLParser.RULE_association);
-	    var _la = 0;
+	association_detail() {
+	    let localctx = new Association_detailContext(this, this._ctx, this.state);
+	    this.enterRule(localctx, 30, PlantUMLParser.RULE_association_detail);
 	    try {
 	        this.enterOuterAlt(localctx, 1);
-	        this.state = 323;
-	        this.identifier();
-	        this.state = 325;
-	        this._errHandler.sync(this);
-	        _la = this._input.LA(1);
-	        if(_la===70 || _la===71) {
-	            this.state = 324;
-	            this.stringExpression();
-	        }
-
-	        this.state = 327;
-	        this.associationSymbol();
-	        this.state = 329;
-	        this._errHandler.sync(this);
-	        _la = this._input.LA(1);
-	        if(_la===70 || _la===71) {
-	            this.state = 328;
-	            this.stringExpression();
-	        }
-
-	        this.state = 331;
-	        this.identifier();
-	        this.state = 333;
-	        this._errHandler.sync(this);
-	        _la = this._input.LA(1);
-	        if(_la===11) {
-	            this.state = 332;
-	            this.lineAnnotation();
-	        }
-
+	        this.state = 156;
+	        this.match(PlantUMLParser.ASSOC_DETAIL);
 	    } catch (re) {
 	    	if(re instanceof antlr4.error.RecognitionException) {
 		        localctx.exception = re;
@@ -1300,21 +783,13 @@ export default class PlantUMLParser extends antlr4.Parser {
 
 
 
-	associationSymbol() {
-	    let localctx = new AssociationSymbolContext(this, this._ctx, this.state);
-	    this.enterRule(localctx, 36, PlantUMLParser.RULE_associationSymbol);
-	    var _la = 0;
+	association_name() {
+	    let localctx = new Association_nameContext(this, this._ctx, this.state);
+	    this.enterRule(localctx, 32, PlantUMLParser.RULE_association_name);
 	    try {
 	        this.enterOuterAlt(localctx, 1);
-	        this.state = 335;
-	        _la = this._input.LA(1);
-	        if(!(((((_la - 18)) & ~0x1f) === 0 && ((1 << (_la - 18)) & 2113929217) !== 0))) {
-	        this._errHandler.recoverInline(this);
-	        }
-	        else {
-	        	this._errHandler.reportMatch(this);
-	            this.consume();
-	        }
+	        this.state = 158;
+	        this.match(PlantUMLParser.AFTER_COLON_TEXT);
 	    } catch (re) {
 	    	if(re instanceof antlr4.error.RecognitionException) {
 		        localctx.exception = re;
@@ -1331,42 +806,81 @@ export default class PlantUMLParser extends antlr4.Parser {
 
 
 
-	aggregation() {
-	    let localctx = new AggregationContext(this, this._ctx, this.state);
-	    this.enterRule(localctx, 38, PlantUMLParser.RULE_aggregation);
+	associative_class_dclr() {
+	    let localctx = new Associative_class_dclrContext(this, this._ctx, this.state);
+	    this.enterRule(localctx, 34, PlantUMLParser.RULE_associative_class_dclr);
 	    var _la = 0;
 	    try {
-	        this.enterOuterAlt(localctx, 1);
-	        this.state = 337;
-	        this.identifier();
-	        this.state = 339;
+	        this.state = 180;
 	        this._errHandler.sync(this);
-	        _la = this._input.LA(1);
-	        if(_la===70 || _la===71) {
-	            this.state = 338;
-	            this.stringExpression();
-	        }
+	        switch(this._input.LA(1)) {
+	        case 24:
+	            this.enterOuterAlt(localctx, 1);
+	            this.state = 160;
+	            this.match(PlantUMLParser.LPAREN);
+	            this.state = 161;
+	            localctx.left = this.ident();
+	            this.state = 162;
+	            this.match(PlantUMLParser.COMMA);
+	            this.state = 163;
+	            localctx.right = this.ident();
+	            this.state = 164;
+	            this.match(PlantUMLParser.RPAREN);
+	            this.state = 165;
+	            _la = this._input.LA(1);
+	            if(!(_la===16 || _la===17)) {
+	            this._errHandler.recoverInline(this);
+	            }
+	            else {
+	            	this._errHandler.reportMatch(this);
+	                this.consume();
+	            }
+	            this.state = 166;
+	            localctx.target = this.ident();
+	            this.state = 168;
+	            this._errHandler.sync(this);
+	            _la = this._input.LA(1);
+	            if(_la===36) {
+	                this.state = 167;
+	                this.association_name();
+	            }
 
-	        this.state = 341;
-	        this.aggregationSymbol();
-	        this.state = 343;
-	        this._errHandler.sync(this);
-	        _la = this._input.LA(1);
-	        if(_la===70 || _la===71) {
-	            this.state = 342;
-	            this.stringExpression();
-	        }
+	            break;
+	        case 42:
+	            this.enterOuterAlt(localctx, 2);
+	            this.state = 170;
+	            localctx.target = this.ident();
+	            this.state = 171;
+	            _la = this._input.LA(1);
+	            if(!(_la===16 || _la===17)) {
+	            this._errHandler.recoverInline(this);
+	            }
+	            else {
+	            	this._errHandler.reportMatch(this);
+	                this.consume();
+	            }
+	            this.state = 172;
+	            this.match(PlantUMLParser.LPAREN);
+	            this.state = 173;
+	            localctx.left = this.ident();
+	            this.state = 174;
+	            this.match(PlantUMLParser.COMMA);
+	            this.state = 175;
+	            localctx.right = this.ident();
+	            this.state = 176;
+	            this.match(PlantUMLParser.RPAREN);
+	            this.state = 178;
+	            this._errHandler.sync(this);
+	            _la = this._input.LA(1);
+	            if(_la===36) {
+	                this.state = 177;
+	                this.association_name();
+	            }
 
-	        this.state = 345;
-	        this.identifier();
-	        this.state = 347;
-	        this._errHandler.sync(this);
-	        _la = this._input.LA(1);
-	        if(_la===11) {
-	            this.state = 346;
-	            this.lineAnnotation();
+	            break;
+	        default:
+	            throw new antlr4.error.NoViableAltException(this);
 	        }
-
 	    } catch (re) {
 	    	if(re instanceof antlr4.error.RecognitionException) {
 		        localctx.exception = re;
@@ -1375,1049 +889,88 @@ export default class PlantUMLParser extends antlr4.Parser {
 		    } else {
 		    	throw re;
 		    }
-	    } finally {
-	        this.exitRule();
-	    }
-	    return localctx;
-	}
-
-
-
-	aggregationSymbol() {
-	    let localctx = new AggregationSymbolContext(this, this._ctx, this.state);
-	    this.enterRule(localctx, 40, PlantUMLParser.RULE_aggregationSymbol);
-	    var _la = 0;
-	    try {
-	        this.enterOuterAlt(localctx, 1);
-	        this.state = 349;
-	        _la = this._input.LA(1);
-	        if(!(((((_la - 49)) & ~0x1f) === 0 && ((1 << (_la - 49)) & 15) !== 0))) {
-	        this._errHandler.recoverInline(this);
-	        }
-	        else {
-	        	this._errHandler.reportMatch(this);
-	            this.consume();
-	        }
-	    } catch (re) {
-	    	if(re instanceof antlr4.error.RecognitionException) {
-		        localctx.exception = re;
-		        this._errHandler.reportError(this, re);
-		        this._errHandler.recover(this, re);
-		    } else {
-		    	throw re;
-		    }
-	    } finally {
-	        this.exitRule();
-	    }
-	    return localctx;
-	}
-
-
-
-	composition() {
-	    let localctx = new CompositionContext(this, this._ctx, this.state);
-	    this.enterRule(localctx, 42, PlantUMLParser.RULE_composition);
-	    var _la = 0;
-	    try {
-	        this.enterOuterAlt(localctx, 1);
-	        this.state = 351;
-	        this.identifier();
-	        this.state = 353;
-	        this._errHandler.sync(this);
-	        _la = this._input.LA(1);
-	        if(_la===70 || _la===71) {
-	            this.state = 352;
-	            this.stringExpression();
-	        }
-
-	        this.state = 355;
-	        this.compositionSymbol();
-	        this.state = 357;
-	        this._errHandler.sync(this);
-	        _la = this._input.LA(1);
-	        if(_la===70 || _la===71) {
-	            this.state = 356;
-	            this.stringExpression();
-	        }
-
-	        this.state = 359;
-	        this.identifier();
-	        this.state = 361;
-	        this._errHandler.sync(this);
-	        _la = this._input.LA(1);
-	        if(_la===11) {
-	            this.state = 360;
-	            this.lineAnnotation();
-	        }
-
-	    } catch (re) {
-	    	if(re instanceof antlr4.error.RecognitionException) {
-		        localctx.exception = re;
-		        this._errHandler.reportError(this, re);
-		        this._errHandler.recover(this, re);
-		    } else {
-		    	throw re;
-		    }
-	    } finally {
-	        this.exitRule();
-	    }
-	    return localctx;
-	}
-
-
-
-	compositionSymbol() {
-	    let localctx = new CompositionSymbolContext(this, this._ctx, this.state);
-	    this.enterRule(localctx, 44, PlantUMLParser.RULE_compositionSymbol);
-	    var _la = 0;
-	    try {
-	        this.enterOuterAlt(localctx, 1);
-	        this.state = 363;
-	        _la = this._input.LA(1);
-	        if(!(((((_la - 53)) & ~0x1f) === 0 && ((1 << (_la - 53)) & 255) !== 0))) {
-	        this._errHandler.recoverInline(this);
-	        }
-	        else {
-	        	this._errHandler.reportMatch(this);
-	            this.consume();
-	        }
-	    } catch (re) {
-	    	if(re instanceof antlr4.error.RecognitionException) {
-		        localctx.exception = re;
-		        this._errHandler.reportError(this, re);
-		        this._errHandler.recover(this, re);
-		    } else {
-		    	throw re;
-		    }
-	    } finally {
-	        this.exitRule();
-	    }
-	    return localctx;
-	}
-
-
-
-	dependency() {
-	    let localctx = new DependencyContext(this, this._ctx, this.state);
-	    this.enterRule(localctx, 46, PlantUMLParser.RULE_dependency);
-	    var _la = 0;
-	    try {
-	        this.enterOuterAlt(localctx, 1);
-	        this.state = 365;
-	        this.identifier();
-	        this.state = 367;
-	        this._errHandler.sync(this);
-	        _la = this._input.LA(1);
-	        if(_la===70 || _la===71) {
-	            this.state = 366;
-	            this.stringExpression();
-	        }
-
-	        this.state = 369;
-	        this.dependencySymbol();
-	        this.state = 371;
-	        this._errHandler.sync(this);
-	        _la = this._input.LA(1);
-	        if(_la===70 || _la===71) {
-	            this.state = 370;
-	            this.stringExpression();
-	        }
-
-	        this.state = 373;
-	        this.identifier();
-	        this.state = 375;
-	        this._errHandler.sync(this);
-	        _la = this._input.LA(1);
-	        if(_la===11) {
-	            this.state = 374;
-	            this.lineAnnotation();
-	        }
-
-	    } catch (re) {
-	    	if(re instanceof antlr4.error.RecognitionException) {
-		        localctx.exception = re;
-		        this._errHandler.reportError(this, re);
-		        this._errHandler.recover(this, re);
-		    } else {
-		    	throw re;
-		    }
-	    } finally {
-	        this.exitRule();
-	    }
-	    return localctx;
-	}
-
-
-
-	dependencySymbol() {
-	    let localctx = new DependencySymbolContext(this, this._ctx, this.state);
-	    this.enterRule(localctx, 48, PlantUMLParser.RULE_dependencySymbol);
-	    var _la = 0;
-	    try {
-	        this.enterOuterAlt(localctx, 1);
-	        this.state = 377;
-	        _la = this._input.LA(1);
-	        if(!(((((_la - 61)) & ~0x1f) === 0 && ((1 << (_la - 61)) & 63) !== 0))) {
-	        this._errHandler.recoverInline(this);
-	        }
-	        else {
-	        	this._errHandler.reportMatch(this);
-	            this.consume();
-	        }
-	    } catch (re) {
-	    	if(re instanceof antlr4.error.RecognitionException) {
-		        localctx.exception = re;
-		        this._errHandler.reportError(this, re);
-		        this._errHandler.recover(this, re);
-		    } else {
-		    	throw re;
-		    }
-	    } finally {
-	        this.exitRule();
-	    }
-	    return localctx;
-	}
-
-
-
-	lineAnnotation() {
-	    let localctx = new LineAnnotationContext(this, this._ctx, this.state);
-	    this.enterRule(localctx, 50, PlantUMLParser.RULE_lineAnnotation);
-	    var _la = 0;
-	    try {
-	        this.state = 388;
-	        this._errHandler.sync(this);
-	        var la_ = this._interp.adaptivePredict(this._input,51,this._ctx);
-	        switch(la_) {
-	        case 1:
-	            this.enterOuterAlt(localctx, 1);
-	            this.state = 379;
-	            this.match(PlantUMLParser.T__10);
-	            this.state = 381;
-	            this._errHandler.sync(this);
-	            _la = this._input.LA(1);
-	            if(_la===67 || _la===68) {
-	                this.state = 380;
-	                this.direction();
-	            }
-
-	            this.state = 383;
-	            this.identifier();
-	            break;
-
-	        case 2:
-	            this.enterOuterAlt(localctx, 2);
-	            this.state = 384;
-	            this.match(PlantUMLParser.T__10);
-	            this.state = 385;
-	            this.identifier();
-	            this.state = 386;
-	            this.direction();
-	            break;
-
-	        }
-	    } catch (re) {
-	    	if(re instanceof antlr4.error.RecognitionException) {
-		        localctx.exception = re;
-		        this._errHandler.reportError(this, re);
-		        this._errHandler.recover(this, re);
-		    } else {
-		    	throw re;
-		    }
-	    } finally {
-	        this.exitRule();
-	    }
-	    return localctx;
-	}
-
-
-
-	direction() {
-	    let localctx = new DirectionContext(this, this._ctx, this.state);
-	    this.enterRule(localctx, 52, PlantUMLParser.RULE_direction);
-	    var _la = 0;
-	    try {
-	        this.enterOuterAlt(localctx, 1);
-	        this.state = 390;
-	        _la = this._input.LA(1);
-	        if(!(_la===67 || _la===68)) {
-	        this._errHandler.recoverInline(this);
-	        }
-	        else {
-	        	this._errHandler.reportMatch(this);
-	            this.consume();
-	        }
-	    } catch (re) {
-	    	if(re instanceof antlr4.error.RecognitionException) {
-		        localctx.exception = re;
-		        this._errHandler.reportError(this, re);
-		        this._errHandler.recover(this, re);
-		    } else {
-		    	throw re;
-		    }
-	    } finally {
-	        this.exitRule();
-	    }
-	    return localctx;
-	}
-
-
-
-	identifier() {
-	    let localctx = new IdentifierContext(this, this._ctx, this.state);
-	    this.enterRule(localctx, 54, PlantUMLParser.RULE_identifier);
-	    try {
-	        this.enterOuterAlt(localctx, 1);
-	        this.state = 392;
-	        this.match(PlantUMLParser.ID);
-	    } catch (re) {
-	    	if(re instanceof antlr4.error.RecognitionException) {
-		        localctx.exception = re;
-		        this._errHandler.reportError(this, re);
-		        this._errHandler.recover(this, re);
-		    } else {
-		    	throw re;
-		    }
-	    } finally {
-	        this.exitRule();
-	    }
-	    return localctx;
-	}
-
-
-
-	stringExpression() {
-	    let localctx = new StringExpressionContext(this, this._ctx, this.state);
-	    this.enterRule(localctx, 56, PlantUMLParser.RULE_stringExpression);
-	    var _la = 0;
-	    try {
-	        this.enterOuterAlt(localctx, 1);
-	        this.state = 394;
-	        _la = this._input.LA(1);
-	        if(!(_la===70 || _la===71)) {
-	        this._errHandler.recoverInline(this);
-	        }
-	        else {
-	        	this._errHandler.reportMatch(this);
-	            this.consume();
-	        }
-	    } catch (re) {
-	    	if(re instanceof antlr4.error.RecognitionException) {
-		        localctx.exception = re;
-		        this._errHandler.reportError(this, re);
-		        this._errHandler.recover(this, re);
-		    } else {
-		    	throw re;
-		    }
-	    } finally {
-	        this.exitRule();
-	    }
-	    return localctx;
-	}
-
-
-
-	integerLiteral() {
-	    let localctx = new IntegerLiteralContext(this, this._ctx, this.state);
-	    this.enterRule(localctx, 58, PlantUMLParser.RULE_integerLiteral);
-	    try {
-	        this.enterOuterAlt(localctx, 1);
-	        this.state = 396;
-	        this.match(PlantUMLParser.INT);
-	    } catch (re) {
-	    	if(re instanceof antlr4.error.RecognitionException) {
-		        localctx.exception = re;
-		        this._errHandler.reportError(this, re);
-		        this._errHandler.recover(this, re);
-		    } else {
-		    	throw re;
-		    }
-	    } finally {
-	        this.exitRule();
-	    }
-	    return localctx;
-	}
-
-
-}
-
-PlantUMLParser.EOF = antlr4.Token.EOF;
-PlantUMLParser.T__0 = 1;
-PlantUMLParser.T__1 = 2;
-PlantUMLParser.T__2 = 3;
-PlantUMLParser.T__3 = 4;
-PlantUMLParser.T__4 = 5;
-PlantUMLParser.T__5 = 6;
-PlantUMLParser.T__6 = 7;
-PlantUMLParser.T__7 = 8;
-PlantUMLParser.T__8 = 9;
-PlantUMLParser.T__9 = 10;
-PlantUMLParser.T__10 = 11;
-PlantUMLParser.T__11 = 12;
-PlantUMLParser.T__12 = 13;
-PlantUMLParser.T__13 = 14;
-PlantUMLParser.T__14 = 15;
-PlantUMLParser.T__15 = 16;
-PlantUMLParser.T__16 = 17;
-PlantUMLParser.T__17 = 18;
-PlantUMLParser.T__18 = 19;
-PlantUMLParser.T__19 = 20;
-PlantUMLParser.T__20 = 21;
-PlantUMLParser.T__21 = 22;
-PlantUMLParser.T__22 = 23;
-PlantUMLParser.T__23 = 24;
-PlantUMLParser.T__24 = 25;
-PlantUMLParser.T__25 = 26;
-PlantUMLParser.T__26 = 27;
-PlantUMLParser.T__27 = 28;
-PlantUMLParser.T__28 = 29;
-PlantUMLParser.T__29 = 30;
-PlantUMLParser.T__30 = 31;
-PlantUMLParser.T__31 = 32;
-PlantUMLParser.T__32 = 33;
-PlantUMLParser.T__33 = 34;
-PlantUMLParser.T__34 = 35;
-PlantUMLParser.T__35 = 36;
-PlantUMLParser.T__36 = 37;
-PlantUMLParser.T__37 = 38;
-PlantUMLParser.T__38 = 39;
-PlantUMLParser.T__39 = 40;
-PlantUMLParser.T__40 = 41;
-PlantUMLParser.T__41 = 42;
-PlantUMLParser.T__42 = 43;
-PlantUMLParser.T__43 = 44;
-PlantUMLParser.T__44 = 45;
-PlantUMLParser.T__45 = 46;
-PlantUMLParser.T__46 = 47;
-PlantUMLParser.T__47 = 48;
-PlantUMLParser.T__48 = 49;
-PlantUMLParser.T__49 = 50;
-PlantUMLParser.T__50 = 51;
-PlantUMLParser.T__51 = 52;
-PlantUMLParser.T__52 = 53;
-PlantUMLParser.T__53 = 54;
-PlantUMLParser.T__54 = 55;
-PlantUMLParser.T__55 = 56;
-PlantUMLParser.T__56 = 57;
-PlantUMLParser.T__57 = 58;
-PlantUMLParser.T__58 = 59;
-PlantUMLParser.T__59 = 60;
-PlantUMLParser.T__60 = 61;
-PlantUMLParser.T__61 = 62;
-PlantUMLParser.T__62 = 63;
-PlantUMLParser.T__63 = 64;
-PlantUMLParser.T__64 = 65;
-PlantUMLParser.T__65 = 66;
-PlantUMLParser.T__66 = 67;
-PlantUMLParser.T__67 = 68;
-PlantUMLParser.FLOAT_LITERAL = 69;
-PlantUMLParser.STRING1_LITERAL = 70;
-PlantUMLParser.STRING2_LITERAL = 71;
-PlantUMLParser.NULL_LITERAL = 72;
-PlantUMLParser.MULTILINE_COMMENT = 73;
-PlantUMLParser.INTEGRAL = 74;
-PlantUMLParser.SIGMA = 75;
-PlantUMLParser.NEWLINE = 76;
-PlantUMLParser.INT = 77;
-PlantUMLParser.ID = 78;
-PlantUMLParser.WS = 79;
-
-PlantUMLParser.RULE_classDiagram = 0;
-PlantUMLParser.RULE_cdelement = 1;
-PlantUMLParser.RULE_classDefinition = 2;
-PlantUMLParser.RULE_classElement = 3;
-PlantUMLParser.RULE_enumDefinition = 4;
-PlantUMLParser.RULE_attribute = 5;
-PlantUMLParser.RULE_internalAttribute = 6;
-PlantUMLParser.RULE_method = 7;
-PlantUMLParser.RULE_internalMethod = 8;
-PlantUMLParser.RULE_parameters = 9;
-PlantUMLParser.RULE_stereotype = 10;
-PlantUMLParser.RULE_visibility = 11;
-PlantUMLParser.RULE_modifier = 12;
-PlantUMLParser.RULE_type = 13;
-PlantUMLParser.RULE_inheritance = 14;
-PlantUMLParser.RULE_leftAncestorSymbol = 15;
-PlantUMLParser.RULE_rightAncestorSymbol = 16;
-PlantUMLParser.RULE_association = 17;
-PlantUMLParser.RULE_associationSymbol = 18;
-PlantUMLParser.RULE_aggregation = 19;
-PlantUMLParser.RULE_aggregationSymbol = 20;
-PlantUMLParser.RULE_composition = 21;
-PlantUMLParser.RULE_compositionSymbol = 22;
-PlantUMLParser.RULE_dependency = 23;
-PlantUMLParser.RULE_dependencySymbol = 24;
-PlantUMLParser.RULE_lineAnnotation = 25;
-PlantUMLParser.RULE_direction = 26;
-PlantUMLParser.RULE_identifier = 27;
-PlantUMLParser.RULE_stringExpression = 28;
-PlantUMLParser.RULE_integerLiteral = 29;
-
-class ClassDiagramContext extends antlr4.ParserRuleContext {
-
-    constructor(parser, parent, invokingState) {
-        if(parent===undefined) {
-            parent = null;
-        }
-        if(invokingState===undefined || invokingState===null) {
-            invokingState = -1;
-        }
-        super(parent, invokingState);
-        this.parser = parser;
-        this.ruleIndex = PlantUMLParser.RULE_classDiagram;
-    }
-
-	EOF() {
-	    return this.getToken(PlantUMLParser.EOF, 0);
-	};
-
-	cdelement = function(i) {
-	    if(i===undefined) {
-	        i = null;
-	    }
-	    if(i===null) {
-	        return this.getTypedRuleContexts(CdelementContext);
-	    } else {
-	        return this.getTypedRuleContext(CdelementContext,i);
-	    }
-	};
-
-	enterRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.enterClassDiagram(this);
-		}
-	}
-
-	exitRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.exitClassDiagram(this);
-		}
-	}
-
-	accept(visitor) {
-	    if ( visitor instanceof PlantUMLVisitor ) {
-	        return visitor.visitClassDiagram(this);
-	    } else {
-	        return visitor.visitChildren(this);
-	    }
-	}
-
-
-}
-
-
-
-class CdelementContext extends antlr4.ParserRuleContext {
-
-    constructor(parser, parent, invokingState) {
-        if(parent===undefined) {
-            parent = null;
-        }
-        if(invokingState===undefined || invokingState===null) {
-            invokingState = -1;
-        }
-        super(parent, invokingState);
-        this.parser = parser;
-        this.ruleIndex = PlantUMLParser.RULE_cdelement;
-    }
-
-	identifier() {
-	    return this.getTypedRuleContext(IdentifierContext,0);
-	};
-
-	stereotype() {
-	    return this.getTypedRuleContext(StereotypeContext,0);
-	};
-
-	classDefinition() {
-	    return this.getTypedRuleContext(ClassDefinitionContext,0);
-	};
-
-	enumDefinition() {
-	    return this.getTypedRuleContext(EnumDefinitionContext,0);
-	};
-
-	inheritance() {
-	    return this.getTypedRuleContext(InheritanceContext,0);
-	};
-
-	association() {
-	    return this.getTypedRuleContext(AssociationContext,0);
-	};
-
-	aggregation() {
-	    return this.getTypedRuleContext(AggregationContext,0);
-	};
-
-	attribute() {
-	    return this.getTypedRuleContext(AttributeContext,0);
-	};
-
-	composition() {
-	    return this.getTypedRuleContext(CompositionContext,0);
-	};
-
-	dependency() {
-	    return this.getTypedRuleContext(DependencyContext,0);
-	};
-
-	method() {
-	    return this.getTypedRuleContext(MethodContext,0);
-	};
-
-	enterRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.enterCdelement(this);
-		}
-	}
-
-	exitRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.exitCdelement(this);
-		}
-	}
-
-	accept(visitor) {
-	    if ( visitor instanceof PlantUMLVisitor ) {
-	        return visitor.visitCdelement(this);
-	    } else {
-	        return visitor.visitChildren(this);
-	    }
-	}
-
-
-}
-
-
-
-class ClassDefinitionContext extends antlr4.ParserRuleContext {
-
-    constructor(parser, parent, invokingState) {
-        if(parent===undefined) {
-            parent = null;
-        }
-        if(invokingState===undefined || invokingState===null) {
-            invokingState = -1;
-        }
-        super(parent, invokingState);
-        this.parser = parser;
-        this.ruleIndex = PlantUMLParser.RULE_classDefinition;
-    }
-
-	classElement = function(i) {
-	    if(i===undefined) {
-	        i = null;
-	    }
-	    if(i===null) {
-	        return this.getTypedRuleContexts(ClassElementContext);
-	    } else {
-	        return this.getTypedRuleContext(ClassElementContext,i);
-	    }
-	};
-
-	enterRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.enterClassDefinition(this);
-		}
-	}
-
-	exitRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.exitClassDefinition(this);
-		}
-	}
-
-	accept(visitor) {
-	    if ( visitor instanceof PlantUMLVisitor ) {
-	        return visitor.visitClassDefinition(this);
-	    } else {
-	        return visitor.visitChildren(this);
-	    }
-	}
-
-
-}
-
-
-
-class ClassElementContext extends antlr4.ParserRuleContext {
-
-    constructor(parser, parent, invokingState) {
-        if(parent===undefined) {
-            parent = null;
-        }
-        if(invokingState===undefined || invokingState===null) {
-            invokingState = -1;
-        }
-        super(parent, invokingState);
-        this.parser = parser;
-        this.ruleIndex = PlantUMLParser.RULE_classElement;
-    }
-
-	internalMethod() {
-	    return this.getTypedRuleContext(InternalMethodContext,0);
-	};
-
-	internalAttribute() {
-	    return this.getTypedRuleContext(InternalAttributeContext,0);
-	};
-
-	enterRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.enterClassElement(this);
-		}
-	}
-
-	exitRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.exitClassElement(this);
-		}
-	}
-
-	accept(visitor) {
-	    if ( visitor instanceof PlantUMLVisitor ) {
-	        return visitor.visitClassElement(this);
-	    } else {
-	        return visitor.visitChildren(this);
-	    }
-	}
-
-
-}
-
-
-
-class EnumDefinitionContext extends antlr4.ParserRuleContext {
-
-    constructor(parser, parent, invokingState) {
-        if(parent===undefined) {
-            parent = null;
-        }
-        if(invokingState===undefined || invokingState===null) {
-            invokingState = -1;
-        }
-        super(parent, invokingState);
-        this.parser = parser;
-        this.ruleIndex = PlantUMLParser.RULE_enumDefinition;
-    }
-
-	identifier = function(i) {
-	    if(i===undefined) {
-	        i = null;
-	    }
-	    if(i===null) {
-	        return this.getTypedRuleContexts(IdentifierContext);
-	    } else {
-	        return this.getTypedRuleContext(IdentifierContext,i);
-	    }
-	};
-
-	enterRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.enterEnumDefinition(this);
-		}
-	}
-
-	exitRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.exitEnumDefinition(this);
-		}
-	}
-
-	accept(visitor) {
-	    if ( visitor instanceof PlantUMLVisitor ) {
-	        return visitor.visitEnumDefinition(this);
-	    } else {
-	        return visitor.visitChildren(this);
-	    }
-	}
-
-
-}
-
-
-
-class AttributeContext extends antlr4.ParserRuleContext {
-
-    constructor(parser, parent, invokingState) {
-        if(parent===undefined) {
-            parent = null;
-        }
-        if(invokingState===undefined || invokingState===null) {
-            invokingState = -1;
-        }
-        super(parent, invokingState);
-        this.parser = parser;
-        this.ruleIndex = PlantUMLParser.RULE_attribute;
-    }
-
-	identifier = function(i) {
-	    if(i===undefined) {
-	        i = null;
-	    }
-	    if(i===null) {
-	        return this.getTypedRuleContexts(IdentifierContext);
-	    } else {
-	        return this.getTypedRuleContext(IdentifierContext,i);
-	    }
-	};
-
-	type() {
-	    return this.getTypedRuleContext(TypeContext,0);
-	};
-
-	visibility() {
-	    return this.getTypedRuleContext(VisibilityContext,0);
-	};
-
-	enterRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.enterAttribute(this);
-		}
-	}
-
-	exitRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.exitAttribute(this);
-		}
-	}
-
-	accept(visitor) {
-	    if ( visitor instanceof PlantUMLVisitor ) {
-	        return visitor.visitAttribute(this);
-	    } else {
-	        return visitor.visitChildren(this);
-	    }
-	}
-
-
-}
-
-
-
-class InternalAttributeContext extends antlr4.ParserRuleContext {
-
-    constructor(parser, parent, invokingState) {
-        if(parent===undefined) {
-            parent = null;
-        }
-        if(invokingState===undefined || invokingState===null) {
-            invokingState = -1;
-        }
-        super(parent, invokingState);
-        this.parser = parser;
-        this.ruleIndex = PlantUMLParser.RULE_internalAttribute;
-    }
-
-	identifier() {
-	    return this.getTypedRuleContext(IdentifierContext,0);
-	};
-
-	modifier() {
-	    return this.getTypedRuleContext(ModifierContext,0);
-	};
-
-	type() {
-	    return this.getTypedRuleContext(TypeContext,0);
-	};
-
-	visibility() {
-	    return this.getTypedRuleContext(VisibilityContext,0);
-	};
-
-	enterRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.enterInternalAttribute(this);
-		}
-	}
-
-	exitRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.exitInternalAttribute(this);
-		}
-	}
-
-	accept(visitor) {
-	    if ( visitor instanceof PlantUMLVisitor ) {
-	        return visitor.visitInternalAttribute(this);
-	    } else {
-	        return visitor.visitChildren(this);
-	    }
-	}
-
-
-}
-
-
-
-class MethodContext extends antlr4.ParserRuleContext {
-
-    constructor(parser, parent, invokingState) {
-        if(parent===undefined) {
-            parent = null;
-        }
-        if(invokingState===undefined || invokingState===null) {
-            invokingState = -1;
-        }
-        super(parent, invokingState);
-        this.parser = parser;
-        this.ruleIndex = PlantUMLParser.RULE_method;
-    }
-
-	identifier = function(i) {
-	    if(i===undefined) {
-	        i = null;
-	    }
-	    if(i===null) {
-	        return this.getTypedRuleContexts(IdentifierContext);
-	    } else {
-	        return this.getTypedRuleContext(IdentifierContext,i);
-	    }
-	};
-
-	visibility() {
-	    return this.getTypedRuleContext(VisibilityContext,0);
-	};
-
-	parameters() {
-	    return this.getTypedRuleContext(ParametersContext,0);
-	};
-
-	enterRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.enterMethod(this);
-		}
-	}
-
-	exitRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.exitMethod(this);
-		}
-	}
-
-	accept(visitor) {
-	    if ( visitor instanceof PlantUMLVisitor ) {
-	        return visitor.visitMethod(this);
-	    } else {
-	        return visitor.visitChildren(this);
-	    }
-	}
-
-
-}
-
-
-
-class InternalMethodContext extends antlr4.ParserRuleContext {
-
-    constructor(parser, parent, invokingState) {
-        if(parent===undefined) {
-            parent = null;
-        }
-        if(invokingState===undefined || invokingState===null) {
-            invokingState = -1;
-        }
-        super(parent, invokingState);
-        this.parser = parser;
-        this.ruleIndex = PlantUMLParser.RULE_internalMethod;
-    }
-
-	identifier() {
-	    return this.getTypedRuleContext(IdentifierContext,0);
-	};
-
-	modifier() {
-	    return this.getTypedRuleContext(ModifierContext,0);
-	};
-
-	type() {
-	    return this.getTypedRuleContext(TypeContext,0);
-	};
-
-	visibility() {
-	    return this.getTypedRuleContext(VisibilityContext,0);
-	};
-
-	parameters() {
-	    return this.getTypedRuleContext(ParametersContext,0);
-	};
-
-	enterRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.enterInternalMethod(this);
-		}
-	}
-
-	exitRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.exitInternalMethod(this);
-		}
-	}
-
-	accept(visitor) {
-	    if ( visitor instanceof PlantUMLVisitor ) {
-	        return visitor.visitInternalMethod(this);
-	    } else {
-	        return visitor.visitChildren(this);
-	    }
-	}
-
-
-}
-
-
-
-class ParametersContext extends antlr4.ParserRuleContext {
-
-    constructor(parser, parent, invokingState) {
-        if(parent===undefined) {
-            parent = null;
-        }
-        if(invokingState===undefined || invokingState===null) {
-            invokingState = -1;
-        }
-        super(parent, invokingState);
-        this.parser = parser;
-        this.ruleIndex = PlantUMLParser.RULE_parameters;
-    }
-
-	identifier = function(i) {
-	    if(i===undefined) {
-	        i = null;
-	    }
-	    if(i===null) {
-	        return this.getTypedRuleContexts(IdentifierContext);
-	    } else {
-	        return this.getTypedRuleContext(IdentifierContext,i);
-	    }
-	};
-
-	enterRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.enterParameters(this);
-		}
-	}
-
-	exitRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.exitParameters(this);
-		}
-	}
-
-	accept(visitor) {
-	    if ( visitor instanceof PlantUMLVisitor ) {
-	        return visitor.visitParameters(this);
-	    } else {
-	        return visitor.visitChildren(this);
+	    } finally {
+	        this.exitRule();
 	    }
+	    return localctx;
 	}
 
 
 }
 
-
-
-class StereotypeContext extends antlr4.ParserRuleContext {
+PlantUMLParser.EOF = antlr4.Token.EOF;
+PlantUMLParser.ENUM = 1;
+PlantUMLParser.CLASS = 2;
+PlantUMLParser.STARTUML = 3;
+PlantUMLParser.ENDUML = 4;
+PlantUMLParser.INTERFACE = 5;
+PlantUMLParser.ABSTRACT = 6;
+PlantUMLParser.MANY = 7;
+PlantUMLParser.ONE = 8;
+PlantUMLParser.EXTENDS = 9;
+PlantUMLParser.STATIC = 10;
+PlantUMLParser.LIST = 11;
+PlantUMLParser.GT = 12;
+PlantUMLParser.LT = 13;
+PlantUMLParser.PLUS = 14;
+PlantUMLParser.DASH = 15;
+PlantUMLParser.DOT = 16;
+PlantUMLParser.DOUBLE_DOT = 17;
+PlantUMLParser.STAR = 18;
+PlantUMLParser.O = 19;
+PlantUMLParser.CARET = 20;
+PlantUMLParser.PIPE_GT = 21;
+PlantUMLParser.LT_PIPE = 22;
+PlantUMLParser.COMMA = 23;
+PlantUMLParser.LPAREN = 24;
+PlantUMLParser.RPAREN = 25;
+PlantUMLParser.LBRACK = 26;
+PlantUMLParser.RBRACK = 27;
+PlantUMLParser.AMP = 28;
+PlantUMLParser.EQUALS = 29;
+PlantUMLParser.NULL_LITERAL = 30;
+PlantUMLParser.CLASS_BODY_START = 31;
+PlantUMLParser.STEREOTYPE_TEXT = 32;
+PlantUMLParser.ASSOC_DETAIL = 33;
+PlantUMLParser.NOTE = 34;
+PlantUMLParser.DIAMOND = 35;
+PlantUMLParser.AFTER_COLON_TEXT = 36;
+PlantUMLParser.NEWLINE = 37;
+PlantUMLParser.WS = 38;
+PlantUMLParser.COMMENT = 39;
+PlantUMLParser.FLOAT_LITERAL = 40;
+PlantUMLParser.NUMBER = 41;
+PlantUMLParser.IDENT = 42;
+PlantUMLParser.BODY_INLINE_BRACES = 43;
+PlantUMLParser.BODY_OPEN = 44;
+PlantUMLParser.BODY_CLOSE = 45;
+PlantUMLParser.BODY_CONTENT = 46;
+PlantUMLParser.BODY_NL = 47;
+PlantUMLParser.ENUM_FREE_TEXT_CLOSE = 48;
+PlantUMLParser.ENUM_FREE_TEXT_CONTENT = 49;
+PlantUMLParser.ASSOC_DETAIL_TEXT_CLOSE = 50;
+PlantUMLParser.ASSOC_DETAIL_TEXT_CONTENT = 51;
+
+PlantUMLParser.RULE_entry_ = 0;
+PlantUMLParser.RULE_uml = 1;
+PlantUMLParser.RULE_class_dclr = 2;
+PlantUMLParser.RULE_class_body = 3;
+PlantUMLParser.RULE_body_content = 4;
+PlantUMLParser.RULE_nested_body = 5;
+PlantUMLParser.RULE_class_type = 6;
+PlantUMLParser.RULE_stereotype = 7;
+PlantUMLParser.RULE_extension_dclr = 8;
+PlantUMLParser.RULE_ident = 9;
+PlantUMLParser.RULE_enum_dclr = 10;
+PlantUMLParser.RULE_association_dclr = 11;
+PlantUMLParser.RULE_relation = 12;
+PlantUMLParser.RULE_association_left = 13;
+PlantUMLParser.RULE_association_right = 14;
+PlantUMLParser.RULE_association_detail = 15;
+PlantUMLParser.RULE_association_name = 16;
+PlantUMLParser.RULE_associative_class_dclr = 17;
+
+class Entry_Context extends antlr4.ParserRuleContext {
 
     constructor(parser, parent, invokingState) {
         if(parent===undefined) {
@@ -2428,28 +981,32 @@ class StereotypeContext extends antlr4.ParserRuleContext {
         }
         super(parent, invokingState);
         this.parser = parser;
-        this.ruleIndex = PlantUMLParser.RULE_stereotype;
+        this.ruleIndex = PlantUMLParser.RULE_entry_;
     }
 
-	identifier() {
-	    return this.getTypedRuleContext(IdentifierContext,0);
+	uml() {
+	    return this.getTypedRuleContext(UmlContext,0);
+	};
+
+	EOF() {
+	    return this.getToken(PlantUMLParser.EOF, 0);
 	};
 
 	enterRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.enterStereotype(this);
+	    if(listener instanceof PlantUMLParserListener ) {
+	        listener.enterEntry_(this);
 		}
 	}
 
 	exitRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.exitStereotype(this);
+	    if(listener instanceof PlantUMLParserListener ) {
+	        listener.exitEntry_(this);
 		}
 	}
 
 	accept(visitor) {
-	    if ( visitor instanceof PlantUMLVisitor ) {
-	        return visitor.visitStereotype(this);
+	    if ( visitor instanceof PlantUMLParserVisitor ) {
+	        return visitor.visitEntry_(this);
 	    } else {
 	        return visitor.visitChildren(this);
 	    }
@@ -2460,7 +1017,7 @@ class StereotypeContext extends antlr4.ParserRuleContext {
 
 
 
-class VisibilityContext extends antlr4.ParserRuleContext {
+class UmlContext extends antlr4.ParserRuleContext {
 
     constructor(parser, parent, invokingState) {
         if(parent===undefined) {
@@ -2471,65 +1028,104 @@ class VisibilityContext extends antlr4.ParserRuleContext {
         }
         super(parent, invokingState);
         this.parser = parser;
-        this.ruleIndex = PlantUMLParser.RULE_visibility;
+        this.ruleIndex = PlantUMLParser.RULE_uml;
     }
 
+	STARTUML() {
+	    return this.getToken(PlantUMLParser.STARTUML, 0);
+	};
+
+	ENDUML() {
+	    return this.getToken(PlantUMLParser.ENDUML, 0);
+	};
 
-	enterRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.enterVisibility(this);
-		}
-	}
+	IDENT() {
+	    return this.getToken(PlantUMLParser.IDENT, 0);
+	};
 
-	exitRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.exitVisibility(this);
+	NEWLINE = function(i) {
+		if(i===undefined) {
+			i = null;
 		}
-	}
-
-	accept(visitor) {
-	    if ( visitor instanceof PlantUMLVisitor ) {
-	        return visitor.visitVisibility(this);
+	    if(i===null) {
+	        return this.getTokens(PlantUMLParser.NEWLINE);
 	    } else {
-	        return visitor.visitChildren(this);
+	        return this.getToken(PlantUMLParser.NEWLINE, i);
 	    }
-	}
+	};
 
 
-}
+	class_dclr = function(i) {
+	    if(i===undefined) {
+	        i = null;
+	    }
+	    if(i===null) {
+	        return this.getTypedRuleContexts(Class_dclrContext);
+	    } else {
+	        return this.getTypedRuleContext(Class_dclrContext,i);
+	    }
+	};
 
+	enum_dclr = function(i) {
+	    if(i===undefined) {
+	        i = null;
+	    }
+	    if(i===null) {
+	        return this.getTypedRuleContexts(Enum_dclrContext);
+	    } else {
+	        return this.getTypedRuleContext(Enum_dclrContext,i);
+	    }
+	};
 
+	association_dclr = function(i) {
+	    if(i===undefined) {
+	        i = null;
+	    }
+	    if(i===null) {
+	        return this.getTypedRuleContexts(Association_dclrContext);
+	    } else {
+	        return this.getTypedRuleContext(Association_dclrContext,i);
+	    }
+	};
 
-class ModifierContext extends antlr4.ParserRuleContext {
+	associative_class_dclr = function(i) {
+	    if(i===undefined) {
+	        i = null;
+	    }
+	    if(i===null) {
+	        return this.getTypedRuleContexts(Associative_class_dclrContext);
+	    } else {
+	        return this.getTypedRuleContext(Associative_class_dclrContext,i);
+	    }
+	};
 
-    constructor(parser, parent, invokingState) {
-        if(parent===undefined) {
-            parent = null;
-        }
-        if(invokingState===undefined || invokingState===null) {
-            invokingState = -1;
-        }
-        super(parent, invokingState);
-        this.parser = parser;
-        this.ruleIndex = PlantUMLParser.RULE_modifier;
-    }
+	COMMENT = function(i) {
+		if(i===undefined) {
+			i = null;
+		}
+	    if(i===null) {
+	        return this.getTokens(PlantUMLParser.COMMENT);
+	    } else {
+	        return this.getToken(PlantUMLParser.COMMENT, i);
+	    }
+	};
 
 
 	enterRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.enterModifier(this);
+	    if(listener instanceof PlantUMLParserListener ) {
+	        listener.enterUml(this);
 		}
 	}
 
 	exitRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.exitModifier(this);
+	    if(listener instanceof PlantUMLParserListener ) {
+	        listener.exitUml(this);
 		}
 	}
 
 	accept(visitor) {
-	    if ( visitor instanceof PlantUMLVisitor ) {
-	        return visitor.visitModifier(this);
+	    if ( visitor instanceof PlantUMLParserVisitor ) {
+	        return visitor.visitUml(this);
 	    } else {
 	        return visitor.visitChildren(this);
 	    }
@@ -2540,7 +1136,7 @@ class ModifierContext extends antlr4.ParserRuleContext {
 
 
 
-class TypeContext extends antlr4.ParserRuleContext {
+class Class_dclrContext extends antlr4.ParserRuleContext {
 
     constructor(parser, parent, invokingState) {
         if(parent===undefined) {
@@ -2551,43 +1147,52 @@ class TypeContext extends antlr4.ParserRuleContext {
         }
         super(parent, invokingState);
         this.parser = parser;
-        this.ruleIndex = PlantUMLParser.RULE_type;
+        this.ruleIndex = PlantUMLParser.RULE_class_dclr;
     }
 
-	type = function(i) {
-	    if(i===undefined) {
-	        i = null;
-	    }
-	    if(i===null) {
-	        return this.getTypedRuleContexts(TypeContext);
-	    } else {
-	        return this.getTypedRuleContext(TypeContext,i);
-	    }
+	CLASS() {
+	    return this.getToken(PlantUMLParser.CLASS, 0);
 	};
 
-	identifier() {
-	    return this.getTypedRuleContext(IdentifierContext,0);
+	ident() {
+	    return this.getTypedRuleContext(IdentContext,0);
 	};
 
-	integerLiteral() {
-	    return this.getTypedRuleContext(IntegerLiteralContext,0);
+	class_type() {
+	    return this.getTypedRuleContext(Class_typeContext,0);
+	};
+
+	stereotype() {
+	    return this.getTypedRuleContext(StereotypeContext,0);
+	};
+
+	extension_dclr() {
+	    return this.getTypedRuleContext(Extension_dclrContext,0);
+	};
+
+	class_body() {
+	    return this.getTypedRuleContext(Class_bodyContext,0);
+	};
+
+	NEWLINE() {
+	    return this.getToken(PlantUMLParser.NEWLINE, 0);
 	};
 
 	enterRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.enterType(this);
+	    if(listener instanceof PlantUMLParserListener ) {
+	        listener.enterClass_dclr(this);
 		}
 	}
 
 	exitRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.exitType(this);
+	    if(listener instanceof PlantUMLParserListener ) {
+	        listener.exitClass_dclr(this);
 		}
 	}
 
 	accept(visitor) {
-	    if ( visitor instanceof PlantUMLVisitor ) {
-	        return visitor.visitType(this);
+	    if ( visitor instanceof PlantUMLParserVisitor ) {
+	        return visitor.visitClass_dclr(this);
 	    } else {
 	        return visitor.visitChildren(this);
 	    }
@@ -2598,7 +1203,7 @@ class TypeContext extends antlr4.ParserRuleContext {
 
 
 
-class InheritanceContext extends antlr4.ParserRuleContext {
+class Class_bodyContext extends antlr4.ParserRuleContext {
 
     constructor(parser, parent, invokingState) {
         if(parent===undefined) {
@@ -2609,43 +1214,43 @@ class InheritanceContext extends antlr4.ParserRuleContext {
         }
         super(parent, invokingState);
         this.parser = parser;
-        this.ruleIndex = PlantUMLParser.RULE_inheritance;
+        this.ruleIndex = PlantUMLParser.RULE_class_body;
     }
 
-	identifier = function(i) {
+	CLASS_BODY_START() {
+	    return this.getToken(PlantUMLParser.CLASS_BODY_START, 0);
+	};
+
+	BODY_CLOSE() {
+	    return this.getToken(PlantUMLParser.BODY_CLOSE, 0);
+	};
+
+	body_content = function(i) {
 	    if(i===undefined) {
 	        i = null;
 	    }
 	    if(i===null) {
-	        return this.getTypedRuleContexts(IdentifierContext);
+	        return this.getTypedRuleContexts(Body_contentContext);
 	    } else {
-	        return this.getTypedRuleContext(IdentifierContext,i);
+	        return this.getTypedRuleContext(Body_contentContext,i);
 	    }
 	};
 
-	leftAncestorSymbol() {
-	    return this.getTypedRuleContext(LeftAncestorSymbolContext,0);
-	};
-
-	rightAncestorSymbol() {
-	    return this.getTypedRuleContext(RightAncestorSymbolContext,0);
-	};
-
 	enterRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.enterInheritance(this);
+	    if(listener instanceof PlantUMLParserListener ) {
+	        listener.enterClass_body(this);
 		}
 	}
 
 	exitRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.exitInheritance(this);
+	    if(listener instanceof PlantUMLParserListener ) {
+	        listener.exitClass_body(this);
 		}
 	}
 
 	accept(visitor) {
-	    if ( visitor instanceof PlantUMLVisitor ) {
-	        return visitor.visitInheritance(this);
+	    if ( visitor instanceof PlantUMLParserVisitor ) {
+	        return visitor.visitClass_body(this);
 	    } else {
 	        return visitor.visitChildren(this);
 	    }
@@ -2656,7 +1261,7 @@ class InheritanceContext extends antlr4.ParserRuleContext {
 
 
 
-class LeftAncestorSymbolContext extends antlr4.ParserRuleContext {
+class Body_contentContext extends antlr4.ParserRuleContext {
 
     constructor(parser, parent, invokingState) {
         if(parent===undefined) {
@@ -2667,25 +1272,44 @@ class LeftAncestorSymbolContext extends antlr4.ParserRuleContext {
         }
         super(parent, invokingState);
         this.parser = parser;
-        this.ruleIndex = PlantUMLParser.RULE_leftAncestorSymbol;
+        this.ruleIndex = PlantUMLParser.RULE_body_content;
     }
 
+	BODY_INLINE_BRACES() {
+	    return this.getToken(PlantUMLParser.BODY_INLINE_BRACES, 0);
+	};
+
+	BODY_OPEN() {
+	    return this.getToken(PlantUMLParser.BODY_OPEN, 0);
+	};
+
+	BODY_CONTENT() {
+	    return this.getToken(PlantUMLParser.BODY_CONTENT, 0);
+	};
+
+	BODY_NL() {
+	    return this.getToken(PlantUMLParser.BODY_NL, 0);
+	};
+
+	nested_body() {
+	    return this.getTypedRuleContext(Nested_bodyContext,0);
+	};
 
 	enterRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.enterLeftAncestorSymbol(this);
+	    if(listener instanceof PlantUMLParserListener ) {
+	        listener.enterBody_content(this);
 		}
 	}
 
 	exitRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.exitLeftAncestorSymbol(this);
+	    if(listener instanceof PlantUMLParserListener ) {
+	        listener.exitBody_content(this);
 		}
 	}
 
 	accept(visitor) {
-	    if ( visitor instanceof PlantUMLVisitor ) {
-	        return visitor.visitLeftAncestorSymbol(this);
+	    if ( visitor instanceof PlantUMLParserVisitor ) {
+	        return visitor.visitBody_content(this);
 	    } else {
 	        return visitor.visitChildren(this);
 	    }
@@ -2696,7 +1320,7 @@ class LeftAncestorSymbolContext extends antlr4.ParserRuleContext {
 
 
 
-class RightAncestorSymbolContext extends antlr4.ParserRuleContext {
+class Nested_bodyContext extends antlr4.ParserRuleContext {
 
     constructor(parser, parent, invokingState) {
         if(parent===undefined) {
@@ -2707,25 +1331,43 @@ class RightAncestorSymbolContext extends antlr4.ParserRuleContext {
         }
         super(parent, invokingState);
         this.parser = parser;
-        this.ruleIndex = PlantUMLParser.RULE_rightAncestorSymbol;
+        this.ruleIndex = PlantUMLParser.RULE_nested_body;
     }
 
+	BODY_OPEN() {
+	    return this.getToken(PlantUMLParser.BODY_OPEN, 0);
+	};
+
+	BODY_CLOSE() {
+	    return this.getToken(PlantUMLParser.BODY_CLOSE, 0);
+	};
+
+	body_content = function(i) {
+	    if(i===undefined) {
+	        i = null;
+	    }
+	    if(i===null) {
+	        return this.getTypedRuleContexts(Body_contentContext);
+	    } else {
+	        return this.getTypedRuleContext(Body_contentContext,i);
+	    }
+	};
 
 	enterRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.enterRightAncestorSymbol(this);
+	    if(listener instanceof PlantUMLParserListener ) {
+	        listener.enterNested_body(this);
 		}
 	}
 
 	exitRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.exitRightAncestorSymbol(this);
+	    if(listener instanceof PlantUMLParserListener ) {
+	        listener.exitNested_body(this);
 		}
 	}
 
 	accept(visitor) {
-	    if ( visitor instanceof PlantUMLVisitor ) {
-	        return visitor.visitRightAncestorSymbol(this);
+	    if ( visitor instanceof PlantUMLParserVisitor ) {
+	        return visitor.visitNested_body(this);
 	    } else {
 	        return visitor.visitChildren(this);
 	    }
@@ -2736,7 +1378,7 @@ class RightAncestorSymbolContext extends antlr4.ParserRuleContext {
 
 
 
-class AssociationContext extends antlr4.ParserRuleContext {
+class Class_typeContext extends antlr4.ParserRuleContext {
 
     constructor(parser, parent, invokingState) {
         if(parent===undefined) {
@@ -2747,54 +1389,32 @@ class AssociationContext extends antlr4.ParserRuleContext {
         }
         super(parent, invokingState);
         this.parser = parser;
-        this.ruleIndex = PlantUMLParser.RULE_association;
+        this.ruleIndex = PlantUMLParser.RULE_class_type;
     }
 
-	identifier = function(i) {
-	    if(i===undefined) {
-	        i = null;
-	    }
-	    if(i===null) {
-	        return this.getTypedRuleContexts(IdentifierContext);
-	    } else {
-	        return this.getTypedRuleContext(IdentifierContext,i);
-	    }
-	};
-
-	associationSymbol() {
-	    return this.getTypedRuleContext(AssociationSymbolContext,0);
-	};
-
-	stringExpression = function(i) {
-	    if(i===undefined) {
-	        i = null;
-	    }
-	    if(i===null) {
-	        return this.getTypedRuleContexts(StringExpressionContext);
-	    } else {
-	        return this.getTypedRuleContext(StringExpressionContext,i);
-	    }
+	ABSTRACT() {
+	    return this.getToken(PlantUMLParser.ABSTRACT, 0);
 	};
 
-	lineAnnotation() {
-	    return this.getTypedRuleContext(LineAnnotationContext,0);
+	INTERFACE() {
+	    return this.getToken(PlantUMLParser.INTERFACE, 0);
 	};
 
 	enterRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.enterAssociation(this);
+	    if(listener instanceof PlantUMLParserListener ) {
+	        listener.enterClass_type(this);
 		}
 	}
 
 	exitRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.exitAssociation(this);
+	    if(listener instanceof PlantUMLParserListener ) {
+	        listener.exitClass_type(this);
 		}
 	}
 
 	accept(visitor) {
-	    if ( visitor instanceof PlantUMLVisitor ) {
-	        return visitor.visitAssociation(this);
+	    if ( visitor instanceof PlantUMLParserVisitor ) {
+	        return visitor.visitClass_type(this);
 	    } else {
 	        return visitor.visitChildren(this);
 	    }
@@ -2805,7 +1425,7 @@ class AssociationContext extends antlr4.ParserRuleContext {
 
 
 
-class AssociationSymbolContext extends antlr4.ParserRuleContext {
+class StereotypeContext extends antlr4.ParserRuleContext {
 
     constructor(parser, parent, invokingState) {
         if(parent===undefined) {
@@ -2816,25 +1436,28 @@ class AssociationSymbolContext extends antlr4.ParserRuleContext {
         }
         super(parent, invokingState);
         this.parser = parser;
-        this.ruleIndex = PlantUMLParser.RULE_associationSymbol;
+        this.ruleIndex = PlantUMLParser.RULE_stereotype;
     }
 
+	STEREOTYPE_TEXT() {
+	    return this.getToken(PlantUMLParser.STEREOTYPE_TEXT, 0);
+	};
 
 	enterRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.enterAssociationSymbol(this);
+	    if(listener instanceof PlantUMLParserListener ) {
+	        listener.enterStereotype(this);
 		}
 	}
 
 	exitRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.exitAssociationSymbol(this);
+	    if(listener instanceof PlantUMLParserListener ) {
+	        listener.exitStereotype(this);
 		}
 	}
 
 	accept(visitor) {
-	    if ( visitor instanceof PlantUMLVisitor ) {
-	        return visitor.visitAssociationSymbol(this);
+	    if ( visitor instanceof PlantUMLParserVisitor ) {
+	        return visitor.visitStereotype(this);
 	    } else {
 	        return visitor.visitChildren(this);
 	    }
@@ -2845,7 +1468,7 @@ class AssociationSymbolContext extends antlr4.ParserRuleContext {
 
 
 
-class AggregationContext extends antlr4.ParserRuleContext {
+class Extension_dclrContext extends antlr4.ParserRuleContext {
 
     constructor(parser, parent, invokingState) {
         if(parent===undefined) {
@@ -2856,54 +1479,32 @@ class AggregationContext extends antlr4.ParserRuleContext {
         }
         super(parent, invokingState);
         this.parser = parser;
-        this.ruleIndex = PlantUMLParser.RULE_aggregation;
+        this.ruleIndex = PlantUMLParser.RULE_extension_dclr;
     }
 
-	identifier = function(i) {
-	    if(i===undefined) {
-	        i = null;
-	    }
-	    if(i===null) {
-	        return this.getTypedRuleContexts(IdentifierContext);
-	    } else {
-	        return this.getTypedRuleContext(IdentifierContext,i);
-	    }
-	};
-
-	aggregationSymbol() {
-	    return this.getTypedRuleContext(AggregationSymbolContext,0);
-	};
-
-	stringExpression = function(i) {
-	    if(i===undefined) {
-	        i = null;
-	    }
-	    if(i===null) {
-	        return this.getTypedRuleContexts(StringExpressionContext);
-	    } else {
-	        return this.getTypedRuleContext(StringExpressionContext,i);
-	    }
+	EXTENDS() {
+	    return this.getToken(PlantUMLParser.EXTENDS, 0);
 	};
 
-	lineAnnotation() {
-	    return this.getTypedRuleContext(LineAnnotationContext,0);
+	ident() {
+	    return this.getTypedRuleContext(IdentContext,0);
 	};
 
 	enterRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.enterAggregation(this);
+	    if(listener instanceof PlantUMLParserListener ) {
+	        listener.enterExtension_dclr(this);
 		}
 	}
 
 	exitRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.exitAggregation(this);
+	    if(listener instanceof PlantUMLParserListener ) {
+	        listener.exitExtension_dclr(this);
 		}
 	}
 
 	accept(visitor) {
-	    if ( visitor instanceof PlantUMLVisitor ) {
-	        return visitor.visitAggregation(this);
+	    if ( visitor instanceof PlantUMLParserVisitor ) {
+	        return visitor.visitExtension_dclr(this);
 	    } else {
 	        return visitor.visitChildren(this);
 	    }
@@ -2914,7 +1515,7 @@ class AggregationContext extends antlr4.ParserRuleContext {
 
 
 
-class AggregationSymbolContext extends antlr4.ParserRuleContext {
+class IdentContext extends antlr4.ParserRuleContext {
 
     constructor(parser, parent, invokingState) {
         if(parent===undefined) {
@@ -2925,25 +1526,28 @@ class AggregationSymbolContext extends antlr4.ParserRuleContext {
         }
         super(parent, invokingState);
         this.parser = parser;
-        this.ruleIndex = PlantUMLParser.RULE_aggregationSymbol;
+        this.ruleIndex = PlantUMLParser.RULE_ident;
     }
 
+	IDENT() {
+	    return this.getToken(PlantUMLParser.IDENT, 0);
+	};
 
 	enterRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.enterAggregationSymbol(this);
+	    if(listener instanceof PlantUMLParserListener ) {
+	        listener.enterIdent(this);
 		}
 	}
 
 	exitRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.exitAggregationSymbol(this);
+	    if(listener instanceof PlantUMLParserListener ) {
+	        listener.exitIdent(this);
 		}
 	}
 
 	accept(visitor) {
-	    if ( visitor instanceof PlantUMLVisitor ) {
-	        return visitor.visitAggregationSymbol(this);
+	    if ( visitor instanceof PlantUMLParserVisitor ) {
+	        return visitor.visitIdent(this);
 	    } else {
 	        return visitor.visitChildren(this);
 	    }
@@ -2954,7 +1558,7 @@ class AggregationSymbolContext extends antlr4.ParserRuleContext {
 
 
 
-class CompositionContext extends antlr4.ParserRuleContext {
+class Enum_dclrContext extends antlr4.ParserRuleContext {
 
     constructor(parser, parent, invokingState) {
         if(parent===undefined) {
@@ -2965,54 +1569,40 @@ class CompositionContext extends antlr4.ParserRuleContext {
         }
         super(parent, invokingState);
         this.parser = parser;
-        this.ruleIndex = PlantUMLParser.RULE_composition;
+        this.ruleIndex = PlantUMLParser.RULE_enum_dclr;
     }
 
-	identifier = function(i) {
-	    if(i===undefined) {
-	        i = null;
-	    }
-	    if(i===null) {
-	        return this.getTypedRuleContexts(IdentifierContext);
-	    } else {
-	        return this.getTypedRuleContext(IdentifierContext,i);
-	    }
+	ENUM() {
+	    return this.getToken(PlantUMLParser.ENUM, 0);
 	};
 
-	compositionSymbol() {
-	    return this.getTypedRuleContext(CompositionSymbolContext,0);
+	ident() {
+	    return this.getTypedRuleContext(IdentContext,0);
 	};
 
-	stringExpression = function(i) {
-	    if(i===undefined) {
-	        i = null;
-	    }
-	    if(i===null) {
-	        return this.getTypedRuleContexts(StringExpressionContext);
-	    } else {
-	        return this.getTypedRuleContext(StringExpressionContext,i);
-	    }
+	stereotype() {
+	    return this.getTypedRuleContext(StereotypeContext,0);
 	};
 
-	lineAnnotation() {
-	    return this.getTypedRuleContext(LineAnnotationContext,0);
+	class_body() {
+	    return this.getTypedRuleContext(Class_bodyContext,0);
 	};
 
 	enterRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.enterComposition(this);
+	    if(listener instanceof PlantUMLParserListener ) {
+	        listener.enterEnum_dclr(this);
 		}
 	}
 
 	exitRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.exitComposition(this);
+	    if(listener instanceof PlantUMLParserListener ) {
+	        listener.exitEnum_dclr(this);
 		}
 	}
 
 	accept(visitor) {
-	    if ( visitor instanceof PlantUMLVisitor ) {
-	        return visitor.visitComposition(this);
+	    if ( visitor instanceof PlantUMLParserVisitor ) {
+	        return visitor.visitEnum_dclr(this);
 	    } else {
 	        return visitor.visitChildren(this);
 	    }
@@ -3023,7 +1613,7 @@ class CompositionContext extends antlr4.ParserRuleContext {
 
 
 
-class CompositionSymbolContext extends antlr4.ParserRuleContext {
+class Association_dclrContext extends antlr4.ParserRuleContext {
 
     constructor(parser, parent, invokingState) {
         if(parent===undefined) {
@@ -3034,25 +1624,40 @@ class CompositionSymbolContext extends antlr4.ParserRuleContext {
         }
         super(parent, invokingState);
         this.parser = parser;
-        this.ruleIndex = PlantUMLParser.RULE_compositionSymbol;
+        this.ruleIndex = PlantUMLParser.RULE_association_dclr;
     }
 
+	association_left() {
+	    return this.getTypedRuleContext(Association_leftContext,0);
+	};
+
+	relation() {
+	    return this.getTypedRuleContext(RelationContext,0);
+	};
+
+	association_right() {
+	    return this.getTypedRuleContext(Association_rightContext,0);
+	};
+
+	association_name() {
+	    return this.getTypedRuleContext(Association_nameContext,0);
+	};
 
 	enterRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.enterCompositionSymbol(this);
+	    if(listener instanceof PlantUMLParserListener ) {
+	        listener.enterAssociation_dclr(this);
 		}
 	}
 
 	exitRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.exitCompositionSymbol(this);
+	    if(listener instanceof PlantUMLParserListener ) {
+	        listener.exitAssociation_dclr(this);
 		}
 	}
 
 	accept(visitor) {
-	    if ( visitor instanceof PlantUMLVisitor ) {
-	        return visitor.visitCompositionSymbol(this);
+	    if ( visitor instanceof PlantUMLParserVisitor ) {
+	        return visitor.visitAssociation_dclr(this);
 	    } else {
 	        return visitor.visitChildren(this);
 	    }
@@ -3063,7 +1668,7 @@ class CompositionSymbolContext extends antlr4.ParserRuleContext {
 
 
 
-class DependencyContext extends antlr4.ParserRuleContext {
+class RelationContext extends antlr4.ParserRuleContext {
 
     constructor(parser, parent, invokingState) {
         if(parent===undefined) {
@@ -3074,94 +1679,116 @@ class DependencyContext extends antlr4.ParserRuleContext {
         }
         super(parent, invokingState);
         this.parser = parser;
-        this.ruleIndex = PlantUMLParser.RULE_dependency;
+        this.ruleIndex = PlantUMLParser.RULE_relation;
     }
 
-	identifier = function(i) {
-	    if(i===undefined) {
-	        i = null;
-	    }
+	LT() {
+	    return this.getToken(PlantUMLParser.LT, 0);
+	};
+
+	GT() {
+	    return this.getToken(PlantUMLParser.GT, 0);
+	};
+
+	DOUBLE_DOT = function(i) {
+		if(i===undefined) {
+			i = null;
+		}
 	    if(i===null) {
-	        return this.getTypedRuleContexts(IdentifierContext);
+	        return this.getTokens(PlantUMLParser.DOUBLE_DOT);
 	    } else {
-	        return this.getTypedRuleContext(IdentifierContext,i);
+	        return this.getToken(PlantUMLParser.DOUBLE_DOT, i);
 	    }
 	};
 
-	dependencySymbol() {
-	    return this.getTypedRuleContext(DependencySymbolContext,0);
-	};
 
-	stringExpression = function(i) {
-	    if(i===undefined) {
-	        i = null;
-	    }
+	DASH = function(i) {
+		if(i===undefined) {
+			i = null;
+		}
 	    if(i===null) {
-	        return this.getTypedRuleContexts(StringExpressionContext);
+	        return this.getTokens(PlantUMLParser.DASH);
 	    } else {
-	        return this.getTypedRuleContext(StringExpressionContext,i);
+	        return this.getToken(PlantUMLParser.DASH, i);
 	    }
 	};
 
-	lineAnnotation() {
-	    return this.getTypedRuleContext(LineAnnotationContext,0);
-	};
 
-	enterRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.enterDependency(this);
+	PIPE_GT = function(i) {
+		if(i===undefined) {
+			i = null;
 		}
-	}
+	    if(i===null) {
+	        return this.getTokens(PlantUMLParser.PIPE_GT);
+	    } else {
+	        return this.getToken(PlantUMLParser.PIPE_GT, i);
+	    }
+	};
 
-	exitRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.exitDependency(this);
-		}
-	}
 
-	accept(visitor) {
-	    if ( visitor instanceof PlantUMLVisitor ) {
-	        return visitor.visitDependency(this);
+	LT_PIPE = function(i) {
+		if(i===undefined) {
+			i = null;
+		}
+	    if(i===null) {
+	        return this.getTokens(PlantUMLParser.LT_PIPE);
 	    } else {
-	        return visitor.visitChildren(this);
+	        return this.getToken(PlantUMLParser.LT_PIPE, i);
 	    }
-	}
+	};
 
 
-}
+	O = function(i) {
+		if(i===undefined) {
+			i = null;
+		}
+	    if(i===null) {
+	        return this.getTokens(PlantUMLParser.O);
+	    } else {
+	        return this.getToken(PlantUMLParser.O, i);
+	    }
+	};
 
 
+	CARET = function(i) {
+		if(i===undefined) {
+			i = null;
+		}
+	    if(i===null) {
+	        return this.getTokens(PlantUMLParser.CARET);
+	    } else {
+	        return this.getToken(PlantUMLParser.CARET, i);
+	    }
+	};
 
-class DependencySymbolContext extends antlr4.ParserRuleContext {
 
-    constructor(parser, parent, invokingState) {
-        if(parent===undefined) {
-            parent = null;
-        }
-        if(invokingState===undefined || invokingState===null) {
-            invokingState = -1;
-        }
-        super(parent, invokingState);
-        this.parser = parser;
-        this.ruleIndex = PlantUMLParser.RULE_dependencySymbol;
-    }
+	STAR = function(i) {
+		if(i===undefined) {
+			i = null;
+		}
+	    if(i===null) {
+	        return this.getTokens(PlantUMLParser.STAR);
+	    } else {
+	        return this.getToken(PlantUMLParser.STAR, i);
+	    }
+	};
 
 
 	enterRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.enterDependencySymbol(this);
+	    if(listener instanceof PlantUMLParserListener ) {
+	        listener.enterRelation(this);
 		}
 	}
 
 	exitRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.exitDependencySymbol(this);
+	    if(listener instanceof PlantUMLParserListener ) {
+	        listener.exitRelation(this);
 		}
 	}
 
 	accept(visitor) {
-	    if ( visitor instanceof PlantUMLVisitor ) {
-	        return visitor.visitDependencySymbol(this);
+	    if ( visitor instanceof PlantUMLParserVisitor ) {
+	        return visitor.visitRelation(this);
 	    } else {
 	        return visitor.visitChildren(this);
 	    }
@@ -3172,7 +1799,7 @@ class DependencySymbolContext extends antlr4.ParserRuleContext {
 
 
 
-class LineAnnotationContext extends antlr4.ParserRuleContext {
+class Association_leftContext extends antlr4.ParserRuleContext {
 
     constructor(parser, parent, invokingState) {
         if(parent===undefined) {
@@ -3183,32 +1810,32 @@ class LineAnnotationContext extends antlr4.ParserRuleContext {
         }
         super(parent, invokingState);
         this.parser = parser;
-        this.ruleIndex = PlantUMLParser.RULE_lineAnnotation;
+        this.ruleIndex = PlantUMLParser.RULE_association_left;
     }
 
-	identifier() {
-	    return this.getTypedRuleContext(IdentifierContext,0);
+	ident() {
+	    return this.getTypedRuleContext(IdentContext,0);
 	};
 
-	direction() {
-	    return this.getTypedRuleContext(DirectionContext,0);
+	association_detail() {
+	    return this.getTypedRuleContext(Association_detailContext,0);
 	};
 
 	enterRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.enterLineAnnotation(this);
+	    if(listener instanceof PlantUMLParserListener ) {
+	        listener.enterAssociation_left(this);
 		}
 	}
 
 	exitRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.exitLineAnnotation(this);
+	    if(listener instanceof PlantUMLParserListener ) {
+	        listener.exitAssociation_left(this);
 		}
 	}
 
 	accept(visitor) {
-	    if ( visitor instanceof PlantUMLVisitor ) {
-	        return visitor.visitLineAnnotation(this);
+	    if ( visitor instanceof PlantUMLParserVisitor ) {
+	        return visitor.visitAssociation_left(this);
 	    } else {
 	        return visitor.visitChildren(this);
 	    }
@@ -3219,7 +1846,7 @@ class LineAnnotationContext extends antlr4.ParserRuleContext {
 
 
 
-class DirectionContext extends antlr4.ParserRuleContext {
+class Association_rightContext extends antlr4.ParserRuleContext {
 
     constructor(parser, parent, invokingState) {
         if(parent===undefined) {
@@ -3230,25 +1857,32 @@ class DirectionContext extends antlr4.ParserRuleContext {
         }
         super(parent, invokingState);
         this.parser = parser;
-        this.ruleIndex = PlantUMLParser.RULE_direction;
+        this.ruleIndex = PlantUMLParser.RULE_association_right;
     }
 
+	ident() {
+	    return this.getTypedRuleContext(IdentContext,0);
+	};
+
+	association_detail() {
+	    return this.getTypedRuleContext(Association_detailContext,0);
+	};
 
 	enterRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.enterDirection(this);
+	    if(listener instanceof PlantUMLParserListener ) {
+	        listener.enterAssociation_right(this);
 		}
 	}
 
 	exitRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.exitDirection(this);
+	    if(listener instanceof PlantUMLParserListener ) {
+	        listener.exitAssociation_right(this);
 		}
 	}
 
 	accept(visitor) {
-	    if ( visitor instanceof PlantUMLVisitor ) {
-	        return visitor.visitDirection(this);
+	    if ( visitor instanceof PlantUMLParserVisitor ) {
+	        return visitor.visitAssociation_right(this);
 	    } else {
 	        return visitor.visitChildren(this);
 	    }
@@ -3259,7 +1893,7 @@ class DirectionContext extends antlr4.ParserRuleContext {
 
 
 
-class IdentifierContext extends antlr4.ParserRuleContext {
+class Association_detailContext extends antlr4.ParserRuleContext {
 
     constructor(parser, parent, invokingState) {
         if(parent===undefined) {
@@ -3270,28 +1904,28 @@ class IdentifierContext extends antlr4.ParserRuleContext {
         }
         super(parent, invokingState);
         this.parser = parser;
-        this.ruleIndex = PlantUMLParser.RULE_identifier;
+        this.ruleIndex = PlantUMLParser.RULE_association_detail;
     }
 
-	ID() {
-	    return this.getToken(PlantUMLParser.ID, 0);
+	ASSOC_DETAIL() {
+	    return this.getToken(PlantUMLParser.ASSOC_DETAIL, 0);
 	};
 
 	enterRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.enterIdentifier(this);
+	    if(listener instanceof PlantUMLParserListener ) {
+	        listener.enterAssociation_detail(this);
 		}
 	}
 
 	exitRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.exitIdentifier(this);
+	    if(listener instanceof PlantUMLParserListener ) {
+	        listener.exitAssociation_detail(this);
 		}
 	}
 
 	accept(visitor) {
-	    if ( visitor instanceof PlantUMLVisitor ) {
-	        return visitor.visitIdentifier(this);
+	    if ( visitor instanceof PlantUMLParserVisitor ) {
+	        return visitor.visitAssociation_detail(this);
 	    } else {
 	        return visitor.visitChildren(this);
 	    }
@@ -3302,7 +1936,7 @@ class IdentifierContext extends antlr4.ParserRuleContext {
 
 
 
-class StringExpressionContext extends antlr4.ParserRuleContext {
+class Association_nameContext extends antlr4.ParserRuleContext {
 
     constructor(parser, parent, invokingState) {
         if(parent===undefined) {
@@ -3313,32 +1947,28 @@ class StringExpressionContext extends antlr4.ParserRuleContext {
         }
         super(parent, invokingState);
         this.parser = parser;
-        this.ruleIndex = PlantUMLParser.RULE_stringExpression;
+        this.ruleIndex = PlantUMLParser.RULE_association_name;
     }
 
-	STRING1_LITERAL() {
-	    return this.getToken(PlantUMLParser.STRING1_LITERAL, 0);
-	};
-
-	STRING2_LITERAL() {
-	    return this.getToken(PlantUMLParser.STRING2_LITERAL, 0);
+	AFTER_COLON_TEXT() {
+	    return this.getToken(PlantUMLParser.AFTER_COLON_TEXT, 0);
 	};
 
 	enterRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.enterStringExpression(this);
+	    if(listener instanceof PlantUMLParserListener ) {
+	        listener.enterAssociation_name(this);
 		}
 	}
 
 	exitRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.exitStringExpression(this);
+	    if(listener instanceof PlantUMLParserListener ) {
+	        listener.exitAssociation_name(this);
 		}
 	}
 
 	accept(visitor) {
-	    if ( visitor instanceof PlantUMLVisitor ) {
-	        return visitor.visitStringExpression(this);
+	    if ( visitor instanceof PlantUMLParserVisitor ) {
+	        return visitor.visitAssociation_name(this);
 	    } else {
 	        return visitor.visitChildren(this);
 	    }
@@ -3349,7 +1979,7 @@ class StringExpressionContext extends antlr4.ParserRuleContext {
 
 
 
-class IntegerLiteralContext extends antlr4.ParserRuleContext {
+class Associative_class_dclrContext extends antlr4.ParserRuleContext {
 
     constructor(parser, parent, invokingState) {
         if(parent===undefined) {
@@ -3360,28 +1990,62 @@ class IntegerLiteralContext extends antlr4.ParserRuleContext {
         }
         super(parent, invokingState);
         this.parser = parser;
-        this.ruleIndex = PlantUMLParser.RULE_integerLiteral;
+        this.ruleIndex = PlantUMLParser.RULE_associative_class_dclr;
+        this.left = null;
+        this.right = null;
+        this.target = null;
     }
 
-	INT() {
-	    return this.getToken(PlantUMLParser.INT, 0);
+	LPAREN() {
+	    return this.getToken(PlantUMLParser.LPAREN, 0);
+	};
+
+	COMMA() {
+	    return this.getToken(PlantUMLParser.COMMA, 0);
+	};
+
+	RPAREN() {
+	    return this.getToken(PlantUMLParser.RPAREN, 0);
+	};
+
+	ident = function(i) {
+	    if(i===undefined) {
+	        i = null;
+	    }
+	    if(i===null) {
+	        return this.getTypedRuleContexts(IdentContext);
+	    } else {
+	        return this.getTypedRuleContext(IdentContext,i);
+	    }
+	};
+
+	DOT() {
+	    return this.getToken(PlantUMLParser.DOT, 0);
+	};
+
+	DOUBLE_DOT() {
+	    return this.getToken(PlantUMLParser.DOUBLE_DOT, 0);
+	};
+
+	association_name() {
+	    return this.getTypedRuleContext(Association_nameContext,0);
 	};
 
 	enterRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.enterIntegerLiteral(this);
+	    if(listener instanceof PlantUMLParserListener ) {
+	        listener.enterAssociative_class_dclr(this);
 		}
 	}
 
 	exitRule(listener) {
-	    if(listener instanceof PlantUMLListener ) {
-	        listener.exitIntegerLiteral(this);
+	    if(listener instanceof PlantUMLParserListener ) {
+	        listener.exitAssociative_class_dclr(this);
 		}
 	}
 
 	accept(visitor) {
-	    if ( visitor instanceof PlantUMLVisitor ) {
-	        return visitor.visitIntegerLiteral(this);
+	    if ( visitor instanceof PlantUMLParserVisitor ) {
+	        return visitor.visitAssociative_class_dclr(this);
 	    } else {
 	        return visitor.visitChildren(this);
 	    }
@@ -3393,33 +2057,21 @@ class IntegerLiteralContext extends antlr4.ParserRuleContext {
 
 
 
-PlantUMLParser.ClassDiagramContext = ClassDiagramContext; 
-PlantUMLParser.CdelementContext = CdelementContext; 
-PlantUMLParser.ClassDefinitionContext = ClassDefinitionContext; 
-PlantUMLParser.ClassElementContext = ClassElementContext; 
-PlantUMLParser.EnumDefinitionContext = EnumDefinitionContext; 
-PlantUMLParser.AttributeContext = AttributeContext; 
-PlantUMLParser.InternalAttributeContext = InternalAttributeContext; 
-PlantUMLParser.MethodContext = MethodContext; 
-PlantUMLParser.InternalMethodContext = InternalMethodContext; 
-PlantUMLParser.ParametersContext = ParametersContext; 
+PlantUMLParser.Entry_Context = Entry_Context; 
+PlantUMLParser.UmlContext = UmlContext; 
+PlantUMLParser.Class_dclrContext = Class_dclrContext; 
+PlantUMLParser.Class_bodyContext = Class_bodyContext; 
+PlantUMLParser.Body_contentContext = Body_contentContext; 
+PlantUMLParser.Nested_bodyContext = Nested_bodyContext; 
+PlantUMLParser.Class_typeContext = Class_typeContext; 
 PlantUMLParser.StereotypeContext = StereotypeContext; 
-PlantUMLParser.VisibilityContext = VisibilityContext; 
-PlantUMLParser.ModifierContext = ModifierContext; 
-PlantUMLParser.TypeContext = TypeContext; 
-PlantUMLParser.InheritanceContext = InheritanceContext; 
-PlantUMLParser.LeftAncestorSymbolContext = LeftAncestorSymbolContext; 
-PlantUMLParser.RightAncestorSymbolContext = RightAncestorSymbolContext; 
-PlantUMLParser.AssociationContext = AssociationContext; 
-PlantUMLParser.AssociationSymbolContext = AssociationSymbolContext; 
-PlantUMLParser.AggregationContext = AggregationContext; 
-PlantUMLParser.AggregationSymbolContext = AggregationSymbolContext; 
-PlantUMLParser.CompositionContext = CompositionContext; 
-PlantUMLParser.CompositionSymbolContext = CompositionSymbolContext; 
-PlantUMLParser.DependencyContext = DependencyContext; 
-PlantUMLParser.DependencySymbolContext = DependencySymbolContext; 
-PlantUMLParser.LineAnnotationContext = LineAnnotationContext; 
-PlantUMLParser.DirectionContext = DirectionContext; 
-PlantUMLParser.IdentifierContext = IdentifierContext; 
-PlantUMLParser.StringExpressionContext = StringExpressionContext; 
-PlantUMLParser.IntegerLiteralContext = IntegerLiteralContext; 
+PlantUMLParser.Extension_dclrContext = Extension_dclrContext; 
+PlantUMLParser.IdentContext = IdentContext; 
+PlantUMLParser.Enum_dclrContext = Enum_dclrContext; 
+PlantUMLParser.Association_dclrContext = Association_dclrContext; 
+PlantUMLParser.RelationContext = RelationContext; 
+PlantUMLParser.Association_leftContext = Association_leftContext; 
+PlantUMLParser.Association_rightContext = Association_rightContext; 
+PlantUMLParser.Association_detailContext = Association_detailContext; 
+PlantUMLParser.Association_nameContext = Association_nameContext; 
+PlantUMLParser.Associative_class_dclrContext = Associative_class_dclrContext;