--- a/AbstractSettingsApplication.st Thu May 04 15:03:55 2006 +0200
+++ b/AbstractSettingsApplication.st Tue May 09 11:39:01 2006 +0200
@@ -619,14 +619,14 @@
(CheckBoxSpec
label: 'Allow Underscore in Identifiers'
name: 'AllowUnderscoreInIdentifiers'
- model: allowUnderscore
+ model: allowUnderscoreInIdentifier
translateLabel: true
extent: (Point 313 22)
)
(CheckBoxSpec
label: 'Allow Dollar in Identifiers'
name: 'AllowDollarInIdentifiers'
- model: allowDollar
+ model: allowDollarInIdentifier
translateLabel: true
extent: (Point 313 22)
)
@@ -732,7 +732,7 @@
label: 'ST/X Extensions'
name: 'STXExtensions'
enableChannel: warnings
- model: warnSTX
+ model: warnSTXSpecials
translateLabel: true
extent: (Point 313 22)
)
@@ -740,7 +740,7 @@
label: 'Underscores in Identifiers'
name: 'UnderscoresInIdentifiers'
enableChannel: enableUnderscore
- model: warnUnderscore
+ model: warnUnderscoreInIdentifier
translateLabel: true
extent: (Point 313 22)
)
@@ -748,7 +748,7 @@
label: 'Dollars in Identifiers'
name: 'DollarsInIdentifiers'
enableChannel: enableDollar
- model: warnDollar
+ model: warnDollarInIdentifier
translateLabel: true
extent: (Point 313 22)
)
@@ -756,7 +756,7 @@
label: 'OldStyle Assignment'
name: 'OldStyleAssignment'
enableChannel: warnings
- model: warnOldStyle
+ model: warnOldStyleAssignment
translateLabel: true
extent: (Point 313 22)
)
@@ -764,7 +764,7 @@
label: 'Possible Incompatibilities'
name: 'PossibleIncompatibilities'
enableChannel: warnings
- model: warnCompatibility
+ model: warnPossibleIncompatibilities
translateLabel: true
extent: (Point 313 22)
)
@@ -846,7 +846,7 @@
(CheckBoxSpec
label: 'Literal Arrays are Immutable'
name: 'LiteralArraysAreImmutable'
- model: immutableArrays
+ model: arraysAreImmutable
translateLabel: true
extent: (Point 665 22)
)
@@ -903,20 +903,20 @@
"/ todo: move all compiler interface to ParserFlags
ParserFlags warnings:self warnings value.
- ParserFlags warnSTXSpecials:self warnSTX value.
- ParserFlags warnOldStyleAssignment:self warnOldStyle value.
- ParserFlags warnUnderscoreInIdentifier:self warnUnderscore value.
- ParserFlags warnDollarInIdentifier:self warnDollar value.
+ ParserFlags warnSTXSpecials:self warnSTXSpecials value.
+ ParserFlags warnOldStyleAssignment:self warnOldStyleAssignment value.
+ ParserFlags warnUnderscoreInIdentifier:self warnUnderscoreInIdentifier value.
+ ParserFlags warnDollarInIdentifier:self warnDollarInIdentifier value.
ParserFlags warnCommonMistakes:self warnCommonMistakes value.
- ParserFlags warnPossibleIncompatibilities:self warnCompatibility value.
+ ParserFlags warnPossibleIncompatibilities:self warnPossibleIncompatibilities value.
ParserFlags warnUnusedVars:self warnUnusedVars value.
ParserFlags warnAboutWrongVariableNames:self warnAboutWrongVariableNames value.
ParserFlags warnAboutBadComments:self warnAboutBadComments value.
ParserFlags warnInconsistentReturnValues:self warnInconsistentReturnValues value.
ParserFlags warnAboutLowercaseLocalVariableNames:self warnAboutLowercaseLocalVariableNames value.
- ParserFlags allowUnderscoreInIdentifier:self allowUnderscore value.
- ParserFlags allowDollarInIdentifier:self allowDollar value.
+ ParserFlags allowUnderscoreInIdentifier:self allowUnderscoreInIdentifier value.
+ ParserFlags allowDollarInIdentifier:self allowDollarInIdentifier value.
ParserFlags allowSqueakExtensions:self allowSqueakExtensions value.
ParserFlags allowDolphinExtensions:self allowDolphinExtensions value.
ParserFlags allowQualifiedNames:self allowQualifiedNames value.
@@ -925,7 +925,7 @@
ParserFlags allowVisualAgeESSymbolLiterals:self allowVisualAgeESSymbolLiterals value.
ParserFlags allowFixedPointLiterals:self allowFixedPointLiterals value.
- ParserFlags arraysAreImmutable:self immutableArrays value.
+ ParserFlags arraysAreImmutable:self arraysAreImmutable value.
self fullDebugSupport value ifTrue:[
Compiler lineNumberInfo:#full.
] ifFalse:[
@@ -950,13 +950,13 @@
!
readSettings
- self allowDollar value:(ParserFlags allowDollarInIdentifier ? false).
+ self allowDollarInIdentifier value:(ParserFlags allowDollarInIdentifier ? false).
self allowDolphinExtensions value:(ParserFlags allowDolphinExtensions ? false).
self allowOldStyleAssignment value:(ParserFlags allowOldStyleAssignment ? false).
self allowQualifiedNames value:(ParserFlags allowQualifiedNames ? false).
self allowReservedWordsAsSelectors value:(ParserFlags allowReservedWordsAsSelectors ? false).
self allowSqueakExtensions value:(ParserFlags allowSqueakExtensions ? false).
- self allowUnderscore value:(ParserFlags allowUnderscoreInIdentifier ? false).
+ self allowUnderscoreInIdentifier value:(ParserFlags allowUnderscoreInIdentifier ? false).
self allowVisualAgeESSymbolLiterals value:(ParserFlags allowVisualAgeESSymbolLiterals ? false).
self allowFixedPointLiterals value:(ParserFlags allowFixedPointLiterals ? false).
@@ -968,7 +968,7 @@
] ifFalse:[
self fullDebugSupport value:(Compiler lineNumberInfo == #full)
].
- self immutableArrays value:(Compiler arraysAreImmutable ? false).
+ self arraysAreImmutable value:(Compiler arraysAreImmutable ? false).
self supportsJustInTimeCompilation ifTrue:[
self justInTimeCompilation
value:(ObjectMemory justInTimeCompilation ? false)
@@ -978,11 +978,11 @@
self warnings value:(ParserFlags warnings ? false).
self warnCommonMistakes value:(ParserFlags warnCommonMistakes ? false).
- self warnCompatibility value:(ParserFlags warnPossibleIncompatibilities ? false).
- self warnDollar value:(ParserFlags warnDollarInIdentifier ? false).
- self warnOldStyle value:(ParserFlags warnOldStyleAssignment ? false).
- self warnSTX value:(ParserFlags warnSTXSpecials ? false).
- self warnUnderscore value:(ParserFlags warnUnderscoreInIdentifier ? false).
+ self warnPossibleIncompatibilities value:(ParserFlags warnPossibleIncompatibilities ? false).
+ self warnDollarInIdentifier value:(ParserFlags warnDollarInIdentifier ? false).
+ self warnOldStyleAssignment value:(ParserFlags warnOldStyleAssignment ? false).
+ self warnSTXSpecials value:(ParserFlags warnSTXSpecials ? false).
+ self warnUnderscoreInIdentifier value:(ParserFlags warnUnderscoreInIdentifier ? false).
self warnUnusedVars value:(ParserFlags warnUnusedVars ? false).
self warnAboutWrongVariableNames value:(ParserFlags warnAboutWrongVariableNames ? false).
self warnAboutBadComments value:(ParserFlags warnAboutBadComments ? false).
@@ -999,10 +999,10 @@
!AbstractSettingsApplication::ByteCodeCompilerSettingsAppl methodsFor:'aspects'!
-allowDollar
+allowDollarInIdentifier
allowDollar isNil ifTrue:[
- allowDollar := (Compiler allowDollarInIdentifier ? false) asValue.
+ allowDollar := Compiler allowDollarInIdentifier asValue.
allowDollar onChangeSend:#updateModifiedChannel to:self.
allowDollar addDependent:self.
].
@@ -1012,7 +1012,7 @@
allowDolphinExtensions
allowDolphinExtensions isNil ifTrue:[
- allowDolphinExtensions := (Compiler allowDolphinExtensions ? false) asValue.
+ allowDolphinExtensions := Compiler allowDolphinExtensions asValue.
allowDolphinExtensions onChangeSend:#updateModifiedChannel to:self.
].
^ allowDolphinExtensions.
@@ -1030,7 +1030,7 @@
allowOldStyleAssignment
allowOldStyleAssignment isNil ifTrue:[
- allowOldStyleAssignment := (Compiler allowOldStyleAssignment ? false) asValue.
+ allowOldStyleAssignment := Compiler allowOldStyleAssignment asValue.
allowOldStyleAssignment onChangeSend:#updateModifiedChannel to:self.
].
^ allowOldStyleAssignment.
@@ -1039,7 +1039,7 @@
allowQualifiedNames
allowQualifiedNames isNil ifTrue:[
- allowQualifiedNames := (Compiler allowQualifiedNames ? false) asValue.
+ allowQualifiedNames := Compiler allowQualifiedNames asValue.
allowQualifiedNames onChangeSend:#updateModifiedChannel to:self.
].
^ allowQualifiedNames.
@@ -1048,7 +1048,7 @@
allowReservedWordsAsSelectors
allowReservedWordsAsSelectors isNil ifTrue:[
- allowReservedWordsAsSelectors := (Compiler allowReservedWordsAsSelectors ? false) asValue.
+ allowReservedWordsAsSelectors := Compiler allowReservedWordsAsSelectors asValue.
allowReservedWordsAsSelectors onChangeSend:#updateModifiedChannel to:self.
].
^ allowReservedWordsAsSelectors.
@@ -1057,16 +1057,16 @@
allowSqueakExtensions
allowSqueakExtensions isNil ifTrue:[
- allowSqueakExtensions := (Compiler allowSqueakExtensions ? false) asValue.
+ allowSqueakExtensions := Compiler allowSqueakExtensions asValue.
allowSqueakExtensions onChangeSend:#updateModifiedChannel to:self.
].
^ allowSqueakExtensions.
!
-allowUnderscore
+allowUnderscoreInIdentifier
allowUnderscore isNil ifTrue:[
- allowUnderscore := (Compiler allowUnderscoreInIdentifier ? false) asValue.
+ allowUnderscore := Compiler allowUnderscoreInIdentifier asValue.
allowUnderscore onChangeSend:#updateModifiedChannel to:self.
allowUnderscore addDependent:self.
].
@@ -1076,12 +1076,21 @@
allowVisualAgeESSymbolLiterals
allowVisualAgeESSymbolLiterals isNil ifTrue:[
- allowVisualAgeESSymbolLiterals := (ParserFlags allowVisualAgeESSymbolLiterals ? false) asValue.
+ allowVisualAgeESSymbolLiterals := ParserFlags allowVisualAgeESSymbolLiterals asValue.
allowVisualAgeESSymbolLiterals onChangeSend:#updateModifiedChannel to:self.
].
^ allowVisualAgeESSymbolLiterals.
!
+arraysAreImmutable
+
+ immutableArrays isNil ifTrue:[
+ immutableArrays := Compiler arraysAreImmutable asValue.
+ immutableArrays onChangeSend:#updateModifiedChannel to:self.
+ ].
+ ^ immutableArrays.
+!
+
constantFolding
constantFolding isNil ifTrue:[
@@ -1148,15 +1157,6 @@
^ fullDebugSupport.
!
-immutableArrays
-
- immutableArrays isNil ifTrue:[
- immutableArrays := (Compiler arraysAreImmutable ? false) asValue.
- immutableArrays onChangeSend:#updateModifiedChannel to:self.
- ].
- ^ immutableArrays.
-!
-
justInTimeCompilation
justInTimeCompilation isNil ifTrue:[
@@ -1172,7 +1172,7 @@
warnAboutBadComments
warnAboutBadComments isNil ifTrue:[
- warnAboutBadComments := (ParserFlags warnAboutBadComments ? false) asValue.
+ warnAboutBadComments := ParserFlags warnAboutBadComments asValue.
warnAboutBadComments onChangeSend:#updateModifiedChannel to:self.
].
^ warnAboutBadComments.
@@ -1180,7 +1180,7 @@
warnAboutLowercaseLocalVariableNames
warnAboutLowercaseLocalVariableNames isNil ifTrue:[
- warnAboutLowercaseLocalVariableNames := (ParserFlags warnAboutLowercaseLocalVariableNames ? false) asValue.
+ warnAboutLowercaseLocalVariableNames := ParserFlags warnAboutLowercaseLocalVariableNames asValue.
warnAboutLowercaseLocalVariableNames onChangeSend:#updateModifiedChannel to:self.
].
^ warnAboutLowercaseLocalVariableNames.
@@ -1188,7 +1188,7 @@
warnAboutWrongVariableNames
warnAboutWrongVariableNames isNil ifTrue:[
- warnAboutWrongVariableNames := (ParserFlags warnAboutWrongVariableNames ? false) asValue.
+ warnAboutWrongVariableNames := ParserFlags warnAboutWrongVariableNames asValue.
warnAboutWrongVariableNames onChangeSend:#updateModifiedChannel to:self.
].
^ warnAboutWrongVariableNames.
@@ -1197,25 +1197,16 @@
warnCommonMistakes
warnCommonMistakes isNil ifTrue:[
- warnCommonMistakes := (ParserFlags warnCommonMistakes ? false) asValue.
+ warnCommonMistakes := ParserFlags warnCommonMistakes asValue.
warnCommonMistakes onChangeSend:#updateModifiedChannel to:self.
].
^ warnCommonMistakes.
!
-warnCompatibility
-
- warnCompatibility isNil ifTrue:[
- warnCompatibility := (ParserFlags warnPossibleIncompatibilities ? false) asValue.
- warnCompatibility onChangeSend:#updateModifiedChannel to:self.
- ].
- ^ warnCompatibility.
-!
-
-warnDollar
+warnDollarInIdentifier
warnDollar isNil ifTrue:[
- warnDollar := (ParserFlags warnDollarInIdentifier ? false) asValue.
+ warnDollar := ParserFlags warnDollarInIdentifier asValue.
warnDollar onChangeSend:#updateModifiedChannel to:self.
].
^ warnDollar.
@@ -1223,34 +1214,43 @@
warnInconsistentReturnValues
warnInconsistentReturnValues isNil ifTrue:[
- warnInconsistentReturnValues := (ParserFlags warnInconsistentReturnValues ? false) asValue.
+ warnInconsistentReturnValues := ParserFlags warnInconsistentReturnValues asValue.
warnInconsistentReturnValues onChangeSend:#updateModifiedChannel to:self.
].
^ warnInconsistentReturnValues.
!
-warnOldStyle
+warnOldStyleAssignment
warnOldStyle isNil ifTrue:[
- warnOldStyle := (ParserFlags warnOldStyleAssignment ? false) asValue.
+ warnOldStyle := ParserFlags warnOldStyleAssignment asValue.
warnOldStyle onChangeSend:#updateModifiedChannel to:self.
].
^ warnOldStyle.
!
-warnSTX
+warnPossibleIncompatibilities
+
+ warnCompatibility isNil ifTrue:[
+ warnCompatibility := ParserFlags warnPossibleIncompatibilities asValue.
+ warnCompatibility onChangeSend:#updateModifiedChannel to:self.
+ ].
+ ^ warnCompatibility.
+!
+
+warnSTXSpecials
warnSTX isNil ifTrue:[
- warnSTX := (ParserFlags warnSTXSpecials ? false) asValue.
+ warnSTX := ParserFlags warnSTXSpecials asValue.
warnSTX onChangeSend:#updateModifiedChannel to:self.
].
^ warnSTX.
!
-warnUnderscore
+warnUnderscoreInIdentifier
warnUnderscore isNil ifTrue:[
- warnUnderscore := (ParserFlags warnUnderscoreInIdentifier ? false) asValue.
+ warnUnderscore := ParserFlags warnUnderscoreInIdentifier asValue.
warnUnderscore onChangeSend:#updateModifiedChannel to:self.
].
^ warnUnderscore.
@@ -1259,7 +1259,7 @@
warnUnusedVars
warnUnusedVars isNil ifTrue:[
- warnUnusedVars := (Compiler warnUnusedVars ? false) asValue.
+ warnUnusedVars := Compiler warnUnusedVars asValue.
warnUnusedVars onChangeSend:#updateModifiedChannel to:self.
].
^ warnUnusedVars.
@@ -1268,7 +1268,7 @@
warnings
warnings isNil ifTrue:[
- warnings := (ParserFlags warnings ? false) asValue.
+ warnings := ParserFlags warnings asValue.
warnings addDependent:self.
warnings changed.
warnings onChangeSend:#updateModifiedChannel to:self.
@@ -1281,15 +1281,15 @@
update:something with:aParameter from:changedObject
changedObject == self warnings ifTrue:[
changedObject value ifTrue:[
- self enableUnderscore value:self allowUnderscore value.
- self enableDollar value:self allowDollar value.
+ self enableUnderscore value:self allowUnderscoreInIdentifier value.
+ self enableDollar value:self allowDollarInIdentifier value.
] ifFalse:[
self enableUnderscore value:false.
self enableDollar value:false.
].
^ self
].
- (changedObject == self allowDollar or:[changedObject == self allowUnderscore]) ifTrue:[
+ (changedObject == self allowDollarInIdentifier or:[changedObject == self allowUnderscoreInIdentifier]) ifTrue:[
self warnings changed.
^ self
].
@@ -1300,29 +1300,35 @@
!AbstractSettingsApplication::ByteCodeCompilerSettingsAppl methodsFor:'queries'!
hasUnsavedChanges
- ((ParserFlags warnings ? false) ~= self warnings value) ifTrue:[^ true].
- ((ParserFlags warnSTXSpecials ? false) ~= self warnSTX value) ifTrue:[^ true].
- ((ParserFlags warnOldStyleAssignment ? false) ~= self warnOldStyle value) ifTrue:[^ true].
- ((ParserFlags warnUnderscoreInIdentifier ? false) ~= self warnUnderscore value) ifTrue:[^ true].
- ((ParserFlags warnDollarInIdentifier ? false) ~= self warnDollar value) ifTrue:[^ true].
- ((ParserFlags warnCommonMistakes ? false) ~= self warnCommonMistakes value) ifTrue:[^ true].
- ((ParserFlags warnPossibleIncompatibilities ? false) ~= self warnCompatibility value) ifTrue:[^ true].
- ((ParserFlags warnUnusedVars ? false) ~= self warnUnusedVars value) ifTrue:[^ true].
- ((ParserFlags warnAboutWrongVariableNames ? false) ~= self warnAboutWrongVariableNames value) ifTrue:[^ true].
- ((ParserFlags warnAboutBadComments ? false) ~= self warnAboutBadComments value) ifTrue:[^ true].
- ((ParserFlags warnInconsistentReturnValues ? false) ~= self warnInconsistentReturnValues value) ifTrue:[^ true].
- ((ParserFlags warnAboutLowercaseLocalVariableNames ? false) ~= self warnAboutLowercaseLocalVariableNames value) ifTrue:[^ true].
-
- ((ParserFlags allowVisualAgeESSymbolLiterals ? false) ~= self allowVisualAgeESSymbolLiterals value) ifTrue:[^ true].
- ((ParserFlags allowUnderscoreInIdentifier ? false) ~= self allowUnderscore value) ifTrue:[^ true].
- ((ParserFlags allowDollarInIdentifier ? false) ~= self allowDollar value) ifTrue:[^ true].
- ((ParserFlags allowSqueakExtensions ? false) ~= self allowSqueakExtensions value) ifTrue:[^ true].
- ((ParserFlags allowFixedPointLiterals ? false) ~= self allowFixedPointLiterals value) ifTrue:[^ true].
- ((ParserFlags allowDolphinExtensions ? false) ~= self allowDolphinExtensions value) ifTrue:[^ true].
- ((ParserFlags allowQualifiedNames ? false) ~= self allowQualifiedNames value) ifTrue:[^ true].
- ((ParserFlags allowOldStyleAssignment ? false) ~= self allowOldStyleAssignment value) ifTrue:[^ true].
- ((ParserFlags allowReservedWordsAsSelectors ? false) ~= self allowReservedWordsAsSelectors value) ifTrue:[^ true].
- ((ParserFlags arraysAreImmutable ? false) ~= self immutableArrays value) ifTrue:[^ true].
+ #(
+ warnings
+ warnCommonMistakes
+ warnUnusedVars
+ warnAboutWrongVariableNames
+ warnAboutBadComments
+ warnInconsistentReturnValues
+ warnAboutLowercaseLocalVariableNames
+ warnSTXSpecials
+ warnOldStyleAssignment
+ warnUnderscoreInIdentifier
+ warnDollarInIdentifier
+ warnPossibleIncompatibilities
+
+ allowVisualAgeESSymbolLiterals
+ allowSqueakExtensions
+ allowDolphinExtensions
+ allowQualifiedNames
+ allowOldStyleAssignment
+ allowReservedWordsAsSelectors
+ allowUnderscoreInIdentifier
+ allowDollarInIdentifier
+ allowFixedPointLiterals
+ arraysAreImmutable
+ )
+ do:[:aspect |
+ (self perform:aspect) value ~= (ParserFlags perform:aspect) ifTrue:[^ true].
+ ].
+
((self supportsJustInTimeCompilation value ifTrue:[ObjectMemory fullSingleStepSupport ? false] ifFalse:[Compiler lineNumberInfo == #full]) ~= self fullDebugSupport value) ifTrue:[^ true].
((Compiler foldConstants) ~= (self class constantFoldingOptions at:self constantFoldingSelection value)) ifTrue:[^ true].
((ObjectMemory justInTimeCompilation ? false) ~= self justInTimeCompilation value) ifTrue:[^ true].
@@ -12014,5 +12020,5 @@
!AbstractSettingsApplication class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.222 2006-04-18 09:28:27 cg Exp $'
-! !
+ ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.223 2006-05-09 09:39:01 cg Exp $'
+! !