Merge pull request #316 from tomooda/editable-table

make attribute/utility definition tables editable
ReMobidyc · Mar 27, 2024 · 9676324 · 9676324
2 parents 2328128 + 491155b
commit 9676324
Show file tree

Hide file tree

Showing 36 changed files with 1,895 additions and 335 deletions.
diff --git a/src/ReMobidyc-Language/RMDAbstractAssignableAttributeVariableNode.class.st b/src/ReMobidyc-Language/RMDAbstractAssignableAttributeVariableNode.class.st
@@ -15,13 +15,42 @@ RMDAbstractAssignableAttributeVariableNode class >> attributeVariable: aRMDAttri
 		  yourself
 ]
 
+{ #category : #accessing }
+RMDAbstractAssignableAttributeVariableNode class >> classForOperator: aString [
+
+	aString = self deltaOperator ifTrue: [
+		^ RMDAssignableDeltaAttributeVariableNode ].
+	aString = self differentialOperator ifTrue: [
+		^ RMDAssignableDifferentialAttributeVariableNode ].
+	^ RMDAssignableAttributeVariableNode
+]
+
+{ #category : #accessing }
+RMDAbstractAssignableAttributeVariableNode class >> deltaOperator [
+
+	^ 'Δ'
+]
+
+{ #category : #accessing }
+RMDAbstractAssignableAttributeVariableNode class >> differentialOperator [
+
+	^ 'd/dt '
+]
+
 { #category : #'instance creation' }
 RMDAbstractAssignableAttributeVariableNode class >> identifier: aString agent: anotherString [
 	^ self new
 		attributeVariable: (RMDAttributeVariableNode identifier: aString agent: anotherString);
 		yourself
 ]
 
+{ #category : #'instance creation' }
+RMDAbstractAssignableAttributeVariableNode class >> operator: aString attributeVariable: aRMDAttributeVariableNode [
+
+	^ (self classForOperator: aString) attributeVariable:
+		  aRMDAttributeVariableNode
+]
+
 { #category : #comparing }
 RMDAbstractAssignableAttributeVariableNode >> = anObject [
 	^ self class = anObject class
@@ -33,6 +62,13 @@ RMDAbstractAssignableAttributeVariableNode >> agent [
 	^ attributeVariable agent
 ]
 
+{ #category : #accessing }
+RMDAbstractAssignableAttributeVariableNode >> agent: aString [
+
+	self attributeVariable:
+		(RMDAttributeVariableNode identifier: self identifier agent: aString)
+]
+
 { #category : #accessing }
 RMDAbstractAssignableAttributeVariableNode >> attributeVariable [
 	^ attributeVariable
@@ -73,6 +109,12 @@ RMDAbstractAssignableAttributeVariableNode >> operator [
 	^ self subclassResponsibility
 ]
 
+{ #category : #converting }
+RMDAbstractAssignableAttributeVariableNode >> operator: aString [
+
+	^ self class operator: aString attributeVariable: attributeVariable
+]
+
 { #category : #copying }
 RMDAbstractAssignableAttributeVariableNode >> postCopy [
 

diff --git a/src/ReMobidyc-Language/RMDAgentDefinitionNode.class.st b/src/ReMobidyc-Language/RMDAgentDefinitionNode.class.st
@@ -232,6 +232,13 @@ RMDAgentDefinitionNode >> isAgentDefinitionNode [
 	^ true
 ]
 
+{ #category : #testing }
+RMDAgentDefinitionNode >> isCorrectSyntax [
+
+	^ (RMDGrammar current agentDefinition end parse: self printString)
+	  = self
+]
+
 { #category : #accessing }
 RMDAgentDefinitionNode >> name [
 

diff --git a/src/ReMobidyc-Language/RMDAnimatInitializerNode.class.st b/src/ReMobidyc-Language/RMDAnimatInitializerNode.class.st
@@ -88,6 +88,13 @@ RMDAnimatInitializerNode >> isAnimatInitializerNode [
 	^ true
 ]
 
+{ #category : #testing }
+RMDAnimatInitializerNode >> isCorrectSyntax [
+
+	^ (RMDGrammar current animatInitializer end parse: self printString)
+	  = self
+]
+
 { #category : #accessing }
 RMDAnimatInitializerNode >> population [
 	^ population

diff --git a/src/ReMobidyc-Language/RMDAssignableAttributeVariableNode.class.st b/src/ReMobidyc-Language/RMDAssignableAttributeVariableNode.class.st
@@ -4,6 +4,12 @@ Class {
 	#category : #'ReMobidyc-Language-AST'
 }
 
+{ #category : #accessing }
+RMDAssignableAttributeVariableNode >> identifier: aString [
+
+	self attributeVariable identifier: aString
+]
+
 { #category : #testing }
 RMDAssignableAttributeVariableNode >> isAssignableAttributeVariableNode [
 	^ true

diff --git a/src/ReMobidyc-Language/RMDAttributeDeclarationNode.class.st b/src/ReMobidyc-Language/RMDAttributeDeclarationNode.class.st
@@ -25,6 +25,12 @@ RMDAttributeDeclarationNode class >> identifier: aString unit: aRMDUnit initiali
 		  yourself
 ]
 
+{ #category : #'typical instances' }
+RMDAttributeDeclarationNode class >> template [
+
+	^ self identifier: '' unit: RMDUnit noDimension
+]
+
 { #category : #comparing }
 RMDAttributeDeclarationNode >> = anObject [
 
@@ -93,6 +99,34 @@ RMDAttributeDeclarationNode >> isAttributeDeclarationNode [
 	^ true
 ]
 
+{ #category : #testing }
+RMDAttributeDeclarationNode >> isCorrectSyntax [
+
+	^ (RMDGrammar current attributeDeclaration end parse:
+		   self printString) = self
+]
+
+{ #category : #testing }
+RMDAttributeDeclarationNode >> isCorrectTypeWithSubject: aString in: aRMDSimulationModel [
+
+	| agentDefinition |
+	agentDefinition := aRMDSimulationModel
+		                   agentDefinitionAt: aString
+		                   ifAbsent: [ ^ false ].
+	[
+	aRMDSimulationModel typechecker
+		typecheck: self
+		subject: aString
+		object: nil
+		utilities: agentDefinition utilityDefinitions ]
+		on: RMDError
+		do: [ :ex | ^ false ].
+	^ (agentDefinition attributeDeclarations contains: [
+		   :attributeDeclaration |
+		   attributeDeclaration ~~ self and: [
+			   attributeDeclaration identifier = self identifier ] ]) not
+]
+
 { #category : #accessing }
 RMDAttributeDeclarationNode >> nameWithUnit [
 

diff --git a/src/ReMobidyc-Language/RMDAttributeDefinitionNode.class.st b/src/ReMobidyc-Language/RMDAttributeDefinitionNode.class.st
@@ -20,11 +20,29 @@ RMDAttributeDefinitionNode >> asPresenter [
 	^ RMDAttributeDefinitionBrowser on: self
 ]
 
+{ #category : #accessing }
+RMDAttributeDefinitionNode >> identifier [
+
+	^ self variable identifier
+]
+
+{ #category : #accessing }
+RMDAttributeDefinitionNode >> identifier: aString [ 
+	self variable identifier: aString
+]
+
 { #category : #testing }
 RMDAttributeDefinitionNode >> isAttributeDefinitionNode [
 	^ true
 ]
 
+{ #category : #testing }
+RMDAttributeDefinitionNode >> isCorrectSyntax [
+
+	^ (RMDGrammar current attributeDefinition end parse: self printString)
+	  = self
+]
+
 { #category : #accessing }
 RMDAttributeDefinitionNode >> operator [
 	^ '='
@@ -68,3 +86,15 @@ RMDAttributeDefinitionNode >> printShortOn: aStream [
 	super printShortOn: aStream.
 	aStream nextPut: $'
 ]
+
+{ #category : #accessing }
+RMDAttributeDefinitionNode >> variableOperator [
+
+	^ variable operator
+]
+
+{ #category : #accessing }
+RMDAttributeDefinitionNode >> variableOperator: aString [
+
+	variable := variable operator: aString
+]
diff --git a/src/ReMobidyc-Language/RMDAttributeInitializerNode.class.st b/src/ReMobidyc-Language/RMDAttributeInitializerNode.class.st
@@ -65,6 +65,13 @@ RMDAttributeInitializerNode >> isAttributeInitializerNode [
 	^ true
 ]
 
+{ #category : #testing }
+RMDAttributeInitializerNode >> isCorrectSyntax [
+
+	^ (RMDGrammar current attributeInitializer end parse:
+		   self printString) = self
+]
+
 { #category : #copying }
 RMDAttributeInitializerNode >> postCopy [
 

diff --git a/src/ReMobidyc-Language/RMDConditionNode.class.st b/src/ReMobidyc-Language/RMDConditionNode.class.st
@@ -29,6 +29,12 @@ RMDConditionNode >> isConditionNode [
 	^ true
 ]
 
+{ #category : #testing }
+RMDConditionNode >> isCorrectSyntax [
+
+	^ (RMDGrammar current condition end parse: self printString) = self
+]
+
 { #category : #accessing }
 RMDConditionNode >> precedence [
 	^ self subclassResponsibility

diff --git a/src/ReMobidyc-Language/RMDExpressionNode.class.st b/src/ReMobidyc-Language/RMDExpressionNode.class.st
@@ -39,6 +39,12 @@ RMDExpressionNode >> insertTrace [
 	^ RMDTraceNode on: super insertTrace
 ]
 
+{ #category : #testing }
+RMDExpressionNode >> isCorrectSyntax [
+
+	^ (RMDGrammar current expression end parse: self printString) = self
+]
+
 { #category : #testing }
 RMDExpressionNode >> isExpressionNode [
 	^ true

diff --git a/src/ReMobidyc-Language/RMDGrammar.class.st b/src/ReMobidyc-Language/RMDGrammar.class.st
@@ -150,7 +150,7 @@ RMDGrammar >> _identifier [
 { #category : #'parsers-atoms' }
 RMDGrammar >> _literal [
 
-	^ self numberString , self type optional ==> [ :pair | 
+	^ self decimalString / self pi , self type optional ==> [ :pair |
 	  self literalNodeClass
 		  literal: pair first
 		  unit: (pair second ifNil: [ RMDUnit noDimension ]) ]
@@ -1341,7 +1341,10 @@ RMDGrammar >> numberOfIndividualsInWorldDirectiveNodeClass [
 { #category : #'parsers-atoms' }
 RMDGrammar >> numberString [
 
-	^ self decimalString / self pi
+	^ self decimalString , self type optional ==> [ :pair |
+	  self literalNodeClass
+		  literal: pair first
+		  unit: (pair second ifNil: [ RMDUnit noDimension ]) ]
 ]
 
 { #category : #'parsers-definitions' }

diff --git a/src/ReMobidyc-Language/RMDLifeDirectiveNode.class.st b/src/ReMobidyc-Language/RMDLifeDirectiveNode.class.st
@@ -25,6 +25,12 @@ RMDLifeDirectiveNode >> childrenTransform: aBlock [
 
 ]
 
+{ #category : #testing }
+RMDLifeDirectiveNode >> hasNewAgents [
+
+	^ false
+]
+
 { #category : #comparing }
 RMDLifeDirectiveNode >> hash [
 	^ self class hash

diff --git a/src/ReMobidyc-Language/RMDNewDirectiveNode.class.st b/src/ReMobidyc-Language/RMDNewDirectiveNode.class.st
@@ -59,6 +59,12 @@ RMDNewDirectiveNode >> childrenTransform: aBlock [
 	quantity ifNotNil: [ quantity := aBlock value: quantity ]
 ]
 
+{ #category : #testing }
+RMDNewDirectiveNode >> hasNewAgents [
+
+	^ true
+]
+
 { #category : #comparing }
 RMDNewDirectiveNode >> hash [
 

diff --git a/src/ReMobidyc-Language/RMDPatchInitializerNode.class.st b/src/ReMobidyc-Language/RMDPatchInitializerNode.class.st
@@ -89,6 +89,13 @@ RMDPatchInitializerNode >> hash [
 		bitXor: size hash) bitXor: length hash
 ]
 
+{ #category : #testing }
+RMDPatchInitializerNode >> isCorrectSyntax [
+
+	^ (RMDGrammar current patchInitializer end parse: self printString)
+	  = self
+]
+
 { #category : #testing }
 RMDPatchInitializerNode >> isPatchInitializerNode [
 	^ true

diff --git a/src/ReMobidyc-Language/RMDStageDirectiveNode.class.st b/src/ReMobidyc-Language/RMDStageDirectiveNode.class.st
@@ -36,6 +36,12 @@ RMDStageDirectiveNode >> animatIdentifier: aString [
 		                    ifFalse: [ aString ]
 ]
 
+{ #category : #testing }
+RMDStageDirectiveNode >> hasNewAgents [
+
+	^ true
+]
+
 { #category : #comparing }
 RMDStageDirectiveNode >> hash [