summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2003-11-16 05:05:38 +0000
committerAndrew Tridgell <tridge@samba.org>2003-11-16 05:05:38 +0000
commitb5fccdd9ee4f18ff77e488c0beb85410b554ac78 (patch)
tree33d9fe5c20917fb88203e701505914be3574546b
parent1f4fe8e48603a68c4bc9ebbbee001b8e932c77ba (diff)
downloadsamba-b5fccdd9ee4f18ff77e488c0beb85410b554ac78.tar.gz
samba-b5fccdd9ee4f18ff77e488c0beb85410b554ac78.tar.bz2
samba-b5fccdd9ee4f18ff77e488c0beb85410b554ac78.zip
fixed the handling of much more general C expressions in value()
statements (This used to be commit 8b38041f6530e42c5d294a5947c15a7f6a2d3c61)
-rw-r--r--source4/build/pidl/idl.gram9
1 files changed, 7 insertions, 2 deletions
diff --git a/source4/build/pidl/idl.gram b/source4/build/pidl/idl.gram
index 4605c4c712..e349a532ff 100644
--- a/source4/build/pidl/idl.gram
+++ b/source4/build/pidl/idl.gram
@@ -135,8 +135,13 @@ type :
text: /[\w\s\..?-]*/
-anytext: call(s?)
- {{ "$item[1][0]" }}
+text2: /[\w\s\*\>\/\..?-]*/
+
+anytext: text2 '(' <commit> anytext ')' anytext
+ {{ "$item[1]($item[4])$item[6]" }}
+ | text2 '+' anytext
+ {{ "$item[1]+$item[3]" }}
+ | text2
call: expression '(' <commit> expression ')'
{{ "$item[1]($item[4])" }}