From adea19b2a3ed5f3be56166706316a25babed3246 Mon Sep 17 00:00:00 2001
From: Jonathan Turner <probata@hotmail.com>
Date: Fri, 29 May 2009 17:59:13 +0000
Subject: [PATCH] Cleaned up constructors and corrected missing defaults.

---
 langkit/langkit_parser.hpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/langkit/langkit_parser.hpp b/langkit/langkit_parser.hpp
index cf299c8..0d4fbc7 100644
--- a/langkit/langkit_parser.hpp
+++ b/langkit/langkit_parser.hpp
@@ -19,7 +19,10 @@ struct RuleImpl {
     bool keep;
     int new_id;
 
-    RuleImpl() : keep(true), new_id(-1) { }
+    RuleImpl() : keep(true), new_id(-1) {}
+    RuleImpl(int id) : keep(true), new_id(id) {}
+    RuleImpl(RuleFun fun) : rule(fun), keep(true), new_id(-1) {}
+    RuleImpl(RuleFun fun, bool keep_match) : rule(fun), keep(keep_match), new_id(-1) {}
 
     std::pair<Token_Iterator, bool> operator()(Token_Iterator iter, Token_Iterator end, TokenPtr parent) {
         return rule(iter, end, parent, keep, new_id);
@@ -53,10 +56,10 @@ std::pair<Token_Iterator, bool> Nop_Rule
 struct Rule {
     RuleImplPtr impl;
 
-    Rule() : impl(new RuleImpl()) { }
-    Rule(int id) : impl(new RuleImpl()) { impl->new_id = id; }
-    Rule(RuleFun fun) : impl(new RuleImpl()) { impl->rule = fun; }
-    Rule(RuleFun fun, bool keep) : impl(new RuleImpl()) { impl->rule = fun; impl->keep = keep; }
+    Rule() : impl(new RuleImpl()) {}
+    Rule(int id) : impl(new RuleImpl(id)) {}
+    Rule(RuleFun fun) : impl(new RuleImpl(fun)) {}
+    Rule(RuleFun fun, bool keep) : impl(new RuleImpl(fun, keep)) {}
 
     std::pair<Token_Iterator, bool> operator()(Token_Iterator iter, Token_Iterator end, TokenPtr parent) {
         return (*impl)(iter, end, parent);