Changeset 1002 for trunk/mkspecs

Timestamp:

Aug 17, 2011, 8:44:53 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: gnumake/os2: Make mkdir-p.cmd understand quotes in arguments.

File:

• trunk/mkspecs/os2-g++/mkdir-p.cmd (modified) (3 diffs)

trunk/mkspecs/os2-g++/mkdir-p.cmd

@@ -8 +8 @@
 '@echo off'
 
+Globals = 'G.'
+
 parse arg aArgs
 
@@ -14 +16 @@
 
 aArgs = strip(aArgs)
-if (aArgs == '') then do
+call TokenizeString aArgs, 'G.Args'
+if (G.Args.0 \= 1) then do
     say "Usage: mkdir-p <directory>"
     exit 255
 end
 
-exit MakeDir(strip(aArgs))
+exit MakeDir(strip(G.Args.1))
 
 MakeDir: procedure expose (Globals)
@@ -59 +62 @@
     return 0
 
+/**
+ *  Returns a list of all words from the string as a stem.
+ *  Delimiters are spaces, tabs and new line characters.
+ *  Words containg spaces must be enclosed with double
+ *  quotes. Double quote symbols that need to be a part
+ *  of the word, must be doubled.
+ *
+ *  @param string   the string to tokenize
+ *  @param stem
+ *      the name of the stem. The stem must be global
+ *      (i.e. its name must start with 'G.!'), for example,
+ *      'G.!wordlist'.
+ *  @param leave_ws
+ *      1 means whitespace chars are considered as a part of words they follow.
+ *      Leading whitespace (if any) is always a part of the first word (if any).
+ *
+ *  @version 1.1
+ */
+TokenizeString: procedure expose (Globals)
+
+    parse arg string, stem, leave_ws
+    leave_ws = (leave_ws == 1)
+
+    delims  = '20090D0A'x
+    quote   = '22'x /* " */
+
+    num = 0
+    token = ''
+
+    len = length(string)
+    last_state = '' /* D - in delim, Q - in quotes, W - in word */
+    seen_QW = 0
+
+    do i = 1 to len
+        c = substr(string, i, 1)
+        /* determine a new state */
+        if (c == quote) then do
+            if (last_state == 'Q') then do
+                /* detect two double quotes in a row */
+                if (substr(string, i + 1, 1) == quote) then i = i + 1
+                else state = 'W'
+            end
+            else state = 'Q'
+        end
+        else if (verify(c, delims) == 0 & last_state \== 'Q') then do
+            state = 'D'
+        end
+        else do
+            if (last_state == 'Q') then state = 'Q'
+            else state = 'W'
+        end
+        /* process state transitions */
+        if ((last_state == 'Q' | state == 'Q') & state \== last_state) then c = ''
+        else if (state == 'D' & \leave_ws) then c = ''
+        if (last_state == 'D' & state \== 'D' & seen_QW) then do
+            /* flush the token */
+            num = num + 1
+            call value stem'.'num, token
+            token = ''
+        end
+        token = token||c
+        last_state = state
+        seen_QW = (seen_QW | state \== 'D')
+    end
+
+    /* flush the last token if any */
+    if (token \== '' | seen_QW) then do
+        num = num + 1
+        call value stem'.'num, token
+    end
+
+    call value stem'.0', num
+
+    return