[Python-checkins] python/dist/src/Tools/bgen/bgen bgenType.py,1.11,1.11.4.1 macsupport.py,1.29,1.29.4.1

[jackjansen@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Tools/bgen/bgen
In directory sc8-pr-cvs1:/tmp/cvs-serv28363/Tools/bgen/bgen

Modified Files:
      Tag: getargs_mask_mods
	bgenType.py macsupport.py 
Log Message:
Fixes for the new PyArg_ParseTuple k and K format chars, and the
changed semantics of h. Only lightly tested, but the IDE works
again.

These changes may not be needed anymore now that the semantic change
to h has been reverted, so I'm checking it in on a branch.


Index: bgenType.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/bgen/bgen/bgenType.py,v
retrieving revision 1.11
retrieving revision 1.11.4.1
diff -C2 -d -r1.11 -r1.11.4.1
*** bgenType.py	24 Jan 2003 09:23:13 -0000	1.11
--- bgenType.py	18 Apr 2003 08:58:30 -0000	1.11.4.1
***************
*** 140,148 ****
  void = None
  char = Type("char", "c")
! short = Type("short", "h")
  unsigned_short = Type("unsigned short", "H")
  int = Type("int", "i")
  long = Type("long", "l")
! unsigned_long = Type("unsigned long", "l")
  float = Type("float", "f")
  double = Type("double", "d")
--- 140,148 ----
  void = None
  char = Type("char", "c")
! short = Type("short", "H")
  unsigned_short = Type("unsigned short", "H")
  int = Type("int", "i")
  long = Type("long", "l")
! unsigned_long = Type("unsigned long", "k")
  float = Type("float", "f")
  double = Type("double", "d")

Index: macsupport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/bgen/bgen/macsupport.py,v
retrieving revision 1.29
retrieving revision 1.29.4.1
diff -C2 -d -r1.29 -r1.29.4.1
*** macsupport.py	19 Jan 2003 21:53:57 -0000	1.29
--- macsupport.py	18 Apr 2003 08:58:30 -0000	1.29.4.1
***************
*** 12,36 ****
  # Simple types
  Boolean = Type("Boolean", "b")
! SignedByte = Type("SignedByte", "b")
  Size = Type("Size", "l")
! Style = Type("Style", "b")
! StyleParameter = Type("StyleParameter", "h")
! CharParameter = Type("CharParameter", "h")
! TextEncoding = Type("TextEncoding", "l")
! ByteCount = Type("ByteCount", "l")
! Duration = Type("Duration", "l")
! ByteOffset = Type("ByteOffset", "l")
! OptionBits = Type("OptionBits", "l")
! ItemCount = Type("ItemCount", "l")
! PBVersion = Type("PBVersion", "l")
! ScriptCode = Type("ScriptCode", "h")
! LangCode = Type("LangCode", "h")
! RegionCode = Type("RegionCode", "h")
  
  UInt8 = Type("UInt8", "b")
! SInt8 = Type("SInt8", "b")
  UInt16 = Type("UInt16", "H")
! SInt16 = Type("SInt16", "h")
! UInt32 = Type("UInt32", "l")
  SInt32 = Type("SInt32", "l")
  Float32 = Type("Float32", "f")
--- 12,36 ----
  # Simple types
  Boolean = Type("Boolean", "b")
! SignedByte = Type("SignedByte", "B")
  Size = Type("Size", "l")
! Style = Type("Style", "B")
! StyleParameter = Type("StyleParameter", "H")
! CharParameter = Type("CharParameter", "H")
! TextEncoding = Type("TextEncoding", "k")
! ByteCount = Type("ByteCount", "k")
! Duration = Type("Duration", "k")
! ByteOffset = Type("ByteOffset", "k")
! OptionBits = Type("OptionBits", "k")
! ItemCount = Type("ItemCount", "k")
! PBVersion = Type("PBVersion", "k")
! ScriptCode = Type("ScriptCode", "H")
! LangCode = Type("LangCode", "H")
! RegionCode = Type("RegionCode", "H")
  
  UInt8 = Type("UInt8", "b")
! SInt8 = Type("SInt8", "B")
  UInt16 = Type("UInt16", "H")
! SInt16 = Type("SInt16", "H")
! UInt32 = Type("UInt32", "k")
  SInt32 = Type("SInt32", "l")
  Float32 = Type("Float32", "f")
***************
*** 108,113 ****
          Output("if (%s != noErr) return PyMac_Error(%s);", name, name)
          self.used = 1
! OSErr = OSErrType("OSErr", 'h')
! OSStatus = OSErrType("OSStatus", 'l')
  
  
--- 108,113 ----
          Output("if (%s != noErr) return PyMac_Error(%s);", name, name)
          self.used = 1
! OSErr = OSErrType("OSErr", 'H')
! OSStatus = OSErrType("OSStatus", 'k')