Navigation

Changeset 1763

Timestamp:

05/13/07 18:33:19 (2 years ago)

Author:

nahi

Message:

check keyword for safe methodname as same as variable and Constant. closes #302.

Files:

r1734	r1763
70	70	GenSupport.capitalize(ele)
71	71	}.join
72		if /^[A-Z]/ !~ safename or keyword?(safename)
73		safename = "C_#{safename}"
	72	if /\A[A-Z]/ !~ safename or keyword?(safename)
	73	"C_#{safename}"
	74	else
	75	safename
74	76	end
75		~~safename~~
76	77	end
77	78	module_function :safeconstname
…	…
87	88	safename = uncapitalize(safename)
88	89	safename += postfix if postfix
89		if /^[a-z]/ !~ safename
90		safename = "m_#{safename}"
	90	if /\A[a-z]/ !~ safename or keyword?(safename)
	91	"m_#{safename}"
	92	else
	93	safename
91	94	end
92		~~safename~~
93	95	end
94	96	module_function :safemethodname
95	97
96	98	def safemethodname?(name)
97		/\A[a-zA-Z_][a-zA-Z0-9_]*[=!?]?\z/ =~ name
	99	/\A[a-zA-Z_][a-zA-Z0-9_]*[=!?]?\z/ =~ name and !keyword?(name)
98	100	end
99	101	module_function :safemethodname?
…	…
101	103	def safevarname(name)
102	104	safename = uncapitalize(name.scan(/[a-zA-Z0-9_]+/).join('_'))
103		if /^[a-z]/ !~ safename or keyword?(safename)
	105	if /\A[a-z]/ !~ safename or keyword?(safename)
104	106	"v_#{safename}"
105	107	else