merge revision(s) r42988: [Backport #8928]

	* parse.y (intern_str): sigil only names are junk, at least one
	  identifier character is needed.  [ruby-dev:47723] [Bug #8928]

	* parse.y (rb_enc_symname_type): fix out of bound access.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44845 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 34 insertions, 0 deletions

diff --git a/ext/-test-/symbol/type.c b/ext/-test-/symbol/type.c
new file mode 100644
index 0000000000..37406d3853
--- /dev/null
+++ b/ext/-test-/symbol/type.c
@@ -0,0 +1,34 @@
+#include "ruby.h"
+
+#ifdef HAVE_RB_IS_CONST_NAME
+# define get_symbol_type(type, t, name) do { \
+	ID id = rb_check_id(&name); \
+	t = (id ? rb_is_##type##_id(id) : rb_is_##type##_name(name)); \
+    } while (0)
+#else
+# define get_symbol_type(type, t, name) do { \
+	t = rb_is_##type##_id(rb_to_id(name)); \
+    } while (0)
+#endif
+
+#define define_symbol_type_p(type) \
+static VALUE \
+bug_sym_##type##_p(VALUE self, VALUE name) \
+{ \
+    int t; \
+    get_symbol_type(type, t, name); \
+    return (t ? Qtrue : Qfalse); \
+}
+
+#define declare_symbol_type_p(type) \
+    rb_define_singleton_method(klass, #type"?", bug_sym_##type##_p, 1);
+
+#define FOREACH_ID_TYPES(x) x(const) x(class) x(global) x(instance) x(attrset) x(local) x(junk)
+
+FOREACH_ID_TYPES(define_symbol_type_p)
+
+void
+Init_type(VALUE klass)
+{
+    FOREACH_ID_TYPES(declare_symbol_type_p)
+}