You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by mr...@apache.org on 2007/12/19 01:53:07 UTC
svn commit: r605377 - in /ode/sandbox/simpel/src:
main/antlr/org/apache/ode/simpel/antlr/SimPEL.g
test/resources/auction.simpel test/resources/compile-tests-ok.simpel
test/resources/loan-approval.simpel
Author: mriou
Date: Tue Dec 18 16:53:06 2007
New Revision: 605377
URL: http://svn.apache.org/viewvc?rev=605377&view=rev
Log:
It's parallel dammit.
Modified:
ode/sandbox/simpel/src/main/antlr/org/apache/ode/simpel/antlr/SimPEL.g
ode/sandbox/simpel/src/test/resources/auction.simpel
ode/sandbox/simpel/src/test/resources/compile-tests-ok.simpel
ode/sandbox/simpel/src/test/resources/loan-approval.simpel
Modified: ode/sandbox/simpel/src/main/antlr/org/apache/ode/simpel/antlr/SimPEL.g
URL: http://svn.apache.org/viewvc/ode/sandbox/simpel/src/main/antlr/org/apache/ode/simpel/antlr/SimPEL.g?rev=605377&r1=605376&r2=605377&view=diff
==============================================================================
--- ode/sandbox/simpel/src/main/antlr/org/apache/ode/simpel/antlr/SimPEL.g (original)
+++ ode/sandbox/simpel/src/main/antlr/org/apache/ode/simpel/antlr/SimPEL.g Tue Dec 18 16:53:06 2007
@@ -107,7 +107,7 @@
timeout : 'timeout' '(' expr ')' block -> ^(TIMEOUT expr block);
// TODO links
-flow : 'parrallel' b+=body ('and' b+=body)* -> ^(FLOW $b);
+flow : 'parallel' b+=body ('and' b+=body)* -> ^(FLOW $b);
signal : 'signal' '('ID (',' expr)? ')' -> ^(SIGNAL ID expr?);
join : 'join' '(' k+=ID (',' k+=ID)* (',' expr)? ')' -> ^(JOIN $k expr?);
Modified: ode/sandbox/simpel/src/test/resources/auction.simpel
URL: http://svn.apache.org/viewvc/ode/sandbox/simpel/src/test/resources/auction.simpel?rev=605377&r1=605376&r2=605377&view=diff
==============================================================================
--- ode/sandbox/simpel/src/test/resources/auction.simpel (original)
+++ ode/sandbox/simpel/src/test/resources/auction.simpel Tue Dec 18 16:53:06 2007
@@ -45,7 +45,7 @@
invoke(actionRegistrar, processData, auctionData);
answerData = receive(actionRegistrar, answer, {auctionIdFromAnswer: auctionId});
- parrallel {
+ parallel {
seller = sellerData.endpointReference;
sellerAnswerData.thankYouText = "Thank you!";
invoke(seller, answer, sellerAnswerData);
Modified: ode/sandbox/simpel/src/test/resources/compile-tests-ok.simpel
URL: http://svn.apache.org/viewvc/ode/sandbox/simpel/src/test/resources/compile-tests-ok.simpel?rev=605377&r1=605376&r2=605377&view=diff
==============================================================================
--- ode/sandbox/simpel/src/test/resources/compile-tests-ok.simpel (original)
+++ ode/sandbox/simpel/src/test/resources/compile-tests-ok.simpel Tue Dec 18 16:53:06 2007
@@ -178,8 +178,7 @@
while(count < 10)
receive(p, o) { |m|
count = count + 1;
- if (count == 10)
- invoke(count_partner, count_done);
+ if (count == 10) invoke(count_partner, count_done);
}
#=============================================================
@@ -251,7 +250,7 @@
process BasicFlow {
orderMsg = receive(my_pl, start_op);
- parrallel {
+ parallel {
invoke(partner1_pl, partner1_op, orderMsg);
} and {
invoke(partner2_pl, partner2_op, orderMsg);
@@ -264,7 +263,7 @@
process CompactFlow {
orderMsg = receive(my_pl, start_op);
- parrallel
+ parallel
invoke(partner1_pl, partner1_op, orderMsg);
and
invoke(partner2_pl, partner2_op, orderMsg);
@@ -276,7 +275,7 @@
process BasicFlow {
orderMsg = receive(my_pl, start_op);
- parrallel {
+ parallel {
invoke(partner1_pl, partner1_op, orderMsg);
signal(branch1);
} and {
@@ -294,7 +293,7 @@
process SimilarNames {
try {
- parrallel {
+ parallel {
receive_var = receive(receive_pl, receive_op);
signal(signal-done, [$foo > 1]);
}
Modified: ode/sandbox/simpel/src/test/resources/loan-approval.simpel
URL: http://svn.apache.org/viewvc/ode/sandbox/simpel/src/test/resources/loan-approval.simpel?rev=605377&r1=605376&r2=605377&view=diff
==============================================================================
--- ode/sandbox/simpel/src/test/resources/loan-approval.simpel (original)
+++ ode/sandbox/simpel/src/test/resources/loan-approval.simpel Tue Dec 18 16:53:06 2007
@@ -5,7 +5,7 @@
process pns::LoanApproval {
partnerLink customer, assessor, approver;
try {
- parrallel {
+ parallel {
request = receive(customer, request);
signal(receive-to-assess, [$request.amount < 10000]);
signal(receive-to-approval, [$request.amount >= 10000]);