Setup the ns table in the context class
This commit is contained in:
parent
66cecc77f3
commit
33c6ebd3d3
|
@ -36,16 +36,23 @@ class Expression;
|
||||||
using Node = std::shared_ptr<Expression>;
|
using Node = std::shared_ptr<Expression>;
|
||||||
} // namespace exprs
|
} // namespace exprs
|
||||||
|
|
||||||
struct SereneContext {
|
class SereneContext {
|
||||||
llvm::DenseMap<llvm::StringRef, std::unique_ptr<Namespace>> namespaces;
|
std::map<std::string, std::shared_ptr<Namespace>> namespaces;
|
||||||
|
|
||||||
Environment<llvm::StringRef, exprs::Node> semanticEnv;
|
public:
|
||||||
|
/// Insert the given `ns` into the context. The Context object is
|
||||||
|
/// the owner of all the namespaces. The `ns` will overwrite any
|
||||||
|
/// namespace with the same name.
|
||||||
|
void insertNS(std::shared_ptr<Namespace> ns);
|
||||||
|
|
||||||
|
std::shared_ptr<Namespace> getNS(llvm::StringRef ns_name);
|
||||||
SereneContext(){};
|
SereneContext(){};
|
||||||
};
|
};
|
||||||
|
|
||||||
/// Creates a new context object. Contexts are used through out the compilation
|
/// Creates a new context object. Contexts are used through out the compilation
|
||||||
/// process to store the state
|
/// process to store the state
|
||||||
SereneContext makeSereneContext();
|
SereneContext makeSereneContext();
|
||||||
|
|
||||||
}; // namespace serene
|
}; // namespace serene
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -26,8 +26,10 @@
|
||||||
#define NAMESPACE_H
|
#define NAMESPACE_H
|
||||||
|
|
||||||
#include "serene/environment.h"
|
#include "serene/environment.h"
|
||||||
|
#include "serene/utils.h"
|
||||||
#include <llvm/ADT/StringRef.h>
|
#include <llvm/ADT/StringRef.h>
|
||||||
#include <llvm/IR/Module.h>
|
#include <llvm/IR/Module.h>
|
||||||
|
#include <memory>
|
||||||
#include <mlir/Support/LogicalResult.h>
|
#include <mlir/Support/LogicalResult.h>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
|
@ -35,12 +37,17 @@
|
||||||
DEBUG_WITH_TYPE("NAMESPACE", llvm::dbgs() << __VA_ARGS__ << "\n");
|
DEBUG_WITH_TYPE("NAMESPACE", llvm::dbgs() << __VA_ARGS__ << "\n");
|
||||||
|
|
||||||
namespace serene {
|
namespace serene {
|
||||||
|
class SereneContext;
|
||||||
|
|
||||||
namespace exprs {
|
namespace exprs {
|
||||||
class Expression;
|
class Expression;
|
||||||
using Node = std::shared_ptr<Expression>;
|
using Node = std::shared_ptr<Expression>;
|
||||||
using Ast = std::vector<Node>;
|
using Ast = std::vector<Node>;
|
||||||
} // namespace exprs
|
} // namespace exprs
|
||||||
|
|
||||||
|
/// Serene's namespaces are the unit of compilation. Any code that needs to be
|
||||||
|
/// compiled has to be in a namespace. The official way to create a new
|
||||||
|
/// namespace is to use the `makeNamespace` function.
|
||||||
class Namespace {
|
class Namespace {
|
||||||
private:
|
private:
|
||||||
bool initialized = false;
|
bool initialized = false;
|
||||||
|
@ -48,7 +55,7 @@ private:
|
||||||
|
|
||||||
public:
|
public:
|
||||||
mlir::StringRef name;
|
mlir::StringRef name;
|
||||||
llvm::Optional<llvm::StringRef> filename;
|
llvm::Optional<std::string> filename;
|
||||||
|
|
||||||
/// The root environment of the namespace on the semantic analysis phase.
|
/// The root environment of the namespace on the semantic analysis phase.
|
||||||
/// Which is a mapping from names to AST nodes ( no evaluation ).
|
/// Which is a mapping from names to AST nodes ( no evaluation ).
|
||||||
|
@ -62,6 +69,9 @@ public:
|
||||||
~Namespace();
|
~Namespace();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
std::shared_ptr<Namespace>
|
||||||
|
makeNamespace(SereneContext &ctx, llvm::StringRef name,
|
||||||
|
llvm::Optional<llvm::StringRef> filename);
|
||||||
} // namespace serene
|
} // namespace serene
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -23,7 +23,21 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "serene/context.h"
|
#include "serene/context.h"
|
||||||
|
#include "serene/namespace.h"
|
||||||
|
|
||||||
namespace serene {
|
namespace serene {
|
||||||
SereneContext makeSereneContext() { return SereneContext(); }
|
|
||||||
|
void SereneContext::insertNS(std::shared_ptr<Namespace> ns) {
|
||||||
|
namespaces[ns->name.str()] = ns;
|
||||||
|
};
|
||||||
|
|
||||||
|
std::shared_ptr<Namespace> SereneContext::getNS(llvm::StringRef ns_name) {
|
||||||
|
if (namespaces.count(ns_name.str())) {
|
||||||
|
return namespaces[ns_name.str()];
|
||||||
|
}
|
||||||
|
|
||||||
|
return nullptr;
|
||||||
|
};
|
||||||
|
|
||||||
|
SereneContext makeSereneContext() { return SereneContext(); };
|
||||||
}; // namespace serene
|
}; // namespace serene
|
||||||
|
|
|
@ -35,11 +35,8 @@ using namespace llvm;
|
||||||
namespace serene {
|
namespace serene {
|
||||||
|
|
||||||
Namespace::Namespace(llvm::StringRef ns_name,
|
Namespace::Namespace(llvm::StringRef ns_name,
|
||||||
llvm::Optional<llvm::StringRef> filename) {
|
llvm::Optional<llvm::StringRef> filename)
|
||||||
|
: name(ns_name), filename(filename->str()){};
|
||||||
this->filename = filename;
|
|
||||||
this->name = ns_name;
|
|
||||||
};
|
|
||||||
|
|
||||||
exprs::Ast &Namespace::Tree() { return this->tree; }
|
exprs::Ast &Namespace::Tree() { return this->tree; }
|
||||||
|
|
||||||
|
@ -52,6 +49,14 @@ mlir::LogicalResult Namespace::setTree(exprs::Ast &t) {
|
||||||
return mlir::success();
|
return mlir::success();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
std::shared_ptr<Namespace>
|
||||||
|
makeNamespace(SereneContext &ctx, llvm::StringRef name,
|
||||||
|
llvm::Optional<llvm::StringRef> filename) {
|
||||||
|
auto nsPtr = std::make_shared<Namespace>(name, filename);
|
||||||
|
ctx.insertNS(nsPtr);
|
||||||
|
return nsPtr;
|
||||||
|
};
|
||||||
|
|
||||||
Namespace::~Namespace() {}
|
Namespace::~Namespace() {}
|
||||||
|
|
||||||
} // namespace serene
|
} // namespace serene
|
||||||
|
|
|
@ -0,0 +1,63 @@
|
||||||
|
/* -*- C++ -*-
|
||||||
|
* Serene programming language.
|
||||||
|
*
|
||||||
|
* Copyright (c) 2019-2021 Sameer Rahmani <lxsameer@gnu.org>
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
|
* in the Software without restriction, including without limitation the rights
|
||||||
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
* copies of the Software, and to permit persons to whom the Software is
|
||||||
|
* furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in
|
||||||
|
* all copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
* SOFTWARE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "./test_helpers.cpp.inc"
|
||||||
|
#include "serene/context.h"
|
||||||
|
#include "serene/namespace.h"
|
||||||
|
#include <catch2/catch.hpp>
|
||||||
|
|
||||||
|
namespace serene {
|
||||||
|
|
||||||
|
TEST_CASE("Context tests", "[context]") {
|
||||||
|
auto ctx = makeSereneContext();
|
||||||
|
auto ns = ctx.getNS("blah");
|
||||||
|
|
||||||
|
REQUIRE_FALSE(ns);
|
||||||
|
|
||||||
|
auto userNs = makeNamespace(ctx, "user", llvm::Optional<llvm::StringRef>("/some/file"));
|
||||||
|
|
||||||
|
CHECK(userNs->name == "user");
|
||||||
|
REQUIRE(userNs->filename);
|
||||||
|
CHECK(userNs->filename.getValue() == "/some/file");
|
||||||
|
|
||||||
|
ns = ctx.getNS("user");
|
||||||
|
|
||||||
|
REQUIRE(ns);
|
||||||
|
CHECK(ns->name == userNs->name);
|
||||||
|
|
||||||
|
|
||||||
|
/// Creating new ns with the same name overrides the old one
|
||||||
|
auto userNs1 = makeNamespace(ctx, "user", llvm::Optional<llvm::StringRef>("/some/other/file"));
|
||||||
|
|
||||||
|
ns = ctx.getNS("user");
|
||||||
|
|
||||||
|
REQUIRE(ns);
|
||||||
|
CHECK(ns->name == userNs1->name);
|
||||||
|
REQUIRE(ns->filename);
|
||||||
|
CHECK(ns->filename.getValue() == "/some/other/file");
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
} // namespace serene
|
|
@ -23,6 +23,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define CATCH_CONFIG_MAIN
|
#define CATCH_CONFIG_MAIN
|
||||||
|
#include "./context_tests.cpp.inc"
|
||||||
#include "./environment_tests.cpp.inc"
|
#include "./environment_tests.cpp.inc"
|
||||||
#include "./errors/error_tests.cpp.inc"
|
#include "./errors/error_tests.cpp.inc"
|
||||||
#include "./exprs/expression_tests.cpp.inc"
|
#include "./exprs/expression_tests.cpp.inc"
|
||||||
|
|
Loading…
Reference in New Issue