Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@codeZeilen
codeZeilen committed Jan 12, 2023
2 parents cf95f12 + 00fe364 commit bc5be74
Show file tree
Hide file tree
Showing 417 changed files with 1,979 additions and 486 deletions.
4 changes: 3 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# Babylonian Programming / Smalltalk [![Build Status Main](https://img.shields.io/github/workflow/status/hpi-swa-lab/babylonian-programming-smalltalk/testAndBuild/main?logo=github&label=main)](https://github.com/hpi-swa-lab/babylonian-programming-smalltalk/actions/workflows/main.yml) [![Build Status Develop](https://img.shields.io/github/workflow/status/hpi-swa-lab/babylonian-programming-smalltalk/testAndBuild/develop?logo=github&label=develop)](https://github.com/hpi-swa-lab/babylonian-programming-smalltalk/actions/workflows/main.yml)
# Babylonian Programming / Smalltalk
[![Build Status Main](https://img.shields.io/github/actions/workflow/status/hpi-swa-lab/babylonian-programming-smalltalk/main.yml?logo=github&label=main&branch=main)](https://github.com/hpi-swa-lab/babylonian-programming-smalltalk/actions/workflows/main.yml)
[![Build Status Develop](https://img.shields.io/github/actions/workflow/status/hpi-swa-lab/babylonian-programming-smalltalk/main.yml?logo=github&label=develop&branch=develop)](https://github.com/hpi-swa-lab/babylonian-programming-smalltalk/actions/workflows/main.yml)

A Smalltalk implementation of the Babylonian Programming System.

Expand Down
2 changes: 1 addition & 1 deletion packages/Babylonian-Compiler.package/BPCompiler.class/instance/keywords.st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
private
keywords

^ #(bpProbe bpReplace bpAssert exampleNamed)
^ #(bpProbe bpReplace bpAssert bpProfilingProbe bpTypeProbe exampleNamed)
2 changes: 1 addition & 1 deletion packages/Babylonian-Compiler.package/BPCompiler.class/instance/parse..st
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
private
parse: code

^ BPSmalltalkGrammar
^ PEGParserBPSmalltalk new
match: code
startingFrom: #MethodDeclaration
4 changes: 2 additions & 2 deletions packages/Babylonian-Compiler.package/BPCompiler.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"backgroundCompileInstrumentedVersionOf:basedOn:" : "pre 10/12/2020 15:36",
"compileCue:noPattern:ifFail:" : "pre 7/20/2022 16:41",
"compileInstrumentedVersionOf:" : "jb 9/9/2021 17:31",
"keywords" : "pre 7/26/2019 14:00",
"keywords" : "pre 11/30/2022 09:33",
"methodSourceRequiresBPLayers:" : "pre 11/11/2019 15:49",
"parse:" : "pre 1/11/2021 15:51",
"parse:" : "pre 5/3/2021 15:01",
"rewriteToSource:" : "pre 8/17/2020 08:54",
"rewriter" : "jb 12/7/2020 18:03" } }
2 changes: 1 addition & 1 deletion ...Babylonian-Compiler.package/BPExtractAnnotations.class/instance/Pragma.with.with.with..st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ rules
Pragma: aNode with: literal with: values with: anotherLiteral

| exampleName |
(BPExample bpExamplePragmaPrefixes anySatisfy: [:prefix | values children first interval contents beginsWith: prefix]) ifTrue: [
(BPAbstractExample bpExamplePragmaPrefixes anySatisfy: [:prefix | values children first interval contents beginsWith: prefix]) ifTrue: [
exampleName := self value: values children first children first.
annotations add: (BPExampleAnnotation new
exampleName: exampleName;
Expand Down
2 changes: 1 addition & 1 deletion packages/Babylonian-Compiler.package/BPExtractAnnotations.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"KeywordPragma:with:with:" : "pre 7/23/2019 12:10",
"MethodDeclaration:with:and:and:" : "pre 7/23/2022 20:12",
"MethodHeader:with:" : "pre 7/23/2022 16:19",
"Pragma:with:with:with:" : "pre 9/6/2022 11:12",
"Pragma:with:with:with:" : "pre 1/11/2023 14:38",
"Pragmas:pragmas:" : "jb 12/7/2020 18:01",
"defaultExpression:" : "jb 12/7/2020 18:01",
"initialize" : "pre 3/24/2020 09:39",
Expand Down
0 .../BPActiveSpecimenRegistry.class/README.md → ...ckage/BPReferenceRewriter.class/README.md
View file
File renamed without changes.
6 changes: 6 additions & 0 deletions packages/Babylonian-Compiler.package/BPReferenceRewriter.class/instance/Reference.with..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
as yet unclassified
Reference: aNode with: identifier

^ (argumentNames includes: identifier interval contents asSymbol)
ifTrue: [self value: identifier]
ifFalse: ['(self bpResolveReferenceDynamically: #' , identifier interval contents , ' in: thisContext)']
4 changes: 4 additions & 0 deletions ...an-Compiler.package/BPReferenceRewriter.class/instance/blockArgument.with.and.and.and..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
as yet unclassified
blockArgument: aNode with: some and: more and: moree and: evenMore
argumentNames add: aNode interval contents copyWithoutFirst asSymbol.
^ aNode interval contents
2 changes: 1 addition & 1 deletion ...imenRegistry.class/instance/initialize.st → ...enceRewriter.class/instance/initialize.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ initialize-release
initialize

super initialize.
dictionary := IdentityDictionary new.
argumentNames := Set new.
7 changes: 7 additions & 0 deletions packages/Babylonian-Compiler.package/BPReferenceRewriter.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"class" : {
},
"instance" : {
"Reference:with:" : "pre 1/10/2023 17:50",
"blockArgument:with:and:and:and:" : "pre 1/10/2023 17:51",
"initialize" : "pre 1/10/2023 17:37" } }
14 changes: 14 additions & 0 deletions packages/Babylonian-Compiler.package/BPReferenceRewriter.class/properties.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"category" : "Babylonian-Compiler",
"classinstvars" : [
],
"classvars" : [
],
"commentStamp" : "",
"instvars" : [
"argumentNames" ],
"name" : "BPReferenceRewriter",
"pools" : [
],
"super" : "OhmSmalltalkSourceRewriter",
"type" : "normal" }
4 changes: 4 additions & 0 deletions ...ges/Babylonian-Compiler.package/BPSourceRewriter.class/instance/bpProfilingProbe.with..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
rewrite rules
bpProfilingProbe: annotation with: originalExpressionSourceNode

^ annotation instrumentationCallFor: (self value: originalExpressionSourceNode)
4 changes: 4 additions & 0 deletions packages/Babylonian-Compiler.package/BPSourceRewriter.class/instance/bpTypeProbe.with..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
rewrite rules
bpTypeProbe: annotation with: originalExpressionSourceNode

^ annotation instrumentationCallFor: (self value: originalExpressionSourceNode)
2 changes: 2 additions & 0 deletions packages/Babylonian-Compiler.package/BPSourceRewriter.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,11 @@
"MethodHeader:with:" : "pre 9/25/2020 11:14",
"bpAssert:with:" : "pre 9/25/2020 11:20",
"bpProbe:with:" : "pre 9/25/2020 11:20",
"bpProfilingProbe:with:" : "pre 11/29/2022 16:45",
"bpReplace:with:" : "pre 9/25/2020 11:20",
"bpSlider:with:" : "pre 9/1/2022 20:51",
"bpTemporaryProbe:with:" : "pre 9/2/2022 15:03",
"bpTypeProbe:with:" : "pre 11/30/2022 09:34",
"expressionAnnotationStart:with:and:and:and:and:and:and:" : "pre 8/6/2021 18:49",
"initialize" : "pre 7/23/2022 15:23",
"nextBlockId" : "pre 1/27/2020 09:17",
Expand Down
3 changes: 3 additions & 0 deletions packages/Babylonian-Core.package/BPAbstractExample.class/README.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
A Babylonian Example is a source of concrete data to illustrate source code.

Currently, an example is always associated with a method, even if the example refers to a global source of information, each example in a method is its own instance. You can activate each individual instance.
4 changes: 4 additions & 0 deletions packages/Babylonian-Core.package/BPAbstractExample.class/class/bpExamplePragmaPrefix.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
constants
bpExamplePragmaPrefix
"Should be overridden by subclasses"
^ 'noExample'
0 ...le.class/class/bpExamplePragmaPrefixes.st → ...le.class/class/bpExamplePragmaPrefixes.st
View file
File renamed without changes.
16 changes: 16 additions & 0 deletions packages/Babylonian-Core.package/BPAbstractExample.class/class/exampleColors.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
constants
exampleColors

"These are color brewer colors: https://colorbrewer2.org"
^ #('a6cee3'
'1f78b4'
'b2df8a'
'33a02c'
'fb9a99'
'e31a1c'
'fdbf6f'
'ff7f00'
'cab2d6'
'6a3d9a')
collect: [:colorHexString |
Color fromString: colorHexString]
0 ...kage/BPExample.class/class/fromPragma..st → ...bstractExample.class/class/fromPragma..st
View file
File renamed without changes.
0 ....package/BPExample.class/class/newFor..st → .../BPAbstractExample.class/class/newFor..st
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...kage/BPExample.class/instance/asPragma.st → ...bstractExample.class/instance/asPragma.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ serialization
asPragma

<bpRelevantMethod>
^ self subclassResponsibility
self subclassResponsibility.
0 ...ge/BPExample.class/instance/assertions.st → ...tractExample.class/instance/assertions.st
View file
File renamed without changes.
0 ...ample.class/instance/canBeUsedForDoIts.st → ...ample.class/instance/canBeUsedForDoIts.st
View file
File renamed without changes.
0 ...package/BPExample.class/instance/color.st → ...BPAbstractExample.class/instance/color.st
View file
File renamed without changes.
4 changes: 4 additions & 0 deletions packages/Babylonian-Core.package/BPAbstractExample.class/instance/currentTrace.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
tracing
currentTrace

^ self traceInformation trace
0 ...package/BPExample.class/instance/debug.st → ...BPAbstractExample.class/instance/debug.st
View file
File renamed without changes.
3 changes: 3 additions & 0 deletions packages/Babylonian-Core.package/BPAbstractExample.class/instance/ensureTerminatedProcess.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
tracing
ensureTerminatedProcess
self traceInformation terminateTracingProcess.
6 changes: 6 additions & 0 deletions packages/Babylonian-Core.package/BPAbstractExample.class/instance/exampleName..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
accessing
exampleName: aStringOrText

self subclassResponsibility.


4 changes: 4 additions & 0 deletions packages/Babylonian-Core.package/BPAbstractExample.class/instance/exampleName.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
exampleName

self subclassResponsibility.
0 ...ckage/BPExample.class/instance/execute.st → ...AbstractExample.class/instance/execute.st
View file
File renamed without changes.
3 changes: 3 additions & 0 deletions packages/Babylonian-Core.package/BPAbstractExample.class/instance/expectedResult..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
accessing
expectedResult: aString
self subclassResponsibility.
3 changes: 3 additions & 0 deletions packages/Babylonian-Core.package/BPAbstractExample.class/instance/expectedResult.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
accessing
expectedResult
self subclassResponsibility.
0 ...ample.class/instance/hasExpectedResult.st → ...ample.class/instance/hasExpectedResult.st
View file
File renamed without changes.
0 ...e.class/instance/initializeFromMethod..st → ...e.class/instance/initializeFromMethod..st
View file
File renamed without changes.
0 ...e.class/instance/initializeFromPragma..st → ...e.class/instance/initializeFromPragma..st
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...age/BPExample.class/instance/isActive..st → ...stractExample.class/instance/isActive..st
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
accessing
isActive: aBoolean

aBoolean ~= isActive ifTrue: [
isActive := aBoolean.
aBoolean ~= self isActive ifTrue: [
self setIsActive: aBoolean.
aBoolean
ifTrue: [
self liveSpecimen do: [:aSpecimen |
Expand Down
4 changes: 4 additions & 0 deletions packages/Babylonian-Core.package/BPAbstractExample.class/instance/isActive.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
isActive

self subclassResponsibility.
0 .../BPExample.class/instance/isNilExample.st → ...actExample.class/instance/isNilExample.st
View file
File renamed without changes.
0 .../BPExample.class/instance/liveSpecimen.st → ...actExample.class/instance/liveSpecimen.st
View file
File renamed without changes.
4 changes: 4 additions & 0 deletions packages/Babylonian-Core.package/BPAbstractExample.class/instance/method..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
method: anObject

self subclassResponsibility.
4 changes: 4 additions & 0 deletions packages/Babylonian-Core.package/BPAbstractExample.class/instance/method.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
method

self subclassResponsibility.
4 changes: 4 additions & 0 deletions packages/Babylonian-Core.package/BPAbstractExample.class/instance/morphClass.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ui
morphClass

self subclassResponsibility.
2 changes: 1 addition & 1 deletion ...class/instance/newExpectedResultObject.st → ...class/instance/newExpectedResultObject.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ newExpectedResultObject
| result |
self expectedResult isSymbol ifTrue: [
^ self method methodClass perform: self expectedResult].
(self isLiveSpecimenReference: self expectedResult) ifTrue: [
self expectedResult isLiveSpecimenReference ifTrue: [
^ self resolveLiveSpecimen: self expectedResult].

result := Compiler evaluate: self expectedResult.
Expand Down
0 ...Example.class/instance/prepareRunState.st → ...Example.class/instance/prepareRunState.st
View file
File renamed without changes.
0 ...kage/BPExample.class/instance/printOn..st → ...bstractExample.class/instance/printOn..st
View file
File renamed without changes.
0 ...ackage/BPExample.class/instance/probes.st → ...PAbstractExample.class/instance/probes.st
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...e/BPExample.class/instance/removeTrace.st → ...ractExample.class/instance/removeTrace.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ tracing
removeTrace

self ensureTerminatedProcess.
traceInformation trace: nil.
self traceInformation trace: nil.
3 changes: 3 additions & 0 deletions packages/Babylonian-Core.package/BPAbstractExample.class/instance/resumeTracing.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
tracing
resumeTracing
^ self traceInformation resumeProcess
2 changes: 1 addition & 1 deletion ...ackage/BPExample.class/instance/runOn..st → ...PAbstractExample.class/instance/runOn..st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
executing
runOn: initialState

^ self subclassResponsibility
self subclassResponsibility.
0 ...kage/BPExample.class/instance/runSetUp.st → ...bstractExample.class/instance/runSetUp.st
View file
File renamed without changes.
0 ...BPExample.class/instance/runSetUpWith..st → ...ctExample.class/instance/runSetUpWith..st
View file
File renamed without changes.
0 ...e/BPExample.class/instance/runTearDown.st → ...ractExample.class/instance/runTearDown.st
View file
File renamed without changes.
0 ...xample.class/instance/runTearDownWith..st → ...xample.class/instance/runTearDownWith..st
View file
File renamed without changes.
15 changes: 15 additions & 0 deletions packages/Babylonian-Core.package/BPAbstractExample.class/instance/runWithTimeoutOn..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
executing
runWithTimeoutOn: initialState
| complete semaphore |
semaphore := Semaphore new.
complete := false.

self startWatchdog: [
semaphore waitTimeoutMSecs: self timeout.
"We sadly cannot simply ask self tracingIsStillRunning as the values rely
on this method's return value which is not done at this point. So uglyish complete workaround"
complete ifFalse: [self suspendTracingProcess]].

[ ^ self runOn: initialState] ensure: [
complete := true.
semaphore signal]
4 changes: 4 additions & 0 deletions packages/Babylonian-Core.package/BPAbstractExample.class/instance/setIsActive..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
setIsActive: aBoolean

self subclassResponsibility.
6 changes: 6 additions & 0 deletions packages/Babylonian-Core.package/BPAbstractExample.class/instance/setUpScript..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
accessing
setUpScript: aStringOrSymbol

self subclassResponsibility.


4 changes: 4 additions & 0 deletions packages/Babylonian-Core.package/BPAbstractExample.class/instance/setUpScript.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
setUpScript

self subclassResponsibility.
7 changes: 7 additions & 0 deletions packages/Babylonian-Core.package/BPAbstractExample.class/instance/startWatchdog..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
private
startWatchdog: watchdogBlock

| watchdog |
watchdog := watchdogBlock newProcess.
watchdog priority: Processor timingPriority-1.
watchdog resume.
4 changes: 4 additions & 0 deletions packages/Babylonian-Core.package/BPAbstractExample.class/instance/suspendTracingProcess.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
tracing
suspendTracingProcess

^ self traceInformation suspendProcess
6 changes: 6 additions & 0 deletions packages/Babylonian-Core.package/BPAbstractExample.class/instance/tearDownScript..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
accessing
tearDownScript: aStringOrSymbol

self subclassResponsibility.


4 changes: 4 additions & 0 deletions packages/Babylonian-Core.package/BPAbstractExample.class/instance/tearDownScript.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
tearDownScript

self subclassResponsibility.
4 changes: 4 additions & 0 deletions packages/Babylonian-Core.package/BPAbstractExample.class/instance/timeout..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
timeout: aMSNumber

self subclassResponsibility.
4 changes: 4 additions & 0 deletions packages/Babylonian-Core.package/BPAbstractExample.class/instance/timeout.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
timeout

self subclassResponsibility.
0 ...PExample.class/instance/toggleIsActive.st → ...tExample.class/instance/toggleIsActive.st
View file
File renamed without changes.
5 changes: 5 additions & 0 deletions packages/Babylonian-Core.package/BPAbstractExample.class/instance/trace.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
tracing
trace

<bpRelevantMethod>
^ self traceInformation trace: ([self execute] bpTraceForExample: self)
11 changes: 11 additions & 0 deletions packages/Babylonian-Core.package/BPAbstractExample.class/instance/traceInBackground.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
tracing
traceInBackground

<bpRelevantMethod>
| traceAndProcess |
self ensureTerminatedProcess.

traceAndProcess := [self execute] bpTraceInBackgroundForExample: self.
self traceInformation
trace: traceAndProcess first;
tracingProcess: traceAndProcess second.
4 changes: 4 additions & 0 deletions packages/Babylonian-Core.package/BPAbstractExample.class/instance/traceInformation.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
traceInformation

self subclassResponsibility.
0 ...PExample.class/instance/traceToHaltAt..st → ...tExample.class/instance/traceToHaltAt..st
View file
File renamed without changes.
0 ....class/instance/traceToHaltAt.onCount..st → ....class/instance/traceToHaltAt.onCount..st
View file
File renamed without changes.
0 ...e/BPExample.class/instance/traceValues.st → ...ractExample.class/instance/traceValues.st
View file
File renamed without changes.
0 ...ample.class/instance/traceValuesMorphs.st → ...ample.class/instance/traceValuesMorphs.st
View file
File renamed without changes.
4 changes: 4 additions & 0 deletions packages/Babylonian-Core.package/BPAbstractExample.class/instance/tracingIsStillRunning.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
tracing
tracingIsStillRunning

^ self traceInformation tracingIsStillRunning
4 changes: 4 additions & 0 deletions ...ges/Babylonian-Core.package/BPAbstractExample.class/instance/tracingProcessIsSuspended.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
tracing
tracingProcessIsSuspended

^ self traceInformation isProcessSuspended
0 ...xample.class/instance/uniqueIdentifier.st → ...xample.class/instance/uniqueIdentifier.st
View file
File renamed without changes.
0 .../BPExample.class/instance/update.with..st → ...actExample.class/instance/update.with..st
View file
File renamed without changes.
Loading

0 comments on commit bc5be74

Please sign in to comment.