From: <de...@us...> - 2003-05-30 00:55:43
|
Update of /cvsroot/pymerase/pymerase/pymerase/util In directory sc8-pr-cvs1:/tmp/cvs-serv20866 Modified Files: PymeraseType.py Log Message: Added more native types to the native type checker (including varients of int like integer) Added a verb to an error message. Index: PymeraseType.py =================================================================== RCS file: /cvsroot/pymerase/pymerase/pymerase/util/PymeraseType.py,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** PymeraseType.py 9 May 2003 19:11:03 -0000 1.14 --- PymeraseType.py 30 May 2003 00:55:39 -0000 1.15 *************** *** 82,86 **** return maxlength ! NativeTypes = {'python': ('serial', 'String', 'Date', 'float', 'int')} --- 82,86 ---- return maxlength ! NativeTypes = {'python': ('serial', 'String', 'Date', 'float', 'double', 'int.*')} *************** *** 127,131 **** return "character(1)" else: ! raise NotImplementedError("Type %s unknown" % self.type_string) def getPythonTypeStr(self): --- 127,131 ---- return "character(1)" else: ! raise NotImplementedError("Type %s is unknown" % self.type_string) def getPythonTypeStr(self): *************** *** 162,168 **** def isNativeType(self, language="python"): ! """return true if type is a 'native' type of a langage ! """ ! return self.type_string in NativeTypes["python"] --- 162,173 ---- def isNativeType(self, language="python"): ! """return true if type is a 'native' type of a langage ! """ ! for re_string in NativeTypes["python"]: ! if re.match(re_string, self.type_string): ! return 1 ! else: ! return 0 ! #return self.type_string in NativeTypes["python"] |