Merge pull request ProjetoDSL#12 from ProjetoDSL/development

Project Update

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

@@ -50,6 +50,7 @@ import org.xtext.unipampa.erdsl.services.ErDslGrammarAccess;
 		tokenNameToValue.put("Domain", "'Domain'");
 		tokenNameToValue.put("Double", "'double'");
 		tokenNameToValue.put("String", "'string'");
+		tokenNameToValue.put("Diagram", "'Diagram'");
 		tokenNameToValue.put("Boolean", "'boolean'");
 		tokenNameToValue.put("Relates", "'relates'");
 		tokenNameToValue.put("Entities", "'Entities'");
@@ -298,9 +299,15 @@ rule__ERModel__TargetGeneratorAlternatives_0_1_0
 	)
 	|
 	(
-		{ before(grammarAccess.getERModelAccess().getTargetGeneratorAllKeyword_0_1_0_3()); }
+		{ before(grammarAccess.getERModelAccess().getTargetGeneratorDiagramKeyword_0_1_0_3()); }
+		Diagram
+		{ after(grammarAccess.getERModelAccess().getTargetGeneratorDiagramKeyword_0_1_0_3()); }
+	)
+	|
+	(
+		{ before(grammarAccess.getERModelAccess().getTargetGeneratorAllKeyword_0_1_0_4()); }
 		All
-		{ after(grammarAccess.getERModelAccess().getTargetGeneratorAllKeyword_0_1_0_3()); }
+		{ after(grammarAccess.getERModelAccess().getTargetGeneratorAllKeyword_0_1_0_4()); }
 	)
 ;
 finally {

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

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

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

@@ -33,6 +33,8 @@ Generate : ('G'|'g')('E'|'e')('N'|'n')('E'|'e')('R'|'r')('A'|'a')('T'|'t')('E'|'
 
 Datetime : ('D'|'d')('A'|'a')('T'|'t')('E'|'e')('T'|'t')('I'|'i')('M'|'m')('E'|'e');
 
+Diagram : ('D'|'d')('I'|'i')('A'|'a')('G'|'g')('R'|'r')('A'|'a')('M'|'m');
+
 Boolean : ('B'|'b')('O'|'o')('O'|'o')('L'|'l')('E'|'e')('A'|'a')('N'|'n');
 
 Relates : ('R'|'r')('E'|'e')('L'|'l')('A'|'a')('T'|'t')('E'|'e')('S'|'s');

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

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

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

@@ -50,6 +50,7 @@ import org.xtext.unipampa.erdsl.services.ErDslGrammarAccess;
 		tokenNameToValue.put("Domain", "'Domain'");
 		tokenNameToValue.put("Double", "'double'");
 		tokenNameToValue.put("String", "'string'");
+		tokenNameToValue.put("Diagram", "'Diagram'");
 		tokenNameToValue.put("Boolean", "'boolean'");
 		tokenNameToValue.put("Relates", "'relates'");
 		tokenNameToValue.put("Entities", "'Entities'");
@@ -298,9 +299,15 @@ rule__ERModel__TargetGeneratorAlternatives_0_1_0
 	)
 	|
 	(
-		{ before(grammarAccess.getERModelAccess().getTargetGeneratorAllKeyword_0_1_0_3()); }
+		{ before(grammarAccess.getERModelAccess().getTargetGeneratorDiagramKeyword_0_1_0_3()); }
+		Diagram
+		{ after(grammarAccess.getERModelAccess().getTargetGeneratorDiagramKeyword_0_1_0_3()); }
+	)
+	|
+	(
+		{ before(grammarAccess.getERModelAccess().getTargetGeneratorAllKeyword_0_1_0_4()); }
 		All
-		{ after(grammarAccess.getERModelAccess().getTargetGeneratorAllKeyword_0_1_0_3()); }
+		{ after(grammarAccess.getERModelAccess().getTargetGeneratorAllKeyword_0_1_0_4()); }
 	)
 ;
 finally {