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
Tagging
Commits
0eaf25f7
Commit
0eaf25f7
authored
May 21, 2018
by
Alexander David Hellwig
Browse files
Added Range syntax for NameScope
parent
f0e3328d
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/main/grammars/de/monticore/lang/Tagging.mc4
View file @
0eaf25f7
...
...
@@ -32,10 +32,16 @@ grammar Tagging extends de.monticore.common.Common {
fragment
token
Recursion
=
'{'
(~(
'{'
|
'}'
|
'"'
)
|
String
|
Recursion
)+
'}'
;
fragment
token
TagToken
=
(~(
'"'
|
'{'
|
'}'
|
';'
))+;
NameWithArray
=
(
Name
(
"["
IntLiteral
"]"
)?);
NameWithArray
=
(
Name
(
"["
start
:
IntLiteral
((
":"
step
:
IntLiteral
)?
":"
end
:
IntLiteral
)?
"]"
)?);
ast
NameWithArray
=
method
public
String
toString
(){
return
name
+
(
intLiteral
.
isPresent
()
?
"["
+
intLiteral
.
get
().
getValue
()
+
"]"
:
""
);
String
arrayPart
=
""
;
arrayPart
+=
start
.
isPresent
()
?
""
+
start
.
get
().
getValue
()
:
""
;
arrayPart
+=
step
.
isPresent
()
?
":"
+
step
.
get
().
getValue
()
:
""
;
arrayPart
+=
end
.
isPresent
()
?
":"
+
end
.
get
().
getValue
()
:
""
;
return
name
+
(
arrayPart
.
equals
(
""
)
?
""
:
"["
+
arrayPart
+
"]"
);
};
QualifiedNameWithArray
=
parts
:(
NameWithArray
||
"."
)+;
...
...
src/main/java/de/monticore/lang/tagging/_symboltable/TaggingResolver.java
View file @
0eaf25f7
...
...
@@ -37,8 +37,9 @@ import java.util.Set;
import
java.util.function.Predicate
;
import
de.monticore.ast.ASTNode
;
import
de.monticore.lang.tagging._ast.
ASTTaggingUnit
;
import
de.monticore.lang.tagging._ast.
*
;
import
de.monticore.lang.tagging._parser.TaggingParser
;
import
de.monticore.lang.tagging.helper.RangeFixer
;
import
de.monticore.symboltable.CommonScope
;
import
de.monticore.symboltable.MutableScope
;
import
de.monticore.symboltable.Scope
;
...
...
@@ -130,6 +131,7 @@ public class TaggingResolver implements Scope {
}
if
(
ast
.
isPresent
())
{
// todo check package conformity
RangeFixer
.
fixTaggingUnit
(
ast
.
get
());
foundModels
.
add
(
ast
.
get
());
}
});
...
...
src/main/java/de/monticore/lang/tagging/helper/RangeFixer.java
0 → 100644
View file @
0eaf25f7
/**
*
* ******************************************************************************
* 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.tagging.helper
;
import
com.google.common.collect.Lists
;
import
de.monticore.lang.tagging._ast.*
;
import
de.monticore.literals.literals._ast.ASTIntLiteral
;
import
java.util.ArrayList
;
import
java.util.Collection
;
import
java.util.List
;
import
java.util.stream.Collectors
;
public
class
RangeFixer
{
private
RangeFixer
()
{
}
public
static
void
fixTaggingUnit
(
ASTTaggingUnit
astTaggingUnit
)
{
//Replace all range syntax scopes with expanded versions
astTaggingUnit
.
getTagBody
().
getTags
()
.
forEach
(
tag
->
{
List
<
ASTScope
>
fixedScopes
=
tag
.
getScopes
().
stream
()
.
map
(
RangeFixer:
:
expandScopeWithRange
)
.
flatMap
(
Collection:
:
stream
)
.
collect
(
Collectors
.
toList
());
tag
.
setScopes
(
fixedScopes
);
});
}
public
static
List
<
ASTScope
>
expandScopeWithRange
(
ASTScope
scope
)
{
if
(
scope
.
getScopeKind
().
equals
(
"NameScope"
))
{
ASTNameScope
nameScope
=
(
ASTNameScope
)
scope
;
List
<
ASTQualifiedNameWithArray
>
qualifiedNames
=
new
ArrayList
<>();
//add empty start name
qualifiedNames
.
add
(
ASTQualifiedNameWithArray
.
getBuilder
().
build
());
for
(
ASTNameWithArray
part
:
nameScope
.
getQualifiedName
().
getParts
())
{
List
<
ASTNameWithArray
>
expandedParts
=
expandRangeInPart
(
part
);
List
<
ASTQualifiedNameWithArray
>
expandedNames
=
new
ArrayList
<>();
for
(
ASTNameWithArray
ep
:
expandedParts
)
{
for
(
ASTQualifiedNameWithArray
name
:
qualifiedNames
)
{
ASTQualifiedNameWithArray
tmpName
=
name
.
deepClone
();
tmpName
.
getParts
().
add
(
ep
);
expandedNames
.
add
(
tmpName
);
}
}
qualifiedNames
=
expandedNames
;
}
return
qualifiedNames
.
stream
().
map
(
name
->
ASTNameScope
.
getBuilder
().
qualifiedName
(
name
).
build
()).
collect
(
Collectors
.
toList
());
}
else
{
return
Lists
.
newArrayList
(
scope
);
}
}
public
static
List
<
ASTNameWithArray
>
expandRangeInPart
(
ASTNameWithArray
part
)
{
//Not a range
if
(!
part
.
getStart
().
isPresent
()
||
!
part
.
getEnd
().
isPresent
())
{
return
Lists
.
newArrayList
(
part
);
}
List
<
ASTNameWithArray
>
result
=
new
ArrayList
<>();
int
step
=
part
.
getStep
().
isPresent
()
?
part
.
getStep
().
get
().
getValue
()
:
1
;
int
start
=
part
.
getStart
().
get
().
getValue
();
int
end
=
part
.
getEnd
().
get
().
getValue
();
for
(
int
i
=
start
;
i
<=
end
;
i
+=
step
)
{
ASTNameWithArray
tmpNameWithArray
=
ASTNameWithArray
.
getBuilder
()
.
name
(
part
.
getName
())
.
start
(
ASTIntLiteral
.
getBuilder
().
source
(
""
+
i
).
build
())
.
build
();
result
.
add
(
tmpNameWithArray
);
}
return
result
;
}
}
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