Fixed bug in optional argument error checking (and generated all

suites anew).

Mac/Lib/toolbox/AppleScript_Suite.py

@@ -43,9 +43,9 @@ class AppleScript_Suite:
 		_code = 'misc'
 		_subcode = 'actv'
 
+		if _arguments: raise TypeError, 'No optional args expected'
 		if _no_object != None: raise TypeError, 'No direct arg expected'
 
-		if _arguments: raise TypeError, 'No optional args expected'
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
@@ -63,9 +63,9 @@ class AppleScript_Suite:
 		_code = 'ascr'
 		_subcode = 'cmnt'
 
+		if _arguments: raise TypeError, 'No optional args expected'
 		_arguments['----'] = _object
 
-		if _arguments: raise TypeError, 'No optional args expected'
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
@@ -82,9 +82,9 @@ class AppleScript_Suite:
 		_code = 'ToyS'
 		_subcode = 'log0'
 
+		if _arguments: raise TypeError, 'No optional args expected'
 		if _no_object != None: raise TypeError, 'No direct arg expected'
 
-		if _arguments: raise TypeError, 'No optional args expected'
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
@@ -101,9 +101,9 @@ class AppleScript_Suite:
 		_code = 'ToyS'
 		_subcode = 'log1'
 
+		if _arguments: raise TypeError, 'No optional args expected'
 		if _no_object != None: raise TypeError, 'No direct arg expected'
 
-		if _arguments: raise TypeError, 'No optional args expected'
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
@@ -120,9 +120,9 @@ class AppleScript_Suite:
 		_code = 'misc'
 		_subcode = 'copy'
 
+		if _arguments: raise TypeError, 'No optional args expected'
 		if _no_object != None: raise TypeError, 'No direct arg expected'
 
-		if _arguments: raise TypeError, 'No optional args expected'
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
@@ -141,9 +141,9 @@ class AppleScript_Suite:
 		_code = 'misc'
 		_subcode = 'dosc'
 
+		if _arguments: raise TypeError, 'No optional args expected'
 		_arguments['----'] = _object
 
-		if _arguments: raise TypeError, 'No optional args expected'
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
@@ -161,9 +161,9 @@ class AppleScript_Suite:
 		_code = 'misc'
 		_subcode = 'idle'
 
+		if _arguments: raise TypeError, 'No optional args expected'
 		if _no_object != None: raise TypeError, 'No direct arg expected'
 
-		if _arguments: raise TypeError, 'No optional args expected'
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
@@ -181,9 +181,9 @@ class AppleScript_Suite:
 		_code = 'ascr'
 		_subcode = 'noop'
 
+		if _arguments: raise TypeError, 'No optional args expected'
 		if _no_object != None: raise TypeError, 'No direct arg expected'
 
-		if _arguments: raise TypeError, 'No optional args expected'
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
@@ -201,9 +201,9 @@ class AppleScript_Suite:
 		_code = 'ascr'
 		_subcode = 'tell'
 
+		if _arguments: raise TypeError, 'No optional args expected'
 		if _no_object != None: raise TypeError, 'No direct arg expected'
 
-		if _arguments: raise TypeError, 'No optional args expected'
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
@@ -221,9 +221,9 @@ class AppleScript_Suite:
 		_code = 'ascr'
 		_subcode = 'tend'
 
+		if _arguments: raise TypeError, 'No optional args expected'
 		if _no_object != None: raise TypeError, 'No direct arg expected'
 
-		if _arguments: raise TypeError, 'No optional args expected'
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
@@ -253,9 +253,9 @@ class AppleScript_Suite:
 		_code = 'ascr'
 		_subcode = 'err '
 
+		aetools.keysubst(_arguments, self._argmap_error)
 		_arguments['----'] = _object
 
-		aetools.keysubst(_arguments, self._argmap_error)
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
@@ -337,9 +337,9 @@ class AppleScript_Suite:
 		_code = 'ascr'
 		_subcode = 'psbr'
 
+		aetools.keysubst(_arguments, self._argmap_Call_a5_subroutine)
 		_arguments['----'] = _object
 
-		aetools.keysubst(_arguments, self._argmap_Call_a5_subroutine)
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
@@ -358,9 +358,9 @@ class AppleScript_Suite:
 		_code = 'ascr'
 		_subcode = '=   '
 
+		if _arguments: raise TypeError, 'No optional args expected'
 		_arguments['----'] = _object
 
-		if _arguments: raise TypeError, 'No optional args expected'
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
@@ -379,9 +379,9 @@ class AppleScript_Suite:
 		_code = 'ascr'
 		_subcode = '\255   '
 
