hg/stx-libcomp: comparison ByteCodeCompiler.st

equal deleted inserted replaced

-:6b6e5c7fd093
+:cd787e6ed225
 ].
 "
 freak-out support for inline C-code...
 "
-((self hasNonOptionalPrimitiveCode
+NewPrimitives ifFalse:[
-or:[(self hasPrimitiveCode and:[self class canCreateMachineCode])
+((self hasNonOptionalPrimitiveCode
-or:[ParserFlags stcCompilation == #always and:[selector ~~ #doIt]]])
+or:[(self hasPrimitiveCode and:[self class canCreateMachineCode])
-and:[(ParserFlags stcCompilation ~~ #never)
+or:[ParserFlags stcCompilation == #always and:[selector ~~ #doIt]]])
-and:[NewPrimitives ~~ true]]) ifTrue:[
+and:[(ParserFlags stcCompilation ~~ #never)]) ifTrue:[
 Parser::ParseError handle:[:ex |
 ex lineNumber notNil ifTrue:[
 self parseError:(ex description) line:ex lineNumber.
 ] ifFalse:[
 self parseError:(ex description) position:1.
+].
+newMethod := #Error.
+] do:[
+newMethod :=
+(STCCompilerInterface new
+originator:self;
+parserFlags:parserFlags)
+compileToMachineCode:sourceCodeString
+forClass:aClass
+selector:selector
+inCategory:cat
+notifying:aRequestor
+install:install
+skipIfSame:skipIfSame
+silent:silent.
 ].
-newMethod := #Error.
-] do:[
+newMethod == #Error ifTrue:[
-newMethod :=
+self showErrorMessageForClass:aClass.
-(STCCompilerInterface new
+"/^ failBlock value
-originator:self;
+].
-parserFlags:parserFlags)
-compileToMachineCode:sourceCodeString
+(newMethod == #CannotLoad or:[newMethod == #Error]) ifTrue:[
-forClass:aClass
+failureReason := newMethod.
-selector:selector
+newMethod := self trappingStubMethodFor:sourceCodeString inCategory:newCategory.
-inCategory:cat
+newMethod setPackage:newPackage.
-notifying:aRequestor
+keptOldCode := false.
-install:install
+install ifTrue:[
-skipIfSame:skipIfSame
+"/
-silent:silent.
+"/ be very careful with existing methods
-].
+"/ (otherwise, you could easily make your system unusable in systems which cannot load)
+"/
-newMethod == #Error ifTrue:[
+(oldMethod notNil and:[oldMethod code ~= newMethod code]) ifTrue:[
-self showErrorMessageForClass:aClass.
+failureReason == #Error ifTrue:[
-"/            ^ failBlock value
+dialogText :=
-].
-(newMethod == #CannotLoad or:[newMethod == #Error]) ifTrue:[
-failureReason := newMethod.
-newMethod := self trappingStubMethodFor:sourceCodeString inCategory:newCategory.
-newMethod setPackage:newPackage.
-keptOldCode := false.
-install ifTrue:[
-"/
-"/ be very careful with existing methods
-"/ (otherwise, you could easily make your system unusable in systems which cannot load)
-"/
-(oldMethod notNil and:[oldMethod code ~= newMethod code]) ifTrue:[
-failureReason == #Error ifTrue:[
-dialogText :=
 'STC-compilation of ''%1>>%2''
 to machine code failed .
 Shall I use the old methods functionality
 or instead create a dummy trap method for it ?
 if that method is needed by the system, you better leave the
 original functionality in the system.
 Close this warnBox to abort the compilation.
 '
 ] ifFalse:[
 dialogText :=
 'installation of binary code for ''%1>>%2''
 is not possible or disabled.
 Shall I use the old methods functionality
 or instead create a dummy trap method for it ?
 if that method is needed by the system, you better leave the
 original functionality in the system.
 Close this warnBox to abort the compilation.
 '
+].
+answer := Dialog
+confirmWithCancel:(dialogText bindWith:aClass name with:selector)
+labels:#('cancel' 'keep old' 'trap code')
+default:2.
+answer isNil ifTrue:[
+^ failBlock value
+].
+answer == false ifTrue:[
+newMethod code:(oldMethod code).
+keptOldCode := true.
+].
 ].
-answer := Dialog
+aClass addSelector:selector withMethod:newMethod
-confirmWithCancel:(dialogText bindWith:aClass name with:selector)
-labels:#('cancel' 'keep old' 'trap code')
-default:2.
-answer isNil ifTrue:[
-^ failBlock value
-].
-answer == false ifTrue:[
-newMethod code:(oldMethod code).
-keptOldCode := true.
-].
 ].
-aClass addSelector:selector withMethod:newMethod
+self showErrorNotification:(keptOldCode
+ifTrue:['not really compiled - method still shows previous behavior']
+ifFalse:['not compiled to machine code - created a stub instead.'])
 ].
-self showErrorNotification:(keptOldCode
+^ newMethod
-ifTrue:['not really compiled - method still shows previous behavior']
-ifFalse:['not compiled to machine code - created a stub instead.'])
 ].
-^ newMethod
-].
+self hasNonOptionalPrimitiveCode ifTrue:[
+"/
-self hasNonOptionalPrimitiveCode ifTrue:[
+"/ generate a trapping method, if primitive code is present
 "/
-"/ generate a trapping method, if primitive code is present
-"/
-NewPrimitives ifFalse:[
 newMethod := self trappingStubMethodFor:sourceCodeString inCategory:newCategory.
 install ifTrue:[
+self showErrorNotification:'not compiled to machine code - installed a stub instead.'.
 aClass addSelector:selector withMethod:newMethod.
 ].
-self showErrorNotification:'not compiled to machine code - created a stub instead.'.
 ^ newMethod
 ].
 ].
 primNr := self primitiveNumber.
 "Created: / 06-08-2006 / 03:26:27 / cg"
 "Modified: / 06-08-2006 / 15:14:26 / cg"
 !
 showErrorNotification:message
-	Transcript show:'***'.
+Transcript show:'***'.
-	selector notNil ifTrue:[
+selector notNil ifTrue:[
-	    Transcript show:(selector ,' ')
+Transcript show:(selector ,' ')
-	].
+].
-	Transcript showCR:message.
+Transcript showCR:message.
 ! !
 !ByteCodeCompiler methodsFor:'machine code generation'!
 trappingStubMethodFor:aString inCategory:cat
 ! !
 !ByteCodeCompiler class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libcomp/ByteCodeCompiler.st,v 1.268 2012-05-07 12:00:08 stefan Exp $'
+^ '$Header: /cvs/stx/stx/libcomp/ByteCodeCompiler.st,v 1.269 2012-10-08 08:27:15 stefan Exp $'
 !
 version_CVS
-^ '$Header: /cvs/stx/stx/libcomp/ByteCodeCompiler.st,v 1.268 2012-05-07 12:00:08 stefan Exp $'
+^ '$Header: /cvs/stx/stx/libcomp/ByteCodeCompiler.st,v 1.269 2012-10-08 08:27:15 stefan Exp $'
 !
 version_SVN
 ^ '� Id �'
 ! !

changeset 2936	cd787e6ed225
parent 2868	fb701b33bca9
child 2938	220928d3f06e