Skip to content

Commit

Permalink
60436
Browse files Browse the repository at this point in the history
  • Loading branch information
Jenkins Build Server authored and ci committed Mar 7, 2017
1 parent d21a9b5 commit 1b4c50f
Show file tree
Hide file tree
Showing 234 changed files with 827 additions and 369 deletions.
@@ -1,12 +1,12 @@
stable: spec
<symbolicVersion: #'stable'>

spec for: #'common' version: '3.9'.
spec for: #'common' version: '3.10'.

spec for: #'pharo3.x' version: '1.0.0'.

spec for: #'pharo4.x' version: '1.0.1'.

spec for: #'pharo5.x' version: '3.0'.

spec for: #'pharo6.x' version: '3.9'.
spec for: #'pharo6.x' version: '3.10'.
@@ -0,0 +1,14 @@
version310: spec
<version: '3.10' imports: #('0.5-baseline' )>

spec for: #'common' do: [
spec blessing: #'stable'.
spec description: 'GToolkit version 3.36'.
spec author: 'AndreiChis'.
spec timestamp: '3/6/2017 14:09'.
spec project: 'GTInspectorCore' with: '3.28'.
spec
package: 'GT-Debugger' with: 'GT-Debugger-AndreiChis.379';
package: 'GT-BytecodeDebugger' with: 'GT-BytecodeDebugger-AndreiChis.36';
package: 'GT-SUnitDebugger' with: 'GT-SUnitDebugger-TudorGirba.39';
package: 'GT-Tests-Debugger' with: 'GT-Tests-Debugger-AndreiChis.14'. ].
@@ -1,8 +1,8 @@
stable: spec
<symbolicVersion: #'stable'>

spec for: #'common' version: '1.6'.
spec for: #'common' version: '1.7'.

spec for: #'pharo5.x' version: '1.0'.

spec for: #'pharo6.x' version: '1.6'.
spec for: #'pharo6.x' version: '1.7'.
@@ -0,0 +1,12 @@
version17: spec
<version: '1.7' imports: #('0.1-baseline' )>

spec for: #'common' do: [
spec blessing: #'stable'.
spec description: 'GToolkit version 3.36'.
spec author: 'AndreiChis'.
spec timestamp: '3/6/2017 14:09'.
spec project: 'Ston' with: '0.23'.
spec
package: #'GT-EventRecorder' with: 'GT-EventRecorder-AndreiChis.80';
package: 'GT-EventRecorder-Tests' with: 'GT-EventRecorder-Tests-TheIntegrator.40'. ].
@@ -1,12 +1,12 @@
stable: spec
<symbolicVersion: #'stable'>

spec for: #'common' version: '3.27'.
spec for: #'common' version: '3.28'.

spec for: #'pharo3.x' version: '2.0.6'.

spec for: #'pharo4.x' version: '2.0.15'.

spec for: #'pharo5.x' version: '3.17'.

spec for: #'pharo6.x' version: '3.27'.
spec for: #'pharo6.x' version: '3.28'.
@@ -0,0 +1,13 @@
version328: spec
<version: '3.28' imports: #('3.0-baseline' )>

spec for: #'common' do: [
spec blessing: #'stable'.
spec description: 'GToolkit version 3.36'.
spec author: 'AndreiChis'.
spec timestamp: '3/6/2017 14:09'.
spec project: 'GlamourCore' with: '4.36'.
spec
package: 'GT-Inspector' with: 'GT-Inspector-AndreiChis.465';
package: 'GT-InspectorExtensions-Core' with: 'GT-InspectorExtensions-Core-AndreiChis.256';
package: 'GT-Tests-Inspector' with: 'GT-Tests-Inspector-AndreiChis.60'. ].
@@ -1,12 +1,12 @@
stable: spec
<symbolicVersion: #'stable'>

spec for: #'common' version: '3.23'.
spec for: #'common' version: '3.24'.

spec for: #'pharo3.x' version: '2.0.5'.

spec for: #'pharo4.x' version: '2.1.5'.

spec for: #'pharo5.x' version: '3.13'.

