The Trunk: Kernel-nice.779.mcz

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

The Trunk: Kernel-nice.779.mcz

commits-2
Nicolas Cellier uploaded a new version of Kernel to project The Trunk:
http://source.squeak.org/trunk/Kernel-nice.779.mcz

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

Name: Kernel-nice.779
Author: nice
Time: 21 July 2013, 3:23:58.705 pm
UUID: 77ed5cb0-0ac4-4379-9af2-6cb7551b8ca8
Ancestors: Kernel-fbs.779

To solve the update problem = fbs.779 + self environment change in Class>>declare:

=============== Diff against Kernel-fbs.779 ===============

Item was changed:
  ----- Method: Class>>declare: (in category 'initialize-release') -----
  declare: varString
  "Declare class variables common to all instances. Answer whether
  recompilation is advisable."
 
  | newVars conflicts |
 
  newVars :=
  (Scanner new scanFieldNames: varString)
  collect: [:x | x asSymbol].
  newVars do:
  [:var | var first canBeGlobalVarInitial
  ifFalse: [self error: var, ' class variable name should be capitalized; proceed to include anyway.']].
  conflicts := false.
  classPool == nil
  ifFalse: [(classPool keys reject: [:x | newVars includes: x]) do:
  [:var | self removeClassVarName: var]].
  (newVars reject: [:var | self classPool includesKey: var])
  do: [:var | "adding"
  "check if new vars defined elsewhere"
  (self canFindWithoutEnvironment: var) ifTrue: [
  (DuplicateVariableError new)
  superclass: superclass; "fake!!!!!!"
  variable: var;
  signal: var, ' is already defined'.
  conflicts := true]].
  newVars size > 0
  ifTrue:
  [classPool := self classPool.
  "in case it was nil"
+ newVars do: [:var | classPool declare: var from: self environment undeclared]].
- newVars do: [:var | classPool declare: var from: environment undeclared]].
  ^conflicts!