--- a/Launcher.st Sat Feb 10 14:25:23 1996 +0100
+++ b/Launcher.st Sat Feb 10 17:32:12 1996 +0100
@@ -598,8 +598,8 @@
|box warnings warnSTX warnUnderscore warnOldStyle allowUnderscore immutableArrays
warnSTXBox warnUnderscoreBox warnOldStyleBox
stcCompilation compilationList stcCompilationOptions stcIncludes stcDefines stcOptions
- stcLibraries historyLines sourceMode catchRedefs keepSourceOptions keepSource keepSourceList
- foldConstants
+ stcLibraries historyLines sourceMode catchRedefs keepSourceOptions keepSource
+ foldConstants constantFoldingOptions constantFolding
warnEnabler check y component oldIndent|
warnings := Compiler warnings asValue.
@@ -609,7 +609,10 @@
warnOldStyle := Compiler warnOldStyleAssignment asValue.
allowUnderscore := Compiler allowUnderscoreInIdentifier asValue.
immutableArrays := Compiler arraysAreImmutable asValue.
- foldConstants := Compiler foldConstants asValue.
+
+ constantFoldingOptions := #( nil #level1 #level2 #full ).
+ constantFolding := SelectionInList new list:(resources array:#('disabled' 'level1 (always safe)' 'level2 (usually safe)' 'full')).
+ constantFolding selectionIndex:3.
stcCompilationOptions := #( always default never).
stcCompilation := SelectionInList new list:(resources array:#('always' 'primitive code only' 'never')).
@@ -656,7 +659,7 @@
check := box addCheckBox:(resources string:'keep history line in methods') on:historyLines.
HistoryManager isNil ifTrue:[check disable].
- keepSourceList := box addPopUpList:(resources string:'fileIn source mode') on:keepSource.
+ box addPopUpList:(resources string:'fileIn source mode') on:keepSource.
keepSource selectionIndex:( keepSourceOptions indexOf:(ClassCategoryReader sourceMode) ifAbsent:1).
box addHorizontalLine.
@@ -707,7 +710,9 @@
].
].
- box addCheckBox:(resources string:'constant folding') on:foldConstants.
+ box addPopUpList:(resources string:'constant folding') on:constantFolding.
+ constantFolding selectionIndex:( constantFoldingOptions indexOf:(Compiler foldConstants) ifAbsent:1).
+
box addVerticalSpace.
box addCheckBox:(resources string:'allow underscore in identifiers') on:allowUnderscore.
box addVerticalSpace.
@@ -726,7 +731,10 @@
box addVerticalSpace.
box leftIndent:oldIndent.
- box addAbortButton; addOkButton.
+ box
+ addHelpButtonFor:'NewLauncher/compilerSettings.html';
+ addAbortButton;
+ addOkButton.
warnEnabler check.
box showAtPointer.
@@ -751,7 +759,7 @@
Compiler stcCompilationIncludes:stcIncludes value.
Compiler stcCompilationDefines:stcDefines value.
Compiler stcCompilationOptions:stcOptions value.
- Compiler foldConstants:foldConstants value.
+ Compiler foldConstants:(constantFoldingOptions at:constantFolding selectionIndex).
ObjectFileLoader notNil ifTrue:[
ObjectFileLoader searchedLibraries:(stcLibraries value asCollectionOfWords).
]
@@ -759,7 +767,7 @@
box destroy
"Modified: 10.9.1995 / 19:19:18 / claus"
- "Modified: 9.2.1996 / 17:44:29 / cg"
+ "Modified: 10.2.1996 / 17:26:15 / cg"
!
keyboardSetting
@@ -1117,8 +1125,8 @@
box addCheckBox:(resources string:'lazy compilation when autoloading') on:compileLazy.
check := box addCheckBox:(resources string:'if present, load binary objects when autoloading') on:loadBinaries.
ObjectFileLoader isNil ifTrue:[
- loadBinaries value:false.
- check disable
+ loadBinaries value:false.
+ check disable
].
check := box addCheckBox:(resources string:'sourcecode from sourcecode management') on:useManager.
@@ -1130,9 +1138,9 @@
(AbstractSourceCodeManager isNil
or:[AbstractSourceCodeManager defaultManager isNil]) ifTrue:[
- useManager value:false.
- check disable.
- localCheck value:true.
+ useManager value:false.
+ check disable.
+ localCheck value:true.
"/ localCheck disable
].
@@ -1142,7 +1150,10 @@
box addCheckBox:(resources string:'boxes return focus to previously active view') on:returnFocus.
box addCheckBox:(resources string:'hostname in window labels') on:hostNameInLabel.
- box addAbortButton; addOkButton.
+ box
+ addHelpButtonFor:'NewLauncher/miscSettings.html';
+ addAbortButton;
+ addOkButton.
"/
"/ show the box ...
@@ -1153,27 +1164,27 @@
"/ update system settings
"/
box accepted ifTrue:[
- Smalltalk logDoits:logDoits value.
- PopUpView shadows:shadows value.
- Class updateChanges:updChanges value.
- Autoload compileLazy:compileLazy value.
- Smalltalk loadBinaries:loadBinaries value.
- StandardSystemView includeHostNameInLabel:hostNameInLabel value.
- ObjectMemory nameForChanges:changeFileName value.
- Dialog returnFocusWhenClosingModalBoxes:returnFocus value.
+ Smalltalk logDoits:logDoits value.
+ PopUpView shadows:shadows value.
+ Class updateChanges:updChanges value.
+ Autoload compileLazy:compileLazy value.
+ Smalltalk loadBinaries:loadBinaries value.
+ StandardSystemView includeHostNameInLabel:hostNameInLabel value.
+ ObjectMemory nameForChanges:changeFileName value.
+ Dialog returnFocusWhenClosingModalBoxes:returnFocus value.
- useManager value ifTrue:[
- (Smalltalk at:#SourceCodeManager) isNil ifTrue:[
- Smalltalk at:#SourceCodeManager put:(AbstractSourceCodeManager defaultManager)
- ].
- Class tryLocalSourceFirst:(localSourceFirst value).
- ] ifFalse:[
- Smalltalk at:#SourceCodeManager put:nil
- ]
+ useManager value ifTrue:[
+ (Smalltalk at:#SourceCodeManager) isNil ifTrue:[
+ Smalltalk at:#SourceCodeManager put:(AbstractSourceCodeManager defaultManager)
+ ].
+ Class tryLocalSourceFirst:(localSourceFirst value).
+ ] ifFalse:[
+ Smalltalk at:#SourceCodeManager put:nil
+ ]
].
box destroy
- "Modified: 24.1.1996 / 20:19:14 / cg"
+ "Modified: 10.2.1996 / 17:26:29 / cg"
!
printerSettings
@@ -2178,5 +2189,5 @@
!NewLauncher class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Launcher.st,v 1.79 1996-02-09 21:54:35 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Launcher.st,v 1.80 1996-02-10 16:32:12 cg Exp $'
! !