spec for: #'pharo6.x' version: '3.23'.
spec for: #'pharo6.x' version: '3.24'.
@@ -0,0 +1,12 @@
version324: spec
<version: '3.24' imports: #('2.1-baseline' )>

spec for: #'common' do: [
spec blessing: #'stable'.
spec description: 'GToolkit version 3.36'.
spec author: 'AndreiChis'.
spec timestamp: '3/6/2017 14:09'.
spec project: 'GTInspectorCore' with: '3.28'.
spec
package: 'GT-Playground' with: 'GT-Playground-AndreiChis.145';
package: 'GT-Tests-Playground' with: 'GT-Tests-Playground-StefanReichhart.4'. ].
@@ -1,12 +1,12 @@
stable: spec
<symbolicVersion: #'stable'>

spec for: #'common' version: '2.25'.
spec for: #'common' version: '2.26'.

spec for: #'pharo3.x' version: '1.0.4'.

spec for: #'pharo4.x' version: '1.2.4'.

spec for: #'pharo5.x' version: '2.14'.

spec for: #'pharo6.x' version: '2.25'.
spec for: #'pharo6.x' version: '2.26'.
@@ -0,0 +1,16 @@
version226: spec
<version: '2.26' imports: #('1.3-baseline' )>

spec for: #'common' do: [
spec blessing: #'stable'.
spec description: 'GToolkit version 3.36'.
spec author: 'AndreiChis'.
spec timestamp: '3/6/2017 14:09'.
spec
project: 'GlamourCore' with: '4.36';
project: 'GTEventRecorder' with: '1.7'.
spec
package: 'GT-Spotter' with: 'GT-Spotter-TheIntegrator.411';
package: 'GT-Spotter-EventRecorder' with: 'GT-Spotter-EventRecorder-AndreiChis.114';
package: 'GT-SpotterExtensions-Core' with: 'GT-SpotterExtensions-Core-TheIntegrator.222';
package: 'GT-Tests-Spotter' with: 'GT-Tests-Spotter-TheIntegrator.30'. ].
@@ -1,10 +1,10 @@
stable: spec
<symbolicVersion: #'stable'>

spec for: #'common' version: '3.35'.
spec for: #'common' version: '3.36'.

spec for: #'pharo4.x' version: '3.0.2'.

spec for: #'pharo5.x' version: '3.25'.

spec for: #'pharo6.x' version: '3.35'.
spec for: #'pharo6.x' version: '3.36'.
@@ -0,0 +1,13 @@
version336: spec
<version: '3.36' imports: #('3.1-baseline' )>

spec for: #'common' do: [
spec blessing: #'stable'.
spec description: 'GToolkit version 3.36'.
spec author: 'AndreiChis'.
spec timestamp: '3/6/2017 14:09'.
spec
project: 'GTPlaygroundCore' with: '3.24';
project: 'GTInspectorCore' with: '3.28';
project: 'GTSpotter' with: '2.26';
project: 'GTDebugger' with: '3.10'. ].
@@ -1,12 +1,12 @@
stable: spec
<symbolicVersion: #'stable'>

spec for: #'common' version: '4.35'.
spec for: #'common' version: '4.36'.

spec for: #'pharo3.x' version: '3.0.7'.

spec for: #'pharo4.x' version: '3.1.4.Moose51'.

spec for: #'pharo5.x' version: '4.19.1'.

spec for: #'pharo6.x' version: '4.35'.
spec for: #'pharo6.x' version: '4.36'.
@@ -0,0 +1,29 @@
version436: spec
<version: '4.36' imports: #('4.1-baseline' )>

