Be better on startup

src/BaselineOfCarp/BaselineOfCarp.class.st

@@ -13,6 +13,6 @@ BaselineOfCarp >> baseline: spec [
 				baseline: 'GToolkit4SmaCC'
 				with: [ spec repository: 'github://feenkcom/gt4smacc:main/src' ].
 			spec package: 'Carp' with: [ spec requires: #('GToolkit4SmaCC') ].
-			spec package: 'Carp-Parser' with: [ spec requires: #('GToolkit4SmaCC') ].
+			spec package: 'Carp-AST' with: [ spec requires: #('GToolkit4SmaCC') ].
-			spec package: 'Carp-AST' with: [ spec requires: #('GToolkit4SmaCC') ] ]
+			spec package: 'Carp-Parser' with: [ spec requires: #('GToolkit4SmaCC') ] ]
 ]

src/Carp-AST/CarpExpressionNode.class.st

@@ -21,6 +21,11 @@ CarpExpressionNode >> isDefinition [
 	^ false
 ]
 
+{ #category : #accessing }
+CarpExpressionNode >> isDefinitionPredicate [
+	^ false
+]
+
 { #category : #accessing }
 CarpExpressionNode >> isQuoted [
 	^ parent ifNil: [ false ] ifNotNil: [ parent isQuoted ]

src/Carp-Parser/CarpListNode.class.st

@@ -51,8 +51,18 @@ CarpListNode >> initialize [
 
 { #category : #accessing }
 CarpListNode >> intoModel [
-	^ CarpList
+	^ self isDefinition
-		contents: (expressions collect: #intoModel)
+		ifTrue: [ | binding |
+			binding := (CarpBinding perform: self expressions first value source asSymbol)
+					name: self definitionVariable intoModel.
+			self expressions size = 3
+				ifTrue: [ binding binding: self expressions third intoModel ].
+			self expressions size = 4
+				ifTrue: [ binding
+						arguments: self expressions third intoModel;
+						body: self expressions fourth intoModel ].
+			binding ]
+		ifFalse: [ CarpList contents: (expressions collect: #intoModel) ]
 ]
 
 { #category : #accessing }

src/Carp/CarpBinding.class.st

@@ -7,6 +7,31 @@ Class {
 	#category : #'Carp-IDE'
 }
 
+{ #category : #'instance creation' }
+CarpBinding class >> def [
+	^ CarpStaticVariable new
+]
+
+{ #category : #'instance creation' }
+CarpBinding class >> defdynamic [
+	^ CarpDynamicVariable new
+]
+
+{ #category : #'instance creation' }
+CarpBinding class >> defmacro [
+	^ CarpMacro new
+]
+
+{ #category : #'instance creation' }
+CarpBinding class >> defn [
+	^ CarpStaticFunction new
+]
+
+{ #category : #'instance creation' }
+CarpBinding class >> defndynamic [
+	^ CarpDynamicFunction new
+]
+
 { #category : #accessing }
 CarpBinding >> bindingName [
 	^ self subclassResponsibility

src/Carp/CarpExpression.class.st

@@ -14,9 +14,13 @@ CarpExpression >> asElement [
 
 { #category : #accessing }
 CarpExpression >> asElementWithModule: aModule [
-	^ ((GtCarpIDECoderModel code: self toCarp)
+	| applicationStrategy |
-		module: aModule;
+	applicationStrategy := LeCarpApplicationStrategy new.
-		expression: self) asElement
+	^ (GtExpandableSourceCoderElement new
+		coderViewModel: ((GtCarpIDECoderModel code: self toCarp)
+				module: aModule;
+				carpLinkApplicationStrategy: applicationStrategy;
+				expression: self) asCoderViewModel) collapse
 ]
 
 { #category : #accessing }

src/Carp/CarpModule.class.st

@@ -84,6 +84,7 @@ CarpModule >> carpCoderStreamingMethodsFor: aView context: aPhlowContext [
 						ifNotNil: [ :aContents | aNewMethodCoderViewModel := aContents ]
 						ifNil: [ aNewMethodCoder := GtCarpNewFunctionCoderModel new
 									module: self;
+									carpLinkApplicationStrategy: LeCarpApplicationStrategy new;
 									onSave: [ aButton fireEvent: BrDropdownHideWish new.
 										coderElement initializeForModule ].
 

src/Carp/CarpModuleCoderElement.class.st

@@ -12,6 +12,17 @@ Class {
 	#category : #'Carp-Coder'
 }
 
+{ #category : #accessing }
+CarpModuleCoderElement >> build [
+	| application commandFactory |
+	application := CarpApplication start.
+	commandFactory := application newCommandFactory.
+
+	^ commandFactory
+		<< self module toCarp;
+		sendAndWait
+]
+
 { #category : #accessing }
 CarpModuleCoderElement >> buildContentPane [
 
@@ -91,6 +102,13 @@ CarpModuleCoderElement >> buildModuleLabel [
 			 action: [ :aButton | 
 				 aButton phlow spawnObject: self module toCarp ]).
 
+	aContainer addChild: (BrButton new
+			 aptitude: BrGlamorousButtonWithIconAptitude;
+			 icon: BrGlamorousVectorIcons refresh;
+			 beSmallSize;
+			 label: 'Build';
+			 action: [ self build ]).
+
 	^ aContainer
 ]
 
@@ -133,7 +151,8 @@ CarpModuleCoderElement >> coderViewModel: aCarpCoderViewModel [
 
 	container ifNotNil: #removeFromParent.
 	container := self buildContentPane.
-	self addChildFirst: container
+	self addChildFirst: container.
+	self build
 ]
 
 { #category : #accessing }

src/Carp/CarpPythonProcess.class.st

@@ -9,6 +9,12 @@ CarpPythonProcess class >> program [
 	^ 'python'
 ]
 
+{ #category : #accessing }
+CarpPythonProcess class >> resolveCarpPath [
+	"TODO: make more robust"
+	^ '/usr/bin/python' asFileReference
+]
+
 { #category : #accessing }
 CarpPythonProcess >> processArguments [
 	| args |

src/Carp/CarpSequence.class.st

@@ -23,6 +23,11 @@ CarpSequence >> contents: aCollection [
 	contents := aCollection
 ]
 
+{ #category : #accessing }
+CarpSequence >> do: aBlock [
+	contents do: aBlock
+]
+
 { #category : #accessing }
 CarpSequence >> open [
 	^ self subclassResponsibility

src/Carp/CarpSymbol.class.st

@@ -12,6 +12,11 @@ CarpSymbol class >> named: aString [
 	^ self new name: aString 
 ]
 
+{ #category : #accessing }
+CarpSymbol >> name [
+	^ name
+]
+
 { #category : #accessing }
 CarpSymbol >> name: aString [
 	name := aString

src/Carp/GtCarpIDECoderModel.class.st

@@ -7,6 +7,12 @@ Class {
 	#category : #'Carp-Coder'
 }
 
+{ #category : #accessing }
+GtCarpIDECoderModel >> collapsedTextPromise [
+	^ self expression name name , ' : '
+		, (self bindAndExecute: '(type ' , module name, '.', self expression name name , ')') value
+]
+
 { #category : #accessing }
 GtCarpIDECoderModel >> expression [
 	^ expression
@@ -30,7 +36,8 @@ GtCarpIDECoderModel >> initializeAddOns: addOns [
 
 { #category : #accessing }
 GtCarpIDECoderModel >> remove [
-	^ module removeExpression: self expression
+	module removeExpression: self expression.
+	self bindAndExecute: module toCarp
 ]
 
 { #category : #accessing }
@@ -38,5 +45,6 @@ GtCarpIDECoderModel >> save [
 	module removeExpression: expression.
 	module
 		addExpression: (CarpParser parse: sourceCode availableSource text) intoModel.
+	self bindAndExecute: module toCarp.
 	onSave ifNotNil: [ onSave value ]
 ]

src/Carp/GtCarpNewFunctionCoderModel.class.st

@@ -10,14 +10,14 @@ Class {
 
 { #category : #accessing }
 GtCarpNewFunctionCoderModel >> initializeAddOns: addOns [
-	super initializeAddOns: addOns.
+	addOns
+		addStyler: (GtCoderAstSmaCCParserStyler new smaccStyler: CarpParser gtStyler).
 
 	addOns
-				addMainAction: 'Save' translated
+		addMainAction: 'Save' translated
-				icon: BrGlamorousVectorIcons accept
+		icon: BrGlamorousVectorIcons accept
-				action: [ :aCoderUIModel :anElement | 
+		action: [ :aCoderUIModel :anElement | self save ]
-					self save ]
+		id: GtMethodCoderSaveActionId
-				id: GtMethodCoderSaveActionId.
 ]
 
 { #category : #coders }
@@ -32,6 +32,9 @@ GtCarpNewFunctionCoderModel >> onSave: aBlock [
 
 { #category : #accessing }
 GtCarpNewFunctionCoderModel >> save [
-	module addExpression: (CarpParser parse: sourceCode currentSourceText value text) intoModel.
+	| expression |
+	expression := (CarpParser parse: sourceCode currentSourceText value text) intoModel.
+	module addExpression: expression.
+	self bindAndExecute: module toCarp.
 	onSave ifNotNil: [ onSave value ]
 ]

src/Carp/LeCarpApplicationStrategy.class.st

@@ -13,9 +13,6 @@ LeCarpApplicationStrategy class >> strategyName [
 { #category : #accessing }
 LeCarpApplicationStrategy >> applicationServer [
 
-	content database isDatabase ifFalse: [ ^ nil ].
-	CarpApplication uniqueInstance ifNil:
-		[ CarpApplication uniqueInstance: (self newCarpApplicationFor: content database) ].
 	^ CarpApplication uniqueInstance
 ]
 
@@ -27,32 +24,5 @@ LeCarpApplicationStrategy >> applicationSettings [
 	^ CarpApplication isRunning ifTrue:
 		[ CarpApplication uniqueInstance settings ]
 	ifFalse:
-		[ self updatedSettings: CarpApplication defaultSettings ]
+		[ CarpApplication defaultSettings ]
-]
-
-{ #category : #accessing }
-LeCarpApplicationStrategy >> newCarpApplicationFor: aLeDatabase [
-
-	^ CarpApplication new initializeWith: 
-		(self updatedSettings: LanguageLinkSettings carpDefaultSettings).
-
-]
-
-{ #category : #accessing }
-LeCarpApplicationStrategy >> updatedSettings: applicationCarpSettings [
-	"Update the supplied settings with the lepiter configuration"
-
-	| lepiterCarpSettings lepiterDatabase carpDir |
-	lepiterDatabase := content database.
-	(lepiterDatabase isKindOf: LeNullDatabase)
-		ifTrue: [ ^ applicationCarpSettings ].
-	lepiterCarpSettings := lepiterDatabase properties carpLinkSettings.
-	lepiterCarpSettings directory
-		ifNotNil: [ :relativeDir | 
-			carpDir := lepiterDatabase localStoreRootDirectory resolve: relativeDir.
-			applicationCarpSettings workingDirectory: carpDir ].	"lepiterCarpSettings carpPath ifNotNil:
-		[ :carpPath | applicationCarpSettings serverExecutable: carpPath ]."
-	applicationCarpSettings serverDebugMode: lepiterCarpSettings serverDebugMode.
-
-	^ applicationCarpSettings
 ]