[Vm-dev] VM Maker: VMMaker.oscog-nice.1826.mcz

[commits at source.squeak.org]

Nicolas Cellier uploaded a new version of VMMaker to project VM Maker:
http://source.squeak.org/VMMaker/VMMaker.oscog-nice.1826.mcz

==================== Summary ====================

Name: VMMaker.oscog-nice.1826
Author: nice
Time: 20 April 2016, 11:35:53.1 am
UUID: e934173c-a640-fb47-b5ae-b1d706f566b9
Ancestors: VMMaker.oscog-nice.1825

When loading VMMaker, avoid dependency on this setting (Scanner prefAllowUnderscoreSelectors)

=============== Diff against VMMaker.oscog-nice.1825 ===============

Item was changed:
  ----- Method: MacMenubarPlugin>>primitiveCreateStandardWindowMenu: (in category 'system primitives') -----
  primitiveCreateStandardWindowMenu: inOptions 
  	<var: #menuHandle type: #MenuHandle>
  	| menuHandle result |
  	self primitive: 'primitiveCreateStandardWindowMenu'
  		parameters: #(SmallInteger).
+ 	self cppIf: #'TARGET_API_MAC_CARBON'
- 	self cppIf: #TARGET_API_MAC_CARBON
  		ifTrue: [result := self cCode: 'CreateStandardWindowMenu(inOptions,&menuHandle);' inSmalltalk:[0]].
  	^interpreterProxy positiveMachineIntegerFor: (self cCoerce: menuHandle to: 'long')!

Item was changed:
  ----- Method: MacMenubarPlugin>>primitiveDisableMenuCommand:item: (in category 'system primitives') -----
  primitiveDisableMenuCommand: menuHandleOop item: anInteger
  	<var: #menuHandle type: #MenuHandle>
  	<var: #commandID type: #MenuCommand>
  	| menuHandle commandID |
  	self primitive: 'primitiveDisableMenuCommand'
  		parameters: #(Oop Oop).
  	menuHandle := self cCoerce: (interpreterProxy positiveMachineIntegerValueOf: menuHandleOop) to: #MenuHandle.
  	commandID := self cCoerce: (interpreterProxy positive32BitValueOf: anInteger) to: #MenuCommand.
  	(self ioCheckMenuHandle: menuHandle) ifFalse: [^interpreterProxy success: false].
+ 	self cppIf: #'TARGET_API_MAC_CARBON'
- 	self cppIf: #TARGET_API_MAC_CARBON
  		ifTrue: [self cCode: 'DisableMenuCommand(menuHandle,commandID);' inSmalltalk: [menuHandle]].
  	^nil
  !

Item was changed:
  ----- Method: MacMenubarPlugin>>primitiveDisposeMenuBar: (in category 'system primitives') -----
  primitiveDisposeMenuBar: menuHandleOop 
  	<var: #menuBarHandle type: #Handle>
  	| menuBarHandle |
  	self primitive: 'primitiveDisposeMenuBar'
  		parameters: #(Oop).
  	menuBarHandle := self cCoerce: (interpreterProxy positive32BitValueOf: menuHandleOop) to: #Handle.
+ 	self cppIf: #'TARGET_API_MAC_CARBON'
- 	self cppIf: #TARGET_API_MAC_CARBON
  		ifTrue: [self cCode: 'DisposeMenuBar(menuBarHandle);' inSmalltalk: [menuBarHandle]]
  		ifFalse: [self cCode: 'DisposeHandle(menuBarHandle);' inSmalltalk: [menuBarHandle]].
  	^nil
  !

Item was changed:
  ----- Method: MacMenubarPlugin>>primitiveEnableMenuCommand:item: (in category 'system primitives') -----
  primitiveEnableMenuCommand: menuHandleOop item: anInteger
  	<var: #menuHandle type: #MenuHandle>
  	<var: #commandID type: #MenuCommand>
  	| menuHandle commandID |
  	self primitive: 'primitiveEnableMenuCommand'
  		parameters: #(Oop Oop).
  	menuHandle := self cCoerce: (interpreterProxy positiveMachineIntegerValueOf: menuHandleOop) to: #MenuHandle.
  	commandID := self cCoerce: (interpreterProxy positive32BitValueOf: anInteger) to: #MenuCommand.
  	(self ioCheckMenuHandle: menuHandle) ifFalse: [^interpreterProxy success: false].
+ 	self cppIf: #'TARGET_API_MAC_CARBON'
- 	self cppIf: #TARGET_API_MAC_CARBON
  		ifTrue: [self cCode: 'EnableMenuCommand(menuHandle,commandID);' inSmalltalk: [menuHandle]].
  	^nil!

Item was changed:
  ----- Method: MacMenubarPlugin>>primitiveGetIndMenuItemWithCommandID:commandID: (in category 'system primitives') -----
  primitiveGetIndMenuItemWithCommandID: menuHandleOop commandID: aCommandID
  	<var: #menuHandle type: #MenuHandle>
  	<var: #commandID type: #MenuCommand>
  	<var: #applicationMenu type: #MenuHandle>
  	<var: #outIndex type: #MenuItemIndex>
  	| menuHandle commandID applicationMenu outIndex |
  	self primitive: 'primitiveGetIndMenuItemWithCommandID'
  		parameters: #(Oop Oop).
  	menuHandle := self cCoerce: (interpreterProxy positiveMachineIntegerValueOf: menuHandleOop) to: #MenuHandle.
  	commandID := self cCoerce: (interpreterProxy positive32BitValueOf: aCommandID) to: #MenuCommand.
  	(self ioCheckMenuHandle: menuHandle) ifFalse: [^interpreterProxy success: false].
+ 	self cppIf: #'TARGET_API_MAC_CARBON'
- 	self cppIf: #TARGET_API_MAC_CARBON
  		ifTrue: [self cCode: 'GetIndMenuItemWithCommandID(menuHandle, kHICommandHide, 1,
                     &applicationMenu, &outIndex);' inSmalltalk: [menuHandle]].
  	^outIndex asSmallIntegerObj
  !

Item was changed:
  ----- Method: MacMenubarPlugin>>primitiveGetIndMenuWithCommandID:commandID: (in category 'system primitives') -----
  primitiveGetIndMenuWithCommandID: menuHandleOop commandID: aCommandID
  	<var: #menuHandle type: #MenuHandle>
  	<var: #commandID type: #MenuCommand>
  	<var: #applicationMenu type: #MenuHandle>
  	<var: #outIndex type: #MenuItemIndex>
  	| menuHandle commandID applicationMenu outIndex |
  	self primitive: 'primitiveGetIndMenuWithCommandID'
  		parameters: #(Oop Oop).
  	menuHandle := self cCoerce: (interpreterProxy positiveMachineIntegerValueOf: menuHandleOop) to: 'MenuHandle'.
  	commandID := self cCoerce: (interpreterProxy positive32BitValueOf: aCommandID) to: 'MenuCommand'.
  	(self ioCheckMenuHandle: menuHandle) ifFalse: [^interpreterProxy success: false].
+ 	self cppIf: #'TARGET_API_MAC_CARBON'
- 	self cppIf: #TARGET_API_MAC_CARBON
  		ifTrue: [self cCode: 'GetIndMenuItemWithCommandID(menuHandle, kHICommandHide, 1,
                     &applicationMenu, &outIndex);' inSmalltalk: [menuHandle]].
  	outIndex asSmallIntegerObj. "to avoid elimination of the variable..."
  	^interpreterProxy positiveMachineIntegerFor: (self cCoerce: applicationMenu to: 'long')
  
  !