- MetacelloScriptEngine
changed:
#lookupProjectSpecFor:
#validateProjectSpecForScript
- MetacelloValidationNotification
changed: #signal:
- MetacelloProject
changed: #version:
- MetacelloPlatform
changed: #useStackCacheDuring:defaultDictionary:
- MetacelloCleanNotification
changed: #signal:
- MetacelloClearStackCacheNotification
changed: #signal:
- MetacelloProjectSpecForLoad
changed: #performCurrentVersionTestAgainst:operator:targetVersionStatus:using:
- MetacelloSkipDirtyPackageLoad
changed: #signal:
- MetacelloErrorInProjectConstructionNotification
changed: #versionString:exception:
- MetacelloGenericProjectSpec
changed: #load
- extensions
...
--- a/core/MetacelloCleanNotification.st Wed Sep 19 01:40:38 2012 +0000
+++ b/core/MetacelloCleanNotification.st Tue Oct 02 22:30:53 2012 +0000
@@ -29,8 +29,10 @@
signal: aMetacelloVersion
- self version: aMetacelloVersion.
- ^ self signal
+ self version: aMetacelloVersion.
+ ^ self raiseRequest
+
+ "Modified: / 02-10-2012 / 23:31:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!MetacelloCleanNotification class methodsFor:'documentation'!
--- a/core/MetacelloClearStackCacheNotification.st Wed Sep 19 01:40:38 2012 +0000
+++ b/core/MetacelloClearStackCacheNotification.st Tue Oct 02 22:30:53 2012 +0000
@@ -21,10 +21,12 @@
!MetacelloClearStackCacheNotification methodsFor:'signaling'!
signal: anArray
- "Signal the occurrence of an exceptional condition with a specified cacheName."
+ "Signal the occurrence of an exceptional condition with a specified cacheName."
- self cacheNames: anArray.
- ^ self signal
+ self cacheNames: anArray.
+ ^ self raiseSignal
+
+ "Modified: / 02-10-2012 / 23:34:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!MetacelloClearStackCacheNotification class methodsFor:'documentation'!
--- a/core/MetacelloErrorInProjectConstructionNotification.st Wed Sep 19 01:40:38 2012 +0000
+++ b/core/MetacelloErrorInProjectConstructionNotification.st Tue Oct 02 22:30:53 2012 +0000
@@ -14,7 +14,9 @@
^ self new
versionString: aString;
exception: anException;
- signal
+ raiseSignal
+
+ "Modified: / 02-10-2012 / 23:33:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!MetacelloErrorInProjectConstructionNotification methodsFor:'accessing'!
--- a/core/MetacelloGenericProjectSpec.st Wed Sep 19 01:40:38 2012 +0000
+++ b/core/MetacelloGenericProjectSpec.st Tue Oct 02 22:30:53 2012 +0000
@@ -86,7 +86,9 @@
load
(MetacelloLookupProjectSpecForLoad new
projectSpec: self;
- yourself) signal performLoad
+ yourself) raiseSignal performLoad
+
+ "Modified: / 02-10-2012 / 23:33:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
loadVersion: aVersionOrNil
--- a/core/MetacelloPlatform.st Wed Sep 19 01:40:38 2012 +0000
+++ b/core/MetacelloPlatform.st Tue Oct 02 22:30:53 2012 +0000
@@ -118,32 +118,34 @@
!
useStackCacheDuring: aBlock defaultDictionary: defaultDictionary
- | dict |
- dict := MetacelloStackCacheNotification signal.
- dict == nil
- ifTrue: [
- dict := defaultDictionary == nil
- ifTrue: [ Dictionary new ]
- ifFalse: [ defaultDictionary ] ].
- [ ^ aBlock value: dict ]
- on: MetacelloStackCacheNotification , MetacelloClearStackCacheNotification
- do: [ :ex |
- (ex isKindOf: MetacelloStackCacheNotification)
- ifTrue: [ ex resume: dict ].
- (ex isKindOf: MetacelloClearStackCacheNotification)
- ifTrue: [
- | keys |
- keys := ex cacheNames.
- keys ifNil: [ keys := dict keys ].
- keys
- do: [ :k |
- (dict includesKey: k)
- ifTrue: [
- | c |
- c := dict at: k.
- c keys do: [ :ck | c removeKey: ck ].
- dict removeKey: k ] ].
- ex resume ] ]
+ | dict |
+ dict := MetacelloStackCacheNotification raiseSignal.
+ dict == nil
+ ifTrue: [
+ dict := defaultDictionary == nil
+ ifTrue: [ Dictionary new ]
+ ifFalse: [ defaultDictionary ] ].
+ [ ^ aBlock value: dict ]
+ on: MetacelloStackCacheNotification , MetacelloClearStackCacheNotification
+ do: [ :ex |
+ (ex isKindOf: MetacelloStackCacheNotification)
+ ifTrue: [ ex resume: dict ].
+ (ex isKindOf: MetacelloClearStackCacheNotification)
+ ifTrue: [
+ | keys |
+ keys := ex cacheNames.
+ keys ifNil: [ keys := dict keys ].
+ keys
+ do: [ :k |
+ (dict includesKey: k)
+ ifTrue: [
+ | c |
+ c := dict at: k.
+ c keys do: [ :ck | c removeKey: ck ].
+ dict removeKey: k ] ].
+ ex resume ] ]
+
+ "Modified: / 02-10-2012 / 23:33:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!MetacelloPlatform methodsFor:'github support'!
--- a/core/MetacelloProject.st Wed Sep 19 01:40:38 2012 +0000
+++ b/core/MetacelloProject.st Tue Oct 02 22:30:53 2012 +0000
@@ -458,21 +458,22 @@
!
version: aVersionString
- | vrsn |
aVersionString isSymbol
ifTrue: [
| symbolicVersionString |
symbolicVersionString := self symbolicVersionMap
at: aVersionString
- ifAbsent: [ (MetacelloSymbolicVersionDoesNotExistError project: self project versionString: aVersionString) signal ].
+ ifAbsent: [ (MetacelloSymbolicVersionDoesNotExistError project: self project versionString: aVersionString) raiseSignal ].
symbolicVersionString == #'notDefined'
- ifTrue: [ (MetacelloSymbolicVersionNotDefinedError project: self project versionString: aVersionString) signal ].
+ ifTrue: [ (MetacelloSymbolicVersionNotDefinedError project: self project versionString: aVersionString) raiseSignal ].
^ self
lookupVersion: symbolicVersionString
- ifAbsent: [ (MetacelloSymbolicVersionDoesNotExistError project: self project versionString: symbolicVersionString) signal ] ].
+ ifAbsent: [ (MetacelloSymbolicVersionDoesNotExistError project: self project versionString: symbolicVersionString) raiseSignal ] ].
^ self
lookupVersion: aVersionString
- ifAbsent: [ (MetacelloVersionDoesNotExistError project: self project versionString: aVersionString) signal ]
+ ifAbsent: [ (MetacelloVersionDoesNotExistError project: self project versionString: aVersionString) raiseSignal ]
+
+ "Modified: / 02-10-2012 / 23:33:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
version: aVersionString ifAbsent: aBlock
--- a/core/MetacelloProjectSpecForLoad.st Wed Sep 19 01:40:38 2012 +0000
+++ b/core/MetacelloProjectSpecForLoad.st Tue Oct 02 22:30:53 2012 +0000
@@ -71,13 +71,15 @@
(MetacelloAllowProjectDowngrade new
existingProjectRegistration: existing;
newProjectRegistration: new;
- signal) == existing ]
+ raiseSignal) == existing ]
ifFalse: [
"answer false if upgrade allowed"
(MetacelloAllowProjectUpgrade new
existingProjectRegistration: existing;
newProjectRegistration: new;
- signal) == existing ]
+ raiseSignal) == existing ]
+
+ "Modified: / 02-10-2012 / 23:33:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
performLoad
--- a/core/MetacelloScriptEngine.st Wed Sep 19 01:40:38 2012 +0000
+++ b/core/MetacelloScriptEngine.st Tue Oct 02 22:30:53 2012 +0000
@@ -436,9 +436,11 @@
ifFalse: [ MetacelloAllowConflictingProjectUpgrade new ] ])
existingProjectRegistration: existing;
newProjectRegistration: new;
- signal ]
+ raiseSignal ]
ifFalse: [ new ] ].
^ registration lookupSpec: aProjectSpec
+
+ "Modified: / 02-10-2012 / 23:32:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
validateProjectSpecForScript
@@ -449,7 +451,9 @@
withDefaultRepositoryDecription: self defaultRepositoryDescription.
issues isEmpty
ifTrue: [ ^ self ].
- (MetacelloValidationFailure issues: issues message: 'Project spec validation failure') signal
+ (MetacelloValidationFailure issues: issues message: 'Project spec validation failure') raiseSignal
+
+ "Modified: / 02-10-2012 / 23:32:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!MetacelloScriptEngine class methodsFor:'documentation'!
--- a/core/MetacelloSkipDirtyPackageLoad.st Wed Sep 19 01:40:38 2012 +0000
+++ b/core/MetacelloSkipDirtyPackageLoad.st Tue Oct 02 22:30:53 2012 +0000
@@ -12,7 +12,9 @@
signal: aMetacelloPackageSpec
- ^(self new packageSpec: aMetacelloPackageSpec) signal
+ ^(self new packageSpec: aMetacelloPackageSpec) raiseSignal
+
+ "Modified: / 02-10-2012 / 23:32:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!MetacelloSkipDirtyPackageLoad methodsFor:'accessing'!
--- a/core/MetacelloValidationNotification.st Wed Sep 19 01:40:38 2012 +0000
+++ b/core/MetacelloValidationNotification.st Tue Oct 02 22:30:53 2012 +0000
@@ -29,8 +29,10 @@
signal: aMetacelloValidationIssue
- self issue: aMetacelloValidationIssue.
- ^ self signal
+ self issue: aMetacelloValidationIssue.
+ ^ self raiseSignal
+
+ "Modified: / 02-10-2012 / 23:32:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!MetacelloValidationNotification class methodsFor:'documentation'!
--- a/core/core.rc Wed Sep 19 01:40:38 2012 +0000
+++ b/core/core.rc Tue Oct 02 22:30:53 2012 +0000
@@ -25,7 +25,7 @@
VALUE "LegalCopyright", "Copyright Dale Henrichs 2008-2012\nCopyright Jan Vrany 2012 (port & Smalltalk/X specific code)\0"
VALUE "ProductName", "Metacello\0"
VALUE "ProductVersion", "6.2.3.1\0"
- VALUE "ProductDate", "Wed, 19 Sep 2012 01:38:41 GMT\0"
+ VALUE "ProductDate", "Tue, 02 Oct 2012 22:31:50 GMT\0"
END
END
--- a/core/lccmake.bat Wed Sep 19 01:40:38 2012 +0000
+++ b/core/lccmake.bat Tue Oct 02 22:30:53 2012 +0000
@@ -3,6 +3,6 @@
@REM type lccmake, and wait...
@REM do not edit - automatically generated from ProjectDefinition
@REM -------
-make.exe -N -f bc.mak USELCC=1 %*
+make.exe -N -f bc.mak -DUSELCC=1 %*
--- a/core/mingwmake.bat Wed Sep 19 01:40:38 2012 +0000
+++ b/core/mingwmake.bat Tue Oct 02 22:30:53 2012 +0000
@@ -3,6 +3,6 @@
@REM type mingwmake, and wait...
@REM do not edit - automatically generated from ProjectDefinition
@REM -------
-make.exe -N -f bc.mak USEMINGW=1 %*
+make.exe -N -f bc.mak -DUSEMINGW=1 %*