spec for: #'common' do: [
spec blessing: #'stable'.
spec description: 'GToolkit version 3.36'.
spec author: 'AndreiChis'.
spec timestamp: '3/6/2017 14:09'.
spec project: 'FastTable' with: '0.11'.
spec
package: 'Glamour-Announcements' with: 'Glamour-Announcements-AndreiChis.11';
package: 'Glamour-Helpers' with: 'Glamour-Helpers-TudorGirba.40';
package: 'Glamour-Core' with: 'Glamour-Core-AndreiChis.335';
package: 'Glamour-Presentations' with: 'Glamour-Presentations-AndreiChis.190';
package: 'Glamour-Browsers' with: 'Glamour-Browsers-AndreiChis.112';
package: 'Glamour-Examples' with: 'Glamour-Examples-AndreiChis.319';
package: 'Glamour-FastTable' with: 'Glamour-FastTable-AndreiChis.80';
package: 'Glamour-Morphic-Brick' with: 'Glamour-Morphic-Brick-AndreiChis.439';
package: 'Glamour-Morphic-Brick-Tests' with: 'Glamour-Morphic-Brick-Tests-JurajKubelka.15';
package: 'Glamour-Tests-Core' with: 'Glamour-Tests-Core-PavelKrivanek.113';
package: 'Glamour-Tests-Resources' with: 'Glamour-Tests-Resources-AndreiChis.5';
package: 'Glamour-Morphic-Theme' with: 'Glamour-Morphic-Theme-TheIntegrator.229';
package: 'Glamour-Morphic-Widgets' with: 'Glamour-Morphic-Widgets-AndreiChis.207';
package: 'Glamour-Morphic-Renderer' with: 'Glamour-Morphic-Renderer-AndreiChis.360';
package: 'Glamour-Morphic-Pager' with: 'Glamour-Morphic-Pager-AndreiChis.114';
package: 'Glamour-Tests-Morphic' with: 'Glamour-Tests-Morphic-AndreiChis.138';
package: 'Glamour-Rubric-Presentations' with: 'Glamour-Rubric-Presentations-AndreiChis.61';
package: 'Glamour-Tests-Rubric' with: 'Glamour-Tests-Rubric-AndreiChis.36';
package: 'Glamour-SpecIntegration' with: 'Glamour-SpecIntegration-TheIntegrator.6'. ].

This file was deleted.

@@ -0,0 +1,3 @@
buildVariablesFromContext: aContext

^ aContext gtBytecodeDebuggerRetrieveContextValues

This file was deleted.

@@ -1,27 +1,46 @@
gtBytecodeDebuggerRetrieveContextValues
|fieldList displayedTemp context slotsSize|
|fieldList displayedTemp slotsSize tempNames |

fieldList := OrderedCollection new.
context := self.
context == nil ifTrue: [^('_thisContext' -> nil) asOrderedCollection].
fieldList
add: ('_self' -> context receiver);
add: ('_thisContext' -> context).

displayedTemp := OrderedCollection new.
context stackPtr to: 1 by: -1 do: [ :index ||key|
key := (index-1) asString.
(index <= context tempNames size) ifTrue: [
key := key, ' [', (context tempNames at: index) asString, ']'.
displayedTemp add: (context tempNames at: index) ].
fieldList add: (key -> (context at: index)) ].
(context tempNames copy asOrderedCollection removeAll: displayedTemp; yourself) ifNotEmpty: [ :uninitializedTemps |
tempNames := self tempNames.

self stackPtr to: 1 by: -1 do: [ :tempIndex ||tempNode|
fieldList add:
(tempIndex <= tempNames size
ifTrue: [
displayedTemp add: (tempNames at: tempIndex).
tempNode := GTInspectorContextNamedTempNode
hostObject: self
tempName: (tempNames at: tempIndex)
tempIndex: tempIndex.
GTInspectorWrapperNode
hostObject: tempNode
label: (tempIndex - 1) asString, ' [', (tempNames at: tempIndex), ']' ]
ifFalse: [
tempNode := GTInspectorContextIndexedTempNode hostObject: self tempIndex: tempIndex.
GTInspectorWrapperNode
hostObject: tempNode
label: (tempIndex - 1) asString ]) ].

(tempNames copy asOrderedCollection removeAll: displayedTemp; yourself) ifNotEmpty: [ :uninitializedTemps |
uninitializedTemps do: [ :each |
fieldList add: ('- [', each, ']') -> nil ] ].
slotsSize := context receiver class allSlots size.
GTInspectorDynamicNode hostObject: self label: ('- [', each, ']') value: nil ] ].

fieldList addAll: (self gtDebuggerDoItBindings collect: [:aBinding |
(GTInspectorDynamicNode hostObject: self label: aBinding key value: aBinding value)
variableTag: 'temp';
yourself ]).

