[llvm-commits] CVS: llvm/utils/TableGen/FileLexer.l TableGen.cpp

[John Criswell]

Changes in directory llvm/utils/TableGen:

FileLexer.l updated: 1.12 -> 1.13
TableGen.cpp updated: 1.19 -> 1.20

---
Log message:

Added an option to TableGen that allows users to specify a directory in which
to find include files.  TableGen will load include files from this directory if
it cannot find them in the current directory.
This feature was needed for building code inside the object tree (a la autoconf
style).
TODO: Allow for multiple -I options to specify a list of directories to search.



---
Diffs of the changes:

Index: llvm/utils/TableGen/FileLexer.l
diff -u llvm/utils/TableGen/FileLexer.l:1.12 llvm/utils/TableGen/FileLexer.l:1.13
--- llvm/utils/TableGen/FileLexer.l:1.12	Sun Aug 10 17:04:25 2003
+++ llvm/utils/TableGen/FileLexer.l	Wed Aug 27 08:41:57 2003
@@ -21,9 +21,13 @@
 
 %{
 #include "Record.h"
+#include "Support/CommandLine.h"
 typedef std::pair<Record*, std::vector<Init*>*> SubClassRefTy;
 #include "FileParser.h"
 
+// Global variable recording the location of the include directory
+std::string IncludeDirectory;
+
 // ParseInt - This has to handle the special case of binary numbers 0b0101
 static int ParseInt(const char *Str) {
   if (Str[0] == '0' && Str[1] == 'b')
@@ -61,7 +65,18 @@
 
 int Fileparse();
 
-void ParseFile(const std::string &Filename) {
+//
+// Function: ParseFile()
+//
+// Description:
+//	This function begins the parsing of the specified tablegen file.
+//
+// Inputs:
+//	Filename - A string containing the name of the file to parse.
+//	IncludeDir - A string containing the directory from which include
+//	             files can be found.
+//
+void ParseFile(const std::string &Filename, const std::string & IncludeDir) {
   FILE *F = stdin;
   if (Filename != "-") {
     F = fopen(Filename.c_str(), "r");
@@ -75,6 +90,12 @@
     IncludeStack.push_back(IncludeRec("<stdin>", stdin));
   }
 
+  //
+  // Record the location of the include directory so that the lexer can find
+  // it later.
+  //
+  IncludeDirectory = IncludeDir;
+ 
   Filein = F;
   Filelineno = 1;
   Fileparse();
@@ -103,8 +124,20 @@
   // Open the new input file...
   yyin = fopen(Filename.c_str(), "r");
   if (yyin == 0) {
-    err() << "Could not find include file '" << Filename << "'!\n";
-    abort();
+    //
+    // If we couldn't find the file in the current directory, look for it in
+    // the include directories.
+    //
+    // NOTE:
+    //  Right now, there is only one directory.  We need to eventually add
+    //  support for more.
+    //
+    Filename = IncludeDirectory + "/" + Filename;
+    yyin = fopen(Filename.c_str(), "r");
+    if (yyin == 0) {
+      err() << "Could not find include file '" << Filename << "'!\n";
+      abort();
+    }
   }
 
   // Add the file to our include stack...


Index: llvm/utils/TableGen/TableGen.cpp
diff -u llvm/utils/TableGen/TableGen.cpp:1.19 llvm/utils/TableGen/TableGen.cpp:1.20
--- llvm/utils/TableGen/TableGen.cpp:1.19	Thu Aug 14 11:05:35 2003
+++ llvm/utils/TableGen/TableGen.cpp	Wed Aug 27 08:41:57 2003
@@ -64,10 +64,14 @@
 
   cl::opt<std::string>
   InputFilename(cl::Positional, cl::desc("<input file>"), cl::init("-"));
+
+  cl::opt<std::string>
+  IncludeDir("I", cl::desc("Directory of include files"),
+                  cl::value_desc("directory"), cl::init(""));
 }
 
 
-void ParseFile(const std::string &Filename);
+void ParseFile(const std::string &Filename, const std::string & IncludeDir);
 
 RecordKeeper Records;
 
@@ -398,7 +402,7 @@
 
 int main(int argc, char **argv) {
   cl::ParseCommandLineOptions(argc, argv);
-  ParseFile(InputFilename);
+  ParseFile(InputFilename, IncludeDir);
 
   std::ostream *Out = &std::cout;
   if (OutputFilename != "-") {