all test green with ast nodes :)

src/ClassParser-Tests/CDSlotParserArgumentingSlotTest.class.st

@@ -25,7 +25,7 @@ CDSlotParserArgumentingSlotTest >> classDefinitionString [
 	^ '{superclassname} subclass: #{classname}
 		slots: \{
 		''{instvar1}'' =>  (LazyClassVariable default: 5). 
-		''{instvar2}'' =>  (ObservableSlot default: 5). 
+		''{instvar2}'' =>  (ObservableSlot default: true extras: (1 + 4)). 
 		\}
 		classVariableNames: ''{classvar1} {classvar2}''
 		package: #MyPackage'
@@ -43,12 +43,42 @@ CDSlotParserArgumentingSlotTest >> testClassDefWithInitializationSlot [
 	self
 		assert: classDefinition slotNodes first name
 		equals: self firstInstanceVariableName.
+
 	self
 		assert: classDefinition slotNodes first slotClassName
 		equals: #LazyClassVariable.
+
 	self
-		assert: classDefinition slotNodes first initializationMessage printString
-		equals: 'default: ''5'''.
+		assert: classDefinition slotNodes first initializationMessage selectorParts 
+		equals: #(default:).
+
+	self assert: classDefinition slotNodes first initializationMessage argumentParts isCollection.		
+	self
+		assert: (classDefinition slotNodes first initializationMessage argumentParts first isKindOf: RBLiteralValueNode)
+
 
 
 ]
+
+{ #category : #tests }
+CDSlotParserArgumentingSlotTest >> testClassDefWithInitializationSlot2 [
+	self
+		assert: classDefinition slotNodes second name
+		equals: self secondInstanceVariableName.
+
+	self
+		assert: classDefinition slotNodes second slotClassName
+		equals: #ObservableSlot.
+
+	self
+		assert: classDefinition slotNodes second initializationMessage selectorParts 
+		equals: #(default: extras:).
+
+	self assert: classDefinition slotNodes second initializationMessage argumentParts isCollection.		
+	self
+		assert: (classDefinition slotNodes second initializationMessage argumentParts first isKindOf: RBLiteralValueNode).
+	self
+		assert: classDefinition slotNodes second initializationMessage argumentParts first value equals: true.
+	self
+		assert: (classDefinition slotNodes second initializationMessage argumentParts second isKindOf: RBMessageNode)
+]

src/ClassParser/CDClassDefinitionParser.class.st

@@ -189,7 +189,7 @@ CDClassDefinitionParser >> parseSlotNode: aRBMessageNode [
 				node: aRBMessageNode
 				name: aRBMessageNode value
 				slotClassName: #InstanceVariableSlot
-				initializationMessage: (self slotInitializationNodeClass new)
+				initializationMessage: self slotInitializationNodeClass new
 				start: aRBMessageNode start
 				stop: aRBMessageNode stop.
 			classDefinition addSlot: slot.
@@ -207,7 +207,7 @@ CDClassDefinitionParser >> parseSlotNode: aRBMessageNode [
 						node: aRBMessageNode
 						name: aRBMessageNode receiver value
 						slotClassName: aRBMessageNode arguments first name
-						initializationMessage: (self slotInitializationNodeClass new)
+						initializationMessage: self slotInitializationNodeClass new
 						start: aRBMessageNode start
 						stop: aRBMessageNode stop.
 						classDefinition addSlot: slot.
@@ -227,7 +227,7 @@ CDClassDefinitionParser >> parseSlotNode: aRBMessageNode [
 					initializationMessage:
 						(self slotInitializationNodeClass
 							selectorParts: aRBMessageNode arguments first selectorParts
-							argumentParts: aRBMessageNode arguments first argumentPartStrings)
+							argumentParts: aRBMessageNode arguments first arguments)
 					start: aRBMessageNode start
 					stop: aRBMessageNode stop.
 				classDefinition addSlot: slot.

src/ClassParser/CDNode.class.st

@@ -25,6 +25,12 @@ CDNode class >> on: aRBMessageNode [
 		yourself
 ]
 
+{ #category : #visitor }
+CDNode >> acceptVisitor: aProgramNodeVisitor [
+
+	self subclassResponsibility
+]
+
 { #category : #accessing }
 CDNode >> addChild: aChild [
 

src/ClassParser/CDSlotNode.class.st

@@ -2,7 +2,6 @@ Class {
 	#name : #CDSlotNode,
 	#superclass : #CDNode,
 	#instVars : [
-		'slot',
 		'node',
 		'index',
 		'start',

src/ClassParser/RBSlotInitializationNode.class.st

@@ -1,9 +1,12 @@
 "
 I represent the Slot initialization part of a slot definition. 
-I'm not super well integrated in the language AST because I'm a transformation from the AST.
-For example for this expression 'first' =>  LazyClassVariable default: 5, I represent 
+I'm a transformation from the AST.
+
+For example for this expression 'first' => (LazyClassVariable default: 5), I represent 
 the default: 5 part. 
-Still I support visiting protocol in case. 
+
+Slot initialization node works for the three slot forms below. 
+To make sure that all slot definition are polymorphic, all slots have a initializationNode (some acting as null node).
 
 Object subclass: #MyClass
 		slots: {
@@ -14,15 +17,9 @@ Object subclass: #MyClass
 		classVariableNames: ''
 		package: #MyPackage'
 
-In addition, to make sure that all slot definition are polymorphic 
-
-start and end are not managed for the moment at my level. 
-
-argumentParts holds a collection of strings since we can have 
-
 'first' => LazyClassVariable default: x + 3
 
-In this case the argument part is #('x + 3')
+In this case the argument parts is a RBMessageNode.