Add GTInspectors for Data (Ctors, Rvars)

shingarov · Jun 29, 2024 · a06e8f8 · a06e8f8
1 parent 2bb6a78
commit a06e8f8
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 7 deletions.
diff --git a/src/SpriteLang/Data.class.st b/src/SpriteLang/Data.class.st
@@ -51,6 +51,33 @@ dataSigs (Data _ _ ctors) = [(F.symbol b, t) | (b, t) <- ctors]
 	^ctors collectAssociations: [ :b :t | b id -> t ] 
 ]
 
+{ #category : #GT }
+Data >> gtInspectorCtorsIn: composite [
+	<gtInspectorPresentationOrder: 1>
+
+	^ composite fastTable
+		title: 'Ctors';
+		display: [ ctors ];
+		column: 'Ctor' evaluated: [ :each | each key id ];
+		column: 'Type' evaluated: [ :each | each value printString ];
+		send: [ :sel |
+			sel
+				ifNil: [ nil ]
+				ifNotNil: [ sel value ]
+		]
+
+]
+
+{ #category : #GT }
+Data >> gtInspectorRvarsIn: composite [
+	<gtInspectorPresentationOrder: 2>
+
+	^ composite fastList
+		title: 'Rvars';
+		display: [ rvars ];
+		format: [ :each | each prettyPrint ]
+]
+
 { #category : #accessing }
 Data >> inv [
 	^ inv
@@ -71,6 +98,17 @@ Data >> name: anObject [
 	name := anObject
 ]
 
+{ #category : #printing }
+Data >> printOn: aStream [
+	aStream nextPutAll: '∐ '.
+	aStream nextPutAll: name.
+	vars do: [ :eachTypeVar |
+		aStream nextPutAll: ' '''.
+		aStream nextPutAll: eachTypeVar
+	]
+
+]
+
 { #category : #accessing }
 Data >> rvars [
 	^ rvars

diff --git a/src/SpriteLang/RVar.class.st b/src/SpriteLang/RVar.class.st
@@ -44,16 +44,20 @@ cf. Check.hs
 ]
 
 { #category : #printing }
-RVar >> printOn: aStream [
-	aStream nextPutAll: 'RVar{';
-		nextPutAll: rvName;
-		nextPut: $(.
-	rvArgs printOn: aStream delimiter: ', '.
-	aStream nextPutAll: ')}'
-
+RVar >> prettyPrint [
+	^rvName,
+	'(',
+	((rvArgs collect: #printString) separatedBy: ', '),
+	')'	
 
 ]
 
+{ #category : #printing }
+RVar >> printOn: aStream [
+	aStream nextPutAll: 'RVar ';
+		nextPutAll: self prettyPrint
+]
+
 { #category : #'as yet unclassified' }
 RVar >> rVarARef__Types [
 "