iv-phonic 0.0.1 → 0.0.2

data/ext/iv/phonic/creator.h

@@ -512,14 +512,6 @@ class Creator : public iv::core::ast::AstVisitor<AstFactory>::const_type {
     ret_ = hash;
   }
 
-  void Visit(const Declaration* decl) {
-    UNREACHABLE();
-  }
-
-  void Visit(const CaseClause* clause) {
-    UNREACHABLE();
-  }
-
  private:
   VALUE ret_;
 };

data/ext/iv/phonic/factory.h

@@ -23,18 +23,9 @@ class AstFactory : public core::Space<2> {
       false_instance_(new(this)FalseLiteral()) {
   }
 
-  Identifier* NewIdentifier(const core::UStringPiece& buffer) {
-    Identifier* ident = new (this) Identifier(buffer, this);
-    return ident;
-  }
-
-  Identifier* NewIdentifier(const std::vector<uc16>& buffer) {
-    Identifier* ident = new (this) Identifier(buffer, this);
-    return ident;
-  }
-
-  Identifier* NewIdentifier(const std::vector<char>& buffer) {
-    Identifier* ident = new (this) Identifier(buffer, this);
+  template<typename Range>
+  Identifier* NewIdentifier(const Range& range) {
+    Identifier* ident = new(this)Identifier(range, this);
     return ident;
   }
 
@@ -57,8 +48,10 @@ class AstFactory : public core::Space<2> {
 //    // TODO(Constellation) Little Endian?
 //    int r = onig_new(&reg,
 //                     reinterpret_cast<const OnigUChar*>(content.data()),
-//                     reinterpret_cast<const OnigUChar*>(content.data()+content.size()),
-//                     ONIG_OPTION_DEFAULT, rb_enc_get(Encoding::UTF16LEEncoding()),
+//                     reinterpret_cast<const OnigUChar*>(
+//                         content.data()+content.size()),
+//                     ONIG_OPTION_DEFAULT,
+//                     rb_enc_get(Encoding::UTF16LEEncoding()),
 //                     ONIG_SYNTAX_DEFAULT, &einfo);
 //    if (r != ONIG_NORMAL) {
 //      return NULL;
@@ -128,36 +121,50 @@ class AstFactory : public core::Space<2> {
     return new (this) Declaration(name, expr);
   }
 
-  IfStatement* NewIfStatement(Expression* cond, Statement* then) {
-    return new (this) IfStatement(cond, then);
+  IfStatement* NewIfStatement(Expression* cond,
+                              Statement* then_statement,
+                              Statement* else_statement) {
+    return new (this) IfStatement(cond,
+                                  then_statement,
+                                  else_statement);
   }
 
-  DoWhileStatement* NewDoWhileStatement() {
-    return new (this) DoWhileStatement();
+  DoWhileStatement* NewDoWhileStatement(Statement* body,
+                                        Expression* cond) {
+    return new (this) DoWhileStatement(body, cond);
   }
 
-  WhileStatement* NewWhileStatement(Expression* expr) {
-    return new (this) WhileStatement(expr);
+  WhileStatement* NewWhileStatement(Statement* body,
+                                    Expression* cond) {
+    return new (this) WhileStatement(body, cond);
   }
 
-  ForInStatement* NewForInStatement(Statement* each, Expression* enumerable) {
-    return new (this) ForInStatement(each, enumerable);
+  ForInStatement* NewForInStatement(Statement* body,
+                                    Statement* each,
+                                    Expression* enumerable) {
+    return new (this) ForInStatement(body, each, enumerable);
   }
 
   ExpressionStatement* NewExpressionStatement(Expression* expr) {
     return new (this) ExpressionStatement(expr);
   }
 
-  ForStatement* NewForStatement() {
-    return new (this) ForStatement();
+  ForStatement* NewForStatement(Statement* body,
+                                Statement* init,
+                                Expression* cond,
+                                Statement* next) {
+    return new (this) ForStatement(body, init, cond, next);
   }
 
-  ContinueStatement* NewContinueStatement() {
-    return new (this) ContinueStatement();
+
+  ContinueStatement* NewContinueStatement(Identifier* label,
+                                          IterationStatement** target) {
+    return new (this) ContinueStatement(label, target);
   }
 
-  BreakStatement* NewBreakStatement() {
-    return new (this) BreakStatement();
+  BreakStatement* NewBreakStatement(Identifier* label,
+                                    BreakableStatement** target) {
+    return new (this) BreakStatement(label, target);
   }
 
   ReturnStatement* NewReturnStatement(Expression* expr) {
@@ -172,16 +179,22 @@ class AstFactory : public core::Space<2> {
     return new (this) SwitchStatement(expr, this);
   }
 
-  CaseClause* NewCaseClause() {
-    return new (this) CaseClause(this);
+  CaseClause* NewCaseClause(bool is_default, Expression* expr) {
+    return new (this) CaseClause(is_default, expr, this);
   }
 
   ThrowStatement*  NewThrowStatement(Expression* expr) {
     return new (this) ThrowStatement(expr);
   }
 
-  TryStatement* NewTryStatement(Block* block) {
-    return new (this) TryStatement(block);
+  TryStatement* NewTryStatement(Block* try_block,
+                                Identifier* catch_name,
+                                Block* catch_block,
+                                Block* finally_block) {
+    return new (this) TryStatement(try_block,
+                                   catch_name,
+                                   catch_block,
+                                   finally_block);
   }
 
   LabelledStatement* NewLabelledStatement(Expression* expr, Statement* stmt) {

data/ext/iv/phonic/phonic.cc

@@ -14,54 +14,7 @@ void Init_phonic() {
   VALUE mIVPhonic = rb_define_module_under(mIV, "Phonic");
   rb_define_module_function(mIVPhonic, "parse",
                             RBFUNC(&iv::phonic::RParser::Parse), 1);
-
   iv::phonic::RParser::Init(mIVPhonic);
-
-  VALUE cNode = rb_define_class_under(mIVPhonic, "Node", rb_cObject);
-  VALUE cExpr = rb_define_class_under(mIVPhonic, "Expression", cNode);
-  VALUE cStmt = rb_define_class_under(mIVPhonic, "Statement", cNode);
-
-  // Expressions
-  rb_define_class_under(mIVPhonic, "Identifier", cExpr);
-  rb_define_class_under(mIVPhonic, "StringLiteral", cExpr);
-  rb_define_class_under(mIVPhonic, "NumberLiteral", cExpr);
-  rb_define_class_under(mIVPhonic, "RegExpLiteral", cExpr);
-  rb_define_class_under(mIVPhonic, "FunctionLiteral", cExpr);
-  rb_define_class_under(mIVPhonic, "ArrayLiteral", cExpr);
-  rb_define_class_under(mIVPhonic, "ObjectLiteral", cExpr);
-  rb_define_class_under(mIVPhonic, "NullLiteral", cExpr);
-  rb_define_class_under(mIVPhonic, "ThisLiteral", cExpr);
-  rb_define_class_under(mIVPhonic, "Undefined", cExpr);
-  rb_define_class_under(mIVPhonic, "TrueLiteral", cExpr);
-  rb_define_class_under(mIVPhonic, "FalseLiteral", cExpr);
-  rb_define_class_under(mIVPhonic, "ConditionalExpression", cExpr);
-  rb_define_class_under(mIVPhonic, "PostfixExpression", cExpr);
-  rb_define_class_under(mIVPhonic, "BinaryOperation", cExpr);
-  rb_define_class_under(mIVPhonic, "UnaryOperation", cExpr);
-  rb_define_class_under(mIVPhonic, "Assignment", cExpr);
-  rb_define_class_under(mIVPhonic, "FunctionCall", cExpr);
-  rb_define_class_under(mIVPhonic, "ConstructorCall", cExpr);
-  rb_define_class_under(mIVPhonic, "IndexAccess", cExpr);
-  rb_define_class_under(mIVPhonic, "IdentifierAccess", cExpr);
-
-  // Statements
-  rb_define_class_under(mIVPhonic, "Block", cStmt);
-  rb_define_class_under(mIVPhonic, "VariableStatement", cStmt);
-  rb_define_class_under(mIVPhonic, "IfStatement", cStmt);
-  rb_define_class_under(mIVPhonic, "DoWhileStatement", cStmt);
-  rb_define_class_under(mIVPhonic, "WhileStatement", cStmt);
-  rb_define_class_under(mIVPhonic, "ForInStatement", cStmt);
-  rb_define_class_under(mIVPhonic, "ForStatement", cStmt);
-  rb_define_class_under(mIVPhonic, "ExpressionStatement", cStmt);
-  rb_define_class_under(mIVPhonic, "ContinueStatement", cStmt);
-  rb_define_class_under(mIVPhonic, "ReturnStatement", cStmt);
-  rb_define_class_under(mIVPhonic, "BreakStatement", cStmt);
-  rb_define_class_under(mIVPhonic, "WithStatement", cStmt);
-  rb_define_class_under(mIVPhonic, "SwitchStatement", cStmt);
-  rb_define_class_under(mIVPhonic, "ThrowStatement", cStmt);
-  rb_define_class_under(mIVPhonic, "TryStatement", cStmt);
-  rb_define_class_under(mIVPhonic, "LabelledStatement", cStmt);
-  rb_define_class_under(mIVPhonic, "DebuggerStatement", cStmt);
 }
 
 }

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Constellation
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-07 00:00:00 +09:00
+date: 2010-11-10 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency