Vm-dev March 2020

vm-dev@lists.squeakfoundation.org

31 participants
136 discussions

VM Maker: VMMaker-dtl.414.mcz
by commits＠source.squeak.org 02 Mar '20

02 Mar '20

David T. Lewis uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker-dtl.414.mcz ==================== Summary ==================== Name: VMMaker-dtl.414 Author: dtl Time: 1 March 2020, 6:02:04.091 pm UUID: ba7b0d94-ec3e-4744-8fff-788c6b31790d Ancestors: VMMaker-dtl.413 Fix some accumulated breakage in SlangTest. Back out a partial oscog merge by disabling shouldIncludeReceiverAsFirstArgument: test in TSendNode>>argumentsForInliningCodeGenerator: because it is not currently needed and breaks tests. Handle nil args in TSendNode>>printOn:level: to accomodate the hack for oscog cpp compatibility added in VMMaker-dtl.412. Update expectedFailures to identify two tests that document known bugs but for which no fix is available. SlangTest is now green. =============== Diff against VMMaker-dtl.413 =============== Item was changed: + ----- Method: SlangTest>>expectedFailures (in category 'running') ----- - ----- Method: SlangTest>>expectedFailures (in category 'testing') ----- expectedFailures + ^#( + testSetInstanceVariableWithAnAccessorMethod . "inliner limitation, enhancement required" + testIvarShouldNotBeRedeclaredAsLocal . "test added in VMMaker-dtl.278, fix not yet implemented" + testStatementListAsExpression "test added in VMMaker-dtl.386, fix not yet implemented" + )! - ^#( testSetInstanceVariableWithAnAccessorMethod )! Item was changed: ----- Method: TSendNode>>argumentsForInliningCodeGenerator: (in category 'inlining support') ----- argumentsForInliningCodeGenerator: aCodeGen + "^(self shouldIncludeReceiverAsFirstArgument: aCodeGen) - ^(self shouldIncludeReceiverAsFirstArgument: aCodeGen) ifTrue: [{receiver}, arguments] + ifFalse: [arguments]" + + self flag: #FIXME. "above test not currently required, and breaks SlangTests tests" + ^arguments + ! - ifFalse: [arguments]! Item was changed: ----- Method: TSendNode>>printOn:level: (in category 'printing') ----- printOn: aStream level: level | possiblyParenthesize | possiblyParenthesize := [:node :newLevel| (node isSend and: [node selector precedence >= 3]) ifTrue: [aStream nextPut: $(]. node printOn: aStream level: newLevel. (node isSend and: [node selector precedence >= 3]) ifTrue: [aStream nextPut: $)]]. possiblyParenthesize value: receiver value: level. arguments size = 0 ifTrue: [aStream space; nextPutAll: selector. ^self]. selector keywords with: (arguments first: selector numArgs) do: [:keyword :arg | + arg ifNotNil: [ + aStream space; nextPutAll: keyword; space. + possiblyParenthesize value: arg value: level + 1]]! - aStream space; nextPutAll: keyword; space. - possiblyParenthesize value: arg value: level + 1]!

1 0

[OpenSmalltalk/opensmalltalk-vm] 1861db: Rename and hide help menu item
by Fabio Niephaus 01 Mar '20

01 Mar '20

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 1861db582c88417bfe876dc8e47684f3d76d4759 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/1861db582c88417bfe… Author: Fabio Niephaus <code(a)fniephaus.com> Date: 2020-03-01 (Sun, 01 Mar 2020) Changed paths: M platforms/iOS/vm/English.lproj/MainMenu-cg.xib M platforms/iOS/vm/English.lproj/MainMenu-opengl.xib M platforms/iOS/vm/English.lproj/MainMenu.xib Log Message: ----------- Rename and hide help menu item It does not do anything anyway

1 0

[OpenSmalltalk/opensmalltalk-vm] e74e53: Avoid subtracting char * from void *
by Nicolas Cellier 01 Mar '20

01 Mar '20