+		if _arguments: raise TypeError, 'No optional args expected'
 		_arguments['----'] = _object
 
-		if _arguments: raise TypeError, 'No optional args expected'
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
@@ -400,9 +400,9 @@ class AppleScript_Suite:
 		_code = 'ascr'
 		_subcode = '+   '
 
+		if _arguments: raise TypeError, 'No optional args expected'
 		_arguments['----'] = _object
 
-		if _arguments: raise TypeError, 'No optional args expected'
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
@@ -421,9 +421,9 @@ class AppleScript_Suite:
 		_code = 'ascr'
 		_subcode = '-   '
 
+		if _arguments: raise TypeError, 'No optional args expected'
 		_arguments['----'] = _object
 
-		if _arguments: raise TypeError, 'No optional args expected'
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
@@ -442,9 +442,9 @@ class AppleScript_Suite:
 		_code = 'ascr'
 		_subcode = '*   '
 
+		if _arguments: raise TypeError, 'No optional args expected'
 		_arguments['----'] = _object
 
-		if _arguments: raise TypeError, 'No optional args expected'
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
@@ -463,9 +463,9 @@ class AppleScript_Suite:
 		_code = 'ascr'
 		_subcode = '/   '
 
+		if _arguments: raise TypeError, 'No optional args expected'
 		_arguments['----'] = _object
 
-		if _arguments: raise TypeError, 'No optional args expected'
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
@@ -484,9 +484,9 @@ class AppleScript_Suite:
 		_code = 'ascr'
 		_subcode = 'div '
 
+		if _arguments: raise TypeError, 'No optional args expected'
 		_arguments['----'] = _object
 
-		if _arguments: raise TypeError, 'No optional args expected'
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
@@ -505,9 +505,9 @@ class AppleScript_Suite:
 		_code = 'ascr'
 		_subcode = 'mod '
 
+		if _arguments: raise TypeError, 'No optional args expected'
 		_arguments['----'] = _object
 
-		if _arguments: raise TypeError, 'No optional args expected'
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
@@ -526,9 +526,9 @@ class AppleScript_Suite:
 		_code = 'ascr'
 		_subcode = '^   '
 
+		if _arguments: raise TypeError, 'No optional args expected'
 		_arguments['----'] = _object
 
-		if _arguments: raise TypeError, 'No optional args expected'
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
@@ -547,9 +547,9 @@ class AppleScript_Suite:
 		_code = 'ascr'
 		_subcode = '>   '
 
+		if _arguments: raise TypeError, 'No optional args expected'
 		_arguments['----'] = _object
 
-		if _arguments: raise TypeError, 'No optional args expected'
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
@@ -568,9 +568,9 @@ class AppleScript_Suite:
 		_code = 'ascr'
 		_subcode = '>=  '
 
+		if _arguments: raise TypeError, 'No optional args expected'
 		_arguments['----'] = _object
 
-		if _arguments: raise TypeError, 'No optional args expected'
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
@@ -589,9 +589,9 @@ class AppleScript_Suite:
 		_code = 'ascr'
 		_subcode = '<   '
 
+		if _arguments: raise TypeError, 'No optional args expected'
 		_arguments['----'] = _object
 
-		if _arguments: raise TypeError, 'No optional args expected'
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
@@ -610,9 +610,9 @@ class AppleScript_Suite:
 		_code = 'ascr'
 		_subcode = '<=  '
 
+		if _arguments: raise TypeError, 'No optional args expected'
 		_arguments['----'] = _object
 
-		if _arguments: raise TypeError, 'No optional args expected'
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
@@ -631,9 +631,9 @@ class AppleScript_Suite:
 		_code = 'ascr'
 		_subcode = 'ccat'
 
+		if _arguments: raise TypeError, 'No optional args expected'
 		_arguments['----'] = _object
 
-		if _arguments: raise TypeError, 'No optional args expected'
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
@@ -652,9 +652,9 @@ class AppleScript_Suite:
 		_code = 'ascr'
 		_subcode = 'bgwt'
 
+		if _arguments: raise TypeError, 'No optional args expected'
 		_arguments['----'] = _object
 
-		if _arguments: raise TypeError, 'No optional args expected'
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
@@ -673,9 +673,9 @@ class AppleScript_Suite:
 		_code = 'ascr'
 		_subcode = 'ends'
 
+		if _arguments: raise TypeError, 'No optional args expected'
 		_arguments['----'] = _object
 
-		if _arguments: raise TypeError, 'No optional args expected'
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
@@ -694,9 +694,9 @@ class AppleScript_Suite:
 		_code = 'ascr'
 		_subcode = 'cont'
 
