Skip to content

Commit

Permalink
Merge pull request ProjetoDSL#16 from ProjetoDSL/development
Browse files Browse the repository at this point in the history 
Development
  • Loading branch information
@JonnathanRiquelmo
JonnathanRiquelmo authored Apr 25, 2022
2 parents 780fc51 + 80e9e71 commit 80d1097
Show file tree
Hide file tree
Showing 108 changed files with 1,330 additions and 353 deletions.
Binary file modified ...l.ide/bin/org/xtext/unipampa/erdsl/ide/contentassist/antlr/ErDslParser$NameMappings.class
View file
Binary file not shown.
Binary file modified ...e/bin/org/xtext/unipampa/erdsl/ide/contentassist/antlr/internal/InternalErDslParser.class
View file
Binary file not shown.
20 changes: 10 additions & 10 deletions ...l.ide/bin/org/xtext/unipampa/erdsl/ide/contentassist/antlr/internal/InternalErDslParser.g
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +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'");
tokenNameToValue.put("GenerateOccurrenceDiagram", "'@generateOccurrenceDiagram'");
}

public void setGrammarAccess(ErDslGrammarAccess grammarAccess) {
Expand Down Expand Up @@ -1611,9 +1611,9 @@ rule__Relation__Group__3__Impl
}
:
(
{ before(grammarAccess.getRelationAccess().getOcurrenceAssignment_3()); }
(rule__Relation__OcurrenceAssignment_3)?
{ after(grammarAccess.getRelationAccess().getOcurrenceAssignment_3()); }
{ before(grammarAccess.getRelationAccess().getOccurrenceAssignment_3()); }
(rule__Relation__OccurrenceAssignment_3)?
{ after(grammarAccess.getRelationAccess().getOccurrenceAssignment_3()); }
)
;
finally {
Expand Down Expand Up @@ -2304,19 +2304,19 @@ finally {
restoreStackSize(stackSize);
}

rule__Relation__OcurrenceAssignment_3
rule__Relation__OccurrenceAssignment_3
@init {
int stackSize = keepStackSize();
}
:
(
{ before(grammarAccess.getRelationAccess().getOcurrenceGenerateOcurrenceDiagramKeyword_3_0()); }
{ before(grammarAccess.getRelationAccess().getOccurrenceGenerateOccurrenceDiagramKeyword_3_0()); }
(
{ before(grammarAccess.getRelationAccess().getOcurrenceGenerateOcurrenceDiagramKeyword_3_0()); }
GenerateOcurrenceDiagram
{ after(grammarAccess.getRelationAccess().getOcurrenceGenerateOcurrenceDiagramKeyword_3_0()); }
{ before(grammarAccess.getRelationAccess().getOccurrenceGenerateOccurrenceDiagramKeyword_3_0()); }
GenerateOccurrenceDiagram
{ after(grammarAccess.getRelationAccess().getOccurrenceGenerateOccurrenceDiagramKeyword_3_0()); }
)
{ after(grammarAccess.getRelationAccess().getOcurrenceGenerateOcurrenceDiagramKeyword_3_0()); }
{ after(grammarAccess.getRelationAccess().getOccurrenceGenerateOccurrenceDiagramKeyword_3_0()); }
)
;
finally {
Expand Down
2 changes: 1 addition & 1 deletion .../bin/org/xtext/unipampa/erdsl/ide/contentassist/antlr/internal/InternalErDslParser.tokens
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
'(1:N)'=25
','=32
';'=33
'@generateOcurrenceDiagram'=4
'@generateOccurrenceDiagram'=4
'All'=29
'Diagram'=16
'Domain'=19
Expand Down
Binary file modified ...bin/org/xtext/unipampa/erdsl/ide/contentassist/antlr/lexer/InternalErDslLexer$DFA12.class
View file
Binary file not shown.
Binary file modified ...l.ide/bin/org/xtext/unipampa/erdsl/ide/contentassist/antlr/lexer/InternalErDslLexer.class
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion ...erdsl.ide/bin/org/xtext/unipampa/erdsl/ide/contentassist/antlr/lexer/InternalErDslLexer.g
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ 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');
GenerateOccurrenceDiagram : '@'('G'|'g')('E'|'e')('N'|'n')('E'|'e')('R'|'r')('A'|'a')('T'|'t')('E'|'e')('O'|'o')('C'|'c')('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');

Expand Down
2 changes: 1 addition & 1 deletion ....ide/bin/org/xtext/unipampa/erdsl/ide/contentassist/antlr/lexer/InternalErDslLexer.tokens
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Double=20
Entities=13
File=28
Generate=14
GenerateOcurrenceDiagram=4
GenerateOccurrenceDiagram=4
Int=30
Is=31
IsIdentifier=11
Expand Down
2 changes: 1 addition & 1 deletion ...pampa.erdsl.ide/src-gen/org/xtext/unipampa/erdsl/ide/contentassist/antlr/ErDslParser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +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.getRelationAccess().getOccurrenceAssignment_3(), "rule__Relation__OccurrenceAssignment_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");
Expand Down
20 changes: 10 additions & 10 deletions ...e/src-gen/org/xtext/unipampa/erdsl/ide/contentassist/antlr/internal/InternalErDslParser.g
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +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'");
tokenNameToValue.put("GenerateOccurrenceDiagram", "'@generateOccurrenceDiagram'");
}

