iv-phonic 0.0.6 → 0.0.7

data/Manifest.txt

@@ -3,45 +3,45 @@ Manifest.txt
 README.rdoc
 Rakefile
 test/test_iv_phonic.rb
+ext/include/iv/ast_factory.h
+ext/include/iv/uchar.h
+ext/include/iv/space.h
+ext/include/iv/lexer.h
+ext/include/iv/conversions.h
+ext/include/iv/dtoa.h
 ext/include/iv/mt19937.h
-ext/include/iv/token.h
-ext/include/iv/any.h
-ext/include/iv/ast-fwd.h
-ext/include/iv/static_assert.h
 ext/include/iv/ast.h
-ext/include/iv/dtoa.h
-ext/include/iv/ast-visitor.h
-ext/include/iv/ustringpiece.h
-ext/include/iv/ucdata.h
-ext/include/iv/ustring.h
 ext/include/iv/noncopyable.h
-ext/include/iv/keyword.h
-ext/include/iv/chars.h
+ext/include/iv/stringpiece.h
+ext/include/iv/static_assert.h
+ext/include/iv/functor.h
+ext/include/iv/ast_fwd.h
+ext/include/iv/parser.h
+ext/include/iv/errors.h
+ext/include/iv/token.h
 ext/include/iv/enable_if.h
-ext/include/iv/utils.h
-ext/include/iv/conversions.h
-ext/include/iv/location.h
-ext/include/iv/lexer.h
+ext/include/iv/any.h
+ext/include/iv/keyword.h
+ext/include/iv/cmdline.h
 ext/include/iv/xorshift.h
-ext/include/iv/space.h
+ext/include/iv/location.h
+ext/include/iv/ast_info.h
+ext/include/iv/none.h
 ext/include/iv/algorithm.h
-ext/include/iv/fixedcontainer.h
-ext/include/iv/functor.h
-ext/include/iv/cmdline.h
-ext/include/iv/ast-serializer.h
-ext/include/iv/stringpiece.h
-ext/include/iv/uchar.h
-ext/include/iv/ast-factory.h
+ext/include/iv/ustring.h
+ext/include/iv/ast_serializer.h
+ext/include/iv/utils.h
+ext/include/iv/ast_visitor.h
 ext/include/iv/alloc.h
-ext/include/iv/ast-info.h
-ext/include/iv/parser.h
-ext/include/iv/none.h
-ext/include/iv/errors.h
-ext/iv/phonic/ast-fwd.h
+ext/include/iv/chars.h
+ext/include/iv/fixedcontainer.h
+ext/include/iv/ustringpiece.h
+ext/include/iv/ucdata.h
+ext/iv/phonic/factory.h
+ext/iv/phonic/ast_fwd.h
+ext/iv/phonic/parser.h
+ext/iv/phonic/encoding.h
 ext/iv/phonic/source.h
-ext/iv/phonic/creator.h
 ext/iv/phonic/phonic.cc
-ext/iv/phonic/extconf.rb
-ext/iv/phonic/encoding.h
-ext/iv/phonic/parser.h
-ext/iv/phonic/factory.h
+ext/iv/phonic/creator.h
+ext/iv/phonic/extconf.rb

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.6'
+  self.version = '0.0.7'
   self.readme_file = 'README.rdoc'
   self.history_file = 'ChangeLog'
   self.extra_rdoc_files = FileList['*.rdoc']

data/ext/include/iv/ast.h

@@ -10,8 +10,8 @@
 #include "space.h"
 #include "functor.h"
 #include "token.h"
-#include "ast-fwd.h"
-#include "ast-visitor.h"
+#include "ast_fwd.h"
+#include "ast_visitor.h"
 #include "location.h"
 #include "static_assert.h"
 #include "ustringpiece.h"

data/ext/include/iv/{ast-serializer.h → ast_serializer.h}

@@ -6,7 +6,7 @@
 #include <tr1/tuple>
 #include "uchar.h"
 #include "ast.h"
-#include "ast-visitor.h"
+#include "ast_visitor.h"
 #include "ustring.h"
 #include "stringpiece.h"
 #include "ustringpiece.h"

data/ext/include/iv/{ast-visitor.h → ast_visitor.h}

