Skip to content
GitLab
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
TDL Open Source
TOP IDE
Compare revisions
18898793969983390c5ffcb1652c693be8a20942...49b20ae6cc892258e2f00676468749d5809d4493
Commits (5)
* minor refinements to grammar
· fa1ae874
Philip Makedonski
authored
Jul 01, 2020
fa1ae874
+ tdlan formatter refinements
· ca2830ab
Philip Makedonski
authored
Jul 01, 2020
ca2830ab
+ scoping refinements
· e63cd121
Philip Makedonski
authored
Jul 01, 2020
e63cd121
* catch all exceptions during transformation
· 15caa539
Philip Makedonski
authored
Jul 01, 2020
15caa539
* uri construction refinements
· 49b20ae6
Philip Makedonski
authored
Jul 01, 2020
49b20ae6
Show whitespace changes
Inline
Side-by-side
plugins/org.etsi.mts.tdl.TDLan2/src/org/etsi/mts/tdl/TDLan2.xtext
View file @
49b20ae6
...
...
@@ -572,7 +572,7 @@ Identifier returns ecore::EString:
;
QIdentifier returns ecore::EString:
ID ('.' ID)
+
ID ('.' ID)
*
;
...
...
@@ -603,7 +603,7 @@ ElementImport returns tdl::ElementImport:
|
(importedElement+=[tdl::PackageableElement|Identifier] ( "," importedElement+=[tdl::PackageableElement|Identifier])*)
)
'from' (
importedPackage=[tdl::Package|Identifier] |
importedPackage=[tdl::Package|QIdentifier])
'from' (importedPackage=[tdl::Package|QIdentifier])
('with'
'{'
(comment+=Comment (comment+=Comment)*)?
...
...
plugins/org.etsi.mts.tdl.TDLan2/src/org/etsi/mts/tdl/formatting2/TDLan2Formatter.xtend
View file @
49b20ae6
...
...
@@ -28,6 +28,9 @@ import org.etsi.mts.tdl.PeriodicBehaviour
import
org
.
etsi
.
mts
.
tdl
.
SingleCombinedBehaviour
import
org
.
etsi
.
mts
.
tdl
.
MultipleCombinedBehaviour
import
org
.
etsi
.
mts
.
tdl
.
ExceptionalBehaviour
import
org
.
etsi
.
mts
.
tdl
.
DataUse
import
org
.
etsi
.
mts
.
tdl
.
ParameterBinding
import
org
.
etsi
.
mts
.
tdl
.
DataInstanceUse
class
TDLan2Formatter
extends
AbstractFormatter2
{
...
...
@@ -138,6 +141,8 @@ class TDLan2Formatter extends AbstractFormatter2 {
t
.
format
}
e
.
argument
.
format
for
(
c
:
e
.
getComment
())
{
c
.
format
;
}
...
...
@@ -146,6 +151,33 @@ class TDLan2Formatter extends AbstractFormatter2 {
}
}
def
dispatch
void
format
(
DataUse
e
,
extension
IFormattableDocument
document
)
{
interior
(
e
.
regionFor
.
keyword
(
'('
).
append
[
newLine
],
e
.
regionFor
.
keyword
(
')'
).
prepend
[
newLine
],
[
indent
]
)
for
(
t
:
e
.
argument
)
{
t
.
format
}
for
(
c
:
e
.
getComment
())
{
c
.
format
;
}
for
(
a
:
e
.
getAnnotation
())
{
a
.
format
}
}
def
dispatch
void
format
(
ParameterBinding
e
,
extension
IFormattableDocument
document
)
{
interior
(
e
.
regionFor
.
keyword
(
'('
).
append
[
newLine
],
e
.
regionFor
.
keyword
(
')'
).
prepend
[
newLine
],
[
indent
]
)
e
.
prepend
[
newLine
]
}
def
dispatch
void
format
(
Target
e
,
extension
IFormattableDocument
document
)
{
interior
(
e
.
regionFor
.
keyword
(
'{'
).
append
[
newLine
],
...
...
plugins/org.etsi.mts.tdl.common/src/org/etsi/mts/tdl/scoping/TDLScopeProvider.java
View file @
49b20ae6
...
...
@@ -139,6 +139,9 @@ public class TDLScopeProvider extends AbstractDeclarativeScopeProvider {
}
else
{
//TODO: handle?
}
}
else
{
//TODO: double check
elements
.
addAll
(
c
.
getEndPoint
());
}
// GateReference opposite = ((Message) context).getTarget().get(0).getTargetGate();
...
...
plugins/org.etsi.mts.tdl.rt.ui/src/org/etsi/mts/tdl/tools/rt/ui/handlers/TranslationHandler.java
View file @
49b20ae6
...
...
@@ -85,7 +85,7 @@ public class TranslationHandler extends AbstractHandler {
tr
.
getContents
().
addAll
(
EcoreUtil
.
copyAll
(
r
.
getContents
()));
try
{
tr
.
save
(
null
);
}
catch
(
IO
Exception
e1
)
{
}
catch
(
Exception
e1
)
{
// TODO Auto-generated catch block
e1
.
printStackTrace
();
}
...
...
plugins/org.etsi.mts.tdl.ttcn3.ui/src/org/etsi/mts/tdl/ttcn3/ui/handlers/TransformationHandler.java
View file @
49b20ae6
...
...
@@ -71,7 +71,7 @@ public class TransformationHandler extends AbstractHandler {
Resource
ir
=
rs
.
createResource
(
interimURI
);
transformer
.
transform
(
r
,
ir
);
URI
targetURI
=
URI
.
create
URI
(
uri
.
toString
()+
".ttcn3"
);
URI
targetURI
=
URI
.
create
PlatformResourceURI
(
file
.
getFullPath
()
.
toString
()+
".ttcn3"
,
true
);
Injector
injector
=
Guice
.
createInjector
(
new
de
.
ugoe
.
cs
.
swe
.
TTCN3RuntimeModule
());
XtextResourceSet
resourceSet
=
injector
.
getInstance
(
XtextResourceSet
.
class
);
Resource
tr
=
resourceSet
.
createResource
(
targetURI
);
...
...