Changeset 102

Timestamp:

Aug 12, 2009, 3:13:54 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

emxexpw.cmd: Surround E_BlaBla literals with quotes to avoid EXPRESSION HAS NO VALUE errors in Error calls.

File:

• trunk/mkspecs/os2-g++/emxexpw.cmd (modified) (14 diffs)

trunk/mkspecs/os2-g++/emxexpw.cmd

@@ -92 +92 @@
 
 /* check options */
-if (Opt.!DefFile == '') then call Error E_NoDefFile
-if (Opt.!Objects.0 == 0) then call Error E_NoObjectFiles
+if (Opt.!DefFile == '') then call Error 
+if (Opt.!Objects.0 == 0) then call Error 
 
 /* apply default options */
@@ -102 +102 @@
 /* check emxexp.exe existence */
 G.emxexp_exe = SysSearchPath('PATH', 'EMXEXP.EXE')
-if (G.emxexp_exe == '') then call Error E_CantFindEMXEXP
+if (G.emxexp_exe == '') then call Error 
 
 Opt.!ObjectsList = ''
@@ -133 +133 @@
     rc = SysFileDelete(Opt.!DefFile)
     if (rc \== 0 & rc \== 2) then
-        call Error E_CantDeleteFile, Opt.!DefFile, rc
+        call Error , Opt.!DefFile, rc
 
     /* write object files to a responce file for EMXEXP */
@@ -186 +186 @@
 
             if (rc \== 0) then
-                call Error E_EMXEXPFailed, rc
+                call Error , rc
         end
 
@@ -212 +212 @@
         else
             G.emxexp_exe Opt.!ObjectsList '>'G.!TempDefFile
-        if (rc \== 0) then call Error E_EMXEXPFailed, rc
+        if (rc \== 0) then call Error , rc
 
         if (G.!ObjectListFile \= '') then do
@@ -224 +224 @@
 
         if (G.!Exports.0 == 0) then
-            call Error E_NoExports
+            call Error 
 
         /* update the map file */
@@ -230 +230 @@
         rc = SysFileDelete(Opt.!DefMap)
         if (rc \== 0 & rc \== 2) then
-            call Error E_CantDeleteFile, Opt.!DefMap, rc
+            call Error , Opt.!DefMap, rc
 
         stats = AppendExportsToFile(Opt.!DefMap)
@@ -307 +307 @@
         parse value stream(Opt.!DefTemplate, 'C', 'OPEN READ') with status':'code
         if (status \== 'READY') then
-            call Error E_CantOpenFile, Opt.!DefTemplate, code
+            call Error , Opt.!DefTemplate, code
         do while lines(Opt.!DefTemplate)
             str = linein(Opt.!DefTemplate)
@@ -424 +424 @@
                 parse value(G.!line.w) with '@'ordinal
             if (\datatype(ordinal, 'W') | ordinal <= 0) then
-                call Error E_InvalidOrdinal, symbol, ordinal, file, ln
+                call Error , symbol, ordinal, file, ln
             w = w + 1
             if (G.!line.0 < w | translate(G.!line.w) \== 'NONAME') then
-                call Error E_NoNoname, symbol, file, ln
+                call Error , symbol, file, ln
             w = w + 1
         end
@@ -457 +457 @@
             when (magicseg == 'TEXT32') then nop
             otherwise
-                call Error E_InvalidMagicSeg, symbol, magicseg, file, ln
+                call Error , symbol, magicseg, file, ln
         end
 
@@ -475 +475 @@
             signal on novalue
             if (datatype(o, 'W')) then
-                call Error E_DuplicateSymbol, symbol, file, ln
+                call Error , symbol, file, ln
             G.!Exports.symbol = n /* back reference! */
             if (G.!Exports.!maxOrd < ordinal) then
@@ -596 +596 @@
             o = substr(G.!opts.i, 2)
             if (stream(o, 'C', 'QUERY EXISTS') == '') then
-                call Error E_FileNotFound, o
+                call Error , o
             resp_options = resp_options || charin(o,, chars(o))
         end
@@ -640 +640 @@
                 end
                 otherwise
-                    call Error E_InvalidOption, o
+                    call Error , o
             end
         end
@@ -858 +858 @@
     eol = '0D0A'x
 
-    e.E_CantFindEMXEXP  = 'Cannot find EMXEXP.EXE in the PATH.'
-    e.E_CantOpenFile    = 'Cannot open file ''%1'' (RC = %2).'
-    e.E_CantDeleteFile  = 'Cannot delete file ''%1'' (RC = %2).'
-    e.E_InvalidOption   = 'Invalid option: ''%1''.'
-    e.E_FileNotFound    = 'File not found: ''%1''.'
-    e.E_NoDefFile       = 'No output DEF file.'
-    e.E_NoObjectFiles   = 'No input object files.'
-    e.E_EMXEXPFailed    = 'EMXEXP.EXE failed with RC = %1.'
-    e.E_NoExports   =,
+    e.E_CantFindEMXEXP  = 'Cannot find EMXEXP.EXE in the PATH.'
+    e.E_CantOpenFile    = 'Cannot open file ''%1'' (RC = %2).'
+    e.E_CantDeleteFile  = 'Cannot delete file ''%1'' (RC = %2).'
+    e.E_InvalidOption   = 'Invalid option: ''%1''.'
+    e.E_FileNotFound    = 'File not found: ''%1''.'
+    e.E_NoDefFile       = 'No output DEF file.'
+    e.E_NoObjectFiles   = 'No input object files.'
+    e.E_EMXEXPFailed    = 'EMXEXP.EXE failed with RC = %1.'
+    e.E_NoExports   =,
         'The specified list of objects doesn''t export any symbols.'
-    e.E_InvalidMagicSeg =,
+    e.E_InvalidMagicSeg =,
         'Invalid or missing magic segment ''%2'' for symbol "%1" in ''%3'' (line %4).'
-    e.E_InvalidOrdinal  =,
+    e.E_InvalidOrdinal  =,
         'Invalid or missing ordinal ''%2'' for symbol "%1" in ''%3'' (line %4).'
-    e.E_NoNoname        =,
+    e.E_NoNoname        =,
         'No NONAME keyword for symbol "%1" in ''%2'' (line %3).'
-    e.E_DuplicateSymbol =,
+    e.E_DuplicateSymbol =,
         'Duplicate symbol symbol "%1" detected in ''%2'' (line %3).'