Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
C
CNNArchLang
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Test Cases
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
monticore
EmbeddedMontiArc
languages
CNNArchLang
Commits
5f2575c7
Commit
5f2575c7
authored
Jan 27, 2018
by
Thomas Michael Timmermanns
Committed by
Thomas Michael Timmermanns
Jan 27, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Implemented architecture parameters and removed IOParameters and Constants.
parent
94b95cfe
Changes
66
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
66 changed files
with
495 additions
and
322 deletions
+495
-322
README.md
README.md
+96
-54
pom.xml
pom.xml
+1
-1
src/main/grammars/de/monticore/lang/monticar/CNNArch.mc4
src/main/grammars/de/monticore/lang/monticar/CNNArch.mc4
+14
-12
src/main/java/de/monticore/lang/monticar/cnnarch/_ast/ASTArchSpecialArgument.java
...re/lang/monticar/cnnarch/_ast/ASTArchSpecialArgument.java
+11
-21
src/main/java/de/monticore/lang/monticar/cnnarch/_cocos/CNNArchPostResolveCocos.java
...lang/monticar/cnnarch/_cocos/CNNArchPostResolveCocos.java
+2
-1
src/main/java/de/monticore/lang/monticar/cnnarch/_cocos/CNNArchPreResolveCocos.java
.../lang/monticar/cnnarch/_cocos/CNNArchPreResolveCocos.java
+1
-1
src/main/java/de/monticore/lang/monticar/cnnarch/_cocos/CheckArgument.java
...monticore/lang/monticar/cnnarch/_cocos/CheckArgument.java
+3
-3
src/main/java/de/monticore/lang/monticar/cnnarch/_cocos/CheckIOAccessAndIOMissing.java
...ng/monticar/cnnarch/_cocos/CheckIOAccessAndIOMissing.java
+2
-1
src/main/java/de/monticore/lang/monticar/cnnarch/_cocos/CheckIOShape.java
.../monticore/lang/monticar/cnnarch/_cocos/CheckIOShape.java
+7
-14
src/main/java/de/monticore/lang/monticar/cnnarch/_cocos/CheckMethodLayer.java
...ticore/lang/monticar/cnnarch/_cocos/CheckMethodLayer.java
+3
-3
src/main/java/de/monticore/lang/monticar/cnnarch/_cocos/CheckNameExpression.java
...ore/lang/monticar/cnnarch/_cocos/CheckNameExpression.java
+3
-5
src/main/java/de/monticore/lang/monticar/cnnarch/_cocos/CheckRangeOperators.java
...ore/lang/monticar/cnnarch/_cocos/CheckRangeOperators.java
+49
-0
src/main/java/de/monticore/lang/monticar/cnnarch/_cocos/CheckVariableName.java
...icore/lang/monticar/cnnarch/_cocos/CheckVariableName.java
+2
-2
src/main/java/de/monticore/lang/monticar/cnnarch/_symboltable/ArchSimpleExpressionSymbol.java
...icar/cnnarch/_symboltable/ArchSimpleExpressionSymbol.java
+2
-2
src/main/java/de/monticore/lang/monticar/cnnarch/_symboltable/ArchitectureSymbol.java
...ang/monticar/cnnarch/_symboltable/ArchitectureSymbol.java
+106
-3
src/main/java/de/monticore/lang/monticar/cnnarch/_symboltable/CNNArchLanguage.java
...e/lang/monticar/cnnarch/_symboltable/CNNArchLanguage.java
+1
-1
src/main/java/de/monticore/lang/monticar/cnnarch/_symboltable/CNNArchSymbolTableCreator.java
...ticar/cnnarch/_symboltable/CNNArchSymbolTableCreator.java
+24
-42
src/main/java/de/monticore/lang/monticar/cnnarch/_symboltable/PredefinedMethodDeclaration.java
...car/cnnarch/_symboltable/PredefinedMethodDeclaration.java
+4
-3
src/main/java/de/monticore/lang/monticar/cnnarch/_symboltable/VariableSymbol.java
...re/lang/monticar/cnnarch/_symboltable/VariableSymbol.java
+13
-13
src/main/java/de/monticore/lang/monticar/cnnarch/_symboltable/VariableType.java
...core/lang/monticar/cnnarch/_symboltable/VariableType.java
+2
-8
src/main/java/de/monticore/lang/monticar/cnnarch/helper/ErrorCodes.java
...de/monticore/lang/monticar/cnnarch/helper/ErrorCodes.java
+1
-0
src/main/java/de/monticore/lang/monticar/cnnarch/predefined/AllPredefinedVariables.java
...g/monticar/cnnarch/predefined/AllPredefinedVariables.java
+4
-4
src/test/java/de/monticore/lang/monticar/cnnarch/cocos/AbstractCoCoTest.java
...nticore/lang/monticar/cnnarch/cocos/AbstractCoCoTest.java
+5
-4
src/test/java/de/monticore/lang/monticar/cnnarch/cocos/AllCoCoTest.java
...de/monticore/lang/monticar/cnnarch/cocos/AllCoCoTest.java
+13
-8
src/test/resources/architectures/Alexnet.cnna
src/test/resources/architectures/Alexnet.cnna
+3
-3
src/test/resources/architectures/ResNeXt50.cnna
src/test/resources/architectures/ResNeXt50.cnna
+3
-3
src/test/resources/architectures/ResNet34.cnna
src/test/resources/architectures/ResNet34.cnna
+3
-3
src/test/resources/architectures/SequentialAlexnet.cnna
src/test/resources/architectures/SequentialAlexnet.cnna
+3
-3
src/test/resources/architectures/ThreeInputCNN_M14.cnna
src/test/resources/architectures/ThreeInputCNN_M14.cnna
+3
-3
src/test/resources/architectures/VGG16.cnna
src/test/resources/architectures/VGG16.cnna
+3
-3
src/test/resources/invalid_tests/ArgumentConstraintTest1.cnna
...test/resources/invalid_tests/ArgumentConstraintTest1.cnna
+3
-3
src/test/resources/invalid_tests/ArgumentConstraintTest2.cnna
...test/resources/invalid_tests/ArgumentConstraintTest2.cnna
+3
-3
src/test/resources/invalid_tests/ArgumentConstraintTest3.cnna
...test/resources/invalid_tests/ArgumentConstraintTest3.cnna
+3
-3
src/test/resources/invalid_tests/ArgumentConstraintTest4.cnna
...test/resources/invalid_tests/ArgumentConstraintTest4.cnna
+3
-3
src/test/resources/invalid_tests/ArgumentConstraintTest5.cnna
...test/resources/invalid_tests/ArgumentConstraintTest5.cnna
+3
-3
src/test/resources/invalid_tests/ArgumentConstraintTest6.cnna
...test/resources/invalid_tests/ArgumentConstraintTest6.cnna
+3
-3
src/test/resources/invalid_tests/DuplicatedArgument.cnna
src/test/resources/invalid_tests/DuplicatedArgument.cnna
+1
-1
src/test/resources/invalid_tests/DuplicatedNames.cnna
src/test/resources/invalid_tests/DuplicatedNames.cnna
+4
-4
src/test/resources/invalid_tests/IllegalName.cnna
src/test/resources/invalid_tests/IllegalName.cnna
+3
-4
src/test/resources/invalid_tests/InvalidArrayAccessValue.cnna
...test/resources/invalid_tests/InvalidArrayAccessValue.cnna
+3
-3
src/test/resources/invalid_tests/InvalidIOShape1.cnna
src/test/resources/invalid_tests/InvalidIOShape1.cnna
+1
-1
src/test/resources/invalid_tests/InvalidIOShape2.cnna
src/test/resources/invalid_tests/InvalidIOShape2.cnna
+1
-1
src/test/resources/invalid_tests/InvalidInputShape.cnna
src/test/resources/invalid_tests/InvalidInputShape.cnna
+3
-3
src/test/resources/invalid_tests/InvalidRecursion.cnna
src/test/resources/invalid_tests/InvalidRecursion.cnna
+3
-3
src/test/resources/invalid_tests/MissingArgument.cnna
src/test/resources/invalid_tests/MissingArgument.cnna
+3
-3
src/test/resources/invalid_tests/MissingIO.cnna
src/test/resources/invalid_tests/MissingIO.cnna
+5
-5
src/test/resources/invalid_tests/MissingIO2.cnna
src/test/resources/invalid_tests/MissingIO2.cnna
+3
-3
src/test/resources/invalid_tests/MissingLayerOperator.cnna
src/test/resources/invalid_tests/MissingLayerOperator.cnna
+1
-1
src/test/resources/invalid_tests/MissingMerge.cnna
src/test/resources/invalid_tests/MissingMerge.cnna
+3
-3
src/test/resources/invalid_tests/MissingParallelBrackets.cnna
...test/resources/invalid_tests/MissingParallelBrackets.cnna
+3
-3
src/test/resources/invalid_tests/NotIOArray.cnna
src/test/resources/invalid_tests/NotIOArray.cnna
+3
-3
src/test/resources/invalid_tests/UnknownIO.cnna
src/test/resources/invalid_tests/UnknownIO.cnna
+1
-1
src/test/resources/invalid_tests/UnknownVariableName.cnna
src/test/resources/invalid_tests/UnknownVariableName.cnna
+2
-2
src/test/resources/invalid_tests/WrongArgument.cnna
src/test/resources/invalid_tests/WrongArgument.cnna
+3
-3
src/test/resources/invalid_tests/WrongRangeOperator.cnna
src/test/resources/invalid_tests/WrongRangeOperator.cnna
+11
-0
src/test/resources/valid_tests/Alexnet_alt.cnna
src/test/resources/valid_tests/Alexnet_alt.cnna
+3
-3
src/test/resources/valid_tests/Alexnet_alt2.cnna
src/test/resources/valid_tests/Alexnet_alt2.cnna
+4
-4
src/test/resources/valid_tests/Fixed_Alexnet.cnna
src/test/resources/valid_tests/Fixed_Alexnet.cnna
+4
-4
src/test/resources/valid_tests/Fixed_ThreeInputCNN_M14.cnna
src/test/resources/valid_tests/Fixed_ThreeInputCNN_M14.cnna
+1
-1
src/test/resources/valid_tests/ResNeXt50_alt.cnna
src/test/resources/valid_tests/ResNeXt50_alt.cnna
+3
-3
src/test/resources/valid_tests/SimpleNetworkLinear.cnna
src/test/resources/valid_tests/SimpleNetworkLinear.cnna
+3
-3
src/test/resources/valid_tests/SimpleNetworkRelu.cnna
src/test/resources/valid_tests/SimpleNetworkRelu.cnna
+3
-3
src/test/resources/valid_tests/SimpleNetworkSigmoid.cnna
src/test/resources/valid_tests/SimpleNetworkSigmoid.cnna
+3
-3
src/test/resources/valid_tests/SimpleNetworkSoftmax.cnna
src/test/resources/valid_tests/SimpleNetworkSoftmax.cnna
+3
-3
src/test/resources/valid_tests/SimpleNetworkTanh.cnna
src/test/resources/valid_tests/SimpleNetworkTanh.cnna
+3
-3
src/test/resources/valid_tests/ThreeInputCNN_M14_alternative.cnna
.../resources/valid_tests/ThreeInputCNN_M14_alternative.cnna
+3
-3
No files found.
README.md
View file @
5f2575c7
This diff is collapsed.
Click to expand it.
pom.xml
View file @
5f2575c7
...
...
@@ -30,7 +30,7 @@
<groupId>
de.monticore.lang.monticar
</groupId>
<artifactId>
cnn-arch
</artifactId>
<version>
0.1.
0
-SNAPSHOT
</version>
<version>
0.1.
1
-SNAPSHOT
</version>
<!-- == PROJECT DEPENDENCIES ============================================= -->
...
...
src/main/grammars/de/monticore/lang/monticar/CNNArch.mc4
View file @
5f2575c7
...
...
@@ -5,7 +5,8 @@ grammar CNNArch extends de.monticore.lang.math.Math {
CNNArchCompilationUnit
=
Architecture
;
symbol
scope
Architecture
=
"architecture"
name
:
Name
&
"{"
name
:
Name
&
"("
(
ArchitectureParameter
||
","
)*
")"
"{"
declarations
:
ArchDeclaration
*
body
:
ArchBody
"}"
;
...
...
@@ -22,30 +23,31 @@ grammar CNNArch extends de.monticore.lang.math.Math {
ArchType
implements
Type
=
ElementType
"^"
Shape
;
Shape
=
"{"
(
Dimen
sion
||
","
)+
"}"
;
Shape
=
"{"
dimensions
:(
ArchSimpleExpres
sion
||
","
)+
"}"
;
Dimension
=
IOVariable
|
intLiteral
:
UnitNumberResolution
;
IOVariable
implements
Variable
=
Name
&
(
"="
intRhs
:
UnitNumberResolution
)?;
VariableAssignment
implements
Variable
,
ArchDeclaration
=
Name
&
"="
rhs
:
ArchSimpleExpression
;
ArchitectureParameter
implements
Variable
=
Name
&
(
"="
default
:
ArchSimpleExpression
)?;
MethodDeclaration
implements
ArchDeclaration
=
"def"
Name
&
"("
parameters
:(
Parameter
||
","
)*
")"
"{"
parameters
:(
Method
Parameter
||
","
)*
")"
"{"
body
:
ArchBody
"}"
;
Parameter
implements
Variable
=
Name
&
(
"="
default
:
ArchSimpleExpression
)?;
Method
Parameter
implements
Variable
=
Name
&
(
"="
default
:
ArchSimpleExpression
)?;
scope
ArchBody
=
elements
:(
ArchitectureElement
||
"->"
)*;
IOLayer
implements
ArchitectureElement
=
Name
&
(
"["
index
:
ArchSimpleExpression
"]"
)?;
MethodLayer
implements
ArchitectureElement
=
Name
&
"("
arguments
:(
Argument
||
","
)*
")"
;
MethodLayer
implements
ArchitectureElement
=
Name
&
"("
arguments
:(
ArchArgument
||
","
)*
")"
;
interface
ArchArgument
;
ast
ArchArgument
=
method
String
getName
(){}
method
ASTArchExpression
getRhs
(){};
Argument
=
Name
"="
rhs
:
ArchExpression
;
Ar
chParameterArgument
implements
ArchAr
gument
=
Name
"="
rhs
:
ArchExpression
;
PredefinedArgument
extends
Argument
=
(
serial
:
"->"
|
parallel
:
"|"
)
"="
rhs2
:
ArchExpression
;
ArchSpecialArgument
implements
ArchArgument
=
(
serial
:
"->"
|
parallel
:
"|"
)
"="
rhs
:
ArchExpression
;
ast
ArchSpecialArgument
=
method
public
String
getName
(){
return
""
;};
ParallelLayer
implements
ArchitectureElement
=
"("
groups
:
ArchBody
"|"
groups
:(
ArchBody
||
"|"
)+
")"
;
...
...
src/main/java/de/monticore/lang/monticar/cnnarch/_ast/AST
Predefined
Argument.java
→
src/main/java/de/monticore/lang/monticar/cnnarch/_ast/AST
ArchSpecial
Argument.java
View file @
5f2575c7
...
...
@@ -22,34 +22,24 @@ package de.monticore.lang.monticar.cnnarch._ast;
import
de.monticore.lang.monticar.cnnarch.predefined.AllPredefinedVariables
;
public
class
AST
PredefinedArgument
extends
ASTPredefined
ArgumentTOP
{
public
class
AST
ArchSpecialArgument
extends
ASTArchSpecial
ArgumentTOP
{
public
AST
Predefined
Argument
()
{
public
AST
ArchSpecial
Argument
()
{
}
public
AST
PredefinedArgument
(
ASTArchExpression
rhs2
,
String
serial
,
String
parallel
,
String
name
,
ASTArchExpression
rhs
)
{
super
(
rhs
2
,
serial
,
parallel
,
name
,
rhs
);
public
AST
ArchSpecialArgument
(
ASTArchExpression
rhs
,
String
serial
,
String
parallel
)
{
super
(
rhs
,
serial
,
parallel
);
}
@Override
public
void
setRhs2
(
ASTArchExpression
rhs2
)
{
super
.
setRhs2
(
rhs2
);
setRhs
(
rhs2
);
}
@Override
public
void
setParallel
(
String
parallel
)
{
super
.
setParallel
(
parallel
);
if
(
parallel
!=
null
&&
!
parallel
.
isEmpty
()){
setName
(
AllPredefinedVariables
.
CARDINALITY_NAME
);
public
String
getName
()
{
if
(
getParallel
().
isPresent
()){
return
AllPredefinedVariables
.
CARDINALITY_NAME
;
}
}
@Override
public
void
setSerial
(
String
serial
)
{
super
.
setSerial
(
serial
);
if
(
serial
!=
null
&&
!
serial
.
isEmpty
())
{
setName
(
AllPredefinedVariables
.
FOR_NAME
);
else
if
(
getSerial
().
isPresent
())
{
return
AllPredefinedVariables
.
FOR_NAME
;
}
return
null
;
}
}
src/main/java/de/monticore/lang/monticar/cnnarch/_cocos/CNNArchPostResolveCocos.java
View file @
5f2575c7
...
...
@@ -26,7 +26,8 @@ public class CNNArchPostResolveCocos {
return
new
CNNArchCoCoChecker
()
.
addCoCo
(
new
CheckLayerInputs
())
.
addCoCo
(
new
CheckIOAccessAndIOMissing
())
.
addCoCo
(
new
CheckIOType
());
.
addCoCo
(
new
CheckIOType
())
.
addCoCo
(
new
CheckIOShape
());
}
}
src/main/java/de/monticore/lang/monticar/cnnarch/_cocos/CNNArchPreResolveCocos.java
View file @
5f2575c7
...
...
@@ -28,8 +28,8 @@ public class CNNArchPreResolveCocos {
.
addCoCo
(
new
CheckIOName
())
.
addCoCo
(
new
CheckNameExpression
())
.
addCoCo
(
new
CheckMethodLayer
())
.
addCoCo
(
new
CheckRangeOperators
())
.
addCoCo
(
new
CheckVariableName
())
.
addCoCo
(
new
CheckIOShape
())
.
addCoCo
(
new
CheckUnknownIO
())
.
addCoCo
(
new
CheckArgument
())
.
addCoCo
(
new
CheckMethodName
())
...
...
src/main/java/de/monticore/lang/monticar/cnnarch/_cocos/CheckArgument.java
View file @
5f2575c7
...
...
@@ -20,15 +20,15 @@
*/
package
de.monticore.lang.monticar.cnnarch._cocos
;
import
de.monticore.lang.monticar.cnnarch._ast.ASTArgument
;
import
de.monticore.lang.monticar.cnnarch._ast.ASTAr
chAr
gument
;
import
de.monticore.lang.monticar.cnnarch._symboltable.ArgumentSymbol
;
import
de.monticore.lang.monticar.cnnarch.helper.ErrorCodes
;
import
de.se_rwth.commons.logging.Log
;
public
class
CheckArgument
implements
CNNArchASTArgumentCoCo
{
public
class
CheckArgument
implements
CNNArchASTAr
chAr
gumentCoCo
{
@Override
public
void
check
(
ASTArgument
node
)
{
public
void
check
(
ASTAr
chAr
gument
node
)
{
ArgumentSymbol
argument
=
(
ArgumentSymbol
)
node
.
getSymbol
().
get
();
if
(
argument
.
getParameter
()
==
null
){
Log
.
error
(
"0"
+
ErrorCodes
.
UNKNOWN_ARGUMENT_CODE
+
" Unknown Argument. "
+
...
...
src/main/java/de/monticore/lang/monticar/cnnarch/_cocos/CheckIOAccessAndIOMissing.java
View file @
5f2575c7
...
...
@@ -75,7 +75,8 @@ public class CheckIOAccessAndIOMissing implements CNNArchASTIODeclarationCoCo {
unusedIndices
.
remove
(
arrayAccess
.
get
());
}
else
{
Log
.
error
(
"0"
+
ErrorCodes
.
INVALID_ARRAY_ACCESS
+
" The IO array access value must be an integer between 0 and "
+
(
ioDeclaration
.
getArrayLength
()-
1
)
+
". "
+
Log
.
error
(
"0"
+
ErrorCodes
.
INVALID_ARRAY_ACCESS
+
" The IO array access value of '"
+
layer
.
getName
()
+
"' must be an integer between 0 and "
+
(
ioDeclaration
.
getArrayLength
()-
1
)
+
". "
+
"The current value is: "
+
layer
.
getArrayAccess
().
get
().
getValue
().
get
().
toString
()
,
layer
.
getSourcePosition
());
}
...
...
src/main/java/de/monticore/lang/monticar/cnnarch/_cocos/CheckIOShape.java
View file @
5f2575c7
...
...
@@ -20,13 +20,11 @@
*/
package
de.monticore.lang.monticar.cnnarch._cocos
;
import
de.monticore.lang.monticar.cnnarch._ast.ASTDimension
;
import
de.monticore.lang.monticar.cnnarch._ast.ASTIODeclaration
;
import
de.monticore.lang.monticar.cnnarch._symboltable.ShapeSymbol
;
import
de.monticore.lang.monticar.cnnarch._symboltable.ArchSimpleExpressionSymbol
;
import
de.monticore.lang.monticar.cnnarch._symboltable.IODeclarationSymbol
;
import
de.monticore.lang.monticar.cnnarch.helper.ErrorCodes
;
import
de.monticore.lang.monticar.types2._ast.ASTUnitNumberResolution
;
import
de.se_rwth.commons.logging.Log
;
import
org.jscience.mathematics.number.Rational
;
import
java.util.Optional
;
...
...
@@ -41,18 +39,13 @@ public class CheckIOShape implements CNNArchASTIODeclarationCoCo {
,
node
.
getType
().
getShape
().
get_SourcePositionStart
());
}
else
{
for
(
ASTDimension
dimension
:
node
.
getType
().
getShape
().
getDimensions
()){
Rational
rational
;
if
(
dimension
.
getIntLiteral
().
isPresent
()){
rational
=
dimension
.
getIntLiteral
().
get
().
getNumber
().
get
();
}
else
{
rational
=
dimension
.
getIOVariable
().
get
().
getIntRhs
().
get
().
getNumber
().
get
();
}
if
(
rational
.
getDivisor
().
intValue
()
!=
1
||
!
rational
.
isPositive
()){
IODeclarationSymbol
ioDeclaration
=
(
IODeclarationSymbol
)
node
.
getSymbol
().
get
();
for
(
ArchSimpleExpressionSymbol
dimension
:
ioDeclaration
.
getShape
().
getDimensionSymbols
()){
Optional
<
Integer
>
value
=
dimension
.
getIntValue
();
if
(!
value
.
isPresent
()
||
value
.
get
()
<=
0
){
Log
.
error
(
"0"
+
ErrorCodes
.
INVALID_IO_SHAPE
+
" Invalid shape. "
+
"The dimension can only be defined by a positive integer."
,
dimension
.
get
_SourcePositionStart
());
,
dimension
.
get
SourcePosition
());
}
}
}
...
...
src/main/java/de/monticore/lang/monticar/cnnarch/_cocos/CheckMethodLayer.java
View file @
5f2575c7
...
...
@@ -20,7 +20,7 @@
*/
package
de.monticore.lang.monticar.cnnarch._cocos
;
import
de.monticore.lang.monticar.cnnarch._ast.ASTArgument
;
import
de.monticore.lang.monticar.cnnarch._ast.ASTAr
chAr
gument
;
import
de.monticore.lang.monticar.cnnarch._ast.ASTMethodLayer
;
import
de.monticore.lang.monticar.cnnarch._symboltable.MethodDeclarationSymbol
;
import
de.monticore.lang.monticar.cnnarch._symboltable.MethodLayerSymbol
;
...
...
@@ -37,7 +37,7 @@ public class CheckMethodLayer implements CNNArchASTMethodLayerCoCo{
@Override
public
void
check
(
ASTMethodLayer
node
)
{
Set
<
String
>
nameSet
=
new
HashSet
<>();
for
(
ASTArgument
argument
:
node
.
getArguments
()){
for
(
ASTAr
chAr
gument
argument
:
node
.
getArguments
()){
String
name
=
argument
.
getName
();
if
(
nameSet
.
contains
(
name
)){
Log
.
error
(
"0"
+
ErrorCodes
.
DUPLICATED_ARG_CODE
+
" Duplicated name: "
+
name
+
...
...
@@ -62,7 +62,7 @@ public class CheckMethodLayer implements CNNArchASTMethodLayerCoCo{
requiredArguments
.
add
(
param
.
getName
());
}
}
for
(
ASTArgument
argument
:
node
.
getArguments
()){
for
(
ASTAr
chAr
gument
argument
:
node
.
getArguments
()){
requiredArguments
.
remove
(
argument
.
getName
());
if
(
argument
.
getName
().
equals
(
AllPredefinedMethods
.
GLOBAL_NAME
)){
requiredArguments
.
remove
(
AllPredefinedMethods
.
KERNEL_NAME
);
...
...
src/main/java/de/monticore/lang/monticar/cnnarch/_cocos/CheckNameExpression.java
View file @
5f2575c7
...
...
@@ -20,8 +20,6 @@
*/
package
de.monticore.lang.monticar.cnnarch._cocos
;
import
de.monticore.lang.math.math._ast.ASTMathNameExpression
;
import
de.monticore.lang.math.math._cocos.MathASTMathNameExpressionCoCo
;
import
de.monticore.lang.math.math._symboltable.expression.MathExpressionSymbol
;
import
de.monticore.lang.math.math._symboltable.expression.MathNameExpressionSymbol
;
import
de.monticore.lang.monticar.cnnarch._ast.ASTArchSimpleExpression
;
...
...
@@ -31,7 +29,7 @@ import de.monticore.lang.monticar.cnnarch.helper.ErrorCodes;
import
de.monticore.lang.monticar.cnnarch.helper.ExpressionHelper
;
import
de.se_rwth.commons.logging.Log
;
import
java.util.
Optional
;
import
java.util.
Collection
;
public
class
CheckNameExpression
implements
CNNArchASTArchSimpleExpressionCoCo
{
...
...
@@ -44,9 +42,9 @@ public class CheckNameExpression implements CNNArchASTArchSimpleExpressionCoCo {
for
(
MathExpressionSymbol
subMathExp
:
ExpressionHelper
.
createSubExpressionList
(
mathExpression
)){
if
(
subMathExp
instanceof
MathNameExpressionSymbol
){
String
name
=
((
MathNameExpressionSymbol
)
subMathExp
).
getNameToAccess
();
Optional
<
VariableSymbol
>
variable
=
node
.
getEnclosingScope
().
get
().
resolve
(
name
,
VariableSymbol
.
KIND
);
Collection
<
VariableSymbol
>
variableCollection
=
node
.
getEnclosingScope
().
get
().
resolveMany
(
name
,
VariableSymbol
.
KIND
);
if
(
!
variable
.
isPresent
()){
if
(
variableCollection
.
isEmpty
()){
Log
.
error
(
"0"
+
ErrorCodes
.
UNKNOWN_VARIABLE_NAME
+
" Unknown variable name. "
+
"The variable '"
+
name
+
"' does not exist. "
,
subMathExp
.
getSourcePosition
());
...
...
src/main/java/de/monticore/lang/monticar/cnnarch/_cocos/CheckRangeOperators.java
0 → 100644
View file @
5f2575c7
/**
*
* ******************************************************************************
* MontiCAR Modeling Family, www.se-rwth.de
* Copyright (c) 2017, Software Engineering Group at RWTH Aachen,
* All rights reserved.
*
* This project is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 3.0 of the License, or (at your option) any later version.
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this project. If not, see <http://www.gnu.org/licenses/>.
* *******************************************************************************
*/
package
de.monticore.lang.monticar.cnnarch._cocos
;
import
de.monticore.lang.monticar.cnnarch._ast.ASTArchValueRange
;
import
de.monticore.lang.monticar.cnnarch.helper.ErrorCodes
;
import
de.se_rwth.commons.logging.Log
;
public
class
CheckRangeOperators
implements
CNNArchASTArchValueRangeCoCo
{
@Override
public
void
check
(
ASTArchValueRange
node
)
{
if
(
node
.
getParallel
().
isPresent
()){
if
(!
node
.
getParallel2
().
isPresent
()){
differentOperatorError
(
node
);
}
}
else
{
if
(
node
.
getParallel2
().
isPresent
()){
differentOperatorError
(
node
);
}
}
}
private
void
differentOperatorError
(
ASTArchValueRange
node
){
Log
.
error
(
"0"
+
ErrorCodes
.
DIFFERENT_RANGE_OPERATORS
+
" the second layer operator ('->' or '|') in a range has to be identical to the first one."
,
node
.
get_SourcePositionStart
());
}
}
src/main/java/de/monticore/lang/monticar/cnnarch/_cocos/CheckVariableName.java
View file @
5f2575c7
...
...
@@ -20,7 +20,7 @@
*/
package
de.monticore.lang.monticar.cnnarch._cocos
;
import
de.monticore.lang.monticar.cnnarch._ast.ASTParameter
;
import
de.monticore.lang.monticar.cnnarch._ast.AST
Method
Parameter
;
import
de.monticore.lang.monticar.cnnarch._ast.ASTVariable
;
import
de.monticore.lang.monticar.cnnarch.helper.ErrorCodes
;
import
de.monticore.lang.monticar.cnnarch.predefined.AllPredefinedVariables
;
...
...
@@ -64,7 +64,7 @@ public class CheckVariableName implements CNNArchASTVariableCoCo {
private
void
checkForDuplicates
(
ASTVariable
node
){
String
name
=
node
.
getName
();
if
(
variableNames
.
contains
(
name
)){
if
(
node
instanceof
ASTParameter
){
if
(
node
instanceof
AST
Method
Parameter
){
Collection
<
Symbol
>
allParametersWithSameName
=
node
.
getEnclosingScope
().
get
().
getLocalSymbols
().
get
(
name
);
if
(
allParametersWithSameName
.
size
()
>
1
){
duplicationError
(
node
);
...
...
src/main/java/de/monticore/lang/monticar/cnnarch/_symboltable/ArchSimpleExpressionSymbol.java
View file @
5f2575c7
...
...
@@ -69,7 +69,7 @@ public class ArchSimpleExpressionSymbol extends ArchExpressionSymbol {
@Override
public
boolean
isBoolean
()
{
if
(
getMathExpression
().
isPresent
()
&&
!(
getMathExpression
().
get
()
instanceof
MathNameExpressionSymbol
)){
if
(
getMathExpression
().
isPresent
()
&&
!(
getMathExpression
().
get
()
.
getRealMathExpressionSymbol
()
instanceof
MathNameExpressionSymbol
)){
if
(
getMathExpression
().
get
().
getRealMathExpressionSymbol
()
instanceof
MathCompareExpressionSymbol
){
return
true
;
}
...
...
@@ -90,7 +90,7 @@ public class ArchSimpleExpressionSymbol extends ArchExpressionSymbol {
@Override
public
boolean
isTuple
()
{
if
(
getMathExpression
().
isPresent
()
&&
!(
getMathExpression
().
get
()
instanceof
MathNameExpressionSymbol
)){
if
(
getMathExpression
().
isPresent
()
&&
!(
getMathExpression
().
get
()
.
getRealMathExpressionSymbol
()
instanceof
MathNameExpressionSymbol
)){
if
(
getMathExpression
().
get
().
getRealMathExpressionSymbol
()
instanceof
TupleExpressionSymbol
){
return
true
;
}
...
...
src/main/java/de/monticore/lang/monticar/cnnarch/_symboltable/ArchitectureSymbol.java
View file @
5f2575c7
...
...
@@ -23,7 +23,13 @@
package
de.monticore.lang.monticar.cnnarch._symboltable
;
import
de.monticore.lang.monticar.cnnarch.helper.ErrorCodes
;
import
de.se_rwth.commons.Joiners
;
import
de.se_rwth.commons.logging.Log
;
import
org.jscience.mathematics.number.Rational
;
import
java.util.List
;
import
java.util.Optional
;
import
java.util.Set
;
public
class
ArchitectureSymbol
extends
ArchitectureSymbolTOP
{
...
...
@@ -31,6 +37,7 @@ public class ArchitectureSymbol extends ArchitectureSymbolTOP {
private
LayerSymbol
body
;
private
List
<
IODeclarationSymbol
>
inputs
;
private
List
<
IODeclarationSymbol
>
outputs
;
private
List
<
VariableSymbol
>
parameters
;
public
ArchitectureSymbol
(
String
name
)
{
super
(
name
);
...
...
@@ -45,7 +52,7 @@ public class ArchitectureSymbol extends ArchitectureSymbolTOP {
return
body
;
}
p
ublic
void
setBody
(
LayerSymbol
body
)
{
p
rotected
void
setBody
(
LayerSymbol
body
)
{
this
.
body
=
body
;
}
...
...
@@ -53,7 +60,7 @@ public class ArchitectureSymbol extends ArchitectureSymbolTOP {
return
inputs
;
}
p
ublic
void
setInputs
(
List
<
IODeclarationSymbol
>
inputs
)
{
p
rotected
void
setInputs
(
List
<
IODeclarationSymbol
>
inputs
)
{
this
.
inputs
=
inputs
;
}
...
...
@@ -61,11 +68,20 @@ public class ArchitectureSymbol extends ArchitectureSymbolTOP {
return
outputs
;
}
p
ublic
void
setOutputs
(
List
<
IODeclarationSymbol
>
outputs
)
{
p
rotected
void
setOutputs
(
List
<
IODeclarationSymbol
>
outputs
)
{
this
.
outputs
=
outputs
;
}
public
List
<
VariableSymbol
>
getParameters
()
{
return
parameters
;
}
protected
void
setParameters
(
List
<
VariableSymbol
>
parameters
)
{
this
.
parameters
=
parameters
;
}
public
void
resolve
(){
checkParameters
();
getBody
().
checkIfResolvable
();
try
{
getBody
().
resolve
();
...
...
@@ -75,6 +91,13 @@ public class ArchitectureSymbol extends ArchitectureSymbolTOP {
}
}
public
void
resolveOrError
(){
resolve
();
if
(!
isResolved
()){
throw
new
IllegalStateException
(
"The following names could not be resolved: "
+
Joiners
.
COMMA
.
join
(
getUnresolvableVariables
()));
}
}
public
List
<
LayerSymbol
>
getFirstLayers
(){
if
(!
getBody
().
isResolved
()){
resolve
();
...
...
@@ -86,7 +109,87 @@ public class ArchitectureSymbol extends ArchitectureSymbolTOP {
return
getBody
().
isResolved
();
}
public
boolean
isResolvable
(){
return
getBody
().
isResolvable
();
}
public
Set
<
VariableSymbol
>
getUnresolvableVariables
(){
return
getBody
().
getUnresolvableVariables
();
}
public
void
checkParameters
(){
for
(
VariableSymbol
parameter
:
getParameters
()){
if
(!
parameter
.
hasExpression
()){
Log
.
error
(
"0"
+
ErrorCodes
.
MISSING_VAR_VALUE_CODE
+
" Missing architecture argument. "
+
"The parameter '"
+
parameter
.
getName
()
+
"' has no value."
);
}
}
}
public
Optional
<
IODeclarationSymbol
>
getInput
(
String
name
){
for
(
IODeclarationSymbol
input
:
getInputs
()){
if
(
input
.
getName
().
equals
(
name
)){
return
Optional
.
of
(
input
);
}
}
return
Optional
.
empty
();
}
public
Optional
<
IODeclarationSymbol
>
getOutput
(
String
name
){
for
(
IODeclarationSymbol
output
:
getOutputs
()){
if
(
output
.
getName
().
equals
(
name
)){
return
Optional
.
of
(
output
);
}
}
return
Optional
.
empty
();
}
public
Optional
<
VariableSymbol
>
getParameter
(
String
name
){
for
(
VariableSymbol
parameter
:
getParameters
()){
if
(
parameter
.
getName
().
equals
(
name
)){
return
Optional
.
of
(
parameter
);
}
}
return
Optional
.
empty
();
}
private
VariableSymbol
getParameterOrError
(
String
name
){
Optional
<
VariableSymbol
>
param
=
getParameter
(
name
);
if
(
param
.
isPresent
()){
return
param
.
get
();
}
else
{
throw
new
IllegalArgumentException
(
"architecture parameter with name "
+
name
+
" does not exist."
);
}
}
public
void
setParameter
(
String
name
,
Rational
value
){
VariableSymbol
parameter
=
getParameterOrError
(
name
);
if
(
value
.
getDivisor
().
intValue
()
==
1
){
parameter
.
setExpression
(
ArchSimpleExpressionSymbol
.
of
(
value
.
getDividend
().
intValue
()));
}
else
{
parameter
.
setExpression
(
ArchSimpleExpressionSymbol
.
of
(
value
.
doubleValue
()));
}
}
public
void
setParameter
(
String
name
,
boolean
value
){
VariableSymbol
parameter
=
getParameterOrError
(
name
);
parameter
.
setExpression
(
ArchSimpleExpressionSymbol
.
of
(
value
));
}
public
void
setParameter
(
String
name
,
int
value
){
VariableSymbol
parameter
=
getParameterOrError
(
name
);
parameter
.
setExpression
(
ArchSimpleExpressionSymbol
.
of
(
value
));
}
public
void
setParameter
(
String
name
,
double
value
){
VariableSymbol
parameter
=
getParameterOrError
(
name
);
parameter
.
setExpression
(
ArchSimpleExpressionSymbol
.
of
(
value
));
}
public
void
setParameter
(
String
name
,
String
value
){
VariableSymbol
parameter
=
getParameterOrError
(
name
);
parameter
.
setExpression
(
ArchSimpleExpressionSymbol
.
of
(
value
));
}
}
src/main/java/de/monticore/lang/monticar/cnnarch/_symboltable/CNNArchLanguage.java
View file @
5f2575c7
...
...
@@ -40,7 +40,7 @@ public class CNNArchLanguage extends CNNArchLanguageTOP {
protected
void
initResolvingFilters
()
{
super
.
initResolvingFilters
();
//addResolvingFilter(CommonResolvingFilter.create(MathExpressionSymbol.KIND));
addResolvingFilter
(
CommonResolvingFilter
.
create
(
ArchitectureSymbol
.
KIND
));
addResolvingFilter
(
new
ArchitectureResolvingFilter
(
));
addResolvingFilter
(
CommonResolvingFilter
.
create
(
MethodDeclarationSymbol
.
KIND
));
addResolvingFilter
(
CommonResolvingFilter
.
create
(
LayerSymbol
.
KIND
));
addResolvingFilter
(
CommonResolvingFilter
.
create
(
VariableSymbol
.
KIND
));
...
...
src/main/java/de/monticore/lang/monticar/cnnarch/_symboltable/CNNArchSymbolTableCreator.java
View file @
5f2575c7
...
...
@@ -94,7 +94,6 @@ public class CNNArchSymbolTableCreator extends de.monticore.symboltable.CommonSy
}
}
@Override
public
void
visit
(
final
ASTCNNArchCompilationUnit
compilationUnit
)
{
Log
.
debug
(
"Building Symboltable for Script: "
+
compilationUnit
.
getArchitecture
().
getName
(),
...
...
@@ -131,6 +130,12 @@ public class CNNArchSymbolTableCreator extends de.monticore.symboltable.CommonSy
architecture
.
setInputs
(
inputs
);
architecture
.
setOutputs
(
outputs
);
List
<
VariableSymbol
>
parameters
=
new
ArrayList
<>(
node
.
getArchitectureParameters
().
size
());
for
(
ASTArchitectureParameter
astParameter
:
node
.
getArchitectureParameters
()){
parameters
.
add
((
VariableSymbol
)
astParameter
.
getSymbol
().
get
());
}
architecture
.
setParameters
(
parameters
);
removeCurrentScope
();
}
...
...
@@ -145,6 +150,17 @@ public class CNNArchSymbolTableCreator extends de.monticore.symboltable.CommonSy
}
}
@Override