Merge pull request ProjetoDSL#15 from ProjetoDSL/development

Project update

org.xtext.unipampa.erdsl.ide/bin/org/xtext/unipampa/erdsl/ide/contentassist/antlr/internal/InternalErDslParser.g

@@ -64,6 +64,7 @@ import org.xtext.unipampa.erdsl.services.ErDslGrammarAccess;
 		tokenNameToValue.put("PartialDisjoint", "'partial/disjoint'");
 		tokenNameToValue.put("TotalOverlapped", "'total/overlapped'");
 		tokenNameToValue.put("PartialOverlapped", "'partial/overlapped'");
+		tokenNameToValue.put("GenerateOcurrenceDiagram", "'@generateOcurrenceDiagram'");
 	}
 
 	public void setGrammarAccess(ErDslGrammarAccess grammarAccess) {
@@ -1572,6 +1573,7 @@ rule__Relation__Group__2
 	}
 :
 	rule__Relation__Group__2__Impl
+	rule__Relation__Group__3
 ;
 finally {
 	restoreStackSize(stackSize);
@@ -1592,6 +1594,32 @@ finally {
 	restoreStackSize(stackSize);
 }
 
+rule__Relation__Group__3
+	@init {
+		int stackSize = keepStackSize();
+	}
+:
+	rule__Relation__Group__3__Impl
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__Relation__Group__3__Impl
+	@init {
+		int stackSize = keepStackSize();
+	}
+:
+(
+	{ before(grammarAccess.getRelationAccess().getOcurrenceAssignment_3()); }
+	(rule__Relation__OcurrenceAssignment_3)?
+	{ after(grammarAccess.getRelationAccess().getOcurrenceAssignment_3()); }
+)
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
 
 rule__Relation__Group_1__0
 	@init {
@@ -2276,6 +2304,25 @@ finally {
 	restoreStackSize(stackSize);
 }
 
+rule__Relation__OcurrenceAssignment_3
+	@init {
+		int stackSize = keepStackSize();
+	}
+:
+	(
+		{ before(grammarAccess.getRelationAccess().getOcurrenceGenerateOcurrenceDiagramKeyword_3_0()); }
+		(
+			{ before(grammarAccess.getRelationAccess().getOcurrenceGenerateOcurrenceDiagramKeyword_3_0()); }
+			GenerateOcurrenceDiagram
+			{ after(grammarAccess.getRelationAccess().getOcurrenceGenerateOcurrenceDiagramKeyword_3_0()); }
+		)
+		{ after(grammarAccess.getRelationAccess().getOcurrenceGenerateOcurrenceDiagramKeyword_3_0()); }
+	)
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
 rule__RelationSideRight__CardinalityAssignment_0_0
 	@init {
 		int stackSize = keepStackSize();

org.xtext.unipampa.erdsl.ide/bin/org/xtext/unipampa/erdsl/ide/contentassist/antlr/internal/InternalErDslParser.tokens

@@ -1,40 +1,41 @@
-'(0:1)'=21
-'(0:N)'=22
-'(1:1)'=23
-'(1:N)'=24
-','=31
-';'=32
-'All'=28
-'Diagram'=15
-'Domain'=18
-'Entities'=12
-'Generate'=13
-'LogicalSchema'=8
-'MySQL'=25
-'PostgreSQL'=11
-'Relationships'=9
-'['=33
-']'=34
-'boolean'=16
-'datetime'=14
-'double'=19
-'file'=27
-'int'=29
-'is'=30
-'isIdentifier'=10
-'money'=26
-'partial/disjoint'=5
-'partial/overlapped'=4
-'relates'=17
-'string'=20
-'total/disjoint'=7
-'total/overlapped'=6
-'{'=35
-'}'=36
-RULE_ANY_OTHER=43
-RULE_ID=37
-RULE_INT=38
-RULE_ML_COMMENT=40
-RULE_SL_COMMENT=41
-RULE_STRING=39
-RULE_WS=42
+'(0:1)'=22
+'(0:N)'=23
+'(1:1)'=24
+'(1:N)'=25
+','=32
+';'=33
+'@generateOcurrenceDiagram'=4
+'All'=29
+'Diagram'=16
+'Domain'=19
+'Entities'=13
+'Generate'=14
+'LogicalSchema'=9
+'MySQL'=26
+'PostgreSQL'=12
+'Relationships'=10
+'['=34
+']'=35
+'boolean'=17
+'datetime'=15
+'double'=20
+'file'=28
+'int'=30
+'is'=31
+'isIdentifier'=11
+'money'=27
+'partial/disjoint'=6
+'partial/overlapped'=5
+'relates'=18
+'string'=21
+'total/disjoint'=8
+'total/overlapped'=7
+'{'=36
+'}'=37
+RULE_ANY_OTHER=44
+RULE_ID=38
+RULE_INT=39
+RULE_ML_COMMENT=41
+RULE_SL_COMMENT=42
+RULE_STRING=40
+RULE_WS=43

org.xtext.unipampa.erdsl.ide/bin/org/xtext/unipampa/erdsl/ide/contentassist/antlr/lexer/InternalErDslLexer.g

@@ -11,6 +11,8 @@ package org.xtext.unipampa.erdsl.ide.contentassist.antlr.lexer;
 import org.eclipse.xtext.ide.editor.contentassist.antlr.internal.Lexer;
 }
 
+GenerateOcurrenceDiagram : '@'('G'|'g')('E'|'e')('N'|'n')('E'|'e')('R'|'r')('A'|'a')('T'|'t')('E'|'e')('O'|'o')('C'|'c')('U'|'u')('R'|'r')('R'|'r')('E'|'e')('N'|'n')('C'|'c')('E'|'e')('D'|'d')('I'|'i')('A'|'a')('G'|'g')('R'|'r')('A'|'a')('M'|'m');
+
 PartialOverlapped : ('P'|'p')('A'|'a')('R'|'r')('T'|'t')('I'|'i')('A'|'a')('L'|'l')'/'('O'|'o')('V'|'v')('E'|'e')('R'|'r')('L'|'l')('A'|'a')('P'|'p')('P'|'p')('E'|'e')('D'|'d');
 
 PartialDisjoint : ('P'|'p')('A'|'a')('R'|'r')('T'|'t')('I'|'i')('A'|'a')('L'|'l')'/'('D'|'d')('I'|'i')('S'|'s')('J'|'j')('O'|'o')('I'|'i')('N'|'n')('T'|'t');

org.xtext.unipampa.erdsl.ide/bin/org/xtext/unipampa/erdsl/ide/contentassist/antlr/lexer/InternalErDslLexer.tokens

@@ -1,40 +1,41 @@
-All=28
-Boolean=16
-Comma=31
-Datetime=14
-Diagram=15
-Domain=18
-Double=19
-Entities=12
-File=27
-Generate=13
-Int=29
-Is=30
-IsIdentifier=10
-LeftCurlyBracket=35
-LeftParenthesisDigitOneColonDigitOneRightParenthesis=23
-LeftParenthesisDigitZeroColonDigitOneRightParenthesis=21
-LeftSquareBracket=33
-LogicalSchema=8
-Money=26
-MySQL=25
-N=22
-N_1=24
-PartialDisjoint=5
-PartialOverlapped=4
-PostgreSQL=11
-RULE_ANY_OTHER=43
-RULE_ID=37
-RULE_INT=38
-RULE_ML_COMMENT=40
-RULE_SL_COMMENT=41
-RULE_STRING=39
-RULE_WS=42
-Relates=17
-Relationships=9
-RightCurlyBracket=36
-RightSquareBracket=34
-Semicolon=32
-String=20
-TotalDisjoint=7
-TotalOverlapped=6
+All=29
+Boolean=17
+Comma=32
+Datetime=15
+Diagram=16
+Domain=19
+Double=20
+Entities=13
+File=28
+Generate=14
+GenerateOcurrenceDiagram=4
+Int=30
+Is=31
+IsIdentifier=11
+LeftCurlyBracket=36
+LeftParenthesisDigitOneColonDigitOneRightParenthesis=24
+LeftParenthesisDigitZeroColonDigitOneRightParenthesis=22
+LeftSquareBracket=34
+LogicalSchema=9
+Money=27
+MySQL=26
+N=23
+N_1=25
+PartialDisjoint=6
+PartialOverlapped=5
+PostgreSQL=12
+RULE_ANY_OTHER=44
+RULE_ID=38
+RULE_INT=39
+RULE_ML_COMMENT=41
+RULE_SL_COMMENT=42
+RULE_STRING=40
+RULE_WS=43
+Relates=18
+Relationships=10
+RightCurlyBracket=37
+RightSquareBracket=35
+Semicolon=33
+String=21
+TotalDisjoint=8
+TotalOverlapped=7

org.xtext.unipampa.erdsl.ide/src-gen/org/xtext/unipampa/erdsl/ide/contentassist/antlr/ErDslParser.java

@@ -74,6 +74,7 @@ private static void init(ImmutableMap.Builder<AbstractElement, String> builder,
 			builder.put(grammarAccess.getRelationAccess().getRightEndingAssignment_1_3(), "rule__Relation__RightEndingAssignment_1_3");
 			builder.put(grammarAccess.getRelationAccess().getAttributesAssignment_2_1(), "rule__Relation__AttributesAssignment_2_1");
 			builder.put(grammarAccess.getRelationAccess().getAttributesAssignment_2_2_1(), "rule__Relation__AttributesAssignment_2_2_1");
+			builder.put(grammarAccess.getRelationAccess().getOcurrenceAssignment_3(), "rule__Relation__OcurrenceAssignment_3");
 			builder.put(grammarAccess.getRelationSideRightAccess().getCardinalityAssignment_0_0(), "rule__RelationSideRight__CardinalityAssignment_0_0");
 			builder.put(grammarAccess.getRelationSideRightAccess().getTargetAssignment_0_1(), "rule__RelationSideRight__TargetAssignment_0_1");
 			builder.put(grammarAccess.getRelationSideRightAccess().getTargetAssignment_1(), "rule__RelationSideRight__TargetAssignment_1");

org.xtext.unipampa.erdsl.ide/src-gen/org/xtext/unipampa/erdsl/ide/contentassist/antlr/internal/InternalErDslParser.g

@@ -64,6 +64,7 @@ import org.xtext.unipampa.erdsl.services.ErDslGrammarAccess;
 		tokenNameToValue.put("PartialDisjoint", "'partial/disjoint'");
 		tokenNameToValue.put("TotalOverlapped", "'total/overlapped'");
 		tokenNameToValue.put("PartialOverlapped", "'partial/overlapped'");
+		tokenNameToValue.put("GenerateOcurrenceDiagram", "'@generateOcurrenceDiagram'");
 	}
 
 	public void setGrammarAccess(ErDslGrammarAccess grammarAccess) {
@@ -1572,6 +1573,7 @@ rule__Relation__Group__2
 	}
 :
 	rule__Relation__Group__2__Impl
+	rule__Relation__Group__3
 ;
 finally {
 	restoreStackSize(stackSize);
@@ -1592,6 +1594,32 @@ finally {
 	restoreStackSize(stackSize);
 }
 
+rule__Relation__Group__3
+	@init {
+		int stackSize = keepStackSize();
+	}
+:
+	rule__Relation__Group__3__Impl
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__Relation__Group__3__Impl
+	@init {
+		int stackSize = keepStackSize();
+	}
+:
+(
+	{ before(grammarAccess.getRelationAccess().getOcurrenceAssignment_3()); }
+	(rule__Relation__OcurrenceAssignment_3)?
+	{ after(grammarAccess.getRelationAccess().getOcurrenceAssignment_3()); }
+)
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
 
 rule__Relation__Group_1__0
 	@init {
@@ -2276,6 +2304,25 @@ finally {
 	restoreStackSize(stackSize);
 }
 
+rule__Relation__OcurrenceAssignment_3
+	@init {
+		int stackSize = keepStackSize();
+	}
+:
+	(
+		{ before(grammarAccess.getRelationAccess().getOcurrenceGenerateOcurrenceDiagramKeyword_3_0()); }
+		(
+			{ before(grammarAccess.getRelationAccess().getOcurrenceGenerateOcurrenceDiagramKeyword_3_0()); }
+			GenerateOcurrenceDiagram
+			{ after(grammarAccess.getRelationAccess().getOcurrenceGenerateOcurrenceDiagramKeyword_3_0()); }
+		)
+		{ after(grammarAccess.getRelationAccess().getOcurrenceGenerateOcurrenceDiagramKeyword_3_0()); }
+	)
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
 rule__RelationSideRight__CardinalityAssignment_0_0
 	@init {
 		int stackSize = keepStackSize();