[llvm-commits] [hlvm] r38181 - in /hlvm/trunk: hlvm/Reader/HLVM.rng hlvm/Reader/SConscript hlvm/Reader/XML/ hlvm/Reader/XMLReader.cpp hlvm/Reader/XMLReader.h hlvm/Reader/Yaml/ hlvm/Reader/YamlReader.cpp hlvm/Reader/YamlReader.h tools/hlvm-compiler/hlvm-compiler.cpp tools/hlvm-xml2xml/hlvm-xml2xml.cpp

[Reid Spencer]

Author: reid
Date: Sat Jul  7 19:00:51 2007
New Revision: 38181

URL: http://llvm.org/viewvc/llvm-project?rev=38181&view=rev
Log:
Move XMLReader up from hlvm/Reader/XML to just hlvm/Reader. There's no point in
having the directory hierarchy be that deep.

Added:
    hlvm/trunk/hlvm/Reader/HLVM.rng
      - copied unchanged from r38179, hlvm/trunk/hlvm/Reader/XML/HLVM.rng
    hlvm/trunk/hlvm/Reader/XMLReader.cpp
      - copied, changed from r38179, hlvm/trunk/hlvm/Reader/XML/XMLReader.cpp
    hlvm/trunk/hlvm/Reader/XMLReader.h
      - copied unchanged from r38176, hlvm/trunk/hlvm/Reader/XML/XMLReader.h
    hlvm/trunk/hlvm/Reader/YamlReader.cpp
      - copied unchanged from r38176, hlvm/trunk/hlvm/Reader/Yaml/YamlReader.cpp
    hlvm/trunk/hlvm/Reader/YamlReader.h
      - copied unchanged from r38176, hlvm/trunk/hlvm/Reader/Yaml/YamlReader.h
Removed:
    hlvm/trunk/hlvm/Reader/XML/
    hlvm/trunk/hlvm/Reader/Yaml/
Modified:
    hlvm/trunk/hlvm/Reader/SConscript
    hlvm/trunk/tools/hlvm-compiler/hlvm-compiler.cpp
    hlvm/trunk/tools/hlvm-xml2xml/hlvm-xml2xml.cpp

Modified: hlvm/trunk/hlvm/Reader/SConscript
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/hlvm/Reader/SConscript?rev=38181&r1=38180&r2=38181&view=diff

==============================================================================
--- hlvm/trunk/hlvm/Reader/SConscript (original)
+++ hlvm/trunk/hlvm/Reader/SConscript Sat Jul  7 19:00:51 2007
@@ -22,5 +22,10 @@
 #===----------------------------------------------------------------------===#
 from build import hlvm
 Import('env')
-hlvm.Dirs(env,['XML'])
-hlvm.InstallHeader(env,['Reader.h'])
+hlvm.GetRNGQuoteSource(env)
+hlvm.GetRNGTokenizer(env)
+env.RNGQuoteSource('HLVM.rng.inc','HLVM.rng')
+env.RNGTokenizer('HLVMTokenizer.cpp','HLVM.rng')
+lib = env.Library('HLVMXMLReader',['XMLReader.cpp','HLVMTokenizer.cpp'])
+hlvm.InstallLibrary(env,lib)
+hlvm.InstallHeader(env,['XMLReader.h'])

Copied: hlvm/trunk/hlvm/Reader/XMLReader.cpp (from r38179, hlvm/trunk/hlvm/Reader/XML/XMLReader.cpp)
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/hlvm/Reader/XMLReader.cpp?p2=hlvm/trunk/hlvm/Reader/XMLReader.cpp&p1=hlvm/trunk/hlvm/Reader/XML/XMLReader.cpp&r1=38179&r2=38181&rev=38181&view=diff

==============================================================================
--- hlvm/trunk/hlvm/Reader/XML/XMLReader.cpp (original)
+++ hlvm/trunk/hlvm/Reader/XMLReader.cpp Sat Jul  7 19:00:51 2007
@@ -27,8 +27,8 @@
 /// @brief Provides the interface to hlvm::XMLReader
 //===----------------------------------------------------------------------===//
 
-#include <hlvm/Reader/XML/XMLReader.h>
-#include <hlvm/Reader/XML/HLVMTokenizer.h>
+#include <hlvm/Reader/XMLReader.h>
+#include <hlvm/Reader/HLVMTokenizer.h>
 #include <hlvm/AST/Locator.h>
 #include <hlvm/Base/Source.h>
 #include <hlvm/AST/AST.h>
@@ -51,7 +51,7 @@
 #include <iostream>
 
 using namespace hlvm;
-using namespace HLVM_Reader_XML;
+using namespace HLVM_Reader;
 
 namespace {
 

Modified: hlvm/trunk/tools/hlvm-compiler/hlvm-compiler.cpp
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/tools/hlvm-compiler/hlvm-compiler.cpp?rev=38181&r1=38180&r2=38181&view=diff

==============================================================================
--- hlvm/trunk/tools/hlvm-compiler/hlvm-compiler.cpp (original)
+++ hlvm/trunk/tools/hlvm-compiler/hlvm-compiler.cpp Sat Jul  7 19:00:51 2007
@@ -28,7 +28,7 @@
 //===----------------------------------------------------------------------===//
 
 #include <hlvm/Base/Memory.h>
-#include <hlvm/Reader/XML/XMLReader.h>
+#include <hlvm/Reader/XMLReader.h>
 #include <hlvm/Writer/XML/XMLWriter.h>
 #include <hlvm/Pass/Pass.h>
 #include <hlvm/CodeGen/LLVMGenerator.h>

Modified: hlvm/trunk/tools/hlvm-xml2xml/hlvm-xml2xml.cpp
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/tools/hlvm-xml2xml/hlvm-xml2xml.cpp?rev=38181&r1=38180&r2=38181&view=diff

==============================================================================
--- hlvm/trunk/tools/hlvm-xml2xml/hlvm-xml2xml.cpp (original)
+++ hlvm/trunk/tools/hlvm-xml2xml/hlvm-xml2xml.cpp Sat Jul  7 19:00:51 2007
@@ -28,7 +28,7 @@
 //===----------------------------------------------------------------------===//
 
 #include <hlvm/Base/Memory.h>
-#include <hlvm/Reader/XML/XMLReader.h>
+#include <hlvm/Reader/XMLReader.h>
 #include <hlvm/Writer/XML/XMLWriter.h>
 #include <hlvm/Pass/Pass.h>
 #include <llvm/Support/CommandLine.h>