averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

give ASTContext a SourceMgr reference, add diagnostic hooks to SemaBase.

Browse Source 
Swift SVN r39
This commit is contained in:
Chris Lattner
2010-07-19 05:13:55 +00:00
parent c5e54442b4
commit 2eeee5faca
6 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/swift/AST/ASTContext.h
View File

@@ -19,6 +19,7 @@
namespace llvm { namespace llvm {
class BumpPtrAllocator; class BumpPtrAllocator;
class SourceMgr;
} }
namespace swift { namespace swift {
@@ -30,9 +31,12 @@ class ASTContext {
void operator=(const ASTContext&); // DO NOT IMPLEMENT void operator=(const ASTContext&); // DO NOT IMPLEMENT
llvm::BumpPtrAllocator *Allocator; llvm::BumpPtrAllocator *Allocator;
public: public:
ASTContext(); ASTContext(llvm::SourceMgr &SourceMgr);
~ASTContext(); ~ASTContext();
/// SourceMgr - The source manager object.
llvm::SourceMgr &SourceMgr;
Type * const VoidType; /// VoidType - This is 'void'. Type * const VoidType; /// VoidType - This is 'void'.
Type * const IntType; /// IntType - This is 'int'. Type * const IntType; /// IntType - This is 'int'.

2
include/swift/Parse/Parser.h
View File

@@ -42,7 +42,7 @@ class Parser {
Parser(const Parser&); // DO NOT IMPLEMENT Parser(const Parser&); // DO NOT IMPLEMENT
void operator=(const Parser&); // DO NOT IMPLEMENT void operator=(const Parser&); // DO NOT IMPLEMENT
public: public:
Parser(unsigned BufferID, llvm::SourceMgr &SM, ASTContext &Context); Parser(unsigned BufferID, ASTContext &Context);
~Parser(); ~Parser();
void ParseTranslationUnit(); void ParseTranslationUnit();

4
include/swift/Sema/SemaBase.h
View File

@@ -37,7 +37,9 @@ protected:
public: public:
SemaBase(Sema &s); SemaBase(Sema &s);
// TODO: Diagnostics stuff. void Note(llvm::SMLoc Loc, const char *Message);
void Warning(llvm::SMLoc Loc, const char *Message);
void Error(llvm::SMLoc Loc, const char *Message);
}; };
} // end namespace swift } // end namespace swift

3
lib/AST/ASTContext.cpp
View File

@@ -19,8 +19,9 @@
#include "llvm/Support/Allocator.h" #include "llvm/Support/Allocator.h"
using namespace swift; using namespace swift;
ASTContext::ASTContext() ASTContext::ASTContext(llvm::SourceMgr &sourcemgr)
: Allocator(new llvm::BumpPtrAllocator()), : Allocator(new llvm::BumpPtrAllocator()),
SourceMgr(sourcemgr),
VoidType(new (*this) BuiltinType(BuiltinVoidKind)), VoidType(new (*this) BuiltinType(BuiltinVoidKind)),
IntType(new (*this) BuiltinType(BuiltinIntKind)) { IntType(new (*this) BuiltinType(BuiltinIntKind)) {
} }

6
lib/Parse/Parser.cpp
View File

@@ -27,9 +27,9 @@ using llvm::SMLoc;
// Setup and Helper Methods // Setup and Helper Methods
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
Parser::Parser(unsigned BufferID, llvm::SourceMgr &SM, ASTContext &Context) Parser::Parser(unsigned BufferID, ASTContext &Context)
: SourceMgr(SM), : SourceMgr(Context.SourceMgr),
L(*new Lexer(BufferID, SM)), L(*new Lexer(BufferID, SourceMgr)),
S(*new Sema(Context)) { S(*new Sema(Context)) {
} }

12
lib/Sema/SemaBase.cpp
View File

@@ -15,7 +15,19 @@
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#include "swift/Sema/SemaBase.h" #include "swift/Sema/SemaBase.h"
#include "swift/Sema/Sema.h"
#include "llvm/Support/SourceMgr.h"
using namespace swift; using namespace swift;
SemaBase::SemaBase(Sema &s) : S(s) { SemaBase::SemaBase(Sema &s) : S(s) {
} }
void SemaBase::Note(llvm::SMLoc Loc, const char *Message) {
S.Context.SourceMgr.PrintMessage(Loc, Message, "note");
}
void SemaBase::Warning(llvm::SMLoc Loc, const char *Message) {
S.Context.SourceMgr.PrintMessage(Loc, Message, "warning");
}
void SemaBase::Error(llvm::SMLoc Loc, const char *Message) {
S.Context.SourceMgr.PrintMessage(Loc, Message, "error");
}