@@ -2,7 +2,7 @@
 #define _IV_AST_VISITOR_H_
 #include <tr1/type_traits>
 #include "noncopyable.h"
-#include "ast-fwd.h"
+#include "ast_fwd.h"
 
 namespace iv {
 namespace core {

data/ext/include/iv/conversions.h

@@ -252,7 +252,7 @@ inline double StringToDouble(Iter it, Iter last, bool parse_float) {
       return (parse_float && !is_found_zero) ? Conversions::kNaN : 0;
     } else {
       buffer[pos++] = '\0';
-      return std::strtod(buffer.data(), NULL);
+      return std::atof(buffer.data());
     }
   } else {
     return Conversions::kNaN;
@@ -421,13 +421,20 @@ inline double DoubleToInteger(double d) {
   return std::floor(std::abs(d)) * (std::signbit(d) ? -1 : 1);
 }
 
-inline bool ConvertToUInt32(const UStringPiece& str, uint32_t* value) {
+template<typename Iter>
+inline bool ConvertToUInt32(Iter it, const Iter last, uint32_t* value) {
   static const uint32_t uint32_t_max = std::numeric_limits<uint32_t>::max();
   uint16_t ch;
   *value = 0;
-  UStringPiece::const_iterator it = str.begin();
-  const UStringPiece::const_iterator last = str.end();
-  if (it != last && *it != '0' && Chars::IsDecimalDigit(*it)) {
+  if (it != last && *it == '0') {
+    if (it + 1 != last) {
+      return false;
+    } else {
+      *value = 0;
+      return true;
+    }
+  }
+  if (it != last && Chars::IsDecimalDigit(*it)) {
     ch = *it - '0';
     *value = ch;
   } else {
@@ -449,6 +456,14 @@ inline bool ConvertToUInt32(const UStringPiece& str, uint32_t* value) {
            (ch < (uint32_t_max % 10))));
 }
 
+inline bool ConvertToUInt32(const UStringPiece& str, uint32_t* value) {
+  return ConvertToUInt32(str.begin(), str.end(), value);
+}
+
+inline bool ConvertToUInt32(const StringPiece& str, uint32_t* value) {
+  return ConvertToUInt32(str.begin(), str.end(), value);
+}
+
 template<typename T>
 inline std::size_t DoubleToStringWithRadix(double v, int radix, T* buf) {
   static const int kMaxBufSize = 1100;

data/ext/include/iv/lexer.h

@@ -801,7 +801,7 @@ class Lexer: private Noncopyable<Lexer<Source> >::type {
       }
       numeric_ = val;
     } else {
-      numeric_ = std::strtod(buffer8_.c_str(), NULL);
+      numeric_ = std::atof(buffer8_.c_str());
     }
     type_ = type;
     return Token::NUMBER;

data/ext/include/iv/parser.h

@@ -8,7 +8,7 @@
 #include <tr1/type_traits>
 #include "static_assert.h"
 #include "ast.h"
-#include "ast-factory.h"
+#include "ast_factory.h"
 #include "lexer.h"
 #include "noncopyable.h"
 #include "utils.h"

data/ext/include/iv/space.h

@@ -92,19 +92,18 @@ class SpaceAllocator {
     return *this;
   }
 
-  Factory* space() const {
+  inline Factory* space() const {
     return space_;
   }
 
- protected:
+ private:
   void Swap(this_type& rhs) {
     using std::swap;
     swap(space_, rhs.space_);
   }
-  Factory* space_;
-
- private:
   void operator=(const SpaceAllocator&);
+
+  Factory* space_;
 };
 
 template <typename Factory, typename T>

data/ext/include/iv/stringpiece.h

@@ -97,7 +97,7 @@ class BasicStringPiece {
     if (!empty()) {
       target->assign(data(), size());
     } else {
-      target->assign(NULL, 0);
+      target->assign(0UL, static_cast<CharT>('\0'));
     }
   }
 

data/ext/iv/phonic/creator.h

@@ -3,7 +3,7 @@
 extern "C" {
 #include <ruby.h>
 }
-#include <iv/ast-visitor.h>
+#include <iv/ast_visitor.h>
 #include <iv/utils.h>
 #include "factory.h"
 #include "encoding.h"

data/ext/iv/phonic/factory.h

@@ -8,7 +8,7 @@ extern "C" {
 #include <iv/alloc.h>
 #include <iv/ustringpiece.h>
 #include "encoding.h"
-#include "ast-fwd.h"
+#include "ast_fwd.h"
 namespace iv {
 namespace phonic {
 

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: iv-phonic
 version: !ruby/object:Gem::Version 
-  hash: 19
   prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Constellation
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-02 00:00:00 +09:00
+date: 2010-12-11 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 2
         - 0
@@ -42,7 +40,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -56,12 +53,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 2
-        - 7
-        - 0
-        version: 2.7.0
+        - 6
+        - 2
+        version: 2.6.2
   type: :development
   version_requirements: *id003
 description: phonic is ruby binding for iv AST API
@@ -80,48 +76,48 @@ files:
 - README.rdoc
 - Rakefile
 - test/test_iv_phonic.rb
+- ext/include/iv/ast_factory.h
+- ext/include/iv/uchar.h
+- ext/include/iv/space.h
+- ext/include/iv/lexer.h
+- ext/include/iv/conversions.h
+- ext/include/iv/dtoa.h
 - ext/include/iv/mt19937.h
-- ext/include/iv/token.h
-- ext/include/iv/any.h
-- ext/include/iv/ast-fwd.h
-- ext/include/iv/static_assert.h
 - ext/include/iv/ast.h
-- ext/include/iv/dtoa.h
-- ext/include/iv/ast-visitor.h
-- ext/include/iv/ustringpiece.h
-- ext/include/iv/ucdata.h
-- ext/include/iv/ustring.h
 - ext/include/iv/noncopyable.h
-- ext/include/iv/keyword.h
-- ext/include/iv/chars.h
+- ext/include/iv/stringpiece.h
+- ext/include/iv/static_assert.h
+- ext/include/iv/functor.h
+- ext/include/iv/ast_fwd.h
+- ext/include/iv/parser.h
+- ext/include/iv/errors.h
+- ext/include/iv/token.h
 - ext/include/iv/enable_if.h
-- ext/include/iv/utils.h
-- ext/include/iv/conversions.h
-- ext/include/iv/location.h
-- ext/include/iv/lexer.h
+- ext/include/iv/any.h
+- ext/include/iv/keyword.h
+- ext/include/iv/cmdline.h
 - ext/include/iv/xorshift.h
-- ext/include/iv/space.h
+- ext/include/iv/location.h
+- ext/include/iv/ast_info.h
+- ext/include/iv/none.h
 - ext/include/iv/algorithm.h
-- ext/include/iv/fixedcontainer.h
-- ext/include/iv/functor.h
-- ext/include/iv/cmdline.h
-- ext/include/iv/ast-serializer.h
-- ext/include/iv/stringpiece.h
-- ext/include/iv/uchar.h
-- ext/include/iv/ast-factory.h
+- ext/include/iv/ustring.h
+- ext/include/iv/ast_serializer.h
+- ext/include/iv/utils.h
+- ext/include/iv/ast_visitor.h
 - ext/include/iv/alloc.h
-- ext/include/iv/ast-info.h
-- ext/include/iv/parser.h
-- ext/include/iv/none.h
-- ext/include/iv/errors.h
-- ext/iv/phonic/ast-fwd.h
+- ext/include/iv/chars.h
+- ext/include/iv/fixedcontainer.h
+- ext/include/iv/ustringpiece.h
+- ext/include/iv/ucdata.h
+- ext/iv/phonic/factory.h
+- ext/iv/phonic/ast_fwd.h
+- ext/iv/phonic/parser.h
+- ext/iv/phonic/encoding.h
 - ext/iv/phonic/source.h
-- ext/iv/phonic/creator.h
 - ext/iv/phonic/phonic.cc
+- ext/iv/phonic/creator.h
 - ext/iv/phonic/extconf.rb
-- ext/iv/phonic/encoding.h
-- ext/iv/phonic/parser.h
-- ext/iv/phonic/factory.h
 has_rdoc: true
 homepage: https://github.com/Constellation/iv/tree/master/src/phonic/
 licenses: []
@@ -137,7 +133,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 49
       segments: 
       - 1
       - 9
@@ -148,7 +143,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"