Update of /cvsroot/boost/boost/libs/xpressive/test
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv10685/libs/xpressive/test
Modified Files:
test_actions.cpp
Log Message:
rename var() to ref(), add val() and cref()
Index: test_actions.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/xpressive/test/test_actions.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- test_actions.cpp 22 Mar 2007 22:16:12 -0000 1.2
+++ test_actions.cpp 23 Mar 2007 21:43:13 -0000 1.3
@@ -92,7 +92,7 @@
std::map<std::string, int> result;
std::string str("aaa=>1 bbb=>23 ccc=>456");
- sregex pair = ( (s1= +_w) >> "=>" >> (s2= +_d) )[ var(result)[s1] =
as<int>(s2) ];
+ sregex pair = ( (s1= +_w) >> "=>" >> (s2= +_d) )[ ref(result)[s1] =
as<int>(s2) ];
sregex rx = pair >> *(+_s >> pair);
if(!regex_match(str, rx))
@@ -125,34 +125,34 @@
factor = (+_d)[ push(stack, as<int>(_)) ] | group;
term = factor >> *(
('*' >> factor)
- [ var(right) = top(stack)
+ [ ref(right) = top(stack)
, pop(stack)
- , var(left) = top(stack)
+ , ref(left) = top(stack)
, pop(stack)
- , push(stack, var(left) * var(right))
+ , push(stack, ref(left) * ref(right))
]
| ('/' >> factor)
- [ var(right) = top(stack)
+ [ ref(right) = top(stack)
, pop(stack)
- , var(left) = top(stack)
+ , ref(left) = top(stack)
, pop(stack)
- , push(stack, var(left) / var(right))
+ , push(stack, ref(left) / ref(right))
]
);
expression = term >> *(
('+' >> term)
- [ var(right) = top(stack)
+ [ ref(right) = top(stack)
, pop(stack)
- , var(left) = top(stack)
+ , ref(left) = top(stack)
, pop(stack)
- , push(stack, var(left) + var(right))
+ , push(stack, ref(left) + ref(right))
]
| ('-' >> term)
- [ var(right) = top(stack)
+ [ ref(right) = top(stack)
, pop(stack)
- , var(left) = top(stack)
+ , ref(left) = top(stack)
, pop(stack)
- , push(stack, var(left) - var(right))
+ , push(stack, ref(left) - ref(right))
]
);
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
