Skip to content

Fixed BasicFBDeclaration algorithm importing. #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
esapaavilainen wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed BasicFBDeclaration algorithm importing. #24

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 52 additions & 1 deletion code/library/src/main/kotlin/org/fbme/lib/iec61499/parser/BasicFBTypeConverter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import org.fbme.lib.iec61499.ecc.ECTransitionCondition
import org.fbme.lib.iec61499.ecc.StateDeclaration
import org.fbme.lib.iec61499.ecc.StateTransition
import org.fbme.lib.st.STFactory
import org.jdom.CDATA
import org.jdom.Element

open class BasicFBTypeConverter(arguments: ConverterArguments) :
Expand Down Expand Up @@ -134,9 +135,16 @@ open class BasicFBTypeConverter(arguments: ConverterArguments) :
if (stBodyElement != null) {
val st = factory.createAlgorithmBody(AlgorithmLanguage.ST)
algorithmDeclaration.body = st
val stText = stBodyElement.getAttributeValue("Text")?.unescapeXML()
var stText = stBodyElement.getAttributeValue("Text")?.unescapeXML()
if (stText != null) {
stAlgorithmConverter.convert(factory, stFactory, algorithmDeclaration, st, stText)
} else {
val content = stBodyElement.content[0] as CDATA
stText = content.text
if (stText != null) {
stText = removeComments(stText.unescapeXML())
stAlgorithmConverter.convert(factory, stFactory, algorithmDeclaration, st, stText)
}
}
}
val otherBodyElement = element.getChild("Other")
Expand All @@ -151,5 +159,48 @@ open class BasicFBTypeConverter(arguments: ConverterArguments) :
}
return algorithmDeclaration
}

private fun removeComments(rawData: String): String {

val cleanedData = StringBuilder(rawData)
var index1 = 0

while (index1 < cleanedData.length) {

if (cleanedData[index1] == '/') {
if (index1 + 1 < cleanedData.length) {
when (cleanedData[index1 + 1]) {
'/' -> {
// Line comment, remove until end of line.
var index2 = cleanedData.indexOf('\n', index1)
// If comment doesn't start a new line though, spare the last linebreak.
if (index1 != 0) {
if (cleanedData[index1 - 1] != '\n') {
index2 -= 1
}
}
if (index2 != -1) {
cleanedData.delete(index1, index2)
} else {
cleanedData.delete(index1, cleanedData.length)
}
}
'*' -> {
// Block comment, remove until "*/".
val endBlockIndex = cleanedData.indexOf("*/", index1 + 2)
if (endBlockIndex != -1) {
cleanedData.delete(index1, endBlockIndex + 2)
} else {
cleanedData.delete(index1, cleanedData.length)
}
}
}
}
}
index1++
}
return cleanedData.toString()
}

}
}