Commit deded6d5 authored by Clement's avatar Clement
Browse files

projetXtext

parents 233a33cc 4424f072
...@@ -32,12 +32,10 @@ INDEX VERSION 1.131+C:\Users\Yoann Le Carrer\Projet-IDM\.metadata\.plugins\org.e ...@@ -32,12 +32,10 @@ INDEX VERSION 1.131+C:\Users\Yoann Le Carrer\Projet-IDM\.metadata\.plugins\org.e
1103944019.index 1103944019.index
1336142134.index 1336142134.index
2206388479.index 2206388479.index
62527661.index
1637000827.index 1637000827.index
2952800593.index 2952800593.index
1026438759.index 1026438759.index
766069633.index 766069633.index
3284291335.index
3845018809.index 3845018809.index
4098281556.index 4098281556.index
251896979.index 251896979.index
...@@ -70,7 +68,6 @@ INDEX VERSION 1.131+C:\Users\Yoann Le Carrer\Projet-IDM\.metadata\.plugins\org.e ...@@ -70,7 +68,6 @@ INDEX VERSION 1.131+C:\Users\Yoann Le Carrer\Projet-IDM\.metadata\.plugins\org.e
4112173213.index 4112173213.index
4084511144.index 4084511144.index
242676619.index 242676619.index
2606166049.index
1970020917.index 1970020917.index
3466444698.index 3466444698.index
852248757.index 852248757.index
...@@ -98,7 +95,6 @@ INDEX VERSION 1.131+C:\Users\Yoann Le Carrer\Projet-IDM\.metadata\.plugins\org.e ...@@ -98,7 +95,6 @@ INDEX VERSION 1.131+C:\Users\Yoann Le Carrer\Projet-IDM\.metadata\.plugins\org.e
3073025916.index 3073025916.index
2066859635.index 2066859635.index
3217363564.index 3217363564.index
1960622548.index
3413197684.index 3413197684.index
2002773225.index 2002773225.index
2774035974.index 2774035974.index
......
...@@ -151,3 +151,5 @@ ...@@ -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,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 - 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,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
...@@ -56,9 +56,16 @@ ...@@ -56,9 +56,16 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="ref" eType="#//Instructions" <eStructuralFeatures xsi:type="ecore:EReference" name="ref" eType="#//Instructions"
containment="true"/> containment="true"/>
</eClassifiers> </eClassifiers>
<<<<<<< HEAD
<eClassifiers xsi:type="ecore:EClass" name="Rename" eSuperTypes="#//Instructions"> <eClassifiers xsi:type="ecore:EClass" name="Rename" eSuperTypes="#//Instructions">
<eStructuralFeatures xsi:type="ecore:EReference" name="variableDeclaration" eType="#//VariableDeclaration"/> <eStructuralFeatures xsi:type="ecore:EReference" name="variableDeclaration" eType="#//VariableDeclaration"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="ref" eType="#//Instructions" <eStructuralFeatures xsi:type="ecore:EReference" name="ref" eType="#//Instructions"
=======
<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" eSuperTypes="#//Instruction">
<eStructuralFeatures xsi:type="ecore:EReference" name="refVariable" eType="#//RefVariable"
>>>>>>> 4424f0724a0ea4bd5aebb055ccb986dec8af2079
containment="true"/> containment="true"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="stringRename" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="stringRename" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers> </eClassifiers>
......
...@@ -61,9 +61,6 @@ public class IDMParser extends AbstractContentAssistParser { ...@@ -61,9 +61,6 @@ public class IDMParser extends AbstractContentAssistParser {
builder.put(grammarAccess.getMoveAccess().getDataFrameAssignment_3(), "rule__Move__DataFrameAssignment_3"); builder.put(grammarAccess.getMoveAccess().getDataFrameAssignment_3(), "rule__Move__DataFrameAssignment_3");
builder.put(grammarAccess.getSwapAccess().getDataFrameAssignment_3(), "rule__Swap__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.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 ...@@ -2340,9 +2340,9 @@ rule__Rename__Group__3__Impl
} }
: :
( (
{ before(grammarAccess.getRenameAccess().getDataFrameAssignment_3()); } { before(grammarAccess.getRenameAccess().getSTRINGTerminalRuleCall_3()); }
(rule__Rename__DataFrameAssignment_3)? RULE_STRING
{ after(grammarAccess.getRenameAccess().getDataFrameAssignment_3()); } { after(grammarAccess.getRenameAccess().getSTRINGTerminalRuleCall_3()); }
) )
; ;
finally { finally {
...@@ -2463,7 +2463,6 @@ rule__Remove__Group__3 ...@@ -2463,7 +2463,6 @@ rule__Remove__Group__3
} }
: :
rule__Remove__Group__3__Impl rule__Remove__Group__3__Impl
rule__Remove__Group__4
; ;
finally { finally {
restoreStackSize(stackSize); restoreStackSize(stackSize);
...@@ -2475,35 +2474,9 @@ rule__Remove__Group__3__Impl ...@@ -2475,35 +2474,9 @@ rule__Remove__Group__3__Impl
} }
: :
( (
{ before(grammarAccess.getRemoveAccess().getDataFrameAssignment_3()); } { before(grammarAccess.getRemoveAccess().getRightParenthesisKeyword_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()); }
')' ')'
{ after(grammarAccess.getRemoveAccess().getRightParenthesisKeyword_4()); } { after(grammarAccess.getRemoveAccess().getRightParenthesisKeyword_3()); }
) )
; ;
finally { finally {
...@@ -2598,7 +2571,6 @@ rule__Sort__Group__3 ...@@ -2598,7 +2571,6 @@ rule__Sort__Group__3
} }
: :
rule__Sort__Group__3__Impl rule__Sort__Group__3__Impl
rule__Sort__Group__4
; ;
finally { finally {
restoreStackSize(stackSize); restoreStackSize(stackSize);
...@@ -2610,240 +2582,250 @@ rule__Sort__Group__3__Impl ...@@ -2610,240 +2582,250 @@ rule__Sort__Group__3__Impl
} }
: :
( (
{ before(grammarAccess.getSortAccess().getDataFrameAssignment_3()); } { before(grammarAccess.getSortAccess().getRightParenthesisKeyword_3()); }
(rule__Sort__DataFrameAssignment_3)? ')'
{ after(grammarAccess.getSortAccess().getDataFrameAssignment_3()); } { after(grammarAccess.getSortAccess().getRightParenthesisKeyword_3()); }
) )
; ;
finally { finally {
restoreStackSize(stackSize); restoreStackSize(stackSize);
} }
rule__Sort__Group__4
rule__Save__Group__0
@init { @init {
int stackSize = keepStackSize(); int stackSize = keepStackSize();
} }
: :
rule__Sort__Group__4__Impl rule__Save__Group__0__Impl
rule__Save__Group__1
; ;
finally { finally {
restoreStackSize(stackSize); restoreStackSize(stackSize);
} }
rule__Sort__Group__4__Impl rule__Save__Group__0__Impl
@init { @init {
int stackSize = keepStackSize(); int stackSize = keepStackSize();
} }
: :
( (
{ before(grammarAccess.getSortAccess().getRightParenthesisKeyword_4()); } { before(grammarAccess.getSaveAccess().getSaveAction_0()); }
')' ()
{ after(grammarAccess.getSortAccess().getRightParenthesisKeyword_4()); } { after(grammarAccess.getSaveAccess().getSaveAction_0()); }
) )
; ;
finally { finally {
restoreStackSize(stackSize); restoreStackSize(stackSize);
} }
rule__Save__Group__1
rule__Save__Group__0
@init { @init {
int stackSize = keepStackSize(); int stackSize = keepStackSize();
} }
: :
rule__Save__Group__0__Impl rule__Save__Group__1__Impl
rule__Save__Group__1 rule__Save__Group__2
; ;
finally { finally {
restoreStackSize(stackSize); restoreStackSize(stackSize);
} }
rule__Save__Group__0__Impl rule__Save__Group__1__Impl
@init { @init {
int stackSize = keepStackSize(); int stackSize = keepStackSize();
} }
: :
( (
{ before(grammarAccess.getSaveAccess().getSaveAction_0()); } { before(grammarAccess.getSaveAccess().getSaveKeyword_1()); }
() 'Save'
{ after(grammarAccess.getSaveAccess().getSaveAction_0()); } { after(grammarAccess.getSaveAccess().getSaveKeyword_1()); }
) )
; ;
finally { finally {
restoreStackSize(stackSize); restoreStackSize(stackSize);
} }
rule__Save__Group__1 rule__Save__Group__2
@init { @init {
int stackSize = keepStackSize(); int stackSize = keepStackSize();
} }
: :
rule__Save__Group__1__Impl rule__Save__Group__2__Impl
rule__Save__Group__3
; ;
finally { finally {
restoreStackSize(stackSize); restoreStackSize(stackSize);
} }
rule__Save__Group__1__Impl rule__Save__Group__2__Impl
@init { @init {
int stackSize = keepStackSize(); int stackSize = keepStackSize();
} }
: :
( (
{ before(grammarAccess.getSaveAccess().getSaveKeyword_1()); } { before(grammarAccess.getSaveAccess().getLeftParenthesisKeyword_2()); }
'Save' '('
{ after(grammarAccess.getSaveAccess().getSaveKeyword_1()); } { after(grammarAccess.getSaveAccess().getLeftParenthesisKeyword_2()); }
) )
; ;
finally { finally {
restoreStackSize(stackSize); 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 { @init {
int stackSize = keepStackSize(); int stackSize = keepStackSize();
} }
: :
( (
{ before(grammarAccess.getDataProcessorAccess().getInstructionInstructionParserRuleCall_0()); } { before(grammarAccess.getSaveAccess().getSTRINGTerminalRuleCall_3()); }
ruleInstruction RULE_STRING
{ after(grammarAccess.getDataProcessorAccess().getInstructionInstructionParserRuleCall_0()); } { after(grammarAccess.getSaveAccess().getSTRINGTerminalRuleCall_3()); }
) )
; ;
finally { finally {
restoreStackSize(stackSize); restoreStackSize(stackSize);
} }
rule__Sum__DataFrameAssignment_3 rule__Save__Group__4
@init { @init {
int stackSize = keepStackSize(); int stackSize = keepStackSize();
} }
: :
( rule__Save__Group__4__Impl
{ before(grammarAccess.getSumAccess().getDataFrameDataFrameParserRuleCall_3_0()); }
ruleDataFrame
{ after(grammarAccess.getSumAccess().getDataFrameDataFrameParserRuleCall_3_0()); }
)
; ;
finally { finally {
restoreStackSize(stackSize); restoreStackSize(stackSize);
} }
rule__Load__FileAssignment_3 rule__Save__Group__4__Impl
@init { @init {
int stackSize = keepStackSize(); int stackSize = keepStackSize();
} }
: :
( (
{ before(grammarAccess.getLoadAccess().getFileFileParserRuleCall_3_0()); } { before(grammarAccess.getSaveAccess().getRightParenthesisKeyword_4()); }
ruleFile ')'
{ after(grammarAccess.getLoadAccess().getFileFileParserRuleCall_3_0()); } { after(grammarAccess.getSaveAccess().getRightParenthesisKeyword_4()); }
) )
; ;
finally { finally {
restoreStackSize(stackSize); restoreStackSize(stackSize);
} }
rule__Product__DataFrameAssignment_3
rule__DataProcessor__InstructionAssignment
@init { @init {
int stackSize = keepStackSize(); int stackSize = keepStackSize();
} }
: :
( (
{ before(grammarAccess.getProductAccess().getDataFrameDataFrameParserRuleCall_3_0()); } { before(grammarAccess.getDataProcessorAccess().getInstructionInstructionParserRuleCall_0()); }
ruleDataFrame ruleInstruction
{ after(grammarAccess.getProductAccess().getDataFrameDataFrameParserRuleCall_3_0()); } { after(grammarAccess.getDataProcessorAccess().getInstructionInstructionParserRuleCall_0()); }
) )
; ;
finally { finally {
restoreStackSize(stackSize); restoreStackSize(stackSize);
} }
rule__Move__DataFrameAssignment_3 rule__Sum__DataFrameAssignment_3
@init { @init {
int stackSize = keepStackSize(); int stackSize = keepStackSize();
} }
: :
( (
{ before(grammarAccess.getMoveAccess().getDataFrameDataFrameParserRuleCall_3_0()); } { before(grammarAccess.getSumAccess().getDataFrameDataFrameParserRuleCall_3_0()); }
ruleDataFrame ruleDataFrame
{ after(grammarAccess.getMoveAccess().getDataFrameDataFrameParserRuleCall_3_0()); } { after(grammarAccess.getSumAccess().getDataFrameDataFrameParserRuleCall_3_0()); }
) )
; ;
finally { finally {
restoreStackSize(stackSize); restoreStackSize(stackSize);
} }
rule__Swap__DataFrameAssignment_3 rule__Load__FileAssignment_3
@init { @init {
int stackSize = keepStackSize(); int stackSize = keepStackSize();
} }
: :
( (
{ before(grammarAccess.getSwapAccess().getDataFrameDataFrameParserRuleCall_3_0()); } { before(grammarAccess.getLoadAccess().getFileFileParserRuleCall_3_0()); }
ruleDataFrame ruleFile
{ after(grammarAccess.getSwapAccess().getDataFrameDataFrameParserRuleCall_3_0()); } { after(grammarAccess.getLoadAccess().getFileFileParserRuleCall_3_0()); }
) )
; ;
finally { finally {
restoreStackSize(stackSize); restoreStackSize(stackSize);
} }
rule__Add__DataFrameAssignment_3 rule__Product__DataFrameAssignment_3
@init { @init {
int stackSize = keepStackSize(); int stackSize = keepStackSize();
} }
: :
( (
{ before(grammarAccess.getAddAccess().getDataFrameDataFrameParserRuleCall_3_0()); } { before(grammarAccess.getProductAccess().getDataFrameDataFrameParserRuleCall_3_0()); }
ruleDataFrame ruleDataFrame
{ after(grammarAccess.getAddAccess().getDataFrameDataFrameParserRuleCall_3_0()); } { after(grammarAccess.getProductAccess().getDataFrameDataFrameParserRuleCall_3_0()); }
) )
; ;
finally { finally {
restoreStackSize(stackSize); restoreStackSize(stackSize);
} }
rule__Rename__DataFrameAssignment_3 rule__Move__DataFrameAssignment_3
@init {