public void setGrammarAccess(ErDslGrammarAccess grammarAccess) {
Expand Down Expand Up @@ -1611,9 +1611,9 @@ rule__Relation__Group__3__Impl
}
:
(
{ before(grammarAccess.getRelationAccess().getOcurrenceAssignment_3()); }
(rule__Relation__OcurrenceAssignment_3)?
{ after(grammarAccess.getRelationAccess().getOcurrenceAssignment_3()); }
{ before(grammarAccess.getRelationAccess().getOccurrenceAssignment_3()); }
(rule__Relation__OccurrenceAssignment_3)?
{ after(grammarAccess.getRelationAccess().getOccurrenceAssignment_3()); }
)
;
finally {
Expand Down Expand Up @@ -2304,19 +2304,19 @@ finally {
restoreStackSize(stackSize);
}

rule__Relation__OcurrenceAssignment_3
rule__Relation__OccurrenceAssignment_3
@init {
int stackSize = keepStackSize();
}
:
(
{ before(grammarAccess.getRelationAccess().getOcurrenceGenerateOcurrenceDiagramKeyword_3_0()); }
{ before(grammarAccess.getRelationAccess().getOccurrenceGenerateOccurrenceDiagramKeyword_3_0()); }
(
{ before(grammarAccess.getRelationAccess().getOcurrenceGenerateOcurrenceDiagramKeyword_3_0()); }
GenerateOcurrenceDiagram
{ after(grammarAccess.getRelationAccess().getOcurrenceGenerateOcurrenceDiagramKeyword_3_0()); }
{ before(grammarAccess.getRelationAccess().getOccurrenceGenerateOccurrenceDiagramKeyword_3_0()); }
GenerateOccurrenceDiagram
{ after(grammarAccess.getRelationAccess().getOccurrenceGenerateOccurrenceDiagramKeyword_3_0()); }
)
{ after(grammarAccess.getRelationAccess().getOcurrenceGenerateOcurrenceDiagramKeyword_3_0()); }
{ after(grammarAccess.getRelationAccess().getOccurrenceGenerateOccurrenceDiagramKeyword_3_0()); }
)
;
finally {
Expand Down
58 changes: 29 additions & 29 deletions ...rc-gen/org/xtext/unipampa/erdsl/ide/contentassist/antlr/internal/InternalErDslParser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,14 @@
@SuppressWarnings("all")
public class InternalErDslParser extends AbstractInternalContentAssistParser {
public static final String[] tokenNames = new String[] {
"<invalid>", "<EOR>", "<DOWN>", "<UP>", "GenerateOcurrenceDiagram", "PartialOverlapped", "PartialDisjoint", "TotalOverlapped", "TotalDisjoint", "LogicalSchema", "Relationships", "IsIdentifier", "PostgreSQL", "Entities", "Generate", "Datetime", "Diagram", "Boolean", "Relates", "Domain", "Double", "String", "LeftParenthesisDigitZeroColonDigitOneRightParenthesis", "N", "LeftParenthesisDigitOneColonDigitOneRightParenthesis", "N_1", "MySQL", "Money", "File", "All", "Int", "Is", "Comma", "Semicolon", "LeftSquareBracket", "RightSquareBracket", "LeftCurlyBracket", "RightCurlyBracket", "RULE_ID", "RULE_INT", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER"
"<invalid>", "<EOR>", "<DOWN>", "<UP>", "GenerateOccurrenceDiagram", "PartialOverlapped", "PartialDisjoint", "TotalOverlapped", "TotalDisjoint", "LogicalSchema", "Relationships", "IsIdentifier", "PostgreSQL", "Entities", "Generate", "Datetime", "Diagram", "Boolean", "Relates", "Domain", "Double", "String", "LeftParenthesisDigitZeroColonDigitOneRightParenthesis", "N", "LeftParenthesisDigitOneColonDigitOneRightParenthesis", "N_1", "MySQL", "Money", "File", "All", "Int", "Is", "Comma", "Semicolon", "LeftSquareBracket", "RightSquareBracket", "LeftCurlyBracket", "RightCurlyBracket", "RULE_ID", "RULE_INT", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER"
};
public static final int All=29;
public static final int N_1=25;
public static final int PostgreSQL=12;
public static final int String=21;
public static final int TotalOverlapped=7;
public static final int GenerateOccurrenceDiagram=4;
public static final int MySQL=26;
public static final int Boolean=17;
public static final int RightSquareBracket=35;
Expand All @@ -49,7 +50,6 @@ public class InternalErDslParser extends AbstractInternalContentAssistParser {
public static final int Is=31;
public static final int RULE_STRING=40;
public static final int LeftParenthesisDigitZeroColonDigitOneRightParenthesis=22;
public static final int GenerateOcurrenceDiagram=4;
public static final int N=23;
public static final int Int=30;
public static final int RULE_SL_COMMENT=42;
Expand Down Expand Up @@ -123,7 +123,7 @@ public InternalErDslParser(TokenStream input, RecognizerSharedState state) {
tokenNameToValue.put("PartialDisjoint", "'partial/disjoint'");
tokenNameToValue.put("TotalOverlapped", "'total/overlapped'");
tokenNameToValue.put("PartialOverlapped", "'partial/overlapped'");
tokenNameToValue.put("GenerateOcurrenceDiagram", "'@generateOcurrenceDiagram'");
tokenNameToValue.put("GenerateOccurrenceDiagram", "'@generateOccurrenceDiagram'");
}

public void setGrammarAccess(ErDslGrammarAccess grammarAccess) {
Expand Down Expand Up @@ -4975,32 +4975,32 @@ public final void rule__Relation__Group__3() throws RecognitionException {


// $ANTLR start "rule__Relation__Group__3__Impl"
// InternalErDslParser.g:1608:1: rule__Relation__Group__3__Impl : ( ( rule__Relation__OcurrenceAssignment_3 )? ) ;
// InternalErDslParser.g:1608:1: rule__Relation__Group__3__Impl : ( ( rule__Relation__OccurrenceAssignment_3 )? ) ;
public final void rule__Relation__Group__3__Impl() throws RecognitionException {

int stackSize = keepStackSize();

try {
// InternalErDslParser.g:1612:1: ( ( ( rule__Relation__OcurrenceAssignment_3 )? ) )
// InternalErDslParser.g:1613:1: ( ( rule__Relation__OcurrenceAssignment_3 )? )
// InternalErDslParser.g:1612:1: ( ( ( rule__Relation__OccurrenceAssignment_3 )? ) )
// InternalErDslParser.g:1613:1: ( ( rule__Relation__OccurrenceAssignment_3 )? )
{
// InternalErDslParser.g:1613:1: ( ( rule__Relation__OcurrenceAssignment_3 )? )
// InternalErDslParser.g:1614:2: ( rule__Relation__OcurrenceAssignment_3 )?
// InternalErDslParser.g:1613:1: ( ( rule__Relation__OccurrenceAssignment_3 )? )
// InternalErDslParser.g:1614:2: ( rule__Relation__OccurrenceAssignment_3 )?
{
before(grammarAccess.getRelationAccess().getOcurrenceAssignment_3());
// InternalErDslParser.g:1615:2: ( rule__Relation__OcurrenceAssignment_3 )?
before(grammarAccess.getRelationAccess().getOccurrenceAssignment_3());
// InternalErDslParser.g:1615:2: ( rule__Relation__OccurrenceAssignment_3 )?
int alt16=2;
int LA16_0 = input.LA(1);

if ( (LA16_0==GenerateOcurrenceDiagram) ) {
if ( (LA16_0==GenerateOccurrenceDiagram) ) {
alt16=1;
}
switch (alt16) {
case 1 :
// InternalErDslParser.g:1615:3: rule__Relation__OcurrenceAssignment_3
// InternalErDslParser.g:1615:3: rule__Relation__OccurrenceAssignment_3
{
pushFollow(FOLLOW_2);
rule__Relation__OcurrenceAssignment_3();
rule__Relation__OccurrenceAssignment_3();

state._fsp--;

Expand All @@ -5010,7 +5010,7 @@ public final void rule__Relation__Group__3__Impl() throws RecognitionException {

}

after(grammarAccess.getRelationAccess().getOcurrenceAssignment_3());
after(grammarAccess.getRelationAccess().getOccurrenceAssignment_3());

}

Expand Down Expand Up @@ -6982,30 +6982,30 @@ public final void rule__Relation__AttributesAssignment_2_2_1() throws Recognitio
// $ANTLR end "rule__Relation__AttributesAssignment_2_2_1"


// $ANTLR start "rule__Relation__OcurrenceAssignment_3"
// InternalErDslParser.g:2307:1: rule__Relation__OcurrenceAssignment_3 : ( ( GenerateOcurrenceDiagram ) ) ;
public final void rule__Relation__OcurrenceAssignment_3() throws RecognitionException {
// $ANTLR start "rule__Relation__OccurrenceAssignment_3"
// InternalErDslParser.g:2307:1: rule__Relation__OccurrenceAssignment_3 : ( ( GenerateOccurrenceDiagram ) ) ;
public final void rule__Relation__OccurrenceAssignment_3() throws RecognitionException {

int stackSize = keepStackSize();

try {
// InternalErDslParser.g:2311:1: ( ( ( GenerateOcurrenceDiagram ) ) )
// InternalErDslParser.g:2312:2: ( ( GenerateOcurrenceDiagram ) )
// InternalErDslParser.g:2311:1: ( ( ( GenerateOccurrenceDiagram ) ) )
// InternalErDslParser.g:2312:2: ( ( GenerateOccurrenceDiagram ) )
{
// InternalErDslParser.g:2312:2: ( ( GenerateOcurrenceDiagram ) )
// InternalErDslParser.g:2313:3: ( GenerateOcurrenceDiagram )
// InternalErDslParser.g:2312:2: ( ( GenerateOccurrenceDiagram ) )
// InternalErDslParser.g:2313:3: ( GenerateOccurrenceDiagram )
{
before(grammarAccess.getRelationAccess().getOcurrenceGenerateOcurrenceDiagramKeyword_3_0());
// InternalErDslParser.g:2314:3: ( GenerateOcurrenceDiagram )
// InternalErDslParser.g:2315:4: GenerateOcurrenceDiagram
before(grammarAccess.getRelationAccess().getOccurrenceGenerateOccurrenceDiagramKeyword_3_0());
// InternalErDslParser.g:2314:3: ( GenerateOccurrenceDiagram )
// InternalErDslParser.g:2315:4: GenerateOccurrenceDiagram
{
before(grammarAccess.getRelationAccess().getOcurrenceGenerateOcurrenceDiagramKeyword_3_0());
match(input,GenerateOcurrenceDiagram,FOLLOW_2);
after(grammarAccess.getRelationAccess().getOcurrenceGenerateOcurrenceDiagramKeyword_3_0());
before(grammarAccess.getRelationAccess().getOccurrenceGenerateOccurrenceDiagramKeyword_3_0());
match(input,GenerateOccurrenceDiagram,FOLLOW_2);
after(grammarAccess.getRelationAccess().getOccurrenceGenerateOccurrenceDiagramKeyword_3_0());

}

after(grammarAccess.getRelationAccess().getOcurrenceGenerateOcurrenceDiagramKeyword_3_0());
after(grammarAccess.getRelationAccess().getOccurrenceGenerateOccurrenceDiagramKeyword_3_0());

}

Expand All @@ -7024,7 +7024,7 @@ public final void rule__Relation__OcurrenceAssignment_3() throws RecognitionExce
}
return ;
}
// $ANTLR end "rule__Relation__OcurrenceAssignment_3"
// $ANTLR end "rule__Relation__OccurrenceAssignment_3"


// $ANTLR start "rule__RelationSideRight__CardinalityAssignment_0_0"
Expand Down
2 changes: 1 addition & 1 deletion ...-gen/org/xtext/unipampa/erdsl/ide/contentassist/antlr/internal/InternalErDslParser.tokens
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
'(1:N)'=25
','=32
';'=33
'@generateOcurrenceDiagram'=4
'@generateOccurrenceDiagram'=4
'All'=29
'Diagram'=16
'Domain'=19
Expand Down
2 changes: 1 addition & 1 deletion ...l.ide/src-gen/org/xtext/unipampa/erdsl/ide/contentassist/antlr/lexer/InternalErDslLexer.g
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ 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');
GenerateOccurrenceDiagram : '@'('G'|'g')('E'|'e')('N'|'n')('E'|'e')('R'|'r')('A'|'a')('T'|'t')('E'|'e')('O'|'o')('C'|'c')('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');

Expand Down
Loading

0 comments on commit 80d1097

Please sign in to comment.