slotsSize := self receiver class allSlots size.
fieldList
addAll: ((context receiver class allSlots reverse) collect: [:slot ||name|
name := slot name.
('rcv', (slotsSize := slotsSize - 1) asString, ' [', name , ']') -> (slot read: context receiver) ]).
addAll: ((self receiver class allSlots reverse) collect: [:slot ||slotNode|
slotNode := GTInspectorSlotNode hostObject: self receiver slot: slot.
GTInspectorWrapperNode
hostObject: slotNode
label: ('rcv', (slotsSize := slotsSize - 1) asString, ' [', slot name , ']') ]).

^ fieldList
^ fieldList asOrderedCollection
addFirst: (GTInspectorSelfNode hostObject: self receiver);
addLast: (GTInspectorDynamicNode hostObject: self label: 'thisContext' value: self);
yourself
@@ -1,5 +1,5 @@
GLMCompositePresentation subclass: #GTDebuggerVariablesBrowser
instanceVariableNames: 'debugger'
instanceVariableNames: 'debugger cachedVariables'
classVariableNames: ''
poolDictionaries: ''
category: 'GT-Debugger-UI'
@@ -0,0 +1,4 @@
selectedVariableForContext: aContext
^ (self variablesFromContext: aContext)
detect: [ :each | each key = self debugger selectedVariableName ]
ifNone: [ cachedVariables detect: [ :each | each key = 'self' ] ifNone: [ nil ] ]
@@ -0,0 +1,9 @@
restoreSettings
| currentPane presentationTitle lastActivePresentation |

presentationTitle := self debugger cache at: #activePresentationTitle ifAbsent: [ ^ self ].
currentPane := self presentations first paneNamed: #main.
lastActivePresentation := currentPane presentations presentations
detect: [ :each | each title = presentationTitle ]
ifNone: [ ^ self ].
currentPane lastActivePresentation: lastActivePresentation
@@ -0,0 +1,2 @@
updateVariablesForContext
cachedVariables := self
@@ -1,15 +1,30 @@
compose
"self title: [:each | GTInspector new printObjectAsAnItem: each receiver ]."
"self morphicAct: [:anotherComposite | anotherComposite entity receiver browse]
icon: GLMUIThemeExtraIcons glamorousBrowse
entitled: 'Browse'."
self tabulator with: [:browser |
browser row: #variables.
browser transmit to: #variables; andShow: [:a |
self variablesIn: a ].
browser transmit
from: #variables port: #entity;
to: #variables port: #selection;
when: [ :aContext | self debugger selectedVariableName notNil and: [aContext notNil] ];
transformed: [ :aContext | self selectedVariableForContext: aContext ].
browser transmit from: #variables; toOutsidePort: #selection; transformed: [ :pair | pair value ] ]
| tabulator |
tabulator := self tabulator.
tabulator row: #main.
tabulator transmit to: #main; andShow: [ :aComposite |
aComposite tabulator with: [:browser |
browser title: 'Variables'.
browser row: #variables.
browser transmit
to: #variables port: #entity;
andShow: [:a |
self variablesIn: a ].
browser transmit
from: #variables port: #entity;
to: #variables port: #selection;
when: [ :aContext | self debugger selectedVariableName notNil and: [aContext notNil] ];
transformed: [ :aContext | self selectedVariableForContext: aContext ].
browser transmit from: #variables; toOutsidePort: #selection; transformed: [ :aNode | aNode value ] ].
aComposite tabulator with: [:browser |
browser title: 'Evaluator'.
browser row: #evaluator.
browser transmit to: #evaluator; andShow: [:a |
self contextEvaluatorIn: a. ].
browser transmit from: #evaluator; toOutsidePort: #selection ].

aComposite onChangeOfPort: #activePresentation act: [ :presentation |
(presentation pane port: #activePresentation) value
ifNotNil: [ :activePresentation |
self debugger cache at: #activePresentationTitle put: activePresentation title ] ] ].
tabulator transmit from: #main; toOutsidePort: #selection.

This file was deleted.

This file was deleted.

0 comments on commit 1b4c50f

Please sign in to comment.