+		if _arguments: raise TypeError, 'No optional args expected'
 		_arguments['----'] = _object
 
-		if _arguments: raise TypeError, 'No optional args expected'
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
@@ -715,9 +715,9 @@ class AppleScript_Suite:
 		_code = 'ascr'
 		_subcode = 'AND '
 
+		if _arguments: raise TypeError, 'No optional args expected'
 		_arguments['----'] = _object
 
-		if _arguments: raise TypeError, 'No optional args expected'
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
@@ -736,9 +736,9 @@ class AppleScript_Suite:
 		_code = 'ascr'
 		_subcode = 'OR  '
 
+		if _arguments: raise TypeError, 'No optional args expected'
 		_arguments['----'] = _object
 
-		if _arguments: raise TypeError, 'No optional args expected'
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
@@ -757,9 +757,9 @@ class AppleScript_Suite:
 		_code = 'ascr'
 		_subcode = 'coer'
 
+		if _arguments: raise TypeError, 'No optional args expected'
 		_arguments['----'] = _object
 
-		if _arguments: raise TypeError, 'No optional args expected'
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
@@ -778,9 +778,9 @@ class AppleScript_Suite:
 		_code = 'ascr'
 		_subcode = 'NOT '
 
+		if _arguments: raise TypeError, 'No optional args expected'
 		_arguments['----'] = _object
 
-		if _arguments: raise TypeError, 'No optional args expected'
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
@@ -799,9 +799,9 @@ class AppleScript_Suite:
 		_code = 'ascr'
 		_subcode = 'neg '
 
+		if _arguments: raise TypeError, 'No optional args expected'
 		_arguments['----'] = _object
 
-		if _arguments: raise TypeError, 'No optional args expected'
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)

Mac/Lib/toolbox/Required_Suite.py

@@ -25,9 +25,9 @@ class Required_Suite:
 		_code = 'aevt'
 		_subcode = 'odoc'
 
+		if _arguments: raise TypeError, 'No optional args expected'
 		_arguments['----'] = _object
 
-		if _arguments: raise TypeError, 'No optional args expected'
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
@@ -45,9 +45,9 @@ class Required_Suite:
 		_code = 'aevt'
 		_subcode = 'pdoc'
 
+		if _arguments: raise TypeError, 'No optional args expected'
 		_arguments['----'] = _object
 
-		if _arguments: raise TypeError, 'No optional args expected'
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
@@ -64,9 +64,9 @@ class Required_Suite:
 		_code = 'aevt'
 		_subcode = 'quit'
 
+		if _arguments: raise TypeError, 'No optional args expected'
 		if _no_object != None: raise TypeError, 'No direct arg expected'
 
-		if _arguments: raise TypeError, 'No optional args expected'
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
@@ -83,9 +83,9 @@ class Required_Suite:
 		_code = 'aevt'
 		_subcode = 'oapp'
 
+		if _arguments: raise TypeError, 'No optional args expected'
 		if _no_object != None: raise TypeError, 'No direct arg expected'
 
-		if _arguments: raise TypeError, 'No optional args expected'
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)

Mac/Lib/toolbox/Standard_Suite.py

@@ -61,9 +61,9 @@ class Standard_Suite:
 		_code = 'core'
 		_subcode = 'qobj'
 
+		aetools.keysubst(_arguments, self._argmap_class_info)
 		_arguments['----'] = _object
 
-		aetools.keysubst(_arguments, self._argmap_class_info)
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
@@ -88,9 +88,9 @@ class Standard_Suite:
 		_code = 'core'
 		_subcode = 'clos'
 
+		aetools.keysubst(_arguments, self._argmap_close)
 		_arguments['----'] = _object
 
-		aetools.keysubst(_arguments, self._argmap_close)
 		aetools.enumsubst(_arguments, 'savo', _Enum_savo)
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
@@ -115,9 +115,9 @@ class Standard_Suite:
 		_code = 'core'
 		_subcode = 'cnte'
 
+		aetools.keysubst(_arguments, self._argmap_count)
 		_arguments['----'] = _object
 
-		aetools.keysubst(_arguments, self._argmap_count)
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
@@ -141,9 +141,9 @@ class Standard_Suite:
 		_code = 'core'
 		_subcode = 'dsiz'
 
+		aetools.keysubst(_arguments, self._argmap_data_size)
 		_arguments['----'] = _object
 
-		aetools.keysubst(_arguments, self._argmap_data_size)
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
@@ -161,9 +161,9 @@ class Standard_Suite:
 		_code = 'core'
 		_subcode = 'delo'
 
+		if _arguments: raise TypeError, 'No optional args expected'
 		_arguments['----'] = _object
 
