diff --git a/src/main/jastadd/base/io/IoPN.relast b/src/main/jastadd/base/io/IoPN.relast index d7095dab2a5b4ab75bb4a0209c28397efe937278..fb0ba30c2bc8751f9169e439dec7f19ded1ea2fa 100644 --- a/src/main/jastadd/base/io/IoPN.relast +++ b/src/main/jastadd/base/io/IoPN.relast @@ -1,12 +1,12 @@ InputSignalBinding : PnObject ::= <TransitionID:String> <InputSignalID:String> <InputSignalValue:int>; OutputSignalBinding : PnObject ::= <PlaceID:String> <OutputSignalID:String> EqualityOM:EqualityOutputMapping* ThresholdOM:ThresholdOutputMapping* RangeOM:RangeOutputMapping*; -abstract TransitionInformation ::= <Location:String> <Type:String> <InputLimit:java.lang.Integer> <OutputLimit:java.lang.Integer> <SubNet:String> <Instance:String>; +abstract TransitionInformation ::= <Location:String> <Type:String> <InputLimit:java.lang.Integer> <OutputLimit:java.lang.Integer> <SubNet:String> <Instance:String> <TraceInfo:String>; TopicTransitionInformation : TransitionInformation ::= <Topic:String>; ServiceTransitionInformation : TransitionInformation ::= <ServiceName:String>; DefaultTransitionInformation : TransitionInformation; -PlaceInformation ::= <Location:String> <Type:String> <SubNet:String> <Instance:String>; +PlaceInformation ::= <Location:String> <Type:String> <SubNet:String> <Instance:String> <TraceInfo:String>; InputSignalTransition : Transition ::= /StaticInputSignalBinding:InputSignalBinding*/ MutualInputSignalBinding:InputSignalBinding* /StaticTransitionInformation:TransitionInformation/ [MutualTransitionInformation:TransitionInformation] /InputSignalClause:Root/; OutputSignalPlace : Place ::= /OutputSignalBinding*/ /StaticPlaceInformation:PlaceInformation/ [MutualPlaceInformation:PlaceInformation]; diff --git a/src/main/jastadd/base/parsing/ToolSpecificsParser.jadd b/src/main/jastadd/base/parsing/ToolSpecificsParser.jadd index 6d255859de7d3f490bcbe0a63467ab3c8c28c4eb..8f0f931021a3be228ea960569adb283b1e33839b 100644 --- a/src/main/jastadd/base/parsing/ToolSpecificsParser.jadd +++ b/src/main/jastadd/base/parsing/ToolSpecificsParser.jadd @@ -356,7 +356,8 @@ aspect ToolSpecificsParser{ for (ToolInfo toolInfo : toolInfos) { if (toolInfo.getFormattedXMLBuffer().indexOf(PnmlConstants.SUBNET_KEY) > 0 || - toolInfo.getFormattedXMLBuffer().indexOf(PnmlConstants.COMMUNICATOR) > 0) { + toolInfo.getFormattedXMLBuffer().indexOf(PnmlConstants.COMMUNICATOR) > 0 || + toolInfo.getFormattedXMLBuffer().indexOf(PnmlConstants.ARC_TYPE_KEY) > 0) { ti = toolInfo; break; }