diff options
| -rw-r--r-- | gcc/rust/ast/rust-ast.h | 20 | ||||
| -rw-r--r-- | gcc/rust/ast/rust-macro.h | 5 | ||||
| -rw-r--r-- | gcc/rust/ast/rust-path.h | 2 | ||||
| -rw-r--r-- | gcc/rust/ast/rust-pattern.h | 33 |
4 files changed, 60 insertions, 0 deletions
diff --git a/gcc/rust/ast/rust-ast.h b/gcc/rust/ast/rust-ast.h index 92faaf2..edf726b 100644 --- a/gcc/rust/ast/rust-ast.h +++ b/gcc/rust/ast/rust-ast.h @@ -1360,12 +1360,32 @@ protected: class Pattern : public Visitable { public: + enum class Kind + { + Literal, + Identifier, + Wildcard, + Rest, + Range, + Reference, + Struct, + TupleStruct, + Tuple, + Grouped, + Slice, + Alt, + Path, + MacroInvocation, + }; + // Unique pointer custom clone function std::unique_ptr<Pattern> clone_pattern () const { return std::unique_ptr<Pattern> (clone_pattern_impl ()); } + virtual Kind get_pattern_kind () = 0; + // possible virtual methods: is_refutable() virtual ~Pattern () {} diff --git a/gcc/rust/ast/rust-macro.h b/gcc/rust/ast/rust-macro.h index bfdebfc..5b9ff3f 100644 --- a/gcc/rust/ast/rust-macro.h +++ b/gcc/rust/ast/rust-macro.h @@ -610,6 +610,11 @@ public: std::string as_string () const override; + Pattern::Kind get_pattern_kind () override + { + return Pattern::Kind::MacroInvocation; + } + /** * The default constructor you should use. Whenever we parse a macro call, we * cannot possibly know whether or not this call refers to a builtin macro or diff --git a/gcc/rust/ast/rust-path.h b/gcc/rust/ast/rust-path.h index ccac630..bd3012b 100644 --- a/gcc/rust/ast/rust-path.h +++ b/gcc/rust/ast/rust-path.h @@ -578,6 +578,8 @@ public: // TODO: this seems kinda dodgy std::vector<PathExprSegment> &get_segments () { return segments; } const std::vector<PathExprSegment> &get_segments () const { return segments; } + + Pattern::Kind get_pattern_kind () override { return Pattern::Kind::Path; } }; /* AST node representing a path-in-expression pattern (path that allows diff --git a/gcc/rust/ast/rust-pattern.h b/gcc/rust/ast/rust-pattern.h index 96f0935..365f3b7 100644 --- a/gcc/rust/ast/rust-pattern.h +++ b/gcc/rust/ast/rust-pattern.h @@ -55,6 +55,8 @@ public: const Literal &get_literal () const { return lit; } + Pattern::Kind get_pattern_kind () override { return Pattern::Kind::Literal; } + protected: /* Use covariance to implement clone function as returning this object rather * than base */ @@ -149,6 +151,11 @@ public: NodeId get_node_id () const override { return node_id; } + Pattern::Kind get_pattern_kind () override + { + return Pattern::Kind::Identifier; + } + protected: /* Use covariance to implement clone function as returning this object rather * than base */ @@ -177,6 +184,8 @@ public: NodeId get_node_id () const override { return node_id; } + Pattern::Kind get_pattern_kind () override { return Pattern::Kind::Wildcard; } + protected: /* Use covariance to implement clone function as returning this object rather * than base */ @@ -204,6 +213,8 @@ public: NodeId get_node_id () const override final { return node_id; } + Pattern::Kind get_pattern_kind () override { return Pattern::Kind::Rest; } + protected: RestPattern *clone_pattern_impl () const override { @@ -431,6 +442,8 @@ public: NodeId get_node_id () const override { return node_id; } + Pattern::Kind get_pattern_kind () override { return Pattern::Kind::Range; } + protected: /* Use covariance to implement clone function as returning this object rather * than base */ @@ -499,6 +512,11 @@ public: NodeId get_node_id () const override { return node_id; } + Pattern::Kind get_pattern_kind () override + { + return Pattern::Kind::Reference; + } + protected: /* Use covariance to implement clone function as returning this object rather * than base */ @@ -934,6 +952,8 @@ public: NodeId get_node_id () const override { return node_id; } + Pattern::Kind get_pattern_kind () override { return Pattern::Kind::Struct; } + protected: /* Use covariance to implement clone function as returning this object rather * than base */ @@ -1174,6 +1194,11 @@ public: NodeId get_node_id () const override { return node_id; } + Pattern::Kind get_pattern_kind () override + { + return Pattern::Kind::TupleStruct; + } + protected: /* Use covariance to implement clone function as returning this object rather * than base */ @@ -1411,6 +1436,8 @@ public: NodeId get_node_id () const override { return node_id; } + Pattern::Kind get_pattern_kind () override { return Pattern::Kind::Tuple; } + protected: /* Use covariance to implement clone function as returning this object rather * than base */ @@ -1471,6 +1498,8 @@ public: NodeId get_node_id () const override { return node_id; } + Pattern::Kind get_pattern_kind () override { return Pattern::Kind::Grouped; } + protected: /* Use covariance to implement clone function as returning this object rather * than base */ @@ -1535,6 +1564,8 @@ public: NodeId get_node_id () const override { return node_id; } + Pattern::Kind get_pattern_kind () override { return Pattern::Kind::Slice; } + protected: /* Use covariance to implement clone function as returning this object rather * than base */ @@ -1600,6 +1631,8 @@ public: NodeId get_node_id () const override { return node_id; } + Pattern::Kind get_pattern_kind () override { return Pattern::Kind::Alt; } + protected: /* Use covariance to implement clone function as returning this object rather * than base */ |