-		if _arguments: raise TypeError, 'No optional args expected'
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
@@ -187,9 +187,9 @@ class Standard_Suite:
 		_code = 'core'
 		_subcode = 'clon'
 
+		aetools.keysubst(_arguments, self._argmap_duplicate)
 		_arguments['----'] = _object
 
-		aetools.keysubst(_arguments, self._argmap_duplicate)
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
@@ -213,9 +213,9 @@ class Standard_Suite:
 		_code = 'core'
 		_subcode = 'gtei'
 
+		aetools.keysubst(_arguments, self._argmap_event_info)
 		_arguments['----'] = _object
 
-		aetools.keysubst(_arguments, self._argmap_event_info)
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
@@ -234,9 +234,9 @@ class Standard_Suite:
 		_code = 'core'
 		_subcode = 'doex'
 
+		if _arguments: raise TypeError, 'No optional args expected'
 		_arguments['----'] = _object
 
-		if _arguments: raise TypeError, 'No optional args expected'
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
@@ -265,9 +265,9 @@ class Standard_Suite:
 		_code = 'core'
 		_subcode = 'crel'
 
+		aetools.keysubst(_arguments, self._argmap_make)
 		if _no_object != None: raise TypeError, 'No direct arg expected'
 
-		aetools.keysubst(_arguments, self._argmap_make)
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
@@ -291,9 +291,9 @@ class Standard_Suite:
 		_code = 'core'
 		_subcode = 'move'
 
+		aetools.keysubst(_arguments, self._argmap_move)
 		_arguments['----'] = _object
 
-		aetools.keysubst(_arguments, self._argmap_move)
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
@@ -311,9 +311,9 @@ class Standard_Suite:
 		_code = 'aevt'
 		_subcode = 'odoc'
 
+		if _arguments: raise TypeError, 'No optional args expected'
 		_arguments['----'] = _object
 
-		if _arguments: raise TypeError, 'No optional args expected'
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
@@ -331,9 +331,9 @@ class Standard_Suite:
 		_code = 'aevt'
 		_subcode = 'pdoc'
 
+		if _arguments: raise TypeError, 'No optional args expected'
 		_arguments['----'] = _object
 
-		if _arguments: raise TypeError, 'No optional args expected'
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
@@ -355,9 +355,9 @@ class Standard_Suite:
 		_code = 'aevt'
 		_subcode = 'quit'
 
+		aetools.keysubst(_arguments, self._argmap_quit)
 		if _no_object != None: raise TypeError, 'No direct arg expected'
 
-		aetools.keysubst(_arguments, self._argmap_quit)
 		aetools.enumsubst(_arguments, 'savo', _Enum_savo)
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
@@ -383,9 +383,9 @@ class Standard_Suite:
 		_code = 'core'
 		_subcode = 'save'
 
+		aetools.keysubst(_arguments, self._argmap_save)
 		_arguments['----'] = _object
 
-		aetools.keysubst(_arguments, self._argmap_save)
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
@@ -409,9 +409,9 @@ class Standard_Suite:
 		_code = 'core'
 		_subcode = 'gtsi'
 
+		aetools.keysubst(_arguments, self._argmap_suite_info)
 		_arguments['----'] = _object
 
-		aetools.keysubst(_arguments, self._argmap_suite_info)
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)

Mac/scripts/gensuitemodule.py

@@ -311,6 +311,16 @@ def compileevent(fp, event):
 	#
 	fp.write("\t\t_code = %s\n"% `code`)
 	fp.write("\t\t_subcode = %s\n\n"% `subcode`)
+	#
+	# Do keyword name substitution
+	#
+	if arguments:
+		fp.write("\t\taetools.keysubst(_arguments, self._argmap_%s)\n"%funcname)
+	else:
+		fp.write("\t\tif _arguments: raise TypeError, 'No optional args expected'\n")
+	#
+	# Stuff required arg (if there is one) into arguments
+	#
 	if has_arg:
 		fp.write("\t\t_arguments['----'] = _object\n")
 	elif opt_arg:
@@ -320,12 +330,8 @@ def compileevent(fp, event):
 		fp.write("\t\tif _no_object != None: raise TypeError, 'No direct arg expected'\n")
 	fp.write("\n")
 	#
-	# Do key substitution
+	# Do enum-name substitution
 	#
-	if arguments:
-		fp.write("\t\taetools.keysubst(_arguments, self._argmap_%s)\n"%funcname)
-	else:
-		fp.write("\t\tif _arguments: raise TypeError, 'No optional args expected'\n")
 	for a in arguments:
 		if is_enum(a[2]):
 			kname = a[1]