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 19:20:54 UTC
svn commit: r605650 - in /ode/sandbox/simpel/src:
main/antlr/org/apache/ode/simpel/antlr/SimPEL.g
main/antlr/org/apache/ode/simpel/antlr/SimPELWalker.g
test/resources/auction.simpel test/resources/loan-approval.simpel
Author: mriou
Date: Wed Dec 19 10:20:54 2007
New Revision: 605650
URL: http://svn.apache.org/viewvc?rev=605650&view=rev
Log:
Namespace in E4X path expressions.
Modified:
ode/sandbox/simpel/src/main/antlr/org/apache/ode/simpel/antlr/SimPEL.g
ode/sandbox/simpel/src/main/antlr/org/apache/ode/simpel/antlr/SimPELWalker.g
ode/sandbox/simpel/src/test/resources/auction.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=605650&r1=605649&r2=605650&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 Wed Dec 19 10:20:54 2007
@@ -189,7 +189,7 @@
mexpr : atom (('*'|'/') ^ atom)* | STRING;
atom : path_expr | INT | '(' s_expr ')' -> s_expr;
path_expr
- : pelmt+=ID ('.' pelmt+=ID)* -> ^(PATH $pelmt);
+ : pelmt+=ns_id ('.' pelmt+=ns_id)* -> ^(PATH $pelmt);
ns_id : (pr=ID '::')? loc=ID -> ^(NS $pr? $loc);
Modified: ode/sandbox/simpel/src/main/antlr/org/apache/ode/simpel/antlr/SimPELWalker.g
URL: http://svn.apache.org/viewvc/ode/sandbox/simpel/src/main/antlr/org/apache/ode/simpel/antlr/SimPELWalker.g?rev=605650&r1=605649&r2=605650&view=diff
==============================================================================
--- ode/sandbox/simpel/src/main/antlr/org/apache/ode/simpel/antlr/SimPELWalker.g (original)
+++ ode/sandbox/simpel/src/main/antlr/org/apache/ode/simpel/antlr/SimPELWalker.g Wed Dec 19 10:20:54 2007
@@ -138,7 +138,8 @@
funct_call
: ^(CALL ID*);
path_expr
- : ^(PATH ID*);
+ : ^(PATH ns_id*);
+ns_id : ^(NS ID? ID);
s_expr : ^('==' s_expr s_expr)
| ^('!=' s_expr s_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=605650&r1=605649&r2=605650&view=diff
==============================================================================
--- ode/sandbox/simpel/src/test/resources/auction.simpel (original)
+++ ode/sandbox/simpel/src/test/resources/auction.simpel Wed Dec 19 10:20:54 2007
@@ -54,4 +54,4 @@
buyerAnswerData.thankYouText = "Thank you!";
invoke(buyer, answer, sellerAnswerData);
}
-}
\ No newline at end of file
+}
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=605650&r1=605649&r2=605650&view=diff
==============================================================================
--- ode/sandbox/simpel/src/test/resources/loan-approval.simpel (original)
+++ ode/sandbox/simpel/src/test/resources/loan-approval.simpel Wed Dec 19 10:20:54 2007
@@ -29,4 +29,4 @@
} catch(lns::loanProcessFault) { |error|
reply(customer, request, error);
}
-}
\ No newline at end of file
+}