consolidate lexer stuff into the Parser lib.

Swift SVN r6

include/swift/Parse/Lexer.h

@@ -17,7 +17,7 @@
 #ifndef SWIFT_LEXER_H
 #define SWIFT_LEXER_H
 
-#include "swift/Lex/Token.h"
+#include "swift/Parse/Token.h"
 
 namespace swift {
 

lib/Lex/Makefile

@@ -1,23 +0,0 @@
-##===- swift/lib/Lex/Makefile ------------------------------*- Makefile -*-===##
-# 
-# This source file is part of the Swift.org open source project
-#
-# Copyright (c) 2014 - 2015 Apple Inc. and the Swift project authors
-# Licensed under Apache License v2.0 with Runtime Library Exception
-#
-# See http://swift.org/LICENSE.txt for license information
-# See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-#
-##===----------------------------------------------------------------------===##
-#
-#  This implements the Lexer library for the C-Language front-end.
-#
-##===----------------------------------------------------------------------===##
-
-SWIFT_LEVEL := ../..
-include $(SWIFT_LEVEL)/../../Makefile.config
-
-LIBRARYNAME := swiftLex
-
-include $(SWIFT_LEVEL)/Makefile
-

lib/Makefile

@@ -11,7 +11,7 @@
 ##===----------------------------------------------------------------------===##
 SWIFT_LEVEL := ..
 
-PARALLEL_DIRS = Lex Parse
+PARALLEL_DIRS = Parse
 
 include $(SWIFT_LEVEL)/Makefile
 

lib/Parse/Lexer.cpp

@@ -14,7 +14,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "swift/Lex/Lexer.h"
+#include "swift/Parse/Lexer.h"
 using namespace swift;