scripts: Merge r5337:5642 from trunk

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/2.2.x@5643 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2014-06-29 05:54:01 +00:00
parent 66c239c95d
commit d384c5210b
4 changed files with 67 additions and 5 deletions

View File

@@ -151,7 +151,13 @@ function evaluate(stmnt, pattern, arg, op, result) {
{
last_stmnt = stmnt
pattern = "![[:blank:]]*([0-9]+)"
pattern = "![[:blank:]]*(-*[0-9]+)"
while (match(stmnt, pattern, op) != 0)
{
sub(pattern, op[1] == 0, stmnt)
}
pattern = "![[:blank:]]*\\([[:blank:]]*(-*[0-9]+)[[:blank:]]*\\)"
while (match(stmnt, pattern, op) != 0)
{
sub(pattern, op[1] == 0, stmnt)
@@ -197,6 +203,12 @@ function evaluate(stmnt, pattern, arg, op, result) {
sub(pattern, result, stmnt)
}
pattern="(-*[0-9]+)[[:blank:]]*\\&\\&[[:blank:]]*\\([[:blank:]]*(-*[0-9]+)[[:blank:]]*\\)"
while (match(stmnt, pattern, op) != 0)
{
sub(pattern, (op[1] != 0) && (op[2] != 0), stmnt)
}
pattern="(-*[0-9]+)[[:blank:]]*\\&\\&[[:blank:]]*(-*[0-9]+)"
while (match(stmnt, pattern, op) != 0)
{