did_you_mean 0.9.2 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1033d354e037bc0692601ada07f60c9498c33b3
-  data.tar.gz: 8085bc0924570971f292f56adeae61e81d12c1b4
+  metadata.gz: 17d1aa077937ae14999fe9cf7f30ad339b9d7ff0
+  data.tar.gz: f93090d72fbafed6291f073926a32c36930adcfb
 SHA512:
-  metadata.gz: a17c629b1736f6974693334a786cce0bde8cf1fb95ad93863c645998030dc0d8a5cc569c476b1f683643c1cf32bf8ff27132d94efe684389d9903a7688fe06ab
-  data.tar.gz: 7af66ef499e3d2e24bf65d3637d4218b0bc5dfb59e4f9bf77727d0a77fa8fc3ea1885d49dbf90e5c9bbdf3be6cd6ee1b918dab04a8777af722feb0b1f11cf871
+  metadata.gz: a73eb4adec3501a186751d7806190d763db5f96fc848ca990ef28a6c736309739090c40aff0914634d7f9448b99e77e45167a4e24cc338fd807ed98ec3a6bf54
+  data.tar.gz: f344c68e841947506a6ee465a7f8bc74f0ee7eaf4d749f438e5f57c38c50c5fa7191a995c4bc3afee02fd8680cfc86a5bdb93d7b98214e4ace701cf42a8c9805

data/CHANGELOG.md

