Commit 4424f072 authored by Le Carrer Yoann's avatar Le Carrer Yoann
Browse files

cahngement ecore et grammaire

parent 3019b206
......@@ -32,12 +32,10 @@ INDEX VERSION 1.131+C:\Users\Yoann Le Carrer\Projet-IDM\.metadata\.plugins\org.e
1103944019.index
1336142134.index
2206388479.index
62527661.index
1637000827.index
2952800593.index
1026438759.index
766069633.index
3284291335.index
3845018809.index
4098281556.index
251896979.index
......@@ -70,7 +68,6 @@ INDEX VERSION 1.131+C:\Users\Yoann Le Carrer\Projet-IDM\.metadata\.plugins\org.e
4112173213.index
4084511144.index
242676619.index
2606166049.index
1970020917.index
3466444698.index
852248757.index
......@@ -98,7 +95,6 @@ INDEX VERSION 1.131+C:\Users\Yoann Le Carrer\Projet-IDM\.metadata\.plugins\org.e
3073025916.index
2066859635.index
3217363564.index
1960622548.index
3413197684.index
2002773225.index
2774035974.index
......
......@@ -151,3 +151,5 @@
2021-12-01 16:37:14,601 [Worker-2: Building] INFO o.e.m.c.i.embedder.EclipseLogger - skip non existing resourceDirectory C:\Users\Yoann Le Carrer\Projet-IDM\org.xtext.example.idm.parent\org.xtext.example.idm.tests\src\test\resources
2021-12-01 16:37:14,733 [Worker-2: Building] INFO o.e.m.c.i.embedder.EclipseLogger - Using 'windows-1252' encoding to copy filtered resources.
2021-12-01 16:37:14,733 [Worker-2: Building] INFO o.e.m.c.i.embedder.EclipseLogger - skip non existing resourceDirectory C:\Users\Yoann Le Carrer\Projet-IDM\org.xtext.example.idm.parent\org.xtext.example.idm.ui.tests\src\main\resources
2021-12-01 16:37:14,735 [Worker-2: Building] INFO o.e.m.c.i.embedder.EclipseLogger - Using 'windows-1252' encoding to copy filtered resources.
2021-12-01 16:37:14,735 [Worker-2: Building] INFO o.e.m.c.i.embedder.EclipseLogger - skip non existing resourceDirectory C:\Users\Yoann Le Carrer\Projet-IDM\org.xtext.example.idm.parent\org.xtext.example.idm.ui.tests\src\test\resources
......@@ -47,7 +47,7 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Intersect" eSuperTypes="#//RefVariable"/>
<eClassifiers xsi:type="ecore:EClass" name="Merge" eSuperTypes="#//RefVariable"/>
<eClassifiers xsi:type="ecore:EClass" name="VariableDeclaration">
<eClassifiers xsi:type="ecore:EClass" name="VariableDeclaration" eSuperTypes="#//Instruction">
<eStructuralFeatures xsi:type="ecore:EReference" name="refVariable" eType="#//RefVariable"
containment="true"/>
</eClassifiers>
......
......@@ -61,9 +61,6 @@ public class IDMParser extends AbstractContentAssistParser {
builder.put(grammarAccess.getMoveAccess().getDataFrameAssignment_3(), "rule__Move__DataFrameAssignment_3");
builder.put(grammarAccess.getSwapAccess().getDataFrameAssignment_3(), "rule__Swap__DataFrameAssignment_3");
builder.put(grammarAccess.getAddAccess().getDataFrameAssignment_3(), "rule__Add__DataFrameAssignment_3");
builder.put(grammarAccess.getRenameAccess().getDataFrameAssignment_3(), "rule__Rename__DataFrameAssignment_3");
builder.put(grammarAccess.getRemoveAccess().getDataFrameAssignment_3(), "rule__Remove__DataFrameAssignment_3");
builder.put(grammarAccess.getSortAccess().getDataFrameAssignment_3(), "rule__Sort__DataFrameAssignment_3");
}
}
......
......@@ -2340,9 +2340,9 @@ rule__Rename__Group__3__Impl
}
:
(
{ before(grammarAccess.getRenameAccess().getDataFrameAssignment_3()); }
(rule__Rename__DataFrameAssignment_3)?
{ after(grammarAccess.getRenameAccess().getDataFrameAssignment_3()); }
{ before(grammarAccess.getRenameAccess().getSTRINGTerminalRuleCall_3()); }
RULE_STRING
{ after(grammarAccess.getRenameAccess().getSTRINGTerminalRuleCall_3()); }
)
;
finally {
......@@ -2463,7 +2463,6 @@ rule__Remove__Group__3
}
:
rule__Remove__Group__3__Impl
rule__Remove__Group__4
;
finally {
restoreStackSize(stackSize);
......@@ -2475,35 +2474,9 @@ rule__Remove__Group__3__Impl
}
:
(
{ before(grammarAccess.getRemoveAccess().getDataFrameAssignment_3()); }
(rule__Remove__DataFrameAssignment_3)?
{ after(grammarAccess.getRemoveAccess().getDataFrameAssignment_3()); }
)
;
finally {
restoreStackSize(stackSize);
}
rule__Remove__Group__4
@init {
int stackSize = keepStackSize();
}
:
rule__Remove__Group__4__Impl
;
finally {
restoreStackSize(stackSize);
}
rule__Remove__Group__4__Impl
@init {
int stackSize = keepStackSize();
}
:
(
{ before(grammarAccess.getRemoveAccess().getRightParenthesisKeyword_4()); }
{ before(grammarAccess.getRemoveAccess().getRightParenthesisKeyword_3()); }
')'
{ after(grammarAccess.getRemoveAccess().getRightParenthesisKeyword_4()); }
{ after(grammarAccess.getRemoveAccess().getRightParenthesisKeyword_3()); }
)
;
finally {
......@@ -2598,7 +2571,6 @@ rule__Sort__Group__3
}
:
rule__Sort__Group__3__Impl
rule__Sort__Group__4
;
finally {
restoreStackSize(stackSize);
......@@ -2610,240 +2582,250 @@ rule__Sort__Group__3__Impl
}
:
(
{ before(grammarAccess.getSortAccess().getDataFrameAssignment_3()); }
(rule__Sort__DataFrameAssignment_3)?
{ after(grammarAccess.getSortAccess().getDataFrameAssignment_3()); }
{ before(grammarAccess.getSortAccess().getRightParenthesisKeyword_3()); }
')'
{ after(grammarAccess.getSortAccess().getRightParenthesisKeyword_3()); }
)
;
finally {
restoreStackSize(stackSize);
}
rule__Sort__Group__4
rule__Save__Group__0
@init {
int stackSize = keepStackSize();
}
:
rule__Sort__Group__4__Impl
rule__Save__Group__0__Impl
rule__Save__Group__1
;
finally {
restoreStackSize(stackSize);
}
rule__Sort__Group__4__Impl
rule__Save__Group__0__Impl
@init {
int stackSize = keepStackSize();
}
:
(
{ before(grammarAccess.getSortAccess().getRightParenthesisKeyword_4()); }
')'
{ after(grammarAccess.getSortAccess().getRightParenthesisKeyword_4()); }
{ before(grammarAccess.getSaveAccess().getSaveAction_0()); }
()
{ after(grammarAccess.getSaveAccess().getSaveAction_0()); }
)
;
finally {
restoreStackSize(stackSize);
}
rule__Save__Group__0
rule__Save__Group__1
@init {
int stackSize = keepStackSize();
}
:
rule__Save__Group__0__Impl
rule__Save__Group__1
rule__Save__Group__1__Impl
rule__Save__Group__2
;
finally {
restoreStackSize(stackSize);
}
rule__Save__Group__0__Impl
rule__Save__Group__1__Impl
@init {
int stackSize = keepStackSize();
}
:
(
{ before(grammarAccess.getSaveAccess().getSaveAction_0()); }
()
{ after(grammarAccess.getSaveAccess().getSaveAction_0()); }
{ before(grammarAccess.getSaveAccess().getSaveKeyword_1()); }
'Save'
{ after(grammarAccess.getSaveAccess().getSaveKeyword_1()); }
)
;
finally {
restoreStackSize(stackSize);
}
rule__Save__Group__1
rule__Save__Group__2
@init {
int stackSize = keepStackSize();
}
:
rule__Save__Group__1__Impl
rule__Save__Group__2__Impl
rule__Save__Group__3
;
finally {
restoreStackSize(stackSize);
}
rule__Save__Group__1__Impl
rule__Save__Group__2__Impl
@init {
int stackSize = keepStackSize();
}
:
(
{ before(grammarAccess.getSaveAccess().getSaveKeyword_1()); }
'Save'
{ after(grammarAccess.getSaveAccess().getSaveKeyword_1()); }
{ before(grammarAccess.getSaveAccess().getLeftParenthesisKeyword_2()); }
'('
{ after(grammarAccess.getSaveAccess().getLeftParenthesisKeyword_2()); }
)
;
finally {
restoreStackSize(stackSize);
}
rule__Save__Group__3
@init {
int stackSize = keepStackSize();
}
:
rule__Save__Group__3__Impl
rule__Save__Group__4
;
finally {
restoreStackSize(stackSize);
}
rule__DataProcessor__InstructionAssignment
rule__Save__Group__3__Impl
@init {
int stackSize = keepStackSize();
}
:
(
{ before(grammarAccess.getDataProcessorAccess().getInstructionInstructionParserRuleCall_0()); }
ruleInstruction
{ after(grammarAccess.getDataProcessorAccess().getInstructionInstructionParserRuleCall_0()); }
)
(
{ before(grammarAccess.getSaveAccess().getSTRINGTerminalRuleCall_3()); }
RULE_STRING
{ after(grammarAccess.getSaveAccess().getSTRINGTerminalRuleCall_3()); }
)
;
finally {
restoreStackSize(stackSize);
}
rule__Sum__DataFrameAssignment_3
rule__Save__Group__4
@init {
int stackSize = keepStackSize();
}
:
(
{ before(grammarAccess.getSumAccess().getDataFrameDataFrameParserRuleCall_3_0()); }
ruleDataFrame
{ after(grammarAccess.getSumAccess().getDataFrameDataFrameParserRuleCall_3_0()); }
)
rule__Save__Group__4__Impl
;
finally {
restoreStackSize(stackSize);
}
rule__Load__FileAssignment_3
rule__Save__Group__4__Impl
@init {
int stackSize = keepStackSize();
}
:
(
{ before(grammarAccess.getLoadAccess().getFileFileParserRuleCall_3_0()); }
ruleFile
{ after(grammarAccess.getLoadAccess().getFileFileParserRuleCall_3_0()); }
)
(
{ before(grammarAccess.getSaveAccess().getRightParenthesisKeyword_4()); }
')'
{ after(grammarAccess.getSaveAccess().getRightParenthesisKeyword_4()); }
)
;
finally {
restoreStackSize(stackSize);
}
rule__Product__DataFrameAssignment_3
rule__DataProcessor__InstructionAssignment
@init {
int stackSize = keepStackSize();
}
:
(
{ before(grammarAccess.getProductAccess().getDataFrameDataFrameParserRuleCall_3_0()); }
ruleDataFrame
{ after(grammarAccess.getProductAccess().getDataFrameDataFrameParserRuleCall_3_0()); }
{ before(grammarAccess.getDataProcessorAccess().getInstructionInstructionParserRuleCall_0()); }
ruleInstruction
{ after(grammarAccess.getDataProcessorAccess().getInstructionInstructionParserRuleCall_0()); }
)
;
finally {
restoreStackSize(stackSize);
}
rule__Move__DataFrameAssignment_3
rule__Sum__DataFrameAssignment_3
@init {
int stackSize = keepStackSize();
}
:
(
{ before(grammarAccess.getMoveAccess().getDataFrameDataFrameParserRuleCall_3_0()); }
{ before(grammarAccess.getSumAccess().getDataFrameDataFrameParserRuleCall_3_0()); }
ruleDataFrame
{ after(grammarAccess.getMoveAccess().getDataFrameDataFrameParserRuleCall_3_0()); }
{ after(grammarAccess.getSumAccess().getDataFrameDataFrameParserRuleCall_3_0()); }
)
;
finally {
restoreStackSize(stackSize);
}
rule__Swap__DataFrameAssignment_3
rule__Load__FileAssignment_3
@init {
int stackSize = keepStackSize();
}
:
(
{ before(grammarAccess.getSwapAccess().getDataFrameDataFrameParserRuleCall_3_0()); }
ruleDataFrame
{ after(grammarAccess.getSwapAccess().getDataFrameDataFrameParserRuleCall_3_0()); }
{ before(grammarAccess.getLoadAccess().getFileFileParserRuleCall_3_0()); }
ruleFile
{ after(grammarAccess.getLoadAccess().getFileFileParserRuleCall_3_0()); }
)
;
finally {
restoreStackSize(stackSize);
}
rule__Add__DataFrameAssignment_3
rule__Product__DataFrameAssignment_3
@init {
int stackSize = keepStackSize();
}
:
(
{ before(grammarAccess.getAddAccess().getDataFrameDataFrameParserRuleCall_3_0()); }
{ before(grammarAccess.getProductAccess().getDataFrameDataFrameParserRuleCall_3_0()); }
ruleDataFrame
{ after(grammarAccess.getAddAccess().getDataFrameDataFrameParserRuleCall_3_0()); }
{ after(grammarAccess.getProductAccess().getDataFrameDataFrameParserRuleCall_3_0()); }
)
;
finally {
restoreStackSize(stackSize);
}
rule__Rename__DataFrameAssignment_3
rule__Move__DataFrameAssignment_3
@init {
int stackSize = keepStackSize();
}
:
(
{ before(grammarAccess.getRenameAccess().getDataFrameDataFrameParserRuleCall_3_0()); }
{ before(grammarAccess.getMoveAccess().getDataFrameDataFrameParserRuleCall_3_0()); }
ruleDataFrame
{ after(grammarAccess.getRenameAccess().getDataFrameDataFrameParserRuleCall_3_0()); }
{ after(grammarAccess.getMoveAccess().getDataFrameDataFrameParserRuleCall_3_0()); }
)
;
finally {
restoreStackSize(stackSize);
}
rule__Remove__DataFrameAssignment_3
rule__Swap__DataFrameAssignment_3
@init {
int stackSize = keepStackSize();
}
:
(
{ before(grammarAccess.getRemoveAccess().getDataFrameDataFrameParserRuleCall_3_0()); }
{ before(grammarAccess.getSwapAccess().getDataFrameDataFrameParserRuleCall_3_0()); }
ruleDataFrame
{ after(grammarAccess.getRemoveAccess().getDataFrameDataFrameParserRuleCall_3_0()); }
{ after(grammarAccess.getSwapAccess().getDataFrameDataFrameParserRuleCall_3_0()); }
)
;
finally {
restoreStackSize(stackSize);
}
rule__Sort__DataFrameAssignment_3
rule__Add__DataFrameAssignment_3
@init {
int stackSize = keepStackSize();
}
:
(
{ before(grammarAccess.getSortAccess().getDataFrameDataFrameParserRuleCall_3_0()); }
{ before(grammarAccess.getAddAccess().getDataFrameDataFrameParserRuleCall_3_0()); }
ruleDataFrame
{ after(grammarAccess.getSortAccess().getDataFrameDataFrameParserRuleCall_3_0()); }
{ after(grammarAccess.getAddAccess().getDataFrameDataFrameParserRuleCall_3_0()); }
)
;
finally {
......
......@@ -538,10 +538,10 @@ public class InternalIDMLexer extends Lexer {
try {
int _type = RULE_ID;
int _channel = DEFAULT_TOKEN_CHANNEL;
// InternalIDM.g:2853:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
// InternalIDM.g:2853:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
// InternalIDM.g:2835:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
// InternalIDM.g:2835:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
{
// InternalIDM.g:2853:11: ( '^' )?
// InternalIDM.g:2835:11: ( '^' )?
int alt1=2;
int LA1_0 = input.LA(1);
......@@ -550,7 +550,7 @@ public class InternalIDMLexer extends Lexer {
}
switch (alt1) {
case 1 :
// InternalIDM.g:2853:11: '^'
// InternalIDM.g:2835:11: '^'
{
match('^');
......@@ -568,7 +568,7 @@ public class InternalIDMLexer extends Lexer {
recover(mse);
throw mse;}
// InternalIDM.g:2853:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
// InternalIDM.g:2835:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
loop2:
do {
int alt2=2;
......@@ -617,10 +617,10 @@ public class InternalIDMLexer extends Lexer {
try {
int _type = RULE_INT;
int _channel = DEFAULT_TOKEN_CHANNEL;
// InternalIDM.g:2855:10: ( ( '0' .. '9' )+ )
// InternalIDM.g:2855:12: ( '0' .. '9' )+
// InternalIDM.g:2837:10: ( ( '0' .. '9' )+ )
// InternalIDM.g:2837:12: ( '0' .. '9' )+
{
// InternalIDM.g:2855:12: ( '0' .. '9' )+
// InternalIDM.g:2837:12: ( '0' .. '9' )+
int cnt3=0;
loop3:
do {
......@@ -634,7 +634,7 @@ public class InternalIDMLexer extends Lexer {
switch (alt3) {
case 1 :
// InternalIDM.g:2855:13: '0' .. '9'
// InternalIDM.g:2837:13: '0' .. '9'
{
matchRange('0','9');
......@@ -666,10 +666,10 @@ public class InternalIDMLexer extends Lexer {
try {
int _type = RULE_STRING;
int _channel = DEFAULT_TOKEN_CHANNEL;
// InternalIDM.g:2857:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
// InternalIDM.g:2857:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
// InternalIDM.g:2839:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
// InternalIDM.g:2839:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
{
// InternalIDM.g:2857:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
// InternalIDM.g:2839:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
int alt6=2;
int LA6_0 = input.LA(1);
......@@ -687,10 +687,10 @@ public class InternalIDMLexer extends Lexer {
}
switch (alt6) {
case 1 :
// InternalIDM.g:2857:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
// InternalIDM.g:2839:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
{
match('\"');
// InternalIDM.g:2857:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
// InternalIDM.g:2839:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
loop4:
do {
int alt4=3;
......@@ -706,7 +706,7 @@ public class InternalIDMLexer extends Lexer {
switch (alt4) {
case 1 :
// InternalIDM.g:2857:21: '\\\\' .
// InternalIDM.g:2839:21: '\\\\' .
{
match('\\');
matchAny();
......@@ -714,7 +714,7 @@ public class InternalIDMLexer extends Lexer {
}
break;
case 2 :
// InternalIDM.g:2857:28: ~ ( ( '\\\\' | '\"' ) )
// InternalIDM.g:2839:28: ~ ( ( '\\\\' | '\"' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
input.consume();
......@@ -739,10 +739,10 @@ public class InternalIDMLexer extends Lexer {
}
break;
case 2 :
// InternalIDM.g:2857:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
// InternalIDM.g:2839:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
{
match('\'');
// InternalIDM.g:2857:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
// InternalIDM.g:2839:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
loop5:
do {
int alt5=3;
......@@ -758,7 +758,7 @@ public class InternalIDMLexer extends Lexer {
switch (alt5) {
case 1 :
// InternalIDM.g:2857:54: '\\\\' .
// InternalIDM.g:2839:54: '\\\\' .
{
match('\\');
matchAny();
......@@ -766,7 +766,7 @@ public class InternalIDMLexer extends Lexer {