Branch: refs/heads/compile_legacy_Mac_OS Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: e74e538e006d4da4bd8c67c56d4df05751f5d19e https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/e74e538e006d4da4bd… Author: Nicolas Cellier <nicolas.cellier.aka.nice(a)gmail.com> Date: 2020-03-01 (Sun, 01 Mar 2020) Changed paths: M platforms/Cross/vm/sqMemoryAccess.h Log Message: ----------- Avoid subtracting char * from void * A strict C compiler shall bark. Commit: 7e5456592deb7a67083473c1fdcb419c84aecf43 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/7e5456592deb7a6708… Author: Nicolas Cellier <nicolas.cellier.aka.nice(a)gmail.com> Date: 2020-03-01 (Sun, 01 Mar 2020) Changed paths: M build.macos32x86_legacy/common/Makefile.clangversion M build.macos32x86_legacy/common/Makefile.flags M build.macos32x86_legacy/common/Makefile.rules M build.macos32x86_legacy/common/Makefile.vm Log Message: ----------- Finally compile with a more recent compiler than gcc-4.2 or llvm-gcc-4.2 Note: gcc-4.2 fails to compile the spur VM with an internal error. I guess we ain't gonna get any support for fixing it ;) With XCode 10.3 and XcodeLegacy https://github.com/devernay/xcodelegacy, I could compile on macos 10.14 and run in both osx 10.6 and 10.14 It's not ideal to not be able to compile directly from the target OS, but that's the best we can get for supporting this legacy thing. It's already nice enough to have latest spur VM running on (snow) leopard! Compare: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/596179686af5...7e…

1 0

macOS Window Bugs
by Fabio Niephaus 01 Mar '20

01 Mar '20

Hi Ronie, hi all, Now that I've fixed the fullscreen issues on macOS, I found another problem which I don't understand: I can't close the About panel for some reason. AFAICT this never worked with the new Metal backend. It appears that the window title bar is not initialized correctly, at least it doesn't respond to mouse event. Also, it looks like this is the same reason why the title bar buttons cannot be clicked once the fullscreen mode was triggered via the green fullscreen window button. This seems like something super easy to fix, but I don't know much about macOS UI development. Any help would be appreciated! Best, Fabio

1 0

VM Maker: VMMaker-dtl.413.mcz
by commits＠source.squeak.org 01 Mar '20

01 Mar '20

David T. Lewis uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker-dtl.413.mcz ==================== Summary ==================== Name: VMMaker-dtl.413 Author: dtl Time: 1 March 2020, 12:00:40.233 pm UUID: b2a46b0f-6fd6-4809-b466-a2e230f5e387 Ancestors: VMMaker-dtl.412 Revert one change accidentally included in the previous commit. This is a separate update for checking file system space on image save, and may be included in a future commit along with platform changes. =============== Diff against VMMaker-dtl.412 =============== Item was changed: ----- Method: ContextInterpreter>>writeImageFileIO:embedded: (in category 'image save/restore') ----- writeImageFileIO: imageBytes embedded: embedded | headerStart headerSize f bytesWritten sCWIfn okToWrite | <var: #f type: 'sqImageFile'> <var: #headerStart type: 'squeakFileOffsetType '> <var: #sCWIfn type: 'void *'> "If the security plugin can be loaded, use it to check for write permission. If not, assume it's ok" sCWIfn := self ioLoadFunction: 'secCanWriteImage' From: 'SecurityPlugin'. sCWIfn ~= 0 ifTrue:[okToWrite := self cCode: '((sqInt (*)(void))sCWIfn)()'. okToWrite ifFalse:[^self primitiveFail]]. "local constants" headerStart := 0. headerSize := 16 * objectMemory bytesPerWord. "header size in bytes; do not change!!" - "self sqSpaceForImage: imageName OfSize: imageBytes + 100000" - (self cCode: 'sqImageFileSpaceToSave(imageName, imageBytes + 100000)') - ifFalse: ["file system full" - self success: false. - ^ nil]. - f := self cCode: 'sqImageFileOpen(imageName, "wb")'. f = nil ifTrue: [ "could not open the image file for writing" self success: false. ^ nil]. headerStart := self cCode: 'sqImageFileStartLocation(f,imageName,headerSize+imageBytes)'. self cCode: '/* Note: on Unix systems one could put an exec command here, padded to 512 bytes */'. "position file to start of header" self sqImageFile: f Seek: headerStart. self putLong: (self imageFormatVersion) toFile: f. self putLong: headerSize toFile: f. self putLong: imageBytes toFile: f. self putLong: (objectMemory startOfMemory) toFile: f. self putLong: objectMemory getSpecialObjectsOop toFile: f. self putLong: objectMemory getLastHash toFile: f. self putLong: (self ioScreenSize) toFile: f. self putLong: fullScreenFlag toFile: f. self putLong: extraVMMemory toFile: f. 1 to: 7 do: [:i | self putLong: 0 toFile: f]. "fill remaining header words with zeros" self successful ifFalse: [ "file write or seek failure" self cCode: 'sqImageFileClose(f)'. ^ nil]. "position file after the header" self sqImageFile: f Seek: headerStart + headerSize. "write the image data" bytesWritten := self sqImage: (objectMemory pointerForOop: objectMemory getMemory) write: f size: (self cCode: 'sizeof(unsigned char)') length: imageBytes. self success: bytesWritten = imageBytes. embedded ifFalse: [self setMacFileTypeForImageFile]. + self cCode: 'sqImageFileClose(f)'. - self sqImageFileClose: f. !

