[5/7] cmd: Add support for GEQ comparison operator in if statements (try 4)

Frédéric Delanoy frederic.delanoy at gmail.com
Sat Sep 17 03:54:42 CDT 2011


---
 programs/cmd/builtins.c                  |    8 ++++++++
 programs/cmd/tests/test_builtins.cmd     |   12 ++++++++++++
 programs/cmd/tests/test_builtins.cmd.exp |   25 +++++++++++++++++++++++++
 3 files changed, 45 insertions(+), 0 deletions(-)

diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c
index a915cd0..bf369ce 100644
--- a/programs/cmd/builtins.c
+++ b/programs/cmd/builtins.c
@@ -1510,6 +1510,7 @@ void WCMD_if (WCHAR *p, CMD_LIST **cmdList) {
   static const WCHAR leqW[]    = {'l','e','q','\0'};
   static const WCHAR equW[]    = {'e','q','u','\0'};
   static const WCHAR neqW[]    = {'n','e','q','\0'};
+  static const WCHAR geqW[]    = {'g','e','q','\0'};
   static const WCHAR parmI[]   = {'/','I','\0'};
   int caseInsensitive = (strstrW(quals, parmI) != NULL);
 
@@ -1600,6 +1601,13 @@ void WCMD_if (WCHAR *p, CMD_LIST **cmdList) {
         test = caseInsensitive ? (lstrcmpiW(left, right) != 0)
                                : (lstrcmpW (left, right) != 0);
     }
+    else if (!lstrcmpiW(compOp, geqW)) {
+      if (bothInts)
+        test = (a >= b);
+      else
+        test = caseInsensitive ? (lstrcmpiW(left, right) >= 0)
+                               : (lstrcmpW (left, right) >= 0);
+    }
     else {
       HeapFree(GetProcessHeap(), 0, left);
       HeapFree(GetProcessHeap(), 0, compOp);
diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd
index 3bd65c8..414cde5 100644
--- a/programs/cmd/tests/test_builtins.cmd
+++ b/programs/cmd/tests/test_builtins.cmd
@@ -642,6 +642,11 @@ for %%i in (%STR_PARMS%) do call :NEQtest %%i B
 for %%i in (%STR_PARMS%) do call :NEQtest %%i AB
 for %%i in (%STR_PARMS%) do call :NEQtest %%i BA
 for %%i in (%STR_PARMS%) do call :NEQtest %%i AA
+for %%i in (%STR_PARMS%) do call :GEQtest %%i A
+for %%i in (%STR_PARMS%) do call :GEQtest %%i B
+for %%i in (%STR_PARMS%) do call :GEQtest %%i AB
+for %%i in (%STR_PARMS%) do call :GEQtest %%i BA
+for %%i in (%STR_PARMS%) do call :GEQtest %%i AA
 echo ...... for numbers ......
 if -1 LSS 1 (echo foo) else echo bar
 if 11 LSS 101 (echo riri) else echo fifi
@@ -667,6 +672,10 @@ for %%i in (%INT_PARMS%) do call :NEQtest %%i 0
 for %%i in (%INT_PARMS%) do call :NEQtest %%i 1
 for %%i in (%INT_PARMS%) do call :NEQtest %%i 10
 for %%i in (%INT_PARMS%) do call :NEQtest %%i 9
+for %%i in (%INT_PARMS%) do call :GEQtest %%i 0
+for %%i in (%INT_PARMS%) do call :GEQtest %%i 1
+for %%i in (%INT_PARMS%) do call :GEQtest %%i 10
+for %%i in (%INT_PARMS%) do call :GEQtest %%i 9
 goto :endIfCompOpsSubroutines
 
 rem IF subroutines helpers
@@ -682,6 +691,9 @@ goto :eof
 :NEQtest
 if %1 NEQ %2 echo %1 NEQ %2
 goto :eof
+:GEQtest
+if %1 GEQ %2 echo %1 GEQ %2
+goto :eof
 
 :endIfCompOpsSubroutines
 set STR_PARMS=
diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp
index a0db3cf..b878d0a 100644
--- a/programs/cmd/tests/test_builtins.cmd.exp
+++ b/programs/cmd/tests/test_builtins.cmd.exp
@@ -469,6 +469,21 @@ A NEQ AA
 B NEQ AA
 AB NEQ AA
 BA NEQ AA
+A GEQ A
+B GEQ A
+AB GEQ A
+BA GEQ A
+AA GEQ A
+B GEQ B
+BA GEQ B
+B GEQ AB
+AB GEQ AB
+BA GEQ AB
+BA GEQ BA
+B GEQ AA
+AB GEQ AA
+BA GEQ AA
+AA GEQ AA
 ...... for numbers ......
 foo
 riri
@@ -509,6 +524,16 @@ hexa ok
 0 NEQ 9
 1 NEQ 9
 10 NEQ 9
+0 GEQ 0
+1 GEQ 0
+10 GEQ 0
+9 GEQ 0
+1 GEQ 1
+10 GEQ 1
+9 GEQ 1
+10 GEQ 10
+10 GEQ 9
+9 GEQ 9
 -----------Testing for -----------
 ...plain FOR
 A
-- 
1.7.6.3




More information about the wine-patches mailing list