1 files changed, 24 insertions, 34 deletions

diff --git a/MoonParser/ast.hpp b/src/MoonP/ast.hpp
index b388e77..f2ef76c 100644
--- a/MoonParser/ast.hpp
+++ b/src/MoonP/ast.hpp
@@ -1,3 +1,13 @@
+/* Copyright (c) 2012, Achilleas Margaritis, modified by Jin Li
+All rights reserved.
+
+        Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+        Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+        Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
+
 #pragma once
 
 
@@ -5,7 +15,7 @@
 #include <list>
 #include <stdexcept>
 #include <type_traits>
-#include "parser.hpp"
+#include "MoonP/parser.hpp"
 
 
 namespace parserlib {
@@ -57,7 +67,7 @@ public:
         from a node stack.
         @param st stack.
      */
-    virtual void construct(ast_stack& st) {}
+    virtual void construct(ast_stack&) {}
 
     /** interface for visiting AST tree use.
      */
@@ -78,11 +88,9 @@ public:
 
         virtual bool visitChild(const std::function<bool (ast_node*)>& func);
 
-        virtual size_t getId() const { return "ast_node"_id; }
+        virtual size_t getId() const = 0;
 
-        virtual const char* getName() const { return "ast_node"; }
-
-        virtual int get_type() { return ast_type<ast_node>(); }
+        virtual int get_type() = 0;
 
         template<class T>
         inline ast_ptr<false, T> new_ptr() {
@@ -151,10 +159,6 @@ public:
         virtual traversal traverse(const std::function<traversal (ast_node*)>& func) override;
 
         virtual bool visitChild(const std::function<bool (ast_node*)>& func) override;
-
-        virtual size_t getId() const override { return "ast_container"_id; }
-
-        virtual const char* getName() const override { return "ast_container"; }
 private:
     ast_member_vector m_members;
 
@@ -285,14 +289,14 @@ public:
         // check the stack node
         if (st.empty()) {
                         if (!Required) return;
-                        throw std::logic_error("Invalid AST stack");
+                        throw std::logic_error("Invalid AST stack.");
                 }
         ast_node* node = st.back();
                 if (!ast_ptr::accept(node)) {
                         // if the object is not required, simply return
                         if (!Required) return;
                         // else if the object is mandatory, throw an exception
-                        throw std::logic_error("Invalid AST node");
+                        throw std::logic_error("Invalid AST node.");
                 }
         st.pop_back();
         m_ptr = node;
@@ -327,12 +331,12 @@ public:
     virtual void construct(ast_stack& st) override {
         if (st.empty()) {
                 if (!Required) return;
-                        throw std::logic_error("Invalid AST stack");
+                        throw std::logic_error("Invalid AST stack.");
                 }
         ast_node* node = st.back();
         if (!ast_sel::accept(node)) {
                 if (!Required) return;
-                throw std::logic_error("Invalid AST node");
+                throw std::logic_error("Invalid AST node.");
                 }
         st.pop_back();
         m_ptr = node;
@@ -388,20 +392,6 @@ public:
                 node->release();
         }
 
-    void set_front(ast_node* node) {
-        assert(node && accept(node));
-                m_objects.front()->release();
-                m_objects.front() = node;
-                node->retain();
-        }
-
-    void set_back(ast_node* node) {
-        assert(node && accept(node));
-                m_objects.back()->release();
-                m_objects.back() = node;
-                node->retain();
-        }
-
          const node_container& objects() const {
         return m_objects;
     }
@@ -455,7 +445,7 @@ public:
             // end the list parsing
             if (!ast_list::accept(node)) {
                 if (Required && m_objects.empty()) {
-                        throw std::logic_error("Invalid AST node");
+                        throw std::logic_error("Invalid AST node.");
                                 }
                 return;
             }
@@ -465,7 +455,7 @@ public:
             node->retain();
         }
                 if (Required && m_objects.empty()) {
-                        throw std::logic_error("Invalid AST stack");
+                        throw std::logic_error("Invalid AST stack.");
                 }
     }
 private:
@@ -493,7 +483,7 @@ public:
             ast_node* node = st.back();
             if (!ast_sel_list::accept(node)) {
                 if (Required && m_objects.empty()) {
-                        throw std::logic_error("Invalid AST node");
+                        throw std::logic_error("Invalid AST node.");
                                 }
                 return;
             }
@@ -502,7 +492,7 @@ public:
             node->retain();
         }
                 if (Required && m_objects.empty()) {
-                        throw std::logic_error("Invalid AST stack");
+                        throw std::logic_error("Invalid AST stack.");
                 }
     }
 private:
@@ -548,7 +538,7 @@ private:
     @return pointer to ast node created, or null if there was an error.
         The return object must be deleted by the caller.
  */
-ast_node* _parse(input &i, rule &g, error_list &el, void* ud);
+ast_node* _parse(input& i, rule& g, error_list& el, void* ud);
 
 
 /** parses the given input.
@@ -558,7 +548,7 @@ ast_node* _parse(input &i, rule &g, error_list &el, void* ud);
     @param ud user data, passed to the parse procedures.
     @return ast nodes.
  */
-template <class T> ast_ptr<false, T> parse(input &i, rule &g, error_list &el, void* ud = nullptr) {
+template <class T> ast_ptr<false, T> parse(input& i, rule& g, error_list& el, void* ud = nullptr) {
     ast_node* node = _parse(i, g, el, ud);
     T* ast = ast_cast<T>(node);
     ast_ptr<false, T> ptr;