Skip to content
Snippets Groups Projects
Commit d5dc8ceb authored by Thomas Jahns's avatar Thomas Jahns :cartwheel:
Browse files

Replace string interpolation with concatenation.

parent 6856f591
No related branches found
No related tags found
No related merge requests found
...@@ -645,41 +645,40 @@ def defineFunction(name, arguments, returnType) ...@@ -645,41 +645,40 @@ def defineFunction(name, arguments, returnType)
if !returnTemplate[:isVoid] if !returnTemplate[:isVoid]
formatLines($definitionLines, 2, returnData.expandTemplate(:helperVars)) formatLines($definitionLines, 2, returnData.expandTemplate(:helperVars))
end end
formatLines($definitionLines, 2, "interface") formatLines($definitionLines, 2, 'interface')
if returnTemplate[:isVoid] line=subprogramtype + ' lib_' + name + '(' + dummyArguments + ') ' +
formatLines($definitionLines, 3, "subroutine lib_#{name}(#{dummyArguments}) bind(c, name = '#{name}')") 'bind(c, name = \'' + name + '\')' +
formatLines($definitionLines, 4, importStatement("", argArray)) (returnTemplate[:isVoid] ? '' : ' result(c_result)')
else formatLines($definitionLines, 3, line)
formatLines($definitionLines, 3, formatLines($definitionLines, 4,
"function lib_#{name}(#{dummyArguments}) bind(c, name = '#{name}')" + importStatement(returnTemplate[:isVoid] ? '' :
' result(c_result)') returnData.expandTemplate(:receiveAs), argArray))
formatLines($definitionLines, 4, if !returnTemplate[:isVoid]
importStatement(returnData.expandTemplate(:receiveAs), argArray))
formatLines($definitionLines, 4, formatLines($definitionLines, 4,
returnData.expandTemplate(:receiveAs) + ' :: c_result') returnData.expandTemplate(:receiveAs) + ' :: c_result')
end end
dumpStatements( 4, argArray, :passAs) dumpStatements( 4, argArray, :passAs)
formatLines($definitionLines, 3, "end #{subprogramtype} lib_#{name}") formatLines($definitionLines, 3, 'end ' + subprogramtype + ' lib_' + name)
formatLines($definitionLines, 2, "end interface") formatLines($definitionLines, 2, 'end interface')
dumpStatements( 2, argArray, :precallStatements) dumpStatements( 2, argArray, :precallStatements)
if returnTemplate[:isVoid] if !returnTemplate[:isVoid]
formatLines($definitionLines, 2, "call lib_#{name}(#{argArray.collect{ |arg| formatLines($definitionLines, 2,
arg.expandTemplate(:callExpression) returnData.expandTemplate(:precallStatements))
}.join(", ")})")
else
formatLines($definitionLines, 2, returnData.expandTemplate(:precallStatements))
formatLines($definitionLines, 2, "#{returnData.expandTemplate(:assignVariable)} = lib_#{name}(#{argArray.collect{ |arg|
arg.expandTemplate(:callExpression)
}.join(", ")})")
end end
formatLines($definitionLines, 2,
(returnTemplate[:isVoid] ? 'call' :
(returnData.expandTemplate(:assignVariable) + ' =')) +
' lib_' + name + '(' + argArray.collect{ |arg|
arg.expandTemplate(:callExpression)
}.join(', ') + ')')
dumpStatements( 2, argArray, :postcallStatements) dumpStatements( 2, argArray, :postcallStatements)
if !returnTemplate[:isVoid] if !returnTemplate[:isVoid]
formatLines($definitionLines, 2, formatLines($definitionLines, 2,
returnData.expandTemplate(:postcallStatements)) returnData.expandTemplate(:postcallStatements))
end end
formatLines($definitionLines, 1, "end #{subprogramtype} #{name}") formatLines($definitionLines, 1, 'end ' + subprogramtype + ' ' + name)
formatLines($definitionLines, 0, "") formatLines($definitionLines, 0, '')
formatLines($declarationLines, 1, "public #{name}") formatLines($declarationLines, 1, 'public ' + name)
end end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment