summaryrefslogtreecommitdiff
path: root/src/ast
diff options
context:
space:
mode:
authorJohn Hodge <tpg@ucc.asn.au>2016-10-31 13:35:22 +0800
committerJohn Hodge <tpg@ucc.asn.au>2016-10-31 13:44:33 +0800
commit8b945178e8fd15cccab02c621a1616daddcace16 (patch)
tree026109b50003c7d2c1561f0fb0253094dc6f6350 /src/ast
parentfc7239e7271e879102272ea4d7e98f87f027ee84 (diff)
downloadmrust-8b945178e8fd15cccab02c621a1616daddcace16.tar.gz
AST - Delete some dead code, remove some warnings on GCC6
Diffstat (limited to 'src/ast')
-rw-r--r--src/ast/expr.cpp10
-rw-r--r--src/ast/path.cpp28
-rw-r--r--src/ast/path.hpp10
3 files changed, 6 insertions, 42 deletions
diff --git a/src/ast/expr.cpp b/src/ast/expr.cpp
index e6374f25..bfe3ad98 100644
--- a/src/ast/expr.cpp
+++ b/src/ast/expr.cpp
@@ -55,12 +55,12 @@ Expr Expr::clone() const
::std::ostream& operator<<(::std::ostream& os, const ExprNode& node)
{
- if( static_cast<const void*>(&node) != nullptr ) {
+ //if( static_cast<const void*>(&node) != nullptr ) {
node.print(os);
- }
- else {
- os << "/* NULLPTR */";
- }
+ //}
+ //else {
+ // os << "/* NULLPTR */";
+ //}
return os;
}
ExprNode::~ExprNode() {
diff --git a/src/ast/path.cpp b/src/ast/path.cpp
index 583c3396..d1781e1f 100644
--- a/src/ast/path.cpp
+++ b/src/ast/path.cpp
@@ -188,14 +188,6 @@ void Path::bind_variable(unsigned int slot)
{
m_binding = PathBinding::make_Variable({slot});
}
-void Path::bind_module(const Module& mod) {
- m_binding = PathBinding::make_Module({&mod});
-}
-void Path::bind_enum(const Enum& ent, const ::std::vector<TypeRef>& /*args*/)
-{
- DEBUG("Bound to enum");
- m_binding = PathBinding::make_Enum({&ent});
-}
void Path::bind_enum_var(const Enum& ent, const ::std::string& name, const ::std::vector<TypeRef>& /*args*/)
{
unsigned int idx = 0;
@@ -209,25 +201,7 @@ void Path::bind_enum_var(const Enum& ent, const ::std::string& name, const ::std
throw ParseError::Generic("Enum variant not found");
DEBUG("Bound to enum variant '" << name << "' (#" << idx << ")");
- m_binding = PathBinding::make_EnumVar({&ent, idx});
-}
-void Path::bind_struct(const Struct& ent, const ::std::vector<TypeRef>& /*args*/)
-{
- DEBUG("Bound to struct");
- m_binding = PathBinding::make_Struct({&ent});
-}
-void Path::bind_struct_member(const Struct& ent, const ::std::vector<TypeRef>& /*args*/, const PathNode& member_node)
-{
- DEBUG("Binding to struct item. This needs to be deferred");
- m_binding = PathBinding::make_StructMethod({&ent, member_node.name()});
-}
-void Path::bind_static(const Static& ent)
-{
- m_binding = PathBinding::make_Static({&ent});
-}
-void Path::bind_trait(const Trait& ent, const ::std::vector<TypeRef>& /*args*/)
-{
- m_binding = PathBinding::make_Trait({&ent});
+ m_binding = PathBinding::make_EnumVar({ &ent, idx });
}
Path& Path::operator+=(const Path& other)
diff --git a/src/ast/path.hpp b/src/ast/path.hpp
index 479b26b8..c47f37ca 100644
--- a/src/ast/path.hpp
+++ b/src/ast/path.hpp
@@ -341,21 +341,11 @@ private:
void check_param_counts(const GenericParams& params, bool expect_params, PathNode& node);
public:
- void bind_module(const Module& mod);
- void bind_enum(const Enum& ent, const ::std::vector<TypeRef>& args={});
void bind_enum_var(const Enum& ent, const ::std::string& name, const ::std::vector<TypeRef>& args={});
- void bind_struct(const Struct& ent, const ::std::vector<TypeRef>& args={});
- void bind_struct_member(const Struct& ent, const ::std::vector<TypeRef>& args, const PathNode& member_node);
- void bind_static(const Static& ent);
- void bind_trait(const Trait& ent, const ::std::vector<TypeRef>& args={});
void bind_function(const Function& ent, const ::std::vector<TypeRef>& args={}) {
(void)args;
m_binding = PathBinding::make_Function({&ent});
}
- void bind_type_alias(const TypeAlias& ent, const ::std::vector<TypeRef>& args={}) {
- (void)args;
- m_binding = PathBinding::make_TypeAlias({&ent});
- }
void bind(::AST::PathBinding pb) {
m_binding = mv$(pb);