@@ -1,3 +1,27 @@
+## [v0.9.4](https://github.com/yuki24/did_you_mean/tree/v0.9.4)
+
+_<sup>released on 2014-11-18 03:51:41 UTC</sup>_
+
+#### Bug Fixes
+
+- Fixed a bug where no suggestions will be made in JRuby
+
+## [v0.9.3](https://github.com/yuki24/did_you_mean/tree/v0.9.3)
+
+_<sup>released on 2014-11-18 03:19:24 UTC</sup>_
+
+#### Internal Changes
+
+- Replaced the crazy C extension with a so much better one (thanks to [@nobu](https://github.com/nobu)!)
+
+## [v0.9.2](https://github.com/yuki24/did_you_mean/tree/v0.9.2)
+
+_<sup>released on 2014-11-17 15:32:33 UTC</sup>_
+
+#### Bug Fixes
+
+- Fixed a bug where did\_you\_mean doesn't compile on Ruby 2.1.2/2.1.5 ( [#16](https://github.com/yuki24/did_you_mean/issues/16 "Gem building failed on Debian 6.0.10 x86\_64"))
+
 ## [v0.9.1](https://github.com/yuki24/did_you_mean/tree/v0.9.1)
 
 _<sup>released on 2014-11-16 18:54:24 UTC</sup>_

data/ext/did_you_mean/extconf.rb

@@ -1,26 +1,3 @@
 require 'mkmf'
-require_relative '../../lib/did_you_mean/version'
-
-version =
-  case RUBY_VERSION
-  when /1.9.3/, /2.0.0/, /2.1.[0-5]/, /2.2.\d/
-    RUBY_VERSION
-  else
-    message =
-      "\033[91m" "Unsupported Ruby version!" "\033[39m" "\n" \
-      "\n" \
-      "\033[32m" \
-      "  Sorry, did_you_mean #{DidYouMean::VERSION} doesn't work with Ruby #{RUBY_VERSION}.\n" \
-      "  If you've upgraded Ruby recently, try upgrading did_you_mean gem:\n" \
-      "\n" \
-      "\033[0m" \
-      "      $ bundle update did_you_mean\n" \
-      "\033[39m" \
-
-    raise RuntimeError.new(message)
-  end.tr(".", "")
-
-ruby_header_path = File.join(File.dirname(File.realpath(__FILE__)), "ruby_headers")
-$CFLAGS         += " -I#{ruby_header_path}/#{version}"
 
 create_makefile 'did_you_mean/method_missing'

data/ext/did_you_mean/method_missing.c

@@ -1,109 +1,20 @@
 #include <ruby.h>
-#include "internal.h"
-#include "vm_method.c"
 
-#ifndef UNREACHABLE
-# define UNREACHABLE /* unreachable */
-#endif
-
-static inline const rb_data_type_t *
-threadptr_data_type(void)
-{
-  static const rb_data_type_t *thread_data_type;
-  if (!thread_data_type) {
-    VALUE current_thread = rb_thread_current();
-    thread_data_type = RTYPEDDATA_TYPE(current_thread);
-  }
-  return thread_data_type;
-}
-
-#define ruby_thread_data_type *threadptr_data_type()
-#define ruby_threadptr_data_type *threadptr_data_type()
-
-#define ruby_current_thread ((rb_thread_t *)RTYPEDDATA_DATA(rb_thread_current()))
-
-NORETURN(static void raise_method_missing(rb_thread_t *th, int argc, const VALUE *argv,
-                                          VALUE obj, int call_status));
-
-static VALUE
-rb_method_missing(int argc, const VALUE *argv, VALUE obj)
-{
-  rb_thread_t *th;
-  GetThreadPtr(rb_thread_current(), th);
-  raise_method_missing(th, argc, argv, obj, th->method_missing_reason);
-  UNREACHABLE;
-}
-
-#define NOEX_MISSING   0x80
+static const rb_data_type_t *type;
 
 static VALUE
-make_no_method_exception(VALUE exc, const char *format, VALUE obj, int argc, const VALUE *argv)
-{
-  int n = 0;
-  VALUE mesg;
-  VALUE args[3];
-
-  if (!format) {
-    format = "undefined method `%s' for %s";
-  }
-  mesg = rb_const_get(exc, rb_intern("message"));
-  // if (rb_method_basic_definition_p(CLASS_OF(mesg), '!')) {
-  //   args[n++] = rb_name_err_mesg_new(mesg, rb_str_new2(format), obj, argv[0]);
-  // }
-  // else {
-       args[n++] = rb_funcall(mesg, '!', 3, rb_str_new2(format), obj, argv[0]);
-  // }
-
-  args[n++] = argv[0];
-  if (exc == rb_eNoMethodError) {
-    args[n++] = rb_ary_new4(argc - 1, argv + 1);
-    rb_ary_store(args[n - 1], 0, obj);
-  }
-  return rb_class_new_instance(n, args, exc);
-}
-
-static void
-raise_method_missing(rb_thread_t *th, int argc, const VALUE *argv, VALUE obj,
-                     int last_call_status)
+name_err_receiver(VALUE self)
 {
-  VALUE exc = rb_eNoMethodError;
-  const char *format = 0;
-
-  if (argc == 0 || !SYMBOL_P(argv[0])) {
-    rb_raise(rb_eArgError, "no id given");
-  }
-
-  ruby_stack_check();
-
-  if (last_call_status & NOEX_PRIVATE) {
-    format = "private method `%s' called for %s";
-  }
-  else if (last_call_status & NOEX_PROTECTED) {
-    format = "protected method `%s' called for %s";
-  }
-  else if (last_call_status & NOEX_VCALL) {
-    format = "undefined local variable or method `%s' for %s";
-    exc = rb_eNameError;
-  }
-  else if (last_call_status & NOEX_SUPER) {
-    format = "super: no superclass method `%s' for %s";
-  }
-
-  {
-    exc = make_no_method_exception(exc, format, obj, argc, argv);
-    if (!(last_call_status & NOEX_MISSING)) {
-      th->cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(th->cfp);
-    }
-    rb_exc_raise(exc);
-  }
+  VALUE *ptr, mesg = rb_attr_get(self, rb_intern("mesg"));
+  TypedData_Get_Struct(mesg, VALUE, type, ptr);
+  return ptr[1];
 }
 
 void
 Init_method_missing()
 {
-  VALUE defined_class;
-  rb_method_entry_t *me;
+  VALUE err_mesg = rb_funcall(rb_cNameErrorMesg, '!', 3, Qnil, Qnil, Qnil);
+  type = RTYPEDDATA(err_mesg)->type;
 
-  me = search_method(rb_cBasicObject, rb_intern("method_missing"), &defined_class);
-  me->def->body.cfunc.func = rb_method_missing;
+  rb_define_method(rb_eNameError, "receiver", name_err_receiver, 0);
 }

data/ext/did_you_mean/org/yukinishijima/ReceiverCapturer.java

@@ -51,8 +51,7 @@ public class ReceiverCapturer extends JavaMethodNBlock {
     private void appendReceiverToException(RaiseException exception, IRubyObject self) {
         if (exception.getException() instanceof RubyNoMethodError) {
             RubyNoMethodError noMethodError = (RubyNoMethodError) exception.getException();
-            RubyArray array = (RubyArray) noMethodError.args();
-            array.append(self);
+            noMethodError.setInstanceVariable("@receiver", self);
         }
     }
 }

data/lib/did_you_mean/finders/similar_method_finder.rb

@@ -4,7 +4,7 @@ module DidYouMean
     attr_reader :method_name, :receiver
 
     def initialize(exception)
-      @method_name, @receiver = exception.name, exception.args.first
+      @method_name, @receiver = exception.name, exception.receiver
     end
 
     def words
@@ -35,6 +35,7 @@ module DidYouMean
     when 'jruby'
       require 'did_you_mean/receiver_capturer'
       org.yukinishijima.ReceiverCapturer.setup(JRuby.runtime)
+      NoMethodError.send(:attr, :receiver)
     else
       finders.delete("NoMethodError")
     end

data/lib/did_you_mean/version.rb

@@ -1,3 +1,3 @@
 module DidYouMean
-  VERSION = "0.9.2"
+  VERSION = "0.9.4"
 end

data/test/no_method_error_extension_test.rb

@@ -9,6 +9,6 @@ class NoMethodErrorExtensionTest < Minitest::Test
   end
 
   def test_receiver
-    assert_same @receiver, @error.args.first
+    assert_same @receiver, @error.receiver
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: did_you_mean
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.4
 platform: ruby
 authors:
 - Yuki Nishijima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-17 00:00:00.000000000 Z
+date: 2014-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: interception
@@ -104,109 +104,6 @@ files:
 - ext/did_you_mean/extconf.rb
 - ext/did_you_mean/method_missing.c
 - ext/did_you_mean/org/yukinishijima/ReceiverCapturer.java
-- ext/did_you_mean/ruby_headers/193/debug.h
-- ext/did_you_mean/ruby_headers/193/id.h
-- ext/did_you_mean/ruby_headers/193/internal.h
-- ext/did_you_mean/ruby_headers/193/method.h
-- ext/did_you_mean/ruby_headers/193/node.h
-- ext/did_you_mean/ruby_headers/193/ruby_atomic.h
-- ext/did_you_mean/ruby_headers/193/thread_pthread.h
-- ext/did_you_mean/ruby_headers/193/thread_win32.h
-- ext/did_you_mean/ruby_headers/193/vm_core.h
-- ext/did_you_mean/ruby_headers/193/vm_opts.h
-- ext/did_you_mean/ruby_headers/200/id.h
-- ext/did_you_mean/ruby_headers/200/internal.h
-- ext/did_you_mean/ruby_headers/200/method.h
-- ext/did_you_mean/ruby_headers/200/node.h
-- ext/did_you_mean/ruby_headers/200/ruby_atomic.h
-- ext/did_you_mean/ruby_headers/200/thread_pthread.h
-- ext/did_you_mean/ruby_headers/200/thread_win32.h
-- ext/did_you_mean/ruby_headers/200/vm_core.h
-- ext/did_you_mean/ruby_headers/200/vm_debug.h
-- ext/did_you_mean/ruby_headers/200/vm_opts.h
-- ext/did_you_mean/ruby_headers/210/id.h
-- ext/did_you_mean/ruby_headers/210/internal.h
-- ext/did_you_mean/ruby_headers/210/method.h
-- ext/did_you_mean/ruby_headers/210/node.h
-- ext/did_you_mean/ruby_headers/210/ruby_atomic.h
-- ext/did_you_mean/ruby_headers/210/thread_native.h
-- ext/did_you_mean/ruby_headers/210/thread_pthread.h
-- ext/did_you_mean/ruby_headers/210/thread_win32.h
-- ext/did_you_mean/ruby_headers/210/vm_core.h
-- ext/did_you_mean/ruby_headers/210/vm_debug.h
-- ext/did_you_mean/ruby_headers/210/vm_opts.h
-- ext/did_you_mean/ruby_headers/211/id.h
-- ext/did_you_mean/ruby_headers/211/internal.h
-- ext/did_you_mean/ruby_headers/211/method.h
-- ext/did_you_mean/ruby_headers/211/node.h
-- ext/did_you_mean/ruby_headers/211/ruby_atomic.h
-- ext/did_you_mean/ruby_headers/211/thread_native.h
-- ext/did_you_mean/ruby_headers/211/thread_pthread.h
-- ext/did_you_mean/ruby_headers/211/thread_win32.h
-- ext/did_you_mean/ruby_headers/211/vm_core.h
-- ext/did_you_mean/ruby_headers/211/vm_debug.h
-- ext/did_you_mean/ruby_headers/211/vm_opts.h
-- ext/did_you_mean/ruby_headers/212/id.h
-- ext/did_you_mean/ruby_headers/212/internal.h
-- ext/did_you_mean/ruby_headers/212/method.h
-- ext/did_you_mean/ruby_headers/212/node.h
-- ext/did_you_mean/ruby_headers/212/ruby_atomic.h
-- ext/did_you_mean/ruby_headers/212/thread_native.h
-- ext/did_you_mean/ruby_headers/212/thread_pthread.h
-- ext/did_you_mean/ruby_headers/212/thread_win32.h
-- ext/did_you_mean/ruby_headers/212/vm_core.h
-- ext/did_you_mean/ruby_headers/212/vm_debug.h
-- ext/did_you_mean/ruby_headers/212/vm_opts.h
-- ext/did_you_mean/ruby_headers/213/id.h
-- ext/did_you_mean/ruby_headers/213/internal.h
-- ext/did_you_mean/ruby_headers/213/method.h
-- ext/did_you_mean/ruby_headers/213/node.h
-- ext/did_you_mean/ruby_headers/213/ruby_atomic.h
-- ext/did_you_mean/ruby_headers/213/thread_native.h
-- ext/did_you_mean/ruby_headers/213/thread_pthread.h
-- ext/did_you_mean/ruby_headers/213/thread_win32.h
-- ext/did_you_mean/ruby_headers/213/vm_core.h
-- ext/did_you_mean/ruby_headers/213/vm_debug.h
-- ext/did_you_mean/ruby_headers/213/vm_opts.h
-- ext/did_you_mean/ruby_headers/214/id.h
-- ext/did_you_mean/ruby_headers/214/internal.h
-- ext/did_you_mean/ruby_headers/214/method.h
-- ext/did_you_mean/ruby_headers/214/node.h
-- ext/did_you_mean/ruby_headers/214/ruby_atomic.h
-- ext/did_you_mean/ruby_headers/214/thread_native.h
-- ext/did_you_mean/ruby_headers/214/thread_pthread.h
-- ext/did_you_mean/ruby_headers/214/thread_win32.h
-- ext/did_you_mean/ruby_headers/214/vm_core.h
-- ext/did_you_mean/ruby_headers/214/vm_debug.h
-- ext/did_you_mean/ruby_headers/214/vm_opts.h
-- ext/did_you_mean/ruby_headers/215/id.h
-- ext/did_you_mean/ruby_headers/215/internal.h
-- ext/did_you_mean/ruby_headers/215/method.h
-- ext/did_you_mean/ruby_headers/215/node.h
-- ext/did_you_mean/ruby_headers/215/ruby_atomic.h
-- ext/did_you_mean/ruby_headers/215/thread_native.h
-- ext/did_you_mean/ruby_headers/215/thread_pthread.h
-- ext/did_you_mean/ruby_headers/215/thread_win32.h
-- ext/did_you_mean/ruby_headers/215/vm_core.h
-- ext/did_you_mean/ruby_headers/215/vm_debug.h
-- ext/did_you_mean/ruby_headers/215/vm_opts.h
-- ext/did_you_mean/ruby_headers/220/ccan/check_type/check_type.h
-- ext/did_you_mean/ruby_headers/220/ccan/container_of/container_of.h
-- ext/did_you_mean/ruby_headers/220/ccan/list/list.h
-- ext/did_you_mean/ruby_headers/220/ccan/str/str.h
-- ext/did_you_mean/ruby_headers/220/id.h
-- ext/did_you_mean/ruby_headers/220/internal.h
-- ext/did_you_mean/ruby_headers/220/method.h
-- ext/did_you_mean/ruby_headers/220/node.h
-- ext/did_you_mean/ruby_headers/220/ruby_atomic.h
-- ext/did_you_mean/ruby_headers/220/symbol.h
-- ext/did_you_mean/ruby_headers/220/thread_native.h
-- ext/did_you_mean/ruby_headers/220/thread_pthread.h
-- ext/did_you_mean/ruby_headers/220/thread_win32.h
-- ext/did_you_mean/ruby_headers/220/vm_core.h
-- ext/did_you_mean/ruby_headers/220/vm_debug.h
-- ext/did_you_mean/ruby_headers/220/vm_opts.h
-- ext/did_you_mean/vm_method.c
 - gemfiles/activerecord_30.gemfile
 - gemfiles/activerecord_31.gemfile
 - gemfiles/activerecord_32.gemfile

data/ext/did_you_mean/ruby_headers/193/debug.h

@@ -1,41 +0,0 @@
-/**********************************************************************
-
-  debug.h - YARV Debug function interface
-
-  $Author$
-  created at: 04/08/25 02:33:49 JST
-
-  Copyright (C) 2004-2007 Koichi Sasada
-
-**********************************************************************/
-
-#ifndef RUBY_DEBUG_H
-#define RUBY_DEBUG_H
-
-#include "ruby/ruby.h"
-#include "node.h"
-
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility push(default)
-#endif
-
-#define dpv(h,v) ruby_debug_print_value(-1, 0, (h), (v))
-#define dp(v)    ruby_debug_print_value(-1, 0, "", (v))
-#define dpi(i)   ruby_debug_print_id(-1, 0, "", (i))
-#define dpn(n)   ruby_debug_print_node(-1, 0, "", (n))
-
-#define bp()     ruby_debug_breakpoint()
-
-VALUE ruby_debug_print_value(int level, int debug_level, const char *header, VALUE v);
-ID    ruby_debug_print_id(int level, int debug_level, const char *header, ID id);
-NODE *ruby_debug_print_node(int level, int debug_level, const char *header, const NODE *node);
-int   ruby_debug_print_indent(int level, int debug_level, int indent_level);
-void  ruby_debug_breakpoint(void);
-void  ruby_debug_gc_check_func(void);
-void ruby_set_debug_option(const char *str);
-
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility pop
-#endif
-
-#endif /* RUBY_DEBUG_H */

data/ext/did_you_mean/ruby_headers/193/id.h

@@ -1,171 +0,0 @@
-/* DO NOT EDIT THIS FILE DIRECTLY */
-/**********************************************************************
-
-  id.h -
-
-  $Author$
-  created at: Sun Oct 19 21:12:51 2008
-
-  Copyright (C) 2007 Koichi Sasada
-
-**********************************************************************/
-
-#ifndef RUBY_ID_H
-#define RUBY_ID_H
-
-enum ruby_id_types {
-    RUBY_ID_LOCAL       = 0x00,
-    RUBY_ID_INSTANCE    = 0x01,
-    RUBY_ID_GLOBAL      = 0x03,
-    RUBY_ID_ATTRSET     = 0x04,
-    RUBY_ID_CONST       = 0x05,
-    RUBY_ID_CLASS       = 0x06,
-    RUBY_ID_JUNK        = 0x07,
-    RUBY_ID_INTERNAL    = RUBY_ID_JUNK,
-    RUBY_ID_SCOPE_SHIFT = 3,
-    RUBY_ID_SCOPE_MASK  = ~(~0U<<RUBY_ID_SCOPE_SHIFT)
-};
-
-#define ID_SCOPE_SHIFT RUBY_ID_SCOPE_SHIFT
-#define ID_SCOPE_MASK  RUBY_ID_SCOPE_MASK
-#define ID_LOCAL       RUBY_ID_LOCAL
-#define ID_INSTANCE    RUBY_ID_INSTANCE
-#define ID_GLOBAL      RUBY_ID_GLOBAL
-#define ID_ATTRSET     RUBY_ID_ATTRSET
-#define ID_CONST       RUBY_ID_CONST
-#define ID_CLASS       RUBY_ID_CLASS
-#define ID_JUNK        RUBY_ID_JUNK
-#define ID_INTERNAL    RUBY_ID_INTERNAL
-
-#define ID2ATTRSET(id) (((id)&~ID_SCOPE_MASK)|ID_ATTRSET)
-
-#define symIFUNC ID2SYM(idIFUNC)
-#define symCFUNC ID2SYM(idCFUNC)
-
-#define RUBY_TOKEN_DOT2 128
-#define RUBY_TOKEN_DOT3 129
-#define RUBY_TOKEN_UPLUS 130
-#define RUBY_TOKEN_UMINUS 131
-#define RUBY_TOKEN_POW 132
-#define RUBY_TOKEN_DSTAR 133
-#define RUBY_TOKEN_CMP 134
-#define RUBY_TOKEN_LSHFT 135
-#define RUBY_TOKEN_RSHFT 136
-#define RUBY_TOKEN_LEQ 137
-#define RUBY_TOKEN_GEQ 138
-#define RUBY_TOKEN_EQ 139
-#define RUBY_TOKEN_EQQ 140
-#define RUBY_TOKEN_NEQ 141
-#define RUBY_TOKEN_MATCH 142
-#define RUBY_TOKEN_NMATCH 143
-#define RUBY_TOKEN_AREF 144
-#define RUBY_TOKEN_ASET 145
-#define RUBY_TOKEN_COLON2 146
-#define RUBY_TOKEN_COLON3 147
-#define RUBY_TOKEN(t) RUBY_TOKEN_##t
-
-enum ruby_method_ids {
-    idDot2 = RUBY_TOKEN(DOT2),
-    idDot3 = RUBY_TOKEN(DOT3),
-    idUPlus = RUBY_TOKEN(UPLUS),
-    idUMinus = RUBY_TOKEN(UMINUS),
-    idPow = RUBY_TOKEN(POW),
-    idCmp = RUBY_TOKEN(CMP),
-    idPLUS = '+',
-    idMINUS = '-',
-    idMULT = '*',
-    idDIV = '/',
-    idMOD = '%',
-    idLT = '<',
-    idLTLT = RUBY_TOKEN(LSHFT),
-    idLE = RUBY_TOKEN(LEQ),
-    idGT = '>',
-    idGE = RUBY_TOKEN(GEQ),
-    idEq = RUBY_TOKEN(EQ),
-    idEqq = RUBY_TOKEN(EQQ),
-    idNeq = RUBY_TOKEN(NEQ),
-    idNot = '!',
-    idBackquote = '`',
-    idEqTilde = RUBY_TOKEN(MATCH),
-    idNeqTilde = RUBY_TOKEN(NMATCH),
-    idAREF = RUBY_TOKEN(AREF),
-    idASET = RUBY_TOKEN(ASET),
-    tPRESERVED_ID_BEGIN = 147,
-    idNULL,
-    idEmptyP,
-    idEqlP,
-    idRespond_to,
-    idRespond_to_missing,
-    idIFUNC,
-    idCFUNC,
-    id_core_set_method_alias,
-    id_core_set_variable_alias,
-    id_core_undef_method,
-    id_core_define_method,
-    id_core_define_singleton_method,
-    id_core_set_postexe,
-    id_core_hash_from_ary,
-    id_core_hash_merge_ary,
-    id_core_hash_merge_ptr,
-    id_core_hash_merge_kwd,
-    tPRESERVED_ID_END,
-    tFreeze,
-    tInspect,
-    tIntern,
-    tObject_id,
-    tConst_missing,
-    tMethodMissing,
-    tMethod_added,
-    tSingleton_method_added,
-    tMethod_removed,
-    tSingleton_method_removed,
-    tMethod_undefined,
-    tSingleton_method_undefined,
-    tLength,
-    tSize,
-    tGets,
-    tSucc,
-    tEach,
-    tProc,
-    tLambda,
-    tSend,
-    t__send__,
-    t__attached__,
-    tInitialize,
-    tInitialize_copy,
-    tInitialize_clone,
-    tInitialize_dup,
-    tUScore,
-#define TOKEN2LOCALID(n) id##n = ((t##n<<ID_SCOPE_SHIFT)|ID_LOCAL)
-    TOKEN2LOCALID(Freeze),
-    TOKEN2LOCALID(Inspect),
-    TOKEN2LOCALID(Intern),
-    TOKEN2LOCALID(Object_id),
-    TOKEN2LOCALID(Const_missing),
-    TOKEN2LOCALID(MethodMissing),
-    TOKEN2LOCALID(Method_added),
-    TOKEN2LOCALID(Singleton_method_added),
-    TOKEN2LOCALID(Method_removed),
-    TOKEN2LOCALID(Singleton_method_removed),
-    TOKEN2LOCALID(Method_undefined),
-    TOKEN2LOCALID(Singleton_method_undefined),
-    TOKEN2LOCALID(Length),
-    TOKEN2LOCALID(Size),
-    TOKEN2LOCALID(Gets),
-    TOKEN2LOCALID(Succ),
-    TOKEN2LOCALID(Each),
-    TOKEN2LOCALID(Proc),
-    TOKEN2LOCALID(Lambda),
-    TOKEN2LOCALID(Send),
-    TOKEN2LOCALID(__send__),
-    TOKEN2LOCALID(__attached__),
-    TOKEN2LOCALID(Initialize),
-    TOKEN2LOCALID(Initialize_copy),
-    TOKEN2LOCALID(Initialize_clone),
-    TOKEN2LOCALID(Initialize_dup),
-    TOKEN2LOCALID(UScore),
-    tLAST_OP_ID = tPRESERVED_ID_END-1,
-    idLAST_OP_ID = tLAST_OP_ID >> ID_SCOPE_SHIFT
-};
-
-#endif /* RUBY_ID_H */