[llvm-commits] CVS: llvm/tools/llvmc/ConfigLexer.h ConfigLexer.l

[Reid Spencer]

Changes in directory llvm/tools/llvmc:

ConfigLexer.h updated: 1.8 -> 1.9
ConfigLexer.l updated: 1.8 -> 1.9
---
Log message:

Support substitution options for the W, M, and f options.


---
Diffs of the changes:  (+6 -0)

Index: llvm/tools/llvmc/ConfigLexer.h
diff -u llvm/tools/llvmc/ConfigLexer.h:1.8 llvm/tools/llvmc/ConfigLexer.h:1.9
--- llvm/tools/llvmc/ConfigLexer.h:1.8	Wed Sep  1 15:36:15 2004
+++ llvm/tools/llvmc/ConfigLexer.h	Mon Sep 13 20:59:31 2004
@@ -59,6 +59,7 @@
   DEFS_SUBST,   ///< The substitution item %defs%
   EQUALS,       ///< The equals sign, =
   FALSETOK,     ///< A boolean false value (false/no/off)
+  FOPTS_SUBST,  ///< The substitution item %fOpts%
   FORCE_SUBST,  ///< The substitution item %force%
   IN_SUBST,     ///< The substitution item %in%
   INCLS_SUBST,  ///< The substitution item %incls%
@@ -68,6 +69,7 @@
   LIBS,         ///< The name "libs" (and variants)
   LIBS_SUBST,   ///< The substitution item %libs%
   LINKER,       ///< The name "linker" (and variants)
+  MOPTS_SUBST,  ///< The substitution item %Mopts%
   NAME,         ///< The name "name" (and variants)
   OPT_SUBST,    ///< The substitution item %opt%
   OPTIMIZER,    ///< The name "optimizer" (and variants)
@@ -92,6 +94,7 @@
   TRUETOK,      ///< A boolean true value (true/yes/on)
   VERBOSE_SUBST,///< The substitution item %verbose%
   VERSION,      ///< The name "version" (and variants)
+  WOPTS_SUBST,  ///< The %WOpts% substitution
 };
 
 extern ConfigLexerTokens Configlex();


Index: llvm/tools/llvmc/ConfigLexer.l
diff -u llvm/tools/llvmc/ConfigLexer.l:1.8 llvm/tools/llvmc/ConfigLexer.l:1.9
--- llvm/tools/llvmc/ConfigLexer.l:1.8	Mon Aug 30 01:29:06 2004
+++ llvm/tools/llvmc/ConfigLexer.l	Mon Sep 13 20:59:31 2004
@@ -171,6 +171,9 @@
 %target%        { return handleSubstitution(TARGET_SUBST); }
 %time%          { return handleSubstitution(TIME_SUBST); }
 %verbose%       { return handleSubstitution(VERBOSE_SUBST); }
+%fOpts%         { return handleSubstitution(FOPTS_SUBST); }
+%MOpts%         { return handleSubstitution(MOPTS_SUBST); }
+%WOpts%         { return handleSubstitution(WOPTS_SUBST); }
 {BadSubst}      { YY_FATAL_ERROR("Invalid substitution token"); }
 
 {Assembly}      { return handleValueContext(ASSEMBLY); }