dc: add tla+, utility funcs

hpi-swa-lab · Nov 30, 2023 · 2d6c155 · 2d6c155
1 parent c77efc6
commit 2d6c155
Show file tree

Hide file tree

Showing 22 changed files with 10,594 additions and 249 deletions.
diff --git a/.squot b/.squot
@@ -23,5 +23,6 @@ OrderedDictionary {
 	'packages/DomainCode-Parser' : #SquotTonelSerializer,
 	'packages/DomainCode-Core' : #SquotTonelSerializer,
 	'packages/DomainCode-Diff' : #SquotTonelSerializer,
-	'packages/DomainCode-Truediff' : #SquotTonelSerializer
+	'packages/DomainCode-Truediff' : #SquotTonelSerializer,
+	'packages/Sandblocks-Tlaplus' : #SquotTonelSerializer
 }
diff --git a/packages/DomainCode-Core/CompiledMethod.extension.st b/packages/DomainCode-Core/CompiledMethod.extension.st
@@ -3,7 +3,7 @@ Extension { #name : #CompiledMethod }
 { #category : #'*DomainCode-Core' }
 CompiledMethod >> openDC: convert [
 	<convert>
-	<convertPriority: 11>
+	<convertPriority: 1>
 
 	convert do: [DCSmalltalkMethod for: self]
 ]
diff --git a/packages/DomainCode-Core/Morph.extension.st b/packages/DomainCode-Core/Morph.extension.st
@@ -55,7 +55,7 @@ Morph >> childCount [
 { #category : #'*DomainCode-Core' }
 Morph >> children [
 
-	^ submorphs
+	^ Array streamContents: [:s | self childrenDo: [:c | s nextPut: c]]
 ]
 
 { #category : #'*DomainCode-Core' }
@@ -174,6 +174,12 @@ Morph >> setBoundsDirect: aRectangle [
 	box = priorBounds ifFalse: [self invalidRect: (priorBounds quickMerge: box)]
 ]
 
+{ #category : #'*DomainCode-Core' }
+Morph >> showInQuery [
+
+	^ false
+]
+
 { #category : #'*DomainCode-Core' }
 Morph >> treeSize [
 

diff --git a/packages/DomainCode-Core/SBTSLanguage.extension.st b/packages/DomainCode-Core/SBTSLanguage.extension.st
@@ -0,0 +1,30 @@
+Extension { #name : #SBTSLanguage }
+
+{ #category : #'*DomainCode-Core' }
+SBTSLanguage class >> grammarRule: aSymbol [
+
+	^ self rawGrammar rules at: aSymbol
+]
+
+{ #category : #'*DomainCode-Core' }
+SBTSLanguage class >> rawGrammar [
+
+	^ RawGrammar ifNil: [RawGrammar := Json readFrom: self grammarJson readStream]
+]
+
+{ #category : #'*DomainCode-Core' }
+SBTSLanguage class >> ruleIsInlined: aSymbol [
+
+	^ ((self rawGrammar at: #inline) includes: aSymbol) or: [aSymbol first = $_]
+]
+
+{ #category : #'*DomainCode-Core' }
+SBTSLanguage class >> supertype: aSymbol includes: anotherSymbol [
+
+	^ ((self rawGrammar supertypes includes: aSymbol) or: [self ruleIsInlined: aSymbol])
+		ifTrue: [ | nestedRule |
+			nestedRule := self grammarRule: aSymbol.
+			nestedRule type = 'CHOICE' ifFalse: [nestedRule := nestedRule content].
+			nestedRule members anySatisfy: [:rule | self supertype: (rule name ifNil: [rule content name]) includes: anotherSymbol]]
+		ifFalse: [aSymbol = anotherSymbol]
+]