Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
monticore
EmbeddedMontiArc
languages
CNNArchLang
Commits
a6666c1e
Commit
a6666c1e
authored
Aug 18, 2018
by
Svetlana Pavlitskaya
Browse files
Added nonterminal for an expression with minus. Last test is passing
parent
89c02085
Pipeline
#69086
passed with stages
in 19 minutes and 41 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
pom.xml
View file @
a6666c1e
...
...
@@ -30,7 +30,7 @@
<groupId>
de.monticore.lang.monticar
</groupId>
<artifactId>
cnn-arch
</artifactId>
<version>
0.2.
1
-SNAPSHOT
</version>
<version>
0.2.
3
-SNAPSHOT
</version>
<!-- == PROJECT DEPENDENCIES ============================================= -->
...
...
src/main/grammars/de/monticore/lang/monticar/CNNArch.mc4
View file @
a6666c1e
...
...
@@ -126,8 +126,8 @@ grammar CNNArch extends de.monticore.CommonExpressions, de.monticore.lang.Math,
|
NameExpression
|
MathDottedNameExpression
|
MathAssignmentDeclarationStatement
|
MathAssignmentStatement
|
MinusPrefixExpression
);
|
MathAssignmentStatement
);
//
|
MinusPrefixExpression
);
ArchComplexArithmeticExpression
implements
ArchArithmeticExpression
=
leftExpression
:
ArchMathExpression
NEWLINETOKEN
*
...
...
@@ -157,6 +157,8 @@ grammar CNNArch extends de.monticore.CommonExpressions, de.monticore.lang.Math,
ArchBracketExpression
implements
ArchMathExpression
,
ArchBooleanExpression
,
ArchArithmeticExpression
=
"("
ArchMathExpression
")"
;
ArchPreMinusExpression
implements
ArchMathExpression
,
ArchBooleanExpression
,
ArchArithmeticExpression
=
"-"
ArchMathExpression
;
/*
=================================*/
/*
============
ASTRULES
===========*/
...
...
src/main/java/de/monticore/lang/monticar/cnnarch/_symboltable/CNNArchSymbolTableCreator.java
View file @
a6666c1e
...
...
@@ -23,10 +23,7 @@ package de.monticore.lang.monticar.cnnarch._symboltable;
import
de.monticore.expressionsbasis._ast.ASTExpression
;
import
de.monticore.lang.math._symboltable.MathSymbolTableCreator
;
import
de.monticore.lang.math._symboltable.expression.MathArithmeticExpressionSymbol
;
import
de.monticore.lang.math._symboltable.expression.MathBooleanExpressionSymbol
;
import
de.monticore.lang.math._symboltable.expression.MathExpressionSymbol
;
import
de.monticore.lang.math._symboltable.expression.MathNameExpressionSymbol
;
import
de.monticore.lang.math._symboltable.expression.*
;
import
de.monticore.lang.monticar.cnnarch._ast.*
;
import
de.monticore.lang.monticar.cnnarch._visitor.CNNArchInheritanceVisitor
;
import
de.monticore.lang.monticar.cnnarch._visitor.CNNArchVisitor
;
...
...
@@ -447,8 +444,6 @@ public class CNNArchSymbolTableCreator extends de.monticore.symboltable.CommonSy
sym
=
(
MathExpressionSymbol
)
node
.
getMathAssignmentDeclarationStatement
().
getSymbolOpt
().
get
();
else
if
(
node
.
isPresentMathAssignmentStatement
())
sym
=
(
MathExpressionSymbol
)
node
.
getMathAssignmentStatement
().
getSymbolOpt
().
get
();
else
if
(
node
.
isPresentMinusPrefixExpression
())
sym
=
(
MathExpressionSymbol
)
node
.
getMinusPrefixExpression
().
getExpression
().
getSymbolOpt
().
get
();
addToScopeAndLinkWithNode
(
sym
,
node
);
}
...
...
@@ -499,4 +494,12 @@ public class CNNArchSymbolTableCreator extends de.monticore.symboltable.CommonSy
MathExpressionSymbol
sym
=
(
MathExpressionSymbol
)
node
.
getArchMathExpression
().
getSymbolOpt
().
get
();
addToScopeAndLinkWithNode
(
sym
,
node
);
}
@Override
public
void
endVisit
(
ASTArchPreMinusExpression
node
)
{
MathPreOperatorExpressionSymbol
symbol
=
new
MathPreOperatorExpressionSymbol
();
symbol
.
setMathExpressionSymbol
((
MathExpressionSymbol
)
node
.
getArchMathExpression
().
getSymbolOpt
().
get
());
symbol
.
setOperator
(
"-"
);
addToScopeAndLinkWithNode
(
symbol
,
node
);
}
}
\ No newline at end of file
src/test/java/de/monticore/lang/monticar/cnnarch/cocos/AllCoCoTest.java
View file @
a6666c1e
...
...
@@ -24,7 +24,6 @@ import de.monticore.lang.monticar.cnnarch._cocos.*;
import
de.monticore.lang.monticar.cnnarch.helper.ErrorCodes
;
import
de.se_rwth.commons.logging.Log
;
import
org.junit.Before
;
import
org.junit.Ignore
;
import
org.junit.Test
;
import
static
de
.
monticore
.
lang
.
monticar
.
cnnarch
.
ParserTest
.
ENABLE_FAIL_QUICK
;
...
...
@@ -159,7 +158,6 @@ public class AllCoCoTest extends AbstractCoCoTest {
new
ExpectedErrorInfo
(
1
,
ErrorCodes
.
ILLEGAL_ASSIGNMENT
));
}
@Ignore
@Test
public
void
testArgumentConstraintTest2
(){
checkInvalid
(
new
CNNArchCoCoChecker
(),
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment