Skip to content

Commit

Permalink
Changes type declaration of variables and parameters.
Browse files Browse the repository at this point in the history 
Changes type declaration of variables and parameters following the
adopted "scala-like" syntax (closes #4).
  • Loading branch information
@srodriguez
srodriguez committed Feb 14, 2014
1 parent d661970 commit 4a70751
Show file tree
Hide file tree
Showing 36 changed files with 20,991 additions and 18,383 deletions.
54 changes: 27 additions & 27 deletions core/io.sarl.core/src/main/sarl/io/sarl/core/core.sarl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import java.util.Collection
* This event is only received by the agent's native behavior.
*/
event Initialize {
var Object[] parameters
var parameters : Object[]
}

/**
Expand All @@ -49,48 +49,48 @@ event Destroy {}
* The context Id can be retrieved via ev.getSource().getSpaceID().getContextID()
*/
event AgentSpawned {
var UUID agentID
var agentID :UUID
}

/**
* Informs an agent has been killed
* The context Id can be retrieved via ev.getSource().getSpaceID().getContextID()
*/
event AgentKilled {
var UUID agentID
var agentID : UUID
}


/** Notifies other members the member with agentID has effectively integrated the holon context.*/
event MemberJoined {
var UUID parentContextID
var UUID agentID
var parentContextID : UUID
var agentID : UUID
}

/** Notifies other members the member with agentID was excluded (forced to leave) the holon context parentContextID */
event MemberExcluded {
var UUID parentContextID
var UUID excludeMemberID
var parentContextID : UUID
var excludeMemberID : UUID
}

/** Notifies other members the member with agentID has left the holon context */
event MemberLeft {
var UUID agentID
var agentID : UUID
}

/**
* Notifies behaviors the agent has joined a new superholon
*/
event ContextJoined {
var UUID holonContextID
var UUID defaultSpaceID
var holonContextID : UUID
var defaultSpaceID : UUID
}

/**
* Notifies behaviors the agent has left a superholon
*/
event ContextLeft {
var UUID holonContextID
var holonContextID : UUID
}

capacity ExternalContextAccess {
Expand All @@ -108,7 +108,7 @@ capacity ExternalContextAccess {
* @throws UnknownContextException if the context specified context is not known by the agent.
* @param contextID the ID of the context to get.
*/
def getContext(UUID contextID): AgentContext
def getContext(contextID : UUID): AgentContext

/**
* Joins a new parent context (a new super holon).
Expand All @@ -117,14 +117,14 @@ capacity ExternalContextAccess {
* @fires ContextJoined in its inner Context default space (Behaviors#wake).
* @fires MemberJoined in its parent Context default Space
*/
def join(UUID futureContext, UUID futureContextDefaultSpaceID) fires ContextJoined, MemberJoined
def join(futureContext : UUID, futureContextDefaultSpaceID : UUID) fires ContextJoined, MemberJoined

/**
* Leaves the parent's context.
* @fires ContextLeft in its inner Context default space (Behaviors#wake).
* @fires MemberLeft in its parent Context default Space
*/
def leave(UUID contextID) fires ContextLeft, MemberLeft
def leave(contextID : UUID) fires ContextLeft, MemberLeft

}

Expand All @@ -140,15 +140,15 @@ capacity Behaviors {
* Register a Behavior for the owner agent.
* The new Behavior will react to all declared events received by the agent.
*/
def registerBehavior(Behavior attitude) : Behavior
def registerBehavior(attitude : Behavior) : Behavior
/**
* Unregisters a behavior for the owner agent
*/
def unregisterBehavior(Behavior attitude) : Behavior
def unregisterBehavior(attitude : Behavior) : Behavior
/**
* Wake the agent's behaviors reacting to the Event evt.
*/
def wake(Event evt)
def wake(evt : Event)
}

/**
Expand All @@ -161,7 +161,7 @@ capacity Lifecycle {
* Spawns a new member agent in the parent's context (parentID)
* @fires AgentSpawned inside the default context of the parent. The source of the event is this agent.
*/
def spawnInContext(Class <? extends Agent> agentClass, AgentContext context, Object[] params) : UUID fires AgentSpawned
def spawnInContext(agentClass : Class <? extends Agent>, context : AgentContext, params : Object[]) : UUID fires AgentSpawned

/**
* Kills this agent.
Expand Down Expand Up @@ -189,27 +189,27 @@ capacity Schedules {
* @param procedure the closure to execute.
* @return the generated task
*/
def in(long delay,(Agent) => void procedure) : AgentTask
def in(delay : long, procedure : (Agent) => void ) : AgentTask

/**
* Schedule a given task to be executed after the specified delay.
*/
def in(AgentTask task, long delay,(Agent) => void procedure) : AgentTask
def in(task : AgentTask, delay : long, procedure : (Agent) => void) : AgentTask

/**
* Create a named task that can be retrieved and schedule later.
*/
def task(String name) : AgentTask
def task(name : String) : AgentTask

/**
* Create an anonymous task and schedules a periodic execution of its behavior.
*/
def every(long period,(Agent) => void procedure) : AgentTask
def every(period : long, procedure : (Agent) => void) : AgentTask

/**
* Schedule a periodic execution of the given task.
*/
def every(AgentTask task, long period,(Agent) => void procedure) : AgentTask
def every(task : AgentTask, period : long,procedure : (Agent) => void ) : AgentTask

}

Expand Down Expand Up @@ -247,13 +247,13 @@ capacity DefaultContextInteractions {
* Emits a given event with the provided scope in the DefaultSpace of the DefaultContext.
* Equivalent to defaultContext.defaultSpace.emit(e,scope)
*/
def emit(Event e, Scope<Address> scope)
def emit(e : Event, scope : Scope<Address> )

/**
* Emits a given event with no scope (all registered agent) in the DefaultSpace of the DefaultContext.
* Equivalent to defaultContext.defaultSpace.emit(e)
*/
def emit(Event e)
def emit(e : Event)

/**
* Inverse signature of send. Useful to send events using the agent's UUID.
Expand All @@ -271,7 +271,7 @@ capacity DefaultContextInteractions {
* MyAgent.spawn(mySpawnArgs).receive(new StartWorkingEvent)
* </code>
*/
def receive(UUID receiver, Event e)
def receive(receiver : UUID, e : Event)

//Agent Creation
/**
Expand All @@ -280,5 +280,5 @@ capacity DefaultContextInteractions {
* within the default space of the context.
* @fires AgentSpawned in DefaultSpace
*/
def spawn(Class<? extends Agent> aAgent, Object[] params) : UUID fires AgentSpawned
def spawn(aAgent : Class<? extends Agent>, params : Object[] ) : UUID fires AgentSpawned
}
6 changes: 3 additions & 3 deletions docs/io.sarl.docs.suite/src/test/java/io/sarl/docs/reference/Event.spec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ describe "Event Reference"{
val Model model = '''
package events
event MyEvent {
var Integer number
var number : Integer
}
'''.parsesSuccessfully
val evt = model.elements.filter(Event).head
Expand All @@ -42,7 +42,7 @@ describe "Event Reference"{
val Model model = '''
package myapp.demo
event MyEvent {
var Integer number
var number : Integer
}
'''.parsesSuccessfully
val evt = model.elements.filter(Event).head
Expand All @@ -61,7 +61,7 @@ describe "Event Reference"{
val Model model = '''
package myapp.demo
event MyEvent {
val Integer number
val number : Integer
}
'''.parsesSuccessfully
val evt = model.elements.filter(Event).head
Expand Down
20 changes: 16 additions & 4 deletions ...s/io.sarl.lang.ui/src-gen/io/sarl/lang/ui/contentassist/AbstractSARLProposalProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ public void completeBehavior_Features(EObject model, Assignment assignment, Cont
public void completeAttribute_Writeable(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
// subclasses may override
}
public void completeAttribute_Type(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
public void completeAttribute_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
}
public void completeAttribute_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
public void completeAttribute_Type(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
}
public void completeAttribute_InitialValue(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
Expand Down Expand Up @@ -103,6 +103,15 @@ public void completeActionSignature_Type(EObject model, Assignment assignment, C
public void completeActionSignature_FiredEvents(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
}
public void completeParameter_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
}
public void completeParameter_ParameterType(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
}
public void completeParameter_VarArg(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
// subclasses may override
}
public void completeRequiredCapacity_RequiredCapacities(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
}
Expand All @@ -124,10 +133,10 @@ public void completeConstructor_Body(EObject model, Assignment assignment, Conte
public void completeXVariableDeclaration_Writeable(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
// subclasses may override
}
public void completeXVariableDeclaration_Type(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
public void completeXVariableDeclaration_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
}
public void completeXVariableDeclaration_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
public void completeXVariableDeclaration_Type(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
}
public void completeXVariableDeclaration_Right(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
Expand Down Expand Up @@ -176,6 +185,9 @@ public void complete_Action(EObject model, RuleCall ruleCall, ContentAssistConte
public void complete_ActionSignature(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
// subclasses may override
}
public void complete_Parameter(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
// subclasses may override
}
public void complete_RequiredCapacity(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
// subclasses may override
}
Expand Down
20 changes: 14 additions & 6 deletions lang/plugins/io.sarl.lang.ui/src-gen/io/sarl/lang/ui/contentassist/antlr/SARLParser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ protected String getRuleName(AbstractElement element) {
put(grammarAccess.getAgentFeatureAccess().getAlternatives(), "rule__AgentFeature__Alternatives");
put(grammarAccess.getBehaviorFeatureAccess().getAlternatives(), "rule__BehaviorFeature__Alternatives");
put(grammarAccess.getAttributeAccess().getAlternatives_0(), "rule__Attribute__Alternatives_0");
put(grammarAccess.getAttributeAccess().getAlternatives_1(), "rule__Attribute__Alternatives_1");
put(grammarAccess.getSkillFeatureAccess().getAlternatives(), "rule__SkillFeature__Alternatives");
put(grammarAccess.getXVariableDeclarationAccess().getAlternatives_1(), "rule__XVariableDeclaration__Alternatives_1");
put(grammarAccess.getXVariableDeclarationAccess().getAlternatives_2(), "rule__XVariableDeclaration__Alternatives_2");
Expand Down Expand Up @@ -90,7 +91,9 @@ protected String getRuleName(AbstractElement element) {
put(grammarAccess.getBehaviorAccess().getGroup(), "rule__Behavior__Group__0");
put(grammarAccess.getBehaviorAccess().getGroup_2(), "rule__Behavior__Group_2__0");
put(grammarAccess.getAttributeAccess().getGroup(), "rule__Attribute__Group__0");
put(grammarAccess.getAttributeAccess().getGroup_3(), "rule__Attribute__Group_3__0");
put(grammarAccess.getAttributeAccess().getGroup_1_0(), "rule__Attribute__Group_1_0__0");
put(grammarAccess.getAttributeAccess().getGroup_1_0_0(), "rule__Attribute__Group_1_0_0__0");
put(grammarAccess.getAttributeAccess().getGroup_2(), "rule__Attribute__Group_2__0");
put(grammarAccess.getCapacityUsesAccess().getGroup(), "rule__CapacityUses__Group__0");
put(grammarAccess.getCapacityUsesAccess().getGroup_2(), "rule__CapacityUses__Group_2__0");
put(grammarAccess.getBehaviorUnitAccess().getGroup(), "rule__BehaviorUnit__Group__0");
Expand All @@ -102,6 +105,7 @@ protected String getRuleName(AbstractElement element) {
put(grammarAccess.getActionSignatureAccess().getGroup_3(), "rule__ActionSignature__Group_3__0");
put(grammarAccess.getActionSignatureAccess().getGroup_4(), "rule__ActionSignature__Group_4__0");
put(grammarAccess.getActionSignatureAccess().getGroup_4_2(), "rule__ActionSignature__Group_4_2__0");
put(grammarAccess.getParameterAccess().getGroup(), "rule__Parameter__Group__0");
put(grammarAccess.getRequiredCapacityAccess().getGroup(), "rule__RequiredCapacity__Group__0");
put(grammarAccess.getRequiredCapacityAccess().getGroup_2(), "rule__RequiredCapacity__Group_2__0");
put(grammarAccess.getSkillAccess().getGroup(), "rule__Skill__Group__0");
Expand Down Expand Up @@ -278,9 +282,10 @@ protected String getRuleName(AbstractElement element) {
put(grammarAccess.getBehaviorAccess().getSuperTypeAssignment_2_1(), "rule__Behavior__SuperTypeAssignment_2_1");
put(grammarAccess.getBehaviorAccess().getFeaturesAssignment_4(), "rule__Behavior__FeaturesAssignment_4");
put(grammarAccess.getAttributeAccess().getWriteableAssignment_0_0(), "rule__Attribute__WriteableAssignment_0_0");
put(grammarAccess.getAttributeAccess().getTypeAssignment_1(), "rule__Attribute__TypeAssignment_1");
put(grammarAccess.getAttributeAccess().getNameAssignment_2(), "rule__Attribute__NameAssignment_2");
put(grammarAccess.getAttributeAccess().getInitialValueAssignment_3_1(), "rule__Attribute__InitialValueAssignment_3_1");
put(grammarAccess.getAttributeAccess().getNameAssignment_1_0_0_0(), "rule__Attribute__NameAssignment_1_0_0_0");
put(grammarAccess.getAttributeAccess().getTypeAssignment_1_0_0_2(), "rule__Attribute__TypeAssignment_1_0_0_2");
put(grammarAccess.getAttributeAccess().getNameAssignment_1_1(), "rule__Attribute__NameAssignment_1_1");
put(grammarAccess.getAttributeAccess().getInitialValueAssignment_2_1(), "rule__Attribute__InitialValueAssignment_2_1");
put(grammarAccess.getCapacityUsesAccess().getCapacitiesUsedAssignment_1(), "rule__CapacityUses__CapacitiesUsedAssignment_1");
put(grammarAccess.getCapacityUsesAccess().getCapacitiesUsedAssignment_2_1(), "rule__CapacityUses__CapacitiesUsedAssignment_2_1");
put(grammarAccess.getBehaviorUnitAccess().getEventAssignment_1(), "rule__BehaviorUnit__EventAssignment_1");
Expand All @@ -294,6 +299,9 @@ protected String getRuleName(AbstractElement element) {
put(grammarAccess.getActionSignatureAccess().getTypeAssignment_3_1(), "rule__ActionSignature__TypeAssignment_3_1");
put(grammarAccess.getActionSignatureAccess().getFiredEventsAssignment_4_1(), "rule__ActionSignature__FiredEventsAssignment_4_1");
put(grammarAccess.getActionSignatureAccess().getFiredEventsAssignment_4_2_1(), "rule__ActionSignature__FiredEventsAssignment_4_2_1");
put(grammarAccess.getParameterAccess().getNameAssignment_0(), "rule__Parameter__NameAssignment_0");
put(grammarAccess.getParameterAccess().getParameterTypeAssignment_2(), "rule__Parameter__ParameterTypeAssignment_2");
put(grammarAccess.getParameterAccess().getVarArgAssignment_3(), "rule__Parameter__VarArgAssignment_3");
put(grammarAccess.getRequiredCapacityAccess().getRequiredCapacitiesAssignment_1(), "rule__RequiredCapacity__RequiredCapacitiesAssignment_1");
put(grammarAccess.getRequiredCapacityAccess().getRequiredCapacitiesAssignment_2_1(), "rule__RequiredCapacity__RequiredCapacitiesAssignment_2_1");
put(grammarAccess.getSkillAccess().getNameAssignment_1(), "rule__Skill__NameAssignment_1");
Expand All @@ -304,8 +312,8 @@ protected String getRuleName(AbstractElement element) {
put(grammarAccess.getConstructorAccess().getParamsAssignment_1_2_1(), "rule__Constructor__ParamsAssignment_1_2_1");
put(grammarAccess.getConstructorAccess().getBodyAssignment_2(), "rule__Constructor__BodyAssignment_2");
put(grammarAccess.getXVariableDeclarationAccess().getWriteableAssignment_1_0(), "rule__XVariableDeclaration__WriteableAssignment_1_0");
put(grammarAccess.getXVariableDeclarationAccess().getTypeAssignment_2_0_0_0(), "rule__XVariableDeclaration__TypeAssignment_2_0_0_0");
put(grammarAccess.getXVariableDeclarationAccess().getNameAssignment_2_0_0_1(), "rule__XVariableDeclaration__NameAssignment_2_0_0_1");
put(grammarAccess.getXVariableDeclarationAccess().getNameAssignment_2_0_0_0(), "rule__XVariableDeclaration__NameAssignment_2_0_0_0");
put(grammarAccess.getXVariableDeclarationAccess().getTypeAssignment_2_0_0_2(), "rule__XVariableDeclaration__TypeAssignment_2_0_0_2");
put(grammarAccess.getXVariableDeclarationAccess().getNameAssignment_2_1(), "rule__XVariableDeclaration__NameAssignment_2_1");
put(grammarAccess.getXVariableDeclarationAccess().getRightAssignment_3_1(), "rule__XVariableDeclaration__RightAssignment_3_1");
put(grammarAccess.getXAssignmentAccess().getFeatureAssignment_0_1(), "rule__XAssignment__FeatureAssignment_0_1");
Expand Down
Loading

0 comments on commit 4a70751

Please sign in to comment.