1 0

VM Maker: VMMaker-dtl.412.mcz
by commits＠source.squeak.org 01 Mar '20

01 Mar '20

David T. Lewis uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker-dtl.412.mcz ==================== Summary ==================== Name: VMMaker-dtl.412 Author: dtl Time: 1 March 2020, 11:10:22.475 am UUID: ba78d0f8-9d53-4f41-a3de-4c2fd63d0318 Ancestors: VMMaker-dtl.411 VMMaker 4.18.1 Compatibility for oscog versions of the C preprocessor directives. Map oscog versions to the original implementations by fudging the argument lists in code generation. Add unit tests to ensure correct generation of directives and conditionals. Allows oscog branch methods to be loaded and generated without modification. =============== Diff against VMMaker-dtl.411 =============== Item was added: + ----- Method: CCodeGenerator>>generateOscogInlineCppDirective:on:indent: (in category 'C translation') ----- + generateOscogInlineCppDirective: msgNode on: aStream indent: level + "Generate the C code for this message onto the given stream." + + aStream cr; nextPutAll: msgNode args first value.! Item was added: + ----- Method: CCodeGenerator>>generateOscogInlineCppIf:on:indent: (in category 'C translation') ----- + generateOscogInlineCppIf: msgNode on: aStream indent: level + "Generate the C code for this message onto the given stream." + + "Translate cppIf:ifTrue: as if it was isDefined:inSmalltalk:comment:ifTrue: + by adding nil argument entries for the comment node and the Smalltalk + expression node. Compatibility for externally maintained plugins." + msgNode args size = 2 + ifTrue: [| newArgs | + "Expand the arguments array to match that of cppIf:ifTrue:ifFalse: " + newArgs := Array new: 4. + newArgs at: 1 put: (msgNode args at: 1). + newArgs at: 4 put: (msgNode args at: 2). + msgNode + setSelector: msgNode selector + receiver: msgNode receiver + arguments: newArgs]. + self + generateInlineCppIfDef: msgNode + on: aStream + indent: level + ! Item was added: + ----- Method: CCodeGenerator>>generateOscogInlineCppIfElse:on:indent: (in category 'C translation') ----- + generateOscogInlineCppIfElse: msgNode on: aStream indent: level + "Generate the C code for this message onto the given stream." + + "Translate cppIf:ifTrue:ifFalse: as if it was isDefined:inSmalltalk:comment:ifTrue:ifFalse: + by adding nil argument entries for the comment node and the Smalltalk + expression node. Compatibility for externally maintained plugins." + msgNode args size = 3 + ifTrue: [| newArgs | + "Expand the arguments array to match that of cppIf:ifTrue:ifFalse: " + newArgs := Array new: 5. + newArgs at: 1 put: (msgNode args at: 1). + newArgs at: 4 put: (msgNode args at: 2). + newArgs at: 5 put: (msgNode args at: 3). + msgNode + setSelector: msgNode selector + receiver: msgNode receiver + arguments: newArgs]. + self + generateInlineCppIfDefElse: msgNode + on: aStream + indent: level + ! Item was changed: ----- Method: CCodeGenerator>>initializeCTranslationDictionary (in category 'C translation') ----- initializeCTranslationDictionary "Initialize the dictionary mapping message names to actions for C code generation." | pairs | translationDict := Dictionary new: 200. pairs := #( #& #generateAnd:on:indent: #| #generateOr:on:indent: #and: #generateSequentialAnd:on:indent: #or: #generateSequentialOr:on:indent: #not #generateNot:on:indent: #+ #generatePlus:on:indent: #- #generateMinus:on:indent: #negated #generateNegated:on:indent: #* #generateTimes:on:indent: #/ #generateDivide:on:indent: #// #generateDivide:on:indent: #\\ #generateModulo:on:indent: #<< #generateShiftLeft:on:indent: #>> #generateShiftRight:on:indent: #min: #generateMin:on:indent: #max: #generateMax:on:indent: #between:and: #generateBetweenAnd:on:indent: #bitAnd: #generateBitAnd:on:indent: #bitOr: #generateBitOr:on:indent: #bitXor: #generateBitXor:on:indent: #bitShift: #generateBitShift:on:indent: #signedBitShift: #generateSignedBitShift:on:indent: #bitInvert32 #generateBitInvert32:on:indent: #bitClear: #generateBitClear:on:indent: #< #generateLessThan:on:indent: #<= #generateLessThanOrEqual:on:indent: #= #generateEqual:on:indent: #> #generateGreaterThan:on:indent: #>= #generateGreaterThanOrEqual:on:indent: #~= #generateNotEqual:on:indent: #== #generateEqual:on:indent: #~~ #generateNotEqual:on:indent: #isNil #generateIsNil:on:indent: #notNil #generateNotNil:on:indent: #whileTrue: #generateWhileTrue:on:indent: #whileFalse: #generateWhileFalse:on:indent: #whileTrue #generateDoWhileTrue:on:indent: #whileFalse #generateDoWhileFalse:on:indent: #to:do: #generateToDo:on:indent: #to:by:do: #generateToByDo:on:indent: #repeat #generateRepeat:on:indent: #ifTrue: #generateIfTrue:on:indent: #ifFalse: #generateIfFalse:on:indent: #ifTrue:ifFalse: #generateIfTrueIfFalse:on:indent: #ifFalse:ifTrue: #generateIfFalseIfTrue:on:indent: #at: #generateAt:on:indent: #at:put: #generateAtPut:on:indent: #basicAt: #generateAt:on:indent: #basicAt:put: #generateAtPut:on:indent: #integerValueOf: #generateIntegerValueOf:on:indent: #integerObjectOf: #generateIntegerObjectOf:on:indent: #isIntegerObject: #generateIsIntegerObject:on:indent: #cCode: #generateInlineCCode:on:indent: #cCode:inSmalltalk: #generateInlineCCode:on:indent: #cPreprocessorDirective: #generateInlineCPreprocessorDirective:on:indent: #preprocessorExpression: #generateInlineCppDirective:on:indent: #isDefined:inSmalltalk:comment:ifTrue: #generateInlineCppIfDef:on:indent: #isDefined:inSmalltalk:comment:ifTrue:ifFalse: #generateInlineCppIfDefElse:on:indent: #isDefinedTrueExpression:inSmalltalk:comment:ifTrue:ifFalse: #generateInlineCppIfElse:on:indent: + #cPreprocessorDirective: #generateOscogInlineCppDirective:on:indent: "oscog compatibility" + #cppIf:ifTrue:ifFalse: #generateOscogInlineCppIfElse:on:indent: "oscog compatibility" + #cppIf:ifTrue: #generateOscogInlineCppIf:on:indent: "oscog compatibility" #cCoerce:to: #generateCCoercion:on:indent: #cCoerceSimple:to: #generateCCoercion:on:indent: #addressOf: #generateAddressOf:on:indent: #signedIntFromLong #generateSignedIntFromLong:on:indent: #signedIntToLong #generateSignedIntToLong:on:indent: #signedIntFromShort #generateSignedIntFromShort:on:indent: #signedIntToShort #generateSignedIntToShort:on:indent: #preIncrement #generatePreIncrement:on:indent: #preDecrement #generatePreDecrement:on:indent: #inline: #generateInlineDirective:on:indent: #asFloat #generateAsFloat:on:indent: #asInteger #generateAsInteger:on:indent: #asIntegerPtr #generateAsIntegerPtr:on:indent: #asUnsignedInteger #generateAsUnsignedInteger:on:indent: #asUnsignedIntegerPtr #generateAsUnsignedIntegerPtr:on:indent: #asLong #generateAsLong:on:indent: #asUnsignedLong #generateAsUnsignedLong:on:indent: #asUnsignedLongLong #generateAsUnsignedLongLong:on:indent: #asVoidPointer #generateAsVoidPointer:on:indent: #asSymbol #generateAsSymbol:on:indent: #flag: #generateFlag:on:indent: #anyMask: #generateBitAnd:on:indent: #raisedTo: #generateRaisedTo:on:indent: #touch: #generateTouch:on:indent: #bytesPerWord #generateBytesPerWord:on:indent: #baseHeaderSize #generateBaseHeaderSize:on:indent: #sharedCodeNamed:inCase: #generateSharedCodeDirective:on:indent: #perform: #generatePerform:on:indent: #perform:with: #generatePerform:on:indent: #perform:with:with: #generatePerform:on:indent: #perform:with:with:with: #generatePerform:on:indent: #perform:with:with:with:with: #generatePerform:on:indent: #perform:with:with:with:with:with: #generatePerform:on:indent: #value #generateValue:on:indent: #value: #generateValue:on:indent: #value:value: #generateValue:on:indent: #shouldNotImplement #generateSmalltalkMetaError:on:indent: #shouldBeImplemented #generateSmalltalkMetaError:on:indent: ). 1 to: pairs size by: 2 do: [:i | translationDict at: (pairs at: i) put: (pairs at: i + 1)]. pairs := #( #ifTrue: #generateIfTrueAsArgument:on:indent: #ifFalse: #generateIfFalseAsArgument:on:indent: #ifTrue:ifFalse: #generateIfTrueIfFalseAsArgument:on:indent: #ifFalse:ifTrue: #generateIfFalseIfTrueAsArgument:on:indent: #cCode: #generateInlineCCodeAsArgument:on:indent: #cCode:inSmalltalk: #generateInlineCCodeAsArgument:on:indent: #value #generateValueAsArgument:on:indent: #value: #generateValueAsArgument:on:indent: #value:value: #generateValueAsArgument:on:indent: ). asArgumentTranslationDict := Dictionary new: 8. 1 to: pairs size by: 2 do: [:i | asArgumentTranslationDict at: (pairs at: i) put: (pairs at: i + 1)]. ! Item was changed: ----- Method: ContextInterpreter>>writeImageFileIO:embedded: (in category 'image save/restore') ----- writeImageFileIO: imageBytes embedded: embedded | headerStart headerSize f bytesWritten sCWIfn okToWrite | <var: #f type: 'sqImageFile'> <var: #headerStart type: 'squeakFileOffsetType '> <var: #sCWIfn type: 'void *'> "If the security plugin can be loaded, use it to check for write permission. If not, assume it's ok" sCWIfn := self ioLoadFunction: 'secCanWriteImage' From: 'SecurityPlugin'. sCWIfn ~= 0 ifTrue:[okToWrite := self cCode: '((sqInt (*)(void))sCWIfn)()'. okToWrite ifFalse:[^self primitiveFail]]. "local constants" headerStart := 0. headerSize := 16 * objectMemory bytesPerWord. "header size in bytes; do not change!!" + "self sqSpaceForImage: imageName OfSize: imageBytes + 100000" + (self cCode: 'sqImageFileSpaceToSave(imageName, imageBytes + 100000)') + ifFalse: ["file system full" + self success: false. + ^ nil]. + f := self cCode: 'sqImageFileOpen(imageName, "wb")'. f = nil ifTrue: [ "could not open the image file for writing" self success: false. ^ nil]. headerStart := self cCode: 'sqImageFileStartLocation(f,imageName,headerSize+imageBytes)'. self cCode: '/* Note: on Unix systems one could put an exec command here, padded to 512 bytes */'. "position file to start of header" self sqImageFile: f Seek: headerStart. self putLong: (self imageFormatVersion) toFile: f. self putLong: headerSize toFile: f. self putLong: imageBytes toFile: f. self putLong: (objectMemory startOfMemory) toFile: f. self putLong: objectMemory getSpecialObjectsOop toFile: f. self putLong: objectMemory getLastHash toFile: f. self putLong: (self ioScreenSize) toFile: f. self putLong: fullScreenFlag toFile: f. self putLong: extraVMMemory toFile: f. 1 to: 7 do: [:i | self putLong: 0 toFile: f]. "fill remaining header words with zeros" self successful ifFalse: [ "file write or seek failure" self cCode: 'sqImageFileClose(f)'. ^ nil]. "position file after the header" self sqImageFile: f Seek: headerStart + headerSize. "write the image data" bytesWritten := self sqImage: (objectMemory pointerForOop: objectMemory getMemory) write: f size: (self cCode: 'sizeof(unsigned char)') length: imageBytes. self success: bytesWritten = imageBytes. embedded ifFalse: [self setMacFileTypeForImageFile]. + self sqImageFileClose: f. - self cCode: 'sqImageFileClose(f)'. ! Item was added: + ----- Method: SlangTest>>testCPreprocessorDirective (in category 'testing preprocessor directives - oscog compatibility') ----- + testCPreprocessorDirective + "Test cPreprocessorDirective: " + + "(SlangTest selector: #testCPreprocessorDirective) run" + + | stssi cString | + + stssi := SlangTestSupportInterpreter inline: false. + cString := stssi asCString: #cPreprocessorDirective. + self should: ('*# define FOO bar*' match: cString). + self should: ' define FOO bar' = ((cString copyAfter: $#) findTokens: Character cr) first. + self should: ((cString findTokens: Character cr) select: [:e | e = '#define FOO bar' ]) size = 0. + self should: ((cString findTokens: Character cr) select: [:e | e = '# define FOO bar' ]) size = 1. + self should: ((cString findTokens: Character cr) select: [:e | e = '## define FOO bar' ]) size = 0. + "verify equivalence to the original trunk version" + self should: (cString last:37) = ((stssi asCString: #preprocessorExpression) last:37) + ! Item was added: + ----- Method: SlangTest>>testCppIfIfTrue (in category 'testing preprocessor directives - oscog compatibility') ----- + testCppIfIfTrue + "Test the oscog variant of isDefined:inSmalltalk:comment:ifTrue: + Same as isDefined:inSmalltalk:comment:ifTrue: but does not support the + comment and Smalltalk block." + + "(SlangTest selector: #testCppIfIfTrue) run" + + | stssi cString stringWithoutWhiteSpace lines expected | + + stssi := SlangTestSupportInterpreter inline: false. + + "verify that the default Smalltalk block that is evaluated in simulation" + self assert: stssi ifdefElseEndif = #defaultBlockForSimulation. + + "verify generated C string" + cString := stssi asCString: #cppIfIfTrue. + lines := (cString findTokens: Character cr) select: [:e | + { + '# ifdef HAVE_FOO' . + ' return 1;' . + '# else' . + ' return 0;' . + '# endif // HAVE_FOO' + } includes: e ]. + self should: lines size = 3. + self should: ('*return 1*' match: lines second). + + "check the rest of the method, ignoring whitespace and ignoring the leading method comment" + stringWithoutWhiteSpace := cString reject: [:e | e isSeparator]. + expected := 'sqIntcppIfIfTrue(void){#ifdefHAVE_FOOreturn1;#endif//HAVE_FOOreturnnull;}'. + self should: expected = (stringWithoutWhiteSpace last: expected size). + + ! Item was added: + ----- Method: SlangTest>>testCppIfIfTrueIfFalse (in category 'testing preprocessor directives - oscog compatibility') ----- + testCppIfIfTrueIfFalse + "Test the oscog variant of isDefined:inSmalltalk:comment:ifTrue:ifFalse: + Same as isDefined:inSmalltalk:comment:ifTrue:ifFalse: but does not support + the comment and Smalltalk block." + + "(SlangTest selector: #testCppIfIfTrueIfFalse) run" + + | stssi cString stringWithoutWhiteSpace lines expected | + + stssi := SlangTestSupportInterpreter inline: false. + + "verify that the default Smalltalk block that is evaluated in simulation" + self assert: stssi ifdefElseEndif = #defaultBlockForSimulation. + + "verify generated C string" + cString := stssi asCString: #cppIfIfTrueIfFalse. + lines := (cString findTokens: Character cr) select: [:e | + { + '# ifdef HAVE_FOO' . + ' return 1;' . + '# else' . + ' return 0;' . + '# endif // HAVE_FOO' + } includes: e ]. + self should: lines size = 5. + self should: ('*return 1*' match: lines second). + self should: ('*return 0*' match: lines fourth). + + "check the rest of the method, ignoring whitespace and ignoring the leading method comment" + stringWithoutWhiteSpace := cString reject: [:e | e isSeparator]. + expected := 'sqIntcppIfIfTrueIfFalse(void){#ifdefHAVE_FOOreturn1;#elsereturn0;#endif//HAVE_FOOreturnnull;}'. + self should: expected = (stringWithoutWhiteSpace last: expected size). + + + + ! Item was changed: ----- Method: SlangTest>>testPreprocessorExpression (in category 'testing preprocessor directives') ----- testPreprocessorExpression "Test preprocessorExpression: " "(SlangTest selector: #testPreprocessorExpression) run" | stssi cString | self flag: #FIXME. "See redundant implementation in oscog #cPreprocessorDirective: " stssi := SlangTestSupportInterpreter inline: false. cString := stssi asCString: #preprocessorExpression. self should: ('*# define FOO bar*' match: cString). + self should: ' define FOO bar' = ((cString copyAfter: $#) findTokens: Character cr) first. self should: ((cString findTokens: Character cr) select: [:e | e = '# define FOO bar' ]) size = 1. self should: ((cString findTokens: Character cr) select: [:e | e = '## define FOO bar' ]) size = 0. ! Item was added: + ----- Method: SlangTestSupportInterpreter>>cPreprocessorDirective (in category 'preprocessor directives - oscog compatibility') ----- + cPreprocessorDirective + + self cPreprocessorDirective: '# define FOO bar'. + ! Item was added: + ----- Method: SlangTestSupportInterpreter>>cppIfIfTrue (in category 'preprocessor directives - oscog compatibility') ----- + cppIfIfTrue + "Exercise the oscog variant. Same as isDefined:inSmalltalk:comment:ifTrue: + but does not support the comment and Smalltalk block." + + self cppIf: #'HAVE_FOO' + ifTrue: [ ^true ]. + ^nil + ! Item was added: + ----- Method: SlangTestSupportInterpreter>>cppIfIfTrueIfFalse (in category 'preprocessor directives - oscog compatibility') ----- + cppIfIfTrueIfFalse + "Exercise the oscog variant. Same as isDefined:inSmalltalk:comment:ifTrue:ifFalse: + but does not support the comment and Smalltalk block." + + self cppIf: #'HAVE_FOO' + ifTrue: [ ^true ] + ifFalse: [ ^false ]. + ^nil + ! Item was added: + ----- Method: SlangTestSupportInterpreter>>loopExample: (in category 'type declaration') ----- + loopExample: array1 + + 0 to: (self numSlotsOf: array1) - 1 do: [ :i | #foo ]. + ! Item was changed: ----- Method: TSendNode>>isDirective (in category 'testing') ----- isDirective "Preprocessor directive, e.g. a cpp macro" ^ { #preprocessorExpression: . #isDefined:inSmalltalk:comment:ifTrue:ifFalse: . #isDefined:inSmalltalk:comment:ifTrue: . #isDefinedTrueExpression:inSmalltalk:comment:ifTrue:ifFalse: . + #cPreprocessorDirective: . + #cppIf:ifTrue:ifFalse: . "oscog compatibility" + #cppIf:ifTrue: . "oscog compatibility" + #cPreprocessorDirective: "oscog compatibility" - #cPreprocessorDirective: } identityIncludes: selector! Item was changed: ----- Method: VMMaker class>>versionString (in category 'version testing') ----- versionString "VMMaker versionString" + ^'4.18.1'! - ^'4.17.2'!

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev March 2020