From d821d9acfa503dd5c301f1ccfaa26aea1d8aa4f4 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 17 Oct 2008 11:56:11 +0000 Subject: * id.h: reverted. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19823 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 -- common.mk | 8 ++- id.h | 152 +++++++++++++++++++++++++++++++++++++++++++++++++++++ template/id.h.tmpl | 115 ---------------------------------------- 4 files changed, 155 insertions(+), 124 deletions(-) create mode 100644 id.h delete mode 100644 template/id.h.tmpl diff --git a/ChangeLog b/ChangeLog index 384ffd3c3..b6a827d59 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,14 +1,10 @@ Fri Oct 17 19:46:20 2008 Nobuyoshi Nakada - * common.mk (ID_H_TARGET): phony target to update id.h. - * tool/ifchange, win32/ifchange.bat: --timestamp option added. * tool/generic_erb.rb: --timestamp, --output and --if-change options added. - * template/id.h.tmpl: moved from id.h. - Fri Oct 17 18:33:12 2008 Yuki Sonoda (Yugui) * array.c (ary_resize_capa): renamed RESIZE_CAPA. diff --git a/common.mk b/common.mk index fa9d62b0b..773c3f34d 100644 --- a/common.mk +++ b/common.mk @@ -645,11 +645,9 @@ transdb.h: $(PREP) srcs-enc $(MINIRUBY) $(srcdir)/enc/trans/make_transdb.rb $@.new $(srcdir)/enc/trans enc/trans $(IFCHANGE) "$@" "$@.new" -{$(VPATH)}id.h: - $(CPP) $(CPPFLAGS) -DUSE_PARSE_H $@ - -$(ID_H_TARGET): {$(VPATH)}parse.c $(srcdir)/tool/generic_erb.rb $(srcdir)/template/id.h.tmpl - $(BASERUBY) $(srcdir)/tool/generic_erb.rb --if-change --output=$(srcdir)/id.h $(srcdir)/template/id.h.tmpl --vpath=$(VPATH) parse.c +# {$(VPATH)}id.h: {$(VPATH)}parse.h $(srcdir)/tool/generic_erb.rb $(srcdir)/template/id.h.tmpl +# $(BASERUBY) $(srcdir)/tool/generic_erb.rb --if-change --output=$@ \ +# $(srcdir)/template/id.h.tmpl --vpath=$(VPATH) parse.h known_errors.inc: $(srcdir)/template/known_errors.inc.tmpl $(srcdir)/defs/known_errors.def $(BASERUBY) $(srcdir)/tool/generic_erb.rb $(srcdir)/template/known_errors.inc.tmpl $(srcdir)/defs/known_errors.def > $@ diff --git a/id.h b/id.h new file mode 100644 index 000000000..576ab8cf6 --- /dev/null +++ b/id.h @@ -0,0 +1,152 @@ +/********************************************************************** + + id.h - + + $Author: ko1 $ + created at: Thu Jul 12 04:38:07 2007 + + Copyright (C) 2007 Koichi Sasada + +**********************************************************************/ + +#ifndef RUBY_ID_H +#define RUBY_ID_H + +#define ID_SCOPE_SHIFT 3 +#define ID_SCOPE_MASK 0x07 +#define ID_LOCAL 0x00 +#define ID_INSTANCE 0x01 +#define ID_GLOBAL 0x03 +#define ID_ATTRSET 0x04 +#define ID_CONST 0x05 +#define ID_CLASS 0x06 +#define ID_JUNK 0x07 +#define ID_INTERNAL ID_JUNK + +#ifdef USE_PARSE_H +#include "parse.h" +#endif + +#define symIFUNC ID2SYM(idIFUNC) +#define symCFUNC ID2SYM(idCFUNC) + +enum ruby_method_ids { +#ifndef tLAST_TOKEN + tUPLUS = 321, + tUMINUS = 322, + tPOW = 323, + tCMP = 324, + tEQ = 325, + tEQQ = 326, + tNEQ = 327, + tGEQ = 328, + tLEQ = 329, + tANDOP = 330, + tOROP = 331, + tMATCH = 332, + tNMATCH = 333, + tDOT2 = 334, + tDOT3 = 335, + tAREF = 336, + tASET = 337, + tLSHFT = 338, + tRSHFT = 339, + tLAMBDA = 352, + idNULL = 365, + idRespond_to = 366, + idIFUNC = 367, + idCFUNC = 368, + idThrowState = 369, + id_core_set_method_alias = 370, + id_core_set_variable_alias = 371, + id_core_undef_method = 372, + id_core_define_method = 373, + id_core_define_singleton_method = 374, + id_core_set_postexe = 375, + tLAST_TOKEN = 376, +#elif tUPLUS != 321 || \ + tUMINUS != 322 || \ + tPOW != 323 || \ + tCMP != 324 || \ + tEQ != 325 || \ + tEQQ != 326 || \ + tNEQ != 327 || \ + tGEQ != 328 || \ + tLEQ != 329 || \ + tANDOP != 330 || \ + tOROP != 331 || \ + tMATCH != 332 || \ + tNMATCH != 333 || \ + tDOT2 != 334 || \ + tDOT3 != 335 || \ + tAREF != 336 || \ + tASET != 337 || \ + tLSHFT != 338 || \ + tRSHFT != 339 || \ + tLAMBDA != 352 || \ + idNULL != 365 || \ + idRespond_to != 366 || \ + idIFUNC != 367 || \ + idCFUNC != 368 || \ + idThrowState != 369 || \ + id_core_set_method_alias != 370 || \ + id_core_set_variable_alias != 371 || \ + id_core_undef_method != 372 || \ + id_core_define_method != 373 || \ + id_core_define_singleton_method != 374 || \ + id_core_set_postexe != 375 || \ + tLAST_TOKEN != 376 +#error id.h is out of date. +#endif + idPLUS = '+', + idMINUS = '-', + idMULT = '*', + idDIV = '/', + idMOD = '%', + idLT = '<', + idLTLT = tLSHFT, + idLE = tLEQ, + idGT = '>', + idGE = tGEQ, + idEq = tEQ, + idEqq = tEQQ, + idNeq = tNEQ, + idNot = '!', + idBackquote = '`', + idEqTilde = tMATCH, + idAREF = tAREF, + idASET = tASET, + idLAST_TOKEN = tLAST_TOKEN >> ID_SCOPE_SHIFT, + tIntern, + tMethodMissing, + tLength, + tGets, + tSucc, + tEach, + tLambda, + tSend, + t__send__, + tInitialize, +#if SUPPORT_JOKE + tBitblt, + tAnswer, +#endif + tLAST_ID, +#define TOKEN2ID(n) id##n = ((t##n< -#ifndef RUBY_ID_H -#define RUBY_ID_H - -#define ID_SCOPE_SHIFT 3 -#define ID_SCOPE_MASK 0x07 -#define ID_LOCAL 0x00 -#define ID_INSTANCE 0x01 -#define ID_GLOBAL 0x03 -#define ID_ATTRSET 0x04 -#define ID_CONST 0x05 -#define ID_CLASS 0x06 -#define ID_JUNK 0x07 -#define ID_INTERNAL ID_JUNK - -#ifdef USE_PARSE_H -#include "parse.h" -#endif - -#define symIFUNC ID2SYM(idIFUNC) -#define symCFUNC ID2SYM(idCFUNC) - -enum ruby_method_ids { -#ifndef tLAST_TOKEN -% tokens.each do |token, value| - <%=token%> = <%=value%>, -% end -#elif <%= tokens.map {|token, value|"#{token} != #{value}"}.join(" || \\\n ") %> -#error id.h is out of date. -#endif - idPLUS = '+', - idMINUS = '-', - idMULT = '*', - idDIV = '/', - idMOD = '%', - idLT = '<', - idLTLT = tLSHFT, - idLE = tLEQ, - idGT = '>', - idGE = tGEQ, - idEq = tEQ, - idEqq = tEQQ, - idNeq = tNEQ, - idNot = '!', - idBackquote = '`', - idEqTilde = tMATCH, - idAREF = tAREF, - idASET = tASET, - idLAST_TOKEN = tLAST_TOKEN >> ID_SCOPE_SHIFT, - tIntern, - tMethodMissing, - tLength, - tGets, - tSucc, - tEach, - tLambda, - tSend, - t__send__, - tInitialize, -#if SUPPORT_JOKE - tBitblt, - tAnswer, -#endif - tLAST_ID, -#define TOKEN2ID(n) id##n = ((t##n<