Commit f7e5492d authored by peastman's avatar peastman
Browse files

Fixed errors in wrapper generation related to TabulatedFunctions

parent 3279c73a
...@@ -42,7 +42,7 @@ def getText(subNodePath, node): ...@@ -42,7 +42,7 @@ def getText(subNodePath, node):
def convertOpenMMPrefix(name): def convertOpenMMPrefix(name):
return name.replace('OpenMM::', 'OpenMM_') return name.replace('OpenMM::', 'OpenMM_')
OPENMM_RE_PATTERN=re.compile("(.*)OpenMM:[a-zA-Z:]*:(.*)") OPENMM_RE_PATTERN=re.compile("(.*)OpenMM:[a-zA-Z0-9_:]*:(.*)")
def stripOpenMMPrefix(name, rePattern=OPENMM_RE_PATTERN): def stripOpenMMPrefix(name, rePattern=OPENMM_RE_PATTERN):
try: try:
m=rePattern.search(name) m=rePattern.search(name)
...@@ -123,6 +123,8 @@ class WrapperGenerator: ...@@ -123,6 +123,8 @@ class WrapperGenerator:
methodName = shortMethodDefinition.split()[-1] methodName = shortMethodDefinition.split()[-1]
if className+'::'+methodName in self.skipMethods: if className+'::'+methodName in self.skipMethods:
continue continue
if any(getNodeText(node) == "Deprecated" for node in findNodes(memberNode, "detaileddescription/para/xrefsect/xreftitle")):
continue # Skip deprecated methods
methodList.append(memberNode) methodList.append(memberNode)
return methodList return methodList
......
...@@ -155,6 +155,7 @@ UNITS = { ...@@ -155,6 +155,7 @@ UNITS = {
("*", "getErrorTolerance") : (None, ()), ("*", "getErrorTolerance") : (None, ()),
("*", "getEwaldErrorTolerance") : (None, ()), ("*", "getEwaldErrorTolerance") : (None, ()),
("*", "getFriction") : ("1/unit.picosecond", ()), ("*", "getFriction") : ("1/unit.picosecond", ()),
("*", "getFunction") : (None, ()),
("*", "getGlobalVariable") : (None, ()), ("*", "getGlobalVariable") : (None, ()),
("*", "getIntegrator") : (None, ()), ("*", "getIntegrator") : (None, ()),
("*", "getMapParameters") : (None, ()), ("*", "getMapParameters") : (None, ()),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment