iv-phonic 0.0.3 → 0.0.5

data/Manifest.txt

@@ -20,8 +20,8 @@ ext/include/iv/errors.h
 ext/include/iv/ast-visitor.h
 ext/include/iv/token.h
 ext/include/iv/enable_if.h
-ext/include/iv/source.h
 ext/include/iv/any.h
+ext/include/iv/keyword.h
 ext/include/iv/cmdline.h
 ext/include/iv/xorshift.h
 ext/include/iv/location.h
@@ -30,14 +30,13 @@ ext/include/iv/algorithm.h
 ext/include/iv/ustring.h
 ext/include/iv/ast-fwd.h
 ext/include/iv/utils.h
+ext/include/iv/ast-info.h
 ext/include/iv/alloc.h
 ext/include/iv/chars.h
 ext/include/iv/fixedcontainer.h
 ext/include/iv/ustringpiece.h
 ext/include/iv/ast-serializer.h
 ext/include/iv/ucdata.h
-ext/iv/phonic/rnode.h
-ext/iv/phonic/ast.h
 ext/iv/phonic/factory.h
 ext/iv/phonic/parser.h
 ext/iv/phonic/encoding.h

data/Rakefile

@@ -10,7 +10,7 @@ directory "ext/include/iv"
 
 HOE = Hoe.spec 'iv-phonic' do
   developer('Constellation', 'utatane.tea@gmail.com')
-  self.version = '0.0.3'
+  self.version = '0.0.5'
   self.readme_file = 'README.rdoc'
   self.history_file = 'ChangeLog'
   self.extra_rdoc_files = FileList['*.rdoc']

data/ext/include/iv/alloc.h

@@ -117,12 +117,11 @@ class Space {
     : arena_(&init_arenas_[0]),
       start_malloced_(NULL),
       malloced_() {
-    unsigned int c = 0;
-    for (; c < kInitArenas-1; ++c) {
+    for (std::size_t c = 0; c < N-1; ++c) {
       init_arenas_[c].SetNext(&init_arenas_[c+1]);
     }
   }
-  virtual ~Space() {
+  ~Space() {
     if (start_malloced_) {
       Arena *now = start_malloced_, *next = start_malloced_;
       while (now) {
@@ -161,7 +160,7 @@ class Space {
     }
   }
 
-  virtual inline void Clear() {
+  inline void Clear() {
     arena_ = init_arenas_;
     std::for_each(malloced_.begin(), malloced_.end(), &Malloced::Delete);
     malloced_.clear();
@@ -196,5 +195,13 @@ class Space {
   std::vector<void*>malloced_;
 };
 
+// surpress compiler warning
+template<>
+inline Space<1>::Space()
+  : arena_(&init_arenas_[0]),
+    start_malloced_(NULL),
+    malloced_() {
+}
+
 } }  // namespace iv::core
 #endif  // _IV_ALLOC_H_

data/ext/include/iv/ast-factory.h

@@ -12,10 +12,10 @@ namespace iv {
 namespace core {
 namespace ast {
 
-template<std::size_t N, typename Factory>
-class BasicAstFactory : public Space<N> {
+template<typename Factory>
+class BasicAstFactory {
  public:
-  typedef BasicAstFactory<N, Factory> this_type;
+  typedef BasicAstFactory<Factory> this_type;
 
 #define V(AST) typedef typename ast::AST<Factory> AST;
   AST_NODE_LIST(V)
@@ -28,8 +28,7 @@ class BasicAstFactory : public Space<N> {
 #undef V
 
   BasicAstFactory()
-    : Space<N>(),
-      undefined_instance_(
+    : undefined_instance_(
           new(static_cast<Factory*>(this))Undefined()),
       empty_statement_instance_(
           new(static_cast<Factory*>(this))EmptyStatement()),
@@ -90,8 +89,14 @@ class BasicAstFactory : public Space<N> {
         ObjectLiteral(static_cast<Factory*>(this));
   }
 
+  template<typename T>
+  T** NewPtr() {
+    return new (static_cast<Factory*>(this)->New(sizeof(T*))) T*(NULL);
+  }
+
   Identifiers* NewLabels() {
-    return new (Space<N>::New(sizeof(Identifiers)))
+    void* place = static_cast<Factory*>(this)->New(sizeof(Identifiers));
+    return new (place)
         Identifiers(
             typename Identifiers::allocator_type(static_cast<Factory*>(this)));
   }
@@ -128,6 +133,10 @@ class BasicAstFactory : public Space<N> {
     return new (static_cast<Factory*>(this)) FunctionStatement(func);
   }
 
+  FunctionDeclaration* NewFunctionDeclaration(FunctionLiteral* func) {
+    return new (static_cast<Factory*>(this)) FunctionDeclaration(func);
+  }
+
   Block* NewBlock() {
     return new (static_cast<Factory*>(this)) Block(static_cast<Factory*>(this));
   }

data/ext/include/iv/ast-fwd.h

@@ -24,6 +24,7 @@ V(SwitchStatement)\
 V(ThrowStatement)\
 V(TryStatement)\
 V(LabelledStatement)\
+V(FunctionDeclaration)
 
 #define STATEMENT_NODE_LIST(V)\
 V(Statement)\
@@ -98,5 +99,6 @@ template<typename Factory>\
 class AST;
 AST_NODE_LIST(V)
 #undef V
+
 } } }  // namespace iv::core::ast
 #endif  // _IV_AST_FWD_H_

data/ext/include/iv/ast-info.h

@@ -0,0 +1,21 @@
+#ifndef _IV_AST_INFO_H_
+#define _IV_AST_INFO_H_
+#include "ast.h"
+#include "space.h"
+namespace iv {
+namespace core {
+namespace ast {
+template<typename Factory>
+struct AstInfo {
+#define V(AST) typedef typename AST<Factory> AST;
+  AST_NODE_LIST(V)
+#undef V
+#define V(X, XS) typedef typename SpaceVector<Factory, X *>::type XS;
+  AST_LIST_LIST(V)
+#undef V
+#define V(S) typedef typename SpaceUString<Factory>::type S;
+  AST_STRING(V)
+#undef V
+};
+} } }  // namespace iv::core::ast
+#endif  // _IV_AST_INFO_H_

data/ext/include/iv/ast-serializer.h

@@ -71,6 +71,12 @@ class AstSerializer: public AstVisitor<Factory>::const_type {
     Append('}');
   }
 
+  void Visit(const FunctionDeclaration* func) {
+    Append("{\"type\":\"function_declaration\",\"def\":");
+    func->function()->Accept(this);
+    Append('}');
+  }
+
   void Visit(const VariableStatement* var) {
     Append("{\"type\":");
     if (var->IsConst()) {

data/ext/include/iv/ast-visitor.h

@@ -39,6 +39,7 @@ class BasicAstVisitor
   virtual ~BasicAstVisitor() = 0;
   virtual void Visit(typename add<Block<Factory> >::type block) = 0;  //NOLINT
   virtual void Visit(typename add<FunctionStatement<Factory> >::type func) = 0;  //NOLINT
+  virtual void Visit(typename add<FunctionDeclaration<Factory> >::type func) = 0;  //NOLINT
   virtual void Visit(typename add<VariableStatement<Factory> >::type var) = 0;  //NOLINT
   virtual void Visit(typename add<EmptyStatement<Factory> >::type empty) = 0;  //NOLINT
   virtual void Visit(typename add<IfStatement<Factory> >::type ifstmt) = 0;  //NOLINT